diff options
| author | Bas van Dijk <v.dijk.bas@gmail.com> | 2014-12-05 07:54:48 +0100 |
|---|---|---|
| committer | Bas van Dijk <v.dijk.bas@gmail.com> | 2014-12-05 07:54:48 +0100 |
| commit | 6fa969839a9727de9880f8c38a86f6a9bef8d278 (patch) | |
| tree | 9ae4fa57dc0ab96955b30ed4db98ed7513985b8e /pkgs | |
| parent | 21566e7c56370ffc7efdff0bc44453c2690caf15 (diff) | |
| parent | e51ece3a65390c4ef3e23f47a4bc4d1ba6dfec69 (diff) | |
| download | nixlib-6fa969839a9727de9880f8c38a86f6a9bef8d278.tar nixlib-6fa969839a9727de9880f8c38a86f6a9bef8d278.tar.gz nixlib-6fa969839a9727de9880f8c38a86f6a9bef8d278.tar.bz2 nixlib-6fa969839a9727de9880f8c38a86f6a9bef8d278.tar.lz nixlib-6fa969839a9727de9880f8c38a86f6a9bef8d278.tar.xz nixlib-6fa969839a9727de9880f8c38a86f6a9bef8d278.tar.zst nixlib-6fa969839a9727de9880f8c38a86f6a9bef8d278.zip | |
Merge branch 'master' of https://github.com/NixOS/nixpkgs into update
Conflicts: pkgs/development/libraries/haskell/text-binary/default.nix pkgs/top-level/haskell-defaults.nix pkgs/top-level/haskell-packages.nix
Diffstat (limited to 'pkgs')
2858 files changed, 61606 insertions, 40868 deletions
diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index 62b88cbe0775..5180be3c940c 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -6,7 +6,7 @@ , perl, pkgconfig, python, serd, sord, sratom, suil }: let - tag = "3.5.380"; + tag = "3.5.403"; in stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = git://git.ardour.org/ardour/ardour.git; rev = "refs/tags/${tag}"; - sha256 = "dbcbb2d9143e196d079c27b15266e47d24b81cb7591fe64b717f3485965ded7b"; + sha256 = "7d7c8e2c7ccccca6c8324fd874509e1b0d89f3f42cb92982c50d212797463f4c"; }; buildInputs = diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index 88931520c42a..10baf254dc73 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -39,7 +39,7 @@ assert withOnlineServices -> withTaglib; assert withReplaygain -> withTaglib; let - version = "1.4.1"; + version = "1.5.0"; pname = "cantata"; fstat = x: fn: "-DENABLE_" + fn + "=" + (if x then "ON" else "OFF"); fstats = x: map (fstat x); @@ -50,8 +50,8 @@ stdenv.mkDerivation rec { src = fetchurl { inherit name; - url = "https://drive.google.com/uc?export=download&id=0Bzghs6gQWi60eXhuZ1Z3bGM2bjQ"; - sha256 = "b0d5a1798efd275d72dffb87bc0f016fc865dbd1384b7c9af039cebdffe0cca3"; + url = "https://drive.google.com/uc?export=download&id=0Bzghs6gQWi60c0pFbEtldEk1UnM"; + sha256 = "0gnqfp3ps79d500hrivxj2xkkia042knhg86md6w8ycl3945611p"; }; buildInputs = @@ -92,8 +92,8 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = "http://code.google.com/p/cantata/"; - description = "A graphical client for MPD."; + homepage = http://code.google.com/p/cantata/; + description = "A graphical client for MPD"; license = licenses.gpl3; # Technically Cantata can run on Windows so if someone wants to diff --git a/pkgs/applications/audio/caudec/default.nix b/pkgs/applications/audio/caudec/default.nix new file mode 100644 index 000000000000..24613d4dd965 --- /dev/null +++ b/pkgs/applications/audio/caudec/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, makeWrapper, bash, bc, findutils, flac, lame, opusTools, procps, sox }: + +let + version = "1.7.5"; +in + +stdenv.mkDerivation rec { + name = "caudec-${version}"; + + src = fetchurl { + url = "http://caudec.net/downloads/caudec-${version}.tar.gz"; + sha256 = "5d1f5ab3286bb748bd29cbf45df2ad2faf5ed86070f90deccf71c60be832f3d5"; + }; + + preBuild = '' + patchShebangs ./install.sh + ''; + + buildInputs = [ bash makeWrapper ]; + + installPhase = '' + ./install.sh --prefix=$out/bin + ''; + + postFixup = '' + for executable in $(cd $out/bin && ls); do + wrapProgram $out/bin/$executable \ + --prefix PATH : "${bc}/bin:${findutils}/bin:${sox}/bin:${procps}/bin:${opusTools}/bin:${lame}/bin:${flac}/bin" + done + ''; + + meta = with stdenv.lib; { + homepage = http://caudec.net/; + description = "A multiprocess audio converter that supports many formats (FLAC, MP3, Ogg Vorbis, Windows codecs and many more)"; + license = licenses.gpl3; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ _1126 ]; + }; +} diff --git a/pkgs/applications/audio/chuck/darwin-limits.patch b/pkgs/applications/audio/chuck/darwin-limits.patch new file mode 100644 index 000000000000..3387f7255441 --- /dev/null +++ b/pkgs/applications/audio/chuck/darwin-limits.patch @@ -0,0 +1,13 @@ +--- a/src/util_string.cpp 2014-10-27 22:52:11.875981552 +0100 ++++ b/src/util_string.cpp 2014-10-27 22:54:18.613001994 +0100 +@@ -40,6 +40,10 @@ + #include <linux/limits.h> + #endif // __PLATFORM_LINUX__ + ++#ifdef __PLATFORM_MACOSX__ ++#include <limits.h> ++#endif // __PLATFORM_MACOSX__ ++ + #include <stdio.h> + using namespace std; + diff --git a/pkgs/applications/audio/chuck/default.nix b/pkgs/applications/audio/chuck/default.nix new file mode 100644 index 000000000000..7725ba1e4c80 --- /dev/null +++ b/pkgs/applications/audio/chuck/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, alsaLib, bison, flex, libsndfile, which }: + +stdenv.mkDerivation rec { + version = "1.3.4.0"; + name = "chuck-${version}"; + + src = fetchurl { + url = "http://chuck.cs.princeton.edu/release/files/chuck-${version}.tgz"; + sha256 = "0cwbk8b1i18nkh2nxwzk2prranw83lgglxw7ccnp6b0r2b2yfpmn"; + }; + + buildInputs = [ bison flex libsndfile which ] + ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib; + + patches = [ ./darwin-limits.patch ]; + + postPatch = '' + substituteInPlace src/makefile --replace "/usr/bin" "$out/bin" + substituteInPlace src/makefile.osx --replace "xcodebuild" "/usr/bin/xcodebuild" + substituteInPlace src/makefile.osx --replace "weak_framework" "framework" + ''; + + buildPhase = + stdenv.lib.optionals stdenv.isLinux ["make -C src linux-alsa"] ++ + stdenv.lib.optionals stdenv.isDarwin ["make -C src osx"]; + + installPhase = '' + install -Dm755 ./src/chuck $out/bin/chuck + ''; + + meta = { + description = "Programming language for real-time sound synthesis and music creation"; + homepage = http://chuck.cs.princeton.edu; + license = stdenv.lib.licenses.gpl2; + platforms = with stdenv.lib.platforms; linux ++ darwin; + maintainers = with stdenv.lib.maintainers; [ ftrvxmtrx ]; + }; +} diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index 4f9c491a3a59..7cabc98ebaa9 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -1,21 +1,22 @@ -{ stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, ffmpeg, libvorbis, mpc, mp4v2 }: +{ stdenv, fetchgit, ncurses, pkgconfig, alsaLib, flac, libmad, ffmpeg, libvorbis, mpc, mp4v2, libcue, pulseaudio}: stdenv.mkDerivation rec { name = "cmus-${version}"; - version = "2.5.0"; + version = "2.6.0"; - src = fetchurl { - url = "mirror://sourceforge/cmus/cmus-v${version}.tar.bz2"; - sha256 = "1pwd3jifv12yr0yr77hsv5c9y8ay6kn2b5a3s5i8v2c882vgl890"; + src = fetchgit { + url = https://github.com/cmus/cmus.git; + rev = "46b71032da827d22d4fae5bf2afcc4c9afef568c"; + sha256 = "1hkqifll5ryf3ljp3w1dxz1p8m6rk34fpazc6vwavis6ga310hka"; }; configurePhase = "./configure prefix=$out"; - buildInputs = [ ncurses pkgconfig alsaLib flac libmad ffmpeg libvorbis mpc mp4v2 ]; + buildInputs = [ ncurses pkgconfig alsaLib flac libmad ffmpeg libvorbis mpc mp4v2 libcue pulseaudio ]; meta = { description = "Small, fast and powerful console music player for Linux and *BSD"; - homepage = http://cmus.sourceforge.net; + homepage = https://cmus.github.io/; license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index 19c590330f65..64f3f3586a36 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -12,13 +12,13 @@ }: stdenv.mkDerivation { - name = "csound-5.19.01"; + name = "csound-6.03.2"; enableParallelBuilding = true; src = fetchurl { - url = mirror://sourceforge/csound/Csound5.19.01.tar.gz; - sha256 = "078i69jwgadmxwa5ffn8h1py7cmd9asa8swnh38fyp56lzgzn669"; + url = mirror://sourceforge/csound/Csound6.03.2.tar.gz; + sha256 = "0w6ij57dbfjljpf05bb9r91jphwaq1v63rh0713vl2n11d73dy7m"; }; buildInputs = [ cmake libsndfile flex bison alsaLib pulseaudio tcltk ]; diff --git a/pkgs/applications/audio/drumgizmo/default.nix b/pkgs/applications/audio/drumgizmo/default.nix new file mode 100644 index 000000000000..2daafda554e7 --- /dev/null +++ b/pkgs/applications/audio/drumgizmo/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, alsaLib, expat, glib, jack2, libX11, libpng +, libpthreadstubs, libsmf, libsndfile, lv2, pkgconfig +}: + +stdenv.mkDerivation rec { + version = "0.9.6"; + name = "drumgizmo-${version}"; + + src = fetchurl { + url = "http://www.drumgizmo.org/releases/${name}/${name}.tar.gz"; + sha256 = "1qs8aa1v8cw5zgfzcnr2dc4w0y5yzsgrywlnx2hfvx2si3as0mw4"; + }; + + configureFlags = [ "--enable-lv2" ]; + + buildInputs = [ + alsaLib expat glib jack2 libX11 libpng libpthreadstubs libsmf + libsndfile lv2 pkgconfig + ]; + + meta = with stdenv.lib; { + description = "An LV2 sample based drum plugin"; + homepage = http://www.drumgizmo.org; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.goibhniu ]; + }; +} diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix index 3ba7b5903f99..d4927cc1a718 100644 --- a/pkgs/applications/audio/easytag/default.nix +++ b/pkgs/applications/audio/easytag/default.nix @@ -1,28 +1,28 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk, glib, libid3tag, id3lib, taglib -, libvorbis, libogg, flac, itstool, libxml2 +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, glib, libid3tag, id3lib, taglib +, libvorbis, libogg, flac, itstool, libxml2, gsettings_desktop_schemas +, makeWrapper, gnome_icon_theme }: stdenv.mkDerivation rec { name = "easytag-${version}"; - version = "2.2.4"; + version = "2.3.2"; src = fetchurl { - url = "mirror://gnome/sources/easytag/2.2/${name}.tar.xz"; - sha256 = "14f0s0l28fwxnc37aw1imal2xcg9ykq35mx2j9gaqzz02ymjk0s5"; + url = "mirror://gnome/sources/easytag/2.3/${name}.tar.xz"; + sha256 = "0bj3sj4yzlnhan38j84acs7qv27fl3xy4rdrfq6dnpz4q6qccm84"; }; - preConfigure = '' - # pkg-config v0.23 should be enough. - sed -i -e '/_pkg_min_version=0.24/s/24/23/' \ - -e 's/have_mp3=no/have_mp3=yes/' \ - -e 's/ID3TAG_DEPS="id3tag"/ID3TAG_DEPS=""/' configure + preFixup = '' + wrapProgram $out/bin/easytag \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" ''; NIX_LDFLAGS = "-lid3tag -lz"; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ - pkgconfig intltool gtk glib libid3tag id3lib taglib libvorbis libogg flac - itstool libxml2 + pkgconfig intltool gtk3 glib libid3tag id3lib taglib libvorbis libogg flac + itstool libxml2 gsettings_desktop_schemas gnome_icon_theme ]; meta = { diff --git a/pkgs/applications/audio/faust-compiler/default.nix b/pkgs/applications/audio/faust-compiler/default.nix new file mode 100644 index 000000000000..5e980691df6d --- /dev/null +++ b/pkgs/applications/audio/faust-compiler/default.nix @@ -0,0 +1,101 @@ +{ fetchurl, stdenv, unzip, pkgconfig, makeWrapper, libsndfile, libmicrohttpd, vim }: + +stdenv.mkDerivation rec { + + version = "0.9.67"; + name = "faust-compiler-${version}"; + src = fetchurl { + url = "http://downloads.sourceforge.net/project/faudiostream/faust-${version}.zip"; + sha256 = "068vl9536zn0j4pknwfcchzi90rx5pk64wbcbd67z32w0csx8xm1"; + }; + + buildInputs = [ unzip pkgconfig makeWrapper libsndfile libmicrohttpd vim]; + + + makeFlags="PREFIX = $(out)"; + FPATH="$out"; # <- where to search + + patchPhase = '' + sed -i 's@?= $(shell uname -s)@:= Linux@g' architecture/osclib/oscpack/Makefile + sed -i 's@faust/misc.h@../../architecture/faust/misc.h@g' tools/sound2faust/sound2faust.cpp + sed -i 's@faust/gui/@../../architecture/faust/gui/@g' architecture/faust/misc.h + ''; + + buildPhase = '' + make -C compiler -f Makefile.unix + make -C architecture/osclib + g++ -O3 tools/sound2faust/sound2faust.cpp `pkg-config --cflags --static --libs sndfile` -o tools/sound2faust/sound2faust + make httpd + + ''; + + installPhase = '' + + echo install faust itself + mkdir -p $out/bin/ + mkdir -p $out/include/ + mkdir -p $out/include/faust/ + mkdir -p $out/include/faust/osc/ + install compiler/faust $out/bin/ + + echo install architecture and faust library files + mkdir -p $out/lib/faust + cp architecture/*.lib $out/lib/faust/ + cp architecture/*.cpp $out/lib/faust/ + + echo install math documentation files + cp architecture/mathdoctexts-*.txt $out/lib/faust/ + cp architecture/latexheader.tex $out/lib/faust/ + + echo install additional binary libraries: osc, http + ([ -e architecture/httpdlib/libHTTPDFaust.a ] && cp architecture/httpdlib/libHTTPDFaust.a $out/lib/faust/) || echo libHTTPDFaust not available + cp architecture/osclib/*.a $out/lib/faust/ + cp -r architecture/httpdlib/html/js $out/lib/faust/js + ([ -e architecture/httpdlib/src/hexa/stylesheet ] && cp architecture/httpdlib/src/hexa/stylesheet $out/lib/faust/js/stylesheet.js) || echo stylesheet not available + ([ -e architecture/httpdlib/src/hexa/jsscripts ] && cp architecture/httpdlib/src/hexa/jsscripts $out/lib/faust/js/jsscripts.js) || echo jsscripts not available + + echo install includes files for architectures + cp -r architecture/faust $out/include/ + + echo install additional includes files for binary libraries: osc, http + cp architecture/osclib/faust/faust/OSCControler.h $out/include/faust/gui/ + cp architecture/osclib/faust/faust/osc/*.h $out/include/faust/osc/ + cp architecture/httpdlib/src/include/*.h $out/include/faust/gui/ + + + echo patch header and cpp files + find $out/include/ -name "*.h" -type f | xargs sed "s@#include \"faust/@#include \"$out/include/faust/@g" -i + find $out/lib/faust/ -name "*.cpp" -type f | xargs sed "s@#include \"faust/@#include \"$out/include/faust/@g" -i + sed -i "s@../../architecture/faust/gui/@$out/include/faust/gui/@g" $out/include/faust/misc.h + + wrapProgram $out/bin/faust \ + --set FAUSTLIB $out/lib/faust \ + --set FAUST_LIB_PATH $out/lib/faust \ + --set FAUSTINC $out/include/ + ''; + + meta = with stdenv.lib; { + description = "A functional programming language for realtime audio signal processing"; + longDescription = '' + FAUST (Functional Audio Stream) is a functional programming + language specifically designed for real-time signal processing + and synthesis. FAUST targets high-performance signal processing + applications and audio plug-ins for a variety of platforms and + standards. + The Faust compiler translates DSP specifications into very + efficient C++ code. Thanks to the notion of architecture, + FAUST programs can be easily deployed on a large variety of + audio platforms and plugin formats (jack, alsa, ladspa, maxmsp, + puredata, csound, supercollider, pure, vst, coreaudio) without + any change to the FAUST code. + This package has just the compiler. Install faust for the full + set of faust2somethingElse tools. + ''; + homepage = http://faust.grame.fr/; + downloadPage = http://sourceforge.net/projects/faudiostream/files/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.magnetophon ]; + }; +} + diff --git a/pkgs/applications/audio/faust/default.nix b/pkgs/applications/audio/faust/default.nix new file mode 100644 index 000000000000..9d25573ccc81 --- /dev/null +++ b/pkgs/applications/audio/faust/default.nix @@ -0,0 +1,79 @@ +{ fetchurl, stdenv, bash, alsaLib, atk, cairo, faust-compiler, fontconfig, freetype +, gcc, gdk_pixbuf, glib, gtk, makeWrapper, pango, pkgconfig, unzip +, gtkSupport ? true +}: + +stdenv.mkDerivation rec { + + version = "0.9.67"; + name = "faust-${version}"; + src = fetchurl { + url = "http://downloads.sourceforge.net/project/faudiostream/faust-${version}.zip"; + sha256 = "068vl9536zn0j4pknwfcchzi90rx5pk64wbcbd67z32w0csx8xm1"; + }; + + buildInputs = [ bash unzip faust-compiler gcc makeWrapper pkgconfig ] + ++ stdenv.lib.optionals gtkSupport [ + alsaLib atk cairo fontconfig freetype gdk_pixbuf glib gtk pango + ] + ; + + makeFlags="PREFIX=$(out)"; + FPATH="$out"; # <- where to search + + phases = [ "unpackPhase installPhase postInstall" ]; + + installPhase = '' + mkdir $out/bin + install tools/faust2appls/faust2alsaconsole $out/bin + install tools/faust2appls/faustpath $out/bin + install tools/faust2appls/faustoptflags $out/bin + install tools/faust2appls/faust2alsa $out/bin + + wrapProgram $out/bin/faust2alsaconsole \ + --prefix PKG_CONFIG_PATH : ${alsaLib}/lib/pkgconfig \ + --set FAUSTLIB ${faust-compiler}/lib/faust \ + --set FAUSTINC ${faust-compiler}/include/ + + GTK_PKGCONFIG_PATHS=${gtk}/lib/pkgconfig:${pango}/lib/pkgconfig:${glib}/lib/pkgconfig:${cairo}/lib/pkgconfig:${gdk_pixbuf}/lib/pkgconfig:${atk}/lib/pkgconfig:${freetype}/lib/pkgconfig:${fontconfig}/lib/pkgconfig + + wrapProgram $out/bin/faust2alsa \ + --prefix PKG_CONFIG_PATH : ${alsaLib}/lib/pkgconfig:$GTK_PKGCONFIG_PATHS \ + --set FAUSTLIB ${faust-compiler}/lib/faust \ + --set FAUSTINC ${faust-compiler}/include/ \ + '' + stdenv.lib.optionalString (!gtkSupport) "rm $out/bin/faust2alsa" + ; + + postInstall = '' + find $out/bin/ -name "faust2*" -type f | xargs sed "s@/bin/bash@${bash}/bin/bash@g" -i + sed -i "s@/bin/bash@${bash}/bin/bash@g" $out/bin/faustpath + sed -e "s@\$FAUST_INSTALL /usr/local /usr /opt /opt/local@${faust-compiler}@g" -i $out/bin/faustpath + sed -i "s@/bin/bash@${bash}/bin/bash@g" $out/bin/faustoptflags + find $out/bin/ -name "faust2*" -type f | xargs sed "s@pkg-config@${pkgconfig}/bin/pkg-config@g" -i + find $out/bin/ -name "faust2*" -type f | xargs sed "s@CXX=g++@CXX=${gcc}/bin/g++@g" -i + find $out/bin/ -name "faust2*" -type f | xargs sed "s@faust -i -a @${faust-compiler}/bin/faust -i -a ${faust-compiler}/lib/faust/@g" -i + ''; + + meta = with stdenv.lib; { + description = "A functional programming language for realtime audio signal processing"; + longDescription = '' + FAUST (Functional Audio Stream) is a functional programming + language specifically designed for real-time signal processing + and synthesis. FAUST targets high-performance signal processing + applications and audio plug-ins for a variety of platforms and + standards. + The Faust compiler translates DSP specifications into very + efficient C++ code. Thanks to the notion of architecture, + FAUST programs can be easily deployed on a large variety of + audio platforms and plugin formats (jack, alsa, ladspa, maxmsp, + puredata, csound, supercollider, pure, vst, coreaudio) without + any change to the FAUST code. + ''; + homepage = http://faust.grame.fr/; + downloadPage = http://sourceforge.net/projects/faudiostream/files/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.magnetophon ]; + }; +} + diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix index 728155c02bda..c151deddd70e 100644 --- a/pkgs/applications/audio/gmpc/default.nix +++ b/pkgs/applications/audio/gmpc/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, libtool, intltool, pkgconfig, glib , gtk, curl, mpd_clientlib, libsoup, gob2, vala, libunique +, libSM, libICE, sqlite }: stdenv.mkDerivation rec { @@ -22,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ libtool intltool pkgconfig glib gtk curl mpd_clientlib libsoup - libunique libmpd gob2 vala + libunique libmpd gob2 vala libSM libICE sqlite ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/google-musicmanager/default.nix b/pkgs/applications/audio/google-musicmanager/default.nix index 107dcdce05c9..63a87b315541 100644 --- a/pkgs/applications/audio/google-musicmanager/default.nix +++ b/pkgs/applications/audio/google-musicmanager/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = if stdenv.system == "x86_64-linux" then fetchurl { url = "http://dl.google.com/linux/musicmanager/deb/pool/main/g/google-musicmanager-beta/google-musicmanager-${version}_amd64.deb"; - sha256 = "0efdce3970e2cf83eb7d8f6021f987a1517a41823784ada8e51f1649f8a49342"; + sha256 = "10nr7qlrn5af4g0l6n4xzximmhc216vhzgpy7cpxs662zpli3v1a"; } else fetchurl { url = "http://dl.google.com/linux/musicmanager/deb/pool/main/g/google-musicmanager-beta/google-musicmanager-${version}_i386.deb"; diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index de5ef0551254..e8c14a9c763d 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -1,6 +1,5 @@ { pkgs, stdenv, fetchurl, python, buildPythonPackage, pythonPackages, mygpoclient, intltool, - ipodSupport ? true, libgpod, gpodderHome ? "", gpodderDownloadDir ? "", - gnome3, hicolor_icon_theme }: + ipodSupport ? true, libgpod, gnome3, hicolor_icon_theme }: with pkgs.lib; @@ -8,20 +7,23 @@ let inherit (pythonPackages) coverage feedparser minimock sqlite3 dbus pygtk eyeD3; in buildPythonPackage rec { - name = "gpodder-3.8.0"; + name = "gpodder-3.8.3"; src = fetchurl { url = "http://gpodder.org/src/${name}.tar.gz"; - sha256 = "0731f08f4270c81872b841b55200ae80feb4502706397d0085079471fb9a8fe4"; + sha256 = "8ac120a6084bded6bc88ecadbbc9df54a85f44ef4507f73a76de1d7a5574303c"; }; buildInputs = [ coverage feedparser minimock sqlite3 mygpoclient intltool - gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic - hicolor_icon_theme + gnome3.gnome_themes_standard gnome3.gnome_icon_theme + gnome3.gnome_icon_theme_symbolic hicolor_icon_theme + gnome3.gsettings_desktop_schemas ]; - propagatedBuildInputs = [ feedparser dbus mygpoclient sqlite3 pygtk eyeD3 ] + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + pythonPath = [ feedparser dbus mygpoclient sqlite3 pygtk eyeD3 ] ++ stdenv.lib.optional ipodSupport libgpod; postPatch = "sed -ie 's/PYTHONPATH=src/PYTHONPATH=\$(PYTHONPATH):src/' makefile"; @@ -30,8 +32,6 @@ in buildPythonPackage rec { preFixup = '' wrapProgram $out/bin/gpodder \ - ${optionalString (gpodderHome != "") "--set GPODDER_HOME ${gpodderHome}"} \ - ${optionalString (gpodderDownloadDir != "") "--set GPODDER_DOWNLOAD_DIR ${gpodderDownloadDir}"} \ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" ''; @@ -66,7 +66,7 @@ in buildPythonPackage rec { for you. Listen directly on your computer or on your mobile devices. ''; homepage = "http://gpodder.org/"; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; maintainers = [ stdenv.lib.maintainers.skeidel ]; }; diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix index 80a7cf52cd8d..9c08b2ab6d7d 100644 --- a/pkgs/applications/audio/gtkpod/default.nix +++ b/pkgs/applications/audio/gtkpod/default.nix @@ -1,11 +1,8 @@ { stdenv, fetchurl, pkgconfig, makeWrapper, intltool, libgpod, curl, flac, - gnome3_12, gtk3, glib, gettext, perl, perlXMLParser , libglade, flex, libid3tag, + gnome, gtk3, glib, gettext, perl, perlXMLParser, flex, libglade, libid3tag, libvorbis, hicolor_icon_theme, gdk_pixbuf }: -let - gnome = gnome3_12; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { version = "2.1.4"; name = "gtkpod-${version}"; diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index 3a125ef665dd..c4ba88c87edf 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -4,15 +4,15 @@ stdenv.mkDerivation rec { name = "guitarix-${version}"; - version = "0.30.0"; + version = "0.32.0"; src = fetchurl { url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.bz2"; - sha256 = "0fbapd1pcixzlqxgzb2s2q1c64g9z9lf4hz3vy73z55cnpk72vdx"; + sha256 = "06qxydcba1ga1l19kyqy0mk141mv6pa4wbkyh75xbwhyr65bwkc4"; }; buildInputs = [ - avahi boost boost.lib eigen fftw gettext glib glibmm gtk gtkmm intltool + avahi boost eigen fftw gettext glib glibmm gtk gtkmm intltool jack2 ladspaH librdf libsndfile lilv lv2 pkgconfig python serd sord sratom ]; diff --git a/pkgs/applications/audio/hydrogen/default.nix b/pkgs/applications/audio/hydrogen/default.nix index 72e546246d50..434f683bd5cd 100644 --- a/pkgs/applications/audio/hydrogen/default.nix +++ b/pkgs/applications/audio/hydrogen/default.nix @@ -2,12 +2,12 @@ , liblrdf, libsndfile, pkgconfig, qt4 }: stdenv.mkDerivation rec { - version = "0.9.6"; + version = "0.9.6.1"; name = "hydrogen-${version}"; src = fetchurl { url = "https://github.com/hydrogen-music/hydrogen/archive/${version}.tar.gz"; - sha256 = "1z7j8aq158mp41iv78j0w6fyx98y1y51z592b4x5hkvicabgck5w"; + sha256 = "0vxnaqfmcv7hhk0cj67imdcqngspnck7f0wfmvhfgfqa7x1xznll"; }; buildInputs = [ diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix index f6c0d9e99450..450b57a68195 100644 --- a/pkgs/applications/audio/ingen/default.nix +++ b/pkgs/applications/audio/ingen/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - boost boost.lib ganv glibmm gtk gtkmm jack2 lilv lv2 pkgconfig python + boost ganv glibmm gtk gtkmm jack2 lilv lv2 pkgconfig python raul serd sord sratom suil ]; diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix index eadbaabcf560..d5d7ea7be76a 100644 --- a/pkgs/applications/audio/milkytracker/default.nix +++ b/pkgs/applications/audio/milkytracker/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL alsaLib autoconf automake jack2 perl zlib zziplib ]; meta = { - description = "Music tracker application, similar to Fasttracker II."; + description = "Music tracker application, similar to Fasttracker II"; homepage = http://milkytracker.org; license = stdenv.lib.licenses.gpl3Plus; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix index 9fbf05a2feb1..ec9b1dd47ae2 100644 --- a/pkgs/applications/audio/moc/default.nix +++ b/pkgs/applications/audio/moc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { description = "An ncurses console audio player designed to be powerful and easy to use"; homepage = http://moc.daper.net/; license = licenses.gpl2; - maintainers = with maintainers; [ pSub ]; + maintainers = with maintainers; [ pSub jagajaga ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/mopidy-mopify/default.nix b/pkgs/applications/audio/mopidy-mopify/default.nix new file mode 100644 index 000000000000..715fd111536d --- /dev/null +++ b/pkgs/applications/audio/mopidy-mopify/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, pythonPackages, mopidy }: + +pythonPackages.buildPythonPackage rec { + name = "mopidy-mopify-${version}"; + + version = "0.1.6"; + + src = fetchurl { + url = "https://github.com/dirkgroenen/mopidy-mopify/archive/${version}.tar.gz"; + sha256 = "3581de6b0b42d2ece63bc153dcdba0594fbbeaacf695f2cd1e5d199670d83775"; + }; + + propagatedBuildInputs = [ mopidy ]; + + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/dirkgroenen/mopidy-mopify; + description = "A mopidy webclient based on the Spotify webbased interface."; + license = licenses.gpl3; + maintainers = [ maintainers.Gonzih ]; + }; +} diff --git a/pkgs/applications/audio/mopidy-spotify/default.nix b/pkgs/applications/audio/mopidy-spotify/default.nix index 6223ffb0d81f..b16e63dc421b 100644 --- a/pkgs/applications/audio/mopidy-spotify/default.nix +++ b/pkgs/applications/audio/mopidy-spotify/default.nix @@ -16,7 +16,7 @@ pythonPackages.buildPythonPackage rec { meta = with stdenv.lib; { homepage = http://www.mopidy.com/; - description = "Mopidy extension for playing music from Spotify."; + description = "Mopidy extension for playing music from Spotify"; license = licenses.asl20; maintainers = [ maintainers.rickynils ]; hydraPlatforms = []; diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index a0a3af0e9585..b261508438f0 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -28,7 +28,7 @@ pythonPackages.buildPythonPackage rec { homepage = http://www.mopidy.com/; description = '' An extensible music server that plays music from local disk, Spotify, - SoundCloud, Google Play Music, and more. + SoundCloud, Google Play Music, and more ''; license = licenses.asl20; maintainers = [ maintainers.rickynils ]; diff --git a/pkgs/applications/audio/morituri/default.nix b/pkgs/applications/audio/morituri/default.nix new file mode 100644 index 000000000000..6af08cf0221a --- /dev/null +++ b/pkgs/applications/audio/morituri/default.nix @@ -0,0 +1,58 @@ +{ stdenv, fetchurl, python, pythonPackages, cdparanoia, cdrdao +, pygobject, gst_python, gst_plugins_base, gst_plugins_good +, setuptools, utillinux, makeWrapper }: + +stdenv.mkDerivation rec { + name = "morituri-${version}"; + version = "0.2.3"; + + src = fetchurl { + url = "http://thomas.apestaart.org/download/morituri/${name}.tar.bz2"; + sha256 = "1b30bs1y8azl04izsrl01gw9ys0lhzkn5afxi4p8qbiri2h4v210"; + }; + + pythonPath = [ + pygobject gst_python pythonPackages.musicbrainzngs + pythonPackages.pycdio pythonPackages.pyxdg setuptools + ]; + + buildInputs = [ + python cdparanoia cdrdao utillinux makeWrapper + gst_plugins_base gst_plugins_good + ] ++ pythonPath; + + patches = [ ./paths.patch ]; + + postPatch = '' + substituteInPlace morituri/extern/python-command/scripts/help2man \ + --replace /usr/bin/python ${python}/bin/python + + substituteInPlace morituri/common/program.py \ + --replace umount ${utillinux}/bin/umount \ + --replace \'eject \'${utillinux}/bin/eject + + substituteInPlace morituri/program/cdparanoia.py \ + --replace '"cdparanoia"' '"${cdparanoia}/bin/cdparanoia"' + + substituteInPlace morituri/program/cdrdao.py \ + --replace "['cdrdao', ]" "['${cdrdao}/bin/cdrdao', ]" \ + --replace '"cdrdao"' '"${cdrdao}/bin/cdrdao"' + ''; + + # This package contains no binaries to patch or strip. + dontPatchELF = true; + dontStrip = true; + + postInstall = '' + wrapProgram "$out/bin/rip" \ + --prefix PYTHONPATH : "$PYTHONPATH" \ + --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" + ''; + + meta = with stdenv.lib; { + homepage = http://thomas.apestaart.org/morituri/trac/; + description = "A CD ripper aiming for accuracy over speed"; + maintainers = [ maintainers.rycee ]; + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/applications/audio/morituri/paths.patch b/pkgs/applications/audio/morituri/paths.patch new file mode 100644 index 000000000000..12f1d5b761c8 --- /dev/null +++ b/pkgs/applications/audio/morituri/paths.patch @@ -0,0 +1,12 @@ +diff -Nurp morituri-0.2.3-orig/doc/Makefile.in morituri-0.2.3/doc/Makefile.in +--- morituri-0.2.3-orig/doc/Makefile.in 2014-11-01 00:13:01.231364181 +0100 ++++ morituri-0.2.3/doc/Makefile.in 2014-11-01 00:13:56.691812229 +0100 +@@ -486,7 +486,7 @@ morituri.ics: $(top_srcdir)/morituri.doa + -moap doap -f $(top_srcdir)/morituri.doap ical > morituri.ics + + rip.1: $(top_srcdir)/morituri/extern/python-command/scripts/help2man $(top_srcdir)/morituri +- PYTHONPATH=$(top_srcdir) $(PYTHON) $(top_srcdir)/morituri/extern/python-command/scripts/help2man morituri.rip.main.Rip rip > rip.1 ++ PYTHONPATH=$(top_srcdir):$(PYTHONPATH) $(PYTHON) $(top_srcdir)/morituri/extern/python-command/scripts/help2man morituri.rip.main.Rip rip > rip.1 + + clean-local: + @rm -rf reference diff --git a/pkgs/applications/audio/mp3splt/default.nix b/pkgs/applications/audio/mp3splt/default.nix index b1970a998d50..08d91498cc0a 100644 --- a/pkgs/applications/audio/mp3splt/default.nix +++ b/pkgs/applications/audio/mp3splt/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "utility to split mp3, ogg vorbis and FLAC files without decoding"; homepage = http://sourceforge.net/projects/mp3splt/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bosu ]; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index 186c52654337..6e4ddcb1e9cb 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -1,16 +1,18 @@ { stdenv, fetchurl, ncurses, curl, taglib, fftw, mpd_clientlib, pkgconfig -, libiconvOrEmpty }: +, libiconvOrEmpty, boost, readline }: stdenv.mkDerivation rec { - version = "0.5.10"; + version = "0.6.1"; name = "ncmpcpp-${version}"; src = fetchurl { url = "http://ncmpcpp.rybczak.net/stable/ncmpcpp-${version}.tar.bz2"; - sha256 = "ff6d5376a2d9caba6f5bb78e68af77cefbdb2f04cd256f738e39f8ac9a79a4a8"; + sha256 = "033a18hj0q0smm5n0ykld9az7w95myr7jm2b1bjm0h2q5927x8qm"; }; - buildInputs = [ ncurses curl taglib fftw mpd_clientlib pkgconfig ] + configureFlags = "BOOST_LIB_SUFFIX="; + + buildInputs = [ ncurses curl taglib fftw mpd_clientlib boost pkgconfig readline ] ++ libiconvOrEmpty; meta = with stdenv.lib; { @@ -21,4 +23,3 @@ stdenv.mkDerivation rec { platforms = platforms.all; }; } - diff --git a/pkgs/applications/audio/pamixer/default.nix b/pkgs/applications/audio/pamixer/default.nix index 769af20c0ed0..d273c2381778 100644 --- a/pkgs/applications/audio/pamixer/default.nix +++ b/pkgs/applications/audio/pamixer/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "03r0sbfj85wp6yxa87pjg69ivmk0mxxa2nykr8gf2c607igmb034"; }; - buildInputs = [ pulseaudio boost boost.lib ]; + buildInputs = [ pulseaudio boost ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 235a81a6a32a..d0c3f010e6e1 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -1,26 +1,17 @@ -{ stdenv, fetchurl, pythonPackages, gettext, pyqt4 -, pkgconfig, libdiscid, libofa, ffmpeg, chromaprint +{ stdenv, buildPythonPackage, fetchurl, gettext +, pkgconfig, libofa, ffmpeg, chromaprint +, pyqt4, mutagen, python-libdiscid }: -pythonPackages.buildPythonPackage rec { +let version = "1.3"; in +buildPythonPackage { name = "picard-${version}"; - namePrefix = ""; - version = "1.2"; src = fetchurl { - url = "http://ftp.musicbrainz.org/pub/musicbrainz/picard/${name}.tar.gz"; - sha256 = "0sbsf8hzxhxcnnjqvsd6mc23lmk7w33nln0f3w72f89mjgs6pxm6"; + url = "ftp://ftp.musicbrainz.org/pub/musicbrainz/picard/picard-${version}.tar.gz"; + sha256 = "06s90w1j29qhd931dgj752k5v4pjbvxiz6g0613xzj3ms8zsrlys"; }; - postPatch = let - discid = "${libdiscid}/lib/libdiscid.so.0"; - fpr = "${chromaprint}/bin/fpcalc"; - in '' - substituteInPlace picard/disc.py --replace libdiscid.so.0 ${discid} - substituteInPlace picard/const.py \ - --replace "FPCALC_NAMES = [" "FPCALC_NAMES = ['${fpr}'," - ''; - buildInputs = [ pkgconfig ffmpeg @@ -29,19 +20,11 @@ pythonPackages.buildPythonPackage rec { ]; propagatedBuildInputs = [ - pythonPackages.mutagen pyqt4 - libdiscid + mutagen + python-libdiscid ]; - configurePhase = '' - python setup.py config - ''; - - buildPhase = '' - python setup.py build - ''; - installPhase = '' python setup.py install --prefix="$out" ''; diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 86c68d087b77..354a3e43616d 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, alsaLib, gtk, pkgconfig }: +let version = "5401"; in stdenv.mkDerivation { - name = "praat-5365"; + name = "praat-${version}"; src = fetchurl { - url = http://www.fon.hum.uva.nl/praat/praat5365_sources.tar.gz; - sha256 = "1w3mcq0mipx88i7ckhvzhmdj0p67nhppnn7kbkp21d01yyyz5rgq"; + url = "http://www.fon.hum.uva.nl/praat/praat${version}_sources.tar.gz"; + sha256 = "1hx0simc0hp5w5scyaiw8h8lrpafra4h1zy1jn1kzb0299yd06n3"; }; configurePhase = '' diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index ba875255d4a0..9b87dd53bf6e 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, qt4, alsaLib, jack2, dbus }: stdenv.mkDerivation rec { - version = "0.3.11"; + version = "0.3.12"; name = "qjackctl-${version}"; # some dependencies such as killall have to be installed additionally src = fetchurl { url = "mirror://sourceforge/qjackctl/${name}.tar.gz"; - sha256 = "1wjzrgx3n2asyxk6cnfcm34msaw84qvsqy08bd4qnghrgpl96hwl"; + sha256 = "14yvnc4k3hwsjflg8b2d04bc63pdl0gyqjc7vl6rdn29nbr23zwc"; }; buildInputs = [ qt4 alsaLib jack2 dbus ]; diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index a18ef97dd60a..0622194d2c26 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -28,11 +28,11 @@ # handle that. stdenv.mkDerivation rec { - name = "qmmp-0.7.6"; + name = "qmmp-0.8.2"; src = fetchurl { url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2"; - sha256 = "1hq08ii06lyfg516jrvxdfcjj509gvglvdlsr96aqi1fh8v4k5p9"; + sha256 = "1vwjy3bv1gj6k5kqkhw2q7aspashw6x4lxccl28iydjfzk7d7cd4"; }; buildInputs = diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix index 561a72bb38ba..079703d40ae3 100644 --- a/pkgs/applications/audio/qtractor/default.nix +++ b/pkgs/applications/audio/qtractor/default.nix @@ -3,12 +3,12 @@ , libtool, libvorbis, pkgconfig, qt4, rubberband, stdenv }: stdenv.mkDerivation rec { - version = "0.6.3"; + version = "0.6.4"; name = "qtractor-${version}"; src = fetchurl { url = "mirror://sourceforge/qtractor/${name}.tar.gz"; - sha256 = "1lsmd83vhgfzb3bf02hi6xp5ryh08lz4h21agy7wm3acjqc6gsc2"; + sha256 = "1wgm9cx9mrxgd69kdabh78vb3nlyhhfbpd5k4g9s15ifny9cgwz4"; }; buildInputs = diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index 1b878deb316a..17596e24a3ba 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "snd-15.0"; + name = "snd-15.1"; src = fetchurl { url = "mirror://sourceforge/snd/${name}.tar.gz"; - sha256 = "1s1mswgxhvi0wjw0qscwh2jajihvgz86xffgbwl7qjkymqbh8gyj"; + sha256 = "01xrgxmkibadm3zva2n7qv00dz8yy9wlkpwv7vancqfb8x44x1ji"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix index 42c390620427..7bda4fb27670 100644 --- a/pkgs/applications/audio/sonic-visualiser/default.nix +++ b/pkgs/applications/audio/sonic-visualiser/default.nix @@ -8,12 +8,11 @@ stdenv.mkDerivation rec { name = "sonic-visualiser-${version}"; - version = "2.3"; + version = "2.4.1"; src = fetchurl { - - url = "http://code.soundsoftware.ac.uk/attachments/download/918/${name}.tar.gz"; - sha256 = "1f06w2rin4r2mbi00bg3nmqdi2xdy9vq4jcmfanxzj3ld66ik40c"; + url = "http://code.soundsoftware.ac.uk/attachments/download/1185/${name}.tar.gz"; + sha256 = "06nlha70kgrby16nyhngrv5q846xagnxdinv608v7ga7vpywwmyb"; }; buildInputs = diff --git a/pkgs/applications/audio/tomahawk/default.nix b/pkgs/applications/audio/tomahawk/default.nix new file mode 100644 index 000000000000..fec93f0183d9 --- /dev/null +++ b/pkgs/applications/audio/tomahawk/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, cmake, pkgconfig, attica, boost, gnutls, libechonest +, liblastfm, lucenepp, phonon, phonon_backend_vlc, qca2, qjson, qt4, qtkeychain +, quazip, sparsehash, taglib, websocketpp + +, enableXMPP ? true, libjreen ? null +, enableKDE ? false, kdelibs ? null +, enableTelepathy ? false, telepathy_qt ? null +}: + +assert enableXMPP -> libjreen != null; +assert enableKDE -> kdelibs != null; +assert enableTelepathy -> telepathy_qt != null; + +let + quazipQt4 = quazip.override { qt = qt4; }; +in stdenv.mkDerivation rec { + name = "tomahawk-${version}"; + version = "0.8.1"; + + src = fetchurl { + url = "http://download.tomahawk-player.org/tomahawk-0.8.1.tar.bz2"; + sha256 = "0ca6fah30a2s8nnlryav95wyzhwys1ikjfwakrqf2hb0y5aczdpw"; + }; + + cmakeFlags = [ + "-DLUCENEPP_INCLUDE_DIR=${lucenepp}/include" + "-DLUCENEPP_LIBRARY_DIR=${lucenepp}/lib" + ]; + + buildInputs = [ + cmake pkgconfig attica boost gnutls libechonest liblastfm lucenepp phonon + qca2 qjson qt4 qtkeychain quazipQt4 sparsehash taglib websocketpp + ] ++ stdenv.lib.optional enableXMPP libjreen + ++ stdenv.lib.optional enableKDE kdelibs + ++ stdenv.lib.optional enableTelepathy telepathy_qt; + + propagatedBuildInputs = [ phonon_backend_vlc ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A multi-source music player"; + homepage = "http://tomahawk-player.org/"; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = [ maintainers.aszlig ]; + }; +} diff --git a/pkgs/applications/audio/vimpc/default.nix b/pkgs/applications/audio/vimpc/default.nix index 3e365cae8e94..71a07f18e084 100755 --- a/pkgs/applications/audio/vimpc/default.nix +++ b/pkgs/applications/audio/vimpc/default.nix @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { ''; meta = { - description = "A vi/vim inspired client for the Music Player Daemon (mpd)."; + description = "A vi/vim inspired client for the Music Player Daemon (mpd)"; homepage = https://github.com/boysetsfrog/vimpc; - license = "GPL3"; + license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/vimus/default.nix b/pkgs/applications/audio/vimus/default.nix new file mode 100644 index 000000000000..6bd51760e884 --- /dev/null +++ b/pkgs/applications/audio/vimus/default.nix @@ -0,0 +1,29 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, c2hs, dataDefault, deepseq, filepath, hspec +, hspecExpectations, libmpd, mtl, ncurses, QuickCheck, time +, transformers, utf8String, wcwidth +}: + +cabal.mkDerivation (self: { + pname = "vimus"; + version = "0.2.0"; + sha256 = "0s7hfyil9rnr9rmjb08g1l1sxybx3qdkw2f59p433fkdjp2m140h"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + dataDefault deepseq filepath libmpd mtl time utf8String wcwidth + ]; + testDepends = [ + dataDefault hspec hspecExpectations mtl QuickCheck transformers + wcwidth + ]; + buildTools = [ c2hs ]; + extraLibraries = [ ncurses ]; + meta = { + description = "An MPD client with vim-like key bindings"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ jzellner ]; + }; +}) diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index bc28108b7cb0..7826be89c7ec 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchurl, alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk -, jack2, libsndfile, mesa, minixml, pkgconfig, zlib, xorg +, jack2, libsndfile, lv2, mesa, minixml, pkgconfig, zlib, xorg }: assert stdenv ? glibc; stdenv.mkDerivation rec { name = "yoshimi-${version}"; - version = "1.2.3"; + version = "1.3.0"; src = fetchurl { url = "mirror://sourceforge/yoshimi/${name}.tar.bz2"; - sha256 = "00bp699k8gnilin2rvgj35334s9jrizp82qwlmzzvvfliwcgqlqw"; + sha256 = "1zxblcl6ffwwzxh3d17hw1mp398b73wk5bsagdmx5gph038gdh7y"; }; buildInputs = [ - alsaLib boost boost.lib cairo fftwSinglePrec fltk jack2 libsndfile mesa + alsaLib boost cairo fftwSinglePrec fltk jack2 libsndfile lv2 mesa minixml zlib xorg.libpthreadstubs ]; diff --git a/pkgs/applications/backup/crashplan/CrashPlanEngine.patch b/pkgs/applications/backup/crashplan/CrashPlanEngine.patch new file mode 100644 index 000000000000..de2afe2da684 --- /dev/null +++ b/pkgs/applications/backup/crashplan/CrashPlanEngine.patch @@ -0,0 +1,37 @@ +--- ./scripts/CrashPlanEngine 2014-02-19 23:17:19.000000000 +0000 ++++ ./scripts/CrashPlanEngine.1 2014-07-24 17:36:37.330333581 +0100 +@@ -11,7 +11,7 @@ + + cd $TARGETDIR + +- nice -n 19 $JAVACOMMON $SRV_JAVA_OPTS -classpath $FULL_CP com.backup42.service.CPService > $TARGETDIR/log/engine_output.log 2> $TARGETDIR/log/engine_error.log & ++ nice -n 19 $JAVACOMMON $SRV_JAVA_OPTS -classpath $FULL_CP com.backup42.service.CPService > $VARDIR/log/engine_output.log 2> $VARDIR/log/engine_error.log & + + if [[ $! -gt 0 ]]; then + echo $! > $PIDFILE +@@ -26,7 +26,7 @@ + + echo "Using Ubuntu 9.04 startup" + +- start-stop-daemon -v --pidfile $PIDFILE --make-pidfile --background --chdir $TARGETDIR --start --nicelevel 19 --exec $JAVACOMMON -- $SRV_JAVA_OPTS -classpath $FULL_CP com.backup42.service.CPService > $TARGETDIR/log/engine_output.log 2> $TARGETDIR/log/engine_error.log ++ start-stop-daemon -v --pidfile $PIDFILE --make-pidfile --background --chdir $TARGETDIR --start --nicelevel 19 --exec $JAVACOMMON -- $SRV_JAVA_OPTS -classpath $FULL_CP com.backup42.service.CPService > $VARDIR/log/engine_output.log 2> $VARDIR/log/engine_error.log + + # This test isn't as useful as one might like; start-stop-daemon can't accurately report the state of child processes when --background is used. + # We use this mainly to report the specific error value returned by start-stop-daemon if something goes wrong, but be aware that a return value +@@ -91,7 +91,6 @@ + DESC="CrashPlan Engine" + NAME=CrashPlanEngine + DAEMON=$TARGETDIR/lib/com.backup42.desktop.jar +-PIDFILE="$TARGETDIR/${NAME}.pid" + + if [[ -f $TARGETDIR/install.vars ]]; then + . $TARGETDIR/install.vars +@@ -100,6 +99,8 @@ + exit 1 + fi + ++PIDFILE="$VARDIR/${NAME}.pid" ++ + if [[ ! -f $DAEMON ]]; then + echo "Could not find JAR file $DAEMON" + exit 0 diff --git a/pkgs/applications/backup/crashplan/default.nix b/pkgs/applications/backup/crashplan/default.nix new file mode 100644 index 000000000000..1a78dea21578 --- /dev/null +++ b/pkgs/applications/backup/crashplan/default.nix @@ -0,0 +1,78 @@ +{ stdenv, fetchurl, makeWrapper, jre, cpio, gawk, gnugrep, gnused, procps, swt, gtk2, glib, libXtst }: + +let version = "3.6.4"; + +in stdenv.mkDerivation rec { + name = "crashplan-${version}"; + + crashPlanArchive = fetchurl { + url = "http://download.crashplan.com/installs/linux/install/CrashPlan/CrashPlan_${version}_Linux.tgz"; + sha256 = "0xmzpxfm8vghk552jy167wg1nky1pp93dqds1p922hn73g0x5cv3"; + }; + + srcs = [ crashPlanArchive ]; + + meta = with stdenv.lib; { + description = "An online/offline backup solution"; + homepage = "http://www.crashplan.org"; + license = licenses.unfree; + maintainers = with maintainers; [ sztupi ]; + }; + + buildInputs = [ makeWrapper cpio ]; + + vardir = "/var/lib/crashplan"; + + manifestdir = "${vardir}/manifest"; + + patches = [ ./CrashPlanEngine.patch ]; + + installPhase = '' + mkdir $out + zcat -v CrashPlan_${version}.cpi | (cd $out; cpio -i -d -v --no-preserve-owner) + + # sed -i "s|<manifestPath>manifest</manifestPath>|<manifestPath>${manifestdir}</manifestPath>|g" $out/conf/default.service.xml + + # Fix for encoding troubles (CrashPlan ticket 178827) + # Make sure the daemon is running using the same localization as + # the (installing) user + echo "" >> run.conf + echo "export LC_ALL=en_US.UTF-8" >> run.conf + + install -d -m 755 unpacked $out + + install -D -m 644 EULA.txt $out/EULA.txt + install -D -m 644 run.conf $out/bin/run.conf + install -D -m 755 scripts/CrashPlanDesktop $out/bin/CrashPlanDesktop + install -D -m 755 scripts/CrashPlanEngine $out/bin/CrashPlanEngine + + rm -r $out/log + ln -s $vardir/log $out/log + ln -s $vardir/cache $out/cache + ln -s $vardir/backupArchives $out/backupArchives + ln -s $vardir/conf/service.model $out/conf/service.model + ln -s $vardir/conf/my.service.xml $out/conf/my.service.xml + + echo "JAVACOMMON=${jre}/bin/java" > $out/install.vars + echo "APP_BASENAME=CrashPlan" >> $out/install.vars + echo "TARGETDIR=$out" >> $out/install.vars + echo "BINSDIR=$out/bin" >> $out/install.vars + echo "MANIFESTDIR=${manifestdir}" >> $out/install.vars + echo "VARDIR=${vardir}" >> $out/install.vars + echo "INITDIR=" >> $out/install.vars + echo "RUNLVLDIR=" >> $out/install.vars + echo "INSTALLDATE=" >> $out/install.vars + ''; + + postFixup = '' + for f in $out/bin/CrashPlanDesktop $out/bin/CrashPlanEngine; do + echo "substitutions in $f" + substituteInPlace $f --replace /bin/ps ${procps}/bin/ps + substituteInPlace $f --replace awk ${gawk}/bin/awk + substituteInPlace $f --replace sed ${gnused}/bin/sed + substituteInPlace $f --replace grep ${gnugrep}/bin/grep + done + + wrapProgram $out/bin/CrashPlanDesktop --prefix LD_LIBRARY_PATH ":" "${gtk2}/lib:${glib}/lib:${libXtst}/lib" + ''; +} diff --git a/pkgs/applications/display-managers/slim/themes.nix b/pkgs/applications/display-managers/slim/themes.nix index 6bcacf8baf40..0c69f1018854 100644 --- a/pkgs/applications/display-managers/slim/themes.nix +++ b/pkgs/applications/display-managers/slim/themes.nix @@ -177,7 +177,7 @@ in { fullName = "nixos-slim"; src = fetchurl { url = "https://github.com/jagajaga/nixos-slim-theme/archive/1.1.tar.gz"; - sha256 = "0cawq38l8rcgd35vpdx3i1wbs3wrkcrng1c9qch0l4qncw505hv6"; + sha256 = "66c3020a6716130a20c3898567339b990fbd7888a3b7bbcb688f6544d1c05c31"; }; }; } diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 7197e4b95d96..d16233332e5c 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -16,11 +16,11 @@ let }; in stdenv.mkDerivation rec { name = "atom-${version}"; - version = "0.129.0"; + version = "0.150.0"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "0a78cb7e74b75b5c1cdbdfdea3f56ecab9479e407575b1e3cfb10c0d3265e7a4"; + sha256 = "1vvsxj1pwpcz0hn58k1hsrv994vm61lxkih58ix1rkj32wpvdjxn"; name = "${name}.deb"; }; @@ -39,6 +39,8 @@ in stdenv.mkDerivation rec { $out/share/atom/resources/app/apm/node_modules/atom-package-manager/bin/node wrapProgram $out/bin/atom \ --prefix "LD_LIBRARY_PATH" : "${atomEnv}/lib:${atomEnv}/lib64" + wrapProgram $out/bin/apm \ + --prefix "LD_LIBRARY_PATH" : "${atomEnv}/lib:${atomEnv}/lib64" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/bluefish/default.nix b/pkgs/applications/editors/bluefish/default.nix new file mode 100644 index 000000000000..4e569fc68a57 --- /dev/null +++ b/pkgs/applications/editors/bluefish/default.nix @@ -0,0 +1,23 @@ +{stdenv, fetchurl, intltool, pkgconfig , gtk, libxml2 +, enchant, gucharmap, python +}: + +stdenv.mkDerivation rec { + name = "bluefish-2.2.6"; + + src = fetchurl { + url = "mirror://sourceforge/bluefish/${name}.tar.bz2"; + sha256 = "05j2mv6s2llf2pxknddhk8fzbghr7yff58xhkxy2icky64n8khjl"; + }; + + buildInputs = [intltool pkgconfig gtk libxml2 + enchant gucharmap python]; + + meta = with stdenv.lib; { + description = "A powerful editor targeted towards programmers and webdevelopers"; + homepage = http://bluefish.openoffice.nl/; + license = licenses.gpl3Plus; + maintainer = [maintainers.vbgl]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/editors/bvi/default.nix b/pkgs/applications/editors/bvi/default.nix index e598fa19c5ea..f3f44f769a99 100644 --- a/pkgs/applications/editors/bvi/default.nix +++ b/pkgs/applications/editors/bvi/default.nix @@ -1,18 +1,21 @@ { stdenv, fetchurl, ncurses }: -stdenv.mkDerivation { - name = "bvi-1.3.2"; +stdenv.mkDerivation rec { + name = "bvi-${version}"; + version = "1.4.0"; src = fetchurl { - url = mirror://sourceforge/bvi/bvi-1.3.2.src.tar.gz; - sha256 = "110wxqnyianqamxq4y53drqqxb9vp4k2fcvic45qggvlqkqhlfgz"; + url = "mirror://sourceforge/bvi/${name}.src.tar.gz"; + sha256 = "00pq9rv7s8inqxq2m3xshxi58691i3pxw9smibcrgh6768l3qnh1"; }; buildInputs = [ ncurses ]; - meta = { + meta = with stdenv.lib; { description = "Hex editor with vim style keybindings"; homepage = http://bvi.sourceforge.net/download.html; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; + maintainers = with maintainers; [ pSub ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/editors/elvis/default.nix b/pkgs/applications/editors/elvis/default.nix index e1d2ad69b1dd..0850dd0e7be0 100644 --- a/pkgs/applications/editors/elvis/default.nix +++ b/pkgs/applications/editors/elvis/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://elvis.vi-editor.org/; description = "A vi clone for Unix and other operating systems"; - license = "free"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index 3bfee481c9c0..8f954515b8f2 100644 --- a/pkgs/applications/editors/emacs-24/default.nix +++ b/pkgs/applications/editors/emacs-24/default.nix @@ -9,13 +9,13 @@ assert (libXft != null) -> libpng != null; # probably a bug assert stdenv.isDarwin -> libXaw != null; # fails to link otherwise stdenv.mkDerivation rec { - name = "emacs-24.3"; + name = "emacs-24.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://gnu/emacs/${name}.tar.xz"; - sha256 = "1385qzs3bsa52s5rcncbrkxlydkw0ajzrvfxgv8rws5fx512kakh"; + sha256 = "1zflm6ac34s6v166p58ilxrxbxjm0q2wfc25f8y0mjml1lbr3qs7"; }; patches = [ ./darwin-new-sections.patch ]; @@ -35,10 +35,7 @@ stdenv.mkDerivation rec { [ "--with-x-toolkit=lucid" "--with-xft" ] else [ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no" - "--with-gif=no" "--with-tiff=no" ] ) ) - # On NixOS, help Emacs find `crt*.o'. - ++ stdenv.lib.optional (stdenv ? glibc) - [ "--with-crt-dir=${stdenv.glibc}/lib" ]; + "--with-gif=no" "--with-tiff=no" ] ) ); NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.isDarwin && withX) "-I${cairo}/include/cairo"; diff --git a/pkgs/applications/editors/emacs-24/macport.nix b/pkgs/applications/editors/emacs-24/macport-24.3.nix index d9b32351040b..d9b32351040b 100644 --- a/pkgs/applications/editors/emacs-24/macport.nix +++ b/pkgs/applications/editors/emacs-24/macport-24.3.nix diff --git a/pkgs/applications/editors/emacs-24/macport-24.4.nix b/pkgs/applications/editors/emacs-24/macport-24.4.nix new file mode 100644 index 000000000000..0af0e479a07f --- /dev/null +++ b/pkgs/applications/editors/emacs-24/macport-24.4.nix @@ -0,0 +1,100 @@ +{ stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls +}: + +stdenv.mkDerivation rec { + emacsName = "emacs-24.4"; + name = "${emacsName}-mac-5.1"; + + #builder = ./builder.sh; + + src = fetchurl { + url = "mirror://gnu/emacs/${emacsName}.tar.xz"; + sha256 = "1zflm6ac34s6v166p58ilxrxbxjm0q2wfc25f8y0mjml1lbr3qs7"; + }; + + macportSrc = fetchurl { + url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${name}.tar.gz"; + sha256 = "0qn200vv91qxf93x6y8fdi7l3bsni3clqzf8rcjdpbva1qzgcx27"; + }; + + patches = [ ./darwin-new-sections.patch ]; + + buildInputs = [ ncurses pkgconfig texinfo libxml2 gnutls ]; + + postUnpack = '' + mv $emacsName $name + tar xzf $macportSrc + mv $name $emacsName + ''; + + preConfigure = '' + patch -p0 < patch-mac + + # The search for 'tputs' will fail because it's in ncursesw within the + # ncurses package, yet Emacs' configure script only looks in ncurses. + # Further, we need to make sure that the -L option occurs before mention + # of the library, so that it finds it within the Nix store. + sed -i 's/tinfo ncurses/tinfo ncursesw/' configure + ncurseslib=$(echo ${ncurses}/lib | sed 's#/#\\/#g') + sed -i "s/OLIBS=\$LIBS/OLIBS=\"-L$ncurseslib \$LIBS\"/" configure + sed -i 's/LIBS="\$LIBS_TERMCAP \$LIBS"/LIBS="\$LIBS \$LIBS_TERMCAP"/' configure + + configureFlagsArray=( + LDFLAGS=-L${ncurses}/lib + --with-xml2=yes + --with-gnutls=yes + --with-mac + --enable-mac-app=$out/Applications + ) + makeFlagsArray=( + CFLAGS=-O3 + LDFLAGS="-O3 -L${ncurses}/lib" + ); + ''; + + postInstall = '' + cat >$out/share/emacs/site-lisp/site-start.el <<EOF + ;; nixos specific load-path + (when (getenv "NIX_PROFILES") (setq load-path + (append (reverse (mapcar (lambda (x) (concat x "/share/emacs/site-lisp/")) + (split-string (getenv "NIX_PROFILES")))) + load-path))) + + ;; make tramp work for NixOS machines + (eval-after-load 'tramp '(add-to-list 'tramp-remote-path "/run/current-system/sw/bin")) + EOF + ''; + + doCheck = true; + + meta = with stdenv.lib; { + description = "GNU Emacs 24, the extensible, customizable text editor"; + homepage = http://www.gnu.org/software/emacs/; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ jwiegley ]; + platforms = platforms.darwin; + + longDescription = '' + GNU Emacs is an extensible, customizable text editor—and more. At its + core is an interpreter for Emacs Lisp, a dialect of the Lisp + programming language with extensions to support text editing. + + The features of GNU Emacs include: content-sensitive editing modes, + including syntax coloring, for a wide variety of file types including + plain text, source code, and HTML; complete built-in documentation, + including a tutorial for new users; full Unicode support for nearly all + human languages and their scripts; highly customizable, using Emacs + Lisp code or a graphical interface; a large number of extensions that + add other functionality, including a project planner, mail and news + reader, debugger interface, calendar, and more. Many of these + extensions are distributed with GNU Emacs; others are available + separately. + + This is "Mac port" addition to GNU Emacs 24. This provides a native + GUI support for Mac OS X 10.4 - 10.9. Note that Emacs 23 and later + already contain the official GUI support via the NS (Cocoa) port for + Mac OS X 10.4 and later. So if it is good enough for you, then you + don't need to try this. + ''; + }; +} diff --git a/pkgs/applications/editors/emacs-modes/darcsum/default.nix b/pkgs/applications/editors/emacs-modes/darcsum/default.nix index 349146dbdd89..0a1c2c77b2a2 100644 --- a/pkgs/applications/editors/emacs-modes/darcsum/default.nix +++ b/pkgs/applications/editors/emacs-modes/darcsum/default.nix @@ -26,8 +26,8 @@ stdenv.mkDerivation { ''; meta = { - description = "A pcl-cvs like interface for managing darcs patches."; - homepage = "http://hub.darcs.net/simon/darcsum"; + description = "A pcl-cvs like interface for managing darcs patches"; + homepage = http://hub.darcs.net/simon/darcsum; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.falsifian ]; }; diff --git a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix index af031a6e1a16..aa0bac9a0106 100644 --- a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix +++ b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix @@ -1,4 +1,4 @@ -{ clangStdenv, fetchgit, llvm, clang }: +{ clangStdenv, fetchgit, llvmPackages, clang }: clangStdenv.mkDerivation { name = "emacs-clang-complete-async-20130218"; @@ -8,7 +8,12 @@ clangStdenv.mkDerivation { sha256 = "1c8zqi6axbsb951azz9iqx3j52j30nd9ypv396hvids3g02cirrf"; }; - buildInputs = [ llvm clang.clang ]; + buildInputs = [ llvmPackages.llvm ]; + + patches = [ ./fix-build.patch ]; + + CFLAGS = "-I${llvmPackages.clang}/include"; + LDFLAGS = "-L${llvmPackages.clang}/lib"; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/fix-build.patch b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/fix-build.patch new file mode 100644 index 000000000000..89de339a436b --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/fix-build.patch @@ -0,0 +1,10 @@ +--- old/src/completion.h 2014-11-16 16:58:16.625150124 +0100 ++++ new/src/completion.h 2014-11-16 16:58:28.020207508 +0100 +@@ -3,6 +3,7 @@ + + + #include <clang-c/Index.h> ++#include <stdio.h> + + + typedef struct __completion_Session_struct diff --git a/pkgs/applications/editors/emacs-modes/ess/default.nix b/pkgs/applications/editors/emacs-modes/ess/default.nix index 46e20a58ee68..a2c73907115c 100644 --- a/pkgs/applications/editors/emacs-modes/ess/default.nix +++ b/pkgs/applications/editors/emacs-modes/ess/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, emacs, texinfo }: stdenv.mkDerivation rec { - name = "ess-13.09"; + name = "ess-14.09"; src = fetchurl { url = "http://ess.r-project.org/downloads/ess/${name}.tgz"; - sha256 = "1lki3vb6p7cw98zqq0gaia68flpqrjkd6dcl85fs0cc8qf55yqnh"; + sha256 = "0wa507jfmq3k7x0vigd2yzb4j2190ix4wnnpv7ql4bjy0vfvmwdn"; }; buildInputs = [ emacs texinfo ]; diff --git a/pkgs/applications/editors/emacs-modes/git-modes/default.nix b/pkgs/applications/editors/emacs-modes/git-modes/default.nix new file mode 100644 index 000000000000..8a2ca6eb9090 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/git-modes/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, emacs }: + +let + version = "0.15.0-8-g4e10851"; +in +stdenv.mkDerivation { + name = "git-modes-${version}"; + + src = fetchFromGitHub { + owner = "magit"; + repo = "git-modes"; + rev = "4e10851843145e0c05fc665683d3b487a57ad114"; + sha256 = "13j794a2p4ql9dnw2z0c1m0ybclxsicbk8cmmfqcchs4ygiyc6ag"; + }; + + buildInputs = [ emacs ]; + + installPhase = '' + mkdir -p $out/share/emacs/site-lisp + mv *.el *.elc $out/share/emacs/site-lisp/ + ''; + + meta = { + homepage = "https://github.com/magit/git-modes"; + description = "Emacs modes for various Git-related files"; + license = stdenv.lib.licenses.gpl3Plus; + maintainers = with stdenv.lib.maintainers; [ simons ]; + }; +} diff --git a/pkgs/applications/editors/emacs-modes/hsc3/default.nix b/pkgs/applications/editors/emacs-modes/hsc3/default.nix new file mode 100644 index 000000000000..150bd3593fdb --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/hsc3/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, emacs }: + +# this package installs the emacs-mode which +# resides in the hsc3 sources. + +let version = "0.15"; + +in stdenv.mkDerivation { + name = "hsc3-mode-${version}"; + src = fetchurl { + url = http://hackage.haskell.org/package/hsc3-0.15/hsc3-0.15.tar.gz; + sha256 = "2f3b15655419cf8ebe25ab1c6ec22993b2589b4ffca7c3a75ce478ca78a0bde6"; + }; + + buildInputs = [ emacs ]; + + installPhase = '' + mkdir -p "$out/share/emacs/site-lisp" + cp "emacs/hsc3.el" "$out/share/emacs/site-lisp" + ''; + + meta = { + homepage = http://rd.slavepianos.org/?t=hsc3; + description = "hsc3 mode package for Emacs"; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/applications/editors/emacs-modes/icicles/default.nix b/pkgs/applications/editors/emacs-modes/icicles/default.nix new file mode 100644 index 000000000000..820e959a3574 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/icicles/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, emacs }: + +let + modules = [ + { name = "icicles.el"; sha256 = "175g8w620vy73pp3zyasfjspgljk6g0lki71kdnvw5z88w3s9d1n"; } + { name = "icicles-chg.el"; sha256 = "1bx5xdhirvnrjqk4pk0sjp9bpj1syymsjnckklsw04gv6y0x8zik"; } + { name = "icicles-cmd1.el"; sha256 = "1ff0mndin9zxrswwwq3a7b1s879rr6gy8rzxanr7kxg1ppciafad"; } + { name = "icicles-cmd2.el"; sha256 = "1a44l86jacp9nsy4z260azz6y672drjw3w5a0jsc8w26fgsrnx1k"; } + { name = "icicles-doc1.el"; sha256 = "0s3r4z3y06hd1nxp18wd0b8b88z2a7ryy0j8sx5fzibbmp58ars1"; } + { name = "icicles-doc2.el"; sha256 = "0c10jg91qxyrg1zwiyi4m57dbw3yf43jdrpi4nnby3pkzh6i37ic"; } + { name = "icicles-face.el"; sha256 = "0n0vcbhwgd2lyj7anq1zpwja28xry018qxbm8sprxkh6y3vlw8d2"; } + { name = "icicles-fn.el"; sha256 = "1i10593a7hp465bxd86h7h7gwrdyqxx0d13in53z4jnab8icp3d4"; } + { name = "icicles-mac.el"; sha256 = "1piq0jk8nz0hz9wwci7dkxnfxscdpygjzpj5zg3310vs22l7rrsz"; } + { name = "icicles-mcmd.el"; sha256 = "0c4325yp84i46605nlxmjm6n0f4fh69shsihvd0wb9ryg0a8qa65"; } + { name = "icicles-mode.el"; sha256 = "069wx5clqpsq2c9aavgd9xihvlad3g00iwwrc3cpl47v64dvlipq"; } + { name = "icicles-opt.el"; sha256 = "16487l3361ca8l6il2c0z892843sc5l9v4gr7lx5fxbmrlsswvvn"; } + { name = "icicles-var.el"; sha256 = "1a9cwxpi10x44fngxa7qnrg8hqfvdjb8s8k47gnn1rbh63blkkry"; } + ]; + + forAll = f: map f modules; +in +stdenv.mkDerivation { + name = "icicles-2014-11-06"; + + srcs = forAll ({name, sha256}: fetchurl { url = "http://www.emacswiki.org/emacs-en/download/${name}"; inherit sha256; }); + + buildInputs = [ emacs ]; + + unpackPhase = "for m in $srcs; do cp $m $(echo $m | cut -d- -f2-); done"; + + buildPhase = "emacs --batch -L . -f batch-byte-compile *.el"; + + installPhase = "mkdir -p $out/share/emacs/site-lisp; cp *.el *.elc $out/share/emacs/site-lisp/"; + + meta = { + homepage = "http://www.emacswiki.org/emacs/Icicles"; + description = "Enhance Emacs minibuffer input with cycling and powerful completion."; + license = stdenv.lib.licenses.gpl2Plus; + + maintainers = with stdenv.lib.maintainers; [ simons ]; + }; +} diff --git a/pkgs/applications/editors/emacs-modes/idris/default.nix b/pkgs/applications/editors/emacs-modes/idris/default.nix index 4e9d1cfd77cd..a631939b55c7 100644 --- a/pkgs/applications/editors/emacs-modes/idris/default.nix +++ b/pkgs/applications/editors/emacs-modes/idris/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "idris-mode"; - version = "0.9.14"; + version = "0.9.15"; src = fetchurl { url = "https://github.com/idris-hackers/${pname}/archive/${version}.tar.gz"; - sha256 = "1qlkbf14mcibp6h5r84fp5xdjspyaw1xdmnkmaxbypwjhhjg4s83"; + sha256 = "0ag7qqsv64rifk9ncdxv4gyylfbw6c8y2wq610l4pabqv2qrlh9r"; }; buildInputs = [ emacs ]; diff --git a/pkgs/applications/editors/emacs-modes/js2/default.nix b/pkgs/applications/editors/emacs-modes/js2/default.nix index 00123bfc8c75..ba9fb4f8d6f8 100644 --- a/pkgs/applications/editors/emacs-modes/js2/default.nix +++ b/pkgs/applications/editors/emacs-modes/js2/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, emacs }: stdenv.mkDerivation { - name = "js2-mode-0-20140114"; + name = "js2-mode-0-20141118"; src = fetchgit { url = "git://github.com/mooz/js2-mode.git"; - rev = "b250efaad886dd07b8c69d4573425d095c6652e2"; - sha256 = "30e61e7d364e9175d408bdaf57fda886a4eea22cf5cbd97abb5c307c52b05918"; + rev = "3abcd90ddc2f446ddf0fb874dd79ba870c26ad2d"; + sha256 = "c0aaab4eeb8d60cfd5c382c3e30d4725e5ec492720d573e663ea69ee43aa73a8"; }; buildInputs = [ emacs ]; diff --git a/pkgs/applications/editors/emacs-modes/magit/default.nix b/pkgs/applications/editors/emacs-modes/magit/default.nix index 076caf5235b2..676a86985f8f 100644 --- a/pkgs/applications/editors/emacs-modes/magit/default.nix +++ b/pkgs/applications/editors/emacs-modes/magit/default.nix @@ -1,25 +1,32 @@ -{ stdenv, fetchurl, emacs, texinfo }: +{ stdenv, fetchFromGitHub, emacs, texinfo, gitModes, git }: -let - version = "1.2.0"; -in stdenv.mkDerivation rec { - name = "magit-${version}"; + name = "magit-90141025"; - src = fetchurl { - url = "https://github.com/downloads/magit/magit/${name}.tar.gz"; - sha256 = "1a8vvilhd5y5vmlpsh194qpl4qlg0a1brylfscxcacpfp0cmhlzg"; + src = fetchFromGitHub { + owner = "magit"; + repo = "magit"; + rev = "50c08522c8a3c67e0f3b821fe4df61e8bd456ff9"; + sha256 = "0mzyx72pidzvla1x2qszn3c60n2j0n8i5k875c4difvd1n4p0vsk"; }; - buildInputs = [ emacs texinfo ]; + buildInputs = [ emacs texinfo git ]; + propagatedUserEnvPkgs = [ gitModes ]; - configurePhase = "makeFlagsArray=( PREFIX=$out SYSCONFDIR=$out/etc )"; + configurePhase = '' + makeFlagsArray=( + PREFIX="$out" + EFLAGS="-L ${gitModes}/share/emacs/site-lisp" + lispdir="$out/share/emacs/site-lisp" + ) + ''; + + doCheck = true; + checkTarget = "test"; - # Add (require 'magit-site-init) to your ~/.emacs file to set-up magit mode. postInstall = '' - mv $out/etc/emacs/site-start.d/50magit.el $out/share/emacs/site-lisp/magit-site-init.el - sed -i -e 's|50magit|magit-site-init|' $out/share/emacs/site-lisp/magit-site-init.el - rmdir $out/etc/emacs/site-start.d $out/etc/emacs $out/etc + mkdir -p $out/bin + mv "bin/"* $out/bin/ ''; meta = { @@ -39,7 +46,6 @@ stdenv.mkDerivation rec { save you from learning Git itself. ''; - platforms = stdenv.lib.platforms.all; maintainers = with stdenv.lib.maintainers; [ simons ]; }; } diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix index 293554a62b2b..c7ad1c7049be 100644 --- a/pkgs/applications/editors/emacs-modes/org/default.nix +++ b/pkgs/applications/editors/emacs-modes/org/default.nix @@ -2,11 +2,11 @@ , texLiveAggregationFun }: stdenv.mkDerivation rec { - name = "org-8.2.8"; + name = "org-8.2.10"; src = fetchurl { url = "http://orgmode.org/${name}.tar.gz"; - sha256 = "0f63w6d1yjiv46ac7d9rqn2wks6sxmldrqmijd9j25qvsc8dcsd8"; + sha256 = "1xm8n8zwr3676rl4pd32k61rd7rimlihhrw5a7r4z7r154c4a2fz"; }; buildInputs = [ emacs ]; diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/4.3pre.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/4.3pre.nix index 32a036805edc..96d7619d387b 100644 --- a/pkgs/applications/editors/emacs-modes/proofgeneral/4.3pre.nix +++ b/pkgs/applications/editors/emacs-modes/proofgeneral/4.3pre.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (rec { interactive theorem provers), based on the customizable text editor Emacs. ''; homepage = http://proofgeneral.inf.ed.ac.uk; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; # arbitrary choice }; }) diff --git a/pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix b/pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix index 62b3a0af1fbc..2b4223cdc1fd 100644 --- a/pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix +++ b/pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, emacs}: -let version = "1.3.12"; +let version = "1.3.13"; in stdenv.mkDerivation { name = "emacs-rainbow-delimiters-${version}"; src = fetchurl { url = "https://github.com/jlr/rainbow-delimiters/archive/${version}.tar.gz"; - sha256 = "0l65rqmnrc02q1b406kxc29w5cfpmrmq0glv493pjzhzc5m3r63z"; + sha256 = "075j3nsk4jm0rs5671n28c1wksrfbvpl9a4f89kzcd7sk1h6ncvl"; }; buildInputs = [ emacs ]; diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix new file mode 100644 index 000000000000..bc9163e63cb4 --- /dev/null +++ b/pkgs/applications/editors/focuswriter/default.nix @@ -0,0 +1,25 @@ +{stdenv, fetchurl, qt4, pkgconfig, hunspell}: + +stdenv.mkDerivation rec { + name = "focuswriter-${version}"; + version = "1.5.3"; + + src = fetchurl { + url = http://gottcode.org/focuswriter/focuswriter-1.5.3-src.tar.bz2; + sha256 = "1i58jxbiy95ijf81g8c3gwxhcg3irzssna3wv7vhrd57g4lcfj0w"; + }; + + buildInputs = [ qt4 pkgconfig hunspell ]; + + configurePhase = "qmake PREFIX=/"; + + installPhase = "make install INSTALL_ROOT=$out"; + + meta = { + description = "Simple, distraction-free writing environment"; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.madjar ]; + platforms = stdenv.lib.platforms.all; + homepage = "http://gottcode.org/focuswriter/"; + }; +} diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index f67f23e9e09b..f1e3a078b70e 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -7,7 +7,7 @@ assert stdenv.isLinux; let mkIdeaProduct = - { name, product, version, build, src, meta }: + { name, product, version, build, src, meta, patchSnappy ? true }: let loName = stdenv.lib.toLower product; hiName = stdenv.lib.toUpper product; in @@ -17,7 +17,7 @@ let desktopItem = makeDesktopItem { name = loName; exec = loName; - comment = meta.longDescription; + comment = lib.replaceChars ["\n"] [" "] meta.longDescription; desktopName = product; genericName = meta.description; categories = "Application;Development;"; @@ -26,38 +26,44 @@ let buildInputs = [ makeWrapper patchelf p7zip unzip ]; - patchPhase = '' - - get_file_size() { + patchPhase = lib.concatStringsSep "\n" [ + '' + get_file_size() { local fname="$1" echo $(ls -l $fname | cut -d ' ' -f5) - } + } - munge_size_hack() { + munge_size_hack() { local fname="$1" local size="$2" strip $fname truncate --size=$size $fname - } + } - interpreter=$(echo ${stdenv.glibc}/lib/ld-linux*.so.2) - snappyPath="lib/snappy-java-1.0.5" + interpreter=$(echo ${stdenv.glibc}/lib/ld-linux*.so.2) + if [ "${stdenv.system}" == "x86_64-linux" ]; then + target_size=$(get_file_size bin/fsnotifier64) + patchelf --set-interpreter "$interpreter" bin/fsnotifier64 + munge_size_hack bin/fsnotifier64 $target_size + else + target_size=$(get_file_size bin/fsnotifier) + patchelf --set-interpreter "$interpreter" bin/fsnotifier + munge_size_hack bin/fsnotifier $target_size + fi + '' - 7z x -o"$snappyPath" "$snappyPath.jar" - if [ "${stdenv.system}" == "x86_64-linux" ]; then - target_size=$(get_file_size bin/fsnotifier64) - patchelf --set-interpreter "$interpreter" bin/fsnotifier64 - patchelf --set-rpath ${stdenv.gcc.gcc}/lib64/ "$snappyPath/org/xerial/snappy/native/Linux/amd64/libsnappyjava.so" - munge_size_hack bin/fsnotifier64 $target_size - else - target_size=$(get_file_size bin/fsnotifier) - patchelf --set-interpreter "$interpreter" bin/fsnotifier - patchelf --set-rpath ${stdenv.gcc.gcc}/lib/ "$snappyPath/org/xerial/snappy/native/Linux/i386/libsnappyjava.so" - munge_size_hack bin/fsnotifier $target_size - fi - 7z a -tzip "$snappyPath.jar" ./"$snappyPath"/* - rm -vr "$snappyPath" - ''; + (lib.optionalString patchSnappy '' + snappyPath="lib/snappy-java-1.0.5" + 7z x -o"$snappyPath" "$snappyPath.jar" + if [ "${stdenv.system}" == "x86_64-linux" ]; then + patchelf --set-rpath ${stdenv.gcc.gcc}/lib64 "$snappyPath/org/xerial/snappy/native/Linux/amd64/libsnappyjava.so" + else + patchelf --set-rpath ${stdenv.gcc.gcc}/lib "$snappyPath/org/xerial/snappy/native/Linux/i386/libsnappyjava.so" + fi + 7z a -tzip "$snappyPath.jar" ./"$snappyPath"/* + rm -vr "$snappyPath" + '') + ]; installPhase = '' mkdir -vp "$out/bin" "$out/$name" "$out/share/pixmaps" @@ -68,6 +74,12 @@ let && jdk=${jdk}/lib/openjdk \ || jdk=${jdk} + if [ "${stdenv.system}" == "x86_64-linux" ]; then + makeWrapper "$out/$name/bin/fsnotifier64" "$out/bin/fsnotifier64" + else + makeWrapper "$out/$name/bin/fsnotifier" "$out/bin/fsnotifier" + fi + makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${loName}" \ --prefix PATH : "${jdk}/bin:${coreutils}/bin:${gnugrep}/bin:${which}/bin:${git}/bin" \ --prefix LD_RUN_PATH : "${stdenv.gcc.gcc}/lib/" \ @@ -97,9 +109,77 @@ let }; }); + buildClion = { name, version, build, src, license, description }: + (mkIdeaProduct rec { + inherit name version build src; + patchSnappy = false; + product = "CLion"; + meta = with stdenv.lib; { + homepage = "https://www.jetbrains.com/clion/"; + inherit description license; + longDescription = '' + Enhancing productivity for every C and C++ + developer on Linux, OS X and Windows. + ''; + maintainers = with maintainers; [ edwtjo ]; + platforms = platforms.linux; + }; + }); + + buildIdea = { name, version, build, src, license, description }: + (mkIdeaProduct rec { + inherit name version build src; + patchSnappy = false; + product = "IDEA"; + meta = with stdenv.lib; { + homepage = "https://www.jetbrains.com/idea/"; + inherit description license; + longDescription = '' + IDE for Java SE, Groovy & Scala development Powerful + environment for building Google Android apps Integration + with JUnit, TestNG, popular SCMs, Ant & Maven. + ''; + maintainers = with maintainers; [ edwtjo ]; + platforms = platforms.linux; + }; + }); + + buildRubyMine = { name, version, build, src, license, description }: + (mkIdeaProduct rec { + inherit name version build src; + patchSnappy = false; + product = "RubyMine"; + meta = with stdenv.lib; { + homepage = "https://www.jetbrains.com/ruby/"; + inherit description license; + longDescription = description; + maintainers = with maintainers; [ edwtjo ]; + platforms = platforms.linux; + }; + }); + + buildPhpStorm = { name, version, build, src, license, description }: + (mkIdeaProduct { + inherit name version build src; + product = "PhpStorm"; + patchSnappy = false; + meta = with stdenv.lib; { + homepage = "https://www.jetbrains.com/phpstorm/"; + inherit description license; + longDescription = '' + PhpStorm provides an editor for PHP, HTML and JavaScript + with on-the-fly code analysis, error prevention and + automated refactorings for PHP and JavaScript code. + ''; + maintainers = with maintainers; [ schristo ]; + platforms = platforms.linux; + }; + }); + buildPycharm = { name, version, build, src, license, description }: (mkIdeaProduct rec { inherit name version build src; + patchSnappy = false; product = "PyCharm"; meta = with stdenv.lib; { homepage = "https://www.jetbrains.com/pycharm/"; @@ -124,110 +204,105 @@ let propagatedUserEnvPkgs = [ python ]; }; - buildIdea = { name, version, build, src, license, description }: - (mkIdeaProduct rec { - inherit name version build src; - product = "IDEA"; - meta = with stdenv.lib; { - homepage = "https://www.jetbrains.com/idea/"; - inherit description license; - longDescription = '' - IDE for Java SE, Groovy & Scala development Powerful - environment for building Google Android apps Integration - with JUnit, TestNG, popular SCMs, Ant & Maven. - ''; - maintainers = with maintainers; [ edwtjo ]; - platforms = platforms.linux; - }; - }); - in { android-studio = buildAndroidStudio rec { name = "android-studio-${version}"; - version = "0.8.10"; - build = "135.1428667"; + version = "1.0.0-rc1"; + build = "135.1598475"; description = "Android development environment based on IntelliJ IDEA"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://dl.google.com/dl/android/studio/ide-zips/${version}" + "/android-studio-ide-${build}-linux.zip"; - sha256 = "5736a92ffda24233026ff45a47f1b4f9567ba40347cfa0c9f351112e729b5401"; + sha256 = "1d0gj9c2hkrcij79xv8i5fy1z8zss1fp8szjp6h7z7zak989rsrf"; + }; + }; + + clion = buildClion rec { + name = "clion"; + version = "eap"; + build = "140.569.17"; + description = "C/C++ IDE. New. Intelligent. Cross-platform."; + license = stdenv.lib.licenses.unfree; + src = fetchurl { + url = "http://download.jetbrains.com/cpp/${name}-${build}.tar.gz"; + sha256 = "1y4137dxbydf3g5s6c58bf015k2q7dsl8h4n0q2llqj5bprwcr23"; }; }; idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "13.1.4b"; - build = "IC-135.1230"; + version = "14.0.1"; + build = "IC-139.225"; description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "http://download-ln.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "8b4ee25fd2934e06b87230b50e1474183ed4b331c1626a7fee69b96294d9616d"; + sha256 = "166m55q33q4jwfvzwxm8mak6ic32h63bvpxdnjd41si6bs19ynvg"; }; }; idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "13.1.4b"; - build = "IU-135.1230"; + version = "14.0.1"; + build = "IU-139.225"; description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "http://download-ln.jetbrains.com/idea/ideaIU-${version}.tar.gz"; - sha256 = "84660d97c9c3e4e7cfd6c2708f4685dc7322157f1e1c2888feac64df119f0606"; + sha256 = "0hh84f3297ak63n2kv76xv1rnf1fhjws9d3b2r5pwzgfd78zja4q"; }; }; - pycharm-community-313 = buildPycharm rec { - name = "pycharm-community-${version}"; - version = "3.1.3"; - build = "133.1347"; - description = "PyCharm 3.1 Community Edition"; - license = stdenv.lib.licenses.asl20; + ruby-mine = buildRubyMine rec { + name = "ruby-mine-${version}"; + version = "7.0"; + build = "135.1104"; + description = "The Most Intelligent Ruby and Rails IDE"; + license = stdenv.lib.licenses.unfree; src = fetchurl { - url = "http://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "f671ee4c99207c179f168b5b98fa23afe90a94c3a3914367b95a46b0c2881b23"; + url = "http://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; + sha256 = "0xsx44gaddarkw5k4yjidzwkayf2xvsxklfzdnzcck4rg4vyk4v4"; }; }; - pycharm-community-341 = buildPycharm rec { + pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "3.4.1"; - build = "135.1057"; - description = "PyCharm 3.4 Community Edition"; + version = "4.0.1"; + build = "139.574"; + description = "PyCharm 4.0 Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "http://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "96427b1e842e7c09141ec4d3ede627c5ca7d821c0d6c98169b56a34f9035ef64"; + sha256 = "0jh0sxi5dpgpw7ga018fby7zvb4i9k49vwl8422lfcrgckdz9nv2"; }; }; - pycharm-professional-313 = buildPycharm rec { + pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "3.1.3"; - build = "133.1347"; - description = "PyCharm 3.1 Professional Edition"; + version = "4.0.1"; + build = "139.574"; + description = "PyCharm 4.0 Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "http://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "e0c2db8f18cb825a95de6ddc4b0b9f93c5643bf34cca9f1b3c2fa37fd7c14f11"; + sha256 = "04yjhg6vi2kz00sy8zg4wkz26ai90vbp0cnd850ynsab0jsy24w4"; }; }; - pycharm-professional-341 = buildPycharm rec { - name = "pycharm-professional-${version}"; - version = "3.4.1"; - build = "135.1057"; - description = "PyCharm 3.4 Professional Edition"; + phpstorm = buildPhpStorm rec { + name = "phpstorm-${version}"; + version = "8.0.1"; + build = "PS-138.2001"; + description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { - url = "http://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "e4f85f3248e8985ac9f8c326543f979b47ba1d7ac6b128a2cf2b3eb8ec545d2b"; + url = "http://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; + sha256 = "0d46442aa32174fe16846c3c31428178ab69b827d2e0ce31f633f13b64c01afc"; }; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/editors/jedit/build.xml.patch b/pkgs/applications/editors/jedit/build.xml.patch new file mode 100644 index 000000000000..2dabaaaed0c9 --- /dev/null +++ b/pkgs/applications/editors/jedit/build.xml.patch @@ -0,0 +1,252 @@ +--- a/build.xml 2013-07-28 18:03:55.000000000 +0100 ++++ b/build.xml 2014-11-12 21:54:48.443482074 +0000 +@@ -42,16 +42,6 @@ + <property name="textAreaPackage" + location="../textarea"/> + +- <!-- Ivy Properties --> +- <property name="config.ivy.version" +- value="2.2.0"/> +- <property name="ivy.jar.dir" +- location="${lib.dir}/ivy"/> +- <property name="ivy.jar.filename" +- value="ivy-${config.ivy.version}.jar"/> +- <property name="ivy.jar.file" +- location="${ivy.jar.dir}/${ivy.jar.filename}"/> +- + <!-- Miscellaneous --> + <property name="jar.filename" + value="${ant.project.name}.jar"/> +@@ -89,51 +79,8 @@ + value="true"/> + </target> + +- <target name="check-ivy" +- depends="init"> +- <available property="ivy.jar.present" +- file="${ivy.jar.file}" +- type="file"/> +- </target> +- +- <target name="download-ivy" +- depends="init,check-ivy" +- unless="ivy.jar.present"> +- <mkdir dir="${ivy.jar.dir}"/> +- <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/${config.ivy.version}/ivy-${config.ivy.version}.jar" +- dest="${ivy.jar.file}" +- usetimestamp="true"/> +- </target> +- +- <target name="init-ivy" +- depends="init,download-ivy" +- unless="${ivy.done}"> +- <property name="ivy.retrieve.pattern" +- value="${lib.dir}/[conf]/[artifact](-[classifier]).[ext]"/> +- <taskdef resource="org/apache/ivy/ant/antlib.xml" +- classpath="${ivy.jar.file}" +- loaderref="ivy.loader" +- uri="antlib:org.apache.ivy.ant"/> +- <ivy:settings file="ivysettings.xml"/> +- </target> +- +- <target name="retrieve" +- description="retrieve the dependencies" +- depends="init,init-ivy" +- unless="${ivy.done}"> +- <ivy:retrieve sync="true"/> +- <ivy:retrieve pattern="${lib.dir}/ivy/[artifact]-[revision].[ext]" +- organisation="org.apache.ivy" +- module="ivy" +- revision="${config.ivy.version}" +- conf="default" +- inline="true"/> +- <property name="ivy.done" +- value="true"/> +- </target> +- + <target name="setup" +- depends="init,retrieve"> ++ depends="init"> + <taskdef resource="net/sf/antcontrib/antlib.xml" + uri="antlib:net.sf.antcontrib"> + <classpath> +@@ -238,37 +185,6 @@ + </javac> + </target> + +- <target name="compile-test" +- depends="init,retrieve,compile"> +- <mkdir dir="${classes.dir}/test"/> +- <depend srcDir="${basedir}/test" +- destDir="${classes.dir}/test" +- cache="${classes.dir}"/> +- <dependset> +- <srcfilelist files="build.xml"/> +- <srcfilelist files="ivy.xml"/> +- <targetfileset dir="${classes.dir}/test"/> +- </dependset> +- <javac srcdir="test" +- destdir="${classes.dir}/test" +- debug="true" +- debuglevel="${config.build.debuglevel}" +- nowarn="${config.build.nowarn}" +- deprecation="${config.build.deprecation}" +- source="${target.java.version}" +- target="${target.java.version}" +- compiler="modern" +- encoding="UTF-8" +- includeAntRuntime="false"> +- <classpath id="classpath.test"> +- <fileset dir="${lib.dir}/test" +- includes="*.jar"/> +- <pathelement location="${classes.dir}/core"/> +- </classpath> +- <compilerarg line="${config.build.compilerarg}"/> +- </javac> +- </target> +- + <target name="prepare-textArea" + depends="init"> + <delete includeemptydirs="true" +@@ -425,32 +341,8 @@ + </javac> + </target> + +- <target name="test" +- depends="init,retrieve,compile,compile-test" +- description="run unit tests"> +- <delete dir="${build.dir}/test/raw-reports"/> +- <mkdir dir="${build.dir}/test/raw-reports"/> +- <junit printsummary="true" +- failureproperty="tests.failed" +- enabletestlistenerevents="true"> +- <classpath refid="classpath.test"/> +- <classpath location="${classes.dir}/test"/> +- <formatter type="xml"/> +- <batchtest todir="${build.dir}/test/raw-reports"> +- <fileset dir="test"/> +- </batchtest> +- </junit> +- <mkdir dir="${build.dir}/test/merged-reports"/> +- <junitreport todir="${build.dir}/test/merged-reports"> +- <fileset dir="${build.dir}/test/raw-reports"/> +- <report todir="${build.dir}/test/reports"/> +- </junitreport> +- <fail message="Unit test(s) failed! See reports at ${build.dir}/test/reports/index.html" +- if="tests.failed"/> +- </target> +- + <target name="build" +- depends="init,retrieve,setup,compile" ++ depends="init,setup,compile" + description="build the jEdit JAR-file with full debug-information"> + <mkdir dir="${jar.location}"/> + <jar destfile="${jar.location}/${jar.filename}" +@@ -508,7 +400,7 @@ + </target> + + <target name="build-exe-launcher" +- depends="init,retrieve,setup,filter-package-files" ++ depends="init,setup,filter-package-files" + description="build the EXE launcher"> + <contrib:if> + <os family="windows"/> +@@ -611,7 +503,7 @@ + </target> + + <target name="unpack-docbook-xsl" +- depends="init,retrieve"> ++ depends="init"> + <unzip src="${lib.dir}/docbook/docbook-xsl-resources.zip" + dest="${build.dir}/docbook-xsl/"/> + </target> +@@ -655,7 +547,7 @@ + </presetdef> + + <target name="generate-doc-faq" +- depends="init,retrieve,setup,unpack-docbook-xsl"> ++ depends="init,setup,unpack-docbook-xsl"> + <dependset.html> + <srcfileset dir="doc/FAQ"/> + <targetfileset dir="${jar.location}/doc/FAQ"/> +@@ -679,7 +571,7 @@ + </target> + + <target name="generate-doc-news" +- depends="init,retrieve,setup,unpack-docbook-xsl"> ++ depends="init,setup,unpack-docbook-xsl"> + <dependset.html> + <srcfileset dir="doc/whatsnew"/> + <targetfileset dir="${jar.location}/doc/whatsnew"/> +@@ -703,7 +595,7 @@ + </target> + + <target name="generate-doc-users-guide" +- depends="init,retrieve,setup,unpack-docbook-xsl"> ++ depends="init,setup,unpack-docbook-xsl"> + <dependset.html> + <srcfileset dir="doc/users-guide"/> + <targetfileset dir="${jar.location}/doc/users-guide"/> +@@ -838,7 +730,7 @@ + </target> + + <target name="generate-pdf-users-guide" +- depends="init,retrieve,setup,unpack-docbook-xsl"> ++ depends="init,setup,unpack-docbook-xsl"> + <fail message="Please set the property "paper.type"" + unless="paper.type"/> + <contrib:switch value="${paper.type}"> +@@ -1143,7 +1035,7 @@ + </target> + + <target name="compile-jarbundler" +- depends="init,retrieve"> ++ depends="init"> + <mkdir dir="${classes.dir}/jarbundler"/> + <depend srcDir="${basedir}" + destDir="${classes.dir}/jarbundler" +@@ -1173,7 +1065,7 @@ + </target> + + <target name="dist-mac-finish" +- depends="init,retrieve,setup" ++ depends="init,setup" + description="finish building the Mac OS X disk image (DMG-file) on Mac OS X"> + <fail message="The disk image (DMG-file) for easy distribution on Mac OS X can only be built on Mac OS X currently"> + <condition> +@@ -1271,7 +1163,7 @@ + </target> + + <target name="dist-mac" +- depends="init,retrieve,setup,prepare-dist-files" ++ depends="init,setup,prepare-dist-files" + description="build the Mac OS X disk image (DMG-file)"> + <antcall target="compile-jarbundler"> + <param name="config.build.debuglevel" +@@ -1386,7 +1278,7 @@ + </target> + + <target name="prepare-dist-files" +- depends="init,retrieve,setup"> ++ depends="init,setup"> + <antcall target="build"> + <param name="config.build.debuglevel" + value="lines,source"/> +@@ -1567,7 +1459,7 @@ + </target> + + <target name="dist-deb" +- depends="init,retrieve,setup,prepare-dist-files" ++ depends="init,setup,prepare-dist-files" + description="build the DEB Package"> + <antcall target="compile-ar"> + <param name="config.build.debuglevel" +@@ -1813,7 +1705,7 @@ + </target> + + <target name="dist-sign-deb-Release" +- depends="init,retrieve,setup" ++ depends="init,setup" + description="sign the DEB Release file"> + <contrib:if> + <not> diff --git a/pkgs/applications/editors/jedit/default.nix b/pkgs/applications/editors/jedit/default.nix index 8a57f650fb4a..0e11c577fc85 100644 --- a/pkgs/applications/editors/jedit/default.nix +++ b/pkgs/applications/editors/jedit/default.nix @@ -1,32 +1,47 @@ -{ stdenv, fetchurl, ant, jdk }: +{stdenv, fetchurl, ant, jdk, commonsBsf, commonsLogging}: -let version = "4.4.2"; in +let + version = "5.1.0"; + bsh = fetchurl { + url = http://www.beanshell.org/bsh-2.0b4.jar; + sha256 = "1di7hj2yms1m3wa8k70jpw0wzfnrgibpqnvdk33ahfaqi03mqfci"; + }; + bcpg = fetchurl { + url = http://central.maven.org/maven2/org/bouncycastle/bcpg-jdk16/1.46/bcpg-jdk16-1.46.jar; + sha256 = "16xhmwks4l65m5x150nd23y5lyppha9sa5fj65rzhxw66gbli82d"; + }; + jsr305 = fetchurl { + url = http://central.maven.org/maven2/com/google/code/findbugs/jsr305/2.0.0/jsr305-2.0.0.jar; + sha256 = "0s74pv8qjc42c7q8nbc0c3b1hgx0bmk3b8vbk1z80p4bbgx56zqy"; + }; +in stdenv.mkDerivation { name = "jedit-${version}"; - src = fetchurl { url = "mirror://sourceforge/jedit/jedit${version}source.tar.bz2"; - sha256 = "5e9ad9c32871b77ef0b9fe46dcfcea57ec52558d36113b7280194a33430b8ceb"; + sha256 = "015rn4339mp4wrd901x56nr42wfcy429pg54n835c6n34b2jjdc6"; }; - buildInputs = [ ant jdk ]; + buildInputs = [ ant jdk commonsBsf commonsLogging ]; + + # This patch removes from the build process: + # - the automatic download of dependencies (see configurePhase); + # - the tests + patches = [ ./build.xml.patch ]; - sourceRoot = "jEdit"; + configurePhase = '' + mkdir -p lib/ant-contrib/ lib/scripting lib/compile lib/default-plugins + cp ${ant}/lib/ant/lib/ant-contrib-*.jar lib/ant-contrib/ + cp ${bsh} ${bcpg} lib/scripting/ + cp ${jsr305} lib/compile/ + ''; buildPhase = "ant build"; installPhase = '' mkdir -p $out/share/jEdit - cp build/jedit.jar $out/share/jEdit - mkdir -p $out/share/jEdit/modes - cp -r modes/* $out/share/jEdit/modes - mkdir -p $out/share/jEdit/icons - cp -r icons/* $out/share/jEdit/icons - mkdir -p $out/share/jEdit/macros - cp -r macros/* $out/share/jEdit/macros - mkdir -p $out/share/jEdit/doc - cp -r doc/* $out/share/jEdit/doc + cp -r build/jedit.jar doc icons keymaps macros modes startup $out/share/jEdit sed -i "s|Icon=.*|Icon=$out/share/jEdit/icons/jedit-icon48.png|g" package-files/linux/deb/jedit.desktop mkdir -p $out/share/applications @@ -44,9 +59,11 @@ stdenv.mkDerivation { chmod +x $out/bin/jedit ''; - meta = { + meta = with stdenv.lib; { description = "Mature programmer's text editor (Java based)"; homepage = http://www.jedit.org; - license = "GPL"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.vbgl ]; }; } diff --git a/pkgs/applications/editors/kdevelop/default.nix b/pkgs/applications/editors/kdevelop/default.nix index 945a6210e786..b98e02fd7b98 100644 --- a/pkgs/applications/editors/kdevelop/default.nix +++ b/pkgs/applications/editors/kdevelop/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, kdevplatform, cmake, pkgconfig, automoc4, shared_mime_info, - kdebase_workspace, gettext, perl, okteta, qjson }: + kdebase_workspace, gettext, perl, okteta, qjson, kate, konsole, kde_runtime, oxygen_icons }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig automoc4 shared_mime_info gettext perl ]; + propagatedUserEnvPkgs = [ kdevplatform kate konsole kde_runtime oxygen_icons ]; + NIX_CFLAGS_COMPILE = "-I${okteta}/include/KDE"; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/leafpad/default.nix b/pkgs/applications/editors/leafpad/default.nix new file mode 100644 index 000000000000..fc35a993badf --- /dev/null +++ b/pkgs/applications/editors/leafpad/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, intltool, pkgconfig, gtk }: + +stdenv.mkDerivation rec { + version = "0.8.18.1"; + name = "leafpad-${version}"; + src = fetchurl { + url = "http://download.savannah.gnu.org/releases/leafpad/${name}.tar.gz"; + sha256 = "0b0az2wvqgvam7w0ns1j8xp2llslm1rx6h7zcsy06a7j0yp257cm"; + }; + + buildInputs = [ intltool pkgconfig gtk ]; + + configureFlags = [ + "--enable-chooser" + ]; + + meta = with stdenv.lib; { + description = "A notepad clone for GTK+ 2.0"; + homepage = http://tarot.freeshell.org/leafpad; + platforms = platforms.linux; + maintainers = [ maintainers.flosse ]; + license = licenses.gpl3; + }; +} diff --git a/pkgs/applications/editors/mg/default.nix b/pkgs/applications/editors/mg/default.nix index 6901aed774ba..45a527c7484e 100644 --- a/pkgs/applications/editors/mg/default.nix +++ b/pkgs/applications/editors/mg/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://homepage.boetes.org/software/mg/; description = "Micro GNU/emacs, a portable version of the mg maintained by the OpenBSD team"; - license = "public domain"; + license = stdenv.lib.licenses.publicDomain; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix new file mode 100644 index 000000000000..1c1c050b0000 --- /dev/null +++ b/pkgs/applications/editors/neovim/default.nix @@ -0,0 +1,65 @@ +{ stdenv, fetchgit, fetchurl, unzip, callPackage, ncurses, gettext, pkgconfig, +cmake, pkgs, lpeg, lua, luajit, luaMessagePack, luabitop }: + +stdenv.mkDerivation rec { + name = "neovim-nightly"; + + version = "nightly"; + + src = fetchgit { + url = "https://github.com/neovim/neovim"; + rev = "68fcd8b696dae33897303c9f8265629a31afbf17"; + sha256 = "0hxkcy641jpn4qka44gfvhmb6q3dkjx6lvn9748lcl2gx2d36w4i"; + }; + + libmsgpack = stdenv.mkDerivation rec { + version = "0.5.9"; + name = "libmsgpack-${version}"; + + src = fetchgit { + rev = "ecf4b09acd29746829b6a02939db91dfdec635b4"; + url = "https://github.com/msgpack/msgpack-c"; + sha256 = "076ygqgxrc3vk2l20l8x2cgcv05py3am6mjjkknr418pf8yav2ww"; + }; + + buildInputs = [ cmake ]; + + meta = with stdenv.lib; { + description = "MessagePack implementation for C and C++"; + homepage = http://msgpack.org; + maintainers = [ maintainers.manveru ]; + license = licenses.asl20; + platforms = platforms.all; + }; + }; + + enableParallelBuilding = true; + + buildInputs = [ + ncurses + pkgconfig + cmake + pkgs.libuvVersions.v0_11_29 + luajit + lua + lpeg + luaMessagePack + luabitop + libmsgpack + ]; + nativeBuildInputs = [ gettext ]; + + LUA_CPATH="${lpeg}/lib/lua/${lua.luaversion}/?.so;${luabitop}/lib/lua/5.2/?.so"; + LUA_PATH="${luaMessagePack}/share/lua/5.1/?.lua"; + cmakeFlags = [ + "-DUSE_BUNDLED_MSGPACK=ON" + ]; + + meta = with stdenv.lib; { + description = "Aggressive refactor of Vim"; + homepage = http://www.neovim.org; + maintainers = with maintainers; [ manveru ]; + platforms = platforms.unix; + }; +} + diff --git a/pkgs/applications/editors/nvi/default.nix b/pkgs/applications/editors/nvi/default.nix index 81e0dd35db95..ee9b775453c2 100644 --- a/pkgs/applications/editors/nvi/default.nix +++ b/pkgs/applications/editors/nvi/default.nix @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.bostic.com/vi/; description = "The Berkeley Vi Editor"; - license = "free"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix new file mode 100644 index 000000000000..516377f0996e --- /dev/null +++ b/pkgs/applications/editors/sigil/default.nix @@ -0,0 +1,66 @@ +{ stdenv, fetchurl, unzip, cmake, pkgconfig, makeWrapper +, hunspell, minizip, boost, xercesc, qt5 +}: + +let + version = "0.7.4"; + +in + +stdenv.mkDerivation rec { + name = "sigil-${version}"; + + src = fetchurl { + url = "https://sigil.googlecode.com/files/Sigil-${version}-Code.zip"; + sha256 = "68c7ca15ea8611921af0c435369563f55c6afd2ef1fb0945cf6c4a47429b0fb5"; + }; + + buildInputs = [ + unzip cmake pkgconfig + hunspell minizip boost xercesc qt5 + ]; + + # XXX: the compiler seems to treat the .h file inappropriately: + # + # COMMAND ${CMAKE_CXX_COMPILER} ${compile_flags} \ + # ${CMAKE_CURRENT_SOURCE_DIR}/${header_name}.h \ + # -o ${header_name}.h.gch + # + # but using -c or -x c++-header seems to work: + # + # COMMAND ${CMAKE_CXX_COMPILER} ${compile_flags} \ + # -c ${CMAKE_CURRENT_SOURCE_DIR}/${header_name}.h \ + # -o ${header_name}.h.gch + # + # COMMAND ${CMAKE_CXX_COMPILER} ${compile_flags} \ + # -x c++-header ${CMAKE_CURRENT_SOURCE_DIR}/${header_name}.h \ + # -o ${header_name}.h.gch + # + # Might be related to: + # + # http://permalink.gmane.org/gmane.comp.gcc.bugs/361195 + buildCommand = '' + mkdir -pv $out + mkdir -pv ${name}/src ${name}/build ${name}/run + cd ${name}/src + unzip -n ${src} + sed -i \ + -e 's|\(COMMAND\) \([^ ]\+\) \([^ ]\+\) \(.*\)|\1 \2 \3 -c \4|' \ + cmake_extras/CustomPCH.cmake + cd ../build + cmake -G "Unix Makefiles" \ + -DCMAKE_INSTALL_PREFIX=$out \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_BUILD_RPATH=ON \ + ../src + make + make install + ''; + + meta = { + description = "Free, open source, multi-platform ebook (ePub) editor"; + homepage = https://code.google.com/p/sigil/; + license = stdenv.lib.licenses.gpl3; + inherit version; + }; +} diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix index 87310efc8754..c27f5171de59 100644 --- a/pkgs/applications/editors/sublime3/default.nix +++ b/pkgs/applications/editors/sublime3/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, glib, xlibs, cairo, gtk, pango, makeWrapper}: +{ fetchurl, stdenv, glib, xlibs, cairo, gtk, pango, makeWrapper, openssl, bzip2 }: assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; @@ -41,7 +41,7 @@ in let mkdir -p $out cp -prvd * $out/ # Without this, plugin_host crashes, even though it has the rpath - wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.gcc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1 + wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.gcc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1:${openssl}/lib/libssl.so:${bzip2}/lib/libbz2.so ''; }; in stdenv.mkDerivation { diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 710ceb7d31f1..d5b7182c64a7 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -37,7 +37,7 @@ composableDerivation { else stdenv ).mkDerivation; } (fix: { - name = "vim_configurable-7.4.335"; + name = "vim_configurable-7.4.516"; enableParallelBuilding = true; # test this @@ -46,9 +46,9 @@ composableDerivation { "default" = # latest release args.fetchhg { - url = "https://vim.googlecode.com/hg/"; - rev = "v7-4-335"; - sha256 = "0qnpzfcbi6fhz82pj68l4vrnigca1akq2ksrxz6krwlfhns6jhhj"; + url = "http://vim.googlecode.com/hg/"; + rev = "v7-4-516"; + sha256 = "0a3b5qaywfn7jjr7fjpl8y8jx4wjj2630wxfjnmn3hi1l7iiz4z8"; }; "vim-nox" = @@ -139,7 +139,7 @@ composableDerivation { nlsSupport = config.vim.nls or false; tclSupport = config.vim.tcl or false; multibyteSupport = config.vim.multibyte or false; - cscopeSupport = config.vim.cscope or false; + cscopeSupport = config.vim.cscope or true; netbeansSupport = config.netbeans or true; # eg envim is using it # by default, compile with darwin support if we're compiling on darwin, but diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index 95f654eb8cac..8f27f5409975 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "vim-${version}"; - version = "7.4.335"; + version = "7.4.410"; src = fetchhg { url = "https://vim.googlecode.com/hg/"; - rev = "v7-4-335"; - sha256 = "0qnpzfcbi6fhz82pj68l4vrnigca1akq2ksrxz6krwlfhns6jhhj"; + rev = "v7-4-410"; + sha256 = "145llhj6gq2bh9b7p8xkxc388krrximq80b87f3cn4w4d4k9fhqp"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vim/ft-nix-support.patch b/pkgs/applications/editors/vim/ft-nix-support.patch index ed508784813c..cbbe1ccb212f 100644 --- a/pkgs/applications/editors/vim/ft-nix-support.patch +++ b/pkgs/applications/editors/vim/ft-nix-support.patch @@ -23,39 +23,42 @@ new file mode 100644 index 0000000..a2f9918 --- /dev/null +++ b/runtime/syntax/nix.vim -@@ -0,0 +1,47 @@ +@@ -0,0 +1,56 @@ +" Vim syntax file +" Language: nix +" Maintainer: Marc Weber <marco-oweber@gmx.de> +" Modify and commit if you feel that way -+" Last Change: 2007 Dec ++" Last Change: 2011 Jun +" +" this syntax file can be still be enhanced very much.. +" Don't ask, do it :-) ++" This file (github.com/MarcWeber/vim-addon-nix) is periodically synced with ++" the patch found in vim_configurable (nixpkgs) + +" Quit when a (custom) syntax file was already loaded +if exists("b:current_syntax") + finish +endif + -+syn keyword nixKeyword let in rec assert inherit import true false null with ... -+syn keyword nixBuiltin import abort baseNameOf dirOf isNull builtins map removeAttrs throw toString derivation ++ ++sy cluster nixStrings contains=nixStringParam,nixStringIndented ++ ++syn keyword nixKeyword let throw inherit import true false null with +syn keyword nixConditional if else then +syn keyword nixBrace ( ) { } = +syn keyword nixBuiltin __currentSystem __currentTime __isFunction __getEnv __trace __toPath __pathExists + \ __readFile __toXML __toFile __filterSource __attrNames __getAttr __hasAttr __isAttrs __listToAttrs __isList + \ __head __tail __add __sub __lessThan __substring __stringLength + -+syn match nixAttr "[a-zA-Z0-9-_]\+\ze\s*=" -+syn match nixFuncArg "\zs[a-zA-Z0-9-_]\+\ze\s*:" -+syn region nixStringParam start=+\${+ end=+}+ ++syn region nixStringIndented start=+''+ skip=+'''\|''${\|"+ end=+''+ contains=nixStringParam ++" syn region nixString start=+"+ skip=+\\"+ end=+"+ ++syn match nixAttr "\w\+\ze\s*=" ++syn match nixFuncArg "\zs\w\+\ze\s*:" ++syn region nixStringParam start=+\${+ end=+}+ contains=@nixStrings +syn region nixMultiLineComment start=+/\*+ skip=+\\"+ end=+\*/+ +syn match nixEndOfLineComment "#.*$" -+syn region nixStringIndented start=+''+ skip=+'''\|''${\|"+ end=+''+ contains=nixStringParam -+syn region nixString start=+"+ skip=+\\"+ end=+"+ contains=nixStringParam + +hi def link nixKeyword Keyword -+hi def link nixBuiltin Function +hi def link nixConditional Conditional +hi def link nixBrace Special +hi def link nixString String @@ -67,9 +70,20 @@ index 0000000..a2f9918 +hi def link nixAttr Identifier +hi def link nixFuncArg Identifier + ++syn sync maxlines=20000 ++syn sync minlines=50000 ++ +let b:current_syntax = "nix" + ++" thanks to iElectric +" scan backwards to find begining of multiline statements +syn sync ccomment nixMultiLineComment minlines=10 maxlines=500 +syn sync ccomment nixStringIndented minlines=10 maxlines=500 +syn sync ccomment nixString maxlines=10 +diff --git a/runtime/ftplugin/nix.vim b/runtime/ftplugin/nix.vim +new file mode 100644 +--- /dev/null ++++ b/runtime/ftplugin/nix.vim +@@ -0,0 +1,2 @@ ++" coding conventions ++setlocal sw=2 ts=2 expandtab diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index feafa7b99777..784be80ecf48 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -1,18 +1,15 @@ -{ stdenv, stdenvAdapters, gccApple, fetchFromGitHub, ncurses, gettext, +{ stdenv, fetchurl, ncurses, gettext, pkgconfig, cscope, python, ruby, tcl, perl, luajit }: -let inherit (stdenvAdapters.overrideGCC stdenv gccApple) mkDerivation; -in mkDerivation rec { +stdenv.mkDerivation rec { name = "macvim-${version}"; - version = "7.4.355"; + version = "7.4.479"; - src = fetchFromGitHub { - owner = "genoma"; - repo = "macvim"; - rev = "c18a61f9723565664ffc2eda9179e96c95860e25"; - sha256 = "190bngg8m4bwqcia7w24gn7mmqkhk0mavxy81ziwysam1f652ymf"; + src = fetchurl { + url = "https://github.com/genoma/macvim/archive/g-snapshot-21.tar.gz"; + sha256 = "1s86dpb8bcxh309gikiz8gm9ygv3d2jy6i4qlnxarbvcdk65fzv4"; }; enableParallelBuilding = true; @@ -46,6 +43,7 @@ in mkDerivation rec { "--enable-perlinterp=dynamic" "--enable-rubyinterp=dynamic" "--enable-tclinterp=yes" + "--without-local-dir" "--with-luajit" "--with-lua-prefix=${luajit}" "--with-ruby-command=${ruby}/bin/ruby" @@ -54,6 +52,8 @@ in mkDerivation rec { "--with-compiledby=Nix" ]; + makeFlags = ''PREFIX=$(out) CPPFLAGS="-Wno-error"''; + preConfigure = '' DEV_DIR=$(/usr/bin/xcode-select -print-path)/Platforms/MacOSX.platform/Developer configureFlagsArray+=( diff --git a/pkgs/applications/editors/vim/macvim.patch b/pkgs/applications/editors/vim/macvim.patch index a789b9952d2b..a42ebd4cc03c 100644 --- a/pkgs/applications/editors/vim/macvim.patch +++ b/pkgs/applications/editors/vim/macvim.patch @@ -187,3 +187,36 @@ index bc9f074..9b9125e 100755 # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. $ac_cs_success || as_fn_exit 1 + +diff --git a/src/Makefile b/src/Makefile +index 1c4d104..fff2015 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -1298,7 +1298,7 @@ MACVIMGUI_SRC = gui.c gui_beval.c MacVim/gui_macvim.m MacVim/MMBackend.m \ + MacVim/MacVim.m + MACVIMGUI_OBJ = objects/gui.o objects/gui_beval.o objects/pty.o \ + objects/gui_macvim.o objects/MMBackend.o objects/MacVim.o +-MACVIMGUI_DEFS = -DFEAT_GUI_MACVIM -Wall -Wno-unknown-pragmas -pipe ++MACVIMGUI_DEFS = -DMACOS_X_UNIX -DFEAT_GUI_MACVIM -Wall -Wno-unknown-pragmas -pipe + MACVIMGUI_IPATH = + MACVIMGUI_LIBS_DIR = + MACVIMGUI_LIBS1 = -framework Cocoa -framework Carbon + +diff --git a/src/if_python.c b/src/if_python.c +index b356bf7..b7bfa78 100644 +--- a/src/if_python.c ++++ b/src/if_python.c +@@ -55,11 +55,7 @@ + + #define PY_SSIZE_T_CLEAN + +-#ifdef FEAT_GUI_MACVIM +-# include <Python/Python.h> +-#else +-# include <Python.h> +-#endif ++#include <Python.h> + + #if !defined(PY_VERSION_HEX) || PY_VERSION_HEX < 0x02050000 + # undef PY_SSIZE_T_CLEAN + MACVIMGUI_LIBS1 = -framework Cocoa -framework Carbon diff --git a/pkgs/applications/editors/vim/qvim.nix b/pkgs/applications/editors/vim/qvim.nix index 2357e23bf014..5d1a8a6f1410 100644 --- a/pkgs/applications/editors/vim/qvim.nix +++ b/pkgs/applications/editors/vim/qvim.nix @@ -1,5 +1,8 @@ args@{...}: with args; +let tag = "20140827"; + sha256 = "02adf2212872db3c5d133642d2c12fbfc28b506e4c0c42552e3d079756f63f65"; +in let inherit (args.composableDerivation) composableDerivation edf; in composableDerivation { @@ -9,14 +12,14 @@ composableDerivation { else stdenv ).mkDerivation; } (fix: { - name = "qvim-7.4"; + name = "qvim-7.4." + tag; enableParallelBuilding = true; # test this src = fetchgit { url = https://bitbucket.org/equalsraf/vim-qt.git ; - rev = "4160bfd5c1380e899d2f426b494fc4f1cf6ae85e"; - sha256 = "1qa3xl1b9gqw66p71h53l7ibs4y3zfyj553jss70ybxaxchbhi5b"; + rev = "refs/tags/package-" + tag; + inherit sha256; }; # FIXME: adopt Darwin fixes from vim/default.nix, then chage meta.platforms.linux @@ -119,7 +122,7 @@ composableDerivation { meta = with stdenv.lib; { description = "The most popular clone of the VI editor (Qt GUI fork)"; homepage = https://bitbucket.org/equalsraf/vim-qt/wiki/Home; - maintainers = with maintainers; [ smironov ]; + maintainers = with maintainers; [ smironov ttuegel ]; platforms = platforms.linux; }; }) diff --git a/pkgs/applications/editors/yi/yi-contrib.nix b/pkgs/applications/editors/yi/yi-contrib.nix deleted file mode 100644 index 2678f0a00489..000000000000 --- a/pkgs/applications/editors/yi/yi-contrib.nix +++ /dev/null @@ -1,21 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, filepath, lens, mtl, split, time, transformersBase, yi }: - -cabal.mkDerivation (self: { - pname = "yi-contrib"; - version = "0.8.2"; - sha256 = "17rbgrra1ghlywiraadf16n7igxp1k8jqqmb0iw8sc15y7825qqm"; - buildDepends = [ - filepath lens mtl split time transformersBase yi - ]; - meta = { - homepage = "http://haskell.org/haskellwiki/Yi"; - description = "Add-ons to Yi, the Haskell-Scriptable Editor"; - license = "GPL"; - broken = true; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; - }; -}) diff --git a/pkgs/applications/editors/yi/yi-custom-cabal/LICENSE b/pkgs/applications/editors/yi/yi-custom-cabal/LICENSE new file mode 100644 index 000000000000..cf1ab25da034 --- /dev/null +++ b/pkgs/applications/editors/yi/yi-custom-cabal/LICENSE @@ -0,0 +1,24 @@ +This is free and unencumbered software released into the public domain. + +Anyone is free to copy, modify, publish, use, compile, sell, or +distribute this software, either in source code form or as a compiled +binary, for any purpose, commercial or non-commercial, and by any +means. + +In jurisdictions that recognize copyright laws, the author or authors +of this software dedicate any and all copyright interest in the +software to the public domain. We make this dedication for the benefit +of the public at large and to the detriment of our heirs and +successors. We intend this dedication to be an overt act of +relinquishment in perpetuity of all present and future rights to this +software under copyright law. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + +For more information, please refer to <http://unlicense.org> diff --git a/pkgs/applications/editors/yi/yi-custom-cabal/yi-custom.cabal b/pkgs/applications/editors/yi/yi-custom-cabal/yi-custom.cabal new file mode 100644 index 000000000000..d9ffbb8e4817 --- /dev/null +++ b/pkgs/applications/editors/yi/yi-custom-cabal/yi-custom.cabal @@ -0,0 +1,17 @@ +name: yi-custom +version: 0.0.0.1 +category: Yi +synopsis: Convenience wrapper for nix +description: Convenience wrapper for nix +license: PublicDomain +license-file: LICENSE +author: Mateusz Kowalczyk +maintainer: fuuzetsu@fuuzetsu.co.uk +Cabal-Version: >= 1.10 +build-type: Simple + +library + hs-source-dirs: . + default-language: Haskell2010 + build-depends: base, yi + ghc-options: -threaded diff --git a/pkgs/applications/editors/yi/yi-custom.nix b/pkgs/applications/editors/yi/yi-custom.nix new file mode 100644 index 000000000000..3dbd46119988 --- /dev/null +++ b/pkgs/applications/editors/yi/yi-custom.nix @@ -0,0 +1,40 @@ +# This is a manually-written expression over an in-tree cabal file. +# It's awkward but this way allows the package user to pass in +# extraPackages without much extra hassle on their end, similarly how +# the XMonad service handles it: the difference is that we don't have +# anything like XMONAD_GHC… +# +# The idea is that the user changes their configs using any libraries +# he likes and then builds it using this expression. Once that's done, +# ‘reload’ and similar functions should all work as long as the user +# doesn't need new libraries at which point they should add them to +# extraPackages and rebuild from the expression. +{ cabal, yi, extraPackages, makeWrapper, ghcWithPackages }: +let + w = ghcWithPackages (self: [ yi ] ++ extraPackages self); + wrappedGhc = w.override { ignoreCollisions = true; }; +in +cabal.mkDerivation (self: rec { + pname = "yi-custom"; + version = "0.0.0.1"; + src = ./yi-custom-cabal; + isLibrary = true; + buildDepends = [ yi ]; + buildTools = [ makeWrapper ]; + noHaddock = true; + doCheck = false; + + postInstall = '' + makeWrapper ${yi}/bin/yi $out/bin/yi \ + --set NIX_GHC ${wrappedGhc}/bin/ghc \ + --set NIX_GHC_LIBDIR ${wrappedGhc}/lib/ghc-${self.ghc.version} + ''; + meta = { + homepage = "http://haskell.org/haskellwiki/Yi"; + description = "Wrapper over user-specified Haskell libraries for use in Yi config"; + license = self.stdenv.lib.licenses.publicDomain; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; + }; + +}) \ No newline at end of file diff --git a/pkgs/applications/editors/yi/yi.nix b/pkgs/applications/editors/yi/yi.nix index 9b9287a50f12..a63375adfd14 100644 --- a/pkgs/applications/editors/yi/yi.nix +++ b/pkgs/applications/editors/yi/yi.nix @@ -1,65 +1,39 @@ -{ cabal, alex, binary, Cabal, cautiousFile, concreteTyperep -, dataDefault, derive, Diff, dlist, dyre, filepath, fingertree -, glib, gtk, hashable, hint, HUnit, lens, mtl, pango, parsec -, pointedlist, QuickCheck, random, regexBase, regexTdfa, safe -, split, tasty, tastyHunit, tastyQuickcheck, time, transformersBase -, uniplate, unixCompat, unorderedContainers, utf8String, vty -, xdgBasedir -, withPango ? true +# This file was auto-generated by cabal2nix. Please do NOT edit manually! -# User may need extra dependencies for their configuration file so we -# want to specify it here to have them available when wrapping the -# produced binary. -, extraDepends ? [ ] +{ cabal, binary, Cabal, cautiousFile, dataDefault, derive, dlist +, dynamicState, dyre, exceptions, filepath, glib, gtk, hashable +, hint, HUnit, lens, mtl, ooPrototypes, pango, parsec, pointedlist +, QuickCheck, random, regexBase, regexTdfa, safe, semigroups, split +, tagged, tasty, tastyHunit, tastyQuickcheck, text, time +, transformersBase, unixCompat, unorderedContainers, utf8String +, vty, wordTrie, xdgBasedir, yiLanguage, yiRope }: cabal.mkDerivation (self: { pname = "yi"; - version = "0.8.2"; - sha256 = "18rnyswsdzkh0jdcqfg8pr90mpm6xf11siv598svqkxg12d2qql9"; + version = "0.11.1"; + sha256 = "15m1wwrxmszl930az79lpgyz5rxg72gy8vi17ibpac1cszfdx192"; isLibrary = true; isExecutable = true; buildDepends = [ - binary Cabal cautiousFile concreteTyperep dataDefault derive Diff - dlist dyre filepath fingertree hashable hint lens mtl - parsec pointedlist QuickCheck random regexBase regexTdfa safe - split time transformersBase uniplate unixCompat unorderedContainers - utf8String vty xdgBasedir - ] ++ (if withPango then [ pango gtk glib ] else [ ]) ++ extraDepends; + binary Cabal cautiousFile dataDefault derive dlist dynamicState + dyre exceptions filepath glib gtk hashable hint lens mtl + ooPrototypes pango parsec pointedlist QuickCheck random regexBase + regexTdfa safe semigroups split tagged text time transformersBase + unixCompat unorderedContainers utf8String vty wordTrie xdgBasedir + yiLanguage yiRope + ]; testDepends = [ - filepath HUnit QuickCheck tasty tastyHunit tastyQuickcheck + filepath HUnit lens QuickCheck semigroups tasty tastyHunit + tastyQuickcheck text yiLanguage yiRope ]; - buildTools = [ alex ]; - configureFlags = if withPango then "-fpango" else "-f-pango"; - doCheck = false; - - # https://ghc.haskell.org/trac/ghc/ticket/9170 - noHaddock = self.ghc.version == "7.6.3"; - - # Allows Yi to find the libraries it needs at runtime. - postInstall = '' - mv $out/bin/yi $out/bin/.yi-wrapped - cat - > $out/bin/yi <<EOF - #! ${self.stdenv.shell} - # Trailing : is necessary for it to pick up Prelude &c. - export GHC_PACKAGE_PATH=$(${self.ghc.GHCGetPackages} ${self.ghc.version} \ - | sed 's/-package-db\ //g' \ - | sed 's/^\ //g' \ - | sed 's/\ /:/g')\ - :$out/lib/ghc-${self.ghc.version}/package.conf.d/yi-$version.installedconf: - - eval exec $out/bin/.yi-wrapped "\$@" - EOF - chmod +x $out/bin/yi - ''; - + configureFlags = "-fpango -fvty"; + noHaddock = self.stdenv.lib.versionOlder self.ghc.version "7.8"; meta = { homepage = "http://haskell.org/haskellwiki/Yi"; description = "The Haskell-Scriptable Editor"; license = self.stdenv.lib.licenses.gpl2; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = [ self.stdenv.lib.maintainers.fuuzetsu ]; - broken = true; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; }; }) diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index 9a41bcc36ecc..82f1bc382d71 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python ]; - enableParallelBuilding = true; + # fatal error: ui_qgsdelimitedtextsourceselectbase.h: No such file or directory + #enableParallelBuilding = true; # To handle the lack of 'local' RPATH; required, as they call one of # their built binaries requiring their libs, in the build process. diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix index a990e19dbc3f..bb31b24bf5ef 100644 --- a/pkgs/applications/gis/saga/default.nix +++ b/pkgs/applications/gis/saga/default.nix @@ -2,23 +2,22 @@ libharu, opencv, vigra, postgresql }: stdenv.mkDerivation rec { - name = "saga-2.1.2"; + name = "saga-2.1.4"; buildInputs = [ gdal wxGTK30 proj libharu opencv vigra postgresql libiodbc lzma jasper ]; enableParallelBuilding = true; src = fetchurl { - url = "http://sourceforge.net/projects/saga-gis/files/SAGA%20-%202.1/SAGA%202.1.2/saga_2.1.2.tar.gz"; - sha256 = "51885446f717191210c4b13f0c35a1c5194c9d696d4f9b8f594bc1014809b2f5"; + url = "http://sourceforge.net/projects/saga-gis/files/SAGA%20-%202.1/SAGA%202.1.4/saga_2.1.4.tar.gz"; + sha256 = "694e4102f592f512c635328c40fdeff33493f74698d9466bb654baf3247e7b76"; }; meta = { - description = "SAGA - System for Automated Geoscientific Analyses"; + description = "System for Automated Geoscientific Analyses"; homepage = http://www.saga-gis.org; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.michelk ]; - platforms = with stdenv.lib.platforms; linux; - broken = true; + platforms = ["x86_64-linux" ]; }; } diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 64b1f5b3b2c1..69bc2006666c 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , fetchurl , pkgconfig , bzip2 @@ -18,14 +19,22 @@ }: let - version = "6.8.9-0"; + + version = "6.8.9-8"; + + arch = + if stdenv.system == "i686-linux" then "i686" + else if stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin" then "x86-64" + else throw "ImageMagick is not supported on this platform."; + in + stdenv.mkDerivation rec { name = "ImageMagick-${version}"; src = fetchurl { - url = "mirror://imagemagick/${name}.tar.xz"; - sha256 = "1lapn2798fkc2wn81slpms5p21kq4dsyg45khsk7n8p69cvrmw2b"; + url = "mirror://imagemagick/releases/${name}.tar.xz"; + sha256 = "1c792hbwi308lm9xkml319xaa4w3bz6hwy6i92jwrm7kqr4h8di7"; }; enableParallelBuilding = true; @@ -35,18 +44,19 @@ stdenv.mkDerivation rec { export DVIDecodeDelegate=${tetex}/bin/dvips '' else ""; - configureFlags = "" + stdenv.lib.optionalString (stdenv.system != "x86_64-darwin") '' - --with-gs-font-dir=${ghostscript}/share/ghostscript/fonts - --with-gslib - '' + '' - --with-frozenpaths - ${if librsvg != null then "--with-rsvg" else ""} - ''; + configureFlags = + [ "--with-frozenpaths" ] + ++ [ "--with-gcc-arch=${arch}" ] + ++ lib.optional (librsvg != null) "--with-rsvg" + ++ lib.optionals (stdenv.system != "x86_64-darwin") + [ "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts" + "--with-gslib" + ]; propagatedBuildInputs = [ bzip2 fontconfig freetype libjpeg libpng libtiff libxml2 zlib librsvg libtool jasper libX11 - ] ++ stdenv.lib.optional (stdenv.system != "x86_64-darwin") ghostscript; + ] ++ lib.optional (stdenv.system != "x86_64-darwin") ghostscript; buildInputs = [ tetex pkgconfig ]; diff --git a/pkgs/applications/graphics/cinepaint/default.nix b/pkgs/applications/graphics/cinepaint/default.nix index 41a4b102a6f3..f1ca27eed803 100644 --- a/pkgs/applications/graphics/cinepaint/default.nix +++ b/pkgs/applications/graphics/cinepaint/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.cinepaint.org/; - license = "free"; + license = stdenv.lib.licenses.free; description = "Image editor which supports images over 8bpp and ICC profiles"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix index da6838880630..e498533d63d2 100644 --- a/pkgs/applications/graphics/dia/default.nix +++ b/pkgs/applications/graphics/dia/default.nix @@ -7,8 +7,8 @@ stdenv.mkDerivation rec { src = fetchurlGnome { project = "dia"; - major = "0"; minor = "97"; patchlevel = "2"; extension = "xz"; - sha256 = "1qgawm7rrf4wd1yc0fp39ywv8gbz4ry1s16k00dzg5w6p67lfqd7"; + major = "0"; minor = "97"; patchlevel = "3"; extension = "xz"; + sha256 = "0d3x6w0l6fwd0l8xx06y1h56xf8ss31yzia3a6xr9y28xx44x492"; }; correctPersistence = fetchurl { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optionalString withGNOME "--enable-gnome"; - patches = [ ./glib-top-level-header.patch ]; + patches = [ ]; # This file should normally require a gtk-update-icon-cache -q /usr/share/icons/hicolor command # It have no reasons to exist in a redistribuable package diff --git a/pkgs/applications/graphics/dia/glib-top-level-header.patch b/pkgs/applications/graphics/dia/glib-top-level-header.patch deleted file mode 100644 index 80460ae9d722..000000000000 --- a/pkgs/applications/graphics/dia/glib-top-level-header.patch +++ /dev/null @@ -1,471 +0,0 @@ -diff -Naur dia-0.97.2-orig/app/app_procs.c dia-0.97.2/app/app_procs.c ---- dia-0.97.2-orig/app/app_procs.c 2011-03-20 07:18:13.000000000 -0400 -+++ dia-0.97.2/app/app_procs.c 2012-07-15 10:49:08.192726306 -0400 -@@ -50,7 +50,7 @@ - #include <libxml/parser.h> - #include <libxml/xmlerror.h> - --#include <glib/gstdio.h> -+#include <glib.h> - - #include "intl.h" - #include "app_procs.h" -diff -Naur dia-0.97.2-orig/app/dia-win-remote.c dia-0.97.2/app/dia-win-remote.c ---- dia-0.97.2-orig/app/dia-win-remote.c 2010-08-03 11:35:35.000000000 -0400 -+++ dia-0.97.2/app/dia-win-remote.c 2012-07-15 10:49:08.159726316 -0400 -@@ -35,7 +35,7 @@ - #include <shellapi.h> - #include <Shlwapi.h> - #include <glib.h> --#include <glib/gprintf.h> -+#include <glib.h> - - /** - * PROTOTYPES: -diff -Naur dia-0.97.2-orig/app/filedlg.c dia-0.97.2/app/filedlg.c ---- dia-0.97.2-orig/app/filedlg.c 2009-11-07 12:13:53.000000000 -0500 -+++ dia-0.97.2/app/filedlg.c 2012-07-15 10:49:08.227726294 -0400 -@@ -28,7 +28,7 @@ - #include <unistd.h> - #endif - #include <stdio.h> --#include <glib/gstdio.h> -+#include <glib.h> - - #undef GTK_DISABLE_DEPRECATED /* gtk_file_chooser_dialog_new_with_backend */ - #include <gtk/gtk.h> -diff -Naur dia-0.97.2-orig/app/load_save.c dia-0.97.2/app/load_save.c ---- dia-0.97.2-orig/app/load_save.c 2011-09-25 07:55:11.000000000 -0400 -+++ dia-0.97.2/app/load_save.c 2012-07-15 10:49:08.203726303 -0400 -@@ -30,7 +30,7 @@ - #include <string.h> - - #include <glib.h> --#include <glib/gstdio.h> /* g_access() and friends */ -+#include <glib.h> /* g_access() and friends */ - #include <errno.h> - - #ifndef W_OK -diff -Naur dia-0.97.2-orig/app/sheets_dialog_callbacks.c dia-0.97.2/app/sheets_dialog_callbacks.c ---- dia-0.97.2-orig/app/sheets_dialog_callbacks.c 2009-11-07 12:13:53.000000000 -0500 -+++ dia-0.97.2/app/sheets_dialog_callbacks.c 2012-07-15 10:49:08.201726302 -0400 -@@ -44,7 +44,7 @@ - #endif - #endif - --#include <glib/gstdio.h> -+#include <glib.h> - #include <gmodule.h> - - #undef GTK_DISABLE_DEPRECATED /* GtkOptionMenu */ -diff -Naur dia-0.97.2-orig/ChangeLog.pre-git dia-0.97.2/ChangeLog.pre-git ---- dia-0.97.2-orig/ChangeLog.pre-git 2009-11-07 09:28:34.000000000 -0500 -+++ dia-0.97.2/ChangeLog.pre-git 2012-07-15 10:49:08.384726247 -0400 -@@ -4137,7 +4137,7 @@ - plug-ins/vdx/vdx-export.c plug-ins/vdx/vdx-import.c - plug-ins/wmf/wmf.cpp plug-ins/wpg/wpg.c - plug-ins/xfig/xfig-export.c plug-ins/xfig/xfig-import.c -- plug-ins/xslt/xslt.c : use <glib/gstdio.h> to match GLib's filename -+ plug-ins/xslt/xslt.c : use <glib.h> to match GLib's filename - encoding to the io functions used, that is: g_open, g_fopen, g_stat, - g_unlink, g_mkdir, g_rename (, g_access, g_lstat, g_remove, g_freopen, - g_chdir, g_rmdir). Also replace gzopen() with gzdopen(g_open(), ...) -@@ -5995,7 +5995,7 @@ - Also special case strings starting with \tex - i.e. dont escape them - - to keep the use-case of direct tex input. - -- * lib/debug.c : #include <glib/gprintf.h> not just <gprintf.h> -+ * lib/debug.c : #include <glib.h> - - - 2006-01-14 Hans Breuer <hans@breuer.org> -@@ -6207,7 +6207,7 @@ - * lib/makefile.msc : build debug.obj - - * plug-ins/makefile.msc : building pgf in the right alphabetical order -- * plug-ins/pgf/render_pgf.c : include <glib/gprintf.h> -+ * plug-ins/pgf/render_pgf.c : include <glib.h> - - 2005-12-08 Lars Clausen <lars@raeder.dk> - -diff -Naur dia-0.97.2-orig/lib/debug.c dia-0.97.2/lib/debug.c ---- dia-0.97.2-orig/lib/debug.c 2009-11-07 09:28:34.000000000 -0500 -+++ dia-0.97.2/lib/debug.c 2012-07-15 10:49:06.813726730 -0400 -@@ -21,7 +21,7 @@ - #include <config.h> - - #include <stdio.h> --#include <glib/gprintf.h> -+#include <glib.h> - #include <stdarg.h> - - #include "debug.h" -diff -Naur dia-0.97.2-orig/lib/dia_dirs.c dia-0.97.2/lib/dia_dirs.c ---- dia-0.97.2-orig/lib/dia_dirs.c 2009-11-07 12:13:53.000000000 -0500 -+++ dia-0.97.2/lib/dia_dirs.c 2012-07-15 10:49:06.740726750 -0400 -@@ -30,7 +30,7 @@ - #include <sys/stat.h> - #include <sys/types.h> - #endif --#include <glib/gstdio.h> -+#include <glib.h> - - /** Get the name of a subdirectory of our data directory. - * This function does not create the subdirectory, just make the correct name. -diff -Naur dia-0.97.2-orig/lib/dia_xml.c dia-0.97.2/lib/dia_xml.c ---- dia-0.97.2-orig/lib/dia_xml.c 2009-11-07 09:28:34.000000000 -0500 -+++ dia-0.97.2/lib/dia_xml.c 2012-07-15 10:49:06.770726743 -0400 -@@ -25,7 +25,7 @@ - #include <fcntl.h> - - #include <glib.h> --#include <glib/gstdio.h> -+#include <glib.h> - - #include <libxml/parser.h> - #include <libxml/parserInternals.h> -diff -Naur dia-0.97.2-orig/objects/custom/shape_typeinfo.c dia-0.97.2/objects/custom/shape_typeinfo.c ---- dia-0.97.2-orig/objects/custom/shape_typeinfo.c 2009-11-07 09:28:34.000000000 -0500 -+++ dia-0.97.2/objects/custom/shape_typeinfo.c 2012-07-15 10:49:06.639726783 -0400 -@@ -27,8 +27,8 @@ - #include "custom_util.h" - #include <string.h> - #include <stdarg.h> --#include <glib/gstrfuncs.h> --#include <glib/gstdio.h> -+#include <glib.h> -+#include <glib.h> - #include <libxml/parser.h> - - /* -diff -Naur dia-0.97.2-orig/objects/SISSI/sissi.c dia-0.97.2/objects/SISSI/sissi.c ---- dia-0.97.2-orig/objects/SISSI/sissi.c 2009-11-07 09:28:34.000000000 -0500 -+++ dia-0.97.2/objects/SISSI/sissi.c 2012-07-15 10:49:06.570726804 -0400 -@@ -42,7 +42,7 @@ - #include "dia_xml_libxml.h" - - #include <string.h> --#include <glib/gprintf.h> -+#include <glib.h> - - #define DEFAULT_WIDTH 1.0 - #define DEFAULT_HEIGHT 1.0 -diff -Naur dia-0.97.2-orig/objects/standard/image.c dia-0.97.2/objects/standard/image.c ---- dia-0.97.2-orig/objects/standard/image.c 2009-11-07 12:13:53.000000000 -0500 -+++ dia-0.97.2/objects/standard/image.c 2012-07-15 10:49:06.683726770 -0400 -@@ -25,7 +25,7 @@ - #ifdef HAVE_UNIST_H - #include <unistd.h> - #endif --#include <glib/gstdio.h> -+#include <glib.h> - - #include "intl.h" - #include "message.h" -diff -Naur dia-0.97.2-orig/plug-ins/cairo/diacairo.c dia-0.97.2/plug-ins/cairo/diacairo.c ---- dia-0.97.2-orig/plug-ins/cairo/diacairo.c 2009-11-07 12:13:53.000000000 -0500 -+++ dia-0.97.2/plug-ins/cairo/diacairo.c 2012-07-15 10:49:06.433726846 -0400 -@@ -28,7 +28,7 @@ - #include <errno.h> - #define G_LOG_DOMAIN "DiaCairo" - #include <glib.h> --#include <glib/gstdio.h> -+#include <glib.h> - - /* - * To me the following looks rather suspicious. Why do we need to compile -diff -Naur dia-0.97.2-orig/plug-ins/cairo/diacairo-renderer.c dia-0.97.2/plug-ins/cairo/diacairo-renderer.c ---- dia-0.97.2-orig/plug-ins/cairo/diacairo-renderer.c 2011-01-07 06:54:21.000000000 -0500 -+++ dia-0.97.2/plug-ins/cairo/diacairo-renderer.c 2012-07-15 10:49:06.435726846 -0400 -@@ -28,7 +28,7 @@ - #include <errno.h> - #define G_LOG_DOMAIN "DiaCairo" - #include <glib.h> --#include <glib/gstdio.h> -+#include <glib.h> - - #ifdef HAVE_PANGOCAIRO_H - #include <pango/pangocairo.h> -diff -Naur dia-0.97.2-orig/plug-ins/cgm/cgm.c dia-0.97.2/plug-ins/cgm/cgm.c ---- dia-0.97.2-orig/plug-ins/cgm/cgm.c 2009-12-27 11:22:38.000000000 -0500 -+++ dia-0.97.2/plug-ins/cgm/cgm.c 2012-07-15 10:49:06.425726846 -0400 -@@ -31,7 +31,7 @@ - #include <glib.h> - #include <errno.h> - --#include <glib/gstdio.h> -+#include <glib.h> - - #include "intl.h" - #include "message.h" -diff -Naur dia-0.97.2-orig/plug-ins/drs/dia-render-script.c dia-0.97.2/plug-ins/drs/dia-render-script.c ---- dia-0.97.2-orig/plug-ins/drs/dia-render-script.c 2009-11-07 12:13:53.000000000 -0500 -+++ dia-0.97.2/plug-ins/drs/dia-render-script.c 2012-07-15 10:49:06.427726848 -0400 -@@ -54,7 +54,7 @@ - - #define G_LOG_DOMAIN "DiaRenderScript" - #include <glib.h> --#include <glib/gstdio.h> -+#include <glib.h> - - #include "intl.h" - #include "filter.h" -diff -Naur dia-0.97.2-orig/plug-ins/dxf/dxf-export.c dia-0.97.2/plug-ins/dxf/dxf-export.c ---- dia-0.97.2-orig/plug-ins/dxf/dxf-export.c 2009-11-07 09:28:34.000000000 -0500 -+++ dia-0.97.2/plug-ins/dxf/dxf-export.c 2012-07-15 10:49:06.421726850 -0400 -@@ -29,7 +29,7 @@ - #include <math.h> - #include <glib.h> - #include <errno.h> --#include <glib/gstdio.h> -+#include <glib.h> - - #include "autocad_pal.h" - -diff -Naur dia-0.97.2-orig/plug-ins/dxf/dxf-import.c dia-0.97.2/plug-ins/dxf/dxf-import.c ---- dia-0.97.2-orig/plug-ins/dxf/dxf-import.c 2009-11-07 09:28:34.000000000 -0500 -+++ dia-0.97.2/plug-ins/dxf/dxf-import.c 2012-07-15 10:49:06.419726851 -0400 -@@ -30,7 +30,7 @@ - #include <string.h> - #include <math.h> - #include <glib.h> --#include <glib/gstdio.h> -+#include <glib.h> - - #include "intl.h" - #include "message.h" -diff -Naur dia-0.97.2-orig/plug-ins/hpgl/hpgl.c dia-0.97.2/plug-ins/hpgl/hpgl.c ---- dia-0.97.2-orig/plug-ins/hpgl/hpgl.c 2009-11-07 09:28:34.000000000 -0500 -+++ dia-0.97.2/plug-ins/hpgl/hpgl.c 2012-07-15 10:49:06.487726830 -0400 -@@ -37,7 +37,7 @@ - #include <errno.h> - - #include <glib.h> --#include <glib/gstdio.h> -+#include <glib.h> - - #include "intl.h" - #include "message.h" -diff -Naur dia-0.97.2-orig/plug-ins/libart/export_png.c dia-0.97.2/plug-ins/libart/export_png.c ---- dia-0.97.2-orig/plug-ins/libart/export_png.c 2011-07-03 06:56:08.000000000 -0400 -+++ dia-0.97.2/plug-ins/libart/export_png.c 2012-07-15 10:49:06.415726849 -0400 -@@ -29,7 +29,7 @@ - #include <errno.h> - #include <stdlib.h> - --#include <glib/gstdio.h> -+#include <glib.h> - #include <gtk/gtk.h> - - #include "intl.h" -diff -Naur dia-0.97.2-orig/plug-ins/metapost/render_metapost.c dia-0.97.2/plug-ins/metapost/render_metapost.c ---- dia-0.97.2-orig/plug-ins/metapost/render_metapost.c 2009-11-07 09:28:34.000000000 -0500 -+++ dia-0.97.2/plug-ins/metapost/render_metapost.c 2012-07-15 10:49:06.396726857 -0400 -@@ -43,7 +43,7 @@ - #endif - #include <errno.h> - --#include <glib/gstdio.h> -+#include <glib.h> - - #include "intl.h" - #include "render_metapost.h" -diff -Naur dia-0.97.2-orig/plug-ins/pgf/render_pgf.c dia-0.97.2/plug-ins/pgf/render_pgf.c ---- dia-0.97.2-orig/plug-ins/pgf/render_pgf.c 2011-01-07 07:11:34.000000000 -0500 -+++ dia-0.97.2/plug-ins/pgf/render_pgf.c 2012-07-15 10:49:06.445726842 -0400 -@@ -61,8 +61,8 @@ - #endif - #include <errno.h> - --#include <glib/gprintf.h> --#include <glib/gstdio.h> -+#include <glib.h> -+#include <glib.h> - - #include "intl.h" - #include "render_pgf.h" -diff -Naur dia-0.97.2-orig/plug-ins/postscript/paginate_psprint.c dia-0.97.2/plug-ins/postscript/paginate_psprint.c ---- dia-0.97.2-orig/plug-ins/postscript/paginate_psprint.c 2009-11-07 09:28:34.000000000 -0500 -+++ dia-0.97.2/plug-ins/postscript/paginate_psprint.c 2012-07-15 10:49:06.451726838 -0400 -@@ -31,7 +31,7 @@ - #include <errno.h> - #include <sys/stat.h> - --#include <glib/gstdio.h> -+#include <glib.h> - - #include "intl.h" - #include "message.h" -diff -Naur dia-0.97.2-orig/plug-ins/postscript/render_eps.c dia-0.97.2/plug-ins/postscript/render_eps.c ---- dia-0.97.2-orig/plug-ins/postscript/render_eps.c 2009-11-07 09:28:34.000000000 -0500 -+++ dia-0.97.2/plug-ins/postscript/render_eps.c 2012-07-15 10:49:06.451726838 -0400 -@@ -55,7 +55,7 @@ - #include <locale.h> - #include <errno.h> - --#include <glib/gstdio.h> -+#include <glib.h> - - #include "intl.h" - #include "render_eps.h" -diff -Naur dia-0.97.2-orig/plug-ins/pstricks/render_pstricks.c dia-0.97.2/plug-ins/pstricks/render_pstricks.c ---- dia-0.97.2-orig/plug-ins/pstricks/render_pstricks.c 2011-01-07 07:11:34.000000000 -0500 -+++ dia-0.97.2/plug-ins/pstricks/render_pstricks.c 2012-07-15 10:49:06.410726853 -0400 -@@ -50,7 +50,7 @@ - #endif - #include <errno.h> - --#include <glib/gstdio.h> -+#include <glib.h> - - #include "intl.h" - #include "render_pstricks.h" -diff -Naur dia-0.97.2-orig/plug-ins/python/pydia-render.c dia-0.97.2/plug-ins/python/pydia-render.c ---- dia-0.97.2-orig/plug-ins/python/pydia-render.c 2009-11-07 09:28:34.000000000 -0500 -+++ dia-0.97.2/plug-ins/python/pydia-render.c 2012-07-15 10:49:06.503726822 -0400 -@@ -21,7 +21,7 @@ - - #include <Python.h> - #include <glib.h> --#include <glib/gstdio.h> -+#include <glib.h> - - #include <locale.h> - -diff -Naur dia-0.97.2-orig/plug-ins/shape/shape-export.c dia-0.97.2/plug-ins/shape/shape-export.c ---- dia-0.97.2-orig/plug-ins/shape/shape-export.c 2009-11-08 06:14:56.000000000 -0500 -+++ dia-0.97.2/plug-ins/shape/shape-export.c 2012-07-15 10:49:06.489726827 -0400 -@@ -40,7 +40,7 @@ - #include <unistd.h> - #endif - --#include <glib/gstdio.h> -+#include <glib.h> - - /* the dots per centimetre to render this diagram at */ - /* this matches the setting `100%' setting in dia. */ -diff -Naur dia-0.97.2-orig/plug-ins/svg/render_svg.c dia-0.97.2/plug-ins/svg/render_svg.c ---- dia-0.97.2-orig/plug-ins/svg/render_svg.c 2011-12-17 11:30:38.000000000 -0500 -+++ dia-0.97.2/plug-ins/svg/render_svg.c 2012-07-15 10:49:06.392726859 -0400 -@@ -30,7 +30,7 @@ - #endif - - #include <glib.h> --#include <glib/gstdio.h> -+#include <glib.h> - - #include <libxml/entities.h> - #include <libxml/tree.h> -diff -Naur dia-0.97.2-orig/plug-ins/vdx/vdx-export.c dia-0.97.2/plug-ins/vdx/vdx-export.c ---- dia-0.97.2-orig/plug-ins/vdx/vdx-export.c 2009-12-27 11:22:38.000000000 -0500 -+++ dia-0.97.2/plug-ins/vdx/vdx-export.c 2012-07-15 10:55:17.066579728 -0400 -@@ -32,11 +32,12 @@ - - #include <string.h> - #include <math.h> -+#include <sys/stat.h> - #include <glib.h> - #include <stdlib.h> - #include <errno.h> - #include <locale.h> --#include <glib/gstdio.h> -+#include <glib.h> - - #include "intl.h" - #include "message.h" -diff -Naur dia-0.97.2-orig/plug-ins/vdx/vdx-import.c dia-0.97.2/plug-ins/vdx/vdx-import.c ---- dia-0.97.2-orig/plug-ins/vdx/vdx-import.c 2009-12-27 11:22:38.000000000 -0500 -+++ dia-0.97.2/plug-ins/vdx/vdx-import.c 2012-07-15 10:49:06.466726836 -0400 -@@ -28,7 +28,7 @@ - #include <string.h> - #include <math.h> - #include <glib.h> --#include <glib/gstdio.h> -+#include <glib.h> - #include <stdlib.h> - #include <ctype.h> - #include <libxml/tree.h> -diff -Naur dia-0.97.2-orig/plug-ins/wmf/wmf.cpp dia-0.97.2/plug-ins/wmf/wmf.cpp ---- dia-0.97.2-orig/plug-ins/wmf/wmf.cpp 2011-03-13 09:07:48.000000000 -0400 -+++ dia-0.97.2/plug-ins/wmf/wmf.cpp 2012-07-15 10:49:06.482726831 -0400 -@@ -25,7 +25,7 @@ - #include <string.h> - #include <math.h> - #include <glib.h> --#include <glib/gstdio.h> -+#include <glib.h> - - #include "intl.h" - #include "message.h" -diff -Naur dia-0.97.2-orig/plug-ins/wpg/wpg.c dia-0.97.2/plug-ins/wpg/wpg.c ---- dia-0.97.2-orig/plug-ins/wpg/wpg.c 2009-11-07 09:28:34.000000000 -0500 -+++ dia-0.97.2/plug-ins/wpg/wpg.c 2012-07-15 10:49:06.406726855 -0400 -@@ -40,7 +40,7 @@ - #include <errno.h> - - #include <glib.h> --#include <glib/gstdio.h> -+#include <glib.h> - - #include "intl.h" - #include "message.h" -diff -Naur dia-0.97.2-orig/plug-ins/xfig/xfig-export.c dia-0.97.2/plug-ins/xfig/xfig-export.c ---- dia-0.97.2-orig/plug-ins/xfig/xfig-export.c 2011-12-17 11:30:38.000000000 -0500 -+++ dia-0.97.2/plug-ins/xfig/xfig-export.c 2012-07-15 10:49:06.400726856 -0400 -@@ -16,7 +16,7 @@ - #include <locale.h> - - #include <glib.h> --#include <glib/gstdio.h> -+#include <glib.h> - - #include "intl.h" - #include "message.h" -diff -Naur dia-0.97.2-orig/plug-ins/xfig/xfig-import.c dia-0.97.2/plug-ins/xfig/xfig-import.c ---- dia-0.97.2-orig/plug-ins/xfig/xfig-import.c 2009-11-07 12:13:53.000000000 -0500 -+++ dia-0.97.2/plug-ins/xfig/xfig-import.c 2012-07-15 10:49:06.402726853 -0400 -@@ -40,7 +40,7 @@ - #include <locale.h> - - #include <glib.h> --#include <glib/gstdio.h> -+#include <glib.h> - - #include "intl.h" - #include "message.h" -diff -Naur dia-0.97.2-orig/plug-ins/xslt/xslt.c dia-0.97.2/plug-ins/xslt/xslt.c ---- dia-0.97.2-orig/plug-ins/xslt/xslt.c 2009-11-07 12:13:53.000000000 -0500 -+++ dia-0.97.2/plug-ins/xslt/xslt.c 2012-07-15 10:49:06.440726844 -0400 -@@ -27,7 +27,7 @@ - #include <string.h> - #include <errno.h> - --#include <glib/gstdio.h> -+#include <glib.h> - - #include "filter.h" - #include "intl.h" -diff -Naur dia-0.97.2-orig/tests/test-boundingbox.c dia-0.97.2/tests/test-boundingbox.c ---- dia-0.97.2-orig/tests/test-boundingbox.c 2009-11-07 09:28:35.000000000 -0500 -+++ dia-0.97.2/tests/test-boundingbox.c 2012-07-15 10:49:06.986726677 -0400 -@@ -29,7 +29,7 @@ - #include <glib-object.h> - - #if GLIB_CHECK_VERSION(2,16,0) --#include <glib/gtestutils.h> -+#include <glib.h> - #endif - #include "dialib.h" - -diff -Naur dia-0.97.2-orig/tests/test-objects.c dia-0.97.2/tests/test-objects.c ---- dia-0.97.2-orig/tests/test-objects.c 2009-11-07 09:28:35.000000000 -0500 -+++ dia-0.97.2/tests/test-objects.c 2012-07-15 10:49:06.985726677 -0400 -@@ -29,7 +29,7 @@ - #include <glib-object.h> - - #if GLIB_CHECK_VERSION(2,16,0) --#include <glib/gtestutils.h> -+#include <glib.h> - #endif - - #include "object.h" diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 5bc409d10e52..b067358ea065 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -4,11 +4,11 @@ liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost shared_desktop_ontologies, marble, mysql }: stdenv.mkDerivation rec { - name = "digikam-3.5.0"; + name = "digikam-4.4.0"; src = fetchurl { url = "http://download.kde.org/stable/digikam/${name}.tar.bz2"; - sha256 = "0an4awlg0b8pwl6v8p5zfl3aghgnxck2pc322cyk6i6yznj2mgap"; + sha256 = "1sflh3i989f9xi4qym3rzcrx7ahrjf1n9si8c5q05dgm039a4s2w"; }; nativeBuildInputs = [ cmake automoc4 pkgconfig ]; diff --git a/pkgs/applications/graphics/f-spot/default.nix b/pkgs/applications/graphics/f-spot/default.nix index 8ecfc0df1622..291f0adce582 100644 --- a/pkgs/applications/graphics/f-spot/default.nix +++ b/pkgs/applications/graphics/f-spot/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchurl { url = http://tarballs.nixos.org/f-spot-0.0.10.tar.bz2; - md5 = "19cc6e067ccc261b0502ff6189b79832"; + sha256 = "1hgls6hzvxsnk09j9y6hq10qxsc92i864mdg3gk2cimbkbr0mh8b"; }; patches = [./dllmap.patch]; diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index 0235f892b8dc..a7665177046b 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost - boost.lib zlib python swig gfortran soqt libf2c makeWrapper matplotlib + zlib python swig gfortran soqt libf2c makeWrapper matplotlib pycollada pyside pysideShiboken ]; diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index e914186ac815..033a2027ec6b 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -1,32 +1,31 @@ -{ stdenv, fetchgit, pkgconfig, autoconf, automake, gtk, libpng, exiv2, lcms -, intltool, gettext, libchamplain, fbida }: +{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, gtk, libpng, exiv2 +, lcms, intltool, gettext, libchamplain, fbida +}: stdenv.mkDerivation rec { name = "geeqie-${version}"; version = "1.2"; - src = fetchgit { - url = "git://gitorious.org/geeqie/geeqie.git"; - rev = "refs/tags/v${version}"; - sha256 = "1h9w0jrcqcp5jjgmks5pvpppnfxhcd1s3vqlyb3qyil2wfk8n8wp"; + src = fetchurl { + url = mirror://debian/pool/main/g/geeqie/geeqie_1.2.orig.tar.gz; + sha256 = "0wkcpyh3f6ig36x1q6h9iqgq225w37visip48m72j8rpghmv1rn3"; }; - preConfigure = "./autogen.sh"; - configureFlags = [ "--enable-gps" ]; - buildInputs = - [ pkgconfig autoconf automake gtk libpng exiv2 lcms intltool gettext - libchamplain - ]; - - postInstall = - '' - # Allow geeqie to find exiv2 and exiftran, necessary to - # losslessly rotate JPEG images. - sed -i $out/lib/geeqie/geeqie-rotate \ - -e '1 a export PATH=${exiv2}/bin:${fbida}/bin:$PATH' - ''; + preConfigure = "./autogen.sh"; + + buildInputs = [ + autoconf automake libtool pkgconfig gtk libpng exiv2 lcms intltool gettext + #libchamplain + ]; + + postInstall = '' + # Allow geeqie to find exiv2 and exiftran, necessary to + # losslessly rotate JPEG images. + sed -i $out/lib/geeqie/geeqie-rotate \ + -e '1 a export PATH=${exiv2}/bin:${fbida}/bin:$PATH' + ''; meta = with stdenv.lib; { description = "Lightweight GTK+ based image viewer"; diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix index bd155c59c6b2..9f7643ad1c04 100644 --- a/pkgs/applications/graphics/gimp/2.8.nix +++ b/pkgs/applications/graphics/gimp/2.8.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "The GNU Image Manipulation Program"; homepage = http://www.gimp.org/; - license = "GPL"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 7139bc71f3c1..c5350228dcf2 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -59,7 +59,7 @@ rec { sed -e 's,^\(GIMP_PLUGIN_DIR=\).*,\1'"$out/${gimp.name}-plugins", \ -e 's,^\(GIMP_DATA_DIR=\).*,\1'"$out/share/${gimp.name}", -i configure ''; - meta = { + meta = { description = "The GIMP Animation Package"; homepage = http://www.gimp.org; # The main code is given in GPLv3, but it has ffmpeg in it, and I think ffmpeg license @@ -174,10 +174,10 @@ rec { sourceRoot = "${name}/src"; buildPhase = "make gimp"; installPhase = "installPlugins gmic_gimp"; - meta = { + meta = { description = "script language for image processing which comes with its open-source interpreter"; homepage = http://gmic.sourceforge.net/repository.shtml; - license = "CeCILL FREE SOFTWARE LICENSE AGREEMENT"; + license = stdenv.lib.licenses.cecill20; /* The purpose of this Free Software license agreement is to grant users the right to modify and redistribute the software governed by this @@ -197,7 +197,7 @@ rec { # --enable-dst-correction - enable DST correction for file timestamps. # --enable-contrast - enable the contrast setting option. # --enable-interp-none: enable 'None' interpolation (mostly for debugging). - # --with-lensfun: use the lensfun library - experimental feature, read this before using it. + # --with-lensfun: use the lensfun library - experimental feature, read this before using it. # --with-prefix=PREFIX - use also PREFIX as an input prefix for the build # --with-dosprefix=PREFIX - PREFIX in the the prefix in dos format (needed only for ms-window configureFlags = "--enable-extras --enable-dst-correction --enable-contrast"; diff --git a/pkgs/applications/graphics/luminance-hdr/default.nix b/pkgs/applications/graphics/luminance-hdr/default.nix index 7f2d3e245890..7558b0aef4b6 100644 --- a/pkgs/applications/graphics/luminance-hdr/default.nix +++ b/pkgs/applications/graphics/luminance-hdr/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; - buildInputs = [ qt5 boost boost.lib exiv2 fftwFloat gsl ilmbase lcms2 libraw libtiff openexr ]; + buildInputs = [ qt5 boost exiv2 fftwFloat gsl ilmbase lcms2 libraw libtiff openexr ]; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/applications/graphics/ocrad/default.nix b/pkgs/applications/graphics/ocrad/default.nix index ad8735a6dff3..b4becafdb0b4 100644 --- a/pkgs/applications/graphics/ocrad/default.nix +++ b/pkgs/applications/graphics/ocrad/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, lzip, texinfo }: stdenv.mkDerivation rec { - name = "ocrad-0.23"; + name = "ocrad-0.24"; src = fetchurl { url = "mirror://gnu/ocrad/${name}.tar.lz"; - sha256 = "0vx0v4sz8ivgcp04zggdq9cv9sb5zxnn7j1nm15cds0zq1wr9g7m"; + sha256 = "0hhlx072d00bi9qia0nj5izsq4qkscpfz2mpbyfc72msl3hfvslv"; }; buildInputs = [ lzip texinfo ]; diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix index f6d7c25b196d..473db68dc274 100644 --- a/pkgs/applications/graphics/openimageio/default.nix +++ b/pkgs/applications/graphics/openimageio/default.nix @@ -4,15 +4,15 @@ stdenv.mkDerivation rec { name = "oiio-${version}"; - version = "1.4.13"; + version = "1.4.15"; src = fetchurl { url = "https://github.com/OpenImageIO/oiio/archive/Release-${version}.zip"; - sha256 = "1idscm2qqdjgv362l7xk9v162axji7hqh7xdnd3i0wcxwjpgygca"; + sha256 = "1fc5v3qmrzf9qx765fd15r2dc3ccrz4xf4f9q4cwsrspmaxqyqzs"; }; buildInputs = [ - boost boost.lib cmake ilmbase libjpeg libpng libtiff opencolorio openexr + boost cmake ilmbase libjpeg libpng libtiff opencolorio openexr unzip ]; diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index 67611d2f67cc..e6d5ee5528f0 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - qt4 bison flex eigen boost boost.lib mesa glew opencsg cgal mpfr gmp glib + qt4 bison flex eigen boost mesa glew opencsg cgal mpfr gmp glib pkgconfig ]; diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index cc42e1c40466..40f8d441d7e9 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -36,9 +36,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.paraview.org/"; description = "3D Data analysis and visualization application"; - license = "free"; + license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [viric guibert]; platforms = with stdenv.lib.platforms; linux; }; } - diff --git a/pkgs/applications/graphics/rapcad/default.nix b/pkgs/applications/graphics/rapcad/default.nix index b314bdaf6baa..b8a07f01e03a 100644 --- a/pkgs/applications/graphics/rapcad/default.nix +++ b/pkgs/applications/graphics/rapcad/default.nix @@ -1,16 +1,16 @@ -{stdenv, fetchgit, qt4, cgal, boost, gmp, mpfr, flex, bison, dxflib}: +{stdenv, fetchgit, qt5, cgal, boost, gmp, mpfr, flex, bison, dxflib, readline }: stdenv.mkDerivation rec { - version = "0.8.0"; + version = "0.9.5"; name = "rapcad-${version}"; src = fetchgit { url = "https://github.com/GilesBathgate/RapCAD.git"; rev = "refs/tags/v${version}"; - sha256 = "37c7107dc4fcf8942a4ad35377c4e42e6aedfa35296e5fcf8d84882ae35087c7"; + sha256 = "15c18jvgbwyrfhv7r35ih0gzx35vjlsbi984h1sckgh2z17hjq8l"; }; - buildInputs = [qt4 cgal boost boost.lib gmp mpfr flex bison dxflib]; + buildInputs = [qt5 cgal boost gmp mpfr flex bison dxflib readline ]; configurePhase = '' qmake; diff --git a/pkgs/applications/graphics/sane/backends.nix b/pkgs/applications/graphics/sane/backends.nix index 28d2f1e200b2..743215493187 100644 --- a/pkgs/applications/graphics/sane/backends.nix +++ b/pkgs/applications/graphics/sane/backends.nix @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { postInstall = '' if test "$udevSupport" = "1"; then mkdir -p $out/etc/udev/rules.d/ - ./tools/sane-desc -m udev > $out/etc/udev/rules.d/60-libsane.rules || \ - cp tools/udev/libsane.rules $out/etc/udev/rules.d/60-libsane.rules + ./tools/sane-desc -m udev > $out/etc/udev/rules.d/49-libsane.rules || \ + cp tools/udev/libsane.rules $out/etc/udev/rules.d/49-libsane.rules fi ''; diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix index 221a4340dce2..9bca047a7cf1 100644 --- a/pkgs/applications/graphics/sane/xsane.nix +++ b/pkgs/applications/graphics/sane/xsane.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { preConfigure = '' sed -e '/SANE_CAP_ALWAYS_SETTABLE/d' -i src/xsane-back-gtk.c + chmod a+rX -R . ''; buildInputs = [libpng saneBackends saneFrontends libX11 gtk pkgconfig ] diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 1953f951d169..48044fba1666 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, m4, glibc, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite, webkit +{ fetchurl, stdenv, m4, glibc, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite, webkitgtk24x , pkgconfig, gnome3, gst_all_1, which, udev, libraw, glib, json_glib, gettext, desktop_file_utils , lcms2, gdk_pixbuf, librsvg, makeWrapper, gnome_doc_utils }: @@ -18,12 +18,12 @@ let buildInputs = [ pkgconfig glib libsoup ]; }; in stdenv.mkDerivation rec { - version = "0.18.0"; + version = "0.20.2"; name = "shotwell-${version}"; src = fetchurl { - url = "mirror://gnome/sources/shotwell/0.18/${name}.tar.xz"; - sha256 = "0cq0zs13f3f4xyz46yvj4qfpm5nh4ypds7r53pkqm4a3n8ybf5v7"; + url = "mirror://gnome/sources/shotwell/0.20/${name}.tar.xz"; + sha256 = "0h5pdczsrkplvlvq54zk3am4kjmfpd6pn2sz0ky8lfq1fngwiqip"; }; NIX_CFLAGS_COMPILE = "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include"; @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { ''; - buildInputs = [ m4 glibc gtk3 libexif libgphoto2 libsoup libxml2 vala sqlite webkit pkgconfig + buildInputs = [ m4 glibc gtk3 libexif libgphoto2 libsoup libxml2 vala sqlite webkitgtk24x pkgconfig gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee which udev gnome3.gexiv2 libraw rest json_glib gettext desktop_file_utils glib lcms2 gdk_pixbuf librsvg makeWrapper gnome_doc_utils ]; diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix index 95230291fe95..cba69c476b54 100644 --- a/pkgs/applications/graphics/solvespace/default.nix +++ b/pkgs/applications/graphics/solvespace/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { ''; meta = { - description = "A parametric 3d CAD program."; + description = "A parametric 3d CAD program"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/applications/graphics/sxiv/default.nix index 30513577d04b..a82dafb516e0 100644 --- a/pkgs/applications/graphics/sxiv/default.nix +++ b/pkgs/applications/graphics/sxiv/default.nix @@ -1,22 +1,25 @@ -{ stdenv, fetchurl, libX11, imlib2, giflib }: +{ stdenv, fetchgit, libX11, imlib2, giflib, libexif }: stdenv.mkDerivation { - name = "sxiv-1.1.1"; + name = "sxiv-1.3-git"; - src = fetchurl { - url = "https://github.com/muennich/sxiv/archive/v1.1.1.tar.gz"; - name = "sxiv-1.1.tar.gz"; - sha256 = "07r8125xa8d5q71ql71s4i1dx4swy8hypxh2s5h7z2jnn5y9nmih"; + src = fetchgit { + url = "https://github.com/muennich/sxiv.git"; + rev = "6216bf6c2d42be63025d29550831d9f4447f4066"; + sha256 = "e25e19cf073cc2621656e50d2c31cc59cc0fc200716f96c765374568a26977f1"; }; - buildInputs = [ libX11 imlib2 giflib ]; - - prePatch = ''sed -i "s@/usr/local@$out@" Makefile''; + postUnpack = '' + substituteInPlace $sourceRoot/Makefile \ + --replace /usr/local $out + ''; + buildInputs = [ libX11 imlib2 giflib libexif ]; meta = { description = "Simple X Image Viewer"; homepage = "https://github.com/muennich/sxiv"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; }; } diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index 59ca7b7374d4..2b3f4c80bcd0 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/pkgs/applications/graphics/synfigstudio/default.nix @@ -4,14 +4,14 @@ }: let - version = "0.64.1"; + version = "0.64.2"; ETL = stdenv.mkDerivation rec { name = "ETL-0.04.17"; src = fetchurl { url = "mirror://sourceforge/synfig/${name}.tar.gz"; - sha256 = "13kpiswgcpsif9fwcplqr0405aqavqn390cjnivkn3pxv0d2q8iy"; + sha256 = "1i2m31y5hdwr365z3zmfh5p3zm4ga4l4yqrl1qrmjryqqzkw200l"; }; }; @@ -20,36 +20,46 @@ let src = fetchurl { url = "mirror://sourceforge/synfig/synfig-${version}.tar.gz"; - sha256 = "1b4ksxnqbaq4rxlvasmrvk7z4jvjbsg4ns3cns2qcnz64dyvbgda"; + sha256 = "04mx321z929ngl65hfc1hv5jw37wqbh8y2avmpvajagvn6lp3zdl"; }; + configureFlags = [ + "--with-boost=${boost.dev}" + "--with-boost-libdir=${boost.lib}/lib" + ]; + patches = [ ./synfig-cstring.patch ]; buildInputs = [ - ETL boost boost.lib cairo gettext glibmm libsigcxx libtool libxmlxx pango + ETL boost cairo gettext glibmm libsigcxx libtool libxmlxx pango pkgconfig ]; - - configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ]; }; in stdenv.mkDerivation rec { name = "synfigstudio-${version}"; src = fetchurl { - url = "mirror://sourceforge/synfig/${name}.tar.gz"; - sha256 = "0nl6vpsn5dcjd5qhbrmd0j4mr3wddvymkg9414m77cdpz4l8b9v2"; - }; + url = "mirror://sourceforge/synfig/${name}.tar.gz"; + sha256 = "13hw4z6yx70g4mnjmvmxkk7b1qzlwmqjhxflq5dd6cqdsmfw9mc7"; + }; buildInputs = [ - ETL boost cairo fontsConf gettext glibmm gtk gtkmm imagemagick intltool + ETL boost cairo gettext glibmm gtk gtkmm imagemagick intltool intltool libsigcxx libtool libxmlxx pkgconfig synfig ]; + configureFlags = [ + "--with-boost=${boost.dev}" + "--with-boost-libdir=${boost.lib}/lib" + ]; + preBuild = '' export FONTCONFIG_FILE=${fontsConf} ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "A 2D animation program"; homepage = http://www.synfig.org; diff --git a/pkgs/applications/graphics/ufraw/default.nix b/pkgs/applications/graphics/ufraw/default.nix index dbfda4e58195..3de3d6cdd5a9 100644 --- a/pkgs/applications/graphics/ufraw/default.nix +++ b/pkgs/applications/graphics/ufraw/default.nix @@ -2,12 +2,12 @@ , libjpeg, libtiff, cfitsio, exiv2, lcms, gtkimageview, lensfun }: stdenv.mkDerivation rec { - name = "ufraw-0.19.2"; + name = "ufraw-0.20"; src = fetchurl { # XXX: These guys appear to mutate uploaded tarballs! url = "mirror://sourceforge/ufraw/${name}.tar.gz"; - sha256 = "1lxba7pb3vcsq94dwapg9bk9mb3ww6r3pvvcyb0ah5gh2sgzxgkk"; + sha256 = "1q51p0ynzayxwfpilj0s38aapgkfga00gbl7xi0ndx9q6bvk1kbd"; }; buildInputs = diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix new file mode 100644 index 000000000000..2929513952e1 --- /dev/null +++ b/pkgs/applications/graphics/yed/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, makeWrapper, unzip, jre }: + +stdenv.mkDerivation rec { + name = "yEd-3.13"; + + src = fetchurl { + url = "http://www.yworks.com/products/yed/demo/${name}.zip"; + sha256 = "1d5qs6q31k49y9gh054aafck548pv9f97b3il4iksnna1r59w5jy"; + }; + + nativeBuildInputs = [ unzip makeWrapper ]; + + installPhase = '' + mkdir -p $out/yed + cp -r * $out/yed + mkdir -p $out/bin + + makeWrapper ${jre}/bin/java $out/bin/yed \ + --add-flags "-jar $out/yed/yed.jar --" + ''; + + meta = with stdenv.lib; { + license = licenses.unfreeRedistributable; + homepage = http://www.yworks.com/en/products/yfiles/yed/; + description = "A powerful desktop application that can be used to quickly and effectively generate high-quality diagrams"; + platforms = jre.meta.platforms; + maintainer = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/applications/graphics/zgrviewer/default.nix b/pkgs/applications/graphics/zgrviewer/default.nix index 4eefd5749b65..a6c299d1ab3a 100644 --- a/pkgs/applications/graphics/zgrviewer/default.nix +++ b/pkgs/applications/graphics/zgrviewer/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, jre, unzip}: stdenv.mkDerivation rec { - version = "0.8.2"; + version = "0.9.0"; pname = "zgrviewer"; name="${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/zvtm/${pname}/${version}/${name}.zip"; - sha256 = "a76b9865c1490a6cfc08911592a19c15fe5972bf58e017cb31db580146f069bb"; + sha256 = "1yg2rck81sqqrgfi5kn6c1bz42dr7d0zqpcsdjhicssi1y159f23"; }; buildInputs = [jre unzip]; buildPhase = ""; diff --git a/pkgs/applications/misc/bitcoin/altcoins.nix b/pkgs/applications/misc/bitcoin/altcoins.nix index 2643094e2f16..4b7d81ba8825 100644 --- a/pkgs/applications/misc/bitcoin/altcoins.nix +++ b/pkgs/applications/misc/bitcoin/altcoins.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, pkgconfig , openssl, db48, boost, zlib, miniupnpc, qt4, qrencode, glib, protobuf -, utillinux, autogen, autoconf, autobuild, automake, db }: +, utillinux, autogen, autoconf, autobuild, automake, autoreconfHook, db }: with stdenv.lib; @@ -8,7 +8,7 @@ let buildAltcoin = makeOverridable ({walletName, gui ? true, ...}@a: stdenv.mkDerivation ({ name = "${walletName}${toString (optional (!gui) "d")}-${a.version}"; - buildInputs = [ openssl db48 boost zlib miniupnpc ] + buildInputs = [ pkgconfig openssl db48 boost zlib miniupnpc ] ++ optionals gui [ qt4 qrencode ] ++ a.extraBuildInputs or []; configurePhase = optional gui "qmake"; @@ -27,7 +27,7 @@ let meta = { platforms = platforms.unix; license = license.mit; - maintainers = [ maintainers.offline ]; + maintainers = [ maintainers.offline ] ++ a.extraMaintainers; }; } // a) ); @@ -35,31 +35,6 @@ let in rec { inherit buildAltcoin; - litecoin = buildAltcoin rec { - walletName = "litecoin"; - version = "0.8.5.3-rc3"; - - src = fetchurl { - url = "https://github.com/litecoin-project/litecoin/archive/v${version}.tar.gz"; - sha256 = "1z4a7bm3z9kd7n0s38kln31z8shsd32d5d5v3br5p0jlnr5g3lk7"; - }; - - meta = { - description = "Litecoin is a lite version of Bitcoin using scrypt as a proof-of-work algorithm."; - longDescription= '' - Litecoin is a peer-to-peer Internet currency that enables instant payments - to anyone in the world. It is based on the Bitcoin protocol but differs - from Bitcoin in that it can be efficiently mined with consumer-grade hardware. - Litecoin provides faster transaction confirmations (2.5 minutes on average) - and uses a memory-hard, scrypt-based mining proof-of-work algorithm to target - the regular computers and GPUs most people already have. - The Litecoin network is scheduled to produce 84 million currency units. - ''; - homepage = https://litecoin.org/; - }; - }; - litecoind = litecoin.override { gui = false; }; - namecoin = buildAltcoin rec { walletName = "namecoin"; version = "0.3.51.00"; @@ -75,9 +50,33 @@ in rec { extraBuildInputs = [ glib ]; meta = { - description = "Namecoin is a decentralized key/value registration and transfer system based on Bitcoin technology."; + description = "A decentralized key/value registration and transfer system based on Bitcoin technology"; homepage = http://namecoin.info; }; }; + darkcoin = buildAltcoin rec { + walletName = "darkcoin"; + version = "0.9.13.15"; + + src = fetchurl { + url = "https://github.com/darkcoin/darkcoin/archive/v${version}.tar.gz"; + sha256 = "1kly2y3g4dr1jwwf81smqvc7k662x6rvg4ggmxva1yaifb67bgjb"; + }; + + extraBuildInputs = [ glib ]; + + meta = { + description = "A decentralized key/value registration and transfer system"; + longDescription = '' + Darkcoin (DRK) is an open sourced, privacy-centric digital + currency. It allows you keep your finances private as you make + transactions, similar to cash. + ''; + homepage = http://darkcoin.io; + extraMaintainers = [ maintainers.AndersonTorres ]; + }; + }; + darkcoind = darkcoin.override { gui = false; }; + } diff --git a/pkgs/applications/misc/bitcoin/default.nix b/pkgs/applications/misc/bitcoin/default.nix index 2b68c58b12dd..c886cf3c2707 100644 --- a/pkgs/applications/misc/bitcoin/default.nix +++ b/pkgs/applications/misc/bitcoin/default.nix @@ -4,12 +4,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "0.9.2.1"; + version = "0.9.3"; name = "bitcoin${toString (optional (!gui) "d")}-${version}"; src = fetchurl { url = "https://bitcoin.org/bin/${version}/bitcoin-${version}-linux.tar.gz"; - sha256 = "0060f7d38b98113ab912d4c184000291d7f026eaf77ca5830deec15059678f54"; + sha256 = "1kb59w7232qzfh952rz6vvjri2w26n9cq7baml0vifdsdhxph9f4"; }; # hexdump from utillinux is required for tests @@ -23,15 +23,13 @@ stdenv.mkDerivation rec { cd bitcoin* ''; - configureFlags = [ - "--with-boost=${boost}" - ]; - preCheck = '' # At least one test requires writing in $HOME HOME=$TMPDIR ''; + configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ]; + doCheck = true; enableParallelBuilding = true; @@ -49,5 +47,6 @@ stdenv.mkDerivation rec { homepage = "http://www.bitcoin.org/"; maintainers = [ maintainers.roconnor ]; license = licenses.mit; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/bitcoin/dogecoin.nix b/pkgs/applications/misc/bitcoin/dogecoin.nix index 7ace3c161c7b..21da32104d34 100644 --- a/pkgs/applications/misc/bitcoin/dogecoin.nix +++ b/pkgs/applications/misc/bitcoin/dogecoin.nix @@ -30,7 +30,6 @@ let ./autogen.sh \ && ./configure --prefix=$out \ --with-incompatible-bdb \ - --with-boost-libdir=${boost}/lib \ ${ if withGui then "--with-gui" else "" } ''; diff --git a/pkgs/applications/misc/bitcoin/litecoin.nix b/pkgs/applications/misc/bitcoin/litecoin.nix new file mode 100644 index 000000000000..3e5d9427cf32 --- /dev/null +++ b/pkgs/applications/misc/bitcoin/litecoin.nix @@ -0,0 +1,60 @@ +{ stdenv, fetchurl, pkgconfig +, openssl, db48, boost, zlib, miniupnpc, qt4, qrencode, glib, protobuf +, utillinux, autogen, autoreconfHook }: + +with stdenv.lib; + +let + mkAutoreconfCoin = + { name, version, withGui, src, meta }: + + stdenv.mkDerivation { + + inherit src meta; + + name = name + (toString (optional (!withGui) "d")) + "-" + version; + + buildInputs = [ autogen autoreconfHook pkgconfig openssl + boost zlib miniupnpc db48 glib utillinux protobuf ] + ++ optionals withGui [ qt4 qrencode protobuf ]; + + configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ] ++ optionals withGui [ "--with-gui=qt4" ]; + }; + + mkLitecoin = { withGui }: + + mkAutoreconfCoin rec { + + name = "litecoin"; + version = "0.9.3-preview5"; + inherit withGui; + + src = fetchurl { + url = "https://github.com/litecoin-project/litecoin/archive/v${version}.tar.gz"; + sha256 = "0nnfz4s2g28jb5fqy6cabsryp3h2amzlyslr6g6k8r1vmzvx5ym6"; + }; + + meta = with stdenv.lib; { + description = "A lite version of Bitcoin using scrypt as a proof-of-work algorithm"; + longDescription= '' + Litecoin is a peer-to-peer Internet currency that enables instant payments + to anyone in the world. It is based on the Bitcoin protocol but differs + from Bitcoin in that it can be efficiently mined with consumer-grade hardware. + Litecoin provides faster transaction confirmations (2.5 minutes on average) + and uses a memory-hard, scrypt-based mining proof-of-work algorithm to target + the regular computers and GPUs most people already have. + The Litecoin network is scheduled to produce 84 million currency units. + ''; + homepage = https://litecoin.org/; + platforms = platforms.unix; + license = licenses.mit; + maintainers = [ maintainers.offline maintainers.AndersonTorres ]; + }; + }; + +in { + + litecoin = mkLitecoin { withGui = true; }; + litecoind = mkLitecoin { withGui = false; }; + +} diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 808ef8d593d6..01f9b861bf27 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -9,15 +9,15 @@ with lib; stdenv.mkDerivation rec { - name = "blender-2.72"; + name = "blender-2.72b"; src = fetchurl { url = "http://download.blender.org/source/${name}.tar.gz"; - sha256 = "0wydh5bs1pxnx3ya65lfy3val1s8wz027a5kb4va6wg3aqnwlvlv"; + sha256 = "0ixz8h3c08p4f84x8r85nzddwvc0h5lw1ci8gdg2x3m2mw2cfdj4"; }; buildInputs = - [ SDL boost boost.lib cmake ffmpeg gettext glew ilmbase libXi + [ SDL boost cmake ffmpeg gettext glew ilmbase libXi libjpeg libpng libsamplerate libsndfile libtiff mesa openal opencolorio openexr openimageio /* openjpeg */ python zlib fftw ] diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index a9f4071caaec..4656e5add13f 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "calibre-2.5.0"; + name = "calibre-2.12.0"; src = fetchurl { url = "mirror://sourceforge/calibre/${name}.tar.xz"; - sha256 = "0zl2rpwn5xdgwm4ffb5pizk3247wfghl8ilz0i80hyp36zzxgl8p"; + sha256 = "1qp3aq6f6ngfy8m0bj6rzdf6p2vmk4bxycxfby2n8byfhr8gaclf"; }; inherit python; diff --git a/pkgs/applications/misc/cdrtools/default.nix b/pkgs/applications/misc/cdrtools/default.nix index d1b3b2840526..d96236c94ee0 100644 --- a/pkgs/applications/misc/cdrtools/default.nix +++ b/pkgs/applications/misc/cdrtools/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/cdrtools/${name}.tar.bz2"; - md5 = "d44a81460e97ae02931c31188fe8d3fd"; + sha256 = "08kc5w4z5k2ka7i05an7gfzzp0fsrc403riav7bw8xws0rsn32vj"; }; patches = [./cdrtools-2.01-install.patch]; diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index c290cdfb6908..581081975e53 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.07"; + version = "14.09"; in stdenv.mkDerivation rec { name = "cura-${version}"; src = fetchurl { url = "https://github.com/daid/Cura/archive/${version}.tar.gz"; - sha256 = "1jfgkb2qh1syakcssk66yhnfjm9p9qcx48v34bbza9nryrdlmxdb"; + sha256 = "1nr26hfqa6chim5qch92wpk0s28wfvznvcf3kkzgf23hw707f40v"; }; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/misc/d4x/default.nix b/pkgs/applications/misc/d4x/default.nix index d6ca3939d137..3c146249dd0b 100644 --- a/pkgs/applications/misc/d4x/default.nix +++ b/pkgs/applications/misc/d4x/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "d4x-2.5.7.1"; - + inherit boost; src = fetchurl { @@ -10,15 +10,11 @@ stdenv.mkDerivation { sha256 = "1i1jj02bxynisqapv31481sz9jpfp3f023ky47spz1v1wlwbs13m"; }; - configurePhase = "./configure --prefix=\$out " - + " --with-boost-libdir=\$boost/lib" - + " --with-boost-includedir=\$boost/include"; - buildInputs = [ gtk glib pkgconfig openssl boost ]; - meta = { + meta = { description = "Graphical download manager"; homepage = http://www.krasu.ru/soft/chuchelo/; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; } diff --git a/pkgs/applications/misc/dmenu2/default.nix b/pkgs/applications/misc/dmenu2/default.nix new file mode 100644 index 000000000000..1637586eb477 --- /dev/null +++ b/pkgs/applications/misc/dmenu2/default.nix @@ -0,0 +1,29 @@ +{stdenv, fetchhg, libX11, libXinerama, libXft, zlib}: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "dmenu2"; + + src = fetchhg { + url = "https://bitbucket.org/melek/dmenu2"; + rev = "36cb94a16edf928bdaaa636123392517ed469be0"; + sha256 = "1b17z5ypg6ij7zz3ncp3irc87raccna10y4w490c872a99lp23lv"; + }; + + buildInputs = [ libX11 libXinerama zlib libXft ]; + + postPatch = '' + sed -ri -e 's!\<(dmenu|stest)\>!'"$out/bin"'/&!g' dmenu_run + ''; + + preConfigure = [ ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk'' ]; + + meta = { + description = "A patched fork of the original dmenu - an efficient dynamic menu for X"; + homepage = https://bitbucket.org/melek/dmenu2; + license = stdenv.lib.licenses.mit; + maintainers = with maintainers; [ cstrahan ]; + platforms = with platforms; all; + }; +} diff --git a/pkgs/applications/misc/doomseeker/default.nix b/pkgs/applications/misc/doomseeker/default.nix new file mode 100644 index 000000000000..404fb9553861 --- /dev/null +++ b/pkgs/applications/misc/doomseeker/default.nix @@ -0,0 +1,30 @@ +{ stdenv, cmake, fetchurl, pkgconfig, qt4, zlib, bzip2 }: + +stdenv.mkDerivation rec { + name = "doomseeker-0.12.1b"; + src = fetchurl { + url = "http://doomseeker.drdteam.org/files/${name}_src.tar.bz2"; + sha256 = "110yg3w3y1x8p4gqpxb6djxw348caj50q5liq8ssb5mf78v8gk6b"; + }; + + cmakeFlags = '' + -DCMAKE_BUILD_TYPE=Release + ''; + + buildInputs = [ cmake pkgconfig qt4 zlib bzip2 ]; + + enableParallelBuilding = true; + + patchPhase = '' + sed -e 's#/usr/share/applications#$out/share/applications#' -i src/core/CMakeLists.txt + ''; + + meta = { + homepage = http://doomseeker.drdteam.org/; + description = "Multiplayer server browser for many Doom source ports"; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ MP2E ]; + }; +} + diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix index ea9383a6e10f..db613cd49222 100644 --- a/pkgs/applications/misc/eaglemode/default.nix +++ b/pkgs/applications/misc/eaglemode/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, perl, libX11, libjpeg, libpng, libtiff, pkgconfig, -librsvg, glib, gtk, libXext, libXxf86vm, poppler }: +librsvg, glib, gtk, libXext, libXxf86vm, poppler, xineLib }: stdenv.mkDerivation rec { - name = "eaglemode-0.85.0"; + name = "eaglemode-0.86.0"; src = fetchurl { url = "mirror://sourceforge/eaglemode/${name}.tar.bz2"; - sha256 = "0mz4rg2k36wvcv55dg0a5znaczpl5h4gwkkb34syj89xk8jlbwsc"; + sha256 = "1a2hzyck95g740qg4p4wd4fjwsmlknh75i9sbx5r5v9pyr4i3m4f"; }; buildInputs = [ perl libX11 libjpeg libpng libtiff pkgconfig - librsvg glib gtk libXxf86vm libXext poppler ]; + librsvg glib gtk libXxf86vm libXext poppler xineLib ]; # The program tries to dlopen both Xxf86vm and Xext, so we use the # trick on NIX_LDFLAGS and dontPatchELF to make it find them. @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { # http://sourceforge.net/projects/eaglemode/forums/forum/808824/topic/5115261 buildPhase = '' export NIX_LDFLAGS="$NIX_LDFLAGS -lXxf86vm -lXext" - yes y | perl make.pl build + perl make.pl build ''; dontPatchELF = true; diff --git a/pkgs/applications/misc/epdfview/default.nix b/pkgs/applications/misc/epdfview/default.nix index d79162289c3c..da198e6d88b0 100644 --- a/pkgs/applications/misc/epdfview/default.nix +++ b/pkgs/applications/misc/epdfview/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk, poppler }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, gtk, poppler }: stdenv.mkDerivation rec { name = "epdfview-0.1.8"; src = fetchurl { @@ -6,7 +6,17 @@ stdenv.mkDerivation rec { sha256 = "1w7qybh8ssl4dffi5qfajq8mndw7ipsd92vkim03nywxgjp4i1ll"; }; buildInputs = [ pkgconfig gtk poppler ]; - patches = [ ./glib-top-level-header.patch ]; + patches = [ (fetchpatch { + name = "epdfview-0.1.8-glib2-headers.patch"; + url = "https://projects.archlinux.org/svntogit/community.git/plain/trunk/epdfview-0.1.8-glib2-headers.patch?h=packages/epdfview&id=40ba115c860bdec31d03a30fa594a7ec2864d634"; + sha256 = "17df6s1zij5ficj67xszq6kd88cy620az3ic55065ccnmsd73f8h"; + }) + (fetchpatch { + name = "epdfview-0.1.8-modern-cups.patch"; + url = "https://projects.archlinux.org/svntogit/community.git/plain/trunk/epdfview-0.1.8-modern-cups.patch?h=packages/epdfview&id=40ba115c860bdec31d03a30fa594a7ec2864d634"; + sha256 = "07yvgvai2bvbr5fa1mv6lg7nqr0qyryjn1xyjlh8nidg9k9vv001"; + }) + ]; meta = { homepage = http://trac.emma-soft.com/epdfview/; description = "A lightweight PDF document viewer using Poppler and GTK+"; diff --git a/pkgs/applications/misc/epdfview/glib-top-level-header.patch b/pkgs/applications/misc/epdfview/glib-top-level-header.patch deleted file mode 100644 index a321ad3a2b67..000000000000 --- a/pkgs/applications/misc/epdfview/glib-top-level-header.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur epdfview-0.1.8-orig/src/gtk/StockIcons.h epdfview-0.1.8/src/gtk/StockIcons.h ---- epdfview-0.1.8-orig/src/gtk/StockIcons.h 2011-05-28 06:24:57.000000000 -0400 -+++ epdfview-0.1.8/src/gtk/StockIcons.h 2012-07-15 11:02:43.946339253 -0400 -@@ -18,7 +18,7 @@ - #if !defined (__STOCK_ICONS_H__) - #define __STOCK_ICONS_H__ - --#include <glib/gmacros.h> -+#include <glib.h> - - G_BEGIN_DECLS - diff --git a/pkgs/applications/misc/evtest/default.nix b/pkgs/applications/misc/evtest/default.nix index 638f254364e8..bccfd95e32bf 100644 --- a/pkgs/applications/misc/evtest/default.nix +++ b/pkgs/applications/misc/evtest/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, autoconf, automake, pkgconfig, libxml2 }: stdenv.mkDerivation rec { - name = "evtest-1.31"; + name = "evtest-1.32"; preConfigure = "autoreconf -iv"; @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://anongit.freedesktop.org/evtest"; - rev = "871371806017301373b8b0e5b7e8f168ce1ea13f"; - sha256 = "1hxldlldlrb9lnnybn839a97fpqd1cixbmci2wzgr0rzhjbwhcgp"; + rev = "refs/tags/evtest-1.32"; + sha256 = "150lb7d2gnkcqgfw1hcnb8lcvdb52fpig9j9qxjizp6irhlw2a31"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/freicoin/default.nix b/pkgs/applications/misc/freicoin/default.nix index 06ea5e9ad5cb..65265fc07a5a 100644 --- a/pkgs/applications/misc/freicoin/default.nix +++ b/pkgs/applications/misc/freicoin/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { # I think that openssl and zlib are required, but come through other # packages - buildInputs = [ db boost boost.lib gmp mpfr miniupnpc qt4 unzip ]; + buildInputs = [ db boost gmp mpfr miniupnpc qt4 unzip ]; configurePhase = "qmake"; diff --git a/pkgs/applications/misc/gammu/default.nix b/pkgs/applications/misc/gammu/default.nix index 56e45b11c706..b90a243aec4b 100644 --- a/pkgs/applications/misc/gammu/default.nix +++ b/pkgs/applications/misc/gammu/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python, pkgconfig, cmake, bluez, libusb1, curl -, libiconv, gettext, sqlite }: +, libiconvOrEmpty, gettext, sqlite }: with stdenv.lib; @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { patches = [ ./bashcomp-dir.patch ]; - buildInputs = [ python pkgconfig cmake bluez libusb1 curl libiconv - gettext sqlite ]; + buildInputs = [ python pkgconfig cmake bluez libusb1 curl gettext sqlite ] + ++ libiconvOrEmpty; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index b25d347ec873..c7c110a978a5 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -1,16 +1,27 @@ -{ stdenv, fetchurl, pkgconfig, gtk, gettext }: +{ stdenv, fetchurl, pkgconfig, gtk, gettext, withBuildColors ? true, ncurses ? null}: +assert withBuildColors -> ncurses != null; + +with stdenv.lib; stdenv.mkDerivation rec { - name = "girara-0.2.2"; + name = "girara-${version}"; + version = "0.2.3"; src = fetchurl { url = "http://pwmt.org/projects/girara/download/${name}.tar.gz"; - sha256 = "0lv6wqhx2avdxj6yx111jfs4j32r0xzmmkhy7pgzxpf73kgxz0k3"; + sha256 = "1phfmqp8y17zcy9yi6pm2f80x8ldbk60iswpm4bmjz5217jwqzxh"; }; + preConfigure = '' + sed -i 's/ifdef TPUT_AVAILABLE/ifneq ($(TPUT_AVAILABLE), 0)/' colors.mk + ''; + buildInputs = [ pkgconfig gtk gettext ]; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ] + ++ optional withBuildColors "TPUT=${ncurses}/bin/tput" + ++ optional (!withBuildColors) "TPUT_AVAILABLE=0" + ; meta = { homepage = http://pwmt.org/projects/girara/; @@ -19,9 +30,8 @@ stdenv.mkDerivation rec { girara is a library that implements a GTK+ based VIM-like user interface that focuses on simplicity and minimalism. ''; - license = stdenv.lib.licenses.zlib; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.garbas ]; + license = licenses.zlib; + platforms = platforms.linux; + maintainers = [ maintainers.garbas ]; }; } - diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix index db8595e1baa8..888d39c37320 100644 --- a/pkgs/applications/misc/gnuradio/default.nix +++ b/pkgs/applications/misc/gnuradio/default.nix @@ -23,15 +23,15 @@ stdenv.mkDerivation rec { name = "gnuradio-${version}"; - version = "3.7.5"; + version = "3.7.5.1"; src = fetchurl { url = "http://gnuradio.org/releases/gnuradio/${name}.tar.gz"; - sha256 = "0hv2nyz2hp1mjinin2q7jimh9mr81rjqvghqmaglz8w70qcn4zs6"; + sha256 = "0gg4i8s1z5pcfk8d7n7baxv3lx2cjcizimvbziraj27lcbvpmwar"; }; buildInputs = [ - cmake pkgconfig git boost boost.lib cppunit fftw python swig2 orc lxml qt4 + cmake pkgconfig git boost cppunit fftw python swig2 orc lxml qt4 qwt alsaLib SDL libusb1 uhd gsl makeWrapper ]; diff --git a/pkgs/applications/misc/gosmore/default.nix b/pkgs/applications/misc/gosmore/default.nix index e93e2be85e38..ea72dc032695 100644 --- a/pkgs/applications/misc/gosmore/default.nix +++ b/pkgs/applications/misc/gosmore/default.nix @@ -1,34 +1,30 @@ -a@{fetchsvn, libxml2, gtk, curl, pkgconfig, lib, ...} : -let - fetchsvn = a.fetchsvn; +{ stdenv, fetchsvn, libxml2, gtk, curl, pkgconfig } : - buildInputs = with a; [ - libxml2 gtk curl pkgconfig - ]; +let + version = "30811"; in -rec { +stdenv.mkDerivation { + name = "gosmore-r${version}"; src = fetchsvn { url = http://svn.openstreetmap.org/applications/rendering/gosmore; - sha256 = "0ds61gl75rnzvm0hj9papl5sfcgdv4310df9ch7x9rifssfli9zm"; - rev = "24178"; - } + "/"; + sha256 = "0qyvrb4xgy4msc7f65widzkvjzc8mlddc4dyr1i76b7wd3gpk0xj"; + rev = "${version}"; + }; - inherit buildInputs; - configureFlags = []; + buildInputs = [ libxml2 gtk curl ]; - /* doConfigure should be removed if not needed */ - phaseNames = ["fixCurlIncludes" "doConfigure" "doMakeInstall"]; + nativeBuildInputs = [ pkgconfig ]; - fixCurlIncludes = a.fullDepEntry '' + prePatch = '' sed -e '/curl.types.h/d' -i *.{c,h,hpp,cpp} - '' ["minInit" "doUnpack"]; + ''; - name = "gosmore-r21657"; - meta = { + meta = with stdenv.lib; { description = "Open Street Map viewer"; - maintainers = [ - a.lib.maintainers.raskin + homepage = http://sourceforge.net/projects/gosmore/; + maintainers = with maintainers; [ + raskin ]; - platforms = a.lib.platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix index 7ff253fd4e8d..eafa5c104058 100644 --- a/pkgs/applications/misc/gphoto2/default.nix +++ b/pkgs/applications/misc/gphoto2/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "gphoto2-2.5.3"; + name = "gphoto2-2.5.5"; src = fetchurl { url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; - sha256 = "0i6qjyvgn3aaspiblmiwv51mfy92gm73xpbd3z41ki8mw7plg53i"; + sha256 = "1d0lvp5gsrss72597wixhgh8prcw4g7izfg3zdzzsswjgnlsxsal"; }; nativeBuildInputs = [ pkgconfig gettext ]; diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix new file mode 100644 index 000000000000..31cdb8d17863 --- /dev/null +++ b/pkgs/applications/misc/gramps/default.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchurl, gtk3, pythonPackages, python, pycairo, pygobject3, intltool, + pango, gsettings_desktop_schemas }: + +pythonPackages.buildPythonPackage rec { + version = "4.1.1"; + name = "gramps-${version}"; + namePrefix = ""; + + buildInputs = [ intltool gtk3 ]; + + # Currently broken + doCheck = false; + + src = fetchurl { + url = "mirror://sourceforge/gramps/Stable/${version}/${name}.tar.gz"; + sha256 = "0jdps7yx2mlma1hdj64wssvnqd824xdvw0bmn2dnal5fn3h7h060"; + }; + + pythonPath = [ pygobject3 pango pycairo pythonPackages.bsddb ]; + + # Same installPhase as in buildPythonPackage but without --old-and-unmanageble + # install flag. + installPhase = '' + runHook preInstall + + mkdir -p "$out/lib/${python.libPrefix}/site-packages" + + export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" + + ${python}/bin/${python.executable} setup.py install \ + --install-lib=$out/lib/${python.libPrefix}/site-packages \ + --prefix="$out" + + eapth="$out/lib/${python.libPrefix}"/site-packages/easy-install.pth + if [ -e "$eapth" ]; then + # move colliding easy_install.pth to specifically named one + mv "$eapth" $(dirname "$eapth")/${name}.pth + fi + + rm -f "$out/lib/${python.libPrefix}"/site-packages/site.py* + + runHook postInstall + ''; + + # gobjectIntrospection package, wrap accordingly + preFixup = '' + wrapProgram $out/bin/gramps \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" + ''; + + meta = with stdenv.lib; { + description = "Genealogy software"; + homepage = http://gramps-project.org; + license = licenses.gpl2; + }; +} diff --git a/pkgs/applications/misc/hello/ex-2/default.nix b/pkgs/applications/misc/hello/ex-2/default.nix index 71c9777ff9b7..161be5c6f1be 100644 --- a/pkgs/applications/misc/hello/ex-2/default.nix +++ b/pkgs/applications/misc/hello/ex-2/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "hello-2.9"; + name = "hello-2.10"; src = fetchurl { url = "mirror://gnu/hello/${name}.tar.gz"; - sha256 = "19qy37gkasc4csb1d3bdiz9snn8mir2p3aj0jgzmfv0r2hi7mfzc"; + sha256 = "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i"; }; doCheck = true; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/hello/manual/; license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.ludo ]; + maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index fab492d5c099..b58f0a5703c1 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -23,7 +23,7 @@ assert mercurialSupport -> (mercurial != null); let name = "ikiwiki"; - version = "3.20140227"; + version = "3.20141016"; lib = stdenv.lib; in @@ -32,7 +32,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz"; - sha256 = "1bbpqs4c1la1yqcxcxj3xip3wadjnjq0wawv19j6d6baymm66cr3"; + sha256 = "1amvrb6djil7g0yabsngfs0f1n7qcvj2hddipjkgfjbmghd6jqiw"; }; buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix new file mode 100644 index 000000000000..2ae5a7ac8efa --- /dev/null +++ b/pkgs/applications/misc/k2pdfopt/default.nix @@ -0,0 +1,110 @@ +# Build procedure lifted from https://aur.archlinux.org/packages/k2/k2pdfopt/PKGBUILD +{ stdenv, fetchzip, fetchurl, writeScript, libX11, libXext, autoconf, automake, libtool + , leptonica, libpng, libtiff, zlib, openjpeg, freetype, jbig2dec, djvulibre + , openssl }: + +let + mupdf_src = fetchurl { + url = http://www.mupdf.com/downloads/archive/mupdf-1.5-source.tar.gz; + sha256 = "0sl47zqf4c9fhs4h5zg046vixjmwgy4vhljhr5g4md733nash7z4"; + }; + + tess_src = fetchurl { + url = http://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.02.02.tar.gz; + sha256 = "0g81m9y4iydp7kgr56mlkvjdwpp3mb01q385yhdnyvra7z5kkk96"; + }; + + gocr_src = fetchurl { + url = http://www-e.uni-magdeburg.de/jschulen/ocr/gocr-0.49.tar.gz; + sha256 = "06hpzp7rkkwfr1fvmc8kcfz9v490i9yir7f7imh13gmka0fr6afc"; + }; + +in stdenv.mkDerivation rec { + name = "k2pdfopt"; + src = fetchzip { + url = http://www.willus.com/k2pdfopt/src/k2pdfopt_v2.21_src.zip; + sha256 = "1vy0yw41z6p95gmivjk4r534zbg0kqap4lr9ps56kvjw51q8r54j"; + }; + + buildInputs = [ libX11 libXext autoconf automake libtool leptonica libpng libtiff zlib + openjpeg freetype jbig2dec djvulibre openssl ]; + NIX_LDFLAGS = "-lX11 -lXext"; + + k2_pa = ./k2pdfopt.patch; + tess_pa = ./tesseract.patch; + + builder = writeScript "builder.sh" '' + . ${stdenv}/setup + set -e + + plibs=`pwd`/patched_libraries + + tar zxf ${mupdf_src} + cp $src/mupdf_mod/font.c $src/mupdf_mod/string.c mupdf-1.5-source/source/fitz/ + cp $src/mupdf_mod/pdf-* mupdf-1.5-source/source/pdf + + tar zxf ${tess_src} + cp $src/tesseract_mod/dawg.cpp tesseract-ocr/dict + cp $src/tesseract_mod/tessdatamanager.cpp tesseract-ocr/ccutil + cp $src/tesseract_mod/tessedit.cpp tesseract-ocr/ccmain + cp $src/tesseract_mod/tesscapi.cpp tesseract-ocr/api + cp $src/include_mod/tesseract.h $src/include_mod/leptonica.h tesseract-ocr/api + + cp -a $src k2pdfopt_v2.21 + chmod -R +w k2pdfopt_v2.21 + + patch -p0 -i $tess_pa + patch -p0 -i $k2_pa + + cd tesseract-ocr + ./autogen.sh + substituteInPlace "configure" \ + --replace 'LIBLEPT_HEADERSDIR="/usr/local/include /usr/include"' \ + 'LIBLEPT_HEADERSDIR=${leptonica}/include' + ./configure --prefix=$plibs --disable-shared + make install + + cd .. + tar zxf ${gocr_src} + cd gocr-0.49 + ./configure + cp src/{gocr.h,pnm.h,unicode.h,list.h} $plibs/include + cp include/config.h $plibs/include + make libs + cp src/libPgm2asc.a $plibs/lib + + cd ../mupdf-1.5-source + make prefix=$plibs install + install -Dm644 build/debug/libmujs.a $plibs/lib + + cd ../k2pdfopt_v2.21/k2pdfoptlib + gcc -Ofast -Wall -c *.c -I ../include_mod/ -I $plibs/include \ + -I . -I ../willuslib + ar rcs libk2pdfopt.a *.o + + cd ../willuslib + gcc -Ofast -Wall -c *.c -I ../include_mod/ -I $plibs/include + ar rcs libwillus.a *.o + + cd .. + gcc -Wall -Ofast -o k2pdfopt.o -c k2pdfopt.c -I k2pdfoptlib/ -I willuslib/ \ + -I include_mod/ -I $plibs/include + g++ -Ofast k2pdfopt.o -o k2pdfopt -I willuslib/ -I k2pdfoptlib/ -I include_mod/ \ + -I $plibs/include -L $plibs/lib/ \ + -L willuslib/ -L k2pdfoptlib/ -lk2pdfopt -lwillus -ldjvulibre -lz -lmupdf \ + -ljbig2dec -ljpeg -lopenjp2 -lpng -lfreetype -lpthread -lmujs \ + -lPgm2asc -llept -ltesseract -lcrypto + + mkdir -p $out/bin + cp k2pdfopt $out/bin + ''; + + meta = with stdenv.lib; { + description = "Optimizes PDF/DJVU files for mobile e-readers (e.g. the Kindle) and smartphones"; + homepage = http://www.willus.com/k2pdfopt; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.bosu ]; + }; +} + diff --git a/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch b/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch new file mode 100644 index 000000000000..00ac5770ea42 --- /dev/null +++ b/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch @@ -0,0 +1,95 @@ +diff -aur k2pdfopt_v2.21/willuslib/array.c k2pdfopt_v2.21.new/willuslib/array.c +--- k2pdfopt_v2.21/willuslib/array.c 2014-05-23 16:29:58.000000000 -0300 ++++ k2pdfopt_v2.21.new/willuslib/array.c 2014-07-26 11:35:49.829825567 -0300 +@@ -1055,7 +1055,7 @@ + void arrayf_sort(float *a,int n) + + { +- sort(a,(long)n); ++ willus_sort(a,(long)n); + } + + +diff -aur k2pdfopt_v2.21/willuslib/math.c k2pdfopt_v2.21.new/willuslib/math.c +--- k2pdfopt_v2.21/willuslib/math.c 2013-08-15 21:33:50.000000000 -0300 ++++ k2pdfopt_v2.21.new/willuslib/math.c 2014-07-26 11:36:02.853170659 -0300 +@@ -532,7 +532,7 @@ + + + +-void sort(float *x,int n) ++void willus_sort(float *x,int n) + + { + int top,n1; +diff -aur k2pdfopt_v2.21/willuslib/ocrjocr.c k2pdfopt_v2.21.new/willuslib/ocrjocr.c +--- k2pdfopt_v2.21/willuslib/ocrjocr.c 2012-11-12 13:09:42.000000000 -0300 ++++ k2pdfopt_v2.21.new/willuslib/ocrjocr.c 2014-07-26 11:36:46.699837185 -0300 +@@ -29,6 +29,8 @@ + #ifdef HAVE_GOCR_LIB + #include <gocr.h> + ++job_t *JOB; ++ + /* + ** bmp8 must be grayscale + ** (x1,y1) and (x2,y2) from top left of bitmap +@@ -66,6 +68,7 @@ + h=y2-y1+1; + dh=h+bw*2; + job=&_job; ++ JOB=job; + job_init(job); + job_init_image(job); + // willus_mem_alloc_warn((void **)&job->src.p.p,w*h,funcname,10); +diff -aur k2pdfopt_v2.21/willuslib/string.c k2pdfopt_v2.21.new/willuslib/string.c +--- k2pdfopt_v2.21/willuslib/string.c 2014-02-03 00:37:44.000000000 -0300 ++++ k2pdfopt_v2.21.new/willuslib/string.c 2014-07-26 11:37:01.766506277 -0300 +@@ -81,7 +81,7 @@ + ** Returns NULL if EOF, otherwise returns pointer to the string. + ** + */ +-char *get_line(char *buf,int max,FILE *f) ++char *willus_get_line(char *buf,int max,FILE *f) + + { + int i; +diff -aur k2pdfopt_v2.21/willuslib/willus.h k2pdfopt_v2.21.new/willuslib/willus.h +--- k2pdfopt_v2.21/willuslib/willus.h 2014-07-25 15:03:51.000000000 -0300 ++++ k2pdfopt_v2.21.new/willuslib/willus.h 2014-07-26 11:37:56.316506038 -0300 +@@ -214,9 +214,6 @@ + ** CMAKE handles the defines, not this source + ** (Mod from Dirk Thierbach, 31-Dec-2013) + */ +-#ifdef USE_CMAKE +-#include "config.h" +-#else /* USE_CMAKE */ + + #ifndef HAVE_Z_LIB + #define HAVE_Z_LIB +@@ -268,7 +265,6 @@ + #undef HAVE_GSL_LIB + #endif + +-#endif /* USE_CMAKE */ + /* + ** Consistency check + */ +@@ -533,7 +529,7 @@ + int *n,FILE *err); + int readxyz_ex (char *filename,double **x,double **y,double **z, + int *n,FILE *err,int ignore_after_semicolon); +-void sort (float *x,int n); ++void willus_sort (float *x,int n); + void sortd (double *x,int n); + void sorti (int *x,int n); + void sortxy (float *x,float *y,int n); +@@ -602,7 +598,7 @@ + /* string.c */ + void clean_line (char *buf); + void clean_line_end(char *buf); +-char *get_line (char *buf,int max,FILE *f); ++char *willus_get_line (char *buf,int max,FILE *f); + char *get_line_cf (char *buf,int max,FILE *f); + int mem_get_line_cf(char *buf,int maxlen,char *cptr,long *cindex,long csize); + int in_string (char *buffer,char *pattern); diff --git a/pkgs/applications/misc/k2pdfopt/tesseract.patch b/pkgs/applications/misc/k2pdfopt/tesseract.patch new file mode 100644 index 000000000000..5cb6e0fe3176 --- /dev/null +++ b/pkgs/applications/misc/k2pdfopt/tesseract.patch @@ -0,0 +1,12 @@ +diff -aur tesseract-ocr/api/Makefile.am tesseract-ocr.new/api/Makefile.am +--- tesseract-ocr/api/Makefile.am 2012-10-09 14:18:39.000000000 -0300 ++++ tesseract-ocr.new/api/Makefile.am 2014-03-20 18:43:13.926030341 -0300 +@@ -36,7 +36,7 @@ + if VISIBILITY + libtesseract_api_la_CPPFLAGS += -DTESS_EXPORTS + endif +-libtesseract_api_la_SOURCES = baseapi.cpp capi.cpp ++libtesseract_api_la_SOURCES = baseapi.cpp capi.cpp tesscapi.cpp + + lib_LTLIBRARIES += libtesseract.la + libtesseract_la_LDFLAGS = diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/misc/kdeconnect/default.nix index 663ce872e222..dcb83d7a79d6 100644 --- a/pkgs/applications/misc/kdeconnect/default.nix +++ b/pkgs/applications/misc/kdeconnect/default.nix @@ -1,15 +1,17 @@ -{ stdenv, fetchurl, gettext, kdelibs, libXtst, makeWrapper, qca2, qca2_ossl, qjson }: +{ stdenv, fetchurl, gettext, kdelibs, libXtst, libfakekey, makeWrapper, pkgconfig, qca2, qca2_ossl +, qjson +}: stdenv.mkDerivation rec { name = "kdeconnect-${version}"; - version = "0.7.2"; + version = "0.7.3"; src = fetchurl { url = "http://download.kde.org/unstable/kdeconnect/${version}/src/kdeconnect-kde-${version}.tar.xz"; - sha256 = "1v7sicgy39n8pn7nzq9f7lkmwbcvavhy3b66agyhxwmyzz6mcd4g"; + sha256 = "1vrr047bq5skxvibv5pb9ch9dxh005zmar017jzbyb9hilxr8kg4"; }; - buildInputs = [ gettext kdelibs libXtst makeWrapper qca2 qca2_ossl qjson ]; + buildInputs = [ gettext kdelibs libXtst libfakekey makeWrapper pkgconfig qca2 qca2_ossl qjson ]; postInstall = '' wrapProgram $out/lib/kde4/libexec/kdeconnectd --prefix QT_PLUGIN_PATH : ${qca2_ossl}/lib/qt4/plugins diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index b3fafbc40169..e47e87d6338c 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "keepass-${version}"; - version = "2.27"; + version = "2.28"; src = fetchurl { url = "mirror://sourceforge/keepass/KeePass-${version}.zip"; - sha256 = "1qi7pls5xrv7ma53bwka738idvnxk82dvhk06m1snc8c29dws7fa"; + sha256 = "0rlll6qriflaibqpw9qqfgqqr7cvhl404c3ph6n2i22j7xn5mizh"; }; sourceRoot = "."; diff --git a/pkgs/applications/misc/keybase-node-client/default.nix b/pkgs/applications/misc/keybase-node-client/default.nix new file mode 100644 index 000000000000..bacd8d46fd56 --- /dev/null +++ b/pkgs/applications/misc/keybase-node-client/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, makeWrapper, callPackage, gnupg, utillinux }: + +with stdenv.lib; + +let + nodePackages = callPackage (import <nixpkgs/pkgs/top-level/node-packages.nix>) { + neededNatives = [] ++ optional (stdenv.isLinux) utillinux; + self = nodePackages; + generated = ./package.nix; + }; + +in nodePackages.buildNodePackage rec { + name = "keybase-node-client-${version}"; + version = "0.7.0"; + + src = [(fetchurl { + url = "https://github.com/keybase/node-client/archive/v${version}.tar.gz"; + sha256 = "0n73v4f61rq2dvy2yd3s4l8qvvjzp3ncqj70llm4i6cvbp9kym1v"; + })]; + + deps = (filter (v: nixType v == "derivation") (attrValues nodePackages)); + buildInputs = [ makeWrapper gnupg ]; + + postInstall = '' + wrapProgram "$out/bin/keybase" --set NODE_PATH "$out/lib/node_modules/keybase/node_modules/" + ''; + + passthru.names = ["keybase"]; + + meta = { + description = "CLI for keybase.io written in/for Node.js"; + license = licenses.mit; + homepage = https://keybase.io/docs/command_line; + maintainers = with maintainers; [manveru]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/applications/misc/keybase-node-client/package.nix b/pkgs/applications/misc/keybase-node-client/package.nix new file mode 100644 index 000000000000..85d10ad0ba45 --- /dev/null +++ b/pkgs/applications/misc/keybase-node-client/package.nix @@ -0,0 +1,2518 @@ +{ self, fetchurl, fetchgit ? null, lib }: + +{ + 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-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-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" ]; + }; + "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-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."async"."0.2.x" = + self.by-version."async"."0.2.10"; + by-version."async"."0.2.10" = lib.makeOverridable self.buildNodePackage { + name = "node-async-0.2.10"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/async/-/async-0.2.10.tgz"; + name = "async-0.2.10.tgz"; + sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; + }) + ]; + buildInputs = + (self.nativeDeps."async" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "async" ]; + }; + by-spec."async"."~0.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-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-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" ]; + }; + "bitcoyne" = self.by-version."bitcoyne"."0.0.6"; + 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-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-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" ]; + }; + "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-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" ]; + }; + 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" ]; + }; + "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" ]; + }; + "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"; + by-spec."colors"."~0.6.2" = + self.by-version."colors"."0.6.2"; + 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" ]; + }; + 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" ]; + }; + 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-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-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-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."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-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" ]; + }; + "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"; + by-spec."deep-equal"."~0.2.1" = + self.by-version."deep-equal"."0.2.1"; + 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-spec."docco"."~0.6.2" = + self.by-version."docco"."0.6.3"; + by-version."docco"."0.6.3" = lib.makeOverridable 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" ]; + }; + 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" ]; + }; + 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" ]; + }; + 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-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-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-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-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-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-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" ]; + }; + "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" ]; + }; + 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" ]; + }; + 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" ]; + }; + 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" ]; + }; + "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" ]; + }; + 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-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" ]; + }; + 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-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-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" ]; + }; + 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 { + 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" ]; + }; + "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" ]; + }; + "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" ]; + }; + "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" ]; + }; + "iced-error" = self.by-version."iced-error"."0.0.9"; + by-spec."iced-error".">=0.0.8" = + self.by-version."iced-error"."0.0.9"; + by-spec."iced-error".">=0.0.9" = + self.by-version."iced-error"."0.0.9"; + by-spec."iced-error"."~0.0.8" = + 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" ]; + }; + "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" ]; + }; + "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" ]; + }; + "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"; + 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" ]; + }; + "iced-runtime" = self.by-version."iced-runtime"."1.0.1"; + by-spec."iced-runtime".">=0.0.1 <2.0.0-0" = + self.by-version."iced-runtime"."1.0.1"; + by-spec."iced-runtime"."^1.0.0" = + self.by-version."iced-runtime"."1.0.1"; + 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"; + 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" ]; + }; + "iced-test" = self.by-version."iced-test"."0.0.19"; + 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" ]; + }; + "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" ]; + }; + by-spec."iced-utils".">=0.1.16" = + self.by-version."iced-utils"."0.1.21"; + by-spec."iced-utils".">=0.1.18" = + self.by-version."iced-utils"."0.1.21"; + 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-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 { + 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" ]; + }; + by-spec."isarray"."0.0.1" = + self.by-version."isarray"."0.0.1"; + by-version."isarray"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-isarray-0.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; + name = "isarray-0.0.1.tgz"; + sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; + }) + ]; + buildInputs = + (self.nativeDeps."isarray" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "isarray" ]; + }; + by-spec."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-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-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" ]; + }; + "kbpgp" = self.by-version."kbpgp"."1.0.5"; + by-spec."kbpgp"."^1.0.2" = + self.by-version."kbpgp"."1.0.5"; + 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-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-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" ]; + }; + "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" ]; + }; + "keybase-proofs" = self.by-version."keybase-proofs"."1.1.3"; + 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" ]; + }; + "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" ]; + }; + 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" ]; + }; + "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-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."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-spec."minimist"."~0.0.1" = + self.by-version."minimist"."0.0.10"; + by-version."minimist"."0.0.10" = lib.makeOverridable self.buildNodePackage { + name = "node-minimist-0.0.10"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"; + name = "minimist-0.0.10.tgz"; + sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf"; + }) + ]; + buildInputs = + (self.nativeDeps."minimist" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "minimist" ]; + }; + by-spec."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" ]; + }; + "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-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-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-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" ]; + }; + 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-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-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" ]; + }; + "optimist" = self.by-version."optimist"."0.6.1"; + by-spec."pgp-utils".">=0.0.21" = + 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-spec."pgp-utils".">=0.0.22" = + self.by-version."pgp-utils"."0.0.27"; + "pgp-utils" = self.by-version."pgp-utils"."0.0.27"; + by-spec."pgp-utils".">=0.0.25" = + self.by-version."pgp-utils"."0.0.27"; + 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-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" ]; + }; + "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-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" ]; + }; + 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" ]; + }; + "purepack" = self.by-version."purepack"."1.0.1"; + by-spec."purepack".">=1" = + self.by-version."purepack"."1.0.1"; + by-spec."purepack".">=1.0.1" = + 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-spec."read"."~1.0.5" = + 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" ]; + }; + "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-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" ]; + }; + "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" ]; + }; + 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."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-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-spec."socks5-client"."^0.3.6" = + self.by-version."socks5-client"."0.3.6"; + "socks5-client" = self.by-version."socks5-client"."0.3.6"; + by-spec."socks5-client"."~0.3.4" = + 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" ]; + }; + "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" ]; + }; + "socks5-https-client" = self.by-version."socks5-https-client"."0.2.2"; + 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" ]; + }; + 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-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-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-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" ]; + }; + "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" ]; + }; + "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-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" ]; + }; + "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-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-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" ]; + }; + 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-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-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" ]; + }; + 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-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" ]; + }; +} diff --git a/pkgs/applications/misc/librecad/2.0.nix b/pkgs/applications/misc/librecad/2.0.nix index 8b7a9a40c872..6cc775b72d39 100644 --- a/pkgs/applications/misc/librecad/2.0.nix +++ b/pkgs/applications/misc/librecad/2.0.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { ''; configurePhase = '' - qmake librecad.pro PREFIX=$out MUPARSER_DIR=${muparser} BOOST_DIR=${boost} + qmake librecad.pro PREFIX=$out MUPARSER_DIR=${muparser} BOOST_DIR=${boost.dev} ''; installPhase = '' diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index e04898fba29f..5284d441b44f 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -1,75 +1,41 @@ -{ stdenv, fetchgit, ocaml, mupdf, lablgl, mesa -, libX11, libXext, gtk3, freetype, zlib, openjpeg -, jbig2dec, libjpeg, ncurses }: +{ stdenv, makeWrapper, fetchgit, pkgconfig, ninja, ocaml, findlib, mupdf, lablgl +, gtk3, openjpeg, jbig2dec, mujs }: -stdenv.mkDerivation { - name = "llpp-2014-05-26"; +let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version; +in stdenv.mkDerivation rec { + name = "llpp-2014-11-29"; src = fetchgit { url = "git://repo.or.cz/llpp.git"; - rev = "902143de64d86b5714b3a59d2cc7085083b87249"; - sha256 = "038xl4gbvm57na2lz1fw36sf43zaxq407zi2d53985vc33677j9s"; + rev = "481c8398b2c5dc4589738f5f80104ed75b9c73ff"; + sha256 = "13zi5mzpd9j4mmm68m3zkv49xgkhswhqvmp4bbyi0psmhxak8y5l"; }; - buildInputs = [ ocaml mupdf lablgl mesa libX11 libXext gtk3 - freetype jbig2dec libjpeg openjpeg zlib ncurses ]; + buildInputs = [ pkgconfig ninja makeWrapper ocaml findlib mupdf lablgl + gtk3 jbig2dec openjpeg mujs ]; - # The build phase was extracted from buildall.sh, because that script - # fetched the dependencies on its own. - buildPhase = '' - ccopt="-O" - ccopt="$ccopt -I ${jbig2dec}/include" - ccopt="$ccopt -I ${libjpeg}/include" - ccopt="$ccopt -I ${freetype}/include/freetype2" - ccopt="$ccopt -I ${openjpeg}/include" - ccopt="$ccopt -I ${zlib}/include" - ccopt="$ccopt -I ${mupdf}/include" - ccopt="$ccopt -include ft2build.h" - ccopt="$ccopt -D_GNU_SOURCE" - - cclib="$cclib -lmupdf" - cclib="$cclib -lz -ljpeg -lopenjp2 -ljbig2dec -lfreetype -lpthread" - cclib="$cclib -lX11" - cclib="$cclib -lfreetype" - - comp=ocamlc.opt - cmsuf=cmo - - sh mkhelp.sh keystoml.ml KEYS > help.ml - - $comp -c -o link.o -ccopt "$ccopt" link.c - $comp -c -o help.$cmsuf help.ml - $comp -c -o utils.$cmsuf utils.ml - $comp -c -o wsi.cmi wsi.mli - $comp -c -o wsi.$cmsuf wsi.ml - $comp -c -o parser.$cmsuf parser.ml - $comp -c -o main.$cmsuf -I ${lablgl}/lib/ocaml/4.01.0/site-lib/lablgl main.ml - - $comp -custom -o llpp \ - -I ${lablgl}/lib/ocaml/4.01.0/site-lib/lablgl \ - str.cma unix.cma lablgl.cma \ - link.o \ - -cclib "$cclib" \ - help.cmo \ - utils.cmo \ - parser.cmo \ - wsi.cmo \ - main.cmo + configurePhase = '' + sh configure.sh -O -F ${mupdf} + sed -i 's;-lopenjpeg;-lopenjp2;g' .config + sed -i 's;$builddir/link\.so;link.so;g' build.ninja ''; - # Binary fails with 'No bytecode file specified.' if stripped. - dontStrip = true; + buildPhase = "${ninja}/bin/ninja"; installPhase = '' - install -d $out/bin - install llpp llppac $out/bin + install -d $out/bin $out/lib + install build/llpp $out/bin + install link.so $out/lib + wrapProgram $out/bin/llpp \ + --prefix CAML_LD_LIBRARY_PATH ":" "${lablgl}/lib/ocaml/${ocamlVersion}/site-lib/lablgl" \ + --prefix CAML_LD_LIBRARY_PATH ":" "$out/lib" ''; - meta = { + meta = with stdenv.lib; { homepage = http://repo.or.cz/w/llpp.git; description = "A MuPDF based PDF pager written in OCaml"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.pSub ]; - license = "GPL"; + platforms = platforms.linux; + maintainers = with maintainers; [ pSub ]; + license = licenses.gpl3; }; } diff --git a/pkgs/applications/misc/monero/default.nix b/pkgs/applications/misc/monero/default.nix index 52e8d20495b9..1fe5406384f8 100644 --- a/pkgs/applications/misc/monero/default.nix +++ b/pkgs/applications/misc/monero/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0bbhqjjzh922aymjqrnl2hd3r8x6p7x5aa5jidv3l4d77drhlgzy"; }; - buildInputs = [ cmake boost boost.lib ]; + buildInputs = [ cmake boost ]; # these tests take a long time and don't # always complete in the build environment diff --git a/pkgs/applications/misc/namecoin/default.nix b/pkgs/applications/misc/namecoin/default.nix index 94ee63fe2de2..d9e09923c3be 100644 --- a/pkgs/applications/misc/namecoin/default.nix +++ b/pkgs/applications/misc/namecoin/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # Don't build with miniupnpc due to namecoin using a different verison that # ships with NixOS and it is API incompatible. - buildInputs = [ db4 boost boost.lib openssl unzip ]; + buildInputs = [ db4 boost openssl unzip ]; patchPhase = '' sed -e 's/-Wl,-Bstatic//g' -e 's/-l gthread-2.0//g' -e 's/-l z//g' -i src/Makefile diff --git a/pkgs/applications/misc/namecoin/qt.nix b/pkgs/applications/misc/namecoin/qt.nix index 6b63bf7ca348..2a83a4d11d6f 100644 --- a/pkgs/applications/misc/namecoin/qt.nix +++ b/pkgs/applications/misc/namecoin/qt.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { # Don't build with miniupnpc due to namecoin using a different verison that # ships with NixOS and it is API incompatible. - buildInputs = [ db4 boost boost.lib openssl unzip qt4 ]; + buildInputs = [ db4 boost openssl unzip qt4 ]; configurePhase = '' qmake USE_UPNP=- diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix index d7577987a171..b245a6aace7b 100644 --- a/pkgs/applications/misc/pcmanfm/default.nix +++ b/pkgs/applications/misc/pcmanfm/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, glib, gtk, intltool, libfm, libX11, pango, pkgconfig }: stdenv.mkDerivation { - name = "pcmanfm-1.2.2"; + name = "pcmanfm-1.2.3"; src = fetchurl { - url = "mirror://sourceforge/pcmanfm/pcmanfm-1.2.2.tar.xz"; - sha256 = "00wmbqrbcrxk1mcdkgdl8ddf3gp28rm5mamqdq72sfr0q2d0287n"; + url = "mirror://sourceforge/pcmanfm/pcmanfm-1.2.3.tar.xz"; + sha256 = "1033rw5jd7nlzbcdpx3bik7347kyh1sg1gkla424gq9vqqpxia6g"; }; buildInputs = [ glib gtk intltool libfm libX11 pango pkgconfig ]; diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix new file mode 100644 index 000000000000..17da22cbaafc --- /dev/null +++ b/pkgs/applications/misc/qpdfview/default.nix @@ -0,0 +1,39 @@ +{stdenv, fetchurl, qt4, pkgconfig, popplerQt4, djvulibre, libspectre, cups +, file, ghostscript +}: +let + s = # Generated upstream information + rec { + baseName="qpdfview"; + version="0.4.12"; + name="${baseName}-${version}"; + url="https://launchpad.net/qpdfview/trunk/${version}/+download/qpdfview-${version}.tar.gz"; + sha256="1h6lrrh1vblqkxrd89nmid7d21anyn30iahj24z62yny35lidf0g"; + }; + buildInputs = [ + qt4 popplerQt4 pkgconfig djvulibre libspectre cups file ghostscript + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchurl { + inherit (s) url sha256; + }; + configurePhase = '' + qmake *.pro + for i in *.pro; do + qmake "$i" -o "Makefile.$(basename "$i" .pro)" + done + sed -e "s@/usr/@$out/@g" -i Makefile* + ''; + meta = { + inherit (s) version; + description = "A tabbed document viewer"; + license = stdenv.lib.licenses.gpl2; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + homepage = "https://launchpad.net/qpdfview"; + updateWalker = true; + }; +} diff --git a/pkgs/applications/misc/qtbitcointrader/default.nix b/pkgs/applications/misc/qtbitcointrader/default.nix index 38606d798731..8f7fc3b0e261 100644 --- a/pkgs/applications/misc/qtbitcointrader/default.nix +++ b/pkgs/applications/misc/qtbitcointrader/default.nix @@ -1,17 +1,19 @@ -{ stdenv, fetchurl, qt4 }: +{ stdenv, fetchFromGitHub, qt }: let - version = "1.07.98"; + version = "1.08.02"; in stdenv.mkDerivation { name = "qtbitcointrader-${version}"; - src = fetchurl { - url = "mirror://sourceforge/bitcointrader/SRC/QtBitcoinTrader-${version}.tar.gz"; - sha256 = "1irz17q71fx64dfkmgajlyva7d1wifv4bxgb2iwz7d69rvhzaqzx"; + src = fetchFromGitHub { + owner = "JulyIGHOR"; + repo = "QtBitcoinTrader"; + rev = "452db3ee9447b8f9e7d63253f834b31394b23d92"; + sha256 = "1l2a021dy2j4sr4nmq7wn27r2zli9nigwbviqzain3nlyzq9fjpg"; }; - buildInputs = [ qt4 ]; + buildInputs = [ qt ]; postUnpack = "sourceRoot=\${sourceRoot}/src"; @@ -23,11 +25,11 @@ stdenv.mkDerivation { QtBitcoinTrader_Desktop.pro ''; - meta = { - description = "Secure bitcoin trading client"; - homepage = http://qtopentrader.com; - license = stdenv.lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.linux; # arbitrary choice - maintainers = [ stdenv.lib.maintainers.emery ]; - }; -} \ No newline at end of file + meta = with stdenv.lib; + { description = "Secure bitcoin trading client"; + homepage = https://centrabit.com/; + license = licenses.lgpl3; + platforms = platforms.linux; # arbitrary choice + maintainers = [ maintainers.emery ]; + }; +} diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 8ee006c5d7f1..6070c560815d 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -3,11 +3,11 @@ , GConf, dbus, dbus_glib, makeWrapper, gtk, pygtk, pyxdg, geoclue }: stdenv.mkDerivation rec { - version = "1.8"; + version = "1.9.1"; name = "redshift-${version}"; src = fetchurl { url = "https://github.com/jonls/redshift/archive/v${version}.tar.gz"; - sha256 = "1srj2dwy32h71iqikb4ysv5ipclym80i9lys2ns8vjmclg7hj3vi"; + sha256 = "0rj7lyg4ikwpk1hr1k2bgk9gjqvvv51z8hydsgpx2k2lqdv6lqri"; }; buildInputs = [ diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix new file mode 100644 index 000000000000..2fd43382c402 --- /dev/null +++ b/pkgs/applications/misc/rescuetime/default.nix @@ -0,0 +1,44 @@ +{ stdenv, lib, fetchurl, dpkg, patchelf, qt4, libXtst, libXext, libX11, makeWrapper, libXScrnSaver }: + +let + src = + if stdenv.system == "i686-linux" then fetchurl { + name = "rescuetime-installer.deb"; + url = "https://www.rescuetime.com/installers/rescuetime_current_i386.deb"; + sha256 = "03dj0ivavxlcvx7dv7y6zllwqkclfyxkfax691zv2qclmk5gf8wz"; + } else fetchurl { + name = "rescuetime-installer.deb"; + url = "https://www.rescuetime.com/installers/rescuetime_current_amd64.deb"; + sha256 = "11by4lkij1ryv8h3mz55hj3ssrikl697rs5b7mlg3g058gr2v3wl"; + }; + +in + +stdenv.mkDerivation { + name = "rescuetime-2.8.6.1015"; + inherit src; + buildInputs = [ dpkg makeWrapper ]; + unpackPhase = '' + mkdir pkg + dpkg-deb -x $src pkg + sourceRoot=pkg + ''; + installPhase = '' + mkdir -p $out/bin + cp usr/bin/rescuetime $out/bin + + ${patchelf}/bin/patchelf \ + --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + $out/bin/rescuetime + + wrapProgram $out/bin/rescuetime \ + --prefix LD_PRELOAD : ${qt4}/lib/libQtGui.so.4:${qt4}/lib/libQtCore.so.4:${libXtst}/lib/libXtst.so.6:${libXext}/lib/libXext.so.6:${libX11}/lib/libX11.so.6:${libXScrnSaver}/lib/libXss.so.1 + ''; + meta = with lib; { + description = "Helps you understand your daily habits so you can focus and be more productive"; + homepage = "https://www.rescuetime.com"; + maintainers = with maintainers; [ cstrahan ]; + license = licenses.unfree; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/misc/roxterm/default.nix index a8338b80c9e4..60322c2b911e 100644 --- a/pkgs/applications/misc/roxterm/default.nix +++ b/pkgs/applications/misc/roxterm/default.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { "-I${dbus_libs}/lib/dbus-1.0/include" ]; # Fix up python path so the lockfile library is on it. - PYTHONPATH = stdenv.lib.makeSearchPath "lib/${pythonFull.python.libPrefix}/site-packages" [ + PYTHONPATH = stdenv.lib.makeSearchPath "lib/${pythonFull.libPrefix}/site-packages" [ pythonPackages.curses pythonPackages.lockfile ]; diff --git a/pkgs/applications/misc/rtl-sdr/default.nix b/pkgs/applications/misc/rtl-sdr/default.nix index e6e762493883..defe6eb2df1f 100644 --- a/pkgs/applications/misc/rtl-sdr/default.nix +++ b/pkgs/applications/misc/rtl-sdr/default.nix @@ -12,12 +12,18 @@ stdenv.mkDerivation rec { buildInputs = [ cmake pkgconfig libusb1 ]; - # Building with -DINSTALL_UDEV_RULES=ON tries to install udev rules to - # /etc/udev/rules.d/, and there is no option to install elsewhere. So install - # rules manually. + # TODO: get these fixes upstream: + # * Building with -DINSTALL_UDEV_RULES=ON tries to install udev rules to + # /etc/udev/rules.d/, and there is no option to install elsewhere. So install + # rules manually. + # * Propagate libusb-1.0 dependency in pkg-config file. postInstall = '' mkdir -p "$out/etc/udev/rules.d/" cp ../rtl-sdr.rules "$out/etc/udev/rules.d/99-rtl-sdr.rules" + + pcfile="$out"/lib/pkgconfig/librtlsdr.pc + grep -q "Requires:" "$pcfile" && { echo "Upstream has added 'Requires:' in $(basename "$pcfile"); update nix expression."; exit 1; } + echo "Requires: libusb-1.0" >> "$pcfile" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix new file mode 100644 index 000000000000..98f2e0d61083 --- /dev/null +++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchgit }: + +stdenv.mkDerivation { + name = "urxvt-perls"; + + src = fetchgit { + url = "https://github.com/muennich/urxvt-perls"; + rev = "4dec629b3631297d17855c35be1b723e2d9e7591"; + sha256 = "c61bc8819b4e6655ed4a3ce3b347cb6dbebcb484d5d3973cbe9aa7f2c98d372f"; + }; + + installPhase = '' + mkdir -p $out/lib/urxvt/perl + cp clipboard \ + keyboard-select \ + url-select \ + $out/lib/urxvt/perl + ''; + + meta = with stdenv.lib; { + description = "Perl extensions for the rxvt-unicode terminal emulator"; + homepage = "https://github.com/muennich/urxvt-perls"; + license = licenses.gpl2; + maintainers = maintainers.abbradar; + }; +} \ No newline at end of file diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix new file mode 100644 index 000000000000..a636c3bcfe56 --- /dev/null +++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchgit }: + +stdenv.mkDerivation { + name = "urxvt-tabbedex"; + + src = fetchgit { + url = "https://github.com/mina86/urxvt-tabbedex"; + rev = "54c8d6beb4d65278ed6db24693ca56e1ee65bb42"; + sha256 = "f8734ee289e1cfc517d0699627191c98d32ae3549e0f1935af2a5ccb86d4dc1e"; + }; + + installPhase = '' + install -D tabbedex $out/lib/urxvt/perl/tabbedex + ''; + + meta = with stdenv.lib; { + description = "Tabbed plugin for rxvt-unicode with many enhancements (mina86's fork)"; + homepage = "https://github.com/mina86/urxvt-tabbedex"; + maintainers = maintainers.abbradar; + }; +} \ No newline at end of file diff --git a/pkgs/applications/misc/rxvt_unicode/wrapper.nix b/pkgs/applications/misc/rxvt_unicode/wrapper.nix new file mode 100644 index 000000000000..140113de64a3 --- /dev/null +++ b/pkgs/applications/misc/rxvt_unicode/wrapper.nix @@ -0,0 +1,26 @@ +{ stdenv, buildEnv, rxvt_unicode, makeWrapper, plugins }: + +let + rxvt = rxvt_unicode.override { + perlSupport = true; + }; + + drv = buildEnv { + name = "${rxvt.name}-with-plugins"; + + paths = [ rxvt ] ++ plugins; + + postBuild = '' + # TODO: This could be avoided if buildEnv could be forced to create all directories + if [ -L $out/bin ]; then + rm $out/bin + mkdir $out/bin + for i in ${rxvt}/bin/*; do + ln -s $i $out/bin + done + fi + wrapProgram $out/bin/urxvt \ + --suffix-each URXVT_PERL_LIB ':' "$out/lib/urxvt/perl" + ''; + }; +in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; }) \ No newline at end of file diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix index 06a5cca94a8d..a057197a92de 100644 --- a/pkgs/applications/misc/slic3r/default.nix +++ b/pkgs/applications/misc/slic3r/default.nix @@ -3,21 +3,20 @@ }: stdenv.mkDerivation rec { - version = "1.1.7"; + version = "1.2.1"; name = "slic3r-${version}"; - # Slic3r doesn't put out tarballs, only a git repository is available src = fetchgit { url = "git://github.com/alexrj/Slic3r"; rev = "refs/tags/${version}"; - sha256 = "0hss90iw4xwca08d03wrz0fds5nqwb9zjqii2n6rgpcl4km69fka"; + sha256 = "03xj2kv2d4j6nwmdd5cyghnvjyj4g7g9z0ynynbviyfiplmka2ph"; }; buildInputs = with perlPackages; [ perl makeWrapper which EncodeLocale MathClipper ExtUtilsXSpp BoostGeometryUtils MathConvexHullMonotoneChain MathGeometryVoronoi MathPlanePath Moo IOStringy ClassXSAccessor Wx GrowlGNTP NetDBus ImportInto XMLSAX - ExtUtilsMakeMaker + ExtUtilsMakeMaker OpenGL WxGLCanvas ]; desktopItem = makeDesktopItem { @@ -34,12 +33,16 @@ stdenv.mkDerivation rec { export SLIC3R_NO_AUTO=true export PERL5LIB="./xs/blib/arch/:./xs/blib/lib:$PERL5LIB" + substituteInPlace Build.PL \ + --replace "0.9918" "0.9923" \ + --replace "eval" "" + pushd xs perl Build.PL perl Build popd - perl Build.PL + perl Build.PL --gui ''; installPhase = '' diff --git a/pkgs/applications/misc/slic3r/fix-no-display.patch b/pkgs/applications/misc/slic3r/fix-no-display.patch new file mode 100644 index 000000000000..b5aeca3a4167 --- /dev/null +++ b/pkgs/applications/misc/slic3r/fix-no-display.patch @@ -0,0 +1,59 @@ +diff --git a/Build.PL b/Build.PL +index 8b21c15..fd3aff0 100644 +--- a/Build.PL ++++ b/Build.PL +@@ -33,9 +33,6 @@ my $sudo = grep { $_ eq '--sudo' } @ARGV; + my $gui = grep { $_ eq '--gui' } @ARGV; + my $xs_only = grep { $_ eq '--xs' } @ARGV; + if ($gui) { +- %prereqs = qw( +- Wx 0.9918 +- ); + %recommends = qw( + Growl::GNTP 0.15 + Wx::GLCanvas 0 +diff --git a/lib/Slic3r/GUI.pm b/lib/Slic3r/GUI.pm +index 842ff44..ea0af64 100644 +--- a/lib/Slic3r/GUI.pm ++++ b/lib/Slic3r/GUI.pm +@@ -26,7 +26,7 @@ use Slic3r::GUI::OptionsGroup::Field; + use Slic3r::GUI::SimpleTab; + use Slic3r::GUI::Tab; + +-our $have_OpenGL = eval "use Slic3r::GUI::PreviewCanvas; 1"; ++our $have_OpenGL = 0; + + use Wx 0.9901 qw(:bitmap :dialog :icon :id :misc :systemsettings :toplevelwindow + :filedialog); +diff --git a/lib/Slic3r/GUI/Plater/2DToolpaths.pm b/lib/Slic3r/GUI/Plater/2DToolpaths.pm +index 8e48a72..7bed973 100644 +--- a/lib/Slic3r/GUI/Plater/2DToolpaths.pm ++++ b/lib/Slic3r/GUI/Plater/2DToolpaths.pm +@@ -90,18 +90,20 @@ sub set_z { + package Slic3r::GUI::Plater::2DToolpaths::Canvas; + + use Wx::Event qw(EVT_PAINT EVT_SIZE EVT_ERASE_BACKGROUND EVT_IDLE EVT_MOUSEWHEEL EVT_MOUSE_EVENTS); +-use OpenGL qw(:glconstants :glfunctions :glufunctions); +-use base qw(Wx::GLCanvas Class::Accessor); +-use Wx::GLCanvas qw(:all); + use List::Util qw(min first); + use Slic3r::Geometry qw(scale unscale epsilon); + + __PACKAGE__->mk_accessors(qw(print z layers color init dirty bb)); + +-# make OpenGL::Array thread-safe +-{ +- no warnings 'redefine'; +- *OpenGL::Array::CLONE_SKIP = sub { 1 }; ++if ($Slic3r::GUI::have_OpenGL) { ++ use OpenGL qw(:glconstants :glfunctions :glufunctions); ++ use Wx::GLCanvas qw(:all); ++ use base qw(Wx::GLCanvas Class::Accessor); ++ # make OpenGL::Array thread-safe ++ { ++ no warnings 'redefine'; ++ *OpenGL::Array::CLONE_SKIP = sub { 1 }; ++ } + } + + sub new { diff --git a/pkgs/applications/misc/slmenu/default.nix b/pkgs/applications/misc/slmenu/default.nix new file mode 100644 index 000000000000..193bcf205f5b --- /dev/null +++ b/pkgs/applications/misc/slmenu/default.nix @@ -0,0 +1,30 @@ +{stdenv, fetchhg}: +let + s = + rec { + baseName = "slmenu"; + version = "hg-${date}"; + date = "2012-02-01"; + name = "${baseName}-${version}"; + url = "https://bitbucket.org/rafaelgg/slmenu/"; + rev = "7e74fa5db73e8b018da48d50dbbaf11cb5c62d13"; + sha256 = "0zb7mm8344d3xmvrl62psazcabfk75pp083jqkmywdsrikgjagv6"; + }; + buildInputs = [ + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchhg { + inherit (s) url sha256; + }; + makeFlags = ''PREFIX=$(out)''; + meta = { + inherit (s) version; + description = ''A console dmenu-like tool''; + license = stdenv.lib.licenses.mit; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/misc/spacefm/default.nix index 6f1ced9097e9..b88e4c567cc1 100644 --- a/pkgs/applications/misc/spacefm/default.nix +++ b/pkgs/applications/misc/spacefm/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { ''; meta = { - description = "Multi-panel tabbed file and desktop manager for Linux with built-in VFS, udev- or HAL-based device manager, customizable menu system, and bash integration."; + description = "Multi-panel tabbed file and desktop manager for Linux with built-in VFS, udev- or HAL-based device manager, customizable menu system, and bash integration"; platforms = pkgs.lib.platforms.linux; license = pkgs.lib.licenses.gpl3; }; diff --git a/pkgs/applications/misc/sqliteman/default.nix b/pkgs/applications/misc/sqliteman/default.nix new file mode 100644 index 000000000000..803dfe075c19 --- /dev/null +++ b/pkgs/applications/misc/sqliteman/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, cmake, qt4, qscintilla }: + +stdenv.mkDerivation rec { + name = "sqliteman"; + version = "1.2.0-c41b89e1"; + + src = fetchurl { + url = https://github.com/pvanek/sqliteman/archive/1.2.0.tar.gz; + sha256 = "1x4ppwf01jdnz3a4ycia6vv5qf3w2smbqx690z1pnkwbvk337akm"; + }; + + buildInputs = [ cmake qt4 qscintilla ]; + + prePatch = '' + sed -i 's,m_file(0),m_file(QString()),' Sqliteman/sqliteman/main.cpp + ''; + + preConfigure = '' + cd Sqliteman + sed -i 's,/usr/include/Qsci,${qscintilla}/include/Qsci,' cmake/modules/FindQScintilla.cmake + sed -i 's,PATHS ''${QT_LIBRARY_DIR},PATHS ${qscintilla}/libs,' cmake/modules/FindQScintilla.cmake + ''; + + meta = with stdenv.lib; { + description = "Sqliteman is simple but powerfull Sqlite3 GUI database manager."; + homepage = http://sqliteman.yarpen.cz/; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.eikek ]; + }; +} diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index 17b5c92406b0..978dd19e3dfa 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -4,13 +4,13 @@ let mkSweetHome3D = - { name, module, version, src, license, description }: + { name, module, version, src, license, description, icon }: stdenv.mkDerivation rec { - inherit name version src description; + inherit name version src description icon; exec = stdenv.lib.toLower module; sweethome3dItem = makeDesktopItem { - inherit name exec; + inherit name exec icon; comment = description; desktopName = name; genericName = "Computer Aided (Interior) Design"; @@ -61,6 +61,10 @@ in rec { module = module; tag = "V_" + d2u version; }; + icon = fetchurl { + url = "http://sweethome3d.cvs.sourceforge.net/viewvc/sweethome3d/SweetHome3D/src/com/eteks/sweethome3d/viewcontroller/resources/help/images/sweethome3d.png"; + sha256 = "0lnv2sz2d3m8jx25hz92gzardf0iblykhy5q0q2cyb7mw2qb2p92"; + }; }; } diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index df4c0ea97ebd..2a518b9d7cc9 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -1,16 +1,19 @@ -{ stdenv, fetchurl, cmake, x11, libX11, libXi, libXtst, libXrandr, xinput, curl -, cryptopp ? null, unzip }: +{ stdenv, fetchFromGitHub, cmake, x11, libX11, libXi, libXtst, libXrandr +, xinput, curl, cryptopp ? null, unzip }: assert stdenv.isLinux -> cryptopp != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "synergy-1.5.1"; - - src = fetchurl { - url = "http://synergy-project.org/files/packages/${name}-r2398-Source.tar.gz"; - sha256 = "19q8ck15f0jgpbzlm34dzp046wf3iiwa21s1qfyj5sj7xjxwa367"; + name = "synergy-${version}"; + version = "1.6.1"; + + src = fetchFromGitHub { + owner = "synergy"; + repo = "synergy"; + rev = "1.6.1"; + sha256 = "1043101c4phv1nbxiqp2jn1jhgzspv9q6v75z0kfzwgii5n5xq1c"; }; patches = optional stdenv.isLinux ./cryptopp.patch; diff --git a/pkgs/applications/misc/taffybar/default.nix b/pkgs/applications/misc/taffybar/default.nix index 09eb186013f3..1f5481fc5a9c 100644 --- a/pkgs/applications/misc/taffybar/default.nix +++ b/pkgs/applications/misc/taffybar/default.nix @@ -1,21 +1,22 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, cairo, dbus, dyre, enclosedExceptions, filepath, gtk -, gtkTraymanager, HStringTemplate, HTTP, mtl, network, parsec, safe -, split, stm, text, time, transformers, utf8String, X11, xdgBasedir -, xmonad, xmonadContrib +, gtkTraymanager, HStringTemplate, HTTP, mtl, network, networkUri +, parsec, safe, split, stm, text, time, transformers, utf8String +, X11, xdgBasedir, xmonad, xmonadContrib }: cabal.mkDerivation (self: { pname = "taffybar"; - version = "0.4.1"; - sha256 = "0b4x78sq5x1w0xnc5fk4ixpbkl8cwjfyb4fq8vy21shf4n0fri26"; + version = "0.4.3"; + sha256 = "1h7acdzq3bndy44lyvgnm3gvxpbhzcs0ymvkrhmn3y41bfcwaac2"; isLibrary = true; isExecutable = true; buildDepends = [ cairo dbus dyre enclosedExceptions filepath gtk gtkTraymanager - HStringTemplate HTTP mtl network parsec safe split stm text time - transformers utf8String X11 xdgBasedir xmonad xmonadContrib + HStringTemplate HTTP mtl network networkUri parsec safe split stm + text time transformers utf8String X11 xdgBasedir xmonad + xmonadContrib ]; pkgconfigDepends = [ gtk ]; meta = { diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix index 998c34e56102..51bb13eb55e1 100644 --- a/pkgs/applications/misc/taskwarrior/default.nix +++ b/pkgs/applications/misc/taskwarrior/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, libuuid }: +{ stdenv, fetchurl, cmake, libuuid, gnutls }: stdenv.mkDerivation rec { name = "taskwarrior-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0wxcfq0n96vmcbwrlk2x377k8cc5k4i64ca6p02y74g6168ji6ib"; }; - nativeBuildInputs = [ cmake libuuid ]; + nativeBuildInputs = [ cmake libuuid gnutls ]; meta = { description = "GTD (getting things done) implementation"; diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix index 96ca38f581f8..7c1fe5fc5cbd 100644 --- a/pkgs/applications/misc/termite/default.nix +++ b/pkgs/applications/misc/termite/default.nix @@ -2,25 +2,25 @@ stdenv.mkDerivation rec { name = "termite-${version}"; - version = "v7"; + version = "9"; src = fetchgit { url = "https://github.com/thestinger/termite"; - rev = "f0ff025c1bb6a1e3fd83072f00c2dc42a0701f46"; - sha256 = "057yzlqvp84fkmhn4bz9071glj4rh4187xhg48cdppf2w6phcbxp"; + rev = "refs/tags/v${version}"; + sha256 = "0bnzfjk5yl5i96v5jnlvrz0d1jcp5lal6ppl7y8wx13166i6sdnh"; }; - makeFlags = "VERSION=${version}"; + makeFlags = "VERSION=v${version}"; buildInputs = [pkgconfig vte gtk ncurses]; installFlags = "PREFIX=$(out)"; - meta = { + meta = with stdenv.lib; { description = "A simple VTE-based terminal"; - license = stdenv.lib.licenses.lgpl2Plus; + license = licenses.lgpl2Plus; homepage = https://github.com/thestinger/termite/; - maintainers = with stdenv.lib.maintainers; [koral]; - platforms = stdenv.lib.platforms.all; + maintainers = [ maintainers.koral ]; + platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/tessel/default.nix b/pkgs/applications/misc/tessel/default.nix new file mode 100644 index 000000000000..6a11713c7501 --- /dev/null +++ b/pkgs/applications/misc/tessel/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, callPackage, libusb1, pkgconfig, python, utillinux }: + +with stdenv.lib; + +let + nodePackages = callPackage (import ../../../top-level/node-packages.nix) { + neededNatives = [ libusb1 pkgconfig python utillinux ]; + self = nodePackages; + generated = ./package.nix; + }; + +in nodePackages.buildNodePackage rec { + name = "tessel-0.3.16"; + bin = true; + + src = [ + (fetchurl { + url = "http://registry.npmjs.org/tessel/-/tessel-0.3.16.tgz"; + name = "tessel-0.3.16.tgz"; + sha1 = "900a8d897ba03d7a9d5927697180284772d70738"; + }) + ]; + + deps = (filter (v: nixType v == "derivation") (attrValues nodePackages)); + + postInstall = '' + mkdir -p $out/etc/udev/rules.d + cp $out/lib/node_modules/tessel/install/85-tessel.rules $out/etc/udev/rules.d/ + ''; + + passthru.names = [ "tessel" ]; + + meta = { + description = "Command line tools and programmatic access library for Tessel devices"; + homepage = https://tessel.io; + license = licenses.mit; + maintainers = with maintainers; [ goibhniu ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/applications/misc/tessel/package.nix b/pkgs/applications/misc/tessel/package.nix new file mode 100644 index 000000000000..d388387ccaf8 --- /dev/null +++ b/pkgs/applications/misc/tessel/package.nix @@ -0,0 +1,1974 @@ +{ self, fetchurl, fetchgit ? null, lib }: + +{ + by-spec."abbrev"."1" = + self.by-version."abbrev"."1.0.5"; + by-version."abbrev"."1.0.5" = lib.makeOverridable self.buildNodePackage { + name = "abbrev-1.0.5"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz"; + name = "abbrev-1.0.5.tgz"; + sha1 = "5d8257bd9ebe435e698b2fa431afde4fe7b10b03"; + }) + ]; + buildInputs = + (self.nativeDeps."abbrev" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "abbrev" ]; + }; + by-spec."asn1"."0.1.11" = + self.by-version."asn1"."0.1.11"; + by-version."asn1"."0.1.11" = lib.makeOverridable self.buildNodePackage { + name = "asn1-0.1.11"; + bin = false; + 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-spec."assert-plus"."0.1.2" = + self.by-version."assert-plus"."0.1.2"; + by-version."assert-plus"."0.1.2" = lib.makeOverridable self.buildNodePackage { + name = "assert-plus-0.1.2"; + bin = false; + 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."async"."~0.2.9" = + self.by-version."async"."0.2.10"; + by-version."async"."0.2.10" = lib.makeOverridable 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"; + }) + ]; + buildInputs = + (self.nativeDeps."async" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "async" ]; + }; + "async" = self.by-version."async"."0.2.10"; + by-spec."async"."~0.9.0" = + self.by-version."async"."0.9.0"; + by-version."async"."0.9.0" = lib.makeOverridable 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"; + }) + ]; + buildInputs = + (self.nativeDeps."async" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "async" ]; + }; + 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 = "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"; + }) + ]; + buildInputs = + (self.nativeDeps."aws-sign2" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "aws-sign2" ]; + }; + by-spec."bindings-shyp"."~0.2.3" = + self.by-version."bindings-shyp"."0.2.3"; + by-version."bindings-shyp"."0.2.3" = lib.makeOverridable self.buildNodePackage { + name = "bindings-shyp-0.2.3"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/bindings-shyp/-/bindings-shyp-0.2.3.tgz"; + name = "bindings-shyp-0.2.3.tgz"; + sha1 = "909151c14c701f350eb6be8ad14784ad79813671"; + }) + ]; + buildInputs = + (self.nativeDeps."bindings-shyp" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "bindings-shyp" ]; + }; + by-spec."block-stream"."*" = + self.by-version."block-stream"."0.0.7"; + by-version."block-stream"."0.0.7" = lib.makeOverridable self.buildNodePackage { + name = "block-stream-0.0.7"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz"; + name = "block-stream-0.0.7.tgz"; + sha1 = "9088ab5ae1e861f4d81b176b4a8046080703deed"; + }) + ]; + buildInputs = + (self.nativeDeps."block-stream" or []); + deps = { + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "block-stream" ]; + }; + by-spec."boom"."0.4.x" = + self.by-version."boom"."0.4.2"; + by-version."boom"."0.4.2" = lib.makeOverridable self.buildNodePackage { + name = "boom-0.4.2"; + bin = false; + 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 = { + "hoek-0.9.1" = self.by-version."hoek"."0.9.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "boom" ]; + }; + by-spec."buffer-equal"."~0.0.0" = + self.by-version."buffer-equal"."0.0.1"; + by-version."buffer-equal"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "buffer-equal-0.0.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/buffer-equal/-/buffer-equal-0.0.1.tgz"; + name = "buffer-equal-0.0.1.tgz"; + sha1 = "91bc74b11ea405bc916bc6aa908faafa5b4aac4b"; + }) + ]; + buildInputs = + (self.nativeDeps."buffer-equal" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "buffer-equal" ]; + }; + by-spec."bunker"."0.1.X" = + self.by-version."bunker"."0.1.2"; + by-version."bunker"."0.1.2" = lib.makeOverridable self.buildNodePackage { + name = "bunker-0.1.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/bunker/-/bunker-0.1.2.tgz"; + name = "bunker-0.1.2.tgz"; + sha1 = "c88992464a8e2a6ede86930375f92b58077ef97c"; + }) + ]; + buildInputs = + (self.nativeDeps."bunker" or []); + deps = { + "burrito-0.2.12" = self.by-version."burrito"."0.2.12"; + }; + peerDependencies = [ + ]; + passthru.names = [ "bunker" ]; + }; + by-spec."burrito".">=0.2.5 <0.3" = + self.by-version."burrito"."0.2.12"; + by-version."burrito"."0.2.12" = lib.makeOverridable self.buildNodePackage { + name = "burrito-0.2.12"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/burrito/-/burrito-0.2.12.tgz"; + name = "burrito-0.2.12.tgz"; + sha1 = "d0d6e6ac81d5e99789c6fa4accb0b0031ea54f6b"; + }) + ]; + buildInputs = + (self.nativeDeps."burrito" or []); + deps = { + "traverse-0.5.2" = self.by-version."traverse"."0.5.2"; + "uglify-js-1.1.1" = self.by-version."uglify-js"."1.1.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "burrito" ]; + }; + by-spec."charm"."0.1.x" = + self.by-version."charm"."0.1.2"; + by-version."charm"."0.1.2" = lib.makeOverridable self.buildNodePackage { + name = "charm-0.1.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/charm/-/charm-0.1.2.tgz"; + name = "charm-0.1.2.tgz"; + sha1 = "06c21eed1a1b06aeb67553cdc53e23274bac2296"; + }) + ]; + buildInputs = + (self.nativeDeps."charm" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "charm" ]; + }; + by-spec."colony-compiler"."~0.6.21" = + self.by-version."colony-compiler"."0.6.23"; + by-version."colony-compiler"."0.6.23" = lib.makeOverridable self.buildNodePackage { + name = "colony-compiler-0.6.23"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/colony-compiler/-/colony-compiler-0.6.23.tgz"; + name = "colony-compiler-0.6.23.tgz"; + sha1 = "0bef9e899e1ae928f6fe5e0dcca6cab4d47ab448"; + }) + ]; + buildInputs = + (self.nativeDeps."colony-compiler" or []); + deps = { + "colors-0.6.2" = self.by-version."colors"."0.6.2"; + "optimist-0.5.2" = self.by-version."optimist"."0.5.2"; + "nan-1.0.0" = self.by-version."nan"."1.0.0"; + "async-0.9.0" = self.by-version."async"."0.9.0"; + "bindings-shyp-0.2.3" = self.by-version."bindings-shyp"."0.2.3"; + # "colony-compiler-shyp-win32-ia32-0.6.17-1" = self.by-version."colony-compiler-shyp-win32-ia32"."0.6.17-1"; + # "colony-compiler-shyp-win32-x64-0.6.17-0" = self.by-version."colony-compiler-shyp-win32-x64"."0.6.17-0"; + # "colony-compiler-shyp-darwin-x64-0.6.17-0" = self.by-version."colony-compiler-shyp-darwin-x64"."0.6.17-0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "colony-compiler" ]; + }; + "colony-compiler" = self.by-version."colony-compiler"."0.6.23"; + by-spec."colony-compiler-shyp-darwin-x64"."0.6.x" = + self.by-version."colony-compiler-shyp-darwin-x64"."0.6.17-0"; + by-version."colony-compiler-shyp-darwin-x64"."0.6.17-0" = lib.makeOverridable self.buildNodePackage { + name = "colony-compiler-shyp-darwin-x64-0.6.17-0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/colony-compiler-shyp-darwin-x64/-/colony-compiler-shyp-darwin-x64-0.6.17-0.tgz"; + name = "colony-compiler-shyp-darwin-x64-0.6.17-0.tgz"; + sha1 = "33eedbee7ff8679fde69ba03bf27777110113732"; + }) + ]; + buildInputs = + (self.nativeDeps."colony-compiler-shyp-darwin-x64" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "colony-compiler-shyp-darwin-x64" ]; + }; + by-spec."colony-compiler-shyp-win32-ia32"."0.6.x" = + self.by-version."colony-compiler-shyp-win32-ia32"."0.6.17-1"; + by-version."colony-compiler-shyp-win32-ia32"."0.6.17-1" = lib.makeOverridable self.buildNodePackage { + name = "colony-compiler-shyp-win32-ia32-0.6.17-1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/colony-compiler-shyp-win32-ia32/-/colony-compiler-shyp-win32-ia32-0.6.17-1.tgz"; + name = "colony-compiler-shyp-win32-ia32-0.6.17-1.tgz"; + sha1 = "6e11a978be5df7be00112d2a349d5e34925f443a"; + }) + ]; + buildInputs = + (self.nativeDeps."colony-compiler-shyp-win32-ia32" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "colony-compiler-shyp-win32-ia32" ]; + }; + by-spec."colony-compiler-shyp-win32-x64"."0.6.x" = + self.by-version."colony-compiler-shyp-win32-x64"."0.6.17-0"; + by-version."colony-compiler-shyp-win32-x64"."0.6.17-0" = lib.makeOverridable self.buildNodePackage { + name = "colony-compiler-shyp-win32-x64-0.6.17-0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/colony-compiler-shyp-win32-x64/-/colony-compiler-shyp-win32-x64-0.6.17-0.tgz"; + name = "colony-compiler-shyp-win32-x64-0.6.17-0.tgz"; + sha1 = "cd30416df0ab52e49c74e81d69bd23329983d005"; + }) + ]; + buildInputs = + (self.nativeDeps."colony-compiler-shyp-win32-x64" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "colony-compiler-shyp-win32-x64" ]; + }; + by-spec."colors"."0.5.x" = + self.by-version."colors"."0.5.1"; + by-version."colors"."0.5.1" = lib.makeOverridable self.buildNodePackage { + name = "colors-0.5.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/colors/-/colors-0.5.1.tgz"; + name = "colors-0.5.1.tgz"; + sha1 = "7d0023eaeb154e8ee9fce75dcb923d0ed1667774"; + }) + ]; + buildInputs = + (self.nativeDeps."colors" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "colors" ]; + }; + by-spec."colors"."~0.6.0-1" = + self.by-version."colors"."0.6.2"; + by-version."colors"."0.6.2" = lib.makeOverridable 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"; + }) + ]; + buildInputs = + (self.nativeDeps."colors" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "colors" ]; + }; + "colors" = self.by-version."colors"."0.6.2"; + by-spec."colors"."~0.6.1" = + self.by-version."colors"."0.6.2"; + by-spec."colorsafeconsole"."0.0.4" = + self.by-version."colorsafeconsole"."0.0.4"; + by-version."colorsafeconsole"."0.0.4" = lib.makeOverridable self.buildNodePackage { + name = "colorsafeconsole-0.0.4"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/colorsafeconsole/-/colorsafeconsole-0.0.4.tgz"; + name = "colorsafeconsole-0.0.4.tgz"; + sha1 = "dc10508bb000e51964fb485fd8557faa169effbe"; + }) + ]; + buildInputs = + (self.nativeDeps."colorsafeconsole" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "colorsafeconsole" ]; + }; + "colorsafeconsole" = self.by-version."colorsafeconsole"."0.0.4"; + by-spec."combined-stream"."~0.0.4" = + self.by-version."combined-stream"."0.0.7"; + by-version."combined-stream"."0.0.7" = lib.makeOverridable 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"; + }) + ]; + buildInputs = + (self.nativeDeps."combined-stream" or []); + deps = { + "delayed-stream-0.0.5" = self.by-version."delayed-stream"."0.0.5"; + }; + peerDependencies = [ + ]; + passthru.names = [ "combined-stream" ]; + }; + by-spec."cryptiles"."0.2.x" = + self.by-version."cryptiles"."0.2.2"; + by-version."cryptiles"."0.2.2" = lib.makeOverridable self.buildNodePackage { + name = "cryptiles-0.2.2"; + bin = false; + 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 = { + "boom-0.4.2" = self.by-version."boom"."0.4.2"; + }; + peerDependencies = [ + ]; + passthru.names = [ "cryptiles" ]; + }; + by-spec."ctype"."0.5.2" = + self.by-version."ctype"."0.5.2"; + by-version."ctype"."0.5.2" = lib.makeOverridable self.buildNodePackage { + name = "ctype-0.5.2"; + bin = false; + 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."debug"."^0.8.1" = + self.by-version."debug"."0.8.1"; + by-version."debug"."0.8.1" = lib.makeOverridable self.buildNodePackage { + name = "debug-0.8.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/debug/-/debug-0.8.1.tgz"; + name = "debug-0.8.1.tgz"; + sha1 = "20ff4d26f5e422cb68a1bacbbb61039ad8c1c130"; + }) + ]; + buildInputs = + (self.nativeDeps."debug" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "debug" ]; + }; + "debug" = self.by-version."debug"."0.8.1"; + by-spec."deep-equal"."~0.0.0" = + self.by-version."deep-equal"."0.0.0"; + by-version."deep-equal"."0.0.0" = lib.makeOverridable self.buildNodePackage { + name = "deep-equal-0.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.0.0.tgz"; + name = "deep-equal-0.0.0.tgz"; + sha1 = "99679d3bbd047156fcd450d3d01eeb9068691e83"; + }) + ]; + buildInputs = + (self.nativeDeps."deep-equal" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "deep-equal" ]; + }; + by-spec."deep-equal"."~0.2.0" = + self.by-version."deep-equal"."0.2.1"; + by-version."deep-equal"."0.2.1" = lib.makeOverridable 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"; + }) + ]; + buildInputs = + (self.nativeDeps."deep-equal" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "deep-equal" ]; + }; + by-spec."deep-is"."0.1.x" = + self.by-version."deep-is"."0.1.3"; + by-version."deep-is"."0.1.3" = lib.makeOverridable self.buildNodePackage { + name = "deep-is-0.1.3"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz"; + name = "deep-is-0.1.3.tgz"; + sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; + }) + ]; + buildInputs = + (self.nativeDeps."deep-is" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "deep-is" ]; + }; + by-spec."defined"."~0.0.0" = + self.by-version."defined"."0.0.0"; + by-version."defined"."0.0.0" = lib.makeOverridable self.buildNodePackage { + name = "defined-0.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/defined/-/defined-0.0.0.tgz"; + name = "defined-0.0.0.tgz"; + sha1 = "f35eea7d705e933baf13b2f03b3f83d921403b3e"; + }) + ]; + buildInputs = + (self.nativeDeps."defined" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "defined" ]; + }; + by-spec."delayed-stream"."0.0.5" = + self.by-version."delayed-stream"."0.0.5"; + by-version."delayed-stream"."0.0.5" = lib.makeOverridable self.buildNodePackage { + name = "delayed-stream-0.0.5"; + 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"; + }) + ]; + buildInputs = + (self.nativeDeps."delayed-stream" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "delayed-stream" ]; + }; + by-spec."difflet"."~0.2.0" = + self.by-version."difflet"."0.2.6"; + by-version."difflet"."0.2.6" = lib.makeOverridable self.buildNodePackage { + name = "difflet-0.2.6"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/difflet/-/difflet-0.2.6.tgz"; + name = "difflet-0.2.6.tgz"; + sha1 = "ab23b31f5649b6faa8e3d2acbd334467365ca6fa"; + }) + ]; + buildInputs = + (self.nativeDeps."difflet" or []); + deps = { + "traverse-0.6.6" = self.by-version."traverse"."0.6.6"; + "charm-0.1.2" = self.by-version."charm"."0.1.2"; + "deep-is-0.1.3" = self.by-version."deep-is"."0.1.3"; + }; + peerDependencies = [ + ]; + passthru.names = [ "difflet" ]; + }; + by-spec."effess"."~0.0.2" = + self.by-version."effess"."0.0.5"; + by-version."effess"."0.0.5" = lib.makeOverridable self.buildNodePackage { + name = "effess-0.0.5"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/effess/-/effess-0.0.5.tgz"; + name = "effess-0.0.5.tgz"; + sha1 = "d328fd03929c168c02a63d9d3d889657dc9499db"; + }) + ]; + buildInputs = + (self.nativeDeps."effess" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "effess" ]; + }; + by-spec."effess"."~0.0.5" = + self.by-version."effess"."0.0.5"; + "effess" = self.by-version."effess"."0.0.5"; + 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 = "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"; + }) + ]; + buildInputs = + (self.nativeDeps."forever-agent" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "forever-agent" ]; + }; + 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 = "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"; + }) + ]; + buildInputs = + (self.nativeDeps."form-data" or []); + 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 = [ + ]; + passthru.names = [ "form-data" ]; + }; + by-spec."fstream"."~0.1.25" = + self.by-version."fstream"."0.1.31"; + by-version."fstream"."0.1.31" = lib.makeOverridable self.buildNodePackage { + name = "fstream-0.1.31"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz"; + name = "fstream-0.1.31.tgz"; + sha1 = "7337f058fbbbbefa8c9f561a28cab0849202c988"; + }) + ]; + buildInputs = + (self.nativeDeps."fstream" or []); + deps = { + "graceful-fs-3.0.4" = self.by-version."graceful-fs"."3.0.4"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; + "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; + }; + peerDependencies = [ + ]; + passthru.names = [ "fstream" ]; + }; + "fstream" = self.by-version."fstream"."0.1.31"; + by-spec."fstream"."~0.1.28" = + self.by-version."fstream"."0.1.31"; + by-spec."glob"."~3.2.1" = + self.by-version."glob"."3.2.11"; + by-version."glob"."3.2.11" = lib.makeOverridable self.buildNodePackage { + name = "glob-3.2.11"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/glob/-/glob-3.2.11.tgz"; + name = "glob-3.2.11.tgz"; + sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d"; + }) + ]; + buildInputs = + (self.nativeDeps."glob" or []); + deps = { + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + "minimatch-0.3.0" = self.by-version."minimatch"."0.3.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "glob" ]; + }; + by-spec."glob"."~3.2.9" = + self.by-version."glob"."3.2.11"; + by-spec."graceful-fs"."~1" = + self.by-version."graceful-fs"."1.2.3"; + by-version."graceful-fs"."1.2.3" = lib.makeOverridable self.buildNodePackage { + name = "graceful-fs-1.2.3"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"; + name = "graceful-fs-1.2.3.tgz"; + sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364"; + }) + ]; + buildInputs = + (self.nativeDeps."graceful-fs" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "graceful-fs" ]; + }; + by-spec."graceful-fs"."~3.0.2" = + self.by-version."graceful-fs"."3.0.4"; + by-version."graceful-fs"."3.0.4" = lib.makeOverridable self.buildNodePackage { + name = "graceful-fs-3.0.4"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.4.tgz"; + name = "graceful-fs-3.0.4.tgz"; + sha1 = "a0306d9b0940e0fc512d33b5df1014e88e0637a3"; + }) + ]; + buildInputs = + (self.nativeDeps."graceful-fs" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "graceful-fs" ]; + }; + by-spec."hardware-resolve"."~0.1.3" = + self.by-version."hardware-resolve"."0.1.6"; + by-version."hardware-resolve"."0.1.6" = lib.makeOverridable self.buildNodePackage { + name = "hardware-resolve-0.1.6"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/hardware-resolve/-/hardware-resolve-0.1.6.tgz"; + name = "hardware-resolve-0.1.6.tgz"; + sha1 = "b03f5077ab1b4b185ecd9486a3ba754f4b46e02a"; + }) + ]; + buildInputs = + (self.nativeDeps."hardware-resolve" or []); + deps = { + "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14"; + "osenv-0.0.3" = self.by-version."osenv"."0.0.3"; + "effess-0.0.5" = self.by-version."effess"."0.0.5"; + }; + peerDependencies = [ + ]; + passthru.names = [ "hardware-resolve" ]; + }; + "hardware-resolve" = self.by-version."hardware-resolve"."0.1.6"; + by-spec."hawk"."~1.0.0" = + self.by-version."hawk"."1.0.0"; + by-version."hawk"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "hawk-1.0.0"; + bin = false; + 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 = { + "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 = [ + ]; + passthru.names = [ "hawk" ]; + }; + by-spec."hoek"."0.9.x" = + self.by-version."hoek"."0.9.1"; + by-version."hoek"."0.9.1" = lib.makeOverridable self.buildNodePackage { + name = "hoek-0.9.1"; + bin = false; + 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-spec."http-signature"."~0.10.0" = + self.by-version."http-signature"."0.10.0"; + by-version."http-signature"."0.10.0" = lib.makeOverridable self.buildNodePackage { + name = "http-signature-0.10.0"; + bin = false; + 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 = { + "assert-plus-0.1.2" = self.by-version."assert-plus"."0.1.2"; + "asn1-0.1.11" = self.by-version."asn1"."0.1.11"; + "ctype-0.5.2" = self.by-version."ctype"."0.5.2"; + }; + peerDependencies = [ + ]; + passthru.names = [ "http-signature" ]; + }; + by-spec."humanize"."0.0.9" = + self.by-version."humanize"."0.0.9"; + by-version."humanize"."0.0.9" = lib.makeOverridable self.buildNodePackage { + name = "humanize-0.0.9"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/humanize/-/humanize-0.0.9.tgz"; + name = "humanize-0.0.9.tgz"; + sha1 = "1994ffaecdfe9c441ed2bdac7452b7bb4c9e41a4"; + }) + ]; + buildInputs = + (self.nativeDeps."humanize" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "humanize" ]; + }; + "humanize" = self.by-version."humanize"."0.0.9"; + by-spec."inherits"."*" = + self.by-version."inherits"."2.0.1"; + by-version."inherits"."2.0.1" = lib.makeOverridable 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"; + }) + ]; + buildInputs = + (self.nativeDeps."inherits" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "inherits" ]; + }; + by-spec."inherits"."2" = + self.by-version."inherits"."2.0.1"; + by-spec."inherits"."~2.0.0" = + self.by-version."inherits"."2.0.1"; + by-spec."inherits"."~2.0.1" = + self.by-version."inherits"."2.0.1"; + by-spec."json-stringify-safe"."~5.0.0" = + self.by-version."json-stringify-safe"."5.0.0"; + by-version."json-stringify-safe"."5.0.0" = lib.makeOverridable self.buildNodePackage { + name = "json-stringify-safe-5.0.0"; + 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"; + }) + ]; + buildInputs = + (self.nativeDeps."json-stringify-safe" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "json-stringify-safe" ]; + }; + by-spec."keypress"."~0.2.1" = + self.by-version."keypress"."0.2.1"; + by-version."keypress"."0.2.1" = lib.makeOverridable self.buildNodePackage { + name = "keypress-0.2.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/keypress/-/keypress-0.2.1.tgz"; + name = "keypress-0.2.1.tgz"; + sha1 = "1e80454250018dbad4c3fe94497d6e67b6269c77"; + }) + ]; + buildInputs = + (self.nativeDeps."keypress" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "keypress" ]; + }; + "keypress" = self.by-version."keypress"."0.2.1"; + 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 = "lru-cache-2.5.0"; + bin = false; + 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."mime"."~1.2.11" = + self.by-version."mime"."1.2.11"; + by-version."mime"."1.2.11" = lib.makeOverridable 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"; + }) + ]; + buildInputs = + (self.nativeDeps."mime" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "mime" ]; + }; + by-spec."mime"."~1.2.9" = + self.by-version."mime"."1.2.11"; + by-spec."minimatch"."0.3" = + self.by-version."minimatch"."0.3.0"; + by-version."minimatch"."0.3.0" = lib.makeOverridable self.buildNodePackage { + name = "minimatch-0.3.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz"; + name = "minimatch-0.3.0.tgz"; + sha1 = "275d8edaac4f1bb3326472089e7949c8394699dd"; + }) + ]; + buildInputs = + (self.nativeDeps."minimatch" or []); + deps = { + "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0"; + "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "minimatch" ]; + }; + by-spec."minimatch"."~0.2.14" = + self.by-version."minimatch"."0.2.14"; + by-version."minimatch"."0.2.14" = lib.makeOverridable self.buildNodePackage { + name = "minimatch-0.2.14"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz"; + name = "minimatch-0.2.14.tgz"; + sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a"; + }) + ]; + buildInputs = + (self.nativeDeps."minimatch" or []); + deps = { + "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0"; + "sigmund-1.0.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 = "minimist-0.0.8"; + bin = false; + 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."mkdirp"."0.5" = + self.by-version."mkdirp"."0.5.0"; + by-version."mkdirp"."0.5.0" = lib.makeOverridable self.buildNodePackage { + name = "mkdirp-0.5.0"; + bin = true; + 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 = { + "minimist-0.0.8" = self.by-version."minimist"."0.0.8"; + }; + peerDependencies = [ + ]; + passthru.names = [ "mkdirp" ]; + }; + by-spec."mkdirp"."~0.3 || 0.4 || 0.5" = + self.by-version."mkdirp"."0.5.0"; + by-spec."mkdirp"."~0.3.5" = + self.by-version."mkdirp"."0.3.5"; + by-version."mkdirp"."0.3.5" = lib.makeOverridable 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"; + }) + ]; + buildInputs = + (self.nativeDeps."mkdirp" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "mkdirp" ]; + }; + "mkdirp" = self.by-version."mkdirp"."0.3.5"; + by-spec."mute-stream"."~0.0.4" = + self.by-version."mute-stream"."0.0.4"; + by-version."mute-stream"."0.0.4" = lib.makeOverridable self.buildNodePackage { + name = "mute-stream-0.0.4"; + 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"; + }) + ]; + buildInputs = + (self.nativeDeps."mute-stream" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "mute-stream" ]; + }; + by-spec."my-local-ip"."~1.0.0" = + self.by-version."my-local-ip"."1.0.0"; + by-version."my-local-ip"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "my-local-ip-1.0.0"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/my-local-ip/-/my-local-ip-1.0.0.tgz"; + name = "my-local-ip-1.0.0.tgz"; + sha1 = "37585555a4ff1985309edac7c2a045a466be6c32"; + }) + ]; + buildInputs = + (self.nativeDeps."my-local-ip" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "my-local-ip" ]; + }; + "my-local-ip" = self.by-version."my-local-ip"."1.0.0"; + by-spec."nan"."~1.0.0" = + self.by-version."nan"."1.0.0"; + by-version."nan"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "nan-1.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/nan/-/nan-1.0.0.tgz"; + name = "nan-1.0.0.tgz"; + sha1 = "ae24f8850818d662fcab5acf7f3b95bfaa2ccf38"; + }) + ]; + buildInputs = + (self.nativeDeps."nan" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "nan" ]; + }; + by-spec."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-uuid-1.4.1"; + bin = false; + 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" ]; + }; + by-spec."nomnom"."~1.6.2" = + self.by-version."nomnom"."1.6.2"; + by-version."nomnom"."1.6.2" = lib.makeOverridable self.buildNodePackage { + name = "nomnom-1.6.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/nomnom/-/nomnom-1.6.2.tgz"; + name = "nomnom-1.6.2.tgz"; + sha1 = "84a66a260174408fc5b77a18f888eccc44fb6971"; + }) + ]; + buildInputs = + (self.nativeDeps."nomnom" or []); + deps = { + "colors-0.5.1" = self.by-version."colors"."0.5.1"; + "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; + }; + peerDependencies = [ + ]; + passthru.names = [ "nomnom" ]; + }; + "nomnom" = self.by-version."nomnom"."1.6.2"; + by-spec."nopt"."~2" = + self.by-version."nopt"."2.2.1"; + by-version."nopt"."2.2.1" = lib.makeOverridable self.buildNodePackage { + name = "nopt-2.2.1"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz"; + name = "nopt-2.2.1.tgz"; + sha1 = "2aa09b7d1768487b3b89a9c5aa52335bff0baea7"; + }) + ]; + buildInputs = + (self.nativeDeps."nopt" or []); + deps = { + "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5"; + }; + peerDependencies = [ + ]; + passthru.names = [ "nopt" ]; + }; + by-spec."oauth-sign"."~0.3.0" = + self.by-version."oauth-sign"."0.3.0"; + by-version."oauth-sign"."0.3.0" = lib.makeOverridable self.buildNodePackage { + name = "oauth-sign-0.3.0"; + 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"; + }) + ]; + buildInputs = + (self.nativeDeps."oauth-sign" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "oauth-sign" ]; + }; + by-spec."object-inspect"."~0.4.0" = + self.by-version."object-inspect"."0.4.0"; + by-version."object-inspect"."0.4.0" = lib.makeOverridable self.buildNodePackage { + name = "object-inspect-0.4.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/object-inspect/-/object-inspect-0.4.0.tgz"; + name = "object-inspect-0.4.0.tgz"; + sha1 = "f5157c116c1455b243b06ee97703392c5ad89fec"; + }) + ]; + buildInputs = + (self.nativeDeps."object-inspect" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "object-inspect" ]; + }; + by-spec."optimist"."~0.5.2" = + self.by-version."optimist"."0.5.2"; + by-version."optimist"."0.5.2" = lib.makeOverridable self.buildNodePackage { + name = "optimist-0.5.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/optimist/-/optimist-0.5.2.tgz"; + name = "optimist-0.5.2.tgz"; + sha1 = "85c8c1454b3315e4a78947e857b1df033450bfbc"; + }) + ]; + buildInputs = + (self.nativeDeps."optimist" or []); + deps = { + "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2"; + }; + peerDependencies = [ + ]; + passthru.names = [ "optimist" ]; + }; + by-spec."osenv"."0.0.3" = + self.by-version."osenv"."0.0.3"; + by-version."osenv"."0.0.3" = lib.makeOverridable self.buildNodePackage { + name = "osenv-0.0.3"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/osenv/-/osenv-0.0.3.tgz"; + name = "osenv-0.0.3.tgz"; + sha1 = "cd6ad8ddb290915ad9e22765576025d411f29cb6"; + }) + ]; + buildInputs = + (self.nativeDeps."osenv" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "osenv" ]; + }; + by-spec."punycode".">=0.2.0" = + self.by-version."punycode"."1.3.2"; + by-version."punycode"."1.3.2" = lib.makeOverridable 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"; + }) + ]; + buildInputs = + (self.nativeDeps."punycode" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "punycode" ]; + }; + by-spec."qs"."~0.6.0" = + self.by-version."qs"."0.6.6"; + by-version."qs"."0.6.6" = lib.makeOverridable 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"; + }) + ]; + buildInputs = + (self.nativeDeps."qs" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "qs" ]; + }; + by-spec."read"."^1.0.5" = + self.by-version."read"."1.0.5"; + by-version."read"."1.0.5" = lib.makeOverridable self.buildNodePackage { + name = "read-1.0.5"; + bin = false; + 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 = { + "mute-stream-0.0.4" = self.by-version."mute-stream"."0.0.4"; + }; + peerDependencies = [ + ]; + passthru.names = [ "read" ]; + }; + "read" = self.by-version."read"."1.0.5"; + by-spec."request"."~2.33.0" = + self.by-version."request"."2.33.0"; + by-version."request"."2.33.0" = lib.makeOverridable self.buildNodePackage { + name = "request-2.33.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/request/-/request-2.33.0.tgz"; + name = "request-2.33.0.tgz"; + sha1 = "5167878131726070ec633752ea230a2379dc65ff"; + }) + ]; + buildInputs = + (self.nativeDeps."request" or []); + 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.1" = self.by-version."node-uuid"."1.4.1"; + "mime-1.2.11" = self.by-version."mime"."1.2.11"; + "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1"; + "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.0" = self.by-version."http-signature"."0.10.0"; + "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 = [ + ]; + passthru.names = [ "request" ]; + }; + "request" = self.by-version."request"."2.33.0"; + by-spec."resumer"."~0.0.0" = + self.by-version."resumer"."0.0.0"; + by-version."resumer"."0.0.0" = lib.makeOverridable self.buildNodePackage { + name = "resumer-0.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz"; + name = "resumer-0.0.0.tgz"; + sha1 = "f1e8f461e4064ba39e82af3cdc2a8c893d076759"; + }) + ]; + buildInputs = + (self.nativeDeps."resumer" or []); + deps = { + "through-2.3.6" = self.by-version."through"."2.3.6"; + }; + peerDependencies = [ + ]; + passthru.names = [ "resumer" ]; + }; + by-spec."rimraf"."2" = + self.by-version."rimraf"."2.2.8"; + by-version."rimraf"."2.2.8" = lib.makeOverridable self.buildNodePackage { + name = "rimraf-2.2.8"; + bin = true; + 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" ]; + }; + by-spec."rimraf"."~2.1.4" = + self.by-version."rimraf"."2.1.4"; + by-version."rimraf"."2.1.4" = lib.makeOverridable self.buildNodePackage { + name = "rimraf-2.1.4"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/rimraf/-/rimraf-2.1.4.tgz"; + name = "rimraf-2.1.4.tgz"; + sha1 = "5a6eb62eeda068f51ede50f29b3e5cd22f3d9bb2"; + }) + ]; + buildInputs = + (self.nativeDeps."rimraf" or []); + deps = { + "graceful-fs-1.2.3" = self.by-version."graceful-fs"."1.2.3"; + }; + peerDependencies = [ + ]; + passthru.names = [ "rimraf" ]; + }; + by-spec."runforcover"."~0.0.2" = + self.by-version."runforcover"."0.0.2"; + by-version."runforcover"."0.0.2" = lib.makeOverridable self.buildNodePackage { + name = "runforcover-0.0.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/runforcover/-/runforcover-0.0.2.tgz"; + name = "runforcover-0.0.2.tgz"; + sha1 = "344f057d8d45d33aebc6cc82204678f69c4857cc"; + }) + ]; + buildInputs = + (self.nativeDeps."runforcover" or []); + deps = { + "bunker-0.1.2" = self.by-version."bunker"."0.1.2"; + }; + peerDependencies = [ + ]; + passthru.names = [ "runforcover" ]; + }; + by-spec."semver"."^2.3.0" = + self.by-version."semver"."2.3.2"; + by-version."semver"."2.3.2" = lib.makeOverridable self.buildNodePackage { + name = "semver-2.3.2"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/semver/-/semver-2.3.2.tgz"; + name = "semver-2.3.2.tgz"; + sha1 = "b9848f25d6cf36333073ec9ef8856d42f1233e52"; + }) + ]; + buildInputs = + (self.nativeDeps."semver" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "semver" ]; + }; + "semver" = self.by-version."semver"."2.3.2"; + by-spec."sigmund"."~1.0.0" = + self.by-version."sigmund"."1.0.0"; + by-version."sigmund"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "sigmund-1.0.0"; + bin = false; + 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."slide"."*" = + self.by-version."slide"."1.1.6"; + by-version."slide"."1.1.6" = lib.makeOverridable self.buildNodePackage { + name = "slide-1.1.6"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/slide/-/slide-1.1.6.tgz"; + name = "slide-1.1.6.tgz"; + sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"; + }) + ]; + buildInputs = + (self.nativeDeps."slide" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "slide" ]; + }; + by-spec."sntp"."0.2.x" = + self.by-version."sntp"."0.2.4"; + by-version."sntp"."0.2.4" = lib.makeOverridable self.buildNodePackage { + name = "sntp-0.2.4"; + bin = false; + 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 = { + "hoek-0.9.1" = self.by-version."hoek"."0.9.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "sntp" ]; + }; + by-spec."structured-clone"."~0.2.2" = + self.by-version."structured-clone"."0.2.2"; + by-version."structured-clone"."0.2.2" = lib.makeOverridable self.buildNodePackage { + name = "structured-clone-0.2.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/structured-clone/-/structured-clone-0.2.2.tgz"; + name = "structured-clone-0.2.2.tgz"; + sha1 = "ac92b6be31958a643db30f1335abc6a1b02dfdc2"; + }) + ]; + buildInputs = + (self.nativeDeps."structured-clone" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "structured-clone" ]; + }; + "structured-clone" = self.by-version."structured-clone"."0.2.2"; + by-spec."tap"."~0.4.8" = + self.by-version."tap"."0.4.13"; + by-version."tap"."0.4.13" = lib.makeOverridable self.buildNodePackage { + name = "tap-0.4.13"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/tap/-/tap-0.4.13.tgz"; + name = "tap-0.4.13.tgz"; + sha1 = "3986134d6759727fc2223e61126eeb87243accbc"; + }) + ]; + buildInputs = + (self.nativeDeps."tap" or []); + deps = { + "buffer-equal-0.0.1" = self.by-version."buffer-equal"."0.0.1"; + "deep-equal-0.0.0" = self.by-version."deep-equal"."0.0.0"; + "difflet-0.2.6" = self.by-version."difflet"."0.2.6"; + "glob-3.2.11" = self.by-version."glob"."3.2.11"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; + "nopt-2.2.1" = self.by-version."nopt"."2.2.1"; + "runforcover-0.0.2" = self.by-version."runforcover"."0.0.2"; + "slide-1.1.6" = self.by-version."slide"."1.1.6"; + "yamlish-0.0.6" = self.by-version."yamlish"."0.0.6"; + }; + peerDependencies = [ + ]; + passthru.names = [ "tap" ]; + }; + "tap" = self.by-version."tap"."0.4.13"; + by-spec."tape"."~2.12.3" = + self.by-version."tape"."2.12.3"; + by-version."tape"."2.12.3" = lib.makeOverridable self.buildNodePackage { + name = "tape-2.12.3"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/tape/-/tape-2.12.3.tgz"; + name = "tape-2.12.3.tgz"; + sha1 = "5559d5454050292627537c012991ec6971f66156"; + }) + ]; + buildInputs = + (self.nativeDeps."tape" or []); + deps = { + "deep-equal-0.2.1" = self.by-version."deep-equal"."0.2.1"; + "defined-0.0.0" = self.by-version."defined"."0.0.0"; + "glob-3.2.11" = self.by-version."glob"."3.2.11"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + "object-inspect-0.4.0" = self.by-version."object-inspect"."0.4.0"; + "resumer-0.0.0" = self.by-version."resumer"."0.0.0"; + "through-2.3.6" = self.by-version."through"."2.3.6"; + }; + peerDependencies = [ + ]; + passthru.names = [ "tape" ]; + }; + "tape" = self.by-version."tape"."2.12.3"; + by-spec."tar"."~0.1.18" = + self.by-version."tar"."0.1.20"; + by-version."tar"."0.1.20" = lib.makeOverridable self.buildNodePackage { + name = "tar-0.1.20"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/tar/-/tar-0.1.20.tgz"; + name = "tar-0.1.20.tgz"; + sha1 = "42940bae5b5f22c74483699126f9f3f27449cb13"; + }) + ]; + buildInputs = + (self.nativeDeps."tar" or []); + deps = { + "block-stream-0.0.7" = self.by-version."block-stream"."0.0.7"; + "fstream-0.1.31" = self.by-version."fstream"."0.1.31"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "tar" ]; + }; + "tar" = self.by-version."tar"."0.1.20"; + by-spec."temp"."~0.6.0" = + self.by-version."temp"."0.6.0"; + by-version."temp"."0.6.0" = lib.makeOverridable self.buildNodePackage { + name = "temp-0.6.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/temp/-/temp-0.6.0.tgz"; + name = "temp-0.6.0.tgz"; + sha1 = "6b13df5cddf370f2e3a606ca40f202c419173f07"; + }) + ]; + buildInputs = + (self.nativeDeps."temp" or []); + deps = { + "rimraf-2.1.4" = self.by-version."rimraf"."2.1.4"; + "osenv-0.0.3" = self.by-version."osenv"."0.0.3"; + }; + peerDependencies = [ + ]; + passthru.names = [ "temp" ]; + }; + "temp" = self.by-version."temp"."0.6.0"; + by-spec."through"."~2.3.4" = + self.by-version."through"."2.3.6"; + by-version."through"."2.3.6" = lib.makeOverridable self.buildNodePackage { + name = "through-2.3.6"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/through/-/through-2.3.6.tgz"; + name = "through-2.3.6.tgz"; + sha1 = "26681c0f524671021d4e29df7c36bce2d0ecf2e8"; + }) + ]; + buildInputs = + (self.nativeDeps."through" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "through" ]; + }; + by-spec."tough-cookie".">=0.12.0" = + self.by-version."tough-cookie"."0.12.1"; + by-version."tough-cookie"."0.12.1" = lib.makeOverridable self.buildNodePackage { + name = "tough-cookie-0.12.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz"; + name = "tough-cookie-0.12.1.tgz"; + sha1 = "8220c7e21abd5b13d96804254bd5a81ebf2c7d62"; + }) + ]; + buildInputs = + (self.nativeDeps."tough-cookie" or []); + deps = { + "punycode-1.3.2" = self.by-version."punycode"."1.3.2"; + }; + peerDependencies = [ + ]; + passthru.names = [ "tough-cookie" ]; + }; + by-spec."traverse"."0.6.x" = + self.by-version."traverse"."0.6.6"; + by-version."traverse"."0.6.6" = lib.makeOverridable self.buildNodePackage { + name = "traverse-0.6.6"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz"; + name = "traverse-0.6.6.tgz"; + sha1 = "cbdf560fd7b9af632502fed40f918c157ea97137"; + }) + ]; + buildInputs = + (self.nativeDeps."traverse" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "traverse" ]; + }; + by-spec."traverse"."~0.5.1" = + self.by-version."traverse"."0.5.2"; + by-version."traverse"."0.5.2" = lib.makeOverridable self.buildNodePackage { + name = "traverse-0.5.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/traverse/-/traverse-0.5.2.tgz"; + name = "traverse-0.5.2.tgz"; + sha1 = "e203c58d5f7f0e37db6e74c0acb929bb09b61d85"; + }) + ]; + buildInputs = + (self.nativeDeps."traverse" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "traverse" ]; + }; + by-spec."tunnel-agent"."~0.3.0" = + self.by-version."tunnel-agent"."0.3.0"; + by-version."tunnel-agent"."0.3.0" = lib.makeOverridable self.buildNodePackage { + name = "tunnel-agent-0.3.0"; + 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"; + }) + ]; + buildInputs = + (self.nativeDeps."tunnel-agent" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "tunnel-agent" ]; + }; + by-spec."uglify-js"."~1.1.1" = + self.by-version."uglify-js"."1.1.1"; + by-version."uglify-js"."1.1.1" = lib.makeOverridable self.buildNodePackage { + name = "uglify-js-1.1.1"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/uglify-js/-/uglify-js-1.1.1.tgz"; + name = "uglify-js-1.1.1.tgz"; + sha1 = "ee71a97c4cefd06a1a9b20437f34118982aa035b"; + }) + ]; + buildInputs = + (self.nativeDeps."uglify-js" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "uglify-js" ]; + }; + by-spec."underscore"."~1.4.4" = + self.by-version."underscore"."1.4.4"; + by-version."underscore"."1.4.4" = lib.makeOverridable 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"; + }) + ]; + buildInputs = + (self.nativeDeps."underscore" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "underscore" ]; + }; + by-spec."usb"."~0.3.11" = + self.by-version."usb"."0.3.11"; + by-version."usb"."0.3.11" = lib.makeOverridable self.buildNodePackage { + name = "usb-0.3.11"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/usb/-/usb-0.3.11.tgz"; + name = "usb-0.3.11.tgz"; + sha1 = "ee61d114181fd1de8738053920cde069d0aa428e"; + }) + ]; + buildInputs = + (self.nativeDeps."usb" or []); + deps = { + "bindings-shyp-0.2.3" = self.by-version."bindings-shyp"."0.2.3"; + # "usb-shyp-win32-x64-0.3.11-0" = self.by-version."usb-shyp-win32-x64"."0.3.11-0"; + # "usb-shyp-win32-ia32-0.3.11-0" = self.by-version."usb-shyp-win32-ia32"."0.3.11-0"; + # "usb-shyp-darwin-x64-0.3.11-0" = self.by-version."usb-shyp-darwin-x64"."0.3.11-0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "usb" ]; + }; + "usb" = self.by-version."usb"."0.3.11"; + by-spec."usb-shyp-darwin-x64"."0.3.x" = + self.by-version."usb-shyp-darwin-x64"."0.3.11-0"; + by-version."usb-shyp-darwin-x64"."0.3.11-0" = lib.makeOverridable self.buildNodePackage { + name = "usb-shyp-darwin-x64-0.3.11-0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/usb-shyp-darwin-x64/-/usb-shyp-darwin-x64-0.3.11-0.tgz"; + name = "usb-shyp-darwin-x64-0.3.11-0.tgz"; + sha1 = "8e6c98e5dff676576dac02c8a0465f1eae833285"; + }) + ]; + buildInputs = + (self.nativeDeps."usb-shyp-darwin-x64" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "usb-shyp-darwin-x64" ]; + }; + by-spec."usb-shyp-win32-ia32"."0.3.x" = + self.by-version."usb-shyp-win32-ia32"."0.3.11-0"; + by-version."usb-shyp-win32-ia32"."0.3.11-0" = lib.makeOverridable self.buildNodePackage { + name = "usb-shyp-win32-ia32-0.3.11-0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/usb-shyp-win32-ia32/-/usb-shyp-win32-ia32-0.3.11-0.tgz"; + name = "usb-shyp-win32-ia32-0.3.11-0.tgz"; + sha1 = "365babb7f648cb8aff12f70c65445e1b0958bbbb"; + }) + ]; + buildInputs = + (self.nativeDeps."usb-shyp-win32-ia32" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "usb-shyp-win32-ia32" ]; + }; + by-spec."usb-shyp-win32-x64"."0.3.x" = + self.by-version."usb-shyp-win32-x64"."0.3.11-0"; + by-version."usb-shyp-win32-x64"."0.3.11-0" = lib.makeOverridable self.buildNodePackage { + name = "usb-shyp-win32-x64-0.3.11-0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/usb-shyp-win32-x64/-/usb-shyp-win32-x64-0.3.11-0.tgz"; + name = "usb-shyp-win32-x64-0.3.11-0.tgz"; + sha1 = "561417f00ab33c9d990a56e3a4ee446a21a3fcbe"; + }) + ]; + buildInputs = + (self.nativeDeps."usb-shyp-win32-x64" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "usb-shyp-win32-x64" ]; + }; + by-spec."wordwrap"."~0.0.2" = + self.by-version."wordwrap"."0.0.2"; + by-version."wordwrap"."0.0.2" = lib.makeOverridable 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"; + }) + ]; + buildInputs = + (self.nativeDeps."wordwrap" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "wordwrap" ]; + }; + by-spec."yamlish"."*" = + self.by-version."yamlish"."0.0.6"; + by-version."yamlish"."0.0.6" = lib.makeOverridable self.buildNodePackage { + name = "yamlish-0.0.6"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/yamlish/-/yamlish-0.0.6.tgz"; + name = "yamlish-0.0.6.tgz"; + sha1 = "c5df8f7661731351e39eb52223f83a46659452e3"; + }) + ]; + buildInputs = + (self.nativeDeps."yamlish" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "yamlish" ]; + }; +} diff --git a/pkgs/applications/misc/tilda/default.nix b/pkgs/applications/misc/tilda/default.nix index 7edd86c7409e..187ab0390143 100644 --- a/pkgs/applications/misc/tilda/default.nix +++ b/pkgs/applications/misc/tilda/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "tilda-${version}"; - version = "1.1.13"; + version = "1.2.2"; src = fetchurl { url = "https://github.com/lanoxx/tilda/archive/${name}.tar.gz"; - sha256 = "1b9rnyrdvqmw2xjv899a4k6hvr9w482c4xvlpfnckckxdyp2852d"; + sha256 = "1mzly0llsrxpc2yd1hml3gmwm023my2j3aszjw383pp34dab2nl5"; }; buildInputs = [ pkgconfig autoreconfHook gettext confuse vte gtk makeWrapper ]; diff --git a/pkgs/applications/misc/twmn/default.nix b/pkgs/applications/misc/twmn/default.nix index e144d12f762e..65c2ccb5ff0b 100644 --- a/pkgs/applications/misc/twmn/default.nix +++ b/pkgs/applications/misc/twmn/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1jd2y0ydcpjdmjbx77lw35710sqfwbgyrnpv66mi3gwvrbyiwpf3"; }; - buildInputs = [ qt4 pkgconfig boost boost.lib ]; + buildInputs = [ qt4 pkgconfig boost ]; propagatedBuildInputs = [ dbus ]; configurePhase = "qmake"; diff --git a/pkgs/applications/misc/vifm/default.nix b/pkgs/applications/misc/vifm/default.nix index 5abf57ae1fc4..5ff010005e40 100644 --- a/pkgs/applications/misc/vifm/default.nix +++ b/pkgs/applications/misc/vifm/default.nix @@ -1,18 +1,18 @@ -{ pkgs, fetchurl, stdenv, ncurses, utillinux, file, libX11 }: +{ pkgs, fetchurl, stdenv, ncurses, utillinux, file, libX11, which, groff }: let name = "vifm-${version}"; - version = "0.7.7"; + version = "0.7.8"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://sourceforge/project/vifm/vifm/${name}.tar.bz2"; - sha256 = "1lflmkd5q7qqi9d44py0y41pcx5bsadkihn3gc0x5cka04f2gh0d"; + sha256 = "00vnkr60ci6qwh95kzx399xm97g26svxl9i0y77qv99q41nb5ysx"; }; - buildInputs = [ utillinux ncurses file libX11 ]; + buildInputs = [ utillinux ncurses file libX11 which groff ]; meta = { description = "A vi-like file manager"; diff --git a/pkgs/applications/misc/vue/default.nix b/pkgs/applications/misc/vue/default.nix index 542f11f6e671..5133ad3c29eb 100644 --- a/pkgs/applications/misc/vue/default.nix +++ b/pkgs/applications/misc/vue/default.nix @@ -2,9 +2,9 @@ x@{builderDefsPackage , jre, unzip , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) @@ -32,11 +32,11 @@ rec { doDeploy = a.fullDepEntry '' mkdir -p "$out"/{share/vue,bin} cp ${src} "$out/share/vue/vue.jar" - echo '#!${a.stdenv.shell}' >> "$out/bin/vue" - echo '${a.jre}/bin/java -jar "'"$out/share/vue/vue.jar"'" "$@"' >> "$out/bin/vue" + echo '#!${a.stdenv.shell}' >> "$out/bin/vue" + echo '${a.jre}/bin/java -jar "'"$out/share/vue/vue.jar"'" "$@"' >> "$out/bin/vue" chmod a+x "$out/bin/vue" '' ["addInputs" "defEnsureDir"]; - + meta = { description = "Visual Understanding Environment - mind mapping software"; maintainers = with a.lib.maintainers; @@ -45,7 +45,6 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "free-noncopyleft"; # Apache License fork, actually + license = a.lib.licenses.free; # Apache License fork, actually }; }) x - diff --git a/pkgs/applications/misc/xfontsel/default.nix b/pkgs/applications/misc/xfontsel/default.nix index 2bb05fe44e07..15d054c2be2a 100644 --- a/pkgs/applications/misc/xfontsel/default.nix +++ b/pkgs/applications/misc/xfontsel/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.x.org/; description = "Allows testing the fonts available in an X server"; - license = "free"; + license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux ++ darwin; }; diff --git a/pkgs/applications/misc/xlsfonts/default.nix b/pkgs/applications/misc/xlsfonts/default.nix index 06b09154ba55..7584ebf72fb1 100644 --- a/pkgs/applications/misc/xlsfonts/default.nix +++ b/pkgs/applications/misc/xlsfonts/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.x.org/; description = "Lists the fonts available in the X server"; - license = "free"; + license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux ++ darwin; }; diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix index 8d73dfebb188..65201f2495b9 100644 --- a/pkgs/applications/misc/xmobar/default.nix +++ b/pkgs/applications/misc/xmobar/default.nix @@ -1,23 +1,23 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, alsaCore, alsaMixer, dbus, filepath, hinotify, HTTP -, libmpd, libXrandr, mtl, parsec, regexCompat, stm, time -, timezoneOlson, timezoneSeries, utf8String, wirelesstools, X11 -, X11Xft +, libmpd, libXpm, libXrandr, mtl, parsec, regexCompat, stm, time +, timezoneOlson, timezoneSeries, transformers, utf8String +, wirelesstools, X11, X11Xft }: cabal.mkDerivation (self: { pname = "xmobar"; - version = "0.21"; - sha256 = "1h0gsb808zm4j4kmw7fl4339wllc16ldy1ki96l8w3fvj30bcxpm"; + version = "0.22.1"; + sha256 = "0mnwwcfk0xf4fi3cnw19s6lxcg8sbsdlvg7zwvf5xf0y9q365swz"; isLibrary = false; isExecutable = true; buildDepends = [ alsaCore alsaMixer dbus filepath hinotify HTTP libmpd mtl parsec - regexCompat stm time timezoneOlson timezoneSeries utf8String X11 - X11Xft + regexCompat stm time timezoneOlson timezoneSeries transformers + utf8String X11 X11Xft ]; - extraLibraries = [ libXrandr wirelesstools ]; + extraLibraries = [ libXpm libXrandr wirelesstools ]; configureFlags = "-fall_extensions"; meta = { homepage = "http://xmobar.org"; diff --git a/pkgs/applications/misc/xrandr-invert-colors/default.nix b/pkgs/applications/misc/xrandr-invert-colors/default.nix new file mode 100644 index 000000000000..e9bb722dcab0 --- /dev/null +++ b/pkgs/applications/misc/xrandr-invert-colors/default.nix @@ -0,0 +1,26 @@ +{ fetchurl, stdenv, libXrandr}: + +stdenv.mkDerivation rec { + version = "v0.01"; + name = "xrandr-invert-colors-${version}"; + src = fetchurl { + url = "https://github.com/zoltanp/xrandr-invert-colors/archive/${version}.tar.gz"; + sha256 = "1z4hxn56rlflvqanb8ncqa1xqawnda85b1b37w6r2iqs8rw52d75"; + }; + + buildInputs = [ libXrandr ]; + + installPhase = '' + mkdir -p $out/bin + mv xrandr-invert-colors.bin xrandr-invert-colors + install xrandr-invert-colors $out/bin + ''; + + meta = with stdenv.lib; { + description = "Inverts the colors of your screen"; + license = stdenv.lib.licenses.gpl3Plus; + homepage = https://github.com/zoltanp/xrandr-invert-colors; + maintainers = [stdenv.lib.maintainers.magnetophon ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index 00e9ab0c810c..3365e62f8be3 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, xorg, ncurses, freetype, fontconfig, pkgconfig }: stdenv.mkDerivation rec { - name = "xterm-303"; + name = "xterm-312"; src = fetchurl { url = "ftp://invisible-island.net/xterm/${name}.tgz"; - sha256 = "0n7hay16aam9kfn642ri0wj5yzilbjm3l8znxc2p5dx9pn3rkwla"; + sha256 = "0vpkhls3i12ly4r68igz91vh6s9179wihjkdy0gvwr752hdqxm7s"; }; buildInputs = diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 5f44f79ebcdd..718670f569b7 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -1,17 +1,22 @@ -{ stdenv, fetchurl, pkgconfig, gtk, girara, gettext, docutils, file, makeWrapper, zathura_icon }: +{ stdenv, fetchurl, pkgconfig, gtk, girara, ncurses, gettext, docutils, file, makeWrapper, zathura_icon }: stdenv.mkDerivation rec { - version = "0.2.9"; + version = "0.3.1"; name = "zathura-core-${version}"; src = fetchurl { url = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz"; - sha256 = "17z05skjk95115ajp6459k1djadza1w8kck7jn1qnd697r01s1rc"; + sha256 = "1wwjj7vnzpkvn83674mapapvl2qsn7y44w17lq63283j1lic00mm"; }; buildInputs = [ pkgconfig file gtk girara gettext makeWrapper ]; - makeFlags = [ "PREFIX=$(out)" "RSTTOMAN=${docutils}/bin/rst2man.py" "VERBOSE=1" ]; + makeFlags = [ + "PREFIX=$(out)" + "RSTTOMAN=${docutils}/bin/rst2man.py" + "VERBOSE=1" + "TPUT=${ncurses}/bin/tput" + ]; postInstall = '' wrapProgram "$out/bin/zathura" \ diff --git a/pkgs/applications/misc/zathura/default.nix b/pkgs/applications/misc/zathura/default.nix index 1a4ab3d772c5..6f1b5f400dd1 100644 --- a/pkgs/applications/misc/zathura/default.nix +++ b/pkgs/applications/misc/zathura/default.nix @@ -1,7 +1,7 @@ -{ callPackage, pkgs, fetchurl, useMupdf }: +{ callPackage, pkgs, fetchurl, stdenv, useMupdf }: rec { - inherit (pkgs) stdenv; + inherit stdenv; icon = ./icon.xpm; diff --git a/pkgs/applications/misc/zathura/djvu/default.nix b/pkgs/applications/misc/zathura/djvu/default.nix index 1a2347f27277..00c5464b7d13 100644 --- a/pkgs/applications/misc/zathura/djvu/default.nix +++ b/pkgs/applications/misc/zathura/djvu/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gtk, zathura_core, girara, djvulibre, gettext }: stdenv.mkDerivation rec { - name = "zathura-djvu-0.2.3"; + name = "zathura-djvu-0.2.4"; src = fetchurl { url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz"; - sha256 = "12gd8kb0al5mknh4rlvxzgzwz3vhjggqjh8ws27phaq14paq4vn1"; + sha256 = "1g1lafmrjbx0xv7fljdmyqxx0k334sq4q6jy4a0q5xfrgz0bh45c"; }; buildInputs = [ pkgconfig djvulibre gettext zathura_core gtk girara ]; diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/config.patch b/pkgs/applications/misc/zathura/pdf-mupdf/config.patch index c7d172c92634..6445fab22989 100644 --- a/pkgs/applications/misc/zathura/pdf-mupdf/config.patch +++ b/pkgs/applications/misc/zathura/pdf-mupdf/config.patch @@ -1,10 +1,10 @@ ---- zathura-pdf-mupdf-0.2.6/config.mk -+++ zathura-pdf-mupdf-0.2.6/config.mk +--- zathura-pdf-mupdf-0.2.7/config.mk ++++ zathura-pdf-mupdf-0.2.7/config.mk @@ -32,10 +32,11 @@ OPENSSL_INC ?= $(shell pkg-config --cflags libcrypto) OPENSSL_LIB ?= $(shell pkg-config --libs libcrypto) --MUPDF_LIB ?= -lmupdf -lmupdf-js-none +-MUPDF_LIB ?= -lmupdf -lmujs +MUPDF_INC ?= $(shell pkg-config --cflags mupdf) +MUPDF_LIB ?= $(shell pkg-config --libs mupdf) diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index 4e585d852a2a..a6f12a64cf00 100644 --- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, zathura_core, gtk, girara, mupdf, openssl, openjpeg, libjpeg, jbig2dec }: stdenv.mkDerivation rec { - version = "0.2.6"; + version = "0.2.7"; name = "zathura-pdf-mupdf-${version}"; src = fetchurl { url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz"; - sha256 = "5df94b6f906008b5f3bca770a552da6d2917d6b8d3e4b3049cb7001302041b20"; + sha256 = "0gr5kkk75hn7sz9kmzynhhcdd9xb9sz5gdb8p1iz9g0fjhskyd5i"; }; buildInputs = [ pkgconfig zathura_core gtk girara openssl mupdf openjpeg libjpeg jbig2dec ]; diff --git a/pkgs/applications/networking/bittorrentsync/default.nix b/pkgs/applications/networking/bittorrentsync/default.nix index f45908b2387a..00f36729d1fa 100644 --- a/pkgs/applications/networking/bittorrentsync/default.nix +++ b/pkgs/applications/networking/bittorrentsync/default.nix @@ -5,15 +5,15 @@ let else if stdenv.system == "i686-linux" then "i386" else throw "Bittorrent Sync for: ${stdenv.system} not supported!"; - sha256 = if stdenv.system == "x86_64-linux" then "115xsbi5z8ll0z07vx4rzzsgr6qba43f3z3nzx33pva5dpdr3ci9" - else if stdenv.system == "i686-linux" then "110k6cq6l3nr1gak2ri6i1kwis78r3zc1ilbipgcccdczf9fnx7p" + sha256 = if stdenv.system == "x86_64-linux" then "c4b100bbf8cda0334e20793e02bf400d15266cb9d089917bd2b6b9d49dd37d19" + else if stdenv.system == "i686-linux" then "5760471fcea396efd158758aa350b1c48a9d0633765a5e3b059baf8aeab615fa" else throw "Bittorrent Sync for: ${stdenv.system} not supported!"; libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.libc ]; in stdenv.mkDerivation rec { name = "btsync-${version}"; - version = "1.4.82"; + version = "1.4.93"; src = fetchurl { url = "http://syncapp.bittorrent.com/${version}/btsync_${arch}-${version}.tar.gz"; diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index daab75c74ff9..f88d7df40306 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -12,7 +12,7 @@ mkChromiumDerivation (base: rec { cp -v "$buildPath/"*.pak "$libExecPath/" cp -v "$buildPath/icudtl.dat" "$libExecPath/" cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/" - cp -v $buildPath/libffmpegsumo.so "$libExecPath/" + cp -v "$buildPath/libpdf.so" "$buildPath/libffmpegsumo.so" "$libExecPath/" cp -v "$buildPath/chrome" "$libExecPath/$packageName" @@ -35,7 +35,7 @@ mkChromiumDerivation (base: rec { meta = { description = "An open source web browser from Google"; homepage = http://www.chromium.org/; - maintainers = with maintainers; [ goibhniu chaoflow aszlig wizeman ]; + maintainers = with maintainers; [ goibhniu chaoflow aszlig ]; license = licenses.bsd3; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 2676104db3e0..dea816e5be9b 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -69,7 +69,7 @@ let use_system_xdg_utils = true; use_system_yasm = true; use_system_zlib = false; - use_system_protobuf = true; + use_system_protobuf = false; # needs newer protobuf use_system_harfbuzz = false; use_system_icu = false; # Doesn't support ICU 52 yet. @@ -190,6 +190,7 @@ let libExecPath="${libExecPath}" python build/linux/unbundle/replace_gyp_files.py ${gypFlags} python build/gyp_chromium -f ninja --depth "$(pwd)" ${gypFlags} + find . -iname '*.py[co]' -delete ''; buildPhase = let diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 14881d11601e..75d5f1c248e9 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -9,7 +9,6 @@ , gnomeKeyringSupport ? false , proprietaryCodecs ? true , enablePepperFlash ? false -, enablePepperPDF ? false , enableWideVine ? false , cupsSupport ? false , pulseSupport ? false @@ -36,7 +35,7 @@ let sandbox = callPackage ./sandbox.nix { }; plugins = callPackage ./plugins.nix { - inherit enablePepperFlash enablePepperPDF enableWideVine; + inherit enablePepperFlash enableWideVine; }; }; @@ -56,25 +55,33 @@ let "x-scheme-handler/ftp" "x-scheme-handler/mailto" "x-scheme-handler/webcal" + "x-scheme-handler/about" + "x-scheme-handler/unknown" ]; categories = "Network;WebBrowser"; }; + suffix = if channel != "stable" then "-" + channel else ""; + in stdenv.mkDerivation { - name = "chromium${if channel != "stable" then "-" + channel else ""}-${chromium.browser.version}"; + name = "chromium${suffix}-${chromium.browser.version}"; buildInputs = [ makeWrapper ]; buildCommand = let browserBinary = "${chromium.browser}/libexec/chromium/chromium"; sandboxBinary = "${chromium.sandbox}/bin/chromium-sandbox"; - in '' + mkEnvVar = key: val: "--set '${key}' '${val}'"; + envVars = chromium.plugins.settings.envVars or {}; + flags = chromium.plugins.settings.flags or []; + in with stdenv.lib; '' mkdir -p "$out/bin" "$out/share/applications" ln -s "${chromium.browser}/share" "$out/share" makeWrapper "${browserBinary}" "$out/bin/chromium" \ --set CHROMIUM_SANDBOX_BINARY_PATH "${sandboxBinary}" \ - --add-flags "${chromium.plugins.flagsEnabled}" + ${concatStrings (mapAttrsToList mkEnvVar envVars)} \ + --add-flags "${concatStringsSep " " flags}" ln -s "$out/bin/chromium" "$out/bin/chromium-browser" ln -s "${chromium.browser}/share/icons" "$out/share/icons" diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index 5bd411586320..55e0cc4caa21 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -1,6 +1,5 @@ { stdenv , enablePepperFlash ? false -, enablePepperPDF ? false , enableWideVine ? false , source @@ -16,7 +15,7 @@ let src = source.plugins; phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ]; - outputs = [ "pdf" "flash" "widevine" ]; + outputs = [ "flash" "widevine" ]; unpackCmd = let chan = if source.channel == "dev" then "chrome-unstable" @@ -26,7 +25,6 @@ let mkdir -p plugins ar p "$src" data.tar.lzma | tar xJ -C plugins --strip-components=4 \ ./opt/google/${chan}/PepperFlash \ - ./opt/google/${chan}/libpdf.so \ ./opt/google/${chan}/libwidevinecdm.so \ ./opt/google/${chan}/libwidevinecdmadapter.so ''; @@ -40,7 +38,7 @@ let rpaths = [ stdenv.gcc.gcc ]; mkrpath = p: "${makeSearchPath "lib64" p}:${makeSearchPath "lib" p}"; in '' - for sofile in PepperFlash/libpepflashplayer.so libpdf.so \ + for sofile in PepperFlash/libpepflashplayer.so \ libwidevinecdm.so libwidevinecdmadapter.so; do chmod +x "$sofile" patchelf --set-rpath "${mkrpath rpaths}" "$sofile" @@ -51,25 +49,12 @@ let ''; installPhase = let - pdfName = "Chrome PDF Viewer"; - pdfDescription = "Portable Document Format"; - pdfMimeTypes = concatStringsSep ";" [ - "application/pdf" - "application/x-google-chrome-print-preview-pdf" - ]; - pdfInfo = "#${pdfName}#${pdfDescription};${pdfMimeTypes}"; - wvName = "Widevine Content Decryption Module"; wvDescription = "Playback of encrypted HTML audio/video content"; wvMimeTypes = "application/x-ppapi-widevine-cdm"; wvModule = "$widevine/lib/libwidevinecdmadapter.so"; wvInfo = "#${wvName}#${wvDescription}:${wvMimeTypes}"; in '' - install -vD libpdf.so "$pdf/lib/libpdf.so" - mkdir -p "$pdf/nix-support" - echo "--register-pepper-plugins='$pdf/lib/libpdf.so${pdfInfo}'" \ - > "$pdf/nix-support/chromium-flags" - flashVersion="$( sed -n -r 's/.*"version": "([^"]+)",.*/\1/p' PepperFlash/manifest.json )" @@ -77,24 +62,38 @@ let install -vD PepperFlash/libpepflashplayer.so \ "$flash/lib/libpepflashplayer.so" mkdir -p "$flash/nix-support" - echo "--ppapi-flash-path='$flash/lib/libpepflashplayer.so'" \ - "--ppapi-flash-version=$flashVersion" \ - > "$flash/nix-support/chromium-flags" + cat > "$flash/nix-support/chromium-plugin.nix" <<NIXOUT + { flags = [ + "--ppapi-flash-path='$flash/lib/libpepflashplayer.so'" + "--ppapi-flash-version=$flashVersion" + ]; + } + NIXOUT install -vD libwidevinecdm.so \ "$widevine/lib/libwidevinecdm.so" install -vD libwidevinecdmadapter.so \ "$widevine/lib/libwidevinecdmadapter.so" mkdir -p "$widevine/nix-support" - echo "--register-pepper-plugins='${wvModule}${wvInfo}'" \ - > "$widevine/nix-support/chromium-flags" + cat > "$widevine/nix-support/chromium-plugin.nix" <<NIXOUT + { flags = [ "--register-pepper-plugins='${wvModule}${wvInfo}'" ]; + envVars.NIX_CHROMIUM_PLUGIN_PATH_WIDEVINE = "$widevine/lib"; + } + NIXOUT ''; - passthru.flagsEnabled = let + passthru = let enabledPlugins = optional enablePepperFlash plugins.flash - ++ optional enablePepperPDF plugins.pdf ++ optional enableWideVine plugins.widevine; - getFlags = plugin: "$(< ${plugin}/nix-support/chromium-flags)"; - in concatStringsSep " " (map getFlags enabledPlugins); + getNix = plugin: import "${plugin}/nix-support/chromium-plugin.nix"; + mergeAttrsets = let + f = v: if all isAttrs v then mergeAttrsets v + else if all isList v then concatLists v + else if tail v == [] then head v + else head (tail v); + in fold (l: r: zipAttrsWith (_: f) [ l r ]) {}; + in { + settings = mergeAttrsets (map getNix enabledPlugins); + }; }; in plugins diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix index 5494b3708176..adac4baa29cd 100644 --- a/pkgs/applications/networking/browsers/chromium/source/default.nix +++ b/pkgs/applications/networking/browsers/chromium/source/default.nix @@ -22,9 +22,7 @@ stdenv.mkDerivation { prePatch = "patchShebangs ."; - patches = let - onPre39 = optional (versionOlder version "39.0.0.0"); - in [ ./sandbox_userns_36.patch ] ++ onPre39 ./missing_alg_import.patch; + patches = [ ./sandbox_userns_36.patch ./nix_plugin_paths.patch ]; postPatch = '' sed -i -r \ @@ -32,11 +30,6 @@ stdenv.mkDerivation { -e 's|/bin/echo|echo|' \ -e "/python_arch/s/: *'[^']*'/: '""'/" \ build/common.gypi chrome/chrome_tests.gypi - '' + optionalString (versionOlder version "38.0.0.0") '' - sed -i -e '/not RunGN/,+1d' -e '/import.*depot/d' build/gyp_chromium - sed -i -e 's|/usr/bin/gcc|gcc|' \ - third_party/WebKit/Source/build/scripts/scripts.gypi \ - third_party/WebKit/Source/build/scripts/preprocessor.pm '' + optionalString useOpenSSL '' cat $opensslPatches | patch -p1 -d third_party/openssl/openssl ''; diff --git a/pkgs/applications/networking/browsers/chromium/source/missing_alg_import.patch b/pkgs/applications/networking/browsers/chromium/source/missing_alg_import.patch deleted file mode 100644 index 243e3fe70498..000000000000 --- a/pkgs/applications/networking/browsers/chromium/source/missing_alg_import.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur chromium-37.0.2062.94.old/media/cast/logging/encoding_event_subscriber.cc chromium-37.0.2062.94/media/cast/logging/encoding_event_subscriber.cc ---- chromium-37.0.2062.94.old/media/cast/logging/encoding_event_subscriber.cc 2014-08-29 02:05:15.149140733 -0700 -+++ chromium-37.0.2062.94/media/cast/logging/encoding_event_subscriber.cc 2014-08-29 02:06:00.182853590 -0700 -@@ -4,6 +4,7 @@ - - #include "media/cast/logging/encoding_event_subscriber.h" - -+#include <algorithm> - #include <cstring> - #include <utility> - diff --git a/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths.patch b/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths.patch new file mode 100644 index 000000000000..0220d0429413 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths.patch @@ -0,0 +1,99 @@ +diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc +index 8a205a6..d5c24e1 100644 +--- a/chrome/common/chrome_paths.cc ++++ b/chrome/common/chrome_paths.cc +@@ -97,21 +97,14 @@ static base::LazyInstance<base::FilePath> + g_invalid_specified_user_data_dir = LAZY_INSTANCE_INITIALIZER; + + // Gets the path for internal plugins. +-bool GetInternalPluginsDirectory(base::FilePath* result) { +-#if defined(OS_MACOSX) && !defined(OS_IOS) +- // If called from Chrome, get internal plugins from a subdirectory of the +- // framework. +- if (base::mac::AmIBundled()) { +- *result = chrome::GetFrameworkBundlePath(); +- DCHECK(!result->empty()); +- *result = result->Append("Internet Plug-Ins"); +- return true; +- } +- // In tests, just look in the module directory (below). +-#endif +- +- // The rest of the world expects plugins in the module directory. +- return PathService::Get(base::DIR_MODULE, result); ++bool GetInternalPluginsDirectory(base::FilePath* result, ++ const std::string& ident) { ++ std::string full_env = std::string("NIX_CHROMIUM_PLUGIN_PATH_") + ident; ++ const char* value = getenv(full_env.c_str()); ++ if (value == NULL) ++ return PathService::Get(base::DIR_MODULE, result); ++ else ++ *result = base::FilePath(value); + } + + } // namespace +@@ -248,11 +241,11 @@ bool PathProvider(int key, base::FilePath* result) { + create_dir = true; + break; + case chrome::DIR_INTERNAL_PLUGINS: +- if (!GetInternalPluginsDirectory(&cur)) ++ if (!GetInternalPluginsDirectory(&cur, "ALL")) + return false; + break; + case chrome::DIR_PEPPER_FLASH_PLUGIN: +- if (!GetInternalPluginsDirectory(&cur)) ++ if (!GetInternalPluginsDirectory(&cur, "PEPPERFLASH")) + return false; + cur = cur.Append(kPepperFlashBaseDirectory); + break; +@@ -285,7 +278,7 @@ bool PathProvider(int key, base::FilePath* result) { + cur = cur.Append(FILE_PATH_LITERAL("script.log")); + break; + case chrome::FILE_FLASH_PLUGIN: +- if (!GetInternalPluginsDirectory(&cur)) ++ if (!GetInternalPluginsDirectory(&cur, "FILEFLASH")) + return false; + cur = cur.Append(kInternalFlashPluginFileName); + break; +@@ -295,12 +288,12 @@ bool PathProvider(int key, base::FilePath* result) { + cur = cur.Append(chrome::kPepperFlashPluginFilename); + break; + case chrome::FILE_PDF_PLUGIN: +- if (!GetInternalPluginsDirectory(&cur)) ++ if (!GetInternalPluginsDirectory(&cur, "PDF")) + return false; + cur = cur.Append(kInternalPDFPluginFileName); + break; + case chrome::FILE_EFFECTS_PLUGIN: +- if (!GetInternalPluginsDirectory(&cur)) ++ if (!GetInternalPluginsDirectory(&cur, "FILE_EFFECTS")) + return false; + cur = cur.Append(kEffectsPluginFileName); + break; +@@ -308,7 +301,7 @@ bool PathProvider(int key, base::FilePath* result) { + // We currently need a path here to look up whether the plugin is disabled + // and what its permissions are. + case chrome::FILE_NACL_PLUGIN: +- if (!GetInternalPluginsDirectory(&cur)) ++ if (!GetInternalPluginsDirectory(&cur, "NACL")) + return false; + cur = cur.Append(kInternalNaClPluginFileName); + break; +@@ -343,7 +336,7 @@ bool PathProvider(int key, base::FilePath* result) { + cur = cur.DirName(); + } + #else +- if (!GetInternalPluginsDirectory(&cur)) ++ if (!GetInternalPluginsDirectory(&cur, "PNACL")) + return false; + #endif + cur = cur.Append(FILE_PATH_LITERAL("pnacl")); +@@ -372,7 +365,7 @@ bool PathProvider(int key, base::FilePath* result) { + // In the component case, this is the source adapter. Otherwise, it is the + // actual Pepper module that gets loaded. + case chrome::FILE_WIDEVINE_CDM_ADAPTER: +- if (!GetInternalPluginsDirectory(&cur)) ++ if (!GetInternalPluginsDirectory(&cur, "WIDEVINE")) + return false; + cur = cur.AppendASCII(kWidevineCdmAdapterFileName); + break; diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix index e85369f763b7..5437f8e283ae 100644 --- a/pkgs/applications/networking/browsers/chromium/source/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix @@ -1,21 +1,21 @@ # This file is autogenerated from update.sh in the parent directory. { dev = { - version = "39.0.2171.7"; - sha256 = "1wxi601zsi10jw7ypa4i0a2g5hd3hqrb5pqkkry1pgbdimw69sb8"; - sha256bin32 = "11isyislr5mbbhwk625b347xyyp1x3xgws844sjbbcx83gf0ij7y"; - sha256bin64 = "16b0yzlm8j7kx8pc6fhzwiizl7zrzxmfal40q45848715jyln8hf"; + version = "41.0.2224.3"; + sha256 = "04lgklidxx4bryqhnm7kjqbfr12ns8ic9g4yxk3dig71081sas5f"; + sha256bin32 = "17fgh57yckk318r7r6qkc934dpq35qa6ps4x5fwscl070rzjf81k"; + sha256bin64 = "1qsvjm38cxx3inrw0hs4q9f4i9arqfj9cs57xh64wflrnh2z52zf"; }; beta = { - version = "38.0.2125.101"; - sha256 = "12hrl7i0xrjdwz8yaap5jhc6bzn29pk6dcz96743n6j7mcckac6k"; - sha256bin32 = "178nffl5pgqajg7vxxisycl79vnyv1iqqz04riywgj88mw7mjwpg"; - sha256bin64 = "0akwvnl987w8wli4h4k2x8xnpkzk9n8hn9wbp1lw87ch08sr7zfm"; + version = "40.0.2214.10"; + sha256 = "0wxkxgj6z18l2qkm0k16r8bpv9rdxk1g1ias03zzvlbj1bw3brdn"; + sha256bin32 = "0wr2vg97d3qrryb5sz31sd3ycb1l17irrs79vfa04ip85jqv89zn"; + sha256bin64 = "0bclgy386vdmfdf59hwkypcs8wwmlpgl3npp089hmcdvv7dmars8"; }; stable = { - version = "37.0.2062.120"; - sha256 = "1yvf1hzza5cdsa67dg302ifcwb759r8sf2z21p9q9wyanrc3f1xk"; - sha256bin32 = "07zwf5yn3ig8x9ysjdpm7w1fh4rcyxzfsnqvxmabc0bkrv2r1hg7"; - sha256bin64 = "02qc5qq5v9k55c5bxmndjh1xl6j1qaxk7k4r8mm0k5nxxyqih1p2"; + version = "39.0.2171.65"; + sha256 = "0lglcjvyhgmdm0sd76wv509pgwcfl86rlp9rj83z9giadwqlcmxi"; + sha256bin32 = "1iqzi462vw8da5f8ysk76q68xhiw5ndqc3hhc6djipsc6h240bji"; + sha256bin64 = "1gxh3sxpnl0167la9ncnz7l85gzi4ax6g5pqni1nma5g5cqqm177"; }; } diff --git a/pkgs/applications/networking/browsers/conkeror/default.nix b/pkgs/applications/networking/browsers/conkeror/default.nix index 47381f06d68d..4cb356fcab1a 100644 --- a/pkgs/applications/networking/browsers/conkeror/default.nix +++ b/pkgs/applications/networking/browsers/conkeror/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchgit, unzip, xulrunner, makeWrapper }: +{ stdenv, fetchgit, unzip, firefox, makeWrapper }: stdenv.mkDerivation { name = "conkeror-1.0pre-20140616"; src = fetchgit { url = git://repo.or.cz/conkeror.git; - rev = "8a26fff5896a3360549e2adfbf06b1d57e909266"; - sha256 = "56f1c71ca1753a63d7599d3e8bf52277711b2693e7709ed7c146f34940441cb4"; + rev = "98e89c7e5ff3a1069a0984338da01273cdb189a2"; + sha256 = "284ba966efebfa0aaa768abc1a4f901e2ecf5db9d0391d904a49118b0b94fcd7"; }; buildInputs = [ unzip makeWrapper ]; @@ -15,8 +15,8 @@ stdenv.mkDerivation { mkdir -p $out/libexec/conkeror cp -r * $out/libexec/conkeror - makeWrapper ${xulrunner}/bin/xulrunner $out/bin/conkeror \ - --add-flags $out/libexec/conkeror/application.ini + makeWrapper ${firefox}/bin/firefox $out/bin/conkeror \ + --add-flags "-app $out/libexec/conkeror/application.ini" ''; meta = { diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index ecf8dbc0fc61..3f85467fe315 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -1,8 +1,3 @@ -# This file is generated from generate_nix.rb. DO NOT EDIT. -# Execute the following command in a temporary directory to update the file. -# -# ruby generate_nix.rb > default.nix - { stdenv, fetchurl, config , alsaLib , atk @@ -21,7 +16,10 @@ , gtk , libX11 , libXScrnSaver +, libXcomposite +, libXdamage , libXext +, libXfixes , libXinerama , libXrender , libXt @@ -39,191 +37,10 @@ assert stdenv.isLinux; -let - version = "32.0.3"; - sources = [ - { locale = "ach"; arch = "linux-i686"; sha256 = "fd22fab9da5ba843876e0daf7db5069e3898a8bd548f8b324169914c88c02a10"; } - { locale = "ach"; arch = "linux-x86_64"; sha256 = "221028e98d8cb1cb330da4d2707c7cf98d2ae0066081f0b505d6cc4fa8fd4b30"; } - { locale = "af"; arch = "linux-i686"; sha256 = "37c93da084d25bd47c6aaf5389846ba4ac1e68a8989c03890b69142a46a2dddc"; } - { locale = "af"; arch = "linux-x86_64"; sha256 = "91dc95820faca47b031a8685a12e67d2f0b7f2cc9be5ff40f316bcf4c4110eee"; } - { locale = "an"; arch = "linux-i686"; sha256 = "c1251a6eb097cfc2bfa1fb137bcfcfbea333d457d57de3dce40ca60b96b07a53"; } - { locale = "an"; arch = "linux-x86_64"; sha256 = "fe010c04615c743f0500f9066bfab2e53d799074cbbd17c458b072ee741547f6"; } - { locale = "ar"; arch = "linux-i686"; sha256 = "e3482b3f6629c3addba28f86496c6608823b0a462ebca259bc9acc9ccadd07f3"; } - { locale = "ar"; arch = "linux-x86_64"; sha256 = "d2ba7625730d461d5f870ad4151991071ed36f141c65872d2e9493108d495603"; } - { locale = "as"; arch = "linux-i686"; sha256 = "7f44156bd7087d5ddb46f8ecbcf2d7468b32cca7ed7ac88989e604b9853d603b"; } - { locale = "as"; arch = "linux-x86_64"; sha256 = "a189cb96dedc9943362eaa70e851c64e0115c6c526d9d38a38ce2d79d80dea56"; } - { locale = "ast"; arch = "linux-i686"; sha256 = "5d62d0d12f4cd678567b470a1b6d94ea5889a5c6530a5d3d0b4d07c04bae1f18"; } - { locale = "ast"; arch = "linux-x86_64"; sha256 = "2e6f1caf2432ae2e6b6b3125449f7dcca1e2a3658ce267a0320aa449934260d8"; } - { locale = "be"; arch = "linux-i686"; sha256 = "d41d7abad29170d7d5df953bf9f3f22c56df8e85ddb4ba657cc0cbf357cdef0f"; } - { locale = "be"; arch = "linux-x86_64"; sha256 = "c899602dcf3ca72c657cc30ea54f986f44943ea9583da1dd6d48ebfe4489b7be"; } - { locale = "bg"; arch = "linux-i686"; sha256 = "e4ed4c432b3f399a2f7aa93ae62ae1ffadd8e4758c44f359a0faa401c014a3da"; } - { locale = "bg"; arch = "linux-x86_64"; sha256 = "138dc4afa256ca1a6f50ea250df5a032c69020f629e2b91843947e73f8e665c9"; } - { locale = "bn-BD"; arch = "linux-i686"; sha256 = "30f450b36b71431f87e016c09ab0e26f8ed72ee7a0cede0689be13d8b61a882c"; } - { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "ad320fef3271f5c6955404847552d11800ca8e8d7821cda53eb3311b6014281f"; } - { locale = "bn-IN"; arch = "linux-i686"; sha256 = "1e4b1b3d06cbda0aacb1d971b9a70f5648f05e9ad225de87739baef602b3d58f"; } - { locale = "bn-IN"; arch = "linux-x86_64"; sha256 = "51264d05eb58cec598a726b8e29e583355431c429a6f9eeddc16360ad0ef0dd5"; } - { locale = "br"; arch = "linux-i686"; sha256 = "e0e661d835297bb895ee3d2887fb4321b9c3c5af73edf5d36d365b254b0dc731"; } - { locale = "br"; arch = "linux-x86_64"; sha256 = "94c8e2b56ec784f3e2912a36bece9866c20e419069591517477b67156ad65f47"; } - { locale = "bs"; arch = "linux-i686"; sha256 = "ea2950b6c81b6cb108b518320c0e53406c972b6d46944fec39f92c10722be7ca"; } - { locale = "bs"; arch = "linux-x86_64"; sha256 = "4ceba96a76ec7631dc524d3e3b56c5994967b7ef227f38d3e3aa435c131f561a"; } - { locale = "ca"; arch = "linux-i686"; sha256 = "eb68c1f8e99ab00ddb9861ece4f1d17ca07c7e77fd4c2d4f4ff233f6f0018ba4"; } - { locale = "ca"; arch = "linux-x86_64"; sha256 = "17fe82eeeeb6c385010980984b04a8e71d3770a0d36d83e26786a5884aed7c05"; } - { locale = "cs"; arch = "linux-i686"; sha256 = "69e2a0769284464a95db122fa97f1dfb268b02b754fe6a4842683fd4c94d9a13"; } - { locale = "cs"; arch = "linux-x86_64"; sha256 = "bebaef3126c14b4d23c024176170aabb090463cae1a1b72b6b498ab3720bb9cf"; } - { locale = "csb"; arch = "linux-i686"; sha256 = "9ac7be93d0c3a72460ee3fea75621008bee5b2e85b78796f02eded8239562d81"; } - { locale = "csb"; arch = "linux-x86_64"; sha256 = "1af41e62a6c9ee47dad2d031fd7dcc0ff8b773ac7a912e6888f068e533972dd4"; } - { locale = "cy"; arch = "linux-i686"; sha256 = "339ff34b6b6d79db48b83ec9cc34fcb853652795e648c82845bbccf910b4286f"; } - { locale = "cy"; arch = "linux-x86_64"; sha256 = "686e466692bda17671d2ebf3683d03671c8d063c6a6008f3b27455656a584c95"; } - { locale = "da"; arch = "linux-i686"; sha256 = "67f0ee2e479c49853929cfb1b7fefe95d25d563d67f88f1560b21abf60cd67d6"; } - { locale = "da"; arch = "linux-x86_64"; sha256 = "d9f7cbbaa576e501edc9c03df922f708562ef1d3f84eefe010b8138b23399e40"; } - { locale = "de"; arch = "linux-i686"; sha256 = "a294f585d7f8247ecffd6c71beff75ea07f1ffb1af17830aa54904b6e9c4a71c"; } - { locale = "de"; arch = "linux-x86_64"; sha256 = "6dd118ebe633c66ebc7ef0bf71dcc4d5c2ce42552a4b981b74442e184fa8f3a9"; } - { locale = "dsb"; arch = "linux-i686"; sha256 = "7b989e4a804e366b7dc4fcd500968851e0978b2cd0f9da95e6f6504b9ccff7de"; } - { locale = "dsb"; arch = "linux-x86_64"; sha256 = "aa41149f4f2bc6020980920bdf85d57157ad3cee7dd7be0fa3328ecbb11007bf"; } - { locale = "el"; arch = "linux-i686"; sha256 = "f1b5bc91e4e34d6f17f3e4ed65fc3ab71e066b41df3ec0ff8c1156a4a51d7fb9"; } - { locale = "el"; arch = "linux-x86_64"; sha256 = "fb602fcc45c21c26aa7d15924182d9158064d43c14c44c62786427eaf51d4b1f"; } - { locale = "en-GB"; arch = "linux-i686"; sha256 = "ad269f2192a1d635b8b930aa58a0303a544221e53b38aa8c464c81d807e28477"; } - { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "31ac6558c5a1deb512e937a52ca48d2183881de53685ca0dfaa63dc4495e0a73"; } - { locale = "en-US"; arch = "linux-i686"; sha256 = "265ae5df1a5f2edeae8d08bdcde45df0920f6fb0ad70385371d06ff890017982"; } - { locale = "en-US"; arch = "linux-x86_64"; sha256 = "1a917f88835d8796c52a52ed5c14a9ea71e595de8515ced1ca1356995f529bd6"; } - { locale = "en-ZA"; arch = "linux-i686"; sha256 = "e345f37777a2d7fc763c24c7fb4fe3c6a99c2310066ad405c375b8af069eca84"; } - { locale = "en-ZA"; arch = "linux-x86_64"; sha256 = "d86bf38fb667938852531f081caefe10baba79dc35ff737fa468744911f6968b"; } - { locale = "eo"; arch = "linux-i686"; sha256 = "7b4069d26d4abfdd9878192fc7c5a54686687c401425205bce064d9720ae6f7c"; } - { locale = "eo"; arch = "linux-x86_64"; sha256 = "b1a1b3b8c0c72856e5bb6058dd0ea2dabf2d9dee084f0355a248bee253838b29"; } - { locale = "es-AR"; arch = "linux-i686"; sha256 = "5ef56bebe60802f449bcbd1e53ae6726c5109c559a8a9707269de2a31481764a"; } - { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "65f909b7f1e67cfcebbc8cab1377b967095b5a7f9650c7fa861544bbc874b59f"; } - { locale = "es-CL"; arch = "linux-i686"; sha256 = "0b7499173c0f44ccc4cecb49e1801bb596d7a027c5ee39678252530672785906"; } - { locale = "es-CL"; arch = "linux-x86_64"; sha256 = "69573ffa581de80f21c0201083febcc7de5549d9e567f02227f7d4567c1a97f8"; } - { locale = "es-ES"; arch = "linux-i686"; sha256 = "640bc3111816383cb69e59039289737ca5d16ec2f5238b694348e9df1db794a0"; } - { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "fca7e225eac47f200c3cd01ee617a1fc6bbd728eddba30bb4583eb486155ab47"; } - { locale = "es-MX"; arch = "linux-i686"; sha256 = "32342a144805a3c4e6bab5de0411116862d0b8276befa6f8689eca5d9da01860"; } - { locale = "es-MX"; arch = "linux-x86_64"; sha256 = "cc189b4d4abdd9e90fd0dbfcc5b683e2a717f1f41a7930d9c0b6c405de97a9b3"; } - { locale = "et"; arch = "linux-i686"; sha256 = "b203934a8292393d84f389ca3a13d25e0c9602a10faf60804b435cf45f2fd691"; } - { locale = "et"; arch = "linux-x86_64"; sha256 = "4384025c813efa759c2dd62ed735d662f26d1037e95e892050987d4b2f602a45"; } - { locale = "eu"; arch = "linux-i686"; sha256 = "179fb3acef15d262a9d2f7347a32f1d99bbcd5048c5cab5b69aaccb35afe82f2"; } - { locale = "eu"; arch = "linux-x86_64"; sha256 = "cec3a33bc9950f97f14fc6493158e095e7a1660e4d104c2ff23ce655813d28cc"; } - { locale = "fa"; arch = "linux-i686"; sha256 = "7ce8f6af63ad6d683e5e70e9b077c2452a7c0c040bad83efceab860e3d41d288"; } - { locale = "fa"; arch = "linux-x86_64"; sha256 = "14f7b3f7c7eff44db26c3b55ae85b8625354f1962315fd40e3df4199b067d303"; } - { locale = "ff"; arch = "linux-i686"; sha256 = "f4c9eb89160a5d4bf815715860fc4bc6bc7954e544182e60b204a031f83be5e0"; } - { locale = "ff"; arch = "linux-x86_64"; sha256 = "b774f005bb5dee44eb0974834b42441b47a68f733ef22446b2547aef898b0c02"; } - { locale = "fi"; arch = "linux-i686"; sha256 = "873cf1d866f5db419549a9c39fad9524599a737d80c6568d7a5c9c3739d36cd4"; } - { locale = "fi"; arch = "linux-x86_64"; sha256 = "29f179920b198403f983b11bbd3f1b2d2cb83c65f5f8edcff63dd891d50c413a"; } - { locale = "fr"; arch = "linux-i686"; sha256 = "ade608f8965144177d656d33ff4fa2f8fbd8f54861fca68ac74abab9ca085ad5"; } - { locale = "fr"; arch = "linux-x86_64"; sha256 = "9bfade44971633bca8b12d6e2e05de6d20ec55e368d78da49e44a0131e9d94bb"; } - { locale = "fy-NL"; arch = "linux-i686"; sha256 = "6124308765f3456ac066dc734d245c455168d66ed59a8a65edc1b59ff1130169"; } - { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "9a60afeb858c1e48e21e112f772bc2efd3ef2891b51d0241384658905b140709"; } - { locale = "ga-IE"; arch = "linux-i686"; sha256 = "2de086f287e86d29579896e8fdd9a4d43ba5ed49b5042e4b5c71ff6380d21467"; } - { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "4f2cb11d743ac7d6fb5bc319c940729aa81d9ac97545cf5c6096fcd0d2e7de69"; } - { locale = "gd"; arch = "linux-i686"; sha256 = "c18e5614d73f79df017b1cdedb6949e907ffcdc4152ddfbd56f79242a742f13a"; } - { locale = "gd"; arch = "linux-x86_64"; sha256 = "4b64e007698b2433ead4b14b87c06fd1682ebe7e90ee881d310a8cdab2cd4d13"; } - { locale = "gl"; arch = "linux-i686"; sha256 = "b319a40c4fa9c81533f431e95ad8f33d365aa799d3dccde5188beb3442c8422d"; } - { locale = "gl"; arch = "linux-x86_64"; sha256 = "04a9103e56982e4529c361647ccef527cfbbbb4e88a96a708c0665ee04accd44"; } - { locale = "gu-IN"; arch = "linux-i686"; sha256 = "a15bd410f9bdfde48438db95c44d91472f5567bd41c529b13a7b4d057f97a6b3"; } - { locale = "gu-IN"; arch = "linux-x86_64"; sha256 = "8046ecbabf700872e4e8cf5d1a1d3df53f984a00415e49cb1d21bd507533f4c9"; } - { locale = "he"; arch = "linux-i686"; sha256 = "8369eeb403ef55e61263eafb61e8265f130d5fe4dc277b5e68f6efb65edf6702"; } - { locale = "he"; arch = "linux-x86_64"; sha256 = "a602a9944685ce688a002ea87178e1231170b78ba6ee911a3c7effa41768ecb1"; } - { locale = "hi-IN"; arch = "linux-i686"; sha256 = "6eb2e8fa05bf7470f1be9756a5e529e5949f3e0796a0c663ee44c7264846fd3b"; } - { locale = "hi-IN"; arch = "linux-x86_64"; sha256 = "7e39439801361ab9051941323987364678ef9b1fc8e765bfad2d39d836b7bf85"; } - { locale = "hr"; arch = "linux-i686"; sha256 = "84cabd389757c61cea75ffc642a4b52e544e841a124066701eb071d2d88c15ed"; } - { locale = "hr"; arch = "linux-x86_64"; sha256 = "0bc123e9a5190d155727971c2bed078a5e6b857daa22f2f4bcee4aee76e07bbc"; } - { locale = "hsb"; arch = "linux-i686"; sha256 = "7a5d5a4a7a936defd6c3ea3b04550e39398428f90722d521490b700133964f82"; } - { locale = "hsb"; arch = "linux-x86_64"; sha256 = "545ec5865ce941ca3bc635032cd65215111d56b3f0d68814efdd8ecacaab1d1d"; } - { locale = "hu"; arch = "linux-i686"; sha256 = "b540eadbfa2bf5232049e30167ccf16249786f612ec152c14999e660eceb6497"; } - { locale = "hu"; arch = "linux-x86_64"; sha256 = "4f64d672481bfe88f40fcf944d98fafceae18372c1e2373bba8172877d7555b8"; } - { locale = "hy-AM"; arch = "linux-i686"; sha256 = "f5ace133a64745ecf564996ebd6be55ce3ee0ee5be2ed8fe6c66414833d1e479"; } - { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "e949bffb9180b0ccdc6794b99b3897f9f30dbea84d9d218cd68477634eb58b25"; } - { locale = "id"; arch = "linux-i686"; sha256 = "73f2d64106a3404f6edcc66ab59091ffedb0fcd0c7f475becebebdfc4df41e1c"; } - { locale = "id"; arch = "linux-x86_64"; sha256 = "20d9193d9fc95a3e040220373c216913ca0099989d665b516b1e5de1cd7bf05b"; } - { locale = "is"; arch = "linux-i686"; sha256 = "d6bdeb739b5db8c8a25239963bf2f0d096b76f5914f8f4f4a4843e611beaad9f"; } - { locale = "is"; arch = "linux-x86_64"; sha256 = "300ccec13085aee1b011dd0058c279a31981b3e91280440672e09c71c4dd0eda"; } - { locale = "it"; arch = "linux-i686"; sha256 = "1e02459ec7e62ca3038018e6c88f410e53b0d7b3d1b6cb94d74ad0218a54a948"; } - { locale = "it"; arch = "linux-x86_64"; sha256 = "ba8e8a9ab5f391a5560b7bfd41dd853c6b52c2ff59ce8424f96236263985029d"; } - { locale = "ja"; arch = "linux-i686"; sha256 = "681589c9748b0c7f78ba5c4afa0f254af6f92a0c0cfb504df6b29f94a917f8bb"; } - { locale = "ja"; arch = "linux-x86_64"; sha256 = "7c6447f4dd823e1517ce12ad0b295b53a22d3a0855e1660fac9563a91f6999c2"; } - { locale = "kk"; arch = "linux-i686"; sha256 = "0303c9b812115d3ada0d8fdfcf8e77143f4239440935bfaad5340d33a3270b8b"; } - { locale = "kk"; arch = "linux-x86_64"; sha256 = "168b2ae2ac9168ae674d8649840fd7cc93d95325c7c0d60d7251239b776e5886"; } - { locale = "km"; arch = "linux-i686"; sha256 = "04ba6e90f883e52809e51202356e4abda62ae40bb0ed225965ec8eeca333457d"; } - { locale = "km"; arch = "linux-x86_64"; sha256 = "4903ca63d1ffdafbb7ae36eb7221992101a8a013928e25a820aac51022cdbade"; } - { locale = "kn"; arch = "linux-i686"; sha256 = "2fc54219aa69f963c86e47fc2cafd78bfad2bbd2a11d2fb947786eaa30cfe255"; } - { locale = "kn"; arch = "linux-x86_64"; sha256 = "8fd8e3de5ba9bf2f408da21bdedc1d2baf269fb33251d38fc84ec8b9c2fc86a8"; } - { locale = "ko"; arch = "linux-i686"; sha256 = "eba2c630a59006bad5ff822409c18008e46a327e2903d88461dc88a54f573baa"; } - { locale = "ko"; arch = "linux-x86_64"; sha256 = "baaafa60c8101ea2dfab30149e7ac6b953a63fb7c835e6aa1488349ce8a98384"; } - { locale = "ku"; arch = "linux-i686"; sha256 = "b1333ed8afb9cd20b0e24d25e5747f466050acf1fc4ae2924df1bb345ce49f90"; } - { locale = "ku"; arch = "linux-x86_64"; sha256 = "dd87578c93884388871680ef66f1d37e78f78939e7182a7d3a41fd8287afcdb8"; } - { locale = "lij"; arch = "linux-i686"; sha256 = "6bdab68412b7d08da2023da4346eeac231bbda2de36d7225b7f7bdd23a36dbd6"; } - { locale = "lij"; arch = "linux-x86_64"; sha256 = "d31d69421e74bf089e74f70e5c595284a8b60ce153c7c3ffd83e808adb1bf371"; } - { locale = "lt"; arch = "linux-i686"; sha256 = "4e15475eed19edf5080695da8c9dc94d3bc28e064a30065a1adeb6ea11adcce9"; } - { locale = "lt"; arch = "linux-x86_64"; sha256 = "f5b94a979a1863d068e4f35f71476677febe23de0de2dd803f44e57d2a196c55"; } - { locale = "lv"; arch = "linux-i686"; sha256 = "177f771d821f7501d906fea0bec54d6064e36ce74dc5e17596cdbc460b7c0115"; } - { locale = "lv"; arch = "linux-x86_64"; sha256 = "a958f13c3be77bdd1ea10edb5a453f54aaf6b2b7d00981762ea946abb2aa0a7c"; } - { locale = "mai"; arch = "linux-i686"; sha256 = "32ee3fdb74c2023952071679cfc271ef548b0ba278619f0d2c2f19596c1b5fa1"; } - { locale = "mai"; arch = "linux-x86_64"; sha256 = "c4bb89d5c9b16a4814a628ee31f8628cf287864db44d55ba11321d8203a1fd1c"; } - { locale = "mk"; arch = "linux-i686"; sha256 = "b7ef5bee8ed38ba31ee2e2c1ab010e3a385b97096fff0120bb279e82b6220464"; } - { locale = "mk"; arch = "linux-x86_64"; sha256 = "edf82adb52759c0d60f4bbf23ba1e0b2f7bb47475c80621a508e8a46c6221d06"; } - { locale = "ml"; arch = "linux-i686"; sha256 = "265e68ed9ca02987ca9bc165b4fb69217e4e7aaf73d7ceb83eb0a3d472a3cbed"; } - { locale = "ml"; arch = "linux-x86_64"; sha256 = "948eae17ae44b03c01124243f2246abe98fa6fdd17e9f174a8b1387f87994ff4"; } - { locale = "mr"; arch = "linux-i686"; sha256 = "d3941188b754ec8219b0682eb8c3b531debbeccc0a5738a6304bb18075e473a6"; } - { locale = "mr"; arch = "linux-x86_64"; sha256 = "b40f07132f883a703caefc275ad4a3a6d65f0e5535067595ddd9e7ff604ca315"; } - { locale = "ms"; arch = "linux-i686"; sha256 = "217ae6fba0bb782e84bfc7d7658971c72a8922c4b8ae32abcacd8548c3b865ea"; } - { locale = "ms"; arch = "linux-x86_64"; sha256 = "74d4a6123c40d92db7690e518d6943c916ee5a8ad266c94bdb8edc0e31f7e744"; } - { locale = "nb-NO"; arch = "linux-i686"; sha256 = "cc66fba1d389994b079962e78a7aeb2e4df8c3eea785ada286983a12329c2699"; } - { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "20161c2e0fdfdc65625d31d6ec1fbbdf2b88281e44b9dcbc9c4e5a07bf03d105"; } - { locale = "nl"; arch = "linux-i686"; sha256 = "a8b86126c00e2fefe05a3783e03c7f3f6ca9575180b3b275b1dbb85c68cb126a"; } - { locale = "nl"; arch = "linux-x86_64"; sha256 = "61fea91996c56b7279dc88714567b3e63f69d1b56a2922ea9886b74a69045d53"; } - { locale = "nn-NO"; arch = "linux-i686"; sha256 = "594e4c7393b6692bcbff4a732cb22687207cdbbfeb1d66bd10d7784fa60b1fd1"; } - { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "ae78c76d203532c34023f06a6c7a3f26e864a1b95aca358b7c680e275b250c8a"; } - { locale = "or"; arch = "linux-i686"; sha256 = "b26642112413d3c53c6275a8b2bbaf162f4bdbaf9002ad4479b807e3447b2abe"; } - { locale = "or"; arch = "linux-x86_64"; sha256 = "d212b39c68a7cf8619c946ff7e94c2081ba2a9fca3ed599870167477a887fe87"; } - { locale = "pa-IN"; arch = "linux-i686"; sha256 = "e28e4bec4e4f9d151bdc1e1ffbd42266052fbd81a479c70196a614f825e42f9f"; } - { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "4874f5407d8040a5e447d5a22a8d9e433a6bda273bc813654d95e0b9abb02af5"; } - { locale = "pl"; arch = "linux-i686"; sha256 = "f738a7209e3da17fbc2c955148ef1e0ec08878acf374b9bff2ae6cb0b3b50138"; } - { locale = "pl"; arch = "linux-x86_64"; sha256 = "b78325bc9ab80c176ba266cc6c46933f78ba69e0da44e6526e7b433336534d11"; } - { locale = "pt-BR"; arch = "linux-i686"; sha256 = "dc1564eeb496b1b8584338879d26cfbe4e2191eef204c80ee6a2f9c2d4722426"; } - { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "48c8bb9a52ae80c74f6fe379b28cf072d8275158326e752c776c27409578fcfe"; } - { locale = "pt-PT"; arch = "linux-i686"; sha256 = "0e74d57776d68d3d35e26b5fabdb66016a00d8bf22c6ec458ffea2e2e233227d"; } - { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "61d5fbc72f928e59cdf93ef08684e4d598b154638bf88cdace7d274874efa040"; } - { locale = "rm"; arch = "linux-i686"; sha256 = "1baa7d0d61394c3108ff7d91798fa917e63a1a0943785f94697619cbb684148a"; } - { locale = "rm"; arch = "linux-x86_64"; sha256 = "5cec6c5c013997f1ebade4d139d055b1df3fb5ed75dd41e335535dbfc6bc9359"; } - { locale = "ro"; arch = "linux-i686"; sha256 = "78e4f327a928aed2342d845c9e8e4458eca8f77898aa2a7dd5f7ca55fc61a62b"; } - { locale = "ro"; arch = "linux-x86_64"; sha256 = "320c3dbd605c650b378ed8e93e8b2518039c8efab27471012a498dbc51d1cac3"; } - { locale = "ru"; arch = "linux-i686"; sha256 = "3fc9d98a86e63717dfeaa58ece0dbbb1a0523801c56c056ff74a60491a27fcb9"; } - { locale = "ru"; arch = "linux-x86_64"; sha256 = "1d95e946fbb109380ad2e2fd5986f12211241113e218ae7ecb43e009b7aa5a37"; } - { locale = "si"; arch = "linux-i686"; sha256 = "12d8e83cc703c00da6054bd32bdf39993b588cbb5374880a3961d5ab476b6d29"; } - { locale = "si"; arch = "linux-x86_64"; sha256 = "4ce710ccda7b56a46a8fea2f42c499aa2296377a0979f76f19563caa85f4517e"; } - { locale = "sk"; arch = "linux-i686"; sha256 = "86b726c25de378d53a8220681468fec88a7d525288b02eb9b700b12f87739ffc"; } - { locale = "sk"; arch = "linux-x86_64"; sha256 = "bf8f6bb1b5fd7c82ca14f1802e7914e10b981c04d3ca89df983fe07d7df5b88c"; } - { locale = "sl"; arch = "linux-i686"; sha256 = "39aaca3b7a559346aa418fd4abb1f2a44dc71901050a212178e3cbc7b870e6b1"; } - { locale = "sl"; arch = "linux-x86_64"; sha256 = "85f5f097c7b9a07bbcb97caa9c8e5cfd16d3636ae17b41ec32e91d1238134db9"; } - { locale = "son"; arch = "linux-i686"; sha256 = "2b5a33079e835afdf0246f8b4dec1db92fcc861636a75333c75f6d5d40c14201"; } - { locale = "son"; arch = "linux-x86_64"; sha256 = "4d91324e9b7f88db822216440d5420b0c8b0898bdf77699a6b0fde1ab4db2f0c"; } - { locale = "sq"; arch = "linux-i686"; sha256 = "e3e0194f5e72904b056be4b3e941c015d5af0d9f1a349fa39492a6cefaf5236d"; } - { locale = "sq"; arch = "linux-x86_64"; sha256 = "45767fa6b57fb21399d4850fa88a3435e3fe0bb679de56fc1c28767eca235ba5"; } - { locale = "sr"; arch = "linux-i686"; sha256 = "0f7addd1581d8552b874651bc8dde5b2fe4d4b814c694272674fb5f7732000be"; } - { locale = "sr"; arch = "linux-x86_64"; sha256 = "7b68d38004216c86e3eb648fa78b06da88a703d68343f723f8e9d577d4c1224c"; } - { locale = "sv-SE"; arch = "linux-i686"; sha256 = "5f76d137052ff04da12e80f08a34a09c6ccd92d9ddf2f6efcf193940a948f86c"; } - { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "1aac59a70ac58bfe1926e87a850d7a5a2783332cfd49d9df1ad1fd3e276a9a29"; } - { locale = "ta"; arch = "linux-i686"; sha256 = "2716d50134514693b5d6edafc7c127c708b9973c39d42823987061547e4c18be"; } - { locale = "ta"; arch = "linux-x86_64"; sha256 = "9c9310ad313227cab38d8cd9ff6c4d9c15037bd39777a7fbd4b23ca71a1ac48e"; } - { locale = "te"; arch = "linux-i686"; sha256 = "ac7d78ab767b13810ef7f313c2ba92067756082667db0e256e916f1f0be8c9fa"; } - { locale = "te"; arch = "linux-x86_64"; sha256 = "cd6fc0d115fb67272f205a3595c82107dc8b20ce0696a2de8da6f82a7ae07112"; } - { locale = "th"; arch = "linux-i686"; sha256 = "2d17b346aa296b79e880b83185d3608de4369de62e2e0ce2cfb8d2f3dd6ee97f"; } - { locale = "th"; arch = "linux-x86_64"; sha256 = "331f2c59b2659c65c6899455e9ce55cd54b8debf4d17a60a8d6e76e2198080b6"; } - { locale = "tr"; arch = "linux-i686"; sha256 = "491550857b3b2b3643f1798a9e871492177cdddfd17366057d147e1fbe1ca40e"; } - { locale = "tr"; arch = "linux-x86_64"; sha256 = "aa8677def660eb8a3d258e7e7da05972e84be96807c8c7912f15bde05d749af7"; } - { locale = "uk"; arch = "linux-i686"; sha256 = "9ebb7a0997353bc84b5d48ffae1631d30a70ecc3ed21010fc8499513e3404651"; } - { locale = "uk"; arch = "linux-x86_64"; sha256 = "d686139d6622d6867cb9af95ec0c5e79866974d12468722d40c0ede104897034"; } - { locale = "vi"; arch = "linux-i686"; sha256 = "e56c74b2f6752667f9448c081114065aa0d1c63979cc4bbbf1965a7acc62133e"; } - { locale = "vi"; arch = "linux-x86_64"; sha256 = "41c79d4bcca7c28d02108129de1c8c93f5666bbaf651faef1eb9b424d4e8cb5d"; } - { locale = "xh"; arch = "linux-i686"; sha256 = "89f30d4950fec07c9f1df426c1e5e9f72ab15efa5db93d243418909369d69f03"; } - { locale = "xh"; arch = "linux-x86_64"; sha256 = "f97ea6169a6bdd4e48a0aee72ca709ebc1e2032a406d3dde6d8a6719b8429ee7"; } - { locale = "zh-CN"; arch = "linux-i686"; sha256 = "9ad1e75c6ca5f38bb565e747cec2901ad567efd69efa56328b912e37239f5b9e"; } - { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "400baea252b6f92051e7b054bdb4a4827571036ff7def10cbd841cfe2eaea60a"; } - { locale = "zh-TW"; arch = "linux-i686"; sha256 = "2e7bc62dd7c6c41c5feaf8cf9131bbbb0f0a3403870e57066a98147275b120fd"; } - { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "f2d620e5f4e8baac689557dc34ce582aaf36bcf4253c4f7cb00db52e1e1db98e"; } - { locale = "zu"; arch = "linux-i686"; sha256 = "c9915d4f1b637934ba22dbb81aa2f711417fd5600c6efe25781f11bbd0c707cc"; } - { locale = "zu"; arch = "linux-x86_64"; sha256 = "8fa84e20fb1e21947a8f727bb881d8249bf384944ee9693314cb39715547da5d"; } - ]; +# imports `version` and `sources` +with (import ./sources.nix); +let arch = if stdenv.system == "i686-linux" then "linux-i686" else "linux-x86_64"; @@ -247,7 +64,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/${version}/${source.arch}/${source.locale}/firefox-${version}.tar.bz2"; - inherit (source) sha256; + inherit (source) sha1; }; phases = "unpackPhase installPhase"; @@ -271,7 +88,10 @@ stdenv.mkDerivation { gtk libX11 libXScrnSaver + libXcomposite + libXdamage libXext + libXfixes libXinerama libXrender libXt @@ -331,11 +151,10 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - description = "Mozilla Firefox, free web browser"; + description = "Mozilla Firefox, free web browser (binary package)"; homepage = http://www.mozilla.org/firefox/; license = { - shortName = "unfree"; # not sure - fullName = "unfree"; + free = false; url = http://www.mozilla.org/en-US/foundation/trademarks/policy/; }; platforms = platforms.linux; diff --git a/pkgs/applications/networking/browsers/firefox-bin/generate_nix.rb b/pkgs/applications/networking/browsers/firefox-bin/generate_nix.rb deleted file mode 100644 index 7936741cb3e7..000000000000 --- a/pkgs/applications/networking/browsers/firefox-bin/generate_nix.rb +++ /dev/null @@ -1,219 +0,0 @@ -# TODO share code with thunderbird-bin/generate_nix.rb - -version = if ARGV.empty? - "latest" - else - ARGV[0] - end - -base_path = "download-installer.cdn.mozilla.net/pub/firefox/releases" - -arches = ["linux-i686", "linux-x86_64"] - -arches.each do |arch| - system("wget", "--recursive", "--continue", "--no-parent", "--reject-regex", ".*\\?.*", "--reject", "xpi", "http://#{base_path}/#{version}/#{arch}/") -end - -locales = Dir.glob("#{base_path}/#{version}/#{arches[0]}/*").map do |path| - File.basename(path) -end.sort - -locales.delete("index.html") -locales.delete("xpi") - -# real version number, e.g. "30.0" instead of "latest". -real_version = Dir.glob("#{base_path}/#{version}/#{arches[0]}/#{locales[0]}/firefox-*")[0].match(/firefox-([0-9.]*)/)[1][0..-2] - -locale_arch_path_tuples = locales.flat_map do |locale| - arches.map do |arch| - path = Dir.glob("#{base_path}/#{version}/#{arch}/#{locale}/firefox-*")[0] - - [locale, arch, path] - end -end - -paths = locale_arch_path_tuples.map do |tuple| tuple[2] end - -hashes = IO.popen(["sha256sum", "--binary", *paths]) do |input| - input.each_line.map do |line| - $stderr.puts(line) - - line.match(/^[0-9a-f]*/)[0] - end -end - - -puts(<<"EOH") -# This file is generated from generate_nix.rb. DO NOT EDIT. -# Execute the following command in a temporary directory to update the file. -# -# ruby generate_nix.rb > default.nix - -{ stdenv, fetchurl, config -, alsaLib -, atk -, cairo -, cups -, dbus_glib -, dbus_libs -, fontconfig -, freetype -, gconf -, gdk_pixbuf -, glib -, glibc -, gst_plugins_base -, gstreamer -, gtk -, libX11 -, libXScrnSaver -, libXext -, libXinerama -, libXrender -, libXt -, libcanberra -, libgnome -, libgnomeui -, mesa -, nspr -, nss -, pango -, heimdal -, pulseaudio -, systemd -}: - -assert stdenv.isLinux; - -let - version = "#{real_version}"; - sources = [ -EOH - -locale_arch_path_tuples.zip(hashes) do |tuple, hash| - locale, arch, path = tuple - - puts(%Q| { locale = "#{locale}"; arch = "#{arch}"; sha256 = "#{hash}"; }|) -end - -puts(<<'EOF') - ]; - - arch = if stdenv.system == "i686-linux" - then "linux-i686" - else "linux-x86_64"; - - isPrefixOf = prefix: string: - builtins.substring 0 (builtins.stringLength prefix) string == prefix; - - sourceMatches = locale: source: - (isPrefixOf source.locale locale) && source.arch == arch; - - systemLocale = config.i18n.defaultLocale or "en-US"; - - defaultSource = stdenv.lib.findFirst (sourceMatches "en-US") {} sources; - - source = stdenv.lib.findFirst (sourceMatches systemLocale) defaultSource sources; - -in - -stdenv.mkDerivation { - name = "firefox-bin-${version}"; - - src = fetchurl { - url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/${version}/${source.arch}/${source.locale}/firefox-${version}.tar.bz2"; - inherit (source) sha256; - }; - - phases = "unpackPhase installPhase"; - - libPath = stdenv.lib.makeLibraryPath - [ stdenv.gcc.gcc - alsaLib - atk - cairo - cups - dbus_glib - dbus_libs - fontconfig - freetype - gconf - gdk_pixbuf - glib - glibc - gst_plugins_base - gstreamer - gtk - libX11 - libXScrnSaver - libXext - libXinerama - libXrender - libXt - libcanberra - libgnome - libgnomeui - mesa - nspr - nss - pango - heimdal - pulseaudio - systemd - ] + ":" + stdenv.lib.makeSearchPath "lib64" [ - stdenv.gcc.gcc - ]; - - # "strip" after "patchelf" may break binaries. - # See: https://github.com/NixOS/patchelf/issues/10 - dontStrip = 1; - - installPhase = - '' - mkdir -p "$prefix/usr/lib/firefox-bin-${version}" - cp -r * "$prefix/usr/lib/firefox-bin-${version}" - - mkdir -p "$out/bin" - ln -s "$prefix/usr/lib/firefox-bin-${version}/firefox" "$out/bin/" - - for executable in \ - firefox mozilla-xremote-client firefox-bin plugin-container \ - updater crashreporter webapprt-stub - do - patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ - "$out/usr/lib/firefox-bin-${version}/$executable" - done - - for executable in \ - firefox mozilla-xremote-client firefox-bin plugin-container \ - updater crashreporter webapprt-stub libxul.so - do - patchelf --set-rpath "$libPath" \ - "$out/usr/lib/firefox-bin-${version}/$executable" - done - - # Create a desktop item. - mkdir -p $out/share/applications - cat > $out/share/applications/firefox.desktop <<EOF - [Desktop Entry] - Type=Application - Exec=$out/bin/firefox - Icon=$out/lib/firefox-bin-${version}/chrome/icons/default/default256.png - Name=Firefox - GenericName=Web Browser - Categories=Application;Network; - EOF - ''; - - meta = with stdenv.lib; { - description = "Mozilla Firefox, free web browser"; - homepage = http://www.mozilla.org/firefox/; - license = { - shortName = "unfree"; # not sure - fullName = "unfree"; - url = http://www.mozilla.org/en-US/foundation/trademarks/policy/; - }; - platforms = platforms.linux; - }; -} -EOF diff --git a/pkgs/applications/networking/browsers/firefox-bin/generate_sources.rb b/pkgs/applications/networking/browsers/firefox-bin/generate_sources.rb new file mode 100644 index 000000000000..eabff067f750 --- /dev/null +++ b/pkgs/applications/networking/browsers/firefox-bin/generate_sources.rb @@ -0,0 +1,48 @@ +# TODO share code with thunderbird-bin/generate_sources.rb + +require "open-uri" + +version = if ARGV.empty? + "latest" + else + ARGV[0] + end + +base_path = "http://download-installer.cdn.mozilla.net/pub/firefox/releases" + +Source = Struct.new(:hash, :arch, :locale, :filename) + +sources = open("#{base_path}/#{version}/SHA1SUMS") do |input| + input.readlines +end.select do |line| + /\/firefox-.*\.tar\.bz2$/ === line && !(/source/ === line) +end.map do |line| + hash, name = line.chomp.split(/ +/) + Source.new(hash, *(name.split("/"))) +end.sort_by do |source| + [source.locale, source.arch] +end + +real_version = sources[0].filename.match(/firefox-([0-9.]*)\.tar\.bz2/)[1] + +arches = ["linux-i686", "linux-x86_64"] + +puts(<<"EOH") +# This file is generated from generate_nix.rb. DO NOT EDIT. +# Execute the following command in a temporary directory to update the file. +# +# ruby generate_source.rb > source.nix + +{ + version = "#{real_version}"; + sources = [ +EOH + +sources.each do |source| + puts(%Q| { locale = "#{source.locale}"; arch = "#{source.arch}"; sha1 = "#{source.hash}"; }|) +end + +puts(<<'EOF') + ]; +} +EOF diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix new file mode 100644 index 000000000000..dbb93b690198 --- /dev/null +++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix @@ -0,0 +1,188 @@ +# This file is generated from generate_nix.rb. DO NOT EDIT. +# Execute the following command in a temporary directory to update the file. +# +# ruby generate_source.rb > source.nix + +{ + version = "34.0.5"; + sources = [ + { locale = "ach"; arch = "linux-i686"; sha1 = "2122f58004eec918c2a6f30e6d8a35fcee793f8d"; } + { locale = "ach"; arch = "linux-x86_64"; sha1 = "c304799de726df6c6c99aa4d7b2cc2ae552b92c1"; } + { locale = "af"; arch = "linux-i686"; sha1 = "1e367d63ab86049ba4f3f4121fd3a9531a9cd00f"; } + { locale = "af"; arch = "linux-x86_64"; sha1 = "1e2d3e17bed3aac9e53493f25d1e9a22a70f2710"; } + { locale = "an"; arch = "linux-i686"; sha1 = "cba77e9401b2ce16030cc46e7083c0a87c244165"; } + { locale = "an"; arch = "linux-x86_64"; sha1 = "adc7bb9a86596332c37a3cab118942c4953ec7e9"; } + { locale = "ar"; arch = "linux-i686"; sha1 = "59a85dcbc756752ff2ba07ffb12fecf10beb2bf9"; } + { locale = "ar"; arch = "linux-x86_64"; sha1 = "0c9b4c4ef3d39e3e44885359e1a85e03c47b57e3"; } + { locale = "as"; arch = "linux-i686"; sha1 = "69633541cad0a8fbf1798d4b47047adc2ac23cf3"; } + { locale = "as"; arch = "linux-x86_64"; sha1 = "b628ace403803425ab5f8e485f1107ace00e36a4"; } + { locale = "ast"; arch = "linux-i686"; sha1 = "adefb5324db5cb21ed46c2edee4b476e451d39d5"; } + { locale = "ast"; arch = "linux-x86_64"; sha1 = "734cbe739065246084cc452ca60e79248b3abada"; } + { locale = "az"; arch = "linux-i686"; sha1 = "12a7a57784563982df4fa9c7da1e0ff830afe81f"; } + { locale = "az"; arch = "linux-x86_64"; sha1 = "b8713205b616a81cea2675e477ef29db576f1ab0"; } + { locale = "be"; arch = "linux-i686"; sha1 = "cb60c04c2abab2ad59d6e19a08a425744f0135a9"; } + { locale = "be"; arch = "linux-x86_64"; sha1 = "b1bd0faf18a2f1cb7617d7c1946d586ec7db2fd1"; } + { locale = "bg"; arch = "linux-i686"; sha1 = "c260de634b14ed00a2396f09871fa726c5b24d09"; } + { locale = "bg"; arch = "linux-x86_64"; sha1 = "0a723d9d1b5abadb8250b9be5e6af8b7615231c4"; } + { locale = "bn-BD"; arch = "linux-i686"; sha1 = "292e7f58b2ca6b603949cc22965de0e568811dfb"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "c6f8afcd2e2269c5092dce8779e6068fd2e09540"; } + { locale = "bn-IN"; arch = "linux-i686"; sha1 = "3d93fbcb16a6161740cdee5c91fb2b9e6d5de77a"; } + { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "570cb383c4dcd09f90a02aa6898504295cad25e6"; } + { locale = "br"; arch = "linux-i686"; sha1 = "92fb316eae04d94320dd623d22d7b8c2a76018f6"; } + { locale = "br"; arch = "linux-x86_64"; sha1 = "a7410ed0ec67ae9746f652177664c292b727fdfc"; } + { locale = "bs"; arch = "linux-i686"; sha1 = "7f08e9920875f59b6df051acc68d1bb508615396"; } + { locale = "bs"; arch = "linux-x86_64"; sha1 = "654d90383abc26272d017b914627516b3aa33147"; } + { locale = "ca"; arch = "linux-i686"; sha1 = "645133ed542917fa32518279b375cf9dc4149dd7"; } + { locale = "ca"; arch = "linux-x86_64"; sha1 = "3eaff9df7e51971f9c1e37028430f0159ddcda9c"; } + { locale = "cs"; arch = "linux-i686"; sha1 = "4b283d1393fe06c80f412848b146295519e1957d"; } + { locale = "cs"; arch = "linux-x86_64"; sha1 = "5830a2bc46234d1adac6127fd470223ff750f5e7"; } + { locale = "csb"; arch = "linux-i686"; sha1 = "36c7bd7ccafdd5225d6f6dcde6928e4ca9aff603"; } + { locale = "csb"; arch = "linux-x86_64"; sha1 = "e5070bc33436df13e68e9ce63f091b1f60a96b5d"; } + { locale = "cy"; arch = "linux-i686"; sha1 = "7f6e35e997082406036864fb1cfc4bfd9380d156"; } + { locale = "cy"; arch = "linux-x86_64"; sha1 = "2c2ac492181ccdf10ae88c6cf1ec14a9d81c6019"; } + { locale = "da"; arch = "linux-i686"; sha1 = "cf2be147f015d40d0eecc1f00326856b06acdedd"; } + { locale = "da"; arch = "linux-x86_64"; sha1 = "01804683989d0731826d7dda67d6d7a46fb8de48"; } + { locale = "de"; arch = "linux-i686"; sha1 = "be8909ee0a9cf86869479c9173ea20f27d6e841a"; } + { locale = "de"; arch = "linux-x86_64"; sha1 = "377f54230cbe9d8dfd6242043fc8e9e43e392688"; } + { locale = "dsb"; arch = "linux-i686"; sha1 = "d50f0fca6b2036aca565a694bf70112121acc009"; } + { locale = "dsb"; arch = "linux-x86_64"; sha1 = "f532c3ac7f45682aa916f5cde32c5921a83fe9cf"; } + { locale = "el"; arch = "linux-i686"; sha1 = "2cf025815a5b9d7c1b7f353a592b700377797ff2"; } + { locale = "el"; arch = "linux-x86_64"; sha1 = "2a3c3b79072d6196cfcd00d4ffe546415e5c3c2b"; } + { locale = "en-GB"; arch = "linux-i686"; sha1 = "c638ac1b0f94d7afdf52b580108d9d9f0fbb4642"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "3a89c58a1a391268de63de380f379cf47956873c"; } + { locale = "en-US"; arch = "linux-i686"; sha1 = "9f83d949c426b798268a038c1173bad1efb8076f"; } + { locale = "en-US"; arch = "linux-x86_64"; sha1 = "e9f99d0fd1fadd62ba44606f0fe67cc829b64da3"; } + { locale = "en-ZA"; arch = "linux-i686"; sha1 = "a84f15bb02673c849721290858de31ca9697448f"; } + { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "28984e2a5d91f27247eb40db48f3055a24e77f3c"; } + { locale = "eo"; arch = "linux-i686"; sha1 = "9951a09c2132d468ff1b8c647af195ddb3ecb050"; } + { locale = "eo"; arch = "linux-x86_64"; sha1 = "ec90facdeced4b969547a8193dc9f196a13a5c0c"; } + { locale = "es-AR"; arch = "linux-i686"; sha1 = "a4df107f065e950fe2702871fb10d1d7ddc704dc"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "6cd0464702921be32a70eb5b68be45f5f6a65ff4"; } + { locale = "es-CL"; arch = "linux-i686"; sha1 = "21325f12a6ed59c471a86a8273efd76fdc9dc3bd"; } + { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "b6660728d8ac2ba89a9bb522a8fd7552c7b0fd84"; } + { locale = "es-ES"; arch = "linux-i686"; sha1 = "00b2c86d3f7f6431760e2bdf6228090b46703b21"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "d75ee1d75eb8c1d7f43fd082575cdb9d5657a719"; } + { locale = "es-MX"; arch = "linux-i686"; sha1 = "6e7d188ae57eeb457a5af93cef77a3e0fd3e4138"; } + { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "905ae336894a4d7efdfd5890c43579fcbc4f63e6"; } + { locale = "et"; arch = "linux-i686"; sha1 = "49f5495d4fe4166f46f3d2cc784b0adadad40973"; } + { locale = "et"; arch = "linux-x86_64"; sha1 = "80706f89b23dd019718888c2308596ec63c0cd6c"; } + { locale = "eu"; arch = "linux-i686"; sha1 = "2531d3d157aee3c20616fd94606668cc78ce71f5"; } + { locale = "eu"; arch = "linux-x86_64"; sha1 = "6c84eab337a4b43d604f34e7ea2b563500a52f37"; } + { locale = "fa"; arch = "linux-i686"; sha1 = "61fe70954eca24f1d7fa8908f6cfaab1b4abfad2"; } + { locale = "fa"; arch = "linux-x86_64"; sha1 = "f43b28a2b0af9ba18da35c69824370cec628d056"; } + { locale = "ff"; arch = "linux-i686"; sha1 = "2c1f4c5a2f3639328af873e59afd6c6a479f69ae"; } + { locale = "ff"; arch = "linux-x86_64"; sha1 = "8737e7d4263e66fafbf372568587173e58816f6a"; } + { locale = "fi"; arch = "linux-i686"; sha1 = "3a5b5171449e3629b0e22d08a9bf9a5bb0428a19"; } + { locale = "fi"; arch = "linux-x86_64"; sha1 = "1c901117715d8ac9d869bd79d7ffda778562b4bd"; } + { locale = "fr"; arch = "linux-i686"; sha1 = "3962280160df7f786cc26275025976df9c267174"; } + { locale = "fr"; arch = "linux-x86_64"; sha1 = "cc2f1f433b88b5f73e5c7e4683d85e5275720734"; } + { locale = "fy-NL"; arch = "linux-i686"; sha1 = "ed2b578e76aa9e56a85d3a02a3d9d6d25e07d624"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "110741b45050dbc896424a6e9cf32b9f8555d657"; } + { locale = "ga-IE"; arch = "linux-i686"; sha1 = "32fa55c45a7fbd57a7823135e87c288d463440ee"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "4d0c00130026b892cfc259d8ffb6c57338e8398d"; } + { locale = "gd"; arch = "linux-i686"; sha1 = "2fbafdbe1218eb34ec48a5d92904c0bd07b23690"; } + { locale = "gd"; arch = "linux-x86_64"; sha1 = "90810697ad8206eced9e4c4330c9242c4f3baafa"; } + { locale = "gl"; arch = "linux-i686"; sha1 = "2be76249fc1afde7ed156beb5df2d2eef50a485e"; } + { locale = "gl"; arch = "linux-x86_64"; sha1 = "d400c5692a767b14dabce47303aa195bc17af3c5"; } + { locale = "gu-IN"; arch = "linux-i686"; sha1 = "15704df5ff619aa6818521904d557eea65165206"; } + { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "c19923c4e9d5ae89bf9f1aa441b9f92d6f2fd02c"; } + { locale = "he"; arch = "linux-i686"; sha1 = "39694a4f966ad488ff77592dc490302449104df3"; } + { locale = "he"; arch = "linux-x86_64"; sha1 = "deb058d0798eadc5fe3920996421d86d446ca82e"; } + { locale = "hi-IN"; arch = "linux-i686"; sha1 = "8d28e60f8920001184dc20cc1f381f9474c9a6fd"; } + { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "3e9c18fc995fc013d3bd8bc87f8accc951599e79"; } + { locale = "hr"; arch = "linux-i686"; sha1 = "6ced9bd6614b921600cca7520c8698f265087a31"; } + { locale = "hr"; arch = "linux-x86_64"; sha1 = "8ef625b32212c387a367b8059c4d0bf62d5814da"; } + { locale = "hsb"; arch = "linux-i686"; sha1 = "49ecea386737f963db43f8c13c8d7e9b036523f3"; } + { locale = "hsb"; arch = "linux-x86_64"; sha1 = "7aba537cb8ffc7b7106dba4b378024c5a0356652"; } + { locale = "hu"; arch = "linux-i686"; sha1 = "1d406c76c8846b4ec81e62a958d662b582f75357"; } + { locale = "hu"; arch = "linux-x86_64"; sha1 = "4f582fd196573f5ab1c93dc6652a2e86617a0be7"; } + { locale = "hy-AM"; arch = "linux-i686"; sha1 = "d71daf124c8a16d4bd1d9d17df47cf10d5a5137c"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "b8f124244441a6ce474860731452760e92e575c4"; } + { locale = "id"; arch = "linux-i686"; sha1 = "8e4c0ec82aaeee6fdcf7541f6fd0bab8811ec5ae"; } + { locale = "id"; arch = "linux-x86_64"; sha1 = "3b6a5ff08f1c7f81c0da50fa7d2ed17e7d7da645"; } + { locale = "is"; arch = "linux-i686"; sha1 = "0aa678cd3b58706ac7d9a36399abcc3a8f05a894"; } + { locale = "is"; arch = "linux-x86_64"; sha1 = "e2a815e45fd6c20b37085aea0b2fe6e23848fde7"; } + { locale = "it"; arch = "linux-i686"; sha1 = "8213e082043b61872df49709732d0f209956f858"; } + { locale = "it"; arch = "linux-x86_64"; sha1 = "f411672ad5fb62ddc6cc2f9e89fea611de0d6356"; } + { locale = "ja"; arch = "linux-i686"; sha1 = "a540dd09786c0701a1ec22adbd1a19d6cbf0eb60"; } + { locale = "ja"; arch = "linux-x86_64"; sha1 = "decfa3a81bd81c0d04c62d1ff70858bcbfe505c2"; } + { locale = "kk"; arch = "linux-i686"; sha1 = "bfda7cdf57eafd6248bd5f32cf6ba84a3a05f202"; } + { locale = "kk"; arch = "linux-x86_64"; sha1 = "6a12ec04401251b9382a8b8b927f4684f7268971"; } + { locale = "km"; arch = "linux-i686"; sha1 = "06dc00c095690aa1eabd87d3dd425d3481349a09"; } + { locale = "km"; arch = "linux-x86_64"; sha1 = "901e1755688474d888ebcc524ca6912280fa5c11"; } + { locale = "kn"; arch = "linux-i686"; sha1 = "ccc86b5b46f3444f0a09b8d70ba804a9245e55f4"; } + { locale = "kn"; arch = "linux-x86_64"; sha1 = "b84394b314bd99a0bf856e0330d537f14dc624f1"; } + { locale = "ko"; arch = "linux-i686"; sha1 = "3e3d97975c5c67db99785ccca608ad170e870523"; } + { locale = "ko"; arch = "linux-x86_64"; sha1 = "1575641404e5b6239745eeae202ddbb5b8ede6d0"; } + { locale = "lij"; arch = "linux-i686"; sha1 = "4abdf303280a82ededf5cb2a8433f169a4d2959a"; } + { locale = "lij"; arch = "linux-x86_64"; sha1 = "974f1c26ee02e3eb20daf8cb7a991e83dbeb8c60"; } + { locale = "lt"; arch = "linux-i686"; sha1 = "18cdb106a6866bb1ce33c3712011602e2503799e"; } + { locale = "lt"; arch = "linux-x86_64"; sha1 = "fbf52dab19307bf8f8b7d84e32d7bcddfcb4693b"; } + { locale = "lv"; arch = "linux-i686"; sha1 = "a383ddf03d269575eee7b7fe44ae334aa8d648e9"; } + { locale = "lv"; arch = "linux-x86_64"; sha1 = "91f4b3cfbd5651e0227e2d9c40cbc1eda94e3413"; } + { locale = "mai"; arch = "linux-i686"; sha1 = "62318920bdcb6aa26fb31e2b80e861eeef0f4da6"; } + { locale = "mai"; arch = "linux-x86_64"; sha1 = "1811f361ed1b6d2864f0e7cc3950668ba8633288"; } + { locale = "mk"; arch = "linux-i686"; sha1 = "9b2f802e0543719a3fa13027b283af062278466e"; } + { locale = "mk"; arch = "linux-x86_64"; sha1 = "5b22cb28cfd1390dce8534674fcecb201f431ebd"; } + { locale = "ml"; arch = "linux-i686"; sha1 = "25862ddddd1d9f7ddcbff8780a39ab2609fdff74"; } + { locale = "ml"; arch = "linux-x86_64"; sha1 = "eb5fa58184b6bd10434c5371834eaf2ee343bb6e"; } + { locale = "mr"; arch = "linux-i686"; sha1 = "b4dc26f1d52da326046173765832c8e06eb27adb"; } + { locale = "mr"; arch = "linux-x86_64"; sha1 = "d8e5968afee45607b2874845f2782add083f3d0a"; } + { locale = "ms"; arch = "linux-i686"; sha1 = "fce3550b0e03cf6c78d55f1e89afe27bea3ed0fa"; } + { locale = "ms"; arch = "linux-x86_64"; sha1 = "7bc8f231ac82827d9095ce896cb16f60c92b1053"; } + { locale = "nb-NO"; arch = "linux-i686"; sha1 = "7d077713f9cf02833fa9e3ef69a5dac11d88f59e"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "642851c8ead7a0e673d9d8d0329a551cd9282337"; } + { locale = "nl"; arch = "linux-i686"; sha1 = "f0cd799d98840d8ca7825caac582035761347a94"; } + { locale = "nl"; arch = "linux-x86_64"; sha1 = "beaa7e385b655c82999dc38eb39af31e7e9de69a"; } + { locale = "nn-NO"; arch = "linux-i686"; sha1 = "04ed2d080ef687b0504f3d42bea97b2e56876795"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "857fbeef81cf00def5eaaa02effb1731eac15a1f"; } + { locale = "or"; arch = "linux-i686"; sha1 = "a208556246b7574d5e71eec8a56d8a2ab3c43767"; } + { locale = "or"; arch = "linux-x86_64"; sha1 = "f7b223bfe82d2ab7a0f2dba0b93e682ef5c833e3"; } + { locale = "pa-IN"; arch = "linux-i686"; sha1 = "b67c2aa36065ece0526a280cbe33adcb38a20843"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "73aef7a4e318625d18cade40090ec112667de295"; } + { locale = "pl"; arch = "linux-i686"; sha1 = "3446a41365fb0852684d0808d1fa85ddabcf0958"; } + { locale = "pl"; arch = "linux-x86_64"; sha1 = "0c1b1f1279e1639e71acdccaa4a687bf26aca19f"; } + { locale = "pt-BR"; arch = "linux-i686"; sha1 = "a3ec0b02796f67a798bbb895cf926f9bd7ccbe8d"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "e3b74fcb0ec26c440acedfe282a3ef0902a10d2b"; } + { locale = "pt-PT"; arch = "linux-i686"; sha1 = "0b942ec4a8fee50595a7b34e76636bfa83d2dfc0"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "d20698edd8193185342c2487433af4ea39fb6a3a"; } + { locale = "rm"; arch = "linux-i686"; sha1 = "442b8ac786b05e655b415a76427cca7ee0aa1abf"; } + { locale = "rm"; arch = "linux-x86_64"; sha1 = "250cb2a8e3fe869ae150de97b15e6d8f8fd30da3"; } + { locale = "ro"; arch = "linux-i686"; sha1 = "3a796ab446e77064ad3a094464c54d578b5ca910"; } + { locale = "ro"; arch = "linux-x86_64"; sha1 = "a512c2bd2cdd21f108ff1f77a747c606f28f8621"; } + { locale = "ru"; arch = "linux-i686"; sha1 = "2a907a348dd1f61e2ee8b6027e2085ee2e7e71bf"; } + { locale = "ru"; arch = "linux-x86_64"; sha1 = "228cad14512e25a445c1a5a92262ddf8fbb2f5c5"; } + { locale = "si"; arch = "linux-i686"; sha1 = "69ad63bfa75e1279bdcfe3d4127d83bb49b134b4"; } + { locale = "si"; arch = "linux-x86_64"; sha1 = "851e02e6ab551af88f41655cb3fe15883e536a62"; } + { locale = "sk"; arch = "linux-i686"; sha1 = "56c439e0dca6d75aa218e995187d10c0f88d3390"; } + { locale = "sk"; arch = "linux-x86_64"; sha1 = "43b69972b4e785069eba3ca7db1d8563f5ea76d8"; } + { locale = "sl"; arch = "linux-i686"; sha1 = "64bad6a92fa3eb1c98e2ce038e4fafdddb699690"; } + { locale = "sl"; arch = "linux-x86_64"; sha1 = "ace07b787362d893be563c9d59ec7e616f3a1d11"; } + { locale = "son"; arch = "linux-i686"; sha1 = "6a027929d81d9c36f62d0f092d4d7f1451713077"; } + { locale = "son"; arch = "linux-x86_64"; sha1 = "ebb4fd0f3dcabefd3d5e19a67d3e0e02a70918fa"; } + { locale = "sq"; arch = "linux-i686"; sha1 = "3048cc7c6837dbad7c654b37b44ee1c3a588633c"; } + { locale = "sq"; arch = "linux-x86_64"; sha1 = "d4ef1a51d0bf973fe4bfc614f8878f021ec46f5b"; } + { locale = "sr"; arch = "linux-i686"; sha1 = "d10e7c6619d2a2879eaab9d8c3a1a7f7458f60bb"; } + { locale = "sr"; arch = "linux-x86_64"; sha1 = "5b140de3d590ea84f91165396b7e154acc247172"; } + { locale = "sv-SE"; arch = "linux-i686"; sha1 = "57efc1f16710acd31a6db186673995f0713dba6f"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "d65d51b861eb62a5cdc99491f3c91dbb02638511"; } + { locale = "ta"; arch = "linux-i686"; sha1 = "aead4b55accc679c8fd49a099d12de95410bc480"; } + { locale = "ta"; arch = "linux-x86_64"; sha1 = "fcca6081e4fa248f86d77bc8d7aad658e82ef4c7"; } + { locale = "te"; arch = "linux-i686"; sha1 = "dbcdd1cc740d82f075c71bb6e3d087312ab7700d"; } + { locale = "te"; arch = "linux-x86_64"; sha1 = "901df9c92377dec49e66b17c7efd5a3d8f8ea5d5"; } + { locale = "th"; arch = "linux-i686"; sha1 = "a150db665c6a1e5ceb3d6a27896431890b5631c5"; } + { locale = "th"; arch = "linux-x86_64"; sha1 = "144489c6c53d1fdc32a42d2ebb6905946369c70a"; } + { locale = "tr"; arch = "linux-i686"; sha1 = "ccfc01ef15ee5345a2f0e07b1c4bcf8ac4459554"; } + { locale = "tr"; arch = "linux-x86_64"; sha1 = "563862e9a8b355b12c3dca36fc4d8c219707820a"; } + { locale = "uk"; arch = "linux-i686"; sha1 = "9885b14de8ca7d1a25adec103e245dc6d54c226d"; } + { locale = "uk"; arch = "linux-x86_64"; sha1 = "8d9d3e4a14d0288dc6d82cb652752712e0e4b577"; } + { locale = "vi"; arch = "linux-i686"; sha1 = "a70b8c7d9a7bbda992faf8f3762e55412b12a08d"; } + { locale = "vi"; arch = "linux-x86_64"; sha1 = "17661185644f68902eb946a3cd179c77f9681881"; } + { locale = "xh"; arch = "linux-i686"; sha1 = "1f1c9a8c1a614e5855d7303d808e661e54536de9"; } + { locale = "xh"; arch = "linux-x86_64"; sha1 = "17490957c9f3064ea5ea35562c0d669a557ea1ae"; } + { locale = "zh-CN"; arch = "linux-i686"; sha1 = "5140d26ab69f0645ae512d8a9d277ae6efc7dc45"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "cc09fcde7062e5bac4952b239354152855b8c52a"; } + { locale = "zh-TW"; arch = "linux-i686"; sha1 = "e923cb157faa256852ead1aef8e1c5e420e4fb27"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "d801a229474eaee5229137f2e69629abdf60e36b"; } + ]; +} diff --git a/pkgs/applications/networking/browsers/firefox/13.0.nix b/pkgs/applications/networking/browsers/firefox/13.0.nix deleted file mode 100644 index 1717a476e9ca..000000000000 --- a/pkgs/applications/networking/browsers/firefox/13.0.nix +++ /dev/null @@ -1,188 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL -, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs -, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify -, yasm, mesa, sqlite, unzip, makeWrapper - -, # If you want the resulting program to call itself "Firefox" instead - # of "Shiretoko" or whatever, enable this option. However, those - # binaries may not be distributed without permission from the - # Mozilla Foundation, see - # http://www.mozilla.org/foundation/trademarks/. - enableOfficialBranding ? false -}: - -assert stdenv.gcc ? libc && stdenv.gcc.libc != null; - -rec { - - firefoxVersion = "13.0.1"; - - xulVersion = "13.0.1"; # this attribute is used by other packages - - - src = fetchurl { - url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; - sha256 = "1qwvs3rdmrnkjnjvhi3vh4mjdpxr43zcm7llc6z5qws9n9yx15n1"; - }; - - commonConfigureFlags = - [ "--enable-optimize" - "--disable-debug" - "--enable-strip" - "--with-system-jpeg" - "--with-system-zlib" - "--with-system-bz2" - "--with-system-nspr" - "--with-system-nss" - # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support" - # "--enable-system-cairo" # disabled for the moment because our Cairo is too old - "--enable-system-sqlite" - "--disable-crashreporter" - "--disable-tests" - "--disable-necko-wifi" # maybe we want to enable this at some point - "--disable-installer" - "--disable-updater" - ]; - - - xulrunner = stdenv.mkDerivation rec { - name = "xulrunner-${xulVersion}"; - - inherit src; - - buildInputs = - [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 - python dbus dbus_glib pango freetype fontconfig xlibs.libXi - xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file - alsaLib nspr nss libnotify xlibs.pixman yasm mesa - xlibs.libXScrnSaver xlibs.scrnsaverproto - xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper - ]; - - configureFlags = - [ "--enable-application=xulrunner" - "--disable-javaxpcom" - ] ++ commonConfigureFlags; - - enableParallelBuilding = true; - - # Hack to work around make's idea of -lbz2 dependency - preConfigure = - '' - find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${ - stdenv.lib.concatStringsSep ":" - (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc])) - }' ';' - - export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}" - - mkdir ../objdir - cd ../objdir - configureScript=../mozilla-release/configure - ''; # */ - - # !!! Temporary hack. - preBuild = - '' - export NIX_ENFORCE_PURITY= - ''; - - installFlags = "SKIP_GRE_REGISTRATION=1"; - - postInstall = '' - # Fix some references to /bin paths in the Xulrunner shell script. - substituteInPlace $out/bin/xulrunner \ - --replace /bin/pwd "$(type -tP pwd)" \ - --replace /bin/ls "$(type -tP ls)" - - # Fix run-mozilla.sh search - libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*) - echo libDir: $libDir - test -n "$libDir" - cd $out/bin - mv xulrunner ../lib/$libDir/ - - for i in $out/lib/$libDir/*; do - file $i; - if file $i | grep executable &>/dev/null; then - echo -e '#! /bin/sh\n"'"$i"'" "$@"' > "$out/bin/$(basename "$i")"; - chmod a+x "$out/bin/$(basename "$i")"; - fi; - done - for i in $out/lib/$libDir/*.so; do - patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true - done - for i in $out/lib/$libDir/{xpcshell,plugin-container}; do - wrapProgram $i --prefix LD_LIBRARY_PATH ':' "$out/lib/$libDir" - done - rm -f $out/bin/run-mozilla.sh - ''; # */ - - meta = { - description = "Mozilla Firefox XUL runner"; - homepage = http://www.mozilla.com/en-US/firefox/; - }; - - passthru = { inherit gtk; version = xulVersion; }; - }; - - - firefox = stdenv.mkDerivation rec { - name = "firefox-${firefoxVersion}"; - - inherit src; - - enableParallelBuilding = true; - - buildInputs = - [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python - dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify - xlibs.pixman yasm mesa sqlite file unzip - ]; - - propagatedBuildInputs = [xulrunner]; - - configureFlags = - [ "--enable-application=browser" - "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}" - "--enable-chrome-format=jar" - "--disable-elf-hack" - ] - ++ commonConfigureFlags - ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding"; - - # Hack to work around make's idea of -lbz2 dependency - preConfigure = - '' - find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${ - stdenv.lib.concatStringsSep ":" - (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc])) - }' ';' - ''; - - postInstall = - '' - ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner - for j in $out/bin/*; do - i="$(readlink "$j")"; - file $i; - if file $i | grep executable &>/dev/null; then - rm "$out/bin/$(basename "$i")" - echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")" - chmod a+x "$out/bin/$(basename "$i")" - fi; - done; - ''; # */ - - meta = { - description = "Mozilla Firefox - the browser, reloaded"; - homepage = http://www.mozilla.com/en-US/firefox/; - maintainers = [ stdenv.lib.maintainers.eelco ]; - }; - - passthru = { - inherit gtk xulrunner nspr; - isFirefox3Like = true; - }; - }; -} diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 6d4a8078dc83..2892aa328b0c 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null; -let version = "32.0.3"; in +let version = "34.0.5"; in stdenv.mkDerivation rec { name = "firefox-${version}"; src = fetchurl { url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2"; - sha1 = "1f831147365478e353212714038e812ca3e9fe42"; + sha1 = "33654d38268d1d1f71105f48bbe97cf720f47be2"; }; buildInputs = @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { meta = { description = "Web browser"; homepage = http://www.mozilla.com/en-US/firefox/; - maintainers = with lib.maintainers; [ eelco wizeman ]; + maintainers = with lib.maintainers; [ eelco ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/applications/networking/browsers/links/default.nix b/pkgs/applications/networking/browsers/links/default.nix index 6bbd0fc800c1..8e78a0bd89cb 100644 --- a/pkgs/applications/networking/browsers/links/default.nix +++ b/pkgs/applications/networking/browsers/links/default.nix @@ -4,6 +4,6 @@ stdenv.mkDerivation { name = "links-1.00pre15"; src = fetchurl { url = http://artax.karlin.mff.cuni.cz/~mikulas/links/download/links-1.00pre15.tar.gz; - md5 = "f64823b9a1ac2d79df578a991dfae8b8"; + sha256 = "0yzgzc6jm9vhv7rgbj5s9zwxn9fnf4nyap9l6dzgpwsn7m18vprv"; }; } diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index 32baa0b6a868..f04a5f12ea2d 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -36,7 +36,7 @@ let # -> http://get.adobe.com/flashplayer/ - version = "11.2.202.406"; + version = "11.2.202.424"; src = if stdenv.system == "x86_64-linux" then @@ -47,7 +47,7 @@ let else rec { inherit version; url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz"; - sha256 = "05akcw89kz0cnhan6wp72banz2asmvqfhb2cw1krn66qgd7bl0x0"; + sha256 = "1nkk77lbvvq9x17rlygwlkprq2pgnci5riwxvvriknkqr277dhz8"; } else if stdenv.system == "i686-linux" then if debug then @@ -60,7 +60,7 @@ let else rec { inherit version; url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz"; - sha256 = "10f3842vi80kszj42f4c8sw7plrmvsin5k860cqvlzgdhndz8i4b"; + sha256 = "1zwlzc7z6q8vr5hjzx6jywjcx9r0g9jxz141hlf6lqzicf4x6qan"; } else throw "Flash Player is not supported on this platform"; @@ -90,7 +90,6 @@ stdenv.mkDerivation { meta = { description = "Adobe Flash Player browser plugin"; homepage = http://www.adobe.com/products/flashplayer/; - maintainers = with stdenv.lib.maintainers; [ wizeman ]; license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/applications/networking/browsers/netsurf/haru.nix b/pkgs/applications/networking/browsers/netsurf/haru.nix index 47f0c2f64552..7aa362c613fd 100644 --- a/pkgs/applications/networking/browsers/netsurf/haru.nix +++ b/pkgs/applications/networking/browsers/netsurf/haru.nix @@ -15,10 +15,10 @@ stdenv.mkDerivation { installPhase = "make PREFIX=$out install"; - meta = { + meta = { description = "cross platform, open source library for generating PDF files"; homepage = http://libharu.org/wiki/Main_Page; - license = "ZLIB/LIBPNG"; # see README. + license = with stdenv.lib.licenses; [ libpng zlib ]; maintainers = [args.lib.maintainers.marcweber]; platforms = args.lib.platforms.linux; broken = true; diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index e1bcbf923677..d0fe7e91989d 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -82,6 +82,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.opera.com; description = "Web browser"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/applications/networking/browsers/rekonq/default.nix b/pkgs/applications/networking/browsers/rekonq/default.nix index 3deabd42e013..ce36e26d6fcc 100644 --- a/pkgs/applications/networking/browsers/rekonq/default.nix +++ b/pkgs/applications/networking/browsers/rekonq/default.nix @@ -3,11 +3,11 @@ assert builtins.compareVersions "4.8.3" kde4.release != 1; # https://bugs.kde.org/show_bug.cgi?id=306077 stdenv.mkDerivation rec { - name = "rekonq-1.80"; # >=1.80 need kde >=4.9.0 + name = "rekonq-2.4.2"; # >=1.80 need kde >=4.9.0 src = fetchurl { - url = "mirror://sourceforge/rekonq/${name}.tar.bz2"; - sha256 = "1lzmg8psy1j1v8vrmsyw609jv9scgnigdivx97fb4spb7x6sxn4g"; + url = "mirror://sourceforge/rekonq/${name}.tar.xz"; + sha256 = "09jihyf4xl7bwfwahwwbx6f11h3zqljccchnpl4mijljylr5p079"; }; buildInputs = [ kde4.kdelibs qca2 qoauth ]; diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix index 996bda67323a..1f83f427156f 100644 --- a/pkgs/applications/networking/browsers/vimb/default.nix +++ b/pkgs/applications/networking/browsers/vimb/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "vimb-${version}"; - version = "2.7"; + version = "2.8"; src = fetchurl { url = "https://github.com/fanglingsu/vimb/archive/${version}.tar.gz"; - sha256 = "05i5p9827rgga4h27qy3qh4ps8aynkcr55j681ddhn16ci3dk8zr"; + sha256 = "04ify6gqpkislsppaplvdfgs3fja9gl37j3dywg7bhz1fbkv166k"; }; # Nixos default ca bundle diff --git a/pkgs/applications/networking/cluster/chronos/chronos-deps.nix b/pkgs/applications/networking/cluster/chronos/chronos-deps.nix new file mode 100644 index 000000000000..d258c493aa1a --- /dev/null +++ b/pkgs/applications/networking/cluster/chronos/chronos-deps.nix @@ -0,0 +1,18 @@ +{stdenv, curl}: + +stdenv.mkDerivation { + name = "chronos-maven-deps"; + builder = ./fetch-chronos-deps.sh; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "0mm2sb1p5zz6b0z2s4zhdlix6fafydsxmqjy8zbkwzw4f6lazzyl"; + + buildInputs = [ curl ]; + + # We borrow these environment variables from the caller to allow + # easy proxy configuration. This is impure, but a fixed-output + # derivation like fetchurl is allowed to do so since its result is + # by definition pure. + impureEnvVars = ["http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy"]; +} diff --git a/pkgs/applications/networking/cluster/chronos/default.nix b/pkgs/applications/networking/cluster/chronos/default.nix new file mode 100644 index 000000000000..58d56feea709 --- /dev/null +++ b/pkgs/applications/networking/cluster/chronos/default.nix @@ -0,0 +1,38 @@ +{ stdenv, lib, makeWrapper, fetchgit, curl, jdk, maven, nodejs, mesos }: + +stdenv.mkDerivation rec { + name = "chronos-${version}"; + version = "286b2ccb8e4695f8e413406ceca85b60d3a87e22"; + + src = fetchgit { + url = "https://github.com/airbnb/chronos"; + rev = version; + sha256 = "6c463c30530dc82276d30087e7ab08d6964b884232c0a93f691cef9fa1ff2651"; + }; + + buildInputs = [ makeWrapper curl jdk maven nodejs mesos ]; + + mavenRepo = import ./chronos-deps.nix { inherit stdenv curl; }; + + buildPhase = '' + ln -s $mavenRepo .m2 + mvn package -Dmaven.repo.local=$(pwd)/.m2 + ''; + + installPhase = '' + mkdir -p $out/{bin,libexec/chronos} + cp target/chronos*.jar $out/libexec/chronos/${name}.jar + + makeWrapper ${jdk.jre}/bin/java $out/bin/chronos \ + --add-flags "-Xmx384m -Xms384m -cp $out/libexec/chronos/${name}.jar com.airbnb.scheduler.Main" \ + --prefix "MESOS_NATIVE_LIBRARY" : "$MESOS_NATIVE_LIBRARY" + ''; + + meta = with lib; { + homepage = https://github.com/airbnb/chronos; + license = licenses.asl20; + description = "Fault tolerant job scheduler for Mesos which handles dependencies and ISO8601 based schedules"; + maintainers = with maintainers; [ offline ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/applications/networking/cluster/chronos/fetch-chronos-deps.sh b/pkgs/applications/networking/cluster/chronos/fetch-chronos-deps.sh new file mode 100644 index 000000000000..2e337076107d --- /dev/null +++ b/pkgs/applications/networking/cluster/chronos/fetch-chronos-deps.sh @@ -0,0 +1,1672 @@ +source $stdenv/setup +header "fetching Chronos maven repo" + +function fetchArtifact { + repoPath="$1" + echo "fetching $repoPath" + mkdir -p $(dirname $out/$repoPath) + curl --fail --location --insecure --max-redirs 20 "http://repo.maven.apache.org/maven2/$repoPath" --output "$out/$repoPath" || + curl --fail --location --insecure --max-redirs 20 "https://repository.apache.org/content/repositories/release/$repoPath" --output "$out/$repoPath" || + curl --fail --location --insecure --max-redirs 20 "http://downloads.mesosphere.io/maven/$repoPath" --output "$out/$repoPath" +} + +fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.pom.sha1 +fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.pom +fetchArtifact commons-collections/commons-collections/2.0/commons-collections-2.0.pom +fetchArtifact commons-collections/commons-collections/2.0/commons-collections-2.0.pom.sha1 +fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.pom.sha1 +fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.jar.sha1 +fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.pom +fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.jar +fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.pom.sha1 +fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar.sha1 +fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.pom +fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar +fetchArtifact commons-collections/commons-collections/2.1/commons-collections-2.1.pom +fetchArtifact commons-collections/commons-collections/2.1/commons-collections-2.1.pom.sha1 +fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.jar +fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.pom.sha1 +fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.pom +fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.jar.sha1 +fetchArtifact commons-io/commons-io/2.2/commons-io-2.2.pom +fetchArtifact commons-io/commons-io/2.2/commons-io-2.2.jar +fetchArtifact commons-io/commons-io/2.2/commons-io-2.2.jar.sha1 +fetchArtifact commons-io/commons-io/2.2/commons-io-2.2.pom.sha1 +fetchArtifact aopalliance/aopalliance/1.0/aopalliance-1.0.jar +fetchArtifact aopalliance/aopalliance/1.0/aopalliance-1.0.pom.sha1 +fetchArtifact aopalliance/aopalliance/1.0/aopalliance-1.0.pom +fetchArtifact aopalliance/aopalliance/1.0/aopalliance-1.0.jar.sha1 +fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.pom +fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.jar.sha1 +fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.pom.sha1 +fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.jar +fetchArtifact net/kencochrane/raven/raven-all/4.1.2/raven-all-4.1.2.pom +fetchArtifact net/kencochrane/raven/raven-all/4.1.2/raven-all-4.1.2.pom.sha1 +fetchArtifact net/kencochrane/raven/raven/4.1.2/raven-4.1.2.jar +fetchArtifact net/kencochrane/raven/raven/4.1.2/raven-4.1.2.pom +fetchArtifact net/kencochrane/raven/raven/4.1.2/raven-4.1.2.jar.sha1 +fetchArtifact net/kencochrane/raven/raven/4.1.2/raven-4.1.2.pom.sha1 +fetchArtifact net/kencochrane/raven/raven-getsentry/4.1.2/raven-getsentry-4.1.2.jar.sha1 +fetchArtifact net/kencochrane/raven/raven-getsentry/4.1.2/raven-getsentry-4.1.2.jar +fetchArtifact net/kencochrane/raven/raven-getsentry/4.1.2/raven-getsentry-4.1.2.pom.sha1 +fetchArtifact net/kencochrane/raven/raven-getsentry/4.1.2/raven-getsentry-4.1.2.pom +fetchArtifact net/liftweb/lift-markdown_2.11/2.6-M4/lift-markdown_2.11-2.6-M4.jar.sha1 +fetchArtifact net/liftweb/lift-markdown_2.11/2.6-M4/lift-markdown_2.11-2.6-M4.pom +fetchArtifact net/liftweb/lift-markdown_2.11/2.6-M4/lift-markdown_2.11-2.6-M4.jar +fetchArtifact net/liftweb/lift-markdown_2.11/2.6-M4/lift-markdown_2.11-2.6-M4.pom.sha1 +fetchArtifact net/java/jvnet-parent/4/jvnet-parent-4.pom +fetchArtifact net/java/jvnet-parent/4/jvnet-parent-4.pom.sha1 +fetchArtifact net/java/jvnet-parent/1/jvnet-parent-1.pom +fetchArtifact net/java/jvnet-parent/1/jvnet-parent-1.pom.sha1 +fetchArtifact net/java/jvnet-parent/3/jvnet-parent-3.pom.sha1 +fetchArtifact net/java/jvnet-parent/3/jvnet-parent-3.pom +fetchArtifact net/alchim31/maven/scala-maven-plugin/3.1.0/scala-maven-plugin-3.1.0.jar.sha1 +fetchArtifact net/alchim31/maven/scala-maven-plugin/3.1.0/scala-maven-plugin-3.1.0.pom.sha1 +fetchArtifact net/alchim31/maven/scala-maven-plugin/3.1.0/scala-maven-plugin-3.1.0.pom +fetchArtifact net/alchim31/maven/scala-maven-plugin/3.1.0/scala-maven-plugin-3.1.0.jar +fetchArtifact net/jpountz/lz4/lz4/1.2.0/lz4-1.2.0.jar +fetchArtifact net/jpountz/lz4/lz4/1.2.0/lz4-1.2.0.pom +fetchArtifact net/jpountz/lz4/lz4/1.2.0/lz4-1.2.0.jar.sha1 +fetchArtifact net/jpountz/lz4/lz4/1.2.0/lz4-1.2.0.pom.sha1 +fetchArtifact classworlds/classworlds/1.1/classworlds-1.1.pom +fetchArtifact classworlds/classworlds/1.1/classworlds-1.1.pom.sha1 +fetchArtifact classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar.sha1 +fetchArtifact classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.pom.sha1 +fetchArtifact classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.pom +fetchArtifact classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar +fetchArtifact xerces/xercesImpl/2.8.1/xercesImpl-2.8.1.pom.sha1 +fetchArtifact xerces/xercesImpl/2.8.1/xercesImpl-2.8.1.pom +fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.pom.sha1 +fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.pom +fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar +fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar.sha1 +fetchArtifact io/dropwizard/metrics/metrics-core/3.1.0/metrics-core-3.1.0.pom +fetchArtifact io/dropwizard/metrics/metrics-core/3.1.0/metrics-core-3.1.0.jar +fetchArtifact io/dropwizard/metrics/metrics-core/3.1.0/metrics-core-3.1.0.jar.sha1 +fetchArtifact io/dropwizard/metrics/metrics-core/3.1.0/metrics-core-3.1.0.pom.sha1 +fetchArtifact io/dropwizard/metrics/metrics-graphite/3.1.0/metrics-graphite-3.1.0.jar.sha1 +fetchArtifact io/dropwizard/metrics/metrics-graphite/3.1.0/metrics-graphite-3.1.0.jar +fetchArtifact io/dropwizard/metrics/metrics-graphite/3.1.0/metrics-graphite-3.1.0.pom.sha1 +fetchArtifact io/dropwizard/metrics/metrics-graphite/3.1.0/metrics-graphite-3.1.0.pom +fetchArtifact io/dropwizard/metrics/metrics-parent/3.1.0/metrics-parent-3.1.0.pom.sha1 +fetchArtifact io/dropwizard/metrics/metrics-parent/3.1.0/metrics-parent-3.1.0.pom +fetchArtifact io/netty/netty/3.7.0.Final/netty-3.7.0.Final.jar.sha1 +fetchArtifact io/netty/netty/3.7.0.Final/netty-3.7.0.Final.pom +fetchArtifact io/netty/netty/3.7.0.Final/netty-3.7.0.Final.jar +fetchArtifact io/netty/netty/3.7.0.Final/netty-3.7.0.Final.pom.sha1 +fetchArtifact io/netty/netty/3.9.0.Final/netty-3.9.0.Final.pom.sha1 +fetchArtifact io/netty/netty/3.9.0.Final/netty-3.9.0.Final.jar +fetchArtifact io/netty/netty/3.9.0.Final/netty-3.9.0.Final.pom +fetchArtifact io/netty/netty/3.9.0.Final/netty-3.9.0.Final.jar.sha1 +fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.jar.sha1 +fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.pom.sha1 +fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.jar +fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.pom +fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.pom.sha1 +fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.jar.sha1 +fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.jar +fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.pom +fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.jar +fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.pom.sha1 +fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.pom +fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.jar.sha1 +fetchArtifact log4j/log4j/1.2.12/log4j-1.2.12.pom +fetchArtifact log4j/log4j/1.2.12/log4j-1.2.12.pom.sha1 +fetchArtifact log4j/log4j/1.2.16/log4j-1.2.16.jar.sha1 +fetchArtifact log4j/log4j/1.2.16/log4j-1.2.16.pom.sha1 +fetchArtifact log4j/log4j/1.2.16/log4j-1.2.16.jar +fetchArtifact log4j/log4j/1.2.16/log4j-1.2.16.pom +fetchArtifact log4j/log4j/1.2.17/log4j-1.2.17.pom.sha1 +fetchArtifact log4j/log4j/1.2.17/log4j-1.2.17.jar +fetchArtifact log4j/log4j/1.2.17/log4j-1.2.17.jar.sha1 +fetchArtifact log4j/log4j/1.2.17/log4j-1.2.17.pom +fetchArtifact commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom +fetchArtifact commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom.sha1 +fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom +fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar +fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom.sha1 +fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar.sha1 +fetchArtifact commons-logging/commons-logging/1.0/commons-logging-1.0.pom.sha1 +fetchArtifact commons-logging/commons-logging/1.0/commons-logging-1.0.pom +fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom.sha1 +fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom +fetchArtifact commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.pom +fetchArtifact commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.pom.sha1 +fetchArtifact com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.pom.sha1 +fetchArtifact com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.jar +fetchArtifact com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.jar.sha1 +fetchArtifact com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.pom +fetchArtifact com/google/inject/guice-parent/3.0/guice-parent-3.0.pom.sha1 +fetchArtifact com/google/inject/guice-parent/3.0/guice-parent-3.0.pom +fetchArtifact com/google/inject/extensions/guice-servlet/3.0/guice-servlet-3.0.pom.sha1 +fetchArtifact com/google/inject/extensions/guice-servlet/3.0/guice-servlet-3.0.jar +fetchArtifact com/google/inject/extensions/guice-servlet/3.0/guice-servlet-3.0.jar.sha1 +fetchArtifact com/google/inject/extensions/guice-servlet/3.0/guice-servlet-3.0.pom +fetchArtifact com/google/inject/extensions/extensions-parent/3.0/extensions-parent-3.0.pom.sha1 +fetchArtifact com/google/inject/extensions/extensions-parent/3.0/extensions-parent-3.0.pom +fetchArtifact com/google/inject/guice/3.0/guice-3.0.jar +fetchArtifact com/google/inject/guice/3.0/guice-3.0.jar.sha1 +fetchArtifact com/google/inject/guice/3.0/guice-3.0.pom.sha1 +fetchArtifact com/google/inject/guice/3.0/guice-3.0.pom +fetchArtifact com/google/google/1/google-1.pom +fetchArtifact com/google/google/1/google-1.pom.sha1 +fetchArtifact com/google/google/5/google-5.pom.sha1 +fetchArtifact com/google/google/5/google-5.pom +fetchArtifact com/google/collections/google-collections/1.0/google-collections-1.0.pom +fetchArtifact com/google/collections/google-collections/1.0/google-collections-1.0.pom.sha1 +fetchArtifact com/google/code/findbugs/jsr305/2.0.1/jsr305-2.0.1.pom +fetchArtifact com/google/code/findbugs/jsr305/2.0.1/jsr305-2.0.1.jar.sha1 +fetchArtifact com/google/code/findbugs/jsr305/2.0.1/jsr305-2.0.1.jar +fetchArtifact com/google/code/findbugs/jsr305/2.0.1/jsr305-2.0.1.pom.sha1 +fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.pom.sha1 +fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.pom +fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar.sha1 +fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar +fetchArtifact com/google/guava/guava-parent/15.0/guava-parent-15.0.pom +fetchArtifact com/google/guava/guava-parent/15.0/guava-parent-15.0.pom.sha1 +fetchArtifact com/google/guava/guava-parent/13.0.1/guava-parent-13.0.1.pom.sha1 +fetchArtifact com/google/guava/guava-parent/13.0.1/guava-parent-13.0.1.pom +fetchArtifact com/google/guava/guava-parent/17.0/guava-parent-17.0.pom.sha1 +fetchArtifact com/google/guava/guava-parent/17.0/guava-parent-17.0.pom +fetchArtifact com/google/guava/guava-parent/16.0.1/guava-parent-16.0.1.pom +fetchArtifact com/google/guava/guava-parent/16.0.1/guava-parent-16.0.1.pom.sha1 +fetchArtifact com/google/guava/guava-parent/11.0.2/guava-parent-11.0.2.pom +fetchArtifact com/google/guava/guava-parent/11.0.2/guava-parent-11.0.2.pom.sha1 +fetchArtifact com/google/guava/guava/15.0/guava-15.0.pom.sha1 +fetchArtifact com/google/guava/guava/15.0/guava-15.0.pom +fetchArtifact com/google/guava/guava/13.0.1/guava-13.0.1.pom +fetchArtifact com/google/guava/guava/13.0.1/guava-13.0.1.pom.sha1 +fetchArtifact com/google/guava/guava/17.0/guava-17.0.pom +fetchArtifact com/google/guava/guava/17.0/guava-17.0.pom.sha1 +fetchArtifact com/google/guava/guava/16.0.1/guava-16.0.1.pom.sha1 +fetchArtifact com/google/guava/guava/16.0.1/guava-16.0.1.pom +fetchArtifact com/google/guava/guava/16.0.1/guava-16.0.1.jar +fetchArtifact com/google/guava/guava/16.0.1/guava-16.0.1.jar.sha1 +fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.jar.sha1 +fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.pom +fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.jar +fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.pom.sha1 +fetchArtifact com/github/spullara/mustache/java/compiler/0.8.12/compiler-0.8.12.pom +fetchArtifact com/github/spullara/mustache/java/compiler/0.8.12/compiler-0.8.12.pom.sha1 +fetchArtifact com/github/spullara/mustache/java/compiler/0.8.12/compiler-0.8.12.jar +fetchArtifact com/github/spullara/mustache/java/compiler/0.8.12/compiler-0.8.12.jar.sha1 +fetchArtifact com/github/spullara/mustache/java/mustache.java/0.8.12/mustache.java-0.8.12.pom +fetchArtifact com/github/spullara/mustache/java/mustache.java/0.8.12/mustache.java-0.8.12.pom.sha1 +fetchArtifact com/codahale/metrics/metrics-servlets/3.0.2/metrics-servlets-3.0.2.jar +fetchArtifact com/codahale/metrics/metrics-servlets/3.0.2/metrics-servlets-3.0.2.pom.sha1 +fetchArtifact com/codahale/metrics/metrics-servlets/3.0.2/metrics-servlets-3.0.2.jar.sha1 +fetchArtifact com/codahale/metrics/metrics-servlets/3.0.2/metrics-servlets-3.0.2.pom +fetchArtifact com/codahale/metrics/metrics-annotation/3.0.2/metrics-annotation-3.0.2.jar.sha1 +fetchArtifact com/codahale/metrics/metrics-annotation/3.0.2/metrics-annotation-3.0.2.pom +fetchArtifact com/codahale/metrics/metrics-annotation/3.0.2/metrics-annotation-3.0.2.pom.sha1 +fetchArtifact com/codahale/metrics/metrics-annotation/3.0.2/metrics-annotation-3.0.2.jar +fetchArtifact com/codahale/metrics/metrics-jvm/3.0.2/metrics-jvm-3.0.2.pom +fetchArtifact com/codahale/metrics/metrics-jvm/3.0.2/metrics-jvm-3.0.2.pom.sha1 +fetchArtifact com/codahale/metrics/metrics-jvm/3.0.2/metrics-jvm-3.0.2.jar.sha1 +fetchArtifact com/codahale/metrics/metrics-jvm/3.0.2/metrics-jvm-3.0.2.jar +fetchArtifact com/codahale/metrics/metrics-json/3.0.2/metrics-json-3.0.2.jar.sha1 +fetchArtifact com/codahale/metrics/metrics-json/3.0.2/metrics-json-3.0.2.pom +fetchArtifact com/codahale/metrics/metrics-json/3.0.2/metrics-json-3.0.2.jar +fetchArtifact com/codahale/metrics/metrics-json/3.0.2/metrics-json-3.0.2.pom.sha1 +fetchArtifact com/codahale/metrics/metrics-jersey/3.0.2/metrics-jersey-3.0.2.pom.sha1 +fetchArtifact com/codahale/metrics/metrics-jersey/3.0.2/metrics-jersey-3.0.2.jar +fetchArtifact com/codahale/metrics/metrics-jersey/3.0.2/metrics-jersey-3.0.2.jar.sha1 +fetchArtifact com/codahale/metrics/metrics-jersey/3.0.2/metrics-jersey-3.0.2.pom +fetchArtifact com/codahale/metrics/metrics-jetty8/3.0.2/metrics-jetty8-3.0.2.pom.sha1 +fetchArtifact com/codahale/metrics/metrics-jetty8/3.0.2/metrics-jetty8-3.0.2.jar +fetchArtifact com/codahale/metrics/metrics-jetty8/3.0.2/metrics-jetty8-3.0.2.jar.sha1 +fetchArtifact com/codahale/metrics/metrics-jetty8/3.0.2/metrics-jetty8-3.0.2.pom +fetchArtifact com/codahale/metrics/metrics-healthchecks/3.0.2/metrics-healthchecks-3.0.2.jar.sha1 +fetchArtifact com/codahale/metrics/metrics-healthchecks/3.0.2/metrics-healthchecks-3.0.2.pom.sha1 +fetchArtifact com/codahale/metrics/metrics-healthchecks/3.0.2/metrics-healthchecks-3.0.2.jar +fetchArtifact com/codahale/metrics/metrics-healthchecks/3.0.2/metrics-healthchecks-3.0.2.pom +fetchArtifact com/codahale/metrics/metrics-parent/3.0.2/metrics-parent-3.0.2.pom.sha1 +fetchArtifact com/codahale/metrics/metrics-parent/3.0.2/metrics-parent-3.0.2.pom +fetchArtifact com/fasterxml/jackson/jaxrs/jackson-jaxrs-base/2.4.1/jackson-jaxrs-base-2.4.1.pom +fetchArtifact com/fasterxml/jackson/jaxrs/jackson-jaxrs-base/2.4.1/jackson-jaxrs-base-2.4.1.pom.sha1 +fetchArtifact com/fasterxml/jackson/jaxrs/jackson-jaxrs-base/2.4.1/jackson-jaxrs-base-2.4.1.jar +fetchArtifact com/fasterxml/jackson/jaxrs/jackson-jaxrs-base/2.4.1/jackson-jaxrs-base-2.4.1.jar.sha1 +fetchArtifact com/fasterxml/jackson/jaxrs/jackson-jaxrs-json-provider/2.4.1/jackson-jaxrs-json-provider-2.4.1.pom.sha1 +fetchArtifact com/fasterxml/jackson/jaxrs/jackson-jaxrs-json-provider/2.4.1/jackson-jaxrs-json-provider-2.4.1.jar.sha1 +fetchArtifact com/fasterxml/jackson/jaxrs/jackson-jaxrs-json-provider/2.4.1/jackson-jaxrs-json-provider-2.4.1.pom +fetchArtifact com/fasterxml/jackson/jaxrs/jackson-jaxrs-json-provider/2.4.1/jackson-jaxrs-json-provider-2.4.1.jar +fetchArtifact com/fasterxml/jackson/jaxrs/jackson-jaxrs-providers/2.4.1/jackson-jaxrs-providers-2.4.1.pom.sha1 +fetchArtifact com/fasterxml/jackson/jaxrs/jackson-jaxrs-providers/2.4.1/jackson-jaxrs-providers-2.4.1.pom +fetchArtifact com/fasterxml/jackson/core/jackson-annotations/2.4.1/jackson-annotations-2.4.1.jar +fetchArtifact com/fasterxml/jackson/core/jackson-annotations/2.4.1/jackson-annotations-2.4.1.pom +fetchArtifact com/fasterxml/jackson/core/jackson-annotations/2.4.1/jackson-annotations-2.4.1.pom.sha1 +fetchArtifact com/fasterxml/jackson/core/jackson-annotations/2.4.1/jackson-annotations-2.4.1.jar.sha1 +fetchArtifact com/fasterxml/jackson/core/jackson-annotations/2.4.0/jackson-annotations-2.4.0.pom +fetchArtifact com/fasterxml/jackson/core/jackson-annotations/2.4.0/jackson-annotations-2.4.0.pom.sha1 +fetchArtifact com/fasterxml/jackson/core/jackson-annotations/2.2.2/jackson-annotations-2.2.2.pom +fetchArtifact com/fasterxml/jackson/core/jackson-annotations/2.2.2/jackson-annotations-2.2.2.pom.sha1 +fetchArtifact com/fasterxml/jackson/core/jackson-databind/2.4.1/jackson-databind-2.4.1.pom.sha1 +fetchArtifact com/fasterxml/jackson/core/jackson-databind/2.4.1/jackson-databind-2.4.1.pom +fetchArtifact com/fasterxml/jackson/core/jackson-databind/2.4.1.1/jackson-databind-2.4.1.1.jar.sha1 +fetchArtifact com/fasterxml/jackson/core/jackson-databind/2.4.1.1/jackson-databind-2.4.1.1.jar +fetchArtifact com/fasterxml/jackson/core/jackson-databind/2.4.1.1/jackson-databind-2.4.1.1.pom.sha1 +fetchArtifact com/fasterxml/jackson/core/jackson-databind/2.4.1.1/jackson-databind-2.4.1.1.pom +fetchArtifact com/fasterxml/jackson/core/jackson-databind/2.2.2/jackson-databind-2.2.2.pom.sha1 +fetchArtifact com/fasterxml/jackson/core/jackson-databind/2.2.2/jackson-databind-2.2.2.pom +fetchArtifact com/fasterxml/jackson/core/jackson-core/2.3.0/jackson-core-2.3.0.pom +fetchArtifact com/fasterxml/jackson/core/jackson-core/2.3.0/jackson-core-2.3.0.jar.sha1 +fetchArtifact com/fasterxml/jackson/core/jackson-core/2.3.0/jackson-core-2.3.0.pom.sha1 +fetchArtifact com/fasterxml/jackson/core/jackson-core/2.3.0/jackson-core-2.3.0.jar +fetchArtifact com/fasterxml/jackson/core/jackson-core/2.4.1/jackson-core-2.4.1.pom.sha1 +fetchArtifact com/fasterxml/jackson/core/jackson-core/2.4.1/jackson-core-2.4.1.pom +fetchArtifact com/fasterxml/jackson/core/jackson-core/2.2.2/jackson-core-2.2.2.pom +fetchArtifact com/fasterxml/jackson/core/jackson-core/2.2.2/jackson-core-2.2.2.pom.sha1 +fetchArtifact com/fasterxml/jackson/jackson-parent/2.4/jackson-parent-2.4.pom +fetchArtifact com/fasterxml/jackson/jackson-parent/2.4/jackson-parent-2.4.pom.sha1 +fetchArtifact com/fasterxml/jackson/module/jackson-module-scala_2.11/2.4.1/jackson-module-scala_2.11-2.4.1.pom +fetchArtifact com/fasterxml/jackson/module/jackson-module-scala_2.11/2.4.1/jackson-module-scala_2.11-2.4.1.jar +fetchArtifact com/fasterxml/jackson/module/jackson-module-scala_2.11/2.4.1/jackson-module-scala_2.11-2.4.1.pom.sha1 +fetchArtifact com/fasterxml/jackson/module/jackson-module-scala_2.11/2.4.1/jackson-module-scala_2.11-2.4.1.jar.sha1 +fetchArtifact com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.4.1/jackson-module-jaxb-annotations-2.4.1.jar +fetchArtifact com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.4.1/jackson-module-jaxb-annotations-2.4.1.pom.sha1 +fetchArtifact com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.4.1/jackson-module-jaxb-annotations-2.4.1.jar.sha1 +fetchArtifact com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.4.1/jackson-module-jaxb-annotations-2.4.1.pom +fetchArtifact com/fasterxml/oss-parent/16/oss-parent-16.pom +fetchArtifact com/fasterxml/oss-parent/16/oss-parent-16.pom.sha1 +fetchArtifact com/fasterxml/oss-parent/11/oss-parent-11.pom.sha1 +fetchArtifact com/fasterxml/oss-parent/11/oss-parent-11.pom +fetchArtifact com/fasterxml/oss-parent/10/oss-parent-10.pom.sha1 +fetchArtifact com/fasterxml/oss-parent/10/oss-parent-10.pom +fetchArtifact com/fasterxml/classmate/1.0.0/classmate-1.0.0.pom.sha1 +fetchArtifact com/fasterxml/classmate/1.0.0/classmate-1.0.0.jar +fetchArtifact com/fasterxml/classmate/1.0.0/classmate-1.0.0.pom +fetchArtifact com/fasterxml/classmate/1.0.0/classmate-1.0.0.jar.sha1 +fetchArtifact com/datastax/cassandra/cassandra-driver-core/2.1.0/cassandra-driver-core-2.1.0.jar +fetchArtifact com/datastax/cassandra/cassandra-driver-core/2.1.0/cassandra-driver-core-2.1.0.pom.sha1 +fetchArtifact com/datastax/cassandra/cassandra-driver-core/2.1.0/cassandra-driver-core-2.1.0.pom +fetchArtifact com/datastax/cassandra/cassandra-driver-core/2.1.0/cassandra-driver-core-2.1.0.jar.sha1 +fetchArtifact com/datastax/cassandra/cassandra-driver-parent/2.1.0/cassandra-driver-parent-2.1.0.pom.sha1 +fetchArtifact com/datastax/cassandra/cassandra-driver-parent/2.1.0/cassandra-driver-parent-2.1.0.pom +fetchArtifact com/typesafe/sbt/compiler-interface/0.12.0/compiler-interface-0.12.0.pom.sha1 +fetchArtifact com/typesafe/sbt/compiler-interface/0.12.0/compiler-interface-0.12.0-sources.jar +fetchArtifact com/typesafe/sbt/compiler-interface/0.12.0/compiler-interface-0.12.0.pom +fetchArtifact com/typesafe/sbt/compiler-interface/0.12.0/compiler-interface-0.12.0-sources.jar.sha1 +fetchArtifact com/typesafe/sbt/sbt-interface/0.12.0/sbt-interface-0.12.0.jar.sha1 +fetchArtifact com/typesafe/sbt/sbt-interface/0.12.0/sbt-interface-0.12.0.jar +fetchArtifact com/typesafe/sbt/sbt-interface/0.12.0/sbt-interface-0.12.0.pom +fetchArtifact com/typesafe/sbt/sbt-interface/0.12.0/sbt-interface-0.12.0.pom.sha1 +fetchArtifact com/typesafe/sbt/incremental-compiler/0.12.0/incremental-compiler-0.12.0.jar.sha1 +fetchArtifact com/typesafe/sbt/incremental-compiler/0.12.0/incremental-compiler-0.12.0.pom.sha1 +fetchArtifact com/typesafe/sbt/incremental-compiler/0.12.0/incremental-compiler-0.12.0.jar +fetchArtifact com/typesafe/sbt/incremental-compiler/0.12.0/incremental-compiler-0.12.0.pom +fetchArtifact com/typesafe/config/1.2.1/config-1.2.1.pom.sha1 +fetchArtifact com/typesafe/config/1.2.1/config-1.2.1.jar.sha1 +fetchArtifact com/typesafe/config/1.2.1/config-1.2.1.pom +fetchArtifact com/typesafe/config/1.2.1/config-1.2.1.jar +fetchArtifact com/typesafe/zinc/zinc/0.1.0/zinc-0.1.0.jar +fetchArtifact com/typesafe/zinc/zinc/0.1.0/zinc-0.1.0.pom.sha1 +fetchArtifact com/typesafe/zinc/zinc/0.1.0/zinc-0.1.0.pom +fetchArtifact com/typesafe/zinc/zinc/0.1.0/zinc-0.1.0.jar.sha1 +fetchArtifact com/typesafe/akka/akka-actor_2.11/2.3.6/akka-actor_2.11-2.3.6.pom.sha1 +fetchArtifact com/typesafe/akka/akka-actor_2.11/2.3.6/akka-actor_2.11-2.3.6.jar.sha1 +fetchArtifact com/typesafe/akka/akka-actor_2.11/2.3.6/akka-actor_2.11-2.3.6.pom +fetchArtifact com/typesafe/akka/akka-actor_2.11/2.3.6/akka-actor_2.11-2.3.6.jar +fetchArtifact com/thoughtworks/paranamer/paranamer-parent/2.6/paranamer-parent-2.6.pom.sha1 +fetchArtifact com/thoughtworks/paranamer/paranamer-parent/2.6/paranamer-parent-2.6.pom +fetchArtifact com/thoughtworks/paranamer/paranamer/2.6/paranamer-2.6.pom +fetchArtifact com/thoughtworks/paranamer/paranamer/2.6/paranamer-2.6.jar.sha1 +fetchArtifact com/thoughtworks/paranamer/paranamer/2.6/paranamer-2.6.pom.sha1 +fetchArtifact com/thoughtworks/paranamer/paranamer/2.6/paranamer-2.6.jar +fetchArtifact com/sun/jersey/jersey-server/1.18.1/jersey-server-1.18.1.pom +fetchArtifact com/sun/jersey/jersey-server/1.18.1/jersey-server-1.18.1.jar.sha1 +fetchArtifact com/sun/jersey/jersey-server/1.18.1/jersey-server-1.18.1.pom.sha1 +fetchArtifact com/sun/jersey/jersey-server/1.18.1/jersey-server-1.18.1.jar +fetchArtifact com/sun/jersey/jersey-server/1.17.1/jersey-server-1.17.1.pom.sha1 +fetchArtifact com/sun/jersey/jersey-server/1.17.1/jersey-server-1.17.1.pom +fetchArtifact com/sun/jersey/jersey-servlet/1.18.1/jersey-servlet-1.18.1.jar.sha1 +fetchArtifact com/sun/jersey/jersey-servlet/1.18.1/jersey-servlet-1.18.1.jar +fetchArtifact com/sun/jersey/jersey-servlet/1.18.1/jersey-servlet-1.18.1.pom +fetchArtifact com/sun/jersey/jersey-servlet/1.18.1/jersey-servlet-1.18.1.pom.sha1 +fetchArtifact com/sun/jersey/jersey-core/1.18.1/jersey-core-1.18.1.pom.sha1 +fetchArtifact com/sun/jersey/jersey-core/1.18.1/jersey-core-1.18.1.jar +fetchArtifact com/sun/jersey/jersey-core/1.18.1/jersey-core-1.18.1.pom +fetchArtifact com/sun/jersey/jersey-core/1.18.1/jersey-core-1.18.1.jar.sha1 +fetchArtifact com/sun/jersey/jersey-core/1.17.1/jersey-core-1.17.1.pom +fetchArtifact com/sun/jersey/jersey-core/1.17.1/jersey-core-1.17.1.pom.sha1 +fetchArtifact com/sun/jersey/jersey-project/1.18.1/jersey-project-1.18.1.pom.sha1 +fetchArtifact com/sun/jersey/jersey-project/1.18.1/jersey-project-1.18.1.pom +fetchArtifact com/sun/jersey/jersey-project/1.17.1/jersey-project-1.17.1.pom.sha1 +fetchArtifact com/sun/jersey/jersey-project/1.17.1/jersey-project-1.17.1.pom +fetchArtifact com/sun/jersey/contribs/jersey-guice/1.18.1/jersey-guice-1.18.1.pom.sha1 +fetchArtifact com/sun/jersey/contribs/jersey-guice/1.18.1/jersey-guice-1.18.1.jar.sha1 +fetchArtifact com/sun/jersey/contribs/jersey-guice/1.18.1/jersey-guice-1.18.1.jar +fetchArtifact com/sun/jersey/contribs/jersey-guice/1.18.1/jersey-guice-1.18.1.pom +fetchArtifact com/sun/jersey/contribs/jersey-contribs/1.18.1/jersey-contribs-1.18.1.pom +fetchArtifact com/sun/jersey/contribs/jersey-contribs/1.18.1/jersey-contribs-1.18.1.pom.sha1 +fetchArtifact com/sun/mail/all/1.4.5/all-1.4.5.pom +fetchArtifact com/sun/mail/all/1.4.5/all-1.4.5.pom.sha1 +fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.jar +fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.pom +fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.jar.sha1 +fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.pom.sha1 +fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.pom.sha1 +fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.pom +fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar +fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar.sha1 +fetchArtifact jgraph/jgraph/5.13.0.0/jgraph-5.13.0.0.jar +fetchArtifact jgraph/jgraph/5.13.0.0/jgraph-5.13.0.0.pom +fetchArtifact jgraph/jgraph/5.13.0.0/jgraph-5.13.0.0.pom.sha1 +fetchArtifact jgraph/jgraph/5.13.0.0/jgraph-5.13.0.0.jar.sha1 +fetchArtifact asm/asm-parent/3.3.1/asm-parent-3.3.1.pom +fetchArtifact asm/asm-parent/3.3.1/asm-parent-3.3.1.pom.sha1 +fetchArtifact asm/asm-parent/3.1/asm-parent-3.1.pom.sha1 +fetchArtifact asm/asm-parent/3.1/asm-parent-3.1.pom +fetchArtifact asm/asm/3.3.1/asm-3.3.1.pom +fetchArtifact asm/asm/3.3.1/asm-3.3.1.jar +fetchArtifact asm/asm/3.3.1/asm-3.3.1.pom.sha1 +fetchArtifact asm/asm/3.3.1/asm-3.3.1.jar.sha1 +fetchArtifact asm/asm/3.1/asm-3.1.pom.sha1 +fetchArtifact asm/asm/3.1/asm-3.1.pom +fetchArtifact jline/jline/0.9.94/jline-0.9.94.pom +fetchArtifact jline/jline/0.9.94/jline-0.9.94.pom.sha1 +fetchArtifact jline/jline/0.9.94/jline-0.9.94.jar.sha1 +fetchArtifact jline/jline/0.9.94/jline-0.9.94.jar +fetchArtifact xml-apis/xml-apis/1.3.03/xml-apis-1.3.03.pom +fetchArtifact xml-apis/xml-apis/1.3.03/xml-apis-1.3.03.pom.sha1 +fetchArtifact xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.pom +fetchArtifact xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.pom.sha1 +fetchArtifact xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.pom +fetchArtifact xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.pom.sha1 +fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.pom +fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar +fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar.sha1 +fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.pom.sha1 +fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.pom.sha1 +fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.jar +fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.pom +fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.jar.sha1 +fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.pom +fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.pom.sha1 +fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.pom +fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.pom.sha1 +fetchArtifact org/vafer/jdependency/0.9/jdependency-0.9.jar +fetchArtifact org/vafer/jdependency/0.9/jdependency-0.9.jar.sha1 +fetchArtifact org/vafer/jdependency/0.9/jdependency-0.9.pom +fetchArtifact org/vafer/jdependency/0.9/jdependency-0.9.pom.sha1 +fetchArtifact org/joda/joda-convert/1.7/joda-convert-1.7.jar.sha1 +fetchArtifact org/joda/joda-convert/1.7/joda-convert-1.7.jar +fetchArtifact org/joda/joda-convert/1.7/joda-convert-1.7.pom +fetchArtifact org/joda/joda-convert/1.7/joda-convert-1.7.pom.sha1 +fetchArtifact org/mockito/mockito-core/1.9.5/mockito-core-1.9.5.pom +fetchArtifact org/mockito/mockito-core/1.9.5/mockito-core-1.9.5.jar.sha1 +fetchArtifact org/mockito/mockito-core/1.9.5/mockito-core-1.9.5.pom.sha1 +fetchArtifact org/mockito/mockito-core/1.9.5/mockito-core-1.9.5.jar +fetchArtifact org/mockito/mockito-all/1.9.5/mockito-all-1.9.5.jar +fetchArtifact org/mockito/mockito-all/1.9.5/mockito-all-1.9.5.pom.sha1 +fetchArtifact org/mockito/mockito-all/1.9.5/mockito-all-1.9.5.pom +fetchArtifact org/mockito/mockito-all/1.9.5/mockito-all-1.9.5.jar.sha1 +fetchArtifact org/javabits/jgrapht/jgrapht-ext/0.9.1/jgrapht-ext-0.9.1.pom.sha1 +fetchArtifact org/javabits/jgrapht/jgrapht-ext/0.9.1/jgrapht-ext-0.9.1.jar +fetchArtifact org/javabits/jgrapht/jgrapht-ext/0.9.1/jgrapht-ext-0.9.1.pom +fetchArtifact org/javabits/jgrapht/jgrapht-ext/0.9.1/jgrapht-ext-0.9.1.jar.sha1 +fetchArtifact org/javabits/jgrapht/jgrapht-core/0.9.1/jgrapht-core-0.9.1.pom +fetchArtifact org/javabits/jgrapht/jgrapht-core/0.9.1/jgrapht-core-0.9.1.jar +fetchArtifact org/javabits/jgrapht/jgrapht-core/0.9.1/jgrapht-core-0.9.1.jar.sha1 +fetchArtifact org/javabits/jgrapht/jgrapht-core/0.9.1/jgrapht-core-0.9.1.pom.sha1 +fetchArtifact org/javabits/jgrapht/jgrapht/0.9.1/jgrapht-0.9.1.pom.sha1 +fetchArtifact org/javabits/jgrapht/jgrapht/0.9.1/jgrapht-0.9.1.pom +fetchArtifact org/scala-lang/scala-compiler/2.11.2/scala-compiler-2.11.2.pom +fetchArtifact org/scala-lang/scala-compiler/2.11.2/scala-compiler-2.11.2.jar.sha1 +fetchArtifact org/scala-lang/scala-compiler/2.11.2/scala-compiler-2.11.2.jar +fetchArtifact org/scala-lang/scala-compiler/2.11.2/scala-compiler-2.11.2.pom.sha1 +fetchArtifact org/scala-lang/scala-compiler/2.11.0-RC3/scala-compiler-2.11.0-RC3.jar.sha1 +fetchArtifact org/scala-lang/scala-compiler/2.11.0-RC3/scala-compiler-2.11.0-RC3.jar +fetchArtifact org/scala-lang/scala-compiler/2.11.0-RC3/scala-compiler-2.11.0-RC3.pom.sha1 +fetchArtifact org/scala-lang/scala-compiler/2.11.0-RC3/scala-compiler-2.11.0-RC3.pom +fetchArtifact org/scala-lang/scala-compiler/2.9.2/scala-compiler-2.9.2.jar +fetchArtifact org/scala-lang/scala-compiler/2.9.2/scala-compiler-2.9.2.pom.sha1 +fetchArtifact org/scala-lang/scala-compiler/2.9.2/scala-compiler-2.9.2.pom +fetchArtifact org/scala-lang/scala-compiler/2.9.2/scala-compiler-2.9.2.jar.sha1 +fetchArtifact org/scala-lang/scala-library/2.11.1/scala-library-2.11.1.jar.sha1 +fetchArtifact org/scala-lang/scala-library/2.11.1/scala-library-2.11.1.jar +fetchArtifact org/scala-lang/scala-library/2.11.1/scala-library-2.11.1.pom +fetchArtifact org/scala-lang/scala-library/2.11.1/scala-library-2.11.1.pom.sha1 +fetchArtifact org/scala-lang/scala-library/2.11.2/scala-library-2.11.2.pom.sha1 +fetchArtifact org/scala-lang/scala-library/2.11.2/scala-library-2.11.2.jar.sha1 +fetchArtifact org/scala-lang/scala-library/2.11.2/scala-library-2.11.2.pom +fetchArtifact org/scala-lang/scala-library/2.11.2/scala-library-2.11.2.jar +fetchArtifact org/scala-lang/scala-library/2.11.0-RC3/scala-library-2.11.0-RC3.pom +fetchArtifact org/scala-lang/scala-library/2.11.0-RC3/scala-library-2.11.0-RC3.pom.sha1 +fetchArtifact org/scala-lang/scala-library/2.11.0-RC3/scala-library-2.11.0-RC3.jar +fetchArtifact org/scala-lang/scala-library/2.11.0-RC3/scala-library-2.11.0-RC3.jar.sha1 +fetchArtifact org/scala-lang/scala-library/2.11.0/scala-library-2.11.0.pom +fetchArtifact org/scala-lang/scala-library/2.11.0/scala-library-2.11.0.pom.sha1 +fetchArtifact org/scala-lang/scala-library/2.9.2/scala-library-2.9.2.pom.sha1 +fetchArtifact org/scala-lang/scala-library/2.9.2/scala-library-2.9.2.pom +fetchArtifact org/scala-lang/scala-library/2.9.2/scala-library-2.9.2.jar.sha1 +fetchArtifact org/scala-lang/scala-library/2.9.2/scala-library-2.9.2.jar +fetchArtifact org/scala-lang/scala-reflect/2.11.1/scala-reflect-2.11.1.pom.sha1 +fetchArtifact org/scala-lang/scala-reflect/2.11.1/scala-reflect-2.11.1.pom +fetchArtifact org/scala-lang/scala-reflect/2.11.2/scala-reflect-2.11.2.jar +fetchArtifact org/scala-lang/scala-reflect/2.11.2/scala-reflect-2.11.2.jar.sha1 +fetchArtifact org/scala-lang/scala-reflect/2.11.2/scala-reflect-2.11.2.pom +fetchArtifact org/scala-lang/scala-reflect/2.11.2/scala-reflect-2.11.2.pom.sha1 +fetchArtifact org/scala-lang/scala-reflect/2.11.0-RC3/scala-reflect-2.11.0-RC3.pom.sha1 +fetchArtifact org/scala-lang/scala-reflect/2.11.0-RC3/scala-reflect-2.11.0-RC3.jar.sha1 +fetchArtifact org/scala-lang/scala-reflect/2.11.0-RC3/scala-reflect-2.11.0-RC3.pom +fetchArtifact org/scala-lang/scala-reflect/2.11.0-RC3/scala-reflect-2.11.0-RC3.jar +fetchArtifact org/scala-lang/scala-reflect/2.11.0/scala-reflect-2.11.0.pom.sha1 +fetchArtifact org/scala-lang/scala-reflect/2.11.0/scala-reflect-2.11.0.pom +fetchArtifact org/scala-lang/modules/scala-xml_2.11.0-RC3/1.0.1/scala-xml_2.11.0-RC3-1.0.1.pom +fetchArtifact org/scala-lang/modules/scala-xml_2.11.0-RC3/1.0.1/scala-xml_2.11.0-RC3-1.0.1.pom.sha1 +fetchArtifact org/scala-lang/modules/scala-xml_2.11.0-RC3/1.0.1/scala-xml_2.11.0-RC3-1.0.1.jar +fetchArtifact org/scala-lang/modules/scala-xml_2.11.0-RC3/1.0.1/scala-xml_2.11.0-RC3-1.0.1.jar.sha1 +fetchArtifact org/scala-lang/modules/scala-parser-combinators_2.11.0-RC3/1.0.1/scala-parser-combinators_2.11.0-RC3-1.0.1.jar.sha1 +fetchArtifact org/scala-lang/modules/scala-parser-combinators_2.11.0-RC3/1.0.1/scala-parser-combinators_2.11.0-RC3-1.0.1.jar +fetchArtifact org/scala-lang/modules/scala-parser-combinators_2.11.0-RC3/1.0.1/scala-parser-combinators_2.11.0-RC3-1.0.1.pom +fetchArtifact org/scala-lang/modules/scala-parser-combinators_2.11.0-RC3/1.0.1/scala-parser-combinators_2.11.0-RC3-1.0.1.pom.sha1 +fetchArtifact org/scala-lang/modules/scala-parser-combinators_2.11/1.0.1/scala-parser-combinators_2.11-1.0.1.pom.sha1 +fetchArtifact org/scala-lang/modules/scala-parser-combinators_2.11/1.0.1/scala-parser-combinators_2.11-1.0.1.pom +fetchArtifact org/scala-lang/modules/scala-parser-combinators_2.11/1.0.1/scala-parser-combinators_2.11-1.0.1.jar.sha1 +fetchArtifact org/scala-lang/modules/scala-parser-combinators_2.11/1.0.1/scala-parser-combinators_2.11-1.0.1.jar +fetchArtifact org/scala-lang/modules/scala-parser-combinators_2.11/1.0.2/scala-parser-combinators_2.11-1.0.2.jar.sha1 +fetchArtifact org/scala-lang/modules/scala-parser-combinators_2.11/1.0.2/scala-parser-combinators_2.11-1.0.2.jar +fetchArtifact org/scala-lang/modules/scala-parser-combinators_2.11/1.0.2/scala-parser-combinators_2.11-1.0.2.pom.sha1 +fetchArtifact org/scala-lang/modules/scala-parser-combinators_2.11/1.0.2/scala-parser-combinators_2.11-1.0.2.pom +fetchArtifact org/scala-lang/modules/scala-xml_2.11/1.0.1/scala-xml_2.11-1.0.1.jar.sha1 +fetchArtifact org/scala-lang/modules/scala-xml_2.11/1.0.1/scala-xml_2.11-1.0.1.pom +fetchArtifact org/scala-lang/modules/scala-xml_2.11/1.0.1/scala-xml_2.11-1.0.1.jar +fetchArtifact org/scala-lang/modules/scala-xml_2.11/1.0.1/scala-xml_2.11-1.0.1.pom.sha1 +fetchArtifact org/scala-lang/modules/scala-xml_2.11/1.0.2/scala-xml_2.11-1.0.2.pom.sha1 +fetchArtifact org/scala-lang/modules/scala-xml_2.11/1.0.2/scala-xml_2.11-1.0.2.jar.sha1 +fetchArtifact org/scala-lang/modules/scala-xml_2.11/1.0.2/scala-xml_2.11-1.0.2.pom +fetchArtifact org/scala-lang/modules/scala-xml_2.11/1.0.2/scala-xml_2.11-1.0.2.jar +fetchArtifact org/scala-sbt/test-interface/1.0/test-interface-1.0.jar.sha1 +fetchArtifact org/scala-sbt/test-interface/1.0/test-interface-1.0.pom.sha1 +fetchArtifact org/scala-sbt/test-interface/1.0/test-interface-1.0.pom +fetchArtifact org/scala-sbt/test-interface/1.0/test-interface-1.0.jar +fetchArtifact org/specs2/specs2_2.11.0-RC3/2.3.10/specs2_2.11.0-RC3-2.3.10.jar.sha1 +fetchArtifact org/specs2/specs2_2.11.0-RC3/2.3.10/specs2_2.11.0-RC3-2.3.10.pom.sha1 +fetchArtifact org/specs2/specs2_2.11.0-RC3/2.3.10/specs2_2.11.0-RC3-2.3.10.pom +fetchArtifact org/specs2/specs2_2.11.0-RC3/2.3.10/specs2_2.11.0-RC3-2.3.10.jar +fetchArtifact org/specs2/classycle/1.4.3/classycle-1.4.3.jar +fetchArtifact org/specs2/classycle/1.4.3/classycle-1.4.3.pom +fetchArtifact org/specs2/classycle/1.4.3/classycle-1.4.3.jar.sha1 +fetchArtifact org/specs2/classycle/1.4.3/classycle-1.4.3.pom.sha1 +fetchArtifact org/jdom/jdom/1.1/jdom-1.1.pom +fetchArtifact org/jdom/jdom/1.1/jdom-1.1.jar +fetchArtifact org/jdom/jdom/1.1/jdom-1.1.jar.sha1 +fetchArtifact org/jdom/jdom/1.1/jdom-1.1.pom.sha1 +fetchArtifact org/jboss/shrinkwrap/shrinkwrap-bom/1.0.1/shrinkwrap-bom-1.0.1.pom +fetchArtifact org/jboss/shrinkwrap/shrinkwrap-bom/1.0.1/shrinkwrap-bom-1.0.1.pom.sha1 +fetchArtifact org/jboss/shrinkwrap/descriptors/shrinkwrap-descriptors-bom/2.0.0-alpha-3/shrinkwrap-descriptors-bom-2.0.0-alpha-3.pom.sha1 +fetchArtifact org/jboss/shrinkwrap/descriptors/shrinkwrap-descriptors-bom/2.0.0-alpha-3/shrinkwrap-descriptors-bom-2.0.0-alpha-3.pom +fetchArtifact org/jboss/shrinkwrap/resolver/shrinkwrap-resolver-bom/1.0.0-beta-7/shrinkwrap-resolver-bom-1.0.0-beta-7.pom +fetchArtifact org/jboss/shrinkwrap/resolver/shrinkwrap-resolver-bom/1.0.0-beta-7/shrinkwrap-resolver-bom-1.0.0-beta-7.pom.sha1 +fetchArtifact org/jboss/jboss-parent/9/jboss-parent-9.pom.sha1 +fetchArtifact org/jboss/jboss-parent/9/jboss-parent-9.pom +fetchArtifact org/jboss/logging/jboss-logging/3.1.3.GA/jboss-logging-3.1.3.GA.pom +fetchArtifact org/jboss/logging/jboss-logging/3.1.3.GA/jboss-logging-3.1.3.GA.jar +fetchArtifact org/jboss/logging/jboss-logging/3.1.3.GA/jboss-logging-3.1.3.GA.jar.sha1 +fetchArtifact org/jboss/logging/jboss-logging/3.1.3.GA/jboss-logging-3.1.3.GA.pom.sha1 +fetchArtifact org/jboss/arquillian/arquillian-bom/1.0.2.Final/arquillian-bom-1.0.2.Final.pom +fetchArtifact org/jboss/arquillian/arquillian-bom/1.0.2.Final/arquillian-bom-1.0.2.Final.pom.sha1 +fetchArtifact org/rogach/scallop_2.11/0.9.5/scallop_2.11-0.9.5.jar.sha1 +fetchArtifact org/rogach/scallop_2.11/0.9.5/scallop_2.11-0.9.5.pom +fetchArtifact org/rogach/scallop_2.11/0.9.5/scallop_2.11-0.9.5.pom.sha1 +fetchArtifact org/rogach/scallop_2.11/0.9.5/scallop_2.11-0.9.5.jar +fetchArtifact org/scalacheck/scalacheck_2.11.0-RC3/1.11.3/scalacheck_2.11.0-RC3-1.11.3.pom +fetchArtifact org/scalacheck/scalacheck_2.11.0-RC3/1.11.3/scalacheck_2.11.0-RC3-1.11.3.jar.sha1 +fetchArtifact org/scalacheck/scalacheck_2.11.0-RC3/1.11.3/scalacheck_2.11.0-RC3-1.11.3.jar +fetchArtifact org/scalacheck/scalacheck_2.11.0-RC3/1.11.3/scalacheck_2.11.0-RC3-1.11.3.pom.sha1 +fetchArtifact org/tinyjee/jgraphx/jgraphx/2.0.0.1/jgraphx-2.0.0.1.jar.sha1 +fetchArtifact org/tinyjee/jgraphx/jgraphx/2.0.0.1/jgraphx-2.0.0.1.pom +fetchArtifact org/tinyjee/jgraphx/jgraphx/2.0.0.1/jgraphx-2.0.0.1.jar +fetchArtifact org/tinyjee/jgraphx/jgraphx/2.0.0.1/jgraphx-2.0.0.1.pom.sha1 +fetchArtifact org/hibernate/hibernate-validator/5.1.2.Final/hibernate-validator-5.1.2.Final.jar +fetchArtifact org/hibernate/hibernate-validator/5.1.2.Final/hibernate-validator-5.1.2.Final.pom +fetchArtifact org/hibernate/hibernate-validator/5.1.2.Final/hibernate-validator-5.1.2.Final.jar.sha1 +fetchArtifact org/hibernate/hibernate-validator/5.1.2.Final/hibernate-validator-5.1.2.Final.pom.sha1 +fetchArtifact org/hibernate/hibernate-validator-parent/5.1.2.Final/hibernate-validator-parent-5.1.2.Final.pom.sha1 +fetchArtifact org/hibernate/hibernate-validator-parent/5.1.2.Final/hibernate-validator-parent-5.1.2.Final.pom +fetchArtifact org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5.pom.sha1 +fetchArtifact org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5.pom +fetchArtifact org/slf4j/slf4j-api/1.7.7/slf4j-api-1.7.7.jar +fetchArtifact org/slf4j/slf4j-api/1.7.7/slf4j-api-1.7.7.pom +fetchArtifact org/slf4j/slf4j-api/1.7.7/slf4j-api-1.7.7.pom.sha1 +fetchArtifact org/slf4j/slf4j-api/1.7.7/slf4j-api-1.7.7.jar.sha1 +fetchArtifact org/slf4j/slf4j-api/1.7.6/slf4j-api-1.7.6.pom +fetchArtifact org/slf4j/slf4j-api/1.7.6/slf4j-api-1.7.6.pom.sha1 +fetchArtifact org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar +fetchArtifact org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.pom +fetchArtifact org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.pom.sha1 +fetchArtifact org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar.sha1 +fetchArtifact org/slf4j/jul-to-slf4j/1.7.7/jul-to-slf4j-1.7.7.jar.sha1 +fetchArtifact org/slf4j/jul-to-slf4j/1.7.7/jul-to-slf4j-1.7.7.pom.sha1 +fetchArtifact org/slf4j/jul-to-slf4j/1.7.7/jul-to-slf4j-1.7.7.pom +fetchArtifact org/slf4j/jul-to-slf4j/1.7.7/jul-to-slf4j-1.7.7.jar +fetchArtifact org/slf4j/slf4j-parent/1.7.5/slf4j-parent-1.7.5.pom +fetchArtifact org/slf4j/slf4j-parent/1.7.5/slf4j-parent-1.7.5.pom.sha1 +fetchArtifact org/slf4j/slf4j-parent/1.7.7/slf4j-parent-1.7.7.pom +fetchArtifact org/slf4j/slf4j-parent/1.7.7/slf4j-parent-1.7.7.pom.sha1 +fetchArtifact org/slf4j/slf4j-parent/1.7.6/slf4j-parent-1.7.6.pom.sha1 +fetchArtifact org/slf4j/slf4j-parent/1.7.6/slf4j-parent-1.7.6.pom +fetchArtifact org/slf4j/slf4j-parent/1.6.1/slf4j-parent-1.6.1.pom +fetchArtifact org/slf4j/slf4j-parent/1.6.1/slf4j-parent-1.6.1.pom.sha1 +fetchArtifact org/slf4j/slf4j-log4j12/1.7.7/slf4j-log4j12-1.7.7.jar +fetchArtifact org/slf4j/slf4j-log4j12/1.7.7/slf4j-log4j12-1.7.7.pom +fetchArtifact org/slf4j/slf4j-log4j12/1.7.7/slf4j-log4j12-1.7.7.jar.sha1 +fetchArtifact org/slf4j/slf4j-log4j12/1.7.7/slf4j-log4j12-1.7.7.pom.sha1 +fetchArtifact org/apache/xbean/xbean/3.4/xbean-3.4.pom.sha1 +fetchArtifact org/apache/xbean/xbean/3.4/xbean-3.4.pom +fetchArtifact org/apache/xbean/xbean-reflect/3.4/xbean-reflect-3.4.pom.sha1 +fetchArtifact org/apache/xbean/xbean-reflect/3.4/xbean-reflect-3.4.pom +fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar.sha1 +fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.pom.sha1 +fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar +fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.pom +fetchArtifact org/apache/httpcomponents/httpcomponents-core/4.0.1/httpcomponents-core-4.0.1.pom.sha1 +fetchArtifact org/apache/httpcomponents/httpcomponents-core/4.0.1/httpcomponents-core-4.0.1.pom +fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.pom +fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.jar.sha1 +fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.pom.sha1 +fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.jar +fetchArtifact org/apache/httpcomponents/httpcomponents-client/4.0.2/httpcomponents-client-4.0.2.pom.sha1 +fetchArtifact org/apache/httpcomponents/httpcomponents-client/4.0.2/httpcomponents-client-4.0.2.pom +fetchArtifact org/apache/httpcomponents/project/4.0/project-4.0.pom.sha1 +fetchArtifact org/apache/httpcomponents/project/4.0/project-4.0.pom +fetchArtifact org/apache/httpcomponents/project/4.1/project-4.1.pom +fetchArtifact org/apache/httpcomponents/project/4.1/project-4.1.pom.sha1 +fetchArtifact org/apache/ant/ant-launcher/1.8.2/ant-launcher-1.8.2.jar.sha1 +fetchArtifact org/apache/ant/ant-launcher/1.8.2/ant-launcher-1.8.2.jar +fetchArtifact org/apache/ant/ant-launcher/1.8.2/ant-launcher-1.8.2.pom +fetchArtifact org/apache/ant/ant-launcher/1.8.2/ant-launcher-1.8.2.pom.sha1 +fetchArtifact org/apache/ant/ant/1.8.2/ant-1.8.2.jar +fetchArtifact org/apache/ant/ant/1.8.2/ant-1.8.2.pom.sha1 +fetchArtifact org/apache/ant/ant/1.8.2/ant-1.8.2.pom +fetchArtifact org/apache/ant/ant/1.8.2/ant-1.8.2.jar.sha1 +fetchArtifact org/apache/ant/ant-parent/1.8.2/ant-parent-1.8.2.pom.sha1 +fetchArtifact org/apache/ant/ant-parent/1.8.2/ant-parent-1.8.2.pom +fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.jar.sha1 +fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.pom.sha1 +fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.jar +fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.pom +fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.6/maven-resources-plugin-2.6.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.6/maven-resources-plugin-2.6.jar.sha1 +fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.6/maven-resources-plugin-2.6.pom +fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.6/maven-resources-plugin-2.6.jar +fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.3/maven-shade-plugin-2.3.jar.sha1 +fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.3/maven-shade-plugin-2.3.jar +fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.3/maven-shade-plugin-2.3.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.3/maven-shade-plugin-2.3.pom +fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.3.2/maven-compiler-plugin-2.3.2.pom +fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.3.2/maven-compiler-plugin-2.3.2.jar.sha1 +fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.3.2/maven-compiler-plugin-2.3.2.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.3.2/maven-compiler-plugin-2.3.2.jar +fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.pom +fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.jar +fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.jar.sha1 +fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.jar.sha1 +fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.pom +fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.jar +fetchArtifact org/apache/maven/plugins/maven-antrun-plugin/1.7/maven-antrun-plugin-1.7.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-antrun-plugin/1.7/maven-antrun-plugin-1.7.pom +fetchArtifact org/apache/maven/plugins/maven-antrun-plugin/1.7/maven-antrun-plugin-1.7.jar.sha1 +fetchArtifact org/apache/maven/plugins/maven-antrun-plugin/1.7/maven-antrun-plugin-1.7.jar +fetchArtifact org/apache/maven/plugins/maven-plugins/22/maven-plugins-22.pom +fetchArtifact org/apache/maven/plugins/maven-plugins/22/maven-plugins-22.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-plugins/24/maven-plugins-24.pom +fetchArtifact org/apache/maven/plugins/maven-plugins/24/maven-plugins-24.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-plugins/18/maven-plugins-18.pom +fetchArtifact org/apache/maven/plugins/maven-plugins/18/maven-plugins-18.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-plugins/25/maven-plugins-25.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-plugins/25/maven-plugins-25.pom +fetchArtifact org/apache/maven/plugins/maven-plugins/23/maven-plugins-23.pom +fetchArtifact org/apache/maven/plugins/maven-plugins/23/maven-plugins-23.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-surefire-report-plugin/2.14.1/maven-surefire-report-plugin-2.14.1.pom +fetchArtifact org/apache/maven/plugins/maven-surefire-report-plugin/2.14.1/maven-surefire-report-plugin-2.14.1.jar +fetchArtifact org/apache/maven/plugins/maven-surefire-report-plugin/2.14.1/maven-surefire-report-plugin-2.14.1.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-surefire-report-plugin/2.14.1/maven-surefire-report-plugin-2.14.1.jar.sha1 +fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.14.1/maven-surefire-plugin-2.14.1.jar +fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.14.1/maven-surefire-plugin-2.14.1.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.14.1/maven-surefire-plugin-2.14.1.jar.sha1 +fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.14.1/maven-surefire-plugin-2.14.1.pom +fetchArtifact org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.pom +fetchArtifact org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-monitor/2.0.9/maven-monitor-2.0.9.pom +fetchArtifact org/apache/maven/maven-monitor/2.0.9/maven-monitor-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.pom +fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.9/maven-error-diagnostics-2.0.9.pom +fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.9/maven-error-diagnostics-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-dependency-tree/1.2/maven-dependency-tree-1.2.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-dependency-tree/1.2/maven-dependency-tree-1.2.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-dependency-tree/1.2/maven-dependency-tree-1.2.jar +fetchArtifact org/apache/maven/shared/maven-dependency-tree/1.2/maven-dependency-tree-1.2.pom +fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.jar +fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.pom +fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.jar +fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.pom +fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-filtering/1.1/maven-filtering-1.1.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-filtering/1.1/maven-filtering-1.1.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-filtering/1.1/maven-filtering-1.1.pom +fetchArtifact org/apache/maven/shared/maven-filtering/1.1/maven-filtering-1.1.jar +fetchArtifact org/apache/maven/shared/maven-shared-components/19/maven-shared-components-19.pom +fetchArtifact org/apache/maven/shared/maven-shared-components/19/maven-shared-components-19.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-shared-components/9/maven-shared-components-9.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-shared-components/9/maven-shared-components-9.pom +fetchArtifact org/apache/maven/shared/maven-shared-components/17/maven-shared-components-17.pom +fetchArtifact org/apache/maven/shared/maven-shared-components/17/maven-shared-components-17.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-shared-components/12/maven-shared-components-12.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-shared-components/12/maven-shared-components-12.pom +fetchArtifact org/apache/maven/shared/maven-shared-components/8/maven-shared-components-8.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-shared-components/8/maven-shared-components-8.pom +fetchArtifact org/apache/maven/shared/maven-shared-components/15/maven-shared-components-15.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-shared-components/15/maven-shared-components-15.pom +fetchArtifact org/apache/maven/shared/maven-shared-components/11/maven-shared-components-11.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-shared-components/11/maven-shared-components-11.pom +fetchArtifact org/apache/maven/shared/maven-shared-components/10/maven-shared-components-10.pom +fetchArtifact org/apache/maven/shared/maven-shared-components/10/maven-shared-components-10.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.jar +fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.pom +fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.pom +fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.jar +fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.jar.sha1 +fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.jar.sha1 +fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.jar +fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.pom +fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.jar +fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.pom +fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.pom +fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.jar +fetchArtifact org/apache/maven/shared/maven-shared-utils/0.4/maven-shared-utils-0.4.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-shared-utils/0.4/maven-shared-utils-0.4.jar +fetchArtifact org/apache/maven/shared/maven-shared-utils/0.4/maven-shared-utils-0.4.pom +fetchArtifact org/apache/maven/shared/maven-shared-utils/0.4/maven-shared-utils-0.4.jar.sha1 +fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.pom +fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.9/maven-plugin-parameter-documenter-2.0.9.pom +fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.9/maven-plugin-parameter-documenter-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-core/3.0/maven-core-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven-core/3.0/maven-core-3.0.pom +fetchArtifact org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.pom +fetchArtifact org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.pom +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.5/maven-artifact-manager-2.0.5.pom +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.5/maven-artifact-manager-2.0.5.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact-manager/2.2.0/maven-artifact-manager-2.2.0.pom +fetchArtifact org/apache/maven/maven-artifact-manager/2.2.0/maven-artifact-manager-2.2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.pom +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.10/maven-artifact-manager-2.0.10.pom +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.10/maven-artifact-manager-2.0.10.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.8/maven-artifact-manager-2.0.8.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.8/maven-artifact-manager-2.0.8.pom +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.2/maven-artifact-manager-2.0.2.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.2/maven-artifact-manager-2.0.2.pom +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.11/maven-artifact-manager-2.0.11.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.11/maven-artifact-manager-2.0.11.pom +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.pom +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.jar +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.jar.sha1 +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/plugin-tools/maven-plugin-tools/3.2/maven-plugin-tools-3.2.pom +fetchArtifact org/apache/maven/plugin-tools/maven-plugin-tools/3.2/maven-plugin-tools-3.2.pom.sha1 +fetchArtifact org/apache/maven/plugin-tools/maven-plugin-annotations/3.2/maven-plugin-annotations-3.2.pom.sha1 +fetchArtifact org/apache/maven/plugin-tools/maven-plugin-annotations/3.2/maven-plugin-annotations-3.2.jar +fetchArtifact org/apache/maven/plugin-tools/maven-plugin-annotations/3.2/maven-plugin-annotations-3.2.pom +fetchArtifact org/apache/maven/plugin-tools/maven-plugin-annotations/3.2/maven-plugin-annotations-3.2.jar.sha1 +fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.jar +fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.pom.sha1 +fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.pom +fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.jar.sha1 +fetchArtifact org/apache/maven/maven-profile/2.0.5/maven-profile-2.0.5.pom.sha1 +fetchArtifact org/apache/maven/maven-profile/2.0.5/maven-profile-2.0.5.pom +fetchArtifact org/apache/maven/maven-profile/2.2.0/maven-profile-2.2.0.pom +fetchArtifact org/apache/maven/maven-profile/2.2.0/maven-profile-2.2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.pom +fetchArtifact org/apache/maven/maven-profile/2.0.10/maven-profile-2.0.10.pom +fetchArtifact org/apache/maven/maven-profile/2.0.10/maven-profile-2.0.10.pom.sha1 +fetchArtifact org/apache/maven/maven-profile/2.0.8/maven-profile-2.0.8.pom.sha1 +fetchArtifact org/apache/maven/maven-profile/2.0.8/maven-profile-2.0.8.pom +fetchArtifact org/apache/maven/maven-profile/2.0.11/maven-profile-2.0.11.pom +fetchArtifact org/apache/maven/maven-profile/2.0.11/maven-profile-2.0.11.pom.sha1 +fetchArtifact org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.jar +fetchArtifact org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.jar.sha1 +fetchArtifact org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.pom +fetchArtifact org/apache/maven/maven-project/2.0.5/maven-project-2.0.5.pom.sha1 +fetchArtifact org/apache/maven/maven-project/2.0.5/maven-project-2.0.5.pom +fetchArtifact org/apache/maven/maven-project/2.2.0/maven-project-2.2.0.pom +fetchArtifact org/apache/maven/maven-project/2.2.0/maven-project-2.2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.pom +fetchArtifact org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-project/2.0.10/maven-project-2.0.10.pom.sha1 +fetchArtifact org/apache/maven/maven-project/2.0.10/maven-project-2.0.10.pom +fetchArtifact org/apache/maven/maven-project/2.0.8/maven-project-2.0.8.pom.sha1 +fetchArtifact org/apache/maven/maven-project/2.0.8/maven-project-2.0.8.pom +fetchArtifact org/apache/maven/maven-project/2.0.11/maven-project-2.0.11.pom.sha1 +fetchArtifact org/apache/maven/maven-project/2.0.11/maven-project-2.0.11.pom +fetchArtifact org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.jar.sha1 +fetchArtifact org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.pom +fetchArtifact org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.jar +fetchArtifact org/apache/maven/maven-model/2.0.5/maven-model-2.0.5.pom.sha1 +fetchArtifact org/apache/maven/maven-model/2.0.5/maven-model-2.0.5.pom +fetchArtifact org/apache/maven/maven-model/2.2.0/maven-model-2.2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-model/2.2.0/maven-model-2.2.0.pom +fetchArtifact org/apache/maven/maven-model/3.0/maven-model-3.0.pom +fetchArtifact org/apache/maven/maven-model/3.0/maven-model-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.pom +fetchArtifact org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-model/2.0.10/maven-model-2.0.10.pom +fetchArtifact org/apache/maven/maven-model/2.0.10/maven-model-2.0.10.pom.sha1 +fetchArtifact org/apache/maven/maven-model/2.0.8/maven-model-2.0.8.pom +fetchArtifact org/apache/maven/maven-model/2.0.8/maven-model-2.0.8.pom.sha1 +fetchArtifact org/apache/maven/maven-model/2.0.11/maven-model-2.0.11.pom +fetchArtifact org/apache/maven/maven-model/2.0.11/maven-model-2.0.11.pom.sha1 +fetchArtifact org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.jar.sha1 +fetchArtifact org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.pom +fetchArtifact org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.jar +fetchArtifact org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/surefire/surefire/2.14.1/surefire-2.14.1.pom.sha1 +fetchArtifact org/apache/maven/surefire/surefire/2.14.1/surefire-2.14.1.pom +fetchArtifact org/apache/maven/surefire/surefire-report-parser/2.14.1/surefire-report-parser-2.14.1.jar +fetchArtifact org/apache/maven/surefire/surefire-report-parser/2.14.1/surefire-report-parser-2.14.1.jar.sha1 +fetchArtifact org/apache/maven/surefire/surefire-report-parser/2.14.1/surefire-report-parser-2.14.1.pom +fetchArtifact org/apache/maven/surefire/surefire-report-parser/2.14.1/surefire-report-parser-2.14.1.pom.sha1 +fetchArtifact org/apache/maven/surefire/surefire-junit4/2.14.1/surefire-junit4-2.14.1.pom +fetchArtifact org/apache/maven/surefire/surefire-junit4/2.14.1/surefire-junit4-2.14.1.jar.sha1 +fetchArtifact org/apache/maven/surefire/surefire-junit4/2.14.1/surefire-junit4-2.14.1.jar +fetchArtifact org/apache/maven/surefire/surefire-junit4/2.14.1/surefire-junit4-2.14.1.pom.sha1 +fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.14.1/maven-surefire-common-2.14.1.jar.sha1 +fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.14.1/maven-surefire-common-2.14.1.pom +fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.14.1/maven-surefire-common-2.14.1.pom.sha1 +fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.14.1/maven-surefire-common-2.14.1.jar +fetchArtifact org/apache/maven/surefire/surefire-booter/2.14.1/surefire-booter-2.14.1.pom.sha1 +fetchArtifact org/apache/maven/surefire/surefire-booter/2.14.1/surefire-booter-2.14.1.jar +fetchArtifact org/apache/maven/surefire/surefire-booter/2.14.1/surefire-booter-2.14.1.pom +fetchArtifact org/apache/maven/surefire/surefire-booter/2.14.1/surefire-booter-2.14.1.jar.sha1 +fetchArtifact org/apache/maven/surefire/surefire-api/2.14.1/surefire-api-2.14.1.pom +fetchArtifact org/apache/maven/surefire/surefire-api/2.14.1/surefire-api-2.14.1.jar +fetchArtifact org/apache/maven/surefire/surefire-api/2.14.1/surefire-api-2.14.1.jar.sha1 +fetchArtifact org/apache/maven/surefire/surefire-api/2.14.1/surefire-api-2.14.1.pom.sha1 +fetchArtifact org/apache/maven/surefire/surefire-providers/2.14.1/surefire-providers-2.14.1.pom.sha1 +fetchArtifact org/apache/maven/surefire/surefire-providers/2.14.1/surefire-providers-2.14.1.pom +fetchArtifact org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.pom +fetchArtifact org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.5/maven-repository-metadata-2.0.5.pom +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.5/maven-repository-metadata-2.0.5.pom.sha1 +fetchArtifact org/apache/maven/maven-repository-metadata/2.2.0/maven-repository-metadata-2.2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-repository-metadata/2.2.0/maven-repository-metadata-2.2.0.pom +fetchArtifact org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.pom +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.pom +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.10/maven-repository-metadata-2.0.10.pom.sha1 +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.10/maven-repository-metadata-2.0.10.pom +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.8/maven-repository-metadata-2.0.8.pom.sha1 +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.8/maven-repository-metadata-2.0.8.pom +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.2/maven-repository-metadata-2.0.2.pom.sha1 +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.2/maven-repository-metadata-2.0.2.pom +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.11/maven-repository-metadata-2.0.11.pom +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.11/maven-repository-metadata-2.0.11.pom.sha1 +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.pom +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.jar.sha1 +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.jar +fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.pom +fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.9/maven-plugin-descriptor-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.9/maven-plugin-descriptor-2.0.9.pom +fetchArtifact org/apache/maven/maven/2.0.5/maven-2.0.5.pom.sha1 +fetchArtifact org/apache/maven/maven/2.0.5/maven-2.0.5.pom +fetchArtifact org/apache/maven/maven/2.2.0/maven-2.2.0.pom.sha1 +fetchArtifact org/apache/maven/maven/2.2.0/maven-2.2.0.pom +fetchArtifact org/apache/maven/maven/3.0/maven-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven/3.0/maven-3.0.pom +fetchArtifact org/apache/maven/maven/2.0.6/maven-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven/2.0.6/maven-2.0.6.pom +fetchArtifact org/apache/maven/maven/2.0.10/maven-2.0.10.pom.sha1 +fetchArtifact org/apache/maven/maven/2.0.10/maven-2.0.10.pom +fetchArtifact org/apache/maven/maven/2.0.8/maven-2.0.8.pom.sha1 +fetchArtifact org/apache/maven/maven/2.0.8/maven-2.0.8.pom +fetchArtifact org/apache/maven/maven/2.2.1/maven-2.2.1.pom +fetchArtifact org/apache/maven/maven/2.2.1/maven-2.2.1.pom.sha1 +fetchArtifact org/apache/maven/maven/2.0.2/maven-2.0.2.pom +fetchArtifact org/apache/maven/maven/2.0.2/maven-2.0.2.pom.sha1 +fetchArtifact org/apache/maven/maven/2.0.11/maven-2.0.11.pom.sha1 +fetchArtifact org/apache/maven/maven/2.0.11/maven-2.0.11.pom +fetchArtifact org/apache/maven/maven/2.0.9/maven-2.0.9.pom +fetchArtifact org/apache/maven/maven/2.0.9/maven-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.pom +fetchArtifact org/apache/maven/maven-artifact/2.0.5/maven-artifact-2.0.5.pom +fetchArtifact org/apache/maven/maven-artifact/2.0.5/maven-artifact-2.0.5.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact/2.2.0/maven-artifact-2.2.0.pom +fetchArtifact org/apache/maven/maven-artifact/2.2.0/maven-artifact-2.2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.pom +fetchArtifact org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.pom +fetchArtifact org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact/2.0.10/maven-artifact-2.0.10.pom +fetchArtifact org/apache/maven/maven-artifact/2.0.10/maven-artifact-2.0.10.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact/2.0.8/maven-artifact-2.0.8.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact/2.0.8/maven-artifact-2.0.8.pom +fetchArtifact org/apache/maven/maven-artifact/2.2.1/maven-artifact-2.2.1.pom +fetchArtifact org/apache/maven/maven-artifact/2.2.1/maven-artifact-2.2.1.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact/2.0.2/maven-artifact-2.0.2.pom +fetchArtifact org/apache/maven/maven-artifact/2.0.2/maven-artifact-2.0.2.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact/2.0.11/maven-artifact-2.0.11.pom +fetchArtifact org/apache/maven/maven-artifact/2.0.11/maven-artifact-2.0.11.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.jar +fetchArtifact org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.jar.sha1 +fetchArtifact org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.pom +fetchArtifact org/apache/maven/maven-settings/2.0.5/maven-settings-2.0.5.pom +fetchArtifact org/apache/maven/maven-settings/2.0.5/maven-settings-2.0.5.pom.sha1 +fetchArtifact org/apache/maven/maven-settings/2.2.0/maven-settings-2.2.0.pom +fetchArtifact org/apache/maven/maven-settings/2.2.0/maven-settings-2.2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-settings/3.0/maven-settings-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven-settings/3.0/maven-settings-3.0.pom +fetchArtifact org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.pom +fetchArtifact org/apache/maven/maven-settings/2.0.10/maven-settings-2.0.10.pom.sha1 +fetchArtifact org/apache/maven/maven-settings/2.0.10/maven-settings-2.0.10.pom +fetchArtifact org/apache/maven/maven-settings/2.0.8/maven-settings-2.0.8.pom +fetchArtifact org/apache/maven/maven-settings/2.0.8/maven-settings-2.0.8.pom.sha1 +fetchArtifact org/apache/maven/maven-settings/2.0.11/maven-settings-2.0.11.pom +fetchArtifact org/apache/maven/maven-settings/2.0.11/maven-settings-2.0.11.pom.sha1 +fetchArtifact org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.jar.sha1 +fetchArtifact org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.jar +fetchArtifact org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.pom +fetchArtifact org/apache/maven/maven-compat/3.0/maven-compat-3.0.pom +fetchArtifact org/apache/maven/maven-compat/3.0/maven-compat-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.pom +fetchArtifact org/apache/maven/maven-plugin-registry/2.2.0/maven-plugin-registry-2.2.0.pom +fetchArtifact org/apache/maven/maven-plugin-registry/2.2.0/maven-plugin-registry-2.2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.pom +fetchArtifact org/apache/maven/maven-plugin-registry/2.0.10/maven-plugin-registry-2.0.10.pom +fetchArtifact org/apache/maven/maven-plugin-registry/2.0.10/maven-plugin-registry-2.0.10.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-registry/2.0.8/maven-plugin-registry-2.0.8.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-registry/2.0.8/maven-plugin-registry-2.0.8.pom +fetchArtifact org/apache/maven/maven-plugin-registry/2.0.11/maven-plugin-registry-2.0.11.pom +fetchArtifact org/apache/maven/maven-plugin-registry/2.0.11/maven-plugin-registry-2.0.11.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.pom +fetchArtifact org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.jar.sha1 +fetchArtifact org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.jar +fetchArtifact org/apache/maven/maven-parent/7/maven-parent-7.pom +fetchArtifact org/apache/maven/maven-parent/7/maven-parent-7.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/4/maven-parent-4.pom +fetchArtifact org/apache/maven/maven-parent/4/maven-parent-4.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/16/maven-parent-16.pom +fetchArtifact org/apache/maven/maven-parent/16/maven-parent-16.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/22/maven-parent-22.pom +fetchArtifact org/apache/maven/maven-parent/22/maven-parent-22.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/9/maven-parent-9.pom +fetchArtifact org/apache/maven/maven-parent/9/maven-parent-9.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/24/maven-parent-24.pom +fetchArtifact org/apache/maven/maven-parent/24/maven-parent-24.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/13/maven-parent-13.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/13/maven-parent-13.pom +fetchArtifact org/apache/maven/maven-parent/5/maven-parent-5.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/5/maven-parent-5.pom +fetchArtifact org/apache/maven/maven-parent/6/maven-parent-6.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/6/maven-parent-6.pom +fetchArtifact org/apache/maven/maven-parent/21/maven-parent-21.pom +fetchArtifact org/apache/maven/maven-parent/21/maven-parent-21.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/12/maven-parent-12.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/12/maven-parent-12.pom +fetchArtifact org/apache/maven/maven-parent/23/maven-parent-23.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/23/maven-parent-23.pom +fetchArtifact org/apache/maven/maven-parent/8/maven-parent-8.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/8/maven-parent-8.pom +fetchArtifact org/apache/maven/maven-parent/15/maven-parent-15.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/15/maven-parent-15.pom +fetchArtifact org/apache/maven/maven-parent/11/maven-parent-11.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/11/maven-parent-11.pom +fetchArtifact org/apache/maven/maven-parent/10/maven-parent-10.pom +fetchArtifact org/apache/maven/maven-parent/10/maven-parent-10.pom.sha1 +fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.pom.sha1 +fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.jar.sha1 +fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.pom +fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.jar +fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.pom.sha1 +fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.pom +fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.pom.sha1 +fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.pom +fetchArtifact org/apache/maven/wagon/wagon/1.0-beta-2/wagon-1.0-beta-2.pom.sha1 +fetchArtifact org/apache/maven/wagon/wagon/1.0-beta-2/wagon-1.0-beta-2.pom +fetchArtifact org/apache/maven/wagon/wagon/1.0-beta-6/wagon-1.0-beta-6.pom.sha1 +fetchArtifact org/apache/maven/wagon/wagon/1.0-beta-6/wagon-1.0-beta-6.pom +fetchArtifact org/apache/maven/wagon/wagon/1.0-alpha-6/wagon-1.0-alpha-6.pom +fetchArtifact org/apache/maven/wagon/wagon/1.0-alpha-6/wagon-1.0-alpha-6.pom.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.jar +fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.jar.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.pom.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.pom +fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.1/maven-reporting-impl-2.1.pom +fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.1/maven-reporting-impl-2.1.pom.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.1/maven-reporting-impl-2.1.jar +fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.1/maven-reporting-impl-2.1.jar.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.jar.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.pom.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.jar +fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.pom +fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.pom +fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.jar +fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.jar.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.pom +fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.jar +fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.jar.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.6/maven-reporting-2.0.6.pom +fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.6/maven-reporting-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.9/maven-reporting-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.9/maven-reporting-2.0.9.pom +fetchArtifact org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.pom +fetchArtifact org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.pom +fetchArtifact org/apache/maven/maven-plugin-api/2.0.10/maven-plugin-api-2.0.10.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-api/2.0.10/maven-plugin-api-2.0.10.pom +fetchArtifact org/apache/maven/maven-plugin-api/2.0.8/maven-plugin-api-2.0.8.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-api/2.0.8/maven-plugin-api-2.0.8.pom +fetchArtifact org/apache/maven/maven-plugin-api/2.0.11/maven-plugin-api-2.0.11.pom +fetchArtifact org/apache/maven/maven-plugin-api/2.0.11/maven-plugin-api-2.0.11.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.jar.sha1 +fetchArtifact org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.pom +fetchArtifact org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.jar +fetchArtifact org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.pom +fetchArtifact org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.pom.sha1 +fetchArtifact org/apache/maven/maven-toolchain/2.0.9/maven-toolchain-2.0.9.pom +fetchArtifact org/apache/maven/maven-toolchain/2.0.9/maven-toolchain-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-modules/1.0/doxia-modules-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-modules/1.0/doxia-modules-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia-modules/1.1.4/doxia-modules-1.1.4.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-modules/1.1.4/doxia-modules-1.1.4.pom +fetchArtifact org/apache/maven/doxia/doxia-modules/1.1.2/doxia-modules-1.1.2.pom +fetchArtifact org/apache/maven/doxia/doxia-modules/1.1.2/doxia-modules-1.1.2.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.jar +fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.jar +fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.1.4/doxia-decoration-model-1.1.4.pom +fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.1.4/doxia-decoration-model-1.1.4.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.1.4/doxia-decoration-model-1.1.4.jar +fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.1.4/doxia-decoration-model-1.1.4.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.1.2/doxia-decoration-model-1.1.2.pom +fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.1.2/doxia-decoration-model-1.1.2.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.jar +fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.1.4/doxia-module-fml-1.1.4.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.1.4/doxia-module-fml-1.1.4.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.1.4/doxia-module-fml-1.1.4.jar +fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.1.4/doxia-module-fml-1.1.4.pom +fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.1.2/doxia-module-fml-1.1.2.pom +fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.1.2/doxia-module-fml-1.1.2.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.jar +fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.0/doxia-sitetools-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.0/doxia-sitetools-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.1.4/doxia-sitetools-1.1.4.pom +fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.1.4/doxia-sitetools-1.1.4.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.1.2/doxia-sitetools-1.1.2.pom +fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.1.2/doxia-sitetools-1.1.2.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.jar +fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-core/1.1.4/doxia-core-1.1.4.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-core/1.1.4/doxia-core-1.1.4.jar +fetchArtifact org/apache/maven/doxia/doxia-core/1.1.4/doxia-core-1.1.4.pom +fetchArtifact org/apache/maven/doxia/doxia-core/1.1.4/doxia-core-1.1.4.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-core/1.1.2/doxia-core-1.1.2.pom +fetchArtifact org/apache/maven/doxia/doxia-core/1.1.2/doxia-core-1.1.2.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.1.4/doxia-logging-api-1.1.4.jar +fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.1.4/doxia-logging-api-1.1.4.pom +fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.1.4/doxia-logging-api-1.1.4.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.1.4/doxia-logging-api-1.1.4.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.1.2/doxia-logging-api-1.1.2.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.1.2/doxia-logging-api-1.1.2.pom +fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.1.2/doxia-logging-api-1.1.2.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.1.2/doxia-logging-api-1.1.2.jar +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.pom +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.jar +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.1.4/doxia-sink-api-1.1.4.pom +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.1.4/doxia-sink-api-1.1.4.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.1.4/doxia-sink-api-1.1.4.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.1.4/doxia-sink-api-1.1.4.jar +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.1.2/doxia-sink-api-1.1.2.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.1.2/doxia-sink-api-1.1.2.pom +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.1.2/doxia-sink-api-1.1.2.jar +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.1.2/doxia-sink-api-1.1.2.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.jar +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.pom +fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.jar +fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.1.4/doxia-module-xhtml-1.1.4.jar +fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.1.4/doxia-module-xhtml-1.1.4.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.1.4/doxia-module-xhtml-1.1.4.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.1.4/doxia-module-xhtml-1.1.4.pom +fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.1.2/doxia-module-xhtml-1.1.2.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.1.2/doxia-module-xhtml-1.1.2.pom +fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-10/doxia-1.0-alpha-10.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-10/doxia-1.0-alpha-10.pom +fetchArtifact org/apache/maven/doxia/doxia/1.0/doxia-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia/1.0/doxia-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia/1.1.4/doxia-1.1.4.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia/1.1.4/doxia-1.1.4.pom +fetchArtifact org/apache/maven/doxia/doxia/1.1.2/doxia-1.1.2.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia/1.1.2/doxia-1.1.2.pom +fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-7/doxia-1.0-alpha-7.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-7/doxia-1.0-alpha-7.pom +fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.jar +fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.1.4/doxia-site-renderer-1.1.4.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.1.4/doxia-site-renderer-1.1.4.jar +fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.1.4/doxia-site-renderer-1.1.4.pom +fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.1.4/doxia-site-renderer-1.1.4.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.1.2/doxia-site-renderer-1.1.2.pom +fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.1.2/doxia-site-renderer-1.1.2.pom.sha1 +fetchArtifact org/apache/apache/7/apache-7.pom +fetchArtifact org/apache/apache/7/apache-7.pom.sha1 +fetchArtifact org/apache/apache/4/apache-4.pom +fetchArtifact org/apache/apache/4/apache-4.pom.sha1 +fetchArtifact org/apache/apache/1/apache-1.pom +fetchArtifact org/apache/apache/1/apache-1.pom.sha1 +fetchArtifact org/apache/apache/9/apache-9.pom +fetchArtifact org/apache/apache/9/apache-9.pom.sha1 +fetchArtifact org/apache/apache/14/apache-14.pom.sha1 +fetchArtifact org/apache/apache/14/apache-14.pom +fetchArtifact org/apache/apache/13/apache-13.pom +fetchArtifact org/apache/apache/13/apache-13.pom.sha1 +fetchArtifact org/apache/apache/3/apache-3.pom +fetchArtifact org/apache/apache/3/apache-3.pom.sha1 +fetchArtifact org/apache/apache/5/apache-5.pom +fetchArtifact org/apache/apache/5/apache-5.pom.sha1 +fetchArtifact org/apache/apache/6/apache-6.pom.sha1 +fetchArtifact org/apache/apache/6/apache-6.pom +fetchArtifact org/apache/apache/11/apache-11.pom +fetchArtifact org/apache/apache/11/apache-11.pom.sha1 +fetchArtifact org/apache/apache/10/apache-10.pom +fetchArtifact org/apache/apache/10/apache-10.pom.sha1 +fetchArtifact org/apache/mesos/mesos/0.20.1/mesos-0.20.1.pom +fetchArtifact org/apache/mesos/mesos/0.20.1/mesos-0.20.1.pom.sha1 +fetchArtifact org/apache/mesos/mesos/0.20.1/mesos-0.20.1.jar.sha1 +fetchArtifact org/apache/mesos/mesos/0.20.1/mesos-0.20.1.jar +fetchArtifact org/apache/zookeeper/zookeeper/3.4.6/zookeeper-3.4.6.pom +fetchArtifact org/apache/zookeeper/zookeeper/3.4.6/zookeeper-3.4.6.jar +fetchArtifact org/apache/zookeeper/zookeeper/3.4.6/zookeeper-3.4.6.pom.sha1 +fetchArtifact org/apache/zookeeper/zookeeper/3.4.6/zookeeper-3.4.6.jar.sha1 +fetchArtifact org/apache/curator/apache-curator/2.6.0/apache-curator-2.6.0.pom +fetchArtifact org/apache/curator/apache-curator/2.6.0/apache-curator-2.6.0.pom.sha1 +fetchArtifact org/apache/curator/curator-framework/2.6.0/curator-framework-2.6.0.pom.sha1 +fetchArtifact org/apache/curator/curator-framework/2.6.0/curator-framework-2.6.0.jar +fetchArtifact org/apache/curator/curator-framework/2.6.0/curator-framework-2.6.0.pom +fetchArtifact org/apache/curator/curator-framework/2.6.0/curator-framework-2.6.0.jar.sha1 +fetchArtifact org/apache/curator/curator-client/2.6.0/curator-client-2.6.0.jar +fetchArtifact org/apache/curator/curator-client/2.6.0/curator-client-2.6.0.jar.sha1 +fetchArtifact org/apache/curator/curator-client/2.6.0/curator-client-2.6.0.pom.sha1 +fetchArtifact org/apache/curator/curator-client/2.6.0/curator-client-2.6.0.pom +fetchArtifact org/apache/curator/curator-test/2.6.0/curator-test-2.6.0.pom.sha1 +fetchArtifact org/apache/curator/curator-test/2.6.0/curator-test-2.6.0.jar +fetchArtifact org/apache/curator/curator-test/2.6.0/curator-test-2.6.0.pom +fetchArtifact org/apache/curator/curator-test/2.6.0/curator-test-2.6.0.jar.sha1 +fetchArtifact org/apache/curator/curator-recipes/2.6.0/curator-recipes-2.6.0.jar.sha1 +fetchArtifact org/apache/curator/curator-recipes/2.6.0/curator-recipes-2.6.0.pom.sha1 +fetchArtifact org/apache/curator/curator-recipes/2.6.0/curator-recipes-2.6.0.pom +fetchArtifact org/apache/curator/curator-recipes/2.6.0/curator-recipes-2.6.0.jar +fetchArtifact org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.pom +fetchArtifact org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.jar.sha1 +fetchArtifact org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.jar +fetchArtifact org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.pom.sha1 +fetchArtifact org/apache/commons/commons-math/2.2/commons-math-2.2.jar.sha1 +fetchArtifact org/apache/commons/commons-math/2.2/commons-math-2.2.pom +fetchArtifact org/apache/commons/commons-math/2.2/commons-math-2.2.jar +fetchArtifact org/apache/commons/commons-math/2.2/commons-math-2.2.pom.sha1 +fetchArtifact org/apache/commons/commons-email/1.3.2/commons-email-1.3.2.jar +fetchArtifact org/apache/commons/commons-email/1.3.2/commons-email-1.3.2.jar.sha1 +fetchArtifact org/apache/commons/commons-email/1.3.2/commons-email-1.3.2.pom.sha1 +fetchArtifact org/apache/commons/commons-email/1.3.2/commons-email-1.3.2.pom +fetchArtifact org/apache/commons/commons-exec/1.0.1/commons-exec-1.0.1.jar +fetchArtifact org/apache/commons/commons-exec/1.0.1/commons-exec-1.0.1.pom.sha1 +fetchArtifact org/apache/commons/commons-exec/1.0.1/commons-exec-1.0.1.pom +fetchArtifact org/apache/commons/commons-exec/1.0.1/commons-exec-1.0.1.jar.sha1 +fetchArtifact org/apache/commons/commons-parent/28/commons-parent-28.pom.sha1 +fetchArtifact org/apache/commons/commons-parent/28/commons-parent-28.pom +fetchArtifact org/apache/commons/commons-parent/7/commons-parent-7.pom.sha1 +fetchArtifact org/apache/commons/commons-parent/7/commons-parent-7.pom +fetchArtifact org/apache/commons/commons-parent/22/commons-parent-22.pom +fetchArtifact org/apache/commons/commons-parent/22/commons-parent-22.pom.sha1 +fetchArtifact org/apache/commons/commons-parent/9/commons-parent-9.pom.sha1 +fetchArtifact org/apache/commons/commons-parent/9/commons-parent-9.pom +fetchArtifact org/apache/commons/commons-parent/24/commons-parent-24.pom +fetchArtifact org/apache/commons/commons-parent/24/commons-parent-24.pom.sha1 +fetchArtifact org/apache/commons/commons-parent/17/commons-parent-17.pom.sha1 +fetchArtifact org/apache/commons/commons-parent/17/commons-parent-17.pom +fetchArtifact org/apache/commons/commons-parent/32/commons-parent-32.pom.sha1 +fetchArtifact org/apache/commons/commons-parent/32/commons-parent-32.pom +fetchArtifact org/apache/commons/commons-parent/5/commons-parent-5.pom +fetchArtifact org/apache/commons/commons-parent/5/commons-parent-5.pom.sha1 +fetchArtifact org/apache/commons/commons-parent/18/commons-parent-18.pom.sha1 +fetchArtifact org/apache/commons/commons-parent/18/commons-parent-18.pom +fetchArtifact org/apache/commons/commons-parent/11/commons-parent-11.pom.sha1 +fetchArtifact org/apache/commons/commons-parent/11/commons-parent-11.pom +fetchArtifact org/apache/commons/commons-math3/3.2/commons-math3-3.2.pom.sha1 +fetchArtifact org/apache/commons/commons-math3/3.2/commons-math3-3.2.jar.sha1 +fetchArtifact org/apache/commons/commons-math3/3.2/commons-math3-3.2.jar +fetchArtifact org/apache/commons/commons-math3/3.2/commons-math3-3.2.pom +fetchArtifact org/codehaus/jackson/jackson-mapper-asl/1.6.1/jackson-mapper-asl-1.6.1.pom +fetchArtifact org/codehaus/jackson/jackson-mapper-asl/1.6.1/jackson-mapper-asl-1.6.1.jar +fetchArtifact org/codehaus/jackson/jackson-mapper-asl/1.6.1/jackson-mapper-asl-1.6.1.pom.sha1 +fetchArtifact org/codehaus/jackson/jackson-mapper-asl/1.6.1/jackson-mapper-asl-1.6.1.jar.sha1 +fetchArtifact org/codehaus/jackson/jackson-core-asl/1.6.1/jackson-core-asl-1.6.1.jar +fetchArtifact org/codehaus/jackson/jackson-core-asl/1.6.1/jackson-core-asl-1.6.1.pom.sha1 +fetchArtifact org/codehaus/jackson/jackson-core-asl/1.6.1/jackson-core-asl-1.6.1.pom +fetchArtifact org/codehaus/jackson/jackson-core-asl/1.6.1/jackson-core-asl-1.6.1.jar.sha1 +fetchArtifact org/codehaus/codehaus-parent/4/codehaus-parent-4.pom +fetchArtifact org/codehaus/codehaus-parent/4/codehaus-parent-4.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-components/1.1.19/plexus-components-1.1.19.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-components/1.1.19/plexus-components-1.1.19.pom +fetchArtifact org/codehaus/plexus/plexus-components/1.3/plexus-components-1.3.pom +fetchArtifact org/codehaus/plexus/plexus-components/1.3/plexus-components-1.3.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-components/1.1.18/plexus-components-1.1.18.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-components/1.1.18/plexus-components-1.1.18.pom +fetchArtifact org/codehaus/plexus/plexus-components/1.2/plexus-components-1.2.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-components/1.2/plexus-components-1.2.pom +fetchArtifact org/codehaus/plexus/plexus-components/1.1.14/plexus-components-1.1.14.pom +fetchArtifact org/codehaus/plexus/plexus-components/1.1.14/plexus-components-1.1.14.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-components/1.1.15/plexus-components-1.1.15.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-components/1.1.15/plexus-components-1.1.15.pom +fetchArtifact org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom +fetchArtifact org/codehaus/plexus/plexus-containers/1.5.5/plexus-containers-1.5.5.pom +fetchArtifact org/codehaus/plexus/plexus-containers/1.5.5/plexus-containers-1.5.5.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-20/plexus-containers-1.0-alpha-20.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-20/plexus-containers-1.0-alpha-20.pom +fetchArtifact org/codehaus/plexus/plexus-containers/1.0.3/plexus-containers-1.0.3.pom +fetchArtifact org/codehaus/plexus/plexus-containers/1.0.3/plexus-containers-1.0.3.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-30/plexus-containers-1.0-alpha-30.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-30/plexus-containers-1.0-alpha-30.pom +fetchArtifact org/codehaus/plexus/plexus-containers/1.5.4/plexus-containers-1.5.4.pom +fetchArtifact org/codehaus/plexus/plexus-containers/1.5.4/plexus-containers-1.5.4.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-container-default/1.5.5/plexus-container-default-1.5.5.pom +fetchArtifact org/codehaus/plexus/plexus-container-default/1.5.5/plexus-container-default-1.5.5.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-20/plexus-container-default-1.0-alpha-20.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-20/plexus-container-default-1.0-alpha-20.pom +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.pom +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.jar +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.pom +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.pom +fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.8.1/plexus-compiler-javac-1.8.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.8.1/plexus-compiler-javac-1.8.1.pom +fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.8.1/plexus-compiler-javac-1.8.1.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.8.1/plexus-compiler-javac-1.8.1.jar +fetchArtifact org/codehaus/plexus/plexus-compilers/1.8.1/plexus-compilers-1.8.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-compilers/1.8.1/plexus-compilers-1.8.1.pom +fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.pom +fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.jar +fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.jar +fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.pom +fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.pom +fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar +fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.4/plexus-component-annotations-1.5.4.pom +fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.4/plexus-component-annotations-1.5.4.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.pom +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.jar +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.pom +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.jar +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.pom +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.pom +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.pom +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.jar +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.1/plexus-interpolation-1.1.pom +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.1/plexus-interpolation-1.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.1/plexus-interpolation-1.1.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.1/plexus-interpolation-1.1.jar +fetchArtifact org/codehaus/plexus/plexus-utils/3.0.10/plexus-utils-3.0.10.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/3.0.10/plexus-utils-3.0.10.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.5/plexus-utils-1.5.5.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.5/plexus-utils-1.5.5.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.7/plexus-utils-1.5.7.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.7/plexus-utils-1.5.7.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.jar +fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.pom +fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.jar +fetchArtifact org/codehaus/plexus/plexus-utils/1.3/plexus-utils-1.3.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.3/plexus-utils-1.3.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.4.2/plexus-utils-1.4.2.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.4.2/plexus-utils-1.4.2.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom +fetchArtifact org/codehaus/plexus/plexus-utils/3.0.15/plexus-utils-3.0.15.jar +fetchArtifact org/codehaus/plexus/plexus-utils/3.0.15/plexus-utils-3.0.15.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/3.0.15/plexus-utils-3.0.15.pom +fetchArtifact org/codehaus/plexus/plexus-utils/3.0.15/plexus-utils-3.0.15.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.jar +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/3.0.8/plexus-utils-3.0.8.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/3.0.8/plexus-utils-3.0.8.jar +fetchArtifact org/codehaus/plexus/plexus-utils/3.0.8/plexus-utils-3.0.8.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/3.0.8/plexus-utils-3.0.8.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.4.1/plexus-utils-1.4.1.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.4.1/plexus-utils-1.4.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.4.6/plexus-utils-1.4.6.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.4.6/plexus-utils-1.4.6.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.15/plexus-utils-1.5.15.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.15/plexus-utils-1.5.15.pom +fetchArtifact org/codehaus/plexus/plexus-utils/2.0.4/plexus-utils-2.0.4.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/2.0.4/plexus-utils-2.0.4.pom +fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.jar +fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.pom +fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/2.1/plexus-utils-2.1.pom +fetchArtifact org/codehaus/plexus/plexus-utils/2.1/plexus-utils-2.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.8.1/plexus-compiler-api-1.8.1.jar +fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.8.1/plexus-compiler-api-1.8.1.pom +fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.8.1/plexus-compiler-api-1.8.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.8.1/plexus-compiler-api-1.8.1.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.jar +fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.pom +fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.jar +fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.pom +fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.pom +fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.jar +fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.8.1/plexus-compiler-manager-1.8.1.jar +fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.8.1/plexus-compiler-manager-1.8.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.8.1/plexus-compiler-manager-1.8.1.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.8.1/plexus-compiler-manager-1.8.1.pom +fetchArtifact org/codehaus/plexus/plexus/2.0.5/plexus-2.0.5.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/2.0.5/plexus-2.0.5.pom +fetchArtifact org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom +fetchArtifact org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom +fetchArtifact org/codehaus/plexus/plexus/1.0.12/plexus-1.0.12.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/1.0.12/plexus-1.0.12.pom +fetchArtifact org/codehaus/plexus/plexus/2.0.6/plexus-2.0.6.pom +fetchArtifact org/codehaus/plexus/plexus/2.0.6/plexus-2.0.6.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/3.3/plexus-3.3.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/3.3/plexus-3.3.pom +fetchArtifact org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom +fetchArtifact org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom +fetchArtifact org/codehaus/plexus/plexus/3.3.1/plexus-3.3.1.pom +fetchArtifact org/codehaus/plexus/plexus/3.3.1/plexus-3.3.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom +fetchArtifact org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/2.0.2/plexus-2.0.2.pom +fetchArtifact org/codehaus/plexus/plexus/2.0.2/plexus-2.0.2.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/3.2/plexus-3.2.pom +fetchArtifact org/codehaus/plexus/plexus/3.2/plexus-3.2.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/2.0.7/plexus-2.0.7.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/2.0.7/plexus-2.0.7.pom +fetchArtifact org/codehaus/plexus/plexus/3.0.1/plexus-3.0.1.pom +fetchArtifact org/codehaus/plexus/plexus/3.0.1/plexus-3.0.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/2.0.3/plexus-2.0.3.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/2.0.3/plexus-2.0.3.pom +fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.pom +fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.jar +fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.jar +fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.pom +fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.pom +fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom +fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.pom +fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.2/plexus-classworlds-2.2.2.pom +fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.2/plexus-classworlds-2.2.2.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-compiler/1.8.1/plexus-compiler-1.8.1.pom +fetchArtifact org/codehaus/plexus/plexus-compiler/1.8.1/plexus-compiler-1.8.1.pom.sha1 +fetchArtifact org/parboiled/parboiled-java/1.1.4/parboiled-java-1.1.4.pom.sha1 +fetchArtifact org/parboiled/parboiled-java/1.1.4/parboiled-java-1.1.4.pom +fetchArtifact org/parboiled/parboiled-java/1.1.4/parboiled-java-1.1.4.jar.sha1 +fetchArtifact org/parboiled/parboiled-java/1.1.4/parboiled-java-1.1.4.jar +fetchArtifact org/parboiled/parboiled-core/1.1.4/parboiled-core-1.1.4.jar +fetchArtifact org/parboiled/parboiled-core/1.1.4/parboiled-core-1.1.4.jar.sha1 +fetchArtifact org/parboiled/parboiled-core/1.1.4/parboiled-core-1.1.4.pom +fetchArtifact org/parboiled/parboiled-core/1.1.4/parboiled-core-1.1.4.pom.sha1 +fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.pom.sha1 +fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.pom +fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.jar +fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.jar.sha1 +fetchArtifact org/eclipse/aether/aether/0.9.0.M2/aether-0.9.0.M2.pom.sha1 +fetchArtifact org/eclipse/aether/aether/0.9.0.M2/aether-0.9.0.M2.pom +fetchArtifact org/eclipse/jetty/jetty-server/8.1.11.v20130520/jetty-server-8.1.11.v20130520.pom +fetchArtifact org/eclipse/jetty/jetty-server/8.1.11.v20130520/jetty-server-8.1.11.v20130520.pom.sha1 +fetchArtifact org/eclipse/jetty/jetty-server/8.1.15.v20140411/jetty-server-8.1.15.v20140411.jar +fetchArtifact org/eclipse/jetty/jetty-server/8.1.15.v20140411/jetty-server-8.1.15.v20140411.pom +fetchArtifact org/eclipse/jetty/jetty-server/8.1.15.v20140411/jetty-server-8.1.15.v20140411.pom.sha1 +fetchArtifact org/eclipse/jetty/jetty-server/8.1.15.v20140411/jetty-server-8.1.15.v20140411.jar.sha1 +fetchArtifact org/eclipse/jetty/jetty-continuation/8.1.11.v20130520/jetty-continuation-8.1.11.v20130520.pom.sha1 +fetchArtifact org/eclipse/jetty/jetty-continuation/8.1.11.v20130520/jetty-continuation-8.1.11.v20130520.pom +fetchArtifact org/eclipse/jetty/jetty-continuation/8.1.15.v20140411/jetty-continuation-8.1.15.v20140411.pom.sha1 +fetchArtifact org/eclipse/jetty/jetty-continuation/8.1.15.v20140411/jetty-continuation-8.1.15.v20140411.pom +fetchArtifact org/eclipse/jetty/jetty-continuation/8.1.15.v20140411/jetty-continuation-8.1.15.v20140411.jar +fetchArtifact org/eclipse/jetty/jetty-continuation/8.1.15.v20140411/jetty-continuation-8.1.15.v20140411.jar.sha1 +fetchArtifact org/eclipse/jetty/jetty-security/8.1.15.v20140411/jetty-security-8.1.15.v20140411.jar +fetchArtifact org/eclipse/jetty/jetty-security/8.1.15.v20140411/jetty-security-8.1.15.v20140411.jar.sha1 +fetchArtifact org/eclipse/jetty/jetty-security/8.1.15.v20140411/jetty-security-8.1.15.v20140411.pom.sha1 +fetchArtifact org/eclipse/jetty/jetty-security/8.1.15.v20140411/jetty-security-8.1.15.v20140411.pom +fetchArtifact org/eclipse/jetty/jetty-util/8.1.11.v20130520/jetty-util-8.1.11.v20130520.pom +fetchArtifact org/eclipse/jetty/jetty-util/8.1.11.v20130520/jetty-util-8.1.11.v20130520.pom.sha1 +fetchArtifact org/eclipse/jetty/jetty-util/8.1.15.v20140411/jetty-util-8.1.15.v20140411.jar.sha1 +fetchArtifact org/eclipse/jetty/jetty-util/8.1.15.v20140411/jetty-util-8.1.15.v20140411.pom +fetchArtifact org/eclipse/jetty/jetty-util/8.1.15.v20140411/jetty-util-8.1.15.v20140411.jar +fetchArtifact org/eclipse/jetty/jetty-util/8.1.15.v20140411/jetty-util-8.1.15.v20140411.pom.sha1 +fetchArtifact org/eclipse/jetty/jetty-project/8.1.11.v20130520/jetty-project-8.1.11.v20130520.pom.sha1 +fetchArtifact org/eclipse/jetty/jetty-project/8.1.11.v20130520/jetty-project-8.1.11.v20130520.pom +fetchArtifact org/eclipse/jetty/jetty-project/8.1.15.v20140411/jetty-project-8.1.15.v20140411.pom.sha1 +fetchArtifact org/eclipse/jetty/jetty-project/8.1.15.v20140411/jetty-project-8.1.15.v20140411.pom +fetchArtifact org/eclipse/jetty/jetty-http/8.1.11.v20130520/jetty-http-8.1.11.v20130520.pom +fetchArtifact org/eclipse/jetty/jetty-http/8.1.11.v20130520/jetty-http-8.1.11.v20130520.pom.sha1 +fetchArtifact org/eclipse/jetty/jetty-http/8.1.15.v20140411/jetty-http-8.1.15.v20140411.jar.sha1 +fetchArtifact org/eclipse/jetty/jetty-http/8.1.15.v20140411/jetty-http-8.1.15.v20140411.pom.sha1 +fetchArtifact org/eclipse/jetty/jetty-http/8.1.15.v20140411/jetty-http-8.1.15.v20140411.jar +fetchArtifact org/eclipse/jetty/jetty-http/8.1.15.v20140411/jetty-http-8.1.15.v20140411.pom +fetchArtifact org/eclipse/jetty/jetty-parent/20/jetty-parent-20.pom.sha1 +fetchArtifact org/eclipse/jetty/jetty-parent/20/jetty-parent-20.pom +fetchArtifact org/eclipse/jetty/jetty-parent/18/jetty-parent-18.pom +fetchArtifact org/eclipse/jetty/jetty-parent/18/jetty-parent-18.pom.sha1 +fetchArtifact org/eclipse/jetty/orbit/jetty-orbit/1/jetty-orbit-1.pom +fetchArtifact org/eclipse/jetty/orbit/jetty-orbit/1/jetty-orbit-1.pom.sha1 +fetchArtifact org/eclipse/jetty/orbit/javax.servlet/3.0.0.v201112011016/javax.servlet-3.0.0.v201112011016.jar +fetchArtifact org/eclipse/jetty/orbit/javax.servlet/3.0.0.v201112011016/javax.servlet-3.0.0.v201112011016.pom.sha1 +fetchArtifact org/eclipse/jetty/orbit/javax.servlet/3.0.0.v201112011016/javax.servlet-3.0.0.v201112011016.jar.sha1 +fetchArtifact org/eclipse/jetty/orbit/javax.servlet/3.0.0.v201112011016/javax.servlet-3.0.0.v201112011016.pom +fetchArtifact org/eclipse/jetty/jetty-servlet/8.1.15.v20140411/jetty-servlet-8.1.15.v20140411.pom +fetchArtifact org/eclipse/jetty/jetty-servlet/8.1.15.v20140411/jetty-servlet-8.1.15.v20140411.jar +fetchArtifact org/eclipse/jetty/jetty-servlet/8.1.15.v20140411/jetty-servlet-8.1.15.v20140411.jar.sha1 +fetchArtifact org/eclipse/jetty/jetty-servlet/8.1.15.v20140411/jetty-servlet-8.1.15.v20140411.pom.sha1 +fetchArtifact org/eclipse/jetty/jetty-io/8.1.11.v20130520/jetty-io-8.1.11.v20130520.pom +fetchArtifact org/eclipse/jetty/jetty-io/8.1.11.v20130520/jetty-io-8.1.11.v20130520.pom.sha1 +fetchArtifact org/eclipse/jetty/jetty-io/8.1.15.v20140411/jetty-io-8.1.15.v20140411.pom +fetchArtifact org/eclipse/jetty/jetty-io/8.1.15.v20140411/jetty-io-8.1.15.v20140411.pom.sha1 +fetchArtifact org/eclipse/jetty/jetty-io/8.1.15.v20140411/jetty-io-8.1.15.v20140411.jar +fetchArtifact org/eclipse/jetty/jetty-io/8.1.15.v20140411/jetty-io-8.1.15.v20140411.jar.sha1 +fetchArtifact org/scalaz/scalaz-core_2.11.0-RC3/7.0.6/scalaz-core_2.11.0-RC3-7.0.6.pom.sha1 +fetchArtifact org/scalaz/scalaz-core_2.11.0-RC3/7.0.6/scalaz-core_2.11.0-RC3-7.0.6.pom +fetchArtifact org/scalaz/scalaz-core_2.11.0-RC3/7.0.6/scalaz-core_2.11.0-RC3-7.0.6.jar +fetchArtifact org/scalaz/scalaz-core_2.11.0-RC3/7.0.6/scalaz-core_2.11.0-RC3-7.0.6.jar.sha1 +fetchArtifact org/scalaz/scalaz-effect_2.11.0-RC3/7.0.6/scalaz-effect_2.11.0-RC3-7.0.6.jar.sha1 +fetchArtifact org/scalaz/scalaz-effect_2.11.0-RC3/7.0.6/scalaz-effect_2.11.0-RC3-7.0.6.pom.sha1 +fetchArtifact org/scalaz/scalaz-effect_2.11.0-RC3/7.0.6/scalaz-effect_2.11.0-RC3-7.0.6.jar +fetchArtifact org/scalaz/scalaz-effect_2.11.0-RC3/7.0.6/scalaz-effect_2.11.0-RC3-7.0.6.pom +fetchArtifact org/scalaz/scalaz-concurrent_2.11.0-RC3/7.0.6/scalaz-concurrent_2.11.0-RC3-7.0.6.jar +fetchArtifact org/scalaz/scalaz-concurrent_2.11.0-RC3/7.0.6/scalaz-concurrent_2.11.0-RC3-7.0.6.pom +fetchArtifact org/scalaz/scalaz-concurrent_2.11.0-RC3/7.0.6/scalaz-concurrent_2.11.0-RC3-7.0.6.jar.sha1 +fetchArtifact org/scalaz/scalaz-concurrent_2.11.0-RC3/7.0.6/scalaz-concurrent_2.11.0-RC3-7.0.6.pom.sha1 +fetchArtifact org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar +fetchArtifact org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.pom +fetchArtifact org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.pom.sha1 +fetchArtifact org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar.sha1 +fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.pom +fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.pom.sha1 +fetchArtifact org/hamcrest/hamcrest-parent/1.3/hamcrest-parent-1.3.pom +fetchArtifact org/hamcrest/hamcrest-parent/1.3/hamcrest-parent-1.3.pom.sha1 +fetchArtifact org/hamcrest/hamcrest-parent/1.1/hamcrest-parent-1.1.pom.sha1 +fetchArtifact org/hamcrest/hamcrest-parent/1.1/hamcrest-parent-1.1.pom +fetchArtifact org/sonatype/oss/oss-parent/7/oss-parent-7.pom.sha1 +fetchArtifact org/sonatype/oss/oss-parent/7/oss-parent-7.pom +fetchArtifact org/sonatype/oss/oss-parent/5/oss-parent-5.pom +fetchArtifact org/sonatype/oss/oss-parent/5/oss-parent-5.pom.sha1 +fetchArtifact org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.pom.sha1 +fetchArtifact org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.pom +fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.jar +fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.jar.sha1 +fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.pom.sha1 +fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.pom +fetchArtifact org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.pom.sha1 +fetchArtifact org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.pom +fetchArtifact org/sonatype/aether/aether-api/1.7/aether-api-1.7.pom.sha1 +fetchArtifact org/sonatype/aether/aether-api/1.7/aether-api-1.7.pom +fetchArtifact org/sonatype/aether/aether-parent/1.7/aether-parent-1.7.pom +fetchArtifact org/sonatype/aether/aether-parent/1.7/aether-parent-1.7.pom.sha1 +fetchArtifact org/sonatype/sisu/sisu-parent/1.4.2/sisu-parent-1.4.2.pom.sha1 +fetchArtifact org/sonatype/sisu/sisu-parent/1.4.2/sisu-parent-1.4.2.pom +fetchArtifact org/sonatype/sisu/sisu-inject/1.4.2/sisu-inject-1.4.2.pom +fetchArtifact org/sonatype/sisu/sisu-inject/1.4.2/sisu-inject-1.4.2.pom.sha1 +fetchArtifact org/sonatype/sisu/inject/guice-plexus/1.4.2/guice-plexus-1.4.2.pom +fetchArtifact org/sonatype/sisu/inject/guice-plexus/1.4.2/guice-plexus-1.4.2.pom.sha1 +fetchArtifact org/sonatype/sisu/inject/guice-bean/1.4.2/guice-bean-1.4.2.pom +fetchArtifact org/sonatype/sisu/inject/guice-bean/1.4.2/guice-bean-1.4.2.pom.sha1 +fetchArtifact org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.pom.sha1 +fetchArtifact org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.pom +fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7-noaop.jar.sha1 +fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7-noaop.jar +fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7.pom.sha1 +fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7.pom +fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.jar.sha1 +fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.jar +fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.pom +fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.pom.sha1 +fetchArtifact org/sonatype/spice/spice-parent/16/spice-parent-16.pom +fetchArtifact org/sonatype/spice/spice-parent/16/spice-parent-16.pom.sha1 +fetchArtifact org/sonatype/spice/spice-parent/17/spice-parent-17.pom.sha1 +fetchArtifact org/sonatype/spice/spice-parent/17/spice-parent-17.pom +fetchArtifact org/sonatype/spice/spice-parent/12/spice-parent-12.pom +fetchArtifact org/sonatype/spice/spice-parent/12/spice-parent-12.pom.sha1 +fetchArtifact org/sonatype/spice/spice-parent/10/spice-parent-10.pom.sha1 +fetchArtifact org/sonatype/spice/spice-parent/10/spice-parent-10.pom +fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.jar +fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.jar.sha1 +fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.pom +fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.pom.sha1 +fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.pom.sha1 +fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar +fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.pom +fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar.sha1 +fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.pom.sha1 +fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar.sha1 +fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar +fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.pom +fetchArtifact org/sonatype/forge/forge-parent/4/forge-parent-4.pom.sha1 +fetchArtifact org/sonatype/forge/forge-parent/4/forge-parent-4.pom +fetchArtifact org/sonatype/forge/forge-parent/3/forge-parent-3.pom +fetchArtifact org/sonatype/forge/forge-parent/3/forge-parent-3.pom.sha1 +fetchArtifact org/sonatype/forge/forge-parent/5/forge-parent-5.pom.sha1 +fetchArtifact org/sonatype/forge/forge-parent/5/forge-parent-5.pom +fetchArtifact org/sonatype/forge/forge-parent/6/forge-parent-6.pom.sha1 +fetchArtifact org/sonatype/forge/forge-parent/6/forge-parent-6.pom +fetchArtifact org/sonatype/forge/forge-parent/10/forge-parent-10.pom.sha1 +fetchArtifact org/sonatype/forge/forge-parent/10/forge-parent-10.pom +fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.jar.sha1 +fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.pom.sha1 +fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.pom +fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.jar +fetchArtifact org/javassist/javassist/3.18.1-GA/javassist-3.18.1-GA.pom +fetchArtifact org/javassist/javassist/3.18.1-GA/javassist-3.18.1-GA.pom.sha1 +fetchArtifact org/javassist/javassist/3.18.1-GA/javassist-3.18.1-GA.jar.sha1 +fetchArtifact org/javassist/javassist/3.18.1-GA/javassist-3.18.1-GA.jar +fetchArtifact org/ow2/asm/asm-parent/5.0.2/asm-parent-5.0.2.pom.sha1 +fetchArtifact org/ow2/asm/asm-parent/5.0.2/asm-parent-5.0.2.pom +fetchArtifact org/ow2/asm/asm-parent/4.1/asm-parent-4.1.pom +fetchArtifact org/ow2/asm/asm-parent/4.1/asm-parent-4.1.pom.sha1 +fetchArtifact org/ow2/asm/asm-analysis/5.0.2/asm-analysis-5.0.2.jar +fetchArtifact org/ow2/asm/asm-analysis/5.0.2/asm-analysis-5.0.2.pom.sha1 +fetchArtifact org/ow2/asm/asm-analysis/5.0.2/asm-analysis-5.0.2.pom +fetchArtifact org/ow2/asm/asm-analysis/5.0.2/asm-analysis-5.0.2.jar.sha1 +fetchArtifact org/ow2/asm/asm-analysis/4.1/asm-analysis-4.1.pom +fetchArtifact org/ow2/asm/asm-analysis/4.1/asm-analysis-4.1.jar +fetchArtifact org/ow2/asm/asm-analysis/4.1/asm-analysis-4.1.pom.sha1 +fetchArtifact org/ow2/asm/asm-analysis/4.1/asm-analysis-4.1.jar.sha1 +fetchArtifact org/ow2/asm/asm/5.0.2/asm-5.0.2.jar.sha1 +fetchArtifact org/ow2/asm/asm/5.0.2/asm-5.0.2.pom.sha1 +fetchArtifact org/ow2/asm/asm/5.0.2/asm-5.0.2.pom +fetchArtifact org/ow2/asm/asm/5.0.2/asm-5.0.2.jar +fetchArtifact org/ow2/asm/asm/4.1/asm-4.1.jar.sha1 +fetchArtifact org/ow2/asm/asm/4.1/asm-4.1.pom.sha1 +fetchArtifact org/ow2/asm/asm/4.1/asm-4.1.pom +fetchArtifact org/ow2/asm/asm/4.1/asm-4.1.jar +fetchArtifact org/ow2/asm/asm-util/5.0.2/asm-util-5.0.2.pom +fetchArtifact org/ow2/asm/asm-util/5.0.2/asm-util-5.0.2.jar +fetchArtifact org/ow2/asm/asm-util/5.0.2/asm-util-5.0.2.pom.sha1 +fetchArtifact org/ow2/asm/asm-util/5.0.2/asm-util-5.0.2.jar.sha1 +fetchArtifact org/ow2/asm/asm-util/4.1/asm-util-4.1.jar +fetchArtifact org/ow2/asm/asm-util/4.1/asm-util-4.1.pom +fetchArtifact org/ow2/asm/asm-util/4.1/asm-util-4.1.pom.sha1 +fetchArtifact org/ow2/asm/asm-util/4.1/asm-util-4.1.jar.sha1 +fetchArtifact org/ow2/asm/asm-tree/5.0.2/asm-tree-5.0.2.jar +fetchArtifact org/ow2/asm/asm-tree/5.0.2/asm-tree-5.0.2.jar.sha1 +fetchArtifact org/ow2/asm/asm-tree/5.0.2/asm-tree-5.0.2.pom +fetchArtifact org/ow2/asm/asm-tree/5.0.2/asm-tree-5.0.2.pom.sha1 +fetchArtifact org/ow2/asm/asm-tree/4.1/asm-tree-4.1.jar +fetchArtifact org/ow2/asm/asm-tree/4.1/asm-tree-4.1.pom.sha1 +fetchArtifact org/ow2/asm/asm-tree/4.1/asm-tree-4.1.jar.sha1 +fetchArtifact org/ow2/asm/asm-tree/4.1/asm-tree-4.1.pom +fetchArtifact org/ow2/asm/asm-commons/5.0.2/asm-commons-5.0.2.pom +fetchArtifact org/ow2/asm/asm-commons/5.0.2/asm-commons-5.0.2.jar +fetchArtifact org/ow2/asm/asm-commons/5.0.2/asm-commons-5.0.2.jar.sha1 +fetchArtifact org/ow2/asm/asm-commons/5.0.2/asm-commons-5.0.2.pom.sha1 +fetchArtifact org/ow2/ow2/1.3/ow2-1.3.pom.sha1 +fetchArtifact org/ow2/ow2/1.3/ow2-1.3.pom +fetchArtifact org/glassfish/web/javax.el/2.2.5/javax.el-2.2.5.jar.sha1 +fetchArtifact org/glassfish/web/javax.el/2.2.5/javax.el-2.2.5.jar +fetchArtifact org/glassfish/web/javax.el/2.2.5/javax.el-2.2.5.pom +fetchArtifact org/glassfish/web/javax.el/2.2.5/javax.el-2.2.5.pom.sha1 +fetchArtifact org/pegdown/pegdown/1.2.1/pegdown-1.2.1.jar.sha1 +fetchArtifact org/pegdown/pegdown/1.2.1/pegdown-1.2.1.pom +fetchArtifact org/pegdown/pegdown/1.2.1/pegdown-1.2.1.pom.sha1 +fetchArtifact org/pegdown/pegdown/1.2.1/pegdown-1.2.1.jar +fetchArtifact junit/junit/4.11/junit-4.11.jar +fetchArtifact junit/junit/4.11/junit-4.11.pom +fetchArtifact junit/junit/4.11/junit-4.11.jar.sha1 +fetchArtifact junit/junit/4.11/junit-4.11.pom.sha1 +fetchArtifact junit/junit/3.8.1/junit-3.8.1.pom +fetchArtifact junit/junit/3.8.1/junit-3.8.1.jar +fetchArtifact junit/junit/3.8.1/junit-3.8.1.jar.sha1 +fetchArtifact junit/junit/3.8.1/junit-3.8.1.pom.sha1 +fetchArtifact junit/junit/3.8.2/junit-3.8.2.pom +fetchArtifact junit/junit/3.8.2/junit-3.8.2.pom.sha1 +fetchArtifact joda-time/joda-time/2.3/joda-time-2.3.pom +fetchArtifact joda-time/joda-time/2.3/joda-time-2.3.jar.sha1 +fetchArtifact joda-time/joda-time/2.3/joda-time-2.3.jar +fetchArtifact joda-time/joda-time/2.3/joda-time-2.3.pom.sha1 +fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar +fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.pom.sha1 +fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.pom +fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar.sha1 +fetchArtifact commons-beanutils/commons-beanutils/1.6/commons-beanutils-1.6.pom +fetchArtifact commons-beanutils/commons-beanutils/1.6/commons-beanutils-1.6.pom.sha1 +fetchArtifact javax/inject/javax.inject/1/javax.inject-1.pom +fetchArtifact javax/inject/javax.inject/1/javax.inject-1.jar +fetchArtifact javax/inject/javax.inject/1/javax.inject-1.jar.sha1 +fetchArtifact javax/inject/javax.inject/1/javax.inject-1.pom.sha1 +fetchArtifact javax/el/javax.el-api/2.2.4/javax.el-api-2.2.4.pom.sha1 +fetchArtifact javax/el/javax.el-api/2.2.4/javax.el-api-2.2.4.jar.sha1 +fetchArtifact javax/el/javax.el-api/2.2.4/javax.el-api-2.2.4.jar +fetchArtifact javax/el/javax.el-api/2.2.4/javax.el-api-2.2.4.pom +fetchArtifact javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final.pom +fetchArtifact javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final.jar.sha1 +fetchArtifact javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final.pom.sha1 +fetchArtifact javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final.jar +fetchArtifact javax/mail/mail/1.4.5/mail-1.4.5.pom.sha1 +fetchArtifact javax/mail/mail/1.4.5/mail-1.4.5.jar +fetchArtifact javax/mail/mail/1.4.5/mail-1.4.5.pom +fetchArtifact javax/mail/mail/1.4.5/mail-1.4.5.jar.sha1 +fetchArtifact javax/activation/activation/1.1/activation-1.1.pom.sha1 +fetchArtifact javax/activation/activation/1.1/activation-1.1.pom +fetchArtifact javax/activation/activation/1.1.1/activation-1.1.1.jar.sha1 +fetchArtifact javax/activation/activation/1.1.1/activation-1.1.1.pom +fetchArtifact javax/activation/activation/1.1.1/activation-1.1.1.jar +fetchArtifact javax/activation/activation/1.1.1/activation-1.1.1.pom.sha1 +fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.jar.sha1 +fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.pom.sha1 +fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.jar +fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.pom +fetchArtifact mesosphere/chaos_2.11/0.6.1/chaos_2.11-0.6.1.jar +fetchArtifact mesosphere/chaos_2.11/0.6.1/chaos_2.11-0.6.1.pom +fetchArtifact mesosphere/chaos_2.11/0.6.1/chaos_2.11-0.6.1.jar.sha1 +fetchArtifact mesosphere/chaos_2.11/0.6.1/chaos_2.11-0.6.1.pom.sha1 +fetchArtifact mesosphere/mesos-utils_2.11/0.20.1-1/mesos-utils_2.11-0.20.1-1.jar.sha1 +fetchArtifact mesosphere/mesos-utils_2.11/0.20.1-1/mesos-utils_2.11-0.20.1-1.pom +fetchArtifact mesosphere/mesos-utils_2.11/0.20.1-1/mesos-utils_2.11-0.20.1-1.pom.sha1 +fetchArtifact mesosphere/mesos-utils_2.11/0.20.1-1/mesos-utils_2.11-0.20.1-1.jar +fetchArtifact oro/oro/2.0.8/oro-2.0.8.pom +fetchArtifact oro/oro/2.0.8/oro-2.0.8.jar.sha1 +fetchArtifact oro/oro/2.0.8/oro-2.0.8.pom.sha1 +fetchArtifact oro/oro/2.0.8/oro-2.0.8.jar diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix new file mode 100644 index 000000000000..7931da602d6e --- /dev/null +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, which, go, makeWrapper, iptables,rsync }: + +stdenv.mkDerivation rec { + name = "kubernetes-${version}"; + version = "v0.5.4"; + + src = fetchFromGitHub { + owner = "GoogleCloudPlatform"; + repo = "kubernetes"; + rev = version; + sha256 = "1pipcqpjz9zsi4kfsbdvbbbia642l4xg50pznjw5v061c5xk7vnk"; + }; + + buildInputs = [ makeWrapper which go iptables rsync ]; + + preBuild = "patchShebangs ./hack"; + + postBuild = ''go build --ldflags '-extldflags "-static" -s' build/pause/pause.go''; + + installPhase = '' + mkdir -p "$out/bin" + cp _output/local/go/bin/* "$out/bin/" + cp pause $out/bin/kube-pause + ''; + + preFixup = '' + wrapProgram "$out/bin/kube-proxy" --set "PATH" "${iptables}/bin" + ''; + + meta = with stdenv.lib; { + description = "Open source implementation of container cluster management."; + license = licenses.asl20; + homepage = https://github.com/GoogleCloudPlatform; + maintainers = with maintainers; [offline]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/cluster/mesos/darwin.patch b/pkgs/applications/networking/cluster/mesos/darwin.patch deleted file mode 100644 index 118129f17232..000000000000 --- a/pkgs/applications/networking/cluster/mesos/darwin.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 1ebd196..a49d7d4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -463,11 +463,6 @@ __EOF__ - fi - - # Determine linker flags for Java if not set. -- if test "$OS_NAME" = "darwin"; then -- dir="$JAVA_HOME/jre/lib/server" -- JAVA_TEST_LDFLAGS="-framework JavaVM" -- JAVA_JVM_LIBRARY=$dir/libjvm.dylib -- elif test "$OS_NAME" = "linux"; then - for arch in amd64 i386; do - dir="$JAVA_HOME/jre/lib/$arch/server" - if test -e "$dir"; then -@@ -477,7 +472,6 @@ __EOF__ - break; - fi - done -- fi - - if test -z "$JAVA_TEST_LDFLAGS"; then - AC_MSG_ERROR([failed to determine linker flags for using Java \ -@@ -488,26 +482,6 @@ __EOF__ - # flags as necessary (provided JAVA_CPPFLAGS was not set). - AC_MSG_CHECKING([whether or not we can build with JNI]) - if test -z "$JAVA_CPPFLAGS"; then -- if test "$OS_NAME" = "darwin"; then -- while true; do # Loop until sucessful (via break) or exhausted options. -- m4_foreach([java_cppflags], -- [["-I$JAVA_HOME/include -I$JAVA_HOME/include/$OS_NAME"], -- ["-I/System/Library/Frameworks/JavaVM.framework/Headers"]], -- [JAVA_CPPFLAGS=java_cppflags -- TRY_LINK_JNI([break])]) -- # Exhausted options. -- AC_MSG_ERROR([failed to build with JNI -- ------------------------------------------------------------------- -- It appears we were unable to compile against the JNI. This is most -- likely due to one of the following issues: -- 1. You do not have a JDK installed on your system. -- 2. All JDKs installed on your system have deprecated JNI headers. -- It is advised to install OpenJDK on your system, as the JDK that -- ships with OS X has deprecated JNI headers. -- ------------------------------------------------------------------- -- ]) -- done -- else - while true; do # Loop until sucessful (via break) or exhausted options. - m4_foreach([java_cppflags], - [["-I$JAVA_HOME/include -I$JAVA_HOME/include/$OS_NAME"]], -@@ -516,7 +490,6 @@ __EOF__ - # Exhausted options. - AC_MSG_ERROR([failed to build with JNI]) - done -- fi - else - TRY_LINK_JNI([], [AC_MSG_ERROR([failed to build with JNI])]) - fi -@@ -760,20 +733,6 @@ libcurl is required for mesos to build. - if test "x$with_cxx11" = "xyes"; then - AX_CXX_COMPILE_STDCXX_11([noext], [mandatory]) - -- case "$host_os" in -- darwin* ) -- # If we're using clang, we need to pass -stdlib=libc++ too. -- if test "x$CLANG" = "xyes"; then -- CXXFLAGS="$CXXFLAGS -stdlib=libc++" -- fi -- -- # GTEST on OSX needs its own tr1 tuple. -- # TODO(dhamon): Update to gmock 1.7 and pass GTEST_LANG_CXX11 when in -- # c++11 mode. -- CXXFLAGS="$CXXFLAGS -DGTEST_USE_OWN_TR1_TUPLE=1" -- ;; -- esac -- - # Also pass the flags to 3rdparty libraries. - CONFIGURE_ARGS="$CONFIGURE_ARGS CXXFLAGS='$CXXFLAGS'" - fi diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index fe93a072b2cf..b298fb559011 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -1,9 +1,10 @@ -{ stdenv, lib, makeWrapper, fetchurl, fetchzip, curl, sasl, openssh, autoconf +{ stdenv, lib, makeWrapper, fetchurl, curl, sasl, openssh, autoconf , automake, libtool, unzip, gnutar, jdk, maven, python, wrapPython -, setuptools, distutils-cfg, boto, pythonProtobuf +, setuptools, distutils-cfg, boto, pythonProtobuf, apr, subversion +, leveldb, glog }: -let version = "0.19.1"; +let version = "0.21.0"; in stdenv.mkDerivation { dontDisableStatic = true; @@ -11,14 +12,13 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://www.apache.org/dist/mesos/${version}/mesos-${version}.tar.gz"; - sha256 = "12li5xqfcw3124qg3h2cji3yhrc7gbx91lj45zfliicwgjkbmyf1"; + sha256 = "01ap8blrb046w26zf3i4r7vvnnhjsbfi20vz5yinmncqbzjjyx6i"; }; - patches = [ ./darwin.patch ]; - buildInputs = [ makeWrapper autoconf automake libtool curl sasl jdk maven - python wrapPython boto distutils-cfg setuptools + python wrapPython boto distutils-cfg setuptools leveldb + subversion apr glog ]; propagatedBuildInputs = [ @@ -41,11 +41,11 @@ in stdenv.mkDerivation { configureFlags = [ "--sbindir=\${out}/bin" - "--with-python-headers=${python}/include" - "--with-webui" - "--with-java-home=${jdk}" - "--with-java-headers=${jdk}/include" - "--with-included-zookeeper" + "--with-apr=${apr}" + "--with-svn=${subversion}" + "--with-leveldb=${leveldb}" + "--with-glog=${glog}" + "--disable-python-dependency-install" ]; postInstall = '' @@ -101,7 +101,7 @@ in stdenv.mkDerivation { homepage = "http://mesos.apache.org"; license = licenses.asl20; description = "A cluster manager that provides efficient resource isolation and sharing across distributed applications, or frameworks"; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ cstrahan offline ]; platforms = with platforms; linux; }; } diff --git a/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh b/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh index c58c9f2e3d6d..3fafc427bbc9 100644 --- a/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh +++ b/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh @@ -3,1240 +3,1241 @@ header "fetching Apache Mesos maven repo" function fetchArtifact { repoPath="$1" + echo "Fetching $repoPath" url="http://repo.maven.apache.org/maven2/$repoPath" mkdir -p $(dirname $out/$repoPath) curl --fail --location --insecure --retry 3 --max-redirs 20 "$url" --output "$out/$repoPath" } -fetchArtifact antlr/antlr/2.7.2/antlr-2.7.2.jar -fetchArtifact antlr/antlr/2.7.2/antlr-2.7.2.jar.sha1 -fetchArtifact antlr/antlr/2.7.2/antlr-2.7.2.pom -fetchArtifact antlr/antlr/2.7.2/antlr-2.7.2.pom.sha1 -fetchArtifact asm/asm/3.2/asm-3.2.pom -fetchArtifact asm/asm/3.2/asm-3.2.pom.sha1 -fetchArtifact asm/asm/3.3.1/asm-3.3.1.jar -fetchArtifact asm/asm/3.3.1/asm-3.3.1.jar.sha1 -fetchArtifact asm/asm/3.3.1/asm-3.3.1.pom -fetchArtifact asm/asm/3.3.1/asm-3.3.1.pom.sha1 -fetchArtifact asm/asm-analysis/3.2/asm-analysis-3.2.jar -fetchArtifact asm/asm-analysis/3.2/asm-analysis-3.2.jar.sha1 -fetchArtifact asm/asm-analysis/3.2/asm-analysis-3.2.pom -fetchArtifact asm/asm-analysis/3.2/asm-analysis-3.2.pom.sha1 -fetchArtifact asm/asm-commons/3.2/asm-commons-3.2.pom -fetchArtifact asm/asm-commons/3.2/asm-commons-3.2.pom.sha1 -fetchArtifact asm/asm-commons/3.3.1/asm-commons-3.3.1.jar -fetchArtifact asm/asm-commons/3.3.1/asm-commons-3.3.1.jar.sha1 -fetchArtifact asm/asm-commons/3.3.1/asm-commons-3.3.1.pom -fetchArtifact asm/asm-commons/3.3.1/asm-commons-3.3.1.pom.sha1 -fetchArtifact asm/asm-parent/3.2/asm-parent-3.2.pom -fetchArtifact asm/asm-parent/3.2/asm-parent-3.2.pom.sha1 -fetchArtifact asm/asm-parent/3.3.1/asm-parent-3.3.1.pom -fetchArtifact asm/asm-parent/3.3.1/asm-parent-3.3.1.pom.sha1 -fetchArtifact asm/asm-tree/3.2/asm-tree-3.2.pom -fetchArtifact asm/asm-tree/3.2/asm-tree-3.2.pom.sha1 -fetchArtifact asm/asm-tree/3.3.1/asm-tree-3.3.1.jar -fetchArtifact asm/asm-tree/3.3.1/asm-tree-3.3.1.jar.sha1 -fetchArtifact asm/asm-tree/3.3.1/asm-tree-3.3.1.pom -fetchArtifact asm/asm-tree/3.3.1/asm-tree-3.3.1.pom.sha1 -fetchArtifact asm/asm-util/3.2/asm-util-3.2.jar -fetchArtifact asm/asm-util/3.2/asm-util-3.2.jar.sha1 -fetchArtifact asm/asm-util/3.2/asm-util-3.2.pom -fetchArtifact asm/asm-util/3.2/asm-util-3.2.pom.sha1 -fetchArtifact avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.pom -fetchArtifact avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.pom.sha1 -fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar -fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar.sha1 -fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.pom -fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.pom.sha1 -fetchArtifact classworlds/classworlds/1.1/classworlds-1.1.pom -fetchArtifact classworlds/classworlds/1.1/classworlds-1.1.pom.sha1 -fetchArtifact classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.pom -fetchArtifact classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.pom.sha1 -fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar -fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar.sha1 -fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.pom -fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.pom.sha1 -fetchArtifact com/google/collections/google-collections/1.0/google-collections-1.0.pom -fetchArtifact com/google/collections/google-collections/1.0/google-collections-1.0.pom.sha1 -fetchArtifact com/google/google/1/google-1.pom -fetchArtifact com/google/google/1/google-1.pom.sha1 -fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.jar -fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.jar.sha1 -fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.pom -fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.pom.sha1 -fetchArtifact com/google/guava/guava-parent/11.0.2/guava-parent-11.0.2.pom -fetchArtifact com/google/guava/guava-parent/11.0.2/guava-parent-11.0.2.pom.sha1 -fetchArtifact com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.jar -fetchArtifact com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.jar.sha1 -fetchArtifact com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.pom -fetchArtifact com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.pom.sha1 -fetchArtifact com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1.jar -fetchArtifact com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1.jar.sha1 -fetchArtifact com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1.pom -fetchArtifact com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1.pom.sha1 -fetchArtifact com/thoughtworks/qdox/qdox/1.12/qdox-1.12.jar -fetchArtifact com/thoughtworks/qdox/qdox/1.12/qdox-1.12.jar.sha1 -fetchArtifact com/thoughtworks/qdox/qdox/1.12/qdox-1.12.pom -fetchArtifact com/thoughtworks/qdox/qdox/1.12/qdox-1.12.pom.sha1 -fetchArtifact commons-beanutils/commons-beanutils/1.6/commons-beanutils-1.6.pom -fetchArtifact commons-beanutils/commons-beanutils/1.6/commons-beanutils-1.6.pom.sha1 -fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar -fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar.sha1 -fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.pom -fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.pom.sha1 fetchArtifact commons-chain/commons-chain/1.1/commons-chain-1.1.jar -fetchArtifact commons-chain/commons-chain/1.1/commons-chain-1.1.jar.sha1 -fetchArtifact commons-chain/commons-chain/1.1/commons-chain-1.1.pom fetchArtifact commons-chain/commons-chain/1.1/commons-chain-1.1.pom.sha1 -fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.jar -fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.jar.sha1 -fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.pom -fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.pom.sha1 -fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.jar -fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.jar.sha1 -fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.pom -fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.pom.sha1 -fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.jar -fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.jar.sha1 -fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.pom -fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.pom.sha1 -fetchArtifact commons-collections/commons-collections/2.0/commons-collections-2.0.pom -fetchArtifact commons-collections/commons-collections/2.0/commons-collections-2.0.pom.sha1 -fetchArtifact commons-collections/commons-collections/2.1/commons-collections-2.1.pom -fetchArtifact commons-collections/commons-collections/2.1/commons-collections-2.1.pom.sha1 -fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.jar +fetchArtifact commons-chain/commons-chain/1.1/commons-chain-1.1.pom +fetchArtifact commons-chain/commons-chain/1.1/commons-chain-1.1.jar.sha1 +fetchArtifact dom4j/dom4j/1.1/dom4j-1.1.jar.sha1 +fetchArtifact dom4j/dom4j/1.1/dom4j-1.1.pom +fetchArtifact dom4j/dom4j/1.1/dom4j-1.1.pom.sha1 +fetchArtifact dom4j/dom4j/1.1/dom4j-1.1.jar fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.jar.sha1 -fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.pom +fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.jar fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.pom.sha1 -fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.jar +fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.pom +fetchArtifact commons-collections/commons-collections/2.0/commons-collections-2.0.pom +fetchArtifact commons-collections/commons-collections/2.0/commons-collections-2.0.pom.sha1 +fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.pom.sha1 fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.jar.sha1 fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.pom -fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.pom.sha1 -fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar +fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.jar +fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.pom.sha1 fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar.sha1 fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.pom -fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.pom.sha1 -fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.jar -fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.jar.sha1 -fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.pom -fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.pom.sha1 -fetchArtifact commons-digester/commons-digester/1.8/commons-digester-1.8.jar -fetchArtifact commons-digester/commons-digester/1.8/commons-digester-1.8.jar.sha1 -fetchArtifact commons-digester/commons-digester/1.8/commons-digester-1.8.pom -fetchArtifact commons-digester/commons-digester/1.8/commons-digester-1.8.pom.sha1 -fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar -fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar.sha1 -fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.pom -fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.pom.sha1 -fetchArtifact commons-io/commons-io/1.3.2/commons-io-1.3.2.jar +fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar +fetchArtifact commons-collections/commons-collections/2.1/commons-collections-2.1.pom +fetchArtifact commons-collections/commons-collections/2.1/commons-collections-2.1.pom.sha1 fetchArtifact commons-io/commons-io/1.3.2/commons-io-1.3.2.jar.sha1 fetchArtifact commons-io/commons-io/1.3.2/commons-io-1.3.2.pom +fetchArtifact commons-io/commons-io/1.3.2/commons-io-1.3.2.jar fetchArtifact commons-io/commons-io/1.3.2/commons-io-1.3.2.pom.sha1 fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.jar -fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.jar.sha1 -fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.pom fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.pom.sha1 -fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.jar -fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.jar.sha1 -fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.pom -fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.pom.sha1 -fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.jar -fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.jar.sha1 -fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.pom -fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.pom.sha1 +fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.pom +fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.jar.sha1 +fetchArtifact logkit/logkit/1.0.1/logkit-1.0.1.pom +fetchArtifact logkit/logkit/1.0.1/logkit-1.0.1.pom.sha1 +fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.pom +fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.jar.sha1 +fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.pom.sha1 +fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.jar +fetchArtifact sslext/sslext/1.2-0/sslext-1.2-0.jar.sha1 +fetchArtifact sslext/sslext/1.2-0/sslext-1.2-0.jar +fetchArtifact sslext/sslext/1.2-0/sslext-1.2-0.pom +fetchArtifact sslext/sslext/1.2-0/sslext-1.2-0.pom.sha1 +fetchArtifact classworlds/classworlds/1.1/classworlds-1.1.pom +fetchArtifact classworlds/classworlds/1.1/classworlds-1.1.pom.sha1 +fetchArtifact classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.pom.sha1 +fetchArtifact classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.pom +fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.pom.sha1 +fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.pom +fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar +fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar.sha1 fetchArtifact commons-lang/commons-lang/2.5/commons-lang-2.5.jar fetchArtifact commons-lang/commons-lang/2.5/commons-lang-2.5.jar.sha1 fetchArtifact commons-lang/commons-lang/2.5/commons-lang-2.5.pom fetchArtifact commons-lang/commons-lang/2.5/commons-lang-2.5.pom.sha1 -fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.jar +fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.jar.sha1 +fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.pom.sha1 +fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.jar +fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.pom +fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.pom.sha1 fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.jar.sha1 +fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.jar fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.pom -fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.pom.sha1 -fetchArtifact commons-logging/commons-logging/1.0/commons-logging-1.0.pom -fetchArtifact commons-logging/commons-logging/1.0/commons-logging-1.0.pom.sha1 +fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.jar +fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.pom.sha1 +fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.pom +fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.jar.sha1 +fetchArtifact log4j/log4j/1.2.12/log4j-1.2.12.pom +fetchArtifact log4j/log4j/1.2.12/log4j-1.2.12.pom.sha1 +fetchArtifact log4j/log4j/1.2.14/log4j-1.2.14.pom.sha1 +fetchArtifact log4j/log4j/1.2.14/log4j-1.2.14.jar +fetchArtifact log4j/log4j/1.2.14/log4j-1.2.14.pom +fetchArtifact log4j/log4j/1.2.14/log4j-1.2.14.jar.sha1 fetchArtifact commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom fetchArtifact commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom.sha1 -fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar -fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar.sha1 fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom +fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom.sha1 -fetchArtifact commons-logging/commons-logging/1.1/commons-logging-1.1.pom +fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar.sha1 +fetchArtifact commons-logging/commons-logging/1.0/commons-logging-1.0.pom.sha1 +fetchArtifact commons-logging/commons-logging/1.0/commons-logging-1.0.pom fetchArtifact commons-logging/commons-logging/1.1/commons-logging-1.1.pom.sha1 +fetchArtifact commons-logging/commons-logging/1.1/commons-logging-1.1.pom +fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom.sha1 fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar -fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar.sha1 fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom -fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom.sha1 +fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar.sha1 fetchArtifact commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.pom fetchArtifact commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.pom.sha1 -fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.jar -fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.jar.sha1 -fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.pom -fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.pom.sha1 -fetchArtifact commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.jar -fetchArtifact commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.jar.sha1 -fetchArtifact commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.pom -fetchArtifact commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.pom.sha1 -fetchArtifact dom4j/dom4j/1.1/dom4j-1.1.jar -fetchArtifact dom4j/dom4j/1.1/dom4j-1.1.jar.sha1 -fetchArtifact dom4j/dom4j/1.1/dom4j-1.1.pom -fetchArtifact dom4j/dom4j/1.1/dom4j-1.1.pom.sha1 -fetchArtifact doxia/doxia-sink-api/1.0-alpha-4/doxia-sink-api-1.0-alpha-4.pom -fetchArtifact doxia/doxia-sink-api/1.0-alpha-4/doxia-sink-api-1.0-alpha-4.pom.sha1 -fetchArtifact javax/servlet/servlet-api/2.3/servlet-api-2.3.pom -fetchArtifact javax/servlet/servlet-api/2.3/servlet-api-2.3.pom.sha1 -fetchArtifact javax/servlet/servlet-api/2.5/servlet-api-2.5.jar -fetchArtifact javax/servlet/servlet-api/2.5/servlet-api-2.5.jar.sha1 -fetchArtifact javax/servlet/servlet-api/2.5/servlet-api-2.5.pom -fetchArtifact javax/servlet/servlet-api/2.5/servlet-api-2.5.pom.sha1 -fetchArtifact junit/junit/3.8.1/junit-3.8.1.jar -fetchArtifact junit/junit/3.8.1/junit-3.8.1.jar.sha1 -fetchArtifact junit/junit/3.8.1/junit-3.8.1.pom -fetchArtifact junit/junit/3.8.1/junit-3.8.1.pom.sha1 -fetchArtifact junit/junit/3.8.2/junit-3.8.2.pom -fetchArtifact junit/junit/3.8.2/junit-3.8.2.pom.sha1 -fetchArtifact junit/junit/4.10/junit-4.10.pom -fetchArtifact junit/junit/4.10/junit-4.10.pom.sha1 -fetchArtifact log4j/log4j/1.2.12/log4j-1.2.12.pom -fetchArtifact log4j/log4j/1.2.12/log4j-1.2.12.pom.sha1 -fetchArtifact log4j/log4j/1.2.14/log4j-1.2.14.jar -fetchArtifact log4j/log4j/1.2.14/log4j-1.2.14.jar.sha1 -fetchArtifact log4j/log4j/1.2.14/log4j-1.2.14.pom -fetchArtifact log4j/log4j/1.2.14/log4j-1.2.14.pom.sha1 -fetchArtifact logkit/logkit/1.0.1/logkit-1.0.1.pom -fetchArtifact logkit/logkit/1.0.1/logkit-1.0.1.pom.sha1 -fetchArtifact org/apache/apache/10/apache-10.pom -fetchArtifact org/apache/apache/10/apache-10.pom.sha1 -fetchArtifact org/apache/apache/11/apache-11.pom -fetchArtifact org/apache/apache/11/apache-11.pom.sha1 -fetchArtifact org/apache/apache/13/apache-13.pom -fetchArtifact org/apache/apache/13/apache-13.pom.sha1 -fetchArtifact org/apache/apache/2/apache-2.pom -fetchArtifact org/apache/apache/2/apache-2.pom.sha1 -fetchArtifact org/apache/apache/3/apache-3.pom -fetchArtifact org/apache/apache/3/apache-3.pom.sha1 -fetchArtifact org/apache/apache/4/apache-4.pom -fetchArtifact org/apache/apache/4/apache-4.pom.sha1 -fetchArtifact org/apache/apache/5/apache-5.pom -fetchArtifact org/apache/apache/5/apache-5.pom.sha1 -fetchArtifact org/apache/apache/6/apache-6.pom -fetchArtifact org/apache/apache/6/apache-6.pom.sha1 -fetchArtifact org/apache/apache/7/apache-7.pom -fetchArtifact org/apache/apache/7/apache-7.pom.sha1 -fetchArtifact org/apache/apache/9/apache-9.pom -fetchArtifact org/apache/apache/9/apache-9.pom.sha1 -fetchArtifact org/apache/apache-jar-resource-bundle/1.4/apache-jar-resource-bundle-1.4.jar -fetchArtifact org/apache/apache-jar-resource-bundle/1.4/apache-jar-resource-bundle-1.4.jar.sha1 -fetchArtifact org/apache/commons/commons-parent/12/commons-parent-12.pom -fetchArtifact org/apache/commons/commons-parent/12/commons-parent-12.pom.sha1 -fetchArtifact org/apache/commons/commons-parent/17/commons-parent-17.pom -fetchArtifact org/apache/commons/commons-parent/17/commons-parent-17.pom.sha1 -fetchArtifact org/apache/commons/commons-parent/3/commons-parent-3.pom -fetchArtifact org/apache/commons/commons-parent/3/commons-parent-3.pom.sha1 -fetchArtifact org/apache/commons/commons-parent/5/commons-parent-5.pom -fetchArtifact org/apache/commons/commons-parent/5/commons-parent-5.pom.sha1 -fetchArtifact org/apache/commons/commons-parent/7/commons-parent-7.pom -fetchArtifact org/apache/commons/commons-parent/7/commons-parent-7.pom.sha1 -fetchArtifact org/apache/commons/commons-parent/9/commons-parent-9.pom -fetchArtifact org/apache/commons/commons-parent/9/commons-parent-9.pom.sha1 -fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.jar -fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.jar.sha1 +fetchArtifact com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1.jar +fetchArtifact com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1.pom +fetchArtifact com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1.jar.sha1 +fetchArtifact com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1.pom.sha1 +fetchArtifact com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.pom.sha1 +fetchArtifact com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.jar +fetchArtifact com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.jar.sha1 +fetchArtifact com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.pom +fetchArtifact com/google/google/1/google-1.pom +fetchArtifact com/google/google/1/google-1.pom.sha1 +fetchArtifact com/google/collections/google-collections/1.0/google-collections-1.0.pom +fetchArtifact com/google/collections/google-collections/1.0/google-collections-1.0.pom.sha1 +fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.pom.sha1 +fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.pom +fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar.sha1 +fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar +fetchArtifact com/google/guava/guava-parent/11.0.2/guava-parent-11.0.2.pom +fetchArtifact com/google/guava/guava-parent/11.0.2/guava-parent-11.0.2.pom.sha1 +fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.jar.sha1 +fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.pom +fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.jar +fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.pom.sha1 +fetchArtifact com/thoughtworks/qdox/qdox/1.12/qdox-1.12.pom +fetchArtifact com/thoughtworks/qdox/qdox/1.12/qdox-1.12.pom.sha1 +fetchArtifact com/thoughtworks/qdox/qdox/1.12/qdox-1.12.jar.sha1 +fetchArtifact com/thoughtworks/qdox/qdox/1.12/qdox-1.12.jar +fetchArtifact commons-digester/commons-digester/1.8/commons-digester-1.8.jar +fetchArtifact commons-digester/commons-digester/1.8/commons-digester-1.8.pom.sha1 +fetchArtifact commons-digester/commons-digester/1.8/commons-digester-1.8.jar.sha1 +fetchArtifact commons-digester/commons-digester/1.8/commons-digester-1.8.pom +fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.jar +fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.pom +fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.jar.sha1 +fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.pom.sha1 +fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.pom.sha1 +fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.pom +fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar +fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar.sha1 +fetchArtifact asm/asm-parent/3.3.1/asm-parent-3.3.1.pom +fetchArtifact asm/asm-parent/3.3.1/asm-parent-3.3.1.pom.sha1 +fetchArtifact asm/asm-parent/3.2/asm-parent-3.2.pom +fetchArtifact asm/asm-parent/3.2/asm-parent-3.2.pom.sha1 +fetchArtifact asm/asm-analysis/3.2/asm-analysis-3.2.jar.sha1 +fetchArtifact asm/asm-analysis/3.2/asm-analysis-3.2.pom.sha1 +fetchArtifact asm/asm-analysis/3.2/asm-analysis-3.2.pom +fetchArtifact asm/asm-analysis/3.2/asm-analysis-3.2.jar +fetchArtifact asm/asm/3.3.1/asm-3.3.1.pom +fetchArtifact asm/asm/3.3.1/asm-3.3.1.jar +fetchArtifact asm/asm/3.3.1/asm-3.3.1.pom.sha1 +fetchArtifact asm/asm/3.3.1/asm-3.3.1.jar.sha1 +fetchArtifact asm/asm/3.2/asm-3.2.pom +fetchArtifact asm/asm/3.2/asm-3.2.pom.sha1 +fetchArtifact asm/asm-util/3.2/asm-util-3.2.jar.sha1 +fetchArtifact asm/asm-util/3.2/asm-util-3.2.jar +fetchArtifact asm/asm-util/3.2/asm-util-3.2.pom.sha1 +fetchArtifact asm/asm-util/3.2/asm-util-3.2.pom +fetchArtifact asm/asm-tree/3.3.1/asm-tree-3.3.1.pom.sha1 +fetchArtifact asm/asm-tree/3.3.1/asm-tree-3.3.1.jar +fetchArtifact asm/asm-tree/3.3.1/asm-tree-3.3.1.pom +fetchArtifact asm/asm-tree/3.3.1/asm-tree-3.3.1.jar.sha1 +fetchArtifact asm/asm-tree/3.2/asm-tree-3.2.pom +fetchArtifact asm/asm-tree/3.2/asm-tree-3.2.pom.sha1 +fetchArtifact asm/asm-commons/3.3.1/asm-commons-3.3.1.jar.sha1 +fetchArtifact asm/asm-commons/3.3.1/asm-commons-3.3.1.pom +fetchArtifact asm/asm-commons/3.3.1/asm-commons-3.3.1.jar +fetchArtifact asm/asm-commons/3.3.1/asm-commons-3.3.1.pom.sha1 +fetchArtifact asm/asm-commons/3.2/asm-commons-3.2.pom.sha1 +fetchArtifact asm/asm-commons/3.2/asm-commons-3.2.pom +fetchArtifact velocity/velocity/1.5/velocity-1.5.jar.sha1 +fetchArtifact velocity/velocity/1.5/velocity-1.5.pom.sha1 +fetchArtifact velocity/velocity/1.5/velocity-1.5.jar +fetchArtifact velocity/velocity/1.5/velocity-1.5.pom +fetchArtifact xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.pom +fetchArtifact xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.pom.sha1 +fetchArtifact xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar +fetchArtifact xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar.sha1 +fetchArtifact xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.pom +fetchArtifact xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.pom.sha1 +fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.pom +fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar +fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar.sha1 +fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.pom.sha1 +fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.pom.sha1 +fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.jar +fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.pom +fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.jar.sha1 +fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.jar +fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.pom +fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.pom.sha1 +fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.jar.sha1 +fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar +fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.pom +fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar.sha1 +fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.pom.sha1 +fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.pom +fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.pom.sha1 +fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.jar +fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.jar.sha1 +fetchArtifact org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar.sha1 +fetchArtifact org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.pom +fetchArtifact org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar +fetchArtifact org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.pom.sha1 +fetchArtifact org/jdom/jdom/1.1/jdom-1.1.pom +fetchArtifact org/jdom/jdom/1.1/jdom-1.1.jar +fetchArtifact org/jdom/jdom/1.1/jdom-1.1.jar.sha1 +fetchArtifact org/jdom/jdom/1.1/jdom-1.1.pom.sha1 +fetchArtifact org/apache/xbean/xbean/3.4/xbean-3.4.pom.sha1 +fetchArtifact org/apache/xbean/xbean/3.4/xbean-3.4.pom +fetchArtifact org/apache/xbean/xbean-reflect/3.4/xbean-reflect-3.4.pom.sha1 +fetchArtifact org/apache/xbean/xbean-reflect/3.4/xbean-reflect-3.4.pom +fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar.sha1 +fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.pom.sha1 +fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar +fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.pom +fetchArtifact org/apache/httpcomponents/httpcomponents-core/4.0.1/httpcomponents-core-4.0.1.pom.sha1 +fetchArtifact org/apache/httpcomponents/httpcomponents-core/4.0.1/httpcomponents-core-4.0.1.pom fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.pom +fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.jar.sha1 fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.pom.sha1 -fetchArtifact org/apache/httpcomponents/httpcomponents-client/4.0.2/httpcomponents-client-4.0.2.pom +fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.jar fetchArtifact org/apache/httpcomponents/httpcomponents-client/4.0.2/httpcomponents-client-4.0.2.pom.sha1 -fetchArtifact org/apache/httpcomponents/httpcomponents-core/4.0.1/httpcomponents-core-4.0.1.pom -fetchArtifact org/apache/httpcomponents/httpcomponents-core/4.0.1/httpcomponents-core-4.0.1.pom.sha1 -fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar -fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar.sha1 -fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.pom -fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.pom.sha1 -fetchArtifact org/apache/httpcomponents/project/4.0/project-4.0.pom +fetchArtifact org/apache/httpcomponents/httpcomponents-client/4.0.2/httpcomponents-client-4.0.2.pom fetchArtifact org/apache/httpcomponents/project/4.0/project-4.0.pom.sha1 +fetchArtifact org/apache/httpcomponents/project/4.0/project-4.0.pom fetchArtifact org/apache/httpcomponents/project/4.1/project-4.1.pom fetchArtifact org/apache/httpcomponents/project/4.1/project-4.1.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia/1.0/doxia-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia/1.0/doxia-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-10/doxia-1.0-alpha-10.pom -fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-10/doxia-1.0-alpha-10.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-7/doxia-1.0-alpha-7.pom -fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-7/doxia-1.0-alpha-7.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia/1.2/doxia-1.2.pom -fetchArtifact org/apache/maven/doxia/doxia/1.2/doxia-1.2.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia/1.3/doxia-1.3.pom -fetchArtifact org/apache/maven/doxia/doxia/1.3/doxia-1.3.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.jar -fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-core/1.3/doxia-core-1.3.jar -fetchArtifact org/apache/maven/doxia/doxia-core/1.3/doxia-core-1.3.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-core/1.3/doxia-core-1.3.pom -fetchArtifact org/apache/maven/doxia/doxia-core/1.3/doxia-core-1.3.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.jar -fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.2/doxia-decoration-model-1.2.pom -fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.2/doxia-decoration-model-1.2.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.3/doxia-decoration-model-1.3.jar -fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.3/doxia-decoration-model-1.3.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.3/doxia-decoration-model-1.3.pom -fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.3/doxia-decoration-model-1.3.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.2/doxia-logging-api-1.2.pom -fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.2/doxia-logging-api-1.2.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.3/doxia-logging-api-1.3.jar -fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.3/doxia-logging-api-1.3.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.3/doxia-logging-api-1.3.pom -fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.3/doxia-logging-api-1.3.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.jar -fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.3/doxia-module-apt-1.3.jar -fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.3/doxia-module-apt-1.3.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.3/doxia-module-apt-1.3.pom -fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.3/doxia-module-apt-1.3.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.jar -fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.3/doxia-module-fml-1.3.jar -fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.3/doxia-module-fml-1.3.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.3/doxia-module-fml-1.3.pom -fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.3/doxia-module-fml-1.3.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.jar -fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.3/doxia-module-xdoc-1.3.jar -fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.3/doxia-module-xdoc-1.3.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.3/doxia-module-xdoc-1.3.pom -fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.3/doxia-module-xdoc-1.3.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.jar -fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.3/doxia-module-xhtml-1.3.jar -fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.3/doxia-module-xhtml-1.3.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.3/doxia-module-xhtml-1.3.pom -fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.3/doxia-module-xhtml-1.3.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-modules/1.0/doxia-modules-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia-modules/1.0/doxia-modules-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-modules/1.3/doxia-modules-1.3.pom -fetchArtifact org/apache/maven/doxia/doxia-modules/1.3/doxia-modules-1.3.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.jar -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.pom -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.jar -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.pom -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.3/doxia-sink-api-1.3.jar -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.3/doxia-sink-api-1.3.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.3/doxia-sink-api-1.3.pom -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.3/doxia-sink-api-1.3.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.jar -fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.3/doxia-site-renderer-1.3.jar -fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.3/doxia-site-renderer-1.3.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.3/doxia-site-renderer-1.3.pom -fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.3/doxia-site-renderer-1.3.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.0/doxia-sitetools-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.0/doxia-sitetools-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.2/doxia-sitetools-1.2.pom -fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.2/doxia-sitetools-1.2.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.3/doxia-sitetools-1.3.pom -fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.3/doxia-sitetools-1.3.pom.sha1 -fetchArtifact org/apache/maven/maven/2.0/maven-2.0.pom -fetchArtifact org/apache/maven/maven/2.0/maven-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven/2.0.1/maven-2.0.1.pom -fetchArtifact org/apache/maven/maven/2.0.1/maven-2.0.1.pom.sha1 -fetchArtifact org/apache/maven/maven/2.0.2/maven-2.0.2.pom -fetchArtifact org/apache/maven/maven/2.0.2/maven-2.0.2.pom.sha1 -fetchArtifact org/apache/maven/maven/2.0.5/maven-2.0.5.pom -fetchArtifact org/apache/maven/maven/2.0.5/maven-2.0.5.pom.sha1 -fetchArtifact org/apache/maven/maven/2.0.6/maven-2.0.6.pom -fetchArtifact org/apache/maven/maven/2.0.6/maven-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven/2.0.8/maven-2.0.8.pom -fetchArtifact org/apache/maven/maven/2.0.8/maven-2.0.8.pom.sha1 -fetchArtifact org/apache/maven/maven/2.0.9/maven-2.0.9.pom -fetchArtifact org/apache/maven/maven/2.0.9/maven-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven/2.2.0/maven-2.2.0.pom -fetchArtifact org/apache/maven/maven/2.2.0/maven-2.2.0.pom.sha1 -fetchArtifact org/apache/maven/maven/2.2.1/maven-2.2.1.pom -fetchArtifact org/apache/maven/maven/2.2.1/maven-2.2.1.pom.sha1 -fetchArtifact org/apache/maven/maven/3.0/maven-3.0.pom -fetchArtifact org/apache/maven/maven/3.0/maven-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.pom -fetchArtifact org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.jar -fetchArtifact org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.jar.sha1 -fetchArtifact org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.pom -fetchArtifact org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.pom.sha1 -fetchArtifact org/apache/maven/maven-archiver/2.4.1/maven-archiver-2.4.1.jar -fetchArtifact org/apache/maven/maven-archiver/2.4.1/maven-archiver-2.4.1.jar.sha1 -fetchArtifact org/apache/maven/maven-archiver/2.4.1/maven-archiver-2.4.1.pom -fetchArtifact org/apache/maven/maven-archiver/2.4.1/maven-archiver-2.4.1.pom.sha1 -fetchArtifact org/apache/maven/maven-archiver/2.4.2/maven-archiver-2.4.2.jar -fetchArtifact org/apache/maven/maven-archiver/2.4.2/maven-archiver-2.4.2.jar.sha1 -fetchArtifact org/apache/maven/maven-archiver/2.4.2/maven-archiver-2.4.2.pom -fetchArtifact org/apache/maven/maven-archiver/2.4.2/maven-archiver-2.4.2.pom.sha1 -fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.jar -fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.jar.sha1 -fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.pom -fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact/2.0/maven-artifact-2.0.pom -fetchArtifact org/apache/maven/maven-artifact/2.0/maven-artifact-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact/2.0.2/maven-artifact-2.0.2.pom -fetchArtifact org/apache/maven/maven-artifact/2.0.2/maven-artifact-2.0.2.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact/2.0.5/maven-artifact-2.0.5.pom -fetchArtifact org/apache/maven/maven-artifact/2.0.5/maven-artifact-2.0.5.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.pom -fetchArtifact org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact/2.0.8/maven-artifact-2.0.8.pom -fetchArtifact org/apache/maven/maven-artifact/2.0.8/maven-artifact-2.0.8.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.pom -fetchArtifact org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact/2.2.0/maven-artifact-2.2.0.pom -fetchArtifact org/apache/maven/maven-artifact/2.2.0/maven-artifact-2.2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact/2.2.1/maven-artifact-2.2.1.pom -fetchArtifact org/apache/maven/maven-artifact/2.2.1/maven-artifact-2.2.1.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.pom -fetchArtifact org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0.pom -fetchArtifact org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.2/maven-artifact-manager-2.0.2.pom -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.2/maven-artifact-manager-2.0.2.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.5/maven-artifact-manager-2.0.5.pom -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.5/maven-artifact-manager-2.0.5.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.pom -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.8/maven-artifact-manager-2.0.8.pom -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.8/maven-artifact-manager-2.0.8.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.pom -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact-manager/2.2.0/maven-artifact-manager-2.2.0.pom -fetchArtifact org/apache/maven/maven-artifact-manager/2.2.0/maven-artifact-manager-2.2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-compat/3.0/maven-compat-3.0.pom -fetchArtifact org/apache/maven/maven-compat/3.0/maven-compat-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-core/2.0/maven-core-2.0.pom -fetchArtifact org/apache/maven/maven-core/2.0/maven-core-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.pom -fetchArtifact org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.pom -fetchArtifact org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-core/3.0/maven-core-3.0.pom -fetchArtifact org/apache/maven/maven-core/3.0/maven-core-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-error-diagnostics/2.0/maven-error-diagnostics-2.0.pom -fetchArtifact org/apache/maven/maven-error-diagnostics/2.0/maven-error-diagnostics-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.pom -fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.9/maven-error-diagnostics-2.0.9.pom -fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.9/maven-error-diagnostics-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-model/2.0/maven-model-2.0.pom -fetchArtifact org/apache/maven/maven-model/2.0/maven-model-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-model/2.0.5/maven-model-2.0.5.pom -fetchArtifact org/apache/maven/maven-model/2.0.5/maven-model-2.0.5.pom.sha1 -fetchArtifact org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.pom -fetchArtifact org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-model/2.0.8/maven-model-2.0.8.pom -fetchArtifact org/apache/maven/maven-model/2.0.8/maven-model-2.0.8.pom.sha1 -fetchArtifact org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.pom -fetchArtifact org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-model/2.2.0/maven-model-2.2.0.pom -fetchArtifact org/apache/maven/maven-model/2.2.0/maven-model-2.2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-model/2.2.1/maven-model-2.2.1.pom -fetchArtifact org/apache/maven/maven-model/2.2.1/maven-model-2.2.1.pom.sha1 -fetchArtifact org/apache/maven/maven-model/3.0/maven-model-3.0.pom -fetchArtifact org/apache/maven/maven-model/3.0/maven-model-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.pom -fetchArtifact org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-monitor/2.0/maven-monitor-2.0.pom -fetchArtifact org/apache/maven/maven-monitor/2.0/maven-monitor-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.pom -fetchArtifact org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-monitor/2.0.9/maven-monitor-2.0.9.pom -fetchArtifact org/apache/maven/maven-monitor/2.0.9/maven-monitor-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/10/maven-parent-10.pom -fetchArtifact org/apache/maven/maven-parent/10/maven-parent-10.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/11/maven-parent-11.pom -fetchArtifact org/apache/maven/maven-parent/11/maven-parent-11.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/13/maven-parent-13.pom -fetchArtifact org/apache/maven/maven-parent/13/maven-parent-13.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/15/maven-parent-15.pom -fetchArtifact org/apache/maven/maven-parent/15/maven-parent-15.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/16/maven-parent-16.pom -fetchArtifact org/apache/maven/maven-parent/16/maven-parent-16.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/19/maven-parent-19.pom -fetchArtifact org/apache/maven/maven-parent/19/maven-parent-19.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/20/maven-parent-20.pom -fetchArtifact org/apache/maven/maven-parent/20/maven-parent-20.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/21/maven-parent-21.pom -fetchArtifact org/apache/maven/maven-parent/21/maven-parent-21.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/23/maven-parent-23.pom -fetchArtifact org/apache/maven/maven-parent/23/maven-parent-23.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/5/maven-parent-5.pom -fetchArtifact org/apache/maven/maven-parent/5/maven-parent-5.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/6/maven-parent-6.pom -fetchArtifact org/apache/maven/maven-parent/6/maven-parent-6.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/7/maven-parent-7.pom -fetchArtifact org/apache/maven/maven-parent/7/maven-parent-7.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/8/maven-parent-8.pom -fetchArtifact org/apache/maven/maven-parent/8/maven-parent-8.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/9/maven-parent-9.pom -fetchArtifact org/apache/maven/maven-parent/9/maven-parent-9.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.pom -fetchArtifact org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-api/2.0.1/maven-plugin-api-2.0.1.pom -fetchArtifact org/apache/maven/maven-plugin-api/2.0.1/maven-plugin-api-2.0.1.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.pom -fetchArtifact org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-api/2.0.8/maven-plugin-api-2.0.8.pom -fetchArtifact org/apache/maven/maven-plugin-api/2.0.8/maven-plugin-api-2.0.8.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.pom -fetchArtifact org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-api/2.2.1/maven-plugin-api-2.2.1.pom -fetchArtifact org/apache/maven/maven-plugin-api/2.2.1/maven-plugin-api-2.2.1.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.pom -fetchArtifact org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0/maven-plugin-descriptor-2.0.pom -fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0/maven-plugin-descriptor-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.pom -fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.9/maven-plugin-descriptor-2.0.9.pom -fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.9/maven-plugin-descriptor-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0/maven-plugin-parameter-documenter-2.0.pom -fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0/maven-plugin-parameter-documenter-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.pom -fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.9/maven-plugin-parameter-documenter-2.0.9.pom -fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.9/maven-plugin-parameter-documenter-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-registry/2.0/maven-plugin-registry-2.0.pom -fetchArtifact org/apache/maven/maven-plugin-registry/2.0/maven-plugin-registry-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.pom -fetchArtifact org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-registry/2.0.8/maven-plugin-registry-2.0.8.pom -fetchArtifact org/apache/maven/maven-plugin-registry/2.0.8/maven-plugin-registry-2.0.8.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.pom -fetchArtifact org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-registry/2.2.0/maven-plugin-registry-2.2.0.pom -fetchArtifact org/apache/maven/maven-plugin-registry/2.2.0/maven-plugin-registry-2.2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-profile/2.0/maven-profile-2.0.pom -fetchArtifact org/apache/maven/maven-profile/2.0/maven-profile-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-profile/2.0.5/maven-profile-2.0.5.pom -fetchArtifact org/apache/maven/maven-profile/2.0.5/maven-profile-2.0.5.pom.sha1 -fetchArtifact org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.pom -fetchArtifact org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-profile/2.0.8/maven-profile-2.0.8.pom -fetchArtifact org/apache/maven/maven-profile/2.0.8/maven-profile-2.0.8.pom.sha1 -fetchArtifact org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.pom -fetchArtifact org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-profile/2.2.0/maven-profile-2.2.0.pom -fetchArtifact org/apache/maven/maven-profile/2.2.0/maven-profile-2.2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-project/2.0/maven-project-2.0.pom -fetchArtifact org/apache/maven/maven-project/2.0/maven-project-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-project/2.0.5/maven-project-2.0.5.pom -fetchArtifact org/apache/maven/maven-project/2.0.5/maven-project-2.0.5.pom.sha1 -fetchArtifact org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.pom -fetchArtifact org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-project/2.0.8/maven-project-2.0.8.pom -fetchArtifact org/apache/maven/maven-project/2.0.8/maven-project-2.0.8.pom.sha1 -fetchArtifact org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.pom -fetchArtifact org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-project/2.2.0/maven-project-2.2.0.pom -fetchArtifact org/apache/maven/maven-project/2.2.0/maven-project-2.2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0.pom -fetchArtifact org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.2/maven-repository-metadata-2.0.2.pom -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.2/maven-repository-metadata-2.0.2.pom.sha1 -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.5/maven-repository-metadata-2.0.5.pom -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.5/maven-repository-metadata-2.0.5.pom.sha1 -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.pom -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.8/maven-repository-metadata-2.0.8.pom -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.8/maven-repository-metadata-2.0.8.pom.sha1 -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.pom -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-repository-metadata/2.2.0/maven-repository-metadata-2.2.0.pom -fetchArtifact org/apache/maven/maven-repository-metadata/2.2.0/maven-repository-metadata-2.2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.pom -fetchArtifact org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-settings/2.0/maven-settings-2.0.pom -fetchArtifact org/apache/maven/maven-settings/2.0/maven-settings-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-settings/2.0.5/maven-settings-2.0.5.pom -fetchArtifact org/apache/maven/maven-settings/2.0.5/maven-settings-2.0.5.pom.sha1 -fetchArtifact org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.pom -fetchArtifact org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-settings/2.0.8/maven-settings-2.0.8.pom -fetchArtifact org/apache/maven/maven-settings/2.0.8/maven-settings-2.0.8.pom.sha1 -fetchArtifact org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.pom -fetchArtifact org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-settings/2.2.0/maven-settings-2.2.0.pom -fetchArtifact org/apache/maven/maven-settings/2.2.0/maven-settings-2.2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-settings/3.0/maven-settings-3.0.pom -fetchArtifact org/apache/maven/maven-settings/3.0/maven-settings-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.pom -fetchArtifact org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.pom -fetchArtifact org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.pom.sha1 -fetchArtifact org/apache/maven/maven-toolchain/2.0.9/maven-toolchain-2.0.9.pom -fetchArtifact org/apache/maven/maven-toolchain/2.0.9/maven-toolchain-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-clean-plugin/2.5/maven-clean-plugin-2.5.jar -fetchArtifact org/apache/maven/plugins/maven-clean-plugin/2.5/maven-clean-plugin-2.5.jar.sha1 +fetchArtifact org/apache/struts/struts-master/4/struts-master-4.pom.sha1 +fetchArtifact org/apache/struts/struts-master/4/struts-master-4.pom +fetchArtifact org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.jar +fetchArtifact org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.pom.sha1 +fetchArtifact org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.pom +fetchArtifact org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.jar.sha1 +fetchArtifact org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.jar.sha1 +fetchArtifact org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.pom +fetchArtifact org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.jar +fetchArtifact org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.pom.sha1 +fetchArtifact org/apache/struts/struts-parent/1.3.8/struts-parent-1.3.8.pom +fetchArtifact org/apache/struts/struts-parent/1.3.8/struts-parent-1.3.8.pom.sha1 +fetchArtifact org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.pom +fetchArtifact org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.pom.sha1 +fetchArtifact org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.jar +fetchArtifact org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.jar.sha1 +fetchArtifact org/apache/velocity/velocity/1.6.2/velocity-1.6.2.pom +fetchArtifact org/apache/velocity/velocity/1.6.2/velocity-1.6.2.pom.sha1 +fetchArtifact org/apache/velocity/velocity/1.7/velocity-1.7.jar.sha1 +fetchArtifact org/apache/velocity/velocity/1.7/velocity-1.7.pom +fetchArtifact org/apache/velocity/velocity/1.7/velocity-1.7.pom.sha1 +fetchArtifact org/apache/velocity/velocity/1.7/velocity-1.7.jar +fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.jar.sha1 +fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.pom.sha1 +fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.jar +fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.pom +fetchArtifact org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.jar.sha1 +fetchArtifact org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.pom.sha1 +fetchArtifact org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.jar +fetchArtifact org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.pom +fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.jar.sha1 +fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.jar +fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.pom +fetchArtifact org/apache/maven/plugins/maven-remote-resources-plugin/1.3/maven-remote-resources-plugin-1.3.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-remote-resources-plugin/1.3/maven-remote-resources-plugin-1.3.jar +fetchArtifact org/apache/maven/plugins/maven-remote-resources-plugin/1.3/maven-remote-resources-plugin-1.3.jar.sha1 +fetchArtifact org/apache/maven/plugins/maven-remote-resources-plugin/1.3/maven-remote-resources-plugin-1.3.pom +fetchArtifact org/apache/maven/plugins/maven-source-plugin/2.1.2/maven-source-plugin-2.1.2.jar.sha1 +fetchArtifact org/apache/maven/plugins/maven-source-plugin/2.1.2/maven-source-plugin-2.1.2.pom +fetchArtifact org/apache/maven/plugins/maven-source-plugin/2.1.2/maven-source-plugin-2.1.2.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-source-plugin/2.1.2/maven-source-plugin-2.1.2.jar +fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.2/maven-shade-plugin-2.2.pom +fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.2/maven-shade-plugin-2.2.jar.sha1 +fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.2/maven-shade-plugin-2.2.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.2/maven-shade-plugin-2.2.jar +fetchArtifact org/apache/maven/plugins/maven-javadoc-plugin/2.8.1/maven-javadoc-plugin-2.8.1.pom +fetchArtifact org/apache/maven/plugins/maven-javadoc-plugin/2.8.1/maven-javadoc-plugin-2.8.1.jar +fetchArtifact org/apache/maven/plugins/maven-javadoc-plugin/2.8.1/maven-javadoc-plugin-2.8.1.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-javadoc-plugin/2.8.1/maven-javadoc-plugin-2.8.1.jar.sha1 fetchArtifact org/apache/maven/plugins/maven-clean-plugin/2.5/maven-clean-plugin-2.5.pom fetchArtifact org/apache/maven/plugins/maven-clean-plugin/2.5/maven-clean-plugin-2.5.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.5.1/maven-compiler-plugin-2.5.1.jar +fetchArtifact org/apache/maven/plugins/maven-clean-plugin/2.5/maven-clean-plugin-2.5.jar.sha1 +fetchArtifact org/apache/maven/plugins/maven-clean-plugin/2.5/maven-clean-plugin-2.5.jar fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.5.1/maven-compiler-plugin-2.5.1.jar.sha1 fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.5.1/maven-compiler-plugin-2.5.1.pom fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.5.1/maven-compiler-plugin-2.5.1.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.5.1/maven-compiler-plugin-2.5.1.jar +fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.pom fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.jar fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.jar.sha1 -fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.pom fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-site-plugin/3.1/maven-site-plugin-3.1.jar +fetchArtifact org/apache/maven/plugins/maven-site-plugin/3.1/maven-site-plugin-3.1.pom +fetchArtifact org/apache/maven/plugins/maven-site-plugin/3.1/maven-site-plugin-3.1.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-site-plugin/3.1/maven-site-plugin-3.1.jar.sha1 +fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.jar.sha1 +fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.pom +fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.jar fetchArtifact org/apache/maven/plugins/maven-gpg-plugin/1.4/maven-gpg-plugin-1.4.jar fetchArtifact org/apache/maven/plugins/maven-gpg-plugin/1.4/maven-gpg-plugin-1.4.jar.sha1 fetchArtifact org/apache/maven/plugins/maven-gpg-plugin/1.4/maven-gpg-plugin-1.4.pom fetchArtifact org/apache/maven/plugins/maven-gpg-plugin/1.4/maven-gpg-plugin-1.4.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.jar -fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.jar.sha1 -fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.pom -fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-javadoc-plugin/2.8.1/maven-javadoc-plugin-2.8.1.jar -fetchArtifact org/apache/maven/plugins/maven-javadoc-plugin/2.8.1/maven-javadoc-plugin-2.8.1.jar.sha1 -fetchArtifact org/apache/maven/plugins/maven-javadoc-plugin/2.8.1/maven-javadoc-plugin-2.8.1.pom -fetchArtifact org/apache/maven/plugins/maven-javadoc-plugin/2.8.1/maven-javadoc-plugin-2.8.1.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-plugins/18/maven-plugins-18.pom -fetchArtifact org/apache/maven/plugins/maven-plugins/18/maven-plugins-18.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-plugins/19/maven-plugins-19.pom -fetchArtifact org/apache/maven/plugins/maven-plugins/19/maven-plugins-19.pom.sha1 fetchArtifact org/apache/maven/plugins/maven-plugins/22/maven-plugins-22.pom fetchArtifact org/apache/maven/plugins/maven-plugins/22/maven-plugins-22.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-plugins/19/maven-plugins-19.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-plugins/19/maven-plugins-19.pom fetchArtifact org/apache/maven/plugins/maven-plugins/24/maven-plugins-24.pom fetchArtifact org/apache/maven/plugins/maven-plugins/24/maven-plugins-24.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-remote-resources-plugin/1.3/maven-remote-resources-plugin-1.3.jar -fetchArtifact org/apache/maven/plugins/maven-remote-resources-plugin/1.3/maven-remote-resources-plugin-1.3.jar.sha1 -fetchArtifact org/apache/maven/plugins/maven-remote-resources-plugin/1.3/maven-remote-resources-plugin-1.3.pom -fetchArtifact org/apache/maven/plugins/maven-remote-resources-plugin/1.3/maven-remote-resources-plugin-1.3.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.jar -fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.jar.sha1 -fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.pom -fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.2/maven-shade-plugin-2.2.jar -fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.2/maven-shade-plugin-2.2.jar.sha1 -fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.2/maven-shade-plugin-2.2.pom -fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.2/maven-shade-plugin-2.2.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-site-plugin/3.1/maven-site-plugin-3.1.jar -fetchArtifact org/apache/maven/plugins/maven-site-plugin/3.1/maven-site-plugin-3.1.jar.sha1 -fetchArtifact org/apache/maven/plugins/maven-site-plugin/3.1/maven-site-plugin-3.1.pom -fetchArtifact org/apache/maven/plugins/maven-site-plugin/3.1/maven-site-plugin-3.1.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-source-plugin/2.1.2/maven-source-plugin-2.1.2.jar -fetchArtifact org/apache/maven/plugins/maven-source-plugin/2.1.2/maven-source-plugin-2.1.2.jar.sha1 -fetchArtifact org/apache/maven/plugins/maven-source-plugin/2.1.2/maven-source-plugin-2.1.2.pom -fetchArtifact org/apache/maven/plugins/maven-source-plugin/2.1.2/maven-source-plugin-2.1.2.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.12/maven-surefire-plugin-2.12.jar +fetchArtifact org/apache/maven/plugins/maven-plugins/18/maven-plugins-18.pom +fetchArtifact org/apache/maven/plugins/maven-plugins/18/maven-plugins-18.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.12/maven-surefire-plugin-2.12.pom.sha1 fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.12/maven-surefire-plugin-2.12.jar.sha1 fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.12/maven-surefire-plugin-2.12.pom -fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.12/maven-surefire-plugin-2.12.pom.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting/2.0/maven-reporting-2.0.pom -fetchArtifact org/apache/maven/reporting/maven-reporting/2.0/maven-reporting-2.0.pom.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.6/maven-reporting-2.0.6.pom -fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.6/maven-reporting-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.9/maven-reporting-2.0.9.pom -fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.9/maven-reporting-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0/maven-reporting-api-2.0.pom -fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0/maven-reporting-api-2.0.pom.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.jar -fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.jar.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.pom -fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.jar -fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.jar.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.pom -fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.jar -fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.jar.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.pom -fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.pom.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting-exec/1.0.2/maven-reporting-exec-1.0.2.jar -fetchArtifact org/apache/maven/reporting/maven-reporting-exec/1.0.2/maven-reporting-exec-1.0.2.jar.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting-exec/1.0.2/maven-reporting-exec-1.0.2.pom -fetchArtifact org/apache/maven/reporting/maven-reporting-exec/1.0.2/maven-reporting-exec-1.0.2.pom.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.jar -fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.jar.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.pom -fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.pom.sha1 -fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.jar -fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.jar.sha1 -fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.pom -fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-artifact-resolver/1.0/maven-artifact-resolver-1.0.jar -fetchArtifact org/apache/maven/shared/maven-artifact-resolver/1.0/maven-artifact-resolver-1.0.jar.sha1 -fetchArtifact org/apache/maven/shared/maven-artifact-resolver/1.0/maven-artifact-resolver-1.0.pom -fetchArtifact org/apache/maven/shared/maven-artifact-resolver/1.0/maven-artifact-resolver-1.0.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.jar -fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.jar.sha1 -fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.pom -fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.jar -fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.jar.sha1 -fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.pom -fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.jar -fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.jar.sha1 -fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.pom -fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.jar -fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.jar.sha1 -fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.pom -fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.12/maven-surefire-plugin-2.12.jar +fetchArtifact org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.pom +fetchArtifact org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-monitor/2.0/maven-monitor-2.0.pom +fetchArtifact org/apache/maven/maven-monitor/2.0/maven-monitor-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-monitor/2.0.9/maven-monitor-2.0.9.pom +fetchArtifact org/apache/maven/maven-monitor/2.0.9/maven-monitor-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.pom +fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-error-diagnostics/2.0/maven-error-diagnostics-2.0.pom +fetchArtifact org/apache/maven/maven-error-diagnostics/2.0/maven-error-diagnostics-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.9/maven-error-diagnostics-2.0.9.pom +fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.9/maven-error-diagnostics-2.0.9.pom.sha1 fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.jar fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.jar.sha1 fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.pom fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.jar fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.jar fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.pom fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.4/maven-doxia-tools-1.4.pom fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.4/maven-doxia-tools-1.4.jar fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.4/maven-doxia-tools-1.4.jar.sha1 -fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.4/maven-doxia-tools-1.4.pom fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.4/maven-doxia-tools-1.4.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-filtering/1.0/maven-filtering-1.0.jar +fetchArtifact org/apache/maven/shared/maven-filtering/1.0/maven-filtering-1.0.pom.sha1 fetchArtifact org/apache/maven/shared/maven-filtering/1.0/maven-filtering-1.0.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-filtering/1.0/maven-filtering-1.0.jar fetchArtifact org/apache/maven/shared/maven-filtering/1.0/maven-filtering-1.0.pom -fetchArtifact org/apache/maven/shared/maven-filtering/1.0/maven-filtering-1.0.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-shared-components/7/maven-shared-components-7.pom +fetchArtifact org/apache/maven/shared/maven-shared-components/7/maven-shared-components-7.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-shared-components/16/maven-shared-components-16.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-shared-components/16/maven-shared-components-16.pom +fetchArtifact org/apache/maven/shared/maven-shared-components/19/maven-shared-components-19.pom +fetchArtifact org/apache/maven/shared/maven-shared-components/19/maven-shared-components-19.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-shared-components/9/maven-shared-components-9.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-shared-components/9/maven-shared-components-9.pom +fetchArtifact org/apache/maven/shared/maven-shared-components/17/maven-shared-components-17.pom +fetchArtifact org/apache/maven/shared/maven-shared-components/17/maven-shared-components-17.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-shared-components/12/maven-shared-components-12.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-shared-components/12/maven-shared-components-12.pom +fetchArtifact org/apache/maven/shared/maven-shared-components/8/maven-shared-components-8.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-shared-components/8/maven-shared-components-8.pom +fetchArtifact org/apache/maven/shared/maven-shared-components/15/maven-shared-components-15.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-shared-components/15/maven-shared-components-15.pom +fetchArtifact org/apache/maven/shared/maven-shared-components/11/maven-shared-components-11.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-shared-components/11/maven-shared-components-11.pom +fetchArtifact org/apache/maven/shared/maven-shared-components/10/maven-shared-components-10.pom +fetchArtifact org/apache/maven/shared/maven-shared-components/10/maven-shared-components-10.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.pom.sha1 fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.jar fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.jar.sha1 fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.pom -fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.pom.sha1 fetchArtifact org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.jar +fetchArtifact org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.pom.sha1 fetchArtifact org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.jar.sha1 fetchArtifact org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.pom -fetchArtifact org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.jar -fetchArtifact org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.jar.sha1 -fetchArtifact org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.pom -fetchArtifact org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-shared-components/10/maven-shared-components-10.pom -fetchArtifact org/apache/maven/shared/maven-shared-components/10/maven-shared-components-10.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-shared-components/11/maven-shared-components-11.pom -fetchArtifact org/apache/maven/shared/maven-shared-components/11/maven-shared-components-11.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-shared-components/12/maven-shared-components-12.pom -fetchArtifact org/apache/maven/shared/maven-shared-components/12/maven-shared-components-12.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-shared-components/15/maven-shared-components-15.pom -fetchArtifact org/apache/maven/shared/maven-shared-components/15/maven-shared-components-15.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-shared-components/16/maven-shared-components-16.pom -fetchArtifact org/apache/maven/shared/maven-shared-components/16/maven-shared-components-16.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-shared-components/17/maven-shared-components-17.pom -fetchArtifact org/apache/maven/shared/maven-shared-components/17/maven-shared-components-17.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-shared-components/19/maven-shared-components-19.pom -fetchArtifact org/apache/maven/shared/maven-shared-components/19/maven-shared-components-19.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-shared-components/7/maven-shared-components-7.pom -fetchArtifact org/apache/maven/shared/maven-shared-components/7/maven-shared-components-7.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-shared-components/8/maven-shared-components-8.pom -fetchArtifact org/apache/maven/shared/maven-shared-components/8/maven-shared-components-8.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-shared-components/9/maven-shared-components-9.pom -fetchArtifact org/apache/maven/shared/maven-shared-components/9/maven-shared-components-9.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.jar -fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.jar.sha1 fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.pom fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.pom.sha1 -fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.12/maven-surefire-common-2.12.jar +fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.jar +fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.jar.sha1 +fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.jar.sha1 +fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.jar +fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.pom +fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.jar +fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.pom +fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.pom +fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.jar +fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.pom +fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.jar +fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.pom +fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.jar +fetchArtifact org/apache/maven/shared/maven-artifact-resolver/1.0/maven-artifact-resolver-1.0.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-artifact-resolver/1.0/maven-artifact-resolver-1.0.pom +fetchArtifact org/apache/maven/shared/maven-artifact-resolver/1.0/maven-artifact-resolver-1.0.jar +fetchArtifact org/apache/maven/shared/maven-artifact-resolver/1.0/maven-artifact-resolver-1.0.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.pom +fetchArtifact org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.jar +fetchArtifact org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.jar.sha1 +fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.pom +fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0/maven-plugin-parameter-documenter-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0/maven-plugin-parameter-documenter-2.0.pom +fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.9/maven-plugin-parameter-documenter-2.0.9.pom +fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.9/maven-plugin-parameter-documenter-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-core/3.0/maven-core-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven-core/3.0/maven-core-3.0.pom +fetchArtifact org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.pom +fetchArtifact org/apache/maven/maven-core/2.0/maven-core-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-core/2.0/maven-core-2.0.pom +fetchArtifact org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.pom +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.5/maven-artifact-manager-2.0.5.pom +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.5/maven-artifact-manager-2.0.5.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact-manager/2.2.0/maven-artifact-manager-2.2.0.pom +fetchArtifact org/apache/maven/maven-artifact-manager/2.2.0/maven-artifact-manager-2.2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.pom +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.8/maven-artifact-manager-2.0.8.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.8/maven-artifact-manager-2.0.8.pom +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.2/maven-artifact-manager-2.0.2.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.2/maven-artifact-manager-2.0.2.pom +fetchArtifact org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0.pom +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.pom +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-archiver/2.4.1/maven-archiver-2.4.1.jar +fetchArtifact org/apache/maven/maven-archiver/2.4.1/maven-archiver-2.4.1.jar.sha1 +fetchArtifact org/apache/maven/maven-archiver/2.4.1/maven-archiver-2.4.1.pom.sha1 +fetchArtifact org/apache/maven/maven-archiver/2.4.1/maven-archiver-2.4.1.pom +fetchArtifact org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.pom +fetchArtifact org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.jar +fetchArtifact org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.pom.sha1 +fetchArtifact org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.jar.sha1 +fetchArtifact org/apache/maven/maven-archiver/2.4.2/maven-archiver-2.4.2.jar +fetchArtifact org/apache/maven/maven-archiver/2.4.2/maven-archiver-2.4.2.pom +fetchArtifact org/apache/maven/maven-archiver/2.4.2/maven-archiver-2.4.2.pom.sha1 +fetchArtifact org/apache/maven/maven-archiver/2.4.2/maven-archiver-2.4.2.jar.sha1 +fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.jar +fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.pom.sha1 +fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.pom +fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.jar.sha1 +fetchArtifact org/apache/maven/maven-profile/2.0.5/maven-profile-2.0.5.pom.sha1 +fetchArtifact org/apache/maven/maven-profile/2.0.5/maven-profile-2.0.5.pom +fetchArtifact org/apache/maven/maven-profile/2.2.0/maven-profile-2.2.0.pom +fetchArtifact org/apache/maven/maven-profile/2.2.0/maven-profile-2.2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.pom +fetchArtifact org/apache/maven/maven-profile/2.0.8/maven-profile-2.0.8.pom.sha1 +fetchArtifact org/apache/maven/maven-profile/2.0.8/maven-profile-2.0.8.pom +fetchArtifact org/apache/maven/maven-profile/2.0/maven-profile-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-profile/2.0/maven-profile-2.0.pom +fetchArtifact org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.pom +fetchArtifact org/apache/maven/maven-project/2.0.5/maven-project-2.0.5.pom.sha1 +fetchArtifact org/apache/maven/maven-project/2.0.5/maven-project-2.0.5.pom +fetchArtifact org/apache/maven/maven-project/2.2.0/maven-project-2.2.0.pom +fetchArtifact org/apache/maven/maven-project/2.2.0/maven-project-2.2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.pom +fetchArtifact org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-project/2.0.8/maven-project-2.0.8.pom.sha1 +fetchArtifact org/apache/maven/maven-project/2.0.8/maven-project-2.0.8.pom +fetchArtifact org/apache/maven/maven-project/2.0/maven-project-2.0.pom +fetchArtifact org/apache/maven/maven-project/2.0/maven-project-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.pom +fetchArtifact org/apache/maven/maven-model/2.0.5/maven-model-2.0.5.pom.sha1 +fetchArtifact org/apache/maven/maven-model/2.0.5/maven-model-2.0.5.pom +fetchArtifact org/apache/maven/maven-model/2.2.0/maven-model-2.2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-model/2.2.0/maven-model-2.2.0.pom +fetchArtifact org/apache/maven/maven-model/3.0/maven-model-3.0.pom +fetchArtifact org/apache/maven/maven-model/3.0/maven-model-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.pom +fetchArtifact org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-model/2.0.8/maven-model-2.0.8.pom +fetchArtifact org/apache/maven/maven-model/2.0.8/maven-model-2.0.8.pom.sha1 +fetchArtifact org/apache/maven/maven-model/2.2.1/maven-model-2.2.1.pom.sha1 +fetchArtifact org/apache/maven/maven-model/2.2.1/maven-model-2.2.1.pom +fetchArtifact org/apache/maven/maven-model/2.0/maven-model-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-model/2.0/maven-model-2.0.pom +fetchArtifact org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.pom +fetchArtifact org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/surefire/surefire/2.12/surefire-2.12.pom +fetchArtifact org/apache/maven/surefire/surefire/2.12/surefire-2.12.pom.sha1 fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.12/maven-surefire-common-2.12.jar.sha1 +fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.12/maven-surefire-common-2.12.jar fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.12/maven-surefire-common-2.12.pom fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.12/maven-surefire-common-2.12.pom.sha1 -fetchArtifact org/apache/maven/surefire/surefire/2.12/surefire-2.12.pom -fetchArtifact org/apache/maven/surefire/surefire/2.12/surefire-2.12.pom.sha1 +fetchArtifact org/apache/maven/surefire/surefire-booter/2.12/surefire-booter-2.12.pom +fetchArtifact org/apache/maven/surefire/surefire-booter/2.12/surefire-booter-2.12.pom.sha1 +fetchArtifact org/apache/maven/surefire/surefire-booter/2.12/surefire-booter-2.12.jar.sha1 +fetchArtifact org/apache/maven/surefire/surefire-booter/2.12/surefire-booter-2.12.jar fetchArtifact org/apache/maven/surefire/surefire-api/2.12/surefire-api-2.12.jar -fetchArtifact org/apache/maven/surefire/surefire-api/2.12/surefire-api-2.12.jar.sha1 fetchArtifact org/apache/maven/surefire/surefire-api/2.12/surefire-api-2.12.pom +fetchArtifact org/apache/maven/surefire/surefire-api/2.12/surefire-api-2.12.jar.sha1 fetchArtifact org/apache/maven/surefire/surefire-api/2.12/surefire-api-2.12.pom.sha1 -fetchArtifact org/apache/maven/surefire/surefire-booter/2.12/surefire-booter-2.12.jar -fetchArtifact org/apache/maven/surefire/surefire-booter/2.12/surefire-booter-2.12.jar.sha1 -fetchArtifact org/apache/maven/surefire/surefire-booter/2.12/surefire-booter-2.12.pom -fetchArtifact org/apache/maven/surefire/surefire-booter/2.12/surefire-booter-2.12.pom.sha1 -fetchArtifact org/apache/maven/wagon/wagon/1.0/wagon-1.0.pom -fetchArtifact org/apache/maven/wagon/wagon/1.0/wagon-1.0.pom.sha1 -fetchArtifact org/apache/maven/wagon/wagon/1.0-alpha-6/wagon-1.0-alpha-6.pom -fetchArtifact org/apache/maven/wagon/wagon/1.0-alpha-6/wagon-1.0-alpha-6.pom.sha1 -fetchArtifact org/apache/maven/wagon/wagon/1.0-beta-6/wagon-1.0-beta-6.pom -fetchArtifact org/apache/maven/wagon/wagon/1.0-beta-6/wagon-1.0-beta-6.pom.sha1 +fetchArtifact org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.pom +fetchArtifact org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.5/maven-repository-metadata-2.0.5.pom +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.5/maven-repository-metadata-2.0.5.pom.sha1 +fetchArtifact org/apache/maven/maven-repository-metadata/2.2.0/maven-repository-metadata-2.2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-repository-metadata/2.2.0/maven-repository-metadata-2.2.0.pom +fetchArtifact org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.pom +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.pom +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.8/maven-repository-metadata-2.0.8.pom.sha1 +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.8/maven-repository-metadata-2.0.8.pom +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.2/maven-repository-metadata-2.0.2.pom.sha1 +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.2/maven-repository-metadata-2.0.2.pom +fetchArtifact org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0.pom +fetchArtifact org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.pom +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.pom +fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0/maven-plugin-descriptor-2.0.pom +fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0/maven-plugin-descriptor-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.9/maven-plugin-descriptor-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.9/maven-plugin-descriptor-2.0.9.pom +fetchArtifact org/apache/maven/maven/2.0.5/maven-2.0.5.pom.sha1 +fetchArtifact org/apache/maven/maven/2.0.5/maven-2.0.5.pom +fetchArtifact org/apache/maven/maven/2.2.0/maven-2.2.0.pom.sha1 +fetchArtifact org/apache/maven/maven/2.2.0/maven-2.2.0.pom +fetchArtifact org/apache/maven/maven/3.0/maven-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven/3.0/maven-3.0.pom +fetchArtifact org/apache/maven/maven/2.0.6/maven-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven/2.0.6/maven-2.0.6.pom +fetchArtifact org/apache/maven/maven/2.0.1/maven-2.0.1.pom.sha1 +fetchArtifact org/apache/maven/maven/2.0.1/maven-2.0.1.pom +fetchArtifact org/apache/maven/maven/2.0.8/maven-2.0.8.pom.sha1 +fetchArtifact org/apache/maven/maven/2.0.8/maven-2.0.8.pom +fetchArtifact org/apache/maven/maven/2.2.1/maven-2.2.1.pom +fetchArtifact org/apache/maven/maven/2.2.1/maven-2.2.1.pom.sha1 +fetchArtifact org/apache/maven/maven/2.0.2/maven-2.0.2.pom +fetchArtifact org/apache/maven/maven/2.0.2/maven-2.0.2.pom.sha1 +fetchArtifact org/apache/maven/maven/2.0/maven-2.0.pom +fetchArtifact org/apache/maven/maven/2.0/maven-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven/2.0.9/maven-2.0.9.pom +fetchArtifact org/apache/maven/maven/2.0.9/maven-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.pom +fetchArtifact org/apache/maven/maven-artifact/2.0.5/maven-artifact-2.0.5.pom +fetchArtifact org/apache/maven/maven-artifact/2.0.5/maven-artifact-2.0.5.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact/2.2.0/maven-artifact-2.2.0.pom +fetchArtifact org/apache/maven/maven-artifact/2.2.0/maven-artifact-2.2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.pom +fetchArtifact org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.pom +fetchArtifact org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact/2.0.8/maven-artifact-2.0.8.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact/2.0.8/maven-artifact-2.0.8.pom +fetchArtifact org/apache/maven/maven-artifact/2.2.1/maven-artifact-2.2.1.pom +fetchArtifact org/apache/maven/maven-artifact/2.2.1/maven-artifact-2.2.1.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact/2.0.2/maven-artifact-2.0.2.pom +fetchArtifact org/apache/maven/maven-artifact/2.0.2/maven-artifact-2.0.2.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact/2.0/maven-artifact-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact/2.0/maven-artifact-2.0.pom +fetchArtifact org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.pom +fetchArtifact org/apache/maven/maven-settings/2.0.5/maven-settings-2.0.5.pom +fetchArtifact org/apache/maven/maven-settings/2.0.5/maven-settings-2.0.5.pom.sha1 +fetchArtifact org/apache/maven/maven-settings/2.2.0/maven-settings-2.2.0.pom +fetchArtifact org/apache/maven/maven-settings/2.2.0/maven-settings-2.2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-settings/3.0/maven-settings-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven-settings/3.0/maven-settings-3.0.pom +fetchArtifact org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.pom +fetchArtifact org/apache/maven/maven-settings/2.0.8/maven-settings-2.0.8.pom +fetchArtifact org/apache/maven/maven-settings/2.0.8/maven-settings-2.0.8.pom.sha1 +fetchArtifact org/apache/maven/maven-settings/2.0/maven-settings-2.0.pom +fetchArtifact org/apache/maven/maven-settings/2.0/maven-settings-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.pom +fetchArtifact org/apache/maven/maven-compat/3.0/maven-compat-3.0.pom +fetchArtifact org/apache/maven/maven-compat/3.0/maven-compat-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.pom +fetchArtifact org/apache/maven/maven-plugin-registry/2.2.0/maven-plugin-registry-2.2.0.pom +fetchArtifact org/apache/maven/maven-plugin-registry/2.2.0/maven-plugin-registry-2.2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.pom +fetchArtifact org/apache/maven/maven-plugin-registry/2.0.8/maven-plugin-registry-2.0.8.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-registry/2.0.8/maven-plugin-registry-2.0.8.pom +fetchArtifact org/apache/maven/maven-plugin-registry/2.0/maven-plugin-registry-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-registry/2.0/maven-plugin-registry-2.0.pom +fetchArtifact org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.pom +fetchArtifact org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/7/maven-parent-7.pom +fetchArtifact org/apache/maven/maven-parent/7/maven-parent-7.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/16/maven-parent-16.pom +fetchArtifact org/apache/maven/maven-parent/16/maven-parent-16.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/19/maven-parent-19.pom +fetchArtifact org/apache/maven/maven-parent/19/maven-parent-19.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/20/maven-parent-20.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/20/maven-parent-20.pom +fetchArtifact org/apache/maven/maven-parent/9/maven-parent-9.pom +fetchArtifact org/apache/maven/maven-parent/9/maven-parent-9.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/13/maven-parent-13.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/13/maven-parent-13.pom +fetchArtifact org/apache/maven/maven-parent/5/maven-parent-5.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/5/maven-parent-5.pom +fetchArtifact org/apache/maven/maven-parent/6/maven-parent-6.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/6/maven-parent-6.pom +fetchArtifact org/apache/maven/maven-parent/21/maven-parent-21.pom +fetchArtifact org/apache/maven/maven-parent/21/maven-parent-21.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/23/maven-parent-23.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/23/maven-parent-23.pom +fetchArtifact org/apache/maven/maven-parent/8/maven-parent-8.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/8/maven-parent-8.pom +fetchArtifact org/apache/maven/maven-parent/15/maven-parent-15.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/15/maven-parent-15.pom +fetchArtifact org/apache/maven/maven-parent/11/maven-parent-11.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/11/maven-parent-11.pom +fetchArtifact org/apache/maven/maven-parent/10/maven-parent-10.pom +fetchArtifact org/apache/maven/maven-parent/10/maven-parent-10.pom.sha1 fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0/wagon-provider-api-1.0.pom fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0/wagon-provider-api-1.0.pom.sha1 -fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.pom -fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.pom.sha1 -fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.pom fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.pom.sha1 -fetchArtifact org/apache/maven/wagon/wagon-providers/1.0/wagon-providers-1.0.pom -fetchArtifact org/apache/maven/wagon/wagon-providers/1.0/wagon-providers-1.0.pom.sha1 -fetchArtifact org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.jar -fetchArtifact org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.jar.sha1 -fetchArtifact org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.pom +fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.pom +fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.pom.sha1 +fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.pom fetchArtifact org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.pom.sha1 +fetchArtifact org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.pom +fetchArtifact org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.jar.sha1 +fetchArtifact org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.jar +fetchArtifact org/apache/maven/wagon/wagon-providers/1.0/wagon-providers-1.0.pom.sha1 +fetchArtifact org/apache/maven/wagon/wagon-providers/1.0/wagon-providers-1.0.pom +fetchArtifact org/apache/maven/wagon/wagon/1.0/wagon-1.0.pom +fetchArtifact org/apache/maven/wagon/wagon/1.0/wagon-1.0.pom.sha1 +fetchArtifact org/apache/maven/wagon/wagon/1.0-beta-6/wagon-1.0-beta-6.pom.sha1 +fetchArtifact org/apache/maven/wagon/wagon/1.0-beta-6/wagon-1.0-beta-6.pom +fetchArtifact org/apache/maven/wagon/wagon/1.0-alpha-6/wagon-1.0-alpha-6.pom +fetchArtifact org/apache/maven/wagon/wagon/1.0-alpha-6/wagon-1.0-alpha-6.pom.sha1 fetchArtifact org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.jar fetchArtifact org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.jar.sha1 fetchArtifact org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.pom fetchArtifact org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.pom.sha1 -fetchArtifact org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.jar -fetchArtifact org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.jar.sha1 -fetchArtifact org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.pom -fetchArtifact org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.pom.sha1 -fetchArtifact org/apache/struts/struts-master/4/struts-master-4.pom -fetchArtifact org/apache/struts/struts-master/4/struts-master-4.pom.sha1 -fetchArtifact org/apache/struts/struts-parent/1.3.8/struts-parent-1.3.8.pom -fetchArtifact org/apache/struts/struts-parent/1.3.8/struts-parent-1.3.8.pom.sha1 -fetchArtifact org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.jar -fetchArtifact org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.jar.sha1 -fetchArtifact org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.pom -fetchArtifact org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.pom.sha1 -fetchArtifact org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.jar -fetchArtifact org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.jar.sha1 -fetchArtifact org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.pom -fetchArtifact org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.pom.sha1 -fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.jar -fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.jar.sha1 -fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.pom -fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.pom.sha1 -fetchArtifact org/apache/velocity/velocity/1.6.2/velocity-1.6.2.pom -fetchArtifact org/apache/velocity/velocity/1.6.2/velocity-1.6.2.pom.sha1 -fetchArtifact org/apache/velocity/velocity/1.7/velocity-1.7.jar -fetchArtifact org/apache/velocity/velocity/1.7/velocity-1.7.jar.sha1 -fetchArtifact org/apache/velocity/velocity/1.7/velocity-1.7.pom -fetchArtifact org/apache/velocity/velocity/1.7/velocity-1.7.pom.sha1 -fetchArtifact org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.jar -fetchArtifact org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.jar.sha1 -fetchArtifact org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.pom -fetchArtifact org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.pom.sha1 -fetchArtifact org/apache/xbean/xbean/3.4/xbean-3.4.pom -fetchArtifact org/apache/xbean/xbean/3.4/xbean-3.4.pom.sha1 -fetchArtifact org/apache/xbean/xbean-reflect/3.4/xbean-reflect-3.4.pom -fetchArtifact org/apache/xbean/xbean-reflect/3.4/xbean-reflect-3.4.pom.sha1 -fetchArtifact org/beanshell/beanshell/2.0b4/beanshell-2.0b4.pom -fetchArtifact org/beanshell/beanshell/2.0b4/beanshell-2.0b4.pom.sha1 -fetchArtifact org/beanshell/bsh/2.0b4/bsh-2.0b4.jar -fetchArtifact org/beanshell/bsh/2.0b4/bsh-2.0b4.jar.sha1 -fetchArtifact org/beanshell/bsh/2.0b4/bsh-2.0b4.pom -fetchArtifact org/beanshell/bsh/2.0b4/bsh-2.0b4.pom.sha1 -fetchArtifact org/codehaus/codehaus-parent/4/codehaus-parent-4.pom -fetchArtifact org/codehaus/codehaus-parent/4/codehaus-parent-4.pom.sha1 -fetchArtifact org/codehaus/mojo/build-helper-maven-plugin/1.8/build-helper-maven-plugin-1.8.jar -fetchArtifact org/codehaus/mojo/build-helper-maven-plugin/1.8/build-helper-maven-plugin-1.8.jar.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.jar +fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.jar.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.pom.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.pom +fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.jar.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.pom.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.jar +fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.pom +fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.pom +fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.jar +fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.jar.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0/maven-reporting-api-2.0.pom +fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0/maven-reporting-api-2.0.pom.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.pom +fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.jar +fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.jar.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.6/maven-reporting-2.0.6.pom +fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.6/maven-reporting-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting/2.0/maven-reporting-2.0.pom +fetchArtifact org/apache/maven/reporting/maven-reporting/2.0/maven-reporting-2.0.pom.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.9/maven-reporting-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.9/maven-reporting-2.0.9.pom +fetchArtifact org/apache/maven/reporting/maven-reporting-exec/1.0.2/maven-reporting-exec-1.0.2.jar.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting-exec/1.0.2/maven-reporting-exec-1.0.2.jar +fetchArtifact org/apache/maven/reporting/maven-reporting-exec/1.0.2/maven-reporting-exec-1.0.2.pom.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting-exec/1.0.2/maven-reporting-exec-1.0.2.pom +fetchArtifact org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.pom +fetchArtifact org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.pom +fetchArtifact org/apache/maven/maven-plugin-api/2.0.1/maven-plugin-api-2.0.1.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-api/2.0.1/maven-plugin-api-2.0.1.pom +fetchArtifact org/apache/maven/maven-plugin-api/2.0.8/maven-plugin-api-2.0.8.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-api/2.0.8/maven-plugin-api-2.0.8.pom +fetchArtifact org/apache/maven/maven-plugin-api/2.2.1/maven-plugin-api-2.2.1.pom +fetchArtifact org/apache/maven/maven-plugin-api/2.2.1/maven-plugin-api-2.2.1.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.pom +fetchArtifact org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.pom +fetchArtifact org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.pom +fetchArtifact org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.pom.sha1 +fetchArtifact org/apache/maven/maven-toolchain/2.0.9/maven-toolchain-2.0.9.pom +fetchArtifact org/apache/maven/maven-toolchain/2.0.9/maven-toolchain-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-modules/1.3/doxia-modules-1.3.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-modules/1.3/doxia-modules-1.3.pom +fetchArtifact org/apache/maven/doxia/doxia-modules/1.0/doxia-modules-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-modules/1.0/doxia-modules-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.3/doxia-module-xdoc-1.3.pom +fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.3/doxia-module-xdoc-1.3.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.3/doxia-module-xdoc-1.3.jar +fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.3/doxia-module-xdoc-1.3.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.jar +fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.3/doxia-decoration-model-1.3.pom +fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.3/doxia-decoration-model-1.3.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.3/doxia-decoration-model-1.3.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.3/doxia-decoration-model-1.3.jar +fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.jar +fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.2/doxia-decoration-model-1.2.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.2/doxia-decoration-model-1.2.pom +fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.3/doxia-module-fml-1.3.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.3/doxia-module-fml-1.3.pom +fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.3/doxia-module-fml-1.3.jar +fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.3/doxia-module-fml-1.3.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.jar +fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.3/doxia-module-apt-1.3.pom +fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.3/doxia-module-apt-1.3.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.3/doxia-module-apt-1.3.jar +fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.3/doxia-module-apt-1.3.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.jar +fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.3/doxia-sitetools-1.3.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.3/doxia-sitetools-1.3.pom +fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.0/doxia-sitetools-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.0/doxia-sitetools-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.2/doxia-sitetools-1.2.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.2/doxia-sitetools-1.2.pom +fetchArtifact org/apache/maven/doxia/doxia-core/1.3/doxia-core-1.3.pom +fetchArtifact org/apache/maven/doxia/doxia-core/1.3/doxia-core-1.3.jar +fetchArtifact org/apache/maven/doxia/doxia-core/1.3/doxia-core-1.3.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-core/1.3/doxia-core-1.3.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.jar +fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.3/doxia-logging-api-1.3.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.3/doxia-logging-api-1.3.pom +fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.3/doxia-logging-api-1.3.jar +fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.3/doxia-logging-api-1.3.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.2/doxia-logging-api-1.2.pom +fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.2/doxia-logging-api-1.2.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.pom +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.3/doxia-sink-api-1.3.pom +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.3/doxia-sink-api-1.3.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.3/doxia-sink-api-1.3.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.3/doxia-sink-api-1.3.jar +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.jar +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.jar +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.pom +fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.3/doxia-module-xhtml-1.3.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.3/doxia-module-xhtml-1.3.jar +fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.3/doxia-module-xhtml-1.3.pom +fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.3/doxia-module-xhtml-1.3.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.jar +fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-10/doxia-1.0-alpha-10.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-10/doxia-1.0-alpha-10.pom +fetchArtifact org/apache/maven/doxia/doxia/1.3/doxia-1.3.pom +fetchArtifact org/apache/maven/doxia/doxia/1.3/doxia-1.3.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia/1.0/doxia-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia/1.0/doxia-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia/1.2/doxia-1.2.pom +fetchArtifact org/apache/maven/doxia/doxia/1.2/doxia-1.2.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-7/doxia-1.0-alpha-7.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-7/doxia-1.0-alpha-7.pom +fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.3/doxia-site-renderer-1.3.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.3/doxia-site-renderer-1.3.pom +fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.3/doxia-site-renderer-1.3.jar +fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.3/doxia-site-renderer-1.3.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.jar +fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.pom.sha1 +fetchArtifact org/apache/apache/7/apache-7.pom +fetchArtifact org/apache/apache/7/apache-7.pom.sha1 +fetchArtifact org/apache/apache/2/apache-2.pom +fetchArtifact org/apache/apache/2/apache-2.pom.sha1 +fetchArtifact org/apache/apache/4/apache-4.pom +fetchArtifact org/apache/apache/4/apache-4.pom.sha1 +fetchArtifact org/apache/apache/9/apache-9.pom +fetchArtifact org/apache/apache/9/apache-9.pom.sha1 +fetchArtifact org/apache/apache/13/apache-13.pom +fetchArtifact org/apache/apache/13/apache-13.pom.sha1 +fetchArtifact org/apache/apache/3/apache-3.pom +fetchArtifact org/apache/apache/3/apache-3.pom.sha1 +fetchArtifact org/apache/apache/5/apache-5.pom +fetchArtifact org/apache/apache/5/apache-5.pom.sha1 +fetchArtifact org/apache/apache/6/apache-6.pom.sha1 +fetchArtifact org/apache/apache/6/apache-6.pom +fetchArtifact org/apache/apache/11/apache-11.pom +fetchArtifact org/apache/apache/11/apache-11.pom.sha1 +fetchArtifact org/apache/apache/10/apache-10.pom +fetchArtifact org/apache/apache/10/apache-10.pom.sha1 +fetchArtifact org/apache/apache-jar-resource-bundle/1.4/apache-jar-resource-bundle-1.4.jar +fetchArtifact org/apache/apache-jar-resource-bundle/1.4/apache-jar-resource-bundle-1.4.jar.sha1 +fetchArtifact org/apache/commons/commons-parent/7/commons-parent-7.pom.sha1 +fetchArtifact org/apache/commons/commons-parent/7/commons-parent-7.pom +fetchArtifact org/apache/commons/commons-parent/9/commons-parent-9.pom.sha1 +fetchArtifact org/apache/commons/commons-parent/9/commons-parent-9.pom +fetchArtifact org/apache/commons/commons-parent/3/commons-parent-3.pom +fetchArtifact org/apache/commons/commons-parent/3/commons-parent-3.pom.sha1 +fetchArtifact org/apache/commons/commons-parent/17/commons-parent-17.pom.sha1 +fetchArtifact org/apache/commons/commons-parent/17/commons-parent-17.pom +fetchArtifact org/apache/commons/commons-parent/5/commons-parent-5.pom +fetchArtifact org/apache/commons/commons-parent/5/commons-parent-5.pom.sha1 +fetchArtifact org/apache/commons/commons-parent/12/commons-parent-12.pom +fetchArtifact org/apache/commons/commons-parent/12/commons-parent-12.pom.sha1 +fetchArtifact org/mortbay/jetty/jetty-util/6.1.25/jetty-util-6.1.25.jar +fetchArtifact org/mortbay/jetty/jetty-util/6.1.25/jetty-util-6.1.25.jar.sha1 +fetchArtifact org/mortbay/jetty/jetty-util/6.1.25/jetty-util-6.1.25.pom.sha1 +fetchArtifact org/mortbay/jetty/jetty-util/6.1.25/jetty-util-6.1.25.pom +fetchArtifact org/mortbay/jetty/jetty-parent/7/jetty-parent-7.pom.sha1 +fetchArtifact org/mortbay/jetty/jetty-parent/7/jetty-parent-7.pom +fetchArtifact org/mortbay/jetty/jetty-parent/10/jetty-parent-10.pom.sha1 +fetchArtifact org/mortbay/jetty/jetty-parent/10/jetty-parent-10.pom +fetchArtifact org/mortbay/jetty/jetty/6.1.25/jetty-6.1.25.jar +fetchArtifact org/mortbay/jetty/jetty/6.1.25/jetty-6.1.25.jar.sha1 +fetchArtifact org/mortbay/jetty/jetty/6.1.25/jetty-6.1.25.pom +fetchArtifact org/mortbay/jetty/jetty/6.1.25/jetty-6.1.25.pom.sha1 +fetchArtifact org/mortbay/jetty/project/6.1.25/project-6.1.25.pom.sha1 +fetchArtifact org/mortbay/jetty/project/6.1.25/project-6.1.25.pom +fetchArtifact org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.jar +fetchArtifact org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.pom.sha1 +fetchArtifact org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.jar.sha1 +fetchArtifact org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.pom fetchArtifact org/codehaus/mojo/build-helper-maven-plugin/1.8/build-helper-maven-plugin-1.8.pom fetchArtifact org/codehaus/mojo/build-helper-maven-plugin/1.8/build-helper-maven-plugin-1.8.pom.sha1 -fetchArtifact org/codehaus/mojo/mojo-parent/30/mojo-parent-30.pom +fetchArtifact org/codehaus/mojo/build-helper-maven-plugin/1.8/build-helper-maven-plugin-1.8.jar +fetchArtifact org/codehaus/mojo/build-helper-maven-plugin/1.8/build-helper-maven-plugin-1.8.jar.sha1 fetchArtifact org/codehaus/mojo/mojo-parent/30/mojo-parent-30.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom -fetchArtifact org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom -fetchArtifact org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/1.0.12/plexus-1.0.12.pom -fetchArtifact org/codehaus/plexus/plexus/1.0.12/plexus-1.0.12.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom -fetchArtifact org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/1.0.5/plexus-1.0.5.pom -fetchArtifact org/codehaus/plexus/plexus/1.0.5/plexus-1.0.5.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom -fetchArtifact org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom -fetchArtifact org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/2.0.2/plexus-2.0.2.pom -fetchArtifact org/codehaus/plexus/plexus/2.0.2/plexus-2.0.2.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/2.0.3/plexus-2.0.3.pom -fetchArtifact org/codehaus/plexus/plexus/2.0.3/plexus-2.0.3.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/2.0.5/plexus-2.0.5.pom -fetchArtifact org/codehaus/plexus/plexus/2.0.5/plexus-2.0.5.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/2.0.6/plexus-2.0.6.pom -fetchArtifact org/codehaus/plexus/plexus/2.0.6/plexus-2.0.6.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/2.0.7/plexus-2.0.7.pom -fetchArtifact org/codehaus/plexus/plexus/2.0.7/plexus-2.0.7.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/3.0.1/plexus-3.0.1.pom -fetchArtifact org/codehaus/plexus/plexus/3.0.1/plexus-3.0.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/3.1/plexus-3.1.pom -fetchArtifact org/codehaus/plexus/plexus/3.1/plexus-3.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/3.2/plexus-3.2.pom -fetchArtifact org/codehaus/plexus/plexus/3.2/plexus-3.2.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/3.3/plexus-3.3.pom -fetchArtifact org/codehaus/plexus/plexus/3.3/plexus-3.3.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/3.3.1/plexus-3.3.1.pom -fetchArtifact org/codehaus/plexus/plexus/3.3.1/plexus-3.3.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.jar -fetchArtifact org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.pom -fetchArtifact org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.jar -fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.pom -fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.jar -fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.pom -fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-archiver/2.0.1/plexus-archiver-2.0.1.pom -fetchArtifact org/codehaus/plexus/plexus-archiver/2.0.1/plexus-archiver-2.0.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.jar -fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.pom -fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.jar -fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.pom -fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-6/plexus-classworlds-1.2-alpha-6.pom -fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-6/plexus-classworlds-1.2-alpha-6.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom -fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.pom -fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.2/plexus-classworlds-2.2.2.pom -fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.2/plexus-classworlds-2.2.2.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.pom -fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-compiler/1.9.1/plexus-compiler-1.9.1.pom -fetchArtifact org/codehaus/plexus/plexus-compiler/1.9.1/plexus-compiler-1.9.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.9.1/plexus-compiler-api-1.9.1.jar -fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.9.1/plexus-compiler-api-1.9.1.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.9.1/plexus-compiler-api-1.9.1.pom -fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.9.1/plexus-compiler-api-1.9.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.9.1/plexus-compiler-javac-1.9.1.jar -fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.9.1/plexus-compiler-javac-1.9.1.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.9.1/plexus-compiler-javac-1.9.1.pom -fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.9.1/plexus-compiler-javac-1.9.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.9.1/plexus-compiler-manager-1.9.1.jar -fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.9.1/plexus-compiler-manager-1.9.1.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.9.1/plexus-compiler-manager-1.9.1.pom -fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.9.1/plexus-compiler-manager-1.9.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-compilers/1.9.1/plexus-compilers-1.9.1.pom -fetchArtifact org/codehaus/plexus/plexus-compilers/1.9.1/plexus-compilers-1.9.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.4/plexus-component-annotations-1.5.4.pom -fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.4/plexus-component-annotations-1.5.4.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar -fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.pom -fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-component-api/1.0-alpha-15/plexus-component-api-1.0-alpha-15.pom -fetchArtifact org/codehaus/plexus/plexus-component-api/1.0-alpha-15/plexus-component-api-1.0-alpha-15.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom -fetchArtifact org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom -fetchArtifact org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-components/1.1.14/plexus-components-1.1.14.pom -fetchArtifact org/codehaus/plexus/plexus-components/1.1.14/plexus-components-1.1.14.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-components/1.1.15/plexus-components-1.1.15.pom -fetchArtifact org/codehaus/plexus/plexus-components/1.1.15/plexus-components-1.1.15.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-components/1.1.17/plexus-components-1.1.17.pom +fetchArtifact org/codehaus/mojo/mojo-parent/30/mojo-parent-30.pom +fetchArtifact org/codehaus/codehaus-parent/4/codehaus-parent-4.pom +fetchArtifact org/codehaus/codehaus-parent/4/codehaus-parent-4.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-components/1.1.19/plexus-components-1.1.19.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-components/1.1.19/plexus-components-1.1.19.pom fetchArtifact org/codehaus/plexus/plexus-components/1.1.17/plexus-components-1.1.17.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-components/1.1.18/plexus-components-1.1.18.pom +fetchArtifact org/codehaus/plexus/plexus-components/1.1.17/plexus-components-1.1.17.pom +fetchArtifact org/codehaus/plexus/plexus-components/1.3/plexus-components-1.3.pom +fetchArtifact org/codehaus/plexus/plexus-components/1.3/plexus-components-1.3.pom.sha1 fetchArtifact org/codehaus/plexus/plexus-components/1.1.18/plexus-components-1.1.18.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-components/1.1.19/plexus-components-1.1.19.pom -fetchArtifact org/codehaus/plexus/plexus-components/1.1.19/plexus-components-1.1.19.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-components/1.1.18/plexus-components-1.1.18.pom +fetchArtifact org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom fetchArtifact org/codehaus/plexus/plexus-components/1.1.20/plexus-components-1.1.20.pom fetchArtifact org/codehaus/plexus/plexus-components/1.1.20/plexus-components-1.1.20.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom -fetchArtifact org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-components/1.1.9/plexus-components-1.1.9.pom fetchArtifact org/codehaus/plexus/plexus-components/1.1.9/plexus-components-1.1.9.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-components/1.2/plexus-components-1.2.pom +fetchArtifact org/codehaus/plexus/plexus-components/1.1.9/plexus-components-1.1.9.pom fetchArtifact org/codehaus/plexus/plexus-components/1.2/plexus-components-1.2.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-components/1.3/plexus-components-1.3.pom -fetchArtifact org/codehaus/plexus/plexus-components/1.3/plexus-components-1.3.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-15/plexus-container-default-1.0-alpha-15.pom -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-15/plexus-container-default-1.0-alpha-15.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-20/plexus-container-default-1.0-alpha-20.pom -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-20/plexus-container-default-1.0-alpha-20.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.pom -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.pom -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.pom -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.pom -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-container-default/1.5.5/plexus-container-default-1.5.5.pom -fetchArtifact org/codehaus/plexus/plexus-container-default/1.5.5/plexus-container-default-1.5.5.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-15/plexus-containers-1.0-alpha-15.pom -fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-15/plexus-containers-1.0-alpha-15.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom -fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-20/plexus-containers-1.0-alpha-20.pom +fetchArtifact org/codehaus/plexus/plexus-components/1.2/plexus-components-1.2.pom +fetchArtifact org/codehaus/plexus/plexus-components/1.1.14/plexus-components-1.1.14.pom +fetchArtifact org/codehaus/plexus/plexus-components/1.1.14/plexus-components-1.1.14.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-components/1.1.15/plexus-components-1.1.15.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-components/1.1.15/plexus-components-1.1.15.pom +fetchArtifact org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom +fetchArtifact org/codehaus/plexus/plexus-containers/1.5.5/plexus-containers-1.5.5.pom +fetchArtifact org/codehaus/plexus/plexus-containers/1.5.5/plexus-containers-1.5.5.pom.sha1 fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-20/plexus-containers-1.0-alpha-20.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-30/plexus-containers-1.0-alpha-30.pom -fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-30/plexus-containers-1.0-alpha-30.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-20/plexus-containers-1.0-alpha-20.pom fetchArtifact org/codehaus/plexus/plexus-containers/1.0.3/plexus-containers-1.0.3.pom fetchArtifact org/codehaus/plexus/plexus-containers/1.0.3/plexus-containers-1.0.3.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-30/plexus-containers-1.0-alpha-30.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-30/plexus-containers-1.0-alpha-30.pom +fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-15/plexus-containers-1.0-alpha-15.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-15/plexus-containers-1.0-alpha-15.pom +fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom +fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom.sha1 fetchArtifact org/codehaus/plexus/plexus-containers/1.5.4/plexus-containers-1.5.4.pom fetchArtifact org/codehaus/plexus/plexus-containers/1.5.4/plexus-containers-1.5.4.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-containers/1.5.5/plexus-containers-1.5.5.pom -fetchArtifact org/codehaus/plexus/plexus-containers/1.5.5/plexus-containers-1.5.5.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.jar -fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.pom -fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.pom.sha1 fetchArtifact org/codehaus/plexus/plexus-interactivity/1.0-alpha-6/plexus-interactivity-1.0-alpha-6.pom fetchArtifact org/codehaus/plexus/plexus-interactivity/1.0-alpha-6/plexus-interactivity-1.0-alpha-6.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.jar -fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.pom -fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.jar -fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.pom -fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.pom -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.jar -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.pom -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.jar -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.pom -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-resources/1.0-alpha-5/plexus-resources-1.0-alpha-5.pom +fetchArtifact org/codehaus/plexus/plexus-resources/1.0-alpha-5/plexus-resources-1.0-alpha-5.jar +fetchArtifact org/codehaus/plexus/plexus-resources/1.0-alpha-5/plexus-resources-1.0-alpha-5.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-resources/1.0-alpha-5/plexus-resources-1.0-alpha-5.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-component-api/1.0-alpha-15/plexus-component-api-1.0-alpha-15.pom +fetchArtifact org/codehaus/plexus/plexus-component-api/1.0-alpha-15/plexus-component-api-1.0-alpha-15.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom +fetchArtifact org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-container-default/1.5.5/plexus-container-default-1.5.5.pom +fetchArtifact org/codehaus/plexus/plexus-container-default/1.5.5/plexus-container-default-1.5.5.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-20/plexus-container-default-1.0-alpha-20.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-20/plexus-container-default-1.0-alpha-20.pom +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.pom +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.pom +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-15/plexus-container-default-1.0-alpha-15.pom +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-15/plexus-container-default-1.0-alpha-15.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.pom +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.pom +fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.9.1/plexus-compiler-javac-1.9.1.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.9.1/plexus-compiler-javac-1.9.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.9.1/plexus-compiler-javac-1.9.1.pom +fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.9.1/plexus-compiler-javac-1.9.1.jar +fetchArtifact org/codehaus/plexus/plexus-compilers/1.9.1/plexus-compilers-1.9.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-compilers/1.9.1/plexus-compilers-1.9.1.pom +fetchArtifact org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.jar +fetchArtifact org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.pom +fetchArtifact org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.pom +fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.jar +fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-archiver/2.0.1/plexus-archiver-2.0.1.pom +fetchArtifact org/codehaus/plexus/plexus-archiver/2.0.1/plexus-archiver-2.0.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.pom +fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.jar +fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.pom +fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.jar +fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.jar +fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.pom +fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.pom +fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar +fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.4/plexus-component-annotations-1.5.4.pom +fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.4/plexus-component-annotations-1.5.4.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.pom fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.jar fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.pom fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.jar -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.pom +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.jar +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.jar +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.pom +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.pom fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.pom +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.jar fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-io/1.0/plexus-io-1.0.jar -fetchArtifact org/codehaus/plexus/plexus-io/1.0/plexus-io-1.0.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-io/1.0/plexus-io-1.0.pom -fetchArtifact org/codehaus/plexus/plexus-io/1.0/plexus-io-1.0.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.jar -fetchArtifact org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.pom -fetchArtifact org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-io/2.0.1/plexus-io-2.0.1.pom -fetchArtifact org/codehaus/plexus/plexus-io/2.0.1/plexus-io-2.0.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.jar -fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.pom -fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.jar -fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.pom -fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-resources/1.0-alpha-5/plexus-resources-1.0-alpha-5.jar -fetchArtifact org/codehaus/plexus/plexus-resources/1.0-alpha-5/plexus-resources-1.0-alpha-5.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-resources/1.0-alpha-5/plexus-resources-1.0-alpha-5.pom -fetchArtifact org/codehaus/plexus/plexus-resources/1.0-alpha-5/plexus-resources-1.0-alpha-5.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.3/plexus-utils-1.3.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.3/plexus-utils-1.3.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.4/plexus-utils-1.4.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.4/plexus-utils-1.4.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.4.1/plexus-utils-1.4.1.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.4.1/plexus-utils-1.4.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.4.2/plexus-utils-1.4.2.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.4.2/plexus-utils-1.4.2.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.4.6/plexus-utils-1.4.6.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.4.6/plexus-utils-1.4.6.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.4.9/plexus-utils-1.4.9.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.4.9/plexus-utils-1.4.9.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.10/plexus-utils-1.5.10.jar -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.10/plexus-utils-1.5.10.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.10/plexus-utils-1.5.10.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.10/plexus-utils-1.5.10.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.jar -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.15/plexus-utils-1.5.15.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.15/plexus-utils-1.5.15.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.5/plexus-utils-1.5.5.pom +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/3.0.10/plexus-utils-3.0.10.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/3.0.10/plexus-utils-3.0.10.pom fetchArtifact org/codehaus/plexus/plexus-utils/1.5.5/plexus-utils-1.5.5.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.5/plexus-utils-1.5.5.pom fetchArtifact org/codehaus/plexus/plexus-utils/1.5.7/plexus-utils-1.5.7.pom fetchArtifact org/codehaus/plexus/plexus-utils/1.5.7/plexus-utils-1.5.7.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.jar -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/2.0.4/plexus-utils-2.0.4.pom -fetchArtifact org/codehaus/plexus/plexus-utils/2.0.4/plexus-utils-2.0.4.pom.sha1 fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.jar +fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.pom.sha1 fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.jar.sha1 fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.pom -fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/2.1/plexus-utils-2.1.pom -fetchArtifact org/codehaus/plexus/plexus-utils/2.1/plexus-utils-2.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.jar +fetchArtifact org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.jar +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.jar.sha1 fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.pom fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/3.0.10/plexus-utils-3.0.10.pom -fetchArtifact org/codehaus/plexus/plexus-utils/3.0.10/plexus-utils-3.0.10.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.pom +fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.jar +fetchArtifact org/codehaus/plexus/plexus-utils/1.3/plexus-utils-1.3.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.3/plexus-utils-1.3.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.4.9/plexus-utils-1.4.9.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.4.9/plexus-utils-1.4.9.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.4.2/plexus-utils-1.4.2.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.4.2/plexus-utils-1.4.2.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.10/plexus-utils-1.5.10.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.10/plexus-utils-1.5.10.jar +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.10/plexus-utils-1.5.10.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.10/plexus-utils-1.5.10.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom fetchArtifact org/codehaus/plexus/plexus-utils/3.0.15/plexus-utils-3.0.15.jar fetchArtifact org/codehaus/plexus/plexus-utils/3.0.15/plexus-utils-3.0.15.jar.sha1 fetchArtifact org/codehaus/plexus/plexus-utils/3.0.15/plexus-utils-3.0.15.pom fetchArtifact org/codehaus/plexus/plexus-utils/3.0.15/plexus-utils-3.0.15.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/3.0.8/plexus-utils-3.0.8.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.pom.sha1 fetchArtifact org/codehaus/plexus/plexus-utils/3.0.8/plexus-utils-3.0.8.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/3.0.8/plexus-utils-3.0.8.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.4.1/plexus-utils-1.4.1.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.4.1/plexus-utils-1.4.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.4.6/plexus-utils-1.4.6.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.4.6/plexus-utils-1.4.6.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.15/plexus-utils-1.5.15.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.15/plexus-utils-1.5.15.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.4/plexus-utils-1.4.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.4/plexus-utils-1.4.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/2.0.4/plexus-utils-2.0.4.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/2.0.4/plexus-utils-2.0.4.pom fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.jar -fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.pom fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.jar -fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.pom -fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.pom +fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.jar +fetchArtifact org/codehaus/plexus/plexus-utils/2.1/plexus-utils-2.1.pom +fetchArtifact org/codehaus/plexus/plexus-utils/2.1/plexus-utils-2.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.9.1/plexus-compiler-api-1.9.1.jar +fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.9.1/plexus-compiler-api-1.9.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.9.1/plexus-compiler-api-1.9.1.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.9.1/plexus-compiler-api-1.9.1.pom +fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.jar +fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.pom +fetchArtifact org/codehaus/plexus/plexus-io/1.0/plexus-io-1.0.jar +fetchArtifact org/codehaus/plexus/plexus-io/1.0/plexus-io-1.0.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-io/1.0/plexus-io-1.0.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-io/1.0/plexus-io-1.0.pom +fetchArtifact org/codehaus/plexus/plexus-io/2.0.1/plexus-io-2.0.1.pom +fetchArtifact org/codehaus/plexus/plexus-io/2.0.1/plexus-io-2.0.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.jar +fetchArtifact org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.pom +fetchArtifact org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.jar +fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.pom +fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.pom +fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.jar +fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.9.1/plexus-compiler-manager-1.9.1.pom +fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.9.1/plexus-compiler-manager-1.9.1.jar +fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.9.1/plexus-compiler-manager-1.9.1.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.9.1/plexus-compiler-manager-1.9.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/2.0.5/plexus-2.0.5.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/2.0.5/plexus-2.0.5.pom +fetchArtifact org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom +fetchArtifact org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/1.0.5/plexus-1.0.5.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/1.0.5/plexus-1.0.5.pom +fetchArtifact org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom +fetchArtifact org/codehaus/plexus/plexus/1.0.12/plexus-1.0.12.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/1.0.12/plexus-1.0.12.pom +fetchArtifact org/codehaus/plexus/plexus/2.0.6/plexus-2.0.6.pom +fetchArtifact org/codehaus/plexus/plexus/2.0.6/plexus-2.0.6.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/3.3/plexus-3.3.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/3.3/plexus-3.3.pom +fetchArtifact org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom +fetchArtifact org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom +fetchArtifact org/codehaus/plexus/plexus/3.3.1/plexus-3.3.1.pom +fetchArtifact org/codehaus/plexus/plexus/3.3.1/plexus-3.3.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom +fetchArtifact org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/3.1/plexus-3.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/3.1/plexus-3.1.pom +fetchArtifact org/codehaus/plexus/plexus/2.0.2/plexus-2.0.2.pom +fetchArtifact org/codehaus/plexus/plexus/2.0.2/plexus-2.0.2.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/3.2/plexus-3.2.pom +fetchArtifact org/codehaus/plexus/plexus/3.2/plexus-3.2.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/2.0.7/plexus-2.0.7.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/2.0.7/plexus-2.0.7.pom +fetchArtifact org/codehaus/plexus/plexus/3.0.1/plexus-3.0.1.pom +fetchArtifact org/codehaus/plexus/plexus/3.0.1/plexus-3.0.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/2.0.3/plexus-2.0.3.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/2.0.3/plexus-2.0.3.pom +fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.pom +fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.jar +fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.jar +fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.pom +fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.8/plexus-velocity-1.1.8.pom.sha1 fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.8/plexus-velocity-1.1.8.jar fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.8/plexus-velocity-1.1.8.jar.sha1 fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.8/plexus-velocity-1.1.8.pom -fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.8/plexus-velocity-1.1.8.pom.sha1 -fetchArtifact org/eclipse/aether/aether/0.9.0.M2/aether-0.9.0.M2.pom -fetchArtifact org/eclipse/aether/aether/0.9.0.M2/aether-0.9.0.M2.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.jar +fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.pom +fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.pom +fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-6/plexus-classworlds-1.2-alpha-6.pom +fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-6/plexus-classworlds-1.2-alpha-6.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom +fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.pom +fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.2/plexus-classworlds-2.2.2.pom +fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.2/plexus-classworlds-2.2.2.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-compiler/1.9.1/plexus-compiler-1.9.1.pom +fetchArtifact org/codehaus/plexus/plexus-compiler/1.9.1/plexus-compiler-1.9.1.pom.sha1 +fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.pom.sha1 +fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.pom fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.jar fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.jar.sha1 -fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.pom -fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.pom.sha1 +fetchArtifact org/eclipse/aether/aether/0.9.0.M2/aether-0.9.0.M2.pom.sha1 +fetchArtifact org/eclipse/aether/aether/0.9.0.M2/aether-0.9.0.M2.pom fetchArtifact org/eclipse/jetty/jetty-parent/14/jetty-parent-14.pom fetchArtifact org/eclipse/jetty/jetty-parent/14/jetty-parent-14.pom.sha1 -fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar -fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar.sha1 +fetchArtifact org/beanshell/bsh/2.0b4/bsh-2.0b4.jar +fetchArtifact org/beanshell/bsh/2.0b4/bsh-2.0b4.pom +fetchArtifact org/beanshell/bsh/2.0b4/bsh-2.0b4.jar.sha1 +fetchArtifact org/beanshell/bsh/2.0b4/bsh-2.0b4.pom.sha1 +fetchArtifact org/beanshell/beanshell/2.0b4/beanshell-2.0b4.pom.sha1 +fetchArtifact org/beanshell/beanshell/2.0b4/beanshell-2.0b4.pom fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.pom fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.pom.sha1 -fetchArtifact org/hamcrest/hamcrest-parent/1.1/hamcrest-parent-1.1.pom +fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar.sha1 +fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar fetchArtifact org/hamcrest/hamcrest-parent/1.1/hamcrest-parent-1.1.pom.sha1 -fetchArtifact org/jdom/jdom/1.1/jdom-1.1.jar -fetchArtifact org/jdom/jdom/1.1/jdom-1.1.jar.sha1 -fetchArtifact org/jdom/jdom/1.1/jdom-1.1.pom -fetchArtifact org/jdom/jdom/1.1/jdom-1.1.pom.sha1 -fetchArtifact org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar -fetchArtifact org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar.sha1 -fetchArtifact org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.pom -fetchArtifact org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.pom.sha1 -fetchArtifact org/mortbay/jetty/jetty/6.1.25/jetty-6.1.25.jar -fetchArtifact org/mortbay/jetty/jetty/6.1.25/jetty-6.1.25.jar.sha1 -fetchArtifact org/mortbay/jetty/jetty/6.1.25/jetty-6.1.25.pom -fetchArtifact org/mortbay/jetty/jetty/6.1.25/jetty-6.1.25.pom.sha1 -fetchArtifact org/mortbay/jetty/jetty-parent/10/jetty-parent-10.pom -fetchArtifact org/mortbay/jetty/jetty-parent/10/jetty-parent-10.pom.sha1 -fetchArtifact org/mortbay/jetty/jetty-parent/7/jetty-parent-7.pom -fetchArtifact org/mortbay/jetty/jetty-parent/7/jetty-parent-7.pom.sha1 -fetchArtifact org/mortbay/jetty/jetty-util/6.1.25/jetty-util-6.1.25.jar -fetchArtifact org/mortbay/jetty/jetty-util/6.1.25/jetty-util-6.1.25.jar.sha1 -fetchArtifact org/mortbay/jetty/jetty-util/6.1.25/jetty-util-6.1.25.pom -fetchArtifact org/mortbay/jetty/jetty-util/6.1.25/jetty-util-6.1.25.pom.sha1 -fetchArtifact org/mortbay/jetty/project/6.1.25/project-6.1.25.pom -fetchArtifact org/mortbay/jetty/project/6.1.25/project-6.1.25.pom.sha1 -fetchArtifact org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.jar -fetchArtifact org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.jar.sha1 -fetchArtifact org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.pom -fetchArtifact org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.pom.sha1 -fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.jar -fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.jar.sha1 -fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.pom -fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.pom.sha1 -fetchArtifact org/sonatype/aether/aether-api/1.7/aether-api-1.7.pom -fetchArtifact org/sonatype/aether/aether-api/1.7/aether-api-1.7.pom.sha1 -fetchArtifact org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.pom -fetchArtifact org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.pom.sha1 -fetchArtifact org/sonatype/aether/aether-parent/1.7/aether-parent-1.7.pom -fetchArtifact org/sonatype/aether/aether-parent/1.7/aether-parent-1.7.pom.sha1 -fetchArtifact org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.pom +fetchArtifact org/hamcrest/hamcrest-parent/1.1/hamcrest-parent-1.1.pom +fetchArtifact org/sonatype/oss/oss-parent/7/oss-parent-7.pom.sha1 +fetchArtifact org/sonatype/oss/oss-parent/7/oss-parent-7.pom +fetchArtifact org/sonatype/oss/oss-parent/6/oss-parent-6.pom.sha1 +fetchArtifact org/sonatype/oss/oss-parent/6/oss-parent-6.pom fetchArtifact org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.pom.sha1 +fetchArtifact org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.pom fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.jar fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.jar.sha1 -fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.pom fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.pom.sha1 -fetchArtifact org/sonatype/forge/forge-parent/10/forge-parent-10.pom -fetchArtifact org/sonatype/forge/forge-parent/10/forge-parent-10.pom.sha1 -fetchArtifact org/sonatype/forge/forge-parent/3/forge-parent-3.pom -fetchArtifact org/sonatype/forge/forge-parent/3/forge-parent-3.pom.sha1 -fetchArtifact org/sonatype/forge/forge-parent/4/forge-parent-4.pom -fetchArtifact org/sonatype/forge/forge-parent/4/forge-parent-4.pom.sha1 -fetchArtifact org/sonatype/forge/forge-parent/5/forge-parent-5.pom -fetchArtifact org/sonatype/forge/forge-parent/5/forge-parent-5.pom.sha1 -fetchArtifact org/sonatype/forge/forge-parent/6/forge-parent-6.pom -fetchArtifact org/sonatype/forge/forge-parent/6/forge-parent-6.pom.sha1 -fetchArtifact org/sonatype/oss/oss-parent/6/oss-parent-6.pom -fetchArtifact org/sonatype/oss/oss-parent/6/oss-parent-6.pom.sha1 -fetchArtifact org/sonatype/oss/oss-parent/7/oss-parent-7.pom -fetchArtifact org/sonatype/oss/oss-parent/7/oss-parent-7.pom.sha1 -fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.jar -fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.jar.sha1 -fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.pom -fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.pom.sha1 -fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar -fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar.sha1 -fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.pom -fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.pom.sha1 -fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar -fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar.sha1 -fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.pom -fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.pom.sha1 -fetchArtifact org/sonatype/sisu/inject/guice-bean/1.4.2/guice-bean-1.4.2.pom -fetchArtifact org/sonatype/sisu/inject/guice-bean/1.4.2/guice-bean-1.4.2.pom.sha1 +fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.pom +fetchArtifact org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.pom.sha1 +fetchArtifact org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.pom +fetchArtifact org/sonatype/aether/aether-api/1.7/aether-api-1.7.pom.sha1 +fetchArtifact org/sonatype/aether/aether-api/1.7/aether-api-1.7.pom +fetchArtifact org/sonatype/aether/aether-parent/1.7/aether-parent-1.7.pom +fetchArtifact org/sonatype/aether/aether-parent/1.7/aether-parent-1.7.pom.sha1 +fetchArtifact org/sonatype/sisu/sisu-parent/1.4.2/sisu-parent-1.4.2.pom.sha1 +fetchArtifact org/sonatype/sisu/sisu-parent/1.4.2/sisu-parent-1.4.2.pom +fetchArtifact org/sonatype/sisu/sisu-inject/1.4.2/sisu-inject-1.4.2.pom +fetchArtifact org/sonatype/sisu/sisu-inject/1.4.2/sisu-inject-1.4.2.pom.sha1 fetchArtifact org/sonatype/sisu/inject/guice-plexus/1.4.2/guice-plexus-1.4.2.pom fetchArtifact org/sonatype/sisu/inject/guice-plexus/1.4.2/guice-plexus-1.4.2.pom.sha1 -fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7-noaop.jar +fetchArtifact org/sonatype/sisu/inject/guice-bean/1.4.2/guice-bean-1.4.2.pom +fetchArtifact org/sonatype/sisu/inject/guice-bean/1.4.2/guice-bean-1.4.2.pom.sha1 +fetchArtifact org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.pom.sha1 +fetchArtifact org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.pom fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7-noaop.jar.sha1 -fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7.pom +fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7-noaop.jar fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7.pom.sha1 -fetchArtifact org/sonatype/sisu/sisu-inject/1.4.2/sisu-inject-1.4.2.pom -fetchArtifact org/sonatype/sisu/sisu-inject/1.4.2/sisu-inject-1.4.2.pom.sha1 -fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.jar +fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7.pom fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.jar.sha1 +fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.jar fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.pom fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.pom.sha1 -fetchArtifact org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.pom -fetchArtifact org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.pom.sha1 -fetchArtifact org/sonatype/sisu/sisu-parent/1.4.2/sisu-parent-1.4.2.pom -fetchArtifact org/sonatype/sisu/sisu-parent/1.4.2/sisu-parent-1.4.2.pom.sha1 -fetchArtifact org/sonatype/spice/spice-parent/10/spice-parent-10.pom -fetchArtifact org/sonatype/spice/spice-parent/10/spice-parent-10.pom.sha1 -fetchArtifact org/sonatype/spice/spice-parent/12/spice-parent-12.pom -fetchArtifact org/sonatype/spice/spice-parent/12/spice-parent-12.pom.sha1 fetchArtifact org/sonatype/spice/spice-parent/16/spice-parent-16.pom fetchArtifact org/sonatype/spice/spice-parent/16/spice-parent-16.pom.sha1 -fetchArtifact org/sonatype/spice/spice-parent/17/spice-parent-17.pom fetchArtifact org/sonatype/spice/spice-parent/17/spice-parent-17.pom.sha1 -fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.jar -fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.jar.sha1 -fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.pom -fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.pom.sha1 -fetchArtifact oro/oro/2.0.8/oro-2.0.8.jar -fetchArtifact oro/oro/2.0.8/oro-2.0.8.jar.sha1 +fetchArtifact org/sonatype/spice/spice-parent/17/spice-parent-17.pom +fetchArtifact org/sonatype/spice/spice-parent/12/spice-parent-12.pom +fetchArtifact org/sonatype/spice/spice-parent/12/spice-parent-12.pom.sha1 +fetchArtifact org/sonatype/spice/spice-parent/10/spice-parent-10.pom.sha1 +fetchArtifact org/sonatype/spice/spice-parent/10/spice-parent-10.pom +fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.jar +fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.jar.sha1 +fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.pom +fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.pom.sha1 +fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.pom.sha1 +fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar +fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.pom +fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar.sha1 +fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.pom.sha1 +fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar.sha1 +fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar +fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.pom +fetchArtifact org/sonatype/forge/forge-parent/4/forge-parent-4.pom.sha1 +fetchArtifact org/sonatype/forge/forge-parent/4/forge-parent-4.pom +fetchArtifact org/sonatype/forge/forge-parent/3/forge-parent-3.pom +fetchArtifact org/sonatype/forge/forge-parent/3/forge-parent-3.pom.sha1 +fetchArtifact org/sonatype/forge/forge-parent/5/forge-parent-5.pom.sha1 +fetchArtifact org/sonatype/forge/forge-parent/5/forge-parent-5.pom +fetchArtifact org/sonatype/forge/forge-parent/6/forge-parent-6.pom.sha1 +fetchArtifact org/sonatype/forge/forge-parent/6/forge-parent-6.pom +fetchArtifact org/sonatype/forge/forge-parent/10/forge-parent-10.pom.sha1 +fetchArtifact org/sonatype/forge/forge-parent/10/forge-parent-10.pom +fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.jar.sha1 +fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.pom.sha1 +fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.pom +fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.jar +fetchArtifact junit/junit/3.8.1/junit-3.8.1.pom +fetchArtifact junit/junit/3.8.1/junit-3.8.1.jar +fetchArtifact junit/junit/3.8.1/junit-3.8.1.jar.sha1 +fetchArtifact junit/junit/3.8.1/junit-3.8.1.pom.sha1 +fetchArtifact junit/junit/4.10/junit-4.10.pom.sha1 +fetchArtifact junit/junit/4.10/junit-4.10.pom +fetchArtifact junit/junit/3.8.2/junit-3.8.2.pom +fetchArtifact junit/junit/3.8.2/junit-3.8.2.pom.sha1 +fetchArtifact avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.pom.sha1 +fetchArtifact avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.pom +fetchArtifact antlr/antlr/2.7.2/antlr-2.7.2.pom +fetchArtifact antlr/antlr/2.7.2/antlr-2.7.2.pom.sha1 +fetchArtifact antlr/antlr/2.7.2/antlr-2.7.2.jar +fetchArtifact antlr/antlr/2.7.2/antlr-2.7.2.jar.sha1 +fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar +fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.pom.sha1 +fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.pom +fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar.sha1 +fetchArtifact commons-beanutils/commons-beanutils/1.6/commons-beanutils-1.6.pom +fetchArtifact commons-beanutils/commons-beanutils/1.6/commons-beanutils-1.6.pom.sha1 +fetchArtifact doxia/doxia-sink-api/1.0-alpha-4/doxia-sink-api-1.0-alpha-4.pom.sha1 +fetchArtifact doxia/doxia-sink-api/1.0-alpha-4/doxia-sink-api-1.0-alpha-4.pom +fetchArtifact javax/servlet/servlet-api/2.3/servlet-api-2.3.pom +fetchArtifact javax/servlet/servlet-api/2.3/servlet-api-2.3.pom.sha1 +fetchArtifact javax/servlet/servlet-api/2.5/servlet-api-2.5.pom.sha1 +fetchArtifact javax/servlet/servlet-api/2.5/servlet-api-2.5.jar.sha1 +fetchArtifact javax/servlet/servlet-api/2.5/servlet-api-2.5.jar +fetchArtifact javax/servlet/servlet-api/2.5/servlet-api-2.5.pom +fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.jar.sha1 +fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.pom.sha1 +fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.jar +fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.pom +fetchArtifact commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.pom +fetchArtifact commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.jar +fetchArtifact commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.jar.sha1 +fetchArtifact commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.pom.sha1 fetchArtifact oro/oro/2.0.8/oro-2.0.8.pom +fetchArtifact oro/oro/2.0.8/oro-2.0.8.jar.sha1 fetchArtifact oro/oro/2.0.8/oro-2.0.8.pom.sha1 -fetchArtifact sslext/sslext/1.2-0/sslext-1.2-0.jar -fetchArtifact sslext/sslext/1.2-0/sslext-1.2-0.jar.sha1 -fetchArtifact sslext/sslext/1.2-0/sslext-1.2-0.pom -fetchArtifact sslext/sslext/1.2-0/sslext-1.2-0.pom.sha1 -fetchArtifact velocity/velocity/1.5/velocity-1.5.jar -fetchArtifact velocity/velocity/1.5/velocity-1.5.jar.sha1 -fetchArtifact velocity/velocity/1.5/velocity-1.5.pom -fetchArtifact velocity/velocity/1.5/velocity-1.5.pom.sha1 -fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar -fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar.sha1 -fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.pom -fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.pom.sha1 -fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar -fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar.sha1 -fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.pom -fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.pom.sha1 -fetchArtifact xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar -fetchArtifact xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar.sha1 -fetchArtifact xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.pom -fetchArtifact xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.pom.sha1 -fetchArtifact xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.pom -fetchArtifact xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.pom.sha1 +fetchArtifact oro/oro/2.0.8/oro-2.0.8.jar stopNest diff --git a/pkgs/applications/networking/cluster/rq/default.nix b/pkgs/applications/networking/cluster/rq/default.nix index 8935aeb2771a..fdf11adfb6c0 100644 --- a/pkgs/applications/networking/cluster/rq/default.nix +++ b/pkgs/applications/networking/cluster/rq/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { ''; meta = { - license = "Ruby"; + license = stdenv.lib.licenses.ruby; homepage = "http://www.codeforpeople.com/lib/ruby/rq/"; description = "Simple cluster queue runner"; longDescription = "rq creates instant linux clusters by managing priority work queues, even on a multi-core single machine. This cluster runner is easy to install and easy to manage, contrasting with the common complicated solutions."; diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 82a340591f21..d55e2b18162b 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -25,9 +25,9 @@ let else if stdenv.system == "i686-linux" then "ld-linux.so.2" else throw "Dropbox client for: ${stdenv.system} not supported!"; - version = "2.10.30"; - sha256 = if stdenv.system == "x86_64-linux" then "1gdch4fka5f671zwl329j6b60igki1rzxw9ggxcywcg1h4rlvw7r" - else if stdenv.system == "i686-linux" then "1a4pswpy945iqzvi8kcs1r0sydb04h28v5zv0hdyra0c548wsm2g" + version = "2.10.52"; + sha256 = if stdenv.system == "x86_64-linux" then "0fn2frp00f0p0r6v5czzxfbw1ifan9w12k3ry8gq1m4bvx6g27p6" + else if stdenv.system == "i686-linux" then "1rm5kspb53zqgaz48v8x3ffk1mcfi0nh0zsmsdniyrgqbis5mmm9" else throw "Dropbox client for: ${stdenv.system} not supported!"; # relative location where the dropbox libraries are stored diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 5f695f80b199..bf8f9234f5a2 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, dbus, gnutls, wxGTK28, libidn, tinyxml, gettext +{ stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext , pkgconfig, xdg_utils, gtk2, sqlite }: -let version = "3.8.1"; in +let version = "3.9.0.6"; in stdenv.mkDerivation { name = "filezilla-${version}"; src = fetchurl { url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2"; - sha256 = "0kqyz8yb15kbzx02l3riswg95prbp402k4672nwxrzs35049rg36"; + sha256 = "1dxhj4ijpl5m2r5f9p04kbaqcvivy3lrb1kdn5axqngshfrmczyf"; }; configureFlags = [ @@ -15,7 +15,7 @@ stdenv.mkDerivation { ]; buildInputs = [ - dbus gnutls wxGTK28 libidn tinyxml gettext pkgconfig xdg_utils gtk2 sqlite + dbus gnutls wxGTK30 libidn tinyxml gettext pkgconfig xdg_utils gtk2 sqlite ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/ids/daq/default.nix b/pkgs/applications/networking/ids/daq/default.nix index 3e7a80f137d5..287a4239c2c0 100644 --- a/pkgs/applications/networking/ids/daq/default.nix +++ b/pkgs/applications/networking/ids/daq/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, flex, bison, libpcap}: stdenv.mkDerivation rec { - name = "daq-2.0.2"; + name = "daq-2.0.4"; src = fetchurl { name = "${name}.tar.gz"; url = "http://www.snort.org/downloads/snort/${name}.tar.gz"; - sha256 = "1a39qbm9nc05yr8llawl7mz0ny1fci4acj9c2k1h4klrqikiwpfn"; + sha256 = "0g15kny0s6mpqfc723jxv7mgjfh45izhwcidhjzh52fd04ysm552"; }; buildInputs = [ flex bison libpcap ]; diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix index 5b740cec9355..3f99094ffd45 100644 --- a/pkgs/applications/networking/ids/snort/default.nix +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, libpcap, pcre, libdnet, daq, zlib, flex, bison}: stdenv.mkDerivation rec { - name = "snort-2.9.6.2"; + name = "snort-2.9.7.0"; src = fetchurl { name = "${name}.tar.gz"; url = "http://www.snort.org/downloads/snort/${name}.tar.gz"; - sha256 = "0xsxbd5h701ncnhn9sf7zkmzravlqhn1182whinphfjjw72py7cf"; + sha256 = "16z4mi7bri7ygvc0j4hhl2pgcw6xwxah1h3wk5vpy2yj8pmayf4p"; }; buildInputs = [ libpcap pcre libdnet daq zlib flex bison ]; diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix new file mode 100644 index 000000000000..a7b5ef6972ef --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/blink/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, pythonPackages, pyqt4, cython, libvncserver, zlib, twisted, gnutls }: + +pythonPackages.buildPythonPackage rec { + name = "blink-${version}"; + version = "0.9.1"; + + src = fetchurl { + url = "http://download.ag-projects.com/BlinkQt/${name}.tar.gz"; + sha256 = "f578e5186893c3488e7773fbb775028ae54540433a0c51aefa5af983ca2bfdae"; + }; + + patches = [ ./pythonpath.patch ]; + + propagatedBuildInputs = [ pyqt4 pythonPackages.cjson pythonPackages.sipsimple twisted ]; + + buildInputs = [ cython zlib libvncserver ]; + + postInstall = '' + wrapProgram $out/bin/blink \ + --prefix LD_LIBRARY_PATH : ${gnutls}/lib + ''; + + meta = { + homepage = http://icanblink.com/; + description = "A state of the art, easy to use SIP client"; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/blink/pythonpath.patch b/pkgs/applications/networking/instant-messengers/blink/pythonpath.patch new file mode 100644 index 000000000000..2cf7ba19d383 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/blink/pythonpath.patch @@ -0,0 +1,12 @@ +diff --git a/blink/resources.py b/blink/resources.py +index 524d9e5..c271887 100644 +--- a/blink/resources.py ++++ b/blink/resources.py +@@ -64,6 +64,7 @@ class Resources(object): + if script == '': + application_directory = os.path.realpath(script) # executed in interactive interpreter + else: ++ script = os.path.join(sys.path[0], script) + binary_directory = os.path.dirname(os.path.realpath(script)) + if os.path.basename(binary_directory) == 'bin': + application_directory = os.path.dirname(binary_directory) diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix index 41bd4ca45131..cae9fe294f34 100644 --- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix +++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { perl perlXMLParser evolution_data_server gnome_doc_utils avahi libsigcxx gtk dbus_glib libnotify libXext xextproto sqlite gnome3.libsoup glib gnome3.gnome_icon_theme_symbolic - hicolor_icon_theme gnome3.gnome_icon_theme boost boost.lib + hicolor_icon_theme gnome3.gnome_icon_theme boost autoreconfHook pkgconfig libxml2 videoproto unixODBC db nspr nss zlib libsecret libXrandr randrproto which libxslt libtasn1 gmp nettle makeWrapper ]; diff --git a/pkgs/applications/networking/instant-messengers/freetalk/default.nix b/pkgs/applications/networking/instant-messengers/freetalk/default.nix index cdbc4233cf48..320e7094d484 100644 --- a/pkgs/applications/networking/instant-messengers/freetalk/default.nix +++ b/pkgs/applications/networking/instant-messengers/freetalk/default.nix @@ -1,51 +1,43 @@ -x@{builderDefsPackage - , guile, pkgconfig, glib, loudmouth, gmp, libidn, readline, libtool - , libunwind, ncurses - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchgit +, guile, pkgconfig, glib, loudmouth, gmp, libidn, readline, libtool +, libunwind, ncurses, curl, jansson, texinfo +, automake, autoconf +}: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { +let + s = rec { baseName="freetalk"; - version="3.2"; + version="4.0rc6"; name="${baseName}-${version}"; - url="mirror://savannah/${baseName}/${name}.tar.gz"; - hash="12dn7yj9k5xsrrjlnma77wzpvsdxjccwla1q0wy3lacl5l2p0jms"; + url="https://github.com/GNUFreetalk/freetalk"; + rev = "refs/tags/v${version}"; + sha256="0sj3bwq9n6ijwv552nmi038sz7wayq8r3zaj6ngn2cnkn2b5nwbz"; }; + buildInputs = [ + guile pkgconfig glib loudmouth gmp libidn readline libtool + libunwind ncurses curl jansson texinfo + autoconf automake + ]; in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; - }; - - inherit (sourceInfo) name version; +stdenv.mkDerivation { + inherit (s) name version; inherit buildInputs; + src = fetchgit { + inherit (s) url rev sha256; + name = "git-export-${s.name}"; + }; - patches = [./01_callbacks_const_fix.diff]; + preConfigure = '' + patchShebangs . + ./autogen.sh + ''; - /* doConfigure should be removed if not needed */ - phaseNames = ["doPatch" "doConfigure" "doMakeInstall"]; - meta = { - description = "Console XMPP client"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; - license = a.lib.licenses.gpl3Plus; + inherit (s) version; + description = "Console XMPP client"; + license = stdenv.lib.licenses.gpl3Plus ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + downloadPage = "http://www.gnu.org/software/freetalk/"; }; - passthru = { - updateInfo = { - downloadPage = "http://www.gnu.org/software/freetalk/"; - }; - }; -}) x - +} diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index d5902d143590..82d11e02fe1d 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python, intltool, pkgconfig, libX11, gtk -, ldns, pyopenssl, pythonDBus, pythonPackages +, ldns, pythonDBus, pythonPackages , enableJingle ? true, farstream ? null, gst_plugins_bad ? null , libnice ? null @@ -22,21 +22,15 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "gajim-${version}"; - version = "0.15.4"; + version = "0.16"; src = fetchurl { - url = "http://www.gajim.org/downloads/0.15/gajim-${version}.tar.gz"; - sha256 = "1g4m5j777vqqdwqvr2m6l09ljjx65ilag45d5kfc78z7frm0cz7g"; + url = "http://www.gajim.org/downloads/0.16/gajim-${version}.tar.bz2"; + sha256 = "14x15jwgl0c6vwj02ccpzmxr3fczp632mnj50cpklbaj4bxqvgbs"; }; patches = [ (fetchurl { - name = "gajim-drill-srv.patch"; - url = "https://projects.archlinux.org/svntogit/packages.git/" - + "plain/trunk/gajim-drill.patch?h=packages/gajim"; - sha256 = "1k8zz3ns0l0kriffq41jgkv5ym6jvyd24171l7s98v9d81prdw1w"; - }) - (fetchurl { name = "gajim-icon-index.patch"; url = "http://hg.gajim.org/gajim/raw-rev/b9ec78663dfb"; sha256 = "0w54hr5dq9y36val55kmh8d6cid7h4fs2nghx09714jylz2nyxxv"; @@ -69,7 +63,8 @@ stdenv.mkDerivation rec { pythonPackages.pygobject pythonPackages.pyGtkGlade pythonPackages.sqlite3 pythonPackages.pyasn1 pythonPackages.pyxdg - pyopenssl pythonDBus + pythonPackages.nbxmpp + pythonPackages.pyopenssl pythonDBus ] ++ optionals enableJingle [ farstream gst_plugins_bad libnice ] ++ optional enableE2E pythonPackages.pycrypto ++ optional enableRST pythonPackages.docutils @@ -88,5 +83,7 @@ stdenv.mkDerivation rec { description = "Jabber client written in PyGTK"; license = licenses.gpl3Plus; maintainers = [ maintainers.raskin maintainers.aszlig ]; + downloadPage = "http://gajim.org/downloads.php"; + updateWalker = true; }; } diff --git a/pkgs/applications/networking/instant-messengers/kadu/default.nix b/pkgs/applications/networking/instant-messengers/kadu/default.nix index a74460c3e39b..44cf13e2917c 100644 --- a/pkgs/applications/networking/instant-messengers/kadu/default.nix +++ b/pkgs/applications/networking/instant-messengers/kadu/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation { - name = "kadu-0.12.2"; + name = "kadu-0.12.3"; src = fetchurl { - url = http://download.kadu.im/stable/kadu-0.12.2.tar.bz2; - sha256 = "0rqhkiyn8c7jigpxmvwh7daxsgjxlvd16zjdss1azdzd9x2dbym1"; + url = http://download.kadu.im/stable/kadu-0.12.3.tar.bz2; + sha256 = "1a5q5b8pm253cwg6ahahjdm8jxj0pv41apyi1nvvy08bs38bn1yn"; }; buildInputs = [ cmake qt4 libgadu libXScrnSaver libsndfile libX11 alsaLib aspell libidn qca2 phonon pkgconfig diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix index 362bf0de9774..4fda2d9cc066 100644 --- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, openssl, ncurses, pkgconfig, glib, loudmouth}: +{stdenv, fetchurl, openssl, ncurses, pkgconfig, glib, loudmouth, libotr}: stdenv.mkDerivation rec { name = "mcabber-${version}"; @@ -6,12 +6,12 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://mcabber.com/files/mcabber-${version}.tar.bz2"; - sha256 = "1248cgci1v2ypb90wfhyipwdyp1wskn3gzh78af5ai1a4w5rrjq0"; + sha256 = "0vgsqw6yn0lzzcnr4fql4ycgf3gwqj6w4p0l4nqnvhkc94w62ikp"; }; - buildInputs = [openssl ncurses pkgconfig glib loudmouth]; + buildInputs = [openssl ncurses pkgconfig glib loudmouth libotr]; - configureFlags = "--with-openssl=${openssl}"; + configureFlags = "--with-openssl=${openssl} --enable-modules --enable-otr"; meta = with stdenv.lib; { homepage = http://mcabber.com/; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix index 7cbc38ea0dc0..2fa7d5f37f24 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, libotr, pidgin, intltool } : stdenv.mkDerivation rec { - name = "pidgin-otr-4.0.0"; + name = "pidgin-otr-4.0.1"; src = fetchurl { url = "http://www.cypherpunks.ca/otr/${name}.tar.gz"; - sha256 = "14a6vxvlkm8wazng9aj7p82dr12857fx5is1frcyd7my5l4kysym"; + sha256 = "02pkkf86fh5jvzsdn9y78impsgzj1n0p81kc2girvk3vq941yy0v"; }; postInstall = "ln -s \$out/lib/pidgin \$out/share/pidgin-otr"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix index ba3f041738a6..c9b8a959bf97 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix @@ -1,46 +1,32 @@ -{ stdenv, fetchurl, pidgin, imagemagick, ghostscript -, pkgconfig, glib, gtk, texLive -}: - +{ stdenv, fetchurl, pkgconfig, pidgin, texLive, imagemagick, glib, gtk }: + +let version = "1.5.0"; +in stdenv.mkDerivation { - name = "pidgin-latex"; + name = "pidgin-latex-${version}"; src = fetchurl { - url = http://tapas.affenbande.org/pidgin-latex/pidgin-latex-0.9.tgz; - sha256 = "1yqd3qgxd3n8hm60qg7yv7j1crr6f3d4yrdpgwdpw2pyf92p8nxp"; + url = "mirror://sourceforge/pidgin-latex/pidgin-latex_${version}.tar.bz2"; + sha256 = "9c850aee90d7e59de834f83e09fa6e3e51b123f06e265ead70957608ada95441"; }; - preBuild = '' - sed -e '/^PREFIX/d' -i Makefile ; - sed -e 's@/usr/bin/latex@${texLive}/bin/pdflatex@g' -i pidgin-latex.h - sed -e 's@/usr/bin/convert@${imagemagick}/bin/convert@g' -i pidgin-latex.h - sed -e 's@.*convert_path.*@const gchar *convert = CONVERT_PATH;@' - sed -e 's@.*latex_path.*@const gchar *convert = LATEX_PATH;@' - sed -e 's/%s.dvi/%s.pdf/' -i pidgin-latex.c - sed -e 's/latex_system\(.*\)FALSE/latex_system\1TRUE/' -i pidgin-latex.c - ''; - - makeFlags = "PREFIX=\$(out)"; + nativeBuildInputs = [pkgconfig]; + buildInputs = [gtk glib pidgin]; + makeFlags = "PREFIX=$(out)"; - preInstall = "mkdir -p $out/lib/pidgin $out/bin"; - - postInstall = '' - mkdir -p $out/share/pidgin-latex - ln -s $out/lib/pidgin/pidgin-latex.so $out/share/pidgin-latex/ + postPatch = '' + sed -e 's/-Wl,-soname//' -i Makefile ''; - buildInputs = [pidgin imagemagick ghostscript pkgconfig glib gtk texLive]; + passthru = { + wrapArgs = "--prefix PATH ':' ${texLive}/bin:${imagemagick}/bin"; + }; - meta = { - longDescription = '' - Pidgin-LaTeX is a pidgin plugin that cuts everything inside \$\$ - .. \$\$ and feeds to LaTeX. A bit of conversion (automated, of - course) - and you see every formula that occurs in conversation - in pretty graphical form. There are some glitches - when a - formula fails to compile, you can see just previous formula.. - Enable it for user by linking to ~/.purple/plugins - from - sw/share/pidgin-latex , not from store of course. - ''; - homepage = http://tapas.affenbande.org/wordpress/?page_id=70; + meta = with stdenv.lib; { + homepage = http://sourceforge.net/projects/pidgin-latex/; + description = "LaTeX rendering plugin for Pidgin IM"; + licenses = licenses.gpl2; + platforms = platforms.linux; + maintainers = maintainers.abbradar; }; } diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix deleted file mode 100644 index 840416b7d175..000000000000 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix +++ /dev/null @@ -1,44 +0,0 @@ -args : with args; -let version = "1.5.0"; -in -rec { - src = fetchurl { - url = "mirror://sourceforge/pidgin-latex/pidgin-latex_${version}.tar.bz2"; - sha256 = "9c850aee90d7e59de834f83e09fa6e3e51b123f06e265ead70957608ada95441"; - }; - - buildInputs = [texLive pkgconfig gtk imagemagick glib pidgin which]; - configureFlags = []; - installFlags = [ - "PREFIX=$out" - ]; - - preBuild = fullDepEntry ('' - mkdir -p $out/bin - ln -s $(which convert) $out/bin - ln -s $(which xelatex) $out/bin - ln -s $(which dvips) $out/bin - - sed -e 's/-Wl,-soname//' -i Makefile - sed -e 's/\(PATH("\)latex/\1xelatex/' -i LaTeX.c - sed -e 's/|| execute(cmddvips, dvipsopts, 10) //' -i LaTeX.c - sed -e 's/ strcat([*]file_ps, "[.]ps");/ strcat(*file_ps, ".pdf");/' -i LaTeX.c - sed -e 's/\([*]convertopts\[5\]=[{]"\)\(\\"",\)/\1 -trim \2/' -i LaTeX.c - sed -e 's/\(#define HEADER ".*\)12pt\(.*\)"/\116pt\2\\\\usepackage{fontspec}\\\\usepackage{xunicode}"/' -i LaTeX.h - '') ["minInit" "addInputs" "defEnsureDir" "doUnpack"]; - - postInstall = fullDepEntry ('' - mkdir -p $out/lib - mkdir -p $out/share/pidgin-latex - ln -s ../../lib/pidgin/LaTeX.so $out/share/pidgin-latex - '') ["minInit" "defEnsureDir" "doMakeInstall"]; - - /* doConfigure should be specified separately */ - phaseNames = [ "preBuild" "doMakeInstall" "postInstall"]; - - name = "pidgin-latex-${version}"; - meta = { - description = "LaTeX rendering plugin for Pidgin IM"; - priority = "10"; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix index 348802fe16eb..7cfa12eccb4d 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix @@ -1,16 +1,18 @@ -{ stdenv, fetchurl, libtoxcore, pidgin, autoconf, automake, libtool, libsodium } : +{ stdenv, fetchFromGitHub, libtoxcore, pidgin, autoconf, automake, libtool +, libsodium } : let - version = "17a3fd9199"; - date = "20131012"; + version = "dd181722ea"; + date = "20141202"; in stdenv.mkDerivation rec { name = "tox-prpl-${date}-${version}"; - src = fetchurl { - url = "https://github.com/jin-eld/tox-prpl/tarball/${version}"; - name = "${name}.tar.gz"; - sha256 = "0sz5wkyfwmhaj652xpsxq4p252cmmfa1vy6mp3jfyn145c758v9n"; + src = fetchFromGitHub { + owner = "jin-eld"; + repo = "tox-prpl"; + rev = "${version}"; + sha256 = "0wzyvg11h4ym28zqd24p35lza3siwm2519ga0yhk98rv458zks0v"; }; NIX_LDFLAGS = "-lssp -lsodium"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix new file mode 100644 index 000000000000..37b2a1f0c62d --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, pidgin } : + +stdenv.mkDerivation rec { + name = "pidgin-window-merge-${version}"; + version = "0.3"; + + src = fetchurl { + url = "https://github.com/downloads/dm0-/window_merge/window_merge-${version}.tar.gz"; + sha256 = "0cb5rvi7jqvm345g9mlm4wpq0240kcybv81jpw5wlx7hz0lwi478"; + }; + + buildInputs = [ pidgin ]; + + meta = with stdenv.lib; { + homepage = https://github.com/dm0-/window_merge; + description = "Pidgin plugin that merges the Buddy List window with a conversation window"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ jgeerds ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/pidgin/add-search-path.patch b/pkgs/applications/networking/instant-messengers/pidgin/add-search-path.patch new file mode 100644 index 000000000000..b0758777186a --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/pidgin/add-search-path.patch @@ -0,0 +1,20 @@ +diff --git a/libpurple/plugin.c b/libpurple/plugin.c +index 4f2b402..fda9add 100644 +--- a/libpurple/plugin.c ++++ b/libpurple/plugin.c +@@ -1181,8 +1181,15 @@ purple_plugins_get_handle(void) { + void + purple_plugins_init(void) { + void *handle = purple_plugins_get_handle(); ++ gchar **paths, **p; + + purple_plugins_add_search_path(LIBDIR); ++ paths = g_strsplit(g_getenv("PURPLE_PLUGIN_PATH"), ":", -1); ++ if (paths) { ++ for (p = paths; *p; ++p) ++ if (**p) purple_plugins_add_search_path(*p); ++ } ++ g_strfreev(paths); + + purple_signal_register(handle, "plugin-load", + purple_marshal_VOID__POINTER, diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 814a191c457a..5e8f266930ff 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -1,56 +1,59 @@ -/** - * Possible missing configuration: - * - * - silcclient - * - libebook-1.2 - * - libedata-book-1.2 - * - checking for XScreenSaverRegister in -lXext... no - * - checking for XScreenSaverRegister in -lXss... no - * - ao - * - audiofile-config - * - doxygen - */ -{ stdenv, fetchurl, pkgconfig, gtk, gtkspell, aspell, - gstreamer, gst_plugins_base, startupnotification, gettext, - perl, perlXMLParser, libxml2, nss, nspr, farsight2, - libXScrnSaver, ncurses, avahi, dbus, dbus_glib, intltool, libidn - , lib, python - , openssl ? null - , gnutls ? null - , libgcrypt ? null -} : +{ stdenv, fetchurl, pkgconfig, gtk, gtkspell, aspell +, gstreamer, gst_plugins_base, startupnotification, gettext +, perl, perlXMLParser, libxml2, nss, nspr, farsight2 +, libXScrnSaver, ncurses, avahi, dbus, dbus_glib, intltool, libidn +, lib, python, libICE, libXext, libSM +, openssl ? null +, gnutls ? null +, libgcrypt ? null +}: + +# FIXME: clean the mess around choosing the SSL library (nss by default) stdenv.mkDerivation rec { - name = "pidgin-2.10.9"; + name = "pidgin-${version}"; + majorVersion = "2"; + version = "${majorVersion}.10.11"; + src = fetchurl { url = "mirror://sourceforge/pidgin/${name}.tar.bz2"; - sha256 = "06gka47myl9f5x0flkq74ml75akkf28rx9sl8pm3wqkzazc2wdnw"; + sha256 = "01s0q30qrjlzj7kkz6f8lvrwsdd55a9yjh2xjjwyyxzw849j3bpj"; }; inherit nss ncurses; + buildInputs = [ gtkspell aspell gstreamer gst_plugins_base startupnotification - libxml2] - ++ (lib.optional (openssl != null) openssl) - ++ (lib.optional (gnutls != null) gnutls) - ++ (lib.optional (libgcrypt != null) libgcrypt) - ++ - [nss nspr farsight2 + libxml2 nss nspr farsight2 libXScrnSaver ncurses python avahi dbus dbus_glib intltool libidn + libICE libXext libSM ] - ; + ++ (lib.optional (openssl != null) openssl) + ++ (lib.optional (gnutls != null) gnutls) + ++ (lib.optional (libgcrypt != null) libgcrypt); propagatedBuildInputs = [ pkgconfig gtk perl perlXMLParser gettext ]; - patches = [./pidgin-makefile.patch ]; + patches = [./pidgin-makefile.patch ./add-search-path.patch ]; + + configureFlags = [ + "--with-nspr-includes=${nspr}/include/nspr" + "--with-nspr-libs=${nspr}/lib" + "--with-nss-includes=${nss}/include/nss" + "--with-nss-libs=${nss}/lib" + "--with-ncurses-headers=${ncurses}/include" + "--disable-meanwhile" + "--disable-nm" + "--disable-tcl" + ] + ++ (lib.optionals (gnutls != null) ["--enable-gnutls=yes" "--enable-nss=no"]); + + enableParallelBuilding = true; - configureFlags="--with-nspr-includes=${nspr}/include/nspr --with-nspr-libs=${nspr}/lib --with-nss-includes=${nss}/include/nss --with-nss-libs=${nss}/lib --with-ncurses-headers=${ncurses}/include --disable-meanwhile --disable-nm --disable-tcl" - + (lib.optionalString (gnutls != null) " --enable-gnutls=yes --enable-nss=no") - ; meta = with stdenv.lib; { description = "Multi-protocol instant messaging client"; homepage = http://pidgin.im; diff --git a/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix b/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix new file mode 100644 index 000000000000..7e637c767cfa --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix @@ -0,0 +1,24 @@ +{ stdenv, buildEnv, pidgin, makeWrapper, plugins }: + +let +extraArgs = map (x: x.wrapArgs or "") plugins; +drv = buildEnv { + name = "pidgin-with-plugins-" + (builtins.parseDrvName pidgin.name).version; + + paths = [ pidgin ] ++ plugins; + + postBuild = '' + # TODO: This could be avoided if buildEnv could be forced to create all directories + if [ -L $out/bin ]; then + rm $out/bin + mkdir $out/bin + for i in ${pidgin}/bin/*; do + ln -s $i $out/bin + done + fi + wrapProgram $out/bin/pidgin \ + --suffix-each PURPLE_PLUGIN_PATH ':' "$out/lib/purple-${pidgin.majorVersion} $out/lib/pidgin" \ + ${toString extraArgs} + ''; + }; +in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; }) diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index 438b6f35145d..7f5757e68b44 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -1,29 +1,30 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libtoxcore, qt5, openal, opencv }: +{ stdenv, fetchFromGitHub, pkgconfig, libtoxcore, qt5, openalSoft, opencv +, libsodium }: stdenv.mkDerivation rec { - name = "qtox-dev-20140918"; + name = "qtox-dev-20141201"; src = fetchFromGitHub { owner = "tux3"; repo = "qTox"; - rev = "f06ec65bca"; - sha256 = "0r7qc444bgsxawyya5nw3xk1c50b90307lcwazs8mn35h4snr97m"; + rev = "qtox-windows-1417469442.11"; + sha256 = "02nxj0w5qbgc79n8mgyqldk1yadf4p8pysn79f7fvi8fxq4j0j5n"; }; - buildInputs = [ pkgconfig libtoxcore qt5 openal opencv ]; + buildInputs = [ pkgconfig libtoxcore qt5 openalSoft opencv libsodium ]; configurePhase = "qmake"; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp qtox $out/bin ''; meta = with stdenv.lib; { description = "QT Tox client"; license = licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ viric ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ viric jgeerds ]; + platforms = platforms.all; }; } diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index 3870533aa89b..8a3e7203f265 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeWrapper, zlib, glib, libpng, freetype, xorg , fontconfig, xlibs, qt5, xkeyboard_config, alsaLib, pulseaudio ? null -, libredirect, quazip +, libredirect, quazip, less, which }: let @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { else "1b3nbvfpd8lx3dig8z5yk6zjkbmsy6y938dhj1f562wc8adixciz"; }; - buildInputs = [ makeWrapper ]; + buildInputs = [ makeWrapper less which ]; unpackPhase = '' - yes | sh $src + echo -e 'q\ny' | sh -xe $src cd TeamSpeak* ''; diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index 39de30e5dce4..5af31cdb21a9 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, autoconf, libtool, automake, libsodium, ncurses +{ stdenv, fetchFromGitHub, autoconf, libtool, automake, libsodium, ncurses , libtoxcore, openal, libvpx, freealut, libconfig, pkgconfig }: -let - version = "0.5.1"; -in stdenv.mkDerivation rec { - name = "toxic-${version}"; +stdenv.mkDerivation rec { + name = "toxic-dev-20141130"; - src = fetchurl { - url = "https://github.com/Tox/toxic/archive/v${version}.tar.gz"; - sha256 = "0zzfgwm17a4xcy9l0ll2pksp45mz6f4s3isdrgjpw1xibv9xnzcm"; + src = fetchFromGitHub { + owner = "Tox"; + repo = "toxic"; + rev = "4acfe84171"; + sha256 = "1yqglh9fm75zph4fzf3z4gwmamngypwpvb7shpqgakdg8ybq0a8s"; }; - makeFlags = [ "-Cbuild" "VERSION=${version}" "PREFIX=$(out)" ]; + makeFlags = [ "-Cbuild" "PREFIX=$(out)" ]; installFlags = [ "PREFIX=$(out)" ]; buildInputs = [ @@ -21,10 +21,10 @@ in stdenv.mkDerivation rec { openal libvpx freealut ]; - meta = { + meta = with stdenv.lib; { description = "Reference CLI for Tox"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ viric ]; - platforms = stdenv.lib.platforms.all; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ viric jgeerds ]; + platforms = platforms.all; }; } diff --git a/pkgs/applications/networking/instant-messengers/twinkle/default.nix b/pkgs/applications/networking/instant-messengers/twinkle/default.nix index 961ab997384e..c7f33c1f5805 100644 --- a/pkgs/applications/networking/instant-messengers/twinkle/default.nix +++ b/pkgs/applications/networking/instant-messengers/twinkle/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { configureFlags = "--with-extra-includes=${libjpeg}/include"; buildInputs = - [ pkgconfig autoreconfHook commoncpp2 openssl boost boost.lib libsndfile + [ pkgconfig autoreconfHook commoncpp2 openssl boost libsndfile libxml2 libjpeg readline qt3 perl file # optional ? : alsaLib speex diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix index 99753f6ceeb4..1c6183ed330a 100644 --- a/pkgs/applications/networking/instant-messengers/utox/default.nix +++ b/pkgs/applications/networking/instant-messengers/utox/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { - name = "utox-dev-20140921"; + name = "utox-dev-20141130"; src = fetchFromGitHub { owner = "notsecure"; repo = "uTox"; - rev = "c0afc95cf3"; - sha256 = "0a6i0c9crj6b27alm8q0fcfj8q425khg5305sp57r7pj505l4d1f"; + rev = "38b0a2014f"; + sha256 = "00g9fsp83yjq6dfim3hfpag0ny9w5kydghycfj3ic8qaljp47y8a"; }; buildInputs = [ pkgconfig libtoxcore dbus libvpx libX11 openal freetype @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Lightweight Tox client"; license = licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ iElectric ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ iElectric jgeerds ]; + platforms = platforms.all; }; } diff --git a/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/pkgs/applications/networking/instant-messengers/vacuum/default.nix index ad8b677a2ec5..205c21adab42 100644 --- a/pkgs/applications/networking/instant-messengers/vacuum/default.nix +++ b/pkgs/applications/networking/instant-messengers/vacuum/default.nix @@ -12,17 +12,17 @@ let buildInputs = map (n: builtins.getAttr n x) (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { - version="1.2.3"; + version="1.2.4"; baseName="vacuum-im"; name="${baseName}-${version}"; - url="http://vacuum-im.googlecode.com/files/vacuum-${version}.tar.xz"; - hash="037k2b2kkp2ywkrshqa0fj18mkd2jq60x4x62kzbrsvb85qcbbxh"; + url="https://googledrive.com/host/0B7A5K_290X8-d1hjQmJaSGZmTTA/vacuum-1.2.4.tar.gz"; + sha256="10qxpfbbaagqcalhk0nagvi5irbbz5hk31w19lba8hxf6pfylrhf"; }; in rec { src = a.fetchurl { url = sourceInfo.url; - sha256 = sourceInfo.hash; + sha256 = sourceInfo.sha256; }; inherit (sourceInfo) name version; diff --git a/pkgs/applications/networking/iptraf/default.nix b/pkgs/applications/networking/iptraf/default.nix index db1f2011f113..11655d0e28d9 100644 --- a/pkgs/applications/networking/iptraf/default.nix +++ b/pkgs/applications/networking/iptraf/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = ftp://iptraf.seul.org/pub/iptraf/iptraf-3.0.1.tar.gz; - md5 = "004c2c005a1b78739e22bc49d33e244d"; + sha256 = "12n059j9iihhpf6spmlaspqzxz3wqan6kkpnhmlj08jdijpnk84m"; }; patchPhase = '' diff --git a/pkgs/applications/networking/irc/chatzilla/default.nix b/pkgs/applications/networking/irc/chatzilla/default.nix index 2010d064f0d9..765066bb4371 100644 --- a/pkgs/applications/networking/irc/chatzilla/default.nix +++ b/pkgs/applications/networking/irc/chatzilla/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, unzip, xulrunner, makeWrapper }: +{ stdenv, fetchurl, unzip, firefox, makeWrapper }: stdenv.mkDerivation rec { - name = "chatzilla-0.9.90.1"; + name = "chatzilla-0.9.91"; src = fetchurl { # Obtained from http://chatzilla.rdmsoft.com/xulrunner/. url = "http://chatzilla.rdmsoft.com/xulrunner/download/${name}.en-US.xulapp"; - sha256 = "0z38jig91h10cb14rvs30rpg2pgn3v890nyxyy8lxzbv5ncxmngw"; + sha256 = "1bmjw2wvp8gh7fdl8czkxc55iari6dy672446hps20xixrh8hl8r"; }; buildInputs = [ unzip makeWrapper ]; @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { mkdir -p $out/libexec/chatzilla unzip $src -d $out/libexec/chatzilla - makeWrapper ${xulrunner}/bin/xulrunner $out/bin/chatzilla \ - --add-flags $out/libexec/chatzilla/application.ini + makeWrapper ${firefox}/bin/firefox $out/bin/chatzilla \ + --add-flags "-app $out/libexec/chatzilla/application.ini" sed -i $out/libexec/chatzilla/application.ini -e 's/.*MaxVersion.*/MaxVersion=99.*/' ''; diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index 67e06be08830..8d8913cf3cd6 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintlOrEmpty }: stdenv.mkDerivation rec { - name = "irssi-0.8.15"; + name = "irssi-0.8.16"; src = fetchurl { url = "http://irssi.org/files/${name}.tar.bz2"; - sha256 = "19m0aah9bhc70dnhh7kpydbsz5n35l0l9knxav1df0sic3xicbf1"; + sha256 = "15wzs4h754jzs1l4z7qzsyjllk9wdx3qfb6gymdiykvmlb9gwyiz"; }; buildInputs = [ pkgconfig ncurses glib openssl perl libintlOrEmpty ]; diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/pkgs/applications/networking/irc/konversation/default.nix index 7554ad7d1a8c..cbe4e3be28d4 100644 --- a/pkgs/applications/networking/irc/konversation/default.nix +++ b/pkgs/applications/networking/irc/konversation/default.nix @@ -3,7 +3,7 @@ let pn = "konversation"; - v = "1.5"; + v = "1.5.1"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://kde/stable/${pn}/${v}/src/${name}.tar.xz"; - sha256 = "0vsl34kiar7kbsgncycwd7f66f493fip6d635qlprqn1gqhycb9q"; + sha256 = "11hrjrq4r6v1v14ybx9llgzmrl3a45z26n292nb0q887rg1qv0wp"; }; buildInputs = [ cmake qt4 perl gettext libXScrnSaver kdelibs kdepimlibs diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index ba3d7b8c368a..1349e71a791a 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -5,24 +5,27 @@ , ssl ? true # enable SSL support , previews ? false # enable webpage previews on hovering over URLs , tag ? "" # tag added to the package name -, stdenv, fetchurl, cmake, makeWrapper, qt4, kdelibs, automoc4, phonon, dconf }: +, stdenv, fetchurl, cmake, makeWrapper, qt, kdelibs, automoc4, phonon, dconf }: + +assert monolithic -> !client && !daemon; +assert client || daemon -> !monolithic; let edf = flag: feature: [("-D" + feature + (if flag then "=ON" else "=OFF"))]; in with stdenv; mkDerivation rec { - version = "0.10.0"; + version = "0.11.0"; name = "quassel${tag}-${version}"; src = fetchurl { url = "http://quassel-irc.org/pub/quassel-${version}.tar.bz2"; - sha256 = "08vwxkwnzlgnxn0wi6ga9fk8qgc6nklb236hsfnr5ad37bi8q8k8"; + sha256 = "01251y5i1fvm6s2g9acxaczk2jdyw1byr45q41q0yh9apjw938cr"; }; enableParallelBuilding = true; - buildInputs = [ cmake makeWrapper qt4 ] + buildInputs = [ cmake makeWrapper qt ] ++ lib.optional withKDE kdelibs ++ lib.optional withKDE automoc4 ++ lib.optional withKDE phonon; @@ -63,6 +66,6 @@ in with stdenv; mkDerivation rec { license = stdenv.lib.licenses.gpl3; maintainers = [ maintainers.phreedom ]; repositories.git = https://github.com/quassel/quassel.git; - inherit (qt4.meta) platforms; + inherit (qt.meta) platforms; }; } diff --git a/pkgs/applications/networking/jmeter/default.nix b/pkgs/applications/networking/jmeter/default.nix index 77aeb64478f0..4f936f2677ec 100644 --- a/pkgs/applications/networking/jmeter/default.nix +++ b/pkgs/applications/networking/jmeter/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "jmeter-2.11"; src = fetchurl { - url = "http://ftp.unicamp.br/pub/apache//jmeter/binaries/apache-${name}.tgz"; + url = "http://archive.apache.org/dist/jmeter/binaries/apache-${name}.tgz"; sha256 = "1fr3sw06qncb6yygcf2lbnkxma4v1dbigpf39ajrm0isxbpyv944"; }; diff --git a/pkgs/applications/networking/linssid/default.nix b/pkgs/applications/networking/linssid/default.nix index 00ff1110c32f..2b4c5f564bec 100644 --- a/pkgs/applications/networking/linssid/default.nix +++ b/pkgs/applications/networking/linssid/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "13d35rlcjncd8lx3khkgn9x8is2xjd5fp6ns5xsn3w6l4xj9b4gl"; }; - buildInputs = [ qt5 pkgconfig boost boost.lib ]; + buildInputs = [ qt5 pkgconfig boost ]; postPatch = '' sed -e "s|/usr/include/|/nonexistent/|g" -i linssid-app/*.pro diff --git a/pkgs/applications/networking/mailreaders/alpine/default.nix b/pkgs/applications/networking/mailreaders/alpine/default.nix new file mode 100644 index 000000000000..87e824a977d3 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/alpine/default.nix @@ -0,0 +1,38 @@ +{stdenv, fetchurl, ncurses, tcl, openssl, pam, pkgconfig, gettext, kerberos +, openldap +}: +let + s = + rec { + version = "2.00"; + url = "ftp://ftp.cac.washington.edu/alpine/alpine-${version}.tar.bz2"; + sha256 = "19m2w21dqn55rhxbh5lr9qarc2fqa9wmpj204jx7a0zrb90bhpf8"; + baseName = "alpine"; + name = "${baseName}-${version}"; + }; + buildInputs = [ + ncurses tcl openssl pam kerberos openldap + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchurl { + inherit (s) url sha256; + }; + configureFlags = [ + "--with-ssl-include-dir=${openssl}/include/openssl" + "--with-tcl-lib=tcl8.5" + ]; + preConfigure = '' + export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s" + ''; + meta = { + inherit (s) version; + description = ''Console mail reader''; + license = stdenv.lib.licenses.asl20; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + homepage = "https://www.washington.edu/alpine/"; + }; +} diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix new file mode 100644 index 000000000000..c22c1a275c36 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -0,0 +1,81 @@ +{ fetchurl, stdenv +, curl, dbus, dbus_glib, enchant, gtk, gnutls, gnupg, gpgme, libarchive +, libcanberra, libetpan, libnotify, libsoup, libxml2, networkmanager, openldap +, perl, pkgconfig, poppler, python, webkitgtk2 + +# Build options +# TODO: A flag to build the manual. +# TODO: Plugins that complain about their missing dependencies, even when +# provided: +# gdata requires libgdata +# geolocation requires libchamplain +# python requires python +, enableLdap ? false +, enableNetworkManager ? false +, enablePgp ? false +, enablePluginArchive ? false +, enablePluginFancy ? false +, enablePluginNotificationDialogs ? true +, enablePluginNotificationSounds ? true +, enablePluginPdf ? false +, enablePluginRavatar ? false +, enablePluginRssyl ? false +, enablePluginSmime ? false +, enablePluginSpamassassin ? false +, enablePluginSpamReport ? false +, enablePluginVcalendar ? false +, enableSpellcheck ? false +}: + +with stdenv.lib; + +let version = "3.11.1"; in + +stdenv.mkDerivation { + name = "claws-mail-${version}"; + + meta = { + description = "The user-friendly, lightweight, and fast email client"; + homepage = http://www.claws-mail.org/; + license = licenses.gpl3; + platforms = platforms.linux; + }; + + src = fetchurl { + url = "http://downloads.sourceforge.net/project/claws-mail/Claws%20Mail/${version}/claws-mail-${version}.tar.bz2"; + sha256 = "0w13xzri9d3165qsxf1dig1f0gxn3ib4lysfc9pgi4zpyzd0zgrw"; + }; + + buildInputs = + [ curl dbus dbus_glib gtk gnutls libetpan perl pkgconfig python ] + ++ optional enableSpellcheck enchant + ++ optionals (enablePgp || enablePluginSmime) [ gnupg gpgme ] + ++ optional enablePluginArchive libarchive + ++ optional enablePluginNotificationSounds libcanberra + ++ optional enablePluginNotificationDialogs libnotify + ++ optional enablePluginFancy libsoup + ++ optional enablePluginRssyl libxml2 + ++ optional enableNetworkManager networkmanager + ++ optional enableLdap openldap + ++ optional enablePluginPdf poppler + ++ optional enablePluginFancy webkitgtk2; + + configureFlags = + optional (!enableLdap) "--disable-ldap" + ++ optional (!enableNetworkManager) "--disable-networkmanager" + ++ optionals (!enablePgp) [ + "--disable-pgpcore-plugin" + "--disable-pgpinline-plugin" + "--disable-pgpmime-plugin" + ] + ++ optional (!enablePluginArchive) "--disable-archive-plugin" + ++ optional (!enablePluginFancy) "--disable-fancy-plugin" + ++ optional (!enablePluginPdf) "--disable-pdf_viewer-plugin" + ++ optional (!enablePluginRavatar) "--disable-libravatar-plugin" + ++ optional (!enablePluginRssyl) "--disable-rssyl-plugin" + ++ optional (!enablePluginSmime) "--disable-smime-plugin" + ++ optional (!enablePluginSpamassassin) "--disable-spamassassin-plugin" + ++ optional (!enablePluginSpamReport) "--disable-spam_report-plugin" + ++ optional (!enablePluginVcalendar) "--disable-vcalendar-plugin" + ++ optional (!enableSpellcheck) "--disable-enchant"; +} diff --git a/pkgs/applications/networking/mailreaders/imapfilter.nix b/pkgs/applications/networking/mailreaders/imapfilter.nix index d42b71b23121..d7aff753e237 100644 --- a/pkgs/applications/networking/mailreaders/imapfilter.nix +++ b/pkgs/applications/networking/mailreaders/imapfilter.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, lua, pcre }: stdenv.mkDerivation rec { - name = "imapfilter-2.5.6"; + name = "imapfilter-2.5.7"; src = fetchurl { - url = "https://github.com/lefcha/imapfilter/archive/v2.5.6.tar.gz"; - sha256 = "0c94xdcnkk33d2filzkbraymfzm09np78486kqzqwidnnfllsk86"; + url = "https://github.com/lefcha/imapfilter/archive/v2.5.7.tar.gz"; + sha256 = "1l7sg7pyw1i8cxqnyb5xv983fakj8mxq6w44qd7w3kc7l6ixd4n7"; }; makeFlagsArray = "PREFIX=$(out)"; diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix index 4ab85026dedc..695e2b381576 100644 --- a/pkgs/applications/networking/mailreaders/mailpile/default.nix +++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix @@ -2,14 +2,14 @@ pythonPackages.buildPythonPackage rec { name = "mailpile-${version}"; - version = "0.4.0"; + version = "0.4.1"; src = fetchgit { url = "git://github.com/pagekite/Mailpile"; - rev = "af3e2554dcef892cc44e044ce61e1693f09228c0"; - sha256 = "0p8j5w5281rjl0nigsw7glfp7inz13p6iqlr9g3m3vh72i9pvl7h"; + rev = "refs/tags/${version}"; + sha256 = "0h84cc9kwb0m4admqjkpg4pllxlh095rmzvrql45kz71fpnxs780"; }; - + patchPhase = '' substituteInPlace setup.py --replace "data_files.append((dir" "data_files.append(('lib/${pythonPackages.python.libPrefix}/site-packages/' + dir" ''; @@ -31,4 +31,4 @@ pythonPackages.buildPythonPackage rec { platforms = platforms.linux; maintainers = [ maintainers.iElectric ]; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 9c397f27c46f..7c60864b486c 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, which, perl +{ stdenv, fetchurl, ncurses, which, perl, autoreconfHook , sslSupport ? true , imapSupport ? true , headerCache ? true @@ -8,31 +8,34 @@ , openssl ? null , cyrus_sasl ? null , gpgme ? null +, withSidebar ? false }: assert headerCache -> gdbm != null; assert sslSupport -> openssl != null; assert saslSupport -> cyrus_sasl != null; +assert gpgmeSupport -> gpgme != null; let version = "1.5.23"; in stdenv.mkDerivation rec { - name = "mutt-${version}"; - + name = "mutt${stdenv.lib.optionalString withSidebar "-with-sidebar"}-${version}"; + src = fetchurl { - url = "mirror://sourceforge/mutt/${name}.tar.gz"; + url = "mirror://sourceforge/mutt/mutt-${version}.tar.gz"; sha256 = "0dzx4qk50pjfsb6cs5jahng96a52k12f7pm0sc78iqdrawg71w1s"; }; - buildInputs = [ - ncurses which perl - (if headerCache then gdbm else null) - (if sslSupport then openssl else null) - (if saslSupport then cyrus_sasl else null) - (if gpgmeSupport then gpgme else null) - ]; - + buildInputs = with stdenv.lib; + [ ncurses which perl ] + ++ optional headerCache gdbm + ++ optional sslSupport openssl + ++ optional saslSupport cyrus_sasl + ++ optional gpgmeSupport gpgme; + + nativeBuildInputs = stdenv.lib.optional withSidebar autoreconfHook; + configureFlags = [ "--with-mailpath=" "--enable-smtp" @@ -52,6 +55,13 @@ stdenv.mkDerivation rec { (if gpgmeSupport then "--enable-gpgme" else "--disable-gpgme") ]; + # Adding the sidebar + patches = [] ++ + (stdenv.lib.optional withSidebar (fetchurl { + url = http://lunar-linux.org/~tchan/mutt/patch-1.5.23.sidebar.20140412.txt; + sha256 = "1i2r7dj0pd1k0z3jjxn2szi6sf0k28i8dwhr4f65pn8r2lh3wisz"; + })); + meta = with stdenv.lib; { description = "A small but very powerful text-based mail client"; homepage = http://www.mutt.org; diff --git a/pkgs/applications/networking/mailreaders/mutt/mailpath.patch b/pkgs/applications/networking/mailreaders/mutt/mailpath.patch deleted file mode 100644 index 3fb9c7a5f7f9..000000000000 --- a/pkgs/applications/networking/mailreaders/mutt/mailpath.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -r 8f62001989cc configure.ac ---- a/configure.ac Sat Feb 08 10:24:22 2014 -0800 -+++ b/configure.ac Wed Jul 02 12:34:40 2014 +0200 -@@ -473,6 +473,8 @@ - mutt_cv_mailpath=/usr/spool/mail - elif test -d /usr/mail; then - mutt_cv_mailpath=/usr/mail -+ elif test -d /tmp; then -+ mutt_cv_mailpath=/tmp - fi]) - ]) - if test "$mutt_cv_mailpath" = no; then diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 75ccb93ca954..a5af880728a1 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -1,60 +1,25 @@ -{ fetchurl, stdenv, bash, emacs, gdb, glib, gmime, gnupg, - pkgconfig, talloc, xapian +{ fetchurl, stdenv, bash, emacs, fixDarwinDylibNames +, gdb, glib, gmime, gnupg +, pkgconfig, talloc, xapian +, sphinx, python }: stdenv.mkDerivation rec { - name = "notmuch-0.18.1"; + name = "notmuch-0.19"; src = fetchurl { url = "http://notmuchmail.org/releases/${name}.tar.gz"; - sha256 = "1pdp9l7yv71d3fjb30qyccva8h03hvg88q4a00yi50v2j70kvmgj"; + sha256 = "1szf6c44g209pcjq5nvfhlp3nzcm3lrcwv4spsxmwy13hiaccvrr"; }; - buildInputs = [ bash emacs gdb glib gmime gnupg pkgconfig talloc xapian ]; + buildInputs = [ bash emacs gdb glib gmime gnupg pkgconfig talloc xapian sphinx python ] + ++ stdenv.lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; patchPhase = '' - (cd test && for prg in \ - aggregate-results.sh \ - argument-parsing \ - atomicity \ - author-order \ - basic \ - crypto \ - count \ - dump-restore \ - emacs \ - emacs-large-search-buffer \ - encoding \ - from-guessing \ - help-test \ - hooks \ - json \ - long-id \ - maildir-sync \ - multipart \ - new \ - notmuch-test \ - python \ - raw \ - reply \ - search \ - search-by-folder \ - search-insufficient-from-quoting \ - search-folder-coherence \ - search-limiting \ - search-output \ - search-position-overlap-bug \ - symbol-hiding \ - tagging \ - test-lib.sh \ - test-verbose \ - thread-naming \ - thread-order \ - uuencode \ - ;do - substituteInPlace "$prg" \ - --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" - done) + find test -type f -exec \ + sed -i \ + "1s_#!/usr/bin/env bash_#!${bash}/bin/bash_" \ + "{}" ";" for src in \ crypto.c \ @@ -65,6 +30,20 @@ stdenv.mkDerivation rec { done ''; + postInstall = '' + make install-man + ''; + + preFixup = if stdenv.isDarwin then + '' + prg="$out/bin/notmuch" + target="libnotmuch.3.dylib" + echo "$prg: fixing link to $target" + install_name_tool -change "$target" "$out/lib/$target" "$prg" + '' + else + ""; + # XXX: emacs tests broken doCheck = false; checkTarget = "test"; diff --git a/pkgs/applications/networking/mailreaders/realpine/default.nix b/pkgs/applications/networking/mailreaders/realpine/default.nix new file mode 100644 index 000000000000..11097672ae7f --- /dev/null +++ b/pkgs/applications/networking/mailreaders/realpine/default.nix @@ -0,0 +1,39 @@ +{stdenv, fetchurl, ncurses, tcl, openssl, pam, pkgconfig, gettext, kerberos +, openldap +}: +let + s = + rec { + version = "2.03"; + url = "mirror://sourceforge/re-alpine/re-alpine-${version}.tar.bz2"; + sha256 = "11xspzbk9cwmklmcw6rxsan7j71ysd4m9c7qldlc59ck595k5nbh"; + baseName = "re-alpine"; + name = "${baseName}-${version}"; + }; + buildInputs = [ + ncurses tcl openssl pam kerberos openldap + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchurl { + inherit (s) url sha256; + }; + configureFlags = [ + "--with-ssl-include-dir=${openssl}/include/openssl" + "--with-tcl-lib=tcl8.5" + ]; + preConfigure = '' + export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s" + ''; + meta = { + inherit (s) version; + description = ''Console mail reader''; + license = stdenv.lib.licenses.asl20; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + homepage = "http://re-alpine.sf.net/"; + downloadPage = "http://sourceforge.net/projects/re-alpine/files/"; + }; +} diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index d180ea290adb..55e5820a5d2b 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -1,8 +1,3 @@ -# This file is generated from generate_nix.rb. DO NOT EDIT. -# Execute the following command in a temporary directory to update the file. -# -# ruby generate_nix.rb > default.nix - { stdenv, fetchurl, config , gconf , alsaLib @@ -39,121 +34,10 @@ assert stdenv.isLinux; -let - version = "31.1.2"; - sources = [ - { locale = "id"; arch = "linux-i686"; sha256 = "210f0037279ec373d5d189a8724962fec3237900c343ca93d2421ca93a35f201"; } - { locale = "id"; arch = "linux-x86_64"; sha256 = "7436275f73a1292567cc587bd41439ecb724fac5e092f0b0f2af932bf39805f7"; } - { locale = "he"; arch = "linux-i686"; sha256 = "14b878d70f96e60e3a73134c3cbb35cc6d468446b588510ae5f2e8934d8fbb3b"; } - { locale = "he"; arch = "linux-x86_64"; sha256 = "6edabe4a5bf81274cb117bdf7ec7d0b89f3759b9f31e1b9e03c0c603cda2e91f"; } - { locale = "el"; arch = "linux-i686"; sha256 = "9f65b45570f83d41b856f99b3077e6e112fa65b3762eb51277269fdbf07cfdb2"; } - { locale = "el"; arch = "linux-x86_64"; sha256 = "6a500164772c004d851f13d77a7a9b84428b5c372fdba6f0936c1ddd398d9087"; } - { locale = "tr"; arch = "linux-i686"; sha256 = "fb5f9ab606101cfebe86f64f64b9e46ecd73a704c1a2a993e4b4d68129d84484"; } - { locale = "tr"; arch = "linux-x86_64"; sha256 = "54517217aa8cf4d715dd2c7d5cf7c4b96bd5f0add2dda9d9d9412ea10b4210a4"; } - { locale = "ast"; arch = "linux-i686"; sha256 = "2ff66a151f4003b5dc0432b43e1038e0c69645c58fc5d6015cab3e493a8ed9a7"; } - { locale = "ast"; arch = "linux-x86_64"; sha256 = "e34c892ff3fe761c2707036c5ea3453fe411dca2ad2e474ead7ef0c209558e06"; } - { locale = "nl"; arch = "linux-i686"; sha256 = "46154b1fab58e9040e4e67b01ae2c5865b644ccf8f2239c396725bf063eae640"; } - { locale = "nl"; arch = "linux-x86_64"; sha256 = "271f169763271582698b8ec23d9ca463b41a7d2b373b56d9c170179e15f0fc34"; } - { locale = "bn-BD"; arch = "linux-i686"; sha256 = "2b3f2e9933bcda04abc5785b77630cedcba2d85a73a9d535d895ed7910c97d54"; } - { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "e4878b6ec24d75cba9e991f6b852ec280992b205bca0e82a2aecfd9a607cdbb4"; } - { locale = "eu"; arch = "linux-i686"; sha256 = "b2ff2e8b6c9b7ee81d0965380d15e080c204ffac35b687ca29ca41b51804b491"; } - { locale = "eu"; arch = "linux-x86_64"; sha256 = "7afd4c4618f4e7758875ae58295e340289eb994723d3eea13c388751878e0b4e"; } - { locale = "fr"; arch = "linux-i686"; sha256 = "41f07408eaec108a28f03917820329c801a386ad3628ebdeb7abd852e579ae72"; } - { locale = "fr"; arch = "linux-x86_64"; sha256 = "ea667afbfeba6901a56cc44751d6bf202ef978ce7e39719e56c1fe31a622922b"; } - { locale = "br"; arch = "linux-i686"; sha256 = "cea91b552b14e4a417d288d93b4db10b787a1a15316ed7de0b3016be359ddcc5"; } - { locale = "br"; arch = "linux-x86_64"; sha256 = "8d72d7cca4885f527a8e8d2b8e2950d0ea0e5d1a840bcde38c08a77e3b6a69a7"; } - { locale = "pa-IN"; arch = "linux-i686"; sha256 = "92a28502463e92e6bb9cf7854358c13757222433f9931703a2df4d1ef93bdcbb"; } - { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "6b61650491252bb441a13b2fa550d9bdd76e6f23a0e5da641fde4372637c451c"; } - { locale = "gd"; arch = "linux-i686"; sha256 = "4d35dfe5c9d66ea8f81fa0e5957152296f9af31968b8ed4975563c480abf2da8"; } - { locale = "gd"; arch = "linux-x86_64"; sha256 = "3647b5345ac4fa5cc6cd301fefbe538d2442110f93cccb5e8eca4227bcbcd661"; } - { locale = "bg"; arch = "linux-i686"; sha256 = "b06afea38900f268b95787c257d960de8c0174f582e51434aa97a9535fac43a4"; } - { locale = "bg"; arch = "linux-x86_64"; sha256 = "c4ae2aebdd91543cf3c64ea25931327f6e8d2113b59d0b2fbb19561b4f935134"; } - { locale = "sv-SE"; arch = "linux-i686"; sha256 = "854d4c53fd22c5c1f4635ed41e7dadc6f0603439380e3d3f15ea7a5db5721941"; } - { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "64842c6606e2102434ed0b33bcb53d0cdef08e4b55e67e85b3c1244a7dab32d5"; } - { locale = "ja"; arch = "linux-i686"; sha256 = "6632eec0a8bf14a77590fae44113d417589634a97cd0b57ef4ede7623cd5b632"; } - { locale = "ja"; arch = "linux-x86_64"; sha256 = "727c25136106eca05d4c0bbddbe01672decc4a9f55b3246290c1c6e41cbef946"; } - { locale = "pt-BR"; arch = "linux-i686"; sha256 = "986ae49f92e2bab52cc3a4da4f9ca9bce34c01e96126d4fd9fe41d39d16a8ee3"; } - { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "c208dc5adb8bbe39535ec28836425d66d557d4ebb111aca9c0d025750ad0d3c4"; } - { locale = "is"; arch = "linux-i686"; sha256 = "ee8b101070f820849ec2bde48b76e102cf750bbcee106f47238259bb3cb791bb"; } - { locale = "is"; arch = "linux-x86_64"; sha256 = "19471d5e13856f85fc395b825fb297f88805bba5d1d6c2999c49c4947cc6ed43"; } - { locale = "es-AR"; arch = "linux-i686"; sha256 = "b21ec0c7e2ee24b971828ae02419f06e3d9447c5e30b1c8257a1d8e1b5ac383e"; } - { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "6f8eda76fe19bd590e4f8e23e491edc93b870b72064814eb0d6352c99513397f"; } - { locale = "nn-NO"; arch = "linux-i686"; sha256 = "217a6b195255c841ff42f181aa4fa54bd76a91de61662098d96c4fb9e7d6b79a"; } - { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "f11ce6f7ef22cb99674668bfcd0f3614a4a9e162f9608fa1290ae26c6c199560"; } - { locale = "sr"; arch = "linux-i686"; sha256 = "85f32820095ee3b50716731b2b369378cf530fd1f3ef3522a5cd55e00fb4ce5e"; } - { locale = "sr"; arch = "linux-x86_64"; sha256 = "d67b98991de46de52f84627ccb7f2888551343eef94a5d7562e587fcd8d968ec"; } - { locale = "si"; arch = "linux-i686"; sha256 = "14914642dc540c6a0fa0df5816eb35b39b822dac4da58a79d9cfe1c3bf7ed1c0"; } - { locale = "si"; arch = "linux-x86_64"; sha256 = "c0421803b2be6704151177c0d13557a9d828e3b3333cd214734e2ed4aafce105"; } - { locale = "ro"; arch = "linux-i686"; sha256 = "9226cd799114fcec9c1b53b403708e62ca9f151d43bb53167b822cd3ca779171"; } - { locale = "ro"; arch = "linux-x86_64"; sha256 = "05e13ad7c9a53a123c3a50e858285f730a4a5ec95e93074cfda990f4466a1c4f"; } - { locale = "it"; arch = "linux-i686"; sha256 = "ed9b4f3bfd457d00792795584bf17bebf4b42967c111cf4f778aa7e88b437407"; } - { locale = "it"; arch = "linux-x86_64"; sha256 = "301dbc22a9af014aeb6f151ac1f6ff67ef667dabe31c5e487681f682bf8d567b"; } - { locale = "pl"; arch = "linux-i686"; sha256 = "9894e91593b3d825d2572af8c520c8be5dd791a267bb056180dc4415d55f4dc1"; } - { locale = "pl"; arch = "linux-x86_64"; sha256 = "0531f815bc4325f150465c753ffe849577931e47eb9528df3b58e666155856f0"; } - { locale = "sk"; arch = "linux-i686"; sha256 = "4633afa9f32f6aa1bc91c1ca2e6d1b5622192c9a82fd4c591e0f6a3095ab0baf"; } - { locale = "sk"; arch = "linux-x86_64"; sha256 = "2121bd74ce76a0ec1734e3171c8da8ac4d935c99f6c16344639ff7e60de9a860"; } - { locale = "vi"; arch = "linux-i686"; sha256 = "d10a856d94c790281500cf1c41683255a858eecc43afaa74819ef2d3559216e9"; } - { locale = "vi"; arch = "linux-x86_64"; sha256 = "964343e1ee3209dea0a90dcb1f5371cb0f949b68e059aa23fe80d53747a4699c"; } - { locale = "rm"; arch = "linux-i686"; sha256 = "f28ce0029dc5fb3212bd020065c2d453d36db53c98df1806f0e4192ef3d8c5da"; } - { locale = "rm"; arch = "linux-x86_64"; sha256 = "fb532732406c8338bfb947e20ee6a95ff1bb18b1d6eadcd7525153393894bdf9"; } - { locale = "ar"; arch = "linux-i686"; sha256 = "5e05b156179978920c4c7ed995ef018ddaa6332c5fe1898d94314412d11567b0"; } - { locale = "ar"; arch = "linux-x86_64"; sha256 = "acba5a042588731e8b1af0dcc7e075577551969d7c1081c23df6feae7f4d107d"; } - { locale = "es-ES"; arch = "linux-i686"; sha256 = "92c6f00a0e014617b5fb53167c821f17f550e8307fcd4af831cde04891f00b40"; } - { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "191c531621e961b25bf8f16c2aad2ac57357d3456f84fc5efb4f7b7e9becc202"; } - { locale = "fi"; arch = "linux-i686"; sha256 = "2f061035a0b6b07bb81d9f84f1bad9a7fd50b0546417fc047102e684683241c5"; } - { locale = "fi"; arch = "linux-x86_64"; sha256 = "ee7b57cfbc15104568e12d0cc81a14118c7b0f2708963fbe2ba8ca7a2ce30a0b"; } - { locale = "hu"; arch = "linux-i686"; sha256 = "a493b0d327f608a815654a74b22f0ab3237b139998b8720c197468fc624754b6"; } - { locale = "hu"; arch = "linux-x86_64"; sha256 = "2b9e87e794e6ac423fd7e6c5500b8a63dc2f8a6a4bdf39de2bbfa5c06a2a8f67"; } - { locale = "zh-CN"; arch = "linux-i686"; sha256 = "d272ea7a87f15a649c8d6089b6a5eac91ca732b760163e36ee6634ac2a186313"; } - { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "2b71cab0bfd437a6c79125cbe0ccb82bc1fe257c6aa24b0b63c1a8456334e6e0"; } - { locale = "uk"; arch = "linux-i686"; sha256 = "56a04b6a6a27d9eea98bb5539c927870a3a43aaace14d31faf54dd56b8ef128b"; } - { locale = "uk"; arch = "linux-x86_64"; sha256 = "99e33539eff6a48d944f47fc86a98e07ab4395e90e509c050403e70820b11db4"; } - { locale = "ko"; arch = "linux-i686"; sha256 = "4c7a67b83db3c15cb8385ec057eff849e59841d2c6e82f6839f76c747c09fd02"; } - { locale = "ko"; arch = "linux-x86_64"; sha256 = "5e54ad0316c905a2fc137365e34ba24391ec3a12c638f1947d8048b9747b2a21"; } - { locale = "cs"; arch = "linux-i686"; sha256 = "735d14680ba5108d9d422fda161d0cd1cf31ffb2d29d66b33671c58504436290"; } - { locale = "cs"; arch = "linux-x86_64"; sha256 = "031b6f8a2f9a14689e91d887754221a972d4c9aa02807209126aa0d26be18b04"; } - { locale = "be"; arch = "linux-i686"; sha256 = "604db8cb078699262bf01f81a97bb745bda26efdb7e81bdae66ae5fe9f546c48"; } - { locale = "be"; arch = "linux-x86_64"; sha256 = "62a3ed654691720ff2cb2402efb450dcbe395baecd6c20dcba3d45455bfb68d1"; } - { locale = "ru"; arch = "linux-i686"; sha256 = "81b2a2eab496824d109faf49b6df93adc9dce838058f3f70c9e9c99ad251baf3"; } - { locale = "ru"; arch = "linux-x86_64"; sha256 = "6cdf95dd941475554630709d89fb802e8744bae7645ad9164dc2e8af701d195e"; } - { locale = "ta-LK"; arch = "linux-i686"; sha256 = "422f2173eae85a95611ba14a9945aac7b44076764b7c67d2c4198b3e6fe2fad7"; } - { locale = "ta-LK"; arch = "linux-x86_64"; sha256 = "d3d3dfc439bcb26cdb8d8f1ef0a9a24e804a6928aa6ac4f9ea2c0994c3e6e2c4"; } - { locale = "zh-TW"; arch = "linux-i686"; sha256 = "6d0e3db5748fa2bce8ebc3b51098241ba80971afea629836a37e4f84feeb0c85"; } - { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "4dd79725f91c163cd5a2073d52f3f599c2e0e95281e8235df0a20c9f8717fa07"; } - { locale = "de"; arch = "linux-i686"; sha256 = "7b1fb8c036729ee18507e0c3529cbaf93e8776801fba9bd8c93fa7b56dcf460e"; } - { locale = "de"; arch = "linux-x86_64"; sha256 = "926b0ad5e817af337b2f2f7416f98e935b5a6b90171816207275413c04dffb2c"; } - { locale = "nb-NO"; arch = "linux-i686"; sha256 = "a0c9e3abe9f3835166237a9ee12dffdc1e3255b59a47e3ed0f19ecf5a6f41ba8"; } - { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "173c030e3bba69c1634587a4032e4d0b49f37e0a94ba75c4deda7f23d25b21cc"; } - { locale = "fy-NL"; arch = "linux-i686"; sha256 = "25f3ca3328c99421db81e4d88b8fe51e913b01430e0db412699b11fef0c81240"; } - { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "df9f7737dddd56fb233d029c83c46a18470f992bc2b0222b54e1c4c36bde135b"; } - { locale = "sq"; arch = "linux-i686"; sha256 = "181bbb3808b28a5dc170db90db69a99137ce5d49c559c59c4a185b1ee48bea3d"; } - { locale = "sq"; arch = "linux-x86_64"; sha256 = "8b06fb2d2e4027aaa3ca5032823b203f5e2628c7673dd956103636916cf28a32"; } - { locale = "ga-IE"; arch = "linux-i686"; sha256 = "e7679ef7d467aeaa796af37e62a48fb08e60299cdeb6cea07fcbd8253cda7288"; } - { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "83a4b3a22de8be841be0967cda71dcc05958dddb690b7f90d80f1f6235555a49"; } - { locale = "da"; arch = "linux-i686"; sha256 = "b7db83686a2e9bf5e501ae32b608189af09eca9f4996b975960fcab3a97a10d2"; } - { locale = "da"; arch = "linux-x86_64"; sha256 = "aa081115593e5225f5fb47a9ba5bcd983da1c9e088f1a9f5cea3710afda75cd9"; } - { locale = "hr"; arch = "linux-i686"; sha256 = "99698f7259b1c3fa21600c43aa2a946376547a852e04f5a20478282bdbbb99d8"; } - { locale = "hr"; arch = "linux-x86_64"; sha256 = "bb2958eea731689b4fa48e98604233ef03b4de89107d801f72b12843cbc6fc70"; } - { locale = "ca"; arch = "linux-i686"; sha256 = "988e95cda1b412663bcbf1c1b552ad24b889fdfc30e7228bc47ac7f14aa43b31"; } - { locale = "ca"; arch = "linux-x86_64"; sha256 = "ac1f417ddc5b62f674f86f25a248d1434d996453892b4825ffb38852436d2df5"; } - { locale = "en-US"; arch = "linux-i686"; sha256 = "9209fa7bdada6245717dbfaf517d68cef04719812504bc0c988def6adc7baab5"; } - { locale = "en-US"; arch = "linux-x86_64"; sha256 = "6e2f046dae0a6fa80de190b95667340abcb0ddaddf1ecee813099a89142c56e1"; } - { locale = "pt-PT"; arch = "linux-i686"; sha256 = "f4acc2f18f55d7578555ac0b189aeb834adb6c3911ee665790fe4799774c8fe4"; } - { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "2dc24f408fc801df266f2b890109c2e7d4a0d47bc2db7f541d371037ffad8ff8"; } - { locale = "gl"; arch = "linux-i686"; sha256 = "b9e89373d2d1b0123095cd45867014f87bc2696093127448e7b7b9cf72d294e6"; } - { locale = "gl"; arch = "linux-x86_64"; sha256 = "191f8f5327e8a7607497b990dce09e6219c444cbe9261fdbf709cdd07d6cd57f"; } - { locale = "lt"; arch = "linux-i686"; sha256 = "80cb0818fce6c8130c9344d3259a7bbc1722c1e7896853d365ad06cc4ccddd82"; } - { locale = "lt"; arch = "linux-x86_64"; sha256 = "347027a7c82330f5bc1989a19afb6dde415c260ad4de6c312bd1bda30d4f7651"; } - { locale = "en-GB"; arch = "linux-i686"; sha256 = "94f2742fd3a88826eab8712e77a503fb340437ed0a2c1657b64f13b8522c0ad6"; } - { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "8319f02f751d0683e5d015d32da3e12c94cb8a8fd27f8cdf5cd583e6e594bdfd"; } - { locale = "sl"; arch = "linux-i686"; sha256 = "076ed4c9c2ed99769e278ed0965ca5da7efd00bc9fb225e36cffb712b7cedca5"; } - { locale = "sl"; arch = "linux-x86_64"; sha256 = "e37bf18f4e32f050ac97b1a20cfa44832d4438524e2ef9c4ca82e7ed8c1307cb"; } - { locale = "et"; arch = "linux-i686"; sha256 = "afc9aef58f08bf8f4b300308a5a4e527ba93e1bae024983063efd82e96c36703"; } - { locale = "et"; arch = "linux-x86_64"; sha256 = "d46257893e5e1f17757f0b53c9201b12bc4e5b27bde1eecb007a858f61c49fab"; } - { locale = "hy-AM"; arch = "linux-i686"; sha256 = "8a1cbc00e4e6cffb3a225d9334e9c2372050203a0cba3b31c6537e02404efedb"; } - { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "ae17a6fb60f27bb95a11501a061c7ab9deb0a6ba89b17e6cf01394e18710a831"; } - ]; +# imports `version` and `sources` +with (import ./sources.nix); +let arch = if stdenv.system == "i686-linux" then "linux-i686" else "linux-x86_64"; @@ -177,7 +61,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download-installer.cdn.mozilla.net/pub/thunderbird/releases/${version}/${source.arch}/${source.locale}/thunderbird-${version}.tar.bz2"; - inherit (source) sha256; + inherit (source) sha1; }; phases = "unpackPhase installPhase"; @@ -257,11 +141,10 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - description = "Mozilla Thunderbird, a full-featured email client"; + description = "Mozilla Thunderbird, a full-featured email client (binary package)"; homepage = http://www.mozilla.org/thunderbird/; license = { - shortName = "unfree"; # not sure - fullName = "unfree"; + free = false; url = http://www.mozilla.org/en-US/foundation/trademarks/policy/; }; maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/generate_nix.rb b/pkgs/applications/networking/mailreaders/thunderbird-bin/generate_nix.rb deleted file mode 100644 index fe2ed59389ef..000000000000 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/generate_nix.rb +++ /dev/null @@ -1,213 +0,0 @@ -version = if ARGV.empty? - "latest" - else - ARGV[0] - end - -base_path = "download-installer.cdn.mozilla.net/pub/thunderbird/releases" - -arches = ["linux-i686", "linux-x86_64"] - -arches.each do |arch| - system("wget", "--recursive", "--continue", "--no-parent", "--reject-regex", ".*\\?.*", "--reject", "xpi", "http://#{base_path}/#{version}/#{arch}/") -end - -locales = Dir.glob("#{base_path}/#{version}/#{arches[0]}/*").map do |path| - File.basename(path) -end - -locales.delete("index.html") -locales.delete("xpi") - -real_version = Dir.glob("#{base_path}/#{version}/#{arches[0]}/#{locales[0]}/thunderbird-*")[0].match(/thunderbird-([0-9.]*)/)[1][0..-2] - -locale_arch_path_tuples = locales.flat_map do |locale| - arches.map do |arch| - path = Dir.glob("#{base_path}/#{version}/#{arch}/#{locale}/thunderbird-*")[0] - - [locale, arch, path] - end -end - -paths = locale_arch_path_tuples.map do |tuple| tuple[2] end - -hashes = IO.popen(["sha256sum", "--binary", *paths]) do |input| - input.each_line.map do |line| - $stderr.puts(line) - - line.match(/^[0-9a-f]*/)[0] - end -end - - -puts(<<"EOH") -# This file is generated from generate_nix.rb. DO NOT EDIT. -# Execute the following command in a temporary directory to update the file. -# -# ruby generate_nix.rb > default.nix - -{ stdenv, fetchurl, config -, gconf -, alsaLib -, at_spi2_atk -, atk -, cairo -, cups -, curl -, dbus_glib -, dbus_libs -, fontconfig -, freetype -, gdk_pixbuf -, glib -, glibc -, gst_plugins_base -, gstreamer -, gtk -, kerberos -, libX11 -, libXScrnSaver -, libXext -, libXinerama -, libXrender -, libXt -, libcanberra -, libgnome -, libgnomeui -, mesa -, nspr -, nss -, pango -}: - -assert stdenv.isLinux; - -let - version = "#{real_version}"; - sources = [ -EOH - -locale_arch_path_tuples.zip(hashes) do |tuple, hash| - locale, arch, path = tuple - - puts(%Q| { locale = "#{locale}"; arch = "#{arch}"; sha256 = "#{hash}"; }|) -end - -puts(<<'EOF') - ]; - - arch = if stdenv.system == "i686-linux" - then "linux-i686" - else "linux-x86_64"; - - isPrefixOf = prefix: string: - builtins.substring 0 (builtins.stringLength prefix) string == prefix; - - sourceMatches = locale: source: - (isPrefixOf source.locale locale) && source.arch == arch; - - systemLocale = config.i18n.defaultLocale or "en-US"; - - defaultSource = stdenv.lib.findFirst (sourceMatches "en-US") {} sources; - - source = stdenv.lib.findFirst (sourceMatches systemLocale) defaultSource sources; - -in - -stdenv.mkDerivation { - name = "thunderbird-bin-${version}"; - - src = fetchurl { - url = "http://download-installer.cdn.mozilla.net/pub/thunderbird/releases/${version}/${source.arch}/${source.locale}/thunderbird-${version}.tar.bz2"; - inherit (source) sha256; - }; - - phases = "unpackPhase installPhase"; - - libPath = stdenv.lib.makeLibraryPath - [ stdenv.gcc.gcc - gconf - alsaLib - at_spi2_atk - atk - cairo - cups - curl - dbus_glib - dbus_libs - fontconfig - freetype - gdk_pixbuf - glib - glibc - gst_plugins_base - gstreamer - gtk - kerberos - libX11 - libXScrnSaver - libXext - libXinerama - libXrender - libXt - libcanberra - libgnome - libgnomeui - mesa - nspr - nss - pango - ] + ":" + stdenv.lib.makeSearchPath "lib64" [ - stdenv.gcc.gcc - ]; - - installPhase = - '' - mkdir -p "$prefix/usr/lib/thunderbird-bin-${version}" - cp -r * "$prefix/usr/lib/thunderbird-bin-${version}" - - mkdir -p "$out/bin" - ln -s "$prefix/usr/lib/thunderbird-bin-${version}/thunderbird" "$out/bin/" - - for executable in \ - thunderbird mozilla-xremote-client thunderbird-bin plugin-container \ - updater - do - patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ - "$out/usr/lib/thunderbird-bin-${version}/$executable" - done - - for executable in \ - thunderbird mozilla-xremote-client thunderbird-bin plugin-container \ - updater libxul.so - do - patchelf --set-rpath "$libPath" \ - "$out/usr/lib/thunderbird-bin-${version}/$executable" - done - - # Create a desktop item. - mkdir -p $out/share/applications - cat > $out/share/applications/thunderbird.desktop <<EOF - [Desktop Entry] - Type=Application - Exec=$out/bin/thunderbird - Icon=$out/lib/thunderbird-bin-${version}/chrome/icons/default/default256.png - Name=Thunderbird - GenericName=Mail Reader - Categories=Application;Network; - EOF - ''; - - meta = with stdenv.lib; { - description = "Mozilla Thunderbird, a full-featured email client"; - homepage = http://www.mozilla.org/thunderbird/; - license = { - shortName = "unfree"; # not sure - fullName = "unfree"; - url = http://www.mozilla.org/en-US/foundation/trademarks/policy/; - }; - maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; - platforms = platforms.linux; - }; -} -EOF diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/generate_sources.rb b/pkgs/applications/networking/mailreaders/thunderbird-bin/generate_sources.rb new file mode 100644 index 000000000000..72b9d1599e0f --- /dev/null +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/generate_sources.rb @@ -0,0 +1,46 @@ +require "open-uri" + +version = if ARGV.empty? + "latest" + else + ARGV[0] + end + +base_path = "http://download-installer.cdn.mozilla.net/pub/thunderbird/releases" + +Source = Struct.new(:hash, :arch, :locale, :filename) + +sources = open("#{base_path}/#{version}/SHA1SUMS") do |input| + input.readlines +end.select do |line| + /\/thunderbird-.*\.tar\.bz2$/ === line && !(/source/ === line) +end.map do |line| + hash, name = line.chomp.split(/ +/) + Source.new(hash, *(name.split("/"))) +end.sort_by do |source| + [source.locale, source.arch] +end + +real_version = sources[0].filename.match(/thunderbird-([0-9.]*)\.tar\.bz2/)[1] + +arches = ["linux-i686", "linux-x86_64"] + +puts(<<"EOH") +# This file is generated from generate_nix.rb. DO NOT EDIT. +# Execute the following command in a temporary directory to update the file. +# +# ruby generate_source.rb > source.nix + +{ + version = "#{real_version}"; + sources = [ +EOH + +sources.each do |source| + puts(%Q| { locale = "#{source.locale}"; arch = "#{source.arch}"; sha1 = "#{source.hash}"; }|) +end + +puts(<<'EOF') + ]; +} +EOF diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix new file mode 100644 index 000000000000..e51c3f68d7f6 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix @@ -0,0 +1,120 @@ +# This file is generated from generate_nix.rb. DO NOT EDIT. +# Execute the following command in a temporary directory to update the file. +# +# ruby generate_source.rb > source.nix + +{ + version = "31.3.0"; + sources = [ + { locale = "ar"; arch = "linux-i686"; sha1 = "2579ce59d7c26bdd345732d6ab164fbf6e531b0a"; } + { locale = "ar"; arch = "linux-x86_64"; sha1 = "55b912f4424b06972cc9d3b14cab3eaa75abdff0"; } + { locale = "ast"; arch = "linux-i686"; sha1 = "101de138543ae46b667cc9800e45d30a59c31ea0"; } + { locale = "ast"; arch = "linux-x86_64"; sha1 = "0e290b8222ec3085d2848eb219fa2a950ab38f96"; } + { locale = "be"; arch = "linux-i686"; sha1 = "80db08139076f5e2810edd931af353bc3c9f6326"; } + { locale = "be"; arch = "linux-x86_64"; sha1 = "0569479306e0e5fbaa9b87d9f547eec875cdc673"; } + { locale = "bg"; arch = "linux-i686"; sha1 = "072900fc768486d525fa89ef4a289b3135ec7d1e"; } + { locale = "bg"; arch = "linux-x86_64"; sha1 = "b99da8534a06e89380b8a9c62e7ac848995cd648"; } + { locale = "bn-BD"; arch = "linux-i686"; sha1 = "89303e18aa4bc22b1cb91f4d990eb2e3896336e9"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "142a507fd977c81e18580acea9dc3e60fb6e6cca"; } + { locale = "br"; arch = "linux-i686"; sha1 = "987b861d55d333d552e22fd6ce4d5d8fa3031e95"; } + { locale = "br"; arch = "linux-x86_64"; sha1 = "8c088d8f374e4cab6477ed5e071861d3875513fb"; } + { locale = "ca"; arch = "linux-i686"; sha1 = "0517ffca37a556548a9b8ded4d7084df0ad70d53"; } + { locale = "ca"; arch = "linux-x86_64"; sha1 = "a617ae22a924d458ed633e5728f44838d0b42c64"; } + { locale = "cs"; arch = "linux-i686"; sha1 = "9ae7115dfc0c11528ec276d62925815f93f49dd0"; } + { locale = "cs"; arch = "linux-x86_64"; sha1 = "2155ef2017e5411a9279b66142306f5d5b9b2b0d"; } + { locale = "da"; arch = "linux-i686"; sha1 = "dfb5ee11a096128f53cebe016156e34aa762a5be"; } + { locale = "da"; arch = "linux-x86_64"; sha1 = "8549835e2c3a120aea39c274d7cb1c7f54035649"; } + { locale = "de"; arch = "linux-i686"; sha1 = "3032a8b87835781d919cab8862057a2612a52af3"; } + { locale = "de"; arch = "linux-x86_64"; sha1 = "6a9a99636cbfbff3950c5f31681ed2aefbb170b9"; } + { locale = "el"; arch = "linux-i686"; sha1 = "33bd8a4a7cdaab9937a7880f17c27177a667f1f5"; } + { locale = "el"; arch = "linux-x86_64"; sha1 = "e32d2382a8322cb65ed3b2b4d634cc818bf94d58"; } + { locale = "en-GB"; arch = "linux-i686"; sha1 = "2e85dcaa7450e2cd605ab41849693c6eb94aa4b8"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "5a229b46fca9bfe736254bc9a65259c5722dac37"; } + { locale = "en-US"; arch = "linux-i686"; sha1 = "40d0e9a5530812d2ffc471f9c1e9c64ec39bc3aa"; } + { locale = "en-US"; arch = "linux-x86_64"; sha1 = "5dc64b9a0fa7e4df1ed232b56478d52986c3b4ad"; } + { locale = "es-AR"; arch = "linux-i686"; sha1 = "5b3cec2e5ddfd9a12eadc5ac270aba85acfe0051"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "bceb273367d49b927f5de022009fdd27b707d4eb"; } + { locale = "es-ES"; arch = "linux-i686"; sha1 = "9911086185272ac2a5c6ee9b36170f1a7352b5a4"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "df164ccdb2ec8ac50c663fe5771a63cb51b991a8"; } + { locale = "et"; arch = "linux-i686"; sha1 = "1e98b4c19dc16e52a65e66a0b518626924a098b1"; } + { locale = "et"; arch = "linux-x86_64"; sha1 = "2153b56a7336fdba78797025ebba8deb0c5796ed"; } + { locale = "eu"; arch = "linux-i686"; sha1 = "864ae993a8e87b09ba2ebfa5d12a8cc9b36c9c27"; } + { locale = "eu"; arch = "linux-x86_64"; sha1 = "ad4a01b18e2c9d38d048f9ee28a19c00dd1dc122"; } + { locale = "fi"; arch = "linux-i686"; sha1 = "d2ebe588dda618a29de4af0fbadbdd1daddd059c"; } + { locale = "fi"; arch = "linux-x86_64"; sha1 = "3c5eb0bb4dec968678c812eda5d723b50ca2f150"; } + { locale = "fr"; arch = "linux-i686"; sha1 = "c71f67ab5942cb49add9a044d6eeb69523f416c9"; } + { locale = "fr"; arch = "linux-x86_64"; sha1 = "60c5a7037de5439ffebc39980c87e5e1065e2d8c"; } + { locale = "fy-NL"; arch = "linux-i686"; sha1 = "09d4f2786ede2aff43250d4ed8f151f73c1cb983"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "839bea8234ccc71f9402487f022a3fcee13da341"; } + { locale = "ga-IE"; arch = "linux-i686"; sha1 = "07635c04802c1023a9c6ec6d66c2d9ed9c210800"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "ff584fe726ca1be184c453d2eec250577d7747b4"; } + { locale = "gd"; arch = "linux-i686"; sha1 = "3cbb34e8eba1ad0db2f25b51390b6b66efbdbd6b"; } + { locale = "gd"; arch = "linux-x86_64"; sha1 = "78703fbf8e9c7cf4db1522baaea837450972f568"; } + { locale = "gl"; arch = "linux-i686"; sha1 = "1aab34a16224d84c958aa65f4a0e8100a96003f4"; } + { locale = "gl"; arch = "linux-x86_64"; sha1 = "a8beb35a764b040a1d495e8e34623a884c1911c8"; } + { locale = "he"; arch = "linux-i686"; sha1 = "73fe49520af05bb79e20c202836fce347466c957"; } + { locale = "he"; arch = "linux-x86_64"; sha1 = "1780d0a0f342fc6c64e9365a548c13770f9d02f3"; } + { locale = "hr"; arch = "linux-i686"; sha1 = "f2c570b88fe3368fa30a53f42357a02b610acb36"; } + { locale = "hr"; arch = "linux-x86_64"; sha1 = "b3bb417879fd039222062f2df8f64811c1472cd6"; } + { locale = "hu"; arch = "linux-i686"; sha1 = "3369f82671a7e56ca24161ac2a1dd7cd0ae9ba85"; } + { locale = "hu"; arch = "linux-x86_64"; sha1 = "996b00fb13c2cfd826597eb817bdf8098b523f1b"; } + { locale = "hy-AM"; arch = "linux-i686"; sha1 = "c805817f9463d74bb73cad273d91c15d04ef1786"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "20abe54c61fa4760a507da630c1b919cfe36cf6a"; } + { locale = "id"; arch = "linux-i686"; sha1 = "76e1659be7d8fbfcd2a6b0bcefdc3988d59e81fa"; } + { locale = "id"; arch = "linux-x86_64"; sha1 = "cff15be3455dcf7ed714e8e69d34dc2ad016b60f"; } + { locale = "is"; arch = "linux-i686"; sha1 = "be8238cddd980bbd7de2a21541b260fd6689a8d7"; } + { locale = "is"; arch = "linux-x86_64"; sha1 = "1fcabd1b1b43ac25f7f5d2eca896ba7d5ea82102"; } + { locale = "it"; arch = "linux-i686"; sha1 = "df18fd291ffbb80323dfd823aa04692bcf6f251f"; } + { locale = "it"; arch = "linux-x86_64"; sha1 = "196fae349e7b06029e9738a12fb78f24ca691598"; } + { locale = "ja"; arch = "linux-i686"; sha1 = "a888ba62981b73d96ba39892a3372b36f0ffb2b3"; } + { locale = "ja"; arch = "linux-x86_64"; sha1 = "00e2be4b037a37429ee708d49c82af5ffafe8ca1"; } + { locale = "ko"; arch = "linux-i686"; sha1 = "634ea25e7246ff1c23a0d57bdf928372ca867cd6"; } + { locale = "ko"; arch = "linux-x86_64"; sha1 = "cfa4acb0970ab87f44e3bbfe46717d1664c63e99"; } + { locale = "lt"; arch = "linux-i686"; sha1 = "50d2764febdfb206c704cc0eb14e0679e42dffc3"; } + { locale = "lt"; arch = "linux-x86_64"; sha1 = "1a975a34ddcb0637957def46bd6cc3785a9630df"; } + { locale = "nb-NO"; arch = "linux-i686"; sha1 = "c0cf3563e2322724447d1c6730a7d4674c9bad7a"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "0c7267858bf95345dc09f9b03b56283e3198f8a4"; } + { locale = "nl"; arch = "linux-i686"; sha1 = "8c8db046ca1f21c11d00914613010836e0c5aefc"; } + { locale = "nl"; arch = "linux-x86_64"; sha1 = "acd50182d4e1f255ef70bf3d7dfc9ef963535def"; } + { locale = "nn-NO"; arch = "linux-i686"; sha1 = "ca1728b39e052bd9975d2b2ec8cffa6290098316"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "05a3bed8b8c0ccea66ceef02184f4ecd95e141f8"; } + { locale = "pa-IN"; arch = "linux-i686"; sha1 = "e0aa8fca5e1df6adf5b5bf41d9c8f2a195e5b598"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "fd4f63140ffc56095c7b66a3ff560409a43ad018"; } + { locale = "pl"; arch = "linux-i686"; sha1 = "9dc57337681fd57c5eb51240463e25543385d23d"; } + { locale = "pl"; arch = "linux-x86_64"; sha1 = "2c27721db5b96a8d488ce7a74e3ebf350f71f76a"; } + { locale = "pt-BR"; arch = "linux-i686"; sha1 = "c4d3e3f02375533bfb734155327832b4bcddbbe5"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "81d1cfacaf3f6a2830af0fceda7ac463867afa90"; } + { locale = "pt-PT"; arch = "linux-i686"; sha1 = "f59639147c77344d7fbe49c8c3320ec382ce261c"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "76d04ef5ac5ce644c04621adcc08059f4d509cdd"; } + { locale = "rm"; arch = "linux-i686"; sha1 = "a9d4485e9740572e1c5b8579a171c381797c3f97"; } + { locale = "rm"; arch = "linux-x86_64"; sha1 = "9d699390b577ec97842e75118ee6f0579c386fe0"; } + { locale = "ro"; arch = "linux-i686"; sha1 = "e03991f23cd9da6e5f14e37a4f84faee64f529b1"; } + { locale = "ro"; arch = "linux-x86_64"; sha1 = "7137b302ed8c1079ed8f7efa2eaaeaeeb900cc28"; } + { locale = "ru"; arch = "linux-i686"; sha1 = "7cc98ffeebf3f450c5f29b177eca3e127184c89d"; } + { locale = "ru"; arch = "linux-x86_64"; sha1 = "c087c970e9456d60265f7f9f6be83100b3990ef9"; } + { locale = "si"; arch = "linux-i686"; sha1 = "4197c63d5669be0cd6856d17883f5dbb9690438f"; } + { locale = "si"; arch = "linux-x86_64"; sha1 = "753e858aba8212d86ce9a6855dfaa2223d2ce3bd"; } + { locale = "sk"; arch = "linux-i686"; sha1 = "64ca38cce9a99b7cf281faf0c53e5b646cb8e7f7"; } + { locale = "sk"; arch = "linux-x86_64"; sha1 = "78e10824e31d2aee74d852d7b657dd3239cfbaa2"; } + { locale = "sl"; arch = "linux-i686"; sha1 = "6d38031ef73b82a11193fe2333ba7bfc31e0da49"; } + { locale = "sl"; arch = "linux-x86_64"; sha1 = "c1ba73354f662da9f541978b5611acc41ee60356"; } + { locale = "sq"; arch = "linux-i686"; sha1 = "3bc7482b81a754abc01e4c1face0aa4e65aa3ea6"; } + { locale = "sq"; arch = "linux-x86_64"; sha1 = "2463ac4d17d95c41e5bfebf31c3127e3404caa02"; } + { locale = "sr"; arch = "linux-i686"; sha1 = "28f762f06a526f93b9a3ff3bd5a52a1bd4c6b314"; } + { locale = "sr"; arch = "linux-x86_64"; sha1 = "69bbca2b8cea57a76cb3791029f0d55da8383594"; } + { locale = "sv-SE"; arch = "linux-i686"; sha1 = "ddbfd64533c198deeb3e56cb137af3707cc22912"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "992b3a896d619393a829b0b404f6c69bc6d11263"; } + { locale = "ta-LK"; arch = "linux-i686"; sha1 = "dcc7382a20d316eabd500c9d7cfaa84b9e406d43"; } + { locale = "ta-LK"; arch = "linux-x86_64"; sha1 = "4202e74f6cb4e7bb22ae08a5e28d02cac8dd4861"; } + { locale = "tr"; arch = "linux-i686"; sha1 = "1cb9db5a71df0990758a93728d1cccc229797aaa"; } + { locale = "tr"; arch = "linux-x86_64"; sha1 = "8406829869881ed3228f44531c32106f51ef8671"; } + { locale = "uk"; arch = "linux-i686"; sha1 = "e9d259c9872336d96e854208d08d0d09aeb98f47"; } + { locale = "uk"; arch = "linux-x86_64"; sha1 = "3a65b5a21c2310dcb243abbf1cfdc7ec097a6018"; } + { locale = "vi"; arch = "linux-i686"; sha1 = "60070b3d0488aa80aa331cfb0ea1f37301d074d4"; } + { locale = "vi"; arch = "linux-x86_64"; sha1 = "ffe662b33db700fe795972a08320370592de365b"; } + { locale = "zh-CN"; arch = "linux-i686"; sha1 = "9722b296495a4ac01bb80952df97a1f1a92eed27"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "014e0cd18afceeb662d7c2e9f4541e7a4ef0260a"; } + { locale = "zh-TW"; arch = "linux-i686"; sha1 = "f5174db5a7852d27bdfcca4b57fdf5ffd5294680"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "0014eea1f648f9ddcf977f56f7a82044b41c136e"; } + ]; +} diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index fa48a8a0a2f5..e6ba7e21dc8e 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -13,7 +13,7 @@ enableOfficialBranding ? false }: -let version = "31.1.2"; in +let version = "31.2.0"; in let verName = "${version}"; in stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "ftp://ftp.mozilla.org/pub/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.bz2"; - sha1 = "a3983e7d29bd70e8117ca26f5b9873c68675caa9"; + sha1 = "87dff89388bd7ec51876e1bdbd82bc3fe60006b6"; }; buildInputs = # from firefox30Pkgs.xulrunner, but without gstreamer and libvpx diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 7b9396ff5ffb..80db3020ba5f 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -15,11 +15,11 @@ let in stdenv.mkDerivation rec { name = "mumble-" + version; - version = "1.2.7"; + version = "1.2.8"; src = fetchurl { url = "mirror://sourceforge/mumble/${name}.tar.gz"; - sha256 = "0zjqkkdkcvgmqic6np87hj6b6f851lkzyd6y3cqj6zzacjvps31d"; + sha256 = "0ng1xd7i0951kqnd9visf84y2dcwia79a1brjwfvr1wnykgw6bsc"; }; patches = optional jackSupport ./mumble-jack-support.patch; diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index fbf8955765aa..4d5a49ac5f63 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -6,14 +6,14 @@ }: let pname = "liferea"; - version = "1.10.11"; + version = "1.10.12"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2"; - sha256 = "0mf5mpdj60j8if4qi5656l4pzhgwzhshf31yp0h53l1j442v109a"; + sha256 = "0c046r3cgf2adcjkgcny1gf2yj3hs0fhrc1zmcz2ja7grcbx46si"; }; buildInputs = with gst_all_1; [ diff --git a/pkgs/applications/networking/newsreaders/slrn/default.nix b/pkgs/applications/networking/newsreaders/slrn/default.nix index fe13c756bd7f..84cf023776ea 100644 --- a/pkgs/applications/networking/newsreaders/slrn/default.nix +++ b/pkgs/applications/networking/newsreaders/slrn/default.nix @@ -1,15 +1,14 @@ -{ stdenv, fetchurl, -slang, ncurses -}: +{ stdenv, fetchurl +, slang, ncurses }: -let version = "1.0.1"; in +let version = "1.0.2"; in stdenv.mkDerivation { name = "slrn-${version}"; src = fetchurl { - url = "http://www.jedsoft.org/slrn/download/slrn-1.0.1.tar.gz"; - sha256 = "1rmaprfwvshzkv0c5vi43839cz3laqjpl306b9z0ghwyjdha1d06"; + url = "http://www.jedsoft.org/releases/slrn/slrn-${version}.tar.gz"; + sha256 = "1gn6m2zha2nnnrh9lz3m3nrqk6fgfij1wc53pg25j7sdgvlziv12"; }; preConfigure = '' @@ -23,9 +22,10 @@ stdenv.mkDerivation { buildInputs = [ slang ncurses ]; - meta = { - description = "Text-based newsreader"; + meta = with stdenv.lib; { + description = "The slrn (S-Lang read news) newsreader"; homepage = http://slrn.sourceforge.net/index.html; - license = stdenv.lib.licenses.gpl2; + maintainers = with maintainers; [ emery ]; + license = licenses.gpl2; }; } diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix new file mode 100644 index 000000000000..6e7755c7bf43 --- /dev/null +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, cmake, qt4, pkgconfig, neon, qtkeychain, sqlite }: + +stdenv.mkDerivation rec { + name = "owncloud-client" + "-" + version; + + version = "1.7.0"; + + src = fetchurl { + url = "https://download.owncloud.com/desktop/stable/mirall-${version}.tar.bz2"; + sha256 = "b1cb0612e5022de263dc4c6309eba8207d694a40a80dae6762b4a56fa8d4d944"; + }; + + buildInputs = + [ cmake qt4 pkgconfig neon qtkeychain sqlite]; + + #configurePhase = '' + # mkdir build + # cd build + # cmake -DBUILD_WITH_QT4=on \ + # -DCMAKE_INSTALL_PREFIX=$out \ + # -DCMAKE_BUILD_TYPE=Release \ + # .. + #''; + + enableParallelBuilding = true; + + meta = { + description = "Synchronise your ownCloud with your computer using this desktop client"; + homepage = https://owncloud.org; + maintainers = with stdenv.lib.maintainers; [ qknight ]; + }; +} diff --git a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix index ba71e1985b46..e4ca6d423cdc 100644 --- a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix +++ b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "3d9170645450f9cb0a605278b8646fec2110b9637910d86fd27cf245cbe24eaf"; }; - buildInputs = [ cmake pkgconfig qt4 boost boost.lib bzip2 libX11 pcre libidn lua5 miniupnpc aspell gettext ]; + buildInputs = [ cmake pkgconfig qt4 boost bzip2 libX11 pcre libidn lua5 miniupnpc aspell gettext ]; cmakeFlags = '' -DUSE_ASPELL=ON diff --git a/pkgs/applications/networking/p2p/frostwire/default.nix b/pkgs/applications/networking/p2p/frostwire/default.nix new file mode 100644 index 000000000000..434a2c785508 --- /dev/null +++ b/pkgs/applications/networking/p2p/frostwire/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, jre }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + version = "6.0.0"; + name = "frostwire-${version}"; + + src = fetchurl { + url = "http://dl.frostwire.com/frostwire/${version}/frostwire-${version}.x86_64.tar.gz"; + sha256 = "16rpfh235jj75vm4rx6qqw25ax3rk2p21l6lippbm0pi13lp2pdh"; + }; + + inherit jre; + + installPhase = '' + jar=$(ls */*.jar) + + mkdir -p $out/share/java + mv $jar $out/share/java + + mkdir -p $out/bin + cat > $out/bin/frostwire <<EOF + #! $SHELL -e + exec $out/share/java/frostwire + EOF + chmod +x $out/bin/frostwire + ''; + + meta = { + homepage = http://www.frostwire.com/; + description = "BitTorrent Client and Cloud File Downloader"; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.gavin ]; + }; +} diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix index 57ea62485310..9813393c4b50 100644 --- a/pkgs/applications/networking/p2p/mldonkey/default.nix +++ b/pkgs/applications/networking/p2p/mldonkey/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation (rec { meta = { description = "Client for many p2p networks, with multiple frontends"; homepage = http://mldonkey.sourceforge.net/; + license = stdenv.lib.licenses.gpl2; }; buildInputs = [ ocaml zlib ncurses bzip2 file gd libpng ]; diff --git a/pkgs/applications/networking/p2p/opentracker/default.nix b/pkgs/applications/networking/p2p/opentracker/default.nix new file mode 100644 index 000000000000..32ceeb6fc8d5 --- /dev/null +++ b/pkgs/applications/networking/p2p/opentracker/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchgit, libowfat, zlib }: + +stdenv.mkDerivation { + name = "opentracker"; + src = fetchgit { + url = "https://github.com/masroore/opentracker.git"; + rev = "9a26b3d203755577879315ecc2b515d0e22793cb"; + sha256 = "74a7a6cbe80932fefb1698524809ce89be696f0fe3afd38fcb2b99fa59c9c891"; + }; + + buildInputs = [ libowfat zlib ]; + + installPhase = '' + mkdir -p $out/bin + cp opentracker $out/bin + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/masroore/opentracker; + license = "beer-ware"; + platforms = platforms.linux; + description = "Bittorrent tracker project aiminf for minimal resource usage and is intended to run at your wlan router"; + }; +} \ No newline at end of file diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index ccf129881f5d..51c43771bcf7 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -2,18 +2,21 @@ , pkgconfig }: stdenv.mkDerivation rec { - name = "qbittorrent-3.1.10"; + name = "qbittorrent-3.1.11"; src = fetchurl { url = "mirror://sourceforge/qbittorrent/${name}.tar.xz"; - sha256 = "0xhqli191r5v9b5x6wj1wsjlj6svf6ldgzl7jza39q3ipr5c2pg6"; + sha256 = "0qvz8ifk01b9sw9x5yh3b5kmssx5yi026zvgvabdvfaqkvcmw43i"; }; - buildInputs = [ qt4 which dbus_libs boost libtorrentRasterbar - pkgconfig ]; + buildInputs = [ + qt4 which dbus_libs boost libtorrentRasterbar pkgconfig + ]; - configureFlags = "--with-libboost-inc=${boost}/include " - + "--with-libboost-lib=${boost}/lib"; + configureFlags = [ + "--with-libboost-lib=${boost.lib}/lib" + "--with-libboost-inc=${boost.dev}/include" + ]; # https://github.com/qbittorrent/qBittorrent/issues/1992 #enableParallelBuilding = true; diff --git a/pkgs/applications/networking/p2p/twister/default.nix b/pkgs/applications/networking/p2p/twister/default.nix index 36f83a0611bf..e6fd674e9e7c 100644 --- a/pkgs/applications/networking/p2p/twister/default.nix +++ b/pkgs/applications/networking/p2p/twister/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, python -, boost, db, openssl, geoip, libiconv, miniupnpc +, boost, db, openssl, geoip, libiconvOrEmpty, miniupnpc , srcOnly, fetchgit }: @@ -26,7 +26,6 @@ in stdenv.mkDerivation rec { configureFlags = [ "--with-libgeoip" "--with-libiconv" - "--with-boost=${boost}" "--disable-deprecated-functions" "--enable-tests" "--enable-python-binding" @@ -34,8 +33,8 @@ in stdenv.mkDerivation rec { buildInputs = [ autoconf automake libtool pkgconfig python - boost db openssl geoip libiconv miniupnpc - ]; + boost db openssl geoip miniupnpc + ] ++ libiconvOrEmpty; postPatch = '' sed -i -e '/-htmldir/s|(default: [^)]*)|(default: ${twisterHTML})|' \ diff --git a/pkgs/applications/networking/pond/default.nix b/pkgs/applications/networking/pond/default.nix new file mode 100644 index 000000000000..9d3954d839ba --- /dev/null +++ b/pkgs/applications/networking/pond/default.nix @@ -0,0 +1,32 @@ +{ stdenv, lib, fetchgit, fetchhg, go, trousers }: + +let deps = import ./deps.nix { + inherit stdenv lib fetchgit fetchhg; +}; + +in stdenv.mkDerivation rec { + name = "pond"; + + buildInputs = [ go trousers ]; + + unpackPhase = '' + export GOPATH=$PWD + echo $PWD + cp -LR ${deps}/src src + chmod u+w -R src + ''; + + installPhase = '' + export GOPATH="$PWD" + mkdir -p $out/bin + go build --tags nogui -v -o $out/bin/pond-cli github.com/agl/pond/client + ''; + + meta = with lib; { + description = "Forward secure, asynchronous messaging for the discerning"; + homepage = https://pond.imperialviolet.org; + license = licenses.bsd3; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/applications/networking/pond/deps.nix b/pkgs/applications/networking/pond/deps.nix new file mode 100644 index 000000000000..0983ad275e22 --- /dev/null +++ b/pkgs/applications/networking/pond/deps.nix @@ -0,0 +1,60 @@ +# This file was generated by go2nix. +{ stdenv, lib, fetchgit, fetchhg}: + +let + goDeps = [ + { + root = "github.com/agl/pond"; + src = fetchgit { + url = "git://github.com/agl/pond.git"; + rev = "f4e441c77a2039814046ff8219629c547fe8b689"; + sha256 = "f2dfc6cb96cc4b8ae732e41d1958b62036f40cb346df2e14f27b5964a1416026"; + }; + } + { + root = "github.com/agl/ed25519"; + src = fetchgit { + url = "git://github.com/agl/ed25519.git"; + rev = "d2b94fd789ea21d12fac1a4443dd3a3f79cda72c"; + sha256 = "83e3010509805d1d315c7aa85a356fda69d91b51ff99ed98a503d63adb3613e9"; + }; + } + { + root = "code.google.com/p/go.crypto"; + src = fetchhg { + url = "https://code.google.com/p/go.crypto"; + rev = "31393df5baea"; + sha256 = "0b95dpsvxxapcjjvhj05fdmyn0mzffamc25hvxy7xgsl2l9yy3nw"; + }; + } + { + root = "code.google.com/p/go.net"; + src = fetchhg { + url = "https://code.google.com/p/go.net"; + rev = "90e232e2462d"; + sha256 = "0hqvkaa0rbxwbi74xa6aqbkf63zk662x5hp3bp8vbhzkc4yl1h59"; + }; + } + { + root = "code.google.com/p/goprotobuf"; + src = fetchhg { + url = "https://code.google.com/p/goprotobuf"; + rev = "36be16571e14"; + sha256 = "14yay2sgfbbs0bx3q03bdqn1kivyvxfdm34rmp2612gvinlll215"; + }; + } + ]; + +in + +stdenv.mkDerivation rec { + name = "go-deps"; + + buildCommand = + lib.concatStrings + (map (dep: '' + mkdir -p $out/src/`dirname ${dep.root}` + ln -s ${dep.src} $out/src/${dep.root} + '') goDeps); +} + diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 8785837fbb93..092e6f53e493 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -60,6 +60,6 @@ stdenv.mkDerivation rec { homepage = http://www.freerdp.com/; - license = "free-non-copyleft"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/applications/networking/remote/freerdp/unstable.nix b/pkgs/applications/networking/remote/freerdp/unstable.nix index a8388b4829af..00e5a4f93ee6 100644 --- a/pkgs/applications/networking/remote/freerdp/unstable.nix +++ b/pkgs/applications/networking/remote/freerdp/unstable.nix @@ -1,77 +1,42 @@ -{ stdenv -, fetchgit -, cmake -, openssl -, printerSupport ? true, cups -, pkgconfig -, zlib -, libX11 -, libXcursor -, libXdamage -, libXext -, alsaLib -, ffmpeg -, libxkbfile -#, xmlto, docbook_xml_dtd_412, docbook_xml_xslt -, libXinerama -#, directfb -#, cunit -, libXv -, pulseaudioSupport ? true, pulseaudio +{ stdenv, fetchFromGitHub, cmake, pkgconfig, openssl, zlib, libX11, libXcursor +, libXdamage, libXext, glib, alsaLib, ffmpeg, libxkbfile, libXinerama, libXv +, pulseaudio ? null, cups ? null, pcsclite ? null }: -assert printerSupport -> cups != null; - -let rev = "ec6effcb1e7759551cf31f5b18d768afc67db97d"; in - stdenv.mkDerivation rec { - name = "freerdp-1.1pre-${stdenv.lib.strings.substring 0 7 rev}"; + name = "freerdp-1.2.0-beta1"; - src = fetchgit { - url = git://github.com/FreeRDP/FreeRDP.git; - inherit rev; - sha256 = "4e5af9a6769c4b34c6b75dffe83a385d1d86068c523ea9f62fabc651a2958455"; + src = fetchFromGitHub { + owner = "FreeRDP"; + repo = "FreeRDP"; + rev = "1.2.0-beta1+android7"; + sha256 = "08nn18jydblrif1qs92pakzd3ww7inr0i378ssn1bjp09lm1bkk0"; }; buildInputs = [ - cmake - openssl - pkgconfig - zlib - libX11 - libXcursor - libXdamage - libXext -# directfb -# cunit - alsaLib - ffmpeg - libxkbfile -# xmlto docbook_xml_dtd_412 docbook_xml_xslt - libXinerama - libXv - ] ++ stdenv.lib.optional printerSupport cups; + cmake pkgconfig openssl zlib libX11 libXcursor libXdamage libXext glib + alsaLib ffmpeg libxkbfile libXinerama libXv cups pulseaudio pcsclite + ]; doCheck = false; - checkPhase = ''LD_LIBRARY_PATH="libfreerdp-cache:libfreerdp-chanman:libfreerdp-common:libfreerdp-core:libfreerdp-gdi:libfreerdp-kbd:libfreerdp-rail:libfreerdp-rfx:libfreerdp-utils" cunit/test_freerdp''; + cmakeFlags = [ + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DWITH_CUNIT=OFF" + ] ++ stdenv.lib.optional (pulseaudio != null) "-DWITH_PULSE=ON" + ++ stdenv.lib.optional (cups != null) "-DWITH_CUPS=ON" + ++ stdenv.lib.optional (pcsclite != null) "-DWITH_PCSC=ON"; - cmakeFlags = [ "-DWITH_DIRECTFB=OFF" "-DWITH_CUNIT=OFF" "-DWITH_MANPAGES=OFF" - ] ++ stdenv.lib.optional pulseaudioSupport "-DWITH_PULSEAUDIO=ON"; - - meta = { + meta = with stdenv.lib; { description = "A Remote Desktop Protocol Client"; - longDescription = '' FreeRDP is a client-side implementation of the Remote Desktop Protocol (RDP) following the Microsoft Open Specifications. ''; - homepage = http://www.freerdp.com/; - - license = "free-non-copyleft"; - - broken = true; # fails to build + license = licenses.asl20; + maintainers = with maintainers; [ wkennington ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/remote/rdesktop/default.nix b/pkgs/applications/networking/remote/rdesktop/default.nix index 7d2b7990d3f9..fbbc85108a15 100644 --- a/pkgs/applications/networking/remote/rdesktop/default.nix +++ b/pkgs/applications/networking/remote/rdesktop/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation (rec { sha256 = "0y0s0qjfsflp4drcn75ykx6as7mn13092bcvlp2ibhilkpa27gzv"; }; + patches = [ ./enable_windows_key.patch ]; + buildInputs = [openssl libX11]; configureFlags = [ diff --git a/pkgs/applications/networking/remote/rdesktop/enable_windows_key.patch b/pkgs/applications/networking/remote/rdesktop/enable_windows_key.patch new file mode 100644 index 000000000000..fff84c599636 --- /dev/null +++ b/pkgs/applications/networking/remote/rdesktop/enable_windows_key.patch @@ -0,0 +1,29 @@ +http://sourceforge.net/p/rdesktop/code/1816/ +Fix constant naming and enabled windowskey by default. + +Index: trunk/rdesktop.c +=================================================================== +--- trunk/rdesktop.c (revision 1815) ++++ trunk/rdesktop.c (revision 1816) +@@ -554,7 +554,7 @@ + act.sa_flags = 0; + sigaction(SIGPIPE, &act, NULL); + +- flags = RDP_LOGON_NORMAL; ++ flags = RDP_LOGON_NORMAL | RDP_LOGON_ENABLEWINDOWSKEY; + prompt_password = False; + g_seamless_spawn_cmd[0] = domain[0] = g_password[0] = shell[0] = directory[0] = 0; + g_embed_wnd = 0; +Index: trunk/constants.h +=================================================================== +--- trunk/constants.h (revision 1815) ++++ trunk/constants.h (revision 1816) +@@ -321,7 +321,7 @@ + #define RDP_LOGON_AUTO 0x0008 + #define RDP_LOGON_NORMAL 0x0033 + #define RDP_LOGON_COMPRESSION 0x0080 /* mppc compression with 8kB histroy buffer */ +-#define RDP_LOGON_BLOB 0x0100 ++#define RDP_LOGON_ENABLEWINDOWSKEY 0x0100 + #define RDP_LOGON_COMPRESSION2 0x0200 /* rdp5 mppc compression with 64kB history buffer */ + #define RDP_LOGON_LEAVE_AUDIO 0x2000 + #define RDP_LOGON_PASSWORD_IS_SC_PIN 0x40000 diff --git a/pkgs/applications/networking/remote/teamviewer/8.nix b/pkgs/applications/networking/remote/teamviewer/8.nix index 459ae9fab82b..a47d7bad4c9d 100644 --- a/pkgs/applications/networking/remote/teamviewer/8.nix +++ b/pkgs/applications/networking/remote/teamviewer/8.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libX11, libXtst, libXext, libXdamage, libXfixes, wineUnstable, makeWrapper, libXau -, bash, patchelf }: +, bash, patchelf, config }: let topath = "${wineUnstable}/bin"; @@ -10,8 +10,8 @@ in stdenv.mkDerivation { name = "teamviewer-8.0.17147"; src = fetchurl { - url = "http://download.teamviewer.com/download/version_8x/teamviewer_linux_x64.deb"; - sha256 = "0s5m15f99rdmspzwx3gb9mqd6jx1bgfm0d6rfd01k9rf7gi7qk0k"; + url = config.teamviewer8.url or "http://download.teamviewer.com/download/version_8x/teamviewer_linux_x64.deb"; + sha256 = config.teamviewer8.sha256 or "0s5m15f99rdmspzwx3gb9mqd6jx1bgfm0d6rfd01k9rf7gi7qk0k"; }; buildInputs = [ makeWrapper patchelf ]; diff --git a/pkgs/applications/networking/remote/teamviewer/9.nix b/pkgs/applications/networking/remote/teamviewer/9.nix new file mode 100644 index 000000000000..6ae68aea9ea3 --- /dev/null +++ b/pkgs/applications/networking/remote/teamviewer/9.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl, libX11, libXtst, libXext, libXdamage, libXfixes, wineUnstable, makeWrapper, libXau +, bash, patchelf, config }: + +let + topath = "${wineUnstable}/bin"; + + toldpath = stdenv.lib.concatStringsSep ":" (map (x: "${x}/lib") + [ stdenv.gcc.gcc libX11 libXtst libXext libXdamage libXfixes wineUnstable ]); +in +stdenv.mkDerivation { + name = "teamviewer-9.0.32150"; + src = fetchurl { + url = config.teamviewer9.url or "http://download.teamviewer.com/download/version_9x/teamviewer_linux_x64.deb"; + sha256 = config.teamviewer9.sha256 or "0wpwbx0xzn3vlzavszxhfvfcaj3pijlpwvlz5m7w19mb6cky3q13"; + }; + + buildInputs = [ makeWrapper patchelf ]; + + unpackPhase = '' + ar x $src + tar xf data.tar.gz + ''; + + installPhase = '' + mkdir -p $out/share/teamviewer9 $out/bin + cp -a opt/teamviewer9/* $out/share/teamviewer9 + rm -R $out/share/teamviewer9/tv_bin/wine/{bin,lib,share} + + cat > $out/bin/teamviewer << EOF + #!${bash}/bin/sh + export LD_LIBRARY_PATH=${toldpath}\''${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH} + export PATH=${topath}\''${PATH:+:\$PATH} + $out/share/teamviewer9/tv_bin/script/teamviewer "\$@" + EOF + chmod +x $out/bin/teamviewer + + patchelf --set-rpath "${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib:${libX11}/lib:${libXext}/lib:${libXau}/lib:${libXdamage}/lib:${libXfixes}/lib" $out/share/teamviewer9/tv_bin/teamviewerd + patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $out/share/teamviewer9/tv_bin/teamviewerd + ln -s $out/share/teamviewer9/tv_bin/teamviewerd $out/bin/ + ''; + + meta = { + homepage = "http://www.teamviewer.com"; + license = stdenv.lib.licenses.unfree; + description = "Desktop sharing application, providing remote support and online meetings"; + }; +} diff --git a/pkgs/applications/networking/sniffers/ettercap/default.nix b/pkgs/applications/networking/sniffers/ettercap/default.nix index 3994563cf3eb..7e32a26abf18 100644 --- a/pkgs/applications/networking/sniffers/ettercap/default.nix +++ b/pkgs/applications/networking/sniffers/ettercap/default.nix @@ -1,13 +1,15 @@ -{ stdenv, fetchurl, cmake, libpcap, libnet, zlib, curl, pcre, +{ stdenv, fetchFromGitHub, cmake, libpcap, libnet, zlib, curl, pcre, openssl, ncurses, glib, gtk, atk, pango, flex, bison }: stdenv.mkDerivation rec { name = "ettercap-${version}"; - version = "0.8.0"; + version = "0.8.1"; - src = fetchurl { - url = "https://github.com/Ettercap/ettercap/archive/v${version}.tar.gz"; - sha256 = "1g69782wk2hag8h76jqy81szw5jhvqqnn3m4v0wjkbv9zjxy44w0"; + src = fetchFromGitHub { + owner = "Ettercap"; + repo = "ettercap"; + rev = "v${version}"; + sha256 = "017398fiqcl2x1bjfnz97y6j8v5n83gbsniy73vbx21kmhh5pacg"; }; buildInputs = [ @@ -16,7 +18,8 @@ stdenv.mkDerivation rec { ]; preConfigure = '' - substituteInPlace CMakeLists.txt --replace /etc \$\{INSTALL_PREFIX\}/etc + substituteInPlace CMakeLists.txt --replace /etc \$\{INSTALL_PREFIX\}/etc \ + --replace /usr \$\{INSTALL_PREFIX\} ''; cmakeFlags = [ @@ -24,10 +27,11 @@ stdenv.mkDerivation rec { "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk}/lib/gtk-2.0/include" ]; - meta = { + meta = with stdenv.lib; { description = "Comprehensive suite for man in the middle attacks"; homepage = http://ettercap.github.io/ettercap/; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 68d7becdd3c2..c6ba48782184 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -10,7 +10,7 @@ assert withQt -> !withGtk && qt4 != null; with stdenv.lib; let - version = "1.12.1"; + version = "1.12.2"; variant = if withGtk then "gtk" else if withQt then "qt" else "cli"; in @@ -19,7 +19,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.wireshark.org/download/src/wireshark-${version}.tar.bz2"; - sha256 = "0jsqpr4s5smadvlm881l8fkhhw384ak3apkq4wxr05gc2va6pcl2"; + sha256 = "14pjkl1r0lcnhrs8994dmrnpmpr4gn3xjkd8wcn694m512s1dbih"; }; buildInputs = [ diff --git a/pkgs/applications/networking/sync/akunambol/default.nix b/pkgs/applications/networking/sync/akunambol/default.nix deleted file mode 100644 index 2aedfd7f8334..000000000000 --- a/pkgs/applications/networking/sync/akunambol/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv, fetchgit, kdepimlibs, funambol, liblikeback }: - -stdenv.mkDerivation rec { - name = "akunambol-20110304"; - - src = fetchgit { - url = git://anongit.kde.org/akunambol.git; - rev = "1d832bbbce84f474e3f1e5d2f9fa8a4079b0c8e5"; - sha256 = "1d2x42lbw32qyawri7z0mrbafz36r035w5bxjpq51awyqjwkbb2d"; - }; - - buildInputs = [ kdepimlibs funambol liblikeback ]; - KDEDIRS = liblikeback; - - patches = [ ./non-latin.diff ]; -} diff --git a/pkgs/applications/networking/sync/akunambol/non-latin.diff b/pkgs/applications/networking/sync/akunambol/non-latin.diff deleted file mode 100644 index 905a6a894bdf..000000000000 --- a/pkgs/applications/networking/sync/akunambol/non-latin.diff +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/qtgui/standardsourcesettings.cpp b/qtgui/standardsourcesettings.cpp -index a14a737..5d4712e 100644 ---- a/qtgui/standardsourcesettings.cpp -+++ b/qtgui/standardsourcesettings.cpp -@@ -83,9 +83,9 @@ void StandardSourceSettings::populateCollections() - foreach( const Collection &collection, colls ) { - if (collection.contentMimeTypes().contains(source->getAkonadiMimeType())) { - i++; -- const char* dn = collection.name().toUtf8(); -- LOG.debug("Adding collection id %lld named %s", collection.id(), dn); -- collections->addItem(dn); -+ LOG.debug("Adding collection id %lld named %s", collection.id(), -+ collection.name().toLocal8Bit().data()); -+ collections->addItem(collection.name()); - idList.append(collection.id()); - } - } diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index e87053d53264..3c58d367ab1e 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - name = "calligra-2.7.5"; + name = "calligra-2.8.6"; src = fetchurl { url = "mirror://kde/stable/${name}/${name}.tar.xz"; - sha256 = "0png8ac10xywxsml1z18as18kc9k9162l6an67hi6lgx0rv27ldi"; + sha256 = "587dda4a340f46e28fe69de8f292fa33a3cf237445013f6ce5ceafa191cb3694"; }; nativeBuildInputs = [ cmake perl pkgconfig ]; diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index 2b2fd87cf430..06cc268c1592 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "gnumeric-1.12.12"; + name = "gnumeric-1.12.18"; src = fetchurl { url = "mirror://gnome/sources/gnumeric/1.12/${name}.tar.xz"; - sha256 = "096i9x6b4i6x24vc4lsxx8fg2n2pjs2jb6x3bkg3ppa2c60w1jq0"; + sha256 = "402224f858cfa4e91503ab1be0491fa3322713dabe56b6eae171def8b736d9e9"; }; preConfigure = ''sed -i 's/\(SUBDIRS.*\) doc/\1/' Makefile.in''; # fails when installing docs diff --git a/pkgs/applications/office/ledger/3.0.nix b/pkgs/applications/office/ledger/default.nix index 22f15f652175..34aa7c769d01 100644 --- a/pkgs/applications/office/ledger/3.0.nix +++ b/pkgs/applications/office/ledger/default.nix @@ -2,19 +2,21 @@ , texinfo, gnused }: let - rev = "5961384"; + version = "3.1"; in stdenv.mkDerivation { - name = "ledger-3.0.4.${rev}"; + name = "ledger-${version}"; + # NOTE: fetchgit because ledger has submodules not included in the + # default github tarball. src = fetchgit { - url = "git://github.com/ledger/ledger.git"; - inherit rev; - sha256 = "0fmmhr3as4v2kb6h64k1fq979080cqhd75jvxfg7axk2mylb6b3q"; + url = "https://github.com/ledger/ledger.git"; + rev = "refs/tags/v${version}"; + sha256 = "1l5y4k830jyw7n1nnhssci3qahq091fj5cxcr77znk20nclz851s"; }; - buildInputs = [ cmake boost boost.lib gmp mpfr libedit python texinfo gnused ]; + buildInputs = [ cmake boost gmp mpfr libedit python texinfo gnused ]; enableParallelBuilding = true; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index e7583c437c81..ceb1a9eab865 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -24,7 +24,7 @@ let langsSpaces = stdenv.lib.concatStringsSep " " langs; major = "4"; minor = "3"; - patch = "1"; + patch = "3"; tweak = "2"; subdir = "${major}.${minor}.${patch}"; version = "${subdir}${if tweak == "" then "" else "."}${tweak}"; @@ -40,9 +40,9 @@ let sha256 = "10amvz7fzr1kcy3svfspkdykmspqgpjdmk44cyr406wi7v4lwnf9"; }; - configureFlags = "--with-boost=${boost}"; + buildInputs = [ boost mdds pkgconfig ]; - buildInputs = [ boost boost.lib mdds pkgconfig ]; + configureFlags = [ "--with-boost=${boost.dev}" ]; }; fetchThirdParty = {name, md5, brief, subDir ? ""}: fetchurl { @@ -60,9 +60,10 @@ let (x: x.name == "${name}.tar.bz2") ("Error: update liborcus version inside LO expression") (import ./libreoffice-srcs.nix)); - configureFlags = "--with-boost=${boost}"; - buildInputs = [ boost boost.lib mdds pkgconfig zlib libixion ]; + buildInputs = [ boost mdds pkgconfig zlib libixion ]; + + configureFlags = [ "--with-boost=${boost.dev}" ]; }; fetchSrc = {name, sha256}: fetchurl { @@ -79,14 +80,14 @@ let translations = fetchSrc { name = "translations"; - sha256 = "0vj1fpr99cb124hag0hijpp3pfbbi0gak56qiikxbwbq7mab6p9h"; + sha256 = "0jpkkb71fbiid12r2dpvak304hlvx4ws1bk2yrb3narz15wzcvjr"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "1q0vzfla764zjz6xcx6r4nc8rikwb3pr2jsraj28hhwr5b26gdfz"; + sha256 = "0vd4ndnqy7xjlxh9flfp84jy82bvaq80pxcsx6lsarxsb4cvw7sz"; }; }; @@ -96,7 +97,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "0s1j5y1gfyf3r53bbqnzirx17p49i8ah07737nrzik0ggps3lgd5"; + sha256 = "0abmrn8iwwsbvi9dxq1pnirclxvfb33ngg7lpsj0y5lf0jpgpbb0"; }; # Openoffice will open libcups dynamically, so we link it directly @@ -113,9 +114,7 @@ stdenv.mkDerivation rec { '' + (stdenv.lib.concatMapStrings (f: "ln -sv ${f} $sourceRoot/src/${f.outputHash}-${f.name}\nln -sv ${f} $sourceRoot/src/${f.name}\n") srcs.third_party) + '' ln -sv ${srcs.help} $sourceRoot/src/${srcs.help.name} - tar xf $sourceRoot/src/${srcs.help.name} -C $sourceRoot/../ - ln -sv ${srcs.translations} $sourceRoot/src/${srcs.translations.name} - tar xf $sourceRoot/src/${srcs.translations.name} -C $sourceRoot/../ + ln -svf ${srcs.translations} $sourceRoot/src/${srcs.translations.name} ''; patchPhase = '' @@ -183,6 +182,8 @@ stdenv.mkDerivation rec { ''; configureFlags = [ + "--with-boost=${boost.dev}" + "--with-boost-libdir=${boost.lib}/lib" "--with-vendor=NixOS" # Without these, configure does not finish @@ -198,7 +199,6 @@ stdenv.mkDerivation rec { "--with-system-headers" "--with-system-openssl" "--with-system-openldap" - "--with-boost-libdir=${boost.lib}/lib" "--without-system-libwps" # TODO "--without-doxygen" @@ -236,7 +236,7 @@ stdenv.mkDerivation rec { ''; buildInputs = with xorg; - [ ant ArchiveZip autoconf automake bison boost boost.lib cairo clucene_core + [ ant ArchiveZip autoconf automake bison boost cairo clucene_core CompressZlib cppunit cups curl db dbus_glib expat file flex fontconfig freetype GConf getopt gnome_vfs gperf gst_plugins_base gstreamer gtk hunspell icu jdk kde4.kdelibs lcms libcdr libexttextcat unixODBC libjpeg diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix index 6110a54feb55..7460f7e1fd68 100644 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix @@ -525,4 +525,10 @@ md5 = "44d667c142d7cda120332623eab69f40"; brief = true; } +{ + name = "libgltf-0.0.2.tar.bz2"; + md5 = "d63a9f47ab048f5009d90693d6aa6424"; + brief = true; + subDir = "libgltf/"; +} ] diff --git a/pkgs/applications/office/pinpoint/default.nix b/pkgs/applications/office/pinpoint/default.nix new file mode 100644 index 000000000000..0c3297ccc937 --- /dev/null +++ b/pkgs/applications/office/pinpoint/default.nix @@ -0,0 +1,19 @@ +{ fetchurl, stdenv, pkgconfig, autoconf, automake, clutter, clutter-gst +, gdk_pixbuf, cairo }: + +stdenv.mkDerivation rec { + name = "pinpoint-${version}"; + version = "0.1.4"; + src = fetchurl { + url = "http://ftp.gnome.org/pub/GNOME/sources/pinpoint/0.1/${name}.tar.bz2"; + sha256 = "26df7ba171d13f697c30c272460989b0f1b45e70c797310878a589ed5a6a47de"; + }; + buildInputs = [ pkgconfig autoconf automake clutter clutter-gst gdk_pixbuf + cairo ]; + + meta = { + homepage = https://wiki.gnome.org/action/show/Apps/Pinpoint; + description = "A tool for making hackers do excellent presentations"; + license = stdenv.lib.licenses.lgpl21; + }; +} diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index fb7a41d62466..d0d6fd136efd 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -3,11 +3,11 @@ , zlib, libpng, xorg, cairo, podofo, aspell, boost, cmake }: stdenv.mkDerivation rec { - name = "scribus-1.4.3"; + name = "scribus-1.4.4"; src = fetchurl { url = "mirror://sourceforge/scribus/scribus/${name}.tar.xz"; - sha256 = "1zxgl2g299rllfy5ihs5skicpv7zcmz149ahraami69gqcag6bn7"; + sha256 = "1bhp09x8rgdhyq8b516226nn0p7pxd2arkfkf2vvvklca5arsfx4"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix index dfb4c243c8cf..a12849cf2099 100644 --- a/pkgs/applications/office/skrooge/default.nix +++ b/pkgs/applications/office/skrooge/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, kdelibs, grantlee, qca2, libofx, gettext }: +{ stdenv, fetchurl, libxslt, kdelibs, kdepimlibs, grantlee, qjson, qca2, libofx, sqlite, gettext }: stdenv.mkDerivation rec { - name = "skrooge-1.3.2"; + name = "skrooge-1.10.0"; src = fetchurl { - url = "http://skrooge.org/files/${name}.tar.bz2"; - sha256 = "18j36yamxzfwpnnnjiach22q9088c2nlcilzh2p24gjhgnnd0v6r"; + url = "http://download.kde.org/stable/skrooge/${name}.tar.bz2"; + sha256 = "0rsw2xdgws5bvnf3h4hg16liahigcxgaxls7f8hzr9wipxx5xqda"; }; - buildInputs = [ kdelibs grantlee qca2 libofx ]; + buildInputs = [ libxslt kdelibs kdepimlibs grantlee qjson qca2 libofx sqlite ]; nativeBuildInputs = [ gettext ]; @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { inherit (kdelibs.meta) platforms; description = "A personal finance manager for KDE"; maintainers = [ stdenv.lib.maintainers.urkud ]; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/applications/office/tagainijisho/default.nix b/pkgs/applications/office/tagainijisho/default.nix new file mode 100644 index 000000000000..bee1b738d124 --- /dev/null +++ b/pkgs/applications/office/tagainijisho/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchurl, qt4, cmake, sqlite}: + +stdenv.mkDerivation { + name = "tagainijisho-1.0.2"; + src = fetchurl { + url = https://github.com/Gnurou/tagainijisho/releases/download/1.0.2/tagainijisho-1.0.2.tar.gz; + sha256 = "0gvwsphy2a1b2npxkzvaf91rbzb00zhi2anxd5102h6ld5m52jhl"; + }; + + buildInputs = [ qt4 cmake sqlite ]; + + meta = with stdenv.lib; { + description = "A free, open-source Japanese dictionary and kanji lookup tool"; + homepage = http://www.tagaini.net/; + license = with licenses; [ + /* program */ gpl3Plus + /* data */ cc-by-sa-30 + ]; + platforms = platforms.unix; + maintainers = with maintainers; [ vbgl ]; + }; +} diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index 658f460793f1..85ec081ea416 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { name = "zim-${version}"; - version = "0.60"; + version = "0.62"; namePrefix = ""; src = fetchurl { - url = "http://zim-wiki.org/downloads/zim-0.61.tar.gz"; - sha256 = "0jncxkf83bwra3022jbvjfwhk5w8az0jlwr8nsvm7wa1zfrajhsq"; + url = "http://zim-wiki.org/downloads/${name}.tar.gz"; + sha256 = "1hmx24jjazqvs3z6h10jl8wrqxyvvk0wc807v222vaf1sbmjmmhr"; }; propagatedBuildInputs = [ pythonPackages.sqlite3 pygtk /*pythonPackages.pyxdg*/ pygobject ]; @@ -100,4 +100,3 @@ buildPythonPackage rec { license = stdenv.lib.licenses.gpl2Plus; }; } - diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 00fda8bf1c45..6cd8697cd7d7 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -1,9 +1,20 @@ -{ stdenv, fetchurl, bash, xulrunner }: +{ stdenv, fetchurl, bash, callPackage, libIDL, pysqlite }: assert (stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"); + let - version = "4.0.22"; + /* Zotero always has a hard upper bound on its firefox/xulrunner dependency. + * Use private versions of firefox and xulrunner to prevent breakage when the + * system packages are updated. Please update these dependencies whenever + * zotero is updated; it should be as simple as copying the system firefox + * and xulrunner Nix expressions into place. + */ + firefox = callPackage ./firefox.nix { inherit libIDL pysqlite; }; + xulrunner = callPackage ./xulrunner.nix { inherit libIDL pysqlite firefox; }; + + # Please update the firefox and xulrunner dependencies when zotero is updated! + version = "4.0.23"; arch = if stdenv.system == "x86_64-linux" then "linux-x86_64" else "linux-i686"; @@ -14,8 +25,8 @@ stdenv.mkDerivation { src = fetchurl { url = "https://download.zotero.org/standalone/${version}/Zotero-${version}_${arch}.tar.bz2"; sha256 = if stdenv.system == "x86_64-linux" - then "0dq4x1cc0lnhs7g6w85qjdlb7sajr13mr2zcf4yvrciwhwy3r1i1" - else "0s4j2karaq85fwnd1niz8hzx5k71cqs493g38pg337i3iwxad9hg"; + then "1fz5xn69vapfw8d20207zr9p5r1h9x5kahh334pl2dn1h8il0sm8" + else "1kmsvvg2lh881rzy3rxbigzivixjamyrwf5x7vmn1kzhvsvifrng"; }; # Strip the bundled xulrunner diff --git a/pkgs/applications/office/zotero/firefox.nix b/pkgs/applications/office/zotero/firefox.nix new file mode 100644 index 000000000000..60befdbaad53 --- /dev/null +++ b/pkgs/applications/office/zotero/firefox.nix @@ -0,0 +1,108 @@ +{ lib, stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL +, libjpeg, zlib, dbus, dbus_glib, bzip2, xlibs +, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify +, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite +, hunspell, libevent, libstartup_notification, libvpx +, cairo, gstreamer, gst_plugins_base, icu +, debugBuild ? false +, # If you want the resulting program to call itself "Firefox" instead + # of "Shiretoko" or whatever, enable this option. However, those + # binaries may not be distributed without permission from the + # Mozilla Foundation, see + # http://www.mozilla.org/foundation/trademarks/. + enableOfficialBranding ? false +}: + +assert stdenv.gcc ? libc && stdenv.gcc.libc != null; + +let version = "33.1.1"; in + +stdenv.mkDerivation rec { + name = "firefox-${version}"; + + src = fetchurl { + url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2"; + sha1 = "1e9e3176e7d221c4f2ce479f37ee7c432236a0ec"; + }; + + buildInputs = + [ pkgconfig gtk perl zip libIDL libjpeg zlib bzip2 + python dbus dbus_glib pango freetype fontconfig xlibs.libXi + xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file + alsaLib nspr nss libnotify xlibs.pixman yasm mesa + xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite + xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper + hunspell libevent libstartup_notification libvpx cairo + gstreamer gst_plugins_base icu + ]; + + configureFlags = + [ "--enable-application=browser" + "--disable-javaxpcom" + "--with-system-jpeg" + "--with-system-zlib" + "--with-system-bz2" + "--with-system-nspr" + "--with-system-nss" + "--with-system-libevent" + "--with-system-libvpx" + # "--with-system-png" # needs APNG support + # "--with-system-icu" # causes ‘ar: invalid option -- 'L'’ in Firefox 28.0 + "--enable-system-ffi" + "--enable-system-hunspell" + "--enable-system-pixman" + "--enable-system-sqlite" + "--enable-system-cairo" + "--enable-gstreamer" + "--enable-startup-notification" + # "--enable-content-sandbox" # available since 26.0, but not much info available + # "--enable-content-sandbox-reporter" # keeping disabled for now + "--disable-crashreporter" + "--disable-tests" + "--disable-necko-wifi" # maybe we want to enable this at some point + "--disable-installer" + "--disable-updater" + "--disable-pulseaudio" + ] + ++ (if debugBuild then [ "--enable-debug" "--enable-profiling"] + else [ "--disable-debug" "--enable-release" + "--enable-optimize${lib.optionalString (stdenv.system == "i686-linux") "=-O1"}" + "--enable-strip" ]) + ++ lib.optional enableOfficialBranding "--enable-official-branding"; + + enableParallelBuilding = true; + + preConfigure = + '' + mkdir ../objdir + cd ../objdir + configureScript=../mozilla-release/configure + ''; + + preInstall = + '' + # The following is needed for startup cache creation on grsecurity kernels. + paxmark m ../objdir/dist/bin/xpcshell + ''; + + postInstall = + '' + # For grsecurity kernels + paxmark m $out/lib/${name}/{firefox,firefox-bin,plugin-container} + + # Remove SDK cruft. FIXME: move to a separate output? + rm -rf $out/share/idl $out/include $out/lib/firefox-devel-* + ''; + + meta = { + description = "Web browser"; + homepage = http://www.mozilla.com/en-US/firefox/; + maintainers = with lib.maintainers; [ eelco ]; + platforms = lib.platforms.linux; + }; + + passthru = { + inherit gtk nspr version; + isFirefox3Like = true; + }; +} diff --git a/pkgs/applications/office/zotero/xulrunner.nix b/pkgs/applications/office/zotero/xulrunner.nix new file mode 100644 index 000000000000..4dd1095c0ce8 --- /dev/null +++ b/pkgs/applications/office/zotero/xulrunner.nix @@ -0,0 +1,80 @@ +{ lib, stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL +, libjpeg, zlib, dbus, dbus_glib, bzip2, xlibs +, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify +, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite +, hunspell, libevent, libstartup_notification, libvpx +, cairo, gstreamer, gst_plugins_base, icu, firefox +, debugBuild ? false +}: + +assert stdenv.gcc ? libc && stdenv.gcc.libc != null; + +let version = firefox.version; in + +stdenv.mkDerivation rec { + name = "xulrunner-${version}"; + + src = firefox.src; + + buildInputs = + [ pkgconfig gtk perl zip libIDL libjpeg zlib bzip2 + python dbus dbus_glib pango freetype fontconfig xlibs.libXi + xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file + alsaLib nspr nss libnotify xlibs.pixman yasm mesa + xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite + xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper + hunspell libevent libstartup_notification libvpx cairo + gstreamer gst_plugins_base icu + ]; + + configureFlags = + [ "--enable-application=xulrunner" + "--disable-javaxpcom" + "--with-system-jpeg" + "--with-system-zlib" + "--with-system-bz2" + "--with-system-nspr" + "--with-system-nss" + "--with-system-libevent" + "--with-system-libvpx" + # "--with-system-png" # needs APNG support + # "--with-system-icu" # causes ‘ar: invalid option -- 'L'’ in Firefox 28.0 + "--enable-system-ffi" + "--enable-system-hunspell" + "--enable-system-pixman" + "--enable-system-sqlite" + "--enable-system-cairo" + "--enable-gstreamer" + "--enable-startup-notification" + # "--enable-content-sandbox" # available since 26.0, but not much info available + # "--enable-content-sandbox-reporter" # keeping disabled for now + "--disable-crashreporter" + "--disable-tests" + "--disable-necko-wifi" # maybe we want to enable this at some point + "--disable-installer" + "--disable-updater" + "--disable-pulseaudio" + ] + ++ (if debugBuild + then [ "--enable-debug" "--enable-profiling"] + else [ "--disable-debug" "--enable-release" "--enable-strip" + "--enable-optimize${lib.optionalString (stdenv.system == "i686-linux") "=-O1"}" ]); + + enableParallelBuilding = true; + + preConfigure = + '' + mkdir ../objdir + cd ../objdir + configureScript=../mozilla-release/configure + ''; + + meta = { + description = "Mozilla Firefox XUL runner"; + homepage = http://www.mozilla.com/en-US/firefox/; + maintainers = [ lib.maintainers.eelco ]; + platforms = lib.platforms.linux; + }; + + passthru = { inherit gtk version; }; +} diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 6b84143d0138..d7ae496f5aa6 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, qt4, perl, libiconv }: +{ stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, qt4, perl +, libiconvOrEmpty }: stdenv.mkDerivation rec { name = "stellarium-0.12.4"; @@ -8,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "11367hv9niyz9v47lf31vjsqkgc8da0vy2nhiyxgmk1i49p1pbhg"; }; - buildInputs = [ cmake freetype libpng mesa gettext openssl qt4 perl libiconv ]; + buildInputs = [ cmake freetype libpng mesa gettext openssl qt4 perl ] + ++ libiconvOrEmpty; enableParallelBuilding = true; diff --git a/pkgs/applications/science/astronomy/xplanet/giflib.patch b/pkgs/applications/science/astronomy/xplanet/giflib.patch index aaf024198fbc..653b9c8dc7d6 100644 --- a/pkgs/applications/science/astronomy/xplanet/giflib.patch +++ b/pkgs/applications/science/astronomy/xplanet/giflib.patch @@ -1,6 +1,6 @@ -diff -wbBur xplanet-1.3.0/src/libimage/gif.c /home/sergej/tmp/BUILD/staging-i686/sergej/build/xplanet/src/xplanet-1.3.0/src/libimage/gif.c +diff -wbBur xplanet-1.3.0/src/libimage/gif.c xplanet-1.3.0.my/src/libimage/gif.c --- xplanet-1.3.0/src/libimage/gif.c 2006-03-26 01:50:51.000000000 +0300 -+++ /home/sergej/tmp/BUILD/staging-i686/sergej/build/xplanet/src/xplanet-1.3.0/src/libimage/gif.c 2013-07-30 18:21:17.412474692 +0400 ++++ xplanet-1.3.0.my/src/libimage/gif.c 2014-05-29 18:59:14.830652716 +0400 @@ -20,7 +20,7 @@ #include <stdio.h> @@ -59,6 +59,15 @@ diff -wbBur xplanet-1.3.0/src/libimage/gif.c /home/sergej/tmp/BUILD/staging-i686 return(0); } } +@@ -154,7 +154,7 @@ + + free(buffer); + +- DGifCloseFile(infile); ++ DGifCloseFile(infile, NULL); + return(1); + } + @@ -178,7 +178,7 @@ return(0); } @@ -119,11 +128,13 @@ diff -wbBur xplanet-1.3.0/src/libimage/gif.c /home/sergej/tmp/BUILD/staging-i686 return(0); } ptr += width; -@@ -233,7 +233,7 @@ +@@ -232,8 +232,8 @@ + EGifSpew(outfile); - if (EGifCloseFile(outfile) == GIF_ERROR) +- if (EGifCloseFile(outfile) == GIF_ERROR) - PrintGifError(); ++ if (EGifCloseFile(outfile, NULL) == GIF_ERROR) + printf("%s\n", GifErrorString(GIF_ERROR)); free(buffer); diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix new file mode 100644 index 000000000000..0ac189c4ef8e --- /dev/null +++ b/pkgs/applications/science/electronics/fritzing/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, qt5, boost }: + +stdenv.mkDerivation rec { + + version = "0.9.0b"; + name = "fritzing"; + + src = fetchurl { + url = "http://fritzing.org/download/${version}/source-tarball/fritzing-${version}.source.tar_1.bz2"; + sha256 = "181qnknq1j5x075icpw2qk0sc4wcj9f2hym533vs936is0wxp2gk"; + }; + + unpackPhase = '' + tar xjf ${src} + ''; + + buildInputs = [ qt5 boost ]; + + configurePhase = '' + cd fritzing-${version}.source + qmake PREFIX=$out phoenix.pro + ''; + + meta = { + description = "An open source prototyping tool for Arduino-based projects"; + homepage = http://fritzing.org/; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.robberer ]; + }; +} diff --git a/pkgs/applications/science/electronics/pulseview/default.nix b/pkgs/applications/science/electronics/pulseview/default.nix index f9369efe96e5..07724d932541 100644 --- a/pkgs/applications/science/electronics/pulseview/default.nix +++ b/pkgs/applications/science/electronics/pulseview/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1pf1dgwd9j586nqmni6gqf3qxrsmawcmi9wzqfzqkjci18xd7dgy"; }; - buildInputs = [ pkgconfig cmake glib qt4 boost boost.lib libsigrok + buildInputs = [ pkgconfig cmake glib qt4 boost libsigrok libsigrokdecode libserialport libzip udev libusb1 libftdi ]; diff --git a/pkgs/applications/science/electronics/qucs/default.nix b/pkgs/applications/science/electronics/qucs/default.nix index dd3eaecc7441..6d89d9e52715 100644 --- a/pkgs/applications/science/electronics/qucs/default.nix +++ b/pkgs/applications/science/electronics/qucs/default.nix @@ -1,17 +1,16 @@ -{stdenv, fetchurl, qt3, libX11}: +{stdenv, fetchurl, flex, bison, qt4, libX11 }: stdenv.mkDerivation rec { - name = "qucs-0.0.16"; + name = "qucs-0.0.18"; src = fetchurl { url = "mirror://sourceforge/qucs/${name}.tar.gz"; - sha256 = "1h8ba84k06rix5zl5p9p414zj2facbnlf1vxwh4a1sp4h9dbfnzy"; + sha256 = "3609a18b57485dc9f19886ac6694667f3251702175bd1cbbbea37981b2c482a7"; }; - patches = [ ./tr1-complex.patch ]; - patchFlags = "-p0"; + QTDIR=qt4; - buildInputs = [ qt3 libX11 ]; + buildInputs = [ flex bison qt4 libX11 ]; meta = { description = "Integrated circuit simulator"; diff --git a/pkgs/applications/science/logic/acgtk/default.nix b/pkgs/applications/science/logic/acgtk/default.nix new file mode 100644 index 000000000000..41c6cf75f325 --- /dev/null +++ b/pkgs/applications/science/logic/acgtk/default.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchurl, ocaml, findlib, dypgen, bolt, ansiterminal, + buildBytecode ? true, + buildNative ? true, + installExamples ? true, + installEmacsMode ? true }: + +let inherit (stdenv.lib) getVersion versionAtLeast + optionals optionalString; in + +assert versionAtLeast (getVersion ocaml) "3.07"; +assert versionAtLeast (getVersion dypgen) "20080925"; +assert versionAtLeast (getVersion bolt) "1.4"; + +assert buildBytecode || buildNative; + +stdenv.mkDerivation { + + name = "acgtk-1.1"; + + src = fetchurl { + url = "http://www.loria.fr/equipes/calligramme/acg/software/acg-1.1-20140905.tar.gz"; + sha256 = "1k1ldqg34bwmgdpmi9gry9czlsk85ycjxnkd25fhlf3mmgg4n9p6"; + }; + + buildInputs = [ ocaml findlib dypgen bolt ansiterminal ]; + + patches = [ ./install-emacs-to-site-lisp.patch + ./use-nix-ocaml-byteflags.patch ]; + + # The bytecode executable is dependent on the dynamic library provided by + # ANSITerminal. We can use the -dllpath flag of ocamlc (analogous to + # -rpath) to make sure that ocamlrun is able to link the library at + # runtime and that Nix detects a runtime dependency. + NIX_OCAML_BYTEFLAGS = "-dllpath ${ansiterminal}/lib/ocaml/${getVersion ocaml}/site-lib/ANSITerminal"; + + buildFlags = optionalString buildBytecode "byte" + + " " + + optionalString buildNative "opt"; + + installTargets = "install" + + " " + optionalString installExamples "install-examples" + + " " + optionalString installEmacsMode "install-emacs"; + + meta = with stdenv.lib; { + homepage = "http://www.loria.fr/equipes/calligramme/acg"; + description = "A toolkit for developing ACG signatures and lexicon"; + license = licenses.cecill20; + platforms = ocaml.meta.platforms; + maintainers = [ maintainers.jirkamarsik ]; + }; +} diff --git a/pkgs/applications/science/logic/acgtk/install-emacs-to-site-lisp.patch b/pkgs/applications/science/logic/acgtk/install-emacs-to-site-lisp.patch new file mode 100644 index 000000000000..43ddd20b4a39 --- /dev/null +++ b/pkgs/applications/science/logic/acgtk/install-emacs-to-site-lisp.patch @@ -0,0 +1,23 @@ +--- acg-1.1-20140905/Makefile.in 2014-10-24 15:21:39.442287208 +0200 ++++ acg-1.1-20140905/Makefile.in.new 2014-10-24 15:24:58.557117228 +0200 +@@ -35,6 +35,7 @@ + ACGC_DIR=src/acg-data + + DATA_DIR=@datarootdir@/acgtk ++EMACS_DIR=@prefix@/share/emacs/site-lisp + + + +@@ -82,10 +83,10 @@ + rm -r $(DATA_DIR) + + install-emacs: +- mkdir -p $(DATA_DIR) && cp -r emacs $(DATA_DIR)/. ++ mkdir -p $(EMACS_DIR) && cp emacs/acg.el $(EMACS_DIR) + + uninstall-emacs: +- rm -rf $(DATA_DIR)/emacs ++ rm -rf $(EMACS_DIR)/emacs + + install-examples: + mkdir -p $(DATA_DIR) && cp -r examples $(DATA_DIR)/. diff --git a/pkgs/applications/science/logic/acgtk/use-nix-ocaml-byteflags.patch b/pkgs/applications/science/logic/acgtk/use-nix-ocaml-byteflags.patch new file mode 100644 index 000000000000..26ade37e4521 --- /dev/null +++ b/pkgs/applications/science/logic/acgtk/use-nix-ocaml-byteflags.patch @@ -0,0 +1,11 @@ +--- acg-1.1-20140905/src/Makefile.master.in 2014-10-27 10:59:42.263382081 +0100 ++++ acg-1.1-20140905/src/Makefile.master.in.new 2014-10-27 10:59:59.683597972 +0100 +@@ -23,7 +23,7 @@ + # All warnings are treated as errors + WARNINGS = @OCAML09WARNINGS@ -warn-error A + COMMONFLAGS= $(WARNINGS) @TYPES@ +-BYTEFLAGS = $(COMMONFLAGS) $(DEBUGFLAG) ++BYTEFLAGS = $(COMMONFLAGS) $(DEBUGFLAG) $(NIX_OCAML_BYTEFLAGS) + OPTFLAGS = $(COMMONFLAGS) + LFLAGS= -a + diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix index 62359baf2bc6..ca1602d6e58e 100644 --- a/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/pkgs/applications/science/logic/alt-ergo/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, ocaml, ocamlPackages, gmp }: +{ fetchurl, stdenv, ocaml, ocamlPackages }: stdenv.mkDerivation rec { name = "alt-ergo-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = with ocamlPackages; - [ ocaml findlib ocamlgraph zarith lablgtk gmp ]; + [ ocaml findlib ocamlgraph zarith lablgtk ]; meta = { description = "High-performance theorem prover and SMT solver"; diff --git a/pkgs/applications/science/logic/coq/8.3.nix b/pkgs/applications/science/logic/coq/8.3.nix index 8664b822cca7..63aaa02e67a3 100644 --- a/pkgs/applications/science/logic/coq/8.3.nix +++ b/pkgs/applications/science/logic/coq/8.3.nix @@ -64,6 +64,7 @@ stdenv.mkDerivation { ''; homepage = "http://coq.inria.fr"; license = licenses.lgpl21; + branch = "8.3"; maintainers = with maintainers; [ roconnor vbgl ]; }; } diff --git a/pkgs/applications/science/logic/coq/HEAD.nix b/pkgs/applications/science/logic/coq/HEAD.nix index 4081465fbd27..edf3091ef169 100644 --- a/pkgs/applications/science/logic/coq/HEAD.nix +++ b/pkgs/applications/science/logic/coq/HEAD.nix @@ -2,8 +2,8 @@ {stdenv, fetchgit, writeText, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null}: -let - version = "8.5pre-01feb42"; +let + version = "8.5pre-52f51fb3"; coq-version = "8.5"; buildIde = lablgtk != null; ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; @@ -17,8 +17,8 @@ stdenv.mkDerivation { src = fetchgit { url = git://scm.gforge.inria.fr/coq/coq.git; - rev = "01feb4206d26b41bfaab9bd45a7b2fc4db569baf"; - sha256 = "e6d44ebc3019b2650c6e320218b264f5bde68bf6f222b356d41b0a38918e839f"; + rev = "52f51fb385d6a1c90bd7d055185fee50ef2670be"; + sha256 = "0pgp59j2j8vk7nmcja5smly39dpkqfhpp29wpsn71piq6n52pql3"; }; buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ]; @@ -64,6 +64,7 @@ stdenv.mkDerivation { ''; homepage = "http://coq.inria.fr"; license = licenses.lgpl21; + branch = coq-version; maintainers = with maintainers; [ roconnor thoughtpolice vbgl ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index f0f62bfb3537..391dba244ef1 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -3,7 +3,7 @@ {stdenv, fetchurl, pkgconfig, writeText, ocaml, findlib, camlp5, ncurses, lablgtk ? null}: let - version = "8.4pl4"; + version = "8.4pl5"; coq-version = "8.4"; buildIde = lablgtk != null; ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; @@ -17,7 +17,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://coq.inria.fr/distrib/V${version}/files/coq-${version}.tar.gz"; - sha256 = "00bzf4kfbd0g279jrr8ynzvb9wqcly3wi577bkrxivhrg2msxhq6"; + sha256 = "0iajsabyrgypk1ncm0kqcxqv02k24xa1bayaxacjgmsqiavmm09m"; }; buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ]; @@ -64,6 +64,7 @@ stdenv.mkDerivation { ''; homepage = "http://coq.inria.fr"; license = licenses.lgpl21; + branch = coq-version; maintainers = with maintainers; [ roconnor thoughtpolice vbgl ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/science/logic/cvc3/default.nix b/pkgs/applications/science/logic/cvc3/default.nix index 07b87e3cf073..ce6e039c5b1b 100644 --- a/pkgs/applications/science/logic/cvc3/default.nix +++ b/pkgs/applications/science/logic/cvc3/default.nix @@ -2,9 +2,9 @@ x@{builderDefsPackage , flex, bison, gmp, perl , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ ["gmp"]; buildInputs = (map (n: builtins.getAttr n x) @@ -33,7 +33,7 @@ rec { sed -e "s@ /bin/bash@bash@g" -i Makefile.std find . -exec sed -e "s@/usr/bin/perl@${perl}/bin/perl@g" -i '{}' ';' '') ["minInit" "doUnpack"]; - + meta = { description = "A prover for satisfiability modulo theory (SMT)"; maintainers = with a.lib.maintainers; @@ -42,7 +42,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "free-noncopyleft"; + license = a.lib.licenses.free; homepage = "http://www.cs.nyu.edu/acsys/cvc3/index.html"; }; passthru = { @@ -51,4 +51,3 @@ rec { }; }; }) x - diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix new file mode 100644 index 000000000000..5b2e9c54d6f8 --- /dev/null +++ b/pkgs/applications/science/logic/cvc4/default.nix @@ -0,0 +1,23 @@ +{stdenv, fetchurl, gmp, libantlr3c, boost}: + +stdenv.mkDerivation { + name = "cvc4-1.4"; + src = fetchurl { + url = http://cvc4.cs.nyu.edu/builds/src/cvc4-1.4.tar.gz; + sha256 = "093h7zgv4z4ad503j30dpn8k2pz9m90pvd7gi5axdmwsxgwlzzkn"; + }; + + buildInputs = [ gmp libantlr3c boost ]; + + preConfigure = "patchShebangs ./src/"; + + doChecks = true; + + meta = with stdenv.lib; { + description = "An efficient open-source automatic theorem prover for satisfiability modulo theories (SMT) problems"; + homepage = http://cvc4.cs.nyu.edu/web/; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ vbgl ]; + }; +} diff --git a/pkgs/applications/science/logic/hol_light/Makefile.patch b/pkgs/applications/science/logic/hol_light/Makefile.patch deleted file mode 100644 index ae521004f338..000000000000 --- a/pkgs/applications/science/logic/hol_light/Makefile.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: Makefile -=================================================================== ---- /Makefile (révision 199) -+++ /Makefile (copie de travail) -@@ -59,7 +59,7 @@ - then cp pa_j_3.1x_6.02.1.ml pa_j.ml; \ - else if test ${CAMLP5_VERSION} = "6.02.2" -o ${CAMLP5_VERSION} = "6.02.3" -o ${CAMLP5_VERSION} = "6.03" -o ${CAMLP5_VERSION} = "6.04" -o ${CAMLP5_VERSION} = "6.05" -o ${CAMLP5_VERSION} = "6.06" ; \ - then cp pa_j_3.1x_6.02.2.ml pa_j.ml; \ -- else if test ${CAMLP5_VERSION} = "6.06" -o ${CAMLP5_VERSION} = "6.07" -o ${CAMLP5_VERSION} = "6.08" -o ${CAMLP5_VERSION} = "6.09" -o ${CAMLP5_VERSION} = "6.10" -o ${CAMLP5_VERSION} = "6.11" ; \ -+ else if test ${CAMLP5_VERSION} = "6.06" -o ${CAMLP5_VERSION} = "6.07" -o ${CAMLP5_VERSION} = "6.08" -o ${CAMLP5_VERSION} = "6.09" -o ${CAMLP5_VERSION} = "6.10" -o ${CAMLP5_VERSION} = "6.11" -o ${CAMLP5_VERSION} = "6.12" ; \ - then cp pa_j_3.1x_6.11.ml pa_j.ml; \ - else cp pa_j_3.1x_${CAMLP5_BINARY_VERSION}.xx.ml pa_j.ml; \ - fi \ diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index 9b8f25cab779..1e4fe08639f5 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -10,18 +10,16 @@ in stdenv.mkDerivation rec { name = "hol_light-${version}"; - version = "199"; + version = "205"; src = fetchsvn { url = http://hol-light.googlecode.com/svn/trunk; rev = version; - sha256 = "0308nw91iww18wvl30g5ygf6lhw329jh1vqi9hsh30inhb3dx3jw"; + sha256 = "1qnk3fkfr6f74nd8wsi84s9kg872cw766sa15a2ldlhs9ma76chj"; }; buildInputs = [ ocaml findlib camlp5 ]; - patches = [ ./Makefile.patch ]; - installPhase = '' mkdir -p "$out/lib/hol_light" "$out/bin" cp -a . $out/lib/hol_light diff --git a/pkgs/applications/science/logic/ott/default.nix b/pkgs/applications/science/logic/ott/default.nix index afe827f3ad98..293381d2888b 100644 --- a/pkgs/applications/science/logic/ott/default.nix +++ b/pkgs/applications/science/logic/ott/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { target-system terms. ''; homepage = http://www.cl.cam.ac.uk/~pes20/ott; - license = "BSD3"; + license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ jwiegley ]; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/science/logic/satallax/default.nix b/pkgs/applications/science/logic/satallax/default.nix index 2126a4d76d63..89a214c3f474 100644 --- a/pkgs/applications/science/logic/satallax/default.nix +++ b/pkgs/applications/science/logic/satallax/default.nix @@ -2,9 +2,9 @@ x@{builderDefsPackage , sbcl, zlib , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) @@ -47,11 +47,11 @@ rec { sbcl --load make.lisp ! ( ./test | grep ERROR ) - + mkdir -p "$out/bin" cp bin/satallax "$out/bin" '') ["defEnsureDir" "minInit" "addInputs" "doUnpack"]; - + meta = { description = "A higher-order logic prover"; maintainers = with a.lib.maintainers; @@ -60,7 +60,7 @@ rec { ]; platforms = with a.lib.platforms; unix; - license = "free-noncopyleft"; + license = a.lib.licenses.free; homepage = "http://www.ps.uni-saarland.de/~cebrown/satallax/"; }; passthru = { @@ -69,4 +69,3 @@ rec { }; }; }) x - diff --git a/pkgs/applications/science/logic/stp/default.nix b/pkgs/applications/science/logic/stp/default.nix index 109d9fe3d4be..cfe96bc6983a 100644 --- a/pkgs/applications/science/logic/stp/default.nix +++ b/pkgs/applications/science/logic/stp/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { rev = "3aa11620a823d617fc033d26aedae91853d18635"; sha256 = "832520787f57f63cf47364d080f30ad10d6d6e00f166790c19b125be3d6dd45c"; }; - buildInputs = [ cmake boost boost.lib bison flex perl zlib ]; + buildInputs = [ cmake boost bison flex perl zlib ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; patchPhase = '' sed -e 's,^export(PACKAGE.*,,' -i CMakeLists.txt diff --git a/pkgs/applications/science/logic/twelf/default.nix b/pkgs/applications/science/logic/twelf/default.nix index f9680b475797..4d97f0480bb3 100644 --- a/pkgs/applications/science/logic/twelf/default.nix +++ b/pkgs/applications/science/logic/twelf/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { Standard ML. ''; homepage = http://twelf.org/wiki/Main_Page; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ jwiegley ]; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index 71ff1cc7fb47..70149522393a 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -2,21 +2,21 @@ stdenv.mkDerivation rec { name = "why3-${version}"; - version = "0.83"; + version = "0.85"; src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/33490/${name}.tar.gz"; - sha256 = "1jcs5vj91ppbgh4q4hch89b63wgakjhg35pm3r4jwhp377lnggya"; + url = "https://gforge.inria.fr/frs/download.php/34074/why3-0.85.tar.gz"; + sha256 = "0sj1pd50lqvnvyss1f8ysgigdi64s91rrpdrmp7crmcy1npa8apf"; }; buildInputs = with ocamlPackages; [ coq ocaml findlib lablgtk ocamlgraph zarith ]; - meta = { - description = "why is a software verification platform"; + meta = with stdenv.lib; { + description = "A platform for deductive program verification"; homepage = "http://why3.lri.fr/"; - license = stdenv.lib.licenses.lgpl21; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = licenses.lgpl21; + platforms = platforms.unix; + maintainers = with maintainers; [ thoughtpolice vbgl ]; }; } diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index edba65146a66..8413eb14a35c 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.0"; + name = "R-3.1.2"; src = fetchurl { url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz"; - sha256 = "1qjzbw341bvi1h4jwbvdkvq8j0z9l3m85mpgrlfw0n2cz2806s4a"; + sha256 = "0ypsm11c7n49pgh2ricyhhpfhas3famscdazzdp2zq70rapm1ldw"; }; buildInputs = [ blas bzip2 gfortran liblapack libX11 libXmu libXt @@ -54,7 +54,8 @@ stdenv.mkDerivation rec { installTargets = [ "install" "install-info" "install-pdf" ]; - doCheck = true; + # The test suite fails when building without the recommended packages. + doCheck = withRecommendedPackages; enableParallelBuilding = true; @@ -84,7 +85,9 @@ stdenv.mkDerivation rec { user-defined recursive functions and input and output facilities. ''; + platforms = stdenv.lib.platforms.all; hydraPlatforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/applications/science/math/R/setup-hook.sh b/pkgs/applications/science/math/R/setup-hook.sh index a31289bbfba9..09a775db9bf5 100644 --- a/pkgs/applications/science/math/R/setup-hook.sh +++ b/pkgs/applications/science/math/R/setup-hook.sh @@ -2,4 +2,4 @@ addRLibPath () { addToSearchPath R_LIBS_SITE $1/library } -envHooks=(${envHooks[@]} addRLibPath) +envHooks+=(addRLibPath) diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index 3277d94d99b6..ddd5dc5d6bb4 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -2,7 +2,7 @@ let name = "maxima"; - version = "5.33.0"; + version = "5.34.1"; searchPath = stdenv.lib.makeSearchPath "bin" @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz"; - sha256 = "13axm11xw0f3frx5b0qdidi7igkn1524fzz77s9rbpl2yy2nrbz2"; + sha256 = "1dw9vfzldpj7lv303xbw0wpyn6ra6i2yzwlrjbcx7j0jm5n43ji0"; }; buildInputs = [sbcl texinfo perl makeWrapper]; diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index ced8b6f95bb6..a27a93dd2c64 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "sage-6.1.1"; src = fetchurl { - url = "http://mirrors.xmission.com/sage/src/sage-6.1.1.tar.gz"; + url = "mirror://sagemath/${name}.tar.gz"; sha256 = "0kbzs0l9q7y34jv3f8rd1c2mrjsjkdgaw6mfdwjlpg9g4gghmq5y"; }; @@ -23,9 +23,8 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.scilab.org/; - description = "Scientific software package for numerical computations (Matlab lookalike)"; - # see http://www.scilab.org/legal - license = "SciLab"; + homepage = "http://www.sagemath.org"; + description = "A free open source mathematics software system"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index 75448b6965cd..06eceea65c95 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -2,14 +2,14 @@ let name = "wxmaxima"; - version = "13.04.2"; + version = "14.09.0"; in stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { - url = "mirror://sourceforge/${name}/wxMaxima/${version}/wxMaxima-${version}.tar.gz"; - sha256 = "1sylvr0kfdzxxc3qsb0c6ff3lg0bzm1ib5xh78wjgzykbnvjsd99"; + url = "mirror://sourceforge/${name}/wxMaxima/${version}/wxmaxima-${version}.tar.gz"; + sha256 = "1wqiw9dgjc9vg94dqk4kif8xs7nlmn34xj3v4zm13fh1jihraksq"; }; buildInputs = [wxGTK maxima makeWrapper]; diff --git a/pkgs/applications/science/misc/fityk/default.nix b/pkgs/applications/science/misc/fityk/default.nix index 4c93eef2b1c0..7a534fce4f67 100644 --- a/pkgs/applications/science/misc/fityk/default.nix +++ b/pkgs/applications/science/misc/fityk/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "Curve fitting and peak fitting software"; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; homepage = http://fityk.nieto.pl/; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/science/misc/golly/default.nix b/pkgs/applications/science/misc/golly/default.nix index a29d37cc41a1..63a0be47c474 100644 --- a/pkgs/applications/science/misc/golly/default.nix +++ b/pkgs/applications/science/misc/golly/default.nix @@ -13,15 +13,27 @@ let wxGTK perl python zlib ]; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { inherit (s) name version; inherit buildInputs; src = fetchurl { inherit (s) url sha256; }; - preConfigure = '' - cd gui-wx/configure + + sourceRoot="${name}-src/gui-wx/configure"; + + # Link against Python explicitly as it is needed for scripts + makeFlags=[ + "AM_LDFLAGS=" + ]; + NIX_LDFLAGS="-lpython${python.majorVersion} -lperl"; + preConfigure='' + export NIX_LDFLAGS="$NIX_LDFLAGS -L$(dirname "$(find ${perl} -name libperl.so)")" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE + -DPYTHON_SHLIB=$(basename "$( + readlink -f ${python}/lib/libpython*.so)")" ''; + meta = { inherit (s) version; description = "Cellular automata simulation program"; diff --git a/pkgs/applications/science/misc/vite/default.nix b/pkgs/applications/science/misc/vite/default.nix index 2e25ff582ee9..8537ea171b3c 100644 --- a/pkgs/applications/science/misc/vite/default.nix +++ b/pkgs/applications/science/misc/vite/default.nix @@ -2,10 +2,10 @@ # ViTE 1.1 has several bugs, so use the SVN version. let - rev = "1143"; + rev = "1543"; externals = fetchsvn { url = "svn://scm.gforge.inria.fr/svn/vite/externals"; - sha256 = "0wg3yh5q8gx7189rvkd8achld7bzp0i7qqn6c77pg767b4b8dh1a"; + sha256 = "1a422n3dp72v4visq5b1i21cf8sj12903sgg5v2hah3sgk02dnyz"; inherit rev; }; in @@ -14,16 +14,14 @@ stdenv.mkDerivation { src = fetchsvn { url = "svn://scm.gforge.inria.fr/svn/vite/trunk"; - sha256 = "0cy9b6isiwqwnv9gk0cg97x370fpwyccljadds4a118k5gh58zw4"; + sha256 = "02479dv96h29d0w0svp42mjjrxhmv8lkkqp30w7mlx5gr2g0v7lf"; inherit rev; }; - preConfigure = - '' rm -v externals - ln -sv "${externals}" externals - ''; - - patches = [ ./larger-line-buffer.patch ]; + preConfigure = '' + rm -rv externals + ln -sv "${externals}" externals + ''; buildInputs = [ cmake qt4 mesa ]; @@ -32,19 +30,15 @@ stdenv.mkDerivation { meta = { description = "Visual Trace Explorer (ViTE), a tool to visualize execution traces"; - longDescription = - '' ViTE is a trace explorer. It is a tool to visualize execution traces - in Pajé or OTF format for debugging and profiling parallel or - distributed applications. - ''; + longDescription = '' + ViTE is a trace explorer. It is a tool to visualize execution + traces in Pajé or OTF format for debugging and profiling + parallel or distributed applications. + ''; homepage = http://vite.gforge.inria.fr/; - - license = "CeCILL-A"; - - maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice - - broken = true; + license = stdenv.lib.licenses.cecill20; + maintainers = with stdenv.lib.maintainers; [ ludo fuuzetsu ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/science/misc/vite/larger-line-buffer.patch b/pkgs/applications/science/misc/vite/larger-line-buffer.patch deleted file mode 100644 index 7934c0085c19..000000000000 --- a/pkgs/applications/science/misc/vite/larger-line-buffer.patch +++ /dev/null @@ -1,14 +0,0 @@ -ViTE has an arbitrary restriction on the length of lines read by the parser. -Make it larger. - ---- a/src/parser/PajeFileManager.hpp -+++ b/src/parser/PajeFileManager.hpp -@@ -67,7 +67,7 @@ - - #include <string.h> - --#define _PAJE_BUFSIZE 256 -+#define _PAJE_BUFSIZE 16384 - #define _PAJE_NBMAXTKS 16 - - /** diff --git a/pkgs/applications/version-management/darcs/default.nix b/pkgs/applications/version-management/darcs/default.nix index ff5c3456e227..d5f03a41f224 100644 --- a/pkgs/applications/version-management/darcs/default.nix +++ b/pkgs/applications/version-management/darcs/default.nix @@ -23,6 +23,9 @@ cabal.mkDerivation (self: { mkdir -p $out/etc/bash_completion.d mv contrib/darcs_completion $out/etc/bash_completion.d/darcs ''; + patchPhase = '' + sed -i -e 's|random.*==.*|random|' -e 's|text.*>=.*,|text,|' darcs.cabal + ''; meta = { homepage = "http://darcs.net/"; description = "a distributed, interactive, smart revision control system"; diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 4cabe3a4e2ab..71fb75a21576 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -99,4 +99,6 @@ rec { git-remote-hg = callPackage ./git-remote-hg { }; gitRemoteGcrypt = callPackage ./git-remote-gcrypt { }; + + git-extras = callPackage ./git-extras { }; } diff --git a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix index dcfcce1fcf63..562917ec0737 100644 --- a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix +++ b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix @@ -30,10 +30,10 @@ stdenv.mkDerivation { done ''; - # usage: + # usage: meta = { description = "import svn, mercurial into git"; homepage = "http://repo.or.cz/w/fast-export.git"; - license = "?"; # the .py file is GPLv2 + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index cbbdb6b7075d..9259cabc28e7 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -1,37 +1,38 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, aeson, async, blazeBuilder, bloomfilter, bup, byteable -, caseInsensitive, clientsession, cryptoApi, cryptohash, curl -, dataDefault, dataenc, DAV, dbus, dlist, dns, editDistance -, exceptions, fdoNotify, feed, filepath, git, gnupg1, gnutls -, hamlet, hinotify, hS3, hslogger, httpClient, httpConduit -, httpTypes, IfElse, json, lsof, MissingH, monadControl, mtl -, network, networkInfo, networkMulticast, networkProtocolXmpp -, networkUri, openssh, optparseApplicative, pathPieces, perl -, QuickCheck, random, regexTdfa, rsync, SafeSemaphore, securemem -, SHA, shakespeare, stm, tasty, tastyHunit, tastyQuickcheck -, tastyRerun, text, time, transformers, unixCompat, utf8String -, uuid, wai, waiExtra, warp, warpTls, which, xmlTypes, yesod -, yesodCore, yesodDefault, yesodForm, yesodStatic +{ cabal, aeson, async, aws, blazeBuilder, bloomfilter, bup +, byteable, caseInsensitive, clientsession, conduit, conduitExtra +, cryptoApi, cryptohash, curl, dataDefault, dataenc, DAV, dbus +, dlist, dns, editDistance, exceptions, fdoNotify, feed, filepath +, git, gnupg1, gnutls, hamlet, hinotify, hslogger, httpClient +, httpConduit, httpTypes, IfElse, json, lsof, MissingH +, monadControl, mtl, network, networkInfo, networkMulticast +, networkProtocolXmpp, networkUri, openssh, optparseApplicative +, pathPieces, perl, QuickCheck, random, regexTdfa, resourcet, rsync +, SafeSemaphore, securemem, SHA, shakespeare, stm, tasty +, tastyHunit, tastyQuickcheck, tastyRerun, text, time, transformers +, unixCompat, utf8String, uuid, wai, waiExtra, warp, warpTls, which +, xmlTypes, yesod, yesodCore, yesodDefault, yesodForm, yesodStatic }: cabal.mkDerivation (self: { pname = "git-annex"; - version = "5.20140927"; - sha256 = "02zmg8pcrdavfna2xy51n6chn6i5g0b8p20rba1vj29rlfj3cask"; + version = "5.20141203"; + sha256 = "01gifds86925vg7mh363i7qsii2wrgf3vpk3wgjff9rbb7z0fvfk"; isLibrary = false; isExecutable = true; buildDepends = [ - aeson async blazeBuilder bloomfilter byteable caseInsensitive - clientsession cryptoApi cryptohash dataDefault dataenc DAV dbus - dlist dns editDistance exceptions fdoNotify feed filepath gnutls - hamlet hinotify hS3 hslogger httpClient httpConduit httpTypes - IfElse json MissingH monadControl mtl network networkInfo + aeson async aws blazeBuilder bloomfilter byteable caseInsensitive + clientsession conduit conduitExtra cryptoApi cryptohash dataDefault + dataenc DAV dbus dlist dns editDistance exceptions fdoNotify feed + filepath gnutls hamlet hinotify hslogger httpClient httpConduit + httpTypes IfElse json MissingH monadControl mtl network networkInfo networkMulticast networkProtocolXmpp networkUri optparseApplicative - pathPieces QuickCheck random regexTdfa SafeSemaphore securemem SHA - shakespeare stm tasty tastyHunit tastyQuickcheck tastyRerun text - time transformers unixCompat utf8String uuid wai waiExtra warp - warpTls xmlTypes yesod yesodCore yesodDefault yesodForm yesodStatic + pathPieces QuickCheck random regexTdfa resourcet SafeSemaphore + securemem SHA shakespeare stm tasty tastyHunit tastyQuickcheck + tastyRerun text time transformers unixCompat utf8String uuid wai + waiExtra warp warpTls xmlTypes yesod yesodCore yesodDefault + yesodForm yesodStatic ]; buildTools = [ bup curl git gnupg1 lsof openssh perl rsync which ]; configureFlags = "-fAssistant -fProduction"; diff --git a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix new file mode 100644 index 000000000000..3392c1c00217 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "git-extras-${version}"; + version = "2.2.0"; + + src = fetchurl { + url = "https://github.com/tj/git-extras/archive/${version}.tar.gz"; + sha256 = "0qwgaj0r9lsmwricpnma9rm7llfrcqarcfk5iq3ilxkns8a334va"; + }; + + phases = [ "unpackPhase" "installPhase" ]; + + makeFlags = "DESTDIR=$(out) PREFIX="; + + meta = with stdenv.lib; { + homepage = https://github.com/tj/git-extras; + description = "GIT utilities -- repo summary, repl, changelog population, author commit percentages and more"; + license = licenses.mit; + platforms = platforms.all; + maintainers = [ maintainers.spwhitt ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index b21cd35b7016..69e88f32c41d 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -10,7 +10,7 @@ let - version = "2.1.2"; + version = "2.1.3"; svn = subversionClient.override { perlBindings = true; }; @@ -21,10 +21,15 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "12x1qycc0rii6fqpiizp9v9ysdmj6lpi9imqqbrkdx6cifbwh9vv"; + sha256 = "0mvgvr2hz25p49dhhizcw9591f2h17y2699mpmndis3kzap0c6zy"; }; - patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ./cert-path.patch ]; + patches = [ + ./docbook2texi.patch + ./symlinks-in-bin.patch + ./cert-path.patch + ./ssl-cert-file.patch + ]; buildInputs = [curl openssl zlib expat gettext cpio makeWrapper] ++ stdenv.lib.optionals withManual [ asciidoc texinfo xmlto docbook2x @@ -55,7 +60,7 @@ stdenv.mkDerivation { # Install git-subtree. pushd contrib/subtree make - make install install-doc + make install ${stdenv.lib.optionalString withManual "install-doc"} popd rm -rf contrib/subtree @@ -142,6 +147,6 @@ stdenv.mkDerivation { ''; platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ simons the-kenny ]; + maintainers = with stdenv.lib.maintainers; [ simons the-kenny wmertens ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch b/pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch new file mode 100644 index 000000000000..dd216b7bf6f8 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch @@ -0,0 +1,13 @@ +This patch adds support for the OpenSSL SSL_CERT_FILE environment variable. +GIT_SSL_CAINFO still takes precedence. + +--- git-orig/http.c.orig 2014-11-25 23:27:56.000000000 +0100 ++++ git-orig/http.c 2014-11-25 23:28:48.000000000 +0100 +@@ -433,6 +433,7 @@ + #if LIBCURL_VERSION_NUM >= 0x070908 + set_from_env(&ssl_capath, "GIT_SSL_CAPATH"); + #endif ++ set_from_env(&ssl_cainfo, "SSL_CERT_FILE"); + set_from_env(&ssl_cainfo, "GIT_SSL_CAINFO"); + + set_from_env(&user_agent, "GIT_HTTP_USER_AGENT"); diff --git a/pkgs/applications/version-management/git-and-tools/github-backup/default.nix b/pkgs/applications/version-management/git-and-tools/github-backup/default.nix index ca329eddc66a..5b1e2041e4aa 100644 --- a/pkgs/applications/version-management/git-and-tools/github-backup/default.nix +++ b/pkgs/applications/version-management/git-and-tools/github-backup/default.nix @@ -1,19 +1,20 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, extensibleExceptions, filepath, git, github, hslogger -, IfElse, MissingH, mtl, network, optparseApplicative, prettyShow -, text, unixCompat +{ cabal, exceptions, filepath, git, github, hslogger, IfElse +, MissingH, mtl, network, networkUri, optparseApplicative +, prettyShow, text, transformers, unixCompat }: cabal.mkDerivation (self: { pname = "github-backup"; - version = "1.20140721"; - sha256 = "0bnkfmgpk1iaaqck4ppn461fzk3s2761w2nxfrvw10gc934lhrxc"; + version = "1.20141110"; + sha256 = "0675zcijfap757076r3j7js4iadnj1jbihmchf6ikzaanczmq1kg"; isLibrary = false; isExecutable = true; buildDepends = [ - extensibleExceptions filepath github hslogger IfElse MissingH mtl - network optparseApplicative prettyShow text unixCompat + exceptions filepath github hslogger IfElse MissingH mtl network + networkUri optparseApplicative prettyShow text transformers + unixCompat ]; buildTools = [ git ]; meta = { @@ -21,7 +22,5 @@ cabal.mkDerivation (self: { description = "backs up everything github knows about a repository, to the repository"; license = "GPL"; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - broken = true; }; }) diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index 7f8091067cb9..a697aaa08a1a 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, python }: stdenv.mkDerivation { - name = "git-repo-1.20"; + name = "git-repo-1.21"; src = fetchurl { - # I could not find a versioned url for the 1.20 version. In case + # I could not find a versioned url for the 1.21 version. In case # the sha mismatches, check the homepage for new version and sha. url = "http://commondatastorage.googleapis.com/git-repo-downloads/repo"; - sha1 = "e197cb48ff4ddda4d11f23940d316e323b29671c"; + sha1 = "b8bd1804f432ecf1bab730949c82b93b0fc5fede"; }; unpackPhase = "true"; diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix index 74eee4778472..82b3f7aed095 100644 --- a/pkgs/applications/version-management/gource/default.nix +++ b/pkgs/applications/version-management/gource/default.nix @@ -3,27 +3,28 @@ }: stdenv.mkDerivation rec { - version = "0.42"; + version = "0.43"; name = "gource-${version}"; src = fetchurl { url = "https://github.com/acaudwell/Gource/releases/download/${name}/${name}.tar.gz"; - sha256 = "08ab57z44y8b5wxg1193j6hiy50njbpi6dwafjh6nb0apcq8ziz5"; + sha256 = "1r5x9ai86f609hf584n0xaf5hxkbilj5qihn89v7ghpmwk40m945"; }; buildInputs = [ glew SDL ftgl pkgconfig libpng libjpeg pcre SDL_image mesa - boost boost.lib glm + boost glm ]; - configureFlags = "--with-boost-libdir=${boost.lib}/lib"; + configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ]; - NIX_CFLAGS_COMPILE = "-fpermissive"; # fix build with newer gcc versions + NIX_CFLAGS_COMPILE = "-fpermissive " + # fix build with newer gcc versions + "-std=c++11"; # fix build with glm >= 0.9.6.0 - meta = { - homepage = "http://code.google.com/p/gource/"; - description = "software version control visualization tool"; - license = stdenv.lib.licenses.gpl3Plus; + meta = with stdenv.lib; { + homepage = http://code.google.com/p/gource/; + description = "A Software version control visualization tool"; + license = licenses.gpl3Plus; longDescription = '' Software projects are displayed by Gource as an animated tree with the root directory of the project at its centre. Directories @@ -34,6 +35,7 @@ stdenv.mkDerivation rec { Mercurial and Bazaar and SVN. Gource can also parse logs produced by several third party tools for CVS repositories. ''; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 7b309233ca90..82d92fd79e88 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -2,7 +2,7 @@ , guiSupport ? false, tk ? null, curses }: let - version = "3.1.1"; + version = "3.1.2"; name = "mercurial-${version}"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://mercurial.selenic.com/release/${name}.tar.gz"; - sha256 = "1ncqagvxcqa41ginmf0kpx2z6b2r2zrq7bdkza3nfba682c2is67"; + sha256 = "0fldlypjpzn12az2gk4b3am615wih3r6ld69im97iqq76zmmrgjx"; }; inherit python; # pass it so that the same version can be used in hg2git diff --git a/pkgs/applications/version-management/mr/default.nix b/pkgs/applications/version-management/mr/default.nix index 29fafc4db74c..d52802e42f1d 100644 --- a/pkgs/applications/version-management/mr/default.nix +++ b/pkgs/applications/version-management/mr/default.nix @@ -1,56 +1,31 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - - version = "1.13"; - name = "mr-" + version; + version = "1.20141024"; + name = "mr-${version}"; src = fetchurl { - url = "http://ftp.de.debian.org/debian/pool/main/m/mr/mr_${version}.tar.gz"; - sha256 = "1q3qxk8dwbv30v2xxh852wnwl1msgkvk5cgxyicpqj8kh5b96zlz"; + url = "https://github.com/joeyh/myrepos/archive/${version}.tar.gz"; + sha256 = "7b68183476867d15d6f111fc9678335b94824dcfa09f07c761a72d64cdf5ad4a"; }; - buildInputs = [perl]; - - buildPhase = '' - make build - ''; + buildInputs = [ perl ]; - installPhase = '' - mkdir -pv $out/bin $out/share/man/man1 $out/share/mr - cp -v mr $out/bin - cp -v webcheckout $out/bin - cp -v mr.1 $out/share/man/man1 - cp -v webcheckout.1 $out/share/man/man1 - cp -v lib/* $out/share/mr - ''; + makeFlags = "PREFIX=$(out)"; meta = { description = "Multiple Repository management tool"; - longDescription = ''The mr(1) command can checkout, update, or perform other actions on a - set of repositories as if they were one combined respository. It - supports any combination of subversion, git, cvs, mercurial, bzr, - darcs, cvs, vcsh, fossil and veracity repositories, and support for - other revision control systems can easily be added. (There are - extensions adding support for unison and git-svn.) - - It is extremely configurable via simple shell scripting. Some examples - of things it can do include: - - - Update a repository no more frequently than once every twelve - hours. - - Run an arbitrary command before committing to a - repository. - - When updating a git repository, pull from two - different upstreams and merge the two together. - - Run several repository updates in parallel, greatly speeding - up the update process. - - Remember actions that failed due to a laptop being - offline, so they can be retried when it comes back online. + longDescription = '' + mr is a tool to manage all your version control repos. It can + checkout, update, or perform other actions on a set of + repositories as if they were one combined repository. It + supports any combination of subversion, git, cvs, mercurial, + bzr, darcs, fossil and veracity repositories, and support for + other version control systems can easily be added. ''; - homepage = http://joeyh.name/code/mr/; + homepage = http://myrepos.branchable.com/; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.antono ]; + maintainers = with stdenv.lib.maintainers; [ antono henrytill ]; }; } diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix index 823638669b68..d58c9ed15c8f 100644 --- a/pkgs/applications/version-management/rcs/default.nix +++ b/pkgs/applications/version-management/rcs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ed }: stdenv.mkDerivation rec { - name = "rcs-5.9.2"; + name = "rcs-5.9.3"; src = fetchurl { url = "mirror://gnu/rcs/${name}.tar.xz"; - sha256 = "0wdmmplga9k05d9k7wjqv4zb6xvvzsli8hmn206pvangki1g66k5"; + sha256 = "0isvzwfvqkg7zcsznra6wqh650z49ib113n7gp6ncxv5p30x3c38"; }; buildInputs = [ ed ]; diff --git a/pkgs/applications/version-management/redmine/2002_FHS_through_env_vars.patch b/pkgs/applications/version-management/redmine/2002_FHS_through_env_vars.patch new file mode 100644 index 000000000000..889b8c930e73 --- /dev/null +++ b/pkgs/applications/version-management/redmine/2002_FHS_through_env_vars.patch @@ -0,0 +1,100 @@ +Description: FHS through env vars +Forwarded: not-needed +Author: Jérémy Lal <kapouer@melix.org> +Last-Update: 2013-09-28 +--- redmine.orig/app/models/attachment.rb ++++ redmine/app/models/attachment.rb +@@ -46,10 +46,10 @@ class Attachment < ActiveRecord::Base + "LEFT JOIN #{Project.table_name} ON #{Document.table_name}.project_id = #{Project.table_name}.id"} + + cattr_accessor :storage_path +- @@storage_path = Redmine::Configuration['attachments_storage_path'] || File.join(Rails.root, "files") ++ @@storage_path = Redmine::Configuration['attachments_storage_path'] || ENV['RAILS_VAR'] ? File.join(ENV['RAILS_VAR'], "files") : File.join(Rails.root, "files") + + cattr_accessor :thumbnails_storage_path +- @@thumbnails_storage_path = File.join(Rails.root, "tmp", "thumbnails") ++ @@thumbnails_storage_path = ENV['RAILS_TMP'] ? File.join(ENV['RAILS_TMP'], "thumbnails") : File.join(Rails.root, "tmp", "thumbnails") + + before_save :files_to_final_location + after_destroy :delete_from_disk +--- redmine.orig/lib/redmine/configuration.rb ++++ redmine/lib/redmine/configuration.rb +@@ -32,7 +32,7 @@ module Redmine + # * <tt>:file</tt>: the configuration file to load (default: config/configuration.yml) + # * <tt>:env</tt>: the environment to load the configuration for (default: Rails.env) + def load(options={}) +- filename = options[:file] || File.join(Rails.root, 'config', 'configuration.yml') ++ filename = options[:file] || ENV['RAILS_ETC'] ? File.join(ENV['RAILS_ETC'], 'configuration.yml') : File.join(Rails.root, 'config', 'configuration.yml') + env = options[:env] || Rails.env + + @config = @defaults.dup +@@ -103,7 +103,7 @@ module Redmine + end + + def load_deprecated_email_configuration(env) +- deprecated_email_conf = File.join(Rails.root, 'config', 'email.yml') ++ deprecated_email_conf = ENV['RAILS_ETC'] ? File.join(ENV['RAILS_ETC'], 'email.yml') : File.join(Rails.root, 'config', 'email.yml') + if File.file?(deprecated_email_conf) + warn "Storing outgoing emails configuration in config/email.yml is deprecated. You should now store it in config/configuration.yml using the email_delivery setting." + @config.merge!({'email_delivery' => load_from_yaml(deprecated_email_conf, env)}) +--- redmine.orig/lib/redmine/export/pdf.rb ++++ redmine/lib/redmine/export/pdf.rb +@@ -38,7 +38,7 @@ module Redmine + attr_accessor :footer_date + + def initialize(lang, orientation='P') +- @@k_path_cache = Rails.root.join('tmp', 'pdf') ++ @@k_path_cache = ENV['RAILS_TMP'] ? File.join(ENV['RAILS_TMP'], 'pdf') : Rails.root.join('tmp', 'pdf') + FileUtils.mkdir_p @@k_path_cache unless File::exist?(@@k_path_cache) + set_language_if_valid lang + pdf_encoding = l(:general_pdf_encoding).upcase +--- redmine.orig/config/application.rb ++++ redmine/config/application.rb +@@ -52,8 +63,21 @@ module RedmineApp + # Do not include all helpers + config.action_controller.include_all_helpers = false + ++ # move tmp directory to RAILS_TMP ++ config.paths['tmp'] = ENV['RAILS_TMP'] ++ + config.session_store :cookie_store, :key => '_redmine_session' + ++ # log path ++ config.paths['log'] = File.join(ENV['RAILS_LOG'], "#{Rails.env}.log") unless !ENV['RAILS_LOG'] ++ ++ config.paths['public'] = ENV['RAILS_PUBLIC'] unless !ENV['RAILS_PUBLIC'] ++ ++ config.cache_store = :file_store, File.join(ENV['RAILS_TMP'], "cache") ++ ++ # Set Active Record's database.yml path ++ config.paths['config/database'] = File.join(ENV['RAILS_ETC'], 'database.yml') unless !ENV['RAILS_ETC'] ++ + if File.exists?(File.join(File.dirname(__FILE__), 'additional_environment.rb')) + instance_eval File.read(File.join(File.dirname(__FILE__), 'additional_environment.rb')) + end +--- redmine.orig/lib/plugins/rfpdf/lib/tcpdf.rb ++++ redmine/lib/plugins/rfpdf/lib/tcpdf.rb +@@ -89,10 +89,10 @@ class TCPDF + @@k_small_ratio = 2/3.0 + + cattr_accessor :k_path_cache +- @@k_path_cache = Rails.root.join('tmp') ++ @@k_path_cache = ENV['RAILS_TMP'] ? ENV['RAILS_TMP'] : Rails.root.join('tmp') + + cattr_accessor :k_path_url_cache +- @@k_path_url_cache = Rails.root.join('tmp') ++ @@k_path_url_cache = ENV['RAILS_TMP'] ? ENV['RAILS_TMP'] : Rails.root.join('tmp') + + attr_accessor :barcode + +--- redmine.orig/lib/redmine/scm/adapters/abstract_adapter.rb ++++ redmine/lib/redmine/scm/adapters/abstract_adapter.rb +@@ -222,7 +222,7 @@ module Redmine + if @stderr_log_file.nil? + writable = false + path = Redmine::Configuration['scm_stderr_log_file'].presence +- path ||= Rails.root.join("log/#{Rails.env}.scm.stderr.log").to_s ++ path ||= ENV['RAILS_LOG'] ? File.join(ENV['RAILS_LOG'], "#{Rails.env}.scm.stderr.log").to_s : Rails.root.join("log/#{Rails.env}.scm.stderr.log").to_s + if File.exists?(path) + if File.file?(path) && File.writable?(path) + writable = true diff --git a/pkgs/applications/version-management/redmine/2003_externalize_session_config.patch b/pkgs/applications/version-management/redmine/2003_externalize_session_config.patch new file mode 100644 index 000000000000..39af8e02e556 --- /dev/null +++ b/pkgs/applications/version-management/redmine/2003_externalize_session_config.patch @@ -0,0 +1,72 @@ +Description: Externalize session config to yml in /etc +Forwarded: not-needed +Author: Jérémy Lal <kapouer@melix.org> +Last-Update: 2010-01-10 +--- redmine.orig/lib/tasks/initializers.rake ++++ redmine/lib/tasks/initializers.rake +@@ -1,11 +1,12 @@ + desc 'Generates a secret token for the application.' ++task :generate_secret_token do + +-file 'config/initializers/secret_token.rb' do +- path = File.join(Rails.root, 'config', 'initializers', 'secret_token.rb') +- secret = SecureRandom.hex(40) +- File.open(path, 'w') do |f| +- f.write <<"EOF" +-# This file was generated by 'rake generate_secret_token', and should ++filename = ENV['YML_SESSION_FILENAME'] ? ENV['YML_SESSION_FILENAME'] : 'session.yml' ++path = File.join(ENV['RAILS_ETC'] ? ENV['RAILS_ETC'] : File.join(Rails.root, 'config'), filename) ++secret = SecureRandom.hex(40) ++File.open(path, 'w') do |f| ++ f.write <<"EOF" ++# This file was generated by 'rake generate_session_store', + # not be made visible to public. + # If you have a load-balancing Redmine cluster, you will need to use the + # same version of this file on each machine. And be sure to restart your +@@ -15,10 +18,18 @@ file 'config/initializers/secret_token.r + # change this key, all old sessions will become invalid! Make sure the + # secret is at least 30 characters and all random, no regular words or + # you'll be exposed to dictionary attacks. +-RedmineApp::Application.config.secret_token = '#{secret}' ++ ++production: ++ key: _redmine_ ++ secret: #{secret} ++ ++development: ++ key: _redmine_ ++ secret: #{secret} ++ ++test: ++ key: _redmine_ ++ secret: #{secret} + EOF + end + end +- +-desc 'Generates a secret token for the application.' +-task :generate_secret_token => ['config/initializers/secret_token.rb'] +--- redmine.orig/config/application.rb ++++ redmine/config/application.rb +@@ -66,7 +66,20 @@ module RedmineApp + # move tmp directory to RAILS_TMP + config.paths['tmp'] = ENV['RAILS_TMP'] + +- config.session_store :cookie_store, :key => '_redmine_session' ++ # loads cookie based session session and secret keys ++ # this is needed here because initializers are loaded after plugins, ++ # and some plugins initialize ActionController which requires a secret to be set. ++ # crash if file not found ++ relativeUrlRoot = ENV['RAILS_RELATIVE_URL_ROOT'] ++ filename = ENV['RAILS_ETC'] ? File.join(ENV['RAILS_ETC'], 'session.yml') : File.join(File.dirname(__FILE__), '..', 'session.yml') ++ if File.exists?(filename) ++ sessionconfig = YAML::load_file(filename) ++ config.session_store :cookie_store, :key => sessionconfig[Rails.env]['key'], :path => (relativeUrlRoot.blank?) ? '/' : relativeUrlRoot ++ config.secret_token = sessionconfig[Rails.env]['secret'] ++ else ++ # temporary settings before session.yml is created ++ config.session_store :cookie_store, :key => '_redmine_session', :path => (relativeUrlRoot.blank?) ? '/' : relativeUrlRoot ++ end + + # log path + config.paths['log'] = File.join(ENV['RAILS_LOG'], "#{Rails.env}.log") unless !ENV['RAILS_LOG'] diff --git a/pkgs/applications/version-management/redmine/2004_FHS_plugins_assets.patch b/pkgs/applications/version-management/redmine/2004_FHS_plugins_assets.patch new file mode 100644 index 000000000000..d9a6844a6a35 --- /dev/null +++ b/pkgs/applications/version-management/redmine/2004_FHS_plugins_assets.patch @@ -0,0 +1,11 @@ +--- redmine.orig/lib/redmine/plugin.rb ++++ redmine/lib/redmine/plugin.rb +@@ -47,7 +47,7 @@ module Redmine #:nodoc: + self.directory = File.join(Rails.root, 'plugins') + + cattr_accessor :public_directory +- self.public_directory = File.join(Rails.root, 'public', 'plugin_assets') ++ self.public_directory = ENV['RAILS_TMP'] ? File.join(ENV['RAILS_TMP'], 'plugin_assets') : File.join(Rails.root, 'public', 'plugin_assets') + + @registered_plugins = {} + class << self diff --git a/pkgs/applications/version-management/redmine/Gemfile.lock b/pkgs/applications/version-management/redmine/Gemfile.lock new file mode 100644 index 000000000000..7d83583c019d --- /dev/null +++ b/pkgs/applications/version-management/redmine/Gemfile.lock @@ -0,0 +1,152 @@ +GEM + remote: https://rubygems.org/ + specs: + actionmailer (3.2.19) + actionpack (= 3.2.19) + mail (~> 2.5.4) + actionpack (3.2.19) + activemodel (= 3.2.19) + activesupport (= 3.2.19) + builder (~> 3.0.0) + erubis (~> 2.7.0) + journey (~> 1.0.4) + rack (~> 1.4.5) + rack-cache (~> 1.2) + rack-test (~> 0.6.1) + sprockets (~> 2.2.1) + activemodel (3.2.19) + activesupport (= 3.2.19) + builder (~> 3.0.0) + activerecord (3.2.19) + activemodel (= 3.2.19) + activesupport (= 3.2.19) + arel (~> 3.0.2) + tzinfo (~> 0.3.29) + activeresource (3.2.19) + activemodel (= 3.2.19) + activesupport (= 3.2.19) + activesupport (3.2.19) + i18n (~> 0.6, >= 0.6.4) + multi_json (~> 1.0) + arel (3.0.3) + awesome_nested_set (2.1.6) + activerecord (>= 3.0.0) + builder (3.0.0) + capybara (2.1.0) + mime-types (>= 1.16) + nokogiri (>= 1.3.3) + rack (>= 1.0.0) + rack-test (>= 0.5.4) + xpath (~> 2.0) + childprocess (0.5.5) + ffi (~> 1.0, >= 1.0.11) + coderay (1.1.0) + erubis (2.7.0) + fastercsv (1.5.5) + ffi (1.9.5) + hike (1.2.3) + i18n (0.6.11) + journey (1.0.4) + jquery-rails (2.0.3) + railties (>= 3.1.0, < 5.0) + thor (~> 0.14) + json (1.8.1) + mail (2.5.4) + mime-types (~> 1.16) + treetop (~> 1.4.8) + metaclass (0.0.4) + mime-types (1.25.1) + mini_portile (0.6.0) + mocha (1.0.0) + metaclass (~> 0.0.1) + multi_json (1.10.1) + net-ldap (0.3.1) + nokogiri (1.6.3.1) + mini_portile (= 0.6.0) + pg (0.17.1) + polyglot (0.3.5) + rack (1.4.5) + rack-cache (1.2) + rack (>= 0.4) + rack-openid (1.4.2) + rack (>= 1.1.0) + ruby-openid (>= 2.1.8) + rack-ssl (1.3.4) + rack + rack-test (0.6.2) + rack (>= 1.0) + rails (3.2.19) + actionmailer (= 3.2.19) + actionpack (= 3.2.19) + activerecord (= 3.2.19) + activeresource (= 3.2.19) + activesupport (= 3.2.19) + bundler (~> 1.0) + railties (= 3.2.19) + railties (3.2.19) + actionpack (= 3.2.19) + activesupport (= 3.2.19) + rack-ssl (~> 1.3.2) + rake (>= 0.8.7) + rdoc (~> 3.4) + thor (>= 0.14.6, < 2.0) + rake (10.1.1) + rdoc (3.12.2) + json (~> 1.4) + redcarpet (2.3.0) + rmagick (2.13.3) + ruby-openid (2.3.0) + rubyzip (1.1.6) + selenium-webdriver (2.43.0) + childprocess (~> 0.5) + multi_json (~> 1.0) + rubyzip (~> 1.0) + websocket (~> 1.0) + shoulda (3.3.2) + shoulda-context (~> 1.0.1) + shoulda-matchers (~> 1.4.1) + shoulda-context (1.0.2) + shoulda-matchers (1.4.1) + activesupport (>= 3.0.0) + sprockets (2.2.2) + hike (~> 1.2) + multi_json (~> 1.0) + rack (~> 1.0) + tilt (~> 1.1, != 1.3.0) + thor (0.19.1) + tilt (1.4.1) + treetop (1.4.15) + polyglot + polyglot (>= 0.3.1) + tzinfo (0.3.41) + websocket (1.2.1) + xpath (2.0.0) + nokogiri (~> 1.3) + yard (0.8.7.4) + +PLATFORMS + ruby + +DEPENDENCIES + activerecord-jdbc-adapter (~> 1.3.2) + activerecord-jdbcpostgresql-adapter + awesome_nested_set (= 2.1.6) + builder (= 3.0.0) + capybara (~> 2.1.0) + coderay (~> 1.1.0) + fastercsv (~> 1.5.0) + jquery-rails (~> 2.0.2) + mime-types + mocha (~> 1.0.0) + net-ldap (~> 0.3.1) + pg (>= 0.11.0) + rack-openid + rails (= 3.2.19) + rake (~> 10.1.1) + rdoc (>= 2.4.2) + redcarpet (~> 2.3.0) + rmagick (>= 2.0.0) + ruby-openid (~> 2.3.0) + selenium-webdriver + shoulda (~> 3.3.2) + yard diff --git a/pkgs/applications/version-management/redmine/Gemfile.nix b/pkgs/applications/version-management/redmine/Gemfile.nix new file mode 100644 index 000000000000..a7339097b146 --- /dev/null +++ b/pkgs/applications/version-management/redmine/Gemfile.nix @@ -0,0 +1,332 @@ +[ +{ +name = "actionmailer"; +hash = "cd9f0b22f755b0adeae13cf949adaf63fa1c068c72d0a100572c6a11aecd3ba7"; +url = "http://rubygems.org/downloads/actionmailer-3.2.19.gem"; +version = "3.2.19"; +} +{ +name = "actionpack"; +hash = "c58ca2342aff2062f4f478551ce46d81918ac93200bc62d099764d2cd7499fcd"; +url = "http://rubygems.org/downloads/actionpack-3.2.19.gem"; +version = "3.2.19"; +} +{ +name = "activemodel"; +hash = "4ea3abf790eca9ee8228e9e2a465350e258294270a639b63f0e1dfad236fe70e"; +url = "http://rubygems.org/downloads/activemodel-3.2.19.gem"; +version = "3.2.19"; +} +{ +name = "activerecord"; +hash = "052945ad510744aaa3e35a817a6f515a2316e7dd96df6460f75b36067bb60372"; +url = "http://rubygems.org/downloads/activerecord-3.2.19.gem"; +version = "3.2.19"; +} +{ +name = "activeresource"; +hash = "8617d24537ca937cc67aac46aaa29782510d66136605426d0a23a3585a839daf"; +url = "http://rubygems.org/downloads/activeresource-3.2.19.gem"; +version = "3.2.19"; +} +{ +name = "activesupport"; +hash = "2c837a59250da14b12a6b0cfb6774f0afae90aa749fd96ad4347344d8417ad3d"; +url = "http://rubygems.org/downloads/activesupport-3.2.19.gem"; +version = "3.2.19"; +} +{ +name = "arel"; +hash = "c0006e2169deee3b8cc2d258296388822eeb2db59832450b9b7316e1387d0da4"; +url = "http://rubygems.org/downloads/arel-3.0.3.gem"; +version = "3.0.3"; +} +{ +name = "awesome_nested_set"; +hash = "0dcd801aea5048f5ab907b62b4174b6763b191eaa4e1e11bb83f996f01349af8"; +url = "http://rubygems.org/downloads/awesome_nested_set-2.1.6.gem"; +version = "2.1.6"; +} +{ +name = "builder"; +hash = "fbd3e15e5de02245f7d649b3415b2c2875cdc9a14dccde89aa30fc14a314618e"; +url = "http://rubygems.org/downloads/builder-3.0.0.gem"; +version = "3.0.0"; +} +{ +name = "capybara"; +hash = "a9a19f8d6bb2dfcb1f05ea3e1727cb556d1cba0d234d1712b481e8d4f7bbb91e"; +url = "http://rubygems.org/downloads/capybara-2.1.0.gem"; +version = "2.1.0"; +} +{ +name = "childprocess"; +hash = "9b583295a11932d2eeffa1e8f5b8fb2fb0064a2f0111ad98c3b752b94f80bf33"; +url = "http://rubygems.org/downloads/childprocess-0.5.5.gem"; +version = "0.5.5"; +} +{ +name = "coderay"; +hash = "5a943c59e36f7ef9dd2677855735656413af02e3f302431e9c548aabe89f3c15"; +url = "http://rubygems.org/downloads/coderay-1.1.0.gem"; +version = "1.1.0"; +} +{ +name = "erubis"; +hash = "63653f5174a7997f6f1d6f465fbe1494dcc4bdab1fb8e635f6216989fb1148ba"; +url = "http://rubygems.org/downloads/erubis-2.7.0.gem"; +version = "2.7.0"; +} +{ +name = "fastercsv"; +hash = "d098199e62e4e10eec436a9ea9b8c189dacd5c06f2825f00d1e0f1c29fdbc3b5"; +url = "http://rubygems.org/downloads/fastercsv-1.5.5.gem"; +version = "1.5.5"; +} +{ +name = "ffi"; +hash = "0d2ef90163eef8545689e8dfc27fb1245a2d82e3500d587de1e38290629e662f"; +url = "http://rubygems.org/downloads/ffi-1.9.5.gem"; +version = "1.9.5"; +} +{ +name = "hike"; +hash = "154e2f2593845e5bcd8ed2ba3092600c55c6ad8c630722857de3fdaf334ccc44"; +url = "http://rubygems.org/downloads/hike-1.2.3.gem"; +version = "1.2.3"; +} +{ +name = "i18n"; +hash = "b37dda25b30484f2674a851e24ae098a38564a61c976fa91a34bf8fceaa3923b"; +url = "http://rubygems.org/downloads/i18n-0.6.11.gem"; +version = "0.6.11"; +} +{ +name = "journey"; +hash = "7454b8612530784000fbb17ea2df749a71b70702a0ac8ebef4a1e7f05aecc10f"; +url = "http://rubygems.org/downloads/journey-1.0.4.gem"; +version = "1.0.4"; +} +{ +name = "jquery-rails"; +hash = "cc4eab342fb3b1fcbb2fc1c9a61b09ecd86d795b1f74d607994b0bc6fd5ef444"; +url = "http://rubygems.org/downloads/jquery-rails-2.0.3.gem"; +version = "2.0.3"; +} +{ +name = "json"; +hash = "961bfbbfa9fda1e857e9c791e964e6664e0d43bf687b19669dfbc7cdbc5e0200"; +url = "http://rubygems.org/downloads/json-1.8.1.gem"; +version = "1.8.1"; +} +{ +name = "mail"; +hash = "446585c38b062121252688dcc9cc70af1f470822e30db021bb97d185969e257c"; +url = "http://rubygems.org/downloads/mail-2.5.4.gem"; +version = "2.5.4"; +} +{ +name = "metaclass"; +hash = "8569685c902108b1845be4e5794d646f2a8adcb0280d7651b600dab0844fe942"; +url = "http://rubygems.org/downloads/metaclass-0.0.4.gem"; +version = "0.0.4"; +} +{ +name = "mime-types"; +hash = "88ef3c596481678710ffd4018fa40f1999b02d97babea39682ba7d5badd21f56"; +url = "http://rubygems.org/downloads/mime-types-1.25.1.gem"; +version = "1.25.1"; +} +{ +name = "mini_portile"; +hash = "762b3e241362de24b2eb2bb1b98638399b931e9e51bece5f8e2df7611eb16c26"; +url = "http://rubygems.org/downloads/mini_portile-0.6.0.gem"; +version = "0.6.0"; +} +{ +name = "mocha"; +hash = "788fd93c8009a7e0eebd155509953e5987f4681902aad666a294283baa09899a"; +url = "http://rubygems.org/downloads/mocha-1.0.0.gem"; +version = "1.0.0"; +} +{ +name = "multi_json"; +hash = "2c98979877e87df0b338ebf5c86091b390f53d62c11a8232bd51ca007e0b82d2"; +url = "http://rubygems.org/downloads/multi_json-1.10.1.gem"; +version = "1.10.1"; +} +{ +name = "net-ldap"; +hash = "953551665fb0d398740a72a26314c6d34bd70fa35419c96dc58351f17d9a5081"; +url = "http://rubygems.org/downloads/net-ldap-0.3.1.gem"; +version = "0.3.1"; +} +{ +name = "nokogiri"; +hash = "91761a654439406b5bed71adf6092d49829e26332b4c0e7c8a23a2e628442585"; +url = "http://rubygems.org/downloads/nokogiri-1.6.3.1.gem"; +version = "1.6.3.1"; +} +{ +name = "pg"; +hash = "e7933e8f7f184c28e820ed85ddfb3ad8a13933b2b2ab8656aa8f81cb0aa610a6"; +url = "http://rubygems.org/downloads/pg-0.17.1.gem"; +version = "0.17.1"; +} +{ +name = "polyglot"; +hash = "59d66ef5e3c166431c39cb8b7c1d02af419051352f27912f6a43981b3def16af"; +url = "http://rubygems.org/downloads/polyglot-0.3.5.gem"; +version = "0.3.5"; +} +{ +name = "rack"; +hash = "f7bf3faa8e09a2ff26475372de36a724e7470d6bdc33d189a0ec34b49605f308"; +url = "http://rubygems.org/downloads/rack-1.4.5.gem"; +version = "1.4.5"; +} +{ +name = "rack-cache"; +hash = "02bfed05f8b3266db804f2fa445801636ca2c6d211a3137ec796f88af5756e1c"; +url = "http://rubygems.org/downloads/rack-cache-1.2.gem"; +version = "1.2"; +} +{ +name = "rack-openid"; +hash = "8cd2305e738463a7da98791f9ac4df4cf3f6ed27908d982350430694ac2fe869"; +url = "http://rubygems.org/downloads/rack-openid-1.4.2.gem"; +version = "1.4.2"; +} +{ +name = "rack-ssl"; +hash = "d703764fa2a0d44a2163d6add65be89f5dba4477d1959b90d3727682a9c37dcf"; +url = "http://rubygems.org/downloads/rack-ssl-1.3.4.gem"; +version = "1.3.4"; +} +{ +name = "rack-test"; +hash = "7e920b6aac888e4a3846e5997fb1cbf456bdb5846322b58dc31697a54a38b306"; +url = "http://rubygems.org/downloads/rack-test-0.6.2.gem"; +version = "0.6.2"; +} +{ +name = "rails"; +hash = "33b64cf78dfcf3206d961ce03e8fe6d260081da696e60da39d0b2a4a160fe22b"; +url = "http://rubygems.org/downloads/rails-3.2.19.gem"; +version = "3.2.19"; +} +{ +name = "railties"; +hash = "c569009ee5c005190d208ac228087fdc094b10c6f0cf209f1d12c552b447cc10"; +url = "http://rubygems.org/downloads/railties-3.2.19.gem"; +version = "3.2.19"; +} +{ +name = "rake"; +hash = "85e446590871dd3469c80dfe70a0296c20b76a9006af6b728c1f47d0b460412d"; +url = "http://rubygems.org/downloads/rake-10.1.1.gem"; +version = "10.1.1"; +} +{ +name = "rdoc"; +hash = "a8e2b78f7e5ec4cc4716cd863975645f2f2377dc6db267a15e427e5fae2633ed"; +url = "http://rubygems.org/downloads/rdoc-3.12.2.gem"; +version = "3.12.2"; +} +{ +name = "redcarpet"; +hash = "5c9bcc307fba97ff5a25eec74f08365c17e929d2a5c707db32d6fc99ec81f0b9"; +url = "http://rubygems.org/downloads/redcarpet-2.3.0.gem"; +version = "2.3.0"; +} +{ +name = "rmagick"; +hash = "109f3b8be90afdea9abbdd2a79a955cd808b5cad65d937ed12676da22870d3b4"; +url = "http://rubygems.org/downloads/rmagick-2.13.3.gem"; +version = "2.13.3"; +} +{ +name = "ruby-openid"; +hash = "f69ed004e95f7094e23bfd8bc9ebfb1dc88a7b46637252ca2907a1189870ea7b"; +url = "http://rubygems.org/downloads/ruby-openid-2.3.0.gem"; +version = "2.3.0"; +} +{ +name = "rubyzip"; +hash = "a996435ee9698be6a09d3748f4d23ee15aaf45cbfef1749def165af6ea3c0a9e"; +url = "http://rubygems.org/downloads/rubyzip-1.1.6.gem"; +version = "1.1.6"; +} +{ +name = "selenium-webdriver"; +hash = "09fe4374d1541cb45403ad1238c2d88129f3afb985218635af087a06c99a521a"; +url = "http://rubygems.org/downloads/selenium-webdriver-2.43.0.gem"; +version = "2.43.0"; +} +{ +name = "shoulda"; +hash = "52e70b71cbfb7c01dace14e268a62d86c21ddd1e5ec0116c8b1e632d8e04e412"; +url = "http://rubygems.org/downloads/shoulda-3.3.2.gem"; +version = "3.3.2"; +} +{ +name = "shoulda-context"; +hash = "ee5559aa13248c70fdec6868a3c144adf7438c904c59d1a76b04a002e5151de5"; +url = "http://rubygems.org/downloads/shoulda-context-1.0.2.gem"; +version = "1.0.2"; +} +{ +name = "shoulda-matchers"; +hash = "c35693cbfa84213212dffbc2c87487427ef364927340151329a842f0a06086b9"; +url = "http://rubygems.org/downloads/shoulda-matchers-1.4.1.gem"; +version = "1.4.1"; +} +{ +name = "sprockets"; +hash = "fae893b7e86e83c1936f6f2a64db3550510f86eabdd5fa9f0f23fb25d7e0cf96"; +url = "http://rubygems.org/downloads/sprockets-2.2.2.gem"; +version = "2.2.2"; +} +{ +name = "thor"; +hash = "9ff834f031b5550c743bb8a3139317fefdae9cdebd02d60de376658f427fe522"; +url = "http://rubygems.org/downloads/thor-0.19.1.gem"; +version = "0.19.1"; +} +{ +name = "tilt"; +hash = "39820562c4f5db45fe18de87ccc30a0e77a998bf5334b1d8c10a2f7dbc1f5903"; +url = "http://rubygems.org/downloads/tilt-1.4.1.gem"; +version = "1.4.1"; +} +{ +name = "treetop"; +hash = "ffa68f201c0f62c26b0a1d13233d73194400596964696843f87ebb5d812f12ff"; +url = "http://rubygems.org/downloads/treetop-1.4.15.gem"; +version = "1.4.15"; +} +{ +name = "tzinfo"; +hash = "381b22fd1744a35d0a0239f563f505773681e626e6d900063b14cb9b1b68e98c"; +url = "http://rubygems.org/downloads/tzinfo-0.3.41.gem"; +version = "0.3.41"; +} +{ +name = "websocket"; +hash = "e626c8c3e8593735d900265fb1fc3439fd06b394069860177d8f40733b12ae9e"; +url = "http://rubygems.org/downloads/websocket-1.2.1.gem"; +version = "1.2.1"; +} +{ +name = "xpath"; +hash = "9ca4a1cc88d9ab16c591468cce7b5d00ee06a8a76b841f8438970c7a44c86c12"; +url = "http://rubygems.org/downloads/xpath-2.0.0.gem"; +version = "2.0.0"; +} +{ +name = "yard"; +hash = "e65a26f9b9dc6e2aa9b1d1d2e1a45bee3edf540a6a7e6c30fa6aa1df7f7a29b4"; +url = "http://rubygems.org/downloads/yard-0.8.7.4.gem"; +version = "0.8.7.4"; +} +] diff --git a/pkgs/applications/version-management/redmine/README b/pkgs/applications/version-management/redmine/README new file mode 100644 index 000000000000..1cc4772568a4 --- /dev/null +++ b/pkgs/applications/version-management/redmine/README @@ -0,0 +1,6 @@ +to regenerate Gemfile.nix and Gemfile.lock you need to + + % nix-build bootstrap.nix + % cp result/Gemfile.nix ./ + % cp result/Gemfile.lock ./ + diff --git a/pkgs/applications/version-management/redmine/bootstrap.nix b/pkgs/applications/version-management/redmine/bootstrap.nix new file mode 100644 index 000000000000..4b4359603c9b --- /dev/null +++ b/pkgs/applications/version-management/redmine/bootstrap.nix @@ -0,0 +1,45 @@ +{ pkgs ? import <nixpkgs> {} +}: + +with pkgs; + +let + +in stdenv.mkDerivation rec { + version = "2.5.2"; + name = "redmine-${version}"; + __noChroot = true; + src = fetchurl { + url = "http://www.redmine.org/releases/${name}.tar.gz"; + sha256 = "0x0zwxyj4dwbk7l64s3lgny10mjf0ba8jwrbafsm4d72sncmacv0"; + }; + buildInputs = [ + ruby rubyLibs.bundler libiconv libxslt libxml2 pkgconfig + libffi imagemagickBig postgresql which stdenv + ]; + installPhase = '' + unset http_proxy + unset ftp_proxy + + cp -R . $out + cp ${./generate_nix_requirements.rb} $out/generate_nix_requirements.rb + cd $out + + cat > config/database.yml <<EOF + production: + adapter: postgresql + EOF + + bundle config --local build.nokogiri --use-system-libraries \ + --with-iconv-dir=${libiconv} \ + --with-xslt-dir=${libxslt} \ + --with-xml2-dir=${libxml2} \ + --with-pkg-config \ + --with-pg-config=${postgresql}/bin/pg_config + + bundle install --verbose --without development test rmagick --path /tmp/redmine-${version} + + HOME="/tmp/redmine-${version}" ruby generate_nix_requirements.rb + rm -R /tmp/gems + ''; +} diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix new file mode 100644 index 000000000000..4655a16671ee --- /dev/null +++ b/pkgs/applications/version-management/redmine/default.nix @@ -0,0 +1,73 @@ +{ stdenv, fetchurl, ruby, rubyLibs, libiconv, libxslt, libxml2, pkgconfig, libffi, imagemagickBig, postgresql }: + +let + gemspec = map (gem: fetchurl { url=gem.url; sha256=gem.hash; }) (import ./Gemfile.nix); +in stdenv.mkDerivation rec { + version = "2.5.2"; + name = "redmine-${version}"; + + src = fetchurl { + url = "http://www.redmine.org/releases/${name}.tar.gz"; + sha256 = "0x0zwxyj4dwbk7l64s3lgny10mjf0ba8jwrbafsm4d72sncmacv0"; + }; + + # taken from redmine (2.5.1-2~bpo70+3) in debian wheezy-backports + # needed to separate run-time and build-time directories + patches = [ + ./2002_FHS_through_env_vars.patch + ./2004_FHS_plugins_assets.patch + ./2003_externalize_session_config.patch + ]; + postPatch = '' + substituteInPlace lib/redmine/plugin.rb --replace "File.join(Rails.root, 'plugins')" "ENV['RAILS_PLUGINS']" + substituteInPlace lib/redmine/plugin.rb --replace "File.join(Rails.root, 'plugins', id.to_s, 'db', 'migrate')" "File.join(ENV['RAILS_PLUGINS'], id.to_s, 'db', 'migrate')" + substituteInPlace config/routes.rb --replace '"plugins/*", Rails.root' 'ENV["RAILS_PLUGINS"] + "/*"' + ''; + + buildInputs = [ + ruby rubyLibs.bundler libiconv libxslt libxml2 pkgconfig libffi + imagemagickBig postgresql + ]; + + installPhase = '' + mkdir -p $out/share/redmine/ + cp -R . $out/share/redmine/ + cd $out/share/redmine + ln -s ${./Gemfile.lock} Gemfile.lock + export HOME=$(pwd) + + cat > config/database.yml <<EOF + production: + adapter: postgresql + EOF + + mkdir -p vendor/cache + ${stdenv.lib.concatStrings (map (gem: "ln -s ${gem} vendor/cache/${gem.name};") gemspec)} + + bundle config build.nokogiri \ + --use-system-libraries \ + --with-iconv-dir=${libiconv} \ + --with-xslt-dir=${libxslt} \ + --with-xml2-dir=${libxml2} \ + --with-pkg-config \ + --with-pg-config=${postgresql}/bin/pg_config + + bundle install --verbose --local --deployment + + # make sure we always load pg package + echo "gem \"pg\"" >> Gemfile + + # make rails server happy + mkdir -p tmp/pids + + # cleanup + rm config/database.yml + ''; + + meta = with stdenv.lib; { + homepage = http://www.redmine.org/; + platforms = platforms.linux; + maintainers = [ maintainers.garbas ]; + license = licenses.gpl2; + }; +} diff --git a/pkgs/applications/version-management/redmine/generate_nix_requirements.rb b/pkgs/applications/version-management/redmine/generate_nix_requirements.rb new file mode 100644 index 000000000000..ed47d52c9c1b --- /dev/null +++ b/pkgs/applications/version-management/redmine/generate_nix_requirements.rb @@ -0,0 +1,56 @@ +#!/usr/bin/env ruby + +require 'rubygems' +require 'bundler' +require 'fileutils' +require 'net/http' +require 'net/https' +require 'uri' + +TMP_DIR = "/tmp/gems" + +FileUtils.rm_rf(TMP_DIR) if File.exists?(TMP_DIR) +FileUtils.mkdir TMP_DIR + +GEMSERVER = "http://rubygems.org" + +# inspect Gemfile.lock +lockfile = Bundler::LockfileParser.new(Bundler.read_file("Gemfile.lock")) + +to_mirror = {} + +uri = URI(GEMSERVER) +http = Net::HTTP.new(uri.host, uri.port) +http.use_ssl = uri.scheme == 'https' + +requirements = {} + +lockfile.specs.each do |s| + possible_gem_name = "#{s.name}-#{s.version.to_s}.gem" + + Dir.chdir TMP_DIR do + filename = `gem fetch #{s.name} -v #{s.version.to_s}`.split()[1] + hash = `sha256sum #{filename}.gem` + url = "#{GEMSERVER}/downloads/#{filename}.gem" + puts url + requirements[s.name] = { :version => s.version.to_s, + :hash => hash.split().first, + :url => url,} + + end +end + +filename = 'Gemfile.nix' + +File.open(filename, 'w') do |file| + file.puts "[" + requirements.each do |name, info| + file.puts "{" + file.puts ['name = ', '"', name, '";'].join('') + file.puts ['hash = ', '"', info[:hash], '";'].join('') + file.puts ['url = ', '"', info[:url], '";'].join('') + file.puts ['version = ', '"', info[:version], '";'].join('') + file.puts "}" + end + file.puts "]" +end diff --git a/pkgs/applications/version-management/src/default.nix b/pkgs/applications/version-management/src/default.nix new file mode 100644 index 000000000000..ced82dd45c00 --- /dev/null +++ b/pkgs/applications/version-management/src/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, python, rcs, git }: + +stdenv.mkDerivation rec { + name = "src-0.13"; + + src = fetchurl { + url = "http://www.catb.org/~esr/src/${name}.tar.gz"; + sha256 = "03x0slgi6bnzgfn7f9qbl6jma0pj7357kwdh832l3v8zafk41p51"; + }; + + buildInputs = [ python ]; + + patches = [ ./path.patch ]; + + postPatch = '' + sed -i \ + -e 's|@python@|${python}|' \ + -e 's|@rcs@|${rcs}|' \ + -e 's|@git@|${git}|' \ + src srctest + ''; + + makeFlags = [ "prefix=$(out)" ]; + + doCheck = true; + + meta = { + description = "Simple single-file revision control"; + + homepage = http://www.catb.org/~esr/src/; + + license = [ stdenv.lib.licenses.bsd3 ]; + + maintainers = [ stdenv.lib.maintainers.shlevy ]; + + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/version-management/src/path.patch b/pkgs/applications/version-management/src/path.patch new file mode 100644 index 000000000000..ef500c8e04e7 --- /dev/null +++ b/pkgs/applications/version-management/src/path.patch @@ -0,0 +1,30 @@ +diff -Naur src-0.13-orig/src src-0.13/src +--- src-0.13-orig/src 2014-11-24 03:56:16.000000000 -0500 ++++ src-0.13/src 2014-11-26 16:32:32.925151003 -0500 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python2 ++#!@python@/bin/python + # + # src - simple revision control. + # +@@ -51,6 +51,8 @@ + + import sys, os, subprocess, time, calendar, stat, glob, shutil, hashlib + ++os.environ['PATH'] = "@rcs@/bin:@git@/bin:" + os.environ['PATH'] ++ + version="0.13" + + def rfc3339(t): +diff -Naur src-0.13-orig/srctest src-0.13/srctest +--- src-0.13-orig/srctest 2014-11-21 08:12:00.000000000 -0500 ++++ src-0.13/srctest 2014-11-26 16:33:13.627715388 -0500 +@@ -12,7 +12,7 @@ + + # Set the PATH to include the current directory, so the repository + # head version of src can always be tested. +-PATH="$(pwd)":$PATH ++PATH="$(pwd)":@git@/bin:$PATH + + trap "rm -fr $SANDBOX" 0 1 2 15 + diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 283ea7591538..1ec4866f1aa4 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -6,12 +6,12 @@ , javahlBindings ? false , saslSupport ? false , stdenv, fetchurl, apr, aprutil, zlib, sqlite -, httpd ? null, expat, swig ? null, jdk ? null, python ? null, perl ? null +, apacheHttpd ? null, expat, swig ? null, jdk ? null, python ? null, perl ? null , sasl ? null, serf ? null }: assert bdbSupport -> aprutil.bdbSupport; -assert httpServer -> httpd != null; +assert httpServer -> apacheHttpd != null; assert pythonBindings -> swig != null && python != null; assert javahlBindings -> jdk != null && perl != null; @@ -34,20 +34,18 @@ stdenv.mkDerivation rec { configureFlags = '' ${if bdbSupport then "--with-berkeley-db" else "--without-berkeley-db"} - ${if httpServer then "--with-apxs=${httpd}/bin/apxs" else "--without-apxs"} + ${if httpServer then "--with-apxs=${apacheHttpd}/bin/apxs" else "--without-apxs"} ${if pythonBindings || perlBindings then "--with-swig=${swig}" else "--without-swig"} ${if javahlBindings then "--enable-javahl --with-jdk=${jdk}" else ""} ${if stdenv.isDarwin then "--enable-keychain" else "--disable-keychain"} - ${if saslSupport then "--enable-sasl --with-sasl=${sasl}" else "--disable-sasl"} - ${if httpSupport then "--enable-serf --with-serf=${serf}" else "--disable-serf"} + ${if saslSupport then "--with-sasl=${sasl}" else "--without-sasl"} + ${if httpSupport then "--with-serf=${serf}" else "--without-serf"} --with-zlib=${zlib} --with-sqlite=${sqlite} ''; preBuild = '' makeFlagsArray=(APACHE_LIBEXECDIR=$out/modules) - '' + stdenv.lib.optionalString stdenv.isDarwin '' - substituteInPlace configure --replace "-no-cpp-precomp" "" ''; postInstall = '' @@ -73,10 +71,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # Hack to build on Mac OS X. The system header files use C99-style - # comments, but Subversion passes -std=c90. - NIX_CFLAGS_COMPILE = "-std=c99"; - meta = { description = "A version control system intended to be a compelling replacement for CVS in the open source community"; homepage = http://subversion.apache.org/; diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index b42e781704a0..c32235a592fd 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl -, libX11, gettext, wxGTK -, libiconv, fontconfig, freetype +, libX11, wxGTK +, libiconvOrEmpty, fontconfig, freetype , mesa , libass, fftw, ffms , ffmpeg, pkgconfig, zlib # Undocumented (?) dependencies @@ -29,18 +29,20 @@ stdenv.mkDerivation rec { }; buildInputs = with stdenv.lib; - [ intltool libX11 gettext wxGTK libiconv fontconfig freetype mesa libass fftw ffms ffmpeg pkgconfig zlib icu boost boost.lib ] - ++ optional spellChecking hunspell - ++ optional automationSupport lua - ++ optional openalSupport openal - ++ optional alsaSupport alsaLib - ++ optional pulseaudioSupport pulseaudio - ++ optional portaudioSupport portaudio - ; - - NIX_LDFLAGS = "-liconv -lavutil -lavformat -lavcodec -lswscale -lz -lm -lGL"; - - configureFlags = "--with-boost-libdir=${boost.lib}/lib/"; + [ pkgconfig intltool libX11 wxGTK fontconfig freetype mesa + libass fftw ffms ffmpeg zlib icu boost boost.lib + ] + ++ libiconvOrEmpty + ++ optional spellChecking hunspell + ++ optional automationSupport lua + ++ optional openalSupport openal + ++ optional alsaSupport alsaLib + ++ optional pulseaudioSupport pulseaudio + ++ optional portaudioSupport portaudio + ; + + + enableParallelBuilding = true; postInstall = "ln -s $out/bin/aegisub-* $out/bin/aegisub"; diff --git a/pkgs/applications/video/byzanz/add-amflags.patch b/pkgs/applications/video/byzanz/add-amflags.patch new file mode 100644 index 000000000000..aeaa195798a4 --- /dev/null +++ b/pkgs/applications/video/byzanz/add-amflags.patch @@ -0,0 +1,12 @@ +diff --git a/Makefile.am b/Makefile.am +index 6eedb51..7b54313 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,5 +1,7 @@ + SUBDIRS = macros data gifenc src po + ++ACLOCAL_AMFLAGS = -I macros ++ + EXTRA_DIST = \ + MAINTAINERS \ + depcomp \ diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix new file mode 100644 index 000000000000..69b0ffbe1314 --- /dev/null +++ b/pkgs/applications/video/byzanz/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchgit, which, gnome3_12, glib, intltool, pkgconfig, libtool, cairo, gtk3, gst_all_1 }: + +stdenv.mkDerivation rec { + version = "0.2.3.alpha"; + name = "byzanz-${version}"; + + src = fetchgit { + url = git://github.com/GNOME/byzanz; + rev = "1875a7f6a3903b83f6b1d666965800f47db9286a"; + sha256 = "1b7hyilwj9wf2ri5zq63889bvskagdnqjc91hvyjmx1aj7vdkzd4"; + }; + + patches = [ ./add-amflags.patch ]; + + preBuild = '' + ./autogen.sh --prefix=$out + ''; + + buildInputs = [ which gnome3_12.gnome_common glib intltool pkgconfig libtool cairo gtk3 gst_all_1.gstreamer gst_all_1.gst-plugins-base ]; + + meta = with stdenv.lib; { + description = "Tool to record a running X desktop to an animation suitable for presentation in a web browser"; + homepage = https://github.com/GNOME/byzanz; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.DamienCassou ]; + }; +} diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix index 8287cb9121ea..94ec79e70d67 100644 --- a/pkgs/applications/video/cinelerra/default.nix +++ b/pkgs/applications/video/cinelerra/default.nix @@ -4,7 +4,7 @@ , libtiff, freetype, mjpegtools, x264, gettext, openexr , libXext, libXxf86vm, libXv, libXi, libX11, xextproto, libtheora, libpng , libdv, libuuid, file, nasm, perl }: - + stdenv.mkDerivation { name = "cinelerra-git"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { # # END src = fetchgit { - url = "git://git.cinelerra.org/j6t/cinelerra.git"; + url = "git://git.cinelerra-cv.org/j6t/cinelerra.git"; rev = "01dc4375a0fb65d10dd95151473d0e195239175f"; sha256 = "afb406a5637e4d0afad94e62ffd3af5b61e39f75aba9c08521523d00a0a5fec5"; }; @@ -40,7 +40,7 @@ stdenv.mkDerivation { perl ]; - meta = { + meta = { description = "Video Editor"; homepage = http://www.cinelerra.org; maintainers = [ stdenv.lib.maintainers.marcweber ]; diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix index 879fa08ea382..5a519e231c80 100644 --- a/pkgs/applications/video/gnash/default.nix +++ b/pkgs/applications/video/gnash/default.nix @@ -30,12 +30,11 @@ stdenv.mkDerivation rec { patch -p1 < ${patch_CVE} # Add all libs to `macros/libslist', a list of library search paths. - for lib in ${lib.concatStringsSep " " - (map (lib: "\"${lib}\"/lib") - (buildInputs ++ [stdenv.glibc]))} - do + libs=$(echo "$NIX_LDFLAGS" | tr ' ' '\n' | sed -n 's/.*-L\(.*\).*/\1/p') + for lib in $libs; do echo -n "$lib " >> macros/libslist done + echo -n "${stdenv.glibc}/lib" >> macros/libslist # Make sure to honor $TMPDIR, for chroot builds. for file in configure gui/Makefile.in Makefile.in @@ -54,7 +53,7 @@ stdenv.mkDerivation rec { buildInputs = [ gettext x11 SDL SDL_mixer gstreamer gst_plugins_base gst_plugins_good gst_ffmpeg speex libtool - libogg libxml2 libjpeg mesa libpng libungif boost boost.lib freetype agg + libogg libxml2 libjpeg mesa libpng libungif boost freetype agg dbus curl pkgconfig glib gtk gtkglext pangox_compat xulrunner makeWrapper diff --git a/pkgs/applications/video/kdenlive/default.nix b/pkgs/applications/video/kdenlive/default.nix index 8c51c4f35a3b..e3e52425ebde 100644 --- a/pkgs/applications/video/kdenlive/default.nix +++ b/pkgs/applications/video/kdenlive/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "kdenlive-${version}"; - version = "0.9.8"; + version = "0.9.10"; src = fetchurl { url = "mirror://kde/stable/kdenlive/${version}/src/${name}.tar.bz2"; - sha256 = "17x5srgywcwlbpbs598jwwc62l8313n4dbqx3sdk7p6lyvwk3jln"; + sha256 = "0qxpxnfbr8g6xq0h32skgqqi2xylrv2bnmyx5x1cws9y2wwxp3zn"; }; buildInputs = [ diff --git a/pkgs/applications/video/makemkv/builder.sh b/pkgs/applications/video/makemkv/builder.sh index e4cfcf3d9068..0f5f853c28df 100644 --- a/pkgs/applications/video/makemkv/builder.sh +++ b/pkgs/applications/video/makemkv/builder.sh @@ -4,6 +4,7 @@ set -x lib=" \ makemkv-oss-${ver}/out/libdriveio.so.0 \ makemkv-oss-${ver}/out/libmakemkv.so.1 \ + makemkv-oss-${ver}/out/libmmbd.so.0 \ " bin=" \ @@ -16,7 +17,8 @@ tar xzf ${src_oss} ( cd makemkv-oss-${ver} - make -f makefile.linux + ./configure --prefix=$out + make ) chmod +x ${bin} diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index bec9d85aefd8..9f360e964af5 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -1,28 +1,28 @@ { stdenv, fetchurl -, openssl, qt4, mesa, zlib +, openssl, qt4, mesa, zlib, pkgconfig, libav }: stdenv.mkDerivation rec { name = "makemkv-${ver}"; - ver = "1.8.0"; + ver = "1.9.0"; builder = ./builder.sh; src_bin = fetchurl { url = "http://www.makemkv.com/download/makemkv-bin-${ver}.tar.gz"; - sha256 = "1f465rdv5ibnh5hnfmvmlid0yyzkansjw8l1mi5qd3bc6ca4k30c"; + sha256 = "1rcvg7a1h59mfwsl5w0fr89m101pkqm9vgj06dl91hkgp5nh3wah"; }; src_oss = fetchurl { url = "http://www.makemkv.com/download/makemkv-oss-${ver}.tar.gz"; - sha256 = "0kj1mpkzz2cvi0ibdgdzfwbh9k2jfj3ra5m3hd7iyc5ng21v4sk3"; + sha256 = "0415gw2nacb57sz5m0hcaznynmznc6v8qb6028qnsqgv39d4w8f8"; }; - buildInputs = [openssl qt4 mesa zlib]; + buildInputs = [openssl qt4 mesa zlib pkgconfig libav]; libPath = stdenv.lib.makeLibraryPath [stdenv.gcc.gcc openssl mesa qt4 zlib ] + ":" + stdenv.gcc.gcc + "/lib64"; - meta = { + meta = with stdenv.lib; { description = "convert blu-ray and dvd to mkv"; longDescription = '' makemkv is a one-click QT application that transcodes an encrypted @@ -33,7 +33,8 @@ stdenv.mkDerivation rec { can always download the latest version from makemkv.com that will reset the expiration date. ''; - license = stdenv.lib.licenses.unfree; + license = licenses.unfree; homepage = http://makemkv.com; + maintainers = [ maintainers.titanous ]; }; } diff --git a/pkgs/applications/video/miro/default.nix b/pkgs/applications/video/miro/default.nix index 7572bedc1e05..cd2033917499 100644 --- a/pkgs/applications/video/miro/default.nix +++ b/pkgs/applications/video/miro/default.nix @@ -3,8 +3,13 @@ , taglib, pysqlite, pycurl, mutagen, pycairo, pythonDBus, pywebkitgtk , libtorrentRasterbar, glib_networking, gsettings_desktop_schemas , gst_python, gst_plugins_base, gst_plugins_good, gst_ffmpeg +, enableBonjour ? false, avahi ? null }: +assert enableBonjour -> avahi != null; + +with stdenv.lib; + buildPythonPackage rec { name = "miro-${version}"; namePrefix = ""; @@ -37,6 +42,9 @@ buildPythonPackage rec { c RESOURCE_ROOT = '"'$out/share/miro/resources/'"' }' \ plat/resources.py + '' + optionalString enableBonjour '' + sed -i -e 's|ctypes.cdll.LoadLibrary( *|ctypes.CDLL("${avahi}/lib/" +|' \ + ../lib/libdaap/pybonjour.py ''; # Disabled for now, because it requires networking and even if we skip those @@ -69,13 +77,13 @@ buildPythonPackage rec { pygobject pygtk pycurl python.modules.sqlite3 mutagen pycairo pythonDBus pywebkitgtk libtorrentRasterbar gst_python gst_plugins_base gst_plugins_good gst_ffmpeg - ]; + ] ++ optional enableBonjour avahi; meta = { homepage = "http://www.getmiro.com/"; description = "Video and audio feed aggregator"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.aszlig ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2Plus; + maintainers = [ maintainers.aszlig ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 567821ba3612..a6c2ff0b822a 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -15,12 +15,12 @@ }: stdenv.mkDerivation rec { - version = "7.2.0"; + version = "7.3.0"; name = "mkvtoolnix-${version}"; src = fetchurl { url = "http://www.bunkus.org/videotools/mkvtoolnix/sources/${name}.tar.xz"; - sha256 = "1bpmd37y2v4icv9iqjv3p4kr62jbdng2ar8vpiij3bdgwrjc6gv1"; + sha256 = "086lg64pki6mz00h0a735hgvz4347zbcp3wz384sigqndn99zc1c"; }; buildInputs = [ @@ -28,7 +28,6 @@ stdenv.mkDerivation rec { expat wxGTK zlib ruby gettext pkgconfig curl ]; - configureFlags = "--with-boost-libdir=${boost}/lib"; buildPhase = '' ruby ./drake ''; diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index c58ac268b670..5acdcac97372 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -20,7 +20,7 @@ # For screenshots , libpngSupport ? true, libpng ? null # for Youtube support -, quviSupport ? false, libquvi ? null +, youtubeSupport ? false, youtubeDL ? null , cacaSupport ? false, libcaca ? null , vaapiSupport ? false, libva ? null }: @@ -41,7 +41,7 @@ assert jackaudioSupport -> jack2 != null; assert pulseSupport -> pulseaudio != null; assert bs2bSupport -> libbs2b != null; assert libpngSupport -> libpng != null; -assert quviSupport -> libquvi != null; +assert youtubeSupport -> youtubeDL != null; assert cacaSupport -> libcaca != null; # Purity problem: Waf needed to be is downloaded by bootstrap.py @@ -50,23 +50,23 @@ assert cacaSupport -> libcaca != null; let waf = fetchurl { - url = http://ftp.waf.io/pub/release/waf-1.7.16; - sha256 = "b64dc26c882572415fd450b745006107965f3fe17b357e3eb43d6676c9635a61"; + url = http://ftp.waf.io/pub/release/waf-1.8.1; + sha256 = "ec658116ba0b96629d91fde0b32321849e866e0819f1e835c4c2c7f7ffe1a21d"; }; in stdenv.mkDerivation rec { name = "mpv-${version}"; - version = "0.5.4"; + version = "0.7.0"; src = fetchurl { url = "https://github.com/mpv-player/mpv/archive/v${version}.tar.gz"; - sha256 = "1n992nvylnh27jc6425daasq0nsxjfc1mxhhlhvlwzxm724x94xp"; + sha256 = "0rz8dp44yag442gamaa2vdmf69h25gqh2bgybx89prkfh8n4hy8x"; }; buildInputs = with stdenv.lib; - [ waf python3 lua perl freetype pkgconfig ffmpeg libass docutils which libpthreadstubs lua5_sockets ] + [ python3 lua perl freetype pkgconfig ffmpeg libass docutils which libpthreadstubs lua5_sockets ] ++ optionals x11Support [ libX11 libXext mesa libXxf86vm ] ++ optional alsaSupport alsaLib ++ optional xvSupport libXv @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { ++ optional speexSupport speex ++ optional bs2bSupport libbs2b ++ optional libpngSupport libpng - ++ optional quviSupport libquvi + ++ optional youtubeSupport youtubeDL ++ optional sdl2Support SDL2 ++ optional cacaSupport libcaca ++ optional vaapiSupport libva @@ -126,6 +126,5 @@ stdenv.mkDerivation rec { } # TODO: Wayland support -# TODO: investigate libquvi problems (related to Youtube support) # TODO: investigate caca support # TODO: investigate lua5_sockets bug diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix index a4fe07b2d053..2bc635d510eb 100644 --- a/pkgs/applications/video/mythtv/default.nix +++ b/pkgs/applications/video/mythtv/default.nix @@ -1,22 +1,32 @@ { stdenv, fetchurl, which, qt4, x11, pulseaudio, fftwSinglePrec , lame, zlib, mesa, alsaLib, freetype, perl, pkgconfig , libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm, libXmu +, yasm, libuuid, taglib, libtool, autoconf, automake, file }: stdenv.mkDerivation rec { - name = "mythtv-0.24.2"; + name = "mythtv-${version}"; + version = "0.27.4"; src = fetchurl { - url = "http://ftp.osuosl.org/pub/mythtv/${name}.tar.bz2"; - sha256 = "14mkyf2b26pc9spx6lg15mml0nqyg1r3qnq8m9dz3110h771y2db"; + url = "https://github.com/MythTV/mythtv/archive/v${version}.tar.gz"; + sha256 = "0nrn4fbkkzh43n7jgbv21i92sb4z4yacwj9yj6m3hjbffzy4ywqz"; }; + sourceRoot = "${name}/mythtv"; + buildInputs = [ freetype qt4 lame zlib x11 mesa perl alsaLib pulseaudio fftwSinglePrec libX11 libXv libXrandr libXvMC libXmu libXinerama libXxf86vm libXmu + libuuid taglib ]; + nativeBuildInputs = [ pkgconfig which yasm libtool autoconf automake file ]; - nativeBuildInputs = [ pkgconfig which ]; - - patches = [ ./settings.patch ]; + meta = with stdenv.lib; { + homepage = "https://www.mythtv.org/"; + description = "Open Source DVR"; + license = licenses.gpl2; + meta.platforms = platforms.linux; + maintainers = [ maintainers.titanous ]; + }; } diff --git a/pkgs/applications/video/mythtv/settings.patch b/pkgs/applications/video/mythtv/settings.patch deleted file mode 100644 index ec1e70097921..000000000000 --- a/pkgs/applications/video/mythtv/settings.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Makefile b/Makefile -index 05db819..383036d 100644 ---- a/Makefile -+++ b/Makefile -@@ -53,7 +53,7 @@ i18n/Makefile: i18n/i18n.pro - locales/Makefile: locales/locales.pro - - $(addsuffix /Makefile,$(QT_SUBDIRS)): %/Makefile : -- cd $*; $(QMAKE) QMAKE=$(QMAKE) -o $(@F) $(<F) -+ cd $*; $(QMAKE) QMAKE=$(QMAKE) PREFIX=${PREFIX} -o $(@F) $(<F) - - $(SUBDIRS): $(addsuffix /Makefile,$(SUBDIRS)) version.cpp - $(MAKE) -C $@ diff --git a/pkgs/applications/video/quvi/library.nix b/pkgs/applications/video/quvi/library.nix index 0fdd78fe1068..3fa426d9f6f9 100644 --- a/pkgs/applications/video/quvi/library.nix +++ b/pkgs/applications/video/quvi/library.nix @@ -11,12 +11,11 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig lua5 curl quvi_scripts libproxy libgcrypt ]; - meta = { + meta = { description = "Web video downloader"; homepage = http://quvi.sf.net; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.mornfall ]; + maintainers = [ stdenv.lib.maintainers.mornfall ]; }; } - diff --git a/pkgs/applications/video/quvi/scripts.nix b/pkgs/applications/video/quvi/scripts.nix index 68b61fc453de..cdc53367d114 100644 --- a/pkgs/applications/video/quvi/scripts.nix +++ b/pkgs/applications/video/quvi/scripts.nix @@ -11,12 +11,11 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig ]; - meta = { + meta = { description = "Web video downloader"; homepage = http://quvi.sf.net; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.mornfall ]; + maintainers = [ stdenv.lib.maintainers.mornfall ]; }; } - diff --git a/pkgs/applications/video/smplayer/basegui.cpp.patch b/pkgs/applications/video/smplayer/basegui.cpp.patch new file mode 100644 index 000000000000..05664ee96e62 --- /dev/null +++ b/pkgs/applications/video/smplayer/basegui.cpp.patch @@ -0,0 +1,11 @@ +--- a/src/basegui.cpp 2014-08-20 01:04:51.000000000 +0100 ++++ b/src/basegui.cpp 2014-10-11 10:25:57.561983556 +0100 +@@ -5235,7 +5235,7 @@ + #ifdef YOUTUBE_SUPPORT + void BaseGui::showTubeBrowser() { + qDebug("BaseGui::showTubeBrowser"); +- QString exec = Paths::appPath() + "/smtube"; ++ QString exec = "smtube"; + qDebug("BaseGui::showTubeBrowser: '%s'", exec.toUtf8().constData()); + if (!QProcess::startDetached(exec, QStringList())) { + QMessageBox::warning(this, "SMPlayer", diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index 018be742a160..4e4d7a3e4b5b 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -1,13 +1,15 @@ { stdenv, fetchurl, qt4 }: stdenv.mkDerivation rec { - name = "smplayer-14.3.0"; + name = "smplayer-14.9.0"; src = fetchurl { url = "mirror://sourceforge/smplayer/${name}.tar.bz2"; - sha256 = "9b8db20043d1528ee5c6054526779e88a172d2c757429bd7095c794d65ecbc18"; + sha256 = "04yzgmdj9hm9v7ln49zm2aa1r9mm9q12pym4bvfww7yzsvnx96j2"; }; + patches = [ ./basegui.cpp.patch ]; + buildInputs = [ qt4 ]; preConfigure = '' diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix new file mode 100644 index 000000000000..d648b5866e04 --- /dev/null +++ b/pkgs/applications/video/smtube/default.nix @@ -0,0 +1,23 @@ +{stdenv, fetchurl, qt4}: + +stdenv.mkDerivation { + name = "smtube-14.8.0"; + src = fetchurl { + url = mirror://sourceforge/smplayer/smtube-14.8.0.tar.bz2; + sha256 = "0h0kw4dvdj9sbxp0p6bdib9y8i7854f45lsmrdkykzk6rmgrf1cw"; + }; + + buildInputs = [qt4]; + + preConfigure = '' + makeFlags="PREFIX=$out" + ''; + + meta = with stdenv.lib; { + description = "Play and download Youtube videos"; + homepage = http://smplayer.sourceforge.net/smtube.php; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ vbgl ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/video/xbmc/default.nix b/pkgs/applications/video/xbmc/default.nix index 404659208cfc..f7bddc50ef82 100644 --- a/pkgs/applications/video/xbmc/default.nix +++ b/pkgs/applications/video/xbmc/default.nix @@ -24,6 +24,7 @@ # TODO: librtmp , libvdpau ? null, vdpauSupport ? true , pulseaudio ? null, pulseSupport ? true +, libcec ? null, cecSupport ? true }: assert dbusSupport -> dbus_libs != null; @@ -32,6 +33,7 @@ assert usbSupport -> libusb != null && ! udevSupport; # libusb won't be used i assert sambaSupport -> samba != null; assert vdpauSupport -> libvdpau != null && ffmpeg.vdpauSupport; assert pulseSupport -> pulseaudio != null; +assert cecSupport -> libcec != null; stdenv.mkDerivation rec { name = "xbmc-13.2"; @@ -65,7 +67,8 @@ stdenv.mkDerivation rec { ++ lib.optional usbSupport libusb ++ lib.optional sambaSupport samba ++ lib.optional vdpauSupport libvdpau - ++ lib.optional pulseSupport pulseaudio; + ++ lib.optional pulseSupport pulseaudio + ++ lib.optional cecSupport libcec; dontUseCmakeConfigure = true; @@ -91,15 +94,16 @@ stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH ":" "${curl}/lib" \ --prefix LD_LIBRARY_PATH ":" "${systemd}/lib" \ --prefix LD_LIBRARY_PATH ":" "${libmad}/lib" \ - --prefix LD_LIBRARY_PATH ":" "${libvdpau}/lib" + --prefix LD_LIBRARY_PATH ":" "${libvdpau}/lib" \ + --prefix LD_LIBRARY_PATH ":" "${libcec}/lib" done ''; - meta = { + meta = with stdenv.lib; { homepage = http://xbmc.org/; description = "Media center"; - license = "GPLv2"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.iElectric ]; + license = stdenv.lib.licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.iElectric maintainers.titanous ]; }; } diff --git a/pkgs/applications/video/xbmc/plugins.nix b/pkgs/applications/video/xbmc/plugins.nix index d34fba9ade73..f1d4d50f37d7 100644 --- a/pkgs/applications/video/xbmc/plugins.nix +++ b/pkgs/applications/video/xbmc/plugins.nix @@ -16,7 +16,9 @@ let installPhase = '' d=$out${pluginDir}/${namespace} mkdir -p $d - cp -R $src/* $d + sauce="." + [ -d ${namespace} ] && sauce=${namespace} + cp -R $sauce/* $d ''; }; @@ -53,17 +55,39 @@ in }; + genesis = mkXBMCPlugin rec { + + plugin = "genesis"; + namespace = "plugin.video.genesis"; + version = "2.1.3"; + + src = fetchFromGitHub { + owner = "lambda81"; + repo = "lambda-xbmc-addons"; + rev = "f8aa34064bf31fffbb3c264af32c66bbdaf0a59e"; + sha256 = "0d197fd6n3m9knpg38frnmfhqyabvh00ridpmikyw4vzk3hx11km"; + }; + + meta = with stdenv.lib; { + homepage = "http://forums.tvaddons.ag/forums/148-lambda-s-xbmc-addons"; + description = "The origins of streaming"; + platforms = platforms.all; + maintainers = with maintainers; [ edwtjo ]; + }; + + }; + svtplay = mkXBMCPlugin rec { plugin = "svtplay"; namespace = "plugin.video.svtplay"; - version = "4.0.6"; + version = "4.0.9"; src = fetchFromGitHub { owner = "nilzen"; repo = "xbmc-" + plugin; - rev = "4f27254edbd6dc48350152832833c5b164ca58de"; - sha256 = "11r8vljpx9fxwdx20cvkb5szlaypfrn6c235jwcg61s4hmjy4kl8"; + rev = "29a754e49584d1ca32f0c07b87304669cf266bb0"; + sha256 = "0k7mwaknw4h1jlq7ialbzgxxpb11j8bk29dx2gimp40lvnyw4yhz"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/video/xbmc/wrapper.nix b/pkgs/applications/video/xbmc/wrapper.nix index b1017c7098c7..90413c1769aa 100644 --- a/pkgs/applications/video/xbmc/wrapper.nix +++ b/pkgs/applications/video/xbmc/wrapper.nix @@ -28,8 +28,15 @@ stdenv.mkDerivation { do $(ln -s $share $out/share/xbmc/.) done) - makeWrapper ${xbmc}/bin/xbmc $out/bin/xbmc \ + $(for passthrough in icons xsessions applications + do + ln -s ${xbmc}/share/$passthrough $out/share/ + done) + $(for exe in xbmc{,-standalone} + do + makeWrapper ${xbmc}/bin/$exe $out/bin/$exe \ --prefix XBMC_HOME : $out/share/xbmc; + done) ''; preferLocalBuilds = true; diff --git a/pkgs/applications/video/zdfmediathk/default.nix b/pkgs/applications/video/zdfmediathk/default.nix new file mode 100644 index 000000000000..105bbbfbacd5 --- /dev/null +++ b/pkgs/applications/video/zdfmediathk/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, unzip, jre }: + +with stdenv; + +mkDerivation rec { + + version = "8"; + name = "zdfmediathk"; + src = fetchurl { + url = "http://downloads.sourceforge.net/project/zdfmediathk/Mediathek/Mediathek%208/MediathekView_${version}.zip"; + sha256 = "1sglzk8zh6cyijyw82k49yqzjv0ywglp03w09s7wr4mzk48mfjj9"; + }; + + buildInputs = [ unzip ]; + + unpackPhase = "unzip $src"; + + installPhase = '' + mkdir -p $out/{lib,bin,share/{doc,licenses}} + install -m644 MediathekView.jar $out/ + install -m644 -t $out/lib lib/* + install -m755 bin/flv.sh $out/bin/ + install -m644 -t $out/share/doc Anleitung/*.pdf + install -m644 -t $out/share/licenses Copyright/{*.*,_copyright} + bin="$out/bin/mediathek" + cat >> "$bin" << EOF + #!/bin/sh + exec ${jre}/bin/java -cp "$out/lib/*" -Xms128M -Xmx1G -jar "$out/MediathekView.jar" "\$@" + EOF + chmod +x "$bin" + ''; + + meta = with stdenv.lib; { + description = "Offers access to the Mediathek of different tv stations (ARD, ZDF, Arte, etc.)"; + homepage = "http://zdfmediathk.sourceforge.net/"; + license = licenses.gpl3; + maintainers = [ maintainers.flosse ]; + platforms = platforms.all; + }; + +} diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix index a3e7a5b2994d..914114467e67 100644 --- a/pkgs/applications/virtualization/bochs/default.nix +++ b/pkgs/applications/virtualization/bochs/default.nix @@ -2,7 +2,7 @@ , pkgconfig, libtool , gtk, mesa, readline, libX11, libXpm , docbook_xml_dtd_45, docbook_xsl -, sdlSupport ? true, SDL ? null +, sdlSupport ? true, SDL2 ? null , termSupport ? true , ncurses ? null , wxSupport ? false, wxGTK ? null # Warning! Broken # Optional, undocumented dependencies @@ -10,7 +10,7 @@ , curlSupport ? false, curl ? null }: -assert sdlSupport -> (SDL != null); +assert sdlSupport -> (SDL2 != null); assert termSupport -> (ncurses != null); assert wxSupport -> (gtk != null && wxGTK != null); assert wgetSupport -> (wget != null); @@ -19,11 +19,11 @@ assert curlSupport -> (curl != null); stdenv.mkDerivation rec { name = "bochs-${version}"; - version = "2.6.6"; + version = "2.6.7"; src = fetchurl { url = "http://downloads.sourceforge.net/project/bochs/bochs/${version}/${name}.tar.gz"; - sha256 = "0nlrl218x93vz97n46aw2szsalx97r020mn43fjsif100v7zix6f"; + sha256 = "10l2pgzwnmng0rd44kqv7y46nwpcc18j53h3kf3dlqlnd7mlwdd4"; }; # The huge list of configurable options @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { buildInputs = with stdenv.lib; [ pkgconfig libtool gtk mesa readline libX11 libXpm docbook_xml_dtd_45 docbook_xsl ] ++ optionals termSupport [ ncurses ] - ++ optionals sdlSupport [ SDL ] + ++ optionals sdlSupport [ SDL2 ] ++ optionals wxSupport [ wxGTK ] ++ optionals wgetSupport [ wget ] ++ optionals curlSupport [ curl ]; @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { "--enable-raw-serial=no" ] # Boolean flags ++ stdenv.lib.optional termSupport "--with-term" - ++ stdenv.lib.optional sdlSupport "--with-sdl" + ++ stdenv.lib.optional sdlSupport "--with-sdl2" ++ stdenv.lib.optional wxSupport "--with-wx" ++ stdenv.lib.optional largefile "--enable-largefile" ++ stdenv.lib.optional idleHack "--enable-idle-hack" diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index dafc093bf05a..354666f3374b 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -3,11 +3,11 @@ btrfsProgs, iptables, bash, e2fsprogs, xz}: stdenv.mkDerivation rec { name = "docker-${version}"; - version = "1.2.0"; + version = "1.3.1"; src = fetchurl { url = "https://github.com/dotcloud/docker/archive/v${version}.tar.gz"; - sha256 = "1nk74p9k17bllgw4992ixx7z3w87icp2wabbpbgfyi20k2q9mayp"; + sha256 = "0w1gz1apkcrmhgng2rkkzy7wmxm68zgs6a16bi4cx3a38n4mgday"; }; buildInputs = [ makeWrapper go sqlite lxc iproute bridge_utils devicemapper btrfsProgs iptables e2fsprogs]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildPhase = '' patchShebangs ./hack export AUTO_GOPATH=1 - export DOCKER_GITCOMMIT="fa7b24f" + export DOCKER_GITCOMMIT="c78088f" ./hack/make.sh dynbinary ''; diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index 1da4a521da75..b49bd40136f3 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -7,10 +7,10 @@ with stdenv.lib; let sourceInfo = rec { baseName="virt-viewer"; - version="0.6.0"; + version="1.0"; name="${baseName}-${version}"; url="http://virt-manager.org/download/sources/${baseName}/${name}.tar.gz"; - hash="0svalnr6k8rjadysnxixygk3bdx04asmwx75bhrbljyicba216v6"; + hash="09sf1xzvw2yysv4c1jkqlzrazdg501r4j12hiwjdzk5swk6lppw0"; }; in stdenv.mkDerivation { diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 309cfe1f35a1..cbdf13b21589 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -4,14 +4,16 @@ , xorriso, makeself, perl, pkgconfig , javaBindings ? false, jdk ? null , pythonBindings ? false, python ? null -, enableExtensionPack ? false, requireFile ? null, patchelf ? null +, enableExtensionPack ? false, requireFile ? null, patchelf ? null, fakeroot ? null +, pulseSupport ? false, pulseaudio ? null +, enableHardening ? true }: with stdenv.lib; let - version = "4.3.16"; # changes ./guest-additions as well + version = "4.3.20"; # changes ./guest-additions as well forEachModule = action: '' for mod in \ @@ -31,13 +33,13 @@ let ''; # See https://github.com/NixOS/nixpkgs/issues/672 for details - extpackRevision = "95972"; + extpackRevision = "96996"; extensionPack = requireFile rec { name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack"; # IMPORTANT: Hash must be base16 encoded because it's used as an input to # VBoxExtPackHelperApp! # Tip: see http://dlc.sun.com.edgesuite.net/virtualbox/4.3.10/SHA256SUMS - sha256 = "93b01ac2c575388ea6ae994450907c24e30a788c271ae9ff18512a06f28d9abd"; + sha256 = "7e1253f7013e9cdc84a614a0db38b40de7bbd330cb5b85bd3ef3de213773450d"; message = '' In order to use the extension pack, you need to comply with the VirtualBox Personal Use and Evaluation License (PUEL) by downloading the related binaries from: @@ -56,7 +58,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "99c32e646dbc93cbf4cc0b62ca6c1d24113a295fd758dc15724c14908dd6dcb3"; + sha256 = "1484f8e9993ec4fe3892c5165db84d238713d2506e147ed8236541ece642e965"; }; buildInputs = @@ -64,7 +66,8 @@ in stdenv.mkDerivation { libcap glib lvm2 python alsaLib curl libvpx pam xorriso makeself perl pkgconfig which libXmu ] ++ optional javaBindings jdk - ++ optional pythonBindings python; + ++ optional pythonBindings python + ++ optional pulseSupport pulseaudio; prePatch = '' set -x @@ -75,33 +78,46 @@ in stdenv.mkDerivation { -i configure ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 - find . -type f | xargs sed 's/depmod -a/true/' -i + find . -type f -iname '*makefile*' -exec sed -i -e 's/depmod -a/:/g' {} + sed -e 's@"libasound.so.2"@"${alsaLib}/lib/libasound.so.2"@g' -i src/VBox/Main/xml/Settings.cpp src/VBox/Devices/Audio/alsa_stubs.c export USER=nix set +x ''; + patches = optional enableHardening ./hardened.patch; + configurePhase = '' sourcedir="$(pwd)" + cat >> LocalConfig.kmk <<LOCAL_CONFIG + VBOX_WITH_TESTCASES := + VBOX_WITH_TESTSUITE := + VBOX_WITH_VALIDATIONKIT := + VBOX_WITH_DOCS := + VBOX_WITH_WARNINGS_AS_ERRORS := + + VBOX_WITH_ORIGIN := + VBOX_PATH_APP_PRIVATE_ARCH_TOP := $out/share/virtualbox + VBOX_PATH_APP_PRIVATE_ARCH := $out/libexec/virtualbox + VBOX_PATH_SHARED_LIBS := $out/libexec/virtualbox + VBOX_WITH_RUNPATH := $out/libexec/virtualbox + VBOX_PATH_APP_PRIVATE := $out/share/virtualbox + VBOX_PATH_APP_DOCS := $out/doc + ${optionalString javaBindings '' + VBOX_JAVA_HOME := ${jdk} + ''} + LOCAL_CONFIG + ./configure --with-qt4-dir=${qt4} \ ${optionalString (!javaBindings) "--disable-java"} \ ${optionalString (!pythonBindings) "--disable-python"} \ - --disable-pulse --disable-hardening --disable-kmods \ - --with-mkisofs=${xorriso}/bin/xorrisofs + ${optionalString (!pulseSupport) "--disable-pulse"} \ + ${optionalString (!enableHardening) "--disable-hardening"} \ + --disable-kmods --with-mkisofs=${xorriso}/bin/xorrisofs sed -e 's@PKG_CONFIG_PATH=.*@PKG_CONFIG_PATH=${libIDL}/lib/pkgconfig:${glib}/lib/pkgconfig ${libIDL}/bin/libIDL-config-2@' \ -i AutoConfig.kmk sed -e 's@arch/x86/@@' \ -i Config.kmk substituteInPlace Config.kmk --replace "VBOX_WITH_TESTCASES = 1" "#" - cat >> AutoConfig.kmk << END_PATHS - VBOX_PATH_APP_PRIVATE := $out - VBOX_PATH_APP_DOCS := $out/doc - ${optionalString javaBindings '' - VBOX_JAVA_HOME := ${jdk} - ''} - END_PATHS - echo "VBOX_WITH_DOCS :=" >> LocalConfig.kmk - echo "VBOX_WITH_WARNINGS_AS_ERRORS :=" >> LocalConfig.kmk ''; enableParallelBuilding = true; @@ -114,6 +130,7 @@ in stdenv.mkDerivation { installPhase = '' libexec=$out/libexec/virtualbox + share=$out/share/virtualbox # Install VirtualBox files cd out/linux.*/release/bin @@ -130,12 +147,15 @@ in stdenv.mkDerivation { done ${optionalString enableExtensionPack '' + mkdir -p "$share" + "${fakeroot}/bin/fakeroot" "${stdenv.shell}" <<EXTHELPER "$libexec/VBoxExtPackHelperApp" install \ - --base-dir "$libexec/ExtensionPacks" \ - --cert-dir "$libexec/ExtPackCertificates" \ + --base-dir "$share/ExtensionPacks" \ + --cert-dir "$share/ExtPackCertificates" \ --name "Oracle VM VirtualBox Extension Pack" \ --tarball "${extensionPack}" \ --sha-256 "${extensionPack.outputHash}" + EXTHELPER ''} # Create and fix desktop item diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 9552e7264c5a..f7059c329c0a 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "d58f678613bd37f5f94bcf324708af63572fc8582833a2558574090231fd080f"; + sha256 = "9ab48f44ac26a6deb374cb5fe6bad103bbf4fdf5186140e2d40ebe48bd01f3ea"; }; KERN_DIR = "${kernel.dev}/lib/modules/*/build"; diff --git a/pkgs/applications/virtualization/virtualbox/hardened.patch b/pkgs/applications/virtualization/virtualbox/hardened.patch new file mode 100644 index 000000000000..a0184b68f079 --- /dev/null +++ b/pkgs/applications/virtualization/virtualbox/hardened.patch @@ -0,0 +1,39 @@ +diff --git a/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp b/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp +index c39d2f7..cd19186 100644 +--- a/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp ++++ b/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp +@@ -1415,7 +1415,7 @@ static int supR3HardenedVerifyFsObject(PCSUPR3HARDENEDFSOBJSTATE pFsObjState, bo + NOREF(fRelaxed); + #else + NOREF(fRelaxed); +- bool fBad = true; ++ bool fBad = !(fDir && pFsObjState->Stat.st_mode & S_ISVTX && !suplibHardenedStrCmp(pszPath, "/nix/store")); + #endif + if (fBad) + return supR3HardenedSetError3(VERR_SUPLIB_WRITE_NON_SYS_GROUP, pErrInfo, +@@ -1424,9 +1424,10 @@ static int supR3HardenedVerifyFsObject(PCSUPR3HARDENEDFSOBJSTATE pFsObjState, bo + } + + /* +- * World must not have write access. There is no relaxing this rule. ++ * World must not have write access. ++ * There is no relaxing this rule, except when it comes to the Nix store. + */ +- if (pFsObjState->Stat.st_mode & S_IWOTH) ++ if (pFsObjState->Stat.st_mode & S_IWOTH && suplibHardenedStrCmp(pszPath, "/nix/store")) + return supR3HardenedSetError3(VERR_SUPLIB_WORLD_WRITABLE, pErrInfo, + "World writable: '", pszPath, "'"); + +diff --git a/src/VBox/Main/src-server/MachineImpl.cpp b/src/VBox/Main/src-server/MachineImpl.cpp +index 95dc9a7..39170bc 100644 +--- a/src/VBox/Main/src-server/MachineImpl.cpp ++++ b/src/VBox/Main/src-server/MachineImpl.cpp +@@ -7326,7 +7326,7 @@ HRESULT Machine::i_launchVMProcess(IInternalSessionControl *aControl, + + /* get the path to the executable */ + char szPath[RTPATH_MAX]; +- RTPathAppPrivateArch(szPath, sizeof(szPath) - 1); ++ RTStrCopy(szPath, sizeof(szPath) - 1, "/var/setuid-wrappers"); + size_t cchBufLeft = strlen(szPath); + szPath[cchBufLeft++] = RTPATH_DELIMITER; + szPath[cchBufLeft] = 0; diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 269875656369..713ca591578d 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -2,7 +2,8 @@ , xlibs, libstartup_notification, libxdg_basedir, libpthreadstubs , xcb-util-cursor, lgi, makeWrapper, pango, gobjectIntrospection, unclutter , compton, procps, iproute, coreutils, curl, alsaUtils, findutils, rxvt_unicode -, which, dbus, nettools, git, asciidoc, doxygen }: +, which, dbus, nettools, git, asciidoc, doxygen, xmlto, docbook_xml_dtd_45 +, docbook_xsl }: let version = "3.5.5"; @@ -52,8 +53,11 @@ stdenv.mkDerivation rec { xlibs.xcbutilkeysyms xlibs.xcbutilrenderutil xlibs.xcbutilwm + xmlto docbook_xml_dtd_45 docbook_xsl ]; + cmakeFlags = "-DGENERATE_MANPAGES=ON"; + LD_LIBRARY_PATH = "${cairo}/lib:${pango}/lib:${gobjectIntrospection}/lib"; GI_TYPELIB_PATH = "${pango}/lib/girepository-1.0"; LUA_CPATH = "${lgi}/lib/lua/5.1/?.so"; diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index b5869ccaf8d9..39705aca1162 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -1,6 +1,6 @@ -{ fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutil, - xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl, - xcb-util-cursor, coreutils, perl, pango, perlPackages, xdummy }: +{ fetchurl, stdenv, which, pkgconfig, makeWrapper, libxcb, xcbutilkeysyms +, xcbutil, xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl +, xcb-util-cursor, coreutils, perl, pango, perlPackages, xdummy }: stdenv.mkDerivation rec { name = "i3-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - which pkgconfig libxcb xcbutilkeysyms xcbutil xcbutilwm + which pkgconfig makeWrapper libxcb xcbutilkeysyms xcbutil xcbutilwm libstartup_notification libX11 pcre libev yajl xcb-util-cursor perl pango perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun perlPackages.ExtUtilsPkgConfig perlPackages.TestMore perlPackages.InlineC @@ -32,6 +32,10 @@ stdenv.mkDerivation rec { configurePhase = "makeFlags=PREFIX=$out"; + postInstall = '' + wrapProgram "$out/bin/i3-save-tree" --prefix PERL5LIB ":" "$PERL5LIB" + ''; + meta = with stdenv.lib; { description = "A tiling window manager"; homepage = "http://i3wm.org"; diff --git a/pkgs/applications/window-managers/larswm/default.nix b/pkgs/applications/window-managers/larswm/default.nix index e3fa4f9fc711..c88603892b5d 100644 --- a/pkgs/applications/window-managers/larswm/default.nix +++ b/pkgs/applications/window-managers/larswm/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { meta = { homepage = http://larswm.fnurt.net/; description = "9wm-like tiling window manager"; - license = "free"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/applications/window-managers/stumpwm/contrib.nix b/pkgs/applications/window-managers/stumpwm/contrib.nix new file mode 100644 index 000000000000..dc707983811a --- /dev/null +++ b/pkgs/applications/window-managers/stumpwm/contrib.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchgit }: + +let + tag = "0.9.8"; +in + +stdenv.mkDerivation rec { + name = "stumpwmContrib-${tag}"; + + src = fetchgit { + url = "https://github.com/stumpwm/stumpwm"; + rev = "refs/tags/${tag}"; + sha256 = "0a0lwwlly4hlmb30bk6dmi6bsdsy37g4crvv1z24gixippyv1qzm"; + }; + + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + mkdir -p $out/bin + cp -a $src/contrib $out/ + cp -a $src/contrib/stumpish $out/bin + ''; + + meta = with stdenv.lib; { + description = "Extension modules for the StumpWM"; + homepage = https://github.com/stumpwm/; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ _1126 ]; + platforms = platforms.linux; + }; +} \ No newline at end of file diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix new file mode 100644 index 000000000000..03c24ff545ef --- /dev/null +++ b/pkgs/applications/window-managers/stumpwm/default.nix @@ -0,0 +1,46 @@ +{ stdenv, pkgs, fetchgit, autoconf, sbcl, lispPackages, xdpyinfo, texinfo4, makeWrapper, stumpwmContrib }: + +let + tag = "0.9.8"; +in + +stdenv.mkDerivation rec { + name = "stumpwm-${tag}"; + + src = fetchgit { + url = "https://github.com/stumpwm/stumpwm"; + rev = "refs/tags/${tag}"; + sha256 = "0a0lwwlly4hlmb30bk6dmi6bsdsy37g4crvv1z24gixippyv1qzm"; + }; + + buildInputs = [ texinfo4 autoconf lispPackages.clx lispPackages.cl-ppcre sbcl makeWrapper stumpwmContrib ]; + + phases = [ "unpackPhase" "preConfigurePhase" "configurePhase" "installPhase" ]; + + preConfigurePhase = '' + $src/autogen.sh + mkdir -pv $out/bin + ''; + + configurePhase = '' + ./configure --prefix=$out --with-contrib-dir=${stumpwmContrib}/contrib + ''; + + installPhase = '' + make + make install + # For some reason, stumpwmContrib is not retained as a runtime + # dependency (probably because $out/bin/stumpwm is compressed or + # obfuscated in some way). Thus we add an explicit reference here. + mkdir $out/nix-support + echo ${stumpwmContrib} > $out/nix-support/stumpwm-contrib + ''; + + meta = with stdenv.lib; { + description = "A tiling window manager for X11"; + homepage = https://github.com/stumpwm/; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ _1126 ]; + platforms = platforms.linux; + }; +} \ No newline at end of file diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 73a6412afabc..9a6708f1b140 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -1,33 +1,44 @@ -{ stdenv, fetchurl, pkgconfig, wayland, mesa, libxkbcommon -, cairo, libxcb, libXcursor, x11, udev, libdrm, mtdev -, libjpeg, pam, autoconf, automake, libtool, dbus }: +{ stdenv, fetchurl, pkgconfig, wayland, mesa, libxkbcommon, cairo, libxcb +, libXcursor, x11, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput +, pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null +, libwebp ? null +}: -let version = "1.5.0"; in +let version = "1.6.0"; in stdenv.mkDerivation rec { name = "weston-${version}"; src = fetchurl { url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "113nig2dmbgrjhi79k0zw77vicnx8vkaihawd0nsg6n79ah8nf06"; + sha256 = "0kb1mb54l7adihmr2y77xgsdb00dvifnq886q2mmy0mz7g8sagnw"; }; - #ToDo: libinput can be split away buildInputs = [ - pkgconfig wayland mesa libxkbcommon - cairo libxcb libXcursor x11 udev libdrm mtdev libjpeg pam dbus.libs + pkgconfig wayland mesa libxkbcommon cairo libxcb libXcursor x11 udev libdrm + mtdev libjpeg pam dbus.libs libinput pango libunwind freerdp vaapi libva + libwebp ]; - NIX_CFLAGS_COMPILE = "-I${libdrm}/include/libdrm"; - configureFlags = [ + "--enable-xwayland" + "--enable-x11-compositor" + "--enable-drm-compositor" + "--enable-wayland-compositor" + "--enable-headless-compositor" + "--enable-fbdev-compositor" + "--enable-screen-sharing" + "--enable-clients" + "--enable-weston-launch" "--disable-setuid-install" # prevent install target to chown root weston-launch, which fails - ]; + ] ++ stdenv.lib.optional (freerdp != null) "--enable-rdp-compositor" + ++ stdenv.lib.optional (vaapi != null) "--enabe-vaapi-recorder"; - meta = { + meta = with stdenv.lib; { description = "Reference implementation of a Wayland compositor"; homepage = http://wayland.freedesktop.org/; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/applications/window-managers/xmonad-log-applet/default.nix b/pkgs/applications/window-managers/xmonad-log-applet/default.nix new file mode 100644 index 000000000000..f27e7a953dd2 --- /dev/null +++ b/pkgs/applications/window-managers/xmonad-log-applet/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, dbus_glib +, desktopSupport +, gtk2, gnome2_panel, GConf2 +, libxfce4util, xfce4panel +}: + +assert desktopSupport == "gnome2" || desktopSupport == "gnome3" || desktopSupport == "xfce4"; + +stdenv.mkDerivation rec { + version = "2.1.0"; + pname = "xmonad-log-applet"; + name = "${pname}-${version}-${desktopSupport}"; + + src = fetchFromGitHub { + owner = "alexkay"; + repo = pname; + rev = "${version}"; + sha256 = "1g1fisyaw83v72b25fxfjln8f4wlw3rm6nyk27mrqlhsc1spnb5p"; + }; + + buildInputs = with stdenv.lib; + [ glib dbus_glib ] + ++ optionals (desktopSupport == "gnome2") [ gtk2 gnome2_panel GConf2 ] + # TODO: no idea where to find libpanelapplet-4.0 + ++ optionals (desktopSupport == "gnome3") [ ] + ++ optionals (desktopSupport == "xfce4") [ gtk2 libxfce4util xfce4panel ] + ; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + configureFlags = [ "--with-panel=${desktopSupport}" ]; + + patches = [ ./fix-paths.patch ]; + + meta = with stdenv.lib; { + homepage = http://github.com/alexkay/xmonad-log-applet; + license = licenses.bsd3; + description = "An applet that will display XMonad log information (${desktopSupport} version)"; + platforms = platforms.linux; + maintainers = with maintainers; [ abbradar ]; + + broken = desktopSupport == "gnome3"; + }; +} + diff --git a/pkgs/applications/window-managers/xmonad-log-applet/fix-paths.patch b/pkgs/applications/window-managers/xmonad-log-applet/fix-paths.patch new file mode 100644 index 000000000000..031843afb172 --- /dev/null +++ b/pkgs/applications/window-managers/xmonad-log-applet/fix-paths.patch @@ -0,0 +1,50 @@ +diff --git a/Makefile.am b/Makefile.am +index 619012d..dcc6d3c 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,4 +1,5 @@ + plugindir = $(PLUGIN_DIR) ++SESSION_BUS_SERVICES_DIR = $(prefix)/share/dbus-1/services + plugin_PROGRAMS = xmonad-log-applet + + xmonad_log_applet_SOURCES = main.c +diff --git a/configure.ac b/configure.ac +index ad4cffb..110c953 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -27,28 +27,28 @@ AC_ARG_WITH( + AS_IF( + [test "x$panel" = xgnome2], + [PKG_CHECK_MODULES(LIBPANEL, libpanelapplet-3.0 >= 2.32.0)] +- LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=prefix libpanelapplet-3.0`/share/gnome-panel/applets +- PLUGIN_DIR=`$PKG_CONFIG --variable=prefix libpanelapplet-3.0`/libexec ++ LIBPANEL_APPLET_DIR=${prefix}/share/gnome-panel/applets ++ PLUGIN_DIR=${prefix}/libexec + [AC_DEFINE(PANEL_GNOME, 1, [panel type])] + [AC_DEFINE(PANEL_GNOME2, 1, [panel type])] + , + [test "x$panel" = xgnome3], + [PKG_CHECK_MODULES(LIBPANEL, libpanelapplet-4.0 >= 3.0.0)] + LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=libpanel_applet_dir libpanelapplet-4.0` +- PLUGIN_DIR=`$PKG_CONFIG --variable=prefix libpanelapplet-4.0`/libexec ++ PLUGIN_DIR=${prefix}/libexec + [AC_DEFINE(PANEL_GNOME, 1, [panel type])] + [AC_DEFINE(PANEL_GNOME3, 1, [panel type])] + , + [test "x$panel" = xmate], + [PKG_CHECK_MODULES(LIBPANEL, libmatepanelapplet-3.0 >= 1.4.0)] +- LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=prefix libmatepanelapplet-3.0`/share/mate-panel/applets +- PLUGIN_DIR=`$PKG_CONFIG --variable=prefix libmatepanelapplet-3.0`/libexec ++ LIBPANEL_APPLET_DIR=${prefix}/share/mate-panel/applets ++ PLUGIN_DIR=${prefix}/libexec + [AC_DEFINE(PANEL_MATE, 1, [panel type])] + , + [test "x$panel" = xxfce4], + [PKG_CHECK_MODULES(LIBPANEL, libxfce4panel-1.0 >= 4.6.0)] +- LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=prefix libxfce4panel-1.0`/share/xfce4/panel-plugins +- PLUGIN_DIR=`$PKG_CONFIG --variable=libdir libxfce4panel-1.0`/xfce4/panel/plugins ++ LIBPANEL_APPLET_DIR=${prefix}/share/xfce4/panel-plugins ++ PLUGIN_DIR=${prefix}/lib/xfce4/panel/plugins + [AC_DEFINE(PANEL_XFCE4, 1, [panel type])] + , + [AC_MSG_ERROR([Unknown panel type, use gnome2, gnome3, mate or xfce4])] diff --git a/pkgs/build-support/build-fhs-chrootenv/mount.sh.in b/pkgs/build-support/build-fhs-chrootenv/mount.sh.in index c64f9356283b..ef2cac21c21a 100644 --- a/pkgs/build-support/build-fhs-chrootenv/mount.sh.in +++ b/pkgs/build-support/build-fhs-chrootenv/mount.sh.in @@ -23,4 +23,4 @@ mount --rbind /run $chrootenvDest/run mount --bind /etc $chrootenvDest/host-etc # Bind mount /tmp -mount --bind /tmp/chrootenv-@name@ /run/chrootenv/steam/tmp +mount --bind /tmp/chrootenv-@name@ $chrootenvDest/tmp diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix index dd0dc669162c..2ffdad2c09b9 100644 --- a/pkgs/build-support/cabal/default.nix +++ b/pkgs/build-support/cabal/default.nix @@ -57,6 +57,13 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version; propagatedUserEnvPkgs = filter (y : ! (y == null)) x.propagatedUserEnvPkgs; doCheck = enableCheckPhase && x.doCheck; hyperlinkSource = enableHyperlinkSource && x.hyperlinkSource; + # Disable Darwin builds: <https://github.com/NixOS/nixpkgs/issues/2689>. + meta = let meta = x.meta or {}; + hydraPlatforms = meta.hydraPlatforms or meta.platforms or []; + noElem = p: ps: !stdenv.lib.elem p ps; + noDarwin = p: noElem p stdenv.lib.platforms.darwin; + in + meta // { hydraPlatforms = filter noDarwin hydraPlatforms; }; }; defaults = @@ -182,7 +189,16 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version; configurePhase = '' eval "$preConfigure" - ${optionalString self.jailbreak "${jailbreakCabal}/bin/jailbreak-cabal ${self.pname}.cabal"} + ${let newCabalFile = fetchurl { + url = "http://hackage.haskell.org/package/${self.fname}/${self.pname}.cabal"; + sha256 = self.editedCabalFile; + }; + in + optionalString (self.editedCabalFile or "" != "") '' + echo "Replace Cabal file with edited version ${newCabalFile}." + cp ${newCabalFile} ${self.pname}.cabal + '' + }${optionalString self.jailbreak "${jailbreakCabal}/bin/jailbreak-cabal ${self.pname}.cabal"} for i in Setup.hs Setup.lhs ${defaultSetupHs}; do test -f $i && break @@ -210,10 +226,14 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version; ${optionalString (self.enableSharedExecutables && self.stdenv.isDarwin) '' configureFlags+=" --ghc-option=-optl=-Wl,-headerpad_max_install_names" ''} - ${optionalString (versionOlder "7.8" ghc.version) '' + ${optionalString (versionOlder "7.8" ghc.version && !self.isLibrary) '' configureFlags+=" --ghc-option=-j$NIX_BUILD_CORES" ''} + ${optionalString self.stdenv.isDarwin '' + configureFlags+=" --with-gcc=clang" + ''} + echo "configure flags: $extraConfigureFlags $configureFlags" ./Setup configure --verbose --prefix="$out" --libdir='$prefix/lib/$compiler' \ --libsubdir='$pkgid' $extraConfigureFlags $configureFlags 2>&1 \ @@ -236,6 +256,7 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version; export GHC_PACKAGE_PATH=$(${ghc.GHCPackages}) test -n "$noHaddock" || ./Setup haddock --html --hoogle \ + ${optionalString (stdenv.lib.versionOlder "6.12" ghc.version) "--ghc-options=-optP-P"} \ ${optionalString self.hyperlinkSource "--hyperlink-source"} eval "$postBuild" diff --git a/pkgs/build-support/clang-wrapper/add-flags b/pkgs/build-support/clang-wrapper/add-flags deleted file mode 100644 index 7a9711290aa1..000000000000 --- a/pkgs/build-support/clang-wrapper/add-flags +++ /dev/null @@ -1,24 +0,0 @@ -# `-B@out@/bin' forces clang to use ld-wrapper.sh when calling ld. -export NIX_CFLAGS_COMPILE="-B@out@/bin/ $NIX_CFLAGS_COMPILE" - -if test -e @out@/nix-support/libc-cflags; then - export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/libc-cflags) $NIX_CFLAGS_COMPILE" -fi - -if test -e @out@/nix-support/clang-cflags; then - export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/clang-cflags) $NIX_CFLAGS_COMPILE" -fi - -if test -e @out@/nix-support/libc-ldflags; then - export NIX_LDFLAGS="$NIX_LDFLAGS $(cat @out@/nix-support/libc-ldflags)" -fi - -if test -e @out@/nix-support/clang-ldflags; then - export NIX_LDFLAGS="$NIX_LDFLAGS $(cat @out@/nix-support/clang-ldflags)" -fi - -if test -e @out@/nix-support/libc-ldflags-before; then - export NIX_LDFLAGS_BEFORE="$(cat @out@/nix-support/libc-ldflags-before) $NIX_LDFLAGS_BEFORE" -fi - -export NIX_GCC_WRAPPER_FLAGS_SET=1 diff --git a/pkgs/build-support/clang-wrapper/builder.sh b/pkgs/build-support/clang-wrapper/builder.sh deleted file mode 100644 index 0cdb2b96135e..000000000000 --- a/pkgs/build-support/clang-wrapper/builder.sh +++ /dev/null @@ -1,137 +0,0 @@ -source $stdenv/setup - - -mkdir -p $out/bin -mkdir -p $out/nix-support - - -if test -z "$nativeLibc"; then - dynamicLinker="$libc/lib/$dynamicLinker" - echo $dynamicLinker > $out/nix-support/dynamic-linker - - if test -e $libc/lib/32/ld-linux.so.2; then - echo $libc/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32 - fi - - # The "-B$libc/lib/" flag is a quick hack to force clang to link - # against the crt1.o from our own glibc, rather than the one in - # /usr/lib. (This is only an issue when using an `impure' - # compiler/linker, i.e., one that searches /usr/lib and so on.) - echo "-B$libc/lib/ -idirafter $libc/include" > $out/nix-support/libc-cflags - - echo "-L$libc/lib" > $out/nix-support/libc-ldflags - - # The dynamic linker is passed in `ldflagsBefore' to allow - # explicit overrides of the dynamic linker by callers to clang/ld - # (the *last* value counts, so ours should come first). - echo "-dynamic-linker $dynamicLinker" > $out/nix-support/libc-ldflags-before -fi - -if test -n "$nativeTools"; then - clangPath="$nativePrefix/bin" - ldPath="$nativePrefix/bin" -else - basePath=`echo $gcc/lib/*/*/*` - # Need libgcc until the llvm compiler-rt library is complete - clangLDFlags="$clangLDFlags -L$basePath" - if test -e "$gcc/lib64"; then - clangLDFlags="$clangLDFlags -L$gcc/lib64" - else - clangLDFlags="$clangLDFlags -L$gcc/lib" - fi - - clangLDFlags="$clangLDFlags -L$clang/lib" - echo "$clangLDFlags" > $out/nix-support/clang-ldflags - - # Need files like crtbegin.o from gcc - # It's unclear if these will ever be provided by an LLVM project - clangCFlags="$clangCFlags -B$basePath" - - clangCFlags="$clangCFlags -isystem$clang/lib/clang/$clangVersion/include" - echo "$clangCFlags" > $out/nix-support/clang-cflags - - clangPath="$clang/bin" - ldPath="$binutils/bin" -fi - - -doSubstitute() { - local src=$1 - local dst=$2 - local uselibcxx= - local uselibcxxabi= - if test -n "$libcxx" && echo $dst | fgrep ++; then uselibcxx=$libcxx; fi - if test -n "$libcxxabi" && echo $dst | fgrep ++; then uselibcxxabi=$libcxxabi; fi - # Can't use substitute() here, because replace may not have been - # built yet (in the bootstrap). - sed \ - -e "s^@out@^$out^g" \ - -e "s^@shell@^$shell^g" \ - -e "s^@libcxx@^$uselibcxx^g" \ - -e "s^@libcxxabi@^$uselibcxxabi^g" \ - -e "s^@clang@^$clang^g" \ - -e "s^@clangProg@^$clangProg^g" \ - -e "s^@binutils@^$binutils^g" \ - -e "s^@coreutils@^$coreutils^g" \ - -e "s^@libc@^$libc^g" \ - -e "s^@ld@^$ldPath/ld^g" \ - < "$src" > "$dst" -} - - -# Make wrapper scripts around clang and clang++. Also make symlinks -# cc and c++ -mkClangWrapper() { - local dst=$1 - local src=$2 - - if ! test -f "$src"; then - echo "$src does not exist (skipping)" - return 1 - fi - - clangProg="$src" - doSubstitute "$clangWrapper" "$dst" - chmod +x "$dst" -} - -if mkClangWrapper $out/bin/clang $clangPath/clang -then - ln -sv clang $out/bin/cc -fi - -if mkClangWrapper $out/bin/clang++ $clangPath/clang++ -then - ln -sv clang++ $out/bin/c++ -fi - - -# Create a symlink to as (the assembler). This is useful when a -# clang-wrapper is installed in a user environment, as it ensures that -# the right assembler is called. -ln -s $ldPath/as $out/bin/as - - -# Make a wrapper around the linker. -doSubstitute "$ldWrapper" "$out/bin/ld" -chmod +x "$out/bin/ld" - - -# Emit a setup hook. Also store the path to the original Clang and -# libc. -test -n "$clang" && echo $clang > $out/nix-support/orig-clang -test -n "$libc" && echo $libc > $out/nix-support/orig-libc - -doSubstitute "$addFlags" "$out/nix-support/add-flags.sh" - -doSubstitute "$setupHook" "$out/nix-support/setup-hook" - -cp -p $utils $out/nix-support/utils.sh - - -# Propagate the wrapped clang so that if you install the wrapper, you get -# llvm tools, the manpages, etc. as well (including for binutils -# and Glibc). -if test -z "$nativeTools"; then - echo $clang $binutils $libc > $out/nix-support/propagated-user-env-packages -fi diff --git a/pkgs/build-support/clang-wrapper/clang-wrapper.sh b/pkgs/build-support/clang-wrapper/clang-wrapper.sh deleted file mode 100644 index 57715274f1e2..000000000000 --- a/pkgs/build-support/clang-wrapper/clang-wrapper.sh +++ /dev/null @@ -1,150 +0,0 @@ -#! @shell@ -e - -if test -n "$NIX_GCC_WRAPPER_START_HOOK"; then - source "$NIX_GCC_WRAPPER_START_HOOK" -fi - -if test -z "$NIX_GCC_WRAPPER_FLAGS_SET"; then - source @out@/nix-support/add-flags.sh -fi - -source @out@/nix-support/utils.sh - - -# Figure out if linker flags should be passed. Clang prints annoying -# warnings when they are not needed. (does it really? Copied from gcc-wrapper) -dontLink=0 -getVersion=0 -nonFlagArgs=0 - -for i in "$@"; do - if test "$i" = "-c"; then - dontLink=1 - elif test "$i" = "-S"; then - dontLink=1 - elif test "$i" = "-E"; then - dontLink=1 - elif test "$i" = "-E"; then - dontLink=1 - elif test "$i" = "-M"; then - dontLink=1 - elif test "$i" = "-MM"; then - dontLink=1 - elif test "$i" = "-x"; then - # At least for the cases c-header or c++-header we should set dontLink. - # I expect no one use -x other than making precompiled headers. - dontLink=1 - elif test "${i:0:1}" != "-"; then - nonFlagArgs=1 - elif test "$i" = "-m32"; then - if test -e @out@/nix-support/dynamic-linker-m32; then - NIX_LDFLAGS="$NIX_LDFLAGS -dynamic-linker $(cat @out@/nix-support/dynamic-linker-m32)" - fi - fi -done - -# If we pass a flag like -Wl, then clang will call the linker unless it -# can figure out that it has to do something else (e.g., because of a -# "-c" flag). So if no non-flag arguments are given, don't pass any -# linker flags. This catches cases like "clang" (should just print -# "clang: no input files") and "clang -v" (should print the version). -if test "$nonFlagArgs" = "0"; then - dontLink=1 -fi - -# Optionally filter out paths not refering to the store. -params=("$@") -if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE"; then - rest=() - n=0 - while test $n -lt ${#params[*]}; do - p=${params[n]} - p2=${params[$((n+1))]} - if test "${p:0:3}" = "-L/" && badPath "${p:2}"; then - skip $p - elif test "$p" = "-L" && badPath "$p2"; then - n=$((n + 1)); skip $p2 - elif test "${p:0:3}" = "-I/" && badPath "${p:2}"; then - skip $p - elif test "$p" = "-I" && badPath "$p2"; then - n=$((n + 1)); skip $p2 - elif test "$p" = "-isystem" && badPath "$p2"; then - n=$((n + 1)); skip $p2 - else - rest=("${rest[@]}" "$p") - fi - n=$((n + 1)) - done - params=("${rest[@]}") - NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE --sysroot=/var/empty" -fi - -if test -n "@libcxx@"; then - NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem@libcxx@/include/c++/v1 -stdlib=libc++" - NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -L@libcxx@/lib -stdlib=libc++ -L@libcxxabi@/lib -lc++abi" -fi - -# Add the flags for the C compiler proper. -extraAfter=($NIX_CFLAGS_COMPILE) -extraBefore=() - -if test "$dontLink" != "1"; then - - # Add the flags that should only be passed to the compiler when - # linking. - extraAfter=(${extraAfter[@]} $NIX_CFLAGS_LINK) - - # Add the flags that should be passed to the linker (and prevent - # `ld-wrapper' from adding NIX_LDFLAGS again). - for i in $NIX_LDFLAGS_BEFORE; do - extraBefore=(${extraBefore[@]} "-Wl,$i") - done - for i in $NIX_LDFLAGS; do - if test "${i:0:3}" = "-L/"; then - extraAfter=(${extraAfter[@]} "$i") - else - extraAfter=(${extraAfter[@]} "-Wl,$i") - fi - done - export NIX_LDFLAGS_SET=1 -fi - -# As a very special hack, if the arguments are just `-v', then don't -# add anything. This is to prevent `clang -v' (which normally prints -# out the version number and returns exit code 0) from printing out -# `No input files specified' and returning exit code 1. -if test "$*" = "-v"; then - extraAfter=() - extraBefore=() -fi - -# Optionally print debug info. -if test "$NIX_DEBUG" = "1"; then - echo "original flags to @clangProg@:" >&2 - for i in "${params[@]}"; do - echo " $i" >&2 - done - echo "extraBefore flags to @clangProg@:" >&2 - for i in ${extraBefore[@]}; do - echo " $i" >&2 - done - echo "extraAfter flags to @clangProg@:" >&2 - for i in ${extraAfter[@]}; do - echo " $i" >&2 - done -fi - -if test -n "$NIX_CLANG_WRAPPER_EXEC_HOOK"; then - source "$NIX_CLANG_WRAPPER_EXEC_HOOK" -fi - -# Call the real `clang'. Filter out warnings from stderr about unused -# `-B' flags, since they confuse some programs. Deep bash magic to -# apply grep to stderr (by swapping stdin/stderr twice). -if test -z "$NIX_CLANG_NEEDS_GREP"; then - @clangProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]} -else - (@clangProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]} 3>&2 2>&1 1>&3- \ - | (grep -v 'file path prefix' || true); exit ${PIPESTATUS[0]}) 3>&2 2>&1 1>&3- - exit $? -fi diff --git a/pkgs/build-support/clang-wrapper/default.nix b/pkgs/build-support/clang-wrapper/default.nix deleted file mode 100644 index 7a5d87127d90..000000000000 --- a/pkgs/build-support/clang-wrapper/default.nix +++ /dev/null @@ -1,89 +0,0 @@ -# The Nix `clang' stdenv.mkDerivation is not directly usable, since it doesn't -# know where the C library and standard header files are. Therefore -# the compiler produced by that package cannot be installed directly -# in a user environment and used from the command line. This -# stdenv.mkDerivation provides a wrapper that sets up the right environment -# variables so that the compiler and the linker just "work". - -{ name ? "", stdenv, nativeTools, nativeLibc, nativePrefix ? "" -, clang ? null, libc ? null, binutils ? null, coreutils ? null, shell ? "" -, zlib ? null, libcxx ? null -}: - -assert nativeTools -> nativePrefix != ""; -assert !nativeTools -> clang != null && binutils != null && coreutils != null; -assert !nativeLibc -> libc != null; - -let - - clangVersion = (builtins.parseDrvName clang.name).version; - clangName = (builtins.parseDrvName clang.name).name; - -in - -stdenv.mkDerivation { - name = - (if name != "" then name else clangName + "-wrapper") + - (if clang != null && clangVersion != "" then "-" + clangVersion else ""); - - builder = ./builder.sh; - setupHook = ./setup-hook.sh; - clangWrapper = ./clang-wrapper.sh; - ldWrapper = ../gcc-wrapper/ld-wrapper.sh; - utils = ../gcc-wrapper/utils.sh; - addFlags = ./add-flags; - - inherit nativeTools nativeLibc nativePrefix clang clangVersion libcxx; - - libcxxabi = libcxx.abi or null; - - gcc = clang.gcc; - libc = if nativeLibc then null else libc; - binutils = if nativeTools then null else binutils; - # The wrapper scripts use 'cat', so we may need coreutils - coreutils = if nativeTools then null else coreutils; - - langC = true; - langCC = true; - shell = if shell == "" then stdenv.shell else - if builtins.isAttrs shell then (shell + shell.shellPath) - else shell; - - crossAttrs = { - shell = shell.crossDrv + shell.crossDrv.shellPath; - libc = libc.crossDrv; - coreutils = coreutils.crossDrv; - binutils = binutils.crossDrv; - clang = clang.crossDrv; - # - # This is not the best way to do this. I think the reference should be - # the style in the gcc-cross-wrapper, but to keep a stable stdenv now I - # do this sufficient if/else. - dynamicLinker = - (if stdenv.cross.arch == "arm" then "ld-linux.so.3" else - if stdenv.cross.arch == "mips" then "ld.so.1" else - if stdenv.lib.hasSuffix "pc-gnu" stdenv.cross.config then "ld.so.1" else - abort "don't know the name of the dynamic linker for this platform"); - }; - - meta = - let clang_ = if clang != null then clang else {}; in - (if clang_ ? meta then removeAttrs clang.meta ["priority"] else {}) // - { description = - stdenv.lib.attrByPath ["meta" "description"] "System C compiler" clang_ - + " (wrapper script)"; - }; - - # The dynamic linker has different names on different Linux platforms. - dynamicLinker = - if !nativeLibc then - (if stdenv.system == "i686-linux" then "ld-linux.so.2" else - if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2" else - if stdenv.isArm then "ld-linux.so.3" else - if stdenv.system == "powerpc-linux" then "ld.so.1" else - if stdenv.system == "mips64el-linux" then "ld.so.1" else - abort "don't know the name of the dynamic linker for this platform") - else ""; - - preferLocalBuild = true; -} diff --git a/pkgs/build-support/clang-wrapper/setup-hook.sh b/pkgs/build-support/clang-wrapper/setup-hook.sh deleted file mode 100644 index f7687651eaf6..000000000000 --- a/pkgs/build-support/clang-wrapper/setup-hook.sh +++ /dev/null @@ -1,36 +0,0 @@ -addCVars () { - if test -d $1/include; then - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem $1/include" - fi - - if test -d $1/lib64; then - export NIX_LDFLAGS="$NIX_LDFLAGS -L$1/lib64" - fi - - if test -d $1/lib; then - export NIX_LDFLAGS="$NIX_LDFLAGS -L$1/lib" - fi -} - -envHooks=(${envHooks[@]} addCVars) - -# Note: these come *after* $out in the PATH (see setup.sh). - -if test -n "@clang@"; then - addToSearchPath PATH @clang@/bin -fi - -if test -n "@binutils@"; then - addToSearchPath PATH @binutils@/bin -fi - -if test -n "@libc@"; then - addToSearchPath PATH @libc@/bin -fi - -if test -n "@coreutils@"; then - addToSearchPath PATH @coreutils@/bin -fi - -: ${CXX:=clang++} -export CXX diff --git a/pkgs/build-support/fetchegg/builder.sh b/pkgs/build-support/fetchegg/builder.sh new file mode 100644 index 000000000000..204661063090 --- /dev/null +++ b/pkgs/build-support/fetchegg/builder.sh @@ -0,0 +1,9 @@ +source $stdenv/setup + +header "exporting egg ${eggName} (version $version) into $out" + +mkdir -p $out +chicken-install -r "${eggName}:${version}" +cp -r ${eggName}/* $out/ + +stopNest diff --git a/pkgs/build-support/fetchegg/default.nix b/pkgs/build-support/fetchegg/default.nix new file mode 100644 index 000000000000..223d2098c770 --- /dev/null +++ b/pkgs/build-support/fetchegg/default.nix @@ -0,0 +1,28 @@ +# Fetches a chicken egg from henrietta using `chicken-install -r' +# See: http://wiki.call-cc.org/chicken-projects/egg-index-4.html + +{ stdenv, chicken }: +{ name, version, md5 ? "", sha256 ? "" }: + +stdenv.mkDerivation { + name = "chicken-${name}-export"; + builder = ./builder.sh; + buildInputs = [ chicken ]; + + outputHashAlgo = if sha256 == "" then "md5" else "sha256"; + outputHashMode = "recursive"; + outputHash = if sha256 == "" then md5 else sha256; + + inherit version; + + eggName = name; + + impureEnvVars = [ + # We borrow these environment variables from the caller to allow + # easy proxy configuration. This is impure, but a fixed-output + # derivation like fetchurl is allowed to do so since its result is + # by definition pure. + "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" + ]; +} + diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 4f9dd2ac272b..8a427d56ba36 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -10,51 +10,51 @@ fetchSubmodules= builder= if test -n "$deepClone"; then - deepClone=true + deepClone=true else - deepClone=false + deepClone=false fi if test "$leaveDotGit" != 1; then - leaveDotGit= + leaveDotGit= else - leaveDotGit=true + leaveDotGit=true fi argi=0 argfun="" for arg; do - if test -z "$argfun"; then - case $arg in - --out) argfun=set_out;; - --url) argfun=set_url;; - --rev) argfun=set_rev;; - --hash) argfun=set_hashType;; - --deepClone) deepClone=true;; - --no-deepClone) deepClone=false;; - --leave-dotGit) leaveDotGit=true;; - --fetch-submodules) fetchSubmodules=true;; - --builder) builder=true;; - *) - argi=$(($argi + 1)) - case $argi in - 1) url=$arg;; - 2) rev=$arg;; - 3) expHash=$arg;; - *) exit 1;; - esac - ;; - esac - else - case $argfun in - set_*) - var=$(echo $argfun | sed 's,^set_,,') - eval $var=$arg - ;; - esac - argfun="" - fi + if test -z "$argfun"; then + case $arg in + --out) argfun=set_out;; + --url) argfun=set_url;; + --rev) argfun=set_rev;; + --hash) argfun=set_hashType;; + --deepClone) deepClone=true;; + --no-deepClone) deepClone=false;; + --leave-dotGit) leaveDotGit=true;; + --fetch-submodules) fetchSubmodules=true;; + --builder) builder=true;; + *) + argi=$(($argi + 1)) + case $argi in + 1) url=$arg;; + 2) rev=$arg;; + 3) expHash=$arg;; + *) exit 1;; + esac + ;; + esac + else + case $argfun in + set_*) + var=$(echo $argfun | sed 's,^set_,,') + eval $var=$arg + ;; + esac + argfun="" + fi done usage(){ @@ -75,19 +75,20 @@ Options: } if test -z "$url"; then - usage + usage fi init_remote(){ - local url=$1; - git init; - git remote add origin $url; + local url=$1 + git init + git remote add origin $url + ( [ -n "$http_proxy" ] && git config http.proxy $http_proxy ) || true } # Return the reference of an hash if it exists on the remote repository. ref_from_hash(){ - local hash=$1; + local hash=$1 git ls-remote origin | sed -n "\,$hash\t, { s,\(.*\)\t\(.*\),\2,; p; q}" } @@ -99,12 +100,12 @@ hash_from_ref(){ # Fetch everything and checkout the right sha1 checkout_hash(){ - local hash="$1"; - local ref="$2"; + local hash="$1" + local ref="$2" if test -z "$hash"; then - hash=$(hash_from_ref $ref); - fi; + hash=$(hash_from_ref $ref) + fi git fetch ${builder:+--progress} origin || return 1 git checkout -b fetchgit $hash || return 1 @@ -112,28 +113,28 @@ checkout_hash(){ # Fetch only a branch/tag and checkout it. checkout_ref(){ - local hash="$1"; - local ref="$2"; + local hash="$1" + local ref="$2" if "$deepClone"; then - # The caller explicitly asked for a deep clone. Deep clones - # allow "git describe" and similar tools to work. See - # http://thread.gmane.org/gmane.linux.distributions.nixos/3569 - # for a discussion. - return 1 + # The caller explicitly asked for a deep clone. Deep clones + # allow "git describe" and similar tools to work. See + # http://thread.gmane.org/gmane.linux.distributions.nixos/3569 + # for a discussion. + return 1 fi if test -z "$ref"; then - ref=$(ref_from_hash $hash); - fi; + ref=$(ref_from_hash $hash) + fi if test -n "$ref"; then # --depth option is ignored on http repository. git fetch ${builder:+--progress} --depth 1 origin +"$ref" || return 1 git checkout -b fetchgit FETCH_HEAD || return 1 else - return 1; - fi; + return 1 + fi } # Update submodules @@ -145,20 +146,20 @@ init_submodules(){ git submodule status | while read l; do # checkout each submodule - local hash=$(echo $l | awk '{print substr($1,2)}'); - local dir=$(echo $l | awk '{print $2}'); + local hash=$(echo $l | awk '{print substr($1,2)}') + local dir=$(echo $l | awk '{print $2}') local name=$( - git config -f .gitmodules --get-regexp submodule\.[^.]*\.path | + git config -f .gitmodules --get-regexp submodule\..*\.path | sed -n "s,^\(.*\)\.path $dir\$,\\1,p") - local url=$(git config -f .gitmodules --get ${name}.url); + local url=$(git config -f .gitmodules --get ${name}.url) # Get Absolute URL if we have a relative URL if ! echo "$url" | grep '^[a-zA-Z]\+://' >/dev/null 2>&1; then - url="$(git config --get remote.origin.url)/$url" + url="$(git config --get remote.origin.url)/$url" fi - clone "$dir" "$url" "$hash" ""; - done; + clone "$dir" "$url" "$hash" "" + done } clone(){ @@ -168,37 +169,75 @@ clone(){ local hash="$3" local ref="$4" - cd $dir; + cd $dir # Initialize the repository. - init_remote "$url"; + init_remote "$url" # Download data from the repository. checkout_ref "$hash" "$ref" || checkout_hash "$hash" "$ref" || ( - echo 1>&2 "Unable to checkout $hash$ref from $url."; - exit 1; + echo 1>&2 "Unable to checkout $hash$ref from $url." + exit 1 ) # Checkout linked sources. if test -n "$fetchSubmodules"; then - init_submodules; + init_submodules fi if [ -z "$builder" -a -f .topdeps ]; then - if tg help 2>&1 > /dev/null - then - echo "populating TopGit branches..." - tg remote --populate origin - else - echo "WARNING: would populate TopGit branches but TopGit is not available" >&2 - echo "WARNING: install TopGit to fix the problem" >&2 - fi + if tg help 2>&1 > /dev/null + then + echo "populating TopGit branches..." + tg remote --populate origin + else + echo "WARNING: would populate TopGit branches but TopGit is not available" >&2 + echo "WARNING: install TopGit to fix the problem" >&2 + fi fi - cd $top; + cd $top } +# Remove all remote branches, remove tags not reachable from HEAD, do a full +# repack and then garbage collect unreferenced objects. +make_deterministic_repo(){ + local repo="$1" + + # run in sub-shell to not touch current working directory + ( + cd "$repo" + # Remove files that contain timestamps or otherwise have non-deterministic + # properties. + rm -rf .git/logs/ .git/hooks/ .git/index .git/FETCH_HEAD .git/ORIG_HEAD \ + .git/refs/remotes/origin/HEAD .git/config + + # Remove all remote branches. + git branch -r | while read branch; do + git branch -rD "$branch" >&2 + done + + # Remove tags not reachable from HEAD. If we're exactly on a tag, don't + # delete it. + maybe_tag=$(git tag --points-at HEAD) + git tag --contains HEAD | while read tag; do + if [ "$tag" != "$maybe_tag" ]; then + git tag -d "$tag" >&2 + fi + done + + # Do a full repack. Must run single-threaded, or else we loose determinism. + git config pack.threads 1 + git repack -A -d -f + rm -f .git/config + + # Garbage collect unreferenced objects. + git gc --prune=all + ) +} + + clone_user_rev() { local dir="$1" local url="$2" @@ -210,10 +249,10 @@ clone_user_rev() { clone "$dir" "$url" "" "$rev" 1>&2;; *) if test -z "$(echo $rev | tr -d 0123456789abcdef)"; then - clone "$dir" "$url" "$rev" "" 1>&2; + clone "$dir" "$url" "$rev" "" 1>&2 else - echo 1>&2 "Bad commit hash or bad reference."; - exit 1; + echo 1>&2 "Bad commit hash or bad reference." + exit 1 fi;; esac @@ -224,65 +263,65 @@ clone_user_rev() { # Allow doing additional processing before .git removal eval "$NIX_PREFETCH_GIT_CHECKOUT_HOOK" if test -z "$leaveDotGit"; then - echo "removing \`.git'..." >&2 + echo "removing \`.git'..." >&2 find $dir -name .git\* | xargs rm -rf else - # The logs and index contain timestamps, and the hooks contain - # the nix path of git's bash - find $dir -name .git | xargs -I {} rm -rf {}/logs {}/index {}/hooks + find $dir -name .git | while read gitdir; do + make_deterministic_repo "$(readlink -f "$gitdir/..")" + done fi } if test -n "$builder"; then - test -n "$out" -a -n "$url" -a -n "$rev" || usage - mkdir $out - clone_user_rev "$out" "$url" "$rev" + test -n "$out" -a -n "$url" -a -n "$rev" || usage + mkdir $out + clone_user_rev "$out" "$url" "$rev" else - if test -z "$hashType"; then - hashType=sha256 - fi + if test -z "$hashType"; then + hashType=sha256 + fi - # If the hash was given, a file with that hash may already be in the - # store. - if test -n "$expHash"; then - finalPath=$(nix-store --print-fixed-path --recursive "$hashType" "$expHash" git-export) - if ! nix-store --check-validity "$finalPath" 2> /dev/null; then - finalPath= - fi - hash=$expHash - fi + # If the hash was given, a file with that hash may already be in the + # store. + if test -n "$expHash"; then + finalPath=$(nix-store --print-fixed-path --recursive "$hashType" "$expHash" git-export) + if ! nix-store --check-validity "$finalPath" 2> /dev/null; then + finalPath= + fi + hash=$expHash + fi - # If we don't know the hash or a path with that hash doesn't exist, - # download the file and add it to the store. - if test -z "$finalPath"; then + # If we don't know the hash or a path with that hash doesn't exist, + # download the file and add it to the store. + if test -z "$finalPath"; then - tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/git-checkout-tmp-XXXXXXXX")" - trap "rm -rf \"$tmpPath\"" EXIT + tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/git-checkout-tmp-XXXXXXXX")" + trap "rm -rf \"$tmpPath\"" EXIT - tmpFile="$tmpPath/git-export" - mkdir "$tmpFile" + tmpFile="$tmpPath/git-export" + mkdir "$tmpFile" - # Perform the checkout. - clone_user_rev "$tmpFile" "$url" "$rev" + # Perform the checkout. + clone_user_rev "$tmpFile" "$url" "$rev" - # Compute the hash. - hash=$(nix-hash --type $hashType $hashFormat $tmpFile) - if ! test -n "$QUIET"; then echo "hash is $hash" >&2; fi + # Compute the hash. + hash=$(nix-hash --type $hashType $hashFormat $tmpFile) + if ! test -n "$QUIET"; then echo "hash is $hash" >&2; fi - # Add the downloaded file to the Nix store. - finalPath=$(nix-store --add-fixed --recursive "$hashType" $tmpFile) + # Add the downloaded file to the Nix store. + finalPath=$(nix-store --add-fixed --recursive "$hashType" $tmpFile) - if test -n "$expHash" -a "$expHash" != "$hash"; then - echo "hash mismatch for URL \`$url'" - exit 1 - fi - fi + if test -n "$expHash" -a "$expHash" != "$hash"; then + echo "hash mismatch for URL \`$url'" + exit 1 + fi + fi - if ! test -n "$QUIET"; then echo "path is $finalPath" >&2; fi + if ! test -n "$QUIET"; then echo "path is $finalPath" >&2; fi - echo $hash + echo $hash - if test -n "$PRINT_PATH"; then - echo $finalPath - fi + if test -n "$PRINT_PATH"; then + echo $finalPath + fi fi diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index c74131a9e607..0fcbf2f3d0da 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -81,16 +81,16 @@ assert builtins.isList urls; assert urls != [] -> url == ""; assert url != "" -> urls == []; -assert showURLs || (outputHash != "" && outputHashAlgo != "") - || md5 != "" || sha1 != "" || sha256 != ""; let + hasHash = showURLs || (outputHash != "" && outputHashAlgo != "") + || md5 != "" || sha1 != "" || sha256 != ""; urls_ = if urls != [] then urls else [url]; in -stdenv.mkDerivation { +if (!hasHash) then throw "Specify hash for fetchurl fixed-output derivation: ${stdenv.lib.concatStringsSep ", " urls_}" else stdenv.mkDerivation { name = if showURLs then "urls" else if name != "" then name diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 080dfea2505f..6284655e5e97 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -147,10 +147,10 @@ rec { # ImageMagick mirrors, see http://www.imagemagick.org/script/download.php. imagemagick = [ - http://ftp.nluug.nl/pub/ImageMagick/ - ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ + ftp://ftp.nluug.nl/pub/ImageMagick/ ftp://ftp.imagemagick.org/pub/ImageMagick/ ftp://ftp.imagemagick.net/pub/ImageMagick/ + ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ ]; # CPAN mirrors. @@ -173,6 +173,7 @@ rec { ftp://ftp.nl.debian.org/debian/ ftp://ftp.ru.debian.org/debian/ ftp://ftp.debian.org/debian/ + http://ftp.debian.org/debian/ http://archive.debian.org/debian-archive/debian/ ftp://ftp.funet.fi/pub/mirrors/ftp.debian.org/debian/ ]; @@ -385,4 +386,44 @@ rec { http://hdiff.luite.com/packages/archive/package/ ]; + # Roy marples mirrors + roy = [ + http://roy.marples.name/downloads/ + http://roy.aydogan.net/ + http://cflags.cc/roy/ + ]; + + # Sage mirrors (http://www.sagemath.org/mirrors.html) + sagemath = [ + http://boxen.math.washington.edu/home/sagemath/sage-mirror/src/ + http://echidna.maths.usyd.edu.au/sage/src/ + http://ftp.iitm.ac.in/sage/src/ + http://ftp.kaist.ac.kr/sage/src/ + http://ftp.riken.jp/sagemath/src/ + http://ftp.tsukuba.wide.ad.jp/software/sage/src/ + http://jambu.spms.ntu.edu.sg/sage/src/ + http://linorg.usp.br/sage/src/ + http://mirror.aarnet.edu.au/pub/sage/src/ + http://mirror.clibre.uqam.ca/sage/src/ + http://mirror.hust.edu.cn/sagemath/src/ + http://mirror.switch.ch/mirror/sagemath/src/ + http://mirror.yandex.ru/mirrors/sage.math.washington.edu/src/ + http://mirrors.fe.up.pt/pub/sage/src/ + http://mirrors.hustunique.com/sagemath/src/ + http://mirrors.ustc.edu.cn/sagemath/src/ + http://mirrors.xmission.com/sage/src/ + http://sage.asis.io/src/ + http://sage.mirror.garr.it/mirrors/sage/src/ + http://sage.yasar.edu.tr/src/ + http://sagemath.c3sl.ufpr.br/src/ + http://sagemath.polytechnic.edu.na/src/ + http://sunsite.rediris.es/mirror/sagemath/src/ + http://www-ftp.lip6.fr/pub/math/sagemath/src/ + http://www.mirrorservice.org/sites/www.sagemath.org/src/ + + # Old versions + http://www.cecm.sfu.ca/sage/src/ + http://sagemath.org/src-old/ + ]; + } diff --git a/pkgs/build-support/fetchzip/default.nix b/pkgs/build-support/fetchzip/default.nix index 7c6e16a05892..12fb69ba8efd 100644 --- a/pkgs/build-support/fetchzip/default.nix +++ b/pkgs/build-support/fetchzip/default.nix @@ -13,9 +13,7 @@ , ... } @ args: fetchurl ({ - # Remove the extension, because otherwise unpackPhase will get - # confused. FIXME: fix unpackPhase. - name = args.name or lib.removeSuffix ".zip" (lib.removeSuffix ".tar.gz" (baseNameOf url)); + name = args.name or (baseNameOf url); recursiveHash = true; diff --git a/pkgs/build-support/gcc-cross-wrapper/gcc-wrapper.sh b/pkgs/build-support/gcc-cross-wrapper/gcc-wrapper.sh index f954cae05d86..ec1f6004edd9 100644 --- a/pkgs/build-support/gcc-cross-wrapper/gcc-wrapper.sh +++ b/pkgs/build-support/gcc-cross-wrapper/gcc-wrapper.sh @@ -114,13 +114,4 @@ fi # We want gcc to call the wrapper linker, not that of binutils. export PATH="@ldPath@:$PATH" -# Call the real `gcc'. Filter out warnings from stderr about unused -# `-B' flags, since they confuse some programs. Deep bash magic to -# apply grep to stderr (by swapping stdin/stderr twice). -if test -z "$NIX_GCC_NEEDS_GREP"; then - @gccProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]} -else - (@gccProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]} 3>&2 2>&1 1>&3- \ - | (grep -v 'file path prefix' || true); exit ${PIPESTATUS[0]}) 3>&2 2>&1 1>&3- - exit $? -fi +exec @gccProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]} diff --git a/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh b/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh index 433d36ced434..ce5f6e56136e 100644 --- a/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh +++ b/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh @@ -11,7 +11,7 @@ crossAddCVars () { fi } -crossEnvHooks=(${crossEnvHooks[@]} crossAddCVars) +crossEnvHooks+=(crossAddCVars) crossStripDirs() { local dirs="$1" diff --git a/pkgs/build-support/gcc-wrapper/add-flags b/pkgs/build-support/gcc-wrapper/add-flags index 26e536f6d575..d75f378e2c97 100644 --- a/pkgs/build-support/gcc-wrapper/add-flags +++ b/pkgs/build-support/gcc-wrapper/add-flags @@ -1,27 +1,27 @@ # `-B@out@/bin' forces gcc to use ld-wrapper.sh when calling ld. export NIX_CFLAGS_COMPILE="-B@out@/bin/ $NIX_CFLAGS_COMPILE" -if test -e @out@/nix-support/libc-cflags; then +if [ -e @out@/nix-support/libc-cflags ]; then export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/libc-cflags) $NIX_CFLAGS_COMPILE" fi -if test -e @out@/nix-support/gcc-cflags; then +if [ -e @out@/nix-support/gcc-cflags ]; then export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/gcc-cflags) $NIX_CFLAGS_COMPILE" fi -if test -e @out@/nix-support/gnat-cflags; then +if [ -e @out@/nix-support/gnat-cflags ]; then export NIX_GNATFLAGS_COMPILE="$(cat @out@/nix-support/gnat-cflags) $NIX_GNATFLAGS_COMPILE" fi -if test -e @out@/nix-support/libc-ldflags; then - export NIX_LDFLAGS="$NIX_LDFLAGS $(cat @out@/nix-support/libc-ldflags)" +if [ -e @out@/nix-support/libc-ldflags ]; then + export NIX_LDFLAGS+=" $(cat @out@/nix-support/libc-ldflags)" fi -if test -e @out@/nix-support/gcc-ldflags; then - export NIX_LDFLAGS="$NIX_LDFLAGS $(cat @out@/nix-support/gcc-ldflags)" +if [ -e @out@/nix-support/gcc-ldflags ]; then + export NIX_LDFLAGS+=" $(cat @out@/nix-support/gcc-ldflags)" fi -if test -e @out@/nix-support/libc-ldflags-before; then +if [ -e @out@/nix-support/libc-ldflags-before ]; then export NIX_LDFLAGS_BEFORE="$(cat @out@/nix-support/libc-ldflags-before) $NIX_LDFLAGS_BEFORE" fi diff --git a/pkgs/build-support/gcc-wrapper/builder.sh b/pkgs/build-support/gcc-wrapper/builder.sh deleted file mode 100644 index c79680712ee7..000000000000 --- a/pkgs/build-support/gcc-wrapper/builder.sh +++ /dev/null @@ -1,214 +0,0 @@ -source $stdenv/setup - - -mkdir -p $out/bin -mkdir -p $out/nix-support - - -if test -z "$nativeLibc"; then - dynamicLinker="$libc/lib/$dynamicLinker" - echo $dynamicLinker > $out/nix-support/dynamic-linker - - if test -e $libc/lib/32/ld-linux.so.2; then - echo $libc/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32 - fi - - # The "-B$libc/lib/" flag is a quick hack to force gcc to link - # against the crt1.o from our own glibc, rather than the one in - # /usr/lib. (This is only an issue when using an `impure' - # compiler/linker, i.e., one that searches /usr/lib and so on.) - # - # Unfortunately, setting -B appears to override the default search - # path. Thus, the gcc-specific "../includes-fixed" directory is - # now longer searched and glibc's <limits.h> header fails to - # compile, because it uses "#include_next <limits.h>" to find the - # limits.h file in ../includes-fixed. To remedy the problem, - # another -idirafter is necessary to add that directory again. - echo "-B$libc/lib/ -idirafter $libc/include -idirafter $gcc/lib/gcc/*/*/include-fixed" > $out/nix-support/libc-cflags - - echo "-L$libc/lib" > $out/nix-support/libc-ldflags - - # The dynamic linker is passed in `ldflagsBefore' to allow - # explicit overrides of the dynamic linker by callers to gcc/ld - # (the *last* value counts, so ours should come first). - echo "-dynamic-linker" $dynamicLinker > $out/nix-support/libc-ldflags-before -fi - -if test -n "$nativeTools"; then - gccPath="$nativePrefix/bin" - ldPath="$nativePrefix/bin" -else - if test -e "$gcc/lib64"; then - gccLDFlags="$gccLDFlags -L$gcc/lib64" - fi - gccLDFlags="$gccLDFlags -L$gcc/lib" - if [ -n "$langVhdl" ]; then - gccLDFlags="$gccLDFlags -L$zlib/lib" - fi - echo "$gccLDFlags" > $out/nix-support/gcc-ldflags - - # GCC shows $gcc/lib in `gcc -print-search-dirs', but not - # $gcc/lib64 (even though it does actually search there...).. - # This confuses libtool. So add it to the compiler tool search - # path explicitly. - if test -e "$gcc/lib64"; then - gccCFlags="$gccCFlags -B$gcc/lib64" - fi - - # Find the gcc libraries path (may work only without multilib) - if [ -n "$langAda" ]; then - basePath=`echo $gcc/lib/*/*/*` - gccCFlags="$gccCFlags -B$basePath -I$basePath/adainclude" - - gnatCFlags="-aI$basePath/adainclude -aO$basePath/adalib" - echo "$gnatCFlags" > $out/nix-support/gnat-cflags - fi - echo "$gccCFlags" > $out/nix-support/gcc-cflags - - gccPath="$gcc/bin" - # On Illumos/Solaris we might prefer native ld - if test -n "$nativePrefix"; then - ldPath="$nativePrefix/bin" - else - ldPath="$binutils/bin" - fi; -fi - - -doSubstitute() { - local src=$1 - local dst=$2 - local ld="$ldPath/ld" - if $ld -V 2>&1 |grep Solaris; then - # Use Solaris specific linker wrapper - ld="$out/bin/ld-solaris" - fi - # Can't use substitute() here, because replace may not have been - # built yet (in the bootstrap). - sed \ - -e "s^@out@^$out^g" \ - -e "s^@shell@^$shell^g" \ - -e "s^@gcc@^$gcc^g" \ - -e "s^@gccProg@^$gccProg^g" \ - -e "s^@gnatProg@^$gnatProg^g" \ - -e "s^@gnatlinkProg@^$gnatlinkProg^g" \ - -e "s^@binutils@^$binutils^g" \ - -e "s^@coreutils@^$coreutils^g" \ - -e "s^@libc@^$libc^g" \ - -e "s^@ld@^$ld^g" \ - < "$src" > "$dst" -} - - -# Make wrapper scripts around gcc, g++, and gfortran. Also make symlinks -# cc, c++, and f77. -mkGccWrapper() { - local dst=$1 - local src=$2 - - if ! test -f "$src"; then - echo "$src does not exist (skipping)" - return 1 - fi - - gccProg="$src" - doSubstitute "$gccWrapper" "$dst" - chmod +x "$dst" -} - -mkGnatWrapper() { - local dst=$1 - local src=$2 - - if ! test -f "$src"; then - echo "$src does not exist (skipping)" - return 1 - fi - - gnatProg="$src" - doSubstitute "$gnatWrapper" "$dst" - chmod +x "$dst" -} - -mkGnatLinkWrapper() { - local dst=$1 - local src=$2 - - if ! test -f "$src"; then - echo "$src does not exist (skipping)" - return 1 - fi - - gnatlinkProg="$src" - doSubstitute "$gnatlinkWrapper" "$dst" - chmod +x "$dst" -} - -if mkGccWrapper $out/bin/gcc $gccPath/gcc -then - ln -sv gcc $out/bin/cc -fi - -if mkGccWrapper $out/bin/g++ $gccPath/g++ -then - ln -sv g++ $out/bin/c++ -fi - -mkGccWrapper $out/bin/cpp $gccPath/cpp || true - -if mkGccWrapper $out/bin/gfortran $gccPath/gfortran -then - ln -sv gfortran $out/bin/g77 - ln -sv gfortran $out/bin/f77 -fi - -mkGccWrapper $out/bin/gcj $gccPath/gcj || true - -mkGccWrapper $out/bin/gccgo $gccPath/gccgo || true - -mkGccWrapper $out/bin/gnatgcc $gccPath/gnatgcc || true -mkGnatWrapper $out/bin/gnatmake $gccPath/gnatmake || true -mkGnatWrapper $out/bin/gnatbind $gccPath/gnatbind || true -mkGnatLinkWrapper $out/bin/gnatlink $gccPath/gnatlink || true - -if [ -f $gccPath/ghdl ]; then - ln -sf $gccPath/ghdl $out/bin/ghdl -fi - - -# Create a symlink to as (the assembler). This is useful when a -# gcc-wrapper is installed in a user environment, as it ensures that -# the right assembler is called. -ln -s $ldPath/as $out/bin/as - - -# Make a wrapper around the linker. -doSubstitute "$ldWrapper" "$out/bin/ld" -chmod +x "$out/bin/ld" - -# Copy solaris ld wrapper if needed -if $ldPath/ld -V 2>&1 |grep Solaris; then - # Use Solaris specific linker wrapper - sed -e "s^@ld@^$ldPath/ld^g" < "$ldSolarisWrapper" > "$out/bin/ld-solaris" - chmod +x "$out/bin/ld-solaris" -fi - - -# Emit a setup hook. Also store the path to the original GCC and -# Glibc. -test -n "$gcc" && echo $gcc > $out/nix-support/orig-gcc -test -n "$libc" && echo $libc > $out/nix-support/orig-libc - -doSubstitute "$addFlags" "$out/nix-support/add-flags.sh" - -doSubstitute "$setupHook" "$out/nix-support/setup-hook" - -cp -p $utils $out/nix-support/utils.sh - - -# Propagate the wrapped gcc so that if you install the wrapper, you get -# tools like gcov, the manpages, etc. as well (including for binutils -# and Glibc). -if test -z "$nativeTools"; then - echo $gcc $binutils $libc > $out/nix-support/propagated-user-env-packages -fi diff --git a/pkgs/build-support/gcc-wrapper/default.nix b/pkgs/build-support/gcc-wrapper/default.nix index 8e8b0b909454..b2f7d07560d3 100644 --- a/pkgs/build-support/gcc-wrapper/default.nix +++ b/pkgs/build-support/gcc-wrapper/default.nix @@ -1,28 +1,29 @@ -# The Nix `gcc' stdenv.mkDerivation is not directly usable, since it doesn't -# know where the C library and standard header files are. Therefore -# the compiler produced by that package cannot be installed directly -# in a user environment and used from the command line. This -# stdenv.mkDerivation provides a wrapper that sets up the right environment -# variables so that the compiler and the linker just "work". +# The Nixpkgs GCC is not directly usable, since it doesn't know where +# the C library and standard header files are. Therefore the compiler +# produced by that package cannot be installed directly in a user +# environment and used from the command line. So we use a wrapper +# script that sets up the right environment variables so that the +# compiler and the linker just "work". { name ? "", stdenv, nativeTools, nativeLibc, nativePrefix ? "" -, gcc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? "" -, zlib ? null +, gcc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? stdenv.shell +, zlib ? null, extraPackages ? [] }: +with stdenv.lib; + assert nativeTools -> nativePrefix != ""; assert !nativeTools -> gcc != null && binutils != null && coreutils != null; assert !nativeLibc -> libc != null; -# For ghdl (the vhdl language provider to gcc) we need zlib in the wrapper -assert (gcc != null && gcc ? langVhdl && gcc.langVhdl) -> zlib != null; +# For ghdl (the vhdl language provider to gcc) we need zlib in the wrapper. +assert gcc.langVhdl or false -> zlib != null; let gccVersion = (builtins.parseDrvName gcc.name).version; gccName = (builtins.parseDrvName gcc.name).name; - langGo = if nativeTools then false else gcc ? langGo && gcc.langGo; in stdenv.mkDerivation { @@ -30,31 +31,198 @@ stdenv.mkDerivation { (if name != "" then name else gccName + "-wrapper") + (if gcc != null && gccVersion != "" then "-" + gccVersion else ""); - builder = ./builder.sh; - setupHook = ./setup-hook.sh; - gccWrapper = ./gcc-wrapper.sh; - gnatWrapper = ./gnat-wrapper.sh; - gnatlinkWrapper = ./gnatlink-wrapper.sh; - ldWrapper = ./ld-wrapper.sh; - ldSolarisWrapper = ./ld-solaris-wrapper.sh; - utils = ./utils.sh; - addFlags = ./add-flags; - - inherit nativeTools nativeLibc nativePrefix gcc; + preferLocalBuild = true; + + inherit gcc shell; libc = if nativeLibc then null else libc; binutils = if nativeTools then null else binutils; - # The wrapper scripts use 'cat', so we may need coreutils + # The wrapper scripts use 'cat', so we may need coreutils. coreutils = if nativeTools then null else coreutils; - langC = if nativeTools then true else gcc.langC; - langCC = if nativeTools then true else gcc.langCC; - langFortran = if nativeTools then false else gcc ? langFortran; - langAda = if nativeTools then false else gcc ? langAda && gcc.langAda; - langVhdl = if nativeTools then false else gcc ? langVhdl && gcc.langVhdl; - zlib = if gcc != null && gcc ? langVhdl then zlib else null; - shell = if shell == "" then stdenv.shell else - if builtins.isAttrs shell then (shell + shell.shellPath) - else shell; + passthru = { inherit nativeTools nativeLibc nativePrefix; }; + + buildCommand = + '' + mkdir -p $out/bin $out/nix-support + + wrap() { + local dst="$1" + local wrapper="$2" + export prog="$3" + substituteAll "$wrapper" "$out/bin/$dst" + chmod +x "$out/bin/$dst" + } + '' + + + optionalString (!nativeLibc) '' + dynamicLinker="$libc/lib/$dynamicLinker" + echo $dynamicLinker > $out/nix-support/dynamic-linker + + if [ -e $libc/lib/32/ld-linux.so.2 ]; then + echo $libc/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32 + fi + + # The "-B$libc/lib/" flag is a quick hack to force gcc to link + # against the crt1.o from our own glibc, rather than the one in + # /usr/lib. (This is only an issue when using an `impure' + # compiler/linker, i.e., one that searches /usr/lib and so on.) + # + # Unfortunately, setting -B appears to override the default search + # path. Thus, the gcc-specific "../includes-fixed" directory is + # now longer searched and glibc's <limits.h> header fails to + # compile, because it uses "#include_next <limits.h>" to find the + # limits.h file in ../includes-fixed. To remedy the problem, + # another -idirafter is necessary to add that directory again. + echo "-B$libc/lib/ -idirafter $libc/include -idirafter $gcc/lib/gcc/*/*/include-fixed" > $out/nix-support/libc-cflags + + echo "-L$libc/lib" > $out/nix-support/libc-ldflags + + # The dynamic linker is passed in `ldflagsBefore' to allow + # explicit overrides of the dynamic linker by callers to gcc/ld + # (the *last* value counts, so ours should come first). + echo "-dynamic-linker" $dynamicLinker > $out/nix-support/libc-ldflags-before + + echo $libc > $out/nix-support/orig-libc + '' + + + (if nativeTools then '' + gccPath="${nativePrefix}/bin" + ldPath="${nativePrefix}/bin" + '' else '' + echo $gcc > $out/nix-support/orig-gcc + + # GCC shows $gcc/lib in `gcc -print-search-dirs', but not + # $gcc/lib64 (even though it does actually search there...).. + # This confuses libtool. So add it to the compiler tool search + # path explicitly. + if [ -e "$gcc/lib64" -a ! -L "$gcc/lib64" ]; then + gccLDFlags+=" -L$gcc/lib64" + gccCFlags+=" -B$gcc/lib64" + fi + gccLDFlags+=" -L$gcc/lib" + + ${optionalString gcc.langVhdl or false '' + gccLDFlags+=" -L${zlib}/lib" + ''} + + # Find the gcc libraries path (may work only without multilib). + ${optionalString gcc.langAda or false '' + basePath=`echo $gcc/lib/*/*/*` + gccCFlags+=" -B$basePath -I$basePath/adainclude" + gnatCFlags="-aI$basePath/adainclude -aO$basePath/adalib" + echo "$gnatCFlags" > $out/nix-support/gnat-cflags + ''} + + echo "$gccLDFlags" > $out/nix-support/gcc-ldflags + echo "$gccCFlags" > $out/nix-support/gcc-cflags + + gccPath="$gcc/bin" + ldPath="$binutils/bin" + + # Propagate the wrapped gcc so that if you install the wrapper, + # you get tools like gcov, the manpages, etc. as well (including + # for binutils and Glibc). + echo $gcc $binutils $libc > $out/nix-support/propagated-user-env-packages + + echo ${toString extraPackages} > $out/nix-support/propagated-native-build-inputs + '' + + + optionalString (stdenv.isSunOS && nativePrefix != "") '' + # Solaris needs an additional ld wrapper. + ldPath="${nativePrefix}/bin" + ld="$out/bin/ld-solaris" + wrap ld-solaris ${./ld-solaris-wrapper.sh} + '') + + + '' + # Create a symlink to as (the assembler). This is useful when a + # gcc-wrapper is installed in a user environment, as it ensures that + # the right assembler is called. + if [ -e $ldPath/as ]; then + ln -s $ldPath/as $out/bin/as + fi + + wrap ld ${./ld-wrapper.sh} ''${ld:-$ldPath/ld} + + if [ -e $binutils/bin/ld.gold ]; then + wrap ld.gold ${./ld-wrapper.sh} $binutils/bin/ld.gold + fi + + if [ -e $binutils/bin/ld.bfd ]; then + wrap ld.bfd ${./ld-wrapper.sh} $binutils/bin/ld.bfd + fi + + if [ -e $gccPath/gcc ]; then + wrap gcc ${./gcc-wrapper.sh} $gccPath/gcc + ln -s gcc $out/bin/cc + elif [ -e $gccPath/clang ]; then + wrap clang ${./gcc-wrapper.sh} $gccPath/clang + ln -s clang $out/bin/cc + fi + + if [ -e $gccPath/g++ ]; then + wrap g++ ${./gcc-wrapper.sh} $gccPath/g++ + ln -s g++ $out/bin/c++ + elif [ -e $gccPath/clang++ ]; then + wrap clang++ ${./gcc-wrapper.sh} $gccPath/clang++ + ln -s clang++ $out/bin/c++ + fi + + if [ -e $gccPath/cpp ]; then + wrap cpp ${./gcc-wrapper.sh} $gccPath/cpp + fi + '' + + + optionalString gcc.langFortran or false '' + wrap gfortran ${./gcc-wrapper.sh} $gccPath/gfortran + ln -sv gfortran $out/bin/g77 + ln -sv gfortran $out/bin/f77 + '' + + + optionalString gcc.langJava or false '' + wrap gcj ${./gcc-wrapper.sh} $gccPath/gcj + '' + + + optionalString gcc.langGo or false '' + wrap gccgo ${./gcc-wrapper.sh} $gccPath/gccgo + '' + + + optionalString gcc.langAda or false '' + wrap gnatgcc ${./gcc-wrapper.sh} $gccPath/gnatgcc + wrap gnatmake ${./gnat-wrapper.sh} $gccPath/gnatmake + wrap gnatbind ${./gnat-wrapper.sh} $gccPath/gnatbind + wrap gnatlink ${./gnatlink-wrapper.sh} $gccPath/gnatlink + '' + + + optionalString gcc.langVhdl or false '' + ln -s $gccPath/ghdl $out/bin/ghdl + '' + + + '' + substituteAll ${./setup-hook.sh} $out/nix-support/setup-hook + substituteAll ${./add-flags} $out/nix-support/add-flags.sh + cp -p ${./utils.sh} $out/nix-support/utils.sh + + if [ -e $out/bin/clang ]; then + echo 'export CC; : ''${CC:=clang}' >> $out/nix-support/setup-hook + fi + + if [ -e $out/bin/clang++ ]; then + echo 'export CXX; : ''${CXX:=clang++}' >> $out/nix-support/setup-hook + fi + ''; + + # The dynamic linker has different names on different Linux platforms. + dynamicLinker = + if !nativeLibc then + (if stdenv.system == "i686-linux" then "ld-linux.so.2" else + if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2" else + # ARM with a wildcard, which can be "" or "-armhf". + if stdenv.isArm then "ld-linux*.so.3" else + if stdenv.system == "powerpc-linux" then "ld.so.1" else + if stdenv.system == "mips64el-linux" then "ld.so.1" else + abort "Don't know the name of the dynamic linker for this platform.") + else ""; crossAttrs = { shell = shell.crossDrv + shell.crossDrv.shellPath; @@ -73,8 +241,6 @@ stdenv.mkDerivation { abort "don't know the name of the dynamic linker for this platform"); }; - preferLocalBuild = true; - meta = let gcc_ = if gcc != null then gcc else {}; in (if gcc_ ? meta then removeAttrs gcc.meta ["priority"] else {}) // @@ -82,16 +248,4 @@ stdenv.mkDerivation { stdenv.lib.attrByPath ["meta" "description"] "System C compiler" gcc_ + " (wrapper script)"; }; - - # The dynamic linker has different names on different Linux platforms. - dynamicLinker = - if !nativeLibc then - (if stdenv.system == "i686-linux" then "ld-linux.so.2" else - if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2" else - # ARM with a wildcard, which can be "" or "-armhf". - if stdenv.isArm then "ld-linux*.so.3" else - if stdenv.system == "powerpc-linux" then "ld.so.1" else - if stdenv.system == "mips64el-linux" then "ld.so.1" else - abort "don't know the name of the dynamic linker for this platform") - else ""; } diff --git a/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh b/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh index 2ad7783a442c..d0c82c82dc1c 100644 --- a/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh +++ b/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh @@ -1,10 +1,10 @@ #! @shell@ -e -if test -n "$NIX_GCC_WRAPPER_START_HOOK"; then +if [ -n "$NIX_GCC_WRAPPER_START_HOOK" ]; then source "$NIX_GCC_WRAPPER_START_HOOK" fi -if test -z "$NIX_GCC_WRAPPER_FLAGS_SET"; then +if [ -z "$NIX_GCC_WRAPPER_FLAGS_SET" ]; then source @out@/nix-support/add-flags.sh fi @@ -18,26 +18,26 @@ getVersion=0 nonFlagArgs=0 for i in "$@"; do - if test "$i" = "-c"; then + if [ "$i" = -c ]; then dontLink=1 - elif test "$i" = "-S"; then + elif [ "$i" = -S ]; then dontLink=1 - elif test "$i" = "-E"; then + elif [ "$i" = -E ]; then dontLink=1 - elif test "$i" = "-E"; then + elif [ "$i" = -E ]; then dontLink=1 - elif test "$i" = "-M"; then + elif [ "$i" = -M ]; then dontLink=1 - elif test "$i" = "-MM"; then + elif [ "$i" = -MM ]; then dontLink=1 - elif test "$i" = "-x"; then + elif [ "$i" = -x ]; then # At least for the cases c-header or c++-header we should set dontLink. # I expect no one use -x other than making precompiled headers. dontLink=1 - elif test "${i:0:1}" != "-"; then + elif [ "${i:0:1}" != - ]; then nonFlagArgs=1 - elif test "$i" = "-m32"; then - if test -e @out@/nix-support/dynamic-linker-m32; then + elif [ "$i" = -m32 ]; then + if [ -e @out@/nix-support/dynamic-linker-m32 ]; then NIX_LDFLAGS="$NIX_LDFLAGS -dynamic-linker $(cat @out@/nix-support/dynamic-linker-m32)" fi fi @@ -48,28 +48,28 @@ done # "-c" flag). So if no non-flag arguments are given, don't pass any # linker flags. This catches cases like "gcc" (should just print # "gcc: no input files") and "gcc -v" (should print the version). -if test "$nonFlagArgs" = "0"; then +if [ "$nonFlagArgs" = 0 ]; then dontLink=1 fi # Optionally filter out paths not refering to the store. params=("$@") -if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE"; then +if [ "$NIX_ENFORCE_PURITY" = 1 -a -n "$NIX_STORE" ]; then rest=() n=0 - while test $n -lt ${#params[*]}; do + while [ $n -lt ${#params[*]} ]; do p=${params[n]} p2=${params[$((n+1))]} - if test "${p:0:3}" = "-L/" && badPath "${p:2}"; then + if [ "${p:0:3}" = -L/ ] && badPath "${p:2}"; then skip $p - elif test "$p" = "-L" && badPath "$p2"; then + elif [ "$p" = -L ] && badPath "$p2"; then n=$((n + 1)); skip $p2 - elif test "${p:0:3}" = "-I/" && badPath "${p:2}"; then + elif [ "${p:0:3}" = -I/ ] && badPath "${p:2}"; then skip $p - elif test "$p" = "-I" && badPath "$p2"; then + elif [ "$p" = -I ] && badPath "$p2"; then n=$((n + 1)); skip $p2 - elif test "$p" = "-isystem" && badPath "$p2"; then + elif [ "$p" = -isystem ] && badPath "$p2"; then n=$((n + 1)); skip $p2 else rest=("${rest[@]}" "$p") @@ -84,11 +84,20 @@ fi extraAfter=($NIX_CFLAGS_COMPILE) extraBefore=() -if test "$dontLink" != "1"; then +# When enforcing purity, pretend gcc can't find the current date and +# time +if [ "$NIX_ENFORCE_PURITY" = 1 ]; then + extraAfter+=('-D__DATE__="Jan 01 1970"' + '-D__TIME__="00:00:01"' + -Wno-builtin-macro-redefined) +fi + + +if [ "$dontLink" != 1 ]; then # Add the flags that should only be passed to the compiler when # linking. - extraAfter=(${extraAfter[@]} $NIX_CFLAGS_LINK) + extraAfter+=($NIX_CFLAGS_LINK) # Add the flags that should be passed to the linker (and prevent # `ld-wrapper' from adding NIX_LDFLAGS again). @@ -96,11 +105,11 @@ if test "$dontLink" != "1"; then extraBefore=(${extraBefore[@]} "-Wl,$i") done for i in $NIX_LDFLAGS; do - if test "${i:0:3}" = "-L/"; then - extraAfter=(${extraAfter[@]} "$i") - else - extraAfter=(${extraAfter[@]} "-Wl,$i") - fi + if [ "${i:0:3}" = -L/ ]; then + extraAfter+=("$i") + else + extraAfter+=("-Wl,$i") + fi done export NIX_LDFLAGS_SET=1 fi @@ -109,39 +118,29 @@ fi # add anything. This is to prevent `gcc -v' (which normally prints # out the version number and returns exit code 0) from printing out # `No input files specified' and returning exit code 1. -if test "$*" = "-v"; then +if [ "$*" = -v ]; then extraAfter=() extraBefore=() -fi +fi # Optionally print debug info. -if test "$NIX_DEBUG" = "1"; then - echo "original flags to @gccProg@:" >&2 +if [ -n "$NIX_DEBUG" ]; then + echo "original flags to @prog@:" >&2 for i in "${params[@]}"; do echo " $i" >&2 done - echo "extraBefore flags to @gccProg@:" >&2 + echo "extraBefore flags to @prog@:" >&2 for i in ${extraBefore[@]}; do echo " $i" >&2 done - echo "extraAfter flags to @gccProg@:" >&2 + echo "extraAfter flags to @prog@:" >&2 for i in ${extraAfter[@]}; do echo " $i" >&2 done fi -if test -n "$NIX_GCC_WRAPPER_EXEC_HOOK"; then +if [ -n "$NIX_GCC_WRAPPER_EXEC_HOOK" ]; then source "$NIX_GCC_WRAPPER_EXEC_HOOK" fi - -# Call the real `gcc'. Filter out warnings from stderr about unused -# `-B' flags, since they confuse some programs. Deep bash magic to -# apply grep to stderr (by swapping stdin/stderr twice). -if test -z "$NIX_GCC_NEEDS_GREP"; then - @gccProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]} -else - (@gccProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]} 3>&2 2>&1 1>&3- \ - | (grep -v 'file path prefix' || true); exit ${PIPESTATUS[0]}) 3>&2 2>&1 1>&3- - exit $? -fi +exec @prog@ ${extraBefore[@]} "${params[@]}" "${extraAfter[@]}" diff --git a/pkgs/build-support/gcc-wrapper/gnat-wrapper.sh b/pkgs/build-support/gcc-wrapper/gnat-wrapper.sh index f6fa4b18400a..3514ccd67325 100644 --- a/pkgs/build-support/gcc-wrapper/gnat-wrapper.sh +++ b/pkgs/build-support/gcc-wrapper/gnat-wrapper.sh @@ -1,10 +1,10 @@ #! @shell@ -e -if test -n "$NIX_GNAT_WRAPPER_START_HOOK"; then +if [ -n "$NIX_GNAT_WRAPPER_START_HOOK" ]; then source "$NIX_GNAT_WRAPPER_START_HOOK" fi -if test -z "$NIX_GNAT_WRAPPER_FLAGS_SET"; then +if [ -z "$NIX_GNAT_WRAPPER_FLAGS_SET" ]; then source @out@/nix-support/add-flags.sh fi @@ -18,14 +18,14 @@ getVersion=0 nonFlagArgs=0 for i in "$@"; do - if test "$i" = "-c"; then + if [ "$i" = -c ]; then dontLink=1 - elif test "$i" = "-M"; then + elif [ "$i" = -M ]; then dontLink=1 - elif test "${i:0:1}" != "-"; then + elif [ "${i:0:1}" != - ]; then nonFlagArgs=1 - elif test "$i" = "-m32"; then - if test -e @out@/nix-support/dynamic-linker-m32; then + elif [ "$i" = -m32 ]; then + if [ -e @out@/nix-support/dynamic-linker-m32 ]; then NIX_LDFLAGS="$NIX_LDFLAGS -dynamic-linker $(cat @out@/nix-support/dynamic-linker-m32)" fi fi @@ -36,26 +36,26 @@ done # "-c" flag). So if no non-flag arguments are given, don't pass any # linker flags. This catches cases like "gcc" (should just print # "gcc: no input files") and "gcc -v" (should print the version). -if test "$nonFlagArgs" = "0"; then +if [ "$nonFlagArgs" = 0 ]; then dontLink=1 fi # Optionally filter out paths not refering to the store. params=("$@") -if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE"; then +if [ "$NIX_ENFORCE_PURITY" = 1 -a -n "$NIX_STORE" ]; then rest=() n=0 - while test $n -lt ${#params[*]}; do + while [ $n -lt ${#params[*]} ]; do p=${params[n]} p2=${params[$((n+1))]} - if test "${p:0:3}" = "-L/" && badPath "${p:2}"; then + if [ "${p:0:3}" = -L/ ] && badPath "${p:2}"; then skip $p - elif test "${p:0:3}" = "-I/" && badPath "${p:2}"; then + elif [ "${p:0:3}" = -I/ ] && badPath "${p:2}"; then skip $p - elif test "${p:0:4}" = "-aI/" && badPath "${p:3}"; then + elif [ "${p:0:4}" = -aI/ ] && badPath "${p:3}"; then skip $p - elif test "${p:0:4}" = "-aO/" && badPath "${p:3}"; then + elif [ "${p:0:4}" = -aO/ ] && badPath "${p:3}"; then skip $p else rest=("${rest[@]}" "$p") @@ -81,33 +81,23 @@ fi #done # Optionally print debug info. -if test "$NIX_DEBUG" = "1"; then - echo "original flags to @gnatProg@:" >&2 +if [ -n "$NIX_DEBUG" ]; then + echo "original flags to @prog@:" >&2 for i in "${params[@]}"; do echo " $i" >&2 done - echo "extraBefore flags to @gnatProg@:" >&2 + echo "extraBefore flags to @prog@:" >&2 for i in ${extraBefore[@]}; do echo " $i" >&2 done - echo "extraAfter flags to @gnatProg@:" >&2 + echo "extraAfter flags to @prog@:" >&2 for i in ${extraAfter[@]}; do echo " $i" >&2 done fi -if test -n "$NIX_GNAT_WRAPPER_EXEC_HOOK"; then +if [ -n "$NIX_GNAT_WRAPPER_EXEC_HOOK" ]; then source "$NIX_GNAT_WRAPPER_EXEC_HOOK" fi - -# Call the real `gcc'. Filter out warnings from stderr about unused -# `-B' flags, since they confuse some programs. Deep bash magic to -# apply grep to stderr (by swapping stdin/stderr twice). -if test -z "$NIX_GNAT_NEEDS_GREP"; then - @gnatProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]} -else - (@gnatProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]} 3>&2 2>&1 1>&3- \ - | (grep -v 'file path prefix' || true); exit ${PIPESTATUS[0]}) 3>&2 2>&1 1>&3- - exit $? -fi +exec @prog@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]} diff --git a/pkgs/build-support/gcc-wrapper/gnatlink-wrapper.sh b/pkgs/build-support/gcc-wrapper/gnatlink-wrapper.sh index 25907108b4db..c9958dbbb413 100644 --- a/pkgs/build-support/gcc-wrapper/gnatlink-wrapper.sh +++ b/pkgs/build-support/gcc-wrapper/gnatlink-wrapper.sh @@ -11,33 +11,23 @@ extraBefore=() #done # Optionally print debug info. -if test "$NIX_DEBUG" = "1"; then - echo "original flags to @gnatlinkProg@:" >&2 +if [ -n "$NIX_DEBUG" ]; then + echo "original flags to @prog@:" >&2 for i in "$@"; do echo " $i" >&2 done - echo "extraBefore flags to @gnatlinkProg@:" >&2 + echo "extraBefore flags to @prog@:" >&2 for i in ${extraBefore[@]}; do echo " $i" >&2 done - echo "extraAfter flags to @gnatlinkProg@:" >&2 + echo "extraAfter flags to @prog@:" >&2 for i in ${extraAfter[@]}; do echo " $i" >&2 done fi -if test -n "$NIX_GNAT_WRAPPER_EXEC_HOOK"; then +if [ -n "$NIX_GNAT_WRAPPER_EXEC_HOOK" ]; then source "$NIX_GNAT_WRAPPER_EXEC_HOOK" fi - -# Call the real `gcc'. Filter out warnings from stderr about unused -# `-B' flags, since they confuse some programs. Deep bash magic to -# apply grep to stderr (by swapping stdin/stderr twice). -if test -z "$NIX_GNAT_NEEDS_GREP"; then - @gnatlinkProg@ ${extraBefore[@]} "$@" ${extraAfter[@]} -else - (@gnatlinkProg@ ${extraBefore[@]} "$@" ${extraAfter[@]} 3>&2 2>&1 1>&3- \ - | (grep -v 'file path prefix' || true); exit ${PIPESTATUS[0]}) 3>&2 2>&1 1>&3- - exit $? -fi +exec @prog@ ${extraBefore[@]} "$@" ${extraAfter[@]} diff --git a/pkgs/build-support/gcc-wrapper/ld-solaris-wrapper.sh b/pkgs/build-support/gcc-wrapper/ld-solaris-wrapper.sh index 5a7b92b5ad7d..9216ea3198dd 100644 --- a/pkgs/build-support/gcc-wrapper/ld-solaris-wrapper.sh +++ b/pkgs/build-support/gcc-wrapper/ld-solaris-wrapper.sh @@ -6,7 +6,7 @@ set -u # I've also tried adding -z direct and -z lazyload, but it gave too many problems with C++ exceptions :'( # Also made sure libgcc would not be lazy-loaded, as suggested here: https://www.illumos.org/issues/2534#note-3 # but still no success. -cmd="@ld@ -z ignore" +cmd="@prog@ -z ignore" args=("$@"); diff --git a/pkgs/build-support/gcc-wrapper/ld-wrapper.sh b/pkgs/build-support/gcc-wrapper/ld-wrapper.sh index 822c4a03a218..894dbf9a352c 100644 --- a/pkgs/build-support/gcc-wrapper/ld-wrapper.sh +++ b/pkgs/build-support/gcc-wrapper/ld-wrapper.sh @@ -1,10 +1,10 @@ #! @shell@ -e -if test -n "$NIX_LD_WRAPPER_START_HOOK"; then +if [ -n "$NIX_LD_WRAPPER_START_HOOK" ]; then source "$NIX_LD_WRAPPER_START_HOOK" fi -if test -z "$NIX_GCC_WRAPPER_FLAGS_SET"; then +if [ -z "$NIX_GCC_WRAPPER_FLAGS_SET" ]; then source @out@/nix-support/add-flags.sh fi @@ -13,26 +13,26 @@ source @out@/nix-support/utils.sh # Optionally filter out paths not refering to the store. params=("$@") -if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE" \ - -a \( -z "$NIX_IGNORE_LD_THROUGH_GCC" -o -z "$NIX_LDFLAGS_SET" \); then +if [ "$NIX_ENFORCE_PURITY" = 1 -a -n "$NIX_STORE" \ + -a \( -z "$NIX_IGNORE_LD_THROUGH_GCC" -o -z "$NIX_LDFLAGS_SET" \) ]; then rest=() n=0 - while test $n -lt ${#params[*]}; do + while [ $n -lt ${#params[*]} ]; do p=${params[n]} p2=${params[$((n+1))]} - if test "${p:0:3}" = "-L/" && badPath "${p:2}"; then + if [ "${p:0:3}" = -L/ ] && badPath "${p:2}"; then skip $p - elif test "$p" = "-L" && badPath "$p2"; then + elif [ "$p" = -L ] && badPath "$p2"; then n=$((n + 1)); skip $p2 - elif test "$p" = "-rpath" && badPath "$p2"; then + elif [ "$p" = -rpath ] && badPath "$p2"; then n=$((n + 1)); skip $p2 - elif test "$p" = "-dynamic-linker" && badPath "$p2"; then + elif [ "$p" = -dynamic-linker ] && badPath "$p2"; then n=$((n + 1)); skip $p2 - elif test "${p:0:1}" = "/" && badPath "$p"; then + elif [ "${p:0:1}" = / ] && badPath "$p"; then # We cannot skip this; barf. echo "impure path \`$p' used in link" >&2 exit 1 - elif test "${p:0:9}" = "--sysroot"; then + elif [ "${p:0:9}" = --sysroot ]; then # Our ld is not built with sysroot support (Can we fix that?) : else @@ -47,7 +47,7 @@ fi extra=() extraBefore=() -if test -z "$NIX_LDFLAGS_SET"; then +if [ -z "$NIX_LDFLAGS_SET" ]; then extra+=($NIX_LDFLAGS) extraBefore+=($NIX_LDFLAGS_BEFORE) fi @@ -56,12 +56,12 @@ extra+=($NIX_LDFLAGS_AFTER) # Add all used dynamic libraries to the rpath. -if test "$NIX_DONT_SET_RPATH" != "1"; then +if [ "$NIX_DONT_SET_RPATH" != 1 ]; then libPath="" addToLibPath() { local path="$1" - if test "${path:0:1}" != "/"; then return 0; fi + if [ "${path:0:1}" != / ]; then return 0; fi case "$path" in *..*|*./*|*/.*|*//*) local path2 @@ -75,12 +75,12 @@ if test "$NIX_DONT_SET_RPATH" != "1"; then esac libPath="$libPath $path " } - + addToRPath() { # If the path is not in the store, don't add it to the rpath. # This typically happens for libraries in /tmp that are later # copied to $out/lib. If not, we're screwed. - if test "${1:0:${#NIX_STORE}}" != "$NIX_STORE"; then return 0; fi + if [ "${1:0:${#NIX_STORE}}" != "$NIX_STORE" ]; then return 0; fi case $rpath in *\ $1\ *) return 0 ;; esac @@ -97,21 +97,21 @@ if test "$NIX_DONT_SET_RPATH" != "1"; then # First, find all -L... switches. allParams=("${params[@]}" ${extra[@]}) n=0 - while test $n -lt ${#allParams[*]}; do + while [ $n -lt ${#allParams[*]} ]; do p=${allParams[n]} p2=${allParams[$((n+1))]} - if test "${p:0:3}" = "-L/"; then + if [ "${p:0:3}" = -L/ ]; then addToLibPath ${p:2} - elif test "$p" = "-L"; then + elif [ "$p" = -L ]; then addToLibPath ${p2} n=$((n + 1)) - elif test "$p" = "-l"; then + elif [ "$p" = -l ]; then addToLibs ${p2} n=$((n + 1)) - elif test "${p:0:2}" = "-l"; then + elif [ "${p:0:2}" = -l ]; then addToLibs ${p:2} - elif test "$p" = "-dynamic-linker"; then - # Ignore the dynamic linker argument, or it + elif [ "$p" = -dynamic-linker ]; then + # Ignore the dynamic linker argument, or it # will get into the next 'elif'. We don't want # the dynamic linker path rpath to go always first. n=$((n + 1)) @@ -129,16 +129,16 @@ if test "$NIX_DONT_SET_RPATH" != "1"; then # so, add the directory to the rpath. # It's important to add the rpath in the order of -L..., so # the link time chosen objects will be those of runtime linking. - + for i in $libPath; do for j in $libs; do - if test -f "$i/lib$j.so"; then + if [ -f "$i/lib$j.so" ]; then addToRPath $i break fi done done - + # Finally, add `-rpath' switches. for i in $rpath; do @@ -148,19 +148,19 @@ fi # Optionally print debug info. -if test "$NIX_DEBUG" = "1"; then - echo "original flags to @ld@:" >&2 +if [ -n "$NIX_DEBUG" ]; then + echo "original flags to @prog@:" >&2 for i in "${params[@]}"; do echo " $i" >&2 done - echo "extra flags to @ld@:" >&2 + echo "extra flags to @prog@:" >&2 for i in ${extra[@]}; do echo " $i" >&2 done fi -if test -n "$NIX_LD_WRAPPER_EXEC_HOOK"; then +if [ -n "$NIX_LD_WRAPPER_EXEC_HOOK" ]; then source "$NIX_LD_WRAPPER_EXEC_HOOK" fi -exec @ld@ ${extraBefore[@]} "${params[@]}" ${extra[@]} +exec @prog@ ${extraBefore[@]} "${params[@]}" ${extra[@]} diff --git a/pkgs/build-support/gcc-wrapper/setup-hook.sh b/pkgs/build-support/gcc-wrapper/setup-hook.sh index 298ade21d1f5..a6b7edbcb694 100644 --- a/pkgs/build-support/gcc-wrapper/setup-hook.sh +++ b/pkgs/build-support/gcc-wrapper/setup-hook.sh @@ -1,33 +1,35 @@ +export NIX_GCC=@out@ + addCVars () { - if test -d $1/include; then - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem $1/include" + if [ -d $1/include ]; then + export NIX_CFLAGS_COMPILE+=" -isystem $1/include" fi - if test -d $1/lib64; then - export NIX_LDFLAGS="$NIX_LDFLAGS -L$1/lib64" + if [ -d $1/lib64 -a ! -L $1/lib64 ]; then + export NIX_LDFLAGS+=" -L$1/lib64" fi - if test -d $1/lib; then - export NIX_LDFLAGS="$NIX_LDFLAGS -L$1/lib" + if [ -d $1/lib ]; then + export NIX_LDFLAGS+=" -L$1/lib" fi } -envHooks=(${envHooks[@]} addCVars) +envHooks+=(addCVars) # Note: these come *after* $out in the PATH (see setup.sh). -if test -n "@gcc@"; then +if [ -n "@gcc@" ]; then addToSearchPath PATH @gcc@/bin fi -if test -n "@binutils@"; then +if [ -n "@binutils@" ]; then addToSearchPath PATH @binutils@/bin fi -if test -n "@libc@"; then +if [ -n "@libc@" ]; then addToSearchPath PATH @libc@/bin fi -if test -n "@coreutils@"; then +if [ -n "@coreutils@" ]; then addToSearchPath PATH @coreutils@/bin fi diff --git a/pkgs/build-support/gcc-wrapper/utils.sh b/pkgs/build-support/gcc-wrapper/utils.sh index 753b3772e956..3ab512d85c4e 100644 --- a/pkgs/build-support/gcc-wrapper/utils.sh +++ b/pkgs/build-support/gcc-wrapper/utils.sh @@ -1,5 +1,5 @@ skip () { - if test "$NIX_DEBUG" = "1"; then + if [ -n "$NIX_DEBUG" ]; then echo "skipping impure path $1" >&2 fi } @@ -9,11 +9,11 @@ skip () { # `/nix/store/.../lib/foo.so' isn't. badPath() { local p=$1 - + # Relative paths are okay (since they're presumably relative to # the temporary build directory). - if test "${p:0:1}" != "/"; then return 1; fi - + if [ "${p:0:1}" != / ]; then return 1; fi + # Otherwise, the path should refer to the store or some temporary # directory (including the build directory). test \ diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix index bd6ac84a0f8d..19e8f14ebf1c 100644 --- a/pkgs/build-support/grsecurity/default.nix +++ b/pkgs/build-support/grsecurity/default.nix @@ -32,7 +32,7 @@ let grKernel = if cfg.stable then mkKernel pkgs.linux_3_14 stable-patch - else mkKernel pkgs.linux_3_16 test-patch; + else mkKernel pkgs.linux_3_17 test-patch; ## -- grsecurity configuration --------------------------------------------- @@ -84,7 +84,7 @@ let let boolToKernOpt = b: if b then "y" else "n"; # Disable RANDSTRUCT under virtualbox, as it has some kind of # breakage with the vbox guest drivers - #randstruct = optionalString config.services.virtualbox.enable + #randstruct = optionalString config.services.virtualboxGuest.enable # "GRKERNSEC_RANDSTRUCT n"; # Disable restricting links under the testing kernel, as something diff --git a/pkgs/build-support/release/ant-build.nix b/pkgs/build-support/release/ant-build.nix index 409c98d8d3a3..346e139d35de 100644 --- a/pkgs/build-support/release/ant-build.nix +++ b/pkgs/build-support/release/ant-build.nix @@ -108,7 +108,7 @@ stdenv.mkDerivation ( . ${./functions.sh} origSrc=$src - src=$(findTarballs $src | head -1) + src=$(findTarball $src) ''; } ) diff --git a/pkgs/build-support/release/binary-tarball.nix b/pkgs/build-support/release/binary-tarball.nix index 41fab231ee34..f691b1bf7356 100644 --- a/pkgs/build-support/release/binary-tarball.nix +++ b/pkgs/build-support/release/binary-tarball.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation ( . ${./functions.sh} origSrc=$src - src=$(findTarballs $src | head -1) + src=$(findTarball $src) if test -e $origSrc/nix-support/hydra-release-name; then releaseName=$(cat $origSrc/nix-support/hydra-release-name) diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix index 3adfe41031da..7dcc9b9552a4 100644 --- a/pkgs/build-support/release/debian-build.nix +++ b/pkgs/build-support/release/debian-build.nix @@ -32,7 +32,7 @@ vmTools.runInLinuxImage (stdenv.mkDerivation ( postHook = '' . ${./functions.sh} propagateImageName - src=$(findTarballs $src | head -1) # Find a tarball. + src=$(findTarball $src) ''; installExtraDebsPhase = '' diff --git a/pkgs/build-support/release/functions.sh b/pkgs/build-support/release/functions.sh index efc4e7970cc5..875a2da178de 100644 --- a/pkgs/build-support/release/functions.sh +++ b/pkgs/build-support/release/functions.sh @@ -1,34 +1,37 @@ -findTarballs() { - local suffix - test -d "$1/tarballs/" && { +findTarball() { + local suffix i + if [ -d "$1/tarballs/" ]; then for suffix in tar.gz tgz tar.bz2 tbz2 tar.xz tar.lzma; do - ls $1/tarballs/*.$suffix 2> /dev/null - done | sort - } - echo "$1" + for i in $1/tarballs/*.$suffix; do echo $i; break; done + done | sort | head -1 + return + else + echo "$1" + return + fi } canonicalizeJarManifest() { - local input=$1 - # http://docs.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#Notes_on_Manifest_and_Signature_Files - (head -n 1 $input && tail -n +2 $input | sort | grep -v '^\s*$') > $input-tmp - mv $input-tmp $input + local input=$1 + # http://docs.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#Notes_on_Manifest_and_Signature_Files + (head -n 1 $input && tail -n +2 $input | sort | grep -v '^\s*$') > $input-tmp + mv $input-tmp $input } # Post-process a jar file to contain canonical timestamps and metadata ordering canonicalizeJar() { - local input=$1 - local outer=$(pwd) - unzip -qq $input -d $input-tmp - canonicalizeJarManifest $input-tmp/META-INF/MANIFEST.MF - # Set all timestamps to Jan 1 1980, which is the earliest date the zip format supports... - find $input-tmp -exec touch -t 198001010000.00 {} + - rm $input - pushd $input-tmp - zip -q -r -o -X $outer/tmp-out.jar . 2> /dev/null - popd - rm -rf $input-tmp - mv $outer/tmp-out.jar $input + local input=$1 + local outer=$(pwd) + unzip -qq $input -d $input-tmp + canonicalizeJarManifest $input-tmp/META-INF/MANIFEST.MF + # Set all timestamps to Jan 1 1980, which is the earliest date the zip format supports... + find $input-tmp -exec touch -t 198001010000.00 {} + + rm $input + pushd $input-tmp + zip -q -r -o -X $outer/tmp-out.jar . 2> /dev/null + popd + rm -rf $input-tmp + mv $outer/tmp-out.jar $input } propagateImageName() { diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix index b80c9242ed23..6e0088adc3fe 100644 --- a/pkgs/build-support/release/nix-build.nix +++ b/pkgs/build-support/release/nix-build.nix @@ -18,6 +18,8 @@ , prePhases ? [] , postPhases ? [] , buildInputs ? [] +, preHook ? "" +, postHook ? "" , ... } @ args: let @@ -89,7 +91,8 @@ stdenv.mkDerivation ( postHook = '' . ${./functions.sh} origSrc=$src - src=$(findTarballs $src | head -1) + src=$(findTarball $src) + ${postHook} ''; preHook = '' @@ -105,6 +108,8 @@ stdenv.mkDerivation ( shopt -s expand_aliases alias make="scan-build -o _clang_analyze_$name --html-title='Scan results for $name' make" fi + + ${preHook} ''; # Clean up after analysis diff --git a/pkgs/build-support/release/rpm-build.nix b/pkgs/build-support/release/rpm-build.nix index 9a1c7eeee626..194bbc60534e 100644 --- a/pkgs/build-support/release/rpm-build.nix +++ b/pkgs/build-support/release/rpm-build.nix @@ -16,7 +16,7 @@ vmTools.buildRPM ( preBuild = '' . ${./functions.sh} propagateImageName - src=$(findTarballs $src | head -1) # Pick the first tarball. + src=$(findTarball $src) ''; postInstall = '' diff --git a/pkgs/build-support/setup-hooks/compress-man-pages.sh b/pkgs/build-support/setup-hooks/compress-man-pages.sh new file mode 100644 index 000000000000..1dd9788419b8 --- /dev/null +++ b/pkgs/build-support/setup-hooks/compress-man-pages.sh @@ -0,0 +1,27 @@ +fixupOutputHooks+=('if [ -z "$dontGzipMan" ]; then compressManPages "$prefix"; fi') + +compressManPages() { + local dir="$1" + + echo "gzipping man pages in $dir" + + GLOBIGNORE=.:..:*.gz:*.bz2 + + for f in "$dir"/share/man/*/* "$dir"/share/man/*/*/*; do + if [ -f "$f" -a ! -L "$f" ]; then + if gzip -c -n "$f" > "$f".gz; then + rm "$f" + else + rm "$f".gz + fi + fi + done + + for f in "$dir"/share/man/*/* "$dir"/share/man/*/*/*; do + if [ -L "$f" -a -f `readlink -f "$f"`.gz ]; then + ln -sf `readlink "$f"`.gz "$f".gz && rm "$f" + fi + done + + unset GLOBIGNORE +} diff --git a/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh b/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh index 5962bf039069..2b64fbf8f093 100644 --- a/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh +++ b/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh @@ -10,6 +10,8 @@ # their absolute path (using "install_name_tool -id"). It also # rewrites references in other dylibs to absolute paths. +postFixupHooks+=('fixDarwinDylibNamesIn $prefix') + fixDarwinDylibNames() { local flags=() local old_id @@ -29,7 +31,3 @@ fixDarwinDylibNamesIn() { local dir="$1" fixDarwinDylibNames $(find "$dir" -name "*.dylib") } - -postFixup() { - fixDarwinDylibNamesIn "$prefix" -} diff --git a/pkgs/build-support/setup-hooks/move-docs.sh b/pkgs/build-support/setup-hooks/move-docs.sh new file mode 100644 index 000000000000..c819ee12a9c9 --- /dev/null +++ b/pkgs/build-support/setup-hooks/move-docs.sh @@ -0,0 +1,50 @@ +# This setup hook moves $out/{man,doc,info} to $out/share; moves +# $out/share/man to $man/share/man; and moves $out/share/doc to +# $man/share/doc. + +preFixupHooks+=(_moveDocs) + +_moveToShare() { + forceShare=${forceShare:=man doc info} + if [ -z "$forceShare" -o -z "$out" ]; then return; fi + + for d in $forceShare; do + if [ -d "$out/$d" ]; then + if [ -d "$out/share/$d" ]; then + echo "both $d/ and share/$d/ exist!" + else + echo "moving $out/$d to $out/share/$d" + mkdir -p $out/share + mv $out/$d $out/share/ + fi + fi + done +} + +_moveToOutput() { + local d="$1" + local dst="$2" + if [ -z "$dst" -a ! -e $dst/$d ]; then return; fi + local output + for output in $outputs; do + if [ "${!output}" = "$dst" ]; then continue; fi + if [ -d "${!output}/$d" ]; then + echo "moving ${!output}/$d to $dst/$d" + mkdir -p $dst/share + mv ${!output}/$d $dst/$d + break + fi + done +} + +_moveDocs() { + _moveToShare + _moveToOutput share/man "$man" + _moveToOutput share/info "$info" + _moveToOutput share/doc "$doc" + + # Remove empty share directory. + if [ -d "$out/share" ]; then + rmdir $out/share 2> /dev/null || true + fi +} diff --git a/pkgs/build-support/setup-hooks/move-lib64.sh b/pkgs/build-support/setup-hooks/move-lib64.sh new file mode 100644 index 000000000000..46c90fcea6bd --- /dev/null +++ b/pkgs/build-support/setup-hooks/move-lib64.sh @@ -0,0 +1,21 @@ +# This setup hook, for each output, moves everything in $output/lib64 +# to $output/lib, and replaces $output/lib64 with a symlink to +# $output/lib. The rationale is that lib64 directories are unnecessary +# in Nix (since 32-bit and 64-bit builds of a package are in different +# store paths anyway). + +fixupOutputHooks+=(_moveLib64) + +_moveLib64() { + if [ "$dontMoveLib64" = 1 ]; then return; fi + if [ ! -e "$prefix/lib64" -o -L "$prefix/lib64" ]; then return; fi + echo "moving $prefix/lib64/* to $prefix/lib" + mkdir -p $prefix/lib + shopt -s dotglob + for i in $prefix/lib64/*; do + mv "$i" $prefix/lib + done + shopt -u dotglob + rmdir $prefix/lib64 + ln -s lib $prefix/lib64 +} diff --git a/pkgs/build-support/setup-hooks/move-sbin.sh b/pkgs/build-support/setup-hooks/move-sbin.sh new file mode 100644 index 000000000000..cc51c27cafdf --- /dev/null +++ b/pkgs/build-support/setup-hooks/move-sbin.sh @@ -0,0 +1,19 @@ +# This setup hook, for each output, moves everything in $output/sbin +# to $output/bin, and replaces $output/sbin with a symlink to +# $output/bin. + +fixupOutputHooks+=(_moveSbin) + +_moveSbin() { + if [ "$dontMoveSbin" = 1 ]; then return; fi + if [ ! -e "$prefix/sbin" -o -L "$prefix/sbin" ]; then return; fi + echo "moving $prefix/sbin/* to $prefix/bin" + mkdir -p $prefix/bin + shopt -s dotglob + for i in $prefix/sbin/*; do + mv "$i" $prefix/bin + done + shopt -u dotglob + rmdir $prefix/sbin + ln -s bin $prefix/sbin +} diff --git a/pkgs/build-support/setup-hooks/patch-shebangs.sh b/pkgs/build-support/setup-hooks/patch-shebangs.sh new file mode 100644 index 000000000000..5a7f23b2d816 --- /dev/null +++ b/pkgs/build-support/setup-hooks/patch-shebangs.sh @@ -0,0 +1,62 @@ +# This setup hook causes the fixup phase to rewrite all script +# interpreter file names (`#! /path') to paths found in $PATH. E.g., +# /bin/sh will be rewritten to /nix/store/<hash>-some-bash/bin/sh. +# /usr/bin/env gets special treatment so that ".../bin/env python" is +# rewritten to /nix/store/<hash>/bin/python. Interpreters that are +# already in the store are left untouched. + +fixupOutputHooks+=('if [ -z "$dontPatchShebangs" ]; then patchShebangs "$prefix"; fi') + +patchShebangs() { + local dir="$1" + header "patching script interpreter paths in $dir" + local f + local oldPath + local newPath + local arg0 + local args + local oldInterpreterLine + local newInterpreterLine + + find "$dir" -type f -perm +0100 | while read f; do + if [ "$(head -1 "$f" | head -c +2)" != '#!' ]; then + # missing shebang => not a script + continue + fi + + oldInterpreterLine=$(head -1 "$f" | tail -c +3) + read -r oldPath arg0 args <<< "$oldInterpreterLine" + + if $(echo "$oldPath" | grep -q "/bin/env$"); then + # Check for unsupported 'env' functionality: + # - options: something starting with a '-' + # - environment variables: foo=bar + if $(echo "$arg0" | grep -q -- "^-.*\|.*=.*"); then + echo "unsupported interpreter directive \"$oldInterpreterLine\" (set dontPatchShebangs=1 and handle shebang patching yourself)" + exit 1 + fi + newPath="$(command -v "$arg0" || true)" + else + if [ "$oldPath" = "" ]; then + # If no interpreter is specified linux will use /bin/sh. Set + # oldpath="/bin/sh" so that we get /nix/store/.../sh. + oldPath="/bin/sh" + fi + newPath="$(command -v "$(basename "$oldPath")" || true)" + args="$arg0 $args" + fi + + newInterpreterLine="$newPath $args" + + if [ -n "$oldPath" -a "${oldPath:0:${#NIX_STORE}}" != "$NIX_STORE" ]; then + if [ -n "$newPath" -a "$newPath" != "$oldPath" ]; then + echo "$f: interpreter directive changed from \"$oldInterpreterLine\" to \"$newInterpreterLine\"" + # escape the escape chars so that sed doesn't interpret them + escapedInterpreterLine=$(echo "$newInterpreterLine" | sed 's|\\|\\\\|g') + sed -i -e "1 s|.*|#\!$escapedInterpreterLine|" "$f" + fi + fi + done + + stopNest +} diff --git a/pkgs/build-support/setup-hooks/set-java-classpath.sh b/pkgs/build-support/setup-hooks/set-java-classpath.sh index 76e8e42ca268..047da91bc97c 100644 --- a/pkgs/build-support/setup-hooks/set-java-classpath.sh +++ b/pkgs/build-support/setup-hooks/set-java-classpath.sh @@ -10,4 +10,4 @@ addPkgToClassPath () { done } -envHooks=(''${envHooks[@]} addPkgToClassPath) +envHooks+=(addPkgToClassPath) diff --git a/pkgs/build-support/setup-hooks/strip.sh b/pkgs/build-support/setup-hooks/strip.sh new file mode 100644 index 000000000000..6860c9b9cb9a --- /dev/null +++ b/pkgs/build-support/setup-hooks/strip.sh @@ -0,0 +1,36 @@ +# This setup hook strips libraries and executables in the fixup phase. + +fixupOutputHooks+=(_doStrip) + +_doStrip() { + if [ -z "$dontStrip" ]; then + stripDebugList=${stripDebugList:-lib lib32 lib64 libexec bin sbin} + if [ -n "$stripDebugList" ]; then + stripDirs "$stripDebugList" "${stripDebugFlags:--S}" + fi + + stripAllList=${stripAllList:-} + if [ -n "$stripAllList" ]; then + stripDirs "$stripAllList" "${stripAllFlags:--s}" + fi + fi +} + +stripDirs() { + local dirs="$1" + local stripFlags="$2" + local dirsNew= + + for d in ${dirs}; do + if [ -d "$prefix/$d" ]; then + dirsNew="${dirsNew} $prefix/$d " + fi + done + dirs=${dirsNew} + + if [ -n "${dirs}" ]; then + header "stripping (with flags $stripFlags) in$dirs" + find $dirs -type f -print0 | xargs -0 ${xargsFlags:--r} strip $commonStripFlags $stripFlags || true + stopNest + fi +} diff --git a/pkgs/build-support/substitute-files/substitute-all-files.nix b/pkgs/build-support/substitute-files/substitute-all-files.nix new file mode 100644 index 000000000000..642919016037 --- /dev/null +++ b/pkgs/build-support/substitute-files/substitute-all-files.nix @@ -0,0 +1,22 @@ +{ stdenv }: + +args: + +stdenv.mkDerivation ({ + name = if args ? name then args.name else baseNameOf (toString args.src); + builder = with stdenv.lib; builtins.toFile "builder.sh" '' + source $stdenv/setup + set -o pipefail + + eval "$preInstall" + + args= + + cd "$src" + echo -ne "${concatStringsSep "\\0" args.files}" | xargs -0 -n1 -I {} -- find {} -type f -print0 | while read -d "" line; do + mkdir -p "$out/$(dirname "$line")" + substituteAll "$line" "$out/$line" + done + ''; + preferLocalBuild = true; +} // args) diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index c08a6c3a265f..78e671e8d229 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -1,4 +1,4 @@ -{ stdenv, lndir }: +{ lib, stdenv, lndir }: rec { @@ -30,7 +30,7 @@ rec { (test -n "$executable" && chmod +x "$n") || true ''; - + # Shorthands for `writeTextFile'. writeText = name: text: writeTextFile {inherit name text;}; writeTextDir = name: text: writeTextFile {inherit name text; destination = "/${name}";}; @@ -55,9 +55,9 @@ rec { ('' mkdir -p $out/nix-support cp ${script} $out/nix-support/setup-hook - '' + stdenv.lib.optionalString (deps != []) '' + '' + lib.optionalString (deps != []) '' echo ${toString deps} > $out/nix-support/propagated-native-build-inputs - '' + stdenv.lib.optionalString (substitutions != {}) '' + '' + lib.optionalString (substitutions != {}) '' substituteAll ${script} $out/nix-support/setup-hook ''); @@ -80,7 +80,7 @@ rec { # Quickly create a set of symlinks to derivations. # entries is a list of attribute sets like { name = "name" ; path = "/nix/store/..."; } linkFarm = name: entries: runCommand name {} ("mkdir -p $out; cd $out; \n" + - (stdenv.lib.concatMapStrings (x: "ln -s '${x.path}' '${x.name}';\n") entries)); + (lib.concatMapStrings (x: "ln -s '${x.path}' '${x.name}';\n") entries)); # Require file requireFile = {name, sha256, url ? null, message ? null} : diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 72cc7f68b090..962f9f6a10f1 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -52,11 +52,11 @@ rec { createDeviceNodes = dev: '' - mknod ${dev}/null c 1 3 - mknod ${dev}/zero c 1 5 - mknod ${dev}/random c 1 8 - mknod ${dev}/urandom c 1 9 - mknod ${dev}/tty c 5 0 + mknod -m 666 ${dev}/null c 1 3 + mknod -m 666 ${dev}/zero c 1 5 + mknod -m 666 ${dev}/random c 1 8 + mknod -m 666 ${dev}/urandom c 1 9 + mknod -m 666 ${dev}/tty c 5 0 mknod ${dev}/rtc c 254 0 . /sys/class/block/${hd}/uevent mknod ${dev}/${hd} b $MAJOR $MINOR @@ -118,7 +118,7 @@ rec { mount -t 9p store /fs/nix/store -o trans=virtio,version=9p2000.L,msize=262144,cache=loose mkdir -p /fs/tmp - mount -t tmpfs -o "mode=755" none /fs/tmp + mount -t tmpfs -o "mode=1777" none /fs/tmp echo "mounting host's temporary directory..." mkdir -p /fs/tmp/xchg @@ -1511,6 +1511,40 @@ rec { packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; }; + ubuntu1410i386 = { + name = "ubuntu-14.10-utopic-i386"; + fullName = "Ubuntu 14.10 Utopic (i386)"; + packagesLists = + [ (fetchurl { + url = mirror://ubuntu/dists/utopic/main/binary-i386/Packages.bz2; + sha256 = "d703032d9291783772c790c17d428ea6cf6d04c3baac5159e623ae60b681e64e"; + }) + (fetchurl { + url = mirror://ubuntu/dists/utopic/universe/binary-i386/Packages.bz2; + sha256 = "cc9232b7fd937bd8894ad6daf28bd4b2a7428e09a0c1661c708e846b3af24ec8"; + }) + ]; + urlPrefix = mirror://ubuntu; + packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; + }; + + ubuntu1410x86_64 = { + name = "ubuntu-14.10-utopic-amd64"; + fullName = "Ubuntu 14.10 Utopic (amd64)"; + packagesList = + [ (fetchurl { + url = mirror://ubuntu/dists/utopic/main/binary-amd64/Packages.bz2; + sha256 = "56b5cce1a2c8ae1ea46b1d4c50345f0fc8f1108a8db27f6dd8409d566eb517c9"; + }) + (fetchurl { + url = mirror://ubuntu/dists/utopic/universe/binary-amd64/Packages.bz2; + sha256 = "66ca2bf3363b4b45b97e5f5047bd736947d672c31693ed78bacd36e63b19bb63"; + }) + ]; + urlPrefix = mirror://ubuntu; + packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; + }; + debian40i386 = { name = "debian-4.0r9-etch-i386"; fullName = "Debian 4.0r9 Etch (i386)"; @@ -1582,22 +1616,22 @@ rec { debian70x86_64 = debian7x86_64; debian7i386 = { - name = "debian-7.6-wheezy-i386"; - fullName = "Debian 7.6 Wheezy (i386)"; + name = "debian-7.7-wheezy-i386"; + fullName = "Debian 7.7 Wheezy (i386)"; packagesList = fetchurl { url = mirror://debian/dists/wheezy/main/binary-i386/Packages.bz2; - sha256 = "773ba601513cd7ef1d5192ad8baa795fa050573d82568c577cdf79adade698a3"; + sha256 = "f2fd890597b6f0d82c5d66ccc8b12a963937a0576a377dd0ccbe47de4c1b09c8"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; }; debian7x86_64 = { - name = "debian-7.6-wheezy-amd64"; - fullName = "Debian 7.6 Wheezy (amd64)"; + name = "debian-7.7-wheezy-amd64"; + fullName = "Debian 7.7 Wheezy (amd64)"; packagesList = fetchurl { url = mirror://debian/dists/wheezy/main/binary-amd64/Packages.bz2; - sha256 = "11a8bd3648d51f51e56c9f5382168cc47267d67ef6a050826e1cd358ed46cc17"; + sha256 = "8ce14e88febc58310a1c13350f016ce583f068d10031ed4f0cb50985707786d8"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index 2ec66152f7dc..603ae5c684b3 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "man-pages-3.73"; + name = "man-pages-3.75"; src = fetchurl { url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz"; - sha256 = "01qcafrq9z55kh5q97fir13l9cg2a1ls7ijkgzj99kgc6vkc90h5"; + sha256 = "1xnja13a3zb7gzcsdn7sx962lk6mj8m3rz1w7fpgvhsq745cmah6"; }; preBuild = diff --git a/pkgs/data/documentation/stdman/default.nix b/pkgs/data/documentation/stdman/default.nix new file mode 100644 index 000000000000..33c002e98013 --- /dev/null +++ b/pkgs/data/documentation/stdman/default.nix @@ -0,0 +1,32 @@ +{ stdenv, curl, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "stdman-${version}"; + version = "d860212"; + + src = fetchFromGitHub { + owner = "jeaye"; + repo = "stdman"; + rev = "d860212767ca60472e33aa3bad22a3eac834b1f8"; + sha256 = "09c5gjhcz97ghfrv9zkgfb1wckvmqnhbzga0xidbm1ir7640di8l"; + }; + + preConfigure = " + patchShebangs ./configure + patchShebangs ./do_install + "; + + buildInputs = [ curl ]; + + meta = with stdenv.lib; { + description = "Formatted C++11/14 stdlib man pages (cppreference)"; + longDescription = "stdman is a tool that parses archived HTML + files from cppreference and generates groff-formatted manual + pages for Unix-based systems. The goal is to provide excellent + formatting for easy readability."; + homepage = https://github.com/jeaye/stdman; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.twey ]; + }; +} diff --git a/pkgs/data/fonts/aurulent-sans/default.nix b/pkgs/data/fonts/aurulent-sans/default.nix index a56efa35c7c8..d6b4829d7306 100644 --- a/pkgs/data/fonts/aurulent-sans/default.nix +++ b/pkgs/data/fonts/aurulent-sans/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "Aurulent Sans"; longDescription = "Aurulent Sans is a humanist sans serif intended to be used as an interface font."; homepage = http://delubrum.org/; - license = "SIL"; + license = stdenv.lib.licenses.ofl; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/data/fonts/clearlyU/default.nix b/pkgs/data/fonts/clearlyU/default.nix index 2761ed6f3e69..b4750c90faad 100644 --- a/pkgs/data/fonts/clearlyU/default.nix +++ b/pkgs/data/fonts/clearlyU/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation { meta = { description = "A Unicode font"; + maintainers = [stdenv.lib.maintainers.raskin]; }; } diff --git a/pkgs/data/fonts/freefont-ttf/default.nix b/pkgs/data/fonts/freefont-ttf/default.nix index e1d9e1614f38..51505320ba40 100644 --- a/pkgs/data/fonts/freefont-ttf/default.nix +++ b/pkgs/data/fonts/freefont-ttf/default.nix @@ -1,13 +1,15 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, unzip}: stdenv.mkDerivation rec { - name = "freefont-ttf-20100919"; + name = "freefont-ttf-20120503"; src = fetchurl { - url = "mirror://gnu/freefont/${name}.tar.gz"; - sha256 = "1q3h5jp1mbdkinkwxy0lfd0a1q7azlbagraydlzaa2ng82836wg4"; + url = "mirror://gnu/freefont/${name}.zip"; + sha256 = "1bw9mrf5pqi2a29b7qw4nhhj566aqqmi28hkbn2a38c2pzqvm1bw"; }; + buildInputs = [ unzip ]; + installPhase = '' mkdir -p $out/share/fonts/truetype cp *.ttf $out/share/fonts/truetype diff --git a/pkgs/data/fonts/hasklig/default.nix b/pkgs/data/fonts/hasklig/default.nix new file mode 100644 index 000000000000..d2de6f63be3a --- /dev/null +++ b/pkgs/data/fonts/hasklig/default.nix @@ -0,0 +1,29 @@ +{stdenv, fetchurl, unzip}: + +stdenv.mkDerivation { + name = "hasklig-0.4"; + + src = fetchurl { + url = "https://github.com/i-tu/Hasklig/releases/download/0.4/Hasklig-0.4.zip"; + sha256 = "14j0zfapw6s6x5psp1rvx2i59rxdwb1jgwfgfhzhypr22qy40xi8"; + }; + + buildInputs = [ unzip ]; + + sourceRoot = "."; + + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + mkdir -p $out/share/fonts/opentype + cp *.otf $out/share/fonts/opentype + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/i-tu/Hasklig"; + description = "A font with ligatures for Haskell code based off Source Code Pro"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ davidrusu ]; + }; +} diff --git a/pkgs/data/fonts/junicode/default.nix b/pkgs/data/fonts/junicode/default.nix index ea579a589c47..45025701a1d4 100644 --- a/pkgs/data/fonts/junicode/default.nix +++ b/pkgs/data/fonts/junicode/default.nix @@ -1,24 +1,23 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation { - name = "junicode-0.6.15"; + name = "junicode-0.7.8"; src = fetchurl { - url = mirror://sourceforge/junicode/junicode-0.6.15.zip; - sha256 = "0p16r5s6qwyz0hayb6k61s5r2sfachlx7r6gpqqx5myx6ipbfdns"; + url = mirror://sourceforge/junicode/junicode/junicode-0-7-8/junicode-0-7-8.zip; + sha256 = "1lgkhj52s351ya7lp9z3xba7kaivgdvg80njhpj1rpc3jcmc69vl"; }; buildInputs = [ unzip ]; - sourceRoot = "."; - installPhase = '' mkdir -p $out/share/fonts/junicode-ttf - cp *.ttf $out/share/fonts/junicode-ttf + cp fonts/*.ttf $out/share/fonts/junicode-ttf ''; meta = { + homepage = http://junicode.sourceforge.net/; description = "A Unicode font"; }; } diff --git a/pkgs/data/fonts/kochi-substitute-naga10/default.nix b/pkgs/data/fonts/kochi-substitute-naga10/default.nix index 98ab8a3bcac5..ea2c15752d7f 100644 --- a/pkgs/data/fonts/kochi-substitute-naga10/default.nix +++ b/pkgs/data/fonts/kochi-substitute-naga10/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { ''; meta = { - description = "Japanese font, non-free replacement for MS Gothic and MS Mincho."; + description = "Japanese font, non-free replacement for MS Gothic and MS Mincho"; longDescription = '' Kochi Gothic and Kochi Mincho were developed as free replacements for the MS Gothic and MS Mincho fonts from Microsoft. This version of the fonts diff --git a/pkgs/data/fonts/kochi-substitute/default.nix b/pkgs/data/fonts/kochi-substitute/default.nix index dec20fd51000..574bc7f29218 100644 --- a/pkgs/data/fonts/kochi-substitute/default.nix +++ b/pkgs/data/fonts/kochi-substitute/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { ''; meta = { - description = "Japanese font, a free replacement for MS Gothic and MS Mincho."; + description = "Japanese font, a free replacement for MS Gothic and MS Mincho"; longDescription = '' Kochi Gothic and Kochi Mincho were developed as free replacements for the MS Gothic and MS Mincho fonts from Microsoft. These are the Debian diff --git a/pkgs/data/fonts/meslo-lg/default.nix b/pkgs/data/fonts/meslo-lg/default.nix new file mode 100644 index 000000000000..fe123f6622d0 --- /dev/null +++ b/pkgs/data/fonts/meslo-lg/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + version = "1.2.1"; + + name = "meslo-lg"; + + meslo-lg = fetchurl { + url="https://github.com/andreberg/Meslo-Font/blob/master/dist/v${version}/Meslo%20LG%20v${version}.zip?raw=true"; + name="${name}"; + sha256="1l08mxlzaz3i5bamnfr49s2k4k23vdm64b8nz2ha33ysimkbgg6h"; + }; + + meslo-lg-dz = fetchurl { + url="https://github.com/andreberg/Meslo-Font/blob/master/dist/v${version}/Meslo%20LG%20DZ%20v${version}.zip?raw=true"; + name="${name}-dz"; + sha256="0lnbkrvcpgz9chnvix79j6fiz36wj6n46brb7b1746182rl1l875"; + }; + + buildInputs = [ unzip ]; + + sourceRoot = "."; + + phases = [ "unpackPhase" "installPhase" ]; + unpackPhase = '' + unzip -j ${meslo-lg} + unzip -j ${meslo-lg-dz} + ''; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp *.ttf $out/share/fonts/truetype + ''; + + meta = { + description = "A customized version of Apple’s Menlo-Regular font"; + homepage = https://github.com/andreberg/Meslo-Font/; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ balajisivaraman ]; + platforms = with stdenv.lib.platforms; all; + }; +} diff --git a/pkgs/data/fonts/opensans-ttf/default.nix b/pkgs/data/fonts/opensans-ttf/default.nix index 2e0f3d5df2a7..946efa00b9ab 100644 --- a/pkgs/data/fonts/opensans-ttf/default.nix +++ b/pkgs/data/fonts/opensans-ttf/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://en.wikipedia.org/wiki/Open_Sans"; - license = "Apache"; + license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.all; maintainers = [ ]; diff --git a/pkgs/data/fonts/poly/default.nix b/pkgs/data/fonts/poly/default.nix index 63006fdd4f8a..1bd0d8980677 100644 --- a/pkgs/data/fonts/poly/default.nix +++ b/pkgs/data/fonts/poly/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Medium contrast serif font."; + description = "Medium contrast serif font"; longDescription = '' With short ascenders and a very high x-height, Poly is efficient in small sizes. Thanks to its careful balance between the x-height and glyph widths, diff --git a/pkgs/data/fonts/redhat-liberation-fonts/binary.nix b/pkgs/data/fonts/redhat-liberation-fonts/binary.nix new file mode 100644 index 000000000000..e3d2cfe0226a --- /dev/null +++ b/pkgs/data/fonts/redhat-liberation-fonts/binary.nix @@ -0,0 +1,49 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + version = "2.00.1"; + name = "liberation-fonts-${version}"; + src = fetchurl { + url = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz"; + sha256 = "010m4zfqan4w04b6bs9pm3gapn9hsb18bmwwgp2p6y6idj52g43q"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp -v $( find . -name '*.ttf') $out/share/fonts/truetype + + mkdir -p "$out/doc/${name}" + cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}" || true + ''; + + meta = { + description = "Liberation Fonts, replacements for Times New Roman, Arial, and Courier New"; + + longDescription = '' + The Liberation Fonts are intended to be replacements for the three most + commonly used fonts on Microsoft systems: Times New Roman, Arial, and + Courier New. + + There are three sets: Sans (a substitute for Arial, Albany, Helvetica, + Nimbus Sans L, and Bitstream Vera Sans), Serif (a substitute for Times + New Roman, Thorndale, Nimbus Roman, and Bitstream Vera Serif) and Mono + (a substitute for Courier New, Cumberland, Courier, Nimbus Mono L, and + Bitstream Vera Sans Mono). + + You are free to use these fonts on any system you would like. You are + free to redistribute them under the GPL+exception license found in the + download. Using these fonts does not subject your documents to the + GPL---it liberates them from any proprietary claim. + ''; + + # See `License.txt' for details. + license = stdenv.lib.licenses.gpl2Oss; + + homepage = https://fedorahosted.org/liberation-fonts/; + + maintainers = [ + stdenv.lib.maintainers.raskin + stdenv.lib.maintainers.ludo + ]; + }; +} diff --git a/pkgs/data/fonts/redhat-liberation-fonts/default.nix b/pkgs/data/fonts/redhat-liberation-fonts/default.nix index 08faeafc619c..f6d98088ef95 100644 --- a/pkgs/data/fonts/redhat-liberation-fonts/default.nix +++ b/pkgs/data/fonts/redhat-liberation-fonts/default.nix @@ -1,18 +1,21 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, fontforge, pythonPackages, python}: stdenv.mkDerivation rec { - name = "liberation-fonts-1.04"; + name = "liberation-fonts-2.00.1"; + src = fetchurl { url = "https://fedorahosted.org/releases/l/i/liberation-fonts/${name}.tar.gz"; - sha256 = "189i6pc4jqhhmsb9shi8afg9af9crpmz9bnlldhqaxavr1bhj38f"; + sha256 = "1ymryvd2nw4jmw4w5y1i3ll2dn48rpkqzlsgv7994lk6qc9cdjvs"; }; - + + buildInputs = [ fontforge pythonPackages.fonttools python ]; + installPhase = '' mkdir -p $out/share/fonts/truetype - cp -v *.ttf $out/share/fonts/truetype + cp -v $(find . -name '*.ttf') $out/share/fonts/truetype mkdir -p "$out/doc/${name}" - cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}" + cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}" || true ''; meta = { @@ -36,7 +39,7 @@ stdenv.mkDerivation rec { ''; # See `License.txt' for details. - license = "GPLv2 + exception"; + license = stdenv.lib.licenses.gpl2Oss; homepage = https://fedorahosted.org/liberation-fonts/; diff --git a/pkgs/data/fonts/source-code-pro/default.nix b/pkgs/data/fonts/source-code-pro/default.nix index 8fde0c6ef03f..dc5bcb5b9a79 100644 --- a/pkgs/data/fonts/source-code-pro/default.nix +++ b/pkgs/data/fonts/source-code-pro/default.nix @@ -37,6 +37,6 @@ rec { maintainers = with a.lib.maintainers; [ relrod ]; platforms = with a.lib.platforms; all; homepage = "http://blog.typekit.com/2012/09/24/source-code-pro/"; - license = "OFL"; + license = a.lib.licenses.ofl; }; }) x diff --git a/pkgs/data/fonts/symbola/default.nix b/pkgs/data/fonts/symbola/default.nix index 70375a22bae5..7efb1ea39471 100644 --- a/pkgs/data/fonts/symbola/default.nix +++ b/pkgs/data/fonts/symbola/default.nix @@ -1,15 +1,15 @@ {stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "symbola-7.17"; + name = "symbola-7.18"; src = fetchurl { url = "http://users.teilar.gr/~g1951d/Symbola.zip"; - sha256 = "19q5wcqk1rz8ps7jvvx1rai6x8ais79z71sm8d36hvsk2vr135al"; + sha256 = "1dk0qawlgdfh58pz2wb80rs9h8m20nmnr4bhk6jmva8201ixz62f"; }; docs_pdf = fetchurl { url = "http://users.teilar.gr/~g1951d/Symbola.pdf"; - sha256 = "11h2202p1p4np4nv5m8k41wk7431p2m35sjpmbi1ygizakkbla3p"; + sha256 = "16f37fsi2zyy3ka409g3m5d9c09l0ba3rqkz912j90p4588dvk85"; }; buildInputs = [ unzip ]; diff --git a/pkgs/data/fonts/ubuntu-font-family/default.nix b/pkgs/data/fonts/ubuntu-font-family/default.nix index 130aeef88ab4..d64a8883d326 100644 --- a/pkgs/data/fonts/ubuntu-font-family/default.nix +++ b/pkgs/data/fonts/ubuntu-font-family/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { contemporary style and contains characteristics unique to the Ubuntu brand that convey a precise, reliable and free attitude."; homepage = http://font.ubuntu.com/; - license = "free"; + license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.antono ]; }; diff --git a/pkgs/data/fonts/ucs-fonts/default.nix b/pkgs/data/fonts/ucs-fonts/default.nix index 1d2aa5e62d3b..bcba39571098 100644 --- a/pkgs/data/fonts/ucs-fonts/default.nix +++ b/pkgs/data/fonts/ucs-fonts/default.nix @@ -34,5 +34,6 @@ wrapFonts (stdenv.mkDerivation { meta = { description = "Unicode bitmap fonts"; + maintainers = [stdenv.lib.maintainers.raskin]; }; }) diff --git a/pkgs/data/misc/mobile-broadband-provider-info/default.nix b/pkgs/data/misc/mobile-broadband-provider-info/default.nix index 52e9ebf0617c..94a65f6e63e4 100644 --- a/pkgs/data/misc/mobile-broadband-provider-info/default.nix +++ b/pkgs/data/misc/mobile-broadband-provider-info/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "Mobile broadband service provider database"; homepage = http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders; platforms = stdenv.lib.platforms.all; - license = "CC-PD"; + license = stdenv.lib.licenses.publicDomain; maintainers = [ stdenv.lib.maintainers.urkud ]; }; } diff --git a/pkgs/data/misc/poppler-data/default.nix b/pkgs/data/misc/poppler-data/default.nix index 9e2679c04380..59dd4da792bb 100644 --- a/pkgs/data/misc/poppler-data/default.nix +++ b/pkgs/data/misc/poppler-data/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, cmake }: stdenv.mkDerivation rec { - name = "poppler-data-0.4.6"; + name = "poppler-data-0.4.7"; src = fetchurl { url = "http://poppler.freedesktop.org/${name}.tar.gz"; - sha256 = "1yhaz74b50hjkz3ii077kmq3qg3p3kdyxm33cv6r1njvz8fr01pk"; + sha256 = "1pm7wg6xqj4sppb5az4pa7psfdk4yxxkw52j85bm9fksibcb0lp7"; }; buildInputs = [ cmake ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { homepage = http://poppler.freedesktop.org/; description = "Encoding files for Poppler, a PDF rendering library"; platforms = stdenv.lib.platforms.all; - license = "free"; # more free licenses combined + license = stdenv.lib.licenses.free; # more free licenses combined maintainers = [ stdenv.lib.maintainers.urkud ]; }; } diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 6a4427bea404..df3f3ec82246 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -let version = "2014g"; in +let version = "2014j"; in stdenv.mkDerivation rec { name = "tzdata-${version}"; @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { srcs = [ (fetchurl { url = "http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz"; - sha256 = "0w52hafnf82vy678rm8p39ckymcj6shv5376zwzzbxw2m6vxaism"; + sha256 = "038fvj6zf51k6z9sbbxbj87ajaf69l3whal2vwshbm4l0qr71n52"; }) (fetchurl { url = "http://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz"; - sha256 = "0ymg0cscpbfj9jpnx4g9apmfrixq6z8dch99h6a77k2pmnj5ymfz"; + sha256 = "1qpd12imy7q5hb5fhk48mfw65s0xlrkmms0zr2gk0mj88qjn3m3z"; }) ]; @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.iana.org/time-zones; description = "Database of current and historical time zones"; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix index e4e5a7367c64..7ff79488a89f 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix @@ -21,4 +21,7 @@ import ./generic.nix { postInstall = " sed 's|V4.2|V4.1.2|g' < ${docbook42catalog} > catalog.xml "; + meta = { + branch = "4.1.2"; + }; } diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix index 47cbbf33c019..7071d4a471ff 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix @@ -7,4 +7,7 @@ import ./generic.nix { url = http://www.docbook.org/xml/4.2/docbook-xml-4.2.zip; md5 = "73fe50dfe74ca631c1602f558ed8961f"; }; + meta = { + branch = "4.2"; + }; } diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix index 6a2e4e65a821..478dd68e8bbb 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix @@ -7,4 +7,7 @@ import ./generic.nix { url = http://www.docbook.org/xml/4.3/docbook-xml-4.3.zip; md5 = "ab200202b9e136a144db1e0864c45074"; }; + meta = { + branch = "4.3"; + }; } diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix index eb26d185bbe7..669536962a12 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix @@ -7,4 +7,7 @@ import ./generic.nix { url = http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip; sha256 = "1d671lcjckjri28xfbf6dq7y3xnkppa910w1jin8rjc35dx06kjf"; }; + meta = { + branch = "4.5"; + }; } diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix index f4ee845b5f19..29a18f4ce69e 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix @@ -1,9 +1,9 @@ -{stdenv, fetchurl, unzip, src, name, postInstall ? "true"}: +{ stdenv, fetchurl, unzip, src, name, postInstall ? "true", meta ? {} }: assert unzip != null; stdenv.mkDerivation { - inherit src name postInstall; + inherit src name postInstall meta; builder = ./builder.sh; buildInputs = [unzip]; } diff --git a/pkgs/desktops/e17/default.nix b/pkgs/desktops/e17/default.nix deleted file mode 100644 index 648a35778635..000000000000 --- a/pkgs/desktops/e17/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ callPackage, pkgs }: -rec { - #### CORE EFL - - eina = callPackage ./eina { }; - - eet = callPackage ./eet { }; - - evas = callPackage ./evas { }; - - ecore = callPackage ./ecore { }; - - eio = callPackage ./eio { }; - - embryo = callPackage ./embryo { }; - - edje = callPackage ./edje { lua = pkgs.lua5; }; - - efreet = callPackage ./efreet { }; - - e_dbus = callPackage ./e_dbus { }; - - eeze = callPackage ./eeze { }; - - emotion = callPackage ./emotion { }; - - ethumb = callPackage ./ethumb { }; - - elementary = callPackage ./elementary { }; - - - #### WINDOW MANAGER - - enlightenment = callPackage ./enlightenment { }; - - - #### APPLICATIONS - - terminology = callPackage ./terminology { }; - - - - #### ART - - - - -} diff --git a/pkgs/desktops/e17/e_dbus/default.nix b/pkgs/desktops/e17/e_dbus/default.nix deleted file mode 100644 index cfc0203b3e0f..000000000000 --- a/pkgs/desktops/e17/e_dbus/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, expat, ecore, eina, evas -, dbus_libs }: -stdenv.mkDerivation rec { - name = "e_dbus-${version}"; - version = "1.7.5"; - src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "16ckrpzzw5x1cs0fwqkk8431al55xil5magihkp9l3s77g0qd26q"; - }; - buildInputs = [ pkgconfig zlib libjpeg expat ecore eina evas ]; - propagatedBuildInputs = [ dbus_libs ]; - setupHook = ./setup-hook.sh; - configureFlags = '' - --disable-edbus-test - --disable-edbus-test-client - --disable-edbus-notify-send - --disable-edbus-notify-test - --disable-edbus-async-test - ''; - meta = { - description = "Enlightenment's D-Bus wrapping and glue layer library"; - longDescription = '' - Enlightenment's E_Dbus is a set of wrappers around DBus APIs by - third party, so they can be easily used by EFL applications, - automatically providing Ecore/main loop integration, as well as - Eina data types. - ''; - homepage = http://enlightenment.org/; - license = stdenv.lib.licenses.bsd2; # not sure - }; -} diff --git a/pkgs/desktops/e17/e_dbus/setup-hook.sh b/pkgs/desktops/e17/e_dbus/setup-hook.sh deleted file mode 100644 index d98f24b4c04b..000000000000 --- a/pkgs/desktops/e17/e_dbus/setup-hook.sh +++ /dev/null @@ -1,8 +0,0 @@ -addDbusIncludePath () { - if test -d "$1/include/dbus-1.0" - then - export NIX_CFLAGS_COMPILE="${NIX_CFLAGS_COMPILE} -I$1/include/dbus-1.0 -I $1/lib/dbus-1.0/include" - fi -} - -envHooks=(${envHooks[@]} addDbusIncludePath) diff --git a/pkgs/desktops/e17/ecore/default.nix b/pkgs/desktops/e17/ecore/default.nix deleted file mode 100644 index 4a3eef4ec490..000000000000 --- a/pkgs/desktops/e17/ecore/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, eina, evas, libX11, libXext, libXrender -, libXcomposite, libXfixes, libXdamage }: -stdenv.mkDerivation rec { - name = "ecore-${version}"; - version = "1.7.5"; - src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "08ljda6p0zj1h5sq3l0js6mihw8cr6ydynn42dnka36vachvmfjb"; - }; - buildInputs = [ pkgconfig eina evas ]; - propagatedBuildInputs = [ libX11 libXext libXcomposite libXrender libXfixes - libXdamage - ]; - meta = { - description = "Enlightenment's core mainloop, display abstraction and utility library"; - longDescription = '' - Enlightenment's Ecore is a clean and tiny event loop library - with many modules to do lots of convenient things for a - programmer, to save time and effort. - - It's small and lean, designed to work on embedded systems all - the way to large and powerful multi-cpu workstations. It - serialises all system signals, events etc. into a single event - queue, that is easily processed without needing to worry about - concurrency. A properly written, event-driven program using this - kind of programming doesn't need threads, nor has to worry about - concurrency. It turns a program into a state machine, and makes - it very robust and easy to follow. - ''; - homepage = http://enlightenment.org/; - license = stdenv.lib.licenses.bsd2; # not sure - }; -} diff --git a/pkgs/desktops/e17/edje/default.nix b/pkgs/desktops/e17/edje/default.nix deleted file mode 100644 index 62758b2094e5..000000000000 --- a/pkgs/desktops/e17/edje/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, lua, expat, zlib, libjpeg, eina, eet, evas -, ecore, embryo }: -stdenv.mkDerivation rec { - name = "edje-${version}"; - version = "1.7.5"; - src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "1hsyj46bk94yd9ymf9425pf4ygy36h5gdkg9fhf8qds8cnn2kcy7"; - }; - buildInputs = [ pkgconfig expat zlib libjpeg lua eina eet evas ecore embryo ]; - patchPhase = '' - substituteInPlace src/bin/edje_cc_out.c --replace '%s/embryo_cc' '${embryo}/bin/embryo_cc' - substituteInPlace src/bin/edje_cc_out.c --replace 'eina_prefix_bin_get(pfx),' "" - ''; - meta = { - description = "Enlightenment's abstract GUI layout and animation object library"; - longDescription = '' - Enlightenment's Edje is a complex graphical design & layout - library based on Evas that provides an abstraction layer between - the application code and the interface, while allowing extremely - flexible dynamic layouts and animations. - - In more popular terms, Edje makes every application that uses it - "skinable". - ''; - homepage = http://enlightenment.org/; - license = stdenv.lib.licenses.bsd2; # not sure - }; -} diff --git a/pkgs/desktops/e17/eet/default.nix b/pkgs/desktops/e17/eet/default.nix deleted file mode 100644 index 079d07187ff4..000000000000 --- a/pkgs/desktops/e17/eet/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, eina, zlib, libjpeg }: -stdenv.mkDerivation rec { - name = "eet-${version}"; - version = "1.7.5"; - src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "0ys2579v45f9x2n47shq0k63g0sdbj1ndhh72dvfajihsgjwd767"; - }; - buildInputs = [ pkgconfig eina zlib libjpeg ]; - meta = { - description = "Enlightenment's data encode/decode and storage library"; - longDescription = '' - Enlightenment's EET is a tiny library designed to write an - arbitary set of chunks of data to a file and optionally compress - each chunk (very much like a zip file) and allow fast - random-access reading of the file later on. EET files are - perfect for storing data that is written once (or rarely) and - read many times, especially when the program does not want to - have to read all the data in at once. - - Use this library when you need to pack C structure and you want - to retrieve it quickly with as few as possible memory use. You - can also use it to serialize data quickly and exchange them - between two program over ipc or network link. - ''; - homepage = http://enlightenment.org/; - license = stdenv.lib.licenses.bsd2; # not sure - }; -} diff --git a/pkgs/desktops/e17/eeze/default.nix b/pkgs/desktops/e17/eeze/default.nix deleted file mode 100644 index 162fbcf1aef1..000000000000 --- a/pkgs/desktops/e17/eeze/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, eina, ecore, udev }: -stdenv.mkDerivation rec { - name = "eeze-${version}"; - version = "1.7.5"; - src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "0274fs4cxgw6420yyz9frrc8zhj0qqyvwczzslq3kih3sx1nikxr"; - }; - buildInputs = [ pkgconfig eina ecore ]; - propagatedBuildInputs = [ udev ]; - meta = { - description = "Enlightenment's device abstraction library"; - longDescription = '' - Enlightenment's Eeze is a library for manipulating devices - through udev with a simple and fast api. It interfaces directly - with libudev, avoiding such middleman daemons as udisks/upower - or hal, to immediately gather device information the instant it - becomes known to the system. - ''; - homepage = http://enlightenment.org/; - license = stdenv.lib.licenses.bsd2; # not sure - }; -} diff --git a/pkgs/desktops/e17/efreet/default.nix b/pkgs/desktops/e17/efreet/default.nix deleted file mode 100644 index dfe755db5978..000000000000 --- a/pkgs/desktops/e17/efreet/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, eina, eet, ecore }: -stdenv.mkDerivation rec { - name = "efreet-${version}"; - version = "1.7.5"; - src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "1yw7qjddqcnsz1vb693pa57v9wydvzfy198dc23mz46qfqx08nlg"; - }; - buildInputs = [ pkgconfig eina eet ecore ]; - meta = { - description = "Enlightenment's standards handling for freedesktop.org standards"; - longDescription = '' - Enlightenment's Efreet is a library designed to help apps work - several of the Freedesktop.org standards regarding Icons, - Desktop files and Menus. To that end it implements the following - specifications: - - * XDG Base Directory Specification - * Icon Theme Specification - * Desktop Entry Specification - * Desktop Menu Specification - * FDO URI Specification - * Shared Mime Info Specification - * Trash Specification - ''; - homepage = http://enlightenment.org/; - license = stdenv.lib.licenses.bsd2; # not sure - }; -} diff --git a/pkgs/desktops/e17/eina/default.nix b/pkgs/desktops/e17/eina/default.nix deleted file mode 100644 index 77d4829a8419..000000000000 --- a/pkgs/desktops/e17/eina/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl }: -stdenv.mkDerivation rec { - name = "eina-${version}"; - version = "1.7.5"; - src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "0kd4116njrbag9h459cmfpg07c4ag04z3yrsg513lpi27amch27w"; - }; - meta = { - description = "Enlightenment's core data structure library"; - longDescription = '' - Enlightenment's Eina is a core data structure and common utility - library. - ''; - homepage = http://enlightenment.org/; - license = stdenv.lib.licenses.lgpl21; - }; -} diff --git a/pkgs/desktops/e17/eio/default.nix b/pkgs/desktops/e17/eio/default.nix deleted file mode 100644 index b56422fd7741..000000000000 --- a/pkgs/desktops/e17/eio/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, eet, eina, ecore }: -stdenv.mkDerivation rec { - name = "eio-${version}"; - version = "1.7.5"; - src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "1bsam5q364kc4xwfv7pql6686gj0byhk42zwjqx9ajf70l23kss6"; - }; - buildInputs = [ pkgconfig eet eina ecore ]; - meta = { - description = "A library that integrates with EFL to provide efficient filesystem IO"; - longDescription = '' - Eio integrates with EFL (Ecore, Eina) to provide efficient filesystem Input/Output. - It use the best techniques to achieve such purpose, like using at-variants, splice, - properly handling errors and doing it in an asynchronous fashion by means of worker - threads. It is also ported to Windows, so multi-platform. - - Whenever you need to list a directory, copy, move or delete files, Eio will do that - task better than you'd achieve with naive implementations, and it is easy to use. - ''; - homepage = http://enlightenment.org/; - license = stdenv.lib.licenses.lgpl21; - }; -} diff --git a/pkgs/desktops/e17/elementary/default.nix b/pkgs/desktops/e17/elementary/default.nix deleted file mode 100644 index b0240d986dea..000000000000 --- a/pkgs/desktops/e17/elementary/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, eina, eet, evas, ecore, edje }: -stdenv.mkDerivation rec { - name = "elementary-${version}"; - version = "1.7.5"; - src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "08cb4x9639xyrb8d4vzvhl6v385qjfswl717sicm7iimh5zlm2l9"; - }; - buildInputs = [ pkgconfig eina eet evas ecore edje ]; - meta = { - description = "Enlightenment's core data structure library"; - longDescription = '' - Enlightenment's Eina is a core data structure and common utility - library. - ''; - homepage = http://enlightenment.org/; - license = stdenv.lib.licenses.lgpl21; - }; -} diff --git a/pkgs/desktops/e17/embryo/default.nix b/pkgs/desktops/e17/embryo/default.nix deleted file mode 100644 index 59b5540f25d4..000000000000 --- a/pkgs/desktops/e17/embryo/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, eina }: -stdenv.mkDerivation rec { - name = "embryo-${version}"; - version = "1.7.5"; - src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "104fsa179w2dfg00sfnap7c3b4ixcps4crxa6yav755awssdcim9"; - }; - buildInputs = [ pkgconfig eina ]; - meta = { - description = "Enlightenment's small Pawn based virtual machine and compiler"; - longDescription = '' - Enlightenment's Embryo is a tiny library designed to interpret - limited Small programs compiled by the included compiler, - embryo_cc. It is mostly a cleaned up and smaller version of the - original Small abstract machine. The compiler is mostly - untouched. - ''; - homepage = http://enlightenment.org/; - license = with stdenv.lib.licenses; [ bsd2.shortName bsd3.shortName ]; # not sure - }; -} diff --git a/pkgs/desktops/e17/emotion/default.nix b/pkgs/desktops/e17/emotion/default.nix deleted file mode 100644 index 9ec3631b1e78..000000000000 --- a/pkgs/desktops/e17/emotion/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, ecore, evas, eet, eina, edje, vlc }: -stdenv.mkDerivation rec { - name = "emotion-${version}"; - version = "1.7.5"; - src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "1sfw8kpj2fcqymzd6q7p51xxib1n2arvjl1hnwhqkvwhlsq2b4sw"; - }; - buildInputs = [ pkgconfig ecore evas eet eina edje vlc ]; - meta = { - description = "A library to easily integrate media playback into EFL applications"; - longDescription = '' - Emotion is a library to easily integrate media playback into EFL applications, - it will take care of using Ecore's main loop and video display is done using Evas. - ''; - homepage = http://enlightenment.org/; - license = stdenv.lib.licenses.lgpl21; - }; -} diff --git a/pkgs/desktops/e17/enlightenment/default.nix b/pkgs/desktops/e17/enlightenment/default.nix deleted file mode 100644 index 953c90e80032..000000000000 --- a/pkgs/desktops/e17/enlightenment/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, eina, eet, evas, ecore, edje, efreet, e_dbus -, embryo, eio, xcbutilkeysyms, libjpeg }: -stdenv.mkDerivation rec { - name = "enlightenment-${version}"; - version = "0.17.1"; - src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "1z2vx9r7yc55rs673jg7d685slgdv9dss45asg50wh5wxp2mfi3y"; - }; - buildInputs = [ pkgconfig eina eet ecore evas edje efreet e_dbus embryo - eio xcbutilkeysyms libjpeg ]; - configureFlags = '' - --with-profile=FAST_PC - --disable-illume - --disable-illume2 - ''; - meta = { - description = "A window manager"; - longDescription = '' - The Enlightenment Desktop shell provides an efficient yet - breathtaking window manager based on the Enlightenment - Foundation Libraries along with other essential desktop - components like a file manager, desktop icons and widgets. - - It boasts a un-precedented level of theme-ability while still - being capable of performing on older hardware or embedded - devices. - ''; - homepage = http://enlightenment.org/; - license = stdenv.lib.licenses.bsd2; # not sure - }; -} diff --git a/pkgs/desktops/e17/ethumb/default.nix b/pkgs/desktops/e17/ethumb/default.nix deleted file mode 100644 index 344abe1e3f12..000000000000 --- a/pkgs/desktops/e17/ethumb/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, eina, evas, ecore, edje, eet, e_dbus, emotion, libexif }: -stdenv.mkDerivation rec { - name = "ethumb-${version}"; - version = "1.7.5"; - src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "0prka3knz8p2n46dfrzgwn55khhhrhjny4vvnzkjcwmhvz7kgc9l"; - }; - buildInputs = [ pkgconfig eina evas ecore edje eet emotion libexif ]; - propagatedBuildInputs = [ e_dbus libexif ]; - meta = { - description = "A thumbnail generation library"; - longDescription = '' - Ethumb - thumbnail generation library. Features: - * create thumbnails with a predefined frame (possibly an edje frame); - * have an option to create fdo-like thumbnails; - * have a client/server utility; - * TODO: make thumbnails from edje backgrounds, icons and themes; - ''; - homepage = http://enlightenment.org/; - license = stdenv.lib.licenses.lgpl21; - }; -} diff --git a/pkgs/desktops/e17/evas/default.nix b/pkgs/desktops/e17/evas/default.nix deleted file mode 100644 index c271caa980d6..000000000000 --- a/pkgs/desktops/e17/evas/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, freetype, fontconfig, libpng, libjpeg -, libX11, libXext, eina, eet }: -stdenv.mkDerivation rec { - name = "evas-${version}"; - version = "1.7.5"; - src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "0x3k89q2wxgxjsbhdf4qws7jgpjl7rpqji98ca3nf25jf2lm1cvh"; - }; - buildInputs = [ pkgconfig freetype fontconfig libpng libjpeg - libX11 libXext eina eet - ]; - meta = { - description = "Enlightenment's canvas and scenegraph rendering library"; - longDescription = '' - Enlightenment's Evas is a clean display canvas API that - implements a scene graph, not an immediate-mode rendering - target, is cross-platform, for several target display systems - that can draw anti-aliased text, smooth super and sub-sampled - scaled images, alpha-blend objects and much more. - ''; - homepage = http://enlightenment.org/; - license = stdenv.lib.licenses.bsd2; # not sure - }; -} diff --git a/pkgs/desktops/e17/terminology/default.nix b/pkgs/desktops/e17/terminology/default.nix deleted file mode 100644 index 692f4e73ac2c..000000000000 --- a/pkgs/desktops/e17/terminology/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, elementary, eina, eet, evas, edje, emotion, ecore, ethumb, efreet }: - -stdenv.mkDerivation rec { - name = "terminology-${version}"; - version = "0.5.1"; - src = fetchurl { - url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.gz"; - sha256 = "1b8m6fhzx2fdr3m6ak2163v33zc4svmg2k875m0xppzifdd9xvyf"; - }; - buildInputs = [ pkgconfig elementary eina eet evas ecore edje emotion ecore ethumb efreet ]; - - meta = { - description = "Terminology, the E17 terminal emulator"; - homepage = http://www.enlightenment.org/p.php?p=about/terminology; - license = stdenv.lib.licenses.bsd2; # not sure - }; -} diff --git a/pkgs/desktops/e18/default.nix b/pkgs/desktops/e18/default.nix deleted file mode 100644 index 56361eb85ce1..000000000000 --- a/pkgs/desktops/e18/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ callPackage, pkgs }: -rec { - #### CORE EFL - efl = callPackage ./efl.nix { }; - evas = callPackage ./evas.nix { }; - emotion = callPackage ./emotion.nix { }; - elementary = callPackage ./elementary.nix { }; - - #### WINDOW MANAGER - enlightenment = callPackage ./enlightenment.nix { }; - - #### APPLICATIONS - econnman = callPackage ./econnman.nix { }; - terminology = callPackage ./terminology.nix { }; - -} diff --git a/pkgs/desktops/e18/econnman.nix b/pkgs/desktops/e18/econnman.nix deleted file mode 100644 index f2c67edf4f88..000000000000 --- a/pkgs/desktops/e18/econnman.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, e18, python27, python27Packages, dbus, makeWrapper }: -stdenv.mkDerivation rec { - name = "econnman-${version}"; - version = "1.1"; - src = fetchurl { - url = "http://download.enlightenment.org/rel/apps/econnman/${name}.tar.gz"; - sha256 = "057pwwavlvrrq26bncqnfrf449zzaim0zq717xv86av4n940gwv0"; - }; - - buildInputs = [ makeWrapper pkgconfig e18.efl python27 dbus ]; - propagatedBuildInputs = [ python27Packages.pythonefl python27Packages.dbus e18.elementary ]; - postInstall = '' - wrapProgram $out/bin/econnman-bin --prefix PYTHONPATH : ${python27Packages.dbus}/lib/python2.7/site-packages:${python27Packages.pythonefl}/lib/python2.7/site-packages - ''; - - meta = { - description = "Econnman is a user interface for the connman network connection manager"; - homepage = http://enlightenment.org/; - maintainers = [ stdenv.lib.maintainers.matejc ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.lgpl3; - }; -} diff --git a/pkgs/desktops/e18/efl.nix b/pkgs/desktops/e18/efl.nix deleted file mode 100644 index ca09ac32ee53..000000000000 --- a/pkgs/desktops/e18/efl.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, pulseaudio, libsndfile, xlibs, wayland, libdrm, libxkbcommon, udev, utillinuxCurses, dbus, bullet, luajit, python27Packages }: -stdenv.mkDerivation rec { - name = "efl-${version}"; - version = "1.10.2"; - src = fetchurl { - url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.gz"; - sha256 = "0py8x0kv2hgl5v983xb6653fvmvn20im6picpc0hqfyxy09g1b24"; - }; - buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL mesa giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-libav pulseaudio libsndfile xlibs.libXcursor xlibs.printproto xlibs.libX11 libdrm udev utillinuxCurses luajit ]; - propagatedBuildInputs = [ wayland libxkbcommon python27Packages.dbus dbus libjpeg xlibs.libXcomposite xlibs.libXdamage xlibs.libXinerama xlibs.libXp xlibs.libXtst xlibs.libXi xlibs.libXext bullet xlibs.libXScrnSaver ]; - configureFlags = [ "--with-opengl=full" "--with-tests=none" "--enable-wayland" "--enable-sdl" "--enable-drm" ]; - preConfigure = '' - export NIX_CFLAGS_COMPILE="-I${xlibs.libXtst} $NIX_CFLAGS_COMPILE" - export PKG_CONFIG_PATH="${gst_all_1.gst-plugins-base}/lib/pkgconfig/gstreamer-video-0.10.pc:$PKG_CONFIG_PATH" - ''; - meta = { - description = "Enlightenment Core libraries"; - homepage = http://enlightenment.org/; - maintainers = [ stdenv.lib.maintainers.matejc ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.lgpl3; - }; -} diff --git a/pkgs/desktops/e18/elementary.nix b/pkgs/desktops/e18/elementary.nix deleted file mode 100644 index f808d5c905b7..000000000000 --- a/pkgs/desktops/e18/elementary.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, e18 }: -stdenv.mkDerivation rec { - name = "elementary-${version}"; - version = "1.10.2"; - src = fetchurl { - url = "http://download.enlightenment.org/rel/libs/elementary/${name}.tar.gz"; - sha256 = "0y3knvmabl9adc8pd54p7qxpf7gvciixc1rk40hqppwhdgbgpz28"; - }; - buildInputs = [ pkgconfig e18.efl ]; - preConfigure = '' - export NIX_CFLAGS_COMPILE="-I${e18.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE" - ''; - meta = { - description = "Widget set/toolkit"; - homepage = http://enlightenment.org/; - maintainers = [ stdenv.lib.maintainers.matejc ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.lgpl2; - }; -} diff --git a/pkgs/desktops/e18/emotion.nix b/pkgs/desktops/e18/emotion.nix deleted file mode 100644 index 7e1c3be64008..000000000000 --- a/pkgs/desktops/e18/emotion.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, e18, vlc }: -stdenv.mkDerivation rec { - name = "emotion_generic_players-${version}"; - version = "1.10.0"; - src = fetchurl { - url = "http://download.enlightenment.org/rel/libs/emotion_generic_players/${name}.tar.gz"; - sha256 = "1nwlrk9inrhiv6jpzji10ikcdlhzhz7f2b5qhi2ai8bb6j61ryyc"; - }; - buildInputs = [ pkgconfig e18.efl vlc ]; - preConfigure = '' - export NIX_CFLAGS_COMPILE="-I${e18.efl}/include/eo-1 $NIX_CFLAGS_COMPILE" - ''; - meta = { - description = "Extra video decoders"; - homepage = http://enlightenment.org/; - maintainers = [ stdenv.lib.maintainers.matejc ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.bsd2; - }; -} diff --git a/pkgs/desktops/e18/enlightenment.nix b/pkgs/desktops/e18/enlightenment.nix deleted file mode 100644 index c3cd585e5257..000000000000 --- a/pkgs/desktops/e18/enlightenment.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, e18, xlibs, libffi, pam, alsaLib, luajit, bzip2, set_freqset_setuid ? false }: - -stdenv.mkDerivation rec { - name = "enlightenment-${version}"; - version = "0.18.8"; - src = fetchurl { - url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.gz"; - sha256 = "1fsigbrknkwy909p1gqwxag1bar3p413s4f6fq3qnbsd6gjbvj8l"; - }; - buildInputs = [ pkgconfig e18.efl e18.elementary xlibs.libxcb xlibs.xcbutilkeysyms xlibs.libXrandr libffi pam alsaLib luajit bzip2 ]; - preConfigure = '' - export NIX_CFLAGS_COMPILE="-I${e18.efl}/include/eo-1 -I${e18.efl}/include/ecore-imf-1 -I${e18.efl}/include/ethumb-client-1 -I${e18.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE" - ''; - - # this is a hack and without this cpufreq module is not working: - # when set_freqset_setuid is true and "e18_freqset" is set in setuidPrograms (this is taken care of in e18 NixOS module), - # then this postInstall does the folowing: - # 1. moves the "freqset" binary to "e18_freqset", - # 2. linkes "e18_freqset" to enlightenment/bin so that, - # 3. setuidPrograms detects it and makes appropriate stuff to /var/setuid-wrappers/e18_freqset, - # 4. and finaly, linkes /var/setuid-wrappers/e18_freqset to original destination where enlightenment wants it - postInstall = if set_freqset_setuid then '' - export CPUFREQ_DIRPATH=`readlink -f $out/lib/enlightenment/modules/cpufreq/linux-gnu-*`; - mv $CPUFREQ_DIRPATH/freqset $CPUFREQ_DIRPATH/e18_freqset - ln -sv $CPUFREQ_DIRPATH/e18_freqset $out/bin/e18_freqset - ln -sv /var/setuid-wrappers/e18_freqset $CPUFREQ_DIRPATH/freqset - '' else ""; - meta = { - description = "The Compositing Window Manager and Desktop Shell"; - homepage = http://enlightenment.org/; - maintainers = [ stdenv.lib.maintainers.matejc ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.bsd2; - }; -} diff --git a/pkgs/desktops/e18/evas.nix b/pkgs/desktops/e18/evas.nix deleted file mode 100644 index 9ddd94dbaea0..000000000000 --- a/pkgs/desktops/e18/evas.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, e18, zlib }: -stdenv.mkDerivation rec { - name = "evas_generic_loaders-${version}"; - version = "1.10.0"; - src = fetchurl { - url = "http://download.enlightenment.org/rel/libs/evas_generic_loaders/${name}.tar.gz"; - sha256 = "0qx44g7a8pzcgspx8q10zjiwzafis301fhpchd4pskfxhqd4qagm"; - }; - buildInputs = [ pkgconfig e18.efl zlib ]; - meta = { - description = "Extra image decoders"; - homepage = http://enlightenment.org/; - maintainers = [ stdenv.lib.maintainers.matejc ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/e18/terminology.nix b/pkgs/desktops/e18/terminology.nix deleted file mode 100644 index 892abc6ea5fe..000000000000 --- a/pkgs/desktops/e18/terminology.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, e18 }: -stdenv.mkDerivation rec { - name = "terminology-${version}"; - version = "0.6.1"; - src = fetchurl { - url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.gz"; - sha256 = "1wi9njyfs95y4nb9jd30032qqka5cg7k0wacck8s1yqxwg5ng38x"; - }; - buildInputs = [ pkgconfig e18.efl e18.elementary ]; - preConfigure = '' - export NIX_CFLAGS_COMPILE="-I${e18.efl}/include/eo-1 $NIX_CFLAGS_COMPILE" - export NIX_CFLAGS_COMPILE="-I${e18.efl}/include/ecore-con-1 $NIX_CFLAGS_COMPILE" - export NIX_CFLAGS_COMPILE="-I${e18.efl}/include/eldbus-1 $NIX_CFLAGS_COMPILE" - export NIX_CFLAGS_COMPILE="-I${e18.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE" - ''; - meta = { - description = "The best terminal emulator written with the EFL"; - homepage = http://enlightenment.org/; - maintainers = [ stdenv.lib.maintainers.matejc ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.bsd2; - }; -} diff --git a/pkgs/desktops/e19/econnman.nix b/pkgs/desktops/e19/econnman.nix index 1e42895b4e22..0c09317d24f7 100644 --- a/pkgs/desktops/e19/econnman.nix +++ b/pkgs/desktops/e19/econnman.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Econnman is a user interface for the connman network connection manager"; homepage = http://enlightenment.org/; - maintainers = [ stdenv.lib.maintainers.matejc ]; + maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.lgpl3; }; diff --git a/pkgs/desktops/e19/efl.nix b/pkgs/desktops/e19/efl.nix index 2252bc919919..2367f47bac4d 100644 --- a/pkgs/desktops/e19/efl.nix +++ b/pkgs/desktops/e19/efl.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { name = "efl-${version}"; - version = "1.11.2"; + version = "1.11.3"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.gz"; - sha256 = "123jrcifd7i0r9zh8qllqiz3d378fyy7fzkanyki9wbxlz91rk7k"; + sha256 = "0s9pm3lfp7f2yf877xywjw8ihgr2yrns3gibak0gcwx7d8bfljfr"; }; buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-libav pulseaudio libsndfile xlibs.libXcursor xlibs.printproto xlibs.libX11 libdrm udev utillinuxCurses luajit ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "Enlightenment Core libraries"; homepage = http://enlightenment.org/; - maintainers = [ stdenv.lib.maintainers.matejc ]; + maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.lgpl3; }; diff --git a/pkgs/desktops/e19/elementary.nix b/pkgs/desktops/e19/elementary.nix index db335a156202..4ee8c0b1a951 100644 --- a/pkgs/desktops/e19/elementary.nix +++ b/pkgs/desktops/e19/elementary.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, e19, libcap, gdbm }: stdenv.mkDerivation rec { name = "elementary-${version}"; - version = "1.11.2"; + version = "1.11.3"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/elementary/${name}.tar.gz"; - sha256 = "041hwp81qyq4wsw483g2jh52gcanqg046f91pmd0vzgwcgxyixqq"; + sha256 = "1yr96imam9sckgagnp7wdvwmvr1xwakw29dih3gxp7nz7xsa0j8k"; }; buildInputs = [ pkgconfig e19.efl gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; preConfigure = '' @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Widget set/toolkit"; homepage = http://enlightenment.org/; - maintainers = [ stdenv.lib.maintainers.matejc ]; + maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.lgpl2; }; diff --git a/pkgs/desktops/e19/emotion.nix b/pkgs/desktops/e19/emotion.nix index 781d884fe3bd..269bfe32dbcb 100644 --- a/pkgs/desktops/e19/emotion.nix +++ b/pkgs/desktops/e19/emotion.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Extra video decoders"; homepage = http://enlightenment.org/; - maintainers = [ stdenv.lib.maintainers.matejc ]; + maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.bsd2; }; diff --git a/pkgs/desktops/e19/enlightenment.nix b/pkgs/desktops/e19/enlightenment.nix index 95c5abdfa58c..9faa03a63380 100644 --- a/pkgs/desktops/e19/enlightenment.nix +++ b/pkgs/desktops/e19/enlightenment.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { name = "enlightenment-${version}"; - version = "0.19.0"; + version = "0.19.1"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz"; - sha256 = "0d9s8gwma32hj8h000k1bzibr3zj8qajcf14va3w81k87gkilxfp"; + sha256 = "016z1vilhjarpxzn5bwcw696d8b66rklnhkrwzfa5mcxn8gpmvap"; }; buildInputs = [ pkgconfig e19.efl e19.elementary xlibs.libXdmcp xlibs.libxcb xlibs.xcbutilkeysyms xlibs.libXrandr libffi pam alsaLib luajit bzip2 libpthreadstubs gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; preConfigure = '' @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = { description = "The Compositing Window Manager and Desktop Shell"; homepage = http://enlightenment.org/; - maintainers = [ stdenv.lib.maintainers.matejc ]; + maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.bsd2; }; diff --git a/pkgs/desktops/e19/evas.nix b/pkgs/desktops/e19/evas.nix index 98b035f94e40..756c7badb072 100644 --- a/pkgs/desktops/e19/evas.nix +++ b/pkgs/desktops/e19/evas.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = { description = "Extra image decoders"; homepage = http://enlightenment.org/; - maintainers = [ stdenv.lib.maintainers.matejc ]; + maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/desktops/e19/terminology.nix b/pkgs/desktops/e19/terminology.nix index 97bf07b298d5..7b3bcbc5e401 100644 --- a/pkgs/desktops/e19/terminology.nix +++ b/pkgs/desktops/e19/terminology.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, e19 }: stdenv.mkDerivation rec { name = "terminology-${version}"; - version = "0.6.1"; + version = "0.7.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.gz"; - sha256 = "1wi9njyfs95y4nb9jd30032qqka5cg7k0wacck8s1yqxwg5ng38x"; + sha256 = "1x248dh9r292r8ycvf43vrfk4l8wpli50sgywp0zy3q93f8ljgs5"; }; buildInputs = [ pkgconfig e19.efl e19.elementary ]; preConfigure = '' @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "The best terminal emulator written with the EFL"; homepage = http://enlightenment.org/; - maintainers = [ stdenv.lib.maintainers.matejc ]; + maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.bsd2; }; diff --git a/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix b/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix index 3da878dde742..8cd8635c85c5 100644 --- a/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix +++ b/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix @@ -14,5 +14,5 @@ stdenv.mkDerivation { "; buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt gettext]; - configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat"; + configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/catalog.xml"; } diff --git a/pkgs/desktops/gnome-2/platform/libgnomecups/cups_1.6.patch b/pkgs/desktops/gnome-2/platform/libgnomecups/cups_1.6.patch new file mode 100644 index 000000000000..68f379c25109 --- /dev/null +++ b/pkgs/desktops/gnome-2/platform/libgnomecups/cups_1.6.patch @@ -0,0 +1,285 @@ +From ae783efde4fa69578651994505462f02b8639220 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev <tetromino@gentoo.org> +Date: Tue, 7 Aug 2012 06:53:09 -0400 +Subject: [PATCH] Use CUPS-1.6 IPP API getter/setter functions + +CUPS 1.6 makes various structures private and introduces these ippGet +and ippSet functions for all of the fields in these structures. +http://www.cups.org/str.php?L3928 + +We define our own accessors when building against CUPS < 1.6. + +Based on work by Jiri Popelka <jpopelka@redhat.com> at +https://bugzilla.gnome.org/show_bug.cgi?id=679759 +--- + libgnomecups/gnome-cups-printer.c | 48 +++++++++++++++++++++++++++++------- + libgnomecups/gnome-cups-queue.c | 43 +++++++++++++++++++++++++++------ + libgnomecups/gnome-cups-request.c | 44 ++++++++++++++++++++++++++++----- + 3 files changed, 110 insertions(+), 25 deletions(-) + +diff --git a/libgnomecups/gnome-cups-printer.c b/libgnomecups/gnome-cups-printer.c +index c924af0..f5e1ef7 100644 +--- a/libgnomecups/gnome-cups-printer.c ++++ b/libgnomecups/gnome-cups-printer.c +@@ -37,6 +37,34 @@ + + #define UPDATE_TIMEOUT 5000 + ++#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5) ++#define HAVE_CUPS_1_6 1 ++#endif ++ ++#ifndef HAVE_CUPS_1_6 ++#define ippGetCount(attr) attr->num_values ++#define ippGetName(attr) attr->name ++#define ippGetInteger(attr, element) attr->values[element].integer ++#define ippGetString(attr, element, language) attr->values[element].string.text ++ ++static ipp_attribute_t * ++ippFirstAttribute(ipp_t *ipp) ++{ ++ if (!ipp) ++ return (NULL); ++ return (ipp->current = ipp->attrs); ++} ++ ++static ipp_attribute_t * ++ippNextAttribute(ipp_t *ipp) ++{ ++ if (!ipp || !ipp->current) ++ return (NULL); ++ return (ipp->current = ipp->current->next); ++} ++#endif ++ ++ + struct _GnomeCupsPPDFile { + char name[1]; + }; +@@ -173,9 +201,9 @@ map_reasons (GnomeCupsPrinter *printer, + printer->details->state_reasons = NULL; + + /* cf. RFC2911 4.4.12 */ +- for (i = 0; i < attr->num_values; i++) { ++ for (i = 0; i < ippGetCount (attr); i++) { + const char *p; +- const char *keyword = attr->values [i].string.text; ++ const char *keyword = ippGetString (attr, i, NULL); + + reason = g_new (GnomeCupsPrinterReason, 1); + +@@ -224,8 +252,8 @@ gnome_cups_printer_get_info (GnomeCupsPrinter *printer) + return printer->details->info; + } + +-#define MAP_INT(v,a) {if (!g_ascii_strcasecmp (attr->name, (a))) { if ((v) != attr->values[0].integer) { changed = TRUE; } (v) = attr->values[0].integer; }} +-#define MAP_STRING(v,a) {if (!g_ascii_strcasecmp (attr->name, (a))) { if (!v || strcmp (v, attr->values[0].string.text)) { g_free (v); changed = TRUE; (v) = g_strdup (attr->values[0].string.text); }}} ++#define MAP_INT(v,a) {if (!g_ascii_strcasecmp (ippGetName (attr), (a))) { if ((v) != ippGetInteger (attr, 0)) { changed = TRUE; } (v) = ippGetInteger (attr, 0); }} ++#define MAP_STRING(v,a) {if (!g_ascii_strcasecmp (ippGetName (attr), (a))) { if (!v || strcmp (v, ippGetString (attr, 0, NULL))) { g_free (v); changed = TRUE; (v) = g_strdup (ippGetString (attr, 0, NULL)); }}} + + static void + attributes_update_cb (guint id, +@@ -243,14 +271,14 @@ attributes_update_cb (guint id, + changed = FALSE; + + if (!error && response) { +- for (attr = response->attrs; attr != NULL; attr = attr->next) { +- if (!attr->name) { ++ for (attr = ippFirstAttribute (response); attr != NULL; attr = ippNextAttribute (response)) { ++ if (!ippGetName (attr)) { + continue; + } +- if (!g_ascii_strcasecmp (attr->name, "attributes-charset") || !strcmp (attr->name, "attributes-charset")) { ++ if (!g_ascii_strcasecmp (ippGetName (attr), "attributes-charset") || !strcmp (ippGetName (attr), "attributes-charset")) { + continue; + } +- if (!g_ascii_strcasecmp (attr->name, "printer-state-reasons")) { ++ if (!g_ascii_strcasecmp (ippGetName (attr), "printer-state-reasons")) { + map_reasons (printer, attr); + } + MAP_INT (printer->details->state, "printer-state"); +@@ -570,7 +598,7 @@ get_default (void) + + attr = ippFindAttribute (response, "printer-name", IPP_TAG_NAME); + if (attr) { +- name = g_strdup (attr->values[0].string.text); ++ name = g_strdup (ippGetString (attr, 0, NULL)); + } else { + name = NULL; + } +@@ -698,7 +726,7 @@ get_printer_names (void) + attr = ippFindAttribute (response, "printer-name", IPP_TAG_NAME); + while (attr) { + ret = g_list_prepend (ret, +- g_strdup (attr->values[0].string.text)); ++ g_strdup (ippGetString (attr, 0, NULL))); + + attr = ippFindNextAttribute (response, + "printer-name", +diff --git a/libgnomecups/gnome-cups-queue.c b/libgnomecups/gnome-cups-queue.c +index 9f98ed9..298db42 100644 +--- a/libgnomecups/gnome-cups-queue.c ++++ b/libgnomecups/gnome-cups-queue.c +@@ -15,6 +15,33 @@ + + #define UPDATE_TIMEOUT 3000 + ++#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5) ++#define HAVE_CUPS_1_6 1 ++#endif ++ ++#ifndef HAVE_CUPS_1_6 ++#define ippGetName(attr) attr->name ++#define ippGetInteger(attr, element) attr->values[element].integer ++#define ippGetString(attr, element, language) attr->values[element].string.text ++ ++static ipp_attribute_t * ++ippFirstAttribute(ipp_t *ipp) ++{ ++ if (!ipp) ++ return (NULL); ++ return (ipp->current = ipp->attrs); ++} ++ ++static ipp_attribute_t * ++ippNextAttribute(ipp_t *ipp) ++{ ++ if (!ipp || !ipp->current) ++ return (NULL); ++ return (ipp->current = ipp->current->next); ++} ++#endif ++ ++ + struct _GnomeCupsQueueDetails { + char *queue_name; + GList *jobs; +@@ -199,8 +226,8 @@ finish_job (GnomeCupsJob *job) + job->size = job->size * 1024; + } + +-#define MAP_STR(dest, src) { if (!g_ascii_strcasecmp (attr->name, (src))) { if ((dest) != NULL) g_free (dest); (dest) = g_strdup (attr->values[0].string.text);}} +-#define MAP_INT(dest, src) { if (!g_ascii_strcasecmp (attr->name, (src))) { (dest) = attr->values[0].integer; } } ++#define MAP_STR(dest, src) { if (!g_ascii_strcasecmp (ippGetName (attr), (src))) { if ((dest) != NULL) g_free (dest); (dest) = g_strdup (ippGetString (attr, 0, NULL));}} ++#define MAP_INT(dest, src) { if (!g_ascii_strcasecmp (ippGetName (attr), (src))) { (dest) = ippGetInteger (attr, 0); } } + + static void + get_jobs_cb (guint id, +@@ -231,8 +258,8 @@ get_jobs_cb (guint id, + + if (response) { + job = g_new0 (GnomeCupsJob, 1); +- for (attr = response->attrs; attr != NULL; attr = attr->next) { +- if (attr->name == NULL) { ++ for (attr = ippFirstAttribute (response); attr != NULL; attr = ippNextAttribute (response)) { ++ if (ippGetName (attr) == NULL) { + if (job->name) { + finish_job (job); + jobs = g_list_prepend (jobs, job); +@@ -244,7 +271,7 @@ get_jobs_cb (guint id, + continue; + } + +- if (!g_ascii_strcasecmp (attr->name, "attributes-charset") || !g_ascii_strcasecmp (attr->name, "attributes-charset")) { ++ if (!g_ascii_strcasecmp (ippGetName (attr), "attributes-charset") || !g_ascii_strcasecmp (ippGetName (attr), "attributes-charset")) { + continue; + + } +@@ -355,8 +382,8 @@ gnome_cups_queue_get_job_nocache (GnomeCupsQueue *queue, + + if (response) { + job = g_new0 (GnomeCupsJob, 1); +- for (attr = response->attrs; attr != NULL; attr = attr->next) { +- if (attr->name == NULL) { ++ for (attr = ippFirstAttribute (response); attr != NULL; attr = ippNextAttribute (response)) { ++ if (ippGetName (attr) == NULL) { + if (job->name) { + finish_job (job); + } else { +@@ -366,7 +393,7 @@ gnome_cups_queue_get_job_nocache (GnomeCupsQueue *queue, + break; + } + +- if (!g_ascii_strcasecmp (attr->name, "attributes-charset") || !g_ascii_strcasecmp (attr->name, "attributes-charset")) { ++ if (!g_ascii_strcasecmp (ippGetName (attr), "attributes-charset") || !g_ascii_strcasecmp (ippGetName (attr), "attributes-charset")) { + continue; + } + +diff --git a/libgnomecups/gnome-cups-request.c b/libgnomecups/gnome-cups-request.c +index c94f623..13f0948 100644 +--- a/libgnomecups/gnome-cups-request.c ++++ b/libgnomecups/gnome-cups-request.c +@@ -19,6 +19,36 @@ + #define STOP_UNUSED_THREADS_TIMEOUT 60 + #define CLOSE_UNUSED_CONNECTIONS_TIMEOUT 30 + ++#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5) ++#define HAVE_CUPS_1_6 1 ++#endif ++ ++#ifndef HAVE_CUPS_1_6 ++#define ippGetCount(attr) attr->num_values ++#define ippGetValueTag(attr) attr->value_tag ++#define ippGetName(attr) attr->name ++#define ippGetBoolean(attr, element) attr->values[element].boolean ++#define ippGetInteger(attr, element) attr->values[element].integer ++#define ippGetString(attr, element, language) attr->values[element].string.text ++ ++static ipp_attribute_t * ++ippFirstAttribute(ipp_t *ipp) ++{ ++ if (!ipp) ++ return (NULL); ++ return (ipp->current = ipp->attrs); ++} ++ ++static ipp_attribute_t * ++ippNextAttribute(ipp_t *ipp) ++{ ++ if (!ipp || !ipp->current) ++ return (NULL); ++ return (ipp->current = ipp->current->next); ++} ++#endif ++ ++ + typedef struct + { + GMutex *mutex; +@@ -276,14 +306,14 @@ dump_request (ipp_t const *req) + unsigned i; + ipp_attribute_t *attr; + +- for (attr = req->attrs; attr != NULL; attr = attr->next) { +- g_print ("%s", attr->name); +- for (i = 0 ; i < attr->num_values ; i++) { ++ for (attr = ippFirstAttribute (req); attr != NULL; attr = ippNextAttribute (req)) { ++ g_print ("%s", ippGetName (attr)); ++ for (i = 0 ; i < ippGetCount (attr) ; i++) { + g_print ("\t[%d] = ", i); +- switch (attr->value_tag & ~IPP_TAG_COPY) { ++ switch (ippGetValueTag (attr) & ~IPP_TAG_COPY) { + case IPP_TAG_INTEGER: + case IPP_TAG_ENUM: +- g_print ("%d\n", attr->values[i].integer); ++ g_print ("%d\n", ippGetInteger (attr, i)); + break; + + case IPP_TAG_STRING: +@@ -294,11 +324,11 @@ dump_request (ipp_t const *req) + case IPP_TAG_CHARSET: + case IPP_TAG_LANGUAGE: + case IPP_TAG_MIMETYPE: +- g_print ("'%s'\n", attr->values[i].string.text); ++ g_print ("'%s'\n", ippGetString (attr, i, NULL)); + break; + + case IPP_TAG_BOOLEAN: +- g_print ("%s\n", (int)attr->values[i].boolean ? "true" : "false"); ++ g_print ("%s\n", (int)ippGetBoolean (attr, i) ? "true" : "false"); + break; + + default: +-- +1.7.8.6 + diff --git a/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix index 9a0afd1275d0..2aa47d799c9a 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0a8xdaxzz2wc0n1fjcav65093gixzyac3948l8cxx1mk884yhc71"; }; - patches = [ ./glib.patch ]; + patches = [ ./glib.patch ./cups_1.6.patch ]; buildInputs = [ pkgconfig gtk gettext intltool libart_lgpl ]; diff --git a/pkgs/desktops/gnome-3/3.10/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/3.10/apps/bijiben/default.nix deleted file mode 100644 index ef460112d217..000000000000 --- a/pkgs/desktops/gnome-3/3.10/apps/bijiben/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, glib -, hicolor_icon_theme, makeWrapper, itstool -, clutter_gtk, libuuid, webkitgtk, zeitgeist -, gnome3, librsvg, gdk_pixbuf, libxml2 }: - -stdenv.mkDerivation rec { - name = "bijiben-3.10.2"; - - src = fetchurl { - url = "mirror://gnome/sources/bijiben/3.10/${name}.tar.xz"; - sha256 = "81257f85218968b0ad386da6e1143586de478870ca74bb5387646a479999a7d4"; - }; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ pkgconfig glib intltool itstool libxml2 - clutter_gtk libuuid webkitgtk gnome3.tracker - gnome3.gnome_online_accounts zeitgeist - gnome3.gsettings_desktop_schemas makeWrapper - gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - enableParallelBuilding = true; - - preFixup = '' - 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; { - homepage = https://wiki.gnome.org/Apps/Bijiben; - description = "Note editor designed to remain simple to use"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.10/apps/evolution/default.nix deleted file mode 100644 index ee62c951b4cf..000000000000 --- a/pkgs/desktops/gnome-3/3.10/apps/evolution/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ stdenv, intltool, fetchurl, libxml2, webkitgtk, highlight -, pkgconfig, gtk3, glib, hicolor_icon_theme, libnotify -, makeWrapper, itstool, shared_mime_info, libical, db -, gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu -, libcanberra_gtk3, bogofilter, gst_all_1, procps }: - -stdenv.mkDerivation rec { - name = "evolution-3.10.4"; - - src = fetchurl { - url = "mirror://gnome/sources/evolution/3.10/${name}.tar.xz"; - sha256 = "ac60557f264f211e6a7bc0ced919041c154e4c7b9c79600516aee7acc1d03e40"; - }; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 - gdk_pixbuf gnome3.gnome_icon_theme librsvg db icu - gnome3.evolution_data_server libsecret libical - webkitgtk shared_mime_info gnome3.gnome_desktop - libcanberra_gtk3 gnome3.gtkhtml bogofilter gnome3.libgdata - gst_all_1.gstreamer gst_all_1.gst-plugins-base - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - nss nspr libnotify procps highlight gnome3.libgweather - gnome3.gsettings_desktop_schemas makeWrapper ]; - - configureFlags = [ "--disable-spamassassin" "--disable-pst-import" ]; - - NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss"; - - enableParallelBuilding = true; - - preFixup = '' - wrapProgram "$out/bin/evolution" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Evolution; - description = "Personal information management application that provides integrated mail, calendaring and address book functionality"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.lgpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/3.10/apps/file-roller/default.nix deleted file mode 100644 index e13e169ccc5c..000000000000 --- a/pkgs/desktops/gnome-3/3.10/apps/file-roller/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool, itstool, libxml2, libarchive -, attr, bzip2, acl, makeWrapper }: - -stdenv.mkDerivation rec { - name = "file-roller-${version}"; - - majVersion = "3.10"; - version = "${majVersion}.2.1"; - - src = fetchurl { - url = "mirror://gnome/sources/file-roller/${majVersion}/${name}.tar.xz"; - sha256 = "14374z1yfbjlgpl4k1ih8b35x8kzvh99y22rwwkc2wfz0d0i1qgx"; - }; - - # TODO: support nautilus - # it tries to create {nautilus}/lib/nautilus/extensions-3.0/libnautilus-fileroller.so - - buildInputs = [ glib pkgconfig gnome3.gtk intltool itstool libxml2 libarchive - attr bzip2 acl makeWrapper ]; - - preFixup = '' - wrapProgram "$out/bin/file-roller" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - rm $out/share/icons/hicolor/icon-theme.cache - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/apps/gedit/default.nix b/pkgs/desktops/gnome-3/3.10/apps/gedit/default.nix deleted file mode 100644 index 6b9a69c738dc..000000000000 --- a/pkgs/desktops/gnome-3/3.10/apps/gedit/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, intltool, fetchurl, enchant, isocodes -, pkgconfig, gtk3, glib, hicolor_icon_theme -, bash, makeWrapper, itstool, libsoup, libxml2 -, gnome3, librsvg, gdk_pixbuf, file }: - -stdenv.mkDerivation rec { - name = "gedit-3.10.4"; - - src = fetchurl { - url = "mirror://gnome/sources/gedit/3.10/${name}.tar.xz"; - sha256 = "40dc10b6e26fd8523087e7321a20a063f4c1e586dffd7ce8ee78eead11359f9e"; - }; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool enchant isocodes - gdk_pixbuf gnome3.gnome_icon_theme librsvg libsoup - gnome3.libpeas gnome3.gtksourceview libxml2 - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - gnome3.gsettings_desktop_schemas makeWrapper file ]; - - enableParallelBuilding = true; - - preFixup = '' - wrapProgram "$out/bin/gedit" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix XDG_DATA_DIRS : "${gnome3.gtksourceview}/share:${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Gedit; - description = "Official text editor of the GNOME desktop environment"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/apps/glade/default.nix b/pkgs/desktops/gnome-3/3.10/apps/glade/default.nix deleted file mode 100644 index 5979d10fa707..000000000000 --- a/pkgs/desktops/gnome-3/3.10/apps/glade/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, intltool, fetchurl, python -, pkgconfig, gtk3, glib, hicolor_icon_theme -, makeWrapper, itstool, libxml2, docbook_xsl -, gnome3, librsvg, gdk_pixbuf, libxslt }: - -stdenv.mkDerivation rec { - name = "glade-3.16.1"; - - src = fetchurl { - url = "mirror://gnome/sources/glade/3.16/${name}.tar.xz"; - sha256 = "994ac258bc100d3907ed40a2880c3144f13997b324477253e812d59f2716523f"; - }; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 python - gnome3.gsettings_desktop_schemas makeWrapper docbook_xsl - gdk_pixbuf gnome3.gnome_icon_theme librsvg libxslt - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - enableParallelBuilding = true; - - preFixup = '' - 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; { - homepage = https://wiki.gnome.org/Apps/Glade; - description = "User interface designer for GTK+ applications"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.lgpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/3.10/apps/gnome-clocks/default.nix deleted file mode 100644 index c39f731e028a..000000000000 --- a/pkgs/desktops/gnome-3/3.10/apps/gnome-clocks/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, intltool, fetchurl, libgweather, libnotify -, pkgconfig, gtk3, glib, hicolor_icon_theme -, makeWrapper, itstool, libcanberra_gtk3, libtool -, gnome3, librsvg, gdk_pixbuf, geoclue2 }: - -stdenv.mkDerivation rec { - name = "gnome-clocks-3.10.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-clocks/3.10/${name}.tar.xz"; - sha256 = "5f6f3b7bb9929353d974aa444b10bb4d0f414176449cce2c626fabd2d4b55b43"; - }; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool libcanberra_gtk3 - gnome3.gsettings_desktop_schemas makeWrapper - gdk_pixbuf gnome3.gnome_icon_theme librsvg - gnome3.gnome_desktop gnome3.geocode_glib geoclue2 - libgweather libnotify libtool - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - enableParallelBuilding = true; - - preFixup = '' - 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; { - homepage = https://wiki.gnome.org/Apps/Clocks; - description = "Clock application designed for GNOME 3"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/3.10/apps/gnome-documents/default.nix deleted file mode 100644 index a8c84d6a7698..000000000000 --- a/pkgs/desktops/gnome-3/3.10/apps/gnome-documents/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ stdenv, intltool, fetchurl, evince, gjs -, pkgconfig, gtk3, glib, hicolor_icon_theme -, makeWrapper, itstool, libxslt, webkitgtk -, gnome3, librsvg, gdk_pixbuf, libsoup, docbook_xsl -, gobjectIntrospection, json_glib -, gmp, desktop_file_utils }: - -stdenv.mkDerivation rec { - name = "gnome-documents-3.10.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-documents/3.10/${name}.tar.xz"; - sha256 = "2b7267c9c4e5767039632cb31877ed2e57f994b657e8863dd79af5287db45745"; - }; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxslt - docbook_xsl desktop_file_utils - gnome3.gsettings_desktop_schemas makeWrapper gmp - gdk_pixbuf gnome3.gnome_icon_theme librsvg evince - libsoup webkitgtk gjs gobjectIntrospection gnome3.rest - gnome3.tracker gnome3.libgdata gnome3.gnome_online_accounts - gnome3.gnome_desktop gnome3.libzapojit json_glib - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - enableParallelBuilding = true; - - preFixup = '' - substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib}/bin/gapplication" - wrapProgram "$out/bin/gnome-documents" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --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" - rm $out/share/icons/hicolor/icon-theme.cache - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Documents; - description = "Document manager application designed to work with GNOME 3"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/3.10/apps/gnome-music/default.nix deleted file mode 100644 index 31d521e8c302..000000000000 --- a/pkgs/desktops/gnome-3/3.10/apps/gnome-music/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ stdenv, intltool, fetchurl, gdk_pixbuf, tracker -, python3, libxml2, python3Packages, libnotify -, pkgconfig, gtk3, glib, hicolor_icon_theme, cairo -, makeWrapper, itstool, gnome3, librsvg, gst_all_1 }: - -stdenv.mkDerivation rec { - name = "gnome-music-3.10.4"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-music/3.10/${name}.tar.xz"; - sha256 = "64220d4c0f9115a6ed27ec99c7ec7afc065d12e5a32371936f303ef981f5325f"; - }; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.libmediaart - gdk_pixbuf gnome3.gnome_icon_theme librsvg python3 - gnome3.grilo libxml2 python3Packages.pygobject3 libnotify - python3Packages.pycairo python3Packages.dbus - gst_all_1.gstreamer gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - gnome3.gsettings_desktop_schemas makeWrapper tracker ]; - - enableParallelBuilding = true; - - preFixup = '' - wrapProgram "$out/bin/gnome-music" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --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; { - homepage = https://wiki.gnome.org/Apps/Music; - description = "Music player and management application for the GNOME desktop environment"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/3.10/apps/gnome-photos/default.nix deleted file mode 100644 index 68d4e3690f9a..000000000000 --- a/pkgs/desktops/gnome-3/3.10/apps/gnome-photos/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, intltool, fetchurl, exempi, libxml2 -, pkgconfig, gtk3, glib, hicolor_icon_theme -, makeWrapper, itstool, gegl, babl, lcms2 -, desktop_file_utils, gmp -, gnome3, librsvg, gdk_pixbuf, libexif }: - -stdenv.mkDerivation rec { - name = "gnome-photos-3.10.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-photos/3.10/${name}.tar.xz"; - sha256 = "820503c26a0f829682dd46653e8f0850ac687aba42728ac74350ba8406e80975"; - }; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool gegl babl - gnome3.gsettings_desktop_schemas makeWrapper gmp - gdk_pixbuf gnome3.gnome_icon_theme librsvg exempi - gnome3.gfbgraph gnome3.grilo-plugins gnome3.grilo - gnome3.gnome_online_accounts gnome3.gnome_desktop - lcms2 libexif gnome3.tracker libxml2 desktop_file_utils - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-photos" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --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" - rm $out/share/icons/hicolor/icon-theme.cache - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Photos; - description = "Photos is an application to access, organize and share your photos with GNOME 3"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/apps/nautilus-sendto/default.nix b/pkgs/desktops/gnome-3/3.10/apps/nautilus-sendto/default.nix deleted file mode 100644 index 5a85e00e4e45..000000000000 --- a/pkgs/desktops/gnome-3/3.10/apps/nautilus-sendto/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool -, gobjectIntrospection, makeWrapper }: - -stdenv.mkDerivation rec { - name = "nautilus-sendto-${version}"; - - version = "3.8.1"; - - src = fetchurl { - url = "mirror://gnome/sources/nautilus-sendto/3.8/${name}.tar.xz"; - sha256 = "03fa46bff271acdbdedab6243b2a84e5ed3daa19c81b69d087b3e852c8fe5dab"; - }; - - buildInputs = [ glib pkgconfig gobjectIntrospection intltool makeWrapper ]; - - meta = with stdenv.lib; { - description = "Integrates Evolution and Pidgin into the Nautilus file manager"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/3.10/apps/seahorse/default.nix deleted file mode 100644 index cecc4a8913d1..000000000000 --- a/pkgs/desktops/gnome-3/3.10/apps/seahorse/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, intltool, fetchurl -, pkgconfig, gtk3, glib, hicolor_icon_theme -, makeWrapper, itstool, gnupg, libsoup -, gnome3, librsvg, gdk_pixbuf, gpgme -, libsecret, avahi, p11_kit }: - -stdenv.mkDerivation rec { - name = "seahorse-3.10.2"; - - src = fetchurl { - url = "mirror://gnome/sources/seahorse/3.10/${name}.tar.xz"; - sha256 = "89cabf19f77a55f220bc61a3b97e4db845a0980f0f1d9c66147cc9a4ced8cd16"; - }; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gcr - gnome3.gsettings_desktop_schemas makeWrapper gnupg - gdk_pixbuf gnome3.gnome_icon_theme librsvg gpgme - libsecret avahi libsoup p11_kit - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - preFixup = '' - 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; { - homepage = https://wiki.gnome.org/Apps/Seahorse; - description = "Application for managing encryption keys and passwords in the GnomeKeyring"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/baobab/default.nix b/pkgs/desktops/gnome-3/3.10/core/baobab/default.nix deleted file mode 100644 index 9381f45105df..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/baobab/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ stdenv, intltool, fetchurl, vala, libgtop -, pkgconfig, gtk3, glib, hicolor_icon_theme -, bash, makeWrapper, itstool, libxml2 -, gnome3, librsvg, gdk_pixbuf, file }: - -stdenv.mkDerivation rec { - name = "baobab-3.10.1"; - - src = fetchurl { - url = "mirror://gnome/sources/baobab/3.10/${name}.tar.xz"; - sha256 = "23ce8e4847ce5f1c8230e757532d94c84e6e273d6ec8fca20eecaed5f96563f9"; - }; - - configureFlags = [ "--disable-static" ]; - - doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - buildInputs = [ vala pkgconfig gtk3 glib libgtop intltool itstool libxml2 - gnome3.gsettings_desktop_schemas makeWrapper file ]; - - 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 : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Baobab; - description = "Graphical application to analyse disk usage in any Gnome environment"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/caribou/default.nix b/pkgs/desktops/gnome-3/3.10/core/caribou/default.nix deleted file mode 100644 index ba5dc7e7b90a..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/caribou/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, pythonPackages, libxml2 -, libxklavier, libXtst, gtk2, intltool, libxslt, at_spi2_core }: - - -stdenv.mkDerivation rec { - name = "caribou-0.4.12"; - - src = fetchurl { - url = "mirror://gnome/sources/caribou/0.4/${name}.tar.xz"; - sha256 = "0235sws58rg0kadxbp2nq5ha76zmhd4mr10n9qlbryf8p78qsvii"; - }; - - buildInputs = with gnome3; - [ glib pkgconfig gtk clutter at_spi2_core dbus pythonPackages.python pythonPackages.pygobject3 - libxml2 libXtst gtk2 intltool libxslt ]; - - propagatedBuildInputs = [ gnome3.libgee libxklavier ]; - - preBuild = '' - patchShebangs . - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.10/core/dconf/default.nix b/pkgs/desktops/gnome-3/3.10/core/dconf/default.nix deleted file mode 100644 index b284186fa829..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/dconf/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus_glib, gnome3 -, libxml2, intltool, docbook_xsl_ns, docbook_xsl, makeWrapper }: - -stdenv.mkDerivation rec { - name = "dconf-${version}"; - version = "0.20.0"; - - src = fetchurl { - url = "mirror://gnome/sources/dconf/0.20/${name}.tar.xz"; - sha256 = "22c046a247d05ea65ad181e3aef4009c898a5531f76c0181f8ec0dfef83447d9"; - }; - - buildInputs = [ vala libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2 - intltool docbook_xsl docbook_xsl_ns makeWrapper ]; - - preFixup = '' - wrapProgram "$out/bin/dconf-editor" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - - rm $out/lib/gio/modules/giomodule.cache - rm $out/share/icons/hicolor/icon-theme.cache - rm $out/share/icons/HighContrast/icon-theme.cache - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Projects/dconf; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.10/core/empathy/default.nix deleted file mode 100644 index 051bc9b7fb25..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/empathy/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib -, file, librsvg, hicolor_icon_theme, gnome3, gdk_pixbuf -, dbus_glib, dbus_libs, telepathy_glib, telepathy_farstream -, clutter_gtk, clutter-gst, gst_all_1, cogl, gnome_online_accounts -, gcr, libsecret, folks, pulseaudio, telepathy_mission_control -, telepathy_logger, libnotify, clutter, libsoup, gnutls -, evolution_data_server -, libcanberra_gtk3, p11_kit, farstream, libtool, shared_mime_info -, bash, makeWrapper, itstool, libxml2, libxslt, icu, libgee }: - -# TODO: enable more features - -stdenv.mkDerivation rec { - name = "empathy-3.10.3"; - - src = fetchurl { - url = "mirror://gnome/sources/empathy/3.10/${name}.tar.xz"; - sha256 = "49366acdd3c3ef9a74f63eb09920803c4c9df83056acbf8a7899e7890a9fb196"; - }; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard - gnome3.gnome_icon_theme hicolor_icon_theme - gnome_online_accounts shared_mime_info - gnome3.gnome_icon_theme_symbolic ]; - propagatedBuildInputs = [ folks telepathy_logger evolution_data_server - telepathy_mission_control ]; - buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool - libxml2 libxslt icu file makeWrapper - telepathy_glib clutter_gtk clutter-gst cogl - gst_all_1.gstreamer gst_all_1.gst-plugins-base - gcr libsecret pulseaudio gnome3.yelp_xsl gdk_pixbuf - libnotify clutter libsoup gnutls libgee p11_kit - libcanberra_gtk3 telepathy_farstream farstream - gnome3.gsettings_desktop_schemas file libtool librsvg ]; - - NIX_CFLAGS_COMPILE = [ "-I${dbus_glib}/include/dbus-1.0" - "-I${dbus_libs}/include/dbus-1.0" - "-I${dbus_libs}/lib/dbus-1.0/include" ]; - - preFixup = '' - for f in $out/bin/* $out/libexec/*; do - wrapProgram $f \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gnome3.gnome_themes_standard}/:${gnome3.gnome_themes_standard}/share:${hicolor_icon_theme}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - done - rm $out/share/icons/hicolor/icon-theme.cache - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Empathy; - description = "Messaging program which supports text, voice, video chat, and file transfers over many different protocols"; - maintainers = with maintainers; [ lethalman ]; - # TODO: license = [ licenses.gpl2 licenses.lgpl2 ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/eog/default.nix b/pkgs/desktops/gnome-3/3.10/core/eog/default.nix deleted file mode 100644 index 57f19dcaa321..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/eog/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ fetchurl, stdenv, intltool, pkgconfig, itstool, libxml2, libjpeg, gnome3 -, shared_mime_info, makeWrapper, librsvg, libexif }: - - -stdenv.mkDerivation rec { - name = "eog-3.10.2"; - - src = fetchurl { - url = "mirror://gnome/sources/eog/3.10/${name}.tar.xz"; - sha256 = "0qs7wmn987vd0cw8w16gmb0bnda3nkcwfg1q343l4rm6kih9ik2w"; - }; - - buildInputs = with gnome3; - [ intltool pkgconfig itstool libxml2 libjpeg gtk glib libpeas makeWrapper librsvg - gsettings_desktop_schemas shared_mime_info gnome_icon_theme gnome_desktop libexif ]; - - preFixup = '' - wrapProgram "$out/bin/eog" \ - --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; { - homepage = https://wiki.gnome.org/Apps/EyeOfGnome; - platforms = platforms.linux; - description = "GNOME image viewer"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.10/core/epiphany/default.nix deleted file mode 100644 index 9df3a7ed01e5..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/epiphany/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, gtk3, glib, nspr, icu -, bash, makeWrapper, gnome3, libwnck3, libxml2, libxslt, libtool -, webkitgtk, libsoup, libsecret, gnome_desktop, libnotify, p11_kit -, sqlite, gcr, avahi, nss, isocodes, itstool, file -, hicolor_icon_theme, gdk_pixbuf, librsvg }: - -stdenv.mkDerivation rec { - name = "epiphany-3.10.3"; - - src = fetchurl { - url = "mirror://gnome/sources/epiphany/3.10/${name}.tar.xz"; - sha256 = "c18235ecceaa9c76e7d90d370861cb2bba45019e1e14391a00dac3d2e94a0db7"; - }; - - # Tests need an X display - configureFlags = [ "--disable-static --disable-tests" ]; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - nativeBuildInputs = [ pkgconfig file ]; - - preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; - - buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt pkgconfig file - webkitgtk libsoup libsecret gnome_desktop libnotify libtool - sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools - gcr avahi gnome3.gsettings_desktop_schemas makeWrapper ]; - - NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss"; - - enableParallelBuilding = true; - - preFixup = '' - wrapProgram "$out/bin/epiphany" \ - --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" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Epiphany; - description = "WebKit based web browser for GNOME"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/evince/default.nix b/pkgs/desktops/gnome-3/3.10/core/evince/default.nix deleted file mode 100644 index 76cfacb0d776..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/evince/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, intltool, perl, perlXMLParser, libxml2 -, glib, gtk3, pango, atk, gdk_pixbuf, shared_mime_info, itstool, gnome3 -, poppler, ghostscriptX, djvulibre, libspectre, libsecret , makeWrapper -, librsvg, recentListSize ? null # 5 is not enough, allow passing a different number -, gobjectIntrospection -}: - -stdenv.mkDerivation rec { - name = "evince-3.10.3"; - - src = fetchurl { - url = "mirror://gnome/sources/evince/3.10/${name}.tar.xz"; - sha256 = "1bz9ypsvlfw1vgs7i5glba1h1n6c90f0d1g64linhg6xjcxcq3dk"; - }; - - buildInputs = [ - pkgconfig intltool perl perlXMLParser libxml2 - glib gtk3 pango atk gdk_pixbuf gobjectIntrospection - itstool gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic - gnome3.libgnome_keyring gnome3.gsettings_desktop_schemas - poppler ghostscriptX djvulibre libspectre - makeWrapper libsecret librsvg - ]; - - configureFlags = [ - "--disable-nautilus" # Do not use nautilus - "--enable-introspection" - ]; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - preConfigure = with stdenv.lib; - optionalString doCheck '' - for file in test/*.py; do - echo "patching $file" - sed '1s,/usr,${python},' -i "$file" - done - '' + optionalString (recentListSize != null) '' - sed -i 's/\(gtk_recent_chooser_set_limit .*\)5)/\1${builtins.toString recentListSize})/' shell/ev-open-recent-action.c - sed -i 's/\(if (++n_items == \)5\(.*\)/\1${builtins.toString recentListSize}\2/' shell/ev-window.c - ''; - - preFixup = '' - # Tell Glib/GIO about the MIME info directory, which is used - # by `g_file_info_get_content_type ()'. - 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 - - meta = with stdenv.lib; { - homepage = http://www.gnome.org/projects/evince/; - description = "GNOME's document viewer"; - - longDescription = '' - Evince is a document viewer for multiple document formats. It - currently supports PDF, PostScript, DjVu, TIFF and DVI. The goal - of Evince is to replace the multiple document viewers that exist - on the GNOME Desktop with a single simple application. - ''; - - license = stdenv.lib.licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = [ maintainers.vcunat ]; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/3.10/core/evolution-data-server/default.nix deleted file mode 100644 index 685f8c24e7cf..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/evolution-data-server/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, python, intltool, libsoup, libxml2, libsecret -, p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true, vala }: - - -stdenv.mkDerivation rec { - name = "evolution-data-server-3.10.4"; - - src = fetchurl { - url = "mirror://gnome/sources/evolution-data-server/3.10/${name}.tar.xz"; - sha256 = "5c2d5e19af19ecfa81f31306411ab6155c3c62cf407d5a5aaa675a8ce940fa2d"; - }; - - buildInputs = with gnome3; - [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts libsecret - gcr p11_kit db nspr nss libgweather libical libgdata gperf makeWrapper ] - ++ stdenv.lib.optional valaSupport vala; - - # uoa irrelevant for now - configureFlags = ["--disable-uoa" "--with-nspr-includes=${nspr}/include/nspr" "--with-nss-includes=${nss}/include/nss"] - ++ stdenv.lib.optional valaSupport "--enable-vala-bindings"; - - preFixup = '' - for f in "$out/libexec/evolution-addressbook-factory" "$out/libexec/evolution-calendar-factory"; do - wrapProgram $f --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - done - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.10/core/folks/default.nix b/pkgs/desktops/gnome-3/3.10/core/folks/default.nix deleted file mode 100644 index 47b958002a39..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/folks/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, glib, gnome3, nspr, intltool -, vala, sqlite, libxml2, dbus_glib, libsoup, nss, dbus_libs -, telepathy_glib, evolution_data_server, libsecret, db }: - -# TODO: enable more folks backends - -stdenv.mkDerivation rec { - name = "folks-0.9.6"; - - src = fetchurl { - url = "mirror://gnome/sources/folks/0.9/${name}.tar.xz"; - sha256 = "a67e055b5a2724a34a80946e2940c4c0ad708cb1f4e0a09407c6b69a5e40267f"; - }; - - propagatedBuildInputs = [ glib gnome3.libgee sqlite ]; - # dbus_daemon needed for tests - buildInputs = [ dbus_glib telepathy_glib evolution_data_server dbus_libs - vala libsecret libxml2 libsoup nspr nss intltool db ]; - nativeBuildInputs = [ pkgconfig ]; - - configureFlags = "--disable-fatal-warnings"; - - NIX_CFLAGS_COMPILE = ["-I${nspr}/include/nspr" "-I${nss}/include/nss" - "-I${dbus_glib}/include/dbus-1.0" "-I${dbus_libs}/include/dbus-1.0"]; - - enableParallelBuilding = true; - - postBuild = "rm -rf $out/share/gtk-doc"; - - meta = { - description = "Folks"; - - homepage = https://wiki.gnome.org/Projects/Folks; - - license = stdenv.lib.licenses.lgpl2Plus; - - maintainers = with stdenv.lib.maintainers; [ lethalman ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/gconf/default.nix b/pkgs/desktops/gnome-3/3.10/core/gconf/default.nix deleted file mode 100644 index 47dae0486e93..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/gconf/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, dbus_glib, gnome3, glib, libxml2 -, intltool, polkit, orbit }: - -stdenv.mkDerivation rec { - - versionMajor = "3.2"; - versionMinor = "6"; - moduleName = "GConf"; - - origName = "${moduleName}-${versionMajor}.${versionMinor}"; - - name = "gconf-${versionMajor}.${versionMinor}"; - - src = fetchurl { - url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${origName}.tar.xz"; - sha256 = "0k3q9nh53yhc9qxf1zaicz4sk8p3kzq4ndjdsgpaa2db0ccbj4hr"; - }; - - buildInputs = [ libxml2 polkit gnome3.gtk orbit ]; - propagatedBuildInputs = [ glib dbus_glib ]; - nativeBuildInputs = [ pkgconfig intltool ]; - - # ToDo: ldap reported as not found but afterwards reported as supported - - meta = with stdenv.lib; { - homepage = http://projects.gnome.org/gconf/; - description = "A system for storing application preferences"; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/gcr/default.nix b/pkgs/desktops/gnome-3/3.10/core/gcr/default.nix deleted file mode 100644 index a1fdd4712820..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/gcr/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gnupg, p11_kit, glib -, libgcrypt, libtasn1, dbus_glib, gtk, pango, gdk_pixbuf, atk -, gobjectIntrospection, makeWrapper }: - -stdenv.mkDerivation rec { - name = "gcr-3.10.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gcr/3.10/${name}.tar.xz"; - sha256 = "0nv470a8cvw4rw49hf5aqvll1rpkacmsr3pj8s1l205yaid4yvq0"; - }; - - buildInputs = [ - pkgconfig intltool gnupg p11_kit glib gobjectIntrospection - libgcrypt libtasn1 dbus_glib gtk pango gdk_pixbuf atk makeWrapper - ]; - - #doCheck = true; - - preFixup = '' - wrapProgram "$out/bin/gcr-viewer" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.10/core/gdm/default.nix deleted file mode 100644 index 5e53a7e86cbb..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/gdm/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, intltool, accountsservice, libX11 -, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection }: - -stdenv.mkDerivation rec { - name = "gdm-3.10.0.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gdm/3.10/${name}.tar.xz"; - sha256 = "1rva3djas48m8w1gyv3nds3jxfkirdfl0bk30x79mizrk80456jl"; - }; - - buildInputs = [ pkgconfig glib itstool libxml2 intltool accountsservice - gobjectIntrospection libX11 gtk libcanberra_gtk3 pam libtool ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/geocode-glib/default.nix b/pkgs/desktops/gnome-3/3.10/core/geocode-glib/default.nix deleted file mode 100644 index d3b21bef167a..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/geocode-glib/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, intltool, libsoup, json_glib }: - - -stdenv.mkDerivation rec { - name = "geocode-glib-3.10.0"; - - - src = fetchurl { - url = "mirror://gnome/sources/geocode-glib/3.10/${name}.tar.xz"; - sha256 = "0dx6v9n4dsskcy6630s77cyb32xlykdall0d555976warycc3v8a"; - }; - - buildInputs = with gnome3; - [ intltool pkgconfig glib libsoup json_glib ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.10/core/gjs/default.nix b/pkgs/desktops/gnome-3/3.10/core/gjs/default.nix deleted file mode 100644 index 429d147e728b..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/gjs/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, gobjectIntrospection, spidermonkey_17, pango }: - - -stdenv.mkDerivation rec { - name = "gjs-1.38.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gjs/1.38/${name}.tar.xz"; - sha256 = "0xl1zc5ncaxqs5ww5j82rzqrg429l8pdapqclxiba7dxwyh6a83b"; - }; - - buildInputs = with gnome3; - [ gobjectIntrospection pkgconfig glib pango ]; - - propagatedBuildInputs = [ spidermonkey_17 ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.10/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-backgrounds/default.nix deleted file mode 100644 index 3879b81859a4..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/gnome-backgrounds/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool }: - -stdenv.mkDerivation rec { - name = "gnome-backgrounds-3.10.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-backgrounds/3.10/${name}.tar.xz"; - sha256 = "11rv03m4hznpx0brf47hil04199z3jjvl1aq7q0lnill3yrffiyc"; - }; - - nativeBuildInputs = [ pkgconfig intltool ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-calculator/default.nix deleted file mode 100644 index 205961a91713..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/gnome-calculator/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, libxml2 -, bash, gtk3, glib, hicolor_icon_theme, makeWrapper -, itstool, gnome3, librsvg, gdk_pixbuf }: - -stdenv.mkDerivation rec { - name = "gnome-calculator-3.10.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-calculator/3.10/${name}.tar.xz"; - sha256 = "0gkddnk9x76895xrz0ps4yny36w62fhi459gwmxqqb9kx5934n1f"; - }; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - buildInputs = [ bash pkgconfig gtk3 glib intltool itstool - libxml2 gnome3.gtksourceview - gnome3.gsettings_desktop_schemas makeWrapper ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-calculator" \ - --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" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Apps/Calculator; - description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-common/default.nix deleted file mode 100644 index 12b2510dc436..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/gnome-common/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl, which, autoconf, automake }: - -stdenv.mkDerivation rec { - name = "gnome-common-3.10.0"; - - src = fetchurl { - url = "https://download.gnome.org/sources/gnome-common/3.10/${name}.tar.xz"; - sha256 = "aed69474a671e046523827f73ba5e936d57235b661db97900db7356e1e03b0a3"; - }; - - patches = [(fetchurl { - url = "https://bug697543.bugzilla-attachments.gnome.org/attachment.cgi?id=240935"; - sha256 = "17abp7czfzirjm7qsn2czd03hdv9kbyhk3lkjxg2xsf5fky7z7jl"; - })]; - - propagatedBuildInputs = [ which autoconf automake ]; # autogen.sh which is using gnome_common tends to require which -} diff --git a/pkgs/desktops/gnome-3/3.10/core/gnome-contacts/configure_dbus_glib.patch b/pkgs/desktops/gnome-3/3.10/core/gnome-contacts/configure_dbus_glib.patch deleted file mode 100644 index 926762defbde..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/gnome-contacts/configure_dbus_glib.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.ac.orig 2014-04-08 10:25:49.497620879 +0200 -+++ configure.ac 2014-04-08 10:26:36.639440950 +0200 -@@ -43,6 +43,7 @@ - folks-telepathy - folks-eds - libnotify -+ dbus-glib-1 - telepathy-glib >= 0.17.5 - libebook-1.2 >= 3.5.3 - libedataserver-1.2 >= 3.5.3 diff --git a/pkgs/desktops/gnome-3/3.10/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-contacts/default.nix deleted file mode 100644 index f8059f952e62..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/gnome-contacts/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ stdenv, intltool, fetchurl, evolution_data_server, db -, 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 }: - -stdenv.mkDerivation rec { - name = "gnome-contacts-3.10.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-contacts/3.10/${name}.tar.xz"; - sha256 = "e119c32bb10136e7190f11f79334fa82ed56468cff5bb7836da0ebf7b572779b"; - }; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard evolution_data_server ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - # force build from vala - preBuild = '' - touch src/*.vala - ''; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool evolution_data_server - gnome3.gsettings_desktop_schemas makeWrapper file libnotify - folks gnome3.gnome_desktop telepathy_glib libsecret dbus_glib - libxml2 libsoup gnome3.gnome_online_accounts nspr nss - vala automake114x autoconf db ]; - - preFixup = '' - for f in "$out/bin/gnome-contacts" "$out/libexec/gnome-contacts-search-provider"; do - wrapProgram $f \ - --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" - done - ''; - - patches = [ ./configure_dbus_glib.patch ./fix_row_selected.patch ]; - - patchFlags = "-p0"; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Contacts; - description = "Contacts is GNOME's integrated address book"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/gnome-contacts/fix_row_selected.patch b/pkgs/desktops/gnome-3/3.10/core/gnome-contacts/fix_row_selected.patch deleted file mode 100644 index b379b4b8ee97..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/gnome-contacts/fix_row_selected.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/contacts-view.vala.orig 2014-04-08 11:35:36.302252460 +0200 -+++ src/contacts-view.vala 2014-04-08 11:37:37.045343221 +0200 -@@ -265,7 +265,7 @@ - data.destroy (); - } - -- public override void row_selected (ListBoxRow row) { -+ public override void row_selected (ListBoxRow? row) { - var data = row as ContactDataRow; - var contact = data != null ? data.contact : null; - selection_changed (contact); diff --git a/pkgs/desktops/gnome-3/3.10/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-control-center/default.nix deleted file mode 100644 index 4e472514348c..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/gnome-control-center/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper -, libcanberra, accountsservice, libpwquality, pulseaudio, fontconfig -, gdk_pixbuf, hicolor_icon_theme, librsvg, libxkbfile, libnotify -, libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk -, cracklib, python, krb5, networkmanagerapplet, networkmanager -, libwacom, samba, shared_mime_info, tzdata, icu, libtool -, docbook_xsl, docbook_xsl_ns, modemmanager }: - -# http://ftp.gnome.org/pub/GNOME/teams/releng/3.10.2/gnome-suites-core-3.10.2.modules -# TODO: bluetooth, wacom, smbclient, printers - -stdenv.mkDerivation rec { - name = "gnome-control-center-3.10.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-control-center/3.10/${name}.tar.xz"; - sha256 = "1ac34kqkf174w0qc12p927dfhcm69xnv7fqzmbhjab56rn49wypn"; - }; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard gnome3.libgnomekbd ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - enableParallelBuilding = true; - - buildInputs = with gnome3; - [ pkgconfig intltool ibus gtk glib upower libcanberra gsettings_desktop_schemas - libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus - gnome_online_accounts libsoup colord pulseaudio fontconfig colord-gtk libpwquality - accountsservice krb5 networkmanagerapplet libwacom samba libnotify libxkbfile - shared_mime_info icu libtool docbook_xsl docbook_xsl_ns - networkmanager modemmanager makeWrapper ]; - - preBuild = '' - substituteInPlace tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab" - substituteInPlace panels/datetime/tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab" - - # hack to make test-endianess happy - mkdir -p $out/share/locale - substituteInPlace panels/datetime/test-endianess.c --replace "/usr/share/locale/" "$out/share/locale/" - ''; - - preFixup = with gnome3; '' - wrapProgram $out/bin/gnome-control-center \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:${gnome_settings_daemon}/share:${glib}/share:${gtk}/share:${colord}/share:$out/share:$out/share/gnome-control-center:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - 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 ]; - - meta = with stdenv.lib; { - description = "Single sign-on framework for GNOME"; - maintainers = with maintainers; [ lethalman ]; - platforms = platforms.linux; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.10/core/gnome-control-center/search_providers_dir.patch b/pkgs/desktops/gnome-3/3.10/core/gnome-control-center/search_providers_dir.patch deleted file mode 100644 index 7f5ad970f34e..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/gnome-control-center/search_providers_dir.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/panels/search/cc-search-panel.c b/panels/search/cc-search-panel.c -index d08e230..3bff4ad 100644 ---- a/panels/search/cc-search-panel.c -+++ b/panels/search/cc-search-panel.c -@@ -574,7 +574,11 @@ populate_search_providers (CcSearchPanel *self) - { - GFile *providers_location; - -- providers_location = g_file_new_for_path (DATADIR "/gnome-shell/search-providers"); -+ const gchar* search_providers_dir = g_getenv ("GNOME_SEARCH_PROVIDERS_DIR"); -+ if (search_providers_dir == NULL) { -+ search_providers_dir = DATADIR "/gnome-shell/search-providers"; -+ } -+ providers_location = g_file_new_for_path (search_providers_dir); - g_file_enumerate_children_async (providers_location, - "standard::type,standard::name,standard::content-type", - G_FILE_QUERY_INFO_NONE, diff --git a/pkgs/desktops/gnome-3/3.10/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-desktop/default.nix deleted file mode 100644 index 584705d658ef..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/gnome-desktop/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, python, libxml2Python, libxslt, which, libX11, gnome3, gtk3, glib -, intltool, gnome_doc_utils, libxkbfile, xkeyboard_config, isocodes, itstool, wayland -, gobjectIntrospection }: - -stdenv.mkDerivation rec { - - majorVersion = "3.10"; - minorVersion = "1"; - name = "gnome-desktop-${majorVersion}.${minorVersion}"; - - # this should probably be setuphook for glib - NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0"; - - enableParallelBuilding = true; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-desktop/${majorVersion}/${name}.tar.xz"; - sha256 = "0hdvm909lbpnixqv11qdx9iaycx4dpxys46fa128bqp8alisgb0h"; - }; - - buildInputs = [ pkgconfig python libxml2Python libxslt which libX11 xkeyboard_config isocodes itstool wayland - gtk3 glib intltool gnome_doc_utils libxkbfile gnome3.gsettings_desktop_schemas gobjectIntrospection ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-dictionary/default.nix deleted file mode 100644 index 6f68916b781e..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/gnome-dictionary/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, intltool, fetchurl -, pkgconfig, gtk3, glib, hicolor_icon_theme -, bash, makeWrapper, itstool, libxml2 -, gnome3, librsvg, gdk_pixbuf, file }: - -stdenv.mkDerivation rec { - name = "gnome-dictionary-3.10.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-dictionary/3.10/${name}.tar.xz"; - sha256 = "258b60fe50f7d0580a7dc3bb83f7fe2f6f0597d4013d97ac083c3f062c350ed7"; - }; - - doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 file - gnome3.gsettings_desktop_schemas makeWrapper ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-dictionary" \ - --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" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Dictionary; - description = "Dictionary is the GNOME application to look up definitions"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-disk-utility/default.nix deleted file mode 100644 index 334471c2943c..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/gnome-disk-utility/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, udisks2, libsecret, libdvdread -, bash, gtk3, glib, hicolor_icon_theme, makeWrapper, cracklib, libnotify -, itstool, gnome3, librsvg, gdk_pixbuf, libxml2, python -, libcanberra_gtk3, libxslt, libtool, docbook_xsl, libpwquality }: - -stdenv.mkDerivation rec { - name = "gnome-disk-utility-3.10.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-disk-utility/3.10/${name}.tar.xz"; - sha256 = "1amqi2bribxn8r8k8mvxh3710rmdll9963smf0v59v0iwxi3mqil"; - }; - - doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme - librsvg udisks2 gnome3.gnome_settings_daemon - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - buildInputs = [ bash pkgconfig gtk3 glib intltool itstool - libxslt libtool libsecret libpwquality cracklib - libnotify libdvdread libcanberra_gtk3 docbook_xsl - gnome3.gsettings_desktop_schemas makeWrapper libxml2 ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-disks" \ - --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; { - homepage = http://en.wikipedia.org/wiki/GNOME_Disks; - description = "A udisks graphical front-end"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-font-viewer/default.nix deleted file mode 100644 index cba651ca36a3..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/gnome-font-viewer/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, intltool, fetchurl -, pkgconfig, gtk3, glib, hicolor_icon_theme -, bash, makeWrapper, itstool -, gnome3, librsvg, gdk_pixbuf }: - -stdenv.mkDerivation rec { - name = "gnome-font-viewer-3.10.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-font-viewer/3.10/${name}.tar.xz"; - sha256 = "3928350f58ac6c95f44b64cba1a5f03437b19d9b2645a7b01176067504fdd652"; - }; - - doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gnome_desktop - gnome3.gsettings_desktop_schemas makeWrapper ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-font-viewer" \ - --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" - ''; - - meta = with stdenv.lib; { - description = "Program that can preview fonts and create thumbnails for fonts"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/gnome-icon-theme-symbolic/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-icon-theme-symbolic/default.nix deleted file mode 100644 index feb3d84b994e..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/gnome-icon-theme-symbolic/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, iconnamingutils, gtk }: - -stdenv.mkDerivation rec { - name = "gnome-icon-theme-symbolic-3.10.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-icon-theme-symbolic/3.10/${name}.tar.xz"; - sha256 = "344e88e5f9dac3184bf012d9bac972110df2133b93d76f2ad128d4c9cbf41412"; - }; - - configureFlags = "--enable-icon-mapping"; - - # Avoid postinstall make hooks - installPhase = '' - make install-exec-am install-data-local install-pkgconfigDATA - make -C src install - ''; - - buildInputs = [ pkgconfig iconnamingutils gtk gnome3.gnome_icon_theme ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/gnome-icon-theme/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-icon-theme/default.nix deleted file mode 100644 index 5b16f827ae00..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/gnome-icon-theme/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk }: - -stdenv.mkDerivation rec { - name = "gnome-icon-theme-3.10.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-icon-theme/3.10/${name}.tar.xz"; - sha256 = "1xinbgkkvlhazj887ajcl13i7kdc1wcca02jwxzvjrvchjsp4m66"; - }; - - setupHook = ./setup-hook.sh; - - nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/gnome-icon-theme/setup-hook.sh b/pkgs/desktops/gnome-3/3.10/core/gnome-icon-theme/setup-hook.sh deleted file mode 100644 index d7156f3d4630..000000000000 --- a/pkgs/desktops/gnome-3/3.10/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.10/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-keyring/default.nix deleted file mode 100644 index dbb8da93c6cb..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/gnome-keyring/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, libxslt -, intltool, pango, gcr, gdk_pixbuf, atk, p11_kit, makeWrapper -, docbook_xsl_ns, docbook_xsl, gnome3 }: - -stdenv.mkDerivation rec { - name = "gnome-keyring-3.10.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-keyring/3.10/${name}.tar.xz"; - sha256 = "1y6v2p14jx5h6yh14c53pd8r0r5zbmcgw8v4nxvf94kd9jliy00q"; - }; - - buildInputs = with gnome3; [ - dbus libgcrypt pam python gtk3 gconf libgnome_keyring - pango gcr gdk_pixbuf atk p11_kit makeWrapper - ]; - - propagatedBuildInputs = [ glib libtasn1 libxslt ]; - - nativeBuildInputs = [ pkgconfig intltool docbook_xsl_ns docbook_xsl ]; - - configureFlags = [ - "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt" # NixOS hardcoded path - "--with-pkcs11-config=$$out/etc/pkcs11/" # installation directories - "--with-pkcs11-modules=$$out/lib/pkcs11/" - ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-keyring" \ - --prefix XDG_DATA_DIRS : "${glib}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - wrapProgram "$out/bin/gnome-keyring-daemon" \ - --prefix XDG_DATA_DIRS : "${glib}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/gnome-menus/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-menus/default.nix deleted file mode 100644 index 37d2ea1c0863..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/gnome-menus/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, intltool, pkgconfig, glib, gobjectIntrospection }: - -stdenv.mkDerivation rec { - name = "gnome-menus-${version}"; - version = "3.10.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-menus/3.10/${name}.tar.xz"; - sha256 = "0wcacs1vk3pld8wvrwq7fdrm11i56nrajkrp6j1da6jc4yx0m5a6"; - }; - - makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"; - - preBuild = "patchShebangs ./scripts"; - - buildInputs = [ intltool pkgconfig glib gobjectIntrospection ]; - - meta = { - homepage = "http://www.gnome.org"; - description = "Gnome menu specification"; - - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-online-accounts/default.nix deleted file mode 100644 index 8c4594357333..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/gnome-online-accounts/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, libxslt, gtk, webkitgtk, json_glib, rest, libsecret, dbus_glib -, telepathy_glib, intltool, dbus_libs, icu, libsoup, docbook_xsl_ns, docbook_xsl -}: - -stdenv.mkDerivation rec { - name = "gnome-online-accounts-3.10.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-online-accounts/3.10/${name}.tar.xz"; - sha256 = "15qvw40dmi886491s3abpidsm2lx65fhglhj99bvcdskhk0ih90b"; - }; - - NIX_CFLAGS_COMPILE = "-I${dbus_glib}/include/dbus-1.0 -I${dbus_libs}/include/dbus-1.0"; - - enableParallelBuilding = true; - - buildInputs = [ pkgconfig glib libxslt gtk webkitgtk json_glib rest libsecret dbus_glib telepathy_glib intltool icu libsoup docbook_xsl_ns docbook_xsl]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-online-miners/default.nix deleted file mode 100644 index 4c904bf40f67..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/gnome-online-miners/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, gnome3, libxml2 -, libsoup, json_glib, gmp, openssl, makeWrapper }: - -stdenv.mkDerivation rec { - name = "gnome-online-miners-3.10.3"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-online-miners/3.10/${name}.tar.xz"; - sha256 = "129807d398e7744870110e6875629b6858d289021271550569ce5afa10fe9ea8"; - }; - - doCheck = true; - - buildInputs = [ pkgconfig glib gnome3.libgdata libxml2 libsoup gmp openssl - gnome3.grilo gnome3.libzapojit gnome3.grilo-plugins - gnome3.gnome_online_accounts makeWrapper - gnome3.tracker gnome3.gfbgraph json_glib gnome3.rest ]; - - enableParallelBuilding = true; - - preFixup = '' - for f in $out/libexec/*; do - wrapProgram "$f" \ - --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" - done - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/GnomeOnlineMiners; - description = "A set of crawlers that go through your online content and index them locally in Tracker"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-screenshot/default.nix deleted file mode 100644 index 7b94d0f90270..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/gnome-screenshot/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, libcanberra_gtk3 -, bash, gtk3, glib, hicolor_icon_theme, makeWrapper -, itstool, gnome3, librsvg, gdk_pixbuf }: - -stdenv.mkDerivation rec { - name = "gnome-screenshot-3.10.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-screenshot/3.10/${name}.tar.xz"; - sha256 = "1nb56kzcj5z4hmrmxap5r53smi52ki3pc8qmhi4rymkgqswyk7bh"; - }; - - doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libcanberra_gtk3 - gnome3.gsettings_desktop_schemas makeWrapper ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-screenshot" \ - --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" - ''; - - meta = with stdenv.lib; { - homepage = http://en.wikipedia.org/wiki/GNOME_Screenshot; - description = "Utility used in the GNOME desktop environment for taking screenshots"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-session/default.nix deleted file mode 100644 index f999702af54a..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/gnome-session/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, glib, dbus_glib, json_glib, upower -, libxslt, intltool, makeWrapper, systemd }: - - -stdenv.mkDerivation rec { - name = "gnome-session-3.10.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-session/3.10/${name}.tar.xz"; - sha256 = "1k59yss7r748nvr0cdjrqmx0zy26b93rfn66lsdg9fz60x77087n"; - }; - - configureFlags = "--enable-systemd"; - - buildInputs = with gnome3; - [ pkgconfig glib gnome_desktop gtk dbus_glib json_glib libxslt - gnome3.gnome_settings_daemon - gsettings_desktop_schemas upower intltool gconf makeWrapper systemd ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-session" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.10/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-settings-daemon/default.nix deleted file mode 100644 index 7a50b8db56fd..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/gnome-settings-daemon/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, intltool, glib, libnotify, lcms2, libXtst -, libxkbfile, pulseaudio, libcanberra_gtk3, upower, colord, libgweather, polkit -, geoclue2, librsvg, xf86_input_wacom, udev, libwacom, libxslt, libtool -, docbook_xsl, docbook_xsl_ns, makeWrapper, ibus }: - -stdenv.mkDerivation rec { - name = "gnome-settings-daemon-3.10.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-settings-daemon/3.10/${name}.tar.xz"; - sha256 = "0r42lzlgk0w40ws4d3s7yayn6n8zqlnh5b6k88gvgv1lwk39k240"; - }; - - # fatal error: gio/gunixfdlist.h: No such file or directory - NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0"; - - buildInputs = with gnome3; - [ intltool pkgconfig ibus gtk glib gsettings_desktop_schemas libnotify gnome_desktop - lcms2 libXtst libxkbfile pulseaudio libcanberra_gtk3 upower colord libgweather - polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libwacom libxslt - libtool docbook_xsl docbook_xsl_ns makeWrapper gnome_themes_standard ]; - - preFixup = '' - wrapProgram "$out/libexec/gnome-settings-daemon-localeexec" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix PATH : "${glib}/bin" \ - --prefix XDG_DATA_DIRS : "${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.10/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-shell-extensions/default.nix deleted file mode 100644 index 00974edb1db3..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/gnome-shell-extensions/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, intltool, fetchurl, libgtop -, pkgconfig, gtk3, glib, hicolor_icon_theme -, bash, makeWrapper, itstool -, gnome3, file }: - -stdenv.mkDerivation rec { - name = "gnome-shell-extensions-3.10.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-shell-extensions/3.10/${name}.tar.xz"; - sha256 = "9baa9ddaf4e14cab6d4d7944d8dc009378b25f995acfd0fd72843f599cb5ae43"; - }; - - doCheck = true; - - buildInputs = [ pkgconfig gtk3 glib libgtop intltool itstool - makeWrapper file ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/GnomeShell/Extensions; - description = "Modify and extend GNOME Shell functionality and behavior"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-shell/default.nix deleted file mode 100644 index 2b5ff4cc5a28..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/gnome-shell/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, json_glib, libcroco, intltool, libsecret -, python, libsoup, polkit, clutter, networkmanager, docbook_xsl, docbook_xsl_ns, at_spi2_core -, libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip -, pulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper -, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, librsvg }: - -# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup - -stdenv.mkDerivation rec { - name = "gnome-shell-3.10.2.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-shell/3.10/${name}.tar.xz"; - sha256 = "0k642y6h878v6mczx4z1zj4pjl7z4bvq02raxxwxkjyvyz2fv36j"; - }; - - buildInputs = with gnome3; - [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountsservice - libcroco intltool libsecret pkgconfig python libsoup polkit libcanberra gdk_pixbuf librsvg - clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns - libXtst p11_kit networkmanagerapplet gjs mutter pulseaudio caribou evolution_data_server - libical libtool nss gobjectIntrospection gtk gstreamer makeWrapper gdm gnome_control_center - at_spi2_core upower ibus gnome_session gnome_desktop telepathy_logger gnome3.gnome_settings_daemon ]; - - preBuild = '' - patchShebangs src/data-to-c.pl - substituteInPlace data/Makefile --replace " install-keysDATA" "" - ''; - - preFixup = with gnome3; '' - wrapProgram "$out/bin/gnome-shell" \ - --prefix PATH : "${unzip}/bin" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix LD_LIBRARY_PATH : "${accountsservice}/lib:${ibus}/lib:${gdm}/lib" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:${gtk}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - - wrapProgram "$out/libexec/gnome-shell-calendar-server" \ - --prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - patches = [ ./fix_background_corruption.patch ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.10/core/gnome-shell/fix_background_corruption.patch b/pkgs/desktops/gnome-3/3.10/core/gnome-shell/fix_background_corruption.patch deleted file mode 100644 index 9cb041bcce2c..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/gnome-shell/fix_background_corruption.patch +++ /dev/null @@ -1,147 +0,0 @@ -commit 831bd07b0d6b7055fea8317f2cdf8fd4a408c36d -Author: Jasper St. Pierre <jstpierre@mecheye.net> -Date: Thu Nov 7 17:14:47 2013 -0500 - - layout: Fix several issues with the background management code - - If monitor-changed fires at startup, it will destroy all of the - backgrounds, but since this._isStartup is true, won't recreate any - of them. Additionally, since _bgManagers is indexed by monitor index, - if the primary index is not 0, it could become a sparse array (e.g. - [undefined, undefined, primaryBackground]), and our for loop will - crash trying to access properties of undefined. - - Fix both of these issues by always creating background managers for - every monitor, hiding them on startup but only showing them after - the startup animation is complete. - - One thing we need to watch out for is that while LayoutManager is - constructing, Main.uiGroup / Main.layoutManager will be undefined, - so addBackgroundMenu will fail. Fix this by passing down the uiGroup - to the background menu code. - - https://bugzilla.gnome.org/show_bug.cgi?id=709313 - -diff --git a/js/ui/backgroundMenu.js b/js/ui/backgroundMenu.js -index 06e698c..dcbbb39 100644 ---- a/js/ui/backgroundMenu.js -+++ b/js/ui/backgroundMenu.js -@@ -13,7 +13,7 @@ const BackgroundMenu = new Lang.Class({ - Name: 'BackgroundMenu', - Extends: PopupMenu.PopupMenu, - -- _init: function(source) { -+ _init: function(source, layoutManager) { - this.parent(source, 0, St.Side.TOP); - - this.addSettingsAction(_("Settings"), 'gnome-control-center.desktop'); -@@ -22,17 +22,17 @@ const BackgroundMenu = new Lang.Class({ - - this.actor.add_style_class_name('background-menu'); - -- Main.uiGroup.add_actor(this.actor); -+ layoutManager.uiGroup.add_actor(this.actor); - this.actor.hide(); - } - }); - --function addBackgroundMenu(actor) { -+function addBackgroundMenu(actor, layoutManager) { - let cursor = new St.Bin({ opacity: 0 }); -- Main.uiGroup.add_actor(cursor); -+ layoutManager.uiGroup.add_actor(cursor); - - actor.reactive = true; -- actor._backgroundMenu = new BackgroundMenu(cursor); -+ actor._backgroundMenu = new BackgroundMenu(cursor, layoutManager); - actor._backgroundManager = new PopupMenu.PopupMenuManager({ actor: actor }); - actor._backgroundManager.addMenu(actor._backgroundMenu); - -diff --git a/js/ui/layout.js b/js/ui/layout.js -index 17073a6..80bae9d 100644 ---- a/js/ui/layout.js -+++ b/js/ui/layout.js -@@ -352,26 +352,26 @@ const LayoutManager = new Lang.Class({ - this.emit('hot-corners-changed'); - }, - -- _createBackground: function(monitorIndex) { -+ _addBackgroundMenu: function(bgManager) { -+ BackgroundMenu.addBackgroundMenu(bgManager.background.actor, this); -+ }, -+ -+ _createBackgroundManager: function(monitorIndex) { - let bgManager = new Background.BackgroundManager({ container: this._backgroundGroup, - layoutManager: this, - monitorIndex: monitorIndex }); -- BackgroundMenu.addBackgroundMenu(bgManager.background.actor); -- -- bgManager.connect('changed', Lang.bind(this, function() { -- BackgroundMenu.addBackgroundMenu(bgManager.background.actor); -- })); - -- this._bgManagers[monitorIndex] = bgManager; -+ bgManager.connect('changed', Lang.bind(this, this._addBackgroundMenu)); -+ this._addBackgroundMenu(bgManager); - -- return bgManager.background; -+ return bgManager; - }, - -- _createSecondaryBackgrounds: function() { -+ _showSecondaryBackgrounds: function() { - for (let i = 0; i < this.monitors.length; i++) { - if (i != this.primaryIndex) { -- let background = this._createBackground(i); -- -+ let background = this._bgManagers[i].background; -+ background.actor.show(); - background.actor.opacity = 0; - Tweener.addTween(background.actor, - { opacity: 255, -@@ -381,10 +381,6 @@ const LayoutManager = new Lang.Class({ - } - }, - -- _createPrimaryBackground: function() { -- this._createBackground(this.primaryIndex); -- }, -- - _updateBackgrounds: function() { - let i; - for (i = 0; i < this._bgManagers.length; i++) -@@ -395,11 +391,12 @@ const LayoutManager = new Lang.Class({ - if (Main.sessionMode.isGreeter) - return; - -- if (this._startingUp) -- return; -- - for (let i = 0; i < this.monitors.length; i++) { -- this._createBackground(i); -+ let bgManager = this._createBackgroundManager(i); -+ this._bgManagers.push(bgManager); -+ -+ if (i != this.primaryIndex && this._startingUp) -+ bgManager.background.actor.hide(); - } - }, - -@@ -595,7 +592,7 @@ const LayoutManager = new Lang.Class({ - if (Main.sessionMode.isGreeter) { - this.panelBox.translation_y = -this.panelBox.height; - } else { -- this._createPrimaryBackground(); -+ this._updateBackgrounds(); - - // We need to force an update of the regions now before we scale - // the UI group to get the coorect allocation for the struts. -@@ -673,7 +670,7 @@ const LayoutManager = new Lang.Class({ - this.keyboardBox.show(); - - if (!Main.sessionMode.isGreeter) { -- this._createSecondaryBackgrounds(); -+ this._showSecondaryBackgrounds(); - global.window_group.remove_clip(); - } - diff --git a/pkgs/desktops/gnome-3/3.10/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-system-log/default.nix deleted file mode 100644 index cdc4b732b97e..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/gnome-system-log/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig -, bash, gtk3, glib, hicolor_icon_theme, makeWrapper -, itstool, gnome3, librsvg, gdk_pixbuf, libxml2 }: - -stdenv.mkDerivation rec { - name = "gnome-system-log-3.9.90"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-system-log/3.9/${name}.tar.xz"; - sha256 = "9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411"; - }; - - doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - buildInputs = [ bash pkgconfig gtk3 glib intltool itstool - gnome3.gsettings_desktop_schemas makeWrapper libxml2 ]; - - preFixup = '' - 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; { - homepage = https://help.gnome.org/users/gnome-system-log/3.9/; - description = "Graphical, menu-driven viewer that you can use to view and monitor your system logs"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-system-monitor/default.nix deleted file mode 100644 index 91fbe67957fe..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/gnome-system-monitor/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, gtkmm3, libxml2 -, bash, gtk3, glib, hicolor_icon_theme, makeWrapper -, itstool, gnome3, librsvg, gdk_pixbuf, libgtop }: - -stdenv.mkDerivation rec { - name = "gnome-system-monitor-3.10.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-system-monitor/3.10/${name}.tar.xz"; - sha256 = "bd009e15672afe4ad3ebd7ed286cce79b9f76420fd39bc77a5826b29134b9db0"; - }; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libxml2 - gtkmm3 libgtop makeWrapper - gnome3.gsettings_desktop_schemas ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-system-monitor" \ - --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" - ''; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = https://help.gnome.org/users/gnome-system-monitor/3.10/; - description = "System Monitor shows you what programs are running and how much processor time, memory, and disk space are being used"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-terminal/default.nix deleted file mode 100644 index 1b17cbc3d78d..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/gnome-terminal/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, cairo, libxml2, gnome3, pango -, gnome_doc_utils, intltool, libX11, which, gconf, libuuid -, desktop_file_utils, itstool, makeWrapper }: - -stdenv.mkDerivation rec { - - versionMajor = "3.10"; - versionMinor = "2"; - - name = "gnome-terminal-${versionMajor}.${versionMinor}"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-terminal/${versionMajor}/${name}.tar.xz"; - sha256 = "04yrk9531f373nl64jx3pczsnq7a56mj3n436jbhjp74kp12fa70"; - }; - - buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte - gnome3.dconf gnome3.gconf itstool makeWrapper ]; - - nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2 desktop_file_utils ]; - - preFixup = '' - for f in "$out/libexec/gnome-terminal-migration" "$out/libexec/gnome-terminal-server"; do - wrapProgram "$f" --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" - done - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/gnome-themes-standard/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-themes-standard/default.nix deleted file mode 100644 index 08d82b7ae918..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/gnome-themes-standard/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ stdenv, fetchurl, intltool, gtk3, librsvg, pkgconfig, pango, atk, gtk2, gdk_pixbuf }: - -stdenv.mkDerivation rec { - name = "gnome-themes-standard-3.10.0"; - src = fetchurl { - url = "mirror://gnome/sources/gnome-themes-standard/3.10/${name}.tar.xz"; - sha256 = "0f2b3ypkfvrdsxcvp14ja9wqj382f1p46yrjvhhxkkjgagy6qb41"; - }; - - buildInputs = [ intltool gtk3 librsvg pkgconfig pango atk gtk2 gdk_pixbuf ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-user-docs/default.nix deleted file mode 100644 index d66863a22184..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/gnome-user-docs/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, file, gnome3, itstool, libxml2, intltool }: - -stdenv.mkDerivation rec { - name = "gnome-user-docs-3.10.3"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-user-docs/3.10/${name}.tar.xz"; - sha256 = "960b6373ea52e41e3deb3501930e024005b29d2cc958bfadc87450a291d2a905"; - }; - - buildInputs = [ pkgconfig gnome3.yelp itstool libxml2 intltool ]; - - meta = with stdenv.lib; { - homepage = https://help.gnome.org/users/gnome-help/3.10; - description = "User and system administration help for the Gnome desktop"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.cc-by-30; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-user-share/default.nix deleted file mode 100644 index 976b0eaca45b..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/gnome-user-share/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ stdenv, intltool, fetchurl, apacheHttpd_2_2, nautilus -, pkgconfig, gtk3, glib, hicolor_icon_theme, libxml2, gnused -, bash, makeWrapper, itstool, libnotify, libtool, mod_dnssd -, gnome3, librsvg, gdk_pixbuf, file, libcanberra_gtk3 }: - -stdenv.mkDerivation rec { - name = "gnome-user-share-3.10.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-user-share/3.10/${name}.tar.xz"; - sha256 = "1d1ea57a49224c36e7cba04f80265e835639377f474a7582c9e8ac946eda0f8f"; - }; - - doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - preConfigure = '' - sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' -i data/dav_user_2.2.conf - ''; - - configureFlags = [ "--with-httpd=${apacheHttpd_2_2}/bin/httpd" - "--with-modules-path=${apacheHttpd_2_2}/modules" - "--disable-bluetooth" - "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 libtool - makeWrapper file gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - nautilus libnotify libcanberra_gtk3 ]; - - postInstall = '' - mkdir -p $out/share/gsettings-schemas/$name - mv $out/share/glib-2.0 $out/share/gsettings-schemas/$name - ${glib}/bin/glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas - ''; - - preFixup = '' - 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; { - homepage = https://help.gnome.org/users/gnome-user-share/3.8; - description = "Service that exports the contents of the Public folder in your home directory on the local network"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/3.10/core/grilo-plugins/default.nix deleted file mode 100644 index a8a1c244767c..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/grilo-plugins/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, file, intltool, glib, sqlite -, gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp_av -, gmime, json_glib, avahi, tracker, itstool }: - -stdenv.mkDerivation rec { - name = "grilo-plugins-0.2.12"; - - src = fetchurl { - url = "mirror://gnome/sources/grilo-plugins/0.2/${name}.tar.xz"; - sha256 = "15bed8a633c81b251920ab677d455433e641388f605277ca88e549cc89012b48"; - }; - - installFlags = [ "GRL_PLUGINS_DIR=$(out)/lib/grilo-0.2" ]; - - buildInputs = [ pkgconfig gnome3.grilo libxml2 gupnp gssdp gnome3.libgdata - lua5 liboauth gupnp_av sqlite gnome3.gnome_online_accounts - gnome3.totem-pl-parser gnome3.rest gmime json_glib - avahi gnome3.libmediaart tracker intltool itstool ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Projects/Grilo; - description = "A collection of plugins for the Grilo framework"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.lgpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/grilo/default.nix b/pkgs/desktops/gnome-3/3.10/core/grilo/default.nix deleted file mode 100644 index 6f1bfbbcfe94..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/grilo/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, file, intltool, glib -, libxml2, gnome3, gobjectIntrospection, libsoup }: - -stdenv.mkDerivation rec { - name = "grilo-0.2.10"; - - src = fetchurl { - url = "mirror://gnome/sources/grilo/0.2/${name}.tar.xz"; - sha256 = "559a2470fe541b0090bcfdfac7a33e92dba967727bbab6d0eca70e5636a77b25"; - }; - - configureFlags = [ "--enable-grl-pls" "--enable-grl-net" ]; - - preConfigure = '' - for f in src/Makefile.in libs/pls/Makefile.in libs/net/Makefile.in; do - substituteInPlace $f --replace @INTROSPECTION_GIRDIR@ "$out/share/gir-1.0/" - substituteInPlace $f --replace @INTROSPECTION_TYPELIBDIR@ "$out/lib/girepository-1.0" - done - ''; - - buildInputs = [ pkgconfig file intltool glib libxml2 libsoup - gnome3.totem-pl-parser gobjectIntrospection ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Projects/Grilo; - description = "Framework that provides access to various sources of multimedia content, using a pluggable system"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.lgpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/3.10/core/gsettings-desktop-schemas/default.nix deleted file mode 100644 index 13f357db29af..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/gsettings-desktop-schemas/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, gobjectIntrospection - # just for passthru -, gtk3, gsettings_desktop_schemas }: - -stdenv.mkDerivation rec { - - versionMajor = "3.10"; - versionMinor = "1"; - moduleName = "gsettings-desktop-schemas"; - - name = "${moduleName}-${versionMajor}.${versionMinor}"; - - src = fetchurl { - url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "04b8wy10l6pzs5928gnzaia73dz5fjlcdy39xi3mf50ajv27h8s5"; - }; - - buildInputs = [ glib gobjectIntrospection ]; - - nativeBuildInputs = [ pkgconfig intltool ]; - - passthru = { - doCompileSchemas = '' - for pkg in "${gsettings_desktop_schemas}" "${gtk3}"; do - cp -s $pkg/share/glib-2.0/schemas/*.gschema.xml $out/share/glib-2.0/schemas/ - done - ${glib}/bin/glib-compile-schemas $out/share/glib-2.0/schemas/ - ''; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/3.10/core/gtksourceview/default.nix deleted file mode 100644 index 900bb2c922bb..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/gtksourceview/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango -, libxml2Python, perl, intltool, gettext }: - -stdenv.mkDerivation rec { - name = "gtksourceview-${version}"; - version = "3.10.1"; - - src = fetchurl { - url = "https://download.gnome.org/sources/gtksourceview/3.10/gtksourceview-${version}.tar.xz"; - sha256 = "008bzfr1s6ywpj8c8qx7495lz9g0ziccwbxg88s0l4dl6bw49piq"; - }; - - buildInputs = [ pkgconfig atk cairo glib gtk3 pango - libxml2Python perl intltool gettext ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/3.10/core/gucharmap/default.nix deleted file mode 100644 index a6bf72b2fc7e..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/gucharmap/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, gtk3 -, glib, desktop_file_utils, bash -, makeWrapper, gnome3, file, itstool, libxml2 }: - -# TODO: icons and theme still does not work -# use packaged gnome3.gnome_icon_theme_symbolic - -stdenv.mkDerivation rec { - name = "gucharmap-3.10.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gucharmap/3.10/${name}.tar.xz"; - sha256 = "04e8606c65adb14d267b50b1cf9eb4fee92bd9c5ab512a346bd4c9c686403f78"; - }; - - configureFlags = [ "--disable-static" ]; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; - - buildInputs = [ pkgconfig gtk3 intltool itstool glib - gnome3.yelp_tools libxml2 file desktop_file_utils - gnome3.gsettings_desktop_schemas makeWrapper ]; - - preFixup = '' - wrapProgram "$out/bin/gucharmap" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Gucharmap; - description = "GNOME Character Map, based on the Unicode Character Database"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/libcroco/default.nix b/pkgs/desktops/gnome-3/3.10/core/libcroco/default.nix deleted file mode 100644 index 1875c1491f96..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/libcroco/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, glib }: - -stdenv.mkDerivation rec { - name = "libcroco-0.6.8"; - - src = fetchurl { - url = "mirror://gnome/sources/libcroco/0.6/${name}.tar.xz"; - sha256 = "0w453f3nnkbkrly7spx5lx5pf6mwynzmd5qhszprq8amij2invpa"; - }; - - configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic"; - - buildInputs = [ pkgconfig libxml2 glib ]; - - meta = with stdenv.lib; { - platforms = platforms.unix; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/libgdata/default.nix b/pkgs/desktops/gnome-3/3.10/core/libgdata/default.nix deleted file mode 100644 index 9a1a45e0d1ac..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/libgdata/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxml2, glib -, gobjectIntrospection, liboauth, gnome3, p11_kit, openssl }: - -stdenv.mkDerivation rec { - name = "libgdata-0.14.0"; - - src = fetchurl { - url = "mirror://gnome/sources/libgdata/0.14/${name}.tar.xz"; - sha256 = "1scjs944kjazbsh86kdj6w2vprib6yd3wzxzabcs59acmr0m4hax"; - }; - - NIX_CFLAGS_COMPILE = "-I${gnome3.libsoup}/include/libsoup-gnome-2.4/ -I${gnome3.gcr}/include/gcr-3 -I${gnome3.gcr}/include/gck-1"; - - buildInputs = with gnome3; - [ pkgconfig libsoup intltool libxml2 glib gobjectIntrospection - liboauth gcr gnome_online_accounts p11_kit openssl ]; - - meta = with stdenv.lib; { - description = "GData API library"; - maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; - license = licenses.lgpl21Plus; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.10/core/libgee/default.nix b/pkgs/desktops/gnome-3/3.10/core/libgee/default.nix deleted file mode 100644 index c7ed541082d5..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/libgee/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobjectIntrospection }: -let - ver_maj = "0.12"; - ver_min = "0"; -in -stdenv.mkDerivation rec { - name = "libgee-${ver_maj}.${ver_min}"; - - src = fetchurl { - url = "https://download.gnome.org/sources/libgee/${ver_maj}/${name}.tar.xz"; - sha256 = "19bf94ia1h5z8h0hdhwcd2b2p6ngffirg0dai7pdb98dzriys1ni"; - }; - - doCheck = true; - - patches = [ ./fix_introspection_paths.patch ]; - - buildInputs = [ autoconf vala pkgconfig glib gobjectIntrospection ]; - - meta = with stdenv.lib; { - description = "Utility library providing GObject-based interfaces and classes for commonly used data structures"; - license = licenses.lgpl21Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/libgee/fix_introspection_paths.patch b/pkgs/desktops/gnome-3/3.10/core/libgee/fix_introspection_paths.patch deleted file mode 100644 index 67003f451645..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/libgee/fix_introspection_paths.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- fix_introspection_paths.patch/configure 2014-01-07 17:43:53.521339338 +0000 -+++ fix_introspection_paths.patch/configure-fix 2014-01-07 17:45:11.068635069 +0000 -@@ -12085,8 +12085,8 @@ - INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` - INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` - INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` -- INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` -- INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" -+ INTROSPECTION_GIRDIR="${datadir}/gir-1.0" -+ INTROSPECTION_TYPELIBDIR="${libdir}/girepository-1.0" - INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` - INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` - INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection diff --git a/pkgs/desktops/gnome-3/3.10/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.10/core/libgnome-keyring/default.nix deleted file mode 100644 index 28c7b80c0d4f..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/libgnome-keyring/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, intltool, gobjectIntrospection }: - -stdenv.mkDerivation rec { - name = "libgnome-keyring-3.10.1"; - - src = fetchurl { - url = "mirror://gnome/sources/libgnome-keyring/3.10/${name}.tar.xz"; - sha256 = "0wip88r91kwx4zp6sc9b38mnlv11grgl4k2kzsd3a8x83c9g2b05"; - }; - - propagatedBuildInputs = [ glib gobjectIntrospection dbus_libs libgcrypt ]; - nativeBuildInputs = [ pkgconfig intltool ]; - - meta = { - description = "Framework for managing passwords and other secrets"; - homepage = http://live.gnome.org/GnomeKeyring; - # TODO license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ]; - inherit (glib.meta) platforms maintainers; - - longDescription = '' - gnome-keyring is a program that keeps password and other secrets for - users. The library libgnome-keyring is used by applications to integrate - with the gnome-keyring system. - ''; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/libgnomekbd/default.nix b/pkgs/desktops/gnome-3/3.10/core/libgnomekbd/default.nix deleted file mode 100644 index 1156474e5a7c..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/libgnomekbd/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, file, intltool, glib, gtk3, libxklavier, makeWrapper }: - -stdenv.mkDerivation rec { - name = "libgnomekbd-3.6.0"; - - src = fetchurl { - url = "mirror://gnome/sources/libgnomekbd/3.6/${name}.tar.xz"; - sha256 = "c41ea5b0f64da470925ba09f9f1b46b26b82d4e433e594b2c71eab3da8856a09"; - }; - - buildInputs = [ pkgconfig file intltool glib gtk3 libxklavier makeWrapper ]; - - preFixup = '' - wrapProgram $out/bin/gkbd-keyboard-display \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - description = "Keyboard management library"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/libgweather/default.nix b/pkgs/desktops/gnome-3/3.10/core/libgweather/default.nix deleted file mode 100644 index c480a59e453e..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/libgweather/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, libsoup, gconf -, pango, gdk_pixbuf, atk, tzdata }: - -stdenv.mkDerivation rec { - name = "libgweather-3.10.1"; - - src = fetchurl { - url = "mirror://gnome/sources/libgweather/3.10/${name}.tar.xz"; - sha256 = "1iyg0l90m14iw0ksjbmrrhb5fqn0y7x5f726y56gxd4qcxgpi3mf"; - }; - - makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"; - - configureFlags = [ "--with-zoneinfo-dir=${tzdata}/share/zoneinfo" ]; - propagatedBuildInputs = [ libxml2 gtk libsoup gconf pango gdk_pixbuf atk ]; - nativeBuildInputs = [ pkgconfig intltool ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/libgxps/default.nix b/pkgs/desktops/gnome-3/3.10/core/libgxps/default.nix deleted file mode 100644 index 72d307f4f1a7..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/libgxps/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, cairo, libarchive, freetype, libjpeg, libtiff -, openssl, bzip2, acl, attr -}: - -stdenv.mkDerivation rec { - name = "libgxps-0.2.2"; - - src = fetchurl { - url = "http://ftp.acc.umu.se/pub/GNOME/core/3.10/3.10.2/sources/${name}.tar.xz"; - sha256 = "1gi0b0x0354jyqc48vspk2hg2q1403cf2p9ibj847nzhkdrh9l9r"; - }; - - buildInputs = [ pkgconfig glib cairo libarchive freetype libjpeg libtiff acl openssl bzip2 attr]; - - configureFlags = "--without-liblcms2"; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/libpeas/default.nix b/pkgs/desktops/gnome-3/3.10/core/libpeas/default.nix deleted file mode 100644 index 9cf8426104be..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/libpeas/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool -, glib, gtk3, gobjectIntrospection, python, pygobject3 -}: - -stdenv.mkDerivation rec { - name = "libpeas-${version}"; - version = "1.9.0"; - - buildInputs = [ - intltool pkgconfig - glib gtk3 gobjectIntrospection python pygobject3 - ]; - - src = fetchurl { - url = "mirror://gnome/sources/libpeas/1.9/${name}.tar.xz"; - sha256 = "13fzyzv6c0cfdj83z1s16lv8k997wpnzyzr0wfwcfkcmvz64g1q0"; - }; - - preFixup = '' - rm $out/share/icons/hicolor/icon-theme.cache - ''; - - meta = { - description = "A GObject-based plugins engine"; - homepage = "http://ftp.acc.umu.se/pub/GNOME/sources/libpeas/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/libzapojit/default.nix b/pkgs/desktops/gnome-3/3.10/core/libzapojit/default.nix deleted file mode 100644 index e0e4c02c084c..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/libzapojit/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, intltool, json_glib, rest, libsoup, gtk, gnome_online_accounts }: - -stdenv.mkDerivation rec { - name = "libzapojit-0.0.3"; - - src = fetchurl { - url = "http://ftp.acc.umu.se/pub/GNOME/core/3.10/3.10.2/sources/${name}.tar.xz"; - sha256 = "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x"; - }; - - buildInputs = [ pkgconfig glib intltool json_glib rest libsoup gtk gnome_online_accounts ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/mutter/default.nix b/pkgs/desktops/gnome-3/3.10/core/mutter/default.nix deleted file mode 100644 index 0acfa9f36aed..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/mutter/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo -, pango, cogl, clutter, libstartup_notification, libcanberra, zenity, libcanberra_gtk3 -, libtool, makeWrapper }: - - -stdenv.mkDerivation rec { - name = "mutter-3.10.2"; - - src = fetchurl { - url = "mirror://gnome/sources/mutter/3.10/${name}.tar.xz"; - sha256 = "000iclb96mgc4rp2q0cy72nfwyfzl6avijl9nmk87f5sgyy670a3"; - }; - - # fatal error: gio/gunixfdlist.h: No such file or directory - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - configureFlags = "--with-x --disable-static --enable-shape --enable-sm --enable-startup-notification --enable-xsync --enable-verbose-mode --with-libcanberra"; - - buildInputs = with gnome3; - [ pkgconfig intltool glib gobjectIntrospection gtk gsettings_desktop_schemas upower - gnome_desktop cairo pango cogl clutter zenity libstartup_notification libcanberra - libcanberra_gtk3 zenity libtool makeWrapper ]; - - preFixup = '' - wrapProgram "$out/bin/mutter" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.10/core/nautilus/default.nix b/pkgs/desktops/gnome-3/3.10/core/nautilus/default.nix deleted file mode 100644 index 2041a71a82c3..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/nautilus/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, dbus_glib, shared_mime_info, libexif -, gtk, gnome3, libunique, intltool, gobjectIntrospection -, libnotify, makeWrapper, exempi, librsvg }: - -stdenv.mkDerivation rec { - name = "nautilus-3.10.1"; - - src = fetchurl { - url = "mirror://gnome/sources/nautilus/3.10/${name}.tar.xz"; - sha256 = "09y7dxaw4bjgan3q10azky0h6kndqv2lfn75iip12zchf2hk59gn"; - }; - - configureFlags = [ "--enable-tracker=no" ]; - - buildInputs = [ pkgconfig libxml2 dbus_glib shared_mime_info libexif gtk libunique intltool exempi librsvg - gnome3.gnome_desktop gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic gnome3.gsettings_desktop_schemas libnotify makeWrapper ]; - - preFixup = '' - wrapProgram "$out/bin/nautilus" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk}/share:${gnome3.gnome_icon_theme}:${gnome3.gsettings_desktop_schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/rest/default.nix b/pkgs/desktops/gnome-3/3.10/core/rest/default.nix deleted file mode 100644 index f543f8e13b82..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/rest/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, libsoup, gobjectIntrospection }: - -stdenv.mkDerivation rec { - name = "rest-0.7.90"; - - src = fetchurl { - url = "http://ftp.acc.umu.se/pub/GNOME/core/3.10/3.10.2/sources/${name}.tar.xz"; - sha256 = "08n0cvz44l4b1gkmjryap3ysd0wcbbbdjbcar73nr52dmk52ls0x"; - }; - - buildInputs = [ pkgconfig glib libsoup gobjectIntrospection]; - - configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt"; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/sushi/default.nix b/pkgs/desktops/gnome-3/3.10/core/sushi/default.nix deleted file mode 100644 index 089b5cd03c13..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/sushi/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, file, intltool, gobjectIntrospection, glib -, clutter_gtk, clutter-gst, gnome3, gtksourceview, libmusicbrainz -, webkitgtk, libmusicbrainz5, icu, makeWrapper, gst_all_1 -, gdk_pixbuf, librsvg, hicolor_icon_theme }: - -stdenv.mkDerivation rec { - name = "sushi-3.10.0"; - - src = fetchurl { - url = "mirror://gnome/sources/sushi/3.10/${name}.tar.xz"; - sha256 = "cffcf28b170f5825e84983a979972d4d901a453b61cbe3e560d362e8dd4b4bc8"; - }; - - propagatedUserEnvPkgs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; - - buildInputs = [ pkgconfig file intltool gobjectIntrospection glib - clutter_gtk clutter-gst gnome3.gjs gtksourceview gdk_pixbuf librsvg - gnome3.gnome_icon_theme hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - libmusicbrainz5 webkitgtk gnome3.evince icu makeWrapper ]; - - enableParallelBuilding = true; - - preFixup = '' - wrapProgram $out/libexec/sushi-start \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = "http://en.wikipedia.org/wiki/Sushi_(software)"; - description = "A quick previewer for Nautilus"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/totem-pl-parser/default.nix b/pkgs/desktops/gnome-3/3.10/core/totem-pl-parser/default.nix deleted file mode 100644 index f1b3bfe53c13..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/totem-pl-parser/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, file, intltool, gmime, libxml2, libsoup }: - -stdenv.mkDerivation rec { - name = "totem-pl-parser-3.10.2"; - - src = fetchurl { - url = "mirror://gnome/sources/totem-pl-parser/3.10/${name}.tar.xz"; - sha256 = "38be09bddc46ddecd2b5ed7c82144ef52aafe879a5ec3d8b192b4b64ba995469"; - }; - - buildInputs = [ pkgconfig file intltool gmime libxml2 libsoup ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Videos; - description = "Simple GObject-based library to parse and save a host of playlist formats"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.lgpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/totem/default.nix b/pkgs/desktops/gnome-3/3.10/core/totem/default.nix deleted file mode 100644 index c6b78c827dba..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/totem/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ stdenv, intltool, fetchurl, gst_all_1 -, clutter_gtk, clutter-gst, pygobject3, shared_mime_info -, pkgconfig, gtk3, glib, hicolor_icon_theme -, bash, makeWrapper, itstool, libxml2, dbus_glib -, gnome3, librsvg, gdk_pixbuf, file }: - -stdenv.mkDerivation rec { - name = "totem-3.10.1"; - - src = fetchurl { - url = "mirror://gnome/sources/totem/3.10/${name}.tar.xz"; - sha256 = "b6b6038c9104965671a6d25e98496a487c3a9c590c9c104f668bd9f4fa7be9e2"; - }; - - doCheck = true; - - enableParallelBuilding = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 gnome3.grilo - clutter_gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins - gst_all_1.gstreamer gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad - gnome3.libpeas pygobject3 shared_mime_info dbus_glib - gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - gnome3.gsettings_desktop_schemas makeWrapper file ]; - - preFixup = '' - wrapProgram "$out/bin/totem" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --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; { - homepage = https://wiki.gnome.org/Apps/Videos; - description = "Movie player for the GNOME desktop based on GStreamer"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.10/core/tracker/default.nix deleted file mode 100644 index dbae108d2e96..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/tracker/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ stdenv, intltool, fetchurl, libxml2, upower -, pkgconfig, gtk3, glib, hicolor_icon_theme -, bash, makeWrapper, itstool, vala, sqlite -, gnome3, librsvg, gdk_pixbuf, file, libnotify -, evolution_data_server, gst_all_1, poppler -, icu, taglib, libjpeg, libtiff, giflib, libcue -, libvorbis, flac, exempi, networkmanager -, libpng, libexif, libgsf, libuuid, bzip2 }: - -stdenv.mkDerivation rec { - name = "tracker-0.16.4"; - - src = fetchurl { - url = "mirror://gnome/sources/tracker/0.16/${name}.tar.xz"; - sha256 = "9c2f50839c2b8b352ab9a022597ef985c1900e6286c0c3bcb7a64da39dbb3580"; - }; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - enableParallelBuilding = true; - - buildInputs = [ vala pkgconfig gtk3 glib intltool itstool libxml2 - bzip2 gnome3.totem-pl-parser - gnome3.gsettings_desktop_schemas makeWrapper file - gdk_pixbuf gnome3.gnome_icon_theme librsvg sqlite - upower libnotify evolution_data_server gnome3.libgee - gst_all_1.gstreamer gst_all_1.gst-plugins-base flac - poppler icu taglib libjpeg libtiff giflib libvorbis - exempi networkmanager libpng libexif libgsf libuuid - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - preFixup = '' - for f in $out/bin/* $out/libexec/*; do - wrapProgram $f \ - --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" - done - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/Tracker; - description = "Desktop-neutral user information store, search tool and indexer"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/vino/default.nix b/pkgs/desktops/gnome-3/3.10/core/vino/default.nix deleted file mode 100644 index 65668dce6a20..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/vino/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, intltool, fetchurl, gtk3, glib, libsoup, pkgconfig, makeWrapper -, libnotify, file }: - -stdenv.mkDerivation rec { - name = "vino-${versionMajor}.${versionMinor}"; - versionMajor = "3.10"; - versionMinor = "1"; - - src = fetchurl { - url = "mirror://gnome/sources/vino/${versionMajor}/${name}.tar.xz"; - sha256 = "0imyvz96b7kikikwxn1r5sfxwmi40523nd66gp9hrl23gik0vwgs"; - }; - - doCheck = true; - - buildInputs = [ gtk3 intltool glib libsoup pkgconfig libnotify file makeWrapper ]; - - preFixup = '' - for f in "$out/bin/vino-passwd" "$out/libexec/vino-server"; do - wrapProgram $f --prefix XDG_DATA_DIRS : "${gtk3}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - done - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Projects/Vino; - description = "GNOME desktop sharing server"; - maintainers = with maintainers; [ lethalman iElectric ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/3.10/core/yelp-tools/default.nix deleted file mode 100644 index 39ff3838f4a8..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/yelp-tools/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, libxml2, libxslt, itstool, gnome3, pkgconfig }: - -stdenv.mkDerivation rec { - name = "yelp-tools-3.10.0"; - - src = fetchurl { - url = "https://download.gnome.org/sources/yelp-tools/3.10/${name}.tar.xz"; - sha256 = "0496xyx1657db22ks3k92al64fp6236y5bgh7s7b0j8hcc112ppz"; - }; - - buildInputs = [ libxml2 libxslt itstool gnome3.yelp_xsl pkgconfig ]; - - doCheck = true; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Yelp/Tools; - description = "Small programs that help you create, edit, manage, and publish your Mallard or DocBook documentation"; - maintainers = with maintainers; [ iElectric ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/3.10/core/yelp-xsl/default.nix deleted file mode 100644 index c5060bdba75c..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/yelp-xsl/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, bash -, itstool, libxml2, libxslt }: - -stdenv.mkDerivation rec { - name = "yelp-xsl-3.10.1"; - - src = fetchurl { - url = "https://download.gnome.org/sources/yelp-xsl/3.10/${name}.tar.xz"; - sha256 = "59c6dee3999121f6ffd33a9c5228316b75bc22e3bd68fff310beb4eeff245887"; - }; - - doCheck = true; - - buildInputs = [ pkgconfig intltool itstool libxml2 libxslt ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Yelp; - description = "Yelp's universal stylesheets for Mallard and DocBook"; - maintainers = with maintainers; [ lethalman ]; - # TODO license = [licenses.gpl2 licenses.lgpl2]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/yelp/default.nix b/pkgs/desktops/gnome-3/3.10/core/yelp/default.nix deleted file mode 100644 index 983e7f416a6d..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/yelp/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib -, file, librsvg, hicolor_icon_theme, gnome3, gdk_pixbuf -, bash, makeWrapper, itstool, libxml2, libxslt, icu }: - -stdenv.mkDerivation rec { - name = "yelp-3.10.1"; - - src = fetchurl { - url = "mirror://gnome/sources/yelp/3.10/${name}.tar.xz"; - sha256 = "17736479b7d0b1128c7d6cb3073f2b09e4bbc82670731b2a0d3a3219a520f816"; - }; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - propagatedBuildInputs = [ librsvg gdk_pixbuf gnome3.gnome_icon_theme - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; - - buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool - libxml2 libxslt icu file makeWrapper gnome3.yelp_xsl - gnome3.gsettings_desktop_schemas ]; - - preFixup = '' - wrapProgram "$out/bin/yelp" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/:${gnome3.gnome_themes_standard}/share:${gnome3.yelp_xsl}/share/yelp-xsl:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/yelp:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Yelp; - description = "The Gnome help viewer"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/zenity/default.nix b/pkgs/desktops/gnome-3/3.10/core/zenity/default.nix deleted file mode 100644 index 366088c67291..000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/zenity/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, gnome3, pango -, gnome_doc_utils, intltool, libX11, which, itstool }: - -stdenv.mkDerivation rec { - - versionMajor = "3.8"; - versionMinor = "0"; - - name = "zenity-${versionMajor}.${versionMinor}"; - - src = fetchurl { - url = "mirror://gnome/sources/zenity/${versionMajor}/zenity-${versionMajor}.${versionMinor}.tar.xz"; - sha256 = "0gsnwvhsqqba5i6d4jh86j29q4q18hmvhj9c1v76vwlj2nvz1ywl"; - }; - - buildInputs = [ gnome3.gtk libxml2 libxslt libX11 itstool ]; - - nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/default.nix b/pkgs/desktops/gnome-3/3.10/default.nix deleted file mode 100644 index e1783be3b7fb..000000000000 --- a/pkgs/desktops/gnome-3/3.10/default.nix +++ /dev/null @@ -1,195 +0,0 @@ -{ callPackage, self, pkgs }: - -rec { - inherit (pkgs) glib gtk2 gtk3 gnome2 upower glib_networking; - gtk = gtk3; # just to be sure - libcanberra = pkgs.libcanberra_gtk3; # just to be sure - inherit (pkgs.gnome2) ORBit2; - orbit = ORBit2; - inherit (pkgs) libsoup; - -#### Core (http://ftp.acc.umu.se/pub/GNOME/core/) - - baobab = callPackage ./core/baobab { }; - - caribou = callPackage ./core/caribou { }; - - dconf = callPackage ./core/dconf { }; - - empathy = callPackage ./core/empathy { }; - - epiphany = callPackage ./core/epiphany { }; - - evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests - - evolution_data_server = callPackage ./core/evolution-data-server { }; - - gconf = callPackage ./core/gconf { }; - - geocode_glib = callPackage ./core/geocode-glib { }; - - gcr = callPackage ./core/gcr { }; # ToDo: tests fail - - gdm = callPackage ./core/gdm { }; - - gjs = callPackage ./core/gjs { }; - - gnome-backgrounds = callPackage ./core/gnome-backgrounds { }; - - gnome-contacts = callPackage ./core/gnome-contacts { }; - - gnome_control_center = callPackage ./core/gnome-control-center { }; - - gnome-calculator = callPackage ./core/gnome-calculator { }; - - gnome_common = callPackage ./core/gnome-common { }; - - gnome_desktop = callPackage ./core/gnome-desktop { }; - - gnome-dictionary = callPackage ./core/gnome-dictionary { }; - - gnome-disk-utility = callPackage ./core/gnome-disk-utility { }; - - gnome-font-viewer = callPackage ./core/gnome-font-viewer { }; - - gnome_icon_theme = callPackage ./core/gnome-icon-theme { }; - - gnome_icon_theme_symbolic = callPackage ./core/gnome-icon-theme-symbolic { }; - - gnome-menus = callPackage ./core/gnome-menus { }; - - gnome_keyring = callPackage ./core/gnome-keyring { }; - - libgnome_keyring = callPackage ./core/libgnome-keyring { }; - - libgnomekbd = callPackage ./core/libgnomekbd { }; - - folks = callPackage ./core/folks { }; - - gnome_online_accounts = callPackage ./core/gnome-online-accounts { }; - - gnome-online-miners = callPackage ./core/gnome-online-miners { }; - - gnome_session = callPackage ./core/gnome-session { }; - - gnome_shell = callPackage ./core/gnome-shell { }; - - gnome-shell-extensions = callPackage ./core/gnome-shell-extensions { }; - - gnome-screenshot = callPackage ./core/gnome-screenshot { }; - - gnome_settings_daemon = callPackage ./core/gnome-settings-daemon { }; - - gnome-system-log = callPackage ./core/gnome-system-log { }; - - gnome-system-monitor = callPackage ./core/gnome-system-monitor { }; - - gnome_terminal = callPackage ./core/gnome-terminal { }; - - gnome_themes_standard = callPackage ./core/gnome-themes-standard { }; - - gnome-user-docs = callPackage ./core/gnome-user-docs { }; - - gnome-user-share = callPackage ./core/gnome-user-share { }; - - grilo = callPackage ./core/grilo { }; - - grilo-plugins = callPackage ./core/grilo-plugins { }; - - gsettings_desktop_schemas = callPackage ./core/gsettings-desktop-schemas { }; - - gtksourceview = callPackage ./core/gtksourceview { }; - - gucharmap = callPackage ./core/gucharmap { }; - - gvfs = pkgs.gvfs.override { gnome = pkgs.gnome3; lightWeight = false; }; - - eog = callPackage ./core/eog { }; - - libcroco = callPackage ./core/libcroco {}; - - libgee = callPackage ./core/libgee { }; - - libgdata = callPackage ./core/libgdata { }; - - libgxps = callPackage ./core/libgxps { }; - - libpeas = callPackage ./core/libpeas {}; - - libgweather = callPackage ./core/libgweather { }; - - libzapojit = callPackage ./core/libzapojit { }; - - mutter = callPackage ./core/mutter { }; - - nautilus = callPackage ./core/nautilus { }; - - rest = callPackage ./core/rest { }; - - sushi = callPackage ./core/sushi { }; - - totem = callPackage ./core/totem { }; - - totem-pl-parser = callPackage ./core/totem-pl-parser { }; - - tracker = callPackage ./core/tracker { giflib = pkgs.giflib_5_0; }; - - vte = callPackage ./core/vte { }; - - vino = callPackage ./core/vino { }; - - yelp = callPackage ./core/yelp { }; - - yelp_xsl = callPackage ./core/yelp-xsl { }; - - yelp_tools = callPackage ./core/yelp-tools { }; - - zenity = callPackage ./core/zenity { }; - - -#### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/) - - bijiben = callPackage ./apps/bijiben { }; - - evolution = callPackage ./apps/evolution { }; - - file-roller = callPackage ./apps/file-roller { }; - - gedit = callPackage ./apps/gedit { }; - - glade = callPackage ./apps/glade { }; - - gnome-clocks = callPackage ./apps/gnome-clocks { }; - - gnome-documents = callPackage ./apps/gnome-documents { }; - - gnome-music = callPackage ./apps/gnome-music { }; - - gnome-photos = callPackage ./apps/gnome-photos { }; - - nautilus-sendto = callPackage ./apps/nautilus-sendto { }; - - # scrollkeeper replacement - rarian = callPackage ./desktop/rarian { }; - - seahorse = callPackage ./apps/seahorse { }; - - -#### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/ - - gfbgraph = callPackage ./misc/gfbgraph { }; - - goffice = callPackage ./misc/goffice { }; - - gitg = callPackage ./misc/gitg { }; - - libgit2-glib = callPackage ./misc/libgit2-glib { }; - - libmediaart = callPackage ./misc/libmediaart { }; - - gexiv2 = callPackage ./misc/gexiv2 { }; - - gnome-tweak-tool = callPackage ./misc/gnome-tweak-tool { }; - - gtkhtml = callPackage ./misc/gtkhtml { }; -} diff --git a/pkgs/desktops/gnome-3/3.10/desktop/rarian/default.nix b/pkgs/desktops/gnome-3/3.10/desktop/rarian/default.nix deleted file mode 100644 index a1b38b21869a..000000000000 --- a/pkgs/desktops/gnome-3/3.10/desktop/rarian/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42}: - -stdenv.mkDerivation rec { - name = "rarian-0.8.1"; - src = fetchurl { - url = "mirror://gnome/sources/rarian/0.8/${name}.tar.bz2"; - sha256 = "aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577"; - }; - - buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt]; - configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat"; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/3.10/misc/gexiv2/default.nix deleted file mode 100644 index 86942c13f34f..000000000000 --- a/pkgs/desktops/gnome-3/3.10/misc/gexiv2/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, exiv2, glib, libtool, m4 }: - - -stdenv.mkDerivation rec { - name = "gexiv2-${version}"; - version = "0.7.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gexiv2/0.7/${name}.tar.xz"; - sha256 = "12pfc5a57dhlf0c3yg5x3jissxi7jy2b6ir6y99cn510801gwcdn"; - }; - - preConfigure = '' - patchShebangs . - ''; - - buildInputs = [ pkgconfig glib libtool m4 ]; - propagatedBuildInputs = [ exiv2 ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/gexiv2; - description = "GObject wrapper around the Exiv2 photo metadata library"; - platforms = platforms.linux; - }; -} \ No newline at end of file diff --git a/pkgs/desktops/gnome-3/3.10/misc/gfbgraph/default.nix b/pkgs/desktops/gnome-3/3.10/misc/gfbgraph/default.nix deleted file mode 100644 index ee8259af8d61..000000000000 --- a/pkgs/desktops/gnome-3/3.10/misc/gfbgraph/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, glib -, gnome3, libsoup, json_glib }: - -stdenv.mkDerivation rec { - name = "gfbgraph-0.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gfbgraph/0.2/${name}.tar.xz"; - sha256 = "534ca84920445b9d89e2480348eedde3ce950db3628ae0a79703e8f2d52fa724"; - }; - - buildInputs = [ pkgconfig glib libsoup gnome3.gnome_online_accounts - json_glib gnome3.rest ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - description = "GLib/GObject wrapper for the Facebook Graph API"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.lgpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/misc/gitg/default.nix b/pkgs/desktops/gnome-3/3.10/misc/gitg/default.nix deleted file mode 100644 index 401d5cf2f36a..000000000000 --- a/pkgs/desktops/gnome-3/3.10/misc/gitg/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ stdenv, fetchurl, fetchgit, vala, intltool, libgit2, pkgconfig, gtk3, glib -, json_glib, webkitgtk, makeWrapper, libpeas, bash, gobjectIntrospection -, gnome3, gtkspell3, shared_mime_info, libgee, libgit2-glib, librsvg }: - -# TODO: icons and theme still does not work -# use packaged gnome3.gnome_icon_theme_symbolic - -stdenv.mkDerivation rec { - name = "gitg-3.13.91"; - - src = fetchurl { - url = "mirror://gnome/sources/gitg/3.13/${name}.tar.xz"; - sha256 = "1c2016grvgg5f3l5xkracz85rblsc1a4brzr6vgn6kh2h494rv37"; - }; - - preCheck = '' - substituteInPlace tests/libgitg/test-commit.c --replace "/bin/bash" "${bash}/bin/bash" - ''; - doCheck = true; - - makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"; - - propagatedUserEnvPkgs = [ shared_mime_info - gnome3.gnome_themes_standard ]; - - buildInputs = [ vala intltool libgit2 pkgconfig gtk3 glib json_glib webkitgtk libgee libpeas - libgit2-glib gtkspell3 gnome3.gsettings_desktop_schemas gnome3.gtksourceview librsvg - gobjectIntrospection makeWrapper gnome3.gnome_icon_theme_symbolic gnome3.gnome_icon_theme ]; - - preFixup = '' - wrapProgram "$out/bin/gitg" \ - --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 - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Apps/Gitg; - description = "GNOME GUI client to view git repositories"; - maintainers = with maintainers; [ iElectric ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/3.10/misc/gnome-tweak-tool/default.nix deleted file mode 100644 index 2eccb9a32cf9..000000000000 --- a/pkgs/desktops/gnome-3/3.10/misc/gnome-tweak-tool/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ stdenv, intltool, fetchurl, python, pygobject3, atk -, pkgconfig, gtk3, glib, hicolor_icon_theme, libsoup -, bash, makeWrapper, itstool, libxml2, python3Packages -, gnome3, librsvg, gdk_pixbuf, file, libnotify }: - -stdenv.mkDerivation rec { - name = "gnome-tweak-tool-3.10.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-tweak-tool/3.10/${name}.tar.xz"; - sha256 = "fb5af9022c0521a925ef9f295e4080212b1b45427cd5f5f3a901667590afa7ec"; - }; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - makeFlags = [ "DESTDIR=/" ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 - gnome3.gsettings_desktop_schemas makeWrapper file - gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - python pygobject3 libnotify gnome3.gnome_shell - libsoup gnome3.gnome_settings_daemon gnome3.nautilus - gnome3.gnome_desktop ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-tweak-tool" \ - --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" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix LD_LIBRARY_PATH ":" "${libsoup}/lib:${gnome3.gnome_desktop}/lib:${libnotify}/lib:${gtk3}/lib:${atk}/lib" \ - --prefix PYTHONPATH : "$PYTHONPATH:$(toPythonPath $out)" - ''; - - patches = [ ./find_gsettings.patch ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Apps/GnomeTweakTool; - description = "A tool to customize advanced GNOME 3 options"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/misc/gnome-tweak-tool/find_gsettings.patch b/pkgs/desktops/gnome-3/3.10/misc/gnome-tweak-tool/find_gsettings.patch deleted file mode 100644 index 3e68c04cb3ab..000000000000 --- a/pkgs/desktops/gnome-3/3.10/misc/gnome-tweak-tool/find_gsettings.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/gtweak/gsettings.py b/gtweak/gsettings.py -index a00fe19..dce74b2 100644 ---- a/gtweak/gsettings.py -+++ b/gtweak/gsettings.py -@@ -33,10 +33,15 @@ class GSettingsMissingError(Exception): - - class _GSettingsSchema: - def __init__(self, schema_name, schema_dir=None, schema_filename=None, **options): -- if not schema_dir: -- schema_dir = gtweak.GSETTINGS_SCHEMA_DIR - if not schema_filename: - schema_filename = schema_name + ".gschema.xml" -+ if not schema_dir: -+ schema_dir = gtweak.GSETTINGS_SCHEMA_DIR -+ for xdg_dir in GLib.get_system_data_dirs(): -+ dir = os.path.join(xdg_dir, "glib-2.0", "schemas") -+ if os.path.exists(os.path.join(dir, schema_filename)): -+ schema_dir = dir -+ break - - schema_path = os.path.join(schema_dir, schema_filename) - if not os.path.exists(schema_path): diff --git a/pkgs/desktops/gnome-3/3.10/misc/goffice/0.8.nix b/pkgs/desktops/gnome-3/3.10/misc/goffice/0.8.nix deleted file mode 100644 index 02520a9f121a..000000000000 --- a/pkgs/desktops/gnome-3/3.10/misc/goffice/0.8.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, glib, gtk, libglade, bzip2 -, pango, libgsf, libxml2, libart, intltool, gettext -, cairo, gconf, libgnomeui, pcre, gnome3/*just meta*/ }: - -stdenv.mkDerivation rec { - name = "goffice-0.8.17"; - - src = fetchurl { - url = "mirror://gnome/sources/goffice/0.8/${name}.tar.xz"; - sha256 = "165070beb67b84580afe80a8a100b674a81d553ab791acd72ac0c655f4fadb15"; - }; - - # fix linking error: undefined reference to pcre_info - patches = [ ./pcre_info.patch ]; # inspired by https://bugs.php.net/bug.php?id=60986 - - buildInputs = [ - pkgconfig libglade bzip2 libart intltool gettext - gconf libgnomeui pcre - ]; - - propagatedBuildInputs = [ - # All these are in the "Requires:" field of `libgoffice-0.6.pc'. - glib libgsf libxml2 gtk libglade libart cairo pango - ]; - - postInstall = - '' - # Get GnuCash to build. Might be unnecessary if we upgrade pkgconfig. - substituteInPlace $out/lib/pkgconfig/libgoffice-*.pc --replace Requires.private Requires - ''; - - doCheck = true; - - meta = gnome3.goffice.meta // { - maintainers = [ ]; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/misc/goffice/default.nix b/pkgs/desktops/gnome-3/3.10/misc/goffice/default.nix deleted file mode 100644 index fd16d2d4985f..000000000000 --- a/pkgs/desktops/gnome-3/3.10/misc/goffice/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, intltool, glib, gtk3 -, libgsf, libxml2, libxslt, cairo, pango, librsvg, libspectre }: - -stdenv.mkDerivation rec { - name = "goffice-0.10.12"; - - src = fetchurl { - url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz"; - sha256 = "0vh0sdig5n8sxzh4xx82lm8y8d0jcdhc2ipb1kq02qs142zs74ff"; - }; - - nativeBuildInputs = [ pkgconfig intltool ]; - - propagatedBuildInputs = [ # ToDo lasem library for MathML, opt. introspection? - glib gtk3 libxml2 cairo pango libgsf - ]; - - buildInputs = [ libxslt librsvg ]; - - enableParallelBuilding = true; - doCheck = true; - - meta = { - description = "A Glib/GTK+ set of document centric objects and utilities"; - - longDescription = '' - There are common operations for document centric applications that are - conceptually simple, but complex to implement fully: plugins, load/save - documents, undo/redo. - ''; - - license = stdenv.lib.licenses.gpl2Plus; - - platforms = stdenv.lib.platforms.gnu; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/misc/goffice/pcre_info.patch b/pkgs/desktops/gnome-3/3.10/misc/goffice/pcre_info.patch deleted file mode 100644 index cd4ef3c9fed7..000000000000 --- a/pkgs/desktops/gnome-3/3.10/misc/goffice/pcre_info.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/goffice/utils/regutf8.c b/goffice/utils/regutf8.c -index bc4aae4..3adb696 100644 ---- a/goffice/utils/regutf8.c -+++ b/goffice/utils/regutf8.c -@@ -155,7 +155,7 @@ go_regcomp (GORegexp *gor, const char *pat, int cflags) - default: return GO_REG_BADPAT; - } - } else { -- gor->re_nsub = pcre_info (r, NULL, NULL); -+ gor->re_nsub = pcre_fullinfo (r, NULL, NULL, NULL); - gor->nosub = (cflags & GO_REG_NOSUB) != 0; - return 0; - } diff --git a/pkgs/desktops/gnome-3/3.10/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/3.10/misc/gtkhtml/default.nix deleted file mode 100644 index 5e27b474cbd7..000000000000 --- a/pkgs/desktops/gnome-3/3.10/misc/gtkhtml/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, intltool -, gnome3, enchant, isocodes }: - -stdenv.mkDerivation rec { - name = "gtkhtml-4.6.6"; - - src = fetchurl { - url = "mirror://gnome/sources/gtkhtml/4.6/${name}.tar.xz"; - sha256 = "145d23bbe729ff4ee7e7027bb5ff405b34822271327fdd81fe913134831374cd"; - }; - - buildInputs = [ pkgconfig gtk3 intltool gnome3.gnome_icon_theme - gnome3.gsettings_desktop_schemas ]; - - propagatedBuildInputs = [ enchant isocodes ]; - -} diff --git a/pkgs/desktops/gnome-3/3.10/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/3.10/misc/libgit2-glib/default.nix deleted file mode 100644 index 82e2b5855094..000000000000 --- a/pkgs/desktops/gnome-3/3.10/misc/libgit2-glib/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, gnome3, libtool, pkgconfig, vala -, gtk_doc, gobjectIntrospection, libgit2, glib }: - -stdenv.mkDerivation rec { - name = "libgit2-glib-${version}"; - version = "0.0.20"; - - src = fetchurl { - url = "https://github.com/GNOME/libgit2-glib/archive/v${version}.tar.gz"; - sha256 = "1s2hj0ji73ishniqvr6mx90l1ji5jjwwrwhp91i87fxk0d3sry5x"; - }; - - cmakeFlags = "-DTHREADSAFE=ON"; - - configureScript = "sh ./autogen.sh"; - - buildInputs = [ gnome3.gnome_common libtool pkgconfig vala - gtk_doc gobjectIntrospection libgit2 glib ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/misc/libmediaart/default.nix b/pkgs/desktops/gnome-3/3.10/misc/libmediaart/default.nix deleted file mode 100644 index 4985bfa902c3..000000000000 --- a/pkgs/desktops/gnome-3/3.10/misc/libmediaart/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf }: - -stdenv.mkDerivation rec { - name = "libmediaart-0.4.0"; - - src = fetchurl { - url = "mirror://gnome/sources/libmediaart/0.4/${name}.tar.xz"; - sha256 = "e8ec92a642f4df7f988364f6451adf89e1611d7379a636d8c7eff4ca21a0fd1c"; - }; - - buildInputs = [ pkgconfig glib gdk_pixbuf ]; - - meta = with stdenv.lib; { - description = "Library tasked with managing, extracting and handling media art caches"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/apps/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.12/apps/pomodoro/default.nix index 75c82607a024..152acb26b1bc 100644 --- a/pkgs/desktops/gnome-3/3.12/apps/pomodoro/default.nix +++ b/pkgs/desktops/gnome-3/3.12/apps/pomodoro/default.nix @@ -1,18 +1,17 @@ -{ stdenv, fetchurl, which, automake113x, intltool, pkgconfig, libtool, makeWrapper, +{ stdenv, fetchFromGitHub, which, automake113x, intltool, pkgconfig, libtool, makeWrapper, dbus_glib, libcanberra, gst_all_1, upower, vala, gnome3_12, gtk3, gst_plugins_base, glib, gobjectIntrospection, hicolor_icon_theme }: stdenv.mkDerivation rec { - name = "gnome-shell-pomodoro-0.10.2-11-gd5f5b69"; + rev = "0.10.3"; + name = "gnome-shell-pomodoro-${rev}-61df3fa"; - src = fetchurl { - url = - "https://codeload.github.com/codito/gnome-shell-pomodoro/" + - "legacy.tar.gz/gnome-3.12"; - sha256 = - "6c86203f56f69a52675c2df21e580a785f8894a2a9cdf4322d44743603504d10"; - name = "${name}.tar.gz"; + src = fetchFromGitHub { + owner = "codito"; + repo = "gnome-shell-pomodoro"; + rev = "${rev}"; + sha256 = "0i0glmijalppb5hdb1xd6xnmv824l2w831rpkqmhxi0iqbvaship"; }; configureScript = ''./autogen.sh''; @@ -47,4 +46,4 @@ stdenv.mkDerivation rec { license = licenses.gpl3; platforms = platforms.linux; }; -} \ No newline at end of file +} 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 2a585d78f4e5..aaef1d59ed98 100644 --- a/pkgs/desktops/gnome-3/3.12/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/evince/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - name = "evince-3.12.1"; + name = "evince-3.12.2"; src = fetchurl { url = "mirror://gnome/sources/evince/3.12/${name}.tar.xz"; - sha256 = "ef22cc29a7cbe70d2e7ce8c0b5b7ee774187ea69f3ae49a64c6d4a91559ef137"; + sha256 = "30c243bbfde56338c25a39003b4848143be42157177e2163a368f14139909f7d"; }; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/3.12/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.12/core/libgnome-keyring/default.nix index 65d1c9d14939..c6c9323c010a 100644 --- a/pkgs/desktops/gnome-3/3.12/core/libgnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/libgnome-keyring/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "Framework for managing passwords and other secrets"; homepage = http://live.gnome.org/GnomeKeyring; - # TODO license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ]; + license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ]; inherit (glib.meta) platforms maintainers; longDescription = '' diff --git a/pkgs/desktops/gnome-3/3.10/core/vte/default.nix b/pkgs/desktops/gnome-3/3.12/core/vte/0.38.0.nix index b9ffcffafbdc..548ca347a456 100644 --- a/pkgs/desktops/gnome-3/3.10/core/vte/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/vte/0.38.0.nix @@ -1,19 +1,23 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gnome3, ncurses, gobjectIntrospection }: +{ stdenv, fetchurl, intltool, pkgconfig, gnome3, ncurses, gobjectIntrospection, vala, libxml2 +, selectTextPatch ? false }: stdenv.mkDerivation rec { - - versionMajor = "0.35"; - versionMinor = "90"; + versionMajor = "0.38"; + versionMinor = "0"; moduleName = "vte"; name = "${moduleName}-${versionMajor}.${versionMinor}"; src = fetchurl { url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "c47182d1724db479095b918898ce62297ec71988f24cd575506151c59f7b98cf"; + sha256 = "1llg2xnjpn630vd86ci8csbjjacj3ia6syck2bsq4kinr66z5zsw"; }; - buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib gnome3.gtk3 ncurses ]; + patches = with stdenv.lib; optional selectTextPatch ./expose_select_text.0.38.0.patch; + + buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib gnome3.gtk3 ncurses vala libxml2 ]; + + preConfigure = "patchShebangs ."; configureFlags = [ "--enable-introspection" ]; diff --git a/pkgs/desktops/gnome-3/3.12/core/vte/default.nix b/pkgs/desktops/gnome-3/3.12/core/vte/default.nix index f63ae98c4866..d3245e232edd 100644 --- a/pkgs/desktops/gnome-3/3.12/core/vte/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/vte/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gnome3, ncurses, gobjectIntrospection, vala, libxml2 +{ stdenv, fetchurl, intltool, pkgconfig, gnome3, ncurses, gobjectIntrospection , selectTextPatch ? false }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/gnome-3/3.12/core/vte/expose_select_text.0.38.0.patch b/pkgs/desktops/gnome-3/3.12/core/vte/expose_select_text.0.38.0.patch new file mode 100644 index 000000000000..0a9b82a85982 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/vte/expose_select_text.0.38.0.patch @@ -0,0 +1,227 @@ +Only in vte-0.38.0.new: expose_select_text.patch +diff -aur vte-0.38.0/src/vteaccess.c vte-0.38.0.new/src/vteaccess.c +--- vte-0.38.0/src/vteaccess.c 2014-08-13 08:00:38.000000000 -0400 ++++ vte-0.38.0.new/src/vteaccess.c 2014-09-21 17:05:23.934641193 -0400 +@@ -1427,7 +1427,7 @@ + *start_offset = offset_from_xy (priv, start_x, start_y); + _vte_terminal_get_end_selection (terminal, &end_x, &end_y); + *end_offset = offset_from_xy (priv, end_x, end_y); +- return _vte_terminal_get_selection (terminal); ++ return vte_terminal_get_selection (terminal); + } + + static gboolean +diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c +--- vte-0.38.0/src/vte.c 2014-09-13 03:23:47.000000000 -0400 ++++ vte-0.38.0.new/src/vte.c 2014-09-21 17:03:04.671656749 -0400 +@@ -122,7 +122,6 @@ + gpointer data, + GArray *attributes, + gboolean include_trailing_spaces); +-static void _vte_terminal_disconnect_pty_read(VteTerminal *terminal); + static void _vte_terminal_disconnect_pty_write(VteTerminal *terminal); + static void vte_terminal_stop_processing (VteTerminal *terminal); + +@@ -3267,9 +3266,10 @@ + _vte_debug_print (VTE_DEBUG_IO, "removed poll of vte_terminal_io_read\n"); + terminal->pvt->pty_input_source = 0; + } +-static void +-_vte_terminal_connect_pty_read(VteTerminal *terminal) ++void ++vte_terminal_connect_pty_read(VteTerminal *terminal) + { ++ g_return_if_fail(VTE_IS_TERMINAL(terminal)); + if (terminal->pvt->pty_channel == NULL) { + return; + } +@@ -3321,9 +3321,10 @@ + } + } + +-static void +-_vte_terminal_disconnect_pty_read(VteTerminal *terminal) ++void ++vte_terminal_disconnect_pty_read(VteTerminal *terminal) + { ++ g_return_if_fail(VTE_IS_TERMINAL(terminal)); + if (terminal->pvt->pty_input_source != 0) { + _vte_debug_print (VTE_DEBUG_IO, "disconnecting poll of vte_terminal_io_read\n"); + g_source_remove(terminal->pvt->pty_input_source); +@@ -6154,6 +6155,28 @@ + } + } + ++/** ++ * vte_terminal_set_cursor_position: ++ * @terminal: a #VteTerminal ++ * @column: the new cursor column ++ * @row: the new cursor row ++ * ++ * Set the location of the cursor. ++ */ ++void ++vte_terminal_set_cursor_position(VteTerminal *terminal, ++ long column, long row) ++{ ++ g_return_if_fail(VTE_IS_TERMINAL(terminal)); ++ ++ _vte_invalidate_cursor_once(terminal, FALSE); ++ terminal->pvt->screen->cursor_current.col = column; ++ terminal->pvt->screen->cursor_current.row = row; ++ _vte_invalidate_cursor_once(terminal, FALSE); ++ _vte_check_cursor_blink(terminal); ++ vte_terminal_queue_cursor_moved(terminal); ++} ++ + static GtkClipboard * + vte_terminal_clipboard_get(VteTerminal *terminal, GdkAtom board) + { +@@ -6319,7 +6342,7 @@ + vte_terminal_extend_selection(terminal, x, y, FALSE, TRUE); + + /* Temporarily stop caring about input from the child. */ +- _vte_terminal_disconnect_pty_read(terminal); ++ vte_terminal_disconnect_pty_read(terminal); + } + + static gboolean +@@ -6336,7 +6359,7 @@ + terminal->pvt->selecting = FALSE; + + /* Reconnect to input from the child if we paused it. */ +- _vte_terminal_connect_pty_read(terminal); ++ vte_terminal_connect_pty_read(terminal); + + return TRUE; + } +@@ -6834,6 +6857,50 @@ + vte_terminal_deselect_all (terminal); + } + ++/** ++ * vte_terminal_get_selection_block_mode: ++ * @terminal: a #VteTerminal ++ * ++ * Checks whether or not block selection is enabled. ++ * ++ * Returns: %TRUE if block selection is enabled, %FALSE if not ++ */ ++gboolean ++vte_terminal_get_selection_block_mode(VteTerminal *terminal) { ++ g_return_val_if_fail(VTE_IS_TERMINAL(terminal), FALSE); ++ return terminal->pvt->selection_block_mode; ++} ++ ++/** ++ * vte_terminal_set_selection_block_mode: ++ * @terminal: a #VteTerminal ++ * @block_mode: whether block selection is enabled ++ * ++ * Sets whether or not block selection is enabled. ++ */ ++void ++vte_terminal_set_selection_block_mode(VteTerminal *terminal, gboolean block_mode) { ++ g_return_if_fail(VTE_IS_TERMINAL(terminal)); ++ terminal->pvt->selection_block_mode = block_mode; ++} ++ ++/** ++ * vte_terminal_select_text: ++ * @terminal: a #VteTerminal ++ * @start_col: the starting column for the selection ++ * @start_row: the starting row for the selection ++ * @end_col: the end column for the selection ++ * @end_row: the end row for the selection ++ * ++ * Sets the current selection region. ++ */ ++void ++vte_terminal_select_text(VteTerminal *terminal, ++ long start_col, long start_row, ++ long end_col, long end_row) { ++ _vte_terminal_select_text(terminal, start_col, start_row, end_col, end_row, 0, 0); ++} ++ + /* Autoscroll a bit. */ + static gboolean + vte_terminal_autoscroll(VteTerminal *terminal) +@@ -8476,7 +8543,7 @@ + #endif + kill(terminal->pvt->pty_pid, SIGHUP); + } +- _vte_terminal_disconnect_pty_read(terminal); ++ vte_terminal_disconnect_pty_read(terminal); + _vte_terminal_disconnect_pty_write(terminal); + if (terminal->pvt->pty_channel != NULL) { + g_io_channel_unref (terminal->pvt->pty_channel); +@@ -12533,7 +12600,7 @@ + g_object_freeze_notify(object); + + if (pvt->pty != NULL) { +- _vte_terminal_disconnect_pty_read(terminal); ++ vte_terminal_disconnect_pty_read(terminal); + _vte_terminal_disconnect_pty_write(terminal); + + if (terminal->pvt->pty_channel != NULL) { +@@ -12588,7 +12655,7 @@ + _vte_terminal_setup_utf8 (terminal); + + /* Open channels to listen for input on. */ +- _vte_terminal_connect_pty_read (terminal); ++ vte_terminal_connect_pty_read (terminal); + + g_object_notify(object, "pty"); + +@@ -12623,7 +12690,7 @@ + } + + char * +-_vte_terminal_get_selection(VteTerminal *terminal) ++vte_terminal_get_selection(VteTerminal *terminal) + { + g_return_val_if_fail(VTE_IS_TERMINAL(terminal), NULL); + +Only in vte-0.38.0.new/src: .vte.c.swp +diff -aur vte-0.38.0/src/vteint.h vte-0.38.0.new/src/vteint.h +--- vte-0.38.0/src/vteint.h 2014-05-16 13:51:26.000000000 -0400 ++++ vte-0.38.0.new/src/vteint.h 2014-09-21 17:05:44.934589281 -0400 +@@ -25,7 +25,6 @@ + G_BEGIN_DECLS + + void _vte_terminal_accessible_ref(VteTerminal *terminal); +-char* _vte_terminal_get_selection(VteTerminal *terminal); + void _vte_terminal_get_start_selection(VteTerminal *terminal, long *x, long *y); + void _vte_terminal_get_end_selection(VteTerminal *terminal, long *x, long *y); + void _vte_terminal_select_text(VteTerminal *terminal, long start_x, long start_y, long end_x, long end_y, int start_offset, int end_offset); +diff -aur vte-0.38.0/src/vteterminal.h vte-0.38.0.new/src/vteterminal.h +--- vte-0.38.0/src/vteterminal.h 2014-09-13 03:23:47.000000000 -0400 ++++ vte-0.38.0.new/src/vteterminal.h 2014-09-21 17:03:39.094903032 -0400 +@@ -170,6 +170,18 @@ + + void vte_terminal_select_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); + void vte_terminal_unselect_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); ++gboolean vte_terminal_get_selection_block_mode(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); ++void vte_terminal_set_selection_block_mode(VteTerminal *terminal, ++ gboolean block_mode) _VTE_GNUC_NONNULL(1); ++void vte_terminal_select_text(VteTerminal *terminal, ++ long start_col, long start_row, ++ long end_col, long end_row) _VTE_GNUC_NONNULL(1); ++char * ++vte_terminal_get_selection(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); ++ ++/* pause and unpause output */ ++void vte_terminal_disconnect_pty_read(VteTerminal *vte); ++void vte_terminal_connect_pty_read(VteTerminal *vte); + + /* Set the terminal's size. */ + void vte_terminal_set_size(VteTerminal *terminal, +@@ -276,6 +288,8 @@ + void vte_terminal_get_cursor_position(VteTerminal *terminal, + glong *column, + glong *row) _VTE_GNUC_NONNULL(1); ++void vte_terminal_set_cursor_position(VteTerminal *terminal, ++ long column, long row) _VTE_GNUC_NONNULL(1); + + /* Add a matching expression, returning the tag the widget assigns to that + * expression. */ diff --git a/pkgs/desktops/gnome-3/3.12/core/vte/expose_select_text.patch b/pkgs/desktops/gnome-3/3.12/core/vte/expose_select_text.patch index 80a2a445ec03..0a9b82a85982 100644 --- a/pkgs/desktops/gnome-3/3.12/core/vte/expose_select_text.patch +++ b/pkgs/desktops/gnome-3/3.12/core/vte/expose_select_text.patch @@ -1,7 +1,20 @@ -diff -aur vte-0.32.2-old/src/vte.c vte-0.32.2/src/vte.c ---- vte-0.32.2-old/src/vte.c 2012-07-13 21:09:04.003969877 -0400 -+++ vte-0.32.2/src/vte.c 2012-08-30 04:30:04.285924831 -0400 -@@ -129,7 +129,6 @@ +Only in vte-0.38.0.new: expose_select_text.patch +diff -aur vte-0.38.0/src/vteaccess.c vte-0.38.0.new/src/vteaccess.c +--- vte-0.38.0/src/vteaccess.c 2014-08-13 08:00:38.000000000 -0400 ++++ vte-0.38.0.new/src/vteaccess.c 2014-09-21 17:05:23.934641193 -0400 +@@ -1427,7 +1427,7 @@ + *start_offset = offset_from_xy (priv, start_x, start_y); + _vte_terminal_get_end_selection (terminal, &end_x, &end_y); + *end_offset = offset_from_xy (priv, end_x, end_y); +- return _vte_terminal_get_selection (terminal); ++ return vte_terminal_get_selection (terminal); + } + + static gboolean +diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c +--- vte-0.38.0/src/vte.c 2014-09-13 03:23:47.000000000 -0400 ++++ vte-0.38.0.new/src/vte.c 2014-09-21 17:03:04.671656749 -0400 +@@ -122,7 +122,6 @@ gpointer data, GArray *attributes, gboolean include_trailing_spaces); @@ -9,7 +22,7 @@ diff -aur vte-0.32.2-old/src/vte.c vte-0.32.2/src/vte.c static void _vte_terminal_disconnect_pty_write(VteTerminal *terminal); static void vte_terminal_stop_processing (VteTerminal *terminal); -@@ -3508,8 +3507,8 @@ +@@ -3267,9 +3266,10 @@ _vte_debug_print (VTE_DEBUG_IO, "removed poll of vte_terminal_io_read\n"); terminal->pvt->pty_input_source = 0; } @@ -18,9 +31,11 @@ diff -aur vte-0.32.2-old/src/vte.c vte-0.32.2/src/vte.c +void +vte_terminal_connect_pty_read(VteTerminal *terminal) { ++ g_return_if_fail(VTE_IS_TERMINAL(terminal)); if (terminal->pvt->pty_channel == NULL) { return; -@@ -3560,8 +3559,8 @@ + } +@@ -3321,9 +3321,10 @@ } } @@ -29,29 +44,11 @@ diff -aur vte-0.32.2-old/src/vte.c vte-0.32.2/src/vte.c +void +vte_terminal_disconnect_pty_read(VteTerminal *terminal) { ++ g_return_if_fail(VTE_IS_TERMINAL(terminal)); if (terminal->pvt->pty_input_source != 0) { _vte_debug_print (VTE_DEBUG_IO, "disconnecting poll of vte_terminal_io_read\n"); -@@ -3708,8 +3707,8 @@ - return NULL; - } - --static char * --_vte_terminal_get_user_shell_with_fallback (void) -+char * -+vte_terminal_get_user_shell_with_fallback (void) - { - char *command; - const gchar *env; -@@ -3744,7 +3743,7 @@ - char **argv2; - char *shell = NULL; - -- argv2 = __vte_pty_get_argv(command ? command : (shell = _vte_terminal_get_user_shell_with_fallback ()), -+ argv2 = __vte_pty_get_argv(command ? command : (shell = vte_terminal_get_user_shell_with_fallback ()), - argv, - flags); - g_free(shell); -@@ -6545,6 +6544,28 @@ + g_source_remove(terminal->pvt->pty_input_source); +@@ -6154,6 +6155,28 @@ } } @@ -80,8 +77,8 @@ diff -aur vte-0.32.2-old/src/vte.c vte-0.32.2/src/vte.c static GtkClipboard * vte_terminal_clipboard_get(VteTerminal *terminal, GdkAtom board) { -@@ -6676,7 +6697,7 @@ - terminal->pvt->selection_start.row); +@@ -6319,7 +6342,7 @@ + vte_terminal_extend_selection(terminal, x, y, FALSE, TRUE); /* Temporarily stop caring about input from the child. */ - _vte_terminal_disconnect_pty_read(terminal); @@ -89,7 +86,7 @@ diff -aur vte-0.32.2-old/src/vte.c vte-0.32.2/src/vte.c } static gboolean -@@ -6693,7 +6714,7 @@ +@@ -6336,7 +6359,7 @@ terminal->pvt->selecting = FALSE; /* Reconnect to input from the child if we paused it. */ @@ -98,35 +95,8 @@ diff -aur vte-0.32.2-old/src/vte.c vte-0.32.2/src/vte.c return TRUE; } -@@ -8994,7 +9015,7 @@ - #endif - kill(terminal->pvt->pty_pid, SIGHUP); - } -- _vte_terminal_disconnect_pty_read(terminal); -+ vte_terminal_disconnect_pty_read(terminal); - _vte_terminal_disconnect_pty_write(terminal); - if (terminal->pvt->pty_channel != NULL) { - g_io_channel_unref (terminal->pvt->pty_channel); -@@ -14384,7 +14405,7 @@ - g_object_freeze_notify(object); - - if (pvt->pty != NULL) { -- _vte_terminal_disconnect_pty_read(terminal); -+ vte_terminal_disconnect_pty_read(terminal); - _vte_terminal_disconnect_pty_write(terminal); - - if (terminal->pvt->pty_channel != NULL) { -@@ -14440,7 +14461,7 @@ - _vte_terminal_setup_utf8 (terminal); - - /* Open channels to listen for input on. */ -- _vte_terminal_connect_pty_read (terminal); -+ vte_terminal_connect_pty_read (terminal); - - g_object_notify(object, "pty"); - g_object_notify(object, "pty-object"); -@@ -14567,6 +14588,50 @@ - } +@@ -6834,6 +6857,50 @@ + vte_terminal_deselect_all (terminal); } +/** @@ -173,21 +143,72 @@ diff -aur vte-0.32.2-old/src/vte.c vte-0.32.2/src/vte.c + _vte_terminal_select_text(terminal, start_col, start_row, end_col, end_row, 0, 0); +} + - void - _vte_terminal_select_text(VteTerminal *terminal, - long start_col, long start_row, -diff -aur vte-0.32.2-old/src/vte.h vte-0.32.2/src/vte.h ---- vte-0.32.2-old/src/vte.h 2012-07-13 21:09:04.003969877 -0400 -+++ vte-0.32.2/src/vte.h 2012-08-30 04:30:09.695999432 -0400 -@@ -296,6 +296,15 @@ - /* simple manipulation of selection */ - void vte_terminal_select_all(VteTerminal *terminal); - void vte_terminal_select_none(VteTerminal *terminal); -+gboolean vte_terminal_get_selection_block_mode(VteTerminal *terminal); -+void vte_terminal_set_selection_block_mode(VteTerminal *terminal, gboolean block_mode); + /* Autoscroll a bit. */ + static gboolean + vte_terminal_autoscroll(VteTerminal *terminal) +@@ -8476,7 +8543,7 @@ + #endif + kill(terminal->pvt->pty_pid, SIGHUP); + } +- _vte_terminal_disconnect_pty_read(terminal); ++ vte_terminal_disconnect_pty_read(terminal); + _vte_terminal_disconnect_pty_write(terminal); + if (terminal->pvt->pty_channel != NULL) { + g_io_channel_unref (terminal->pvt->pty_channel); +@@ -12533,7 +12600,7 @@ + g_object_freeze_notify(object); + + if (pvt->pty != NULL) { +- _vte_terminal_disconnect_pty_read(terminal); ++ vte_terminal_disconnect_pty_read(terminal); + _vte_terminal_disconnect_pty_write(terminal); + + if (terminal->pvt->pty_channel != NULL) { +@@ -12588,7 +12655,7 @@ + _vte_terminal_setup_utf8 (terminal); + + /* Open channels to listen for input on. */ +- _vte_terminal_connect_pty_read (terminal); ++ vte_terminal_connect_pty_read (terminal); + + g_object_notify(object, "pty"); + +@@ -12623,7 +12690,7 @@ + } + + char * +-_vte_terminal_get_selection(VteTerminal *terminal) ++vte_terminal_get_selection(VteTerminal *terminal) + { + g_return_val_if_fail(VTE_IS_TERMINAL(terminal), NULL); + +Only in vte-0.38.0.new/src: .vte.c.swp +diff -aur vte-0.38.0/src/vteint.h vte-0.38.0.new/src/vteint.h +--- vte-0.38.0/src/vteint.h 2014-05-16 13:51:26.000000000 -0400 ++++ vte-0.38.0.new/src/vteint.h 2014-09-21 17:05:44.934589281 -0400 +@@ -25,7 +25,6 @@ + G_BEGIN_DECLS + + void _vte_terminal_accessible_ref(VteTerminal *terminal); +-char* _vte_terminal_get_selection(VteTerminal *terminal); + void _vte_terminal_get_start_selection(VteTerminal *terminal, long *x, long *y); + void _vte_terminal_get_end_selection(VteTerminal *terminal, long *x, long *y); + void _vte_terminal_select_text(VteTerminal *terminal, long start_x, long start_y, long end_x, long end_y, int start_offset, int end_offset); +diff -aur vte-0.38.0/src/vteterminal.h vte-0.38.0.new/src/vteterminal.h +--- vte-0.38.0/src/vteterminal.h 2014-09-13 03:23:47.000000000 -0400 ++++ vte-0.38.0.new/src/vteterminal.h 2014-09-21 17:03:39.094903032 -0400 +@@ -170,6 +170,18 @@ + + void vte_terminal_select_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); + void vte_terminal_unselect_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); ++gboolean vte_terminal_get_selection_block_mode(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); ++void vte_terminal_set_selection_block_mode(VteTerminal *terminal, ++ gboolean block_mode) _VTE_GNUC_NONNULL(1); +void vte_terminal_select_text(VteTerminal *terminal, + long start_col, long start_row, -+ long end_col, long end_row); ++ long end_col, long end_row) _VTE_GNUC_NONNULL(1); ++char * ++vte_terminal_get_selection(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); + +/* pause and unpause output */ +void vte_terminal_disconnect_pty_read(VteTerminal *vte); @@ -195,20 +216,12 @@ diff -aur vte-0.32.2-old/src/vte.h vte-0.32.2/src/vte.h /* Set the terminal's size. */ void vte_terminal_set_size(VteTerminal *terminal, -@@ -435,6 +444,8 @@ - GArray *attributes); +@@ -276,6 +288,8 @@ void vte_terminal_get_cursor_position(VteTerminal *terminal, - glong *column, glong *row); + glong *column, + glong *row) _VTE_GNUC_NONNULL(1); +void vte_terminal_set_cursor_position(VteTerminal *terminal, -+ long column, long row); - /* Display string matching: clear all matching expressions. */ - void vte_terminal_match_clear_all(VteTerminal *terminal); - -@@ -484,6 +495,7 @@ - VtePty *vte_terminal_get_pty_object(VteTerminal *terminal); - - char *vte_get_user_shell (void); -+char *vte_terminal_get_user_shell_with_fallback(void); ++ long column, long row) _VTE_GNUC_NONNULL(1); - /* Accessors for bindings. */ - #if !GTK_CHECK_VERSION (2, 91, 2) + /* Add a matching expression, returning the tag the widget assigns to that + * expression. */ diff --git a/pkgs/desktops/gnome-3/3.12/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/3.12/core/yelp-xsl/default.nix index 0a5bc78af478..e99118230738 100644 --- a/pkgs/desktops/gnome-3/3.12/core/yelp-xsl/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/yelp-xsl/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { homepage = https://wiki.gnome.org/Apps/Yelp; description = "Yelp's universal stylesheets for Mallard and DocBook"; maintainers = with maintainers; [ lethalman ]; - # TODO license = [licenses.gpl2 licenses.lgpl2]; + license = [licenses.gpl2 licenses.lgpl2]; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/3.12/core/yelp/default.nix b/pkgs/desktops/gnome-3/3.12/core/yelp/default.nix index d8897e262d59..d7f9fe1ff532 100644 --- a/pkgs/desktops/gnome-3/3.12/core/yelp/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/yelp/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Yelp; - description = "Yelp is the help viewer in Gnome."; + description = "The help viewer in Gnome"; maintainers = with maintainers; [ lethalman ]; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix index a46f49cbb5a3..a60e1a85bca0 100644 --- a/pkgs/desktops/gnome-3/3.12/default.nix +++ b/pkgs/desktops/gnome-3/3.12/default.nix @@ -3,11 +3,14 @@ rec { inherit (pkgs) glib gtk2 gtk3 gnome2; gnome3 = pkgs.gnome3_12 // { recurseForDerivations = false; }; + + # DO NOT UPGRADE CLUTTER, IT BREAKS GNOME 3.12 clutter = pkgs.clutter_1_18; clutter_gtk = pkgs.clutter_gtk.override { inherit clutter; }; clutter-gst = pkgs.clutter-gst.override { inherit clutter; }; - upower = pkgs.upower_99; cogl = pkgs.cogl_1_18; + + upower = pkgs.upower_99; gtk = gtk3; # just to be sure libcanberra = pkgs.libcanberra_gtk3; # just to be sure inherit (pkgs.gnome2) ORBit2; @@ -22,9 +25,13 @@ rec { dconf = callPackage ./core/dconf { }; - empathy = callPackage ./core/empathy { }; + empathy = callPackage ./core/empathy { + webkitgtk = pkgs.webkitgtk24x; + }; - epiphany = callPackage ./core/epiphany { }; + epiphany = callPackage ./core/epiphany { + webkitgtk = pkgs.webkitgtk24x; + }; evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests @@ -76,7 +83,9 @@ rec { folks = callPackage ./core/folks { }; - gnome_online_accounts = callPackage ./core/gnome-online-accounts { }; + gnome_online_accounts = callPackage ./core/gnome-online-accounts { + webkitgtk = pkgs.webkitgtk24x; + }; gnome-online-miners = callPackage ./core/gnome-online-miners { }; @@ -112,7 +121,7 @@ rec { gucharmap = callPackage ./core/gucharmap { }; - gvfs = pkgs.gvfs.override { gnome = gnome3; lightWeight = false; }; + gvfs = pkgs.gvfs.override { gnome = gnome3; gnomeSupport = true; }; eog = callPackage ./core/eog { }; @@ -158,7 +167,9 @@ rec { rest = callPackage ./core/rest { }; - sushi = callPackage ./core/sushi { }; + sushi = callPackage ./core/sushi { + webkitgtk = pkgs.webkitgtk24x; + }; totem = callPackage ./core/totem { }; @@ -168,11 +179,15 @@ rec { vte = callPackage ./core/vte { }; - vte-select-text = callPackage ./core/vte { selectTextPatch = true; }; + vte_038 = callPackage ./core/vte/0.38.0.nix { }; # To be moved in gnome 3.14 when available + + vte-select-text = vte_038.override { selectTextPatch = true; }; vino = callPackage ./core/vino { }; - yelp = callPackage ./core/yelp { }; + yelp = callPackage ./core/yelp { + webkitgtk = pkgs.webkitgtk24x; + }; yelp_xsl = callPackage ./core/yelp-xsl { }; @@ -183,9 +198,13 @@ rec { #### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/) - bijiben = callPackage ./apps/bijiben { }; + bijiben = callPackage ./apps/bijiben { + webkitgtk = pkgs.webkitgtk24x; + }; - evolution = callPackage ./apps/evolution { }; + evolution = callPackage ./apps/evolution { + webkitgtk = pkgs.webkitgtk24x; + }; file-roller = callPackage ./apps/file-roller { }; @@ -200,7 +219,9 @@ rec { gnome-clocks = callPackage ./apps/gnome-clocks { }; - gnome-documents = callPackage ./apps/gnome-documents { }; + gnome-documents = callPackage ./apps/gnome-documents { + webkitgtk = pkgs.webkitgtk24x; + }; gnome-music = callPackage ./apps/gnome-music { }; @@ -223,17 +244,23 @@ rec { #### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/ - geary = callPackage ./misc/geary { }; + geary = callPackage ./misc/geary { + webkitgtk = pkgs.webkitgtk24x; + }; gfbgraph = callPackage ./misc/gfbgraph { }; goffice = callPackage ./misc/goffice { }; - gitg = callPackage ./misc/gitg { }; + gitg = callPackage ./misc/gitg { + webkitgtk = pkgs.webkitgtk24x; + }; libgda = callPackage ./misc/libgda { }; - libgit2-glib = callPackage ./misc/libgit2-glib { }; + libgit2-glib = callPackage ./misc/libgit2-glib { + libgit2 = pkgs.libgit2.override { libssh2 = null; }; + }; libmediaart = callPackage ./misc/libmediaart { }; diff --git a/pkgs/desktops/gnome-3/3.12/misc/goffice/default.nix b/pkgs/desktops/gnome-3/3.12/misc/goffice/default.nix index fd16d2d4985f..f116f5b53cd8 100644 --- a/pkgs/desktops/gnome-3/3.12/misc/goffice/default.nix +++ b/pkgs/desktops/gnome-3/3.12/misc/goffice/default.nix @@ -2,11 +2,11 @@ , libgsf, libxml2, libxslt, cairo, pango, librsvg, libspectre }: stdenv.mkDerivation rec { - name = "goffice-0.10.12"; + name = "goffice-0.10.18"; src = fetchurl { url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz"; - sha256 = "0vh0sdig5n8sxzh4xx82lm8y8d0jcdhc2ipb1kq02qs142zs74ff"; + sha256 = "4743a148d4452743f3484ed28285a6889adb4af2a61b72448e0ddfe7d5142c64"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/desktops/gnome-3/3.12/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gpaste/default.nix index 48a086014071..f87431653c93 100644 --- a/pkgs/desktops/gnome-3/3.12/misc/gpaste/default.nix +++ b/pkgs/desktops/gnome-3/3.12/misc/gpaste/default.nix @@ -2,12 +2,12 @@ , pango, gtk3, gnome3, dbus, clutter, appdata-tools, makeWrapper }: stdenv.mkDerivation rec { - version = "3.12.3"; + version = "3.12.3.1"; name = "gpaste-${version}"; src = fetchurl { url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz"; - sha256 = "03f48kaidgbnyi4c7qgkwvnxs5rz7nk9m3iqfpsbhc512c8qnc1f"; + sha256 = "05afbhn3gw015cf2z3045lvlnj4cz06p6libkglb2wqsfb7azbl0"; }; buildInputs = [ intltool autoreconfHook pkgconfig vala glib diff --git a/pkgs/desktops/kde-4.12/applications/kate.nix b/pkgs/desktops/kde-4.12/applications/kate.nix deleted file mode 100644 index e7a6476dd6df..000000000000 --- a/pkgs/desktops/kde-4.12/applications/kate.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ stdenv, kde, kdelibs, kactivities, qjson, pyqt4, sip, python, pykde4}: - -kde { - - buildInputs = [ kdelibs kactivities qjson pyqt4 sip python pykde4 ]; - - meta = { - description = "Kate, the KDE Advanced Text Editor, as well as KWrite"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.12/applications/konsole.nix b/pkgs/desktops/kde-4.12/applications/konsole.nix deleted file mode 100644 index bd4e9e58cd05..000000000000 --- a/pkgs/desktops/kde-4.12/applications/konsole.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ stdenv, kde, kdelibs, kde_baseapps }: - -kde { - - buildInputs = [ kdelibs kde_baseapps ]; - - meta = { - description = "Konsole, the KDE terminal emulator"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.12/default.nix b/pkgs/desktops/kde-4.12/default.nix deleted file mode 100644 index ffcd3115de71..000000000000 --- a/pkgs/desktops/kde-4.12/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.12.4" }: - -let - branch = "4.12"; - - # Need callPackageOrig to avoid infinite cycle - kde = callPackageOrig ./kde-package { - inherit release branch ignoreList extraSubpkgs callPackage; - }; - - # The list of igored individual modules - ignoreList = { - # Doesn't work yet - kdeutils = [ "ksecrets" ]; - # kdeadmin/strigi-analyzer has no real code - kdeadmin = [ "strigi-analyzer" ]; - # Most of kdebindings do not compile due to a bug in the buildsystem - kdebindings = [ "kimono" "korundum" "kross-interpreters" "perlkde" "qyoto" ]; - }; - - # Extra subpackages in the manifest format - extraSubpkgs = {}; - -in - -kde.modules // kde.individual // -{ - inherit (kde) manifest modules individual splittedModuleList; - - akonadi = callPackage ./support/akonadi { }; - - qt4 = qt48; - - kdebase_workspace = kde.modules.kde_workspace; - - inherit release; - - full = stdenv.lib.attrValues kde.modules; - - l10n = callPackage ./l10n { - inherit release branch; - inherit (kde.manifest) stable; - }; -} diff --git a/pkgs/desktops/kde-4.12/files/kde-wallpapers-buildsystem.patch b/pkgs/desktops/kde-4.12/files/kde-wallpapers-buildsystem.patch deleted file mode 100644 index 378cdb646940..000000000000 --- a/pkgs/desktops/kde-4.12/files/kde-wallpapers-buildsystem.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3d3e247..f78db67 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,5 +1,10 @@ --find_package(KDE4 REQUIRED) --include(KDE4Defaults) -+project(kde-wallpapers NONE) -+if( WALLPAPER_INSTALL_DIR ) -+ message(STATUS "Installing wallpapers to user-supplied directory ${WALLPAPER_INSTALL_DIR}") -+else() -+ find_package(KDE4 REQUIRED) -+ include(KDE4Defaults) -+endif() - - install(DIRECTORY Air DESTINATION ${WALLPAPER_INSTALL_DIR} PATTERN .svn EXCLUDE) - diff --git a/pkgs/desktops/kde-4.12/files/kdelibs-cve-2014-5033.patch b/pkgs/desktops/kde-4.12/files/kdelibs-cve-2014-5033.patch deleted file mode 100644 index c85eccd6beb6..000000000000 --- a/pkgs/desktops/kde-4.12/files/kdelibs-cve-2014-5033.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- a/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp -+++ b/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp -@@ -144,7 +144,7 @@ - - Action::AuthStatus Polkit1Backend::actionStatus(const QString &action) - { -- PolkitQt1::UnixProcessSubject subject(QCoreApplication::applicationPid()); -+ PolkitQt1::SystemBusNameSubject subject(QString::fromUtf8(callerID())); - PolkitQt1::Authority::Result r = PolkitQt1::Authority::instance()->checkAuthorizationSync(action, subject, - PolkitQt1::Authority::None); - switch (r) { -@@ -160,21 +160,12 @@ - - QByteArray Polkit1Backend::callerID() const - { -- QByteArray a; -- QDataStream s(&a, QIODevice::WriteOnly); -- s << QCoreApplication::applicationPid(); -- -- return a; -+ return QDBusConnection::systemBus().baseService().toUtf8(); - } - - bool Polkit1Backend::isCallerAuthorized(const QString &action, QByteArray callerID) - { -- QDataStream s(&callerID, QIODevice::ReadOnly); -- qint64 pid; -- -- s >> pid; -- -- PolkitQt1::UnixProcessSubject subject(pid); -+ PolkitQt1::SystemBusNameSubject subject(QString::fromUtf8(callerID)); - PolkitQt1::Authority *authority = PolkitQt1::Authority::instance(); - - PolkitResultEventLoop e; - diff --git a/pkgs/desktops/kde-4.12/files/polkit-install.patch b/pkgs/desktops/kde-4.12/files/polkit-install.patch deleted file mode 100644 index d2ecac663ec5..000000000000 --- a/pkgs/desktops/kde-4.12/files/polkit-install.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru -x '*~' kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake ---- kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake 2011-05-20 22:24:54.000000000 +0200 -+++ kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake 2011-07-12 14:03:00.000000000 +0200 -@@ -139,7 +139,7 @@ - ${CMAKE_INSTALL_PREFIX} _KDE4_AUTH_POLICY_FILES_INSTALL_DIR - ${POLKITQT-1_POLICY_FILES_INSTALL_DIR}) - -- set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR ${_KDE4_AUTH_POLICY_FILES_INSTALL_DIR} CACHE STRING -+ set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions" CACHE STRING - "Where policy files generated by KAuth will be installed" FORCE) - elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "FAKE") - set (KAUTH_COMPILING_FAKE_BACKEND TRUE) diff --git a/pkgs/desktops/kde-4.12/kactivities.nix b/pkgs/desktops/kde-4.12/kactivities.nix deleted file mode 100644 index 06381bb13d7d..000000000000 --- a/pkgs/desktops/kde-4.12/kactivities.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, nepomuk_core }: - -kde { - propagatedBuildInputs = [ kdelibs nepomuk_core ]; - - meta = { - description = "KDE activities library and daemon"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kde-base-artwork.nix b/pkgs/desktops/kde-4.12/kde-base-artwork.nix deleted file mode 100644 index 3f416cebddc4..000000000000 --- a/pkgs/desktops/kde-4.12/kde-base-artwork.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ kde, kdelibs }: - -kde { - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "0mrd3w7rhsj0v92c8rh9zjxyifq7wyvwszksf2gyn53dzd06blk8"; - - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE Base artwork"; - license = "GPL"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kde-baseapps/kde-baseapps.nix b/pkgs/desktops/kde-4.12/kde-baseapps/kde-baseapps.nix deleted file mode 100644 index a65f33e13de1..000000000000 --- a/pkgs/desktops/kde-4.12/kde-baseapps/kde-baseapps.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ stdenv, kde, kdelibs, htmlTidy, kactivities -, nepomuk_core, nepomuk_widgets, libXt }: - -kde { - buildInputs = [ kdelibs nepomuk_core nepomuk_widgets htmlTidy kactivities libXt ]; - - meta = { - description = "Base KDE applications, including the Dolphin file manager and Konqueror web browser"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.12/kde-package/4.12.4.nix b/pkgs/desktops/kde-4.12/kde-package/4.12.4.nix deleted file mode 100644 index 9b5a53cee48d..000000000000 --- a/pkgs/desktops/kde-4.12/kde-package/4.12.4.nix +++ /dev/null @@ -1,444 +0,0 @@ -{stable=true; -hashes=builtins.listToAttrs[ - {name="amor";value="0c8298z7c3a71yj6nik7h8h7rngqzrz6rc95kl990p37jp2ng0d9";} - {name="analitza";value="0l122nh81nf7r4bm73gc6dp9k4jh2dxc7majrzjq37hb8pi77njh";} - {name="ark";value="155bhqqyw3afm99c47b3pxqf9fiqcz6gqg1pavsx9q4rmk7rp8m6";} - {name="audiocd-kio";value="1c5234s1hdh6jc8szyb4nwqr1h8hhwlmin0iyxabsl0c45pss9pa";} - {name="blinken";value="0q0y3xfv3pjrw0h8mnbigpywwrqk8wb2lqbjcgk755j6syinhphh";} - {name="bomber";value="1f12qmg58n9sj6vjqdj57ch50pq5f0h6anx06x9bhhs502w6aqwy";} - {name="bovo";value="10x4qy4vdp76iv3n60iy24lk1wbsjdfr88l1m9xifj4k942wk2ir";} - {name="cantor";value="1x5rxshdbgl40cqx6h5r0hx49rrc6gwnabsl8b7kzimh0kbv2ma9";} - {name="cervisia";value="0ia78cjkq606232jy14ps7cpm77pq4xdmcfimv4l6p0xjpq8jzsg";} - {name="dolphin-plugins";value="08h278jpbll7wc1mhz58cklj1bkrk61dfwjlflag6fnlm6i4xx8k";} - {name="dragon";value="16gyr0dl50nl9r3yc2fkwmqlrfgzzyim6bdlb9a76winzbz8mgxr";} - {name="ffmpegthumbs";value="01cmwm6w1z2gsllwdmrzsl9882fw5k59lr1k7z114kkrh1l0b2j4";} - {name="filelight";value="01rs1r80ixm1dj5d73a22893rdz2srxqp4dv5pysw1fhn02zdkkf";} - {name="granatier";value="1ia85yxfbbi8qxdyn0vwgmdjrxwssb6nadbia1yqsjdncfsnhbvs";} - {name="gwenview";value="01p5b1z05v3c7f192fxrrfp6x3ss7gx8pxv29czkp641hpmcg3jl";} - {name="jovie";value="1hfkj3vlvm63sgb4gx3xl7nksb5cfqnh7shs7wqm3gl6yj2rwhjj";} - {name="juk";value="1vxnrxz6gbyk7fd15akhiyczpgq03cym3nldi61m958cx4khd4y7";} - {name="kaccessible";value="0a9r2bk8a5h7mpl37li3bqbsz5dfgn8rsxnri93msvc6555pnyzv";} - {name="kactivities";value="1fl638cyj3abxfmbqcfqsd3idmdmys1xim4flf1jpbqa29psl75j";} - {name="kajongg";value="19awqjqn9hqhprzi7mjb6nkrgvb3mzhignkgalfjd4j5rga7vzz0";} - {name="kalgebra";value="1bj88nh7znk86i6a4d3jcjyqp46kzipfc99xvhxvqdsy8drbrwjp";} - {name="kalzium";value="00pjpdbd11jgzs443kgh8y6pxf3ff0ypgl5j3zfa6gbj18cnkkq0";} - {name="kamera";value="12mcjw8l0nh2jbi04myx1y1irbf92x9bx93gdymw939lawaalqic";} - {name="kanagram";value="1yd5agh61nv4ajlrijxg5g3hvw0xjxdvnc6h3lbz5mgvc8smvazk";} - {name="kapman";value="1aa78q6y2s9dig2603b9nry5rx5jbbxz2pb3jxr323hmqxp6jy1z";} - {name="kapptemplate";value="08j8xh9spk6ymlichl74n1v2zn342d94m6f4jragnx2jvif2163k";} - {name="kate";value="1cxc9bgzvfpns7dhmmafzxhnyjqxyq0adr0l1mbwsahxpkblc30r";} - {name="katomic";value="01lk7ajlj98rjbs76xd9r3hnd98dy49xv809m2zchm5ria7hdh48";} - {name="kblackbox";value="1sgbs0flllmy6d3518wwnzmdr14kqkxsi76h2p4xyk3bq2g9q2xg";} - {name="kblocks";value="1zinpxbvri52r26qiiiv4j4r02a22947hcrchf1z3n6lf817vqwv";} - {name="kbounce";value="0f9ssdpicvkiv7dxnj75h1cmz24mz2sy2zyp7rw7mvr9ynnl8w21";} - {name="kbreakout";value="02ix39kfkagmsqs8icqrqy9cz90lbl2wqajyjzrshw1vi29iahc7";} - {name="kbruch";value="0mfqdgwd5d8sy3bdiicpd5927dgg6zhm521f2q853qd2sqjbspgl";} - {name="kcachegrind";value="0dydarm1a2i64nazcl59s0a8b8z7znnm20wdmx2gfm5377j98y8x";} - {name="kcalc";value="1znrv4fqwaf56djf9qg6fxcp7nfi7fzza2whjlkayvc9kxv3ah9y";} - {name="kcharselect";value="0mbl9zvb9hp0xdi58v0vb8z0by71xkz22pr9flnkar5b1klnjpdb";} - {name="kcolorchooser";value="1d1cyaqi0rhwfnmjbxpjjavgwjhr3pd2rywlxxb9g4q3rv8k7wg5";} - {name="kcron";value="033f0s14crqpsirhgysi309b9pj02vwsd7fr28n6n2sh5imj30a0";} - {name="kdeartwork";value="08snjhaqiddiaj5jfd0vx1fjijsyqwngy7p1mkpdfhj7575sbx7c";} - {name="kde-baseapps";value="0k0mfbpvmv0n2brrb8hc0rd1wz04m3cyr1byb0z34a7x7kk1h1i4";} - {name="kde-base-artwork";value="0vmkbmir7hviqkv7nqrbqd6skj2srp9w4nrs8rkcvq7c8n76rk5w";} - {name="kde-dev-scripts";value="0l5frvb1akhy86j3yic3n1jirclj8r1jwjn760fi89vl1xysrarq";} - {name="kde-dev-utils";value="0807c8mq8rqqk8vf9r1idqmqrlfv9bsc8rjn8mfv2ch49mzzdrdj";} - {name="kdegraphics-mobipocket";value="1m6lnkr460261iq634lz887dbhvmj56p97k4llch3h80ra10mlh8";} - {name="kdegraphics-strigi-analyzer";value="1rqb1lzqb39p95xpf8c26pm9rxhcmycd518hxzp8arz6k2chazj8";} - {name="kdegraphics-thumbnailers";value="04aaxjznb176ym89f06gp4bycg67zndwc451mkdr33mal58jh0zs";} - {name="kdelibs";value="0dn0z1fs4vym7cp2749viw171dhay9ql2dp65a4hphmsdmk9bzv4";} - {name="kdenetwork-filesharing";value="1r3a5y9nmcf06nqsdh8k4jny7dmrhya8xi3jwz0d1mfzlfjksyf7";} - {name="kdenetwork-strigi-analyzers";value="0gqj5b91q3l5hna6zbgm17wi54g7g058n605adc1mch97yshqyrd";} - {name="kdepim";value="00lsyg6762kd2qvhhqq6vrrrl1fbk07yd3ha8w1yyjwiy9cnsy7z";} - {name="kdepimlibs";value="1h7k5ravilwz9r5lh7dqjnzh9h8hz43plbdaicjwk2sg4mqwzzhh";} - {name="kdepim-runtime";value="1z631kag1gpmk2ljk64vhscr3lad3mj3599phh0i8jqlxvr4007c";} - {name="kdeplasma-addons";value="0lfza3454hzbicqpz0ipjys9brjkblmpsngqg5njxd6ph9mzg34a";} - {name="kde-runtime";value="05n5cllsjyf03bgisykrbc74i7a3nm5f0k6hnq9sphf8xnxl318x";} - {name="kdesdk-kioslaves";value="045kf44s2gg3i2xl6087zn3cz80y7li26fzxdvvv89ywcq0npg59";} - {name="kdesdk-strigi-analyzers";value="15xxpgiy5bp6m78crw448mzv3yijjzipsrybadrbwqz6p7dpysbv";} - {name="kdesdk-thumbnailers";value="039rgq5p4mkdrilcvkf6k1d9d45swk74hdg3qnsbz3m47vqqf92h";} - {name="kde-wallpapers";value="0z7ffz2i410k2xxl1cr8m74mm90c5sizpbhmhyqxwjlsbz1gwfya";} - {name="kdewebdev";value="0ljwbzdcshjaz2dv7yp4ckj0c0jxa60ka6vjbhdmc4x7nvwnx737";} - {name="kdf";value="0s8ms5h5gdfa3697xg1yzz0h2hijlv68gi2g7n7g3xwpawbqrzv1";} - {name="kdiamond";value="10v7zrj4d96ppawjib1jgdz00455h8334w4vb619g448pj5h66sn";} - {name="kfloppy";value="1fd7wwbxngaiy0fbxvqp027rp61jg8fwajz70lx7acs20kcs0301";} - {name="kfourinline";value="1s2gc7zk932ks89c24pyimcsspnmabbmsdjh520xkzzxrp41gz0b";} - {name="kgamma";value="0n19zrarda9fvhimgnm84mdcaqgcqn4qfr0yw6i76la24pjbl46y";} - {name="kgeography";value="0w32841fligd3gyjl34q2f31jldw2vl47bi6cljwp7nlkdlp0lkn";} - {name="kget";value="1kls245b5s2dlxcrpa4d969zlr2lw797p7p2ilyhb4rbv871c0wd";} - {name="kgoldrunner";value="10xq9827gwib6w9h4hhys1v896rxqd50mz66k3frnrqals04zbbk";} - {name="kgpg";value="1wa5ymibiqnjxl5ck94y1xh3qk0bx3v7k7n2y3jcvprmhglffx6j";} - {name="khangman";value="1jfi30cb17gkn7v3i42wj0pqgaq3mr4fjbwh60ikvhxxd0nf5nny";} - {name="kig";value="1z0f50m1hgr5jj79v5v610bdggy4knlqnbxpnwf6ihj60v3cn0x0";} - {name="kigo";value="1klcgh3bpl3gqyh5zvij7ah754wjjf409a9l1xqxjigz4samnism";} - {name="killbots";value="04vy4zybgqls4whymqnzgkfbmzb17cc1m2xf2hp32bq5fq0r8103";} - {name="kimono";value="1bqbgch1z2nm143sp4lwnh3swvmvavhkj4scgx6d17m24jgd69hn";} - {name="kiriki";value="04r7p5f9a2iwv7c40pcnbga5ldcfjjig31fx81ww0b6p62dv2vrl";} - {name="kiten";value="1fxyy805b1q2sxdkd0hq2fr6plbnawzyascsbwychsqsasw2rmng";} - {name="kjumpingcube";value="0q2hn6lvz5grwz10nqq5jkcg3j1lgqsmmmhmx0glr4c732hg1z1d";} - {name="klettres";value="1w4340gaaip8imwy5d0058600v6fi7wnifppay2l7kvlp09iwmws";} - {name="klickety";value="088xvrb1jn8f3cfh39387pzw9simrjan63c24hn76290fkqjadgq";} - {name="klines";value="0n3bsvf5skr4816mjrd7zqjnh8vp5klvgx3h0025hwcbqyfa64bs";} - {name="kmag";value="0x91b1fwvwppiwzsnvc0647429ffhn56gndykmmyzr27i45znk3r";} - {name="kmahjongg";value="19qz7q5sr5xphzwxjf84h5vg0fll45fvs3pi5q9a5x5g4dy14wsv";} - {name="kmines";value="1nm7di7xs727jvfvv2039hpgkxzddgfv6vvrw3jwls975akl1wmb";} - {name="kmix";value="19s9z6m1v3wk5prngmm612r34013z7dkira83ap6kn3v32cfciry";} - {name="kmousetool";value="1zf7d3k1jf5ydaiw7v7a34hd5w4fmgkd4g9427546x64n27vx0a2";} - {name="kmouth";value="12n1x1imy7w3rn8g8zawmfivic0avzgrpmwm71hy7kxw9ya24yjg";} - {name="kmplot";value="1zji3lkq332zgvccnlisdavwxh0d1x81131xcy25r36q9c42syj3";} - {name="knavalbattle";value="0ibbahwck80z1dhycvm52k4nnj0pifzf9vi7j64kczc54z20b6d2";} - {name="knetwalk";value="0j8lyv60rvs5w214vhpmkf0807vi8b2vc8lglmmvz66cpw42c45z";} - {name="kolf";value="060dmnpr84g1512l0c0myxf1h1qp4jdsfgnxg5vwpciqk0dc9qhy";} - {name="kollision";value="033x8dg57f5amsnignri6ln8adavbaw1l3sydlf0jrw7ww3qvw1h";} - {name="kolourpaint";value="0c7i95cplwvxxm6aqgsk70q8ny8yfarcah9113vk6b81llbwn5sc";} - {name="kompare";value="0mq2v9nissb5s41lwvjbpba6fznkzwah9a7yisjq1nq47rp4ymqb";} - {name="konquest";value="0bsqxr12x9qgk4al21s2hrm48hv15ir98792z8jna3d5w6j0a2zy";} - {name="konsole";value="13kv6pmziqfis4qxkfxbmm3yiy2w3fy2l2qi68l0s6yiaqkd9y37";} - {name="kopete";value="012zjq0zmqkgahnzzj02xaqhsh800bn1x7sj8vmv1mxqyi66srvy";} - {name="korundum";value="1qyk8gvzcjwi5pi7s0a74glyvi1mi7k5z5ilza16y0z5k6ffgvck";} - {name="kpat";value="0lmhygv4l1vkmbf7vmrbns6fl1anbcxsnldn0hccdpp73x1py88g";} - {name="kppp";value="0nnz137c384xlnrvy625zdjfzzrp6yrcfnn9gw6fs81cq4zwrr64";} - {name="krdc";value="0g7p94q0h3i3j9wwcmmiylz0604v4z9f0b2dppfiaq5bnz9m5pdl";} - {name="kremotecontrol";value="1hg4fq6ypws4zb07glsrflmr7vq35h7qqmjf5r5b5j53xqmgr6hp";} - {name="kreversi";value="059xsi9x6jhsdsgrxrk08haz1v4p4i46l7zkg8id64s9kvywgn5j";} - {name="krfb";value="01l8jv5ad3gc5kxjbr7k4ggcipc5903z82pq9616mk0qpd96j6jb";} - {name="kross-interpreters";value="0cdb9kaq9fdjaxks83z3gvjwwhz94g4kgjq1rp6wmzwydk28ip6i";} - {name="kruler";value="0i9n2znhm6llriipvrrjh8yymj76a17895w7kbcyd41srk0akk5i";} - {name="ksaneplugin";value="1fqkbf47ajw7ckzipphdjpnpv4gk426k1rpq3z1qlbag9f9wvxsd";} - {name="kscd";value="1f8099bhylrr5m3a5lrmjxz2rz59k3qi1abfjs63hk2z523p99n3";} - {name="kshisen";value="1nhq2rxiylzr7klpqqbhl35v7s4prv15wrckgx84mdm5hmyh4nsw";} - {name="ksirk";value="0s577h7sswqr44mzmm2a5gi62w8lpzivy9xy5jpib3iw768a9gxy";} - {name="ksnakeduel";value="09jp1cd138cqv131h7m3c994zwxbn97yw77fq1yrcfgyspmdx0x9";} - {name="ksnapshot";value="1fiqracij106c22b0ws6n047wn4fww5fzli8rqjas5m25931azl4";} - {name="kspaceduel";value="1a2n9kyn6y62yps5apclgpmzbchdrfn3lck9fl68alk0bpqdnz1n";} - {name="ksquares";value="1bg9na03ph1lignnl6fdxkvcbsq77dskbgn8d7hyq1p800n7jx7q";} - {name="kstars";value="1wf13434sxxwikrp29jl5klggmv0ln73a57rs0m4gr4zrjvbrs2s";} - {name="ksudoku";value="1nq4nj1q723s7gv1d0l3wafs2d6wz67xhir2sa1wsw12dzh856vf";} - {name="ksystemlog";value="0khb92vxr0hfny2yxwnww33ahgm9gmmrf5h7qaj0lqnyrh5fcl6c";} - {name="kteatime";value="13jzf4mcq8glkhg5szpawj2k0ss4qfzrjhpmjn3m3grz1zf167sw";} - {name="ktimer";value="0y6q9khxlmb7pgds4f9a83aqnbn0gwbi3r15s8vf72qr3qj3f5xc";} - {name="ktouch";value="1swdkzvm9q4r8ily7n4cs91y186zlzys7kjs3lf2q46d63l9nfdz";} - {name="ktuberling";value="0fzd17hvb2zaqwd0fw6f3rq0mlq8xrmz155dyg916jg2alslicxh";} - {name="kturtle";value="1hlfv77g0v48qfqwpqqnw5qf8fcl4v38612v3jy5z038g4sacxkx";} - {name="ktux";value="0shib3f2gcdgf88zh2w67kizbmj7gz0vqy8ff5vmr75fp44111b4";} - {name="kubrick";value="1dkd7rzkxyk71hd4r9l6nlvcl3zj8vf6i9v1gqi8zjrqwpxvf188";} - {name="kuser";value="1qc4wk5q9y7mmkfjqndcby7782z2aaj7x1cc4dcmds01glm2bw6j";} - {name="kwalletmanager";value="1f0ncnx3d6z3v373095nhydj844hiva64qh80cc7rmb624vlcsa4";} - {name="kwordquiz";value="1m0zi0gldw7shjy4nhiw2azgrfvhcmm5h423gckjczpqd9f17ihd";} - {name="libkcddb";value="0k1xr8z3dmfq08qh7fkjhi2v523lhy1inmggnk3gaxzarlvhqxxa";} - {name="libkcompactdisc";value="03ch51firb2xcqwy3p6q5j5zr9570nvqa5cgd5yj7pjnzdwcjxv8";} - {name="libkdcraw";value="1ypamhdk8y7vb9y250vilmv5dgxf1svvsw329yxc146ii0pb4nwr";} - {name="libkdeedu";value="0m20vxa9x2ww7xmq1a7j4pmqsdj5pp05hsg4q64slz69m5npi30r";} - {name="libkdegames";value="1hz02x2k7iiw0i78ifa4ji60l87by855v5f6pm3ksw3rdw0ipz9v";} - {name="libkexiv2";value="0mz88j3kszqxf518h7n0fjnql2iqwx780hv4jhvrkraclf4czng9";} - {name="libkipi";value="0x4d356c20fdjaqadzaqhsf43v9c9bgbwbyy304q2w329m8ab058";} - {name="libkmahjongg";value="0911knwvhwa77hr0ncqwjqzfcyvgi806ckyldglrhvm0gw0mgy60";} - {name="libkomparediff2";value="0rn5xhbnywjjbk9qx3xw3gss57l105a4a4v05gh9vvl82hc5sfzx";} - {name="libksane";value="19zibd1y96sxwnpdxkd752jiky83b8is85qi7six60g5kkzi948m";} - {name="lokalize";value="0sl9i146rx0ls3rii6893alkvsjv8ln0d5yabd72f8kagsaw42h7";} - {name="lskat";value="1flx7l8svf51fkr3lw0z85d0gkrabjzi73w4qn2wnsaz9wr6kahi";} - {name="marble";value="1gvlq0si76bk4yd8dfbixzwxj618ifd2jlr7fq6f9mx498cvifpi";} - {name="mplayerthumbs";value="1nw01216mghwxz7zhkf7px5kkb2d4dqdk7par20agvw2raan9axi";} - {name="nepomuk-core";value="0gavipa1hn5aw77q3xrdv9464l8qpabq6kawlvjvv90hjvs8clis";} - {name="nepomuk-widgets";value="1cr4v4s567vcx1046gj066xfmhrqx4g6lipffr6d3wdq9cgy5y5i";} - {name="okteta";value="0maadxyngj8an0hl3kidvmgj538n6vzpz964yilzj6qrry9f46wc";} - {name="okular";value="0cmcaqpaxx8910qmsvag6spjbchdbv6j9hgbizw6qq09kz4d9a7k";} - {name="oxygen-icons";value="00l7qy95za3c323hkjiihavmq2vjm2yi81yn4cgwpnc5l336pynb";} - {name="pairs";value="15kafhp54dsrv2466j9gnn0c8iqbfx4frrql0r6v5qza015vybr9";} - {name="palapeli";value="0bx7qqidywxwkj9vdbzpqsy2fvkjgf9vj8nqk5ypx7jm7da87y94";} - {name="parley";value="163xnfd9h8r6dp3riqs3s32qaramyf225bhy6y9laknbrr9lxnsm";} - {name="perlkde";value="05ybh43ckfq5qh03pklkgiajc2s6b6cmvp5alx0dvq605h5z881f";} - {name="perlqt";value="1fn3gxb8b4kx7g24pnrbg42dv17hn2wv70g53yfr6z277ljinxzl";} - {name="picmi";value="19gli6mii15qya9hi6qyb52rsk2n2dk6r4kzla99ps3cs8n4h9x8";} - {name="poxml";value="11cwhjil8vdwwpmp1l61335b5j9714hbxiyqw0wyxcr6yccasbdf";} - {name="print-manager";value="0v940bsksw04ymxq56lgm6sprkdlyzjm5fgsm24yb564nay3x42h";} - {name="pykde4";value="00gpjqgsfv83xfk1xmglr8c32ln9cc05m4nf1qbd3gvr5jb6cxmg";} - {name="qtruby";value="1312v8vn091q5lh81cm5z5wkgidigdngqkjs3kf7lp9d1k50ai47";} - {name="qyoto";value="0sjii1i31x1cxhr5y5ijaain9ql75fbba9ss1cxz9agswp95kpcz";} - {name="rocs";value="0h72mrb65gnk36g9d4l55bm7kfldh3v95hbv0wxad0p9v7baxmn2";} - {name="smokegen";value="0x4qz1pk8wn4vq0fmy344v9m1gh12dav3n71z6xi4pnpmpmq7kna";} - {name="smokekde";value="1wl88jy9yvvrykzknj1vy7rqhfxr52q053y2jmay53hvx1iaqjxm";} - {name="smokeqt";value="1lphdjxcvysn1lkq6yj7z5pmhzlwpkj3xx7izfdk1g6a1pkjwr7j";} - {name="step";value="0ma7748ixi00zw9hrjjlgbb7d1a4cr124ka3ymn45sa4q4mza3zh";} - {name="superkaramba";value="0xbs2k863p2yg2k7wn70gbwvriin4lv2hv78r5m6fwvb4rsjygsb";} - {name="svgpart";value="1svwqxcxl2wp4wq9s3q6crys7jmz072wp4qz69fvqcvp1cd92gsp";} - {name="sweeper";value="19lsqw192h3863fbd265didviy7m4wk6qwfgnhc7sxaxxccm19y4";} - {name="umbrello";value="0lmygjjsqiw0xnv4d3d1yb1b5zlnj18lh01k954ycl8f50cxsv9a";} - {name="zeroconf-ioslave";value="1324mx9gsr6ghi7m1qk4kwr91g8wfd3jsw3rzp26nhrlwjsa5j6a";} -]; -modules=[ -{ - module="kdemultimedia"; - split=true; - pkgs=[ - { name="audiocd-kio"; sane="audiocd_kio"; } - { name="dragon"; } - { name="ffmpegthumbs"; } - { name="juk"; } - { name="kmix"; } - { name="kscd"; } - { name="libkcddb"; } - { name="libkcompactdisc"; } - { name="mplayerthumbs"; } - ]; -} -{ - module="kdegraphics"; - split=true; - pkgs=[ - { name="gwenview"; } - { name="kamera"; } - { name="kcolorchooser"; } - { name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; } - { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; } - { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; } - { name="kgamma"; } - { name="kolourpaint"; } - { name="kruler"; } - { name="ksaneplugin"; } - { name="ksnapshot"; } - { name="libkdcraw"; } - { name="libkexiv2"; } - { name="libkipi"; } - { name="libksane"; } - { name="okular"; } - { name="svgpart"; } - ]; -} -{ - module="kdelibs"; - split=true; - pkgs=[ - { name="kdelibs"; } - { name="nepomuk-core"; sane="nepomuk_core"; } - { name="nepomuk-widgets"; sane="nepomuk_widgets"; } - ]; -} -{ - module="kdenetwork"; - split=true; - pkgs=[ - { name="kdenetwork-filesharing"; sane="kdenetwork_filesharing"; } - { name="kdenetwork-strigi-analyzers"; sane="kdenetwork_strigi_analyzers"; } - { name="zeroconf-ioslave"; } - { name="kget"; } - { name="kopete"; } - { name="kppp"; } - { name="krdc"; } - { name="krfb"; } - ]; -} -{ - module="kdeutils"; - split=true; - pkgs=[ - { name="ark"; } - { name="filelight"; } - { name="kcalc"; } - { name="kcharselect"; } - { name="kdf"; } - { name="kfloppy"; } - { name="kgpg"; } - { name="kremotecontrol"; } - { name="ktimer"; } - { name="kwalletmanager"; } - { name="print-manager"; sane="print_manager"; } - { name="superkaramba"; } - { name="sweeper"; } - ]; -} -{ - module="applications"; - split=true; - pkgs=[ - { name="kate"; } - { name="konsole"; } - ]; -} -{ - module="kdetoys"; - split=true; - pkgs=[ - { name="amor"; } - { name="kteatime"; } - { name="ktux"; } - ]; -} -{ - module="kdesdk"; - split=true; - pkgs=[ - { name="cervisia"; } - { name="dolphin-plugins"; sane="dolphin_plugins"; } - { name="kapptemplate"; } - { name="kcachegrind"; } - { name="kde-dev-scripts"; sane="kde_dev_scripts"; } - { name="kde-dev-utils"; sane="kde_dev_utils"; } - { name="kdesdk-kioslaves"; sane="kdesdk_kioslaves"; } - { name="kdesdk-strigi-analyzers"; sane="kdesdk_strigi_analyzers"; } - { name="kdesdk-thumbnailers"; sane="kdesdk_thumbnailers"; } - { name="kompare"; } - { name="libkomparediff2"; } - { name="lokalize"; } - { name="okteta"; } - { name="poxml"; } - { name="umbrello"; } - ]; -} -{ - module="kdegames"; - split=true; - pkgs=[ - { name="bomber"; } - { name="bovo"; } - { name="granatier"; } - { name="kajongg"; } - { name="kapman"; } - { name="katomic"; } - { name="kblackbox"; } - { name="kblocks"; } - { name="kbounce"; } - { name="kbreakout"; } - { name="kdiamond"; } - { name="kfourinline"; } - { name="kgoldrunner"; } - { name="kigo"; } - { name="killbots"; } - { name="kiriki"; } - { name="kjumpingcube"; } - { name="klickety"; } - { name="klines"; } - { name="kmahjongg"; } - { name="kmines"; } - { name="knavalbattle"; } - { name="knetwalk"; } - { name="kolf"; } - { name="kollision"; } - { name="konquest"; } - { name="kpat"; } - { name="kreversi"; } - { name="kshisen"; } - { name="ksirk"; } - { name="ksnakeduel"; } - { name="kspaceduel"; } - { name="ksquares"; } - { name="ksudoku"; } - { name="ktuberling"; } - { name="kubrick"; } - { name="libkdegames"; } - { name="libkmahjongg"; } - { name="lskat"; } - { name="palapeli"; } - { name="picmi"; } - ]; -} -{ - module="kdeedu"; - split=true; - pkgs=[ - { name="analitza"; } - { name="blinken"; } - { name="cantor"; } - { name="kalgebra"; } - { name="kalzium"; } - { name="kanagram"; } - { name="kbruch"; } - { name="kgeography"; } - { name="khangman"; } - { name="kig"; } - { name="kiten"; } - { name="klettres"; } - { name="kmplot"; } - { name="kstars"; } - { name="ktouch"; } - { name="kturtle"; } - { name="kwordquiz"; } - { name="libkdeedu"; } - { name="marble"; } - { name="pairs"; } - { name="parley"; } - { name="rocs"; } - { name="step"; } - ]; -} -{ - module="kdeadmin"; - split=true; - pkgs=[ - { name="kcron"; } - { name="ksystemlog"; } - { name="kuser"; } - ]; -} -{ - module="kdebindings"; - split=true; - pkgs=[ - { name="kimono"; } - { name="korundum"; } - { name="kross-interpreters"; sane="kross_interpreters"; } - { name="perlkde"; } - { name="perlqt"; } - { name="pykde4"; } - { name="qtruby"; } - { name="qyoto"; } - { name="smokegen"; } - { name="smokekde"; } - { name="smokeqt"; } - ]; -} -{ - module="kdeaccessibility"; - split=true; - pkgs=[ - { name="jovie"; } - { name="kaccessible"; } - { name="kmag"; } - { name="kmousetool"; } - { name="kmouth"; } - ]; -} -{ - module="kde-baseapps"; -sane="kde_baseapps"; split=true; - pkgs=[ - { name="kde-baseapps"; sane="kde_baseapps"; } - ]; -} -{ module="kactivities"; split=false;} -{ module="kdeartwork"; split=false; - pkgs=[ - { name="ColorSchemes"; } - { name="IconThemes"; } - { name="emoticons"; } - { name="kscreensaver"; } - { name="kwin-styles"; sane="kwin_styles";} - { name="styles"; } - { name="wallpapers"; } - { name="HighResolutionWallpapers"; } - { name="WeatherWallpapers"; } - { name="desktopthemes"; } - ]; - -} -{ module="kde-base-artwork"; sane="kde_base_artwork"; split=false;} -{ module="kdelibs"; split=false;} -{ module="kdepim"; split=false;} -{ module="kdepimlibs"; split=false;} -{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;} -{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;} -{ module="kde-runtime"; sane="kde_runtime"; split=false;} -{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;} -{ module="kdewebdev"; split=false; - pkgs=[ - { name="klinkstatus"; } - { name="kfilereplace"; } - { name="kimagemapeditor"; } - { name="kommander"; } - ]; - -} -{ module="kde-workspace"; sane="kde_workspace"; split=false;} -{ module="oxygen-icons"; sane="oxygen_icons"; split=false;} -]; -} diff --git a/pkgs/desktops/kde-4.12/kde-package/default.nix b/pkgs/desktops/kde-4.12/kde-package/default.nix deleted file mode 100644 index 6b4e1ba0ad87..000000000000 --- a/pkgs/desktops/kde-4.12/kde-package/default.nix +++ /dev/null @@ -1,129 +0,0 @@ -{ callPackage, runCommand, stdenv, fetchurl, qt4, cmake, automoc4 -, release, branch, ignoreList, extraSubpkgs -}: - -let - inherit (stdenv.lib) filter fold; - inherit (builtins) getAttr hasAttr remoteAttrs listToAttrs tail head; -in -rec { - manifest = import (./. + "/${release}.nix"); - - # src attribute for $name tarball - kdesrc = name: fetchurl { - url = "mirror://kde/" + (if manifest.stable then "" else "un") - + "stable/${release}/src/${name}-${release}.tar.xz"; - sha256 = getAttr name manifest.hashes; - }; - - # Default meta attribute - defMeta = { - homepage = http://www.kde.org; - inherit branch; - platforms = stdenv.lib.platforms.linux; - inherit (qt4.meta) maintainers; - }; - - # KDE package built from the whole tarball - # This function is used both for monolithic modules and modules which are - # released as individual tarballs - kdeMonoPkg = name: let n_ = name; in a@{meta, name ? n_, version ? release, ...}: - stdenv.mkDerivation ({ - name = "${name}-${version}"; - src = kdesrc name; - meta = defMeta // meta; - enableParallelBuilding = true; - } // (removeAttrs a [ "meta" "name" ])); - - # kdeMonoPkg wrapper for modules splitted upstream compatible with combinePkgs - # API. - kdeSplittedPkg = module: {name, sane ? name}: kdeMonoPkg name; - - # Build subdirectory ${subdir} of tarball ${module}-${release}.tar.xz - kdeSubdirPkg = module: - {name, subdir ? name, sane ? name}: - let name_ = name; in - a@{cmakeFlags ? [], name ? name_, meta ? {}, ...}: - stdenv.mkDerivation ({ - name = "${name}-${release}"; - src = kdesrc module; - cmakeFlags = - [ "-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE" - "-DBUILD_doc=TRUE" - "-DBUILD_${subdir}=TRUE" - ] ++ cmakeFlags; - meta = defMeta // meta; - enableParallelBuilding = module.enableParallelBuilding or true; - } // (removeAttrs a [ "meta" "name" "cmakeFlags" ])); - - # A KDE monolithic module - kdeMonoModule = name: path: callPackage path { kde = kdeMonoPkg name; }; - - # Combine packages in one module. - # Arguments: - # * pkgFun --- a function of the following signature: - # module: manifest_attrs: manual_attrs: derivation; - # * module --- name of the module - # * pkgs --- list of packages in manifest format - combinePkgs = pkgFun: module: pkgs: - let - f = p@{name, ...}: - callPackage (./.. + "/${module}/${name}.nix") { kde = pkgFun module p; }; - list = map f pkgs; - attrs = listToAttrs (map - ({name, sane ? name, ...}@p: { name = sane; value = f p; }) - pkgs); - in - runCommand "${module}-${release}" - ({passthru = attrs // { - propagatedUserEnvPackages = list; - projects = attrs; - };}) - '' - mkdir -pv $out/nix-support - echo "${toString list}" | tee $out/nix-support/propagated-user-env-packages - ''; - - # Given manifest module data, return the module - kdeModule = { module, sane ? module, split, pkgs ? [] }: - let - pkgs_ = filterPkgs module pkgs; - in - # Module is splitted by upstream - if split then combinePkgs kdeSplittedPkg module pkgs_ - # Monolithic module - else if pkgs == [] then kdeMonoModule module (./.. + "/${module}.nix") - # Module is splitted by us - else combinePkgs kdeSubdirPkg module pkgs_; - - # The same, as nameValuePair with sane name - kdeModuleNV = a@{ module, sane ? module, ... }: - { name = sane; value = kdeModule a; }; - - filterPkgs = module: (p: - removeNames (stdenv.lib.attrByPath [module] [] ignoreList) p - ++ (stdenv.lib.attrByPath [module] [] extraSubpkgs)); - - # Remove attrsets with x.name in subst. Optimized for empty subst. - removeNames = subst: big: - fold (s: out: filter (x: x.name != s) out) big subst; - - modules = listToAttrs (map kdeModuleNV manifest.modules); - - splittedModuleList = - let - splitted = filter (a: a ? pkgs) manifest.modules; - names = map ({module, sane ? module, ...}: sane) splitted; - in - map (m: m.projects) (stdenv.lib.attrVals names modules); - - individual = - stdenv.lib.zipAttrsWith - ( - name: list: - if tail list == [] - then head list - else abort "Multiple modules define ${name}" - ) - splittedModuleList; -} diff --git a/pkgs/desktops/kde-4.12/kde-package/kde-manifest.sh b/pkgs/desktops/kde-4.12/kde-package/kde-manifest.sh deleted file mode 100755 index e964ce3ddc11..000000000000 --- a/pkgs/desktops/kde-4.12/kde-package/kde-manifest.sh +++ /dev/null @@ -1,146 +0,0 @@ -#! /bin/sh - -# Usage: download kde release to $dir, then run -# $0 $dir - -dir="$1" - -# Detect release number & whether it is a stable release -if [[ ! -d "${dir}" ]]; then - echo "${dir} is not a directory (or doesn't exist)!" >&2 - exit 1 -fi - -release=$(ls "${dir}"/kdelibs-*.tar.xz | \ - sed -e 's/.*kdelibs-//' -e 's/\.tar\.xz//') - -if [[ ${release##*.} -gt 50 ]]; then - stable="false" -else - stable="true" -fi - -echo "Detected release ${release}" >&2 - -declare -A hash -declare -A modules -declare -a packages -declare -a top_level - -# xsltproc output declares -A module -if [[ ! -f kde_projects.xml ]]; then - curl -O -J http://projects.kde.org/kde_projects.xml -fi -eval `xsltproc kde-submodules.xslt kde_projects.xml` - -module[kde-baseapps]=kde-baseapps -unset module[kactivities] - -print_sane() { - echo "Called print_sane $1" >&2 - sane="${1//[^a-z0-9_]/_}" - if [[ "$sane" != "$1" ]]; then - echo "Sane version is $sane" >&2 - echo -n "sane=\"$sane\";" - fi -} - -for i in `cd "${dir}"; ls *-${release}.tar.xz`; do - package=${i%-${release}.tar.xz} - packages+=( "$package" ) - echo -n "${package}.. " >&2 - hash[$package]=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}") - echo -n ${hash[$package]} >&2 - - if [ -n "${module[$package]}" ]; then - m="${module[$package]}" - echo " (${m})" >&2 - modules[$m]=1 - else - top_level+=( "$package" ) - echo " (top-level)" >&2 - fi - #nix-store --add-fixed sha256 "${dir}/${i}" >&2 -done - - -print_pkg_hash() { - echo " {name=\"${1}\";value=\"${hash[$1]}\";}" -} - -print_hashes(){ - echo "hashes=builtins.listToAttrs[" - for p in "${packages[@]}"; do print_pkg_hash "$p"; done - echo "];" -} - -print_split_module(){ - echo -n "$1:" >&2 - echo -e "{\n module=\"$1\";" - print_sane "$1" - echo " split=true;" - echo " pkgs=[" - for p in "${packages[@]}"; do - if [[ "${module[$p]}" == "$1" ]]; then - echo -n " { name=\"$p\"; " - print_sane "$p" - echo " }" - echo -n " $p" >&2 - fi - done - echo " ];" - echo "}" - echo >&2 -} - -print_mono_module(){ - echo -en "{ module=\"$1\"; " - print_sane "$1" - echo -n "$1 ... " >&2 - echo -n " split=false;" - cml="$1-$release/CMakeLists.txt" - tar -xf "${dir}/$1-${release}.tar.xz" "$cml" - if grep '^[^#]*add_subdirectory' $cml >/dev/null; then - if grep '^[^#]*add_subdirectory' $cml | grep -v macro_optional_add_subdirectory >/dev/null; then - echo " is monolithic (has unconditionally added subdirs)" >&2 - else - subdirs=( `grep '^[^#]*add_subdirectory' $cml | - sed -e 's/[^#]*add_subdirectory *( *\(.*\) *)/\1/' | - grep -v '\(doc\|cmake\)'` ) - echo " seems splittable, subdirs: ${subdirs[*]}" >&2 - echo -e "\n pkgs=[" - for s in "${subdirs[@]}"; do - echo -en " {" - echo -n " name=\"${s//\//-}\"; " - print_sane "$s" - if [[ $s != "${s//\//-}" ]]; then - echo -n "subdir=\"$s\"; " - fi - echo "}" - done - echo -e " ];\n" - fi - else - echo " is monolithic (has no subdirs)" >&2 - fi - rm $cml - rmdir $1-$release - echo "}" -} - -print_modules(){ - echo "modules=[" - echo "Printing modules splitted by upstream" >&2 - for m in "${!modules[@]}"; do print_split_module "$m"; done - echo >&2 - echo "Printing modules not splitted by upstream (${top_level[*]})" >&2 - for m in "${top_level[@]}"; do print_mono_module "$m"; done - echo "];" -} - -echo "Writing ${release}.nix" >&2 -exec > "${release}.nix" -echo "{stable=${stable};" -print_hashes -print_modules -echo "}" diff --git a/pkgs/desktops/kde-4.12/kde-package/kde-submodules.xslt b/pkgs/desktops/kde-4.12/kde-package/kde-submodules.xslt deleted file mode 100644 index 952a05a9d274..000000000000 --- a/pkgs/desktops/kde-4.12/kde-package/kde-submodules.xslt +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- xslt file for http://projects.kde.org/kde_projects.xml --> - -<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> - - <xsl:output method="text" /> - <xsl:template match="/"> - <xsl:for-each select="kdeprojects/component[@identifier='kde']"> - <xsl:text>declare -A module </xsl:text> - <xsl:for-each select="module"> - <xsl:variable name="module" select='@identifier' /> - <xsl:for-each select=".//project[repo]"> - <xsl:text>module["</xsl:text> - <xsl:value-of select='@identifier' /> - <xsl:text>"]="</xsl:text> - <xsl:value-of select="$module" /> - <xsl:text>" </xsl:text> - </xsl:for-each> - </xsl:for-each> - </xsl:for-each> - </xsl:template> -</xsl:stylesheet> diff --git a/pkgs/desktops/kde-4.12/kde-runtime.nix b/pkgs/desktops/kde-4.12/kde-runtime.nix deleted file mode 100644 index 1c9706f4f4bf..000000000000 --- a/pkgs/desktops/kde-4.12/kde-runtime.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ kde, kdelibs, bzip2, libssh, exiv2, attica, qca2 -, libcanberra, virtuoso, samba, libjpeg, ntrack, pkgconfig, xz, pulseaudio -, networkmanager, kactivities, kdepimlibs, openexr, ilmbase, gpgme -}: - -kde { - buildInputs = [ - kdelibs attica xz bzip2 libssh libjpeg exiv2 ntrack - qca2 samba libcanberra pulseaudio gpgme - networkmanager kactivities kdepimlibs openexr -#todo: add openslp -#todo: gpgme can't be found because cmake module is provided by kdepimlibs which are found too late - ]; - - nativeBuildInputs = [ pkgconfig ]; - - NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; - - passthru.propagatedUserEnvPackages = [ virtuoso ]; - - meta = { - license = "LGPL"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kde-wallpapers.nix b/pkgs/desktops/kde-4.12/kde-wallpapers.nix deleted file mode 100644 index 393d90824ebe..000000000000 --- a/pkgs/desktops/kde-4.12/kde-wallpapers.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kde, cmake }: - -kde { - nativeBuildInputs = [ cmake ]; - - patches = [ ./files/kde-wallpapers-buildsystem.patch ]; - - cmakeFlags = "-DWALLPAPER_INSTALL_DIR=share/wallpapers"; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "1yg9c780xdxa60bw832cqj60v87cbvjxp27k6gacj2lwk7rm5hwg"; - - meta = { - description = "Wallpapers for KDE"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kde-workspace.nix b/pkgs/desktops/kde-4.12/kde-workspace.nix deleted file mode 100644 index 38e28225d94a..000000000000 --- a/pkgs/desktops/kde-4.12/kde-workspace.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ stdenv, kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, lm_sensors -, pciutils, libraw1394, libusb1, python, libqalculate, akonadi -, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison -, libjpeg, pkgconfig, kactivities, qjson, udev, fetchurl -}: - -kde { - - version = "4.11.6"; - - src = fetchurl { - url = "mirror://kde/stable/4.12.2/src/kde-workspace-4.11.6.tar.xz"; - sha256 = "0lk3k9zl4x4il5dqpw7mf25gv8a3y48fd3jq3jvgmwwlviwcpcz1"; - }; - -#todo: wayland, xmms, libusb isn't found - buildInputs = - [ kdelibs qimageblitz libdbusmenu_qt xorg.libxcb xorg.xcbutilimage libjpeg - xorg.xcbutilrenderutil xorg.xcbutilkeysyms xorg.libpthreadstubs xorg.libXdmcp - xorg.libxkbfile xorg.libXcomposite xorg.libXtst - xorg.libXdamage - - python boost boost.lib qjson lm_sensors gpsd libraw1394 pciutils udev - akonadi pam libusb1 libqalculate kdepimlibs prison - kactivities - ]; - - nativeBuildInputs = [ pkgconfig ]; - - preConfigure = - '' - # Fix incorrect path to kde4-config. - substituteInPlace startkde.cmake --replace '$bindir/kde4-config' ${kdelibs}/bin/kde4-config - - # Fix the path to the keyboard configuration files. - substituteInPlace kcontrol/keyboard/xkb_rules.cpp \ - --replace /usr/share/X11 ${xkeyboard_config}/etc/X11 - ''; - - enableParallelBuilding = false; # frequent problems on Hydra - - meta = { - description = "KDE workspace components such as Plasma, Kwin and System Settings"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeaccessibility/jovie.nix b/pkgs/desktops/kde-4.12/kdeaccessibility/jovie.nix deleted file mode 100644 index d38c80c4c36a..000000000000 --- a/pkgs/desktops/kde-4.12/kdeaccessibility/jovie.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, speechd }: - -kde { - buildInputs = [ kdelibs speechd ]; - - meta = { - description = "Text-to-speech synthesis daemon"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeaccessibility/kaccessible.nix b/pkgs/desktops/kde-4.12/kdeaccessibility/kaccessible.nix deleted file mode 100644 index 98fae7c983f8..000000000000 --- a/pkgs/desktops/kde-4.12/kdeaccessibility/kaccessible.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, speechd }: - -kde { - buildInputs = [ kdelibs speechd ]; - - meta = { - description = "Bridge that provides accessibility services to applications"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeaccessibility/kmag.nix b/pkgs/desktops/kde-4.12/kdeaccessibility/kmag.nix deleted file mode 100644 index 606c61cddb63..000000000000 --- a/pkgs/desktops/kde-4.12/kdeaccessibility/kmag.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs }: - -kde { -#todo: package qaccessibilityclient - buildInputs = [ kdelibs ]; - - meta = { - description = "Screen magnifier for KDE"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeaccessibility/kmousetool.nix b/pkgs/desktops/kde-4.12/kdeaccessibility/kmousetool.nix deleted file mode 100644 index 8e0caa76ed9c..000000000000 --- a/pkgs/desktops/kde-4.12/kdeaccessibility/kmousetool.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, libXtst, libXt }: - -kde { - buildInputs = [ kdelibs libXtst libXt ]; - - meta = { - description = "A program that clicks the mouse for you"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeaccessibility/kmouth.nix b/pkgs/desktops/kde-4.12/kdeaccessibility/kmouth.nix deleted file mode 100644 index 4159501967cd..000000000000 --- a/pkgs/desktops/kde-4.12/kdeaccessibility/kmouth.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "A type-and-say front end for speech synthesizers"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeadmin/kcron.nix b/pkgs/desktops/kde-4.12/kdeadmin/kcron.nix deleted file mode 100644 index f585461af381..000000000000 --- a/pkgs/desktops/kde-4.12/kdeadmin/kcron.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Configure and schedule tasks"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeadmin/ksystemlog.nix b/pkgs/desktops/kde-4.12/kdeadmin/ksystemlog.nix deleted file mode 100644 index 88757a6b91c7..000000000000 --- a/pkgs/desktops/kde-4.12/kdeadmin/ksystemlog.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "System log viewer tool"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeadmin/kuser.nix b/pkgs/desktops/kde-4.12/kdeadmin/kuser.nix deleted file mode 100644 index 6118cf558bbd..000000000000 --- a/pkgs/desktops/kde-4.12/kdeadmin/kuser.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, kdepimlibs }: - -kde { - buildInputs = [ kdelibs kdepimlibs ]; - - meta = { - description = "User management tool"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeartwork/ColorSchemes.nix b/pkgs/desktops/kde-4.12/kdeartwork/ColorSchemes.nix deleted file mode 100644 index acccf66976fc..000000000000 --- a/pkgs/desktops/kde-4.12/kdeartwork/ColorSchemes.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs }: - -kde { - name = "kde-color-schemes"; - - buildInputs = [ kdelibs ]; - - meta = { - description = "Additional KDE color schemes"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeartwork/FindXscreensaver.cmake b/pkgs/desktops/kde-4.12/kdeartwork/FindXscreensaver.cmake deleted file mode 100644 index 499ed75268e9..000000000000 --- a/pkgs/desktops/kde-4.12/kdeartwork/FindXscreensaver.cmake +++ /dev/null @@ -1,73 +0,0 @@ -#Macro to find xscreensaver directory - -# Copyright (c) 2006, Laurent Montel, <montel@kde.org> -# -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. - -if (NOT XSCREENSAVER_FOUND) - FIND_PATH(XSCREENSAVER_DIR deco - HINTS - ${KDE4_INCLUDE_DIR} - PATHS - /usr - /usr/local - /opt/local - /usr/X11R6 - /opt/kde - /opt/kde3 - /usr/kde - /usr/local/kde - /usr/local/xscreensaver - /usr/openwin/lib/xscreensaver - /etc - PATH_SUFFIXES - lib${LIB_SUFFIX}/xscreensaver - lib${LIB_SUFFIX}/misc/xscreensaver - lib/xscreensaver - lib64/xscreensaver - lib/misc/xscreensaver - libexec/xscreensaver - bin/xscreensaver-hacks - hacks) - message(STATUS "XSCREENSAVER_DIR <${XSCREENSAVER_DIR}>") - - FIND_PATH(XSCREENSAVER_CONFIG_DIR deco.xml - PATHS - ${KDE4_INCLUDE_DIR} - /usr/ - /usr/local/ - /opt/local/ - /usr/X11R6/ - /opt/kde/ - /opt/kde3/ - /usr/kde/ - /usr/local/kde/ - /usr/openwin/lib/xscreensaver/ - /etc/ - PATH_SUFFIXES xscreensaver xscreensaver/config share/xscreensaver/config - ) - MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>") - -endif(NOT XSCREENSAVER_FOUND) - -#MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>") -#MESSAGE(STATUS "XSCREENSAVER_DIR :<${XSCREENSAVER_DIR}>") - -# Need to fix hack -if(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR) - set(XSCREENSAVER_FOUND TRUE) -endif(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR) - -if (XSCREENSAVER_FOUND) - if (NOT Xscreensaver_FIND_QUIETLY) - message(STATUS "Found XSCREENSAVER_CONFIG_DIR <${XSCREENSAVER_CONFIG_DIR}>") - endif (NOT Xscreensaver_FIND_QUIETLY) -else (XSCREENSAVER_FOUND) - if (Xscreensaver_FIND_REQUIRED) - message(FATAL_ERROR "XScreenSaver not found") - endif (Xscreensaver_FIND_REQUIRED) -endif (XSCREENSAVER_FOUND) - - -MARK_AS_ADVANCED(XSCREENSAVER_DIR XSCREENSAVER_CONFIG_DIR) diff --git a/pkgs/desktops/kde-4.12/kdeartwork/HighResolutionWallpapers.nix b/pkgs/desktops/kde-4.12/kdeartwork/HighResolutionWallpapers.nix deleted file mode 100644 index edffca1562e1..000000000000 --- a/pkgs/desktops/kde-4.12/kdeartwork/HighResolutionWallpapers.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs }: - -kde rec { - name = "kde-wallpapers-high-resolution"; - - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE wallpapers in high resolution"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeartwork/IconThemes.nix b/pkgs/desktops/kde-4.12/kdeartwork/IconThemes.nix deleted file mode 100644 index 43071e8bd142..000000000000 --- a/pkgs/desktops/kde-4.12/kdeartwork/IconThemes.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kde, kdelibs }: - -kde { - name = "kdeartwork-icon-themes"; - - # Sources contain primary and kdeclassic as well but they're not installed - - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE nuvola and mono icon themes"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeartwork/WeatherWallpapers.nix b/pkgs/desktops/kde-4.12/kdeartwork/WeatherWallpapers.nix deleted file mode 100644 index 947e5e17ab0c..000000000000 --- a/pkgs/desktops/kde-4.12/kdeartwork/WeatherWallpapers.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs }: - -kde rec { - name = "kde-weather-wallpapers"; - - buildInputs = [ kdelibs ]; - - meta = { - description = "Additional KDE wallpapers (weather)"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeartwork/desktopthemes.nix b/pkgs/desktops/kde-4.12/kdeartwork/desktopthemes.nix deleted file mode 100644 index 93dd361af738..000000000000 --- a/pkgs/desktops/kde-4.12/kdeartwork/desktopthemes.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs }: - -kde { - name = "kde-desktop-themes"; - - buildInputs = [ kdelibs ]; - - meta = { - description = "Additional KDE desktop themes"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeartwork/emoticons.nix b/pkgs/desktops/kde-4.12/kdeartwork/emoticons.nix deleted file mode 100644 index 5ef9f78a7195..000000000000 --- a/pkgs/desktops/kde-4.12/kdeartwork/emoticons.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs }: - -kde { - name = "kde-emotion-icons"; - - buildInputs = [ kdelibs ]; - - meta = { - description = "Additional KDE emotion icons (smiles)"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeartwork/kscreensaver.nix b/pkgs/desktops/kde-4.12/kdeartwork/kscreensaver.nix deleted file mode 100644 index 84cb008056e4..000000000000 --- a/pkgs/desktops/kde-4.12/kdeartwork/kscreensaver.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kde, kdelibs, xscreensaver, kde_workspace, eigen, libkexiv2, libXt, pkgconfig }: - -kde { - buildInputs = [ kdelibs xscreensaver kde_workspace eigen libkexiv2 libXt ]; - - nativeBuildInputs = [ pkgconfig ]; - - prePatch = "cp -v ${./FindXscreensaver.cmake} cmake/modules/FindXscreensaver.cmake"; - - cmakeFlags = [ "-DBUILD_asciiquarium:BOOL=ON" ]; - - meta = { - description = "KDE screensavers"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeartwork/kwin-styles.nix b/pkgs/desktops/kde-4.12/kdeartwork/kwin-styles.nix deleted file mode 100644 index b5d769b216db..000000000000 --- a/pkgs/desktops/kde-4.12/kdeartwork/kwin-styles.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, kde_workspace }: - -kde { - buildInputs = [ kdelibs kde_workspace ]; - - meta = { - description = "Styles for KWin"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeartwork/styles.nix b/pkgs/desktops/kde-4.12/kdeartwork/styles.nix deleted file mode 100644 index 6a1306c37100..000000000000 --- a/pkgs/desktops/kde-4.12/kdeartwork/styles.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs }: - -kde rec { - name = "kde-style-phase"; - - buildInputs = [ kdelibs ]; - - meta = { - description = "Phase, a widget style for KDE"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeartwork/wallpapers.nix b/pkgs/desktops/kde-4.12/kdeartwork/wallpapers.nix deleted file mode 100644 index 7c9846fbf9e8..000000000000 --- a/pkgs/desktops/kde-4.12/kdeartwork/wallpapers.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs }: - -kde rec { - name = "kdeartwork-wallpapers"; - - buildInputs = [ kdelibs ]; - - meta = { - description = "Additional KDE wallpapers"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdebindings/perlqt.nix b/pkgs/desktops/kde-4.12/kdebindings/perlqt.nix deleted file mode 100644 index 48eed141ce64..000000000000 --- a/pkgs/desktops/kde-4.12/kdebindings/perlqt.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ kde, cmake, smokeqt, perl }: - -kde { - - # TODO: qscintilla2, qwt5 - - buildInputs = [ smokeqt perl ]; - - nativeBuildInputs = [ cmake ]; - - meta = { - description = "Perl bindings for Qt library"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdebindings/pykde4.nix b/pkgs/desktops/kde-4.12/kdebindings/pykde4.nix deleted file mode 100644 index b298cdbc8167..000000000000 --- a/pkgs/desktops/kde-4.12/kdebindings/pykde4.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ kde, kdelibs, python, sip, pyqt4, kdepimlibs, shared_desktop_ontologies, - polkit_qt_1, boost, lndir, pkgconfig }: - -let pydir = "lib/python${python.majorVersion}"; in - -kde { - - # todo: polkit isn't found by the build system - - buildInputs = [ - python kdepimlibs shared_desktop_ontologies - boost boost.lib polkit_qt_1 - ]; - - nativeBuildInputs = [ pkgconfig ]; - - propagatedBuildInputs = [ pyqt4 sip ]; - - preConfigure = - '' - # Symlink PyQt into PyKDE. This is necessary because PyQt looks - # in its PyQt4/uic/widget-plugins directory for plugins, and KDE - # needs to install a plugin. - mkdir -pv $out/${pydir} - ${lndir}/bin/lndir ${pyqt4}/${pydir} $out/${pydir} - cmakeFlagsArray=( "-DSIP_DEFAULT_SIP_DIR=$prefix/share/sip" ) - ''; - - meta = { - description = "Python bindings for KDE"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdebindings/qtruby-install-prefix.patch b/pkgs/desktops/kde-4.12/kdebindings/qtruby-install-prefix.patch deleted file mode 100644 index bd95a0d8bd3d..000000000000 --- a/pkgs/desktops/kde-4.12/kdebindings/qtruby-install-prefix.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 33078b4..30aec0e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -31,8 +31,8 @@ if (NOT COMPILE_RUBY) - return() - endif (NOT COMPILE_RUBY) - --SET(CUSTOM_RUBY_SITE_ARCH_DIR ${RUBY_SITEARCH_DIR} CACHE DIR "custom installation directory for ruby binary extension" ) --SET(CUSTOM_RUBY_SITE_LIB_DIR ${RUBY_SITELIB_DIR} CACHE DIR "custom installation directory for ruby extension" ) -+string(REPLACE "${RUBY_ROOT_DIR}" "${CMAKE_INSTALL_PREFIX}" CUSTOM_RUBY_SITE_ARCH_DIR ${RUBY_SITEARCH_DIR}) -+string(REPLACE "${RUBY_ROOT_DIR}" "${CMAKE_INSTALL_PREFIX}" CUSTOM_RUBY_SITE_LIB_DIR ${RUBY_SITELIB_DIR}) - - # compute an overall version number which can be compared at once - MATH(EXPR RUBY_VERSION_NUMBER "${RUBY_VERSION_MAJOR}*10000 + ${RUBY_VERSION_MINOR}*100 + ${RUBY_VERSION_PATCH}") diff --git a/pkgs/desktops/kde-4.12/kdebindings/qtruby.nix b/pkgs/desktops/kde-4.12/kdebindings/qtruby.nix deleted file mode 100644 index 03e9dc9a007f..000000000000 --- a/pkgs/desktops/kde-4.12/kdebindings/qtruby.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ kde, cmake, smokeqt, ruby }: - -kde { - - # TODO: scintilla2, qwt5 - - buildInputs = [ smokeqt ruby ]; - - nativeBuildInputs = [ cmake ]; - - # The patch is not ready for upstream submmission. - # I should add an option() instead. - patches = [ ./qtruby-install-prefix.patch ]; - - cmakeFlags="-DRUBY_ROOT_DIR=${ruby}"; - - meta = { - description = "Ruby bindings for Qt library"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdebindings/smokegen-CMakeLists.txt-nix.patch b/pkgs/desktops/kde-4.12/kdebindings/smokegen-CMakeLists.txt-nix.patch deleted file mode 100644 index f0811d335a73..000000000000 --- a/pkgs/desktops/kde-4.12/kdebindings/smokegen-CMakeLists.txt-nix.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- smokegen-4.10.5.orig/CMakeLists.txt 2013-06-28 17:14:50.000000000 +0000 -+++ smokegen-4.10.5/CMakeLists.txt 2013-07-31 19:15:17.000000000 +0000 -@@ -36,6 +36,10 @@ - set (CMAKE_SKIP_BUILD_RPATH FALSE) - set (CMAKE_SKIP_RPATH FALSE) - -+# add the automatically determined parts of the RPATH -+# which point to directories outside the build tree to the install RPATH -+SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) -+ - configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in config.h @ONLY ) - - add_executable(smokegen ${generator_SRC}) \ No newline at end of file diff --git a/pkgs/desktops/kde-4.12/kdebindings/smokegen-nix.patch b/pkgs/desktops/kde-4.12/kdebindings/smokegen-nix.patch deleted file mode 100644 index 53257e836e04..000000000000 --- a/pkgs/desktops/kde-4.12/kdebindings/smokegen-nix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -urN smokegen-4.10.5.orig/cmake/SmokeConfig.cmake.in smokegen-4.10.5/cmake/SmokeConfig.cmake.in ---- smokegen-4.10.5.orig/cmake/SmokeConfig.cmake.in 2013-06-28 17:14:50.000000000 +0000 -+++ smokegen-4.10.5/cmake/SmokeConfig.cmake.in 2013-07-30 21:26:33.000000000 +0000 -@@ -80,8 +80,7 @@ - set(SMOKE_API_BIN "@SMOKE_API_BIN@") - - find_library(SMOKE_BASE_LIBRARY smokebase -- PATHS "@SMOKE_LIBRARY_PREFIX@" -- NO_DEFAULT_PATH) -+ PATHS "@SMOKE_LIBRARY_PREFIX@") - - if (NOT SMOKE_BASE_LIBRARY) - if (Smoke_FIND_REQUIRED) diff --git a/pkgs/desktops/kde-4.12/kdebindings/smokegen.nix b/pkgs/desktops/kde-4.12/kdebindings/smokegen.nix deleted file mode 100644 index 5708d0f96eb2..000000000000 --- a/pkgs/desktops/kde-4.12/kdebindings/smokegen.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ stdenv, kde, qt4, cmake }: - -kde { - buildInputs = [ qt4 ]; - nativeBuildInputs = [ cmake ]; - - patches = [ ./smokegen-nix.patch ./smokegen-CMakeLists.txt-nix.patch ]; - - meta = { - description = "C++ parser used to generate language bindings for Qt/KDE"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdebindings/smokekde.nix b/pkgs/desktops/kde-4.12/kdebindings/smokekde.nix deleted file mode 100644 index 4474c1d9731e..000000000000 --- a/pkgs/desktops/kde-4.12/kdebindings/smokekde.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ kde, cmake, smokeqt, kdelibs, akonadi, kdepimlibs, okular -, shared_desktop_ontologies, attica, pkgconfig }: - -kde { - - # TODO: attica, akonadi and kdepimlibs are disabled due to smokegen crash - # okular is disabled because the code generated is broken - buildInputs = [ - smokeqt kdelibs shared_desktop_ontologies - ]; - - nativeBuildInputs = [ cmake pkgconfig ]; - - LD_LIBRARY_PATH = "${smokeqt}/lib/"; - - meta = { - description = "SMOKE bindings for kdelibs"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdebindings/smokeqt.nix b/pkgs/desktops/kde-4.12/kdebindings/smokeqt.nix deleted file mode 100644 index 494bc85e6465..000000000000 --- a/pkgs/desktops/kde-4.12/kdebindings/smokeqt.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ stdenv, kde, qt4, cmake, phonon, qimageblitz, smokegen }: - -kde { - -# TODO: Qwt5, QScintilla2 - - propagatedBuildInputs = [ qt4 phonon qimageblitz ]; - nativeBuildInputs = [ cmake ]; - propagatedNativeBuildInputs = [ smokegen ]; - - meta = { - description = "C++ parser used to generate language bindings for Qt/KDE"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeedu/analitza.nix b/pkgs/desktops/kde-4.12/kdeedu/analitza.nix deleted file mode 100644 index 74c3a1ebb200..000000000000 --- a/pkgs/desktops/kde-4.12/kdeedu/analitza.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ kde, kdelibs, readline }: -kde { - buildInputs = [ kdelibs readline ]; - - meta = { - description = "Library part of KAlgebra"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeedu/blinken.nix b/pkgs/desktops/kde-4.12/kdeedu/blinken.nix deleted file mode 100644 index cdf9728833c2..000000000000 --- a/pkgs/desktops/kde-4.12/kdeedu/blinken.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ kde, kdelibs }: -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Memory Enhancement Game"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeedu/cantor.nix b/pkgs/desktops/kde-4.12/kdeedu/cantor.nix deleted file mode 100644 index a8cd2e44957a..000000000000 --- a/pkgs/desktops/kde-4.12/kdeedu/cantor.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kde, kdelibs, libspectre, analitza, R, pkgconfig, libqalculate, python }: -kde { - -# TODO: R is not found - - buildInputs = [ kdelibs libspectre analitza R libqalculate python ]; - - nativeBuildInputs = [ pkgconfig ]; - - meta = { - description = "KDE Frontend to Mathematical Software"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeedu/kalgebra.nix b/pkgs/desktops/kde-4.12/kdeedu/kalgebra.nix deleted file mode 100644 index 3675c3a225f4..000000000000 --- a/pkgs/desktops/kde-4.12/kdeedu/kalgebra.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ kde, kdelibs, libkdeedu, analitza }: -kde { - buildInputs = [ kdelibs libkdeedu analitza ]; - - meta = { - description = "2D and 3D Graph Calculator"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeedu/kalzium.nix b/pkgs/desktops/kde-4.12/kdeedu/kalzium.nix deleted file mode 100644 index 09de79ce1c05..000000000000 --- a/pkgs/desktops/kde-4.12/kdeedu/kalzium.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kde, kdelibs, facile, ocaml, eigen, openbabel, avogadro, pkgconfig }: -kde { - -# TODO: chemical mime data - - buildInputs = [ kdelibs facile ocaml eigen openbabel avogadro ]; - - nativeBuildInputs = [ pkgconfig ]; - - meta = { - description = "Periodic Table of Elements"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeedu/kanagram.nix b/pkgs/desktops/kde-4.12/kdeedu/kanagram.nix deleted file mode 100644 index 8759c96d78c4..000000000000 --- a/pkgs/desktops/kde-4.12/kdeedu/kanagram.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ kde, kdelibs, libkdeedu }: -kde { - buildInputs = [ kdelibs libkdeedu ]; - - meta = { - description = "Letter Order Game"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeedu/kbruch.nix b/pkgs/desktops/kde-4.12/kdeedu/kbruch.nix deleted file mode 100644 index dc50f1e85a37..000000000000 --- a/pkgs/desktops/kde-4.12/kdeedu/kbruch.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ kde, kdelibs }: -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Practice Fractions"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeedu/kgeography.nix b/pkgs/desktops/kde-4.12/kdeedu/kgeography.nix deleted file mode 100644 index bd8d27c8d6e2..000000000000 --- a/pkgs/desktops/kde-4.12/kdeedu/kgeography.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ kde, kdelibs }: -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Geography Trainer"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeedu/khangman.nix b/pkgs/desktops/kde-4.12/kdeedu/khangman.nix deleted file mode 100644 index 997b50e906a2..000000000000 --- a/pkgs/desktops/kde-4.12/kdeedu/khangman.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ kde, kdelibs, libkdeedu }: -kde { - buildInputs = [ kdelibs libkdeedu ]; - - meta = { - description = "KDE hangman game"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeedu/kig.nix b/pkgs/desktops/kde-4.12/kdeedu/kig.nix deleted file mode 100644 index fb442e2ef629..000000000000 --- a/pkgs/desktops/kde-4.12/kdeedu/kig.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, boost, python}: -kde { - buildInputs = [ kdelibs boost boost.lib python ]; - - cmakeFlags = "-DKIG_ENABLE_PYTHON_SCRIPTING=1"; - meta = { - description = "KDE Interactive Geometry"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeedu/kiten.nix b/pkgs/desktops/kde-4.12/kdeedu/kiten.nix deleted file mode 100644 index 939b7a9f77a2..000000000000 --- a/pkgs/desktops/kde-4.12/kdeedu/kiten.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Japanese Reference/Study Tool"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeedu/klettres.nix b/pkgs/desktops/kde-4.12/kdeedu/klettres.nix deleted file mode 100644 index 7a0fa83078e3..000000000000 --- a/pkgs/desktops/kde-4.12/kdeedu/klettres.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "A KDE alphabet tutorial"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeedu/kmplot.nix b/pkgs/desktops/kde-4.12/kdeedu/kmplot.nix deleted file mode 100644 index fc7b0578c27b..000000000000 --- a/pkgs/desktops/kde-4.12/kdeedu/kmplot.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "A KDE mathematical function plotter"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeedu/kstars.nix b/pkgs/desktops/kde-4.12/kdeedu/kstars.nix deleted file mode 100644 index 0832dc2121e2..000000000000 --- a/pkgs/desktops/kde-4.12/kdeedu/kstars.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ kde, kdelibs, eigen, xplanet, indilib, pkgconfig }: - -kde { - -# TODO: wcslib, astrometry - - buildInputs = [ kdelibs eigen xplanet indilib ]; - - nativeBuildInputs = [ pkgconfig ]; - - meta = { - description = "A KDE graphical desktop planetarium"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeedu/ktouch.nix b/pkgs/desktops/kde-4.12/kdeedu/ktouch.nix deleted file mode 100644 index 9e606adde336..000000000000 --- a/pkgs/desktops/kde-4.12/kdeedu/ktouch.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, libxkbfile }: - -kde { - buildInputs = [ kdelibs libxkbfile ]; - - meta = { - description = "Touch Typing Tutor"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeedu/kturtle.nix b/pkgs/desktops/kde-4.12/kdeedu/kturtle.nix deleted file mode 100644 index 1e1922b1410d..000000000000 --- a/pkgs/desktops/kde-4.12/kdeedu/kturtle.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Educational Programming Environment"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeedu/kwordquiz.nix b/pkgs/desktops/kde-4.12/kdeedu/kwordquiz.nix deleted file mode 100644 index 1b33ba2e469f..000000000000 --- a/pkgs/desktops/kde-4.12/kdeedu/kwordquiz.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, libkdeedu }: - -kde { - buildInputs = [ kdelibs libkdeedu ]; - - meta = { - description = "Flash Card Trainer"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeedu/libkdeedu.nix b/pkgs/desktops/kde-4.12/kdeedu/libkdeedu.nix deleted file mode 100644 index def6c85fefe2..000000000000 --- a/pkgs/desktops/kde-4.12/kdeedu/libkdeedu.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ kde, kdelibs }: -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Libraries used by KDE Education applications"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeedu/marble.nix b/pkgs/desktops/kde-4.12/kdeedu/marble.nix deleted file mode 100644 index 2dc07d14a0d9..000000000000 --- a/pkgs/desktops/kde-4.12/kdeedu/marble.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ kde, kdelibs, gpsd }: - -kde { - -# TODO: package QextSerialPort, libshp(shapelib), QtMobility, QtLocation, libwlocate, quazip - - buildInputs = [ kdelibs gpsd ]; - - meta = { - description = "Marble Virtual Globe"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeedu/pairs.nix b/pkgs/desktops/kde-4.12/kdeedu/pairs.nix deleted file mode 100644 index 36c4aba9604b..000000000000 --- a/pkgs/desktops/kde-4.12/kdeedu/pairs.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "A memory and pairs game"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeedu/parley.nix b/pkgs/desktops/kde-4.12/kdeedu/parley.nix deleted file mode 100644 index f9f86dde150d..000000000000 --- a/pkgs/desktops/kde-4.12/kdeedu/parley.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, libkdeedu, attica }: - -kde { - buildInputs = [ kdelibs libkdeedu attica ]; - - meta = { - description = "Vocabulary Trainer"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeedu/rocs.nix b/pkgs/desktops/kde-4.12/kdeedu/rocs.nix deleted file mode 100644 index 135598ded90a..000000000000 --- a/pkgs/desktops/kde-4.12/kdeedu/rocs.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ kde, kdelibs, boost, grantlee }: -let - boostpkg = boost.override { enableExceptions = true; }; -in -kde { - buildInputs = [ kdelibs boostpkg boostpkg.lib grantlee ]; - - NIX_CFLAGS_COMPILE = "-fexceptions"; - - meta = { - description = "A KDE graph theory viewer"; - kde = { - name = "rocs"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeedu/step.nix b/pkgs/desktops/kde-4.12/kdeedu/step.nix deleted file mode 100644 index f36ccef9b7cd..000000000000 --- a/pkgs/desktops/kde-4.12/kdeedu/step.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ kde, kdelibs, gsl, libqalculate, eigen, pkgconfig }: - -kde { - - buildInputs = [ kdelibs gsl libqalculate eigen ]; - - nativeBuildInputs = [ pkgconfig ]; - - meta = { - description = "A KDE interactive physical simulator"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/bomber.nix b/pkgs/desktops/kde-4.12/kdegames/bomber.nix deleted file mode 100644 index 026227910f21..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/bomber.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a single player arcade game. The player is invading various cities in a plane that is decreasing in height"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/bovo.nix b/pkgs/desktops/kde-4.12/kdegames/bovo.nix deleted file mode 100644 index b0e7d99c589f..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/bovo.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a Gomoku (from Japanese 五目並べ - lit. \"five points\") like game for two players, where the opponents alternate in placing their respective pictogram on the game board"; - }; - -} diff --git a/pkgs/desktops/kde-4.12/kdegames/granatier.nix b/pkgs/desktops/kde-4.12/kdegames/granatier.nix deleted file mode 100644 index 9f1ab0053099..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/granatier.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a clone of the classic Bomberman game, inspired by the work of the Clanbomber clone"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/kajongg.nix b/pkgs/desktops/kde-4.12/kdegames/kajongg.nix deleted file mode 100644 index 9a6f5e836955..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/kajongg.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kde, kdelibs, libkdegames, pythonPackages, sqlite, pykde4 }: -kde rec { - - buildInputs = [ kdelibs libkdegames pythonPackages.python pythonPackages.wrapPython sqlite ] ++ pythonPath; - - pythonPath = [ pythonPackages.twisted pykde4 ]; - - postInstall = "wrapPythonPrograms"; - - meta = { - description = "an ancient Chinese board game for 4 players"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/kapman.nix b/pkgs/desktops/kde-4.12/kdegames/kapman.nix deleted file mode 100644 index f10e099da3cc..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/kapman.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a clone of the well known game Pac-Man"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/katomic.nix b/pkgs/desktops/kde-4.12/kdegames/katomic.nix deleted file mode 100644 index a9936c04f0ea..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/katomic.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a fun and educational puzzle game built around molecular geometry"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/kblackbox.nix b/pkgs/desktops/kde-4.12/kdegames/kblackbox.nix deleted file mode 100644 index 27eeff2f65bb..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/kblackbox.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a game of hide and seek played on an grid of boxes, where the player shoots rays into the grid to deduce the positions of hidden objects"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/kblocks.nix b/pkgs/desktops/kde-4.12/kdegames/kblocks.nix deleted file mode 100644 index 98cf068de09a..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/kblocks.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a classic single player falling blocks puzzle game"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/kbounce.nix b/pkgs/desktops/kde-4.12/kdegames/kbounce.nix deleted file mode 100644 index 77fa0db63529..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/kbounce.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a single player arcade game with the elements of puzzle"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/kbreakout.nix b/pkgs/desktops/kde-4.12/kdegames/kbreakout.nix deleted file mode 100644 index 3a484d919bbb..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/kbreakout.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a Breakout-like game. Its object is to destroy as many bricks as possible without losing the ball"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/kdiamond.nix b/pkgs/desktops/kde-4.12/kdegames/kdiamond.nix deleted file mode 100644 index 06dfcee5ac39..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/kdiamond.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a single player puzzle game. The object of the game is to build lines of three similar diamonds"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/kfourinline.nix b/pkgs/desktops/kde-4.12/kdegames/kfourinline.nix deleted file mode 100644 index 11b8838e7082..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/kfourinline.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a board game for two players based on the Connect-Four game"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/kgoldrunner.nix b/pkgs/desktops/kde-4.12/kdegames/kgoldrunner.nix deleted file mode 100644 index 6217c47a8065..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/kgoldrunner.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "an action game where the hero runs through a maze, climbs stairs, dig holes and dodges enemies in order to collect all the gold nuggets and escape to the next level"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/kigo.nix b/pkgs/desktops/kde-4.12/kdegames/kigo.nix deleted file mode 100644 index 32eee67cc1e0..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/kigo.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "an open-source implementation of the popular Go game"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/killbots.nix b/pkgs/desktops/kde-4.12/kdegames/killbots.nix deleted file mode 100644 index d9c1472495e7..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/killbots.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a simple game of evading killer robots"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/kiriki.nix b/pkgs/desktops/kde-4.12/kdegames/kiriki.nix deleted file mode 100644 index 72f7ab67501b..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/kiriki.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "an addictive and fun dice game, designed to be played by as many as six players"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/kjumpingcube.nix b/pkgs/desktops/kde-4.12/kdegames/kjumpingcube.nix deleted file mode 100644 index a6d22cff51c3..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/kjumpingcube.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a simple dice driven tactical game"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/klickety.nix b/pkgs/desktops/kde-4.12/kdegames/klickety.nix deleted file mode 100644 index b592bc40641f..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/klickety.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a puzzle game where the player removes groups of colored marbles to clear the board"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/klines.nix b/pkgs/desktops/kde-4.12/kdegames/klines.nix deleted file mode 100644 index 90952fe91c07..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/klines.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a simple but highly addictive one player game. The player has to move the colored balls around the game board, gathering them into the lines of the same color by five"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/kmahjongg.nix b/pkgs/desktops/kde-4.12/kdegames/kmahjongg.nix deleted file mode 100644 index 946b531ff127..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/kmahjongg.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames, libkmahjongg }: -kde { - buildInputs = [ kdelibs libkdegames libkmahjongg ]; - meta = { - description = "the tiles are scrambled and staked on top of each other to resemble a certain shape. The player is then expected to remove all the tiles off the game board by locating each tile's matching pair"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/kmines.nix b/pkgs/desktops/kde-4.12/kdegames/kmines.nix deleted file mode 100644 index 538454e95984..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/kmines.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a classic Minesweeper game"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/knavalbattle.nix b/pkgs/desktops/kde-4.12/kdegames/knavalbattle.nix deleted file mode 100644 index 42ffd2fcb4d5..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/knavalbattle.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a Battle Ship game"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/knetwalk.nix b/pkgs/desktops/kde-4.12/kdegames/knetwalk.nix deleted file mode 100644 index a16e578ce848..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/knetwalk.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a small game where you have to build up a computer network by rotating the wires to connect the terminals to the server"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/kolf.nix b/pkgs/desktops/kde-4.12/kdegames/kolf.nix deleted file mode 100644 index 78815ee57996..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/kolf.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a miniature golf game"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/kollision.nix b/pkgs/desktops/kde-4.12/kdegames/kollision.nix deleted file mode 100644 index 3147c7305ea0..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/kollision.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a simple ball dodging game"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/konquest.nix b/pkgs/desktops/kde-4.12/kdegames/konquest.nix deleted file mode 100644 index 53ddd64928cc..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/konquest.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "the KDE version of Gnu-Lactic Konquest"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/kpat.nix b/pkgs/desktops/kde-4.12/kdegames/kpat.nix deleted file mode 100644 index f8d9bad36dc5..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/kpat.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a relaxing card sorting game"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/kreversi.nix b/pkgs/desktops/kde-4.12/kdegames/kreversi.nix deleted file mode 100644 index 2aed981428e1..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/kreversi.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a simple one player strategy game played against the computer. If a player's piece is captured by an opposing player, that piece is turned over to reveal the color of that player"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/kshisen.nix b/pkgs/desktops/kde-4.12/kdegames/kshisen.nix deleted file mode 100644 index 9c8880340388..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/kshisen.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames, libkmahjongg }: -kde { - buildInputs = [ kdelibs libkdegames libkmahjongg ]; - meta = { - description = "a solitaire-like game played using the standard set of Mahjong tiles"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/ksirk.nix b/pkgs/desktops/kde-4.12/kdegames/ksirk.nix deleted file mode 100644 index 767eb67971a8..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/ksirk.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames, qca2 }: -kde { - buildInputs = [ kdelibs libkdegames qca2 ]; - meta = { - description = "a computerized version of the well known strategic board game Risk"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/ksnakeduel.nix b/pkgs/desktops/kde-4.12/kdegames/ksnakeduel.nix deleted file mode 100644 index ccf1fb551e9a..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/ksnakeduel.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a simple Tron-Clone"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/kspaceduel.nix b/pkgs/desktops/kde-4.12/kdegames/kspaceduel.nix deleted file mode 100644 index 5285f7916cad..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/kspaceduel.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "each of two possible players control a satellite spaceship orbiting the sun. As the game progresses players have to eliminate the opponent's spacecraft with bullets or mines"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/ksquares.nix b/pkgs/desktops/kde-4.12/kdegames/ksquares.nix deleted file mode 100644 index a17be2da6325..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/ksquares.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a game modeled after the well known pen and paper based game of Dots and Boxes"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/ksudoku.nix b/pkgs/desktops/kde-4.12/kdegames/ksudoku.nix deleted file mode 100644 index ea4e13a5e4f3..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/ksudoku.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a logic-based symbol placement puzzle"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/ktuberling.nix b/pkgs/desktops/kde-4.12/kdegames/ktuberling.nix deleted file mode 100644 index 1a6ba9d653c2..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/ktuberling.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a simple constructor game suitable for children and adults alike"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/kubrick.nix b/pkgs/desktops/kde-4.12/kdegames/kubrick.nix deleted file mode 100644 index 9bdc6879db4b..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/kubrick.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a game based on the Rubik's Cube™ puzzle"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/libkdegames.nix b/pkgs/desktops/kde-4.12/kdegames/libkdegames.nix deleted file mode 100644 index 3819dcdc9ae2..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/libkdegames.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, openal, libsndfile }: -kde { - buildInputs = [ kdelibs openal libsndfile ]; - meta = { - description = "KDE games library"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/libkmahjongg.nix b/pkgs/desktops/kde-4.12/kdegames/libkmahjongg.nix deleted file mode 100644 index 383b347dc330..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/libkmahjongg.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a library for KMahjongg game"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/lskat.nix b/pkgs/desktops/kde-4.12/kdegames/lskat.nix deleted file mode 100644 index 2a5050cd6676..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/lskat.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a fun and engaging card game for two players, where the second player is either live opponent, or a built in artificial intelligence"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/palapeli.nix b/pkgs/desktops/kde-4.12/kdegames/palapeli.nix deleted file mode 100644 index 010dbd5d6232..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/palapeli.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - -# TODO: package qvoronoi - - buildInputs = [ kdelibs libkdegames ]; - - meta = { - description = "a single-player jigsaw puzzle game"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/picmi.nix b/pkgs/desktops/kde-4.12/kdegames/picmi.nix deleted file mode 100644 index 165d7422f95b..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/picmi.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a single player logic-based puzzle game"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegraphics/gwenview.nix b/pkgs/desktops/kde-4.12/kdegraphics/gwenview.nix deleted file mode 100644 index 3ce9b3dcc78a..000000000000 --- a/pkgs/desktops/kde-4.12/kdegraphics/gwenview.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ stdenv, kde, kdelibs, exiv2, kde_baseapps, libkipi, nepomuk_core -, libjpeg, pkgconfig, kactivities, lcms2 }: - -kde { - - buildInputs = - [ kdelibs exiv2 nepomuk_core kactivities kde_baseapps libkipi libjpeg lcms2 ]; - - nativeBuildInputs = [ pkgconfig ]; - - meta = { - description = "Gwenview, the KDE image viewer"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kamera.nix b/pkgs/desktops/kde-4.12/kdegraphics/kamera.nix deleted file mode 100644 index d9aa11c54afa..000000000000 --- a/pkgs/desktops/kde-4.12/kdegraphics/kamera.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ stdenv, kde, kdelibs, libgphoto2 }: - -kde { - buildInputs = [ kdelibs libgphoto2 ]; - - meta = { - description = "KDE camera interface library"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix b/pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix deleted file mode 100644 index e06c1b5d307c..000000000000 --- a/pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ stdenv, kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "A small utility to select a color"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-mobipocket.nix b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-mobipocket.nix deleted file mode 100644 index e834762feb52..000000000000 --- a/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-mobipocket.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ stdenv, kde, kdelibs, okular }: - -kde { - buildInputs = [ kdelibs okular ]; - - meta = { - description = "A collection of plugins to handle mobipocket files"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-strigi-analyzer.nix b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-strigi-analyzer.nix deleted file mode 100644 index d9d35808ac50..000000000000 --- a/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-strigi-analyzer.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ stdenv, kde, kdelibs, libtiff }: - -kde { - buildInputs = [ kdelibs libtiff ]; - - meta = { - description = "Strigi analyzers for various graphics file formats"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-thumbnailers.nix b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-thumbnailers.nix deleted file mode 100644 index d6207689512f..000000000000 --- a/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-thumbnailers.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ stdenv, kde, kdelibs, libkexiv2, libkdcraw, pkgconfig }: - -kde { - - buildInputs = [ kdelibs libkexiv2 libkdcraw ]; - - nativeBuildInputs = [ pkgconfig ]; - - meta = { - description = "Thumbnailers for various graphics file formats"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kgamma.nix b/pkgs/desktops/kde-4.12/kdegraphics/kgamma.nix deleted file mode 100644 index 016312c199e5..000000000000 --- a/pkgs/desktops/kde-4.12/kdegraphics/kgamma.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ stdenv, kde, kdelibs, libXxf86vm }: - -kde { - buildInputs = [ kdelibs libXxf86vm ]; - - meta = { - description = "KDE monitor calibration tool"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kolourpaint.nix b/pkgs/desktops/kde-4.12/kdegraphics/kolourpaint.nix deleted file mode 100644 index ecf34e5ae9e5..000000000000 --- a/pkgs/desktops/kde-4.12/kdegraphics/kolourpaint.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ stdenv, kde, kdelibs, qimageblitz }: - -kde { - buildInputs = [ kdelibs qimageblitz ]; - - meta = { - description = "KDE paint program"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kruler.nix b/pkgs/desktops/kde-4.12/kdegraphics/kruler.nix deleted file mode 100644 index 209331d9e83d..000000000000 --- a/pkgs/desktops/kde-4.12/kdegraphics/kruler.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ stdenv, kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE screen ruler"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegraphics/ksaneplugin.nix b/pkgs/desktops/kde-4.12/kdegraphics/ksaneplugin.nix deleted file mode 100644 index f541c4bdb4df..000000000000 --- a/pkgs/desktops/kde-4.12/kdegraphics/ksaneplugin.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ stdenv, kde, kdelibs, libksane }: - -kde { - buildInputs = [ kdelibs libksane ]; - - meta = { - description = "A KScan plugin that implements the scanning through libksane"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegraphics/ksnapshot.nix b/pkgs/desktops/kde-4.12/kdegraphics/ksnapshot.nix deleted file mode 100644 index a9897d270bb6..000000000000 --- a/pkgs/desktops/kde-4.12/kdegraphics/ksnapshot.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ stdenv, kde, kdelibs, libkipi }: - -kde { - buildInputs = [ kdelibs libkipi ]; - - meta = { - description = "KDE screenshot utility"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegraphics/libkdcraw.nix b/pkgs/desktops/kde-4.12/kdegraphics/libkdcraw.nix deleted file mode 100644 index 1d5c6e2fcb4a..000000000000 --- a/pkgs/desktops/kde-4.12/kdegraphics/libkdcraw.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ stdenv, kde, kdelibs, pkgconfig, libraw, lcms2 }: - -kde { - - buildInputs = [ kdelibs libraw lcms2 ]; - - nativeBuildInputs = [ pkgconfig ]; - - meta = { - description = "Library for decoding RAW images"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegraphics/libkexiv2.nix b/pkgs/desktops/kde-4.12/kdegraphics/libkexiv2.nix deleted file mode 100644 index 46ec45fad01a..000000000000 --- a/pkgs/desktops/kde-4.12/kdegraphics/libkexiv2.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ stdenv, kde, kdelibs, exiv2 }: - -kde { - buildInputs = [ kdelibs exiv2 ]; - - meta = { - description = "Exiv2 support library"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegraphics/libkipi.nix b/pkgs/desktops/kde-4.12/kdegraphics/libkipi.nix deleted file mode 100644 index 65e6c52bd44f..000000000000 --- a/pkgs/desktops/kde-4.12/kdegraphics/libkipi.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ stdenv, kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Interface library to kipi-plugins"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegraphics/libksane.nix b/pkgs/desktops/kde-4.12/kdegraphics/libksane.nix deleted file mode 100644 index 6c3543eef370..000000000000 --- a/pkgs/desktops/kde-4.12/kdegraphics/libksane.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ stdenv, kde, kdelibs, saneBackends }: - -kde { - buildInputs = [ kdelibs saneBackends ]; - - meta = { - description = "An image scanning library that provides a QWidget that contains all the logic needed to interface a sacanner"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegraphics/okular.nix b/pkgs/desktops/kde-4.12/kdegraphics/okular.nix deleted file mode 100644 index 092833388a78..000000000000 --- a/pkgs/desktops/kde-4.12/kdegraphics/okular.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, chmlib, djvulibre, ebook_tools, kde, kdelibs, libspectre, popplerQt4, qca2 -, qimageblitz, libtiff, kactivities, pkgconfig, libkexiv2 }: - -kde { - -# TODO: package activeapp, qmobipocket - - buildInputs = [ kdelibs chmlib djvulibre ebook_tools libspectre popplerQt4 - qca2 qimageblitz libtiff kactivities libkexiv2 ]; - - nativeBuildInputs = [ pkgconfig ]; - - meta = { - description = "Okular, the KDE document viewer"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegraphics/svgpart.nix b/pkgs/desktops/kde-4.12/kdegraphics/svgpart.nix deleted file mode 100644 index 2fc0e373dbdf..000000000000 --- a/pkgs/desktops/kde-4.12/kdegraphics/svgpart.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ stdenv, kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "SVG KPart"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdelibs/kdelibs.nix b/pkgs/desktops/kde-4.12/kdelibs/kdelibs.nix deleted file mode 100644 index 5db693e6ea07..000000000000 --- a/pkgs/desktops/kde-4.12/kdelibs/kdelibs.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ kde, gcc, cmake, perl -, qt4, bzip2, fam, shared_mime_info, giflib, jasper, strigi -, openexr, avahi, kerberos, shared_desktop_ontologies, libXScrnSaver -, automoc4, soprano, qca2, attica, enchant, libdbusmenu_qt, grantlee -, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1, acl, attr, libXtst -, udev, herqq, phonon, libjpeg, xz, ilmbase, libxslt -, pkgconfig -}: - -kde { - -# TODO: media-player-info - - buildInputs = - [ pkgconfig attica avahi bzip2 enchant fam giflib grantlee herqq - libdbusmenu_qt libXScrnSaver polkit_qt_1 qca2 acl jasper libxslt - shared_desktop_ontologies xz udev libjpeg kerberos openexr - libXtst attr - ]; - - NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; - - propagatedBuildInputs = [ qt4 soprano phonon strigi ]; - - propagatedNativeBuildInputs = [ automoc4 cmake perl shared_mime_info ]; - - # TODO: make sonnet plugins (dictionaries) really work. - # There are a few hardcoded paths. - # Split plugins from libs? - - patches = [ - ../files/polkit-install.patch - ../files/kdelibs-cve-2014-5033.patch # Security patch, remove when updating to 4.14.0 or more - ]; - - cmakeFlags = [ - "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook" - "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook" - "-DHUPNP_ENABLED=ON" - "-DWITH_SOLID_UDISKS2=ON" - ]; - - passthru.wantsUdisks2 = true; - - meta = { - description = "KDE libraries"; - license = "LGPL"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdelibs/nepomuk-core.nix b/pkgs/desktops/kde-4.12/kdelibs/nepomuk-core.nix deleted file mode 100644 index d90e1455ce99..000000000000 --- a/pkgs/desktops/kde-4.12/kdelibs/nepomuk-core.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, kde, kdelibs, soprano, shared_desktop_ontologies, exiv2, ffmpeg, taglib, popplerQt4 -, pkgconfig, doxygen, ebook_tools -}: - -kde { - -# TODO: qmobipocket - - buildInputs = [ - kdelibs soprano shared_desktop_ontologies taglib exiv2 ffmpeg - popplerQt4 ebook_tools - ]; - - nativeBuildInputs = [ pkgconfig doxygen ]; - - meta = { - description = "NEPOMUK core"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdelibs/nepomuk-widgets.nix b/pkgs/desktops/kde-4.12/kdelibs/nepomuk-widgets.nix deleted file mode 100644 index b0fc5ad8900d..000000000000 --- a/pkgs/desktops/kde-4.12/kdelibs/nepomuk-widgets.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ stdenv, kde, kdelibs, nepomuk_core }: - -kde { - - buildInputs = [ kdelibs nepomuk_core ]; - - meta = { - description = "NEPOMUK Widgets"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdemultimedia/audiocd-kio.nix b/pkgs/desktops/kde-4.12/kdemultimedia/audiocd-kio.nix deleted file mode 100644 index 4c56e7529dd7..000000000000 --- a/pkgs/desktops/kde-4.12/kdemultimedia/audiocd-kio.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkcompactdisc, cdparanoia, libkcddb, libvorbis, flac, lame }: -kde { - buildInputs = [ kdelibs libkcompactdisc cdparanoia libkcddb libvorbis flac lame ]; - meta = { - description = "transparent audio CD access for applications using the KDE Platform"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdemultimedia/dragon.nix b/pkgs/desktops/kde-4.12/kdemultimedia/dragon.nix deleted file mode 100644 index 006300742ecd..000000000000 --- a/pkgs/desktops/kde-4.12/kdemultimedia/dragon.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs }: -kde { - buildInputs = [ kdelibs ]; - meta = { - description = "a multimedia player with the focus on simplicity"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdemultimedia/ffmpegthumbs.nix b/pkgs/desktops/kde-4.12/kdemultimedia/ffmpegthumbs.nix deleted file mode 100644 index 45f6c9abcb66..000000000000 --- a/pkgs/desktops/kde-4.12/kdemultimedia/ffmpegthumbs.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, ffmpeg }: -kde { - buildInputs = [ kdelibs ffmpeg ]; - meta = { - description = "a video thumbnail generator for KDE file managers like Dolphin and Konqueror"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdemultimedia/juk.nix b/pkgs/desktops/kde-4.12/kdemultimedia/juk.nix deleted file mode 100644 index 5d7b1db224ea..000000000000 --- a/pkgs/desktops/kde-4.12/kdemultimedia/juk.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs, taglib, libtunepimp }: -kde { - -# TODO: opusfile - - buildInputs = [ kdelibs taglib libtunepimp ]; - meta = { - description = "an audio jukebox application"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdemultimedia/kmix.nix b/pkgs/desktops/kde-4.12/kdemultimedia/kmix.nix deleted file mode 100644 index 1dd8108166f2..000000000000 --- a/pkgs/desktops/kde-4.12/kdemultimedia/kmix.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libcanberra, pulseaudio }: -kde { - buildInputs = [ kdelibs libcanberra pulseaudio ]; - meta = { - description = "sound mixer, an application to allow you to change the volume of your sound card"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdemultimedia/kscd.nix b/pkgs/desktops/kde-4.12/kdemultimedia/kscd.nix deleted file mode 100644 index e99ae53935b9..000000000000 --- a/pkgs/desktops/kde-4.12/kdemultimedia/kscd.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libmusicbrainz }: -kde { - buildInputs = [ kdelibs libmusicbrainz ]; - meta = { - description = "KDE CD player"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdemultimedia/libkcddb.nix b/pkgs/desktops/kde-4.12/kdemultimedia/libkcddb.nix deleted file mode 100644 index 720b01d1861e..000000000000 --- a/pkgs/desktops/kde-4.12/kdemultimedia/libkcddb.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ kde, kdelibs }: -kde { -#todo: libmusicbrainz5 - buildInputs = [ kdelibs ]; - meta = { - description = "a library used to retrieve audio CD meta data from the internet"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdemultimedia/libkcompactdisc.nix b/pkgs/desktops/kde-4.12/kdemultimedia/libkcompactdisc.nix deleted file mode 100644 index 6ed08af89f33..000000000000 --- a/pkgs/desktops/kde-4.12/kdemultimedia/libkcompactdisc.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs }: -kde { - buildInputs = [ kdelibs ]; - meta = { - description = "KDE library for playing & ripping CDs"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdemultimedia/mplayerthumbs.nix b/pkgs/desktops/kde-4.12/kdemultimedia/mplayerthumbs.nix deleted file mode 100644 index c88ebcc2a5a3..000000000000 --- a/pkgs/desktops/kde-4.12/kdemultimedia/mplayerthumbs.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs }: -kde { - buildInputs = [ kdelibs ]; - meta = { - description = "a video thumbnail generator for KDE"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdenetwork/kdenetwork-filesharing.nix b/pkgs/desktops/kde-4.12/kdenetwork/kdenetwork-filesharing.nix deleted file mode 100644 index 0330511a258b..000000000000 --- a/pkgs/desktops/kde-4.12/kdenetwork/kdenetwork-filesharing.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE properties dialog plugin to share a directory with the local network"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdenetwork/kdenetwork-strigi-analyzers.nix b/pkgs/desktops/kde-4.12/kdenetwork/kdenetwork-strigi-analyzers.nix deleted file mode 100644 index 9a76863c8e04..000000000000 --- a/pkgs/desktops/kde-4.12/kdenetwork/kdenetwork-strigi-analyzers.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, boost }: - -kde { - buildInputs = [ kdelibs boost boost.lib ]; - - meta = { - description = "Strigi analyzers for various network protocols"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdenetwork/kget.nix b/pkgs/desktops/kde-4.12/kdenetwork/kget.nix deleted file mode 100644 index d7527ca6a60d..000000000000 --- a/pkgs/desktops/kde-4.12/kdenetwork/kget.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ kde, kdelibs, libktorrent, kde_workspace, sqlite, boost -, kde_baseapps, libmms, qca2, nepomuk_core, nepomuk_widgets -, pkgconfig }: - -kde { - -# TODO: QGpgME - - buildInputs = - [ kdelibs libktorrent nepomuk_core nepomuk_widgets sqlite qca2 - libmms kde_baseapps kde_workspace boost boost.lib ]; - - nativeBuildInputs = [ pkgconfig ]; - - KDEDIRS = libktorrent; - - meta = { - description = "KDE download manager"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdenetwork/kopete.nix b/pkgs/desktops/kde-4.12/kdenetwork/kopete.nix deleted file mode 100644 index e8eab764419a..000000000000 --- a/pkgs/desktops/kde-4.12/kdenetwork/kopete.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ kde, kdelibs, libmsn, libotr, kdepimlibs, qimageblitz, libktorrent, - jasper, libidn, mediastreamer, pkgconfig, libxslt, giflib, - libgadu, boost, qca2, sqlite, jsoncpp, - ortp, srtp, libv4l }: - -kde { - -# TODO: libmeanwhile, xmms, jsoncpp(not found), kleopatra(from kdepim but doesn't install headers?), - - buildInputs = [ - kdelibs qca2 mediastreamer libgadu jsoncpp - kdepimlibs qimageblitz sqlite jasper libotr libmsn giflib - libidn libxslt boost boost.lib - ortp srtp libv4l - ]; - - nativeBuildInputs = [ pkgconfig ]; - - KDEDIRS = libktorrent; - - cmakeFlags = [ "-DBUILD_skypebuttons=TRUE" ]; - - meta = { - description = "A KDE multi-protocol IM client"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdenetwork/kppp.nix b/pkgs/desktops/kde-4.12/kdenetwork/kppp.nix deleted file mode 100644 index 4c6bd65769f7..000000000000 --- a/pkgs/desktops/kde-4.12/kdenetwork/kppp.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "PPP(Dial-Up) client tool"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdenetwork/krdc.nix b/pkgs/desktops/kde-4.12/kdenetwork/krdc.nix deleted file mode 100644 index 80557e827fe0..000000000000 --- a/pkgs/desktops/kde-4.12/kdenetwork/krdc.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, libvncserver, freerdp, telepathy_qt }: - -kde { - buildInputs = [ kdelibs libvncserver freerdp telepathy_qt ]; - - meta = { - description = "KDE remote desktop client"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdenetwork/krfb.nix b/pkgs/desktops/kde-4.12/kdenetwork/krfb.nix deleted file mode 100644 index cb4857965a34..000000000000 --- a/pkgs/desktops/kde-4.12/kdenetwork/krfb.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, libvncserver, libXdamage, libXtst, libjpeg, telepathy_qt }: - -kde { - buildInputs = [ kdelibs libvncserver libXdamage libXtst libjpeg telepathy_qt ]; - - meta = { - description = "KDE desktop sharing"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdenetwork/zeroconf-ioslave.nix b/pkgs/desktops/kde-4.12/kdenetwork/zeroconf-ioslave.nix deleted file mode 100644 index f65960cc337b..000000000000 --- a/pkgs/desktops/kde-4.12/kdenetwork/zeroconf-ioslave.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE tool that monitors the network for DNS-SD services"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdepim-runtime.nix b/pkgs/desktops/kde-4.12/kdepim-runtime.nix deleted file mode 100644 index 484d3e1933a2..000000000000 --- a/pkgs/desktops/kde-4.12/kdepim-runtime.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ kde, libxslt, boost, kdepimlibs, akonadi, shared_desktop_ontologies }: - -kde { - -# TODO: libkgapi(2), LibKFbAPI,libkolab, libkolabxml - - buildInputs = [ - kdepimlibs akonadi boost boost.lib shared_desktop_ontologies - libxslt - ]; - - meta = { - description = "KDE PIM runtime"; - license = "GPL"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdepim.nix b/pkgs/desktops/kde-4.12/kdepim.nix deleted file mode 100644 index 0f5d868837e5..000000000000 --- a/pkgs/desktops/kde-4.12/kdepim.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ kde, boost, gpgme, libassuan, libxslt, kdepimlibs, kdepim_runtime -, akonadi, shared_desktop_ontologies, cyrus_sasl, grantlee, prison -, nepomuk_widgets, kactivities, libXScrnSaver, qjson -, pkgconfig }: - -kde { - -# TODO: LinkGrammar - - buildInputs = - [ kdepimlibs boost boost.lib shared_desktop_ontologies akonadi - nepomuk_widgets libxslt cyrus_sasl gpgme libassuan grantlee prison - kactivities libXScrnSaver qjson - ]; - - nativeBuildInputs = [ pkgconfig ]; - - passthru.propagatedUserEnvPackages = [ akonadi kdepimlibs kdepim_runtime ]; - - meta = { - description = "KDE PIM tools"; - longDescription = '' - Contains various personal information management tools for KDE, such as an organizer. - ''; - license = "GPL"; - homepage = http://pim.kde.org; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdepimlibs.nix b/pkgs/desktops/kde-4.12/kdepimlibs.nix deleted file mode 100644 index 90d2717b8805..000000000000 --- a/pkgs/desktops/kde-4.12/kdepimlibs.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ kde, pkgconfig, boost, cyrus_sasl, gpgme, libical, openldap, prison -, kdelibs, akonadi, libxslt, nepomuk_core -, shared_desktop_ontologies, qjson }: - -kde { - nativeBuildInputs = [ pkgconfig ]; - - buildInputs = - [ boost boost.lib gpgme libical libxslt qjson prison - openldap cyrus_sasl akonadi shared_desktop_ontologies - ]; - - propagatedBuildInputs = [ kdelibs nepomuk_core ]; - - meta = { - description = "KDE PIM libraries"; - license = "LGPL"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeplasma-addons.nix b/pkgs/desktops/kde-4.12/kdeplasma-addons.nix deleted file mode 100644 index afc925c79aab..000000000000 --- a/pkgs/desktops/kde-4.12/kdeplasma-addons.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ kde, kdelibs, marble, shared_desktop_ontologies, pkgconfig -, boost, eigen, kde_workspace, attica, qca2, qimageblitz -, kdepimlibs, libkexiv2, libqalculate, libXtst, libdbusmenu_qt -, qjson, qoauth }: - -kde { - -# TODO: qwt, scim, ibus - - KDEDIRS=marble; - - buildInputs = [ kdelibs boost boost.lib kde_workspace kdepimlibs attica qjson - qoauth eigen qca2 libXtst qimageblitz libqalculate - shared_desktop_ontologies marble libkexiv2 libdbusmenu_qt - ]; - - nativeBuildInputs = [ pkgconfig ]; - - meta = { - description = "KDE Plasma Addons"; - license = "GPL"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdesdk/cervisia.nix b/pkgs/desktops/kde-4.12/kdesdk/cervisia.nix deleted file mode 100644 index 1dabe46cd429..000000000000 --- a/pkgs/desktops/kde-4.12/kdesdk/cervisia.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "A KDE CVS frontend"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdesdk/dolphin-plugins.nix b/pkgs/desktops/kde-4.12/kdesdk/dolphin-plugins.nix deleted file mode 100644 index ad8132a850e5..000000000000 --- a/pkgs/desktops/kde-4.12/kdesdk/dolphin-plugins.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs, kde_baseapps }: - -kde { - - # Needs kdebase for libkonq - buildInputs = [ kdelibs kde_baseapps ]; - - meta = { - description = "Svn, mercurial, git and bazaar plugins for dolphin"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdesdk/kapptemplate.nix b/pkgs/desktops/kde-4.12/kdesdk/kapptemplate.nix deleted file mode 100644 index 391536248dd3..000000000000 --- a/pkgs/desktops/kde-4.12/kdesdk/kapptemplate.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "A KDE 4 project template generator"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdesdk/kcachegrind.nix b/pkgs/desktops/kde-4.12/kdesdk/kcachegrind.nix deleted file mode 100644 index 65d410cca48d..000000000000 --- a/pkgs/desktops/kde-4.12/kdesdk/kcachegrind.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE Frontend for Callgrind/Cachegrind"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdesdk/kde-dev-scripts.nix b/pkgs/desktops/kde-4.12/kdesdk/kde-dev-scripts.nix deleted file mode 100644 index df81145e5d60..000000000000 --- a/pkgs/desktops/kde-4.12/kdesdk/kde-dev-scripts.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Various scripts to ease KDE development"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdesdk/kde-dev-utils.nix b/pkgs/desktops/kde-4.12/kdesdk/kde-dev-utils.nix deleted file mode 100644 index 215c0a3c613a..000000000000 --- a/pkgs/desktops/kde-4.12/kdesdk/kde-dev-utils.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs, gcc, libtool }: - -kde { - buildInputs = [ kdelibs libtool ]; - - preConfigure = "export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:${gcc}:${gcc.gcc}"; - - meta = { - description = "various KDE development utilities"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdesdk/kdesdk-kioslaves.nix b/pkgs/desktops/kde-4.12/kdesdk/kdesdk-kioslaves.nix deleted file mode 100644 index 98bbce35a97c..000000000000 --- a/pkgs/desktops/kde-4.12/kdesdk/kdesdk-kioslaves.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ kde, kdelibs, subversionClient, apr, aprutil,perl }: - -kde { - - buildInputs = [ kdelibs subversionClient apr aprutil perl ]; - - cmakeFlags = [ "-DBUILD_perldoc=ON" ]; - - meta = { - description = "Subversion and perldoc kioslaves"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdesdk/kdesdk-strigi-analyzers.nix b/pkgs/desktops/kde-4.12/kdesdk/kdesdk-strigi-analyzers.nix deleted file mode 100644 index 4d579b88ba8a..000000000000 --- a/pkgs/desktops/kde-4.12/kdesdk/kdesdk-strigi-analyzers.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Strigi analyzers for diff, po and ts"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdesdk/kdesdk-thumbnailers.nix b/pkgs/desktops/kde-4.12/kdesdk/kdesdk-thumbnailers.nix deleted file mode 100644 index d707fe9038fe..000000000000 --- a/pkgs/desktops/kde-4.12/kdesdk/kdesdk-thumbnailers.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs, gettext }: - -kde { - - buildInputs = [ kdelibs gettext ]; - - meta = { - description = "PO file format thumbnailer"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdesdk/kompare.nix b/pkgs/desktops/kde-4.12/kdesdk/kompare.nix deleted file mode 100644 index 644c7c48dc97..000000000000 --- a/pkgs/desktops/kde-4.12/kdesdk/kompare.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, libkomparediff2 }: - -kde { - buildInputs = [ kdelibs libkomparediff2 ]; - - meta = { - description = "A program to view the differences between files and optionally generate a diff"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdesdk/libkomparediff2.nix b/pkgs/desktops/kde-4.12/kdesdk/libkomparediff2.nix deleted file mode 100644 index 5933682c70a0..000000000000 --- a/pkgs/desktops/kde-4.12/kdesdk/libkomparediff2.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "A library to compare files and strings"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdesdk/lokalize.nix b/pkgs/desktops/kde-4.12/kdesdk/lokalize.nix deleted file mode 100644 index 1565426eb1fc..000000000000 --- a/pkgs/desktops/kde-4.12/kdesdk/lokalize.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kde, kdelibs, hunspell }: - -kde { - buildInputs = [ kdelibs hunspell ]; - - meta = { - description = "KDE 4 Computer-aided translation system"; - longDescription = '' - Computer-aided translation system. - Do not translate what had already been translated. - ''; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdesdk/okteta.nix b/pkgs/desktops/kde-4.12/kdesdk/okteta.nix deleted file mode 100644 index 058636596ad8..000000000000 --- a/pkgs/desktops/kde-4.12/kdesdk/okteta.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kde, kdelibs, qca2 }: - -kde { - buildInputs = [ kdelibs qca2 ]; - -# TODO: Look what does -DBUILD_mobile add - - enableParallelBuilding = false; - - meta = { - description = "KDE byte editor"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdesdk/poxml.nix b/pkgs/desktops/kde-4.12/kdesdk/poxml.nix deleted file mode 100644 index 6e46c3e3ab4f..000000000000 --- a/pkgs/desktops/kde-4.12/kdesdk/poxml.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, antlr, gettext }: - -kde { - buildInputs = [ kdelibs antlr gettext ]; - - meta = { - description = "Po<->xml tools"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdesdk/umbrello.nix b/pkgs/desktops/kde-4.12/kdesdk/umbrello.nix deleted file mode 100644 index 2dbccdef9450..000000000000 --- a/pkgs/desktops/kde-4.12/kdesdk/umbrello.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, libxml2, libxslt, boost }: - -kde { - buildInputs = [ kdelibs libxml2 libxslt boost boost.lib ]; - - meta = { - description = "Umbrello UML modeller"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdetoys/amor.nix b/pkgs/desktops/kde-4.12/kdetoys/amor.nix deleted file mode 100644 index 936d63d544a9..000000000000 --- a/pkgs/desktops/kde-4.12/kdetoys/amor.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE creature for your desktop"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdetoys/kteatime.nix b/pkgs/desktops/kde-4.12/kdetoys/kteatime.nix deleted file mode 100644 index dacf54def4b0..000000000000 --- a/pkgs/desktops/kde-4.12/kdetoys/kteatime.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE utility for making a fine cup of tea"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdetoys/ktux.nix b/pkgs/desktops/kde-4.12/kdetoys/ktux.nix deleted file mode 100644 index 108f9be7c722..000000000000 --- a/pkgs/desktops/kde-4.12/kdetoys/ktux.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, kde_workspace }: - -kde { - buildInputs = [ kdelibs kde_workspace ]; - - meta = { - description = "Tux Screen Saver"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeutils/ark.nix b/pkgs/desktops/kde-4.12/kdeutils/ark.nix deleted file mode 100644 index 99844b909fd7..000000000000 --- a/pkgs/desktops/kde-4.12/kdeutils/ark.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ makeWrapper, kde, kdelibs, libarchive, bzip2, kde_baseapps, lzma, qjson -, unzip }: - -kde { - buildInputs = [ - makeWrapper kdelibs kde_baseapps libarchive bzip2 lzma qjson - ]; - - postInstall = '' - wrapProgram $out/bin/ark \ - --prefix PATH ":" "${unzip}/bin" - ''; - - meta = { - description = "KDE Archiving Tool"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeutils/filelight.nix b/pkgs/desktops/kde-4.12/kdeutils/filelight.nix deleted file mode 100644 index 25ecabed27ce..000000000000 --- a/pkgs/desktops/kde-4.12/kdeutils/filelight.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Tool to visualise file and directory sizes"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeutils/kcalc.nix b/pkgs/desktops/kde-4.12/kdeutils/kcalc.nix deleted file mode 100644 index 08b202e8f0e8..000000000000 --- a/pkgs/desktops/kde-4.12/kdeutils/kcalc.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, gmp }: - -kde { - buildInputs = [ kdelibs gmp ]; - - meta = { - description = "KDE Calculator"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeutils/kcharselect.nix b/pkgs/desktops/kde-4.12/kdeutils/kcharselect.nix deleted file mode 100644 index d4c9c06f483d..000000000000 --- a/pkgs/desktops/kde-4.12/kdeutils/kcharselect.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE character selection utility"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeutils/kdf.nix b/pkgs/desktops/kde-4.12/kdeutils/kdf.nix deleted file mode 100644 index 3f9da58d0a62..000000000000 --- a/pkgs/desktops/kde-4.12/kdeutils/kdf.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE free disk space utility"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeutils/kfloppy.nix b/pkgs/desktops/kde-4.12/kdeutils/kfloppy.nix deleted file mode 100644 index 2434a4fa671f..000000000000 --- a/pkgs/desktops/kde-4.12/kdeutils/kfloppy.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Floppy disk formatting utility"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeutils/kgpg.nix b/pkgs/desktops/kde-4.12/kdeutils/kgpg.nix deleted file mode 100644 index 11b62f499a47..000000000000 --- a/pkgs/desktops/kde-4.12/kdeutils/kgpg.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs, kdepimlibs, boost }: - -kde { - - buildInputs = [ kdelibs kdepimlibs boost boost.lib ]; - - meta = { - description = "Simple KDE GUI for GPG"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeutils/kremotecontrol.nix b/pkgs/desktops/kde-4.12/kdeutils/kremotecontrol.nix deleted file mode 100644 index 70311a789f99..000000000000 --- a/pkgs/desktops/kde-4.12/kdeutils/kremotecontrol.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, libXtst }: - -kde { - buildInputs = [ kdelibs libXtst ]; - - meta = { - description = "KDE remote control"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeutils/ktimer.nix b/pkgs/desktops/kde-4.12/kdeutils/ktimer.nix deleted file mode 100644 index 5700977349e3..000000000000 --- a/pkgs/desktops/kde-4.12/kdeutils/ktimer.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE Timer"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeutils/kwalletmanager.nix b/pkgs/desktops/kde-4.12/kdeutils/kwalletmanager.nix deleted file mode 100644 index 9ec0e6c0396c..000000000000 --- a/pkgs/desktops/kde-4.12/kdeutils/kwalletmanager.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE Wallet (password storage) management tool"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeutils/print-manager.nix b/pkgs/desktops/kde-4.12/kdeutils/print-manager.nix deleted file mode 100644 index ae72becd1e49..000000000000 --- a/pkgs/desktops/kde-4.12/kdeutils/print-manager.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ kde, kdelibs -, pythonPackages, cups, pyqt4, pykde4, pycups, system_config_printer }: - -let s_c_p = system_config_printer.override { withGUI = false; }; in - -kde rec { - buildInputs = [ kdelibs pythonPackages.python pythonPackages.wrapPython - ] ++ pythonPath; - - pythonPath = [ cups pyqt4 pykde4 pycups s_c_p ]; - - passthru.propagatedUserEnvPackages = [ s_c_p ]; - - postInstall = - '' - wrapPythonPrograms - - # "system-config-printer" supplies some D-Bus policy that we need. - mkdir -p $out/nix-support - echo ${s_c_p} > $out/nix-support/propagated-user-env-packages - ''; - - meta = { - description = "KDE printer manager"; - longDescription = "Applet to view current print jobs and configure new printers"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeutils/superkaramba.nix b/pkgs/desktops/kde-4.12/kdeutils/superkaramba.nix deleted file mode 100644 index cbe7a2856062..000000000000 --- a/pkgs/desktops/kde-4.12/kdeutils/superkaramba.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs, qimageblitz, python }: - -kde { - buildInputs = [ kdelibs qimageblitz python ]; - - cmakeFlags = [ "-DBUILD_icons=TRUE" "-DBUILD_plasma=TRUE" ]; - - meta = { - description = "A KDE Eye-candy Application"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeutils/sweeper.nix b/pkgs/desktops/kde-4.12/kdeutils/sweeper.nix deleted file mode 100644 index 78d56c7df30e..000000000000 --- a/pkgs/desktops/kde-4.12/kdeutils/sweeper.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Helps clean unwanted traces the user leaves on the system"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdewebdev/kfilereplace.nix b/pkgs/desktops/kde-4.12/kdewebdev/kfilereplace.nix deleted file mode 100644 index 55e37809e07b..000000000000 --- a/pkgs/desktops/kde-4.12/kdewebdev/kfilereplace.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Batch search and replace tool"; - homepage = http://www.kdewebdev.org; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdewebdev/kimagemapeditor.nix b/pkgs/desktops/kde-4.12/kdewebdev/kimagemapeditor.nix deleted file mode 100644 index 6d22f72461f9..000000000000 --- a/pkgs/desktops/kde-4.12/kdewebdev/kimagemapeditor.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "An HTML imagemap editor"; - homepage = http://www.nongnu.org/kimagemap/; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdewebdev/klinkstatus.nix b/pkgs/desktops/kde-4.12/kdewebdev/klinkstatus.nix deleted file mode 100644 index 36630ef8fc69..000000000000 --- a/pkgs/desktops/kde-4.12/kdewebdev/klinkstatus.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kde, kdelibs, libxml2, libxslt, kdepimlibs, htmlTidy, boost }: - -kde { - -# todo: ruby19 is not found by the build system. not linking against ruby18 due to it being too old - - buildInputs = [ kdelibs kdepimlibs htmlTidy boost boost.lib ]; - - meta = { - description = "A KDE link checker"; - homepage = http://klinkstatus.kdewebdev.org; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdewebdev/kommander.nix b/pkgs/desktops/kde-4.12/kdewebdev/kommander.nix deleted file mode 100644 index d5f4337f714d..000000000000 --- a/pkgs/desktops/kde-4.12/kdewebdev/kommander.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "A graphical editor of scripted dialogs"; - }; -} diff --git a/pkgs/desktops/kde-4.12/l10n/default.nix b/pkgs/desktops/kde-4.12/l10n/default.nix deleted file mode 100644 index fa6406043b1b..000000000000 --- a/pkgs/desktops/kde-4.12/l10n/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ stdenv, fetchurl, kdelibs, gettext, release, branch, stable }: - -let - - inherit (stdenv.lib) attrByPath singleton; - - kdeL10nDerivation = - { lang, saneName, sha256 }: - - stdenv.mkDerivation rec { - name = "kde-l10n-${saneName}-${release}"; - - src = fetchurl { - url = "mirror://kde/${if stable then "" else "un"}stable/${release}/src/kde-l10n/kde-l10n-${lang}-${release}.tar.xz"; - name = "${name}.tar.xz"; - inherit sha256; - }; - - buildInputs = [ gettext kdelibs ]; - - cmakeFlags = "-Wno-dev"; - - meta = { - description = "KDE translation for ${lang}"; - inherit branch; - license = "GPL"; - platforms = stdenv.lib.platforms.linux; - inherit (kdelibs.meta) maintainers homepage; - }; - }; - - kdeL10nRelease = - builtins.listToAttrs ( - map ({lang, saneName, sha256}: - { - name = saneName; - value = kdeL10nDerivation { inherit lang saneName sha256; }; - } - ) (import (./manifest + "-${release}.nix")) - ); - -in -{ - inherit kdeL10nDerivation; - recurseForDerivations = true; -} // kdeL10nRelease diff --git a/pkgs/desktops/kde-4.12/l10n/l10n-manifest.sh b/pkgs/desktops/kde-4.12/l10n/l10n-manifest.sh deleted file mode 100755 index ec159a1e2047..000000000000 --- a/pkgs/desktops/kde-4.12/l10n/l10n-manifest.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh - -# Usage: download kde-l10n to $dir, then run -# $0 $dir - -dir=$1 - -if [[ ! -d "${dir}" ]]; then - echo "${dir} is not a directory (or doesn't exist)!" >&2 - exit 1 -fi - -release=$(ls "${dir}"/kde-l10n-en_GB-*.tar.xz | \ - sed -e 's/.*en_GB-//' -e 's/\.tar\.xz//') - -echo "Detected release ${release}" >&2 - -exec > "manifest-${release}.nix" -echo "[" -for i in `cd "${dir}"; ls kde-l10n-*-${release}.tar.xz`; do - lang=${i%-${release}.tar.xz} - lang=${lang#kde-l10n-} - echo -n "${lang}.. " >&2 - hash=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}") - echo "{" - echo " lang = \"${lang}\";" - echo " saneName = \"$(echo $lang | sed s^@^_^g)\";" - echo " sha256 = \"${hash}\";" - echo "}" - echo $hash >&2 -done -echo "]" diff --git a/pkgs/desktops/kde-4.12/l10n/manifest-4.12.4.nix b/pkgs/desktops/kde-4.12/l10n/manifest-4.12.4.nix deleted file mode 100644 index e646e3528877..000000000000 --- a/pkgs/desktops/kde-4.12/l10n/manifest-4.12.4.nix +++ /dev/null @@ -1,262 +0,0 @@ -[ -{ - lang = "ar"; - saneName = "ar"; - sha256 = "1pygy9kckankwhlm4j61fk42zinafw2insc9kkpgmh9mvb8gv0jk"; -} -{ - lang = "bg"; - saneName = "bg"; - sha256 = "1qqbl7l84j3d5928gmdq7f7s0i31gw0rlf4y74p5zx8m80xbdd6l"; -} -{ - lang = "bs"; - saneName = "bs"; - sha256 = "0cg143wlalplw0qr10h60i6srn0avsim94m1hjbm8xrlg71iihjj"; -} -{ - lang = "ca"; - saneName = "ca"; - sha256 = "15s85xmqbnv7bm7ywivkyi62481ip4vy6yyw81m720hza0imbj9z"; -} -{ - lang = "ca@valencia"; - saneName = "ca_valencia"; - sha256 = "1d0bhndwf8b0pmglf3sx28r6s3li72x7a05kc39n026ha5zyx5f1"; -} -{ - lang = "cs"; - saneName = "cs"; - sha256 = "1dx5c6fkgn4hglx8qacrdnxn0l9p7dqbaz6cd7h9pa8b9zri5j9w"; -} -{ - lang = "da"; - saneName = "da"; - sha256 = "1ynh8s17999pa60bzwr2595pcd744h1n8zznyzr5lq302ir8f8qj"; -} -{ - lang = "de"; - saneName = "de"; - sha256 = "1da01wd1n64g3l57pagvrb8mn2jj50ni1qhicnlwylk8n2krw0pf"; -} -{ - lang = "el"; - saneName = "el"; - sha256 = "1qf9g5in9zr39gkip06hr80pzc4frchb2x9q76sqs36h58az5yfd"; -} -{ - lang = "en_GB"; - saneName = "en_GB"; - sha256 = "1lhrbfh74sqglqxl7yh68qkx0gmppg7iir194vxhm2s1j0jxq8r4"; -} -{ - lang = "es"; - saneName = "es"; - sha256 = "0qz39nxkiivgk720lgdbfgxdp3wn5wrvx2zf0phvb8g6q5rl68kw"; -} -{ - lang = "et"; - saneName = "et"; - sha256 = "1i9h68pfsnbi4gw5f4mb6q8jq56hdmi1lqxhwzj6vrbqiip7b9gl"; -} -{ - lang = "eu"; - saneName = "eu"; - sha256 = "020b1p164v82pj6x0jxz6d41w539786ygkfmgrf9dr20zwhchzha"; -} -{ - lang = "fi"; - saneName = "fi"; - sha256 = "0vs8bqr6if32bmwvjzdmakyqdl5fz13igg31mzwga4aqlzalxa1w"; -} -{ - lang = "fr"; - saneName = "fr"; - sha256 = "1wcd9gzf754150i62zl3fa24jq8p7vskn6adaa8x5qy208c0d6v1"; -} -{ - lang = "ga"; - saneName = "ga"; - sha256 = "0fpsc36sk7zh3flxgnvfgxig4cm5hm56sgdgbl01dfg1mac6dckq"; -} -{ - lang = "gl"; - saneName = "gl"; - sha256 = "1hrbsd595q2w09mym9h56hymikkpxbq0qmdxvphap5wsh0xsfxms"; -} -{ - lang = "he"; - saneName = "he"; - sha256 = "1q2y9js6j32rbm5jg8yn6s9zw0jh6yq1q4z6hxy9nss1gh6diqda"; -} -{ - lang = "hi"; - saneName = "hi"; - sha256 = "0zaknfk8kzcid7839wsj61qgn81gjz0hbpis7q2q1syky4nzjwsb"; -} -{ - lang = "hr"; - saneName = "hr"; - sha256 = "1d14h5kdfz8np5p27darraxq4ps0yhxhczg9yli436kgiflbvp88"; -} -{ - lang = "hu"; - saneName = "hu"; - sha256 = "0p29dybsalnjk00f7l3gni7pxzv1ig95m100svhhkmcwvh065kjf"; -} -{ - lang = "ia"; - saneName = "ia"; - sha256 = "1qqbn3v30z058580qr9qyq0sy6g4jw0far8w7ywgnhks4aapy97a"; -} -{ - lang = "is"; - saneName = "is"; - sha256 = "1gfm0k2j2jvff9lab87yjrywc1j0gayw2fxibzifvpygr9bl60i7"; -} -{ - lang = "it"; - saneName = "it"; - sha256 = "11zax6c3qfscadqfamls5k78hw36iwadqsgyiphl574ijz9q48ba"; -} -{ - lang = "ja"; - saneName = "ja"; - sha256 = "1ab658x0a44kydzs05zgzq7nks6dfl0z8m69ank5ngd12qnhb38s"; -} -{ - lang = "kk"; - saneName = "kk"; - sha256 = "0n26860ah421x8q2jmz8mh3mdzy26s8ckbfpnyph1vc23zqx9vqv"; -} -{ - lang = "km"; - saneName = "km"; - sha256 = "05ad1d5klc11s138zb5fj4h2kfida83xqr4z1m6nhv0igwzmza0g"; -} -{ - lang = "ko"; - saneName = "ko"; - sha256 = "14kchh6yixgrkzrrkdz25xaj2q91il6yshz79n4h0yk01lfc3sq5"; -} -{ - lang = "lt"; - saneName = "lt"; - sha256 = "0aa4spy2nc1hfbx1z2b4k3sahha0pdxih1k3pl6n9223cjgwcbqp"; -} -{ - lang = "lv"; - saneName = "lv"; - sha256 = "14341a4qr8p7idvsw6zp23kyva5lb4684wjygm24d9wj69nkc2c4"; -} -{ - lang = "mr"; - saneName = "mr"; - sha256 = "02rq9spp8vzvv8bvzny48qwksimrnqj6y9rpc3xh6bmzfhvr7qsa"; -} -{ - lang = "nb"; - saneName = "nb"; - sha256 = "1s2gbynxdbpi32rwdgddabsp3n10ngwpnh6za3yjp4is93ici6rm"; -} -{ - lang = "nds"; - saneName = "nds"; - sha256 = "18nmh605ya47w0x2nkglg8lrfks7l9pxr6mjnw3z3lsazafigvx1"; -} -{ - lang = "nl"; - saneName = "nl"; - sha256 = "1jxd109m2y7ky0c4im70ipx07rysbr0ndl2fpjb3myxb2nks106h"; -} -{ - lang = "nn"; - saneName = "nn"; - sha256 = "117zl85myjnnb957c4gx0h65ks842sk3gbw9dfp8hpzdwg8zvsn4"; -} -{ - lang = "pa"; - saneName = "pa"; - sha256 = "1q5c61a2swxvyhdw5rambibyms40hj34093ihx32ad73kb4mn72w"; -} -{ - lang = "pl"; - saneName = "pl"; - sha256 = "0wg4nlra1z6pf8mxlz3w0jq68k0qfhxrhsqij35l9zml5y203n4y"; -} -{ - lang = "pt"; - saneName = "pt"; - sha256 = "0rryyjfgplar77fz332jv2w0lv7d6273gv022pb1m83w945pzkf9"; -} -{ - lang = "pt_BR"; - saneName = "pt_BR"; - sha256 = "0aglgvj1ljfdf6gjs478l4wisp2z4dzkkbhz1sgry00p4q1417ab"; -} -{ - lang = "ro"; - saneName = "ro"; - sha256 = "14aqlg64lp287m09zhh9r9l6ywfwzz7f2nz0vr1fg3wqsdrchglw"; -} -{ - lang = "ru"; - saneName = "ru"; - sha256 = "0cq6xacyrb9wrrwbl8xrb2ah3h7s7a9vr7kz3fy5rf2rgq0phfd7"; -} -{ - lang = "sk"; - saneName = "sk"; - sha256 = "07i0plzmg0nykfalyjvwnhg5qrcfdf1h6i18b34xyrp3y4gm540a"; -} -{ - lang = "sl"; - saneName = "sl"; - sha256 = "0gw1iv550nr307ibgb8i48fxcq03liq5r2x7fr9pl0n9xknh3c8a"; -} -{ - lang = "sr"; - saneName = "sr"; - sha256 = "0489n0l9c9wig5567dfh4apyyy6xws7yxq79r4jl00zxl1j43bla"; -} -{ - lang = "sv"; - saneName = "sv"; - sha256 = "1n4ckll9ngj8qn976nikxfljf23qsvphblbjnjm0vk4713bnpf9h"; -} -{ - lang = "tr"; - saneName = "tr"; - sha256 = "0pzjdnanhynalcjlsg94g88i92hwdsqz02x85yxxg87vn74p13ks"; -} -{ - lang = "ug"; - saneName = "ug"; - sha256 = "1z9mjzh0w6i2a75ys0dx5ksm8fpwyw8wrwdh14bvbnxpnkx0jv8x"; -} -{ - lang = "uk"; - saneName = "uk"; - sha256 = "032vjcjpl19dyyc36z1nwyc9h696iys8dfyadpw9rhcllpk4ck67"; -} -{ - lang = "vi"; - saneName = "vi"; - sha256 = "0sd6vzb1qmbbxk6d1vfq21gkq009lp7qxnpdcr7jbykcf0licq7i"; -} -{ - lang = "wa"; - saneName = "wa"; - sha256 = "1m6fa0adfjzfqakjyrrjwak4p0y5wwdkkq61qx9wvzdb78qm83rw"; -} -{ - lang = "zh_CN"; - saneName = "zh_CN"; - sha256 = "11is37g7fafxhk7ydydgbxdg0x1s5cxr8v1pjzwqb858n1cq5x1h"; -} -{ - lang = "zh_TW"; - saneName = "zh_TW"; - sha256 = "1vbr0pjm8d25lxbmhqz8d4x57sjc411a5fkvyxh4rr34fd7xxhwq"; -} -] diff --git a/pkgs/desktops/kde-4.12/oxygen-icons.nix b/pkgs/desktops/kde-4.12/oxygen-icons.nix deleted file mode 100644 index 01020e095f91..000000000000 --- a/pkgs/desktops/kde-4.12/oxygen-icons.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kde, cmake }: - -kde { - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "06qddsbq0sadj9jh2x1qkbm69b7cnd2474b3h0zrzrqgnrsf8jn2"; - - nativeBuildInputs = [ cmake ]; - - meta = { - description = "KDE Oxygen theme icons"; - longDescription = "Icons for KDE's default theme"; - license = "GPL"; - }; -} diff --git a/pkgs/desktops/kde-4.12/support/akonadi/default.nix b/pkgs/desktops/kde-4.12/support/akonadi/default.nix deleted file mode 100644 index 824fd3e6616b..000000000000 --- a/pkgs/desktops/kde-4.12/support/akonadi/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, automoc4, soprano, sqlite }: - -stdenv.mkDerivation rec { - name = "akonadi-1.11.0"; - - src = fetchurl { - url = "mirror://kde/stable/akonadi/src/${name}.tar.bz2"; - sha256 = "0k96i8xq3xkm5rrxrj3zqgppcmqbzcpc918xnx0p54jkkm85gchc"; - }; - - buildInputs = [ qt4 soprano libxslt boost boost.lib sqlite ]; - - nativeBuildInputs = [ cmake automoc4 shared_mime_info ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - description = "KDE PIM Storage Service"; - license = "LGPL"; - homepage = http://pim.kde.org/akonadi; - maintainers = [ maintainers.sander maintainers.urkud maintainers.phreedom ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix new file mode 100644 index 000000000000..7506ece43dc1 --- /dev/null +++ b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, perl, cmake, vala, pkgconfig, glib, gtk3, granite, gnome3, libnotify, gettext, makeWrapper }: + +stdenv.mkDerivation rec { + majorVersion = "0.3"; + minorVersion = "0.1"; + name = "pantheon-terminal-${majorVersion}.${minorVersion}"; + src = fetchurl { + url = "https://launchpad.net/pantheon-terminal/${majorVersion}.x/${majorVersion}.${minorVersion}/+download/${name}.tgz"; + sha256 = "14wspqxp79myyyjngr1x7jg1kw15g3nm2pav2zffp8xs16s1i5za"; + }; + + preConfigure = '' + export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${granite}/lib64/pkgconfig" + ''; + + preFixup = '' + for f in $out/bin/*; do + wrapProgram $f \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" + done + ''; + + buildInputs = [perl cmake vala pkgconfig glib gtk3 granite gnome3.vte gnome3.libgee libnotify gettext makeWrapper]; + meta = { + description = "elementary OS's terminal"; + longDescription = "A super lightweight, beautiful, and simple terminal. It's designed to be setup with sane defaults and little to no configuration. It's just a terminal, nothing more, nothing less. Designed for elementary OS."; + homepage = https://launchpad.net/pantheon-terminal; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.vozz ]; + }; +} diff --git a/pkgs/desktops/xfce/applications/ristretto.nix b/pkgs/desktops/xfce/applications/ristretto.nix index 64e3c34453ee..de7fe5975947 100644 --- a/pkgs/desktops/xfce/applications/ristretto.nix +++ b/pkgs/desktops/xfce/applications/ristretto.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl, pkgconfig, intltool, libexif, gtk -, exo, dbus_glib, libxfce4util, libxfce4ui, xfconf }: +, exo, dbus_glib, libxfce4util, libxfce4ui, xfconf +, hicolor_icon_theme, makeWrapper +}: stdenv.mkDerivation rec { p_name = "ristretto"; @@ -14,8 +16,14 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig intltool libexif gtk dbus_glib exo libxfce4util - libxfce4ui xfconf + libxfce4ui xfconf hicolor_icon_theme makeWrapper ]; + + postInstall = '' + wrapProgram "$out/bin/ristretto" \ + --prefix XDG_DATA_DIRS : "${hicolor_icon_theme}/share" + ''; + preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; meta = { diff --git a/pkgs/desktops/xfce/applications/xfce4-mixer.nix b/pkgs/desktops/xfce/applications/xfce4-mixer.nix index f486373ee17d..78c37771811b 100644 --- a/pkgs/desktops/xfce/applications/xfce4-mixer.nix +++ b/pkgs/desktops/xfce/applications/xfce4-mixer.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, pkgconfig, intltool, makeWrapper , glib, gstreamer, gst_plugins_base, gtk , libxfce4util, libxfce4ui, xfce4panel, xfconf, libunique ? null +, pulseaudioSupport ? false, gst_plugins_good }: let @@ -9,6 +10,10 @@ let gst_plugins_minimal = gst_plugins_base.override { minimalDeps = true; }; + gst_plugins_pulse = gst_plugins_good.override { + minimalDeps = true; + }; + gst_plugins = [ gst_plugins_minimal ] ++ stdenv.lib.optional pulseaudioSupport gst_plugins_pulse; in @@ -24,9 +29,9 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; buildInputs = - [ pkgconfig intltool glib gstreamer gst_plugins_minimal gtk + [ pkgconfig intltool glib gstreamer gtk libxfce4util libxfce4ui xfce4panel xfconf libunique makeWrapper - ]; + ] ++ gst_plugins; postInstall = '' @@ -34,6 +39,8 @@ stdenv.mkDerivation rec { --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" ''; + passthru = { inherit gst_plugins; }; + meta = { homepage = http://www.xfce.org/projects/xfce4-mixer; # referenced but inactive description = "A volume control application for the Xfce desktop environment"; diff --git a/pkgs/desktops/xfce/applications/xfce4-volumed-pulse.nix b/pkgs/desktops/xfce/applications/xfce4-volumed-pulse.nix new file mode 100644 index 000000000000..087ba0f2c815 --- /dev/null +++ b/pkgs/desktops/xfce/applications/xfce4-volumed-pulse.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, pkgconfig, pulseaudio +, gtk2, libnotify +, keybinder, xfconf +}: + +stdenv.mkDerivation rec { + version = "0.2.0"; + name = "xfce4-volumed-pulse-${version}"; + + src = fetchurl { + url = "https://launchpad.net/xfce4-volumed-pulse/trunk/${version}/+download/${name}.tar.bz2"; + sha256 = "0l75gl96skm0zn10w70mwvsjd12p1zjshvn7yc3439dz61506c39"; + }; + + buildInputs = + [ pulseaudio gtk2 + keybinder xfconf libnotify + ]; + + nativeBuildInputs = [ pkgconfig ]; + + meta = with stdenv.lib; { + homepage = https://launchpad.net/xfce4-volumed-pulse; + description = "A volume keys control daemon for the Xfce desktop environment (Xubuntu fork)"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.abbradar ]; + }; +} diff --git a/pkgs/desktops/xfce/applications/xfce4-volumed.nix b/pkgs/desktops/xfce/applications/xfce4-volumed.nix new file mode 100644 index 000000000000..b603229e938d --- /dev/null +++ b/pkgs/desktops/xfce/applications/xfce4-volumed.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, pkgconfig, makeWrapper +, gstreamer, gtk2, gst_plugins_base, libnotify +, keybinder, xfconf +}: + +let + # The usual Gstreamer plugins package has a zillion dependencies + # that we don't need for a simple mixer, so build a minimal package. + gst_plugins_minimal = gst_plugins_base.override { + minimalDeps = true; + }; + +in + +stdenv.mkDerivation rec { + p_name = "xfce4-volumed"; + ver_maj = "0.1"; + ver_min = "13"; + + src = fetchurl { + url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2"; + sha256 = "1aa0a1sbf9yzi7bc78kw044m0xzg1li3y4w9kf20wqv5kfjs7v2c"; + }; + name = "${p_name}-${ver_maj}.${ver_min}"; + + buildInputs = + [ gstreamer gst_plugins_minimal gtk2 + keybinder xfconf libnotify + ]; + + nativeBuildInputs = [ pkgconfig makeWrapper ]; + + postInstall = + '' + wrapProgram "$out/bin/xfce4-volumed" \ + --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" + ''; + + meta = with stdenv.lib; { + homepage = http://www.xfce.org/projects/xfce4-volumed; # referenced but inactive + description = "A volume keys control daemon for the Xfce desktop environment"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.abbradar ]; + }; +} diff --git a/pkgs/desktops/xfce/core/xfce4-panel.nix b/pkgs/desktops/xfce/core/xfce4-panel.nix index e654b2f7dfbe..7fa8862ea3be 100644 --- a/pkgs/desktops/xfce/core/xfce4-panel.nix +++ b/pkgs/desktops/xfce/core/xfce4-panel.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui -, libwnck, exo, garcon, xfconf, libstartup_notification }: +, libwnck, exo, garcon, xfconf, libstartup_notification +, makeWrapper, xfce4mixer }: stdenv.mkDerivation rec { p_name = "xfce4-panel"; @@ -17,10 +18,15 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig intltool gtk libxfce4util exo libwnck - garcon xfconf libstartup_notification - ]; + garcon xfconf libstartup_notification makeWrapper + ] ++ xfce4mixer.gst_plugins; propagatedBuildInputs = [ libxfce4ui ]; + postInstall = '' + wrapProgram "$out/bin/xfce4-panel" \ + --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" + ''; + preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; enableParallelBuilding = true; diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index ae6b1a88a14d..3844633839ed 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -1,4 +1,4 @@ -{ pkgs, newScope }: let +{ config, pkgs, newScope }: let callPackage = newScope (deps // xfce_self); @@ -44,11 +44,17 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od parole = callPackage ./applications/parole.nix { }; ristretto = callPackage ./applications/ristretto.nix { }; terminal = xfce4terminal; # it has changed its name - xfce4mixer = callPackage ./applications/xfce4-mixer.nix { }; + xfce4mixer = callPackage ./applications/xfce4-mixer.nix { + pulseaudioSupport = config.pulseaudio or false; + }; xfce4notifyd = callPackage ./applications/xfce4-notifyd.nix { }; xfce4taskmanager= callPackage ./applications/xfce4-taskmanager.nix { }; xfce4terminal = callPackage ./applications/terminal.nix { }; xfce4screenshooter = callPackage ./applications/xfce4-screenshooter.nix { }; + xfce4volumed = let + gst = callPackage ./applications/xfce4-volumed.nix { }; + pulse = callPackage ./applications/xfce4-volumed-pulse.nix { }; + in if config.pulseaudio or false then pulse else gst; #### ART from "mirror://xfce/src/art/${p_name}/${ver_maj}/${name}.tar.bz2" diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix index f1be290b190e..3f722d1b7d45 100644 --- a/pkgs/development/arduino/arduino-core/default.nix +++ b/pkgs/development/arduino/arduino-core/default.nix @@ -1,22 +1,18 @@ -{ stdenv, fetchurl, jdk, jre, ant, coreutils, gnugrep }: +{ stdenv, fetchFromGitHub, jdk, jre, ant, coreutils, gnugrep, file }: stdenv.mkDerivation rec { - version = "1.0.2"; + version = "1.0.6"; name = "arduino-core"; - src = fetchurl { - url = "http://arduino.googlecode.com/files/arduino-${version}-src.tar.gz"; - sha256 = "0nszl2hdjjgxk87gyk0xi0ww9grbq83hch3iqmpaf9yp4y9bra0x"; + src = fetchFromGitHub { + owner = "arduino"; + repo = "Arduino"; + rev = "${version}"; + sha256 = "0nr5b719qi03rcmx6swbhccv6kihxz3b8b6y46bc2j348rja5332"; }; - buildInputs = [ jdk ant ]; - - phases = "unpackPhase patchPhase buildPhase installPhase"; - - patchPhase = '' - # - ''; + buildInputs = [ jdk ant file ]; buildPhase = '' cd ./core && ant @@ -31,12 +27,26 @@ stdenv.mkDerivation rec { cp -r ./build/linux/work/tools/ $out/share/arduino cp -r ./build/linux/work/lib/ $out/share/arduino echo ${version} > $out/share/arduino/lib/version.txt + + # Fixup "/lib64/ld-linux-x86-64.so.2" like references in ELF executables. + echo "running patchelf on prebuilt binaries:" + find "$out" | while read filepath; do + if file "$filepath" | grep -q "ELF.*executable"; then + # skip target firmware files + if echo "$filepath" | grep -q "\.elf$"; then + continue + fi + echo "setting interpreter $(cat "$NIX_GCC"/nix-support/dynamic-linker) in $filepath" + patchelf --set-interpreter "$(cat "$NIX_GCC"/nix-support/dynamic-linker)" "$filepath" + test $? -eq 0 || { echo "patchelf failed to process $filepath"; exit 1; } + fi + done ''; meta = { - description = "Arduino libraries"; + description = "Libraries for the open-source electronics prototyping platform"; homepage = http://arduino.cc/; - license = "GPL"; - maintainers = [ stdenv.lib.maintainers.antono ]; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.antono stdenv.lib.maintainers.robberer ]; }; } diff --git a/pkgs/development/arduino/ino/default.nix b/pkgs/development/arduino/ino/default.nix index 484de02f05dd..be3799d01968 100644 --- a/pkgs/development/arduino/ino/default.nix +++ b/pkgs/development/arduino/ino/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonPackage, pythonPackages, minicom +{ stdenv, fetchurl, buildPythonPackage, pythonPackages, picocom , avrdude, arduino_core, avrgcclibc }: buildPythonPackage rec { @@ -12,7 +12,7 @@ buildPythonPackage rec { # TODO: add avrgcclibc, it must be rebuild with C++ support propagatedBuildInputs = - [ arduino_core avrdude minicom pythonPackages.configobj + [ arduino_core avrdude picocom pythonPackages.configobj pythonPackages.jinja2 pythonPackages.pyserial pythonPackages.six ]; patchPhase = '' diff --git a/pkgs/development/compilers/agda/default.nix b/pkgs/development/compilers/agda/default.nix index 3a44baa489a7..b37f6ce1ab30 100644 --- a/pkgs/development/compilers/agda/default.nix +++ b/pkgs/development/compilers/agda/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "Agda"; - version = "2.4.2"; - sha256 = "0pgwx79y02a08xn5f6lghw7fsc6wilab5q2gdm9r51yi9gm32aw5"; + version = "2.4.2.1"; + sha256 = "094x1rdhqxm630f0kgllhivgr1vdy4xrd9pgh737b1gbb2vf3awm"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -21,6 +21,7 @@ cabal.mkDerivation (self: { ]; buildTools = [ alex cpphs emacs happy ]; noHaddock = true; + jailbreak = true; postInstall = '' $out/bin/agda -c --no-main $(find $out/share -name Primitive.agda) $out/bin/agda-mode compile @@ -28,7 +29,8 @@ cabal.mkDerivation (self: { meta = { homepage = "http://wiki.portal.chalmers.se/agda/"; description = "A dependently typed functional programming language and proof assistant"; - license = self.stdenv.lib.licenses.mit; + license = "unknown"; platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; }; }) diff --git a/pkgs/development/compilers/agda/stdlib.nix b/pkgs/development/compilers/agda/stdlib.nix index 7305fbb5397b..597d0228b45d 100644 --- a/pkgs/development/compilers/agda/stdlib.nix +++ b/pkgs/development/compilers/agda/stdlib.nix @@ -1,12 +1,12 @@ { stdenv, agda, fetchurl, ghc, filemanip }: agda.mkDerivation (self: rec { - name = "Agda-stdlib"; - version = "0.8.1"; + version = "0.9"; + name = "Agda-stdlib-${version}"; src = fetchurl { url = "https://github.com/agda/agda-stdlib/archive/v${version}.tar.gz"; - sha256 = "0ij4rg4lk0pq01ing285gbmnn23dcf2rhihdcs8bbdpjg52vl4gf"; + sha256 = "05rpmd2xra8wygq33mahdmijcjwq132l1akqyzj66n13frw4hfwj"; }; buildInputs = [ filemanip ghc ]; @@ -18,9 +18,9 @@ agda.mkDerivation (self: rec { meta = with stdenv.lib; { homepage = "http://wiki.portal.chalmers.se/agda/pmwiki.php?n=Libraries.StandardLibrary"; - description = "A standard library for use with the Agda compiler."; + description = "A standard library for use with the Agda compiler"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; - maintainers = with maintainers; [ jwiegley ]; + maintainers = with maintainers; [ jwiegley fuuzetsu ]; }; }) diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix index 07a4ceefd4d2..65f77ee8d3c3 100644 --- a/pkgs/development/compilers/ats2/default.nix +++ b/pkgs/development/compilers/ats2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ats2-${version}"; - version = "0.1.3"; + version = "0.1.4"; src = fetchurl { url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz"; - sha256 = "157k703zsdf0gr7mwz08rdldfgwfsm5ipg36xcc8092fcjs5ryqp"; + sha256 = "174kxdvdgp2rlb0qq7d854n6m9gzy0g8annk3bmbqb23m36n2g39"; }; buildInputs = [ gmp ]; diff --git a/pkgs/development/compilers/bigloo/default.nix b/pkgs/development/compilers/bigloo/default.nix index 8564175d363d..3ac5f1696ce8 100644 --- a/pkgs/development/compilers/bigloo/default.nix +++ b/pkgs/development/compilers/bigloo/default.nix @@ -1,14 +1,16 @@ -{ fetchurl, stdenv }: +{ fetchurl, stdenv, gmp }: stdenv.mkDerivation rec { name = "bigloo-${version}"; - version = "3.7a"; + version = "4.1a-2"; src = fetchurl { url = "ftp://ftp-sop.inria.fr/indes/fp/Bigloo/bigloo${version}.tar.gz"; - sha256 = "0y8i87c2bpqzap8rhzgpyfgdzq21py5xq6mgp0w6xv4rjcj9d0v1"; + sha256 = "09yrz8r0jpj7bda39fdxzrrdyhi851nlfajsyf0b6jxanz6ygcjx"; }; + buildInputs = [ gmp ]; + preConfigure = # Help libgc's configure. '' export CXXCPP="g++ -E" @@ -32,6 +34,10 @@ stdenv.mkDerivation rec { meta = { description = "Efficient Scheme compiler"; + homepage = http://www-sop.inria.fr/indes/fp/Bigloo/; + license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ ludo thoughtpolice ]; longDescription = '' Bigloo is a Scheme implementation devoted to one goal: enabling @@ -44,11 +50,5 @@ stdenv.mkDerivation rec { Scheme and C programs, between Scheme and Java programs, and between Scheme and C# programs. ''; - - homepage = http://www-sop.inria.fr/indes/fp/Bigloo/; - license = stdenv.lib.licenses.gpl2Plus; - - maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice }; } diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix index 7678c066df28..378a8fc8cad2 100644 --- a/pkgs/development/compilers/ccl/default.nix +++ b/pkgs/development/compilers/ccl/default.nix @@ -1,49 +1,55 @@ -a : -let - buildInputs = with a; [ - - ]; -in -rec { - version = "1.8"; - name = "ccl-${version}"; - - /* There are also MacOS and FreeBSD and Windows versions */ - src = a.fetchurl { - url = "ftp://ftp.clozure.com/pub/release/${version}/${name}-linuxx86.tar.gz"; - sha256 = "1dgg6a8i2csa6xidsq66hbw7zx62gm2178hpkp88yyzgxylszp01"; +{ stdenv, fetchsvn, gcc, glibc, m4, coreutils }: + +/* TODO: there are also MacOS, FreeBSD and Windows versions */ +assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; + +stdenv.mkDerivation rec { + name = "ccl-${version}"; + version = "1.10"; + revision = "16313"; + + src = fetchsvn { + url = http://svn.clozure.com/publicsvn/openmcl/release/1.10/linuxx86/ccl; + rev = revision; + sha256 = "11lmdvzj1mbm7mbr22vjbcrsvinyz8n32a91ms324xqdqpr82ifb"; }; - - inherit buildInputs; - configureFlags = []; - /* doConfigure should be removed if not needed */ - phaseNames = ["doUnpack" "doPatchElf" "doCopy"]; + buildInputs = [ gcc glibc m4 ]; + + CCL_RUNTIME = if stdenv.system == "x86_64-linux" then "lx86cl64" else "lx86cl"; + CCL_KERNEL = if stdenv.system == "x86_64-linux" then "linuxx8664" else "linuxx8632"; + + patchPhase = '' + substituteInPlace lisp-kernel/${CCL_KERNEL}/Makefile \ + --replace "svnversion" "echo ${revision}" \ + --replace "/bin/rm" "${coreutils}/bin/rm" \ + --replace "/bin/echo" "${coreutils}/bin/echo" - doCopy = a.fullDepEntry '' + substituteInPlace lisp-kernel/m4macros.m4 \ + --replace "/bin/pwd" "${coreutils}/bin/pwd" + ''; + + buildPhase = '' + make -C lisp-kernel/${CCL_KERNEL} clean + make -C lisp-kernel/${CCL_KERNEL} all + + ./${CCL_RUNTIME} -n -b -e '(ccl:rebuild-ccl :full t)' -e '(ccl:quit)' + ''; + + installPhase = '' mkdir -p "$out/share" - cp -r . "$out/share/ccl-installation" + cp -r . "$out/share/ccl-installation" mkdir -p "$out/bin" - for i in $(find . -maxdepth 1 -type f -perm +111); do - echo -e '#! /bin/sh\n'"$out/share/ccl-installation/$(basename "$i")"'"$@"\n' > "$out"/bin/"$(basename "$i")" - chmod a+x "$out"/bin/"$(basename "$i")" - done - '' ["minInit" "doUnpack" "defEnsureDir"]; - - doPatchElf = a.fullDepEntry '' - patchelfFile="$(type -P patchelf)" - goodInterp="$(patchelf --print-interpreter "$patchelfFile")" - find . -type f -perm +111 -exec patchelf --set-interpreter "$goodInterp" '{}' ';' - '' ["minInit" "doUnpack"]; - + echo -e '#!/bin/sh\n'"$out/share/ccl-installation/${CCL_RUNTIME}"' "$@"\n' > "$out"/bin/"${CCL_RUNTIME}" + chmod a+x "$out"/bin/"${CCL_RUNTIME}" + ''; + meta = { description = "Clozure Common Lisp"; - maintainers = [ - a.lib.maintainers.raskin - ]; - platforms = with a.lib.platforms; - linux; + homepage = http://ccl.clozure.com/; + maintainers = with stdenv.lib.maintainers; [ raskin muflax ]; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.lgpl21; }; } - diff --git a/pkgs/development/compilers/chicken/0001-Introduce-CHICKEN_REPOSITORY_EXTRA.patch b/pkgs/development/compilers/chicken/0001-Introduce-CHICKEN_REPOSITORY_EXTRA.patch new file mode 100644 index 000000000000..0962c9cf46d3 --- /dev/null +++ b/pkgs/development/compilers/chicken/0001-Introduce-CHICKEN_REPOSITORY_EXTRA.patch @@ -0,0 +1,130 @@ +From 752dff853186dc334c519a86fa92f087795fea02 Mon Sep 17 00:00:00 2001 +From: Moritz Heidkamp <moritz.heidkamp@bevuta.com> +Date: Wed, 1 Oct 2014 22:41:30 +0200 +Subject: [PATCH] Introduce CHICKEN_REPOSITORY_EXTRA + +This environment variable works like CHICKEN_REPOSITORY but supports +multiple paths separated by `:'. Those paths are searched after +CHICKEN_REPOSITORY when loading extensions via `require-library' and +friends. It can be accessed and changed at runtime via the new procedure +`repository-extra-paths' which is analog to `repository-path'. +--- + chicken-install.scm | 11 +++++++---- + chicken.import.scm | 1 + + eval.scm | 37 +++++++++++++++++++++++++++++++------ + 3 files changed, 39 insertions(+), 10 deletions(-) + +diff --git a/chicken-install.scm b/chicken-install.scm +index 2ef6ef4..b5c6bf8 100644 +--- a/chicken-install.scm ++++ b/chicken-install.scm +@@ -109,10 +109,10 @@ + (define *show-foreign-depends* #f) + (define *hacks* '()) + +- (define (repo-path) ++ (define (repo-paths) + (if (and *cross-chicken* (not *host-extension*)) +- (make-pathname C_TARGET_LIB_HOME (sprintf "chicken/~a" C_BINARY_VERSION)) +- (repository-path))) ++ (list (make-pathname C_TARGET_LIB_HOME (sprintf "chicken/~a" C_BINARY_VERSION))) ++ (cons (repository-path) (repository-extra-paths)))) + + (define (get-prefix #!optional runtime) + (cond ((and *cross-chicken* +@@ -757,7 +757,10 @@ + "installed extension has no information about which egg it belongs to" + (pathname-file sf)) + #f)))) +- (glob (make-pathname (repo-path) "*" "setup-info"))) ++ (append-map ++ (lambda (path) ++ (glob (make-pathname path "*" "setup-info"))) ++ (repo-paths))) + equal?)) + + (define (list-available-extensions trans locn) +diff --git a/chicken.import.scm b/chicken.import.scm +index baa7316..2839b16 100644 +--- a/chicken.import.scm ++++ b/chicken.import.scm +@@ -201,6 +201,7 @@ + repl + repl-prompt + repository-path ++ repository-extra-paths + require + reset + reset-handler +diff --git a/eval.scm b/eval.scm +index bbcd86c..838588d 100644 +--- a/eval.scm ++++ b/eval.scm +@@ -81,6 +81,7 @@ + (define-constant source-file-extension ".scm") + (define-constant setup-file-extension "setup-info") + (define-constant repository-environment-variable "CHICKEN_REPOSITORY") ++(define-constant repository-extra-environment-variable "CHICKEN_REPOSITORY_EXTRA") + (define-constant prefix-environment-variable "CHICKEN_PREFIX") + + ; these are actually in unit extras, but that is used by default +@@ -1180,6 +1181,25 @@ + + (define repository-path ##sys#repository-path) + ++(define ##sys#repository-extra-paths ++ (let* ((repaths (get-environment-variable repository-extra-environment-variable)) ++ (repaths (if repaths ++ (let ((len (string-length repaths))) ++ (let loop ((i 0) (offset 0) (res '())) ++ (cond ((> i len) ++ (reverse res)) ++ ((or (= i len) (eq? #\: (string-ref repaths i))) ++ (loop (+ i 1) (+ i 1) (cons (substring repaths offset i) res))) ++ (else ++ (loop (+ i 1) offset res))))) ++ '()))) ++ (lambda (#!optional val) ++ (if val ++ (set! repaths val) ++ repaths)))) ++ ++(define repository-extra-paths ##sys#repository-extra-paths) ++ + (define ##sys#setup-mode #f) + + (define ##sys#find-extension +@@ -1197,6 +1217,7 @@ + (let loop ((paths (##sys#append + (if ##sys#setup-mode '(".") '()) + (if rp (list rp) '()) ++ (##sys#repository-extra-paths) + (if inc? ##sys#include-pathnames '()) + (if ##sys#setup-mode '() '("."))) )) + (and (pair? paths) +@@ -1256,12 +1277,16 @@ + [string-append string-append] + [read read] ) + (lambda (id loc) +- (and-let* ((rp (##sys#repository-path))) +- (let* ((p (##sys#canonicalize-extension-path id loc)) +- (rpath (string-append rp "/" p ".")) ) +- (cond ((file-exists? (string-append rpath setup-file-extension)) +- => (cut with-input-from-file <> read) ) +- (else #f) ) ) ) ) )) ++ (let loop ((rpaths (cons (##sys#repository-path) (##sys#repository-extra-paths)))) ++ (and (pair? rpaths) ++ (let ((rp (car rpaths))) ++ (if (not rp) ++ (loop (cdr rpaths)) ++ (let* ((p (##sys#canonicalize-extension-path id loc)) ++ (rpath (string-append rp "/" p ".")) ) ++ (cond ((file-exists? (string-append rpath setup-file-extension)) ++ => (cut with-input-from-file <> read) ) ++ (else (loop (cdr rpaths))) ) )) ))) ) )) + + (define (extension-information ext) + (##sys#extension-information ext 'extension-information) ) +-- +2.1.0 + diff --git a/pkgs/development/compilers/chicken/default.nix b/pkgs/development/compilers/chicken/default.nix index 8fd99973cbc1..0e210343a72f 100644 --- a/pkgs/development/compilers/chicken/default.nix +++ b/pkgs/development/compilers/chicken/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, makeWrapper, bootstrap-chicken ? null }: let version = "4.9.0.1"; @@ -8,18 +8,57 @@ let else if isBSD then "bsd" else if isSunOS then "solaris" else "linux"; # Should be a sane default + lib = stdenv.lib; in stdenv.mkDerivation { name = "chicken-${version}"; + binaryVersion = 7; + src = fetchurl { url = "http://code.call-cc.org/releases/4.9.0/chicken-${version}.tar.gz"; sha256 = "0598mar1qswfd8hva9nqs88zjn02lzkqd8fzdd21dz1nki1prpq4"; }; + setupHook = lib.ifEnable (bootstrap-chicken != null) ./setup-hook.sh; + buildFlags = "PLATFORM=${platform} PREFIX=$(out) VARDIR=$(out)/var/lib"; installFlags = "PLATFORM=${platform} PREFIX=$(out) VARDIR=$(out)/var/lib"; + # We need a bootstrap-chicken to regenerate the c-files after + # applying a patch to add support for CHICKEN_REPOSITORY_EXTRA + patches = lib.ifEnable (bootstrap-chicken != null) [ + ./0001-Introduce-CHICKEN_REPOSITORY_EXTRA.patch + ]; + + buildInputs = [ + makeWrapper + ] ++ (lib.ifEnable (bootstrap-chicken != null) [ + bootstrap-chicken + ]); + + preBuild = lib.ifEnable (bootstrap-chicken != null) '' + # Backup the build* files - those are generated from hostname, + # git-tag, etc. and we don't need/want that + mkdir -p build-backup + mv buildid buildbranch buildtag.h build-backup + + # Regenerate eval.c after the patch + make spotless $buildFlags + + mv build-backup/* . + ''; + + postInstall = '' + for f in $out/bin/* + do + wrapProgram $f \ + --prefix PATH : ${stdenv.gcc}/bin + done + ''; + + # TODO: Assert csi -R files -p '(pathname-file (repository-path))' == binaryVersion + meta = { homepage = http://www.call-cc.org/; license = "BSD"; diff --git a/pkgs/development/compilers/chicken/eggDerivation.nix b/pkgs/development/compilers/chicken/eggDerivation.nix new file mode 100644 index 000000000000..97ce9d9be79b --- /dev/null +++ b/pkgs/development/compilers/chicken/eggDerivation.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchegg, chicken, makeWrapper }: +{ name, src +, buildInputs ? [] +, chickenInstallFlags ? [] +, cscOptions ? [] +, ...} @ args: + +let + libPath = "${chicken}/var/lib/chicken/${toString chicken.binaryVersion}/"; + overrides = import ./overrides.nix; + lib = stdenv.lib; + baseName = (builtins.parseDrvName name).name; + override = if builtins.hasAttr baseName overrides + then + builtins.getAttr baseName overrides + else + {}; +in +stdenv.mkDerivation ({ + name = "chicken-${name}"; + propagatedBuildInputs = buildInputs ++ [ chicken ]; + propagatedUserEnvPkgs = buildInputs ++ [ chicken ]; + buildInputs = [ makeWrapper ]; + + CSC_OPTIONS = stdenv.lib.concatStringsSep " " cscOptions; + + CHICKEN_REPOSITORY = libPath; + CHICKEN_INSTALL_PREFIX = "$out"; + + installPhase = '' + runHook preInstall + + chicken-install -p $out ${stdenv.lib.concatStringsSep " " chickenInstallFlags} + + for f in $out/bin/* + do + wrapProgram $f \ + --set CHICKEN_REPOSITORY $CHICKEN_REPOSITORY \ + --prefix CHICKEN_REPOSITORY_EXTRA : "$out/lib/chicken/${toString chicken.binaryVersion}/:$CHICKEN_REPOSITORY_EXTRA" \ + --prefix CHICKEN_INCLUDE_PATH \; \"$CHICKEN_INCLUDE_PATH\;$out/share/\" \ + --prefix PATH : "$out/bin:${chicken}/bin:$CHICKEN_REPOSITORY_EXTRA:$CHICKEN_REPOSITORY" + done + + runHook postInstall + ''; +} // (builtins.removeAttrs args ["name" "buildInputs"]) // override) diff --git a/pkgs/development/compilers/chicken/overrides.nix b/pkgs/development/compilers/chicken/overrides.nix new file mode 100644 index 000000000000..9fdda9b6d9fe --- /dev/null +++ b/pkgs/development/compilers/chicken/overrides.nix @@ -0,0 +1,10 @@ +{ + setup-helper = { + preBuild = '' + substituteInPlace setup-helper.setup \ + --replace "(chicken-home)" \"$out/share/\" + + cat setup-helper.setup + ''; + }; +} diff --git a/pkgs/development/compilers/chicken/setup-hook.sh b/pkgs/development/compilers/chicken/setup-hook.sh new file mode 100644 index 000000000000..8d6b990a7e05 --- /dev/null +++ b/pkgs/development/compilers/chicken/setup-hook.sh @@ -0,0 +1,7 @@ +addChickenRepositoryPath() { + addToSearchPathWithCustomDelimiter : CHICKEN_REPOSITORY_EXTRA "$1/lib/chicken/7/" + # addToSearchPathWithCustomDelimiter \; CHICKEN_INCLUDE_PATH "$1/share/" + export CHICKEN_INCLUDE_PATH="$1/share;$CHICKEN_INCLUDE_PATH" +} + +envHooks=(${envHooks[@]} addChickenRepositoryPath) diff --git a/pkgs/development/compilers/cmucl/binary.nix b/pkgs/development/compilers/cmucl/binary.nix index 55f64234a32e..c3a960388bb4 100644 --- a/pkgs/development/compilers/cmucl/binary.nix +++ b/pkgs/development/compilers/cmucl/binary.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { which runs on most major Unix platforms. It mainly conforms to the ANSI Common Lisp standard. ''; - license = "free"; # public domain + license = stdenv.lib.licenses.free; # public domain homepage = http://www.cons.org/cmucl/; }; } diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index 96a3d2abfc66..c48d74249e19 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -1,25 +1,20 @@ -{ stdenv, fetchurl, gcc, unzip, curl }: +{ stdenv, fetchurl, unzip, curl }: stdenv.mkDerivation { - name = "dmd-2.064.2"; + name = "dmd-2.066.1"; src = fetchurl { - url = http://downloads.dlang.org/releases/2013/dmd.2.064.2.zip; - sha256 = "1i0jdybigffwyb7c43j0c4aayxx3b93zzqrjxyw6zgp06yhi06pm"; + url = http://downloads.dlang.org/releases/2014/dmd.2.066.1.zip; + sha256 = "1qifwgrl6h232zsnvcx3kmb5d0fsy7j9zv17r3b4vln7x5rvzc66"; }; - buildInputs = [ gcc unzip curl ]; + buildInputs = [ unzip curl ]; - configurePhase = ""; - patchPhase = '' - cp src/VERSION src/dmd/ - cp license.txt src/phobos/LICENSE_1_0.txt - ''; buildPhase = '' cd src/dmd make -f posix.mak INSTALL_DIR=$out export DMD=$PWD/dmd - cd ../druntime + cd ../druntime make -f posix.mak INSTALL_DIR=$out DMD=$DMD cd ../phobos make -f posix.mak INSTALL_DIR=$out DMD=$DMD @@ -28,25 +23,36 @@ stdenv.mkDerivation { installPhase = '' cd src/dmd - tee dmd.conf.default << EOF - [Environment] - DFLAGS=-I$out/import -L-L$out/lib - EOF + mkdir $out + mkdir $out/bin + cp dmd $out/bin + + cd ../druntime + mkdir $out/include + mkdir $out/include/d2 + cp -r import/* $out/include/d2 - make -f posix.mak INSTALL_DIR=$out install - export DMD=$PWD/dmd - cd ../druntime - make -f posix.mak INSTALL_DIR=$out install cd ../phobos - make -f posix.mak INSTALL_DIR=$out install - cd ../.. + mkdir $out/lib + ${let bits = if stdenv.is64bit then "64" else "32"; in + "cp generated/linux/release/${bits}/libphobos2.a $out/lib" + } + + cp -r std $out/include/d2 + cp -r etc $out/include/d2 + + cd $out/bin + tee dmd.conf << EOF + [Environment] + DFLAGS=-I$out/include/d2 -L-L$out/lib -L--no-warn-search-mismatch -L--export-dynamic + EOF ''; - meta = { + meta = with stdenv.lib; { description = "D language compiler"; homepage = http://dlang.org/; - license = "open source, see included files"; - maintainers = with stdenv.lib.maintainers; [ vlstill ]; - platforms = stdenv.lib.platforms.unix; + license = licenses.free; # parts under different licenses + platforms = platforms.unix; }; } + diff --git a/pkgs/development/compilers/elm/elm-get.nix b/pkgs/development/compilers/elm/elm-get.nix new file mode 100644 index 000000000000..d01a3226d29b --- /dev/null +++ b/pkgs/development/compilers/elm/elm-get.nix @@ -0,0 +1,25 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, aesonPretty, ansiWlPprint, binary, Elm, filepath +, HTTP, httpClient, httpClientTls, httpTypes, mtl, network +, optparseApplicative, vector +}: + +cabal.mkDerivation (self: { + pname = "elm-get"; + version = "0.1.3"; + sha256 = "1did7vjd1h2kh5alndd2b63zi8b1m9hf6k1k75yxwvw6f6mz5i4q"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson aesonPretty ansiWlPprint binary Elm filepath HTTP httpClient + httpClientTls httpTypes mtl network optparseApplicative vector + ]; + jailbreak = true; + meta = { + homepage = "http://github.com/elm-lang/elm-get"; + description = "Tool for sharing and using Elm libraries"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/compilers/elm/elm-reactor.nix b/pkgs/development/compilers/elm/elm-reactor.nix new file mode 100644 index 000000000000..7b53d9190d8f --- /dev/null +++ b/pkgs/development/compilers/elm/elm-reactor.nix @@ -0,0 +1,29 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, blazeHtml, blazeMarkup, cmdargs, Elm, fetchgit, filepath +, fsnotify, HTTP, mtl, snapCore, snapServer, systemFilepath, time +, transformers, unorderedContainers, websockets, websocketsSnap +}: + +cabal.mkDerivation (self: { + pname = "elm-reactor"; + version = "0.1"; + src = fetchgit { + url = "git://github.com/elm-lang/elm-reactor.git"; + sha256 = "1e45ef26a9b1c1748737dce071a7f2587d0d22643085942a98006f9b11d11dfe"; + rev = "8715046c5bc8b18f0540069c1a9a65f3aa8332e1"; + }; + isLibrary = false; + isExecutable = true; + buildDepends = [ + blazeHtml blazeMarkup cmdargs Elm filepath fsnotify HTTP mtl + snapCore snapServer systemFilepath time transformers + unorderedContainers websockets websocketsSnap + ]; + meta = { + homepage = "http://elm-lang.org"; + description = "Interactive development tool for Elm programs"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/compilers/elm/elm-repl.nix b/pkgs/development/compilers/elm/elm-repl.nix new file mode 100644 index 000000000000..ffeea93f9fb4 --- /dev/null +++ b/pkgs/development/compilers/elm/elm-repl.nix @@ -0,0 +1,28 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, bytestringTrie, cmdargs, Elm, filepath, haskeline, HUnit +, mtl, parsec, QuickCheck, testFramework, testFrameworkHunit +, testFrameworkQuickcheck2 +}: + +cabal.mkDerivation (self: { + pname = "elm-repl"; + version = "0.3"; + sha256 = "10a4a2ybg5dlshpklnisb957lknb0w8s3ppaq5p5y6ylqik8ak0a"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + bytestringTrie cmdargs Elm filepath haskeline mtl parsec + ]; + testDepends = [ + bytestringTrie cmdargs Elm filepath haskeline HUnit mtl parsec + QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 + ]; + meta = { + homepage = "https://github.com/elm-lang/elm-repl"; + description = "a REPL for Elm"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/compilers/elm/elm.nix b/pkgs/development/compilers/elm/elm.nix index 622f182e8c56..38e1d7de2c6d 100644 --- a/pkgs/development/compilers/elm/elm.nix +++ b/pkgs/development/compilers/elm/elm.nix @@ -1,27 +1,30 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, aesonPretty, binary, blazeHtml, blazeMarkup -, cmdargs, filemanip, filepath, HUnit, indents, languageEcmascript -, languageGlsl, mtl, pandoc, parsec, QuickCheck, scientific -, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text -, transformers, unionFind, unorderedContainers, yaml +, cheapskate, cmdargs, filemanip, filepath, highlightingKate, HUnit +, indents, languageEcmascript, languageGlsl, mtl, parsec +, QuickCheck, testFramework, testFrameworkHunit +, testFrameworkQuickcheck2, text, transformers, unionFind +, unorderedContainers }: cabal.mkDerivation (self: { pname = "Elm"; - version = "0.12.3"; - sha256 = "1v6h9qbbz27ikh19xwjbyfw0zi5ag9x1gp0khh9v4af1g0j86320"; + version = "0.13"; + sha256 = "1l6p00h0717blwvia0gvqpsakq8jy44fxc6brr4qxs5g4yjcjnmh"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson aesonPretty binary blazeHtml blazeMarkup cmdargs filepath - indents languageEcmascript languageGlsl mtl pandoc parsec - scientific text transformers unionFind unorderedContainers yaml + aeson aesonPretty binary blazeHtml blazeMarkup cheapskate cmdargs + filepath highlightingKate indents languageEcmascript languageGlsl + mtl parsec text transformers unionFind unorderedContainers ]; testDepends = [ - aeson aesonPretty binary blazeHtml blazeMarkup cmdargs filemanip - filepath HUnit indents languageEcmascript languageGlsl mtl pandoc - parsec QuickCheck scientific testFramework testFrameworkHunit - testFrameworkQuickcheck2 text transformers unionFind - unorderedContainers yaml + aeson aesonPretty binary blazeHtml blazeMarkup cheapskate cmdargs + filemanip filepath highlightingKate HUnit indents + languageEcmascript languageGlsl mtl parsec QuickCheck testFramework + testFrameworkHunit testFrameworkQuickcheck2 text transformers + unionFind unorderedContainers ]; doCheck = false; preConfigure = '' diff --git a/pkgs/development/compilers/emscripten-fastcomp/default.nix b/pkgs/development/compilers/emscripten-fastcomp/default.nix index 3eb9aef528c0..a8180947f4a0 100644 --- a/pkgs/development/compilers/emscripten-fastcomp/default.nix +++ b/pkgs/development/compilers/emscripten-fastcomp/default.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/kripken/emscripten-fastcomp; description = "emscripten llvm"; maintainers = with maintainers; [ bosu ]; - license = "University of Illinois/NCSA Open Source License"; + license = stdenv.lib.licenses.ncsa; }; } diff --git a/pkgs/development/compilers/epic/default.nix b/pkgs/development/compilers/epic/default.nix index 6ea377387ec6..ae4d73d6e209 100644 --- a/pkgs/development/compilers/epic/default.nix +++ b/pkgs/development/compilers/epic/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "epic"; - version = "0.9.3"; - sha256 = "1x8y3ljha8r52pw83mjfv5i49dq0b7i1xbxg8j9hlvr2vwfa4237"; + version = "0.9.3.2"; + sha256 = "1l73absns4ci20brkdjg1r1l9p4xxx88vax736diqik7rl7zrx9h"; isLibrary = true; isExecutable = true; buildDepends = [ Cabal mtl ]; @@ -16,7 +16,5 @@ cabal.mkDerivation (self: { description = "Compiler for a simple functional language"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - broken = true; }; }) diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix index a2863663bea9..bf2e10b2c629 100644 --- a/pkgs/development/compilers/fpc/lazarus.nix +++ b/pkgs/development/compilers/fpc/lazarus.nix @@ -1,45 +1,55 @@ -args : with args; -rec { - version = "1.0.2"; - versionSuffix = "-0"; - src = fetchurl { +{ +stdenv, fetchurl +, fpc +, gtk, glib, pango, atk, gdk_pixbuf +, libXi, inputproto, libX11, xproto, libXext, xextproto +, makeWrapper +}: +let + s = + rec { + version = "1.2.6"; + versionSuffix = "-0"; url = "mirror://sourceforge/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${version}/lazarus-${version}${versionSuffix}.tar.gz"; - sha256 = "17a94wig8b4yrkq42wng4qbal7n77axkynwh78wday5whsp7div8"; + sha256 = "1sjyc2l46hyd5ic5hr6vscy4qr9kazyhiyddy7bfs9vgf54fdiy0"; + name = "lazarus-${version}"; }; - - buildInputs = [fpc gtk glib libXi inputproto + buildInputs = [ + fpc gtk glib libXi inputproto libX11 xproto libXext xextproto pango atk - stdenv.gcc makeWrapper gdk_pixbuf]; - configureFlags = []; + stdenv.gcc makeWrapper gdk_pixbuf + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchurl { + inherit (s) url sha256; + }; makeFlags = [ - "LAZARUS_INSTALL_DIR=$out/lazarus/" - "INSTALL_PREFIX=$out/" "FPC=fpc" "PP=fpc" + "REQUIRE_PACKAGES+=tachartlazaruspkg" + "bigide" ]; - - /* doConfigure should be specified separately */ - phaseNames = ["preBuild" "doMakeInstall" "postInstall"]; - - preBuild = fullDepEntry ('' - export NIX_LDFLAGS='-lXi -lX11 -lglib-2.0 -lgtk-x11-2.0 -lgdk-x11-2.0 -lc -lXext -lpango-1.0 -latk-1.0 -lgdk_pixbuf-2.0 -lcairo' + preBuild = '' + export makeFlags="$makeFlags LAZARUS_INSTALL_DIR=$out/lazarus/ INSTALL_PREFIX=$out/" + export NIX_LDFLAGS="$NIX_LDFLAGS -lXi -lX11 -lglib-2.0 -lgtk-x11-2.0 -lgdk-x11-2.0 -lc -lXext -lpango-1.0 -latk-1.0 -lgdk_pixbuf-2.0 -lcairo -lgcc_s" export LCL_PLATFORM=gtk2 - mkdir -p $out/share + mkdir -p $out/share "$out/lazarus" tar xf ${fpc.src} --strip-components=1 -C $out/share -m sed -e 's@/usr/fpcsrc@'"$out/share/fpcsrc@" -i ide/include/unix/lazbaseconf.inc - '') - ["minInit" "defEnsureDir" "doUnpack"]; - - postInstall = fullDepEntry ('' + ''; + postInstall = '' wrapProgram $out/bin/startlazarus --prefix NIX_LDFLAGS ' ' "'$NIX_LDFLAGS'" \ --prefix LCL_PLATFORM ' ' "'$LCL_PLATFORM'" - '') ["doMakeInstall" "minInit" "defEnsureDir"]; - - name = "lazarus-${version}"; + ''; meta = { + inherit (s) version; + license = stdenv.lib.licenses.gpl2Plus ; + platforms = stdenv.lib.platforms.linux; description = "Lazarus graphical IDE for FreePascal language"; homepage = http://www.lazarus.freepascal.org; - maintainers = [args.lib.maintainers.raskin]; - #platforms = args.lib.platforms.linux; + maintainers = [stdenv.lib.maintainers.raskin]; }; } diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix index 99e893c79d1c..179c70a5f47d 100644 --- a/pkgs/development/compilers/fsharp/default.nix +++ b/pkgs/development/compilers/fsharp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "fsharp-${version}"; - version = "3.1.1.25"; + version = "3.1.1.26"; src = fetchurl { url = "https://github.com/fsharp/fsharp/archive/${version}.tar.gz"; - sha256 = "1vrgw7qk4g78mjjapc1a1frribcgya4cdrwahv3i26z9s10g5h3d"; + sha256 = "1yz3cq8ys6ryc6x3a0qyc100swrg2q3az8x8in1lp7c2c0l02zb2"; }; buildInputs = [ mono pkgconfig autoconf automake which ]; diff --git a/pkgs/development/compilers/gambit/default.nix b/pkgs/development/compilers/gambit/default.nix index 3d9f2596c96c..cc8c80653ba2 100644 --- a/pkgs/development/compilers/gambit/default.nix +++ b/pkgs/development/compilers/gambit/default.nix @@ -1,28 +1,22 @@ -x@{stdenv, fetchurl, builderDefsPackage, ...}: -builderDefsPackage -(a : -let - s = import ./src-for-default.nix; - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); -in -rec { - src = a.fetchUrlFromSrcInfo s; +{ stdenv, fetchurl }: - inherit (s) name; - inherit buildInputs; - configureFlags = ["--enable-shared"]; +stdenv.mkDerivation rec { + name = "gambit-${version}"; + version = "4.7.3"; + devver = "4_7_3"; + + src = fetchurl { + url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.7/source/gambc-v${devver}-devel.tgz"; + sha256 = "12jbr6bc0zmc7vw07a9pliadbvqgwkpmw6cj8awz73clv1j7pxha"; + }; + + configureFlags = [ "--enable-shared" "--enable-single-host" ]; - /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "doMakeInstall"]; - meta = { - description = "Scheme to C compiler"; - maintainers = [ - a.lib.maintainers.raskin - ]; - platforms = with a.lib.platforms; - linux ++ freebsd; + description = "Optimizing Scheme to C compiler"; + homepage = "http://gambitscheme.org"; + license = stdenv.lib.licenses.lgpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin ]; }; -}) x +} diff --git a/pkgs/development/compilers/gambit/src-for-default.nix b/pkgs/development/compilers/gambit/src-for-default.nix deleted file mode 100644 index 83d0c764561c..000000000000 --- a/pkgs/development/compilers/gambit/src-for-default.nix +++ /dev/null @@ -1,9 +0,0 @@ -rec { - version="v4_6_1"; - name="gambit-v4_6_1"; - hash="0ad6c63dg5ggaamixxinvlf3128mra8xzss5chh66lkii4dc3m7g"; - url="http://www.iro.umontreal.ca/~gambit/download/gambit/v4.6/source/gambc-${version}-devel.tgz"; - advertisedUrl="http://www.iro.umontreal.ca/~gambit/download/gambit/v4.6/source/gambc-v4_6_1-devel.tgz"; - - -} diff --git a/pkgs/development/compilers/gambit/src-info-for-default.nix b/pkgs/development/compilers/gambit/src-info-for-default.nix deleted file mode 100644 index cd32f9d3f821..000000000000 --- a/pkgs/development/compilers/gambit/src-info-for-default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - downloadPage = "http://dynamo.iro.umontreal.ca/~gambit/wiki/index.php/Main_Page"; - baseName = "gambit"; - sourceRegexp = "[.]tgz"; - versionExtractorSedScript = ''s/.*-(v[_0-9]+)-devel[.].*/\1/''; - versionReferenceCreator = ''$(replaceAllVersionOccurences)''; -} diff --git a/pkgs/development/compilers/gcc-arm-embedded/default.nix b/pkgs/development/compilers/gcc-arm-embedded/default.nix index 62e08d1fa7c0..b6f6ac51ba2a 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/default.nix @@ -1,4 +1,4 @@ -{ stdenv, bzip2, patchelf, glibc, gcc, fetchurl, version, releaseType, sha256 }: +{ stdenv, bzip2, patchelf, glibc, gcc, fetchurl, version, releaseType, sha256, ncurses }: with stdenv.lib; let versionParts = splitString "-" version; # 4.7 2013q3 20130916 @@ -31,7 +31,7 @@ stdenv.mkDerivation { for f in $(find $out); do if [ -f "$f" ] && patchelf "$f" 2> /dev/null; then patchelf --set-interpreter ${glibc}/lib/ld-linux.so.2 \ - --set-rpath $out/lib:${gcc}/lib \ + --set-rpath $out/lib:${gcc}/lib:${ncurses}/lib \ "$f" || true fi done diff --git a/pkgs/development/compilers/gcc/3.3/builder.sh b/pkgs/development/compilers/gcc/3.3/builder.sh deleted file mode 100644 index 12e35f88b945..000000000000 --- a/pkgs/development/compilers/gcc/3.3/builder.sh +++ /dev/null @@ -1,86 +0,0 @@ -source $stdenv/setup - - -FIXINC_DUMMY=$NIX_BUILD_TOP/dummy -mkdir $FIXINC_DUMMY - - -# libstdc++ needs this; otherwise it will use /lib/cpp, which is a Bad -# Thing. -export CPP="gcc -E" - - -preConfigure() { - - if test "$noSysDirs" = "1"; then - # Disable the standard include directories. - cat >> ./gcc/cppdefault.h <<EOF -#undef LOCAL_INCLUDE_DIR -#undef SYSTEM_INCLUDE_DIR -#undef STANDARD_INCLUDE_DIR -EOF - fi - - # Determine the frontends to build. - langs="c" - if test -n "$langCC"; then - langs="$langs,c++" - fi - if test -n "$langFortran"; then - langs="$langs,f77" - fi - - # Perform the build in a different directory. - mkdir ../build - cd ../build - - configureScript=../$sourceRoot/configure - configureFlags="--enable-languages=$langs --disable-multilib" -} - - -postConfigure() { - if test "$noSysDirs" = "1"; then - # Patch some of the makefiles to force linking against our own - # glibc. - if test -e $NIX_GCC/nix-support/orig-libc; then - - # Figure out what extra flags to pass to the gcc compilers - # being generated to make sure that they use our glibc. - extraFlags="$(cat $NIX_GCC/nix-support/libc-cflags)" - for i in $(cat $NIX_GCC/nix-support/libc-ldflags) $(cat $NIX_GCC/nix-support/libc-ldflags-before); do - extraFlags="$extraFlags -Wl,$i" - done - - # Use *real* header files, otherwise a limits.h is generated - # that does not include Glibc's limits.h (notably missing - # SSIZE_MAX, which breaks the build). - export FIXINC_DUMMY=$(cat $NIX_GCC/nix-support/orig-libc)/include - fi - - mf=Makefile - sed \ - -e "s^FLAGS_FOR_TARGET =\(.*\)^FLAGS_FOR_TARGET = \1 $extraFlags^" \ - < $mf > $mf.tmp - mv $mf.tmp $mf - - mf=gcc/Makefile - sed \ - -e "s^X_CFLAGS =\(.*\)^X_CFLAGS = \1 $extraFlags^" \ - < $mf > $mf.tmp - mv $mf.tmp $mf - - # Patch gcc/Makefile to prevent fixinc.sh from "fixing" system - # header files from /usr/include. - mf=gcc/Makefile - sed \ - -e "s^NATIVE_SYSTEM_HEADER_DIR =\(.*\)^NATIVE_SYSTEM_HEADER_DIR = $FIXINC_DUMMY^" \ - < $mf > $mf.tmp - mv $mf.tmp $mf - fi -} - - -buildFlags="bootstrap" - -genericBuild diff --git a/pkgs/development/compilers/gcc/3.3/default.nix b/pkgs/development/compilers/gcc/3.3/default.nix deleted file mode 100644 index 23501489925a..000000000000 --- a/pkgs/development/compilers/gcc/3.3/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchurl, noSysDirs -, langC ? true, langCC ? true, langFortran ? false -}: - -assert langC; - -# !!! impurity: finds /usr/bin/as, /usr/bin/ranlib. - -stdenv.mkDerivation { - name = "gcc-3.3.6"; - - builder = ./builder.sh; - - src = fetchurl { - url = http://ftp.gnu.org/gnu/gcc/gcc-3.3.6/gcc-3.3.6.tar.bz2; - md5 = "6936616a967da5a0b46f1e7424a06414"; - }; - - # inspiration: https://aur.archlinux.org/packages/g77/ - postPatch = '' - substituteInPlace gcc/config/i386/linux.h --replace 'struct siginfo' siginfo_t - ''; - - inherit noSysDirs langC langCC langFortran; - - meta = { - homepage = "http://gcc.gnu.org/"; - license = "GPL/LGPL"; - description = "GNU Compiler Collection, 3.3.x"; - }; -} diff --git a/pkgs/development/compilers/gcc/4.2-apple64/default.nix b/pkgs/development/compilers/gcc/4.2-apple64/default.nix index b2444ebb9bff..42d9f29e2b5b 100644 --- a/pkgs/development/compilers/gcc/4.2-apple64/default.nix +++ b/pkgs/development/compilers/gcc/4.2-apple64/default.nix @@ -4,6 +4,7 @@ , gmp ? null, mpfr ? null, bison ? null, flex ? null }: +assert false; assert stdenv.isDarwin; assert langF77 -> gmp != null; diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index 8528be077295..0f08a908bfd4 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -474,6 +474,8 @@ stdenv.mkDerivation ({ # Strip kills static libs of other archs (hence cross != null) // optionalAttrs (!stripped || cross != null) { dontStrip = true; NIX_STRIP_DEBUG = 0; } +// optionalAttrs (enableMultilib) { dontMoveLib64 = true; } + // optionalAttrs langVhdl rec { name = "ghdl-0.29"; diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 7166d325b31c..c240acb5e897 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -526,4 +526,6 @@ stdenv.mkDerivation ({ # Strip kills static libs of other archs (hence cross != null) // optionalAttrs (!stripped || cross != null) { dontStrip = true; NIX_STRIP_DEBUG = 0; } + +// optionalAttrs (enableMultilib) { dontMoveLib64 = true; } ) diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index d38040a48b38..ef7846fadd07 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -52,7 +52,7 @@ assert langGo -> langCC; with stdenv.lib; with builtins; -let version = "4.9.1"; +let version = "4.9.2"; # Whether building a cross-compiler for GNU/Hurd. crossGNU = cross != null && cross.config == "i586-pc-gnu"; @@ -153,7 +153,6 @@ let version = "4.9.1"; " --disable-libssp --disable-nls" + " --without-headers" + " --disable-threads " + - " --disable-libmudflap " + " --disable-libgomp " + " --disable-libquadmath" + " --disable-shared" + @@ -206,7 +205,7 @@ stdenv.mkDerivation ({ src = fetchurl { url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2"; - sha256 = "0zki3ngi0gsidnmsp88mjl2868cc7cm5wm1vwqw6znja28d7hd6k"; + sha256 = "1pbjp4blk2ycaa6r3jmw4ky5f1s9ji3klbqgv8zs2sl5jn1cj810"; }; inherit patches; @@ -513,4 +512,6 @@ stdenv.mkDerivation ({ # Strip kills static libs of other archs (hence cross != null) // optionalAttrs (!stripped || cross != null) { dontStrip = true; NIX_STRIP_DEBUG = 0; } + +// optionalAttrs (enableMultilib) { dontMoveLib64 = true; } ) diff --git a/pkgs/development/compilers/gcl/default.nix b/pkgs/development/compilers/gcl/default.nix index e9c69261fbc1..f2252fe83813 100644 --- a/pkgs/development/compilers/gcl/default.nix +++ b/pkgs/development/compilers/gcl/default.nix @@ -17,11 +17,11 @@ assert a.stdenv.gcc.libc != null ; rec { src = a.fetchurl { - sha256 = "177vz8z74mky5nrq6qlfvnzvb1prw8jmlv4cwfx8w7k3k818y1a4"; - url="http://gnu.spinellicreations.com/gcl/gcl-2.6.11.tar.gz"; + sha256 = "1s4hs2qbjqmn9h88l4xvsifq5c3dlc5s74lyb61rdi5grhdlkf4f"; + url="http://gnu.spinellicreations.com/gcl/${name}.tar.gz"; }; - name = "gcl-2.6.11"; + name = "gcl-2.6.12"; inherit buildInputs; configureFlags = [ "--enable-ansi" diff --git a/pkgs/development/compilers/gforth/default.nix b/pkgs/development/compilers/gforth/default.nix index d710f6729956..c6165bb55869 100644 --- a/pkgs/development/compilers/gforth/default.nix +++ b/pkgs/development/compilers/gforth/default.nix @@ -1,10 +1,27 @@ { stdenv, fetchurl, m4 }: -stdenv.mkDerivation rec { - name = "gforth-0.7.3"; +let + version = "0.7.3"; +in +stdenv.mkDerivation { + name = "gforth-${version}"; src = fetchurl { - url = "http://ftp.gnu.org/gnu/gforth/gforth-0.7.3.tar.gz"; + url = "http://ftp.gnu.org/gnu/gforth/gforth-${version}.tar.gz"; sha256 = "1c1bahc9ypmca8rv2dijiqbangm1d9av286904yw48ph7ciz4qig"; }; + buildInputs = [ m4 ]; -} \ No newline at end of file + + postInstall = '' + mkdir -p $out/share/emacs/site-lisp + cp gforth.el $out/share/emacs/site-lisp/ + ''; + + meta = { + description = "The Forth implementation of the GNU project"; + homepage = https://www.gnu.org/software/gforth/; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.all; + maintainers = with stdenv.lib.maintainers; [ the-kenny ]; + }; +} diff --git a/pkgs/development/compilers/ghc/7.4.2-binary.nix b/pkgs/development/compilers/ghc/7.4.2-binary.nix index 7000081e5dbe..f6dc974227cc 100644 --- a/pkgs/development/compilers/ghc/7.4.2-binary.nix +++ b/pkgs/development/compilers/ghc/7.4.2-binary.nix @@ -62,7 +62,8 @@ stdenv.mkDerivation rec { '' else ""); configurePhase = '' - ./configure --prefix=$out --with-gmp-libraries=${gmp}/lib --with-gmp-includes=${gmp}/include + ./configure --prefix=$out --with-gmp-libraries=${gmp}/lib --with-gmp-includes=${gmp}/include \ + --with-clang ''; # Stripping combined with patchelf breaks the executables (they die diff --git a/pkgs/development/compilers/ghc/7.8.3-binary.nix b/pkgs/development/compilers/ghc/7.8.3-binary.nix new file mode 100644 index 000000000000..f2c65c6ad053 --- /dev/null +++ b/pkgs/development/compilers/ghc/7.8.3-binary.nix @@ -0,0 +1,93 @@ +{stdenv, fetchurl, perl, ncurses, gmp}: + +stdenv.mkDerivation rec { + version = "7.8.3"; + + name = "ghc-${version}-binary"; + + src = + if stdenv.system == "i686-linux" then + fetchurl { + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-unknown-linux.tar.bz2"; + sha256 = "0gny7knhss0w0d9r6jm1gghrcb8kqjvj94bb7hxf9syrk4fxlcxi"; + } + else if stdenv.system == "x86_64-linux" then + fetchurl { + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-unknown-linux.tar.bz2"; + sha256 = "043jabd0lh6n1zlqhysngbpvlsdznsa2mmsj08jyqgahw9sjb5ns"; + } + else if stdenv.system == "i686-darwin" then + fetchurl { + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-apple-darwin.tar.bz2"; + sha256 = "1vrbs3pzki37hzym1f1nh07lrqh066z3ypvm81fwlikfsvk4djc0"; + } + else if stdenv.system == "x86_64-darwin" then + fetchurl { + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.bz2"; + sha256 = "1ja0cq5xyjcvjpvjmm4nzhkpmwfs2kjlldbc48lxcs9rmqi7rnay"; + } + else throw "cannot bootstrap GHC on this platform"; + + buildInputs = [perl]; + + postUnpack = + # Strip is harmful, see also below. It's important that this happens + # first. The GHC Cabal build system makes use of strip by default and + # has hardcoded paths to /usr/bin/strip in many places. We replace + # those below, making them point to our dummy script. + '' + mkdir "$TMP/bin" + for i in strip; do + echo '#! ${stdenv.shell}' > "$TMP/bin/$i" + chmod +x "$TMP/bin/$i" + done + PATH="$TMP/bin:$PATH" + '' + + # We have to patch the GMP paths for the integer-gmp package. + '' + find . -name integer-gmp.buildinfo \ + -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp}/lib@" {} \; + '' + + # On Linux, use patchelf to modify the executables so that they can + # find editline/gmp. + (if stdenv.isLinux then '' + find . -type f -perm +100 \ + -exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-rpath "${ncurses}/lib:${gmp}/lib" {} \; + sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 + sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 + for prog in ld ar gcc strip ranlib; do + find . -name "setup-config" -exec sed -i "s@/usr/bin/$prog@$(type -p $prog)@g" {} \; + done + '' else ""); + + configurePhase = '' + ./configure --prefix=$out --with-gmp-libraries=${gmp}/lib \ + --with-gmp-includes=${gmp}/include + ''; + + # Stripping combined with patchelf breaks the executables (they die + # with a segfault or the kernel even refuses the execve). (NIXPKGS-85) + dontStrip = true; + + # No building is necessary, but calling make without flags ironically + # calls install-strip ... + buildPhase = "true"; + + postInstall = + '' + # Sanity check, can ghc create executables? + cd $TMP + mkdir test-ghc; cd test-ghc + cat > main.hs << EOF + module Main where + main = putStrLn "yes" + EOF + $out/bin/ghc --make main.hs + echo compilation ok + [ $(./main) == "yes" ] + ''; + + meta.license = stdenv.lib.licenses.bsd3; + meta.platforms = ["x86_64-linux" "i686-linux" "i686-darwin" "x86_64-darwin"]; +} diff --git a/pkgs/development/compilers/ghc/7.8.3.nix b/pkgs/development/compilers/ghc/7.8.3.nix index dbcba36fa8ff..9f5fc4b4e50d 100644 --- a/pkgs/development/compilers/ghc/7.8.3.nix +++ b/pkgs/development/compilers/ghc/7.8.3.nix @@ -26,21 +26,19 @@ stdenv.mkDerivation rec { export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}" ''; - configureFlags = "--with-gcc=${stdenv.gcc}/bin/gcc"; - # required, because otherwise all symbols from HSffi.o are stripped, and # that in turn causes GHCi to abort stripDebugFlags = [ "-S" "--keep-file-symbols" ]; - meta = { + meta = with stdenv.lib; { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; - maintainers = [ - stdenv.lib.maintainers.marcweber - stdenv.lib.maintainers.andres - stdenv.lib.maintainers.simons - ]; - inherit (ghc.meta) license platforms; + maintainers = [ maintainers.marcweber maintainers.andres maintainers.simons ]; + inherit (ghc.meta) license; + # Filter old "i686-darwin" platform which is unsupported these days. + platforms = filter (x: elem x platforms.all) ghc.meta.platforms; + # Disable Darwin builds: <https://github.com/NixOS/nixpkgs/issues/2689>. + hydraPlatforms = filter (x: !elem x platforms.darwin) meta.platforms; }; } diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index a5b4aeaff393..c50a79b84747 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ghc, perl, gmp, ncurses, happy, alex }: stdenv.mkDerivation rec { - version = "7.9.20140814"; + version = "7.9.20141106"; name = "ghc-${version}"; src = fetchurl { - url = "http://deb.haskell.org/dailies/2014-08-14/ghc_${version}.orig.tar.bz2"; - sha256 = "05vmlbzbfv72z570xmlh8n003z9xc4l5hixjqvczyyyisdvmyaa3"; + url = "http://deb.haskell.org/dailies/2014-11-06/ghc_${version}.orig.tar.bz2"; + sha256 = "1si8wx8a2lrg5ba13vwpisssxa3rcxi5a7fqxhgapa8d2i2w7gaz"; }; buildInputs = [ ghc perl gmp ncurses happy alex ]; diff --git a/pkgs/development/compilers/go/1.1.nix b/pkgs/development/compilers/go/1.1.nix index e54d12ef9c50..14ea73c23840 100644 --- a/pkgs/development/compilers/go/1.1.nix +++ b/pkgs/development/compilers/go/1.1.nix @@ -89,6 +89,7 @@ stdenv.mkDerivation { ''; meta = { + branch = "1.1"; homepage = http://golang.org/; description = "The Go Programming language"; license = "BSD"; diff --git a/pkgs/development/compilers/go/1.2.nix b/pkgs/development/compilers/go/1.2.nix index 8567337be0b5..9f95ad59b77c 100644 --- a/pkgs/development/compilers/go/1.2.nix +++ b/pkgs/development/compilers/go/1.2.nix @@ -79,10 +79,11 @@ stdenv.mkDerivation { ''; meta = { + branch = "1.2"; homepage = http://golang.org/; description = "The Go Programming language"; license = "BSD"; - maintainers = with stdenv.lib.maintainers; [ pierron viric wizeman ]; + maintainers = with stdenv.lib.maintainers; [ pierron viric ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/compilers/go/1.3.nix b/pkgs/development/compilers/go/1.3.nix index ca117baca787..3c465c3471f0 100644 --- a/pkgs/development/compilers/go/1.3.nix +++ b/pkgs/development/compilers/go/1.3.nix @@ -8,8 +8,8 @@ let loaderArm = "${glibc}/lib/ld-linux.so.3"; srcs = { golang = fetchurl { - url = https://storage.googleapis.com/golang/go1.3.2.src.tar.gz; - sha256 = "1yq6xygc5lhn3b9d4sbddlf8dzi3wihyzjwyc8rhiwrb3hj8hx1y"; + url = https://storage.googleapis.com/golang/go1.3.3.src.tar.gz; + sha1 = "b54b7deb7b7afe9f5d9a3f5dd830c7dede35393a"; }; tools = fetchhg { url = https://code.google.com/p/go.tools/; @@ -20,7 +20,7 @@ let in stdenv.mkDerivation { - name = "go-1.3.2"; + name = "go-1.3.3"; src = srcs.golang; diff --git a/pkgs/development/compilers/go/default.nix b/pkgs/development/compilers/go/default.nix index b9a76a6f82b3..e289ce14ee11 100644 --- a/pkgs/development/compilers/go/default.nix +++ b/pkgs/development/compilers/go/default.nix @@ -83,6 +83,7 @@ stdenv.mkDerivation { ''; meta = { + branch = "1.0"; homepage = http://golang.org/; description = "The Go Programming language"; license = "BSD"; diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix index 1873b58e802e..c48e6d5a81e1 100644 --- a/pkgs/development/compilers/hhvm/default.nix +++ b/pkgs/development/compilers/hhvm/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ cmake pkgconfig boost boost.lib libunwind mariadb libmemcached pcre + [ cmake pkgconfig boost libunwind mariadb libmemcached pcre libevent gd curl libxml2 icu flex bison openssl zlib php expat libcap oniguruma libdwarf libmcrypt tbb gperftools bzip2 openldap readline libelf uwimap binutils cyrus_sasl pam glog libpng libxslt ocaml diff --git a/pkgs/development/compilers/iasl/default.nix b/pkgs/development/compilers/iasl/default.nix index 09245ba6d4bd..973a07b1295f 100644 --- a/pkgs/development/compilers/iasl/default.nix +++ b/pkgs/development/compilers/iasl/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation { meta = { description = "Intel ACPI Compiler"; homepage = http://www.acpica.org/; - license = "iasl"; # FIXME: is this a free software license? + license = stdenv.lib.licenses.iasl; }; } diff --git a/pkgs/development/compilers/icedtea-web/default.nix b/pkgs/development/compilers/icedtea-web/default.nix index c9697bac36c7..34e025c62dd5 100644 --- a/pkgs/development/compilers/icedtea-web/default.nix +++ b/pkgs/development/compilers/icedtea-web/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "icedtea-web-${version}"; - version = "1.5"; + version = "1.5.2"; src = fetchurl { url = "http://icedtea.wildebeest.org/download/source/${name}.tar.gz"; - sha256 = "0bbwa944kaam0r8ldlqrrj9z9zj54v6zdc3q663ck59shw5z828w"; + sha256 = "1wrvl66qj0yhaqqhcq24005ci5sc3w005809cld55iiwagr8z7mj"; }; buildInputs = [ gtk2 xulrunner zip pkgconfig npapi_sdk ]; diff --git a/pkgs/development/compilers/icedtea/cppflags-include-fix.patch b/pkgs/development/compilers/icedtea/cppflags-include-fix.patch index 8931c122538f..731a8d075488 100644 --- a/pkgs/development/compilers/icedtea/cppflags-include-fix.patch +++ b/pkgs/development/compilers/icedtea/cppflags-include-fix.patch @@ -1,7 +1,8 @@ -diff -Naur openjdk-orig/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt.gmk ---- openjdk-orig/jdk/make/sun/awt/mawt.gmk 2012-08-28 19:13:16.000000000 -0400 -+++ openjdk/jdk/make/sun/awt/mawt.gmk 2013-01-22 11:56:22.315418708 -0500 -@@ -234,12 +234,6 @@ +diff --git openjdk-orig/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt.gmk +index c6ab06d..23a14da 100644 +--- openjdk-orig/jdk/make/sun/awt/mawt.gmk ++++ openjdk/jdk/make/sun/awt/mawt.gmk +@@ -270,12 +270,6 @@ LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB) endif # !HEADLESS endif # PLATFORM @@ -11,6 +12,6 @@ diff -Naur openjdk-orig/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt. - $(wildcard /usr/include/X11/extensions)) -endif - - ifeq ($(PLATFORM), macosx)) + ifeq ($(PLATFORM), macosx) CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \ -I$(OPENWIN_HOME)/include diff --git a/pkgs/development/compilers/icedtea/default.nix b/pkgs/development/compilers/icedtea/default.nix index 56c9e69c9a4a..15cf616cc30d 100644 --- a/pkgs/development/compilers/icedtea/default.nix +++ b/pkgs/development/compilers/icedtea/default.nix @@ -24,7 +24,7 @@ let defSrc = name: with (builtins.getAttr name srcInfo.bundles); fetchurl { inherit url sha256; - name = "${pkgName}-${name}-${baseNameOf url}"; + name = "${pkgName}-${baseNameOf url}"; }; bundleNames = builtins.attrNames srcInfo.bundles; diff --git a/pkgs/development/compilers/icedtea/sources.nix b/pkgs/development/compilers/icedtea/sources.nix index 098f774b66cf..2be55870ea7e 100644 --- a/pkgs/development/compilers/icedtea/sources.nix +++ b/pkgs/development/compilers/icedtea/sources.nix @@ -1,55 +1,47 @@ # This file is autogenerated from update.py in the same directory. { icedtea7 = rec { - branch = "2.4"; - version = "${branch}.7"; + version = "2.5.3"; url = "http://icedtea.wildebeest.org/download/source/icedtea-${version}.tar.xz"; - sha256 = "17a58wcxvg0dd7ka99k819ci6bga2b9l8kp67fq8z3w0yyz76sdn"; + sha256 = "1w7i6j4wmg2ixv7d24mad6gphspnkb9w30azjdp4jqn2zqn95wpl"; - hg_url = "http://icedtea.classpath.org/hg/release/icedtea7-forest-${branch}"; + common_url = "http://icedtea.classpath.org/download/drops/icedtea7/${version}"; bundles = { openjdk = rec { - changeset = "13970e76b784"; - url = "${hg_url}/archive/${changeset}.tar.gz"; - sha256 = "bcd45546509defc439f42f230c0ca64e8aa6ec00542c3634aab3a4c10be3fe6b"; + url = "${common_url}/openjdk.tar.bz2"; + sha256 = "3ba1a30762f5d5890e8ee6af11f52213ab9c574c01f07c75a081c42034f5d5c9"; }; corba = rec { - changeset = "e6ad5b912691"; - url = "${hg_url}/corba/archive/${changeset}.tar.gz"; - sha256 = "cc37272df260d08207c84763d4c39d7807728ba2d5908276b9bc63e925e70674"; + url = "${common_url}/corba.tar.bz2"; + sha256 = "8ceb2cd60782b7fc14b88e3d366f273873fa5436cf0e36b86406c0905b7dc43c"; }; jaxp = rec { - changeset = "94b7e8e0d96f"; - url = "${hg_url}/jaxp/archive/${changeset}.tar.gz"; - sha256 = "3515cd105c29563bf78432576e658005386f45d7c3b2b7eac7af86cf196aaaea"; + url = "${common_url}/jaxp.tar.bz2"; + sha256 = "2d13a82078f3f2b8831d1e670e5e75719336a56490df64f16ab7647674a272ef"; }; jaxws = rec { - changeset = "bd9a50a78d04"; - url = "${hg_url}/jaxws/archive/${changeset}.tar.gz"; - sha256 = "3e107628080d84a80a78ef0ef9dc3664989291dd17c8bacf031d59fba7bd7f4d"; + url = "${common_url}/jaxws.tar.bz2"; + sha256 = "5a63d85307203f1aed1e31459ad5e32687909e0640d424ff6f540d9b1cceeb1e"; }; jdk = rec { - changeset = "9448fff93286"; - url = "${hg_url}/jdk/archive/${changeset}.tar.gz"; - sha256 = "9222e5317264f20d4a0b8170b4c4d02459cda98333c18e3a75064e7856ff58be"; + url = "${common_url}/jdk.tar.bz2"; + sha256 = "40c4dda969be0ecd213e79269184e19cfc32100b83777dc529b3cf4b6aa3e12f"; }; langtools = rec { - changeset = "8c26a3c39128"; - url = "${hg_url}/langtools/archive/${changeset}.tar.gz"; - sha256 = "5af29e32344e2f2fc0beb31f91b8312f2a0d6d02c53b4cb700ee2e27bcf1043b"; + url = "${common_url}/langtools.tar.bz2"; + sha256 = "516f6c21719f4b5a2092847c147cde7890c5a30d4aed9425ff667c0164ef1dd0"; }; hotspot = rec { - changeset = "69b542696e5b"; - url = "${hg_url}/hotspot/archive/${changeset}.tar.gz"; - sha256 = "e3bbed298ed7c77169fdfddc47cdb85c62ef2e5e7ea04ca28aa8779861efca65"; + url = "${common_url}/hotspot.tar.bz2"; + sha256 = "8c8e1f7e97f47fe4029e0b0ba42b3515474adabe64e1fbee15c0e2e22a13aa28"; }; }; }; diff --git a/pkgs/development/compilers/icedtea/update.py b/pkgs/development/compilers/icedtea/update.py index ba3c5fc51ad1..c41cf3d38d2f 100755 --- a/pkgs/development/compilers/icedtea/update.py +++ b/pkgs/development/compilers/icedtea/update.py @@ -3,7 +3,7 @@ import subprocess, urllib.request, re, os, tarfile from html.parser import HTMLParser -HG_URL = 'http://icedtea.classpath.org/hg/release/icedtea{}-forest-{}' +URL = 'http://icedtea.classpath.org/download/drops/icedtea{}/{}' DOWNLOAD_URL = 'http://icedtea.wildebeest.org/download/source/' DOWNLOAD_HTML = DOWNLOAD_URL + '?C=M;O=D' @@ -81,7 +81,7 @@ def get_latest_version_url(major): def get_old_bundle_attrs(jdk, bundle): attrs = {} - for attr in ('changeset', 'url', 'sha256'): + for attr in ('url', 'sha256'): attrs[attr] = get_jdk_attr(jdk, 'bundles.{}.{}'.format(bundle, attr)) return attrs @@ -89,7 +89,7 @@ def get_old_bundle_attrs(jdk, bundle): def get_old_attrs(jdk): attrs = {} - for attr in ('branch', 'version', 'url', 'sha256'): + for attr in ('version', 'url', 'sha256'): attrs[attr] = get_jdk_attr(jdk, attr) attrs['bundles'] = {} @@ -128,8 +128,8 @@ def get_new_bundle_attr(makefile, bundle, attr): return m.group(1) -def get_new_bundle_attrs(jdk, branch, path): - hg_url = HG_URL.format(jdk, branch) +def get_new_bundle_attrs(jdk, version, path): + url = URL.format(jdk, version) attrs = {} @@ -137,31 +137,22 @@ def get_new_bundle_attrs(jdk, branch, path): tar = tarfile.open(name = path, mode = 'r:xz') makefile = get_member_file(tar, 'Makefile.am') - hotspot_map = get_member_file(tar, 'hotspot.map') + hotspot_map = get_member_file(tar, 'hotspot.map.in') + + hotspot_map = hotspot_map.replace('@ICEDTEA_RELEASE@', version) for bundle in BUNDLES: battrs = {} + battrs['url'] = '{}/{}.tar.bz2'.format(url, bundle) if bundle == 'hotspot': - m = re.search(r'^default (.*?) (.*?) (.*?)$', hotspot_map, re.MULTILINE) + m = re.search(r'^default (.*?) (.*?) (.*?) (.*?)$', hotspot_map, re.MULTILINE) if m == None: - raise Exception('Could not find info for hotspot bundle in hotspot.map') - - battrs['url'] = '{}/archive/{}.tar.gz'.format(m.group(1), m.group(2)) - battrs['changeset'] = m.group(2) - battrs['sha256'] = m.group(3) - - attrs[bundle] = battrs - continue - - changeset = get_new_bundle_attr(makefile, bundle, 'changeset') - battrs['changeset'] = changeset - battrs['sha256'] = get_new_bundle_attr(makefile, bundle, 'sha256sum') + raise Exception('Could not find info for hotspot bundle in hotspot.map.in') - if bundle == 'openjdk': - battrs['url'] = '{}/archive/{}.tar.gz'.format(hg_url, changeset) + battrs['sha256'] = m.group(4) else: - battrs['url'] = '{}/{}/archive/{}.tar.gz'.format(hg_url, bundle, changeset) + battrs['sha256'] = get_new_bundle_attr(makefile, bundle, 'sha256sum') attrs[bundle] = battrs @@ -193,7 +184,6 @@ def get_new_attrs(jdk): print('Update available, generating new attributes for JDK {}...'.format(jdk)) attrs['version'] = version - attrs['branch'] = '.'.join(version.split('.')[:2]) attrs['url'] = url print('Downloading tarball from url "{}"...'.format(url)) @@ -203,7 +193,7 @@ def get_new_attrs(jdk): print('Inspecting tarball for bundle information...') - attrs['bundles'] = get_new_bundle_attrs(jdk, attrs['branch'], path) + attrs['bundles'] = get_new_bundle_attrs(jdk, attrs['version'], path) print('Done!') @@ -212,21 +202,19 @@ def get_new_attrs(jdk): def generate_jdk(jdk): attrs = get_new_attrs(jdk) - branch = attrs['branch'] - src_version = attrs['version'].replace(branch, '${branch}') - src_url = attrs['url'].replace(attrs['version'], '${version}') + version = attrs['version'] + src_url = attrs['url'].replace(version, '${version}') - hg_url = HG_URL.format(jdk, branch) - src_hg_url = HG_URL.format(jdk, '${branch}') + common_url = URL.format(jdk, version) + src_common_url = URL.format(jdk, '${version}') src = ' icedtea{} = rec {{\n'.format(jdk) - src += ' branch = "{}";\n'.format(branch) - src += ' version = "{}";\n'.format(src_version) + src += ' version = "{}";\n'.format(version) src += '\n' src += ' url = "{}";\n'.format(src_url) src += ' sha256 = "{}";\n'.format(attrs['sha256']) src += '\n' - src += ' hg_url = "{}";\n'.format(src_hg_url) + src += ' common_url = "{}";\n'.format(src_common_url) src += '\n' src += ' bundles = {\n' @@ -234,11 +222,9 @@ def generate_jdk(jdk): battrs = attrs['bundles'][bundle] b_url = battrs['url'] - b_url = b_url.replace(hg_url, '${hg_url}') - b_url = b_url.replace(battrs['changeset'], '${changeset}') + b_url = b_url.replace(common_url, '${common_url}') src += ' {} = rec {{\n'.format(bundle) - src += ' changeset = "{}";\n'.format(battrs['changeset']) src += ' url = "{}";\n'.format(b_url) src += ' sha256 = "{}";\n'.format(battrs['sha256']) src += ' };\n' diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix index 2af8ec1b022a..16bf3bdeb954 100644 --- a/pkgs/development/compilers/idris/default.nix +++ b/pkgs/development/compilers/idris/default.nix @@ -1,31 +1,30 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, annotatedWlPprint, ansiTerminal, ansiWlPprint -, base64Bytestring, binary, blazeHtml, blazeMarkup, boehmgc, Cabal +, base64Bytestring, binary, blazeHtml, blazeMarkup, boehmgc , cheapskate, deepseq, filepath, fingertree, gmp, happy, haskeline -, languageJava, lens, libffi, llvmGeneral, llvmGeneralPure, mtl -, network, optparseApplicative, parsers, split, text, time -, transformers, trifecta, unorderedContainers, utf8String, vector -, vectorBinaryInstances, xml, zlib +, lens, libffi, mtl, network, optparseApplicative, parsers, split +, text, time, transformers, trifecta, unorderedContainers +, utf8String, vector, vectorBinaryInstances, xml, zlib }: cabal.mkDerivation (self: { pname = "idris"; - version = "0.9.14.3"; - sha256 = "03zppfqjamy4mdwcfx3x1wzxav67ha1zgnynrxhvdqw3zcsrwnlr"; + version = "0.9.15.1"; + sha256 = "0r31jcqs9kgknm66v7bbcgj9md7z49sgvn0nhk1dwg8jj2rmfll8"; isLibrary = true; isExecutable = true; buildDepends = [ annotatedWlPprint ansiTerminal ansiWlPprint base64Bytestring binary - blazeHtml blazeMarkup Cabal cheapskate deepseq filepath fingertree - haskeline languageJava lens libffi llvmGeneral llvmGeneralPure mtl - network optparseApplicative parsers split text time transformers - trifecta unorderedContainers utf8String vector - vectorBinaryInstances xml zlib + blazeHtml blazeMarkup cheapskate deepseq filepath fingertree + haskeline lens libffi mtl network optparseApplicative parsers split + text time transformers trifecta unorderedContainers utf8String + vector vectorBinaryInstances xml zlib ]; buildTools = [ happy ]; extraLibraries = [ boehmgc gmp ]; - configureFlags = "-fllvm -fgmp -fffi"; + configureFlags = "-fgmp -fffi"; + jailbreak = true; meta = { homepage = "http://www.idris-lang.org/"; description = "Functional Programming Language with Dependent Types"; diff --git a/pkgs/development/compilers/julia/0.2.1.nix b/pkgs/development/compilers/julia/0.2.1.nix index f7d20a1e01f0..b701558efe0c 100644 --- a/pkgs/development/compilers/julia/0.2.1.nix +++ b/pkgs/development/compilers/julia/0.2.1.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://github.com/JuliaLang/julia.git"; - rev = "e44b5939057d87c1e854077108a1a6d66203f4fa"; + rev = "refs/tags/v${version}"; sha256 = "7ee0f267bc1ae286764ced3c0c695c335a6f8d67bd7b3ca7e4de259333c9426a"; }; @@ -79,6 +79,7 @@ stdenv.mkDerivation rec { do makeFlags="$makeFlags USE_SYSTEM_$i=1 " done + makeFlags="$makeFlags JULIA_CPU_TARGET=core2"; copy_kill_hash(){ cp "$1" "$2/$(basename "$1" | sed -e 's/^[a-z0-9]*-//')" diff --git a/pkgs/development/compilers/julia/0.3.0.nix b/pkgs/development/compilers/julia/0.3.3.nix index 3259fee55bfc..10441fd785aa 100644 --- a/pkgs/development/compilers/julia/0.3.0.nix +++ b/pkgs/development/compilers/julia/0.3.3.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre, zlib , readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl - , ncurses, libunistring, lighttpd, patchelf, openblas, liblapack + , ncurses, libunistring, patchelf, openblas, liblapack , tcl, tk, xproto, libX11, git, mpfr, which } : @@ -11,63 +11,60 @@ let in stdenv.mkDerivation rec { pname = "julia"; - version = "0.3.0"; + version = "0.3.3"; name = "${pname}-${version}"; dsfmt_ver = "2.2"; grisu_ver = "1.1.1"; - openblas_ver = "v0.2.10"; + openblas_ver = "v0.2.12"; lapack_ver = "3.5.0"; arpack_ver = "3.1.5"; - lighttpd_ver = "1.4.29"; - patchelf_ver = "0.6"; - pcre_ver = "8.31"; + patchelf_ver = "0.8"; + pcre_ver = "8.36"; utf8proc_ver = "1.1.6"; dsfmt_src = fetchurl { url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmt_ver}.tar.gz"; name = "dsfmt-${dsfmt_ver}.tar.gz"; - sha256 = "bc3947a9b2253a869fcbab8ff395416cb12958be9dba10793db2cd7e37b26899"; + md5 = "cb61be3be7254eae39684612c524740d"; }; grisu_src = fetchurl { url = "http://double-conversion.googlecode.com/files/double-conversion-${grisu_ver}.tar.gz"; - sha256 = "e1cabb73fd69e74f145aea91100cde483aef8b79dc730fcda0a34466730d4d1d"; + md5 = "29b533ed4311161267bff1a9a97e2953"; }; openblas_src = fetchurl { url = "https://github.com/xianyi/OpenBLAS/tarball/${openblas_ver}"; name = "openblas-${openblas_ver}.tar.gz"; - sha256 = "06i0q4qnd5q5xljzrgvda0gjsczc6l2pl9hw6dn2qjpw38al73za"; + md5 = "dfc868e0c134855639f036d2723bf4be"; }; arpack_src = fetchurl rec { - url = "http://forge.scilab.org/index.php/p/arpack-ng/downloads/get/arpack-ng_${arpack_ver}.tar.gz"; - sha256 = "05fmg4m0yri47rzgsl2mnr1qbzrs7qyd557p3v9wwxxw0rwcwsd2"; + url = "https://github.com/opencollab/arpack-ng/archive/${arpack_ver}.tar.gz"; + md5 = "d84e1b6108d9ee67c0d21aba7099e953"; + name = "arpack-ng-${arpack_ver}.tar.gz"; }; lapack_src = fetchurl { url = "http://www.netlib.org/lapack/lapack-${lapack_ver}.tgz"; name = "lapack-${lapack_ver}.tgz"; - sha256 = "0lk3f97i9imqascnlf6wr5mjpyxqcdj73pgj97dj2mgvyg9z1n4s"; - }; - lighttpd_src = fetchurl { - url = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${lighttpd_ver}.tar.gz"; - sha256 = "ff9f4de3901d03bb285634c5b149191223d17f1c269a16c863bac44238119c85"; + md5 = "b1d3e3e425b2e44a06760ff173104bdf"; }; patchelf_src = fetchurl { url = "http://hydra.nixos.org/build/1524660/download/2/patchelf-${patchelf_ver}.tar.bz2"; - sha256 = "00bw29vdsscsili65wcb5ay0gvg1w0ljd00sb5xc6br8bylpyzpw"; + md5 = "5087261514b4b5814a39c3d3a36eb6ef"; }; pcre_src = fetchurl { url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${pcre_ver}.tar.bz2"; - sha256 = "0g4c0z4h30v8g8qg02zcbv7n67j5kz0ri9cfhgkpwg276ljs0y2p"; + md5 = "b767bc9af0c20bc9c1fe403b0d41ad97"; }; utf8proc_src = fetchurl { url = "http://www.public-software-group.org/pub/projects/utf8proc/v${utf8proc_ver}/utf8proc-v${utf8proc_ver}.tar.gz"; - sha256 = "1rwr84pw92ajjlbcxq0da7yxgg3ijngmrj7vhh2qzsr2h2kqzp7y"; + md5 = "2462346301fac2994c34f5574d6c3ca7"; }; src = fetchgit { url = "git://github.com/JuliaLang/julia.git"; - rev = "refs/tags/v0.3.0"; - sha256 = "1h7icqjiccw26f81r1zwsv31kk6yhavn038h7jp63iv5sdzh5r8i"; + rev = "refs/tags/v${version}"; + md5 = "84266f0201ad34abe8ca1474620fe891"; + name = "julia-git-v${version}"; }; buildInputs = [ gfortran perl m4 gmp pcre llvm readline zlib @@ -76,10 +73,11 @@ stdenv.mkDerivation rec { ]; configurePhase = '' - for i in GMP LLVM PCRE READLINE FFTW LIBUNWIND SUITESPARSE GLPK LIGHTTPD ZLIB MPFR; + for i in GMP LLVM PCRE READLINE FFTW LIBUNWIND SUITESPARSE GLPK ZLIB MPFR; do makeFlags="$makeFlags USE_SYSTEM_$i=1 " done + makeFlags="$makeFlags JULIA_CPU_TARGET=core2"; copy_kill_hash(){ cp "$1" "$2/$(basename "$1" | sed -e 's/^[a-z0-9]*-//')" @@ -142,10 +140,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - postInstall = '' - rm -f "$out"/lib/julia/sys.{so,dylib,dll} - ''; - meta = { description = "High-level performance-oriented dynamical language for technical computing"; homepage = "http://julialang.org/"; diff --git a/pkgs/development/compilers/julia/git-20131013.nix b/pkgs/development/compilers/julia/git-20131013.nix deleted file mode 100644 index ae550f5692d8..000000000000 --- a/pkgs/development/compilers/julia/git-20131013.nix +++ /dev/null @@ -1,140 +0,0 @@ -{ stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre, zlib - , readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl - , ncurses, libunistring, lighttpd, patchelf, openblas, liblapack - , tcl, tk, xproto, libX11, git, mpfr - } : -let - realGcc = stdenv.gcc.gcc; -in -stdenv.mkDerivation rec { - pname = "julia"; - date = "20131013"; - name = "${pname}-git-${date}"; - - grisu_ver = "1.1.1"; - dsfmt_ver = "2.2"; - openblas_ver = "v0.2.2"; - lapack_ver = "3.4.1"; - arpack_ver = "3.1.3"; - clp_ver = "1.14.5"; - lighttpd_ver = "1.4.29"; - patchelf_ver = "0.6"; - pcre_ver = "8.31"; - - grisu_src = fetchurl { - url = "http://double-conversion.googlecode.com/files/double-conversion-${grisu_ver}.tar.gz"; - sha256 = "e1cabb73fd69e74f145aea91100cde483aef8b79dc730fcda0a34466730d4d1d"; - }; - dsfmt_src = fetchurl { - url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmt_ver}.tar.gz"; - name = "dsfmt-${dsfmt_ver}.tar.gz"; - sha256 = "bc3947a9b2253a869fcbab8ff395416cb12958be9dba10793db2cd7e37b26899"; - }; - openblas_src = fetchurl { - url = "https://github.com/xianyi/OpenBLAS/tarball/${openblas_ver}"; - name = "openblas-${openblas_ver}.tar.gz"; - sha256 = "19ffec70f9678f5c159feadc036ca47720681b782910fbaa95aa3867e7e86d8e"; - }; - arpack_src = fetchurl { - url = "http://forge.scilab.org/index.php/p/arpack-ng/downloads/607/get/"; - name = "arpack-ng-${arpack_ver}.tar.gz"; - sha256 = "039w7j3dr1xy35a3hp92zg2g92gmjq6xsv0g4awlb4cffy09nr2d"; - }; - lapack_src = fetchurl { - url = "http://www.netlib.org/lapack/lapack-${lapack_ver}.tgz"; - name = "lapack-${lapack_ver}.tgz"; - sha256 = "93b910f94f6091a2e71b59809c4db4a14655db527cfc5821ade2e8c8ab75380f"; - }; - clp_src = fetchurl { - url = "http://www.coin-or.org/download/source/Clp/Clp-${clp_ver}.tgz"; - name = "clp-${clp_ver}.tar.gz"; - sha256 = "e6cabe8b4319c17a9bbe6fe172194ab6cd1fe6e376f5e9969d3040636ea3a817"; - }; - lighttpd_src = fetchurl { - url = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${lighttpd_ver}.tar.gz"; - sha256 = "ff9f4de3901d03bb285634c5b149191223d17f1c269a16c863bac44238119c85"; - }; - patchelf_src = fetchurl { - url = "http://hydra.nixos.org/build/1524660/download/2/patchelf-${patchelf_ver}.tar.bz2"; - sha256 = "00bw29vdsscsili65wcb5ay0gvg1w0ljd00sb5xc6br8bylpyzpw"; - }; - pcre_src = fetchurl { - url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${pcre_ver}.tar.bz2"; - sha256 = "0g4c0z4h30v8g8qg02zcbv7n67j5kz0ri9cfhgkpwg276ljs0y2p"; - }; - - src = fetchgit { - url = "git://github.com/JuliaLang/julia.git"; - rev = "76d2b87a45fff637473c4c342c9f5f9387675fda"; - sha256 = "079g44r27lv0wsfbg84ihrmgzl73djjjr41xjiaqdph55zqfbn4f"; - }; - - buildInputs = [ gfortran perl m4 gmp pcre llvm readline zlib - fftw fftwSinglePrec libunwind suitesparse glpk ncurses libunistring patchelf - openblas liblapack tcl tk xproto libX11 git mpfr - ]; - - configurePhase = '' - for i in GMP LLVM PCRE LAPACK OPENBLAS BLAS READLINE FFTW LIBUNWIND SUITESPARSE GLPK LIGHTTPD ZLIB MPFR; - do - makeFlags="$makeFlags USE_SYSTEM_$i=1 " - done - - copy_kill_hash(){ - cp "$1" "$2/$(basename "$1" | sed -e 's/^[a-z0-9]*-//')" - } - - for i in "${grisu_src}" "${dsfmt_src}" "${arpack_src}" "${clp_src}" "${patchelf_src}" "${pcre_src}" ; do - copy_kill_hash "$i" deps - done - copy_kill_hash "${dsfmt_src}" deps/random - - ${if realGcc ==null then "" else - ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${realGcc}/lib -L${realGcc}/lib64 -lpcre -llapack -lm -lfftw3f -lfftw3 -lglpk -lunistring -lz -lgmp -lmpfr"''} - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC " - - export LDFLAGS="-L${suitesparse}/lib -L$out/lib/julia -Wl,-rpath,$out/lib/julia" - - export GLPK_PREFIX="${glpk}/include" - - mkdir -p "$out/lib" - sed -e "s@/usr/local/lib@$out/lib@g" -i deps/Makefile - sed -e "s@/usr/lib@$out/lib@g" -i deps/Makefile - - export makeFlags="$makeFlags PREFIX=$out SHELL=${stdenv.shell}" - - export dontPatchELF=1 - - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PWD/usr/lib:$PWD/usr/lib/julia" - ''; - - preBuild = '' - mkdir -p usr/lib - - echo "$out" - mkdir -p "$out/lib" - ( - cd "$(mktemp -d)" - for i in "${suitesparse}"/lib/lib*.a; do - ar -x $i - done - gcc *.o --shared -o "$out/lib/libsuitesparse.so" - ) - cp "$out/lib/libsuitesparse.so" usr/lib - for i in umfpack cholmod amd camd colamd spqr; do - ln -s libsuitesparse.so "$out"/lib/lib$i.so; - ln -s libsuitesparse.so "usr"/lib/lib$i.so; - done - ''; - - preInstall = '' - ''; - - meta = { - description = "High-level performance-oriented dynamical language for technical computing"; - homepage = "http://julialang.org/"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = with stdenv.lib.platforms; linux; - }; -} diff --git a/pkgs/development/compilers/lessc/default.nix b/pkgs/development/compilers/lessc/default.nix index 266e9eb5255f..82052b3d3ca9 100644 --- a/pkgs/development/compilers/lessc/default.nix +++ b/pkgs/development/compilers/lessc/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "lessc-${version}"; - version = "1.4.2"; + version = "1.7.5"; # Upgrade to > 2.x breaks twitter-bootstrap src = fetchgit { url = https://github.com/less/less.js.git; rev = "refs/tags/v${version}"; - sha256 = "1v3b4f1np3mxkj0irh1pk52r26nzpf4k2ax14cbn7mxx16mqjp50"; + sha256 = "0r8bcad247v5fyh543a7dppmfbf49ai4my3vcizk42fsbnjs8q2x"; }; phases = [ "installPhase" ]; diff --git a/pkgs/development/compilers/llvm/3.4/clang.nix b/pkgs/development/compilers/llvm/3.4/clang.nix index 6ec3f7bf44a3..fc33a7809a6c 100644 --- a/pkgs/development/compilers/llvm/3.4/clang.nix +++ b/pkgs/development/compilers/llvm/3.4/clang.nix @@ -1,5 +1,9 @@ { stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src }: +# be sure not to rebuild clang on darwin; some packages request it specifically +# we need to fix those +assert stdenv.isDarwin -> stdenv.gcc.nativeTools; + stdenv.mkDerivation { name = "clang-${version}"; diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix index fbc881fc8e02..d3beb2e7461c 100644 --- a/pkgs/development/compilers/llvm/3.4/llvm.nix +++ b/pkgs/development/compilers/llvm/3.4/llvm.nix @@ -27,7 +27,10 @@ in stdenv.mkDerivation rec { mv compiler-rt-* $sourceRoot/projects/compiler-rt ''; - buildInputs = [ perl groff cmake libxml2 python libffi ] ++ stdenv.lib.optional stdenv.isLinux valgrind; + buildInputs = + [ perl groff cmake libxml2 libffi ] + ++ stdenv.lib.optional (!stdenv.isDarwin) python /* + ++ stdenv.lib.optional stdenv.isLinux valgrind */; propagatedBuildInputs = [ ncurses zlib ]; @@ -65,6 +68,5 @@ in stdenv.mkDerivation rec { license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ shlevy lovek323 raskin viric ]; platforms = stdenv.lib.platforms.all; - broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/compilers/mono/default.nix b/pkgs/development/compilers/mono/default.nix index 1b9e9118d56f..e098f48a24ce 100644 --- a/pkgs/development/compilers/mono/default.nix +++ b/pkgs/development/compilers/mono/default.nix @@ -56,6 +56,6 @@ stdenv.mkDerivation rec { description = "Cross platform, open source .NET development framework"; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [ viric thoughtpolice ]; - license = "free"; # Combination of LGPL/X11/GPL ? + license = stdenv.lib.licenses.free; # Combination of LGPL/X11/GPL ? }; } diff --git a/pkgs/development/compilers/mozart/binary.nix b/pkgs/development/compilers/mozart/binary.nix new file mode 100644 index 000000000000..bcaf917b3c3c --- /dev/null +++ b/pkgs/development/compilers/mozart/binary.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, bash, makeWrapper, coreutils, emacs, tcl, tk, boost, gmp, cacert }: + +assert stdenv.isLinux; + +let + version = "2.0.0"; +in +stdenv.mkDerivation { + name = "mozart-binary-${version}"; + + src = fetchurl { + url = "http://sourceforge.net/projects/mozart-oz/files/v${version}-alpha.0/mozart2-${version}-alpha.0+build.4105.5c06ced-x86_64-linux.tar.gz"; + sha256 = "0rsfrjimjxqbwprpzzlmydl3z3aiwg5qkb052jixdxjyad7gyh5z"; + }; + + libPath = stdenv.lib.makeLibraryPath + [stdenv.gcc.gcc emacs tk tcl boost gmp]; + + builder = ./builder.sh; + + buildInputs = [ makeWrapper ]; + + meta = with stdenv.lib; { + homepage = "http://www.mozart-oz.org/"; + description = "Multiplatform implementation of the Oz programming language"; + longDescription = '' + The Mozart Programming System combines ongoing research in + programming language design and implementation, constraint logic + programming, distributed computing, and human-computer + interfaces. Mozart implements the Oz language and provides both + expressive power and advanced functionality. + ''; + license = licenses.mit; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/compilers/mozart/builder.sh b/pkgs/development/compilers/mozart/builder.sh new file mode 100644 index 000000000000..58fe9a8effea --- /dev/null +++ b/pkgs/development/compilers/mozart/builder.sh @@ -0,0 +1,24 @@ +source $stdenv/setup + +echo "unpacking $src..." +tar xvfz $src + +mkdir -p $out/bin +mkdir -p $out/share + +mv mozart*linux/bin/* $out/bin +mv mozart*linux/share/* $out/share + +patchShebangs $out + +for f in $out/bin/*; do + b=$(basename $f) + if [ $b == "ozemulator" ] || [ $b == "ozwish" ]; then + patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-rpath $libPath \ + $f + continue; + fi + wrapProgram $f \ + --set OZHOME $out +done diff --git a/pkgs/development/compilers/mozart/default.nix b/pkgs/development/compilers/mozart/default.nix deleted file mode 100644 index d649ef46918f..000000000000 --- a/pkgs/development/compilers/mozart/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{stdenv, fetchurl, flex, bison, perl, gmp, zlib, tcl, tk, gdbm, m4, x11, emacs}: - -stdenv.mkDerivation { - name = "mozart-1.4.0"; - src = fetchurl { - url = http://www.mozart-oz.org/download/mozart-ftp/store/1.4.0-2008-07-02-tar/mozart-1.4.0.20080704-src.tar.gz; - sha256 = "5da73d80b5aa7fa42edca64159a1a076323f090e5c548f3747f94d0afc60b223"; - }; - - buildInputs = [flex bison perl gmp zlib tcl tk gdbm m4 x11 emacs]; - - # micq gives a compile error for me - configureFlags = "--with-tcl=${tcl}/lib --with-tk=${tk}/lib --disable-contrib-micq"; -} diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix index 8219882a2a21..fad8a584ed2a 100644 --- a/pkgs/development/compilers/nasm/default.nix +++ b/pkgs/development/compilers/nasm/default.nix @@ -2,16 +2,17 @@ stdenv.mkDerivation rec { name = "nasm-${version}"; - version = "2.11.05"; - + version = "2.11.05"; # do not update until syslinux is fixed with that version + src = fetchurl { url = "http://www.nasm.us/pub/nasm/releasebuilds/${version}/${name}.tar.bz2"; sha256 = "1sgspnascc0asmwlv3jm1mq4vzx653sa7vlg48z20pfybk7pnhaa"; }; - meta = { + meta = with stdenv.lib; { homepage = http://www.nasm.us/; description = "An 80x86 and x86-64 assembler designed for portability and modularity"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/development/compilers/ocaml/3.10.0.nix b/pkgs/development/compilers/ocaml/3.10.0.nix index 1d68585d93a1..69a6a1f5f676 100644 --- a/pkgs/development/compilers/ocaml/3.10.0.nix +++ b/pkgs/development/compilers/ocaml/3.10.0.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, x11, ncurses }: stdenv.mkDerivation (rec { - + name = "ocaml-3.10.0"; - + src = fetchurl { url = "http://caml.inria.fr/pub/distrib/ocaml-3.10/${name}.tar.bz2"; sha256 = "1ihmx1civ78s7k2hfc05z1s9vbyx2qw7fg8lnbxnfd6zxkk8878d"; @@ -13,7 +13,7 @@ stdenv.mkDerivation (rec { configureFlags = ["-no-tk" "-x11lib" x11]; buildFlags = "world bootstrap world.opt"; buildInputs = [x11 ncurses]; - installTargets = "install installopt"; + installTargets = "install installopt"; patchPhase = '' CAT=$(type -tp cat) sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang @@ -25,7 +25,7 @@ stdenv.mkDerivation (rec { meta = { homepage = http://caml.inria.fr/ocaml; - license = "QPL, LGPL2 (library part)"; + license = with stdenv.lib.licenses; [ qpl lgpl2 ]; description = "Most popular variant of the Caml language"; }; diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/pkgs/development/compilers/ocaml/3.12.1.nix index 16c3cb1d7872..6488d94cc08e 100644 --- a/pkgs/development/compilers/ocaml/3.12.1.nix +++ b/pkgs/development/compilers/ocaml/3.12.1.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://caml.inria.fr/ocaml; + branch = "3.12"; license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; description = "Most popular variant of the Caml language"; diff --git a/pkgs/development/compilers/ocaml/4.00.1.nix b/pkgs/development/compilers/ocaml/4.00.1.nix index 5b1e69b86b08..4e888e143223 100644 --- a/pkgs/development/compilers/ocaml/4.00.1.nix +++ b/pkgs/development/compilers/ocaml/4.00.1.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://caml.inria.fr/ocaml; + branch = "4.00"; license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; description = "Most popular variant of the Caml language"; diff --git a/pkgs/development/compilers/ocaml/4.01.0.nix b/pkgs/development/compilers/ocaml/4.01.0.nix index 2876bce9caff..d178285834ff 100644 --- a/pkgs/development/compilers/ocaml/4.01.0.nix +++ b/pkgs/development/compilers/ocaml/4.01.0.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { sha256 = "b1ca708994180236917ae79e17606da5bd334ca6acd6873a550027e1c0ec874a"; }; + patches = [ ./fix-clang-build-on-osx.diff ]; + prefixKey = "-prefix "; configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11lib "-x11include" x11inc ]; @@ -48,6 +50,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://caml.inria.fr/ocaml; + branch = "4.01"; license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; description = "Most popular variant of the Caml language"; diff --git a/pkgs/development/compilers/ocaml/4.02.0.nix b/pkgs/development/compilers/ocaml/4.02.1.nix index b6753cc6297c..18f9d3736506 100644 --- a/pkgs/development/compilers/ocaml/4.02.0.nix +++ b/pkgs/development/compilers/ocaml/4.02.1.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { x11lib = x11env + "/lib"; x11inc = x11env + "/include"; - name = "ocaml-4.02.0"; + name = "ocaml-4.02.1"; src = fetchurl { url = "http://caml.inria.fr/pub/distrib/ocaml-4.02/${name}.tar.xz"; - sha256 = "1ml5r8vzbwqhnq8jlps6jfgf0vym4nyrnr95mrbym6v5j2gabmw7"; + sha256 = "1p7lqvh64xpykh99014mz21q8fs3qyjym2qazhhbq8scwldv1i38"; }; prefixKey = "-prefix "; @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://caml.inria.fr/ocaml; + branch = "4.02"; license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; description = "Most popular variant of the Caml language"; diff --git a/pkgs/development/compilers/ocaml/fix-clang-build-on-osx.diff b/pkgs/development/compilers/ocaml/fix-clang-build-on-osx.diff new file mode 100644 index 000000000000..d7d9c863858f --- /dev/null +++ b/pkgs/development/compilers/ocaml/fix-clang-build-on-osx.diff @@ -0,0 +1,20 @@ +diff --git a/configure b/configure +index d45e88f..25d872b 100755 +--- a/configure ++++ b/configure +@@ -322,7 +322,14 @@ case "$bytecc,$target" in + bytecccompopts="-fno-defer-pop $gcc_warnings -DSHRINKED_GNUC" + mathlib="";; + *,*-*-darwin*) +- bytecccompopts="-fno-defer-pop $gcc_warnings" ++ # On recent version of OSX, gcc is a symlink to clang ++ if $bytecc --version | grep -q clang; then ++ # -fno-defer-pop is not supported by clang, and make recent ++ # versions of clang to fail ++ bytecccompopts="$gcc_warnings" ++ else ++ bytecccompopts="-fno-defer-pop $gcc_warnings" ++ fi + mathlib="" + mkexe="$mkexe -Wl,-no_compact_unwind" + # Tell gcc that we can use 32-bit code addresses for threaded code diff --git a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix index 4313dcd7537e..9b340f69e90b 100644 --- a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix +++ b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, x11, ncurses }: stdenv.mkDerivation (rec { - + name = "metaocaml-3.09-alpha-30"; - + src = fetchurl { url = "http://www.metaocaml.org/dist/old/MetaOCaml_309_alpha_030.tar.gz"; sha256 = "0migbn0zwfb7yb24dy7qfqi19sv3drqcv4369xi7xzpds2cs35fd"; @@ -13,7 +13,7 @@ stdenv.mkDerivation (rec { configureFlags = ["-no-tk" "-x11lib" x11]; buildFlags = "world bootstrap world.opt"; buildInputs = [x11 ncurses]; - installTargets = "install installopt"; + installTargets = "install installopt"; patchPhase = '' CAT=$(type -tp cat) sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang @@ -25,7 +25,7 @@ stdenv.mkDerivation (rec { meta = { homepage = http://www.metaocaml.org/; - license = "QPL, LGPL2 (library part)"; + license = with stdenv.lib.licenses; [ qpl lgpl2 ]; desctiption = "A compiled, type-safe, multi-stage programming language"; }; diff --git a/pkgs/development/compilers/opa/default.nix b/pkgs/development/compilers/opa/default.nix index c25080229ffa..f0b503bd0be7 100644 --- a/pkgs/development/compilers/opa/default.nix +++ b/pkgs/development/compilers/opa/default.nix @@ -1,32 +1,25 @@ -{ stdenv, fetchurl, which, ocaml, perl, jdk -, findlib, ocaml_ssl, openssl, cryptokit, camlzip, ulex -, ocamlgraph, coreutils, zlib, ncurses, makeWrapper -, gcc, binutils, gnumake, nodejs, git } : +{ stdenv, fetchgit, which, perl, jdk +, ocamlPackages, openssl +, coreutils, zlib, ncurses, makeWrapper +, gcc, binutils, gnumake, nodejs} : stdenv.mkDerivation rec { pname = "opa"; - version = "4308"; + version = "4309"; name = "${pname}-${version}"; - src = fetchurl { - url = "https://github.com/MLstate/opalang/tarball/v${version}"; - name = "opa-${version}.tar.gz"; - sha256 = "1farii9474i14ack6bpqm1jihs6i8pvwky3a7q8v8pbnl4i6lb5g"; + src = fetchgit { + url = https://github.com/MLstate/opalang.git; + rev = "047f58bfd4be35ee30176156b3718c707a6c0f76"; + sha256 = "1jbxfrmpbjjk7qvaxdn47044w5m8wr96q9yx65ib3wlapmjbvdvf"; }; # Paths so the opa compiler code generation will use the same programs as were # used to build opa. - codeGeneratorPaths = "${ocaml}/bin:${gcc}/bin:${binutils}/bin:${gnumake}/bin"; - - prePatch = '' - find . -type f -exec sed -i 's@/usr/bin/env@${coreutils}/bin/env@' {} \; - find . -type f -exec sed -i 's@/usr/bin/perl@${perl}/bin/perl@' {} \; - ''; - - patches = []; + codeGeneratorPaths = "${ocamlPackages.ocaml}/bin:${gcc}/bin:${binutils}/bin:${gnumake}/bin:${nodejs}/bin"; preConfigure = '' - configureFlags="$configureFlags -prefix $out" + patchShebangs . ( cat ./compiler/buildinfos/buildInfos.ml.pre ./compiler/buildinfos/generate_buildinfos.sh . --release --version ./compiler/buildinfos/version_major.txt @@ -36,14 +29,17 @@ stdenv.mkDerivation rec { )> ./compiler/buildinfos/buildInfos.ml ''; - dontAddPrefix = true; + prefixKey = "-prefix "; + + configureFlags = "-ocamlfind ${ocamlPackages.findlib}/bin/ocamlfind "; - configureFlags = "-ocamlfind ${findlib}/bin/ocamlfind "; + buildInputs = [ which perl jdk openssl coreutils zlib ncurses + makeWrapper gcc binutils gnumake nodejs + ] ++ (with ocamlPackages; [ + ocaml findlib ocaml_ssl cryptokit camlzip ulex ocamlgraph + ]); - buildInputs = [ which ocaml perl jdk findlib ocaml_ssl openssl cryptokit camlzip ulex - ocamlgraph coreutils zlib ncurses makeWrapper gcc binutils gnumake - nodejs git - ]; + NIX_LDFLAGS = "-lgcc_s"; postInstall = '' # Have compiler use same tools for code generation as used to build it. @@ -53,7 +49,7 @@ stdenv.mkDerivation rec { # Install emacs mode. mkdir -p $out/share/emacs/site-lisp/opa - install -m 0644 -v ./utils/emacs/{opa-mode.el,site-start.el} $out/share/emacs/site-lisp/opa + install -m 0644 -v ./tools/editors/emacs/{opa-mode.el,site-start.el} $out/share/emacs/site-lisp/opa ''; meta = { @@ -66,15 +62,6 @@ stdenv.mkDerivation rec { homepage = http://opalang.org/; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.kkallio ]; - platforms = [ "x86_64-linux" ]; - # File "compiler/libqmlcompil/dbGen/schema_io.ml", line 199, characters 3-53: - # Error: Signature mismatch: - # ... - # The field `remove_edge_e' is required but not provided - # The field `remove_edge' is required but not provided - # The field `remove_vertex' is required but not provided - # Command exited with code 2. - # make: *** [node] Error 10 - broken = true; + platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/development/compilers/opa/libdir.patch b/pkgs/development/compilers/opa/libdir.patch deleted file mode 100644 index 05c8a89afa87..000000000000 --- a/pkgs/development/compilers/opa/libdir.patch +++ /dev/null @@ -1,93 +0,0 @@ -These patches have the compiler place path flags in various places so that -ocaml and c libraries are found in their Nixpkgs locations. - -diff -x '*~' -Naur MLstate-opalang-6b295a9//build_rules.ml MLstate-opalang-6b295a9-new//build_rules.ml ---- MLstate-opalang-6b295a9//build_rules.ml 2011-11-21 08:07:04.000000000 -0430 -+++ MLstate-opalang-6b295a9-new//build_rules.ml 2011-11-27 00:34:35.845277134 -0430 -@@ -373,7 +373,11 @@ - | Some dep -> dep::list - ) (tags_of_pathname (env "%.opa_plugin")) [] - in -- let lib_dir s = [A"--ml";A"-I";A"--ml";P (if Pathname.exists s then ".." / s else ("+"^s))] in -+ let cryptokitdir_opt = function -+ | Some path -> path -+ | None -> "" -+ in -+ let lib_dir s = [A"--ml";A"-I";A"--ml";P (if Pathname.exists s then ".." / s else (if s = "cryptokit" then (cryptokitdir_opt Config.Libdir.cryptokit) else ("+"^s)))] in - let include_dirs = List.flatten (List.map lib_dir caml_use_lib) in - let files = List.map ((^) path) files in - build_list build files; -diff -x '*~' -Naur MLstate-opalang-6b295a9//config.mli MLstate-opalang-6b295a9-new//config.mli ---- MLstate-opalang-6b295a9//config.mli 2011-11-21 08:07:04.000000000 -0430 -+++ MLstate-opalang-6b295a9-new//config.mli 2011-11-27 00:30:39.312443906 -0430 -@@ -43,6 +43,9 @@ - (** Flag for Dbm present *) - val has_dbm : bool - -+(** openssh link directory *) -+val openssl : string option -+ - (** library directories, if the libs are enabled *) - val libnatpmp : (string*string*string) option (** name of the lib, lib dir, include dir *) - -diff -x '*~' -Naur MLstate-opalang-6b295a9//configure MLstate-opalang-6b295a9-new//configure ---- MLstate-opalang-6b295a9//configure 2011-11-21 08:07:04.000000000 -0430 -+++ MLstate-opalang-6b295a9-new//configure 2011-11-27 00:40:52.496151405 -0430 -@@ -27,6 +27,7 @@ - - NO_CAMLIDL=1 - NO_DBM=1 -+CONFIG_LIB_OPENSSL="" - - while [ $# -gt 0 ]; do - case "$1" in -@@ -51,6 +52,11 @@ - shift - OCAMLOPT=$1 - ;; -+ -openssl) -+ if [ $# -lt 2 ]; then echo "Error: option $1 requires an argument" >&2; exit 1; fi -+ shift -+ CONFIG_LIB_OPENSSL=$1 -+ ;; - -ocamlfind) - if [ $# -lt 2 ]; then echo "Error: option $1 requires an argument" >&2; exit 1; fi - shift -@@ -647,6 +653,8 @@ - let miniupnpc = $(camlopt "$HAS_MINIUPNPC" "$(camlstrtuple "${MINIUPNPC[@]}")") - let has_dbm = $(camlbool "$HAS_DBM") - -+let openssl = $(camlopt "$CONFIG_LIB_OPENSSL" '"'"$CONFIG_LIB_OPENSSL"'"') -+ - let available = [ $TAGS_LIST] - let all_tags = [ $(for t in $ALL_TAGS_LIST; do echo -n "\"$t\"; "; done)] - -diff -x '*~' -Naur MLstate-opalang-6b295a9//qml2ocaml/qml2ocamlOptions.ml MLstate-opalang-6b295a9-new//qml2ocaml/qml2ocamlOptions.ml ---- MLstate-opalang-6b295a9//qml2ocaml/qml2ocamlOptions.ml 2011-11-21 08:07:04.000000000 -0430 -+++ MLstate-opalang-6b295a9-new//qml2ocaml/qml2ocamlOptions.ml 2011-11-27 00:32:57.721442828 -0430 -@@ -44,6 +44,7 @@ - - let options_linker = - ["-w a"] -+ @ (match Config.openssl with | Some dir -> ["-ccopt"; "-L"^dir] | None -> []) - @ (if Base.is_windows then - ["-cclib"; "Dnsapi.lib"; "-cclib"; "libeay32.lib"; "-cclib"; "ssleay32.lib" (*; "ssl_stubs.obj" *)] - else []) -@@ -51,11 +52,13 @@ - (** - Absolute path for include directory, will be passed with the option -I to the ocaml compiler. - *) -+ let uselibdirpath = fun po p -> match po with | Some path -> path | None -> p -+ - let server_include_dir = [ -- "+zip" ; "+site-lib/zip" ; "+site-lib/camlzip" ; -- "+ssl" ; "+site-lib/ssl" ; -- "+cryptokit"; "+site-lib/cryptokit" ; -- "+ulex" ; "+site-lib/ulex" ; -+ uselibdirpath Config.Libdir.camlzip "+zip" ; "+site-lib/zip" ; "+site-lib/camlzip" ; -+ uselibdirpath Config.Libdir.ssl "+ssl" ; "+site-lib/ssl" ; -+ uselibdirpath Config.Libdir.cryptokit "+cryptokit"; "+site-lib/cryptokit" ; -+ uselibdirpath Config.Libdir.ulex "+ulex" ; "+site-lib/ulex" ; - ] @ ( - if Config.has_dbm then [ - "+dbm" ; "+site-lib/dbm" ; diff --git a/pkgs/development/compilers/opa/locate.patch b/pkgs/development/compilers/opa/locate.patch deleted file mode 100644 index e67e6bab2603..000000000000 --- a/pkgs/development/compilers/opa/locate.patch +++ /dev/null @@ -1,14 +0,0 @@ -Needed to have ocamlfind discover ocamlgraph with Nixpkgs. - -diff -x '*~' -Naur MLstate-opalang-ee92891/configure MLstate-opalang-ee92891-new//configure ---- MLstate-opalang-ee92891/configure 2011-09-30 05:41:18.000000000 -0430 -+++ MLstate-opalang-ee92891-new//configure 2011-11-24 13:47:01.332558705 -0430 -@@ -567,7 +567,7 @@ - fi - - # - checking ocamlgraph --if ! CONFIG_LIB_OCAMLGRAPH=$(locate-ocaml-lib "Graph" "ocamlgraph/graph") -+if ! CONFIG_LIB_OCAMLGRAPH=$(locate-ocaml-lib "Graph" "ocamlgraph" "graph") - then lib-not-found "ocamlgraph" "libocamlgraph-ocaml-dev" - fi - diff --git a/pkgs/development/compilers/opendylan/bin.nix b/pkgs/development/compilers/opendylan/bin.nix index 19f8eab482cb..4f0a1bd05129 100644 --- a/pkgs/development/compilers/opendylan/bin.nix +++ b/pkgs/development/compilers/opendylan/bin.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { meta = { homepage = http://opendylan.org; - description = "Dylan is a multi-paradigm functional and object-oriented programming language."; + description = "A multi-paradigm functional and object-oriented programming language"; license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/compilers/opendylan/default.nix b/pkgs/development/compilers/opendylan/default.nix index e4bdcf7889bb..66e62f8965e6 100644 --- a/pkgs/development/compilers/opendylan/default.nix +++ b/pkgs/development/compilers/opendylan/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { meta = { homepage = http://opendylan.org; - description = "Dylan is a multi-paradigm functional and object-oriented programming language."; + description = "A multi-paradigm functional and object-oriented programming language"; license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/compilers/oraclejdk/jdk7-linux.nix b/pkgs/development/compilers/oraclejdk/jdk7-linux.nix index cf4990c33b5f..9ba8eaea0629 100644 --- a/pkgs/development/compilers/oraclejdk/jdk7-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk7-linux.nix @@ -1,9 +1,9 @@ import ./jdk-linux-base.nix { productVersion = "7"; - patchVersion = "67"; + patchVersion = "71"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html; - sha256_i686 = "0p58pag1x85r911lxhmr4blk687ivjqigflx175vp7rcmmj108xn"; - sha256_x86_64 = "0db36jg08qy8712qy6lgyifdqlqb468rrnjm3aa6937ixl9ixpal"; + sha256_i686 = "d3c09a35abc0464d8ad70dfe17e02597eb4c5d489ff4d1bcd14088aeb5016424"; + sha256_x86_64 = "80d5705fc37fc4eabe3cea480e0530ae0436c2c086eb8fc6f65bb21e8594baf8"; jceName = "UnlimitedJCEPolicyJDK7.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html; sha256JCE = "7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d"; diff --git a/pkgs/development/compilers/oraclejdk/jdk7psu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk7psu-linux.nix new file mode 100644 index 000000000000..8b71cb66610b --- /dev/null +++ b/pkgs/development/compilers/oraclejdk/jdk7psu-linux.nix @@ -0,0 +1,10 @@ +import ./jdk-linux-base.nix { + productVersion = "7"; + patchVersion = "72"; + downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html; + sha256_i686 = "0376c8a0280752b4389b6cb193d463826c55c821587d0278b7fea665a140f407"; + sha256_x86_64 = "dd1d438e1b7d4b9bb5ea4659f2103b577d1568da51b53f97b736b3232eeade8e"; + jceName = "UnlimitedJCEPolicyJDK7.zip"; + jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html; + sha256JCE = "7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d"; +} diff --git a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix index 63af45643749..f51cca0c478f 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 = "11"; + patchVersion = "25"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256_i686 = "3981e6fb7d35b20ac3c05ec56fb3798ac1cd872a9e968bb3d77a718af7b146d1"; - sha256_x86_64 = "f3593b248b64cc53bf191f45b92a1f10e8c5099c2f84bd5bd5d6465dfd07a8e9"; + sha256_i686 = "17f396a541db09c732032185f10f9c6eb42ac7b5776814602342de9655b2e0e2"; + sha256_x86_64 = "057f660799be2307d2eefa694da9d3fce8e165807948f5bcaa04f72845d2f529"; jceName = "jce_policy-8.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; sha256JCE = "f3020a3922efd6626c2fff45695d527f34a8020e938a49292561f18ad1320b59"; diff --git a/pkgs/development/compilers/rdmd/default.nix b/pkgs/development/compilers/rdmd/default.nix index 621ace195bbe..f70b8f448b48 100644 --- a/pkgs/development/compilers/rdmd/default.nix +++ b/pkgs/development/compilers/rdmd/default.nix @@ -1,29 +1,29 @@ -{ stdenv, fetchurl, writeText, lib, dmd }: +{stdenv, lib, fetchgit, dmd}: stdenv.mkDerivation { - name = "rdmd-2.064"; - - src = fetchurl { - url = https://raw2.github.com/D-Programming-Language/tools/2.064/rdmd.d; - sha256 = "0b1g3ng6bkanvg00r6xb4ycpbh9x8b9dw589av665azxbcraqrs1"; - name = "rdmd-src"; - }; + name = "rdmd-20141113"; buildInputs = [ dmd ]; - builder = writeText "drmd-builder.sh" '' - source $stdenv/setup - cp $src rdmd.d - dmd rdmd.d - mkdir -p $out/bin - cp rdmd $out/bin/ + src = fetchgit { + url = git://github.com/D-Programming-Language/tools.git; + rev = "f496c68ee4e776597bd7382aa47f05da698a69e"; + sha256 = "0vbhmz8nbh8ayml4vad0239kfg982vqfyqqrjv6wrlnjah97n5ms"; + }; + + buildPhase = '' + dmd rdmd.d ''; + installPhase = '' + mkdir -p $out/bin + cp rdmd $out/bin/ + ''; + meta = { description = "Wrapper for D language compiler"; homepage = http://dlang.org/rdmd.html; license = lib.licenses.boost; - maintainers = with stdenv.lib.maintainers; [ vlstill ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/roadsend/default.nix b/pkgs/development/compilers/roadsend/default.nix deleted file mode 100644 index f17cbbbda9a5..000000000000 --- a/pkgs/development/compilers/roadsend/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ composableDerivation, fetchurl, bigloo, curl, fcgi ? null, libxml2 ? null, mysql ? null }: - -let edf = composableDerivation.edf; in - -composableDerivation.composableDerivation {} { - name = "roadsend-2.9.3"; - - buildInputs = [bigloo curl]; - - flags = edf { name = "pcre"; } - // edf { name = "fcgi"; enable = { inherit fcgi; }; } - // edf { name = "xml"; enable = { buildInputs = [ libxml2 ]; }; } - // edf { name = "mysql"; enable = { buildInputs = [ mysql ]; }; } - // edf { name = "odbc"; }; - # // edf { name = "gtk"} } - # // edf { name = "gtk2", enable = { buildInputs = [ mysql ]; } } - - cfg = { - pcreSupport = true; - fcgiSupport = true; - xmlSupport = true; - mysqlSupport = true; - }; - - src = fetchurl { - url = "http://code.roadsend.com/snaps/roadsend-php-20081210.tar.bz2"; - sha256 = "0yhpiik0dyayd964wvn2k0cq7b1gihx1k3qx343r2l7lla4mapsx"; - }; - - # tell pcc where to find the fastcgi library - postInstall = " sed -e \"s=(ldflags fastcgi.*=(ldflags -l fastcgi -L \$fcgi)=\" -i \$out/etc/pcc.conf "; - - meta = { - description = "A PHP to C compiler"; - homepage = http://www.roadsend.com; - # you can choose one of the following licenses: - # Runtime license is LPGL 2.1 - license = ["GPL2"]; - }; -} diff --git a/pkgs/development/compilers/rustc/0.11.nix b/pkgs/development/compilers/rustc/0.12.nix index a7246e44a73d..d26e8ba4ddad 100644 --- a/pkgs/development/compilers/rustc/0.11.nix +++ b/pkgs/development/compilers/rustc/0.12.nix @@ -16,19 +16,19 @@ assert stdenv.gcc.gcc != null; */ -with ((import ./common.nix) {inherit stdenv; version = "0.11.0"; }); +with ((import ./common.nix) {inherit stdenv; version = "0.12.0"; }); let snapshot = if stdenv.system == "i686-linux" - then "84339ea0f796ae468ef86797ef4587274bec19ea" + then "555aca74f9a268f80cab2df1147dc6406403e9e4" else if stdenv.system == "x86_64-linux" - then "bd8a6bc1f28845b7f4b768f6bfa06e7fbdcfcaae" + then "6a43c2f6c8ba2cbbcb9da1f7b58f748aef99f431" else if stdenv.system == "i686-darwin" - then "3f25b2680efbab16ad074477a19d49dcce475977" + then "331bd7ef519cbb424188c546273e8c7d738f0894" else if stdenv.system == "x86_64-darwin" - then "4a8c2e1b7634d73406bac32a1a97893ec3ed818d" + then "2c83a79a9febfe1d326acb17c3af76ba053c6ca9" else abort "no-snapshot for platform ${stdenv.system}"; - snapshotDate = "2014-06-21"; - snapshotRev = "db9af1d"; + snapshotDate = "2014-10-04"; + snapshotRev = "749ff5e"; snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshot}.tar.bz2"; in stdenv.mkDerivation { @@ -37,8 +37,8 @@ in stdenv.mkDerivation { inherit meta; src = fetchurl { - url = http://static.rust-lang.org/dist/rust-0.11.0.tar.gz; - sha256 = "1fhi8iiyyj5j48fpnp93sfv781z1dm0xy94h534vh4mz91jf7cyi"; + url = http://static.rust-lang.org/dist/rust-0.12.0.tar.gz; + sha256 = "1dv9wxh41230zknbwj34zgjnh1kgvvy6k12kbiy9bnch9nr6cgl8"; }; # We need rust to build rust. If we don't provide it, configure will try to download it. @@ -65,7 +65,8 @@ in stdenv.mkDerivation { patches = [ ./hardcode_paths.patch ./local_stage0.patch ]; postPatch = '' substituteInPlace src/librustc/back/link.rs \ - --subst-var-by "ccPath" "${stdenv.gcc}/bin/cc" \ + --subst-var-by "ccPath" "${stdenv.gcc}/bin/cc" + substituteInPlace src/librustc_back/archive.rs \ --subst-var-by "arPath" "${stdenv.gcc.binutils}/bin/ar" ''; diff --git a/pkgs/development/compilers/rustc/common.nix b/pkgs/development/compilers/rustc/common.nix index d766f22c6adb..fdb1195bb827 100644 --- a/pkgs/development/compilers/rustc/common.nix +++ b/pkgs/development/compilers/rustc/common.nix @@ -26,7 +26,7 @@ meta = with stdenv.lib; { homepage = http://www.rust-lang.org/; description = "A safe, concurrent, practical language"; - maintainers = with maintainers; [ madjar cstrahan ]; + maintainers = with maintainers; [ madjar cstrahan wizeman ]; license = map (builtins.getAttr "shortName") [ licenses.mit licenses.asl20 ]; platforms = platforms.linux; }; diff --git a/pkgs/development/compilers/rustc/grsec.HEAD.patch b/pkgs/development/compilers/rustc/grsec.HEAD.patch new file mode 100644 index 000000000000..84582ab7d70f --- /dev/null +++ b/pkgs/development/compilers/rustc/grsec.HEAD.patch @@ -0,0 +1,16 @@ +diff --git a/src/test/run-make/relocation-model/Makefile b/src/test/run-make/relocation-model/Makefile +index 2fcdd32..2d9ddb0 100644 +--- a/src/test/run-make/relocation-model/Makefile ++++ b/src/test/run-make/relocation-model/Makefile +@@ -5,9 +5,11 @@ all: + $(call RUN,foo) + + $(RUSTC) -C relocation-model=default foo.rs ++ paxctl -czexm $(TMPDIR)/foo + $(call RUN,foo) + + $(RUSTC) -C relocation-model=static foo.rs ++ paxctl -czexm $(TMPDIR)/foo + $(call RUN,foo) + + $(RUSTC) -C relocation-model=default --crate-type=dylib foo.rs diff --git a/pkgs/development/compilers/rustc/hardcode_paths.HEAD.patch b/pkgs/development/compilers/rustc/hardcode_paths.HEAD.patch index 21e6576e4e35..83fb26e7a474 100644 --- a/pkgs/development/compilers/rustc/hardcode_paths.HEAD.patch +++ b/pkgs/development/compilers/rustc/hardcode_paths.HEAD.patch @@ -1,33 +1,8 @@ -diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs -index 6332485..9500a23 100644 ---- a/src/librustc/back/link.rs -+++ b/src/librustc/back/link.rs -@@ -383,18 +383,9 @@ pub fn mangle_internal_name_by_path_and_seq(path: PathElems, flav: &str) -> Stri - - pub fn get_cc_prog(sess: &Session) -> String { - match sess.opts.cg.linker { -- Some(ref linker) => return linker.to_string(), -- None => {} -+ Some(ref linker) => linker.to_string(), -+ None => "@ccPath@".to_string() - } -- -- // In the future, FreeBSD will use clang as default compiler. -- // It would be flexible to use cc (system's default C compiler) -- // instead of hard-coded gcc. -- // For Windows, there is no cc command, so we add a condition to make it use gcc. -- match sess.targ_cfg.os { -- abi::OsWindows => "gcc", -- _ => "cc", -- }.to_string() - } - - pub fn remove(sess: &Session, path: &Path) { diff --git a/src/librustc_back/archive.rs b/src/librustc_back/archive.rs -index 060dda5..fecf76b 100644 +index a88bcaf..9c3858d 100644 --- a/src/librustc_back/archive.rs +++ b/src/librustc_back/archive.rs -@@ -53,7 +53,7 @@ fn run_ar(handler: &ErrorHandler, maybe_ar_prog: &Option<String>, +@@ -54,7 +54,7 @@ fn run_ar(handler: &ErrorHandler, maybe_ar_prog: &Option<String>, paths: &[&Path]) -> ProcessOutput { let ar = match *maybe_ar_prog { Some(ref ar) => ar.as_slice(), @@ -36,3 +11,18 @@ index 060dda5..fecf76b 100644 }; let mut cmd = Command::new(ar); +diff --git a/src/librustc_trans/back/link.rs b/src/librustc_trans/back/link.rs +index d27a338..c9b1508 100644 +--- a/src/librustc_trans/back/link.rs ++++ b/src/librustc_trans/back/link.rs +@@ -361,8 +361,8 @@ pub fn mangle_internal_name_by_path_and_seq(path: PathElems, flav: &str) -> Stri + + pub fn get_cc_prog(sess: &Session) -> String { + match sess.opts.cg.linker { +- Some(ref linker) => return linker.to_string(), +- None => sess.target.target.options.linker.clone(), ++ Some(ref linker) => linker.to_string(), ++ None => "@ccPath@".to_string(), + } + } + diff --git a/pkgs/development/compilers/rustc/hardcode_paths.patch b/pkgs/development/compilers/rustc/hardcode_paths.patch index 77e4c3f37887..8701cd3c9829 100644 --- a/pkgs/development/compilers/rustc/hardcode_paths.patch +++ b/pkgs/development/compilers/rustc/hardcode_paths.patch @@ -1,8 +1,8 @@ diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs -index 7a3e912..ced75fa 100644 +index 1cc60fc..2e94b99 100644 --- a/src/librustc/back/link.rs +++ b/src/librustc/back/link.rs -@@ -766,24 +766,15 @@ pub fn output_lib_filename(id: &CrateId) -> String { +@@ -383,18 +383,9 @@ pub fn mangle_internal_name_by_path_and_seq(path: PathElems, flav: &str) -> Stri pub fn get_cc_prog(sess: &Session) -> String { match sess.opts.cg.linker { @@ -15,18 +15,23 @@ index 7a3e912..ced75fa 100644 - // In the future, FreeBSD will use clang as default compiler. - // It would be flexible to use cc (system's default C compiler) - // instead of hard-coded gcc. -- // For win32, there is no cc command, so we add a condition to make it use gcc. +- // For Windows, there is no cc command, so we add a condition to make it use gcc. - match sess.targ_cfg.os { -- abi::OsWin32 => "gcc", +- abi::OsWindows => "gcc", - _ => "cc", - }.to_string() } - pub fn get_ar_prog(sess: &Session) -> String { - match sess.opts.cg.ar { - Some(ref ar) => (*ar).clone(), -- None => "ar".to_string() -+ None => "@arPath@".to_string() - } - } - + pub fn remove(sess: &Session, path: &Path) { +diff --git a/src/librustc_back/archive.rs b/src/librustc_back/archive.rs +index 060dda5..fecf76b 100644 +--- a/src/librustc_back/archive.rs ++++ b/src/librustc_back/archive.rs +@@ -53,7 +53,7 @@ fn run_ar(handler: &ErrorHandler, maybe_ar_prog: &Option<String>, + paths: &[&Path]) -> ProcessOutput { + let ar = match *maybe_ar_prog { + Some(ref ar) => ar.as_slice(), +- None => "ar" ++ None => "@arPath@" + }; + let mut cmd = Command::new(ar); diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix index f81539fad9a3..cc3fabb244e7 100644 --- a/pkgs/development/compilers/rustc/head.nix +++ b/pkgs/development/compilers/rustc/head.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchgit, which, file, perl, curl, python27, makeWrapper -, tzdata, git +, tzdata, git, valgrind }: assert stdenv.gcc.gcc != null; @@ -18,19 +18,19 @@ assert stdenv.gcc.gcc != null; */ -with ((import ./common.nix) {inherit stdenv; version = "0.12.0-pre-a2e7c4da9"; }); +with ((import ./common.nix) {inherit stdenv; version = "0.13.0-pre-1673-g3a325c6";}); let snapshot = if stdenv.system == "i686-linux" - then "555aca74f9a268f80cab2df1147dc6406403e9e4" + then "c8342e762a1720be939ed7c6a39bdaa27892f66f" else if stdenv.system == "x86_64-linux" - then "6a43c2f6c8ba2cbbcb9da1f7b58f748aef99f431" + then "7a7fe6f5ed47b9cc66261f880e166c7c8738b73e" else if stdenv.system == "i686-darwin" - then "331bd7ef519cbb424188c546273e8c7d738f0894" + then "63e8644512bd5665c14389a83d5af564c7c0b103" else if stdenv.system == "x86_64-darwin" - then "2c83a79a9febfe1d326acb17c3af76ba053c6ca9" + then "7933ae0e974d1b897806138b7052cb2b4514585f" else abort "no-snapshot for platform ${stdenv.system}"; - snapshotDate = "2014-10-04"; - snapshotRev = "749ff5e"; + snapshotDate = "2014-11-21"; + snapshotRev = "c9f6d69"; snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshot}.tar.bz2"; in stdenv.mkDerivation { @@ -40,8 +40,8 @@ in stdenv.mkDerivation { src = fetchgit { url = https://github.com/rust-lang/rust; - rev = "a2e7c4da9b331d337fba0b3911c6d3d7f48e8305"; - sha256 = "1lpncqx3lfyjk6llfc7pd1iqxzfhj32hjqvj09zks73r4isc02n4"; + rev = "3a325c666d2cb7e297bf3057ff2442f96a79428b"; + sha256 = "0a0byglfaf0wfsnlm53vng1gqkkz4i29zphdwqg93v26mciqqc61"; }; # We need rust to build rust. If we don't provide it, configure will try to download it. @@ -65,19 +65,26 @@ in stdenv.mkDerivation { configureFlags = [ "--enable-local-rust" "--local-rust-root=$snapshot" ]; # The compiler requires cc, so we patch the source to tell it where to find it - patches = [ ./hardcode_paths.HEAD.patch ./local_stage0.HEAD.patch ]; + patches = [ ./hardcode_paths.HEAD.patch ./local_stage0.HEAD.patch ] + ++ stdenv.lib.optional stdenv.needsPax ./grsec.HEAD.patch; + postPatch = '' - substituteInPlace src/librustc/back/link.rs \ + substituteInPlace src/librustc_trans/back/link.rs \ --subst-var-by "ccPath" "${stdenv.gcc}/bin/cc" substituteInPlace src/librustc_back/archive.rs \ --subst-var-by "arPath" "${stdenv.gcc.binutils}/bin/ar" ''; - buildInputs = [ which file perl curl python27 makeWrapper git ]; + buildInputs = [ which file perl curl python27 makeWrapper git valgrind ]; enableParallelBuilding = false; # disabled due to rust-lang/rust#16305 preCheck = "export TZDIR=${tzdata}/share/zoneinfo"; doCheck = true; + + postInstall = '' + # Install documentation + cp -r doc "$out/share/doc" + ''; } diff --git a/pkgs/development/compilers/rustc/local_stage0.patch b/pkgs/development/compilers/rustc/local_stage0.patch index 1261b2d458da..2f38d7c1757c 100644 --- a/pkgs/development/compilers/rustc/local_stage0.patch +++ b/pkgs/development/compilers/rustc/local_stage0.patch @@ -2,12 +2,15 @@ diff --git a/src/etc/local_stage0.sh b/src/etc/local_stage0.sh index e78f231..6b6773b 100755 --- a/src/etc/local_stage0.sh +++ b/src/etc/local_stage0.sh -@@ -53,8 +53,3 @@ if [ -z $TARG_DIR ]; then +@@ -53,11 +53,6 @@ fi - + cp ${PREFIX}/bin/rustc${BIN_SUF} ${TARG_DIR}/stage0/bin/ -cp ${PREFIX}/${LIB_DIR}/${RUSTLIBDIR}/${TARG_DIR}/${LIB_DIR}/* ${TARG_DIR}/stage0/${LIB_DIR}/ -cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}extra*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ -cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}rust*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ -cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}std*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ -cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}syntax*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ + + # do not fail if one of the above fails, as all we need is a working rustc! + exit 0 diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 535f2697fea6..17c0bed7caa0 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, sbclBootstrap, clisp}: +{ stdenv, fetchurl, sbclBootstrap, clisp, which}: stdenv.mkDerivation rec { name = "sbcl-${version}"; - version = "1.2.3"; + version = "1.2.5"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "0lz2a79dlxxyw05s14l6xp35zjsazgbp1dmqygqi0cmd8dc5vj6j"; + sha256 = "0nmb9amygr5flzk2z9fa6wzwqknbgd2qrkybxkxkamvbdwyayvzr"; }; - buildInputs = [ ] + buildInputs = [ which ] ++ (stdenv.lib.optional stdenv.isDarwin sbclBootstrap) ++ (stdenv.lib.optional stdenv.isLinux clisp) ; @@ -39,6 +39,9 @@ stdenv.mkDerivation rec { sed -i src/code/target-load.lisp -e \ '/date defaulted-source/i(or (and (= 2208988801 (file-write-date defaulted-source-truename)) (= 2208988801 (file-write-date defaulted-fasl-truename)))' + # Fix software version retrieval + sed -e "s@/bin/uname@$(which uname)@g" -i src/code/*-os.lisp + # Fix the tests sed -e '/deftest pwent/inil' -i contrib/sb-posix/posix-tests.lisp sed -e '/deftest grent/inil' -i contrib/sb-posix/posix-tests.lisp diff --git a/pkgs/development/compilers/scala/2.10.nix b/pkgs/development/compilers/scala/2.10.nix index 11c3c0d8c318..d7e7ecf1ce2e 100644 --- a/pkgs/development/compilers/scala/2.10.nix +++ b/pkgs/development/compilers/scala/2.10.nix @@ -31,7 +31,8 @@ stdenv.mkDerivation rec { compared to an equivalent Java application. ''; homepage = http://www.scala-lang.org/; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.all; + branch = "2.10"; }; } diff --git a/pkgs/development/compilers/scala/2.9.nix b/pkgs/development/compilers/scala/2.9.nix index 41f377dbfa3f..de5db1eff996 100644 --- a/pkgs/development/compilers/scala/2.9.nix +++ b/pkgs/development/compilers/scala/2.9.nix @@ -28,7 +28,8 @@ stdenv.mkDerivation rec { compared to an equivalent Java application. ''; homepage = http://www.scala-lang.org/; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.all; + branch = "2.9"; }; } diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index c556870d519f..e9f6c71eb2c0 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.1"; + name = "scala-2.11.4"; src = fetchurl { url = "http://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "1vjsmqjwpxavyj29wrbvvx7799fsa65d4iha5mj63cgs8qp605gk"; + sha256 = "1140xyp8kbv4l6l95pqj2bawzlvs7h39ivikdv09n13qvqcml3q0"; }; buildInputs = [ jre makeWrapper ] ; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { compared to an equivalent Java application. ''; homepage = http://www.scala-lang.org/; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix index 220d3f87fba8..1f38198b30b5 100644 --- a/pkgs/development/compilers/swi-prolog/default.nix +++ b/pkgs/development/compilers/swi-prolog/default.nix @@ -4,14 +4,14 @@ }: let - version = "6.6.5"; + version = "6.6.6"; in stdenv.mkDerivation { name = "swi-prolog-${version}"; src = fetchurl { url = "http://www.swi-prolog.org/download/stable/src/pl-${version}.tar.gz"; - sha256 = "0lsa90sdnkd286xgm1amwkdhvnrpsz7imfzczrfdaw4arqk4bvkr"; + sha256 = "0vcrfskm2hyhv30lxr6v261myb815jc3bgmcn1lgsc9g9qkvp04z"; }; buildInputs = [ gmp readline openssl libjpeg unixODBC libXinerama diff --git a/pkgs/development/compilers/uhc/default.nix b/pkgs/development/compilers/uhc/default.nix deleted file mode 100644 index 2f179d17548e..000000000000 --- a/pkgs/development/compilers/uhc/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ stdenv, coreutils, glibc, fetchgit, m4, libtool, ghc, uulib -, uuagc, mtl, network, binary, llvm, fgl, syb -}: - -# this check won't be needed anymore after ghc-wrapper is fixed -# to show ghc-builtin packages in "ghc-pkg list" output. -let binaryIsBuiltIn = builtins.compareVersions "7.2.1" ghc.version != 1; - -in stdenv.mkDerivation { - name = "uhc-svn-git20120502"; - - src = fetchgit { - url = "https://github.com/UU-ComputerScience/uhc.git"; - rev = "ab26d787657bb729d8a4f92ef5d067d9990f6ce3"; - sha256 = "66c5b6d95dc80a652f6e17476a1b18fbef4b4ff6199a92d033f0055526ec97ff"; - }; - - postUnpack = "sourceRoot=\${sourceRoot}/EHC"; - - propagatedBuildInputs = [mtl network binary fgl syb]; - buildInputs = [coreutils m4 ghc libtool uulib uuagc]; - - # Can we rename this flag to "--with-cpp-uhc-options"? - configureFlags = "--with-cpp-ehc-options=-I${glibc}/include"; - - # 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 - '' + stdenv.lib.optionalString binaryIsBuiltIn '' - sed -i "s|ghcLibBinary=no|ghcLibBinaryExists=yes|" configure - ''; - - meta = { - homepage = "http://www.cs.uu.nl/wiki/UHC"; - description = "Utrecht Haskell Compiler"; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }; -} diff --git a/pkgs/development/compilers/vala/0.26.nix b/pkgs/development/compilers/vala/0.26.nix new file mode 100644 index 000000000000..48b5476fe1d0 --- /dev/null +++ b/pkgs/development/compilers/vala/0.26.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, pkgconfig, flex, bison, libxslt +, glib, libiconvOrEmpty, libintlOrEmpty +}: + +let + major = "0.26"; + minor = "1"; + sha256 = "8407abb19ab3a58bbfc0d288abb47666ef81f76d0540258c03965e7545f59e6b"; +in +stdenv.mkDerivation rec { + name = "vala-${major}.${minor}"; + + meta = { + description = "Compiler for GObject type system"; + homepage = "http://live.gnome.org/Vala"; + license = stdenv.lib.licenses.lgpl21Plus; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ antono lethalman ]; + }; + + src = fetchurl { + url = "mirror://gnome/sources/vala/${major}/${name}.tar.xz"; + inherit sha256; + }; + + nativeBuildInputs = [ pkgconfig flex bison libxslt ]; + + buildInputs = [ glib ] + ++ libiconvOrEmpty + ++ libintlOrEmpty; +} diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/development/compilers/yap/default.nix index a29c0de65b87..dea7d3cd6e84 100644 --- a/pkgs/development/compilers/yap/default.nix +++ b/pkgs/development/compilers/yap/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.dcc.fc.up.pt/~vsc/Yap/"; description = "Yap Prolog System is a ISO-compatible high-performance Prolog compiler"; - license = "artistic"; + license = stdenv.lib.licenses.artistic2; maintainers = [ stdenv.lib.maintainers.simons ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/compilers/yasm/default.nix b/pkgs/development/compilers/yasm/default.nix index ec1fda10d8c3..f752ad35a6d4 100644 --- a/pkgs/development/compilers/yasm/default.nix +++ b/pkgs/development/compilers/yasm/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "yasm-1.2.0"; + name = "yasm-1.3.0"; src = fetchurl { url = "http://www.tortall.net/projects/yasm/releases/${name}.tar.gz"; - sha256 = "0cfg7ji3ia2in628w42wrfvw2ixmmm4rghwmv2k202mraysgm3vn"; + sha256 = "0gv0slmm0qpq91za3v2v9glff3il594x5xsrbgab7xcmnh0ndkix"; }; meta = { diff --git a/pkgs/development/coq-modules/bedrock/default.nix b/pkgs/development/coq-modules/bedrock/default.nix new file mode 100644 index 000000000000..7aadead54281 --- /dev/null +++ b/pkgs/development/coq-modules/bedrock/default.nix @@ -0,0 +1,33 @@ +{stdenv, fetchurl, coq}: + +stdenv.mkDerivation rec { + + name = "coq-bedrock-${coq.coq-version}-${version}"; + version = "20140722"; + + src = fetchurl { + url = "http://plv.csail.mit.edu/bedrock/bedrock-${version}.tgz"; + sha256 = "0aaa98q42rsy9hpsxji21bqznizfvf6fplsw6jq42h06j0049k80"; + }; + + buildInputs = [ coq.ocaml coq.camlp5 ]; + propagatedBuildInputs = [ coq ]; + + enableParallelBuilding = true; + + buildFlags = "cito"; + + installPhase = '' + COQLIB=$out/lib/coq/${coq.coq-version}/ + mkdir -p $COQLIB/user-contrib/Bedrock + cp -pR src $COQLIB/user-contrib/Bedrock + ''; + + meta = with stdenv.lib; { + homepage = http://plv.csail.mit.edu/bedrock/; + description = "Bedrock is a library that turns Coq into a tool much like classical verification systems"; + maintainers = with maintainers; [ jwiegley ]; + platforms = coq.meta.platforms; + }; + +} diff --git a/pkgs/development/coq-modules/containers/default.nix b/pkgs/development/coq-modules/containers/default.nix index 8c20d64d8c7d..5c5681f60107 100644 --- a/pkgs/development/coq-modules/containers/default.nix +++ b/pkgs/development/coq-modules/containers/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { src = fetchurl { url = http://coq.inria.fr/pylons/contribs/files/Containers/v8.4/Containers.tar.gz; - sha256 = "1y9x2lwrskv2231z9ac3kv4bmg6h1415xpp4gl7v5w90ba6p6w8w"; + sha256 = "0z7yk0g7zkniwc73ka7wwb5jjg5a2wr1krrn3akr7kn5z3gvy2mc"; }; buildInputs = [ coq.ocaml coq.camlp5 ]; @@ -17,9 +17,8 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = http://coq.inria.fr/pylons/pylons/contribs/view/Containers/v8.4; description = "A typeclass-based Coq library of finite sets/maps"; - maintainers = with maintainers; [ vbgl ]; + maintainers = with maintainers; [ vbgl jwiegley ]; platforms = coq.meta.platforms; - broken = true; /* the source hash is wrong */ }; } diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix new file mode 100644 index 000000000000..b9939a2e7f4a --- /dev/null +++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix @@ -0,0 +1,28 @@ +{stdenv, fetchgit, coq}: + +stdenv.mkDerivation rec { + + name = "coq-ext-lib-${coq.coq-version}-${version}"; + version = "c2c71a2a"; + + src = fetchgit { + url = git://github.com/coq-ext-lib/coq-ext-lib.git; + rev = "c2c71a2a90ac87f2ceb311a6da53a6796b916816"; + sha256 = "01sihw3nmvvpc8viwyr01qnqifdcmlg016034xmrfmv863yp8c4g"; + }; + + buildInputs = [ coq.ocaml coq.camlp5 ]; + propagatedBuildInputs = [ coq ]; + + enableParallelBuilding = true; + + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + + meta = with stdenv.lib; { + homepage = https://github.com/coq-ext-lib/coq-ext-lib; + description = "A collection of theories and plugins that may be useful in other Coq developments"; + maintainers = with maintainers; [ jwiegley ]; + platforms = coq.meta.platforms; + }; + +} diff --git a/pkgs/development/coq-modules/coqeal/default.nix b/pkgs/development/coq-modules/coqeal/default.nix new file mode 100644 index 000000000000..bfe83a74aae7 --- /dev/null +++ b/pkgs/development/coq-modules/coqeal/default.nix @@ -0,0 +1,28 @@ +{stdenv, fetchgit, coq, ssreflect, mathcomp}: + +stdenv.mkDerivation rec { + + name = "coq-coqeal-${coq.coq-version}-${version}"; + version = "7522037d"; + + src = fetchgit { + url = git://github.com/CoqEAL/CoqEAL.git; + rev = "7522037d5e01e651e705d782f4f91fc68c46866e"; + sha256 = "1cvjz0yyqihdx1hp1h9x5x14kv9qf3rjhgqq4f7rv8bxcv9p1gv3"; + }; + + buildInputs = [ coq.ocaml coq.camlp5 ssreflect mathcomp ]; + propagatedBuildInputs = [ coq ]; + + preConfigure = "cd theory"; + + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + + meta = with stdenv.lib; { + homepage = http://www.maximedenes.fr/content/coqeal-coq-effective-algebra-library; + description = "A Coq library for effective algebra, by which is meant formally verified computer algebra algorithms that can be run inside Coq on concrete inputs"; + maintainers = with maintainers; [ jwiegley ]; + platforms = coq.meta.platforms; + }; + +} diff --git a/pkgs/development/coq-modules/domains/darcs_context b/pkgs/development/coq-modules/domains/darcs_context new file mode 100644 index 000000000000..5dac711c0c0a --- /dev/null +++ b/pkgs/development/coq-modules/domains/darcs_context @@ -0,0 +1,809 @@ + +Context: + +[additional facts about limits on cuts +robdockins@fastmail.fm**20140818025955 + Ignore-this: 6f9c952db425df6ae9d2a14139a8a3d1 +] + +[work on limits +robdockins@fastmail.fm**20140817221707 + Ignore-this: 9811e0cd669b48f3beb7a56d47cbe3c3 +] + +[finish proving that Q field ops commute with injq +robdockins@fastmail.fm**20140817060600 + Ignore-this: a1f6c62b39983e6f6f01d28aca5f8534 +] + +[split up realdom.v and perform associated code motion +robdockins@fastmail.fm**20140817030034 + Ignore-this: 24c74cd459d2ab15dcd3d83ba06f7081 +] + +[recip is canonical and converges +robdockins@fastmail.fm**20140725211947 + Ignore-this: c100dbd94114cca9576b2a3f46c9ddc7 +] + +[improve the proof that 1 is a unit for multiplication +robdockins@fastmail.fm**20140724150124 + Ignore-this: c5ec976f8a9858a7ba1f704b4e84d02e +] + +[complete proof the interval multiplication converges; other minor stuff +robdockins@fastmail.fm**20140724015132 + Ignore-this: bc717baa4c8f9ec31b821c5cfae5b499 +] + +[further progress in realdom.v +robdockins@fastmail.fm**20140723004023 + Ignore-this: f33e18d22ae69c9b6209e28151d18017 +] + +[unmessify rational_intervals patch +robdockins@fastmail.fm**20140721123718 + Ignore-this: 4a125b192a9964a508a1063845e9f160 +] + +[messy updates to rational_intervals.v +robdockins@fastmail.fm**20140721015810 + Ignore-this: 858dac9c55426167c6f397a71ef3fda5 +] + +[implicit arguments for "fixes" +robdockins@fastmail.fm**20140721015739 + Ignore-this: 229ecdd48265fc855319141e399bc522 +] + +[metadata +robdockins@fastmail.fm**20140714201441 + Ignore-this: aa16faaf09c1c404bdc6eaf0d0c39912 +] + +[further beautification +robdockins@fastmail.fm**20140714200516 + Ignore-this: 47d74c51d9fe130a5ac12706b1ddb1d4 +] + +[start working on the recripricol function +robdockins@fastmail.fm**20140714180055 + Ignore-this: c7f93cea17f46daa78a1ea14e86dfcaf +] + +[tweaks to the lambda models +robdockins@fastmail.fm**20140714180031 + Ignore-this: 219788fe70f42f0f6e60176cab464f19 +] + +[beauty edits in st_lam* +robdockins@fastmail.fm**20140714180006 + Ignore-this: a40aa7ae00ed27595ee04073918bd028 +] + +[move stuff to rational_intervals.v / define real_mult and prove some properties +robdockins@fastmail.fm**20140712053232 + Ignore-this: 398c5c03aac9ff37526d4d7c9e1a82c0 +] + +[finish correctness proof for interval multiplication +robdockins@fastmail.fm**20140711191547 + Ignore-this: c9ab138a0ca43fe0b133b208419bbcc4 +] + +[break out facts about rational intervals +robdockins@fastmail.fm**20140711012320 + Ignore-this: b7fe6e9377629a89b5debe3019ae1aa +] + +[updates to ideal completion +robdockins@fastmail.fm**20140707053800 + Ignore-this: 90d1efbd0e5833d8c83f0df056d7a74c +] + +[a pile of additional properties in realdom.v +robdockins@fastmail.fm**20140707053519 + Ignore-this: 7edba1e72a1856f297ef11e698ed989f +] + +[some properties of converging prereals +robdockins@fastmail.fm**20140706041401 + Ignore-this: 273bfbb245302becd7ff402831827ffb +] + +[make realdom compile +robdockins@fastmail.fm**20140630015439 + Ignore-this: 8bfc8eaeed4a1596450b0bb9ddef9aaa +] + +[renaming +robdockins@fastmail.fm**20140630011639 + Ignore-this: a287e083af095790cbf2b48df7a58739 +] + +[reorganize some code +robdockins@fastmail.fm**20140630011446 + Ignore-this: f1375b9e7ad822cb92f0c83d4001eddd +] + +[build the retract for realdom +robdockins@fastmail.fm**20140630001245 + Ignore-this: 4eb9da621588417d1b7b2fc980c7bf70 +] + +[fill out lemmas about cPLT +robdockins@fastmail.fm**20140630001140 + Ignore-this: add9e45c14621e3d6328684098bf8461 +] + +[more facts about cPLT +robdockins@fastmail.fm**20140628073731 + Ignore-this: 101a131ed114902924a1707eff7ebc70 +] + +[continuous domains as retracts of bifinite domains +robdockins@fastmail.fm**20140628035522 + Ignore-this: 5e7c61d49cf8424412b0d94f5fcb5ee6 +] + +[start implementing arithmetic operations in RealDom +robdockins@fastmail.fm**20140620003249 + Ignore-this: c28479b8a933cba263765bdddb112264 +] + +[define the domain of rational intervals +robdockins@fastmail.fm**20140619040809 + Ignore-this: 6cbe1a9cc690e5a9d77f37ee299154b + this domain is useful for describing the semantics of exact real arithmetic. +] + +[show that every effective CUSL is Plotkin +robdockins@fastmail.fm**20140619034433 + Ignore-this: d529a4b1d6d698f79572caa805072394 +] + +[fix notation for octothorpe +robdockins@fastmail.fm**20140614222130 + Ignore-this: 3dc815825f11ceaf4f4f53e4668e6382 +] + +[fix for coq 8.4pl4 +robdockins@fastmail.fm**20140614222049 + Ignore-this: 9745904845aaf54e5569df982fc93d65 +] + +[move swelling lemma into finsets +robdockins@fastmail.fm**20140504080535 + Ignore-this: ffa560e9aa4e4f8b15a55c1f9b1da72e +] + +[documentation improvements and code motion +robdockins@fastmail.fm**20140504070008 + Ignore-this: da7847f82403990342732a8ce226315c +] + +[replace the old finprod +robdockins@fastmail.fm**20140504005534 + Ignore-this: 606cf44422f68d66c8d2d90049e67b93 +] + +[remove the old finprod +robdockins@fastmail.fm**20140504005137 + Ignore-this: 38bd54e16c87d27bbede08496c37bfba +] + +[update st_lam_fix to use the new finprod +robdockins@fastmail.fm**20140504003627 + Ignore-this: 95d0a66e99ccead89bdfef09a1c8c109 +] + +[update st_lam to use the new termmodel +robdockins@fastmail.fm**20140503230854 + Ignore-this: c3d6b2155674b414c5c2e14b85b13760 +] + +[new version of finprod with a better term model +robdockins@fastmail.fm**20140503222035 + Ignore-this: db63e3a063bdb6f2f579644c7b63bd1b +] + +[a few more (hopefully final) lemmas about union +robdockins@fastmail.fm**20140422223924 + Ignore-this: 7b95c75abef9b0d45863b5e33d1c5a37 +] + +[finish proofs about union +robdockins@fastmail.fm**20140422065034 + Ignore-this: 2929c3cdb013c028a48022b0293b2f18 +] + +[powerdomain progress +robdockins@fastmail.fm**20140421064325 + Ignore-this: 592f9c6046f05a27897b460edb2efe10 + Show that powerdomains are endofunctors on PLT. Further, they are monads with + the 'singleton' and 'join' operations. Also make some progress on the additive + portion of the theory, dealing with emptyset and union. +] + +[tweak makefile +robdockins@fastmail.fm**20140420031337 + Ignore-this: d5954b26f731bfed3d79cefacab322fb +] + +[show that semvalue is the weakest condition allowing beta-reduction of strict functions +robdockins@fastmail.fm**20140420020447 + Ignore-this: 16a7ed23f04879f1fb324bdac8a2ffaf +] + +[some additional operations relating to the PLT adjunction +robdockins@fastmail.fm**20140420020351 + Ignore-this: db8eec6e3f74cce3acb67d2b660b104e +] + +[finish building power domain fmap +robdockins@fastmail.fm**20140420020217 + Ignore-this: 556e1cb87576de36cb26f8add3a1b163 +] + +[fix up st_lam.v +robdockins@fastmail.fm**20140329015058 + Ignore-this: 1c31d674b759fbd0cc74fb3125579f96 +] + +[push some proofs into finprod +robdockins@fastmail.fm**20140329000401 + Ignore-this: 49070fdd951e49473e60d3cd0ec431c6 +] + +[documentation and aesthetic changeds +robdockins@fastmail.fm**20140327043141 + Ignore-this: be27b24b78ea6af722a307117e59f5b3 +] + +[finish the st_lam_fix example +robdockins@fastmail.fm**20140322011153 + Ignore-this: e702f564b6eab2f8c11ab16bcb62504b +] + +[clarafications re: countable choice; remove unfinished example from build order +robdockins@fastmail.fm**20140321212852 + Ignore-this: 2a9d5c79c05ba088e1815feab99a5f6c +] + +[break the "fixes" operator into a separate file and prove some facts about it +robdockins@fastmail.fm**20140318013247 + Ignore-this: 80c506cef0719a974a049a1f5870f676 +] + +[minor fix to skiy.v +robdockins@fastmail.fm**20140317054057 + Ignore-this: ffef6fcaf5fa7f8cea80d2808caf4f4c +] + +[add the fixpoint operator; admit proofs +robdockins@fastmail.fm**20140317044648 + Ignore-this: 97ca18e980cdf46a9b40c8252badef14 +] + +[remove the evaluation case for variables +robdockins@fastmail.fm**20140317032932 + Ignore-this: e46d634e735e5b21a18518a48777168d +] + +[start on STLC with fixpoints -- but without fixpoints for now +robdockins@fastmail.fm**20140317031953 + Ignore-this: 3458bc18c73d967bef58418bc73e06cb +] + +[add the eliminator for booleans to st_lam; other additional utility lemmas +robdockins@fastmail.fm**20140317031753 + Ignore-this: 369dd375755cbd9ae5e3c969f3ef6ec +] + +[some minor code motion +robdockins@fastmail.fm**20140228064927 + Ignore-this: 804828472ddb0c5fafc72460fce8387b +] + +[plug final holes in st_lam and add to build order +robdockins@fastmail.fm**20140228044729 + Ignore-this: 3edc7f36bfa97775ba33ffa27c80df59 +] + +[reduce st_lam.v to facts I believe about fresh variables +robdockins@fastmail.fm**20140228010832 + Ignore-this: bde3e73291ddd32337d6fb999e4b1c02 +] + +[fix breakages +robdockins@fastmail.fm**20140226073930 + Ignore-this: 9be54f5255f8ed9d53a79260e9bdf565 +] + +[more work on lambdas +robdockins@fastmail.fm**20140226043753 + Ignore-this: 7f7452670221e2643067a3c7cc180998 +] + +[use new finprod implementation +robdockins@fastmail.fm**20140226043700 + Ignore-this: c9e05df5fcfd31254ed7318fe693490c +] + +[remove old finprod +robdockins@fastmail.fm**20140226043642 + Ignore-this: 2705703a2c782da21a152fbb27c8a972 +] + +[rearrange the interfact to finprod +robdockins@fastmail.fm**20140226043541 + Ignore-this: c44d7c478948f42b188eb8d06469abbf +] + +[fill remaining holes in finprod2 +robdockins@fastmail.fm**20140225205242 + Ignore-this: 1eeb9b8beef92790c28918292f2a9cf4 +] + +[rework some stuff dealing with semidecidable predicates +robdockins@fastmail.fm**20140225092149 + Ignore-this: 32b5ccb2927e08979ea92b9ef67c40f4 +] + +[lots of work on alpha-congrunce in lambdas +robdockins@fastmail.fm**20140225035601 + Ignore-this: fbbec9dac4cb328ff4e0b25df646e0c7 +] + +[terminate is universal in PLT +robdockins@fastmail.fm**20140225035538 + Ignore-this: abc6cd1a60578c435bf9ca596d8d0922 +] + +[new attack on nominal finite products +robdockins@fastmail.fm**20140225035516 + Ignore-this: 3875e713acc6aa5193696612f3ede76d +] + +[push forward a little on lambdas +robdockins@fastmail.fm**20140221095249 + Ignore-this: c690a1b03075702e3fd84aac7e268211 +] + +[update finprod for various changes +robdockins@fastmail.fm**20140221095230 + Ignore-this: a6d787930ed356ae2b0a003af1f4d44 +] + +[better discrete cases lemma +robdockins@fastmail.fm**20140219051301 + Ignore-this: f0ec88e8207257e7657ced933cf687e7 +] + +[start working on simply-typed lambdas +robdockins@fastmail.fm**20140219051238 + Ignore-this: 69bea345376ea39cd1addc0849a43077 +] + +[more messing about with advanced category theory stuff +robdockins@fastmail.fm**20140211095003 + Ignore-this: 9cd3c9d961349e8797f109f716c5f678 +] + +[minor rearrangements and code motion +robdockins@fastmail.fm**20140211041724 + Ignore-this: 642ad6f1395fde7ecd81e5a905fd5428 +] + +[some basic bicategory theory +robdockins@fastmail.fm**20140210083634 + Ignore-this: f47a898fa045a397d3ee70e1512b8baa +] + +[even more notation futzing +robdockins@fastmail.fm**20140209072416 + Ignore-this: d2061652cb3e80f6994f567a9e677b32 +] + +[additional notational futzing +robdockins@fastmail.fm**20140209043308 + Ignore-this: ac42cbbc94df227e6d5e70b96ae65fd3 +] + +[futz around with notations, various other cleanup activities +robdockins@fastmail.fm**20140209005551 + Ignore-this: 3f41a52650aadd956ac490b62e59c1c3 +] + +[complete adequacy for SKI+Y +robdockins@fastmail.fm**20140206050414 + Ignore-this: f730587ac7a42f3e35740976a1439f2e +] + +[minor changes in cpo +robdockins@fastmail.fm**20140206014745 + Ignore-this: 95244704faf1e6c336d62dc7912f9022 +] + +[push through most of SKI+Y adequacy +robdockins@fastmail.fm**20140205214805 + Ignore-this: dc998ef45f2e919e9373bfa21a5ef8c7 +] + +[major simplification of the adequacy proof for SKI +robdockins@fastmail.fm**20140205185605 + Ignore-this: f1f0dc46274db05f3393038dfe2775e2 +] + +[push forward on SKI+Y +robdockins@fastmail.fm**20140205044216 + Ignore-this: daf255aa940b42c1c68ba947a356370d +] + +[continue futzing with the LR statement +robdockins@fastmail.fm**20140203055601 + Ignore-this: f5ef9f06d3b1a11d76317b52cec691ab +] + +[start pushing on adequacy for SKI+Y +robdockins@fastmail.fm**20140202085948 + Ignore-this: 956844809340fad0c13c19e9fa729b5c +] + +[mostly finish soundness for SKI+Y +robdockins@fastmail.fm**20140202060633 + Ignore-this: 4c75fd9eeefa1d6dad6866662abea0fd +] + +[start working on a CCL example +robdockins@fastmail.fm**20140202020748 + Ignore-this: 44c5d7854cc19b0f90414c2be6b3df68 +] + +[make id(A) a parsing-only notation +robdockins@fastmail.fm**20140202020724 + Ignore-this: 68f51f754c0b89e2e815da47b901e4b1 +] + +[the PLT adjunction is strong monodial +robdockins@fastmail.fm**20140202020637 + Ignore-this: 7b29b9a6a5e8efa07440c528ec12d7bd +] + +[fix my broken version of lfp and fixup proofs +robdockins@fastmail.fm**20140202020615 + Ignore-this: 3ac283481318622cbf38378e815a4f09 +] + +[more work on SKI + Y +robdockins@fastmail.fm**20140202020516 + Ignore-this: d1f63e2ef610c6f93d03806c5426cfa5 +] + +[start work on SKI + Y +robdockins@fastmail.fm**20140201085039 + Ignore-this: fb7a405830cf90526cddd8ce37f4da40 +] + +[doc corrections +robdockins@fastmail.fm**20140130015908 + Ignore-this: bca4c04267bfdac8cb202651a0960d92 +] + +[lots of additional inline documentation +robdockins@fastmail.fm**20140129234834 + Ignore-this: ab2c59add5514f44a898de1f0eece98b +] + +[powerdomains form continuous functors in EMBED +robdockins@fastmail.fm**20140126234115 + Ignore-this: d2ee08902f0bdb52efd7f7ce2c594469 +] + +[complete the powerdomain constructions; build some operations +robdockins@fastmail.fm**20140125225202 + Ignore-this: 9c8f2632df05e84fc3794a338ff8720d +] + +[construct the basic powerdomains--still some holes left +robdockins@fastmail.fm**20140125064541 + Ignore-this: c3206d2e1e925096b3e9ff49afacef2f +] + +[generalize the lfp construction to a generic chain_sup operation +robdockins@fastmail.fm**20140124183103 + Ignore-this: 4cc2c1011b9f79365dcb7c76784fbfa6 +] + +[update makefile +robdockins@fastmail.fm**20140124073734 + Ignore-this: a0b7db8383262caa314c21b99e146222 +] + +[new file for recursive lambda domains +robdockins@fastmail.fm**20140124070023 + Ignore-this: 300c02b4da83b6ebd734aa2ccb21cd2d +] + +[more lemmas about antistrict homs +robdockins@fastmail.fm**20140124065953 + Ignore-this: 483c7b350dc3cab59c8ff50e1ac73b8c +] + +[fix breakage related to implicit arguments +robdockins@fastmail.fm**20140124065805 + Ignore-this: 561693d3280851299c6a49a2a34546b3 +] + +[notation tweaks in cpo.v +robdockins@fastmail.fm**20140124053800 + Ignore-this: 83e92d8c14568448074a940ceafbe2c9 +] + +[add if/then/else to the SKI system +robdockins@fastmail.fm**20140124023630 + Ignore-this: 37a9737932a05393a6338380226ca346 +] + +[case analysis for finite types +robdockins@fastmail.fm**20140124012505 + Ignore-this: 6ec1076b2a74f5832501a105a28a6dba +] + +[finish adequacy proof for SKI +robdockins@fastmail.fm**20140123211322 + Ignore-this: 1fe3e626e33431c27e2aa186b3bf91d2 +] + +[additional lemmas about domains +robdockins@fastmail.fm**20140123090037 + Ignore-this: fcad2dd816f805b8b5e7d1be3df60db8 +] + +[most of a proof of adequacy for SKI +robdockins@fastmail.fm**20140123085839 + Ignore-this: d1595c02a6387297018e7f316a3e751 +] + +[more work on finite products +robdockins@fastmail.fm**20140121061158 + Ignore-this: c2f8212e041478104dd4c81c225b42d5 +] + +[begin work on a more flexible "finprod" domain +robdockins@fastmail.fm**20140119021653 + Ignore-this: 249718a2c31964733171b21c84d2effb +] + +[mess with implicit arguments in categories.v +robdockins@fastmail.fm**20140113041450 + Ignore-this: 314cad9207f706e949bd686aaa5c5e1b +] + +[products for CPO, uniformity of lfp +robdockins@fastmail.fm**20140113041421 + Ignore-this: e533abe995e634c732a35e71d66ddb6a +] + +[define the LFP in pointed CPOs, prove the Scott induction principle +robdockins@fastmail.fm**20140112231843 + Ignore-this: 2014174b1c6914bef376d614f34d073f +] + +[build the forgetful functor from EMBED to PLT +robdockins@fastmail.fm**20140110014909 + Ignore-this: 1dacbfc0383e48f4ab35fe0a5fd11cec +] + +[notation changes, prove sum_cases and curry preserve order and equality +robdockins@fastmail.fm**20140110014820 + Ignore-this: d1c6a1d0346a9eba14f3529ac30b5e2f +] + +[prove addl facts about pairs, tweak implicit arguments +robdockins@fastmail.fm**20140110010319 + Ignore-this: 9f0af8abc268b2b22d8b5450d6a4136 +] + +[make 'ob' a coercion +robdockins@fastmail.fm**20140110010204 + Ignore-this: 467c0b0a8b086a7f44bf98875a4380d6 +] + +[copyright notices +robdockins@fastmail.fm**20140106232333 + Ignore-this: f59bafa0ec99e259bd9b4319f2cdbc67 +] + +[add ord_dec coercion +robdockins@fastmail.fm**20140104052750 + Ignore-this: 4ed1cacfd27979f0fe518862be5ac27c +] + +[define the model for CBV lambda calculus +robdockins@fastmail.fm**20140104050626 + Ignore-this: 88ca796d4697bfebb044d3fae27d6129 +] + +[proof a fixpoint lemma for unpointed domains +robdockins@fastmail.fm**20140103231818 + Ignore-this: 4939eb02d09b6a4eecf145c887c64393 +] + +[prove that the adjoint functors between PLT and PPLT extend to continuous functors in EMBED +robdockins@fastmail.fm**20140103000915 + Ignore-this: 54da0101f581731ebe512ed514e0603e +] + +[notation changes for PLT +robdockins@fastmail.fm**20140102234446 + Ignore-this: ad1f82f22d1bf0e057f11c3508a81716 +] + +[move embeddings into their own file; pull TPLT and PPLT into profinite.v +robdockins@fastmail.fm**20140102234424 + Ignore-this: 3704996af47ae32415ba3e539d67cf5c +] + +[Show that PLT is cocartesian; rearrange proof that EMBED(true) is terminated +robdockins@fastmail.fm**20140102213805 + Ignore-this: 3470df6910e7a3e4bda478c0c6ecea62 +] + +[remove unnecessary "inh" hypothesis in the definition of Plotkin order; fixup the fallout +robdockins@fastmail.fm**20140102213646 + Ignore-this: b6a5ad59296f938b377d71852120d48b +] + +[move proofs that empty and unit preorders are effective plotkin +robdockins@fastmail.fm**20140102205530 + Ignore-this: 7324843510fd938d356aa82003c9ec68 +] + +[make epi/mono/iso morphisms into categories +robdockins@fastmail.fm**20131228082442 + Ignore-this: ee75a2b6eb1f3d6fa47f17d6734e5015 +] + +[define the cocartesian and distributive categories +robdockins@fastmail.fm**20131226001612 + Ignore-this: 11e9d8a88bef42bcb800b31d85d28d16 +] + +[remove uses of maximally implict arguments +robdockins@fastmail.fm**20131226001536 + Ignore-this: c0d93a5398aea58cbcc4fbbca3b59b17 +] + +[fixpoints and binary sums for NOMINAL +robdockins@fastmail.fm**20131121092931 + Ignore-this: 8a660dfe2ab16a8208ae559dcf2b7ed0 +] + +[modify bilimit.v to use the general construction from cont_functors.v +robdockins@fastmail.fm**20131120075848 + Ignore-this: 17ea36107ade1646eab5c99aec3561a9 +] + +[generic fixpoint construction for categories with initial objects and directed colimits +robdockins@fastmail.fm**20131119092522 + Ignore-this: 25674dff855a1cecdb4ee919f8bf3a5d +] + +[remove some irritating unit parameters, fix doc typos +robdockins@fastmail.fm**20131118093204 + Ignore-this: 38342d58567d8a13471620d5b7c2b7d4 +] + +[improvements to categories; complete some constructions in nominal +robdockins@fastmail.fm**20131118085737 + Ignore-this: e58cb49a01d0210dabdb021250910adb +] + +[build fixes +robdockins@fastmail.fm**20131113004305 + Ignore-this: 5abffcd1d6b44f816749c5e0cfd5b6e9 +] + +[Documentation additions +robdockins@fastmail.fm**20131113004254 + Ignore-this: 79a913d3a8652866f3fdc64891f6304d +] + +[lots of inline documentation additions +robdockins@fastmail.fm**20131112192736 + Ignore-this: 6aa38112c10ceed3bf43e35dbda98312 +] + +[update makefiles +robdockins@fastmail.fm**20131112192706 + Ignore-this: d834beaa532cdf994cfa0a0b5a562e4f +] + +[continuous functors for binary sum and products +robdockins@fastmail.fm**20131112192605 + Ignore-this: 61520e6e315df909465a02f854816366 +] + +[add the category of nominal types +robdockins@fastmail.fm**20131112192520 + Ignore-this: f0351c5eb0bdacdfe192a6863d9c0bc6 +] + +[split the proof that expF is a continuous functor into a separate file; rearrange some defintions +robdockins@fastmail.fm**20130924013328 + Ignore-this: 4eacee37bb6474d1bdfffe416b98b4c1 +] + +[rearrange definitions of continuous functors. Prove enough plumbing to build the model: D = D->D +robdockins@fastmail.fm**20130924002837 + Ignore-this: a66f9e8833601e244048b70e8bfaab96 +] + +[show that the function space is a continuous functor; other junk +robdockins@fastmail.fm**20130923060521 + Ignore-this: d8f406450688c633ebc1fe1eb0343c91 +] + +[some name changes, other cosmetic fixes +robdockins@fastmail.fm**20130909043234 + Ignore-this: cdd24d1c96a34fb3573c1806153df9fb +] + +[additional cosmetic changes and rearrangements +robdockins@fastmail.fm**20130909020137 + Ignore-this: 77d28bc9452f6c93915194033118dab7 +] + +[reorganize profinite code +robdockins@fastmail.fm**20130909011437 + Ignore-this: 8511bf92ca6998ff8c69d5537624bdb8 +] + +[cosmetic changes +robdockins@fastmail.fm**20130908183909 + Ignore-this: e19039701e58fd26ca4eab79d7b49d14 +] + +[complete the bilimit construction, show how to take fixpoints of continuous functors +robdockins@fastmail.fm**20130908175228 + Ignore-this: 82feab8fdc0c944f13d91605c6a8e571 +] + +[find a MUCH easier path to a bilimit construction +robdockins@fastmail.fm**20130907012151 + Ignore-this: fcc72ad140b045ef37e4b03ad38a8fb0 +] + +[lots of progress, mostly on defining bilimits +robdockins@fastmail.fm**20130905204959 + Ignore-this: abf4bcf03a49fa009f9fb2200ee3abf2 +] + +[start working on the theory of finite preorders, which form a basis for plokin orders +robdockins@fastmail.fm**20130812054451 + Ignore-this: 5be36257a8fdf486bcc31f587d93c457 +] + +[parameterize plotkin orders, build category PPLT +robdockins@fastmail.fm**20130811063623 + Ignore-this: 3f273841bc72098acee0fd618627dbd5 +] + +[complete the details showing PLT is cartesian closed +robdockins@fastmail.fm**20130809230336 + Ignore-this: 13fd1b5a8172dd263cf655421f7584f7 +] + +[add files missed in the first import +robdockins@fastmail.fm**20130809080742 + Ignore-this: 6b59cce866a486d70559f7c80fe99053 +] + +[initial import of development +robdockins@fastmail.fm**20130809080409 + Ignore-this: 44cb5a0df2f1643d289f07dcd4227cbf + First major steps toward a fully effective and usable formalized + domain theory. We formalize the plotkin preorders and show that + they form a cartesian closed category. +] diff --git a/pkgs/development/coq-modules/domains/default.nix b/pkgs/development/coq-modules/domains/default.nix new file mode 100644 index 000000000000..975260c839bd --- /dev/null +++ b/pkgs/development/coq-modules/domains/default.nix @@ -0,0 +1,26 @@ +{stdenv, fetchdarcs, coq}: + +stdenv.mkDerivation rec { + + name = "coq-domains-${coq.coq-version}-${version}"; + version = "ce1a9806"; + + src = fetchdarcs { + url = http://hub.darcs.net/rdockins/domains; + context = ./darcs_context; + sha256 = "0zdqiw08b453i8gdxwbk7nia2dv2r3pncmxsvgr0kva7f3dn1rnc"; + }; + + buildInputs = [ coq.ocaml coq.camlp5 ]; + propagatedBuildInputs = [ coq ]; + + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + + meta = with stdenv.lib; { + homepage = http://rwd.rdockins.name/domains/; + description = "A Coq library for domain theory"; + maintainers = with maintainers; [ jwiegley ]; + platforms = coq.meta.platforms; + }; + +} diff --git a/pkgs/development/coq-modules/flocq/default.nix b/pkgs/development/coq-modules/flocq/default.nix new file mode 100644 index 000000000000..c26c22b0a6dd --- /dev/null +++ b/pkgs/development/coq-modules/flocq/default.nix @@ -0,0 +1,33 @@ +{stdenv, bash, which, autoconf, automake, fetchurl, coq}: + +stdenv.mkDerivation rec { + + name = "coq-flocq-${coq.coq-version}-${version}"; + version = "2.4.0"; + + src = fetchurl { + url = https://gforge.inria.fr/frs/download.php/file/33979/flocq-2.4.0.tar.gz; + sha256 = "020x4nkkrvndkvp5zwb9vads8a2jh603khcwrm40yhqldgfd8zlv"; + }; + + buildInputs = [ coq.ocaml coq.camlp5 bash which autoconf automake ]; + propagatedBuildInputs = [ coq ]; + + buildPhase = '' + ${bash}/bin/bash autogen.sh + ${bash}/bin/bash configure --libdir=$out/lib/coq/${coq.coq-version}/user-contrib/Flocq + ./remake + ''; + + installPhase = '' + ./remake install + ''; + + meta = with stdenv.lib; { + homepage = http://flocq.gforge.inria.fr/; + description = "Flocq (Floats for Coq) is a floating-point formalization for the Coq system"; + maintainers = with maintainers; [ jwiegley ]; + platforms = coq.meta.platforms; + }; + +} diff --git a/pkgs/development/coq-modules/heq/default.nix b/pkgs/development/coq-modules/heq/default.nix new file mode 100644 index 000000000000..5f31fe6dc341 --- /dev/null +++ b/pkgs/development/coq-modules/heq/default.nix @@ -0,0 +1,27 @@ +{stdenv, fetchurl, coq, unzip}: + +stdenv.mkDerivation rec { + + name = "coq-heq-${coq.coq-version}-${version}"; + version = "0.92"; + + src = fetchurl { + url = "https://www.mpi-sws.org/~gil/Heq/download/Heq-${version}.zip"; + sha256 = "03y71c4qs6cmy3s2hjs05g7pcgk9sqma6flj15394yyxbvr9is1p"; + }; + + buildInputs = [ coq.ocaml coq.camlp5 unzip ]; + propagatedBuildInputs = [ coq ]; + + preBuild = "cd src"; + + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}"; + + meta = with stdenv.lib; { + homepage = https://www.mpi-sws.org/~gil/Heq/; + description = "Heq : a Coq library for Heterogeneous Equality"; + maintainers = with maintainers; [ jwiegley ]; + platforms = coq.meta.platforms; + }; + +} diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index ca8bd6481efc..02d06edd538b 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -11,12 +11,14 @@ stdenv.mkDerivation { propagatedBuildInputs = [ coq ssreflect ]; + enableParallelBuilding = true; + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; meta = with stdenv.lib; { homepage = http://ssr.msr-inria.inria.fr/; license = licenses.cecill-b; - maintainers = [ maintainers.vbgl ]; + maintainers = [ maintainers.vbgl maintainers.jwiegley ]; platforms = coq.meta.platforms; hydraPlatforms = []; }; diff --git a/pkgs/development/coq-modules/paco/default.nix b/pkgs/development/coq-modules/paco/default.nix new file mode 100644 index 000000000000..c885d14aa3f2 --- /dev/null +++ b/pkgs/development/coq-modules/paco/default.nix @@ -0,0 +1,31 @@ +{stdenv, fetchurl, coq, unzip}: + +stdenv.mkDerivation rec { + + name = "coq-paco-${coq.coq-version}-${version}"; + version = "1.2.7"; + + src = fetchurl { + url = "http://plv.mpi-sws.org/paco/paco-${version}.zip"; + sha256 = "010fs74c0cmb9sz5dmrgzg4pmb2mgwia4gm0g9l7j2fq5xxcschb"; + }; + + buildInputs = [ coq.ocaml coq.camlp5 unzip ]; + propagatedBuildInputs = [ coq ]; + + preBuild = "cd src"; + + installPhase = '' + COQLIB=$out/lib/coq/${coq.coq-version}/ + mkdir -p $COQLIB/user-contrib/Paco + cp -pR *.vo $COQLIB/user-contrib/Paco + ''; + + meta = with stdenv.lib; { + homepage = http://plv.mpi-sws.org/paco/; + description = "Paco is a Coq library implementing parameterized coinduction"; + maintainers = with maintainers; [ jwiegley ]; + platforms = coq.meta.platforms; + }; + +} diff --git a/pkgs/development/coq-modules/ssreflect/default.nix b/pkgs/development/coq-modules/ssreflect/default.nix index 912ff7071f8f..75112ec96639 100644 --- a/pkgs/development/coq-modules/ssreflect/default.nix +++ b/pkgs/development/coq-modules/ssreflect/default.nix @@ -14,12 +14,26 @@ stdenv.mkDerivation { buildInputs = [ coq.ocaml coq.camlp5 ]; propagatedBuildInputs = [ coq ]; + enableParallelBuilding = true; + + patchPhase = '' + # Permit building of the ssrcoq statically-bound executable + sed -i 's/^#-custom/-custom/' Make + sed -i 's/^#SSRCOQ/SSRCOQ/' Make + ''; + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + postInstall = '' + mkdir -p $out/bin + cp -p bin/ssrcoq $out/bin + cp -p bin/ssrcoq.byte $out/bin + ''; + meta = with stdenv.lib; { homepage = http://ssr.msr-inria.inria.fr/; license = licenses.cecill-b; - maintainers = with maintainers; [ vbgl ]; + maintainers = with maintainers; [ vbgl jwiegley ]; platforms = coq.meta.platforms; }; diff --git a/pkgs/development/coq-modules/tlc/default.nix b/pkgs/development/coq-modules/tlc/default.nix new file mode 100644 index 000000000000..e47ffbdd4562 --- /dev/null +++ b/pkgs/development/coq-modules/tlc/default.nix @@ -0,0 +1,29 @@ +{stdenv, fetchsvn, coq}: + +stdenv.mkDerivation { + + name = "coq-tlc-${coq.coq-version}"; + + src = fetchsvn { + url = svn://scm.gforge.inria.fr/svn/tlc/branches/v3.1; + rev = 240; + sha256 = "0mjnb6n9wzb13y2ix9cvd6irzd9d2gj8dcm2x71wgan0jcskxadm"; + }; + + buildInputs = [ coq.ocaml coq.camlp5 ]; + propagatedBuildInputs = [ coq ]; + + installPhase = '' + COQLIB=$out/lib/coq/${coq.coq-version}/ + mkdir -p $COQLIB/user-contrib/Tlc + cp -p *.vo $COQLIB/user-contrib/Tlc + ''; + + meta = with stdenv.lib; { + homepage = http://www.chargueraud.org/softs/tlc/; + description = "TLC is a general purpose Coq library that provides an alternative to Coq's standard library"; + maintainers = with maintainers; [ jwiegley ]; + platforms = coq.meta.platforms; + }; + +} diff --git a/pkgs/development/coq-modules/unimath/default.nix b/pkgs/development/coq-modules/unimath/default.nix new file mode 100644 index 000000000000..e16156dec530 --- /dev/null +++ b/pkgs/development/coq-modules/unimath/default.nix @@ -0,0 +1,26 @@ +{stdenv, fetchgit, coq}: + +stdenv.mkDerivation rec { + + name = "coq-unimath-${coq.coq-version}-${version}"; + version = "a2714eca"; + + src = fetchgit { + url = git://github.com/UniMath/UniMath.git; + rev = "a2714eca29444a595cd280ea961ec33d17712009"; + sha256 = "0brhbslx4sxl8m9nxjbdl91gi99vcrikykl6b00f4cx5ww43csln"; + }; + + buildInputs = [ coq.ocaml coq.camlp5 ]; + propagatedBuildInputs = [ coq ]; + + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + + meta = with stdenv.lib; { + homepage = https://github.com/UniMath/UniMath; + description = "UniMath aims to formalize a substantial body of mathematics using the univalent point of view."; + maintainers = with maintainers; [ jwiegley ]; + platforms = coq.meta.platforms; + }; + +} diff --git a/pkgs/development/coq-modules/ynot/default.nix b/pkgs/development/coq-modules/ynot/default.nix new file mode 100644 index 000000000000..555945068b1a --- /dev/null +++ b/pkgs/development/coq-modules/ynot/default.nix @@ -0,0 +1,32 @@ +{stdenv, fetchgit, coq}: + +stdenv.mkDerivation rec { + + name = "coq-ynot-${coq.coq-version}-${version}"; + version = "ce1a9806"; + + src = fetchgit { + url = git://github.com/Ptival/ynot.git; + rev = "ce1a9806c26ffc6e7def41da50a9aac1433cb2f8"; + sha256 = "1pcmcl5zamiimkcg1xvynxnfbv439y02vg1mnz79hqq9mnjyfnpw"; + }; + + buildInputs = [ coq.ocaml coq.camlp5 ]; + propagatedBuildInputs = [ coq ]; + + preBuild = "cd src"; + + installPhase = '' + COQLIB=$out/lib/coq/${coq.coq-version}/ + mkdir -p $COQLIB/user-contrib/Ynot + cp -pR coq/*.vo $COQLIB/user-contrib/Ynot + ''; + + meta = with stdenv.lib; { + homepage = http://ynot.cs.harvard.edu/; + description = "Ynot is a library for writing and verifying imperative programs"; + maintainers = with maintainers; [ jwiegley ]; + platforms = coq.meta.platforms; + }; + +} diff --git a/pkgs/development/eclipse/ecj/default.nix b/pkgs/development/eclipse/ecj/default.nix index 0f52e879863e..19ec3a3a2fb5 100644 --- a/pkgs/development/eclipse/ecj/default.nix +++ b/pkgs/development/eclipse/ecj/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { homepage = http://www.eclipse.org/jdt/core/index.php; # http://www.eclipse.org/legal/epl-v10.html (free software, copyleft) - license = "EPLv1.0"; + license = stdenv.lib.licenses.epl10; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; diff --git a/pkgs/development/guile-modules/guile-opengl/default.nix b/pkgs/development/guile-modules/guile-opengl/default.nix new file mode 100644 index 000000000000..4d608f4caa9d --- /dev/null +++ b/pkgs/development/guile-modules/guile-opengl/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, guile }: + +stdenv.mkDerivation rec { + name = "guile-opengl-0.1.0"; + + meta = with stdenv.lib; { + description = "Guile binding for the OpenGL graphics API"; + homepage = "http://gnu.org/s/guile-opengl"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ iyzsong ]; + }; + + src = fetchurl { + url = "mirror://gnu/guile-opengl/${name}.tar.gz"; + sha256 = "13qfx4xh8baryxqrv986l848ygd0piqwm6s2s90pxk9c0m9vklim"; + }; + + nativeBuildInputs = [ pkgconfig guile ]; +} diff --git a/pkgs/development/guile-modules/guile-sdl/default.nix b/pkgs/development/guile-modules/guile-sdl/default.nix new file mode 100644 index 000000000000..8c1706be5835 --- /dev/null +++ b/pkgs/development/guile-modules/guile-sdl/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, guile, buildEnv +, SDL, SDL_image, SDL_ttf, SDL_mixer +}: + +stdenv.mkDerivation rec { + name = "guile-sdl-0.5.1"; + + meta = with stdenv.lib; { + description = "Guile bindings for SDL"; + homepage = "http://gnu.org/s/guile-sdl"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ iyzsong ]; + }; + + src = fetchurl { + url = "mirror://gnu/guile-sdl/${name}.tar.xz"; + sha256 = "126n4rd0ydh6i2s11ari5k85iivradlf12zq13b34shf9k1wn5am"; + }; + + nativeBuildInputs = [ guile ]; + + buildInputs = [ + SDL SDL_image SDL_ttf SDL_mixer + ]; + + GUILE_AUTO_COMPILE = 0; + + makeFlags = let + sdl = buildEnv { + name = "sdl-env"; + paths = buildInputs; + }; + in "SDLMINUSI=-I${sdl}/include/SDL"; +} diff --git a/pkgs/development/interpreters/angelscript/default.nix b/pkgs/development/interpreters/angelscript/default.nix index 1167f121e624..7ed14b632f78 100644 --- a/pkgs/development/interpreters/angelscript/default.nix +++ b/pkgs/development/interpreters/angelscript/default.nix @@ -11,10 +11,10 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="angelscript"; - version = "2.29.1"; + version = "2.29.2"; name="${baseName}-${version}"; url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip"; - sha256 = "081a0wnn1hl0hjgrg0nz63ff7k7dgrwsgszka5i7623ny407fkl5"; + sha256 = "12ws4vp9iyxbgzxxdq7g9729vg1ld92f38gfznyhsknhsay4kmf5"; }; in rec { diff --git a/pkgs/development/interpreters/clisp/2.33.2.nix b/pkgs/development/interpreters/clisp/2.33.2.nix new file mode 100644 index 000000000000..18b325684ca5 --- /dev/null +++ b/pkgs/development/interpreters/clisp/2.33.2.nix @@ -0,0 +1,66 @@ +{ stdenv, fetchurl, libsigsegv, gettext, ncurses, readline, libX11 +, libXau, libXt, pcre, zlib, libXpm, xproto, libXext, xextproto +, libffi, libffcall, coreutils, automake, autoconf, linuxHeaders +, groff +}: + +stdenv.mkDerivation rec { + version = "2.33.2"; + name = "clisp-${version}"; + + src = fetchurl { + url = "mirror://gnu/clisp/release/${version}/${name}.tar.gz"; + sha256 = "0rqyggviixaa68n5ll092ll4a2xy4y7jraq65l0gn0hkjhjnm5zh"; + }; + + buildInputs = + [ libsigsegv gettext ncurses readline libX11 libXau libXt pcre + zlib libXpm xproto libXext xextproto libffi libffcall + automake autoconf groff + ] + ++ (stdenv.lib.optional stdenv.isLinux linuxHeaders) + ; + + # First, replace port 9090 (rather low, can be used) + # with 64237 (much higher, IANA private area, not + # anything rememberable). + # Also remove reference to a type that disappeared from recent glibc + # (seems the correct thing to do, found no reference to any solution) + postPatch = '' + sed -i 's@/bin/pwd@${coreutils}&@' src/clisp-link.in + find . -type f | xargs sed -e 's/-lICE/-lXau &/' -i + + substituteInPlace modules/bindings/glibc/linux.lisp --replace "(def-c-type __swblk_t)" "" + ''; + + configureFlags = + '' + builddir + --with-readline --with-ffcall --with-dynamic-ffi + --with-module=readline --with-module=i18n --with-module=pcre + --with-module=syscalls --with-modules=zlib --with-module=curses + ''; + + preBuild = '' + echo Pre-build starting! + sed -e '/avcall.h/a\#include "config.h"' -i src/foreign.d + sed -e '/asm\/page.h/d' -i src/unix.d + cd builddir + ./makemake $configureFlags > Makefile + make config.lisp + cat config.lisp + ''; + + NIX_CFLAGS_COMPILE="-O0 -lreadline -lncursesw"; + + # TODO : make mod-check fails + doCheck = false; + + meta = { + description = "ANSI Common Lisp Implementation"; + homepage = http://clisp.cons.org; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + branch = "2.44"; + }; +} diff --git a/pkgs/development/interpreters/clisp/2.44.1.nix b/pkgs/development/interpreters/clisp/2.44.1.nix index 521933b0ed1f..66f53831374f 100644 --- a/pkgs/development/interpreters/clisp/2.44.1.nix +++ b/pkgs/development/interpreters/clisp/2.44.1.nix @@ -53,5 +53,6 @@ stdenv.mkDerivation rec { homepage = http://clisp.cons.org; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; + branch = "2.44"; }; } diff --git a/pkgs/development/interpreters/eff/default.nix b/pkgs/development/interpreters/eff/default.nix new file mode 100644 index 000000000000..4f2e100c684a --- /dev/null +++ b/pkgs/development/interpreters/eff/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchgit, ocaml, findlib, menhir, which }: + +let inherit (stdenv.lib) getVersion versionAtLeast; in + +assert versionAtLeast (getVersion ocaml) "3.12"; + +stdenv.mkDerivation { + + name = "eff-20140928"; + + src = fetchgit { + url = "https://github.com/matijapretnar/eff.git"; + rev = "90f884a790fddddb51d4d1d3b7c2edf1e8aabb64"; + sha256 = "28e389b35e6959072c245c2e79fe305885b1b2d44ff540a02a097e09e9f9698f"; + }; + + buildInputs = [ ocaml findlib menhir which ]; + + doCheck = true; + checkTarget = "test"; + + meta = with stdenv.lib; { + homepage = "http://www.eff-lang.org"; + description = "A functional programming language based on algebraic effects and their handlers"; + longDescription = '' + Eff is a functional language with handlers of not only exceptions, + but also of other computational effects such as state or I/O. With + handlers, you can simply implement transactions, redirections, + backtracking, multi-threading, and much more... + ''; + license = licenses.bsd2; + platforms = ocaml.meta.platforms; + maintainers = [ maintainers.jirkamarsik ]; + }; +} diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix index 9a5d2417df7b..378edfaf3432 100644 --- a/pkgs/development/interpreters/elixir/default.nix +++ b/pkgs/development/interpreters/elixir/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, erlang, rebar, makeWrapper, coreutils, curl, bash, cacert }: let - version = "1.0.0"; + version = "1.0.2"; in stdenv.mkDerivation { name = "elixir-${version}"; src = fetchurl { url = "https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz"; - sha256 = "1ci8g6nh89xnn0ax9kazcs47w406nqsj1d4rf8sb1b6abfq78xsj"; + sha256 = "6156ee396e85045358d11a6839e157e8fa9573b7414bddbd2c91843ed2b4b962"; }; buildInputs = [ erlang rebar makeWrapper ]; @@ -28,8 +28,9 @@ stdenv.mkDerivation { # Elixir binaries are shell scripts which run erl. Add some stuff # to PATH so the scripts can run without problems. - for f in $out/bin/* - do + for f in $out/bin/*; do + b=$(basename $f) + if [ $b == "mix" ]; then continue; fi wrapProgram $f \ --prefix PATH ":" "${erlang}/bin:${coreutils}/bin:${curl}/bin:${bash}/bin" \ --set CURL_CA_BUNDLE "${cacert}/etc/ca-bundle.crt" diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index c611577adfbe..9a2bd0ff328f 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "groovy-${version}"; - version = "2.3.7"; + version = "2.3.8"; src = fetchurl { url = "http://dl.bintray.com/groovy/maven/groovy-binary-${version}.zip"; - sha256 = "09957vi33c8bgk6z4wnidch5sz3s183yh6xba8cdjy5f7jpzmmiq"; + sha256 = "0fgsn1s7vhxcrwb2wa6zvrdzff7zbb2s6f7xj6c9x7gl9mdfcwpn"; }; installPhase = '' diff --git a/pkgs/development/interpreters/guile/clang.patch b/pkgs/development/interpreters/guile/clang.patch new file mode 100644 index 000000000000..4d0f342b211f --- /dev/null +++ b/pkgs/development/interpreters/guile/clang.patch @@ -0,0 +1,14 @@ +diff --git a/lib/stdint.in.h b/lib/stdint.in.h +index 889bca7..15d39b0 100644 +--- a/lib/stdint.in.h ++++ b/lib/stdint.in.h +@@ -74,7 +74,8 @@ + in <inttypes.h> would reinclude us, skipping our contents because + _@GUARD_PREFIX@_STDINT_H is defined. + The include_next requires a split double-inclusion guard. */ +-# @INCLUDE_NEXT@ @NEXT_STDINT_H@ ++# include <inttypes.h> ++// # @INCLUDE_NEXT@ @NEXT_STDINT_H@ + #endif + + #if ! defined _@GUARD_PREFIX@_STDINT_H && ! defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 2ddad5cde677..c4634de5d3f2 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -7,11 +7,11 @@ else stdenv.mkDerivation) (rec { - name = "guile-2.0.9"; + name = "guile-2.0.11"; src = fetchurl { url = "mirror://gnu/guile/${name}.tar.xz"; - sha256 = "0nw9y8vjyz4r61v06p9msks5lm58pd91irmzg4k487vmv743h2pp"; + sha256 = "1qh3j7308qvsjgwf7h94yqgckpbgz2k3yqdkzsyhqcafvfka9l5f"; }; nativeBuildInputs = [ makeWrapper gawk pkgconfig ]; @@ -27,9 +27,11 @@ # A native Guile 2.0 is needed to cross-build Guile. selfNativeBuildInput = true; - enableParallelBuilding = true; + # Guile 2.0.11 repeatable fails with 8-core parallel building because + # libguile/vm-i-system.i is not created in time + enableParallelBuilding = false; - patches = [ ./disable-gc-sensitive-tests.patch ./eai_system.patch ] ++ + patches = [ ./disable-gc-sensitive-tests.patch ./eai_system.patch ./clang.patch ] ++ (stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch); # Explicitly link against libgcc_s, to work around the infamous diff --git a/pkgs/development/interpreters/guile/setup-hook-2.0.sh b/pkgs/development/interpreters/guile/setup-hook-2.0.sh index 6994c4cd8dc6..fd1dc944ed44 100644 --- a/pkgs/development/interpreters/guile/setup-hook-2.0.sh +++ b/pkgs/development/interpreters/guile/setup-hook-2.0.sh @@ -10,4 +10,4 @@ addGuileLibPath () { fi } -envHooks=(${envHooks[@]} addGuileLibPath) +envHooks+=(addGuileLibPath) diff --git a/pkgs/development/interpreters/guile/setup-hook.sh b/pkgs/development/interpreters/guile/setup-hook.sh index 87cb5118506d..c1d19e579ed5 100644 --- a/pkgs/development/interpreters/guile/setup-hook.sh +++ b/pkgs/development/interpreters/guile/setup-hook.sh @@ -5,4 +5,4 @@ addGuileLibPath () { fi } -envHooks=(${envHooks[@]} addGuileLibPath) +envHooks+=(addGuileLibPath) diff --git a/pkgs/development/interpreters/j/default.nix b/pkgs/development/interpreters/j/default.nix index d4a1ab85b139..9c09038051ef 100644 --- a/pkgs/development/interpreters/j/default.nix +++ b/pkgs/development/interpreters/j/default.nix @@ -29,12 +29,12 @@ rec { /* doConfigure should be removed if not needed */ phaseNames = ["doUnpack" "doBuildJ" "doDeploy"]; - bits = if a.stdenv.system == "i686-linux" then - "32" - else if a.stdenv.system == "x86_64-linux" then + bits = if a.stdenv.is64bit then "64" - else - throw "Oops, unknown system: ${a.stdenv.system}"; + else if a.stdenv.isi686 then + "32" + else + builtins.trace "assuming ${a.stdenv.system} is 32 bits" "32"; doBuildJ = a.fullDepEntry '' sed -i bin/jconfig -e 's@bits=32@bits=${bits}@g; s@readline=0@readline=1@; s@LIBREADLINE=""@LIBREADLINE=" -lreadline "@' @@ -69,7 +69,7 @@ rec { raskin ]; platforms = with a.lib.platforms; - linux; + unix; license = a.lib.licenses.gpl3Plus; }; passthru = { diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index f70fb164623b..ab559aa9e659 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { meta = { description = "Ruby interpreter written in Java"; homepage = http://jruby.org/; - license = "CPL-1.0 GPL-2 LGPL-2.1"; # one of those + license = with stdenv.lib.licenses; [ cpl10 gpl2 lgpl21 ]; }; } diff --git a/pkgs/development/interpreters/kona/default.nix b/pkgs/development/interpreters/kona/default.nix index cec0d35bde52..2a8f7ca2c302 100644 --- a/pkgs/development/interpreters/kona/default.nix +++ b/pkgs/development/interpreters/kona/default.nix @@ -2,9 +2,9 @@ x@{builderDefsPackage , fetchgit , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ ["fetchgit"]; buildInputs = map (n: builtins.getAttr n x) @@ -31,7 +31,7 @@ rec { prepareOut = a.fullDepEntry '' mkdir -p "$out/bin" '' ["minInit" "defEnsureDir"]; - + meta = { description = "An interpreter of K, APL-like programming language"; maintainers = with a.lib.maintainers; @@ -40,7 +40,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "free-noncopyleft"; + license = a.lib.licenses.free; }; passthru = { updateInfo = { @@ -48,4 +48,3 @@ rec { }; }; }) x - diff --git a/pkgs/development/interpreters/lua-5/5.1.nix b/pkgs/development/interpreters/lua-5/5.1.nix index 444ecbc787af..adeaa9fae7bb 100644 --- a/pkgs/development/interpreters/lua-5/5.1.nix +++ b/pkgs/development/interpreters/lua-5/5.1.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { configurePhase = if stdenv.isDarwin then '' - makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=macosx CFLAGS="-DLUA_USE_LINUX -fno-common -O2" LDFLAGS="" ) + makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=macosx CFLAGS="-DLUA_USE_LINUX -fno-common -O2" LDFLAGS="" CC="$CC" ) installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.5.1.5.dylib" INSTALL_DATA='cp -d' ) '' else '' makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-DLUA_USE_LINUX -O2 -fPIC" LDFLAGS="-fPIC" ) diff --git a/pkgs/development/interpreters/mujs/default.nix b/pkgs/development/interpreters/mujs/default.nix new file mode 100644 index 000000000000..7ef475ddab88 --- /dev/null +++ b/pkgs/development/interpreters/mujs/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchgit, clang }: + +stdenv.mkDerivation rec { + name = "mujs-2014-11-29"; + + src = fetchgit { + url = git://git.ghostscript.com/mujs.git; + rev = "6afabf445cad0dd9afbc1f5870dba730801f09c0"; + sha256 = "1afzmncw3jvfq6smhhhsi1ywfmdpxkjpzswb86pdmdh3p04g1r0n"; + }; + + buildInputs = [ clang ]; + + makeFlags = [ "prefix=$(out)" ]; + + meta = with stdenv.lib; { + homepage = http://mujs.com/; + description = "A lightweight, embeddable Javascript interpreter"; + platforms = stdenv.lib.platforms.linux; + maintainers = with maintainers; [ pSub ]; + license = licenses.gpl3; + }; +} diff --git a/pkgs/development/interpreters/nix-exec/default.nix b/pkgs/development/interpreters/nix-exec/default.nix index 21d203f8e63f..6e7ffa656a06 100644 --- a/pkgs/development/interpreters/nix-exec/default.nix +++ b/pkgs/development/interpreters/nix-exec/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, nix }: let - version = "1.0.0"; +{ stdenv, fetchurl, pkgconfig, nix, git }: let + version = "4.0.0"; in stdenv.mkDerivation { name = "nix-exec-${version}"; src = fetchurl { url = "https://github.com/shlevy/nix-exec/releases/download/v${version}/nix-exec-${version}.tar.xz"; - sha256 = "0w89ma69iil1ki68zvs1l0ii0d87in64791l3a4yzyv9d3ncl3w6"; + sha256 = "0qw25v8pzx08mirhy46dmqj93nwnxfvgw2jsn8rvxh2d7x4nc8jv"; }; - buildInputs = [ pkgconfig nix ]; + buildInputs = [ pkgconfig nix git ]; meta = { description = "Run programs defined in nix expressions"; diff --git a/pkgs/development/interpreters/perl/5.14/setup-hook.sh b/pkgs/development/interpreters/perl/5.14/setup-hook.sh index 6a144a7f7804..a8656b8531db 100644 --- a/pkgs/development/interpreters/perl/5.14/setup-hook.sh +++ b/pkgs/development/interpreters/perl/5.14/setup-hook.sh @@ -2,4 +2,4 @@ addPerlLibPath () { addToSearchPath PERL5LIB $1/lib/perl5/site_perl } -envHooks=(${envHooks[@]} addPerlLibPath) +envHooks+=(addPerlLibPath) diff --git a/pkgs/development/interpreters/perl/5.16/default.nix b/pkgs/development/interpreters/perl/5.16/default.nix index c1a5374c92ea..db9b821b8883 100644 --- a/pkgs/development/interpreters/perl/5.16/default.nix +++ b/pkgs/development/interpreters/perl/5.16/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl, enableThreading ? true }: let @@ -6,10 +6,6 @@ let in -with { - inherit (stdenv.lib) optional optionalString; -}; - stdenv.mkDerivation rec { name = "perl-5.16.3"; @@ -21,9 +17,12 @@ stdenv.mkDerivation rec { patches = [ # Do not look in /usr etc. for dependencies. ./no-sys-dirs.patch + ./no-impure-config-time.patch + ./fixed-man-page-date.patch + ./no-date-in-perl-binary.patch ] - ++ optional stdenv.isSunOS ./ld-shared.patch - ++ stdenv.lib.optional stdenv.isDarwin [ ./cpp-precomp.patch ./no-libutil.patch ] ; + ++ lib.optional stdenv.isSunOS ./ld-shared.patch + ++ lib.optional stdenv.isDarwin [ ./cpp-precomp.patch ./no-libutil.patch ] ; # Build a thread-safe Perl with a dynamic libperls.o. We need the # "installstyle" option to ensure that modules are put under @@ -32,14 +31,13 @@ stdenv.mkDerivation rec { # Miniperl needs -lm. perl needs -lrt. configureFlags = [ "-de" - "-Dcc=gcc" "-Uinstallusrbinperl" "-Dinstallstyle=lib/perl5" "-Duseshrplib" "-Dlocincpth=${libc}/include" "-Dloclibpth=${libc}/lib" ] - ++ optional (stdenv ? glibc) "-Dusethreads"; + ++ lib.optional enableThreading "-Dusethreads"; configureScript = "${stdenv.shell} ./Configure"; @@ -51,18 +49,18 @@ stdenv.mkDerivation rec { '' configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3" - ${optionalString stdenv.isArm '' + ${lib.optionalString stdenv.isArm '' configureFlagsArray=(-Dldflags="-lm -lrt") ''} - ${optionalString stdenv.isCygwin '' + ${lib.optionalString stdenv.isCygwin '' cp cygwin/cygwin.c{,.bak} echo "#define PERLIO_NOT_STDIO 0" > tmp cat tmp cygwin/cygwin.c.bak > cygwin/cygwin.c ''} ''; - preBuild = optionalString (!(stdenv ? gcc && stdenv.gcc.nativeTools)) + preBuild = lib.optionalString (!(stdenv ? gcc && stdenv.gcc.nativeTools)) '' # Make Cwd work on NixOS (where we don't have a /bin/pwd). substituteInPlace dist/Cwd/Cwd.pm --replace "'/bin/pwd'" "'$(type -tP pwd)'" diff --git a/pkgs/development/interpreters/perl/5.16/fixed-man-page-date.patch b/pkgs/development/interpreters/perl/5.16/fixed-man-page-date.patch new file mode 100644 index 000000000000..79f9bc3658e3 --- /dev/null +++ b/pkgs/development/interpreters/perl/5.16/fixed-man-page-date.patch @@ -0,0 +1,11 @@ +--- a/cpan/podlators/lib/Pod/Man.pm 2014-04-07 06:25:23.730505243 +0200 ++++ b/cpan/podlators/lib/Pod/Man.pm 2014-04-07 06:26:40.816552603 +0200 +@@ -768,7 +768,7 @@ + } else { + ($name, $section) = $self->devise_title; + } +- my $date = $$self{date} || $self->devise_date; ++ my $date = "1970-01-01"; # Fixed date for NixOS, orig: $$self{date} || $self->devise_date; + $self->preamble ($name, $section, $date) + unless $self->bare_output or DEBUG > 9; + diff --git a/pkgs/development/interpreters/perl/5.16/no-date-in-perl-binary.patch b/pkgs/development/interpreters/perl/5.16/no-date-in-perl-binary.patch new file mode 100644 index 000000000000..00ea47ae45f6 --- /dev/null +++ b/pkgs/development/interpreters/perl/5.16/no-date-in-perl-binary.patch @@ -0,0 +1,11 @@ +--- a/perl.c 2014-04-07 07:58:01.402831615 +0200 ++++ b/perl.c 2014-04-07 07:59:38.556945298 +0200 +@@ -1754,7 +1754,7 @@ + PUSHs(Perl_newSVpvn_flags(aTHX_ non_bincompat_options, + sizeof(non_bincompat_options) - 1, SVs_TEMP)); + +-#ifdef __DATE__ ++#if 0 + # ifdef __TIME__ + PUSHs(Perl_newSVpvn_flags(aTHX_ + STR_WITH_LEN("Compiled at " __DATE__ " " __TIME__), diff --git a/pkgs/development/interpreters/perl/5.16/no-impure-config-time.patch b/pkgs/development/interpreters/perl/5.16/no-impure-config-time.patch new file mode 100644 index 000000000000..2bf1841e9dd2 --- /dev/null +++ b/pkgs/development/interpreters/perl/5.16/no-impure-config-time.patch @@ -0,0 +1,11 @@ +--- a/Configure 2014-04-05 20:21:33.714635700 +0200 ++++ b/Configure 2014-04-05 20:23:23.377441026 +0200 +@@ -3609,6 +3609,8 @@ + + : who configured the system + cf_time=`LC_ALL=C; LANGUAGE=C; export LC_ALL; export LANGUAGE; $date 2>&1` ++cf_time='Thu Jan 1 00:00:00 UTC 1970' ++ + case "$cf_by" in + "") + cf_by=`(logname) 2>/dev/null` diff --git a/pkgs/development/interpreters/perl/5.16/setup-hook.sh b/pkgs/development/interpreters/perl/5.16/setup-hook.sh index 6a144a7f7804..a8656b8531db 100644 --- a/pkgs/development/interpreters/perl/5.16/setup-hook.sh +++ b/pkgs/development/interpreters/perl/5.16/setup-hook.sh @@ -2,4 +2,4 @@ addPerlLibPath () { addToSearchPath PERL5LIB $1/lib/perl5/site_perl } -envHooks=(${envHooks[@]} addPerlLibPath) +envHooks+=(addPerlLibPath) diff --git a/pkgs/development/interpreters/perl/5.20/default.nix b/pkgs/development/interpreters/perl/5.20/default.nix index d9fb32aa43ea..66a9ca597a40 100644 --- a/pkgs/development/interpreters/perl/5.20/default.nix +++ b/pkgs/development/interpreters/perl/5.20/default.nix @@ -1,4 +1,16 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, enableThreading ? true }: + +# We can only compile perl with threading on platforms where we have a +# real glibc in the stdenv. +# +# Instead of silently building an unthreaded perl if this is not the +# case, we force callers to disableThreading explicitly, therefore +# documenting the platforms where the perl is not threaded. +# +# In the case of stdenv linux boot stage1 it's not possible to use +# threading because of the simpleness of the bootstrap glibc, so we +# use enableThreading = false there. +assert enableThreading -> (stdenv ? glibc); let @@ -11,11 +23,11 @@ with { }; stdenv.mkDerivation rec { - name = "perl-5.20.0"; + name = "perl-5.20.1"; src = fetchurl { - url = "mirror://cpan/src/${name}.tar.gz"; - sha256 = "00ndpgw4bjing9gy2y6jvs3q46mv2ll6zrxjkhpr12fcdsnji32f"; + url = "mirror://cpan/authors/id/S/SH/SHAY/${name}.tar.gz"; + sha256 = "1dfl4v5fngnkd1c4278gcdjgcapsw7laxq0b34nxrx76z4805wgy"; }; patches = @@ -39,7 +51,7 @@ stdenv.mkDerivation rec { "-Dlocincpth=${libc}/include" "-Dloclibpth=${libc}/lib" ] - ++ optional (stdenv ? glibc) "-Dusethreads"; + ++ optional enableThreading "-Dusethreads"; configureScript = "${stdenv.shell} ./Configure"; diff --git a/pkgs/development/interpreters/perl/5.20/setup-hook.sh b/pkgs/development/interpreters/perl/5.20/setup-hook.sh index 6a144a7f7804..a8656b8531db 100644 --- a/pkgs/development/interpreters/perl/5.20/setup-hook.sh +++ b/pkgs/development/interpreters/perl/5.20/setup-hook.sh @@ -2,4 +2,4 @@ addPerlLibPath () { addToSearchPath PERL5LIB $1/lib/perl5/site_perl } -envHooks=(${envHooks[@]} addPerlLibPath) +envHooks+=(addPerlLibPath) diff --git a/pkgs/development/interpreters/perl/sys-perl/setup-hook.sh b/pkgs/development/interpreters/perl/sys-perl/setup-hook.sh index a46a19602e7a..7b03c15ec5ad 100644 --- a/pkgs/development/interpreters/perl/sys-perl/setup-hook.sh +++ b/pkgs/development/interpreters/perl/sys-perl/setup-hook.sh @@ -2,4 +2,4 @@ addPerlLibPath () { addToSearchPath PERL5LIB $1/@libPrefix@ } -envHooks=(${envHooks[@]} addPerlLibPath) +envHooks+=(addPerlLibPath) diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix index c1d02064fe1c..4de87f20d8ed 100644 --- a/pkgs/development/interpreters/php/5.3.nix +++ b/pkgs/development/interpreters/php/5.3.nix @@ -10,7 +10,7 @@ in composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { - version = "5.3.28"; + version = "5.3.29"; name = "php-${version}"; @@ -228,7 +228,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) src = fetchurl { url = "http://www.php.net/distributions/php-${version}.tar.bz2"; - sha256 = "04w53nn6qacpkd1x381mzd41kqh6k8kjnbyg44yvnkqwcl69db0c"; + sha256 = "1480pfp4391byqzmvdmbxkdkqwdzhdylj63sfzrcgadjf9lwzqf4"; name = "php-${version}.tar.bz2"; }; diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index 4f378ddff4f7..c9a3ae61862f 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.32"; + version = "5.4.35"; name = "php-${version}"; @@ -185,12 +185,6 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) php is build within this derivation in order to add the xdebug lines to the php.ini. So both Apache and command line php both use xdebug without having to configure anything. Xdebug could be put in its own derivation. - * / - meta = { - description = "debugging support for PHP"; - homepage = http://xdebug.org; - license = "based on the PHP license - as is"; - }; */ }; @@ -249,13 +243,13 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) src = fetchurl { url = "http://www.php.net/distributions/php-${version}.tar.bz2"; - sha256 = "09n8lxnc5p2xfwk0ql2lh183h78hha1axhrdsa6g3650d5v73l16"; + sha256 = "0d425zxka3m1l0ygsls4r56qy374rf6skl4ggim0k2y1y08fmm2p"; }; meta = { description = "An HTML-embedded scripting language"; homepage = http://www.php.net/; - license = "PHP-3"; + license = stdenv.lib.licenses.php301; }; patches = [ ./fix-5.4.patch ]; diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix index 196e7068e146..adc0261eddbd 100644 --- a/pkgs/development/interpreters/picolisp/default.nix +++ b/pkgs/development/interpreters/picolisp/default.nix @@ -12,18 +12,18 @@ let sourceInfo = rec { baseName="picolisp"; tarballBaseName="picoLisp"; - version="3.0.5"; + version="3.1.8"; name="${baseName}-${version}"; tarballName="${tarballBaseName}-${version}"; extension="tgz"; url="http://www.software-lab.de/${tarballName}.${extension}"; - hash="07w2aygllkmnfcnby3dy88n9giqsas35s77rp2lr2ll5yy2hkc0x"; + sha256="0bkr1ck157871bv4a8dp9dmcvxigjsikm5rr2khylxc3l6il7s1i"; }; in rec { src = a.fetchurl { url = sourceInfo.url; - sha256 = sourceInfo.hash; + sha256 = sourceInfo.sha256; }; inherit (sourceInfo) name version; diff --git a/pkgs/development/interpreters/pure/default.nix b/pkgs/development/interpreters/pure/default.nix index 84ae789150da..bfa47693de0c 100644 --- a/pkgs/development/interpreters/pure/default.nix +++ b/pkgs/development/interpreters/pure/default.nix @@ -1,52 +1,39 @@ -x@{builderDefsPackage - , llvm, gmp, mpfr, readline, bison, flex, makeWrapper - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ lib, stdenv, fetchurl, makeWrapper, + llvm, gmp, mpfr, readline, bison, flex }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="pure"; - project="pure-lang"; - version="0.58"; - name="${baseName}-${version}"; - extension="tar.gz"; +stdenv.mkDerivation rec { + baseName="pure"; + project="pure-lang"; + version="0.63"; + name="${baseName}-${version}"; + extension="tar.gz"; + + src = fetchurl { url="https://bitbucket.org/purelang/${project}/downloads/${name}.${extension}"; - hash="180ygv8nmfy8v4696km8jdahn5cnr454sc8i1av7s6z4ss7mrxmi"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; + sha256="33acb2d560b21813f5e856973b493d9cfafba82bd6f539425ce07aa22f84ee29"; }; - inherit (sourceInfo) name version; - inherit buildInputs; - - /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "doMakeInstall" "doWrap"]; + buildInputs = [ bison flex makeWrapper ]; + propagatedBuildInputs = [ llvm gmp mpfr readline ]; - doWrap = a.makeManyWrappers ''$out/bin/pure'' ''--prefix LD_LIBRARY_PATH : "${llvm}/lib"''; + configureFlags = [ "--enable-release" ]; + doCheck = true; + checkPhase = '' + LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${llvm}/lib make check + ''; + postInstall = '' + wrapProgram $out/bin/pure --prefix LD_LIBRARY_PATH : ${llvm}/lib + ''; meta = { - description = "A purely functional programming language based on term rewriting"; - maintainers = with a.lib.maintainers; + description = "A modern-style functional programming language based on term rewriting"; + maintainers = with lib.maintainers; [ raskin + asppsa ]; - platforms = with a.lib.platforms; + platforms = with lib.platforms; linux; - license = a.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; }; - passthru = { - updateInfo = { - downloadPage = "https://bitbucket.org/purelang/pure-lang/downloads"; - }; - }; -}) x - +} \ No newline at end of file diff --git a/pkgs/development/interpreters/pypy/2.4/default.nix b/pkgs/development/interpreters/pypy/2.4/default.nix index 8f9647c21342..31024b179251 100644 --- a/pkgs/development/interpreters/pypy/2.4/default.nix +++ b/pkgs/development/interpreters/pypy/2.4/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi , sqlite, openssl, ncurses, pythonFull, expat, tcl, tk, x11, libX11 -, makeWrapper }: +, makeWrapper, callPackage, self }: assert zlibSupport -> zlib != null; @@ -71,7 +71,9 @@ let # disable test_multiprocessing due to transient errors # disable test_os because test_urandom_failure fails # disable test_urllib2net and test_urllibnet because it requires networking (example.com) - ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k 'not (test_sqlite or test_urllib2net or test_urllibnet or test_socket or test_os or test_shutil or test_mhlib or test_multiprocessing)' lib-python + # disable test_zipfile64 because it randomly timeouts + # disable test_default_ciphers because of error message mismatch + ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k 'not (test_sqlite or test_default_ciphers or test_urllib2net or test_urllibnet or test_socket or test_os or test_shutil or test_mhlib or test_multiprocessing or test_zipfile64)' lib-python ''; installPhase = '' @@ -94,10 +96,12 @@ let --set LIBRARY_PATH "${LIBRARY_PATH}" ''; - passthru = { + passthru = rec { inherit zlibSupport libPrefix; executable = "pypy"; isPypy = true; + buildEnv = callPackage ../../python/wrapper.nix { python = self; }; + interpreter = "${self}/bin/${executable}"; }; enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/pypy/2.4/setup-hook.sh b/pkgs/development/interpreters/pypy/2.4/setup-hook.sh index 4cf7247fb9e7..b9f5a38dcc64 100644 --- a/pkgs/development/interpreters/pypy/2.4/setup-hook.sh +++ b/pkgs/development/interpreters/pypy/2.4/setup-hook.sh @@ -12,4 +12,4 @@ toPythonPath() { echo $result } -envHooks=(${envHooks[@]} addPythonPath) +envHooks+=(addPythonPath) diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 64e21b755691..3894f401d4ae 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -1,13 +1,11 @@ -{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2 -, sqlite, tcl, tk, x11, openssl, readline, db, ncurses, gdbm -}: +{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, includeModules ? false +, sqlite, tcl, tk, x11, openssl, readline, db, ncurses, gdbm, self, callPackage }: assert zlibSupport -> zlib != null; with stdenv.lib; let - majorVersion = "2.6"; version = "${majorVersion}.9"; @@ -27,57 +25,75 @@ let # the Nix store to 1. So treat that as a special case. ./nix-store-mtime.patch ]; + + preConfigure = '' + # Purity. + for i in /usr /sw /opt /pkg; do + substituteInPlace ./setup.py --replace $i /no-such-path + done + '' + optionalString (stdenv ? gcc && stdenv.gcc.libc != null) '' + for i in Lib/plat-*/regen; do + substituteInPlace $i --replace /usr/include/ ${stdenv.gcc.libc}/include/ + done + '' + optionalString stdenv.isCygwin '' + # On Cygwin, `make install' tries to read this Makefile. + mkdir -p $out/lib/python${majorVersion}/config + touch $out/lib/python${majorVersion}/config/Makefile + mkdir -p $out/include/python${majorVersion} + touch $out/include/python${majorVersion}/pyconfig.h + ''; buildInputs = optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++ - [ bzip2 openssl ] + [ bzip2 openssl ]++ optionals includeModules [ db openssl ncurses gdbm readline x11 tcl tk sqlite ] ++ optional zlibSupport zlib; # Build the basic Python interpreter without modules that have # external dependencies. python = stdenv.mkDerivation { - name = "python-${version}"; + name = "python${if includeModules then "" else "-minimal"}-${version}"; - inherit majorVersion version src patches buildInputs; + inherit majorVersion version src patches buildInputs preConfigure; C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs); LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs); configureFlags = "--enable-shared --with-threads --enable-unicode"; - preConfigure = - '' - # Purity. - for i in /usr /sw /opt /pkg; do - substituteInPlace ./setup.py --replace $i /no-such-path - done - '' + optionalString (stdenv ? gcc && stdenv.gcc.libc != null) '' - for i in Lib/plat-*/regen; do - substituteInPlace $i --replace /usr/include/ ${stdenv.gcc.libc}/include/ - done - ''; - NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-msse2"; setupHook = ./setup-hook.sh; postInstall = '' - rm -rf "$out/lib/python${majorVersion}/test" + # needed for some packages, especially packages that backport + # functionality to 2.x from 3.x + for item in $out/lib/python${majorVersion}/test/*; do + if [[ "$item" != */test_support.py* ]]; then + rm -rf "$item" + fi + done + touch $out/lib/python${majorVersion}/test/__init__.py ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb${majorVersion} mv $out/share/man/man1/{python.1,python2.6.1} ln -s $out/share/man/man1/{python2.6.1,python.1} + + paxmark E $out/bin/python${majorVersion} + + ${ optionalString includeModules "$out/bin/python ./setup.py build_ext"} ''; passthru = rec { inherit zlibSupport; isPy2 = true; isPy26 = true; + buildEnv = callPackage ../wrapper.nix { python = self; }; libPrefix = "python${majorVersion}"; executable = libPrefix; sitePackages = "lib/${libPrefix}/site-packages"; + interpreter = "${self}/bin/${executable}"; }; enableParallelBuilding = true; @@ -96,7 +112,7 @@ let ''; license = stdenv.lib.licenses.psfl; platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ simons chaoflow ]; + maintainers = with stdenv.lib.maintainers; [ simons chaoflow iElectric ]; }; }; @@ -108,25 +124,18 @@ let , internalName ? "_" + moduleName , deps }: - stdenv.mkDerivation rec { + if includeModules then null else stdenv.mkDerivation rec { name = "python-${moduleName}-${python.version}"; - inherit src patches; + inherit src patches preConfigure; buildInputs = [ python ] ++ deps; C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs); LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs); - configurePhase = "true"; - buildPhase = '' - # Fake the build environment that setup.py expects. - ln -s ${python}/include/python*/pyconfig.h . - ln -s ${python}/lib/python*/config/Setup Modules/ - ln -s ${python}/lib/python*/config/Setup.local Modules/ - substituteInPlace setup.py --replace 'self.extensions = extensions' \ 'self.extensions = [ext for ext in self.extensions if ext.name in ["${internalName}"]]' @@ -178,8 +187,6 @@ let deps = [ sqlite ]; }; - ssl = null; - tkinter = buildInternalPythonModule { moduleName = "tkinter"; deps = [ tcl tk x11 ]; diff --git a/pkgs/development/interpreters/python/2.6/setup-hook.sh b/pkgs/development/interpreters/python/2.6/setup-hook.sh index 290525c35713..4caff9c9d846 100644 --- a/pkgs/development/interpreters/python/2.6/setup-hook.sh +++ b/pkgs/development/interpreters/python/2.6/setup-hook.sh @@ -12,4 +12,4 @@ toPythonPath() { echo $result } -envHooks=(${envHooks[@]} addPythonPath) +envHooks+=(addPythonPath) diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index c19430862c21..3201d7520d13 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -1,12 +1,11 @@ -{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2 -, sqlite, tcl, tk, x11, openssl, readline, db, ncurses, gdbm, libX11 }: +{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, includeModules ? false +, sqlite, tcl, tk, x11, openssl, readline, db, ncurses, gdbm, libX11, self, callPackage }: assert zlibSupport -> zlib != null; with stdenv.lib; let - majorVersion = "2.7"; version = "${majorVersion}.8"; @@ -28,33 +27,39 @@ let # patch python to put zero timestamp into pyc # if DETERMINISTIC_BUILD env var is set ./deterministic-build.patch - ]; - - postPatch = stdenv.lib.optionalString (stdenv.gcc.libc != null) '' - substituteInPlace ./Lib/plat-generic/regen \ - --replace /usr/include/netinet/in.h \ - ${stdenv.gcc.libc}/include/netinet/in.h - ''; - - buildInputs = - optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++ - [ bzip2 openssl ] - ++ optional zlibSupport zlib; - ensurePurity = - '' + # http://bugs.python.org/issue21963 + ./remove-avoid-daemon-thread-shutdown.patch + ]; + + preConfigure = '' # Purity. for i in /usr /sw /opt /pkg; do substituteInPlace ./setup.py --replace $i /no-such-path done + '' + optionalString (stdenv ? gcc && stdenv.gcc.libc != null) '' + for i in Lib/plat-*/regen; do + substituteInPlace $i --replace /usr/include/ ${stdenv.gcc.libc}/include/ + done + '' + optionalString stdenv.isCygwin '' + # On Cygwin, `make install' tries to read this Makefile. + mkdir -p $out/lib/python${majorVersion}/config + touch $out/lib/python${majorVersion}/config/Makefile + mkdir -p $out/include/python${majorVersion} + touch $out/include/python${majorVersion}/pyconfig.h ''; + buildInputs = + optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++ + [ bzip2 openssl ] ++ optionals includeModules [ db openssl ncurses gdbm libX11 readline x11 tcl tk sqlite ] + ++ optional zlibSupport zlib; + # Build the basic Python interpreter without modules that have # external dependencies. python = stdenv.mkDerivation { name = "python-${version}"; - inherit majorVersion version src patches postPatch buildInputs; + inherit majorVersion version src patches buildInputs preConfigure; LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs); @@ -62,36 +67,41 @@ let configureFlags = "--enable-shared --with-threads --enable-unicode"; - preConfigure = "${ensurePurity}" + optionalString stdenv.isCygwin - '' - # On Cygwin, `make install' tries to read this Makefile. - mkdir -p $out/lib/python${majorVersion}/config - touch $out/lib/python${majorVersion}/config/Makefile - mkdir -p $out/include/python${majorVersion} - touch $out/include/python${majorVersion}/pyconfig.h - ''; - NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-msse2"; + DETERMINISTIC_BUILD = 1; setupHook = ./setup-hook.sh; postInstall = '' - rm -rf "$out/lib/python${majorVersion}/test" + # needed for some packages, especially packages that backport + # functionality to 2.x from 3.x + for item in $out/lib/python${majorVersion}/test/*; do + if [[ "$item" != */test_support.py* ]]; then + rm -rf "$item" + else + echo $item + fi + done + touch $out/lib/python${majorVersion}/test/__init__.py ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb${majorVersion} ln -s $out/share/man/man1/{python2.7.1.gz,python.1.gz} paxmark E $out/bin/python${majorVersion} + + ${ optionalString includeModules "$out/bin/python ./setup.py build_ext"} ''; passthru = rec { inherit zlibSupport; isPy2 = true; isPy27 = true; + buildEnv = callPackage ../wrapper.nix { python = self; }; libPrefix = "python${majorVersion}"; executable = libPrefix; sitePackages = "lib/${libPrefix}/site-packages"; + interpreter = "${self}/bin/${executable}"; }; enableParallelBuilding = true; @@ -110,7 +120,7 @@ let ''; license = stdenv.lib.licenses.psfl; platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ simons chaoflow ]; + maintainers = with stdenv.lib.maintainers; [ simons chaoflow iElectric ]; }; }; @@ -122,25 +132,17 @@ let , internalName ? "_" + moduleName , deps }: - stdenv.mkDerivation rec { + if includeModules then null else stdenv.mkDerivation rec { name = "python-${moduleName}-${python.version}"; - inherit src patches postPatch; + inherit src patches preConfigure; buildInputs = [ python ] ++ deps; C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs); LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs); - configurePhase = "${ensurePurity}"; - - buildPhase = - '' - # Fake the build environment that setup.py expects. - ln -s ${python}/include/python*/pyconfig.h . - ln -s ${python}/lib/python*/config/Setup Modules/ - ln -s ${python}/lib/python*/config/Setup.local Modules/ - + buildPhase = '' substituteInPlace setup.py --replace 'self.extensions = extensions' \ 'self.extensions = [ext for ext in self.extensions if ext.name in ["${internalName}"]]' @@ -192,8 +194,6 @@ let deps = [ sqlite ]; }; - ssl = null; - tkinter = buildInternalPythonModule { moduleName = "tkinter"; deps = [ tcl tk x11 libX11 ]; diff --git a/pkgs/development/interpreters/python/2.7/remove-avoid-daemon-thread-shutdown.patch b/pkgs/development/interpreters/python/2.7/remove-avoid-daemon-thread-shutdown.patch new file mode 100644 index 000000000000..650f276f08a3 --- /dev/null +++ b/pkgs/development/interpreters/python/2.7/remove-avoid-daemon-thread-shutdown.patch @@ -0,0 +1,170 @@ +changeset: 93046:61ad2208a5ce +branch: 2.7 +tag: tip +user: William A. Kennington III <william@wkennington.com> +date: Mon Oct 13 13:57:12 2014 -0700 +summary: Revert: 91229:7741d0dd66ca to fix i21963 + +diff -r ed4098380799 -r 61ad2208a5ce Include/pythonrun.h +--- a/Include/pythonrun.h Mon Oct 13 12:58:03 2014 -0700 ++++ b/Include/pythonrun.h Mon Oct 13 13:57:12 2014 -0700 +@@ -147,8 +147,6 @@ + PyAPI_FUNC(void) PyByteArray_Fini(void); + PyAPI_FUNC(void) _PyRandom_Fini(void); + +-PyAPI_DATA(PyThreadState *) _Py_Finalizing; +- + /* Stuff with no proper home (yet) */ + PyAPI_FUNC(char *) PyOS_Readline(FILE *, FILE *, char *); + PyAPI_DATA(int) (*PyOS_InputHook)(void); +diff -r ed4098380799 -r 61ad2208a5ce Lib/test/test_threading.py +--- a/Lib/test/test_threading.py Mon Oct 13 12:58:03 2014 -0700 ++++ b/Lib/test/test_threading.py Mon Oct 13 13:57:12 2014 -0700 +@@ -700,49 +700,6 @@ + output = "end of worker thread\nend of main thread\n" + self.assertScriptHasOutput(script, output) + +- @unittest.skipIf(sys.platform in platforms_to_skip, "due to known OS bug") +- def test_6_daemon_threads(self): +- # Check that a daemon thread cannot crash the interpreter on shutdown +- # by manipulating internal structures that are being disposed of in +- # the main thread. +- script = """if True: +- import os +- import random +- import sys +- import time +- import threading +- +- thread_has_run = set() +- +- def random_io(): +- '''Loop for a while sleeping random tiny amounts and doing some I/O.''' +- while True: +- in_f = open(os.__file__, 'rb') +- stuff = in_f.read(200) +- null_f = open(os.devnull, 'wb') +- null_f.write(stuff) +- time.sleep(random.random() / 1995) +- null_f.close() +- in_f.close() +- thread_has_run.add(threading.current_thread()) +- +- def main(): +- count = 0 +- for _ in range(40): +- new_thread = threading.Thread(target=random_io) +- new_thread.daemon = True +- new_thread.start() +- count += 1 +- while len(thread_has_run) < count: +- time.sleep(0.001) +- # Trigger process shutdown +- sys.exit(0) +- +- main() +- """ +- rc, out, err = assert_python_ok('-c', script) +- self.assertFalse(err) +- + @unittest.skipUnless(hasattr(os, 'fork'), "needs os.fork()") + @unittest.skipIf(sys.platform in platforms_to_skip, "due to known OS bug") + def test_reinit_tls_after_fork(self): +diff -r ed4098380799 -r 61ad2208a5ce Misc/NEWS +--- a/Misc/NEWS Mon Oct 13 12:58:03 2014 -0700 ++++ b/Misc/NEWS Mon Oct 13 13:57:12 2014 -0700 +@@ -96,10 +96,6 @@ + - Issue #21831: Avoid integer overflow when large sizes and offsets are given to + the buffer type. + +-- Issue #1856: Avoid crashes and lockups when daemon threads run while the +- interpreter is shutting down; instead, these threads are now killed when they +- try to take the GIL. +- + - Issue #19656: Running Python with the -3 option now also warns about + non-ascii bytes literals. + +diff -r ed4098380799 -r 61ad2208a5ce Python/ceval.c +--- a/Python/ceval.c Mon Oct 13 12:58:03 2014 -0700 ++++ b/Python/ceval.c Mon Oct 13 13:57:12 2014 -0700 +@@ -355,12 +355,6 @@ + if (interpreter_lock) { + int err = errno; + PyThread_acquire_lock(interpreter_lock, 1); +- /* _Py_Finalizing is protected by the GIL */ +- if (_Py_Finalizing && tstate != _Py_Finalizing) { +- PyThread_release_lock(interpreter_lock); +- PyThread_exit_thread(); +- assert(0); /* unreachable */ +- } + errno = err; + } + #endif +@@ -1024,13 +1018,6 @@ + /* Other threads may run now */ + + PyThread_acquire_lock(interpreter_lock, 1); +- +- /* Check if we should make a quick exit. */ +- if (_Py_Finalizing && _Py_Finalizing != tstate) { +- PyThread_release_lock(interpreter_lock); +- PyThread_exit_thread(); +- } +- + if (PyThreadState_Swap(tstate) != NULL) + Py_FatalError("ceval: orphan tstate"); + +diff -r ed4098380799 -r 61ad2208a5ce Python/pythonrun.c +--- a/Python/pythonrun.c Mon Oct 13 12:58:03 2014 -0700 ++++ b/Python/pythonrun.c Mon Oct 13 13:57:12 2014 -0700 +@@ -91,8 +91,6 @@ + int Py_NoUserSiteDirectory = 0; /* for -s and site.py */ + int Py_HashRandomizationFlag = 0; /* for -R and PYTHONHASHSEED */ + +-PyThreadState *_Py_Finalizing = NULL; +- + + /* Hack to force loading of object files */ + int (*_PyOS_mystrnicmp_hack)(const char *, const char *, Py_ssize_t) = \ +@@ -165,7 +163,6 @@ + if (initialized) + return; + initialized = 1; +- _Py_Finalizing = NULL; + + if ((p = Py_GETENV("PYTHONDEBUG")) && *p != '\0') + Py_DebugFlag = add_flag(Py_DebugFlag, p); +@@ -425,16 +422,12 @@ + * the threads created via Threading. + */ + call_sys_exitfunc(); ++ initialized = 0; + + /* Get current thread state and interpreter pointer */ + tstate = PyThreadState_GET(); + interp = tstate->interp; + +- /* Remaining threads (e.g. daemon threads) will automatically exit +- after taking the GIL (in PyEval_RestoreThread()). */ +- _Py_Finalizing = tstate; +- initialized = 0; +- + /* Disable signal handling */ + PyOS_FiniInterrupts(); + +diff -r ed4098380799 -r 61ad2208a5ce Python/thread_pthread.h +--- a/Python/thread_pthread.h Mon Oct 13 12:58:03 2014 -0700 ++++ b/Python/thread_pthread.h Mon Oct 13 13:57:12 2014 -0700 +@@ -242,9 +242,9 @@ + PyThread_exit_thread(void) + { + dprintf(("PyThread_exit_thread called\n")); +- if (!initialized) ++ if (!initialized) { + exit(0); +- pthread_exit(0); ++ } + } + + #ifdef USE_SEMAPHORES + diff --git a/pkgs/development/interpreters/python/2.7/setup-hook.sh b/pkgs/development/interpreters/python/2.7/setup-hook.sh index a393b70afe10..4770eea886f6 100644 --- a/pkgs/development/interpreters/python/2.7/setup-hook.sh +++ b/pkgs/development/interpreters/python/2.7/setup-hook.sh @@ -12,4 +12,4 @@ toPythonPath() { echo $result } -envHooks=(${envHooks[@]} addPythonPath) +envHooks+=(addPythonPath) diff --git a/pkgs/development/interpreters/python/3.2/CVE-2014-1912.patch b/pkgs/development/interpreters/python/3.2/CVE-2014-1912.patch deleted file mode 100644 index c69efd17f964..000000000000 --- a/pkgs/development/interpreters/python/3.2/CVE-2014-1912.patch +++ /dev/null @@ -1,57 +0,0 @@ -# Edited from Mercurial patch: deleted the NEWS hunk, since it didn't apply cleanly. -# It added the following line to NEWS: -# - Issue #20246: Fix buffer overflow in socket.recvfrom_into. - - -# HG changeset patch -# User Benjamin Peterson <benjamin@python.org> -# Date 1389671978 18000 -# Node ID 9c56217e5c793685eeaf0ee224848c402bdf1e4c -# Parent 2b5cd6d4d149dea6c6941b7e07ada248b29fc9f6 -complain when nbytes > buflen to fix possible buffer overflow (closes #20246) - -diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py ---- a/Lib/test/test_socket.py -+++ b/Lib/test/test_socket.py -@@ -1968,6 +1968,14 @@ class BufferIOTest(SocketConnectedTest): - - _testRecvFromIntoMemoryview = _testRecvFromIntoArray - -+ def testRecvFromIntoSmallBuffer(self): -+ # See issue #20246. -+ buf = bytearray(8) -+ self.assertRaises(ValueError, self.cli_conn.recvfrom_into, buf, 1024) -+ -+ def _testRecvFromIntoSmallBuffer(self): -+ self.serv_conn.send(MSG*2048) -+ - - TIPC_STYPE = 2000 - TIPC_LOWER = 200 -diff --git a/Misc/ACKS b/Misc/ACKS ---- a/Misc/ACKS -+++ b/Misc/ACKS -@@ -1020,6 +1020,7 @@ Eric V. Smith - Christopher Smith - Gregory P. Smith - Roy Smith -+Ryan Smith-Roberts - Rafal Smotrzyk - Dirk Soede - Paul Sokolovsky -diff --git a/Misc/NEWS b/Misc/NEWS ---- a/Modules/socketmodule.c -+++ b/Modules/socketmodule.c -@@ -2598,6 +2598,11 @@ sock_recvfrom_into(PySocketSockObject *s - if (recvlen == 0) { - /* If nbytes was not specified, use the buffer's length */ - recvlen = buflen; -+ } else if (recvlen > buflen) { -+ PyBuffer_Release(&pbuf); -+ PyErr_SetString(PyExc_ValueError, -+ "nbytes is greater than the length of the buffer"); -+ return NULL; - } - - readlen = sock_recvfrom_guts(s, buf, recvlen, flags, &addr); - diff --git a/pkgs/development/interpreters/python/3.2/default.nix b/pkgs/development/interpreters/python/3.2/default.nix index 489d0509c1a4..d3f5c6e1f138 100644 --- a/pkgs/development/interpreters/python/3.2/default.nix +++ b/pkgs/development/interpreters/python/3.2/default.nix @@ -9,6 +9,8 @@ , sqlite , tcl, tk , zlib +, callPackage +, self }: assert readline != null -> ncurses != null; @@ -17,7 +19,7 @@ with stdenv.lib; let majorVersion = "3.2"; - version = "${majorVersion}.5"; + version = "${majorVersion}.6"; buildInputs = filter (p: p != null) [ zlib bzip2 gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto @@ -28,16 +30,10 @@ stdenv.mkDerivation { inherit majorVersion version; src = fetchurl { - url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2"; - sha256 = "0pxs234g08v3lar09lvzxw4vqdpwkbqmvkv894j2w7aklskcjd6v"; + url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"; + sha256 = "1p3vvvh3qw8avq959hdl6bq5d6r7mbhrnigqzgx6mllzh40va4hx"; }; - patches = - [ - # See http://bugs.python.org/issue20246 - ./CVE-2014-1912.patch - ]; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; preConfigure = '' @@ -56,14 +52,25 @@ stdenv.mkDerivation { setupHook = ./setup-hook.sh; postInstall = '' - rm -rf "$out/lib/python${majorVersion}/test" + # needed for some packages, especially packages that backport functionality + # to 2.x from 3.x + for item in $out/lib/python${majorVersion}/test/*; do + if [[ "$item" != */test_support.py* ]]; then + rm -rf "$item" + else + echo $item + fi + done + touch $out/lib/python${majorVersion}/test/__init__.py ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}" + paxmark E $out/bin/python${majorVersion} ''; passthru = rec { zlibSupport = zlib != null; sqliteSupport = sqlite != null; dbSupport = db != null; + buildEnv = callPackage ../wrapper.nix { python = self; }; readlineSupport = readline != null; opensslSupport = openssl != null; tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null); @@ -73,6 +80,7 @@ stdenv.mkDerivation { isPy32 = true; is_py3k = true; # deprecated sitePackages = "lib/${libPrefix}/site-packages"; + interpreter = "${self}/bin/${executable}"; }; enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/python/3.2/setup-hook.sh b/pkgs/development/interpreters/python/3.2/setup-hook.sh index e6fa34bf54ba..e8215ef9877c 100644 --- a/pkgs/development/interpreters/python/3.2/setup-hook.sh +++ b/pkgs/development/interpreters/python/3.2/setup-hook.sh @@ -12,4 +12,4 @@ toPythonPath() { echo $result } -envHooks=(${envHooks[@]} addPythonPath) +envHooks+=(addPythonPath) diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix index fcc033803498..1f91d1bbaf43 100644 --- a/pkgs/development/interpreters/python/3.3/default.nix +++ b/pkgs/development/interpreters/python/3.3/default.nix @@ -10,6 +10,8 @@ , sqlite , tcl, tk , zlib +, callPackage +, self }: assert readline != null -> ncurses != null; @@ -18,7 +20,7 @@ with stdenv.lib; let majorVersion = "3.3"; - version = "${majorVersion}.5"; + version = "${majorVersion}.6"; buildInputs = filter (p: p != null) [ zlib bzip2 lzma gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto @@ -30,7 +32,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"; - sha256 = "1rdncc7g8g6f3lfdg33rli1yffbiq8z283xy4f5ksl1l8i49psdb"; + sha256 = "0gsxpgd5p4mwd01gw501vsyahncyw3h9836ypkr3y32kgazy89jj"; }; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; @@ -51,9 +53,17 @@ stdenv.mkDerivation { setupHook = ./setup-hook.sh; postInstall = '' - rm -rf "$out/lib/python${majorVersion}/test" + # needed for some packages, especially packages that backport functionality + # to 2.x from 3.x + for item in $out/lib/python${majorVersion}/test/*; do + if [[ "$item" != */test_support.py* ]]; then + rm -rf "$item" + else + echo $item + fi + done + touch $out/lib/python${majorVersion}/test/__init__.py ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}" - paxmark E $out/bin/python${majorVersion} ''; @@ -66,10 +76,12 @@ stdenv.mkDerivation { tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null); libPrefix = "python${majorVersion}"; executable = "python3.3m"; + buildEnv = callPackage ../wrapper.nix { python = self; }; isPy3 = true; isPy33 = true; is_py3k = true; # deprecated sitePackages = "lib/${libPrefix}/site-packages"; + interpreter = "${self}/bin/${executable}"; }; enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/python/3.3/setup-hook.sh b/pkgs/development/interpreters/python/3.3/setup-hook.sh index c272c87daf1c..82a8c0abd32f 100644 --- a/pkgs/development/interpreters/python/3.3/setup-hook.sh +++ b/pkgs/development/interpreters/python/3.3/setup-hook.sh @@ -12,4 +12,4 @@ toPythonPath() { echo $result } -envHooks=(${envHooks[@]} addPythonPath) +envHooks+=(addPythonPath) diff --git a/pkgs/development/interpreters/python/3.4/default.nix b/pkgs/development/interpreters/python/3.4/default.nix index 312bf247de7c..3cadfc2d22f6 100644 --- a/pkgs/development/interpreters/python/3.4/default.nix +++ b/pkgs/development/interpreters/python/3.4/default.nix @@ -10,6 +10,8 @@ , sqlite , tcl, tk , zlib +, callPackage +, self }: assert readline != null -> ncurses != null; @@ -18,7 +20,7 @@ with stdenv.lib; let majorVersion = "3.4"; - version = "${majorVersion}.1"; + version = "${majorVersion}.2"; fullVersion = "${version}"; buildInputs = filter (p: p != null) [ @@ -31,13 +33,11 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz"; - sha256 = "1i7dgbzyvj24i6gfhb5q2zwr9nn1ni6w1ig1rcgh96a321is35f5"; + sha256 = "1vrd9gqdqw7rw0kiiprqvng7ywnfc2hbyys7gr9mdh25s619cv8w"; }; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; - patches = [ ./issue21121-3.patch ]; - preConfigure = '' for i in /usr /sw /opt /pkg; do # improve purity substituteInPlace ./setup.py --replace $i /no-such-path @@ -54,9 +54,18 @@ stdenv.mkDerivation { setupHook = ./setup-hook.sh; postInstall = '' - rm -rf "$out/lib/python${majorVersion}/test" - ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}" + # needed for some packages, especially packages that backport functionality + # to 2.x from 3.x + for item in $out/lib/python${majorVersion}/test/*; do + if [[ "$item" != */test_support.py* ]]; then + rm -rf "$item" + else + echo $item + fi + done + touch $out/lib/python${majorVersion}/test/__init__.py + ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}" paxmark E $out/bin/python${majorVersion} ''; @@ -69,10 +78,12 @@ stdenv.mkDerivation { tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null); libPrefix = "python${majorVersion}"; executable = "python3.4m"; + buildEnv = callPackage ../wrapper.nix { python = self; }; isPy3 = true; isPy34 = true; is_py3k = true; # deprecated sitePackages = "lib/${libPrefix}/site-packages"; + interpreter = "${self}/bin/${executable}"; }; enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/python/3.4/issue21121-3.patch b/pkgs/development/interpreters/python/3.4/issue21121-3.patch deleted file mode 100644 index 506d9ea9b3d9..000000000000 --- a/pkgs/development/interpreters/python/3.4/issue21121-3.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff --git a/Makefile.pre.in b/Makefile.pre.in ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -71,12 +71,17 @@ - BASECFLAGS= @BASECFLAGS@ - BASECPPFLAGS= @BASECPPFLAGS@ - CONFIGURE_CFLAGS= @CFLAGS@ -+# CFLAGS_NODIST is used for building the interpreter and stdlib C extensions. -+# Use it when a compiler flag should _not_ be part of the distutils CFLAGS -+# once Python is installed (Issue #21121). -+CONFIGURE_CFLAGS_NODIST=@CFLAGS_NODIST@ - CONFIGURE_CPPFLAGS= @CPPFLAGS@ - CONFIGURE_LDFLAGS= @LDFLAGS@ - # Avoid assigning CFLAGS, LDFLAGS, etc. so users can use them on the - # command line to append to these values without stomping the pre-set - # values. - PY_CFLAGS= $(BASECFLAGS) $(OPT) $(CONFIGURE_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) -+PY_CFLAGS_NODIST=$(CONFIGURE_CFLAGS_NODIST) $(CFLAGS_NODIST) - # Both CPPFLAGS and LDFLAGS need to contain the shell's value for setup.py to - # be able to build extension modules using the directories specified in the - # environment variables -@@ -91,7 +96,7 @@ - # Extra C flags added for building the interpreter object files. - CFLAGSFORSHARED=@CFLAGSFORSHARED@ - # C flags used for building the interpreter object files --PY_CORE_CFLAGS= $(PY_CFLAGS) $(PY_CPPFLAGS) $(CFLAGSFORSHARED) -DPy_BUILD_CORE -+PY_CORE_CFLAGS= $(PY_CFLAGS) $(PY_CFLAGS_NODIST) $(PY_CPPFLAGS) $(CFLAGSFORSHARED) -DPy_BUILD_CORE - - - # Machine-dependent subdirectories -diff --git a/configure b/configure ---- a/configure -+++ b/configure -@@ -662,6 +662,7 @@ - LIBTOOL_CRUFT - OTHER_LIBTOOL_OPT - UNIVERSAL_ARCH_FLAGS -+CFLAGS_NODIST - BASECFLAGS - OPT - ABIFLAGS -@@ -6504,7 +6505,7 @@ - - if test $ac_cv_declaration_after_statement_warning = yes - then -- BASECFLAGS="$BASECFLAGS -Werror=declaration-after-statement" -+ CFLAGS_NODIST="$CFLAGS_NODIST -Werror=declaration-after-statement" - fi - - # if using gcc on alpha, use -mieee to get (near) full IEEE 754 -diff --git a/configure.ac b/configure.ac ---- a/configure.ac -+++ b/configure.ac -@@ -1147,6 +1147,7 @@ - fi - - AC_SUBST(BASECFLAGS) -+AC_SUBST(CFLAGS_NODIST) - - # The -arch flags for universal builds on OSX - UNIVERSAL_ARCH_FLAGS= -@@ -1231,7 +1232,7 @@ - - if test $ac_cv_declaration_after_statement_warning = yes - then -- BASECFLAGS="$BASECFLAGS -Werror=declaration-after-statement" -+ CFLAGS_NODIST="$CFLAGS_NODIST -Werror=declaration-after-statement" - fi - - # if using gcc on alpha, use -mieee to get (near) full IEEE 754 -diff --git a/setup.py b/setup.py ---- a/setup.py -+++ b/setup.py -@@ -19,6 +19,12 @@ - - cross_compiling = "_PYTHON_HOST_PLATFORM" in os.environ - -+# Add special CFLAGS reserved for building the interpreter and the stdlib -+# modules (Issue #21121). -+cflags = sysconfig.get_config_var('CFLAGS') -+py_cflags_nodist = sysconfig.get_config_var('PY_CFLAGS_NODIST') -+sysconfig.get_config_vars()['CFLAGS'] = cflags + ' ' + py_cflags_nodist -+ - def get_platform(): - # cross build - if "_PYTHON_HOST_PLATFORM" in os.environ: diff --git a/pkgs/development/interpreters/python/3.4/setup-hook.sh b/pkgs/development/interpreters/python/3.4/setup-hook.sh index ae71b4147ab7..fddcc0b73fe8 100644 --- a/pkgs/development/interpreters/python/3.4/setup-hook.sh +++ b/pkgs/development/interpreters/python/3.4/setup-hook.sh @@ -12,4 +12,4 @@ toPythonPath() { echo $result } -envHooks=(${envHooks[@]} addPythonPath) +envHooks+=(addPythonPath) diff --git a/pkgs/development/interpreters/python/python-linkme-wrapper.nix b/pkgs/development/interpreters/python/python-linkme-wrapper.nix deleted file mode 100644 index 040dd7531a2b..000000000000 --- a/pkgs/development/interpreters/python/python-linkme-wrapper.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ stdenv }: - -stdenv.mkDerivation { - name = "python-linkme-wrapper-1.0"; - - unpackPhase = "true"; - - installPhase = '' - mkdir -p $out/bin - cat ${./python-linkme-wrapper.sh} > $out/bin/.python-linkme-wrapper - chmod +x $out/bin/.python-linkme-wrapper - ''; - - preferLocalBuild = true; -} diff --git a/pkgs/development/interpreters/python/python-linkme-wrapper.sh b/pkgs/development/interpreters/python/python-linkme-wrapper.sh deleted file mode 100644 index 42674aa83b08..000000000000 --- a/pkgs/development/interpreters/python/python-linkme-wrapper.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -# -# Install it into a nix profile and from there build symlink chains. -# The chain will be followed to set the PYTHONPATH -# A/bin/foo -> B/bin/bar -> NIXENV/bin/.python-linkme-wrapper.sh -# - -if test ! -L "$0"; then - echo "Link me!" - exit 1 -fi - -PROG=$(basename "$0") -SITES= - -pypath() { - BIN=$(realpath -s "$(dirname "$1")") - ENV=$(dirname "$BIN") - SITE="$ENV/lib/python2.7/site-packages" - SITES="$SITES${SITES:+:}$SITE" - - PRG="$BIN"/$(readlink "$1") - - if test -L "$PRG"; then - pypath "$PRG" - fi -} - -pypath $(realpath -s "$0") - -export PYTHONPATH="$PYTHONPATH${PYTHONPATH:+:}$SITES" - -exec "$BIN/$PROG" "$@" diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index ccfbcfcdd42f..163e8d7194ba 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -1,12 +1,15 @@ -{ stdenv, python, buildEnv, makeWrapper, recursivePthLoader, extraLibs ? [], postBuild ? "" -, stdLibs ? stdenv.lib.attrValues python.modules, ignoreCollisions ? false -}: +{ stdenv, python, buildEnv, makeWrapper +, extraLibs ? [] +, postBuild ? "" +, ignoreCollisions ? false }: # Create a python executable that knows about additional packages. - +let + recursivePthLoader = import ../../python-modules/recursive-pth-loader/default.nix { stdenv = stdenv; python = python; }; +in (buildEnv { - name = "python-${python.version}-wrapper"; - paths = stdenv.lib.filter (x : x ? pythonPath) (stdenv.lib.closePropagation extraLibs) ++ stdLibs ++ [ python recursivePthLoader ]; + name = "${python.name}-env"; + paths = stdenv.lib.filter (x : x ? pythonPath) (stdenv.lib.closePropagation extraLibs) ++ [ python recursivePthLoader ]; inherit ignoreCollisions; diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 469ef118310a..b626c8a1539c 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -1,38 +1,48 @@ -{ stdenv, fetchurl, cairo, file, pango, glib, gtk -, which, libtool, makeWrapper, libjpeg, libpng -, fontconfig, liberation_ttf, sqlite, openssl } : +{ stdenv, fetchurl, cairo, file, fontconfig, glib, gtk, freefont_ttf +, libjpeg, libpng, libtool, makeWrapper, openssl, pango, sqlite, which, readline } : stdenv.mkDerivation rec { pname = "racket"; - version = "6.0.1"; + version = "6.1.1"; name = "${pname}-${version}"; src = fetchurl { url = "http://mirror.racket-lang.org/installers/${version}/${name}-src.tgz"; - sha256 = "e2bc0d4d0fcdfc3327a58c931f203c07a06d4724703f9708ba2e4c8ea0f9694d"; + sha256 = "090269522d20e7a5ce85d2251a126745746ebf5e87554c05efe03f3b7173da75"; }; - # Various racket executables do run-time searches for these. - ffiSharedLibs = "${glib}/lib:${cairo}/lib:${pango}/lib:${gtk}/lib:${libjpeg}/lib:${libpng}/lib:${sqlite}/lib:${openssl}/lib"; + # Various Racket executables do runtime searches for these. + ffiSharedLibs = "${cairo}/lib:${fontconfig}/lib:${glib}/lib:${gtk}/lib:${libjpeg}/lib:" + + "${libpng}/lib:${openssl}/lib:${pango}/lib:${sqlite}/lib:" + + "${readline}/lib"; - buildInputs = [ file libtool which makeWrapper fontconfig liberation_ttf sqlite ]; + buildInputs = [ file fontconfig freefont_ttf libtool makeWrapper sqlite which ]; preConfigure = '' export LD_LIBRARY_PATH=${ffiSharedLibs}:$LD_LIBRARY_PATH - # Chroot builds do not have access to /etc/fonts/fonts.conf, but the Racket bootstrap - # needs a working fontconfig, so here a simple standin is used. + # Chroot builds do not have access to /etc/fonts/fonts.conf, + # but the Racket bootstrap needs a working fontconfig, + # so here a simple temporary stand-in is used. mkdir chroot-fontconfig cat ${fontconfig}/etc/fonts/fonts.conf > chroot-fontconfig/fonts.conf sed -e 's@</fontconfig>@@' -i chroot-fontconfig/fonts.conf - echo "<dir>${liberation_ttf}</dir>" >> chroot-fontconfig/fonts.conf + echo "<dir>${freefont_ttf}</dir>" >> chroot-fontconfig/fonts.conf echo "</fontconfig>" >> chroot-fontconfig/fonts.conf + # remove extraneous directories from temporary fonts.conf + sed -e 's@<dir></dir>@@g' \ + -e 's@<dir prefix="xdg">fonts</dir>@@g' \ + -e 's@<dir>~/.fonts</dir>@@g' \ + -e 's@<cachedir prefix="xdg">fontconfig</cachedir>@@g' \ + -e 's@<cachedir>~/.fontconfig</cachedir>@@g' \ + -i chroot-fontconfig/fonts.conf + export FONTCONFIG_FILE=$(pwd)/chroot-fontconfig/fonts.conf cd src sed -e 's@/usr/bin/uname@'"$(which uname)"'@g' -i configure - sed -e 's@/usr/bin/file@'"$(which file)"'@g' -i foreign/libffi/configure + sed -e 's@/usr/bin/file@'"$(which file)"'@g' -i foreign/libffi/configure ''; configureFlags = [ "--enable-shared" "--enable-lt=${libtool}/bin/libtool" ]; @@ -41,25 +51,25 @@ stdenv.mkDerivation rec { postInstall = '' for p in $(ls $out/bin/) ; do - wrapProgram $out/bin/$p --prefix LD_LIBRARY_PATH ":" "${ffiSharedLibs}" ; + wrapProgram $out/bin/$p --prefix LD_LIBRARY_PATH ":" "${ffiSharedLibs}"; done ''; meta = { - description = "Programming language derived from Scheme (formerly called PLT Scheme)"; + description = "A programmable programming language"; longDescription = '' - Racket (formerly called PLT Scheme) is a programming language derived - from Scheme. The Racket project has four primary components: the - implementation of Racket, a JIT compiler; DrRacket, the Racket program - development environment; the TeachScheme! outreach, an attempt to turn - Computing and Programming into "an indispensable part of the liberal - arts curriculum"; and PLaneT, Racket's web-based package - distribution system for user-contributed packages. + Racket is a full-spectrum programming language. It goes beyond + Lisp and Scheme with dialects that support objects, types, + laziness, and more. Racket enables programmers to link + components written in different dialects, and it empowers + programmers to create new, project-specific dialects. Racket's + libraries support applications from web servers and databases to + GUIs and charts. ''; homepage = http://racket-lang.org/; - license = stdenv.lib.licenses.lgpl2Plus; # and licenses of contained libraries - maintainers = [ stdenv.lib.maintainers.kkallio ]; + license = stdenv.lib.licenses.lgpl3; + maintainers = with stdenv.lib.maintainers; [ kkallio henrytill ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/interpreters/regina/default.nix b/pkgs/development/interpreters/regina/default.nix index 992f7281554c..e6c84edacaf2 100644 --- a/pkgs/development/interpreters/regina/default.nix +++ b/pkgs/development/interpreters/regina/default.nix @@ -12,7 +12,7 @@ let sourceInfo = rec { baseName="Regina-REXX"; pname="regina-rexx"; - version = "3.8.2"; + version = "3.9.0"; name="${baseName}-${version}"; url="mirror://sourceforge/${pname}/${pname}/${version}/${name}.tar.gz"; }; @@ -20,7 +20,7 @@ in rec { src = a.fetchurl { url = sourceInfo.url; - sha256 = "06vr6p9pqr5zzsxm1l9iwb2w9z8qkm971c2knh0vf5bbm6znjz35"; + sha256 = "051w6i5xyjq7j9yrhw4r14kw105gpylby6z5x9v31f5g824n4mfr"; }; inherit (sourceInfo) name version; diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index 78567b1979f5..f3b47025547e 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -3,30 +3,30 @@ g: # Get dependencies from patched gems { aliases = { - ZenTest = g.ZenTest_4_10_1; - actionmailer = g.actionmailer_4_1_6; - actionpack = g.actionpack_4_1_6; - actionview = g.actionview_4_1_6; - activemodel = g.activemodel_4_1_6; - activerecord = g.activerecord_4_1_6; - activesupport = g.activesupport_4_1_6; + ZenTest = g.ZenTest_4_11_0; + actionmailer = g.actionmailer_4_1_8; + actionpack = g.actionpack_4_1_8; + actionview = g.actionview_4_1_8; + activemodel = g.activemodel_4_1_8; + activerecord = g.activerecord_4_1_8; + activesupport = g.activesupport_4_1_8; addressable = g.addressable_2_3_6; arel = g.arel_5_0_1_20140414130214; - atoulme_Antwrap = g.atoulme_Antwrap_0_7_4; + atoulme_Antwrap = g.atoulme_Antwrap_0_7_5; autotest_rails = g.autotest_rails_4_2_1; - aws_sdk = g.aws_sdk_1_53_0; - aws_sdk_v1 = g.aws_sdk_v1_1_53_0; - backports = g.backports_3_6_1; + aws_sdk = g.aws_sdk_1_59_0; + aws_sdk_v1 = g.aws_sdk_v1_1_59_0; + backports = g.backports_3_6_4; bitbucket_backup = g.bitbucket_backup_0_3_1; blankslate = g.blankslate_2_1_2_4; builder = g.builder_3_2_2; buildr = g.buildr_1_4_20; - bundler = g.bundler_1_7_3; + bundler = g.bundler_1_7_7; celluloid = g.celluloid_0_16_0; - childprocess = g.childprocess_0_5_3; + childprocess = g.childprocess_0_5_5; chronic = g.chronic_0_10_2; - chunky_png = g.chunky_png_1_3_1; - classifier_reborn = g.classifier_reborn_2_0_1; + chunky_png = g.chunky_png_1_3_3; + classifier_reborn = g.classifier_reborn_2_0_2; coderay = g.coderay_1_1_0; coffee_script = g.coffee_script_2_3_0; coffee_script_source = g.coffee_script_source_1_8_0; @@ -38,28 +38,27 @@ g: # Get dependencies from patched gems daemons = g.daemons_1_1_9; diff_lcs = g.diff_lcs_1_2_5; dimensions = g.dimensions_1_2_0; - domain_name = g.domain_name_0_5_21; - dotenv = g.dotenv_0_11_1; - dotenv_deployment = g.dotenv_deployment_0_0_2; + domain_name = g.domain_name_0_5_22; + dotenv = g.dotenv_1_0_2; em_resolv_replace = g.em_resolv_replace_1_1_3; erubis = g.erubis_2_7_0; ethon = g.ethon_0_7_1; eventmachine = g.eventmachine_1_0_3; eventmachine_tail = g.eventmachine_tail_0_6_4; - excon = g.excon_0_39_5; - execjs = g.execjs_2_2_1; - fakes3 = g.fakes3_0_1_5_2; + excon = g.excon_0_41_0; + execjs = g.execjs_2_2_2; + fakes3 = g.fakes3_0_1_6_1; faraday = g.faraday_0_9_0; faraday_middleware = g.faraday_middleware_0_9_1; fast_stemmer = g.fast_stemmer_1_0_2; - ffi = g.ffi_1_9_3; - file_tail = g.file_tail_1_0_12; - foreman = g.foreman_0_75_0; + ffi = g.ffi_1_9_6; + file_tail = g.file_tail_1_1_0; + foreman = g.foreman_0_76_0; gettext = g.gettext_3_1_4; gh = g.gh_0_13_2; gherkin = g.gherkin_2_12_2; - heroku = g.heroku_3_10_3; - heroku_api = g.heroku_api_0_3_19; + heroku = g.heroku_3_16_2; + heroku_api = g.heroku_api_0_3_20; highline = g.highline_1_6_21; hike = g.hike_1_2_3; hitimes = g.hitimes_1_2_2; @@ -67,30 +66,30 @@ g: # Get dependencies from patched gems http_cookie = g.http_cookie_1_0_2; i18n = g.i18n_0_6_11; iconv = g.iconv_1_0_4; - jekyll = g.jekyll_2_4_0; + jekyll = g.jekyll_2_5_2; jekyll_coffeescript = g.jekyll_coffeescript_1_0_1; jekyll_gist = g.jekyll_gist_1_1_0; - jekyll_paginate = g.jekyll_paginate_1_0_0; + jekyll_paginate = g.jekyll_paginate_1_1_0; jekyll_sass_converter = g.jekyll_sass_converter_1_2_1; - jekyll_watch = g.jekyll_watch_1_1_1; + jekyll_watch = g.jekyll_watch_1_1_2; jsduck = g.jsduck_5_3_4; json = g.json_1_8_1; json_pure = g.json_pure_1_8_0; - kramdown = g.kramdown_1_4_2; - launchy = g.launchy_2_4_2; + kramdown = g.kramdown_1_5_0; + launchy = g.launchy_2_4_3; liquid = g.liquid_2_6_1; - listen = g.listen_2_7_9; + listen = g.listen_2_8_3; locale = g.locale_2_1_0; lockfile = g.lockfile_2_1_3; macaddr = g.macaddr_1_7_1; - mail = g.mail_2_6_1; + mail = g.mail_2_6_3; mechanize = g.mechanize_2_7_3; - mercenary = g.mercenary_0_3_4; + mercenary = g.mercenary_0_3_5; method_source = g.method_source_0_8_2; - mime_types = g.mime_types_2_3; - mini_portile = g.mini_portile_0_6_0; + mime_types = g.mime_types_2_4_3; + mini_portile = g.mini_portile_0_6_1; minitar = g.minitar_0_5_4; - minitest = g.minitest_5_4_1; + minitest = g.minitest_5_4_3; multi_json = g.multi_json_1_10_1; multi_test = g.multi_test_0_1_1; multipart_post = g.multipart_post_2_0_0; @@ -99,12 +98,12 @@ g: # Get dependencies from patched gems net_http_pipeline = g.net_http_pipeline_1_0_1; net_sftp = g.net_sftp_2_1_2; net_ssh = g.net_ssh_2_9_1; - netrc = g.netrc_0_7_7; + netrc = g.netrc_0_7_9; nix = g.nix_0_1_1; - nokogiri = g.nokogiri_1_6_3_1; + nokogiri = g.nokogiri_1_6_5; ntlm_http = g.ntlm_http_0_1_1; orderedhash = g.orderedhash_0_0_6; - papertrail = g.papertrail_0_9_10; + papertrail = g.papertrail_0_9_11; papertrail_cli = g.papertrail_cli_0_9_3; parallel = g.parallel_0_7_1; parslet = g.parslet_1_5_0; @@ -115,20 +114,20 @@ g: # Get dependencies from patched gems rack = g.rack_1_5_2; rack_protection = g.rack_protection_1_5_3; rack_test = g.rack_test_0_6_2; - rails = g.rails_4_1_6; - railties = g.railties_4_1_6; - rake = g.rake_10_3_2; + rails = g.rails_4_1_8; + railties = g.railties_4_1_8; + rake = g.rake_10_4_0; rb_fsevent = g.rb_fsevent_0_9_4; rb_inotify = g.rb_inotify_0_9_5; rdiscount = g.rdiscount_2_1_7_1; rdoc = g.rdoc_4_1_2; - redcarpet = g.redcarpet_3_1_2; + redcarpet = g.redcarpet_3_2_1; remote_syslog = g.remote_syslog_1_6_14; rest_client = g.rest_client_1_6_7; riemann_dash = g.riemann_dash_0_2_9; right_aws = g.right_aws_3_1_0; right_http_connection = g.right_http_connection_1_5_0; - rjb = g.rjb_1_5_0; + rjb = g.rjb_1_5_1; rkelly_remix = g.rkelly_remix_0_0_6; rmail = g.rmail_1_0_0; rspec = g.rspec_2_14_1; @@ -136,28 +135,29 @@ g: # Get dependencies from patched gems rspec_expectations = g.rspec_expectations_2_14_5; rspec_mocks = g.rspec_mocks_2_14_6; rubyzip = g.rubyzip_1_1_6; - safe_yaml = g.safe_yaml_1_0_3; - sass = g.sass_3_4_5; - selenium_webdriver = g.selenium_webdriver_2_43_0; + safe_yaml = g.safe_yaml_1_0_4; + sass = g.sass_3_4_9; + selenium_webdriver = g.selenium_webdriver_2_44_0; servolux = g.servolux_0_10_0; sinatra = g.sinatra_1_4_5; slop = g.slop_3_6_0; - sprockets = g.sprockets_2_12_2; - sprockets_rails = g.sprockets_rails_2_1_4; + sprockets = g.sprockets_2_12_3; + sprockets_rails = g.sprockets_rails_2_2_2; syslog_protocol = g.syslog_protocol_0_9_2; systemu = g.systemu_2_6_4; taskjuggler = g.taskjuggler_3_5_0; term_ansicolor = g.term_ansicolor_1_3_0; - terminal_notifier = g.terminal_notifier_1_6_1; + terminal_notifier = g.terminal_notifier_1_6_2; text = g.text_1_3_0; - thin = g.thin_1_6_2; + thin = g.thin_1_6_3; thor = g.thor_0_19_1; thread_safe = g.thread_safe_0_3_4; tilt = g.tilt_1_4_1; timers = g.timers_4_0_1; tins = g.tins_1_3_3; - toml = g.toml_0_1_1; - travis = g.travis_1_7_2; + tmuxinator = g.tmuxinator_0_6_9; + toml = g.toml_0_1_2; + travis = g.travis_1_7_4; trollop = g.trollop_2_0; typhoeus = g.typhoeus_0_6_9; tzinfo = g.tzinfo_1_2_2; @@ -173,9 +173,9 @@ g: # Get dependencies from patched gems xml_simple = g.xml_simple_1_1_2; yajl_ruby = g.yajl_ruby_1_2_1; }; - gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''compass'' ''cucumber'' ''erubis'' ''execjs'' ''fakes3'' ''foreman'' ''gettext'' ''heroku'' ''iconv'' ''jekyll'' ''jsduck'' ''lockfile'' ''mechanize'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''rdoc'' ''remote_syslog'' ''riemann-dash'' ''right_aws'' ''rmail'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''taskjuggler'' ''terminal-notifier'' ''thin'' ''travis'' ''trollop'' ''uglifier'' ''uuid'' ''xapian-full'' ''xapian-ruby'' ''yajl-ruby'' ]; + gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''compass'' ''cucumber'' ''erubis'' ''execjs'' ''fakes3'' ''foreman'' ''gettext'' ''heroku'' ''iconv'' ''jekyll'' ''jsduck'' ''lockfile'' ''mechanize'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''rdoc'' ''remote_syslog'' ''riemann-dash'' ''right_aws'' ''rmail'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''taskjuggler'' ''terminal-notifier'' ''thin'' ''tmuxinator'' ''travis'' ''trollop'' ''uglifier'' ''uuid'' ''xapian-full'' ''xapian-ruby'' ''yajl-ruby'' ]; gems = { - ZenTest_4_10_1 = { + ZenTest_4_11_0 = { basename = ''ZenTest''; meta = { description = ''ZenTest provides 4 different tools: zentest, unit_diff, autotest, and multiruby''; @@ -202,75 +202,75 @@ multiruby runs anything you want on multiple versions of ruby. Great for compatibility checking! Use multiruby_setup to manage your installed versions.''; }; - name = ''ZenTest-4.10.1''; + name = ''ZenTest-4.11.0''; requiredGems = [ ]; - sha256 = ''1jyk0lag27s71idna2h72ljskimj0snsiw7diyjx5rqxnz6fj7z1''; + sha256 = ''0pm0kxrcbcg787jgd9z6cq0p0mg1v2m27n6sgs3pj0v219f526y8''; }; - actionmailer_4_1_6 = { + actionmailer_4_1_8 = { basename = ''actionmailer''; meta = { description = ''Email composition, delivery, and receiving framework (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Email on Rails. Compose, deliver, receive, and test emails using the familiar controller/view pattern. First-class support for multipart email and attachments.''; }; - name = ''actionmailer-4.1.6''; - requiredGems = [ g.actionpack_4_1_6 g.actionview_4_1_6 g.mail_2_6_1 ]; - sha256 = ''1lsw9h0wm7pwdzm9jdq3y5b8b1cf56fd4dcgx4s91qf0lc0dw0wv''; + name = ''actionmailer-4.1.8''; + requiredGems = [ g.actionpack_4_1_8 g.actionview_4_1_8 g.mail_2_6_3 ]; + sha256 = ''1x2jd4vbymkvikdaribgi12mbhbxnfvy54bi4wcilh2a0222m46s''; }; - actionpack_4_1_6 = { + actionpack_4_1_8 = { basename = ''actionpack''; meta = { description = ''Web-flow and rendering framework putting the VC in MVC (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Web apps on Rails. Simple, battle-tested conventions for building and testing MVC web applications. Works with any Rack-compatible server.''; }; - name = ''actionpack-4.1.6''; - requiredGems = [ g.activesupport_4_1_6 g.rack_1_5_2 g.rack_test_0_6_2 g.actionview_4_1_6 ]; - sha256 = ''07a95iahv04gikk4qbgpi9is709ynkpcd4g00kqm629jaffrsyj2''; + name = ''actionpack-4.1.8''; + requiredGems = [ g.activesupport_4_1_8 g.rack_1_5_2 g.rack_test_0_6_2 g.actionview_4_1_8 ]; + sha256 = ''19q0z7rkc7mrqapikyi4qzcxkl8bzy8dxipqq19gskrk2aqyrbsg''; }; - actionview_4_1_6 = { + actionview_4_1_8 = { basename = ''actionview''; meta = { description = ''Rendering framework putting the V in MVC (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Simple, battle-tested conventions and helpers for building web pages.''; }; - name = ''actionview-4.1.6''; - requiredGems = [ g.activesupport_4_1_6 g.builder_3_2_2 g.erubis_2_7_0 ]; - sha256 = ''1r06r4zsaqsq1wyqy2g29nnycw50v37ab7zmnvzjhy24y53rv9w7''; + name = ''actionview-4.1.8''; + requiredGems = [ g.activesupport_4_1_8 g.builder_3_2_2 g.erubis_2_7_0 ]; + sha256 = ''1a870vq2r6q4rxand0nwvq52rwakp9l4p6a834i2rjz5rildmigk''; }; - activemodel_4_1_6 = { + activemodel_4_1_8 = { basename = ''activemodel''; meta = { description = ''A toolkit for building modeling frameworks (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''A toolkit for building modeling frameworks like Active Record. Rich support for attributes, callbacks, validations, serialization, internationalization, and testing.''; }; - name = ''activemodel-4.1.6''; - requiredGems = [ g.activesupport_4_1_6 g.builder_3_2_2 ]; - sha256 = ''14mw7d0jax7sky4nc2a7rspcf2inb3m6mxhx653i00v0xjrxa3x6''; + name = ''activemodel-4.1.8''; + requiredGems = [ g.activesupport_4_1_8 g.builder_3_2_2 ]; + sha256 = ''1zvj66715rmfzf2zwwc8jyk4s21gggxvykvb6fqsny3hlhc1axq5''; }; - activerecord_4_1_6 = { + activerecord_4_1_8 = { basename = ''activerecord''; meta = { description = ''Object-relational mapper framework (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Databases on Rails. Build a persistent domain model by mapping database tables to Ruby classes. Strong conventions for associations, validations, aggregations, migrations, and testing come baked-in.''; }; - name = ''activerecord-4.1.6''; - requiredGems = [ g.activesupport_4_1_6 g.activemodel_4_1_6 g.arel_5_0_1_20140414130214 ]; - sha256 = ''15s72gawgvd7msa2i7hmjw81znif8zh1v57pmans8vmphfg2n9l7''; + name = ''activerecord-4.1.8''; + requiredGems = [ g.activesupport_4_1_8 g.activemodel_4_1_8 g.arel_5_0_1_20140414130214 ]; + sha256 = ''0nmgyskdpp59jpq51bc5jnahxs30ik08qld57p1hmy0arh39yc2g''; }; - activesupport_4_1_6 = { + activesupport_4_1_8 = { basename = ''activesupport''; meta = { description = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework.''; homepage = ''http://www.rubyonrails.org''; longDescription = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.''; }; - name = ''activesupport-4.1.6''; - requiredGems = [ g.i18n_0_6_11 g.json_1_8_1 g.tzinfo_1_2_2 g.minitest_5_4_1 g.thread_safe_0_3_4 ]; - sha256 = ''0crwl6rlxpv5fvvnvcbrjc7iygj8nklj83v1734h5lrhjzirxc22''; + name = ''activesupport-4.1.8''; + requiredGems = [ g.i18n_0_6_11 g.json_1_8_1 g.tzinfo_1_2_2 g.minitest_5_4_3 g.thread_safe_0_3_4 ]; + sha256 = ''012w64jqmkkhcah4rzmcmmd53ihrxdn81nifi6dgrg8i40cxqb8r''; }; addressable_2_3_6 = { basename = ''addressable''; @@ -304,7 +304,7 @@ database compatibility and query generation.''; requiredGems = [ ]; sha256 = ''0dhnc20h1v8ml3nmkxq92rr7qxxpk6ixhwvwhgl2dbw9mmxz0hf9''; }; - atoulme_Antwrap_0_7_4 = { + atoulme_Antwrap_0_7_5 = { basename = ''atoulme_Antwrap''; meta = { description = ''A Ruby module that wraps the Apache Ant build tool. Antwrap can be used to invoke Ant Tasks from a Ruby or a JRuby script.''; @@ -313,18 +313,18 @@ database compatibility and query generation.''; == FEATURES/PROBLEMS: - Antwrap runs on the native Ruby interpreter via the RJB (Ruby Java Bridge gem) and on the JRuby interpreter. Antwrap is compatible with Ant versions 1.5.4, - 1.6.5 and 1.7.0. For more information, see the Project Info (http://rubyforge.org/projects/antwrap/) page. - + Antwrap runs on the native Ruby interpreter via the RJB (Ruby Java Bridge gem) and on the JRuby interpreter. Antwrap is compatible with Ant versions 1.5.4, + 1.6.5 and 1.7.0. For more information, see the Project Info (http://rubyforge.org/projects/antwrap/) page. + == SYNOPSIS: - Antwrap is a Ruby library that can be used to invoke Ant tasks. It is being used in the Buildr (http://incubator.apache.org/buildr/) project to execute - Ant (http://ant.apache.org/) tasks in a Java project. If you are tired of fighting with Ant or Maven XML files in your Java project, take some time to + Antwrap is a Ruby library that can be used to invoke Ant tasks. It is being used in the Buildr (http://incubator.apache.org/buildr/) project to execute + Ant (http://ant.apache.org/) tasks in a Java project. If you are tired of fighting with Ant or Maven XML files in your Java project, take some time to check out Buildr!''; }; - name = ''atoulme-Antwrap-0.7.4''; - requiredGems = [ g.rjb_1_5_0 ]; - sha256 = ''0sh9capkya88qm9mvixwly32fwb2c4nzif9j9vv0f73rqw8kz4j4''; + name = ''atoulme-Antwrap-0.7.5''; + requiredGems = [ g.rjb_1_5_1 ]; + sha256 = ''05s3iw44lqa81f8nfy5f0xjj808600h82zb9bsh46b9kcq2w2kmz''; }; autotest_rails_4_2_1 = { basename = ''autotest_rails''; @@ -335,10 +335,10 @@ database compatibility and query generation.''; rails support and extra plugins for migrations and fixtures.''; }; name = ''autotest-rails-4.2.1''; - requiredGems = [ g.ZenTest_4_10_1 ]; + requiredGems = [ g.ZenTest_4_11_0 ]; sha256 = ''1v1dm9zlhdlrxvk90zs8d439ldar674ix41s7pncddgyswcfgg5l''; }; - aws_sdk_1_53_0 = { + aws_sdk_1_59_0 = { basename = ''aws_sdk''; meta = { description = ''AWS SDK for Ruby V1''; @@ -347,11 +347,11 @@ rails support and extra plugins for migrations and fixtures.''; Use `aws-sdk-v1` if you want to load v1 and v2 of the Ruby SDK in the same application.''; }; - name = ''aws-sdk-1.53.0''; - requiredGems = [ g.aws_sdk_v1_1_53_0 ]; - sha256 = ''1jwvzlpyh5hpa3qn972wmn2pmhqpzw5vjal2n5i14qplvafmj7p2''; + name = ''aws-sdk-1.59.0''; + requiredGems = [ g.aws_sdk_v1_1_59_0 ]; + sha256 = ''0vv3w326mz601970a16vbhmllfja1lk64a6dfb1lqrcx83g9v49f''; }; - aws_sdk_v1_1_53_0 = { + aws_sdk_v1_1_59_0 = { basename = ''aws_sdk_v1''; meta = { description = ''AWS SDK for Ruby V1''; @@ -360,20 +360,20 @@ application.''; Use `aws-sdk-v1` if you want to load v1 and v2 of the Ruby SDK in the same application.''; }; - name = ''aws-sdk-v1-1.53.0''; - requiredGems = [ g.nokogiri_1_6_3_1 g.json_1_8_1 ]; - sha256 = ''00yagrm2d5agwkfgkv4rqbxymwmgjmv5n8hah3xhrc90q1ywr7hw''; + name = ''aws-sdk-v1-1.59.0''; + requiredGems = [ g.nokogiri_1_6_5 g.json_1_8_1 ]; + sha256 = ''1y07wbbxhhgl2j30mq7bs2hljfpjf0b38iaajlrzi93y577xwxfa''; }; - backports_3_6_1 = { + backports_3_6_4 = { basename = ''backports''; meta = { description = ''Backports of Ruby features for older Ruby.''; homepage = ''http://github.com/marcandre/backports''; longDescription = ''Essential backports that enable many of the nice features of Ruby 1.8.7 up to 2.1.0 for earlier versions.''; }; - name = ''backports-3.6.1''; + name = ''backports-3.6.4''; requiredGems = [ ]; - sha256 = ''182fzzmzhjknnh8r6196lnws5fik86wnsn64a382w0fqb2vz98bq''; + sha256 = ''0x2i84g14v5k63i1i2hwzpc2i8h1vkcjz7gr6gicdwsxbvnszwsc''; }; bitbucket_backup_0_3_1 = { basename = ''bitbucket_backup''; @@ -425,19 +425,19 @@ for those one-off tasks, with a language that's a joy to use. ''; }; name = ''buildr-1.4.20''; - requiredGems = [ g.rake_0_9_2_2 g.builder_3_2_2 g.net_ssh_2_7_0 g.net_sftp_2_1_2 g.rubyzip_0_9_9 g.json_pure_1_8_0 g.hoe_3_7_1 g.rjb_1_4_9 g.atoulme_Antwrap_0_7_4 g.diff_lcs_1_2_4 g.rspec_expectations_2_14_3 g.rspec_mocks_2_14_3 g.rspec_core_2_14_5 g.rspec_2_14_1 g.xml_simple_1_1_2 g.minitar_0_5_4 g.bundler_1_7_3 g.orderedhash_0_0_6 ]; + requiredGems = [ g.rake_0_9_2_2 g.builder_3_2_2 g.net_ssh_2_7_0 g.net_sftp_2_1_2 g.rubyzip_0_9_9 g.json_pure_1_8_0 g.hoe_3_7_1 g.rjb_1_4_9 g.atoulme_Antwrap_0_7_5 g.diff_lcs_1_2_4 g.rspec_expectations_2_14_3 g.rspec_mocks_2_14_3 g.rspec_core_2_14_5 g.rspec_2_14_1 g.xml_simple_1_1_2 g.minitar_0_5_4 g.bundler_1_7_7 g.orderedhash_0_0_6 ]; sha256 = ''0x4ffblw7jg0z49ywfm5abfxgg23di3d661czndwi904cvmghrkv''; }; - bundler_1_7_3 = { + bundler_1_7_7 = { basename = ''bundler''; meta = { description = ''The best way to manage your application's dependencies''; homepage = ''http://bundler.io''; longDescription = ''Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably''; }; - name = ''bundler-1.7.3''; + name = ''bundler-1.7.7''; requiredGems = [ ]; - sha256 = ''00r3b4bchiqbd12y896hmrp5sa6n4391fygg1jmvljx1635x5kyj''; + sha256 = ''1911jd33nlzr89dapbkllxfwi63c06zg93cmwsx17l2hh5zzggdh''; }; celluloid_0_16_0 = { basename = ''celluloid''; @@ -450,16 +450,16 @@ for those one-off tasks, with a language that's a joy to use. requiredGems = [ g.timers_4_0_1 ]; sha256 = ''044xk0y7i1xjafzv7blzj5r56s7zr8nzb619arkrl390mf19jxv3''; }; - childprocess_0_5_3 = { + childprocess_0_5_5 = { basename = ''childprocess''; meta = { description = ''This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.''; homepage = ''http://github.com/jarib/childprocess''; longDescription = ''This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.''; }; - name = ''childprocess-0.5.3''; - requiredGems = [ g.ffi_1_9_3 ]; - sha256 = ''12djpdr487fddq55sav8gw1pjglcbb0ab0s6npga0ywgsqdyvsww''; + name = ''childprocess-0.5.5''; + requiredGems = [ g.ffi_1_9_6 ]; + sha256 = ''0cxzh17vjlmpqfcas4815x50dc1gzfwgbs51zzpd4chrl6ak4n4v''; }; chronic_0_10_2 = { basename = ''chronic''; @@ -472,42 +472,42 @@ for those one-off tasks, with a language that's a joy to use. requiredGems = [ ]; sha256 = ''1hrdkn4g8x7dlzxwb1rfgr8kw3bp4ywg5l4y4i9c2g5cwv62yvvn''; }; - chunky_png_1_3_1 = { + chunky_png_1_3_3 = { basename = ''chunky_png''; meta = { description = ''Pure ruby library for read/write, chunk-level access to PNG files''; homepage = ''http://wiki.github.com/wvanbergen/chunky_png''; - longDescription = '' This pure Ruby library can read and write PNG images without depending on an external + longDescription = '' This pure Ruby library can read and write PNG images without depending on an external image library, like RMagick. It tries to be memory efficient and reasonably fast. - - It supports reading and writing all PNG variants that are defined in the specification, - with one limitation: only 8-bit color depth is supported. It supports all transparency, - interlacing and filtering options the PNG specifications allows. It can also read and + + It supports reading and writing all PNG variants that are defined in the specification, + with one limitation: only 8-bit color depth is supported. It supports all transparency, + interlacing and filtering options the PNG specifications allows. It can also read and write textual metadata from PNG files. Low-level read/write access to PNG chunks is also possible. - + This library supports simple drawing on the image canvas and simple operations like - alpha composition and cropping. Finally, it can import from and export to RMagick for + alpha composition and cropping. Finally, it can import from and export to RMagick for interoperability. - - Also, have a look at OilyPNG at http://github.com/wvanbergen/oily_png. OilyPNG is a - drop in mixin module that implements some of the ChunkyPNG algorithms in C, which + + Also, have a look at OilyPNG at http://github.com/wvanbergen/oily_png. OilyPNG is a + drop in mixin module that implements some of the ChunkyPNG algorithms in C, which provides a massive speed boost to encoding and decoding. ''; }; - name = ''chunky_png-1.3.1''; + name = ''chunky_png-1.3.3''; requiredGems = [ ]; - sha256 = ''1kpcv2wrx3zyfi5jbsnd9da1wmkjwidnmpshq6vhzz0r8hp7ai8a''; + sha256 = ''1lc25p87ljn9r62wps32bq88d8i292kda9fs2m05x15zjm3r6y20''; }; - classifier_reborn_2_0_1 = { + classifier_reborn_2_0_2 = { basename = ''classifier_reborn''; meta = { description = ''A general classifier module to allow Bayesian and other types of classifications.''; homepage = ''https://github.com/jekyll/classifier-reborn''; }; - name = ''classifier-reborn-2.0.1''; + name = ''classifier-reborn-2.0.2''; requiredGems = [ g.fast_stemmer_1_0_2 ]; - sha256 = ''1p90lwn6x2akg882h597vb6fdbw6zmiw7pqlpqsc1dj243zf0pks''; + sha256 = ''0adp6hchmlhzjkai9z482cyfnbv4ywks4dlly5hhiaxrn1aybpzh''; }; coderay_1_1_0 = { basename = ''coderay''; @@ -529,7 +529,7 @@ for those one-off tasks, with a language that's a joy to use. ''; }; name = ''coffee-script-2.3.0''; - requiredGems = [ g.coffee_script_source_1_8_0 g.execjs_2_2_1 ]; + requiredGems = [ g.coffee_script_source_1_8_0 g.execjs_2_2_2 ]; sha256 = ''0i0p52f2s7hk8sq3q9342and3whjnhjhc7ldg8zmnjjcm44asm3d''; }; coffee_script_source_1_8_0 = { @@ -567,7 +567,7 @@ for those one-off tasks, with a language that's a joy to use. longDescription = ''Compass is a Sass-based Stylesheet Framework that streamlines the creation and maintenance of CSS.''; }; name = ''compass-1.0.1''; - requiredGems = [ g.sass_3_4_5 g.compass_core_1_0_1 g.compass_import_once_1_0_5 g.chunky_png_1_3_1 g.rb_fsevent_0_9_4 g.rb_inotify_0_9_5 ]; + requiredGems = [ g.sass_3_4_9 g.compass_core_1_0_1 g.compass_import_once_1_0_5 g.chunky_png_1_3_3 g.rb_fsevent_0_9_4 g.rb_inotify_0_9_5 ]; sha256 = ''0cxb6nbj37wz2zwwb4pkbvg9pg0ymamxx9v400h9ibvlb5n0ri40''; }; compass_core_1_0_1 = { @@ -578,7 +578,7 @@ for those one-off tasks, with a language that's a joy to use. longDescription = ''The Compass core stylesheet library and minimum required ruby extensions. This library can be used stand-alone without the compass ruby configuration file or compass command line tools.''; }; name = ''compass-core-1.0.1''; - requiredGems = [ g.sass_3_4_5 g.multi_json_1_10_1 ]; + requiredGems = [ g.sass_3_4_9 g.multi_json_1_10_1 ]; sha256 = ''0zhbmgjq6s9j2qdx3cz0v8s216mh8g0ymk4fzmq3c4an9rryl1zx''; }; compass_import_once_1_0_5 = { @@ -589,7 +589,7 @@ for those one-off tasks, with a language that's a joy to use. longDescription = ''Changes the behavior of Sass's @import directive to only import a file once.''; }; name = ''compass-import-once-1.0.5''; - requiredGems = [ g.sass_3_4_5 ]; + requiredGems = [ g.sass_3_4_9 ]; sha256 = ''0bn7gwbfz7jvvdd0qdfqlx67fcb83gyvxqc7dr9fhcnks3z8z5rq''; }; cucumber_1_3_17 = { @@ -669,7 +669,7 @@ We are happy to report that this issue has been resolved.''; requiredGems = [ ]; sha256 = ''1pqb7yzjcpbgbyi196ifqbd1wy570cn12bkzcvpcha4xilhajja0''; }; - domain_name_0_5_21 = { + domain_name_0_5_22 = { basename = ''domain_name''; meta = { description = ''Domain Name manipulation library for Ruby''; @@ -680,30 +680,20 @@ It can also be used for cookie domain validation based on the Public Suffix List. ''; }; - name = ''domain_name-0.5.21''; + name = ''domain_name-0.5.22''; requiredGems = [ g.unf_0_1_4 ]; - sha256 = ''1ryb2gmryzcrqm9gl19658m1kcjkjz5m0r24mzq4j0zfrs95nfnq''; + sha256 = ''0r3kj0hjibv5y7z3m46xdjrc19pkhnkhzr4xmvq9gypr2h7vz2yb''; }; - dotenv_0_11_1 = { + dotenv_1_0_2 = { basename = ''dotenv''; meta = { description = ''Loads environment variables from `.env`.''; homepage = ''https://github.com/bkeepers/dotenv''; longDescription = ''Loads environment variables from `.env`.''; }; - name = ''dotenv-0.11.1''; - requiredGems = [ g.dotenv_deployment_0_0_2 ]; - sha256 = ''09z0y0d6bks7i0sqvd8szfqj9i1kkj01anzly7shi83b3gxhrq9m''; - }; - dotenv_deployment_0_0_2 = { - basename = ''dotenv_deployment''; - meta = { - description = ''Deployment concerns for dotenv''; - homepage = ''https://github.com/bkeepers/dotenv-deployment''; - }; - name = ''dotenv-deployment-0.0.2''; + name = ''dotenv-1.0.2''; requiredGems = [ ]; - sha256 = ''1ad66jq9a09qq1js8wsyil97018s7y6x0vzji0dy34gh65sbjz8c''; + sha256 = ''1g6sdv55842a7iv11wawrbfrx8x5k7gl598nl6my55jb2nbynkmw''; }; em_resolv_replace_1_1_3 = { basename = ''em_resolv_replace''; @@ -746,7 +736,7 @@ Suffix List. longDescription = ''Very lightweight libcurl wrapper.''; }; name = ''ethon-0.7.1''; - requiredGems = [ g.ffi_1_9_3 ]; + requiredGems = [ g.ffi_1_9_6 ]; sha256 = ''0b762cmnj20fjlrlzk5vsndzv4ac3ybdi4vikx5c11abl7x5wbg6''; }; eventmachine_1_0_3 = { @@ -780,37 +770,38 @@ using TCP/IP, especially if custom protocols are required.''; requiredGems = [ g.eventmachine_1_0_3 ]; sha256 = ''1pvlb34vdzd81kf9f3xyibb4f55xjqm7lqqy28dgyci5cyv50y61''; }; - excon_0_39_5 = { + excon_0_41_0 = { basename = ''excon''; meta = { description = ''speed, persistence, http(s)''; homepage = ''https://github.com/excon/excon''; longDescription = ''EXtended http(s) CONnections''; }; - name = ''excon-0.39.5''; + name = ''excon-0.41.0''; requiredGems = [ ]; - sha256 = ''04dgrjq6b955bv2bps0g59gvn089mz8339nhlqksjf9jimgjglcq''; + sha256 = ''136cffvp65ng50idp323v1sdpydl16csf287ylanrvfv0nbmmhi0''; }; - execjs_2_2_1 = { + execjs_2_2_2 = { basename = ''execjs''; meta = { description = ''Run JavaScript code from Ruby''; homepage = ''https://github.com/sstephenson/execjs''; longDescription = ''ExecJS lets you run JavaScript code from Ruby.''; }; - name = ''execjs-2.2.1''; + name = ''execjs-2.2.2''; requiredGems = [ ]; - sha256 = ''1s41g9qwq0h4452q4gp934lnkzfkxh4wrg8fd4bcynba86bf3j8b''; + sha256 = ''05m41mnxn4b2p133qzbz5cy9cc5rn57aa0pp2943hxmzbk379z1f''; }; - fakes3_0_1_5_2 = { + fakes3_0_1_6_1 = { basename = ''fakes3''; meta = { description = ''FakeS3 is a server that simulates S3 commands so you can test your S3 functionality in your projects''; + homepage = ''https://github.com/jubos/fake-s3''; longDescription = ''Use FakeS3 to test basic S3 functionality without actually connecting to S3''; }; - name = ''fakes3-0.1.5.2''; + name = ''fakes3-0.1.6.1''; requiredGems = [ g.thor_0_19_1 g.builder_3_2_2 ]; - sha256 = ''1gmg428s1jpdwn7bd9pi4ikxg8440nq9yqs22wv0k355z5cqb8by''; + sha256 = ''1s2w06lgwlhsr3q7b58qnjdqqi6x3ksl3hjqq54d57gb0y65s0p3''; }; faraday_0_9_0 = { basename = ''faraday''; @@ -844,38 +835,38 @@ using TCP/IP, especially if custom protocols are required.''; requiredGems = [ ]; sha256 = ''0688clyk4xxh3kdb18vi089k90mca8ji5fwaknh3da5wrzcrzanh''; }; - ffi_1_9_3 = { + ffi_1_9_6 = { basename = ''ffi''; meta = { description = ''Ruby FFI''; homepage = ''http://wiki.github.com/ffi/ffi''; longDescription = ''Ruby FFI library''; }; - name = ''ffi-1.9.3''; + name = ''ffi-1.9.6''; requiredGems = [ ]; - sha256 = ''0873h6jp3v65mll7av9bxlzp9m9l1cc66j0krg0llchwbh4pv5sp''; + sha256 = ''1ckw1336rnyv9yvvl614qgkqqi477g4hljv6xsws2vz14ynlvzhj''; }; - file_tail_1_0_12 = { + file_tail_1_1_0 = { basename = ''file_tail''; meta = { description = ''File::Tail for Ruby''; homepage = ''http://github.com/flori/file-tail''; longDescription = ''Library to tail files in Ruby''; }; - name = ''file-tail-1.0.12''; - requiredGems = [ g.tins_0_13_2 ]; - sha256 = ''0mzxxnwj7k5pwxs0rdbmb3b41zgvzw7x40sf3qlkch4zdfx91i1j''; + name = ''file-tail-1.1.0''; + requiredGems = [ g.tins_1_3_3 ]; + sha256 = ''0idypaigk7l8kzhhnjfhz84mrvqd905njyycgqdq6v23jgif9n64''; }; - foreman_0_75_0 = { + foreman_0_76_0 = { basename = ''foreman''; meta = { description = ''Process manager for applications with multiple components''; homepage = ''http://github.com/ddollar/foreman''; longDescription = ''Process manager for applications with multiple components''; }; - name = ''foreman-0.75.0''; - requiredGems = [ g.thor_0_19_1 g.dotenv_0_11_1 ]; - sha256 = ''0iicqdjwwms86nchk80ia7x4wjcd3p5c8s53bc0z0h063i0ks9ha''; + name = ''foreman-0.76.0''; + requiredGems = [ g.thor_0_19_1 g.dotenv_1_0_2 ]; + sha256 = ''1akr7gjnzbjpp71gf4hw6hd7hrl9fnm9ggazkkvnz84l9l36cgm2''; }; gettext_3_1_4 = { basename = ''gettext''; @@ -899,7 +890,7 @@ So you can use GNU gettext tools for maintaining. longDescription = ''multi-layer client for the github api v3''; }; name = ''gh-0.13.2''; - requiredGems = [ g.faraday_0_9_0 g.backports_3_6_1 g.multi_json_1_10_1 g.addressable_2_3_6 g.net_http_persistent_2_9_4 g.net_http_pipeline_1_0_1 ]; + requiredGems = [ g.faraday_0_9_0 g.backports_3_6_4 g.multi_json_1_10_1 g.addressable_2_3_6 g.net_http_persistent_2_9_4 g.net_http_pipeline_1_0_1 ]; sha256 = ''17scqa35j6ghpykzk986gnd6dvbrh8nn60ib04hb2gbyh9dns1dj''; }; gherkin_2_12_2 = { @@ -913,27 +904,27 @@ So you can use GNU gettext tools for maintaining. requiredGems = [ g.multi_json_1_10_1 ]; sha256 = ''1mxfgw15pii1jmq00xxbyp77v71mh3bp99ndgwzfwkxvbcisha25''; }; - heroku_3_10_3 = { + heroku_3_16_2 = { basename = ''heroku''; meta = { description = ''Client library and CLI to deploy apps on Heroku.''; homepage = ''http://heroku.com/''; longDescription = ''Client library and command-line tool to deploy and manage apps on Heroku.''; }; - name = ''heroku-3.10.3''; - requiredGems = [ g.heroku_api_0_3_19 g.launchy_2_4_2 g.netrc_0_7_7 g.rest_client_1_6_7 g.rubyzip_0_9_9 ]; - sha256 = ''04j9rndygkf5gkv2w5a29wvn683viskhaqyj4fsvnj02qfhfrvnr''; + name = ''heroku-3.16.2''; + requiredGems = [ g.heroku_api_0_3_20 g.launchy_2_4_3 g.netrc_0_7_9 g.rest_client_1_6_7 g.rubyzip_0_9_9 g.multi_json_1_10_1 ]; + sha256 = ''0p21qfcpkgf35s3hwpc94lrdib85rirsdl31nqsrw9wifjqiabc4''; }; - heroku_api_0_3_19 = { + heroku_api_0_3_20 = { basename = ''heroku_api''; meta = { description = ''Ruby Client for the Heroku API''; homepage = ''http://github.com/heroku/heroku.rb''; longDescription = ''Ruby Client for the Heroku API''; }; - name = ''heroku-api-0.3.19''; - requiredGems = [ g.excon_0_39_5 g.multi_json_1_10_1 ]; - sha256 = ''08wddhsnvjyb2a1wl85gbb00rjb1xs26pjlkd068635hi6wmx2id''; + name = ''heroku-api-0.3.20''; + requiredGems = [ g.excon_0_41_0 g.multi_json_1_10_1 ]; + sha256 = ''0c8dfjxzx3prgw7c3xmwzik268wziplv9jhzg0b70mpambvj0h18''; }; highline_1_6_21 = { basename = ''highline''; @@ -989,7 +980,7 @@ below. For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; }; name = ''hoe-3.7.1''; - requiredGems = [ g.rake_10_3_2 ]; + requiredGems = [ g.rake_10_4_0 ]; sha256 = ''0lyrdbzxj4isxzyfp93w0q1g9sqw6grkjp91xirzlw1z1714qsw3''; }; http_cookie_1_0_2 = { @@ -1000,7 +991,7 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; longDescription = ''HTTP::Cookie is a Ruby library to handle HTTP Cookies based on RFC 6265. It has with security, standards compliance and compatibility in mind, to behave just the same as today's major web browsers. It has builtin support for the legacy cookies.txt and the latest cookies.sqlite formats of Mozilla Firefox, and its modular API makes it easy to add support for a new backend store.''; }; name = ''http-cookie-1.0.2''; - requiredGems = [ g.domain_name_0_5_21 ]; + requiredGems = [ g.domain_name_0_5_22 ]; sha256 = ''0cz2fdkngs3jc5w32a6xcl511hy03a7zdiy988jk1sf3bf5v3hdw''; }; i18n_0_6_11 = { @@ -1025,16 +1016,16 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; requiredGems = [ ]; sha256 = ''16sgj6gqs4bgwv6q4vv811fb43908psr33dz7sphn1z8la3y7m2v''; }; - jekyll_2_4_0 = { + jekyll_2_5_2 = { basename = ''jekyll''; meta = { description = ''A simple, blog aware, static site generator.''; homepage = ''https://github.com/jekyll/jekyll''; longDescription = ''Jekyll is a simple, blog aware, static site generator.''; }; - name = ''jekyll-2.4.0''; - requiredGems = [ g.liquid_2_6_1 g.kramdown_1_4_2 g.mercenary_0_3_4 g.safe_yaml_1_0_3 g.colorator_0_1 g.pygments_rb_0_6_0 g.redcarpet_3_1_2 g.toml_0_1_1 g.jekyll_paginate_1_0_0 g.jekyll_gist_1_1_0 g.jekyll_coffeescript_1_0_1 g.jekyll_sass_converter_1_2_1 g.jekyll_watch_1_1_1 g.classifier_reborn_2_0_1 ]; - sha256 = ''1n8m0cw91yayvcspqi3x9y9y0nahagg0sy8r6pn0zplqg1vh7y1l''; + name = ''jekyll-2.5.2''; + requiredGems = [ g.liquid_2_6_1 g.kramdown_1_5_0 g.mercenary_0_3_5 g.safe_yaml_1_0_4 g.colorator_0_1 g.pygments_rb_0_6_0 g.redcarpet_3_2_1 g.toml_0_1_2 g.jekyll_paginate_1_1_0 g.jekyll_gist_1_1_0 g.jekyll_coffeescript_1_0_1 g.jekyll_sass_converter_1_2_1 g.jekyll_watch_1_1_2 g.classifier_reborn_2_0_2 ]; + sha256 = ''03ka7jcfk5byvphy5ks35w75i78ahshrrgm3zbnsxj8xvbxg9bgi''; }; jekyll_coffeescript_1_0_1 = { basename = ''jekyll_coffeescript''; @@ -1056,15 +1047,15 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; requiredGems = [ ]; sha256 = ''06d4jwf64fl7x3dqfimnfqzr4d3wbsdz2l4fif35j91mmh37nmq9''; }; - jekyll_paginate_1_0_0 = { + jekyll_paginate_1_1_0 = { basename = ''jekyll_paginate''; meta = { description = ''Built-in Pagination Generator for Jekyll''; homepage = ''https://github.com/jekyll/jekyll-paginate''; }; - name = ''jekyll-paginate-1.0.0''; + name = ''jekyll-paginate-1.1.0''; requiredGems = [ ]; - sha256 = ''1p01c3mncqrzyiskggdxd4cka1fl4ydlphhzbcfx9pylhrishkjk''; + sha256 = ''0r7bcs8fq98zldih4787zk5i9w24nz5wa26m84ssja95n3sas2l8''; }; jekyll_sass_converter_1_2_1 = { basename = ''jekyll_sass_converter''; @@ -1073,18 +1064,18 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; homepage = ''https://github.com/jekyll/jekyll-sass-converter''; }; name = ''jekyll-sass-converter-1.2.1''; - requiredGems = [ g.sass_3_4_5 ]; + requiredGems = [ g.sass_3_4_9 ]; sha256 = ''1w221nzcpaqh2llflciwhbzw1sqxjavwwzbri9n4qkj057a73ar1''; }; - jekyll_watch_1_1_1 = { + jekyll_watch_1_1_2 = { basename = ''jekyll_watch''; meta = { description = ''Rebuild your Jekyll site when a file changes with the `--watch` switch.''; homepage = ''https://github.com/jekyll/jekyll-watch''; }; - name = ''jekyll-watch-1.1.1''; - requiredGems = [ g.listen_2_7_9 ]; - sha256 = ''0q0skw4fjfrjaskfdvkknfy81a1pbr0mlhc2lrbpb533l5xm3gwz''; + name = ''jekyll-watch-1.1.2''; + requiredGems = [ g.listen_2_8_3 ]; + sha256 = ''0pgyl015akxslrj7d89gc0z61d6s7iqz5kiba5c4sal6vh0w5ckm''; }; jsduck_5_3_4 = { basename = ''jsduck''; @@ -1119,7 +1110,7 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; requiredGems = [ ]; sha256 = ''0kkn5zhiffav2cffj43wwvzj07825r4j463ilfjgik034vnbjs83''; }; - kramdown_1_4_2 = { + kramdown_1_5_0 = { basename = ''kramdown''; meta = { description = ''kramdown is a fast, pure-Ruby Markdown-superset converter.''; @@ -1128,20 +1119,20 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; using a strict syntax definition and supporting several common extensions. ''; }; - name = ''kramdown-1.4.2''; + name = ''kramdown-1.5.0''; requiredGems = [ ]; - sha256 = ''1a1y2a7aysx45qhc6dpbfnlcs1syp04ix12q62f6z84zqrb996xf''; + sha256 = ''1max2dyap3lwi6ssaqi5gbzpmb0nlx1qy47bwc1bpls3y18hd6hm''; }; - launchy_2_4_2 = { + launchy_2_4_3 = { basename = ''launchy''; meta = { description = ''Launchy is helper class for launching cross-platform applications in a fire and forget manner.''; homepage = ''http://github.com/copiousfreetime/launchy''; longDescription = ''Launchy is helper class for launching cross-platform applications in a fire and forget manner. There are application concepts (browser, email client, etc) that are common across all platforms, and they may be launched differently on each platform. Launchy is here to make a common approach to launching external application from within ruby programs.''; }; - name = ''launchy-2.4.2''; + name = ''launchy-2.4.3''; requiredGems = [ g.addressable_2_3_6 ]; - sha256 = ''0i1nmlrqpnk2q6f7iq85cqaa7b8fw4bmqm57w60g92lsfmszs8iv''; + sha256 = ''190lfbiy1vwxhbgn4nl4dcbzxvm049jwc158r2x7kq3g5khjrxa2''; }; liquid_2_6_1 = { basename = ''liquid''; @@ -1153,16 +1144,16 @@ using a strict syntax definition and supporting several common extensions. requiredGems = [ ]; sha256 = ''0fc67cx36x05hsw0cc56la4qr3939g34cdgqmqgdi8yzs72cbv7x''; }; - listen_2_7_9 = { + listen_2_8_3 = { basename = ''listen''; meta = { description = ''Listen to file modifications''; homepage = ''https://github.com/guard/listen''; longDescription = ''The Listen gem listens to file modifications and notifies you about the changes. Works everywhere!''; }; - name = ''listen-2.7.9''; + name = ''listen-2.8.3''; requiredGems = [ g.celluloid_0_16_0 g.rb_fsevent_0_9_4 g.rb_inotify_0_9_5 ]; - sha256 = ''1i9m8fc1w8khwpjxfv9430bqbl4df128i4r8gskgvi3pd4678llf''; + sha256 = ''1cvnr8p6kq7z63a32lwcx24ama6rsyh501pzmlpd2gvi891jxbgw''; }; locale_2_1_0 = { basename = ''locale''; @@ -1198,16 +1189,16 @@ using a strict syntax definition and supporting several common extensions. requiredGems = [ g.systemu_2_6_4 ]; sha256 = ''1clii8mvhmh5lmnm95ljnjygyiyhdpja85c5vy487rhxn52scn0b''; }; - mail_2_6_1 = { + mail_2_6_3 = { basename = ''mail''; meta = { description = ''Mail provides a nice Ruby DSL for making, sending and reading emails.''; - homepage = ''http://github.com/mikel/mail''; + homepage = ''https://github.com/mikel/mail''; longDescription = ''A really Ruby Mail handler.''; }; - name = ''mail-2.6.1''; - requiredGems = [ g.mime_types_2_3 ]; - sha256 = ''17gsw57nc7ihk4xnbq9lidzv6h1ivh4l5m16hy790vs219n22mhx''; + name = ''mail-2.6.3''; + requiredGems = [ g.mime_types_2_4_3 ]; + sha256 = ''1nbg60h3cpnys45h7zydxwrl200p7ksvmrbxnwwbpaaf9vnf3znp''; }; mechanize_2_7_3 = { basename = ''mechanize''; @@ -1221,19 +1212,19 @@ submitted. Mechanize also keeps track of the sites that you have visited as a history.''; }; name = ''mechanize-2.7.3''; - requiredGems = [ g.net_http_digest_auth_1_4 g.net_http_persistent_2_9_4 g.mime_types_2_3 g.http_cookie_1_0_2 g.nokogiri_1_6_3_1 g.ntlm_http_0_1_1 g.webrobots_0_1_1 g.domain_name_0_5_21 ]; + requiredGems = [ g.net_http_digest_auth_1_4 g.net_http_persistent_2_9_4 g.mime_types_2_4_3 g.http_cookie_1_0_2 g.nokogiri_1_6_5 g.ntlm_http_0_1_1 g.webrobots_0_1_1 g.domain_name_0_5_22 ]; sha256 = ''00jkazj8fqnynaxca0lnwx5a084irxrnw8n8i0kppq4vg71g7rrx''; }; - mercenary_0_3_4 = { + mercenary_0_3_5 = { basename = ''mercenary''; meta = { description = ''Lightweight and flexible library for writing command-line apps in Ruby.''; homepage = ''https://github.com/jekyll/mercenary''; longDescription = ''Lightweight and flexible library for writing command-line apps in Ruby.''; }; - name = ''mercenary-0.3.4''; + name = ''mercenary-0.3.5''; requiredGems = [ ]; - sha256 = ''0fg8pbixs68aqx6slp7cpbl0cwa8c4x8rf1s66f7icqa6i9ifcfn''; + sha256 = ''0ls7z086v4xl02g4ia5jhl9s76d22crgmplpmj0c383liwbqi9pb''; }; method_source_0_8_2 = { basename = ''method_source''; @@ -1246,7 +1237,7 @@ a history.''; requiredGems = [ ]; sha256 = ''1g5i4w0dmlhzd18dijlqw5gk27bv6dj2kziqzrzb7mpgxgsd1sf2''; }; - mime_types_2_3 = { + mime_types_2_4_3 = { basename = ''mime_types''; meta = { description = ''The mime-types library provides a library and registry for information about MIME content type definitions''; @@ -1266,12 +1257,28 @@ add additional type definitions (see Contributing.rdoc). The primary sources for MIME type definitions found in mime-types is the IANA collection of registrations (see below for the link), RFCs, and W3C recommendations. -This is release 2.2, mostly changing how the MIME type registry is updated from -the IANA registry (the format of which was incompatibly changed shortly before -this release) and taking advantage of the extra data available from IANA -registry in the form of MIME::Type#xrefs. In addition, the {LTSW -list}[http://www.ltsw.se/knbase/internet/mime.htp] has been dropped as a -supported list. +This is release 2.4.3, restoring full compatibility with Ruby 1.9.2 (which will +be dropped in mime-types 3.0). It also includes the performance improvements +from mime-types 2.4.2 (since yanked because of the broken Ruby 1.9.2 support) +and the 2.4.1 fix of a bug in observed use of the mime-types library where +extensions were not previously sorted, such that + + MIME::Types.of('image.jpg').first.extensions.first + +returned a value of +jpeg+ in mime-types 1, but +jpe+ in mime-types 2. This was +introduced because extensions were sorted during assignment +(MIME::Type#extensions=). This behaviour has been reverted to protect clients +that work as noted above. The preferred way to express this is the new method: + + MIME::Type.of('image.jpg').first.preferred_extension + +Łukasz Śliwa created the +{friendly_mime}[https://github.com/lukaszsliwa/friendly_mime] gem, which offers +friendly descriptive names for MIME types. This functionality and +English-language data has been added to mime-types as MIME::Type#friendly. To +make it easy for internationalization, MIME::Type#i18n_key has been added, +which will return a key suitable for use with the +{I18n}[https://github.com/svenfuchs/i18n] library. As a reminder, mime-types 2.x is no longer compatible with Ruby 1.8 and mime-types 1.x is only being maintained for security issues. No new MIME types @@ -1283,20 +1290,20 @@ conform to the MIME types of RFCs 2045 and 2231. It tracks the {IANA Media Types registry}[https://www.iana.org/assignments/media-types/media-types.xhtml] with some types added by the users of mime-types.''; }; - name = ''mime-types-2.3''; + name = ''mime-types-2.4.3''; requiredGems = [ ]; - sha256 = ''0j0mwzr2q9fmisp3r8rp7j95dns2gw7sd8c5sb5y6z0dfj56a4vd''; + sha256 = ''16nissnb31wj7kpcaynx4gr67i7pbkzccfg8k7xmplbkla4rmwiq''; }; - mini_portile_0_6_0 = { + mini_portile_0_6_1 = { basename = ''mini_portile''; meta = { description = ''Simplistic port-like solution for developers''; homepage = ''http://github.com/luislavena/mini_portile''; longDescription = ''Simplistic port-like solution for developers. It provides a standard and simplified way to compile against dependency libraries without messing up your system.''; }; - name = ''mini_portile-0.6.0''; + name = ''mini_portile-0.6.1''; requiredGems = [ ]; - sha256 = ''09kcn4g63xrdirgwxgjikqg976rr723bkc9bxfr29pk22cj3wavn''; + sha256 = ''07gah4k84sar9d850v9gip9b323pw74vwwndh3bbzxpw5iiwsd3l''; }; minitar_0_5_4 = { basename = ''minitar''; @@ -1309,7 +1316,7 @@ with some types added by the users of mime-types.''; requiredGems = [ ]; sha256 = ''1vpdjfmdq1yc4i620frfp9af02ia435dnpj8ybsd7dc3rypkvbka''; }; - minitest_5_4_1 = { + minitest_5_4_3 = { basename = ''minitest''; meta = { description = ''minitest provides a complete suite of testing facilities supporting TDD, BDD, mocking, and benchmarking''; @@ -1368,9 +1375,9 @@ classes, modules, inheritance, methods. This means you only have to learn ruby to use minitest and all of your regular OO practices like extract-method refactorings still apply.''; }; - name = ''minitest-5.4.1''; + name = ''minitest-5.4.3''; requiredGems = [ ]; - sha256 = ''04iqz25v8vngw4z5pzhwnsf72fb8gf2vzhidrfcbphwsqqik5s4r''; + sha256 = ''1ws2cphg9jh45nrvs43s2ww5r14nb026bwlbwwpi0jz6qsqm86x4''; }; multi_json_1_10_1 = { basename = ''multi_json''; @@ -1499,16 +1506,16 @@ The server will respond in-order.''; requiredGems = [ ]; sha256 = ''1vscp4r58jisiigqc6d6752w19m1m6hmi3jkzmp3ydxai7h3jb2j''; }; - netrc_0_7_7 = { + netrc_0_7_9 = { basename = ''netrc''; meta = { description = ''Library to read and write netrc files.''; homepage = ''https://github.com/geemus/netrc''; longDescription = ''This library can read and update netrc files, preserving formatting including comments and whitespace.''; }; - name = ''netrc-0.7.7''; + name = ''netrc-0.7.9''; requiredGems = [ ]; - sha256 = ''1y64v93hsxdwgx3dfkyzdki3zqd1slm42dmi23v0zy3kap4vpard''; + sha256 = ''11622ccf1gp1m0bkw6y1h5mgsajwszng4rhrfiii264gz4rhhwp5''; }; nix_0_1_1 = { basename = ''nix''; @@ -1521,7 +1528,7 @@ The server will respond in-order.''; requiredGems = [ ]; sha256 = ''0kwrbkkg0gxibhsz9dpd5zabcf2wqsicg28yiazyb3dc9dslk26k''; }; - nokogiri_1_6_3_1 = { + nokogiri_1_6_5 = { basename = ''nokogiri''; meta = { description = ''Nokogiri (鋸) is an HTML, XML, SAX, and Reader parser''; @@ -1532,9 +1539,9 @@ many features is the ability to search documents via XPath or CSS3 selectors. XML is like violence - if it doesn’t solve your problems, you are not using enough of it.''; }; - name = ''nokogiri-1.6.3.1''; - requiredGems = [ g.mini_portile_0_6_0 ]; - sha256 = ''11958hlfd8i3i9y0wk1b6ck9x0j95l4zdbbixmdnnh1r8ijilxli''; + name = ''nokogiri-1.6.5''; + requiredGems = [ g.mini_portile_0_6_1 ]; + sha256 = ''1xmxz6fa0m4p7c7ngpgz6gjgv65lzz63dsf0b6vh7gs2fkiw8j7l''; }; ntlm_http_0_1_1 = { basename = ''ntlm_http''; @@ -1557,16 +1564,16 @@ enough of it.''; requiredGems = [ ]; sha256 = ''0fryy7f9jbpx33jq5m402yqj01zcg563k9fsxlqbhmq638p4bzd7''; }; - papertrail_0_9_10 = { + papertrail_0_9_11 = { basename = ''papertrail''; meta = { description = ''Command-line client for Papertrail hosted log management service.''; homepage = ''http://github.com/papertrail/papertrail-cli''; longDescription = ''Command-line client for Papertrail hosted log management service. Tails and searches app server logs and system syslog. Supports Boolean search and works with grep and pipe output (Unix).''; }; - name = ''papertrail-0.9.10''; + name = ''papertrail-0.9.11''; requiredGems = [ g.chronic_0_10_2 ]; - sha256 = ''1v2acc896w5q72m5pfxc8rx36gzih4fivyiqp0kxwypgyh0f0x58''; + sha256 = ''15wbj0yik5j853r1cap8s9f08z5slvx83lxaq6bsvh5kb47hbb0i''; }; papertrail_cli_0_9_3 = { basename = ''papertrail_cli''; @@ -1576,7 +1583,7 @@ enough of it.''; longDescription = ''Placeholder gem to point to new papertrail gem.''; }; name = ''papertrail-cli-0.9.3''; - requiredGems = [ g.papertrail_0_9_10 ]; + requiredGems = [ g.papertrail_0_9_11 ]; sha256 = ''1914dcfqsmw5rl4xd1zwjrfbgwglyncxm8km06bgxaqn4wnaq5iv''; }; parallel_0_7_1 = { @@ -1686,27 +1693,27 @@ request helpers feature.''; requiredGems = [ g.rack_1_5_2 ]; sha256 = ''01mk715ab5qnqf6va8k3hjsvsmplrfqpz6g58qw4m3l8mim0p4ky''; }; - rails_4_1_6 = { + rails_4_1_8 = { basename = ''rails''; meta = { description = ''Full-stack web application framework.''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity. It encourages beautiful code by favoring convention over configuration.''; }; - name = ''rails-4.1.6''; - requiredGems = [ g.activesupport_4_1_6 g.actionpack_4_1_6 g.actionview_4_1_6 g.activemodel_4_1_6 g.activerecord_4_1_6 g.actionmailer_4_1_6 g.railties_4_1_6 g.bundler_1_7_3 g.sprockets_rails_2_1_4 ]; - sha256 = ''187g903gmni3prd5i768yfgszc4ak5kmrazavr93d0ybfdbcjlgk''; + name = ''rails-4.1.8''; + requiredGems = [ g.activesupport_4_1_8 g.actionpack_4_1_8 g.actionview_4_1_8 g.activemodel_4_1_8 g.activerecord_4_1_8 g.actionmailer_4_1_8 g.railties_4_1_8 g.bundler_1_7_7 g.sprockets_rails_2_2_2 ]; + sha256 = ''17ar4gvnvkcw233cn77x4ps3q6ln3i5kpbqwfa2hbi6s61na9x10''; }; - railties_4_1_6 = { + railties_4_1_8 = { basename = ''railties''; meta = { description = ''Tools for creating, working with, and running Rails applications.''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Rails internals: application bootup, plugins, generators, and rake tasks.''; }; - name = ''railties-4.1.6''; - requiredGems = [ g.activesupport_4_1_6 g.actionpack_4_1_6 g.rake_10_3_2 g.thor_0_19_1 ]; - sha256 = ''11valflllkrrz06bsflz78h5nmxhrhm7hdpm1lwmgm8hwd4ybl0c''; + name = ''railties-4.1.8''; + requiredGems = [ g.activesupport_4_1_8 g.actionpack_4_1_8 g.rake_10_4_0 g.thor_0_19_1 ]; + sha256 = ''171h23zr4135qynz74n61zly2pr0pzvspdi48dwxvc9xrzgzhznm''; }; rake_0_9_2_2 = { basename = ''rake''; @@ -1719,11 +1726,11 @@ request helpers feature.''; requiredGems = [ ]; sha256 = ''19n4qp5gzbcqy9ajh56kgwqv9p9w2hnczhyvaqz0nlvk9diyng6q''; }; - rake_10_3_2 = { + rake_10_4_0 = { basename = ''rake''; meta = { description = ''Rake is a Make-like program implemented in Ruby''; - homepage = ''https://github.com/jimweirich/rake''; + homepage = ''https://github.com/ruby/rake''; longDescription = ''Rake is a Make-like program implemented in Ruby. Tasks and dependencies are specified in standard Ruby syntax. @@ -1747,9 +1754,9 @@ Rake has the following features: * Supports parallel execution of tasks.''; }; - name = ''rake-10.3.2''; + name = ''rake-10.4.0''; requiredGems = [ ]; - sha256 = ''0nvpkjrpsk8xxnij2wd1cdn6arja9q11sxx4aq4fz18bc6fss15m''; + sha256 = ''0a10xzqc1lh6gjkajkslr0n40wjrniyiyzxkp9m5fc8wf7b74zw8''; }; rb_fsevent_0_9_4 = { basename = ''rb_fsevent''; @@ -1770,7 +1777,7 @@ Rake has the following features: longDescription = ''A Ruby wrapper for Linux's inotify, using FFI''; }; name = ''rb-inotify-0.9.5''; - requiredGems = [ g.ffi_1_9_3 ]; + requiredGems = [ g.ffi_1_9_6 ]; sha256 = ''0kddx2ia0qylw3r52nhg83irkaclvrncgy2m1ywpbhlhsz1rymb9''; }; rdiscount_2_1_7_1 = { @@ -1796,16 +1803,16 @@ from the command-line.''; requiredGems = [ g.json_1_8_1 ]; sha256 = ''0cqhjidw657d8irkypxsrv6dr4y9r8csg9inaq40c3iz110cc8w6''; }; - redcarpet_3_1_2 = { + redcarpet_3_2_1 = { basename = ''redcarpet''; meta = { description = ''Markdown that smells nice''; homepage = ''http://github.com/vmg/redcarpet''; longDescription = ''A fast, safe and extensible Markdown to (X)HTML parser''; }; - name = ''redcarpet-3.1.2''; + name = ''redcarpet-3.2.1''; requiredGems = [ ]; - sha256 = ''076p52lkns90hqs27rs4kns2bg7maz8qxr87bl34yd6in319flzz''; + sha256 = ''194gm78cj5kzy60yx8lng26rqgn1qyl4kxhvj60a3f7s1ymssnk7''; }; remote_syslog_1_6_14 = { basename = ''remote_syslog''; @@ -1815,7 +1822,7 @@ from the command-line.''; longDescription = ''Lightweight daemon to tail one or more log files and transmit UDP syslog messages to a remote syslog host (centralized log aggregation). Generates UDP packets itself instead of depending on a system syslog daemon, so it doesn't affect system-wide logging configuration.''; }; name = ''remote_syslog-1.6.14''; - requiredGems = [ g.servolux_0_10_0 g.file_tail_1_0_12 g.eventmachine_1_0_3 g.eventmachine_tail_0_6_4 g.syslog_protocol_0_9_2 g.em_resolv_replace_1_1_3 ]; + requiredGems = [ g.servolux_0_10_0 g.file_tail_1_1_0 g.eventmachine_1_0_3 g.eventmachine_tail_0_6_4 g.syslog_protocol_0_9_2 g.em_resolv_replace_1_1_3 ]; sha256 = ''1f2yjyqhbdc4vlx52zli1b33f6yn8qc1kd4n0dpv27zswj9qfdkr''; }; rest_client_1_6_7 = { @@ -1826,7 +1833,7 @@ from the command-line.''; longDescription = ''A simple HTTP and REST client for Ruby, inspired by the Sinatra microframework style of specifying actions: get, put, post, delete.''; }; name = ''rest-client-1.6.7''; - requiredGems = [ g.mime_types_2_3 ]; + requiredGems = [ g.mime_types_2_4_3 ]; sha256 = ''0nn7zalgidz2yj0iqh3xvzh626krm2al79dfiij19jdhp0rk8853''; }; riemann_dash_0_2_9 = { @@ -1837,7 +1844,7 @@ from the command-line.''; longDescription = ''HTTP dashboard for the distributed event system Riemann.''; }; name = ''riemann-dash-0.2.9''; - requiredGems = [ g.erubis_2_7_0 g.sinatra_1_4_5 g.sass_3_4_5 g.webrick_1_3_1 g.multi_json_1_3_6 ]; + requiredGems = [ g.erubis_2_7_0 g.sinatra_1_4_5 g.sass_3_4_9 g.webrick_1_3_1 g.multi_json_1_3_6 ]; sha256 = ''0ws5wmjbv8w9lcr3i2mdinj2qm91p6c85k6c067i67cf0p90jxq3''; }; right_aws_3_1_0 = { @@ -1919,7 +1926,7 @@ algorithm for low-level network errors. requiredGems = [ ]; sha256 = ''062f7bjwz6iz6da49nzzbbx4xn8ahqqha2smqvqhbf0i7kd5v0yz''; }; - rjb_1_5_0 = { + rjb_1_5_1 = { basename = ''rjb''; meta = { description = ''Ruby Java bridge''; @@ -1927,9 +1934,9 @@ algorithm for low-level network errors. longDescription = ''RJB is a bridge program that connect between Ruby and Java with Java Native Interface. ''; }; - name = ''rjb-1.5.0''; + name = ''rjb-1.5.1''; requiredGems = [ ]; - sha256 = ''0hjc0l3241lqrfracgb7gmsyd54v0lzplqfv9kfzk8km61pkjlfb''; + sha256 = ''1mfmx80r00ka5zn4qa3bnwsvapsnn4g0xr13g1kf95f2fgymy0yv''; }; rkelly_remix_0_0_6 = { basename = ''rkelly_remix''; @@ -2051,18 +2058,18 @@ RKelly[https://github.com/tenderlove/rkelly] JavaScript parser.''; requiredGems = [ ]; sha256 = ''17ha7kmgcnhnxyfp9wgyrd2synp17v9g8j1pknhfd2v9x5g475m9''; }; - safe_yaml_1_0_3 = { + safe_yaml_1_0_4 = { basename = ''safe_yaml''; meta = { description = ''SameYAML provides an alternative implementation of YAML.load suitable for accepting user input in Ruby applications.''; homepage = ''https://github.com/dtao/safe_yaml''; longDescription = ''Parse YAML safely''; }; - name = ''safe_yaml-1.0.3''; + name = ''safe_yaml-1.0.4''; requiredGems = [ ]; - sha256 = ''063bykyk40s3rhy1dxfbvl69s179n1iny418z4wqjbvhrmjn18wl''; + sha256 = ''1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094''; }; - sass_3_4_5 = { + sass_3_4_9 = { basename = ''sass''; meta = { description = ''A powerful but elegant CSS compiler that makes CSS fun again.''; @@ -2073,20 +2080,20 @@ RKelly[https://github.com/tenderlove/rkelly] JavaScript parser.''; command line tool or a web-framework plugin. ''; }; - name = ''sass-3.4.5''; + name = ''sass-3.4.9''; requiredGems = [ ]; - sha256 = ''1rd07m2gprzgd6a4vnrlnyx5lkslfn30hcgfav86rb82a8zqmxah''; + sha256 = ''0vg81irnrlgsgf1xl2cvh7nx7qbq6wbi8qq7avqzzfh9bx8mp7ff''; }; - selenium_webdriver_2_43_0 = { + selenium_webdriver_2_44_0 = { basename = ''selenium_webdriver''; meta = { description = ''The next generation developer focused tool for automated testing of webapps''; homepage = ''http://selenium.googlecode.com''; longDescription = ''WebDriver is a tool for writing automated tests of websites. It aims to mimic the behaviour of a real user, and as such interacts with the HTML of the application.''; }; - name = ''selenium-webdriver-2.43.0''; - requiredGems = [ g.multi_json_1_10_1 g.rubyzip_1_1_6 g.childprocess_0_5_3 g.websocket_1_2_1 ]; - sha256 = ''06jjkb4hcyh8mwsqc8c5p6pz6ac1v313h4md0dab872ls5s47zh9''; + name = ''selenium-webdriver-2.44.0''; + requiredGems = [ g.multi_json_1_10_1 g.rubyzip_1_1_6 g.childprocess_0_5_5 g.websocket_1_2_1 ]; + sha256 = ''06bm0c5cdskbcv27j60ff4cgxa5jwdvw2ys2sca9ycvyd4a5s44w''; }; servolux_0_10_0 = { basename = ''servolux''; @@ -2135,26 +2142,26 @@ interpreters.''; requiredGems = [ ]; sha256 = ''00w8g3j7k7kl8ri2cf1m58ckxk8rn350gp4chfscmgv6pq1spk3n''; }; - sprockets_2_12_2 = { + sprockets_2_12_3 = { basename = ''sprockets''; meta = { description = ''Rack-based asset packaging system''; homepage = ''http://getsprockets.org/''; longDescription = ''Sprockets is a Rack-based asset packaging system that concatenates and serves JavaScript, CoffeeScript, CSS, LESS, Sass, and SCSS.''; }; - name = ''sprockets-2.12.2''; + name = ''sprockets-2.12.3''; requiredGems = [ g.hike_1_2_3 g.multi_json_1_10_1 g.rack_1_5_2 g.tilt_1_4_1 ]; - sha256 = ''0sclb5nqs5hhr7qfp42rgpasy0f9k4c3jcr3hz89amf2bg5v7slx''; + sha256 = ''1bn2drr8bc2af359dkfraq0nm0p1pib634kvhwn5lvj3r4vllnn2''; }; - sprockets_rails_2_1_4 = { + sprockets_rails_2_2_2 = { basename = ''sprockets_rails''; meta = { description = ''Sprockets Rails integration''; homepage = ''https://github.com/rails/sprockets-rails''; }; - name = ''sprockets-rails-2.1.4''; - requiredGems = [ g.sprockets_2_12_2 g.actionpack_4_1_6 g.activesupport_4_1_6 ]; - sha256 = ''1difqidflj71qh8a84lcfdfg9vy4rw5hkgf2j0jis8bcczcq54l3''; + name = ''sprockets-rails-2.2.2''; + requiredGems = [ g.sprockets_2_12_3 g.actionpack_4_1_8 g.activesupport_4_1_8 ]; + sha256 = ''192d4vfl1gjz6phli6sqk98364x6v4jkpl5imajvimsinvgyv81b''; }; syslog_protocol_0_9_2 = { basename = ''syslog_protocol''; @@ -2195,7 +2202,7 @@ management. ''; }; name = ''taskjuggler-3.5.0''; - requiredGems = [ g.mail_2_6_1 g.term_ansicolor_1_3_0 ]; + requiredGems = [ g.mail_2_6_3 g.term_ansicolor_1_3_0 ]; sha256 = ''0r84rlc7a6w7p9nc9mgycbs5h0hq0kzscjq7zj3296xyf0afiwj2''; }; term_ansicolor_1_3_0 = { @@ -2209,15 +2216,15 @@ management. requiredGems = [ g.tins_1_3_3 ]; sha256 = ''1a2gw7gmpmx57sdpyhjwl0zn4bqp7jyjz7aslpvvphd075layp4b''; }; - terminal_notifier_1_6_1 = { + terminal_notifier_1_6_2 = { basename = ''terminal_notifier''; meta = { description = ''Send User Notifications on Mac OS X 10.8 or higher.''; homepage = ''https://github.com/alloy/terminal-notifier''; }; - name = ''terminal-notifier-1.6.1''; + name = ''terminal-notifier-1.6.2''; requiredGems = [ ]; - sha256 = ''0j14sblviiypzc9vb508ldd78winba4vhnm9nhg3zpq07p3528g7''; + sha256 = ''0v0bqpmnyivn0dqqkbzq0xcmas2l1msbwlpp2iclkninkmcqg9sf''; }; text_1_3_0 = { basename = ''text''; @@ -2230,16 +2237,16 @@ management. requiredGems = [ ]; sha256 = ''1bfn0rm2a7gpsxplx3dii3a7q16hi7idsqp54fh92b3j9sqgidj7''; }; - thin_1_6_2 = { + thin_1_6_3 = { basename = ''thin''; meta = { description = ''A thin and fast web server''; homepage = ''http://code.macournoyer.com/thin/''; longDescription = ''A thin and fast web server''; }; - name = ''thin-1.6.2''; + name = ''thin-1.6.3''; requiredGems = [ g.rack_1_5_2 g.eventmachine_1_0_3 g.daemons_1_1_9 ]; - sha256 = ''0v90rnnai8sc40c02dxj9aawj2mi1mhjnmi4ws0rg4yrkc6fxvmq''; + sha256 = ''1m56aygh5rh8ncp3s2gnn8ghn5ibkk0bg6s3clmh1vzaasw2lj4i''; }; thor_0_19_1 = { basename = ''thor''; @@ -2285,17 +2292,6 @@ management. requiredGems = [ g.hitimes_1_2_2 ]; sha256 = ''03ahv07wn1f2g3c5843q7sf03a81518lq5624s9f49kbrswa2p7l''; }; - tins_0_13_2 = { - basename = ''tins''; - meta = { - description = ''Useful stuff.''; - homepage = ''http://flori.github.com/tins''; - longDescription = ''All the stuff that isn't good/big enough for a real library.''; - }; - name = ''tins-0.13.2''; - requiredGems = [ ]; - sha256 = ''1ygkm4ava7x6ap61qz6pn79193g6g29248fa04mwknsz6acfjs2y''; - }; tins_1_3_3 = { basename = ''tins''; meta = { @@ -2307,27 +2303,38 @@ management. requiredGems = [ ]; sha256 = ''14jnsg15wakdk1ljh2iv9yvzk8nb7gpzd2zw4yvjikmffqjyqvna''; }; - toml_0_1_1 = { + tmuxinator_0_6_9 = { + basename = ''tmuxinator''; + meta = { + description = ''Create and manage complex tmux sessions easily.''; + homepage = ''https://github.com/aziz/tmuxinator''; + longDescription = ''Create and manage complex tmux sessions easily.''; + }; + name = ''tmuxinator-0.6.9''; + requiredGems = [ g.thor_0_19_1 g.erubis_2_7_0 ]; + sha256 = ''0q0ld82dznjsan7ciblfsxz59brcc16fwmvr9n3c7vdcndj8rd27''; + }; + toml_0_1_2 = { basename = ''toml''; meta = { description = ''Parse your TOML.''; homepage = ''http://github.com/jm/toml''; longDescription = ''Parse your TOML, seriously.''; }; - name = ''toml-0.1.1''; + name = ''toml-0.1.2''; requiredGems = [ g.parslet_1_5_0 ]; - sha256 = ''1m5dv66qnbbg0r2zpp45hzq2nkmc4qaq0xmqw8j1kwkrpiwihwp8''; + sha256 = ''1wnvi1g8id1sg6776fvzf98lhfbscchgiy1fp5pvd58a8ds2fq9v''; }; - travis_1_7_2 = { + travis_1_7_4 = { basename = ''travis''; meta = { description = ''Travis CI client''; homepage = ''https://github.com/travis-ci/travis.rb''; longDescription = ''CLI and Ruby client library for Travis CI''; }; - name = ''travis-1.7.2''; - requiredGems = [ g.faraday_0_9_0 g.faraday_middleware_0_9_1 g.highline_1_6_21 g.backports_3_6_1 g.gh_0_13_2 g.launchy_2_4_2 g.pry_0_9_12_6 g.typhoeus_0_6_9 g.pusher_client_0_6_0 g.addressable_2_3_6 ]; - sha256 = ''0zl9b48dv0v0gmrj6xyprhysa4g0r3yz8a6f99h0qgwiw2l2xxcc''; + name = ''travis-1.7.4''; + requiredGems = [ g.faraday_0_9_0 g.faraday_middleware_0_9_1 g.highline_1_6_21 g.backports_3_6_4 g.gh_0_13_2 g.launchy_2_4_3 g.pry_0_9_12_6 g.typhoeus_0_6_9 g.pusher_client_0_6_0 g.addressable_2_3_6 ]; + sha256 = ''12c1ghki28qs45j1aw5ihcblh5s45wkzayfv6zjpj282z3q0ygnz''; }; trollop_2_0 = { basename = ''trollop''; @@ -2374,7 +2381,7 @@ specify.''; longDescription = ''Uglifier minifies JavaScript files by wrapping UglifyJS to be accessible in Ruby''; }; name = ''uglifier-2.5.3''; - requiredGems = [ g.execjs_2_2_1 g.json_1_8_1 ]; + requiredGems = [ g.execjs_2_2_2 g.json_1_8_1 ]; sha256 = ''0rlx9nrcavpfffyacsrh7xyvz3adv7jvylz0sv0jnix1mj5rkpd9''; }; unf_0_1_4 = { diff --git a/pkgs/development/interpreters/ruby/patches.nix b/pkgs/development/interpreters/ruby/patches.nix index 438aaf7ba547..029e5cf18a59 100644 --- a/pkgs/development/interpreters/ruby/patches.nix +++ b/pkgs/development/interpreters/ruby/patches.nix @@ -1,6 +1,6 @@ { fetchurl, writeScript, ruby, ncurses, sqlite, libxml2, libxslt, libffi , zlib, libuuid, gems, jdk, python, stdenv, libiconvOrEmpty, imagemagick -, pkgconfig, libiconv }: +, pkgconfig }: let @@ -83,8 +83,8 @@ in buildInputs = [ libxml2 ]; buildFlags = [ "--with-xml2-dir=${libxml2} --with-xml2-include=${libxml2}/include/libxml2" - "--with-xslt-dir=${libxslt} --with-iconv-dir=${libiconv} --use-system-libraries" - ]; + "--with-xslt-dir=${libxslt} --use-system-libraries" + ] ++ libiconvOrEmpty; }; pry = { gemFlags = "--no-ri --no-rdoc"; }; diff --git a/pkgs/development/interpreters/ruby/ruby-1.8.7.nix b/pkgs/development/interpreters/ruby/ruby-1.8.7.nix index 9b43368c6173..9f2945dfb768 100644 --- a/pkgs/development/interpreters/ruby/ruby-1.8.7.nix +++ b/pkgs/development/interpreters/ruby/ruby-1.8.7.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { ''; meta = { - license = "Ruby"; + license = stdenv.lib.licenses.ruby; homepage = "http://www.ruby-lang.org/en/"; description = "The Ruby language"; }; diff --git a/pkgs/development/interpreters/ruby/ruby-1.9.3.nix b/pkgs/development/interpreters/ruby/ruby-1.9.3.nix index e361824bb532..c812abc70fe5 100644 --- a/pkgs/development/interpreters/ruby/ruby-1.9.3.nix +++ b/pkgs/development/interpreters/ruby/ruby-1.9.3.nix @@ -80,6 +80,8 @@ stdenv.mkDerivation rec { installFlags = stdenv.lib.optionalString docSupport "install-doc"; + CFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.7"; + postInstall = '' # Bundler tries to create this directory mkdir -pv $out/${passthru.gemPath} diff --git a/pkgs/development/interpreters/ruby/ruby-2.0.0.nix b/pkgs/development/interpreters/ruby/ruby-2.0.0.nix index 22b13717cfcb..ea8fcc327ee8 100644 --- a/pkgs/development/interpreters/ruby/ruby-2.0.0.nix +++ b/pkgs/development/interpreters/ruby/ruby-2.0.0.nix @@ -5,6 +5,7 @@ , ncurses, readline, cursesSupport ? false , groff, docSupport ? false , libyaml, yamlSupport ? true +, libffi, fiddleSupport ? true , ruby_2_0_0, autoreconfHook, bison, useRailsExpress ? true }: @@ -34,6 +35,7 @@ stdenv.mkDerivation rec { NROFF = "${groff}/bin/nroff"; buildInputs = ops useRailsExpress [ autoreconfHook bison ] + ++ (op fiddleSupport libffi) ++ (ops cursesSupport [ ncurses readline ] ) ++ (op docSupport groff ) ++ (op zlibSupport zlib) @@ -49,11 +51,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; patches = ops useRailsExpress [ - "${patchSet}/patches/ruby/2.0.0/p481/01-zero-broken-tests.patch" - "${patchSet}/patches/ruby/2.0.0/p481/02-railsexpress-gc.patch" - "${patchSet}/patches/ruby/2.0.0/p481/03-display-more-detailed-stack-trace.patch" - "${patchSet}/patches/ruby/2.0.0/p481/04-show-full-backtrace-on-stack-overflow.patch" - "${patchSet}/patches/ruby/2.0.0/p481/05-fix-missing-c-return-event.patch" + "${patchSet}/patches/ruby/2.0.0/p481/railsexpress/01-zero-broken-tests.patch" + "${patchSet}/patches/ruby/2.0.0/p481/railsexpress/02-railsexpress-gc.patch" + "${patchSet}/patches/ruby/2.0.0/p481/railsexpress/03-display-more-detailed-stack-trace.patch" + "${patchSet}/patches/ruby/2.0.0/p481/railsexpress/04-show-full-backtrace-on-stack-overflow.patch" + "${patchSet}/patches/ruby/2.0.0/p481/railsexpress/05-fix-missing-c-return-event.patch" ]; configureFlags = ["--enable-shared" ] @@ -78,7 +80,7 @@ stdenv.mkDerivation rec { ''; meta = { - license = "Ruby"; + license = stdenv.lib.licenses.ruby; homepage = "http://www.ruby-lang.org/en/"; description = "The Ruby language"; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/interpreters/ruby/ruby-2.1.0.nix b/pkgs/development/interpreters/ruby/ruby-2.1.0.nix index fd0c278133bc..8467bc4eb38d 100644 --- a/pkgs/development/interpreters/ruby/ruby-2.1.0.nix +++ b/pkgs/development/interpreters/ruby/ruby-2.1.0.nix @@ -5,6 +5,7 @@ , ncurses, readline, cursesSupport ? false , groff, docSupport ? false , libyaml, yamlSupport ? true +, libffi, fiddleSupport ? true , ruby_2_1_0, autoreconfHook, bison, useRailsExpress ? true }: @@ -35,6 +36,7 @@ stdenv.mkDerivation rec { NROFF = "${groff}/bin/nroff"; buildInputs = ops useRailsExpress [ autoreconfHook bison ] + ++ (op fiddleSupport libffi) ++ (ops cursesSupport [ ncurses readline ] ) ++ (op docSupport groff ) ++ (op zlibSupport zlib) @@ -93,7 +95,7 @@ stdenv.mkDerivation rec { ''; meta = { - license = "Ruby"; + license = stdenv.lib.licenses.ruby; homepage = "http://www.ruby-lang.org/en/"; description = "The Ruby language"; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/interpreters/ruby/ruby-2.1.1.nix b/pkgs/development/interpreters/ruby/ruby-2.1.1.nix index c60a6cb313d4..6a53c2d93ea9 100644 --- a/pkgs/development/interpreters/ruby/ruby-2.1.1.nix +++ b/pkgs/development/interpreters/ruby/ruby-2.1.1.nix @@ -5,6 +5,7 @@ , ncurses, readline, cursesSupport ? false , groff, docSupport ? false , libyaml, yamlSupport ? true +, libffi, fiddleSupport ? true , ruby_2_1_1, autoreconfHook, bison, useRailsExpress ? true }: @@ -35,6 +36,7 @@ stdenv.mkDerivation rec { NROFF = "${groff}/bin/nroff"; buildInputs = ops useRailsExpress [ autoreconfHook bison ] + ++ (op fiddleSupport libffi) ++ (ops cursesSupport [ ncurses readline ] ) ++ (op docSupport groff ) ++ (op zlibSupport zlib) @@ -55,12 +57,12 @@ stdenv.mkDerivation rec { "${patchSet}/patches/ruby/2.1.0/railsexpress/03-display-more-detailed-stack-trace.patch" "${patchSet}/patches/ruby/2.1.0/railsexpress/04-show-full-backtrace-on-stack-overflow.patch" "${patchSet}/patches/ruby/2.1.0/railsexpress/05-fix-missing-c-return-event.patch" - "${patchSet}/patches/ruby/2.1.0/railsexpress/06-backport-006e66b6680f60adfb434ee7397f0dbc77de7873.patch" - "${patchSet}/patches/ruby/2.1.0/railsexpress/07-funny-falcon-stc-density.patch" - "${patchSet}/patches/ruby/2.1.0/railsexpress/08-funny-falcon-stc-pool-allocation.patch" - "${patchSet}/patches/ruby/2.1.0/railsexpress/09-aman-opt-aset-aref-str.patch" - "${patchSet}/patches/ruby/2.1.0/railsexpress/10-funny-falcon-method-cache.patch" - "${patchSet}/patches/ruby/2.1.0/railsexpress/11-backport-r44370.patch" + "${patchSet}/patches/ruby/2.1.0/railsexpress/07-backport-006e66b6680f60adfb434ee7397f0dbc77de7873.patch" + "${patchSet}/patches/ruby/2.1.0/railsexpress/08-funny-falcon-stc-density.patch" + "${patchSet}/patches/ruby/2.1.0/railsexpress/09-funny-falcon-stc-pool-allocation.patch" + "${patchSet}/patches/ruby/2.1.0/railsexpress/10-aman-opt-aset-aref-str.patch" + "${patchSet}/patches/ruby/2.1.0/railsexpress/11-funny-falcon-method-cache.patch" + "${patchSet}/patches/ruby/2.1.0/railsexpress/12-backport-r44370.patch" ]; # Ruby >= 2.1.0 tries to download config.{guess,sub} @@ -92,7 +94,7 @@ stdenv.mkDerivation rec { ''; meta = { - license = "Ruby"; + license = stdenv.lib.licenses.ruby; homepage = "http://www.ruby-lang.org/en/"; description = "The Ruby language"; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/interpreters/ruby/ruby-2.1.2.nix b/pkgs/development/interpreters/ruby/ruby-2.1.2.nix index 1738606bf140..fe03b86d86db 100644 --- a/pkgs/development/interpreters/ruby/ruby-2.1.2.nix +++ b/pkgs/development/interpreters/ruby/ruby-2.1.2.nix @@ -5,6 +5,7 @@ , ncurses, readline, cursesSupport ? false , groff, docSupport ? false , libyaml, yamlSupport ? true +, libffi, fiddleSupport ? true , ruby_2_1_2, autoreconfHook, bison, useRailsExpress ? true }: @@ -35,6 +36,7 @@ stdenv.mkDerivation rec { NROFF = "${groff}/bin/nroff"; buildInputs = ops useRailsExpress [ autoreconfHook bison ] + ++ (op fiddleSupport libffi) ++ (ops cursesSupport [ ncurses readline ] ) ++ (op docSupport groff ) ++ (op zlibSupport zlib) @@ -91,7 +93,7 @@ stdenv.mkDerivation rec { ''; meta = { - license = "Ruby"; + license = stdenv.lib.licenses.ruby; homepage = "http://www.ruby-lang.org/en/"; description = "The Ruby language"; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/interpreters/ruby/ruby-2.1.3.nix b/pkgs/development/interpreters/ruby/ruby-2.1.3.nix new file mode 100644 index 000000000000..9609a8758f98 --- /dev/null +++ b/pkgs/development/interpreters/ruby/ruby-2.1.3.nix @@ -0,0 +1,114 @@ +{ stdenv, fetchurl, fetchgit, fetchFromGitHub +, zlib, zlibSupport ? true +, openssl, opensslSupport ? true +, gdbm, gdbmSupport ? true +, ncurses, readline, cursesSupport ? false +, groff, docSupport ? false +, libyaml, yamlSupport ? true +, libffi, fiddleSupport ? true +, ruby_2_1_3, autoreconfHook, bison, useRailsExpress ? true +}: + +let + op = stdenv.lib.optional; + ops = stdenv.lib.optionals; + patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; }; + config = import ./config.nix fetchgit; + baseruby = ruby_2_1_3.override { useRailsExpress = false; }; +in + +stdenv.mkDerivation rec { + version = with passthru; "${majorVersion}.${minorVersion}.${teenyVersion}-p${patchLevel}"; + + name = "ruby-${version}"; + + src = if useRailsExpress then fetchFromGitHub { + owner = "ruby"; + repo = "ruby"; + rev = "v2_1_3"; + sha256 = "1pnam9jry2l2mbji3gvrbb7jyisxl99xjz6l1qrccwnfinxxbmhv"; + } else fetchurl { + url = "http://cache.ruby-lang.org/pub/ruby/2.1/ruby-2.1.3.tar.gz"; + sha256 = "00bz6jcbxgnllplk4b9lnyc3w8yd3pz5rn11rmca1s8cn6vvw608"; + }; + + # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds. + NROFF = "${groff}/bin/nroff"; + + buildInputs = ops useRailsExpress [ autoreconfHook bison ] + ++ (op fiddleSupport libffi) + ++ (ops cursesSupport [ ncurses readline ]) + ++ (op docSupport groff) + ++ (op zlibSupport zlib) + ++ (op opensslSupport openssl) + ++ (op gdbmSupport gdbm) + ++ (op yamlSupport libyaml) + # Looks like ruby fails to build on darwin without readline even if curses + # support is not enabled, so add readline to the build inputs if curses + # support is disabled (if it's enabled, we already have it) and we're + # running on darwin + ++ (op (!cursesSupport && stdenv.isDarwin) readline); + + enableParallelBuilding = true; + + # Fix a build failure on systems with nix store optimisation. + # (The build process attempted to copy file a overwriting file b, where a and + # b are hard-linked, which results in cp returning a non-zero exit code.) + # https://github.com/NixOS/nixpkgs/issues/4266 + postUnpack = ''rm "$sourceRoot/enc/unicode/name2ctype.h"''; + + patches = ops useRailsExpress [ + "${patchSet}/patches/ruby/2.1.3/railsexpress/01-zero-broken-tests.patch" + "${patchSet}/patches/ruby/2.1.3/railsexpress/02-improve-gc-stats.patch" + "${patchSet}/patches/ruby/2.1.3/railsexpress/03-display-more-detailed-stack-trace.patch" + "${patchSet}/patches/ruby/2.1.3/railsexpress/04-show-full-backtrace-on-stack-overflow.patch" + "${patchSet}/patches/ruby/2.1.3/railsexpress/05-funny-falcon-stc-density.patch" + "${patchSet}/patches/ruby/2.1.3/railsexpress/06-funny-falcon-stc-pool-allocation.patch" + "${patchSet}/patches/ruby/2.1.3/railsexpress/07-aman-opt-aset-aref-str.patch" + "${patchSet}/patches/ruby/2.1.3/railsexpress/08-funny-falcon-method-cache.patch" + ]; + + # Ruby >= 2.1.0 tries to download config.{guess,sub} + postPatch = '' + rm tool/config_files.rb + cp ${config}/config.guess tool/ + cp ${config}/config.sub tool/ + ''; + + configureFlags = ["--enable-shared" ] + ++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby" + # on darwin, we have /usr/include/tk.h -- so the configure script detects + # that tk is installed + ++ ( if stdenv.isDarwin then [ "--with-out-ext=tk " ] else [ ]); + + installFlags = stdenv.lib.optionalString docSupport "install-doc"; + # Bundler tries to create this directory + postInstall = '' + # Bundler tries to create this directory + mkdir -pv $out/${passthru.gemPath} + mkdir -p $out/nix-support + cat > $out/nix-support/setup-hook <<EOF + addGemPath() { + addToSearchPath GEM_PATH \$1/${passthru.gemPath} + } + + envHooks+=(addGemPath) + EOF + ''; + + meta = { + license = stdenv.lib.licenses.ruby; + homepage = "http://www.ruby-lang.org/en/"; + description = "The Ruby language"; + platforms = stdenv.lib.platforms.all; + }; + + passthru = rec { + majorVersion = "2"; + minorVersion = "1"; + teenyVersion = "3"; + patchLevel = "0"; + libPath = "lib/ruby/${majorVersion}.${minorVersion}"; + gemPath = "lib/ruby/gems/${majorVersion}.${minorVersion}"; + }; +} diff --git a/pkgs/development/interpreters/ruby/rvm-patchsets.nix b/pkgs/development/interpreters/ruby/rvm-patchsets.nix index dca74dca62ed..da1328fd948c 100644 --- a/pkgs/development/interpreters/ruby/rvm-patchsets.nix +++ b/pkgs/development/interpreters/ruby/rvm-patchsets.nix @@ -3,6 +3,6 @@ fetchFromGitHub { owner = "skaes"; repo = "rvm-patchsets"; - rev = "13d535bbc060b1b8166673932fe7098abf4216b8"; - sha256 = "0hf1m2bsdgdnyi4427gknvpd8cfribw77lf2k980flb1z9g5d7ib"; + rev = "fb6b427f71e756900184d1b6eaeb10245ec8405a"; + sha256 = "10k7p3nymj7y5a0az8v1aks2w5w190zfqv9kiiafcx0a3qfswnck"; } diff --git a/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix b/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix index 6fc4bcb9dea8..a036388f15ee 100644 --- a/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix +++ b/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix @@ -20,7 +20,22 @@ stdenv.mkDerivation rec { export LIBXUL_DIST=$out ''; - configureFlags = [ "--enable-threadsafe" "--with-system-nspr" ]; + # Explained below in configureFlags for ARM + patches = stdenv.lib.optionals stdenv.isArm [ + ./findvanilla.patch + ]; + + patchFlags = "-p3"; + + # On the Sheevaplug, ARM, its nanojit thing segfaults in japi-tests in + # "make check". Disabling tracejit makes it work, but then it needs the + # patch findvanilla.patch do disable a checker about allocator safety. In case + # of polkit, which is what matters most, it does not override the allocator + # so the failure of that test does not matter much. + configureFlags = [ "--enable-threadsafe" "--with-system-nspr" ] ++ + stdenv.lib.optionals stdenv.isArm [ + "--with-cpu-arch=armv5t" + "--disable-tracejit" ]; # hack around a make problem, see https://github.com/NixOS/nixpkgs/issues/1279#issuecomment-29547393 preBuild = "touch -- {.,shell,jsapi-tests}/{-lpthread,-ldl}"; diff --git a/pkgs/development/interpreters/spidermonkey/findvanilla.patch b/pkgs/development/interpreters/spidermonkey/findvanilla.patch new file mode 100644 index 000000000000..f6dab5497a0a --- /dev/null +++ b/pkgs/development/interpreters/spidermonkey/findvanilla.patch @@ -0,0 +1,19 @@ +diff --git a/js/src/Makefile.in b/js/src/Makefile.in +index a85e055..92ef441 100644 +--- a/js/src/Makefile.in ++++ b/js/src/Makefile.in +@@ -580,14 +580,6 @@ check-valgrind:: + $(check-sync-dirs) $(srcdir)/build $(MOZ_SYNC_BUILD_FILES)/build + endif + +-# The "find any vanilla new/new[] calls" script is tailored to Linux, so +-# only run it there. That should be enough to catch any such calls that +-# creep in. +-ifeq ($(OS_ARCH),Linux) +-check:: +- $(srcdir)/config/find_vanilla_new_calls $(LIBRARY) +-endif +- + ifdef ENABLE_TRACEJIT + ifndef WINCE + JITFLAGS = ,m,j,mj,mjp,am,amj,amjp,amd diff --git a/pkgs/development/interpreters/xulrunner/default.nix b/pkgs/development/interpreters/xulrunner/default.nix index 47dea40eba22..4dd1095c0ce8 100644 --- a/pkgs/development/interpreters/xulrunner/default.nix +++ b/pkgs/development/interpreters/xulrunner/default.nix @@ -3,21 +3,18 @@ , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite , hunspell, libevent, libstartup_notification, libvpx -, cairo, gstreamer, gst_plugins_base, icu +, cairo, gstreamer, gst_plugins_base, icu, firefox , debugBuild ? false }: assert stdenv.gcc ? libc && stdenv.gcc.libc != null; -let version = "31.0"; in +let version = firefox.version; in stdenv.mkDerivation rec { name = "xulrunner-${version}"; - src = fetchurl { - url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2"; - sha1 = "a6c3e25ee3aeb7da42db2aaeb50a385d63532beb"; - }; + src = firefox.src; buildInputs = [ pkgconfig gtk perl zip libIDL libjpeg zlib bzip2 @@ -58,9 +55,10 @@ stdenv.mkDerivation rec { "--disable-updater" "--disable-pulseaudio" ] - ++ (if debugBuild then [ "--enable-debug" "--enable-profiling"] - else [ "--disable-debug" "--enable-release" - "--enable-optimize" "--enable-strip" ]); + ++ (if debugBuild + then [ "--enable-debug" "--enable-profiling"] + else [ "--disable-debug" "--enable-release" "--enable-strip" + "--enable-optimize${lib.optionalString (stdenv.system == "i686-linux") "=-O1"}" ]); enableParallelBuilding = true; diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix index 512a17e6d3ea..505aab78242a 100644 --- a/pkgs/development/libraries/CGAL/default.nix +++ b/pkgs/development/libraries/CGAL/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, cmake, boost, gmp, mpfr }: stdenv.mkDerivation rec { - version = "4.4"; + version = "4.5"; name = "cgal-${version}"; src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/33526/CGAL-${version}.tar.xz"; - sha256 = "1s0ylyrx74vgw6vsg6xxk4b07jrxh8pqcmxcbkx46v01nczv3ixj"; + url = "https://gforge.inria.fr/frs/download.php/34139/CGAL-${version}.tar.xz"; + sha256 = "00shds5yph4s09lqdrb6n60wnw9kpiwa25ghg9mbsgq3fnr8p7kr"; }; - buildInputs = [ cmake boost boost.lib gmp mpfr ]; + buildInputs = [ cmake boost gmp mpfr ]; doCheck = false; diff --git a/pkgs/development/libraries/SDL_mixer/default.nix b/pkgs/development/libraries/SDL_mixer/default.nix index 7aca033c147b..22a67b13e0b0 100644 --- a/pkgs/development/libraries/SDL_mixer/default.nix +++ b/pkgs/development/libraries/SDL_mixer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, libogg, libvorbis, enableNativeMidi ? false, fluidsynth ? null }: +{ stdenv, fetchurl, SDL, libogg, libvorbis, smpeg, enableNativeMidi ? false, fluidsynth ? null }: stdenv.mkDerivation rec { pname = "SDL_mixer"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0alrhqgm40p4c92s26mimg9cm1y7rzr6m0p49687jxd9g6130i0n"; }; - buildInputs = [SDL libogg libvorbis fluidsynth]; + buildInputs = [SDL libogg libvorbis fluidsynth smpeg]; configureFlags = "--disable-music-ogg-shared" + stdenv.lib.optionalString enableNativeMidi " --enable-music-native-midi-gpl"; diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix index 7914dac49334..463386ddfe21 100644 --- a/pkgs/development/libraries/accountsservice/default.nix +++ b/pkgs/development/libraries/accountsservice/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "accountsservice-${version}"; - version = "0.6.38"; + version = "0.6.39"; src = fetchurl { url = "http://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz"; - sha256 = "1ad32qv57rx9yzrvzsw0d0lh0j7adlh664lachv621wb8ya22crn"; + sha256 = "0p9kfnr1wvg1qwi6zsgxw031j1wqh41137xl0mv4rm6x2zas6f7r"; }; buildInputs = [ pkgconfig glib intltool libtool makeWrapper diff --git a/pkgs/development/libraries/afflib/default.nix b/pkgs/development/libraries/afflib/default.nix index ed88b89b14ee..d29349abe0cf 100644 --- a/pkgs/development/libraries/afflib/default.nix +++ b/pkgs/development/libraries/afflib/default.nix @@ -1,15 +1,29 @@ -{ stdenv, fetchurl, zlib, curl, expat, fuse, openssl }: +{ stdenv, fetchgit, zlib, curl, expat, fuse, openssl +, autoconf, automake, libtool, python +}: stdenv.mkDerivation rec { - version = "3.7.4"; + version = "3.7.5"; name = "afflib-${version}"; - src = fetchurl { - url = "http://digitalcorpora.org/downloads/afflib/${name}.tar.gz"; - sha256 = "18j1gjb31qjcmz6lry4m2d933w2a80iagg9g5vrpw5ig80lv10f8"; + src = fetchgit { + url = "https://github.com/sshock/AFFLIBv3/"; + rev = "refs/tags/v${version}"; + sha256 = "06dr3y6bd7vfjf0p9v85yp1xzg43x515zsa9587jcx7yy5h5ams5"; + name = "afflib-${version}-checkout"; }; - buildInputs = [ zlib curl expat fuse openssl ]; + buildInputs = [ zlib curl expat fuse openssl + libtool autoconf automake python + ]; + + preConfigure = '' + libtoolize -f + autoheader -f + aclocal + automake --add-missing -c + autoconf -f + ''; meta = { homepage = http://afflib.sourceforge.net/; diff --git a/pkgs/development/libraries/agda/TotalParserCombinators/contextfile b/pkgs/development/libraries/agda/TotalParserCombinators/contextfile index 1d211f397af9..1c195ee97fa4 100644 --- a/pkgs/development/libraries/agda/TotalParserCombinators/contextfile +++ b/pkgs/development/libraries/agda/TotalParserCombinators/contextfile @@ -1,6 +1,16 @@ Context: +[Updated the copyright year range. +Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20141128223227 + Ignore-this: 31d3f5e4fdd6fbfad9758d9bfd0d3a3e +] + +[Updated the code in response to changes to Agda and the library. +Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20141128223205 + Ignore-this: 6392ec67aab2c534a7195abed55be47 +] + [Updated code to reflect changes to Agda. Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20140425121055 Ignore-this: 54d80fd647cb897eef85f57e9172f7db diff --git a/pkgs/development/libraries/agda/TotalParserCombinators/default.nix b/pkgs/development/libraries/agda/TotalParserCombinators/default.nix index 6b0a63066b2f..4a261e07cfd6 100644 --- a/pkgs/development/libraries/agda/TotalParserCombinators/default.nix +++ b/pkgs/development/libraries/agda/TotalParserCombinators/default.nix @@ -1,13 +1,13 @@ { stdenv, agda, fetchdarcs, AgdaStdlib }: agda.mkDerivation (self: rec { - version = "2014-09-27"; + version = "2014-11-28"; name = "TotalParserCombinators-${version}"; src = fetchdarcs { url = "http://www.cse.chalmers.se/~nad/repos/parser-combinators.code/"; context = ./contextfile; - sha256 = "1rb8prqqp4dnz9s83ays7xfvpqs0n20vl1bg2zlg5si171j9rd4i"; + sha256 = "03fjrgj0749929h5zz6yfz5x9h7fln95c8ydrm44550350n4xjvk"; }; buildDepends = [ AgdaStdlib ]; diff --git a/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix b/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix index fa8ed9e80a78..2c76c2f43508 100644 --- a/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix +++ b/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix @@ -1,13 +1,13 @@ { stdenv, agda, fetchsvn }: agda.mkDerivation (self: rec { - version = "18437"; + version = "18734"; name = "agda-iowa-stdlib-${version}"; src = fetchsvn { url = "https://svn.divms.uiowa.edu/repos/clc/projects/agda/lib"; rev = version; - sha256 = "1g6pwvrcir53ppf6wd8s62gizc3qy35mp229b66mh53abg4brik2"; + sha256 = "0aqib88m5n6aqb5lmns9nl62x40yqhg6zpj0zjxibbn4s4qjw9ky"; }; sourceDirectories = [ "./." ]; diff --git a/pkgs/development/libraries/agda/pretty/contextfile b/pkgs/development/libraries/agda/pretty/contextfile index 4ad31c2e7fab..12079515f66f 100644 --- a/pkgs/development/libraries/agda/pretty/contextfile +++ b/pkgs/development/libraries/agda/pretty/contextfile @@ -1,7 +1,17 @@ Context: -[TAG Correct-by-Construction Pretty-Printing (2013-06-14) -Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20130614153155 - Ignore-this: a64ae32de9e22d60d64ef3da19847e00 +[Modified the copyright year range. +Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20141128164015 + Ignore-this: b9c6dddc965738aa2a7670c4c18da67f +] + +[Updated the code to reflect changes to the library API. +Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20141128163950 + Ignore-this: 8094c47f23cef0fcc596ad0c18a92b56 +] + +[TAG Correct-by-Construction Pretty-Printing (2013-07-28) +Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20130727224432 + Ignore-this: 6aab9b2e6b638457767c8821f3c27cb4 ] diff --git a/pkgs/development/libraries/agda/pretty/default.nix b/pkgs/development/libraries/agda/pretty/default.nix index 1bcb9f8459bc..cab58b369780 100644 --- a/pkgs/development/libraries/agda/pretty/default.nix +++ b/pkgs/development/libraries/agda/pretty/default.nix @@ -1,13 +1,13 @@ { stdenv, agda, fetchdarcs, AgdaStdlib }: agda.mkDerivation (self: rec { - version = "2014-09-27"; + version = "2014-11-28"; name = "pretty-${version}"; src = fetchdarcs { url = "http://www.cse.chalmers.se/~nad/repos/pretty/"; context = ./contextfile; - sha256 = "067pv55r3wlchbgjpx3ha5hyzr29y6xsix0ywwgirm8njcc8nv16"; + sha256 = "1y896qqlfjqvpd09cp0x9nhr60ii21f5cibl0v73xl3z2d0wn0xa"; }; buildDepends = [ AgdaStdlib ]; diff --git a/pkgs/development/libraries/allegro/5-unstable.nix b/pkgs/development/libraries/allegro/5-unstable.nix index d7a8708e5401..5309d32382c1 100644 --- a/pkgs/development/libraries/allegro/5-unstable.nix +++ b/pkgs/development/libraries/allegro/5-unstable.nix @@ -45,7 +45,7 @@ rec { meta = { description = "A game programming library"; - license = "free-noncopyleft"; # giftware + license = a.lib.licenses.free; # giftware maintainers = with a.lib.maintainers; [ raskin @@ -55,4 +55,3 @@ rec { inherit version; }; }) x - diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index f03dd5b548c7..5f67e9592305 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -44,7 +44,7 @@ rec { meta = { description = "A game programming library"; - license = "free-noncopyleft"; # giftware + license = a.lib.licenses.free; # giftware maintainers = with a.lib.maintainers; [ raskin @@ -54,4 +54,3 @@ rec { inherit version; }; }) x - diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix index 213b086c3ccf..6d31087968cc 100644 --- a/pkgs/development/libraries/allegro/default.nix +++ b/pkgs/development/libraries/allegro/default.nix @@ -43,7 +43,7 @@ rec { meta = { branch = "4"; description = "A game programming library"; - license = "free-noncopyleft"; # giftware + license = a.lib.licenses.free; # giftware maintainers = with a.lib.maintainers; [ raskin @@ -57,4 +57,3 @@ rec { }; }; }) x - diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index 6932f389b844..76477d38b6d5 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -2,6 +2,7 @@ , sslSupport ? true, openssl , bdbSupport ? false, db , ldapSupport ? true, openldap +, libiconvOrNull }: assert sslSupport -> openssl != null; @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { ${stdenv.lib.optionalString ldapSupport "--with-ldap"} ''; - propagatedBuildInputs = [ makeWrapper apr expat ] + propagatedBuildInputs = [ makeWrapper apr expat libiconvOrNull ] ++ optional sslSupport openssl ++ optional bdbSupport db ++ optional ldapSupport openldap; diff --git a/pkgs/development/libraries/asio/default.nix b/pkgs/development/libraries/asio/default.nix index b5ed6f30e34b..813dd2d86876 100644 --- a/pkgs/development/libraries/asio/default.nix +++ b/pkgs/development/libraries/asio/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, boost, openssl}: stdenv.mkDerivation rec { - name = "asio-1.10.2"; - + name = "asio-1.10.4"; + src = fetchurl { url = "mirror://sourceforge/asio/${name}.tar.bz2"; - sha256 = "1lqxm3gc8rzzjq0m843l59ggbw32bih7smm5spry1j5khfc86p41"; + sha256 = "0jminwr84wphwpph7j820cql7cbaqlj2zv4gfjk2imazpmlhsfri"; }; propagatedBuildInputs = [ boost ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://asio.sourceforge.net/; description = "Cross-platform C++ library for network and low-level I/O programming"; - license = "boost"; + license = stdenv.lib.licenses.boost; }; } diff --git a/pkgs/development/libraries/aspell/clang.patch b/pkgs/development/libraries/aspell/clang.patch new file mode 100644 index 000000000000..c4cfa426588c --- /dev/null +++ b/pkgs/development/libraries/aspell/clang.patch @@ -0,0 +1,18 @@ +--- interfaces/cc/aspell.h 2013-10-13 20:29:33.000000000 +0200 ++++ interfaces/cc/aspell.h 2013-10-13 20:30:01.000000000 +0200 +@@ -237,6 +237,7 @@ + /******************************** errors ********************************/ + + ++#ifndef __cplusplus + extern const struct AspellErrorInfo * const aerror_other; + extern const struct AspellErrorInfo * const aerror_operation_not_supported; + extern const struct AspellErrorInfo * const aerror_cant_copy; +@@ -322,6 +323,7 @@ + extern const struct AspellErrorInfo * const aerror_bad_magic; + extern const struct AspellErrorInfo * const aerror_expression; + extern const struct AspellErrorInfo * const aerror_invalid_expression; ++#endif + + + /******************************* speller *******************************/ diff --git a/pkgs/development/libraries/aspell/default.nix b/pkgs/development/libraries/aspell/default.nix index 734bcc0797cc..38d734e902c3 100644 --- a/pkgs/development/libraries/aspell/default.nix +++ b/pkgs/development/libraries/aspell/default.nix @@ -8,6 +8,10 @@ stdenv.mkDerivation rec { sha256 = "1qgn5psfyhbrnap275xjfrzppf5a83fb67gpql0kfqv37al869gm"; }; + patchPhase = '' + patch interfaces/cc/aspell.h < ${./clang.patch} + ''; + buildInputs = [ perl ]; doCheck = true; @@ -31,5 +35,6 @@ stdenv.mkDerivation rec { homepage = http://aspell.net/; license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ ]; + platforms = with stdenv.lib.platforms; all; }; } diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix index 79a75708c169..cc0f51eb68d5 100644 --- a/pkgs/development/libraries/aspell/dictionaries.nix +++ b/pkgs/development/libraries/aspell/dictionaries.nix @@ -176,4 +176,14 @@ in { }; }; + sk = buildDict { + shortName = "sk-2.01-2"; + fullName = "Slovak"; + src = fetchurl { + url = mirror://gnu/aspell/dict/sk/aspell6-sk-2.01-2.tar.bz2; + sha256 = "19k0m1v5pcf7xr4lxgjkzqkdlks8nyb13bvi1n7521f3i4lhma66"; + }; + }; + + } diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index d60a0ff7480c..c27506fe5886 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, python, pkgconfig, popt, intltool, dbus_glib , libX11, xextproto, libSM, libICE, libXtst, libXi, gobjectIntrospection }: -stdenv.mkDerivation (rec { +stdenv.mkDerivation rec { versionMajor = "2.12"; versionMinor = "0"; moduleName = "at-spi2-core"; @@ -21,12 +21,10 @@ stdenv.mkDerivation (rec { # ToDo: on non-NixOS we create a symlink from there? configureFlags = "--with-dbus-daemondir=/run/current-system/sw/bin/"; + NIX_LDFLAGS = with stdenv; lib.optionalString isDarwin "-lintl"; + meta = with stdenv.lib; { platforms = platforms.linux; }; } - // stdenv.lib.optionalAttrs stdenv.isDarwin { - NIX_LDFLAGS = "-lintl"; - } -) diff --git a/pkgs/development/libraries/audio/libsmf/default.nix b/pkgs/development/libraries/audio/libsmf/default.nix new file mode 100644 index 000000000000..dce2e363cda5 --- /dev/null +++ b/pkgs/development/libraries/audio/libsmf/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, autoreconfHook, glib, pkgconfig }: + +stdenv.mkDerivation rec { + version = "1.3"; + name = "libsmf-${version}"; + src = fetchurl { + url = "https://github.com/stump/libsmf/archive/${name}.tar.gz"; + sha256 = "1527pcc1vd0l5iks2yw8m0bymcrnih2md5465lwpzw0wgy4rky7n"; + }; + + buildInputs = [ autoreconfHook glib pkgconfig ]; + + meta = with stdenv.lib; { + description = "A C library for reading and writing Standard MIDI Files"; + homepage = https://github.com/stump/libsmf; + license = licenses.bsd2; + maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/audio/lvtk/default.nix b/pkgs/development/libraries/audio/lvtk/default.nix index 7b296ea6d13e..6e2b9a31b304 100644 --- a/pkgs/development/libraries/audio/lvtk/default.nix +++ b/pkgs/development/libraries/audio/lvtk/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost gtkmm lv2 pkgconfig python ]; configurePhase = '' - python waf configure --prefix=$out --boost-includes=${boost}/include + python waf configure --prefix=$out --boost-includes="${boost.dev}/include" ''; buildPhase = "python waf"; diff --git a/pkgs/development/libraries/babl/0_0_22.nix b/pkgs/development/libraries/babl/0_0_22.nix deleted file mode 100644 index 3983816a8b44..000000000000 --- a/pkgs/development/libraries/babl/0_0_22.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation { - name = "babl-0.0.22"; - - src = fetchurl { - url = ftp://ftp.gtk.org/pub/babl/0.0/babl-0.0.22.tar.bz2; - sha256 = "0v8gbf9si4sd06199f8lfmrsbvi6i0hxphd34kyvsj6g2kkkg10s"; - }; - - meta = { - description = "Image pixel format conversion library"; - homepage = http://gegl.org/babl/; - license = stdenv.lib.licenses.gpl3; - }; -} diff --git a/pkgs/development/libraries/blitz/blitz-gcc47.patch b/pkgs/development/libraries/blitz/blitz-gcc47.patch new file mode 100644 index 000000000000..d0b35665567b --- /dev/null +++ b/pkgs/development/libraries/blitz/blitz-gcc47.patch @@ -0,0 +1,33 @@ +diff -ur blitz-0.10/blitz/bzdebug.h blitz-0.10.new/blitz/bzdebug.h +--- blitz-0.10/blitz/bzdebug.h 2012-05-11 22:11:13.000000000 +0200 ++++ blitz-0.10.new/blitz/bzdebug.h 2012-06-28 15:42:38.060656045 +0200 +@@ -117,15 +117,15 @@ + } + } + +- #define BZASSERT(X) checkAssert(X, __FILE__, __LINE__) +- #define BZPRECONDITION(X) checkAssert(X, __FILE__, __LINE__) +- #define BZPOSTCONDITION(X) checkAssert(X, __FILE__, __LINE__) +- #define BZSTATECHECK(X,Y) checkAssert(X == Y, __FILE__, __LINE__) ++ #define BZASSERT(X) blitz::checkAssert(X, __FILE__, __LINE__) ++ #define BZPRECONDITION(X) blitz::checkAssert(X, __FILE__, __LINE__) ++ #define BZPOSTCONDITION(X) blitz::checkAssert(X, __FILE__, __LINE__) ++ #define BZSTATECHECK(X,Y) blitz::checkAssert(X == Y, __FILE__, __LINE__) + #define BZPRECHECK(X,Y) \ + { \ + if ((assertFailMode == false) && (!(X))) \ + BZ_STD_SCOPE(cerr) << Y << BZ_STD_SCOPE(endl); \ +- checkAssert(X, __FILE__, __LINE__); \ ++ blitz::checkAssert(X, __FILE__, __LINE__); \ + } + + #define BZ_DEBUG_MESSAGE(X) \ +@@ -138,7 +138,7 @@ + } + + #define BZ_DEBUG_PARAM(X) X +- #define BZ_PRE_FAIL checkAssert(0) ++ #define BZ_PRE_FAIL blitz::checkAssert(0) + #define BZ_ASM_DEBUG_MARKER + + #elif defined(BZ_DEBUG) diff --git a/pkgs/development/libraries/blitz/blitz-testsuite-stencil-et.patch b/pkgs/development/libraries/blitz/blitz-testsuite-stencil-et.patch new file mode 100644 index 000000000000..fcff8685a08d --- /dev/null +++ b/pkgs/development/libraries/blitz/blitz-testsuite-stencil-et.patch @@ -0,0 +1,13 @@ +diff --git a/testsuite/stencil-et.cpp b/testsuite/stencil-et.cpp +index b23e979..fe6b5ed 100644 +--- a/testsuite/stencil-et.cpp ++++ b/testsuite/stencil-et.cpp +@@ -44,7 +44,7 @@ void test_expr(const T1& d1, const T2& d2) + BZTEST(all(d1==d2)); + } + */ +-#define test_expr(d1,d2) BZTEST(all((d1)==(d2))); ++#define test_expr(d1,d2) BZTEST(all((d1)-(d2)<=1e-7)); + + // Test two vector expressions for equality + template<typename T1, typename T2> diff --git a/pkgs/development/libraries/blitz/default.nix b/pkgs/development/libraries/blitz/default.nix new file mode 100644 index 000000000000..a64a8bd59437 --- /dev/null +++ b/pkgs/development/libraries/blitz/default.nix @@ -0,0 +1,80 @@ +{ stdenv, fetchurl, pkgconfig, gfortran, texinfo + +# Select SIMD alignment width (in bytes) for vectorization. +, simdWidth ? 1 + +# Pad arrays to simdWidth by default? +# Note: Only useful if simdWidth > 1 +, enablePadding ? false + +# Activate serialization through Boost.Serialize? +, enableSerialization ? true, boost ? null + +# Activate test-suite? +# WARNING: Some of the tests require up to 1700MB of memory to compile. +, doCheck ? true + +}: + +assert enableSerialization -> boost != null; + +let + inherit (stdenv.lib) optional optionals optionalString; +in + +stdenv.mkDerivation rec { + name = "blitz++-0.10"; + src = fetchurl { + url = mirror://sourceforge/blitz/blitz-0.10.tar.gz; + sha256 = "153g9sncir6ip9l7ssl6bhc4qzh0qr3lx2d15qm68hqxj7kg0kl0"; + }; + + patches = [ ./blitz-gcc47.patch ./blitz-testsuite-stencil-et.patch ]; + + buildInputs = [ pkgconfig gfortran texinfo ] + ++ optional (boost != null) boost + ; + + configureFlags = + [ "--enable-shared" + "--disable-static" + "--enable-fortran" + "--enable-optimize" + "--with-pic=yes" + "--enable-html-docs" + "--disable-doxygen" + "--disable-dot" + "--disable-latex-docs" + "--enable-simd-width=${toString simdWidth}" + ] + ++ optional enablePadding "--enable-array-length-padding" + ++ optional enableSerialization "--enable-serialization" + ++ optionals (boost != null) [ "--with-boost=${boost.dev}" + "--with-boost-libdir=${boost.lib}/lib" ] + ++ optional stdenv.is64bit "--enable-64bit" + ; + + enableParallelBuilding = true; + + buildFlags = "lib info pdf html"; + installTargets = [ "install" "install-info" "install-pdf" "install-html" ]; + + inherit doCheck; + checkTarget = "check-testsuite check-examples"; + + meta = { + description = "Fast multi-dimensional array library for C++"; + homepage = http://sourceforge.net/projects/blitz/; + license = stdenv.lib.licenses.lgpl3; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + maintainers = [ stdenv.lib.maintainers.aherrmann ]; + + longDescription = '' + Blitz++ is a C++ class library for scientific computing which provides + performance on par with Fortran 77/90. It uses template techniques to + achieve high performance. Blitz++ provides dense arrays and vectors, + random number generators, and small vectors (useful for representing + multicomponent or vector fields). + ''; + }; +} diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index 68b1fb1c9ba4..5ee0cd5291da 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -37,10 +37,10 @@ stdenv.mkDerivation rec { C or C++ programs, though that is not its primary goal. ''; - homepage = http://www.hpl.hp.com/personal/Hans_Boehm/gc/; + homepage = http://hboehm.info/gc/; # non-copyleft, X11-style license - license = "http://www.hpl.hp.com/personal/Hans_Boehm/gc/license.txt"; + license = http://hboehm.info/gc/license.txt; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/boost-process/default.nix b/pkgs/development/libraries/boost-process/default.nix new file mode 100644 index 000000000000..59d25a767329 --- /dev/null +++ b/pkgs/development/libraries/boost-process/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation { + name = "boost-process-0.5"; + + src = fetchurl { + url = "http://www.highscore.de/boost/process0.5/process.zip"; + sha256 = "1v9y9pffb2b7p642kp9ic4z6kg42ziizmyvbgrqd1ci0i4gn0831"; + }; + + buildInputs = [ unzip ]; + + unpackPhase = '' + mkdir $name + cd $name + unzip $src + ''; + + installPhase = '' + mkdir -p $out/include + cp -r boost $out/include + ''; + + meta = with stdenv.lib; { + homepage = "http://www.highscore.de/boost/process0.5/"; + description = "Library to manage system processes"; + license = "boost-license"; + platforms = platforms.unix; + maintainers = maintainers.abbradar; + }; +} diff --git a/pkgs/development/libraries/boost/1.44.nix b/pkgs/development/libraries/boost/1.44.nix deleted file mode 100644 index c192acd23bde..000000000000 --- a/pkgs/development/libraries/boost/1.44.nix +++ /dev/null @@ -1,93 +0,0 @@ -{ stdenv, fetchurl, icu, expat, zlib, bzip2, python -, enableRelease ? true -, enableDebug ? false -, enableSingleThreaded ? false -, enableMultiThreaded ? true -, enableShared ? true -, enableStatic ? false -, enablePIC ? false -, taggedLayout ? false -}: - -let - - variant = stdenv.lib.concatStringsSep "," - (stdenv.lib.optional enableRelease "release" ++ - stdenv.lib.optional enableDebug "debug"); - - threading = stdenv.lib.concatStringsSep "," - (stdenv.lib.optional enableSingleThreaded "single" ++ - stdenv.lib.optional enableMultiThreaded "multi"); - - link = stdenv.lib.concatStringsSep "," - (stdenv.lib.optional enableShared "shared" ++ - stdenv.lib.optional enableStatic "static"); - - # To avoid library name collisions - finalLayout = if (taggedLayout || (enableRelease && enableDebug) || - (enableSingleThreaded && enableMultiThreaded) || - (enableShared && enableStatic)) then - "tagged" else "system"; - - cflags = if enablePIC then "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" else ""; - -in - -stdenv.mkDerivation { - name = "boost-1.44.0"; - - meta = { - homepage = "http://boost.org/"; - description = "Collection of C++ libraries"; - license = "boost-license"; - - maintainers = [ stdenv.lib.maintainers.simons ]; - }; - - src = fetchurl { - url = "mirror://sourceforge/boost/boost_1_44_0.tar.bz2"; - sha256 = "1nvq36mvzr1fr85q0jh86rk3bk65s1y55jgqgzfg3lcpkl12ihs5"; - }; - - enableParallelBuilding = true; - - buildInputs = [icu expat zlib bzip2 python]; - - configureScript = "./bootstrap.sh"; - configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python"; - - buildPhase = "./bjam -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${finalLayout} variant=${variant} threading=${threading} link=${link} ${cflags} install"; - - installPhase = ":"; - - patches = [ - # Patch to get rid of following error, experienced by some packages like encfs, bitcoin: - # terminate called after throwing an instance of 'std::runtime_error' - # what(): locale::facet::_S_create_c_locale name not valid - (fetchurl { - url = https://svn.boost.org/trac/boost/raw-attachment/ticket/4688/boost_filesystem.patch ; - sha256 = "15k91ihzs6190pnryh4cl0b3c2pjpl9d790mr14x16zq52y7px2d"; - }) - ./time_utc_144.patch - ./boost-149-cstdint.patch - ]; - - crossAttrs = rec { - buildInputs = [ expat.crossDrv zlib.crossDrv bzip2.crossDrv ]; - # all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to - # override them. - propagatedBuildInputs = buildInputs; - # We want to substitute the contents of configureFlags, removing thus the - # usual --build and --host added on cross building. - preConfigure = '' - export configureFlags="--prefix=$out --without-icu" - ''; - buildPhase = '' - set -x - cat << EOF > user-config.jam - using gcc : cross : $crossConfig-g++ ; - EOF - ./bjam -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.crossDrv}/include -sEXPAT_LIBPATH=${expat.crossDrv}/lib --layout=${finalLayout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install - ''; - }; -} diff --git a/pkgs/development/libraries/boost/1.49.nix b/pkgs/development/libraries/boost/1.49.nix deleted file mode 100644 index 9e61683238fa..000000000000 --- a/pkgs/development/libraries/boost/1.49.nix +++ /dev/null @@ -1,96 +0,0 @@ -{ stdenv, fetchurl, icu, expat, zlib, bzip2, python -, enableRelease ? true -, enableDebug ? false -, enableSingleThreaded ? false -, enableMultiThreaded ? true -, enableShared ? true -, enableStatic ? false -, enablePIC ? false -, enableExceptions ? false -}: - -let - - variant = stdenv.lib.concatStringsSep "," - (stdenv.lib.optional enableRelease "release" ++ - stdenv.lib.optional enableDebug "debug"); - - threading = stdenv.lib.concatStringsSep "," - (stdenv.lib.optional enableSingleThreaded "single" ++ - stdenv.lib.optional enableMultiThreaded "multi"); - - link = stdenv.lib.concatStringsSep "," - (stdenv.lib.optional enableShared "shared" ++ - stdenv.lib.optional enableStatic "static"); - - # To avoid library name collisions - finalLayout = if ((enableRelease && enableDebug) || - (enableSingleThreaded && enableMultiThreaded) || - (enableShared && enableStatic)) then - "tagged" else "system"; - - cflags = if enablePIC && enableExceptions then - "cflags=-fPIC -fexceptions cxxflags=-fPIC linkflags=-fPIC" - else if enablePIC then - "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" - else if enableExceptions then - "cflags=-fexceptions" - else - ""; -in - -stdenv.mkDerivation { - name = "boost-1.49.0"; - - meta = { - homepage = "http://boost.org/"; - description = "Collection of C++ libraries"; - license = "boost-license"; - - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.simons ]; - }; - - src = fetchurl { - url = "mirror://sourceforge/boost/boost_1_49_0.tar.bz2"; - sha256 = "0g0d33942rm073jgqqvj3znm3rk45b2y2lplfjpyg9q7amzqlx6x"; - }; - - # See <http://svn.boost.org/trac/boost/ticket/4688>. - patches = [ - ./CVE-2013-0252.patch # https://svn.boost.org/trac/boost/ticket/7743 - ./boost_filesystem_post_1_49_0.patch - ./time_utc.patch - ./boost-149-cstdint.patch - ] ++ (stdenv.lib.optional stdenv.isDarwin ./boost-149-darwin.patch ); - - enableParallelBuilding = true; - - buildInputs = [icu expat zlib bzip2 python]; - - configureScript = "./bootstrap.sh"; - configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python"; - - buildPhase = "./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${finalLayout} variant=${variant} threading=${threading} link=${link} ${cflags} install"; - - installPhase = ":"; - - crossAttrs = rec { - buildInputs = [ expat.crossDrv zlib.crossDrv bzip2.crossDrv ]; - # all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to - # override them. - propagatedBuildInputs = buildInputs; - # We want to substitute the contents of configureFlags, removing thus the - # usual --build and --host added on cross building. - preConfigure = '' - export configureFlags="--prefix=$out --without-icu" - ''; - buildPhase = '' - set -x - cat << EOF > user-config.jam - using gcc : cross : $crossConfig-g++ ; - EOF - ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.crossDrv}/include -sEXPAT_LIBPATH=${expat.crossDrv}/lib --layout=${finalLayout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install - ''; - }; -} diff --git a/pkgs/development/libraries/boost/1.55.nix b/pkgs/development/libraries/boost/1.55.nix index 31469b3e06c5..808ff912e7db 100644 --- a/pkgs/development/libraries/boost/1.55.nix +++ b/pkgs/development/libraries/boost/1.55.nix @@ -1,99 +1,10 @@ -{ stdenv, fetchurl, icu, expat, zlib, bzip2, python, fixDarwinDylibNames -, toolset ? null -, enableRelease ? true -, enableDebug ? false -, enableSingleThreaded ? false -, enableMultiThreaded ? true -, enableShared ? true -, enableStatic ? false -, enablePIC ? false -, enableExceptions ? false -, taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic)) -}: +{ callPackage, fetchurl, ... } @ args: -let - - variant = stdenv.lib.concatStringsSep "," - (stdenv.lib.optional enableRelease "release" ++ - stdenv.lib.optional enableDebug "debug"); - - threading = stdenv.lib.concatStringsSep "," - (stdenv.lib.optional enableSingleThreaded "single" ++ - stdenv.lib.optional enableMultiThreaded "multi"); - - link = stdenv.lib.concatStringsSep "," - (stdenv.lib.optional enableShared "shared" ++ - stdenv.lib.optional enableStatic "static"); - - # To avoid library name collisions - layout = if taggedLayout then "tagged" else "system"; - - cflags = if enablePIC && enableExceptions then - "cflags=\"-fPIC -fexceptions\" cxxflags=-fPIC linkflags=-fPIC" - else if enablePIC then - "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" - else if enableExceptions then - "cflags=-fexceptions" - else - ""; - - withToolset = stdenv.lib.optionalString (toolset != null) " --with-toolset=${toolset}"; -in - -let res = stdenv.mkDerivation { - name = "boost-1.55.0"; - - meta = { - homepage = "http://boost.org/"; - description = "Collection of C++ libraries"; - license = "boost-license"; - - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.simons ]; - }; +callPackage ./generic.nix (args // rec { + version = "1.55.0"; src = fetchurl { url = "mirror://sourceforge/boost/boost_1_55_0.tar.bz2"; sha256 = "0lkv5dzssbl5fmh2nkaszi8x9qbj80pr4acf9i26sj3rvlih1w7z"; }; - - enableParallelBuilding = true; - - buildInputs = - [ icu expat zlib bzip2 python ] - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; - - configureScript = "./bootstrap.sh"; - configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python" + withToolset; - - buildPhase = "${stdenv.lib.optionalString (toolset == "clang") "unset NIX_ENFORCE_PURITY; "}./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${layout} variant=${variant} threading=${threading} link=${link} ${cflags} install${withToolset}"; - - # normal install does not install bjam, this is a separate step - installPhase = '' - cd tools/build/v2 - sh bootstrap.sh${withToolset} - ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${layout} variant=${variant} threading=${threading} link=${link} ${cflags} install${withToolset} - rm $out/bin/bjam - ln -s $out/bin/b2 $out/bin/bjam - rm -rf $out/share/boost-build/example - ''; - - crossAttrs = rec { - buildInputs = [ expat.crossDrv zlib.crossDrv bzip2.crossDrv ]; - # all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to - # override them. - propagatedBuildInputs = buildInputs; - # We want to substitute the contents of configureFlags, removing thus the - # usual --build and --host added on cross building. - preConfigure = '' - export configureFlags="--prefix=$out --without-icu" - ''; - buildPhase = '' - set -x - cat << EOF > user-config.jam - using gcc : cross : $crossConfig-g++ ; - EOF - ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.crossDrv}/include -sEXPAT_LIBPATH=${expat.crossDrv}/lib --layout=${layout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install - ''; - }; -}; in res // { lib = res; } +}) diff --git a/pkgs/development/libraries/boost/1.56.nix b/pkgs/development/libraries/boost/1.56.nix index 212b6ca0dee5..fb62c2a07faf 100644 --- a/pkgs/development/libraries/boost/1.56.nix +++ b/pkgs/development/libraries/boost/1.56.nix @@ -1,146 +1,10 @@ -{ stdenv, fetchurl, icu, expat, zlib, bzip2, python, fixDarwinDylibNames -, toolset ? null -, enableRelease ? true -, enableDebug ? false -, enableSingleThreaded ? false -, enableMultiThreaded ? true -, enableShared ? true -, enableStatic ? false -, enablePIC ? false -, enableExceptions ? false -, taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic)) -}: +{ callPackage, fetchurl, ... } @ args: -# We must build at least one type of libraries -assert !enableShared -> enableStatic; - -with stdenv.lib; -let - - variant = concatStringsSep "," - (optional enableRelease "release" ++ - optional enableDebug "debug"); - - threading = concatStringsSep "," - (optional enableSingleThreaded "single" ++ - optional enableMultiThreaded "multi"); - - link = concatStringsSep "," - (optional enableShared "shared" ++ - optional enableStatic "static"); - - runtime-link = if enableShared then "shared" else "static"; - - # To avoid library name collisions - layout = if taggedLayout then "tagged" else "system"; - - cflags = if enablePIC && enableExceptions then - "cflags=\"-fPIC -fexceptions\" cxxflags=-fPIC linkflags=-fPIC" - else if enablePIC then - "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" - else if enableExceptions then - "cflags=-fexceptions" - else - ""; - - withToolset = stdenv.lib.optionalString (toolset != null) "--with-toolset=${toolset}"; - - genericB2Flags = [ - "--prefix=$out" - "--libdir=$lib/lib" - "-j$NIX_BUILD_CORES" - "--layout=${layout}" - "variant=${variant}" - "threading=${threading}" - "runtime-link=${runtime-link}" - "link=${link}" - "${cflags}" - ] ++ optional (variant == "release") "debug-symbols=off"; - - nativeB2Flags = [ - "-sEXPAT_INCLUDE=${expat}/include" - "-sEXPAT_LIBPATH=${expat}/lib" - ] ++ optional (toolset != null) "toolset=${toolset}"; - nativeB2Args = concatStringsSep " " (genericB2Flags ++ nativeB2Flags); - - crossB2Flags = [ - "-sEXPAT_INCLUDE=${expat.crossDrv}/include" - "-sEXPAT_LIBPATH=${expat.crossDrv}/lib" - "--user-config=user-config.jam" - "toolset=gcc-cross" - "--without-python" - ]; - crossB2Args = concatMapStringsSep " " (genericB2Flags ++ crossB2Flags); - - builder = b2Args: '' - ./b2 ${b2Args} - ''; - - installer = b2Args: '' - # boostbook is needed by some applications - mkdir -p $out/share/boostbook - cp -a tools/boostbook/{xsl,dtd} $out/share/boostbook/ - - # Let boost install everything else - ./b2 ${b2Args} install - ''; - - commonConfigureFlags = [ - "--libdir=$(lib)/lib" - ]; -in - -stdenv.mkDerivation { - name = "boost-1.56.0"; - - meta = { - homepage = "http://boost.org/"; - description = "Collection of C++ libraries"; - license = "boost-license"; - - platforms = platforms.unix; - maintainers = with maintainers; [ simons wkennington ]; - }; +callPackage ./generic.nix (args // rec { + version = "1.56.0"; src = fetchurl { url = "mirror://sourceforge/boost/boost_1_56_0.tar.bz2"; sha256 = "07gz62nj767qzwqm3xjh11znpyph8gcii0cqhnx7wvismyn34iqk"; }; - - enableParallelBuilding = true; - - buildInputs = [ icu expat zlib bzip2 python ] - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; - - configureScript = "./bootstrap.sh"; - configureFlags = commonConfigureFlags ++ [ - "--with-icu=${icu}" - "--with-python=${python}/bin/python" - ] ++ optional (toolset != null) "--with-toolset=${toolset}"; - - buildPhase = '' - ${stdenv.lib.optionalString (toolset == "clang") "unset NIX_ENFORCE_PURITY"} - '' + builder nativeB2Args; - - installPhase = installer nativeB2Args; - - outputs = [ "out" "lib" ]; - - crossAttrs = rec { - buildInputs = [ expat.crossDrv zlib.crossDrv bzip2.crossDrv ]; - # all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to - # override them. - propagatedBuildInputs = buildInputs; - # We want to substitute the contents of configureFlags, removing thus the - # usual --build and --host added on cross building. - preConfigure = '' - export configureFlags="--prefix=$out --without-icu ${concatStringsSep " " commonConfigureFlags}" - set -x - cat << EOF > user-config.jam - using gcc : cross : $crossConfig-g++ ; - EOF - ''; - buildPhase = builder crossB2Args; - installPhase = installer crossB2Args; - }; -} +}) diff --git a/pkgs/development/libraries/boost/1.57.nix b/pkgs/development/libraries/boost/1.57.nix new file mode 100644 index 000000000000..6393c6e0d30f --- /dev/null +++ b/pkgs/development/libraries/boost/1.57.nix @@ -0,0 +1,10 @@ +{ callPackage, fetchurl, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "1.57.0"; + + src = fetchurl { + url = "mirror://sourceforge/boost/boost_1_57_0.tar.bz2"; + sha256 = "0rs94vdmg34bwwj23fllva6mhrml2i7mvmlb11zyrk1k5818q34i"; + }; +}) diff --git a/pkgs/development/libraries/boost/CVE-2013-0252.patch b/pkgs/development/libraries/boost/CVE-2013-0252.patch deleted file mode 100644 index fce52d479692..000000000000 --- a/pkgs/development/libraries/boost/CVE-2013-0252.patch +++ /dev/null @@ -1,48 +0,0 @@ -Index: /boost/locale/utf.hpp -=================================================================== ---- /boost/locale/utf.hpp (revision 78304) -+++ /boost/locale/utf.hpp (revision 81590) -@@ -220,4 +220,6 @@ - return incomplete; - tmp = *p++; -+ if (!is_trail(tmp)) -+ return illegal; - c = (c << 6) | ( tmp & 0x3F); - case 2: -@@ -225,4 +227,6 @@ - return incomplete; - tmp = *p++; -+ if (!is_trail(tmp)) -+ return illegal; - c = (c << 6) | ( tmp & 0x3F); - case 1: -@@ -230,4 +234,6 @@ - return incomplete; - tmp = *p++; -+ if (!is_trail(tmp)) -+ return illegal; - c = (c << 6) | ( tmp & 0x3F); - } -Index: /libs/locale/test/test_codepage_converter.cpp -=================================================================== ---- /libs/locale/test/test_codepage_converter.cpp (revision 73786) -+++ /libs/locale/test/test_codepage_converter.cpp (revision 81590) -@@ -140,4 +140,18 @@ - TEST_TO("\xf8\x90\x80\x80\x80",illegal); // 400 0000 - TEST_TO("\xfd\xbf\xbf\xbf\xbf\xbf",illegal); // 7fff ffff -+ -+ std::cout << "-- Invalid trail" << std::endl; -+ TEST_TO("\xC2\x7F",illegal); -+ TEST_TO("\xdf\x7F",illegal); -+ TEST_TO("\xe0\x7F\x80",illegal); -+ TEST_TO("\xef\xbf\x7F",illegal); -+ TEST_TO("\xe0\x7F\x80",illegal); -+ TEST_TO("\xef\xbf\x7F",illegal); -+ TEST_TO("\xf0\x7F\x80\x80",illegal); -+ TEST_TO("\xf4\x7f\xbf\xbf",illegal); -+ TEST_TO("\xf0\x90\x7F\x80",illegal); -+ TEST_TO("\xf4\x8f\x7F\xbf",illegal); -+ TEST_TO("\xf0\x90\x80\x7F",illegal); -+ TEST_TO("\xf4\x8f\xbf\x7F",illegal); - - std::cout << "-- Invalid length" << std::endl; diff --git a/pkgs/development/libraries/boost/boost-149-cstdint.patch b/pkgs/development/libraries/boost/boost-149-cstdint.patch deleted file mode 100644 index 94c7b4716664..000000000000 --- a/pkgs/development/libraries/boost/boost-149-cstdint.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -ru -x '*~' boost_1_49_0-orig/boost/cstdint.hpp boost_1_49_0/boost/cstdint.hpp ---- boost_1_49_0-orig/boost/cstdint.hpp 2012-01-29 22:58:13.000000000 +0100 -+++ boost_1_49_0/boost/cstdint.hpp 2013-12-10 11:48:19.304042208 +0100 -@@ -41,7 +41,10 @@ - // so we disable use of stdint.h when GLIBC does not define __GLIBC_HAVE_LONG_LONG. - // See https://svn.boost.org/trac/boost/ticket/3548 and http://sources.redhat.com/bugzilla/show_bug.cgi?id=10990 - // --#if defined(BOOST_HAS_STDINT_H) && (!defined(__GLIBC__) || defined(__GLIBC_HAVE_LONG_LONG)) -+#if defined(BOOST_HAS_STDINT_H) \ -+ && (!defined(__GLIBC__) \ -+ || defined(__GLIBC_HAVE_LONG_LONG) \ -+ || (defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 17))))) - - // The following #include is an implementation artifact; not part of interface. - # ifdef __hpux diff --git a/pkgs/development/libraries/boost/boost-149-darwin.patch b/pkgs/development/libraries/boost/boost-149-darwin.patch deleted file mode 100644 index 2485f883afc2..000000000000 --- a/pkgs/development/libraries/boost/boost-149-darwin.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -rc boost_1_49_0/tools/build/v2/tools/darwin.jam boost_1_49_0-new/tools/build/v2/tools/darwin.jam -*** boost_1_49_0/tools/build/v2/tools/darwin.jam Mon Jun 6 22:36:21 2011 ---- boost_1_49_0-new/tools/build/v2/tools/darwin.jam Thu May 23 22:07:45 2013 -*************** -*** 498,504 **** - flags darwin.compile OPTIONS <link>shared : -dynamic ; - - # Misc options. -! flags darwin.compile OPTIONS : -no-cpp-precomp -gdwarf-2 -fexceptions ; - #~ flags darwin.link OPTIONS : -fexceptions ; - - # Add the framework names to use. ---- 498,504 ---- - flags darwin.compile OPTIONS <link>shared : -dynamic ; - - # Misc options. -! flags darwin.compile OPTIONS : -gdwarf-2 -fexceptions ; - #~ flags darwin.link OPTIONS : -fexceptions ; - - # Add the framework names to use. -diff -rc boost_1_49_0/tools/build/v2/tools/darwin.py boost_1_49_0-new/tools/build/v2/tools/darwin.py -*** boost_1_49_0/tools/build/v2/tools/darwin.py Wed Oct 28 08:47:51 2009 ---- boost_1_49_0-new/tools/build/v2/tools/darwin.py Thu May 23 21:58:12 2013 -*************** -*** 37,43 **** - feature.feature ('framework', [], ['free']) - - toolset.flags ('darwin.compile', 'OPTIONS', '<link>shared', ['-dynamic']) -! toolset.flags ('darwin.compile', 'OPTIONS', None, ['-Wno-long-double', '-no-cpp-precomp']) - toolset.flags ('darwin.compile.c++', 'OPTIONS', None, ['-fcoalesce-templates']) - - toolset.flags ('darwin.link', 'FRAMEWORK', '<framework>') ---- 37,43 ---- - feature.feature ('framework', [], ['free']) - - toolset.flags ('darwin.compile', 'OPTIONS', '<link>shared', ['-dynamic']) -! toolset.flags ('darwin.compile', 'OPTIONS', None, ['-Wno-long-double']) - toolset.flags ('darwin.compile.c++', 'OPTIONS', None, ['-fcoalesce-templates']) - - toolset.flags ('darwin.link', 'FRAMEWORK', '<framework>') diff --git a/pkgs/development/libraries/boost/boost-155-clang.patch b/pkgs/development/libraries/boost/boost-155-clang.patch new file mode 100644 index 000000000000..9c4e3a74cd25 --- /dev/null +++ b/pkgs/development/libraries/boost/boost-155-clang.patch @@ -0,0 +1,90 @@ +diff --git a/boost/atomic/detail/cas128strong.hpp b/boost/atomic/detail/cas128strong.hpp +index 906c13e..dcb4d7d 100644 +--- a/boost/atomic/detail/cas128strong.hpp ++++ b/boost/atomic/detail/cas128strong.hpp +@@ -196,15 +196,17 @@ class base_atomic<T, void, 16, Sign> + + public: + BOOST_DEFAULTED_FUNCTION(base_atomic(void), {}) +- explicit base_atomic(value_type const& v) BOOST_NOEXCEPT : v_(0) ++ explicit base_atomic(value_type const& v) BOOST_NOEXCEPT + { ++ memset(&v_, 0, sizeof(v_)); + memcpy(&v_, &v, sizeof(value_type)); + } + + void + store(value_type const& value, memory_order order = memory_order_seq_cst) volatile BOOST_NOEXCEPT + { +- storage_type value_s = 0; ++ storage_type value_s; ++ memset(&value_s, 0, sizeof(value_s)); + memcpy(&value_s, &value, sizeof(value_type)); + platform_fence_before_store(order); + platform_store128(value_s, &v_); +@@ -247,7 +249,9 @@ class base_atomic<T, void, 16, Sign> + memory_order success_order, + memory_order failure_order) volatile BOOST_NOEXCEPT + { +- storage_type expected_s = 0, desired_s = 0; ++ storage_type expected_s, desired_s; ++ memset(&expected_s, 0, sizeof(expected_s)); ++ memset(&desired_s, 0, sizeof(desired_s)); + memcpy(&expected_s, &expected, sizeof(value_type)); + memcpy(&desired_s, &desired, sizeof(value_type)); + +diff --git a/boost/atomic/detail/gcc-atomic.hpp b/boost/atomic/detail/gcc-atomic.hpp +index a130590..4af99a1 100644 +--- a/boost/atomic/detail/gcc-atomic.hpp ++++ b/boost/atomic/detail/gcc-atomic.hpp +@@ -958,14 +958,16 @@ class base_atomic<T, void, 16, Sign> + + public: + BOOST_DEFAULTED_FUNCTION(base_atomic(void), {}) +- explicit base_atomic(value_type const& v) BOOST_NOEXCEPT : v_(0) ++ explicit base_atomic(value_type const& v) BOOST_NOEXCEPT + { ++ memset(&v_, 0, sizeof(v_)); + memcpy(&v_, &v, sizeof(value_type)); + } + + void store(value_type const& v, memory_order order = memory_order_seq_cst) volatile BOOST_NOEXCEPT + { +- storage_type tmp = 0; ++ storage_type tmp; ++ memset(&tmp, 0, sizeof(tmp)); + memcpy(&tmp, &v, sizeof(value_type)); + __atomic_store_n(&v_, tmp, atomics::detail::convert_memory_order_to_gcc(order)); + } +@@ -980,7 +982,8 @@ class base_atomic<T, void, 16, Sign> + + value_type exchange(value_type const& v, memory_order order = memory_order_seq_cst) volatile BOOST_NOEXCEPT + { +- storage_type tmp = 0; ++ storage_type tmp; ++ memset(&tmp, 0, sizeof(tmp)); + memcpy(&tmp, &v, sizeof(value_type)); + tmp = __atomic_exchange_n(&v_, tmp, atomics::detail::convert_memory_order_to_gcc(order)); + value_type res; +@@ -994,7 +997,9 @@ class base_atomic<T, void, 16, Sign> + memory_order success_order, + memory_order failure_order) volatile BOOST_NOEXCEPT + { +- storage_type expected_s = 0, desired_s = 0; ++ storage_type expected_s, desired_s; ++ memset(&expected_s, 0, sizeof(expected_s)); ++ memset(&desired_s, 0, sizeof(desired_s)); + memcpy(&expected_s, &expected, sizeof(value_type)); + memcpy(&desired_s, &desired, sizeof(value_type)); + const bool success = __atomic_compare_exchange_n(&v_, &expected_s, desired_s, false, +@@ -1010,7 +1015,9 @@ class base_atomic<T, void, 16, Sign> + memory_order success_order, + memory_order failure_order) volatile BOOST_NOEXCEPT + { +- storage_type expected_s = 0, desired_s = 0; ++ storage_type expected_s, desired_s; ++ memset(&expected_s, 0, sizeof(expected_s)); ++ memset(&desired_s, 0, sizeof(desired_s)); + memcpy(&expected_s, &expected, sizeof(value_type)); + memcpy(&desired_s, &desired, sizeof(value_type)); + const bool success = __atomic_compare_exchange_n(&v_, &expected_s, desired_s, true, diff --git a/pkgs/development/libraries/boost/boost_filesystem_post_1_49_0.patch b/pkgs/development/libraries/boost/boost_filesystem_post_1_49_0.patch deleted file mode 100644 index 334533d98a65..000000000000 --- a/pkgs/development/libraries/boost/boost_filesystem_post_1_49_0.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ubr boost_1_49_0/libs/filesystem/v2/src/v2_path.cpp boost_1_49_0-patched/libs/filesystem/v2/src/v2_path.cpp ---- boost_1_49_0/libs/filesystem/v2/src/v2_path.cpp 2011-01-11 22:39:33.000000000 +0100 -+++ boost_1_49_0-patched/libs/filesystem/v2/src/v2_path.cpp 2012-02-25 20:00:33.628767485 +0100 -@@ -45,7 +45,7 @@ - { - #if !defined(macintosh) && !defined(__APPLE__) && !defined(__APPLE_CC__) - // ISO C calls this "the locale-specific native environment": -- static std::locale lc(""); -+ static std::locale lc; - #else // Mac OS - // "All BSD system functions expect their string parameters to be in UTF-8 encoding - // and nothing else." diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix new file mode 100644 index 000000000000..6e1a2cfc4136 --- /dev/null +++ b/pkgs/development/libraries/boost/generic.nix @@ -0,0 +1,180 @@ +{ stdenv, icu, expat, zlib, bzip2, python, fixDarwinDylibNames +, toolset ? if stdenv.isDarwin then "clang" else null +, enableRelease ? true +, enableDebug ? false +, enableSingleThreaded ? false +, enableMultiThreaded ? true +, enableShared ? true +, enableStatic ? false +, enablePIC ? false +, enableExceptions ? false +, taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic)) +, mpi ? null + +# Attributes inherit from specific versions +, version, src +, ... +}: + +# We must build at least one type of libraries +assert !enableShared -> enableStatic; + +with stdenv.lib; +let + + variant = concatStringsSep "," + (optional enableRelease "release" ++ + optional enableDebug "debug"); + + threading = concatStringsSep "," + (optional enableSingleThreaded "single" ++ + optional enableMultiThreaded "multi"); + + link = concatStringsSep "," + (optional enableShared "shared" ++ + optional enableStatic "static"); + + runtime-link = if enableShared then "shared" else "static"; + + # To avoid library name collisions + layout = if taggedLayout then "tagged" else "system"; + + cflags = if enablePIC && enableExceptions then + "cflags=\"-fPIC -fexceptions\" cxxflags=-fPIC linkflags=-fPIC" + else if enablePIC then + "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" + else if enableExceptions then + "cflags=-fexceptions" + else + ""; + + withToolset = stdenv.lib.optionalString (toolset != null) "--with-toolset=${toolset}"; + + genericB2Flags = [ + "--includedir=$dev/include" + "--libdir=$lib/lib" + "-j$NIX_BUILD_CORES" + "--layout=${layout}" + "variant=${variant}" + "threading=${threading}" + "runtime-link=${runtime-link}" + "link=${link}" + "${cflags}" + ] ++ optional (variant == "release") "debug-symbols=off"; + + nativeB2Flags = [ + "-sEXPAT_INCLUDE=${expat}/include" + "-sEXPAT_LIBPATH=${expat}/lib" + ] ++ optional (toolset != null) "toolset=${toolset}" + ++ optional (mpi != null) "--user-config=user-config.jam"; + nativeB2Args = concatStringsSep " " (genericB2Flags ++ nativeB2Flags); + + crossB2Flags = [ + "-sEXPAT_INCLUDE=${expat.crossDrv}/include" + "-sEXPAT_LIBPATH=${expat.crossDrv}/lib" + "--user-config=user-config.jam" + "toolset=gcc-cross" + "--without-python" + ]; + crossB2Args = concatMapStringsSep " " (genericB2Flags ++ crossB2Flags); + + builder = b2Args: '' + ./b2 ${b2Args} + ''; + + installer = b2Args: '' + # boostbook is needed by some applications + mkdir -p $dev/share/boostbook + cp -a tools/boostbook/{xsl,dtd} $dev/share/boostbook/ + + # Let boost install everything else + ./b2 ${b2Args} install + + # Create a derivation which encompasses everything, making buildInputs nicer + mkdir -p $out/nix-support + echo "$dev $lib" > $out/nix-support/propagated-native-build-inputs + ''; + + commonConfigureFlags = [ + "--includedir=$(dev)/include" + "--libdir=$(lib)/lib" + ]; + + fixup = '' + # Make boost header paths relative so that they are not runtime dependencies + ( + cd "$dev" + find include \( -name '*.hpp' -or -name '*.h' -or -name '*.ipp' \) \ + -exec sed '1i#line 1 "{}"' -i '{}' \; + ) + ''; + +in + +stdenv.mkDerivation { + name = "boost-${version}"; + + inherit src; + + meta = { + homepage = "http://boost.org/"; + description = "Collection of C++ libraries"; + license = stdenv.lib.licenses.boost; + + platforms = platforms.unix; + maintainers = with maintainers; [ simons wkennington ]; + }; + + preConfigure = '' + NIX_LDFLAGS="$(echo $NIX_LDFLAGS | sed "s,$out,$lib,g")" + if test -f tools/build/src/tools/clang-darwin.jam ; then + substituteInPlace tools/build/src/tools/clang-darwin.jam \ + --replace '$(<[1]:D=)' "$lib/lib/\$(<[1]:D=)"; + fi; + '' + optionalString (mpi != null) '' + cat << EOF > user-config.jam + using mpi : ${mpi}/bin/mpiCC ; + EOF + ''; + + NIX_CFLAGS_LINK = stdenv.lib.optionalString stdenv.isDarwin + "-headerpad_max_install_names"; + + enableParallelBuilding = true; + + buildInputs = [ icu expat zlib bzip2 python ] + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + + configureScript = "./bootstrap.sh"; + configureFlags = commonConfigureFlags ++ [ + "--with-icu=${icu}" + "--with-python=${python}/bin/python" + ] ++ optional (toolset != null) "--with-toolset=${toolset}"; + + buildPhase = builder nativeB2Args; + + installPhase = installer nativeB2Args; + + postFixup = fixup; + + outputs = [ "out" "dev" "lib" ]; + + crossAttrs = rec { + buildInputs = [ expat.crossDrv zlib.crossDrv bzip2.crossDrv ]; + # all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to + # override them. + propagatedBuildInputs = buildInputs; + # We want to substitute the contents of configureFlags, removing thus the + # usual --build and --host added on cross building. + preConfigure = '' + export configureFlags="--without-icu ${concatStringsSep " " commonConfigureFlags}" + set -x + cat << EOF > user-config.jam + using gcc : cross : $crossConfig-g++ ; + EOF + ''; + buildPhase = builder crossB2Args; + installPhase = installer crossB2Args; + postFixup = fixup; + }; +} diff --git a/pkgs/development/libraries/boost/time_utc.patch b/pkgs/development/libraries/boost/time_utc.patch deleted file mode 100644 index 3585d0bfc6dd..000000000000 --- a/pkgs/development/libraries/boost/time_utc.patch +++ /dev/null @@ -1,320 +0,0 @@ -From: https://build.opensuse.org/package/view_file?file=boost-time_utc.patch&package=boost&project=Application%3AGeo - -From: https://svn.boost.org/trac/boost/changeset/78802 - -Message: - Thread: fix TIME_UTC, WINVER, constexpr for tags, and don't use local files - -Only the TIME_UTC_ change is taken - -Index: boost_1_49_0/boost/thread/xtime.hpp -=================================================================== ---- boost_1_49_0.orig/boost/thread/xtime.hpp -+++ boost_1_49_0/boost/thread/xtime.hpp -@@ -2,7 +2,7 @@ - // William E. Kempf - // Copyright (C) 2007-8 Anthony Williams - // --// Distributed under the Boost Software License, Version 1.0. (See accompanying -+// Distributed under the Boost Software License, Version 1.0. (See accompanying - // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - - #ifndef BOOST_XTIME_WEK070601_HPP -@@ -20,7 +20,7 @@ namespace boost { - - enum xtime_clock_types - { -- TIME_UTC=1 -+ TIME_UTC_=1 - // TIME_TAI, - // TIME_MONOTONIC, - // TIME_PROCESS, -@@ -53,14 +53,14 @@ struct xtime - boost::posix_time::microseconds((nsec+500)/1000); - #endif - } -- -+ - }; - - inline xtime get_xtime(boost::system_time const& abs_time) - { - xtime res; - boost::posix_time::time_duration const time_since_epoch=abs_time-boost::posix_time::from_time_t(0); -- -+ - res.sec=static_cast<xtime::xtime_sec_t>(time_since_epoch.total_seconds()); - res.nsec=static_cast<xtime::xtime_nsec_t>(time_since_epoch.fractional_seconds()*(1000000000/time_since_epoch.ticks_per_second())); - return res; -@@ -68,7 +68,7 @@ inline xtime get_xtime(boost::system_tim - - inline int xtime_get(struct xtime* xtp, int clock_type) - { -- if (clock_type == TIME_UTC) -+ if (clock_type == TIME_UTC_) - { - *xtp=get_xtime(get_system_time()); - return clock_type; -@@ -81,7 +81,7 @@ inline int xtime_cmp(const xtime& xt1, c - { - if (xt1.sec == xt2.sec) - return (int)(xt1.nsec - xt2.nsec); -- else -+ else - return (xt1.sec > xt2.sec) ? 1 : -1; - } - -Index: boost_1_49_0/libs/thread/example/starvephil.cpp -=================================================================== ---- boost_1_49_0.orig/libs/thread/example/starvephil.cpp -+++ boost_1_49_0/libs/thread/example/starvephil.cpp -@@ -50,7 +50,7 @@ public: - << "very hot ..." << std::endl; - } - boost::xtime xt; -- boost::xtime_get(&xt, boost::TIME_UTC); -+ boost::xtime_get(&xt, boost::TIME_UTC_); - xt.sec += 3; - boost::thread::sleep(xt); - m_chickens += value; -@@ -85,7 +85,7 @@ void chef() - std::cout << "(" << clock() << ") Chef: cooking ..." << std::endl; - } - boost::xtime xt; -- boost::xtime_get(&xt, boost::TIME_UTC); -+ boost::xtime_get(&xt, boost::TIME_UTC_); - xt.sec += 2; - boost::thread::sleep(xt); - { -@@ -111,7 +111,7 @@ struct phil - if (m_id > 0) - { - boost::xtime xt; -- boost::xtime_get(&xt, boost::TIME_UTC); -+ boost::xtime_get(&xt, boost::TIME_UTC_); - xt.sec += 3; - boost::thread::sleep(xt); - } -Index: boost_1_49_0/libs/thread/example/tennis.cpp -=================================================================== ---- boost_1_49_0.orig/libs/thread/example/tennis.cpp -+++ boost_1_49_0/libs/thread/example/tennis.cpp -@@ -1,7 +1,7 @@ - // Copyright (C) 2001-2003 - // William E. Kempf - // --// Distributed under the Boost Software License, Version 1.0. (See accompanying -+// Distributed under the Boost Software License, Version 1.0. (See accompanying - // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - - #include <boost/thread/mutex.hpp> -@@ -104,7 +104,7 @@ int main(int argc, char* argv[]) - boost::thread thrdb(thread_adapter(&player, (void*)PLAYER_B)); - - boost::xtime xt; -- boost::xtime_get(&xt, boost::TIME_UTC); -+ boost::xtime_get(&xt, boost::TIME_UTC_); - xt.sec += 1; - boost::thread::sleep(xt); - { -Index: boost_1_49_0/libs/thread/example/thread.cpp -=================================================================== ---- boost_1_49_0.orig/libs/thread/example/thread.cpp -+++ boost_1_49_0/libs/thread/example/thread.cpp -@@ -14,7 +14,7 @@ struct thread_alarm - void operator()() - { - boost::xtime xt; -- boost::xtime_get(&xt, boost::TIME_UTC); -+ boost::xtime_get(&xt, boost::TIME_UTC_); - xt.sec += m_secs; - - boost::thread::sleep(xt); -Index: boost_1_49_0/libs/thread/example/xtime.cpp -=================================================================== ---- boost_1_49_0.orig/libs/thread/example/xtime.cpp -+++ boost_1_49_0/libs/thread/example/xtime.cpp -@@ -10,7 +10,7 @@ - int main(int argc, char* argv[]) - { - boost::xtime xt; -- boost::xtime_get(&xt, boost::TIME_UTC); -+ boost::xtime_get(&xt, boost::TIME_UTC_); - xt.sec += 1; - boost::thread::sleep(xt); // Sleep for 1 second - } -Index: boost_1_49_0/libs/thread/src/pthread/thread.cpp -=================================================================== ---- boost_1_49_0.orig/libs/thread/src/pthread/thread.cpp -+++ boost_1_49_0/libs/thread/src/pthread/thread.cpp -@@ -23,7 +23,7 @@ - #include <unistd.h> - #endif - --#include "timeconv.inl" -+#include <libs/thread/src/pthread/timeconv.inl> - - namespace boost - { -@@ -354,7 +354,7 @@ namespace boost - cond.timed_wait(lock, xt); - # endif - xtime cur; -- xtime_get(&cur, TIME_UTC); -+ xtime_get(&cur, TIME_UTC_); - if (xtime_cmp(xt, cur) <= 0) - return; - } -@@ -369,7 +369,7 @@ namespace boost - BOOST_VERIFY(!pthread_yield()); - # else - xtime xt; -- xtime_get(&xt, TIME_UTC); -+ xtime_get(&xt, TIME_UTC_); - sleep(xt); - # endif - } -Index: boost_1_49_0/libs/thread/src/pthread/timeconv.inl -=================================================================== ---- boost_1_49_0.orig/libs/thread/src/pthread/timeconv.inl -+++ boost_1_49_0/libs/thread/src/pthread/timeconv.inl -@@ -20,8 +20,8 @@ const int NANOSECONDS_PER_MICROSECOND = - inline void to_time(int milliseconds, boost::xtime& xt) - { - int res = 0; -- res = boost::xtime_get(&xt, boost::TIME_UTC); -- BOOST_ASSERT(res == boost::TIME_UTC); (void)res; -+ res = boost::xtime_get(&xt, boost::TIME_UTC_); -+ BOOST_ASSERT(res == boost::TIME_UTC_); (void)res; - - xt.sec += (milliseconds / MILLISECONDS_PER_SECOND); - xt.nsec += ((milliseconds % MILLISECONDS_PER_SECOND) * -@@ -56,8 +56,8 @@ inline void to_timespec_duration(const b - { - boost::xtime cur; - int res = 0; -- res = boost::xtime_get(&cur, boost::TIME_UTC); -- BOOST_ASSERT(res == boost::TIME_UTC); (void)res; -+ res = boost::xtime_get(&cur, boost::TIME_UTC_); -+ BOOST_ASSERT(res == boost::TIME_UTC_); (void)res; - - if (boost::xtime_cmp(xt, cur) <= 0) - { -@@ -87,8 +87,8 @@ inline void to_duration(boost::xtime xt, - { - boost::xtime cur; - int res = 0; -- res = boost::xtime_get(&cur, boost::TIME_UTC); -- BOOST_ASSERT(res == boost::TIME_UTC); (void)res; -+ res = boost::xtime_get(&cur, boost::TIME_UTC_); -+ BOOST_ASSERT(res == boost::TIME_UTC_); (void)res; - - if (boost::xtime_cmp(xt, cur) <= 0) - milliseconds = 0; -@@ -109,8 +109,8 @@ inline void to_microduration(boost::xtim - { - boost::xtime cur; - int res = 0; -- res = boost::xtime_get(&cur, boost::TIME_UTC); -- BOOST_ASSERT(res == boost::TIME_UTC); (void)res; -+ res = boost::xtime_get(&cur, boost::TIME_UTC_); -+ BOOST_ASSERT(res == boost::TIME_UTC_); (void)res; - - if (boost::xtime_cmp(xt, cur) <= 0) - microseconds = 0; -Index: boost_1_49_0/libs/thread/src/win32/timeconv.inl -=================================================================== ---- boost_1_49_0.orig/libs/thread/src/win32/timeconv.inl -+++ boost_1_49_0/libs/thread/src/win32/timeconv.inl -@@ -17,8 +17,8 @@ const int NANOSECONDS_PER_MICROSECOND = - inline void to_time(int milliseconds, boost::xtime& xt) - { - int res = 0; -- res = boost::xtime_get(&xt, boost::TIME_UTC); -- assert(res == boost::TIME_UTC); -+ res = boost::xtime_get(&xt, boost::TIME_UTC_); -+ assert(res == boost::TIME_UTC_); - - xt.sec += (milliseconds / MILLISECONDS_PER_SECOND); - xt.nsec += ((milliseconds % MILLISECONDS_PER_SECOND) * -@@ -54,8 +54,8 @@ inline void to_timespec_duration(const b - { - boost::xtime cur; - int res = 0; -- res = boost::xtime_get(&cur, boost::TIME_UTC); -- assert(res == boost::TIME_UTC); -+ res = boost::xtime_get(&cur, boost::TIME_UTC_); -+ assert(res == boost::TIME_UTC_); - - if (boost::xtime_cmp(xt, cur) <= 0) - { -@@ -85,8 +85,8 @@ inline void to_duration(boost::xtime xt, - { - boost::xtime cur; - int res = 0; -- res = boost::xtime_get(&cur, boost::TIME_UTC); -- assert(res == boost::TIME_UTC); -+ res = boost::xtime_get(&cur, boost::TIME_UTC_); -+ assert(res == boost::TIME_UTC_); - - if (boost::xtime_cmp(xt, cur) <= 0) - milliseconds = 0; -@@ -107,8 +107,8 @@ inline void to_microduration(boost::xtim - { - boost::xtime cur; - int res = 0; -- res = boost::xtime_get(&cur, boost::TIME_UTC); -- assert(res == boost::TIME_UTC); -+ res = boost::xtime_get(&cur, boost::TIME_UTC_); -+ assert(res == boost::TIME_UTC_); - - if (boost::xtime_cmp(xt, cur) <= 0) - microseconds = 0; -Index: boost_1_49_0/libs/thread/test/test_xtime.cpp -=================================================================== ---- boost_1_49_0.orig/libs/thread/test/test_xtime.cpp -+++ boost_1_49_0/libs/thread/test/test_xtime.cpp -@@ -17,8 +17,8 @@ void test_xtime_cmp() - { - boost::xtime xt1, xt2, cur; - BOOST_CHECK_EQUAL( -- boost::xtime_get(&cur, boost::TIME_UTC), -- static_cast<int>(boost::TIME_UTC)); -+ boost::xtime_get(&cur, boost::TIME_UTC_), -+ static_cast<int>(boost::TIME_UTC_)); - - xt1 = xt2 = cur; - xt1.nsec -= 1; -@@ -42,14 +42,14 @@ void test_xtime_get() - boost::xtime orig, cur, old; - BOOST_CHECK_EQUAL( - boost::xtime_get(&orig, -- boost::TIME_UTC), static_cast<int>(boost::TIME_UTC)); -+ boost::TIME_UTC_), static_cast<int>(boost::TIME_UTC_)); - old = orig; - - for (int x=0; x < 100; ++x) - { - BOOST_CHECK_EQUAL( -- boost::xtime_get(&cur, boost::TIME_UTC), -- static_cast<int>(boost::TIME_UTC)); -+ boost::xtime_get(&cur, boost::TIME_UTC_), -+ static_cast<int>(boost::TIME_UTC_)); - BOOST_CHECK(boost::xtime_cmp(cur, orig) >= 0); - BOOST_CHECK(boost::xtime_cmp(cur, old) >= 0); - old = cur; -Index: boost_1_49_0/libs/thread/test/util.inl -=================================================================== ---- boost_1_49_0.orig/libs/thread/test/util.inl -+++ boost_1_49_0/libs/thread/test/util.inl -@@ -28,8 +28,8 @@ inline boost::xtime delay(int secs, int - const int NANOSECONDS_PER_MILLISECOND = 1000000; - - boost::xtime xt; -- if (boost::TIME_UTC != boost::xtime_get (&xt, boost::TIME_UTC)) -- BOOST_ERROR ("boost::xtime_get != boost::TIME_UTC"); -+ if (boost::TIME_UTC_ != boost::xtime_get (&xt, boost::TIME_UTC_)) -+ BOOST_ERROR ("boost::xtime_get != boost::TIME_UTC_"); - - nsecs += xt.nsec; - msecs += nsecs / NANOSECONDS_PER_MILLISECOND; diff --git a/pkgs/development/libraries/boost/time_utc_144.patch b/pkgs/development/libraries/boost/time_utc_144.patch deleted file mode 100644 index 512832c18295..000000000000 --- a/pkgs/development/libraries/boost/time_utc_144.patch +++ /dev/null @@ -1,520 +0,0 @@ -diff -rc boost_1_44_0/boost/thread/xtime.hpp boost_1_44_0-new/boost/thread/xtime.hpp -*** boost_1_44_0/boost/thread/xtime.hpp 2008-06-18 15:01:08.000000000 +0200 ---- boost_1_44_0-new/boost/thread/xtime.hpp 2013-04-12 14:00:27.125713549 +0200 -*************** -*** 20,26 **** - - enum xtime_clock_types - { -! TIME_UTC=1 - // TIME_TAI, - // TIME_MONOTONIC, - // TIME_PROCESS, ---- 20,26 ---- - - enum xtime_clock_types - { -! TIME_UTC_=1 - // TIME_TAI, - // TIME_MONOTONIC, - // TIME_PROCESS, -*************** -*** 68,74 **** - - inline int xtime_get(struct xtime* xtp, int clock_type) - { -! if (clock_type == TIME_UTC) - { - *xtp=get_xtime(get_system_time()); - return clock_type; ---- 68,74 ---- - - inline int xtime_get(struct xtime* xtp, int clock_type) - { -! if (clock_type == TIME_UTC_) - { - *xtp=get_xtime(get_system_time()); - return clock_type; -diff -rc boost_1_44_0/libs/interprocess/test/condition_test_template.hpp boost_1_44_0-new/libs/interprocess/test/condition_test_template.hpp -*** boost_1_44_0/libs/interprocess/test/condition_test_template.hpp 2009-10-15 20:45:53.000000000 +0200 ---- boost_1_44_0-new/libs/interprocess/test/condition_test_template.hpp 2013-04-12 14:00:20.215658855 +0200 -*************** -*** 49,56 **** - const int NANOSECONDS_PER_MILLISECOND = 1000000; - - boost::xtime xt; -! int ret = boost::xtime_get(&xt, boost::TIME_UTC); -! assert(ret == static_cast<int>(boost::TIME_UTC));(void)ret; - nsecs += xt.nsec; - msecs += nsecs / NANOSECONDS_PER_MILLISECOND; - secs += msecs / MILLISECONDS_PER_SECOND; ---- 49,56 ---- - const int NANOSECONDS_PER_MILLISECOND = 1000000; - - boost::xtime xt; -! int ret = boost::xtime_get(&xt, boost::TIME_UTC_); -! assert(ret == static_cast<int>(boost::TIME_UTC_));(void)ret; - nsecs += xt.nsec; - msecs += nsecs / NANOSECONDS_PER_MILLISECOND; - secs += msecs / MILLISECONDS_PER_SECOND; -diff -rc boost_1_44_0/libs/interprocess/test/util.hpp boost_1_44_0-new/libs/interprocess/test/util.hpp -*** boost_1_44_0/libs/interprocess/test/util.hpp 2009-10-15 20:45:53.000000000 +0200 ---- boost_1_44_0-new/libs/interprocess/test/util.hpp 2013-04-12 14:00:20.219658887 +0200 -*************** -*** 71,77 **** - boost::xtime xsecs(int secs) - { - boost::xtime ret; -! boost::xtime_get(&ret, boost::TIME_UTC); - ret.sec += secs; - return ret; - } ---- 71,77 ---- - boost::xtime xsecs(int secs) - { - boost::xtime ret; -! boost::xtime_get(&ret, boost::TIME_UTC_); - ret.sec += secs; - return ret; - } -diff -rc boost_1_44_0/libs/spirit/classic/test/grammar_mt_tests.cpp boost_1_44_0-new/libs/spirit/classic/test/grammar_mt_tests.cpp -*** boost_1_44_0/libs/spirit/classic/test/grammar_mt_tests.cpp 2008-06-22 17:05:38.000000000 +0200 ---- boost_1_44_0-new/libs/spirit/classic/test/grammar_mt_tests.cpp 2013-04-12 14:00:18.836647940 +0200 -*************** -*** 70,76 **** - { - static long const nanoseconds_per_second = 1000L*1000L*1000L; - boost::xtime xt; -! boost::xtime_get(&xt, boost::TIME_UTC); - xt.nsec+=1000*1000*milliseconds; - while (xt.nsec > nanoseconds_per_second) - { ---- 70,76 ---- - { - static long const nanoseconds_per_second = 1000L*1000L*1000L; - boost::xtime xt; -! boost::xtime_get(&xt, boost::TIME_UTC_); - xt.nsec+=1000*1000*milliseconds; - while (xt.nsec > nanoseconds_per_second) - { -diff -rc boost_1_44_0/libs/spirit/classic/test/owi_mt_tests.cpp boost_1_44_0-new/libs/spirit/classic/test/owi_mt_tests.cpp -*** boost_1_44_0/libs/spirit/classic/test/owi_mt_tests.cpp 2008-06-22 17:05:38.000000000 +0200 ---- boost_1_44_0-new/libs/spirit/classic/test/owi_mt_tests.cpp 2013-04-12 14:00:18.836647940 +0200 -*************** -*** 86,92 **** - return test_size; - - boost::xtime now; -! boost::xtime_get(&now, boost::TIME_UTC); - unsigned long seconds = now.sec - start_time.sec; - if (seconds < 4) - { ---- 86,92 ---- - return test_size; - - boost::xtime now; -! boost::xtime_get(&now, boost::TIME_UTC_); - unsigned long seconds = now.sec - start_time.sec; - if (seconds < 4) - { -*************** -*** 187,193 **** - void concurrent_creation_of_objects() - { - { -! boost::xtime_get(&start_time, boost::TIME_UTC); - boost::thread thread1(callable_ref(test1)); - boost::thread thread2(callable_ref(test2)); - boost::thread thread3(callable_ref(test3)); ---- 187,193 ---- - void concurrent_creation_of_objects() - { - { -! boost::xtime_get(&start_time, boost::TIME_UTC_); - boost::thread thread1(callable_ref(test1)); - boost::thread thread2(callable_ref(test2)); - boost::thread thread3(callable_ref(test3)); -diff -rc boost_1_44_0/libs/thread/example/starvephil.cpp boost_1_44_0-new/libs/thread/example/starvephil.cpp -*** boost_1_44_0/libs/thread/example/starvephil.cpp 2006-09-14 23:51:01.000000000 +0200 ---- boost_1_44_0-new/libs/thread/example/starvephil.cpp 2013-04-12 14:00:19.413652507 +0200 -*************** -*** 50,56 **** - << "very hot ..." << std::endl; - } - boost::xtime xt; -! boost::xtime_get(&xt, boost::TIME_UTC); - xt.sec += 3; - boost::thread::sleep(xt); - m_chickens += value; ---- 50,56 ---- - << "very hot ..." << std::endl; - } - boost::xtime xt; -! boost::xtime_get(&xt, boost::TIME_UTC_); - xt.sec += 3; - boost::thread::sleep(xt); - m_chickens += value; -*************** -*** 85,91 **** - std::cout << "(" << clock() << ") Chef: cooking ..." << std::endl; - } - boost::xtime xt; -! boost::xtime_get(&xt, boost::TIME_UTC); - xt.sec += 2; - boost::thread::sleep(xt); - { ---- 85,91 ---- - std::cout << "(" << clock() << ") Chef: cooking ..." << std::endl; - } - boost::xtime xt; -! boost::xtime_get(&xt, boost::TIME_UTC_); - xt.sec += 2; - boost::thread::sleep(xt); - { -*************** -*** 111,117 **** - if (m_id > 0) - { - boost::xtime xt; -! boost::xtime_get(&xt, boost::TIME_UTC); - xt.sec += 3; - boost::thread::sleep(xt); - } ---- 111,117 ---- - if (m_id > 0) - { - boost::xtime xt; -! boost::xtime_get(&xt, boost::TIME_UTC_); - xt.sec += 3; - boost::thread::sleep(xt); - } -diff -rc boost_1_44_0/libs/thread/example/tennis.cpp boost_1_44_0-new/libs/thread/example/tennis.cpp -*** boost_1_44_0/libs/thread/example/tennis.cpp 2009-10-19 11:18:13.000000000 +0200 ---- boost_1_44_0-new/libs/thread/example/tennis.cpp 2013-04-12 14:00:19.412652499 +0200 -*************** -*** 104,110 **** - boost::thread thrdb(thread_adapter(&player, (void*)PLAYER_B)); - - boost::xtime xt; -! boost::xtime_get(&xt, boost::TIME_UTC); - xt.sec += 1; - boost::thread::sleep(xt); - { ---- 104,110 ---- - boost::thread thrdb(thread_adapter(&player, (void*)PLAYER_B)); - - boost::xtime xt; -! boost::xtime_get(&xt, boost::TIME_UTC_); - xt.sec += 1; - boost::thread::sleep(xt); - { -diff -rc boost_1_44_0/libs/thread/example/thread.cpp boost_1_44_0-new/libs/thread/example/thread.cpp -*** boost_1_44_0/libs/thread/example/thread.cpp 2006-09-14 23:51:01.000000000 +0200 ---- boost_1_44_0-new/libs/thread/example/thread.cpp 2013-04-12 14:00:19.414652515 +0200 -*************** -*** 14,20 **** - void operator()() - { - boost::xtime xt; -! boost::xtime_get(&xt, boost::TIME_UTC); - xt.sec += m_secs; - - boost::thread::sleep(xt); ---- 14,20 ---- - void operator()() - { - boost::xtime xt; -! boost::xtime_get(&xt, boost::TIME_UTC_); - xt.sec += m_secs; - - boost::thread::sleep(xt); -diff -rc boost_1_44_0/libs/thread/example/xtime.cpp boost_1_44_0-new/libs/thread/example/xtime.cpp -*** boost_1_44_0/libs/thread/example/xtime.cpp 2006-09-14 23:51:01.000000000 +0200 ---- boost_1_44_0-new/libs/thread/example/xtime.cpp 2013-04-12 14:00:19.413652507 +0200 -*************** -*** 10,16 **** - int main(int argc, char* argv[]) - { - boost::xtime xt; -! boost::xtime_get(&xt, boost::TIME_UTC); - xt.sec += 1; - boost::thread::sleep(xt); // Sleep for 1 second - } ---- 10,16 ---- - int main(int argc, char* argv[]) - { - boost::xtime xt; -! boost::xtime_get(&xt, boost::TIME_UTC_); - xt.sec += 1; - boost::thread::sleep(xt); // Sleep for 1 second - } -diff -rc boost_1_44_0/libs/thread/src/pthread/thread.cpp boost_1_44_0-new/libs/thread/src/pthread/thread.cpp -*** boost_1_44_0/libs/thread/src/pthread/thread.cpp 2010-07-09 21:13:09.000000000 +0200 ---- boost_1_44_0-new/libs/thread/src/pthread/thread.cpp 2013-04-12 14:00:19.415652523 +0200 -*************** -*** 350,356 **** - cond.timed_wait(lock, xt); - # endif - xtime cur; -! xtime_get(&cur, TIME_UTC); - if (xtime_cmp(xt, cur) <= 0) - return; - } ---- 350,356 ---- - cond.timed_wait(lock, xt); - # endif - xtime cur; -! xtime_get(&cur, TIME_UTC_); - if (xtime_cmp(xt, cur) <= 0) - return; - } -*************** -*** 365,371 **** - BOOST_VERIFY(!pthread_yield()); - # else - xtime xt; -! xtime_get(&xt, TIME_UTC); - sleep(xt); - # endif - } ---- 365,371 ---- - BOOST_VERIFY(!pthread_yield()); - # else - xtime xt; -! xtime_get(&xt, TIME_UTC_); - sleep(xt); - # endif - } -diff -rc boost_1_44_0/libs/thread/src/pthread/timeconv.inl boost_1_44_0-new/libs/thread/src/pthread/timeconv.inl -*** boost_1_44_0/libs/thread/src/pthread/timeconv.inl 2010-04-01 17:04:15.000000000 +0200 ---- boost_1_44_0-new/libs/thread/src/pthread/timeconv.inl 2013-04-12 14:00:19.414652515 +0200 -*************** -*** 20,27 **** - inline void to_time(int milliseconds, boost::xtime& xt) - { - int res = 0; -! res = boost::xtime_get(&xt, boost::TIME_UTC); -! BOOST_ASSERT(res == boost::TIME_UTC); - - xt.sec += (milliseconds / MILLISECONDS_PER_SECOND); - xt.nsec += ((milliseconds % MILLISECONDS_PER_SECOND) * ---- 20,27 ---- - inline void to_time(int milliseconds, boost::xtime& xt) - { - int res = 0; -! res = boost::xtime_get(&xt, boost::TIME_UTC_); -! BOOST_ASSERT(res == boost::TIME_UTC_); - - xt.sec += (milliseconds / MILLISECONDS_PER_SECOND); - xt.nsec += ((milliseconds % MILLISECONDS_PER_SECOND) * -*************** -*** 57,64 **** - { - boost::xtime cur; - int res = 0; -! res = boost::xtime_get(&cur, boost::TIME_UTC); -! BOOST_ASSERT(res == boost::TIME_UTC); - - if (boost::xtime_cmp(xt, cur) <= 0) - { ---- 57,64 ---- - { - boost::xtime cur; - int res = 0; -! res = boost::xtime_get(&cur, boost::TIME_UTC_); -! BOOST_ASSERT(res == boost::TIME_UTC_); - - if (boost::xtime_cmp(xt, cur) <= 0) - { -*************** -*** 88,95 **** - { - boost::xtime cur; - int res = 0; -! res = boost::xtime_get(&cur, boost::TIME_UTC); -! BOOST_ASSERT(res == boost::TIME_UTC); - - if (boost::xtime_cmp(xt, cur) <= 0) - milliseconds = 0; ---- 88,95 ---- - { - boost::xtime cur; - int res = 0; -! res = boost::xtime_get(&cur, boost::TIME_UTC_); -! BOOST_ASSERT(res == boost::TIME_UTC_); - - if (boost::xtime_cmp(xt, cur) <= 0) - milliseconds = 0; -*************** -*** 110,117 **** - { - boost::xtime cur; - int res = 0; -! res = boost::xtime_get(&cur, boost::TIME_UTC); -! BOOST_ASSERT(res == boost::TIME_UTC); - - if (boost::xtime_cmp(xt, cur) <= 0) - microseconds = 0; ---- 110,117 ---- - { - boost::xtime cur; - int res = 0; -! res = boost::xtime_get(&cur, boost::TIME_UTC_); -! BOOST_ASSERT(res == boost::TIME_UTC_); - - if (boost::xtime_cmp(xt, cur) <= 0) - microseconds = 0; -diff -rc boost_1_44_0/libs/thread/src/win32/timeconv.inl boost_1_44_0-new/libs/thread/src/win32/timeconv.inl -*** boost_1_44_0/libs/thread/src/win32/timeconv.inl 2007-11-25 19:38:02.000000000 +0100 ---- boost_1_44_0-new/libs/thread/src/win32/timeconv.inl 2013-04-12 14:00:19.416652531 +0200 -*************** -*** 17,24 **** - inline void to_time(int milliseconds, boost::xtime& xt) - { - int res = 0; -! res = boost::xtime_get(&xt, boost::TIME_UTC); -! assert(res == boost::TIME_UTC); - - xt.sec += (milliseconds / MILLISECONDS_PER_SECOND); - xt.nsec += ((milliseconds % MILLISECONDS_PER_SECOND) * ---- 17,24 ---- - inline void to_time(int milliseconds, boost::xtime& xt) - { - int res = 0; -! res = boost::xtime_get(&xt, boost::TIME_UTC_); -! assert(res == boost::TIME_UTC_); - - xt.sec += (milliseconds / MILLISECONDS_PER_SECOND); - xt.nsec += ((milliseconds % MILLISECONDS_PER_SECOND) * -*************** -*** 54,61 **** - { - boost::xtime cur; - int res = 0; -! res = boost::xtime_get(&cur, boost::TIME_UTC); -! assert(res == boost::TIME_UTC); - - if (boost::xtime_cmp(xt, cur) <= 0) - { ---- 54,61 ---- - { - boost::xtime cur; - int res = 0; -! res = boost::xtime_get(&cur, boost::TIME_UTC_); -! assert(res == boost::TIME_UTC_); - - if (boost::xtime_cmp(xt, cur) <= 0) - { -*************** -*** 85,92 **** - { - boost::xtime cur; - int res = 0; -! res = boost::xtime_get(&cur, boost::TIME_UTC); -! assert(res == boost::TIME_UTC); - - if (boost::xtime_cmp(xt, cur) <= 0) - milliseconds = 0; ---- 85,92 ---- - { - boost::xtime cur; - int res = 0; -! res = boost::xtime_get(&cur, boost::TIME_UTC_); -! assert(res == boost::TIME_UTC_); - - if (boost::xtime_cmp(xt, cur) <= 0) - milliseconds = 0; -*************** -*** 107,114 **** - { - boost::xtime cur; - int res = 0; -! res = boost::xtime_get(&cur, boost::TIME_UTC); -! assert(res == boost::TIME_UTC); - - if (boost::xtime_cmp(xt, cur) <= 0) - microseconds = 0; ---- 107,114 ---- - { - boost::xtime cur; - int res = 0; -! res = boost::xtime_get(&cur, boost::TIME_UTC_); -! assert(res == boost::TIME_UTC_); - - if (boost::xtime_cmp(xt, cur) <= 0) - microseconds = 0; -diff -rc boost_1_44_0/libs/thread/test/test_xtime.cpp boost_1_44_0-new/libs/thread/test/test_xtime.cpp -*** boost_1_44_0/libs/thread/test/test_xtime.cpp 2008-07-08 09:44:55.000000000 +0200 ---- boost_1_44_0-new/libs/thread/test/test_xtime.cpp 2013-04-12 14:00:19.432652657 +0200 -*************** -*** 17,24 **** - { - boost::xtime xt1, xt2, cur; - BOOST_CHECK_EQUAL( -! boost::xtime_get(&cur, boost::TIME_UTC), -! static_cast<int>(boost::TIME_UTC)); - - xt1 = xt2 = cur; - xt1.nsec -= 1; ---- 17,24 ---- - { - boost::xtime xt1, xt2, cur; - BOOST_CHECK_EQUAL( -! boost::xtime_get(&cur, boost::TIME_UTC_), -! static_cast<int>(boost::TIME_UTC_)); - - xt1 = xt2 = cur; - xt1.nsec -= 1; -*************** -*** 42,55 **** - boost::xtime orig, cur, old; - BOOST_CHECK_EQUAL( - boost::xtime_get(&orig, -! boost::TIME_UTC), static_cast<int>(boost::TIME_UTC)); - old = orig; - - for (int x=0; x < 100; ++x) - { - BOOST_CHECK_EQUAL( -! boost::xtime_get(&cur, boost::TIME_UTC), -! static_cast<int>(boost::TIME_UTC)); - BOOST_CHECK(boost::xtime_cmp(cur, orig) >= 0); - BOOST_CHECK(boost::xtime_cmp(cur, old) >= 0); - old = cur; ---- 42,55 ---- - boost::xtime orig, cur, old; - BOOST_CHECK_EQUAL( - boost::xtime_get(&orig, -! boost::TIME_UTC_), static_cast<int>(boost::TIME_UTC)); - old = orig; - - for (int x=0; x < 100; ++x) - { - BOOST_CHECK_EQUAL( -! boost::xtime_get(&cur, boost::TIME_UTC_), -! static_cast<int>(boost::TIME_UTC_)); - BOOST_CHECK(boost::xtime_cmp(cur, orig) >= 0); - BOOST_CHECK(boost::xtime_cmp(cur, old) >= 0); - old = cur; -diff -rc boost_1_44_0/libs/thread/test/util.inl boost_1_44_0-new/libs/thread/test/util.inl -*** boost_1_44_0/libs/thread/test/util.inl 2008-11-03 23:29:39.000000000 +0100 ---- boost_1_44_0-new/libs/thread/test/util.inl 2013-04-12 14:00:19.433652665 +0200 -*************** -*** 28,35 **** - const int NANOSECONDS_PER_MILLISECOND = 1000000; - - boost::xtime xt; -! if (boost::TIME_UTC != boost::xtime_get (&xt, boost::TIME_UTC)) -! BOOST_ERROR ("boost::xtime_get != boost::TIME_UTC"); - - nsecs += xt.nsec; - msecs += nsecs / NANOSECONDS_PER_MILLISECOND; ---- 28,35 ---- - const int NANOSECONDS_PER_MILLISECOND = 1000000; - - boost::xtime xt; -! if (boost::TIME_UTC_ != boost::xtime_get (&xt, boost::TIME_UTC)) -! BOOST_ERROR ("boost::xtime_get != boost::TIME_UTC_"); - - nsecs += xt.nsec; - msecs += nsecs / NANOSECONDS_PER_MILLISECOND; diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix index e603b904ddac..fc56d630837c 100644 --- a/pkgs/development/libraries/botan/default.nix +++ b/pkgs/development/libraries/botan/default.nix @@ -1,59 +1,7 @@ -x@{builderDefsPackage - , python - , bzip2, zlib, gmp, openssl - , boost - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ callPackage, ... } @ args: - buildInputs = [ boost.lib ] - ++ map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="botan"; - tarBaseName="Botan"; - baseVersion = "1.10"; - revision = "8"; - version="${baseVersion}.${revision}"; - name="${baseName}-${version}"; - url="http://files.randombit.net/${baseName}/v${baseVersion}/${tarBaseName}-${version}.tbz"; - hash = "182f316rbdd6jrqn92vjms3jyb9syn4ic0nzi3b7rfjbj3zdabxw"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; - }; - - inherit (sourceInfo) name version; - inherit buildInputs; - - /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "doMakeInstall" "fixPkgConfig"]; - configureCommand = "python configure.py --with-gnump --with-bzip2 --with-zlib --with-openssl --with-tr1-implementation=boost"; - - fixPkgConfig = a.fullDepEntry '' - cd "$out"/lib/pkgconfig - ln -s botan-*.pc botan.pc || true - '' ["minInit" "doMakeInstall"]; - - meta = { - description = "Cryptographic algorithms library"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - unix; - inherit version; - }; - passthru = { - updateInfo = { - downloadPage = "http://files.randombit.net/botan/"; - }; - }; -}) x +callPackage ./generic.nix (args // { + baseVersion = "1.10"; + revision = "8"; + sha256 = "182f316rbdd6jrqn92vjms3jyb9syn4ic0nzi3b7rfjbj3zdabxw"; +}) diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix new file mode 100644 index 000000000000..3fe8d1da7299 --- /dev/null +++ b/pkgs/development/libraries/botan/generic.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, python, bzip2, zlib, gmp, openssl, boost +# Passed by version specific builders +, baseVersion, revision, sha256 +, ... +}: + +stdenv.mkDerivation rec { + name = "botan-${version}"; + version = "${baseVersion}.${revision}"; + + src = fetchurl { + name = "Botan-${version}.tar.bz2"; + url = "http://files.randombit.net/botan/v${baseVersion}/Botan-${version}.tbz"; + inherit sha256; + }; + + buildInputs = [ python bzip2 zlib gmp openssl boost ]; + + configurePhase = '' + python configure.py --prefix=$out --with-gnump --with-bzip2 --with-zlib --with-openssl + ''; + + postInstall = '' + cd "$out"/lib/pkgconfig + ln -s botan-*.pc botan.pc || true + ''; + + meta = with stdenv.lib; { + description = "Cryptographic algorithms library"; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.unix; + license = licenses.bsd2; + }; + passthru.updateInfo.downloadPage = "http://files.randombit.net/botan/"; +} diff --git a/pkgs/development/libraries/botan/unstable.nix b/pkgs/development/libraries/botan/unstable.nix index be541a1d8ec3..5b3a8720bfee 100644 --- a/pkgs/development/libraries/botan/unstable.nix +++ b/pkgs/development/libraries/botan/unstable.nix @@ -1,59 +1,7 @@ -x@{builderDefsPackage - , python - , bzip2, zlib, gmp, openssl - , boost - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ callPackage, ... } @ args: - buildInputs = [ boost.lib ] - ++ map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="botan"; - tarBaseName="Botan"; - baseVersion = "1.11"; - revision = "9"; - version="${baseVersion}.${revision}"; - name="${baseName}-${version}"; - url="http://files.randombit.net/${baseName}/v${baseVersion}/${tarBaseName}-${version}.tbz"; - hash = "0jgx5va042gmr6nc91p5dd59wnfxlz19mz2nnyv74pvwwmizs09m"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; - }; - - inherit (sourceInfo) name version; - inherit buildInputs; - - /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "doMakeInstall" "fixPkgConfig"]; - configureCommand = "python configure.py --with-gnump --with-bzip2 --with-zlib --with-openssl"; - - fixPkgConfig = a.fullDepEntry '' - cd "$out"/lib/pkgconfig - ln -s botan-*.pc botan.pc || true - '' ["minInit" "doMakeInstall"]; - - meta = { - description = "Cryptographic algorithms library"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - unix; - inherit version; - }; - passthru = { - updateInfo = { - downloadPage = "http://files.randombit.net/botan/"; - }; - }; -}) x +callPackage ./generic.nix (args // { + baseVersion = "1.11"; + revision = "9"; + sha256 = "0jgx5va042gmr6nc91p5dd59wnfxlz19mz2nnyv74pvwwmizs09m"; +}) diff --git a/pkgs/development/libraries/box2d/2.0.1.nix b/pkgs/development/libraries/box2d/2.0.1.nix index c15e27695ac9..0d1f3bb14ee9 100644 --- a/pkgs/development/libraries/box2d/2.0.1.nix +++ b/pkgs/development/libraries/box2d/2.0.1.nix @@ -72,6 +72,7 @@ rec { platforms = with a.lib.platforms; linux; license = "bsd"; + branch = "2.0.1"; }; passthru = { updateInfo = { diff --git a/pkgs/development/libraries/bwidget/default.nix b/pkgs/development/libraries/bwidget/default.nix index 0d1913bc8e7a..ed670e61243d 100644 --- a/pkgs/development/libraries/bwidget/default.nix +++ b/pkgs/development/libraries/bwidget/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bwidget-${version}"; - version = "1.9.7"; + version = "1.9.8"; src = fetchurl { url = "mirror://sourceforge/tcllib/bwidget-${version}.tar.gz"; - sha256 = "1z2z77l41g01ra7v716c0q3x8s2kx30l4p1kf21ma8bdqa98arp6"; + sha256 = "055kpl3ghznk028jnhzsa3p48qgipckfzn2liwq932crxviicl2l"; }; dontBuild = true; diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 6c73b17e6f4e..dd73858c3fc2 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -11,11 +11,11 @@ assert glSupport -> mesa_noglu != null; with { inherit (stdenv.lib) optional optionals; }; stdenv.mkDerivation rec { - name = "cairo-1.12.16"; + name = "cairo-1.14.0"; src = fetchurl { url = "http://cairographics.org/releases/${name}.tar.xz"; - sha256 = "0inqwsylqkrzcjivdirkjx5nhdgxbdc62fq284c3xppinfg9a195"; + sha1 = "53cf589b983412ea7f78feee2e1ba9cea6e3ebae"; }; nativeBuildInputs = [ pkgconfig ] ++ libintlOrEmpty ++ libiconvOrEmpty; diff --git a/pkgs/development/libraries/ccnx/default.nix b/pkgs/development/libraries/ccnx/default.nix new file mode 100644 index 000000000000..01812b7baa91 --- /dev/null +++ b/pkgs/development/libraries/ccnx/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, openssl, expat, libpcap }: +let + version = "0.8.2"; +in +stdenv.mkDerivation { + name = "ccnx-${version}"; + src = fetchurl { + url = "https://github.com/ProjectCCNx/ccnx/archive/ccnx-${version}.tar.gz"; + sha256 = "1jyk7i8529821aassxbvzlxnvl5ly0na1qcn3v1jpxhdd0qqpg00"; + }; + buildInputs = [ openssl expat libpcap ]; + preConfigure = '' + mkdir -p $out/include + mkdir -p $out/lib + mkdir -p $out/bin + substituteInPlace csrc/configure --replace "/usr/local" $out --replace "/usr/bin/env sh" "/bin/sh" + ''; + meta = with stdenv.lib; { + homepage = "http://www.ccnx.org/"; + description = "A Named Data Neworking (NDN) or Content Centric Networking (CCN) abstraction"; + longDescription = '' + To address the Internet’s modern-day requirements with a better + fitting model, PARC has created a new networking architecture + called Content-Centric Networking (CCN), which operates by addressing + and delivering Content Objects directly by Name instead of merely + addressing network end-points. In addition, the CCN security model + explicitly secures individual Content Objects rather than securing + the connection or “pipe”. Named and secured content resides in + distributed caches automatically populated on demand or selectively + pre-populated. When requested by name, CCN delivers named content to + the user from the nearest cache, thereby traversing fewer network hops, + eliminating redundant requests, and consuming less resources overall. + ''; + license = licenses.gpl2; + platforms = stdenv.lib.platforms.unix; + maintainers = [ maintainers.sjmackenzie ]; + }; +} diff --git a/pkgs/development/libraries/ccrtp/default.nix b/pkgs/development/libraries/ccrtp/default.nix index 3e75cb45a733..ade48cb22888 100644 --- a/pkgs/development/libraries/ccrtp/default.nix +++ b/pkgs/development/libraries/ccrtp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, pkgconfig, libgcrypt, ucommon }: stdenv.mkDerivation { - name = "ccrtp-2.0.6"; + name = "ccrtp-2.0.9"; src = fetchurl { - url = mirror://gnu/ccrtp/ccrtp-2.0.6.tar.gz; - sha256 = "06rqwk2w5sikfb3l5bcpxszhq4g7ra840gqx1f011xrmhvclrzir"; + url = mirror://gnu/ccrtp/ccrtp-2.0.9.tar.gz; + sha256 = "1prh2niwa4lzvskk12j4ckr7dv141dfh8yjmpkbhbnv4gmpifci0"; }; buildInputs = [ openssl pkgconfig libgcrypt ]; diff --git a/pkgs/development/libraries/celt/0.5.1.nix b/pkgs/development/libraries/celt/0.5.1.nix index 0f42e7cd0407..a520ffd9c0f3 100644 --- a/pkgs/development/libraries/celt/0.5.1.nix +++ b/pkgs/development/libraries/celt/0.5.1.nix @@ -36,7 +36,8 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "free"; + license = a.lib.licenses.free; + branch = "0.5.1"; }; passthru = { updateInfo = { diff --git a/pkgs/development/libraries/celt/0.7.nix b/pkgs/development/libraries/celt/0.7.nix index 5c5dae866bb8..db4c0821336b 100644 --- a/pkgs/development/libraries/celt/0.7.nix +++ b/pkgs/development/libraries/celt/0.7.nix @@ -1,9 +1,9 @@ x@{builderDefsPackage , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) @@ -27,7 +27,7 @@ rec { /* doConfigure should be removed if not needed */ phaseNames = ["doConfigure" "doMakeInstall"]; - + meta = { description = "CELT - low-delay audio codec"; maintainers = with a.lib.maintainers; @@ -36,7 +36,8 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "free"; + license = a.lib.licenses.free; + branch = "0.7"; }; passthru = { updateInfo = { @@ -44,4 +45,3 @@ rec { }; }; }) x - diff --git a/pkgs/development/libraries/celt/default.nix b/pkgs/development/libraries/celt/default.nix index ca25be905048..03eba5a8d254 100644 --- a/pkgs/development/libraries/celt/default.nix +++ b/pkgs/development/libraries/celt/default.nix @@ -1,9 +1,9 @@ x@{builderDefsPackage , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) @@ -27,7 +27,7 @@ rec { /* doConfigure should be removed if not needed */ phaseNames = ["doConfigure" "doMakeInstall"]; - + meta = { description = "Low-delay audio codec"; maintainers = with a.lib.maintainers; @@ -36,7 +36,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "free"; + license = a.lib.licenses.free; }; passthru = { updateInfo = { @@ -44,4 +44,3 @@ rec { }; }; }) x - diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix index a782ff61e287..5273e88763a8 100644 --- a/pkgs/development/libraries/check/default.nix +++ b/pkgs/development/libraries/check/default.nix @@ -1,12 +1,12 @@ { fetchurl, stdenv }: -let version = "0.9.12"; in +let version = "0.9.14"; in stdenv.mkDerivation { name = "check-${version}"; src = fetchurl { url = "mirror://sourceforge/check/${version}/check-${version}.tar.gz"; - sha256 = "18qybf3s25s1gydp2lwbc4icnmdc6f9sj21fllcwm81kw5apxm67"; + sha256 = "02l4g79d81s07hzywcv1knwj5dyrwjiq2pgxaz7kidxi8m364wn2"; }; # Test can randomly fail: http://hydra.nixos.org/build/7243912 diff --git a/pkgs/development/libraries/cil/default.nix b/pkgs/development/libraries/cil/default.nix deleted file mode 100644 index ecbb0c19412b..000000000000 --- a/pkgs/development/libraries/cil/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{stdenv, fetchurl, ocaml, perl}: stdenv.mkDerivation { - name = "cil-1.3.2"; - src = fetchurl { - url = http://manju.cs.berkeley.edu/cil/distrib/cil-1.3.2.tar.gz; - md5 = "aba80dd700fcb1411598670cc36a9573"; - }; - buildInputs = [ocaml perl]; -} diff --git a/pkgs/development/libraries/clearsilver/default.nix b/pkgs/development/libraries/clearsilver/default.nix index 4095c1ae2f4b..34a26e9da86b 100644 --- a/pkgs/development/libraries/clearsilver/default.nix +++ b/pkgs/development/libraries/clearsilver/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python }: -stdenv.mkDerivation { - name = "clearsilver-0.10.3"; +stdenv.mkDerivation rec { + name = "clearsilver-0.10.5"; src = fetchurl { - url = http://www.clearsilver.net/downloads/clearsilver-0.10.3.tar.gz; - md5 = "ff4104b0e58bca1b61d528edbd902769"; + url = "http://www.clearsilver.net/downloads/${name}.tar.gz"; + sha256 = "1046m1dpq3nkgxbis2dr2x7hynmy51n64465q78d7pdgvqwa178y"; }; builder = ./builder.sh; diff --git a/pkgs/development/libraries/cminpack/default.nix b/pkgs/development/libraries/cminpack/default.nix index c73e95948577..892e32777ea6 100644 --- a/pkgs/development/libraries/cminpack/default.nix +++ b/pkgs/development/libraries/cminpack/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: -stdenv.mkDerivation { - name = "cminpack-1.3.2"; +stdenv.mkDerivation rec { + name = "cminpack-1.3.4"; src = fetchurl { - url = http://devernay.free.fr/hacks/cminpack/cminpack-1.3.2.tar.gz; - sha256 = "09bqr44wqancbdsc39lvhdz7rci3hknmlrrrzv46skvwx6rgk9x0"; + url = "http://devernay.free.fr/hacks/cminpack/${name}.tar.gz"; + sha256 = "1jh3ymxfcy3ykh6gnvds5bbkf38aminvjgc8halck356vkvpnl9v"; }; patchPhase = '' @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { homepage = http://devernay.free.fr/hacks/cminpack/cminpack.html; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; description = "Software for solving nonlinear equations and nonlinear least squares problems"; }; diff --git a/pkgs/development/libraries/cogl/1.18.nix b/pkgs/development/libraries/cogl/1.18.nix index 7aad8ba1b436..f6927770d860 100644 --- a/pkgs/development/libraries/cogl/1.18.nix +++ b/pkgs/development/libraries/cogl/1.18.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, mesa_noglu, glib, gdk_pixbuf, xorg, libintlOrEmpty -, pangoSupport ? true, pango, cairo, gobjectIntrospection, wayland +, pangoSupport ? true, pango, cairo, gobjectIntrospection , gstreamerSupport ? true, gst_all_1 }: let @@ -21,13 +21,11 @@ stdenv.mkDerivation rec { "--enable-gles1" "--enable-gles2" "--enable-kms-egl-platform" - "--enable-wayland-egl-platform" - "--enable-wayland-egl-server" ] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst"; propagatedBuildInputs = with xorg; [ glib gdk_pixbuf gobjectIntrospection - mesa_noglu libXrandr libXfixes libXcomposite libXdamage wayland + mesa_noglu libXrandr libXfixes libXcomposite libXdamage ] ++ libintlOrEmpty ++ stdenv.lib.optionals gstreamerSupport [ gst_all_1.gstreamer diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index 0f1c1dd82e2d..a4a20fce023a 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, mesa_noglu, glib, gdk_pixbuf, xorg, libintlOrEmpty -, pangoSupport ? true, pango, cairo, gobjectIntrospection, wayland +, pangoSupport ? true, pango, cairo, gobjectIntrospection , gstreamerSupport ? true, gst_all_1 }: let @@ -21,13 +21,11 @@ stdenv.mkDerivation rec { "--enable-gles1" "--enable-gles2" "--enable-kms-egl-platform" - "--enable-wayland-egl-platform" - "--enable-wayland-egl-server" ] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst"; propagatedBuildInputs = with xorg; [ glib gdk_pixbuf gobjectIntrospection - mesa_noglu libXrandr libXfixes libXcomposite libXdamage wayland + mesa_noglu libXrandr libXfixes libXcomposite libXdamage ] ++ libintlOrEmpty ++ stdenv.lib.optionals gstreamerSupport [ gst_all_1.gstreamer diff --git a/pkgs/development/libraries/concurrencykit/default.nix b/pkgs/development/libraries/concurrencykit/default.nix index 0e584c0d4993..276f1219444a 100644 --- a/pkgs/development/libraries/concurrencykit/default.nix +++ b/pkgs/development/libraries/concurrencykit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "concurrencykit-${version}"; - version = "0.4.3"; + version = "0.4.4"; src = fetchurl { url = "http://concurrencykit.org/releases/ck-${version}.tar.gz"; - sha256 = "1fjdvbj6wazblg6qy0gdqs3kach2y2p6xrcvssmcvxr0nfyaadg2"; + sha256 = "0m3gzv5l7hw3zwhndjjvwmkhh66lvgnk0mspa2s12r1hlzc91zi3"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/cpp-netlib/default.nix b/pkgs/development/libraries/cpp-netlib/default.nix index 3ce9dc38b3c1..2f088b4d3044 100644 --- a/pkgs/development/libraries/cpp-netlib/default.nix +++ b/pkgs/development/libraries/cpp-netlib/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { md5 = "0765cf203f451394df98e6ddf7bf2541"; }; - buildInputs = [ cmake boost boost.lib openssl ]; + buildInputs = [ cmake boost openssl ]; cmakeFlags = [ "-DCPP-NETLIB_BUILD_SHARED_LIBS=ON" "-DCMAKE_BUILD_TYPE=RELEASE" ]; diff --git a/pkgs/development/libraries/cppnetlib/default.nix b/pkgs/development/libraries/cppnetlib/default.nix index 3eab580c6a89..818e28b0a769 100644 --- a/pkgs/development/libraries/cppnetlib/default.nix +++ b/pkgs/development/libraries/cppnetlib/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://cpp-netlib.github.com/; description = "Provides application layer network support at boost style"; - license = "boost"; + license = stdenv.lib.licenses.boost; }; } diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix new file mode 100644 index 000000000000..a7b70615d932 --- /dev/null +++ b/pkgs/development/libraries/cppzmq/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchgit }: + +stdenv.mkDerivation rec { + name = "cppzmq"; + + src = fetchgit { + url = "https://github.com/zeromq/cppzmq"; + rev = "1f05e0d111197c64be32ad5aecd59f4d1b05a819"; + sha256 = "3a3507fd5646f191088e7a0a7a09846da54b0cac0fcb08f7c4c8d510b484e6da"; + }; + + installPhase = '' + install -Dm644 zmq.hpp $out/include/zmq.hpp + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/zeromq/cppzmq; + license = licenses.bsd2; + description = "C++ binding for 0MQ"; + maintainers = maintainers.abbradar; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix index 3b517d60b27f..c326fb7fd384 100644 --- a/pkgs/development/libraries/crypto++/default.nix +++ b/pkgs/development/libraries/crypto++/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = { description = "Crypto++, a free C++ class library of cryptographic schemes"; homepage = http://cryptopp.com/; - license = "Boost 1.0"; + license = stdenv.lib.licenses.boost; maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index 712f05b8d651..391638548fb7 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, db, gettext, pam }: +{ lib, stdenv, fetchurl, openssl, db, gettext, pam, fixDarwinDylibNames }: stdenv.mkDerivation rec { name = "cyrus-sasl-2.1.26"; @@ -8,7 +8,10 @@ stdenv.mkDerivation rec { sha256 = "1hvvbcsg21nlncbgs0cgn3iwlnb3vannzwsp6rwvnn9ba4v53g4g"; }; - buildInputs = [ openssl db gettext ] ++ stdenv.lib.optional stdenv.isLinux pam; + buildInputs = + [ openssl db gettext ] + ++ lib.optional stdenv.isLinux pam + ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; patches = [ ./missing-size_t.patch ]; # https://bugzilla.redhat.com/show_bug.cgi?id=906519 patchFlags = "-p0"; @@ -22,7 +25,7 @@ stdenv.mkDerivation rec { ) ''; - installFlags = if stdenv.isDarwin then [ "framedir=$(out)/Library/Frameworks/SASL2.framework" ] else null; + installFlags = lib.optional stdenv.isDarwin [ "framedir=$(out)/Library/Frameworks/SASL2.framework" ]; meta = { homepage = "http://cyrusimap.web.cmu.edu/"; diff --git a/pkgs/development/libraries/db/db-4.4.nix b/pkgs/development/libraries/db/db-4.4.nix index 4a182353f25f..757b1f71405b 100644 --- a/pkgs/development/libraries/db/db-4.4.nix +++ b/pkgs/development/libraries/db/db-4.4.nix @@ -4,4 +4,5 @@ import ./generic.nix (args // rec { version = "4.4.20"; extraPatches = [ ./cygwin-4.4.patch ]; sha256 = "0y9vsq8dkarx1mhhip1vaciz6imbbyv37c1dm8b20l7p064bg2i9"; + branch = "4.4"; }) diff --git a/pkgs/development/libraries/db/db-4.5.nix b/pkgs/development/libraries/db/db-4.5.nix index 6a0a921d8de6..b1e4b2c47085 100644 --- a/pkgs/development/libraries/db/db-4.5.nix +++ b/pkgs/development/libraries/db/db-4.5.nix @@ -4,4 +4,5 @@ import ./generic.nix (args // rec { version = "4.5.20"; extraPatches = [ ./cygwin-4.5.patch ./register-race-fix.patch ]; sha256 = "0bd81k0qv5i8w5gbddrvld45xi9k1gvmcrfm0393v0lrm37dab7m"; + branch = "4.5"; }) diff --git a/pkgs/development/libraries/db/db-4.7.nix b/pkgs/development/libraries/db/db-4.7.nix index 62ccfd7d3a56..9a7d586cd042 100644 --- a/pkgs/development/libraries/db/db-4.7.nix +++ b/pkgs/development/libraries/db/db-4.7.nix @@ -3,4 +3,5 @@ import ./generic.nix (args // rec { version = "4.7.25"; sha256 = "0gi667v9cw22c03hddd6xd6374l0pczsd56b7pba25c9sdnxjkzi"; + branch = "4.7"; }) diff --git a/pkgs/development/libraries/db/db-4.8.nix b/pkgs/development/libraries/db/db-4.8.nix index e77307d6fa5a..9b5e8cb39bda 100644 --- a/pkgs/development/libraries/db/db-4.8.nix +++ b/pkgs/development/libraries/db/db-4.8.nix @@ -3,4 +3,5 @@ import ./generic.nix (args // rec { version = "4.8.30"; sha256 = "0ampbl2f0hb1nix195kz1syrqqxpmvnvnfvphambj7xjrl3iljg0"; + branch = "4.8"; }) diff --git a/pkgs/development/libraries/db/db-5.3.nix b/pkgs/development/libraries/db/db-5.3.nix index af16f1ddf549..b5e62ee686f0 100644 --- a/pkgs/development/libraries/db/db-5.3.nix +++ b/pkgs/development/libraries/db/db-5.3.nix @@ -3,4 +3,6 @@ import ./generic.nix (args // rec { version = "5.3.28"; sha256 = "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0"; + extraPatches = [ ./osx.patch ]; + branch = "5.3"; }) diff --git a/pkgs/development/libraries/db/db-6.0.nix b/pkgs/development/libraries/db/db-6.0.nix index 22e858a9d180..716cad9ab074 100644 --- a/pkgs/development/libraries/db/db-6.0.nix +++ b/pkgs/development/libraries/db/db-6.0.nix @@ -4,4 +4,5 @@ import ./generic.nix (args // rec { version = "6.0.20"; sha256 = "00r2aaglq625y8r9xd5vw2y070plp88f1mb2gbq3kqsl7128lsl0"; license = stdenv.lib.licenses.agpl3; + branch = "6.0"; }) diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix index 6217bc461249..013a7fd35b9d 100644 --- a/pkgs/development/libraries/db/generic.nix +++ b/pkgs/development/libraries/db/generic.nix @@ -6,6 +6,7 @@ , version, sha256 , extraPatches ? [ ] , license ? stdenv.lib.licenses.sleepycat +, branch ? null }: stdenv.mkDerivation rec { @@ -37,5 +38,6 @@ stdenv.mkDerivation rec { description = "Berkeley DB"; license = license; platforms = platforms.unix; + branch = branch; }; } diff --git a/pkgs/development/libraries/db/osx.patch b/pkgs/development/libraries/db/osx.patch new file mode 100644 index 000000000000..438fa7eedd71 --- /dev/null +++ b/pkgs/development/libraries/db/osx.patch @@ -0,0 +1,20 @@ +--- a/src/dbinc/atomic.h 2013-03-12 14:07:22.000000000 -0400 ++++ b/src/dbinc/atomic.h.change 2013-03-12 14:06:35.000000000 -0400 +@@ -144,7 +144,7 @@ + #define atomic_inc(env, p) __atomic_inc(p) + #define atomic_dec(env, p) __atomic_dec(p) + #define atomic_compare_exchange(env, p, o, n) \ +- __atomic_compare_exchange((p), (o), (n)) ++ __atomic_compare_exchange_db((p), (o), (n)) + static inline int __atomic_inc(db_atomic_t *p) + { + int temp; +@@ -176,7 +176,7 @@ + * http://gcc.gnu.org/onlinedocs/gcc-4.1.0/gcc/Atomic-Builtins.html + * which configure could be changed to use. + */ +-static inline int __atomic_compare_exchange( ++static inline int __atomic_compare_exchange_db( + db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval) + { + atomic_value_t was; diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix index 9c774e802fc1..80afcb343ddd 100644 --- a/pkgs/development/libraries/dbus-glib/default.nix +++ b/pkgs/development/libraries/dbus-glib/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://dbus.freedesktop.org; - license = "AFL-2.1 or GPL-2"; + license = with stdenv.lib.licenses; [ afl21 gpl2 ]; description = "Obsolete glib bindings for D-Bus lightweight IPC mechanism"; maintainers = [ stdenv.lib.maintainers.urkud ]; }; diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index a4505c5ae544..31e271277841 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.6"; - sha256 = "0gyjxd0gfpjs3fq5bx6aljb5f3zxky5zsq0yfqr9ywbv03587vgd"; + version = "1.8.10"; + sha256 = "13mgvwigm931r8n9363imnn0vn6dvc0m322k3p8fs5c8nvyqggqh"; inherit (stdenv) lib; diff --git a/pkgs/development/libraries/dclib/default.nix b/pkgs/development/libraries/dclib/default.nix index a00fbff50b9e..fb290cbcbeba 100644 --- a/pkgs/development/libraries/dclib/default.nix +++ b/pkgs/development/libraries/dclib/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { src = fetchurl { url = ftp://ftp.debian.nl/pub/freebsd/ports/distfiles/dclib-0.3.7.tar.bz2; - md5 = "d35833414534bcac8ce2c8a62ce903a4"; + sha256 = "02jdzm5hqzs1dv2rd596vgpcjaapm55pqqapz5m94l30v4q72rfc"; }; buildInputs = [libxml2 openssl bzip2]; diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix new file mode 100644 index 000000000000..0d262fb061e2 --- /dev/null +++ b/pkgs/development/libraries/dlib/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, cmake, x11 }: + +stdenv.mkDerivation rec { + version = "18.10"; + name = "dlib-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/dclib/dlib/${name}.tar.bz2"; + sha256 = "1g3v13azc29m5r7zqs3x0g731hny6spb66cxnra7f167z31ka3s7"; + }; + + # The supplied CMakeLists.txt does not have any install targets. + sources_var = "\$\{sources\}"; + headers_var = "\$\{hearders\}"; + preConfigure = '' + cat << EOF > CMakeLists.txt + cmake_minimum_required(VERSION 2.6 FATAL_ERROR) + project(dlib) + + include_directories(./) + + file(GLOB sources ./dlib/all/*.cpp) + file(GLOB headers ./dlib/*.h) + + SET(LIBRARY_OUTPUT_PATH ".") + add_library(dlib "SHARED" dlib/all/source.cpp ${sources_var} ${headers_var}) + + install(TARGETS dlib DESTINATION lib) + install(DIRECTORY dlib/ DESTINATION include/dlib FILES_MATCHING PATTERN "*.h") + EOF + ''; + + enableParallelBuilding = true; + buildInputs = [ cmake x11 ]; + propagatedBuildInputs = [ x11 ]; + + meta = with stdenv.lib; { + description = "A general purpose cross-platform C++ machine learning library"; + homepage = http://www.dlib.net; + license = stdenv.lib.licenses.boost; + maintainers = with maintainers; [ christopherpoole ]; + platforms = stdenv.lib.platforms.all; + }; +} + diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/development/libraries/double-conversion/default.nix new file mode 100644 index 000000000000..c43942a5f645 --- /dev/null +++ b/pkgs/development/libraries/double-conversion/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, cmake }: + +stdenv.mkDerivation rec { + name = "double-conversion-1.1.5"; + + src = fetchurl { + url = "https://double-conversion.googlecode.com/files/${name}.tar.gz"; + sha256 = "0hnlyn9r8vd9b3dafnk01ykz4k7bk6xvmvslv93as1cswf7vdvqv"; + }; + + unpackPhase = '' + mkdir $name + cd $name + tar xzf $src + ''; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Binary-decimal and decimal-binary routines for IEEE doubles"; + homepage = https://code.google.com/p/double-conversion/; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = maintainers.abbradar; + }; +} diff --git a/pkgs/development/libraries/eigen/2.0.nix b/pkgs/development/libraries/eigen/2.0.nix index 6317dfe5887d..4ea9f068d39e 100644 --- a/pkgs/development/libraries/eigen/2.0.nix +++ b/pkgs/development/libraries/eigen/2.0.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation { license = licenses.lgpl3Plus; homepage = http://eigen.tuxfamily.org ; maintainers = with stdenv.lib.maintainers; [ sander urkud raskin ]; + branch = "2"; }; } diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/development/libraries/exempi/default.nix index 4fb184f8d605..e941f0f65476 100644 --- a/pkgs/development/libraries/exempi/default.nix +++ b/pkgs/development/libraries/exempi/default.nix @@ -8,9 +8,9 @@ stdenv.mkDerivation rec { sha256 = "01vcd1mfn2s0iiq2cjyzgvnxx6kcq9cwra1iipijhs0vwvjx0yhf"; }; - configureFlags = [ "--with-boost=${boost}" ]; + configureFlags = [ "--with-boost=${boost.dev}" ]; - buildInputs = [ expat zlib boost boost.lib ]; + buildInputs = [ expat zlib boost ]; meta = with stdenv.lib; { homepage = http://libopenraw.freedesktop.org/wiki/Exempi/; diff --git a/pkgs/development/libraries/faac/default.nix b/pkgs/development/libraries/faac/default.nix index 2c4f8da77835..a058fb9cfa21 100644 --- a/pkgs/development/libraries/faac/default.nix +++ b/pkgs/development/libraries/faac/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { homepage = http://www.audiocoding.com/faac.html; # Incompatible with GPL. Some changes to the base code, included in faac, # are under LGPL though. - license = "unfree-redistributable"; + license = stdenv.lib.licenses.unfreeRedistributable; }; } diff --git a/pkgs/development/libraries/ffmpeg/1.x.nix b/pkgs/development/libraries/ffmpeg/1.x.nix index 1dadf1be1276..ae64135a4c3b 100644 --- a/pkgs/development/libraries/ffmpeg/1.x.nix +++ b/pkgs/development/libraries/ffmpeg/1.x.nix @@ -31,11 +31,12 @@ assert playSupport -> SDL != null; assert freetypeSupport -> freetype != null; stdenv.mkDerivation rec { - name = "ffmpeg-1.2.8"; + version = "1.2.10"; + name = "ffmpeg-${version}"; src = fetchurl { url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; - sha256 = "0n9fklr8zqkd60dc5ai161l6k4dbiac5hqy0pi1w82yamc25k6s2"; + sha256 = "02wdxr55a68rjxbyrsxczp55z2qmspw8cfa0yd55x3dv82657hnj"; }; # `--enable-gpl' (as well as the `postproc' and `swscale') mean that @@ -100,7 +101,9 @@ stdenv.mkDerivation rec { 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.x.nix b/pkgs/development/libraries/ffmpeg/2.x.nix index 4bd10216e6b5..bdd4b0392b9a 100644 --- a/pkgs/development/libraries/ffmpeg/2.x.nix +++ b/pkgs/development/libraries/ffmpeg/2.x.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "2.4.1"; + version = "2.4.4"; name = "ffmpeg-${version}"; src = fetchurl { url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; - sha256 = "1wy7hdkaijsr6cbvgq5gkjdb0rd3m6583b8d68hlmsj15k7czbml"; + sha256 = "1z2a940fjryabwqzg5pw5k1r7ivkqdch4p2wbihb5f0z43043l4s"; }; subtitleSupport = config.ffmpeg.subtitle or true; diff --git a/pkgs/development/libraries/flite/default.nix b/pkgs/development/libraries/flite/default.nix index 5b1dc6fc0a41..bf690c020cb5 100644 --- a/pkgs/development/libraries/flite/default.nix +++ b/pkgs/development/libraries/flite/default.nix @@ -17,8 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "A small, fast run-time speech synthesis engine"; homepage = http://www.festvox.org/flite/; - license = "free-non-copyleft"; + license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.linux; }; } - diff --git a/pkgs/development/libraries/folly/105.patch b/pkgs/development/libraries/folly/105.patch new file mode 100644 index 000000000000..bfc92b39ae39 --- /dev/null +++ b/pkgs/development/libraries/folly/105.patch @@ -0,0 +1,22 @@ +From 30b8bb70e0fdcc0b85abbfebf43ed9f127db5248 Mon Sep 17 00:00:00 2001 +From: Johnny Robeson <johnny@localmomentum.net> +Date: Mon, 1 Dec 2014 23:26:27 -0500 +Subject: [PATCH] include gflags header in SSLSessionCacheManager + +this is one way to solve #104 +--- + folly/experimental/wangle/ssl/SSLSessionCacheManager.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/folly/experimental/wangle/ssl/SSLSessionCacheManager.cpp b/folly/experimental/wangle/ssl/SSLSessionCacheManager.cpp +index fc339a1..ca18242 100644 +--- folly/experimental/wangle/ssl/SSLSessionCacheManager.cpp ++++ folly/experimental/wangle/ssl/SSLSessionCacheManager.cpp +@@ -7,6 +7,7 @@ + * of patent rights can be found in the PATENTS file in the same directory. + * + */ ++#include <gflags/gflags.h> + #include <folly/experimental/wangle/ssl/SSLSessionCacheManager.h> + + #include <folly/experimental/wangle/ssl/SSLCacheProvider.h> diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix new file mode 100644 index 000000000000..27c7b6738050 --- /dev/null +++ b/pkgs/development/libraries/folly/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchgit, autoreconfHook, boost, libevent, double_conversion, glog +, google-gflags, python, libiberty, openssl }: + +stdenv.mkDerivation rec { + name = "folly-17"; + + src = fetchgit { + url = "https://github.com/facebook/folly"; + rev = "2c2d5777cd2551397a920007589fd3adba6cb7ab"; + sha256 = "13mfnv04ckkr2syigaaxrbaxmfiwqvn0a7fjxvdi6dii3fx81rsx"; + }; + + patches = [ ./105.patch ]; + + buildInputs = [ libiberty boost.lib libevent double_conversion glog google-gflags openssl ]; + + nativeBuildInputs = [ autoreconfHook python boost ]; + + postUnpack = "sourceRoot=\${sourceRoot}/folly"; + preBuild = '' + patchShebangs build + ''; + + configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A YAML parser and emitter for C++"; + homepage = https://code.google.com/p/yaml-cpp/; + license = licenses.mit; + platforms = platforms.unix; + maintainers = maintainers.abbradar; + }; +} diff --git a/pkgs/development/libraries/fontconfig/2.10.nix b/pkgs/development/libraries/fontconfig/2.10.nix new file mode 100644 index 000000000000..2951dbb44d4f --- /dev/null +++ b/pkgs/development/libraries/fontconfig/2.10.nix @@ -0,0 +1,61 @@ +{ stdenv, fetchurl, pkgconfig, freetype, expat }: + +stdenv.mkDerivation rec { + name = "fontconfig-2.10.2"; + + src = fetchurl { + url = "http://fontconfig.org/release/${name}.tar.bz2"; + sha256 = "0llraqw86jmw4vzv7inskp3xxm2gc64my08iwq5mzncgfdbfza4f"; + }; + + infinality_patch = + let subvers = "1"; + in fetchurl { + url = http://www.infinality.net/fedora/linux/zips/fontconfig-infinality-1-20130104_1.tar.bz2; + sha256 = "1fm5xx0mx2243jrq5rxk4v0ajw2nawpj23399h710bx6hd1rviq7"; + } + ; + + propagatedBuildInputs = [ freetype ]; + buildInputs = [ pkgconfig expat ]; + + configureFlags = [ + "--sysconfdir=/etc" + "--with-cache-dir=/var/cache/fontconfig" + "--disable-docs" + "--with-default-fonts=" + ]; + + # We should find a better way to access the arch reliably. + crossArch = stdenv.cross.arch or null; + + preConfigure = '' + if test -n "$crossConfig"; then + configureFlags="$configureFlags --with-arch=$crossArch"; + fi + ''; + + enableParallelBuilding = true; + + doCheck = true; + + # Don't try to write to /var/cache/fontconfig at install time. + installFlags = "sysconfdir=$(out)/etc fc_cachedir=$(TMPDIR)/dummy RUN_FC_CACHE_TEST=false"; + + postInstall = '' + cd "$out/etc/fonts" && tar xvf ${infinality_patch} + ''; + + passthru = { + # Empty for backward compatibility, there was no versioning before 2.11 + configVersion = ""; + }; + + meta = with stdenv.lib; { + description = "A library for font customization and configuration"; + homepage = http://fontconfig.org/; + license = licenses.bsd2; # custom but very bsd-like + platforms = platforms.all; + maintainers = [ maintainers.vcunat ]; + }; +} diff --git a/pkgs/development/libraries/fontconfig/builder.sh b/pkgs/development/libraries/fontconfig/builder.sh deleted file mode 100644 index d755bca64e32..000000000000 --- a/pkgs/development/libraries/fontconfig/builder.sh +++ /dev/null @@ -1,5 +0,0 @@ -source $stdenv/setup - -configureFlags="--with-confdir=$out/etc/fonts --disable-docs" - -genericBuild diff --git a/pkgs/development/libraries/fontconfig/config-compat.patch b/pkgs/development/libraries/fontconfig/config-compat.patch new file mode 100644 index 000000000000..e86f08fb553c --- /dev/null +++ b/pkgs/development/libraries/fontconfig/config-compat.patch @@ -0,0 +1,28 @@ +commit 05c6adf8104b4321d3a3716a7b9feb6bf223ed0c (HEAD, nixpkgs) +Author: Vladimír Čunát <vcunat@gmail.com> +Date: Tue Nov 4 12:24:25 2014 +0100 + + add check for /etc/fonts/@configVersion@/fonts.conf + + It's checked between FONTCONFIG_FILE and the usual /etc/fonts/fonts.conf. + Also, hardcode /etc/fonts/fonts.conf to prevent accidental override. + +diff --git a/src/fccfg.c b/src/fccfg.c +index 6377fd7..e9eb10a 100644 +--- a/src/fccfg.c ++++ b/src/fccfg.c +@@ -2070,8 +2070,13 @@ FcConfigFilename (const FcChar8 *url) + if (!url || !*url) + { + url = (FcChar8 *) getenv ("FONTCONFIG_FILE"); ++ if (!url) { ++ static const FcChar8 *cfPath = "/etc/fonts/@configVersion@/fonts.conf"; ++ if (access (cfPath, R_OK) == 0) ++ url = cfPath; ++ } + if (!url) +- url = (FcChar8 *) FONTCONFIG_FILE; ++ url = (FcChar8 *) "/etc/fonts/fonts.conf"; + } + file = 0; + diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index f0c4da755673..d659c30083dd 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -1,11 +1,26 @@ -{ stdenv, fetchurl, pkgconfig, freetype, expat }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, freetype, expat, libxslt, fontbhttf +, substituteAll }: +/** Font configuration scheme + - ./config-compat.patch makes fontconfig try the following root configs, in order: + $FONTCONFIG_FILE, /etc/fonts/${configVersion}/fonts.conf, /etc/fonts/fonts.conf + This is done not to override config of pre-2.11 versions (which just blow up) + and still use *global* font configuration at both NixOS or non-NixOS. + - NixOS creates /etc/fonts/${configVersion}/fonts.conf link to $out/etc/fonts/fonts.conf, + and other modifications should go to /etc/fonts/${configVersion}/conf.d + - See ./make-fonts-conf.xsl for config details. + +*/ + +let + configVersion = "2.11"; # bump whenever fontconfig breaks compatibility with older configurations +in stdenv.mkDerivation rec { - name = "fontconfig-2.10.2"; + name = "fontconfig-2.11.1"; src = fetchurl { url = "http://fontconfig.org/release/${name}.tar.bz2"; - sha256 = "0llraqw86jmw4vzv7inskp3xxm2gc64my08iwq5mzncgfdbfza4f"; + sha256 = "16baa4g5lswkyjlyf1h5lwc0zjap7c4d8grw79349a5w6dsl8qnw"; }; infinality_patch = @@ -16,14 +31,27 @@ stdenv.mkDerivation rec { } ; + patches = [ + (fetchpatch ({ + url = "http://cgit.freedesktop.org/fontconfig/patch/?id=f44157c809d280e2a0ce87fb078fc4b278d24a67"; + sha256 = "19s5irclg4irj2yxd7xw9yikbazs9263px8qbv4r21asw06nfalv"; + name = "fc-cache-bug-77252.patch"; + } + )) + (substituteAll { + src = ./config-compat.patch; + inherit configVersion; + }) + ]; + propagatedBuildInputs = [ freetype ]; buildInputs = [ pkgconfig expat ]; configureFlags = [ - "--sysconfdir=/etc" - "--with-cache-dir=/var/cache/fontconfig" + "--with-cache-dir=/var/cache/fontconfig" # otherwise the fallback is in $out/ "--disable-docs" - "--with-default-fonts=" + # just ~1MB; this is what you get when loading config fails for some reason + "--with-default-fonts=${fontbhttf}" ]; # We should find a better way to access the arch reliably. @@ -40,12 +68,24 @@ stdenv.mkDerivation rec { doCheck = true; # Don't try to write to /var/cache/fontconfig at install time. - installFlags = "sysconfdir=$(out)/etc fc_cachedir=$(TMPDIR)/dummy RUN_FC_CACHE_TEST=false"; + installFlags = "fc_cachedir=$(TMPDIR)/dummy RUN_FC_CACHE_TEST=false"; postInstall = '' cd "$out/etc/fonts" && tar xvf ${infinality_patch} + rm conf.d/{50-user,51-local}.conf + "${libxslt}/bin/xsltproc" --stringparam fontDirectories "${fontbhttf}" \ + --stringparam fontconfig "$out" \ + --stringparam fontconfigConfigVersion "${configVersion}" \ + --path $out/share/xml/fontconfig \ + ${./make-fonts-conf.xsl} $out/etc/fonts/fonts.conf \ + > fonts.conf.tmp + mv fonts.conf.tmp $out/etc/fonts/fonts.conf ''; + passthru = { + inherit configVersion; + }; + meta = with stdenv.lib; { description = "A library for font customization and configuration"; homepage = http://fontconfig.org/; @@ -54,3 +94,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.vcunat ]; }; } + diff --git a/pkgs/development/libraries/fontconfig/make-fonts-conf.nix b/pkgs/development/libraries/fontconfig/make-fonts-conf.nix index f9cd096f559b..2b02e0df7a04 100644 --- a/pkgs/development/libraries/fontconfig/make-fonts-conf.nix +++ b/pkgs/development/libraries/fontconfig/make-fonts-conf.nix @@ -1,13 +1,15 @@ -{ runCommand, libxslt, fontconfig, fontDirectories }: +{ runCommand, libxslt, fontconfig, fontbhttf, fontDirectories }: runCommand "fonts.conf" { buildInputs = [ libxslt fontconfig ]; - inherit fontDirectories; + # Add a default font for non-nixos systems. fontbhttf is only about 1mb. + fontDirectories = fontDirectories ++ [ fontbhttf ]; } '' xsltproc --stringparam fontDirectories "$fontDirectories" \ --stringparam fontconfig "${fontconfig}" \ + --stringparam fontconfigConfigVersion "${fontconfig.configVersion}" \ --path ${fontconfig}/share/xml/fontconfig \ ${./make-fonts-conf.xsl} ${fontconfig}/etc/fonts/fonts.conf \ > $out diff --git a/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl b/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl index e3938663c9b4..03f7815e38ad 100644 --- a/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl +++ b/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl @@ -16,25 +16,37 @@ <xsl:param name="fontDirectories" /> <xsl:param name="fontconfig" /> + <xsl:param name="fontconfigConfigVersion" /> <xsl:template match="/fontconfig"> <fontconfig> <xsl:apply-templates select="child::node()[name() != 'dir' and name() != 'cachedir' and name() != 'include']" /> - <include ignore_missing="yes">/etc/fonts/conf.d</include> + <!-- fontconfig distribution conf.d --> <include><xsl:value-of select="$fontconfig" />/etc/fonts/conf.d</include> - + <!-- versioned system-wide config --> + <include ignore_missing="yes">/etc/fonts/<xsl:value-of select="$fontconfigConfigVersion" />/conf.d</include> + <!-- look into user config --> + <include prefix="xdg" ignore_missing="yes">fontconfig/conf.d</include> + + <!-- the first cachedir will be used to store the cache --> + <cachedir prefix="xdg">fontconfig</cachedir> + <!-- /var/cache/fontconfig is useful for non-nixos systems --> <cachedir>/var/cache/fontconfig</cachedir> - <cachedir>~/.fontconfig</cachedir> + <dir prefix="xdg">fonts</dir> <xsl:for-each select="str:tokenize($fontDirectories)"> <dir><xsl:value-of select="." /></dir> <xsl:text>
</xsl:text> </xsl:for-each> - <dir prefix="xdg">fonts</dir> - <!-- the following element will be removed in the future --> - <dir>~/.fonts</dir> + + <!-- nix user profile --> + <dir>~/.nix-profile/lib/X11/fonts</dir> + <dir>~/.nix-profile/share/fonts</dir> + <!-- nix default profile --> + <dir>/nix/var/nix/profiles/default/lib/X11/fonts</dir> + <dir>/nix/var/nix/profiles/default/share/fonts</dir> </fontconfig> diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix index 6d7d7a838790..dfd2c75184ee 100644 --- a/pkgs/development/libraries/fox/default.nix +++ b/pkgs/development/libraries/fox/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "ftp://ftp.fox-toolkit.org/pub/${name}.tar.gz"; - md5 = "b5897e9c664967f5042e57070037ff18"; + sha256 = "1jb9368xsin3ppdf6979n5s7in3s9klbxqbwcp0z8misjixl7nzg"; }; buildInputs = [ libpng x11 libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ]; diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix index 2fe104e849fd..604fe3c2fdf0 100644 --- a/pkgs/development/libraries/fox/fox-1.6.nix +++ b/pkgs/development/libraries/fox/fox-1.6.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { + branch = "1.6"; description = "FOX is a C++ based class library for building Graphical User Interfaces"; longDescription = '' FOX stands for Free Objects for X. diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index 547e9e813be1..3980c5b61b31 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl +, odbcSupport ? false, unixODBC ? null }: + +assert odbcSupport -> unixODBC != null; stdenv.mkDerivation { name = "freetds-0.91"; @@ -8,6 +11,10 @@ stdenv.mkDerivation { sha256 = "0r946axzxs0czsmr7283w7vmk5jx3jnxxc32d2ncxsrsh2yli0ba"; }; + buildInputs = stdenv.lib.optional odbcSupport [ unixODBC ]; + + configureFlags = stdenv.lib.optionalString odbcSupport "--with-odbc=${unixODBC}"; + doDist = true; distPhase = '' diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix new file mode 100644 index 000000000000..4663f7aac224 --- /dev/null +++ b/pkgs/development/libraries/gdcm/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, cmake }: + +stdenv.mkDerivation rec { + version = "2.4.4"; + name = "gdcm-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/gdcm/${name}.tar.bz2"; + sha256 = "07svgp7c928sw712gq6rx4h0c6wp2kr1n8fmxjlzb031l51jzkf5"; + }; + + dontUseCmakeBuildDir = true; + preConfigure = '' + cmakeDir=$PWD + mkdir ../build + cd ../build + ''; + + cmakeFlags = '' + -DGDCM_BUILD_APPLICATIONS=ON + -DGDCM_BUILD_SHARED_LIBS=ON + ''; + + enableParallelBuilding = true; + buildInputs = [ cmake ]; + propagatedBuildInputs = [ ]; + + meta = { + description = "The grassroots cross-platform DICOM implementation"; + longDescription = '' + Grassroots DICOM (GDCM) is an implementation of the DICOM standard designed to be open source so that researchers may access clinical data directly. + GDCM includes a file format definition and a network communications protocol, both of which should be extended to provide a full set of tools for a researcher or small medical imaging vendor to interface with an existing medical database. + ''; + homepage = http://gdcm.sourceforge.net/; + platforms = stdenv.lib.platforms.all; + }; +} + diff --git a/pkgs/development/libraries/gegl/0_0_22.nix b/pkgs/development/libraries/gegl/0_0_22.nix deleted file mode 100644 index 3f9a619ff6a1..000000000000 --- a/pkgs/development/libraries/gegl/0_0_22.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, babl_0_0_22, libpng, cairo, libjpeg -, librsvg, pango, gtk }: - -stdenv.mkDerivation { - name = "gegl-0.0.22"; - - src = fetchurl { - url = ftp://ftp.gimp.org/pub/gegl/0.0/gegl-0.0.22.tar.bz2; - sha256 = "0nx6r9amzhw5d2ghlw3z8qnry18rwz1ymvl2cm31b8p49z436wl5"; - }; - - configureFlags = "--disable-docs"; # needs fonts otherwise don't know how to pass them - - buildInputs = [ pkgconfig glib babl_0_0_22 libpng cairo libjpeg librsvg pango gtk ]; - - meta = { - description = "Graph-based image processing framework"; - homepage = http://www.gegl.org; - license = stdenv.lib.licenses.gpl3; - }; -} diff --git a/pkgs/development/libraries/geoclue/2.0.nix b/pkgs/development/libraries/geoclue/2.0.nix index 5ab9cb62443d..88d9837d5975 100644 --- a/pkgs/development/libraries/geoclue/2.0.nix +++ b/pkgs/development/libraries/geoclue/2.0.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "geoclue-2.1.9"; + name = "geoclue-2.1.10"; src = fetchurl { url = "http://www.freedesktop.org/software/geoclue/releases/2.1/${name}.tar.xz"; - sha256 = "0aq9fqlvvc8jqbshp3mbcc1j5hq4fzjy8hd1yxcl6xrd0jkfw5ml"; + sha256 = "0s0ws2bx5g1cbjamxmm448r4n4crha2fwpzm8zbx6cq6qslygmzi"; }; buildInputs = diff --git a/pkgs/development/libraries/geoip/default.nix b/pkgs/development/libraries/geoip/default.nix index 2b4c291f7f59..99a566cf1955 100644 --- a/pkgs/development/libraries/geoip/default.nix +++ b/pkgs/development/libraries/geoip/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -let version = "1.6.0"; in +let version = "1.6.2"; in stdenv.mkDerivation { name = "geoip-${version}"; @@ -15,5 +15,7 @@ stdenv.mkDerivation { maintainers = [ stdenv.lib.maintainers.raskin ]; license = stdenv.lib.licenses.lgpl21; platforms = stdenv.lib.platforms.unix; + homepage = "http://geolite.maxmind.com/"; + downloadPage = "http://geolite.maxmind.com/download/"; }; } diff --git a/pkgs/development/libraries/getdata/default.nix b/pkgs/development/libraries/getdata/default.nix new file mode 100644 index 000000000000..93ecb7c05e6b --- /dev/null +++ b/pkgs/development/libraries/getdata/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl }: +stdenv.mkDerivation rec { + name = "getdata-0.8.5"; + src = fetchurl { + url = "mirror://sourceforge/getdata/${name}.tar.bz2"; + sha256 = "0km6hbv18m9g8fxdqfcmk3bjr47w856v4hbrxpd609m6rk0j40zf"; + }; + + meta = with stdenv.lib; { + description = "Reference implementation of the Dirfile Standards"; + license = licenses.lgpl21Plus; + platforms = platforms.all; + maintainers = [ maintainers.vbgl ]; + homepage = http://getdata.sourceforge.net/; + }; +} diff --git a/pkgs/development/libraries/giflib/5.0.nix b/pkgs/development/libraries/giflib/5.0.nix index 4dc8132805c4..49e3fc40ba66 100644 --- a/pkgs/development/libraries/giflib/5.0.nix +++ b/pkgs/development/libraries/giflib/5.0.nix @@ -1,12 +1,18 @@ {stdenv, fetchurl, xmlto, docbook_xml_dtd_412, docbook_xsl, libxml2 }: stdenv.mkDerivation { - name = "giflib-5.0.5"; + name = "giflib-5.0.6"; src = fetchurl { - url = mirror://sourceforge/giflib/giflib-5.0.5.tar.bz2; - sha256 = "02c6pwll9pzw5fhg5gccx2ws56d70ylfryk21nv5lqhwdcv8lvb0"; + url = mirror://sourceforge/giflib/giflib-5.0.6.tar.bz2; + sha256 = "1sk9ysh27nabwb6z7a38n8gy2y2rnl3vjkbapv7pbjnzrff862c9"; }; buildInputs = [ xmlto docbook_xml_dtd_412 docbook_xsl libxml2 ]; + meta = { + description = "giflib is a library for reading and writing gif images"; + platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; + branch = "5.0"; + }; } - diff --git a/pkgs/development/libraries/giflib/5.1.nix b/pkgs/development/libraries/giflib/5.1.nix index 3ff71255b851..dcd52fc93f46 100644 --- a/pkgs/development/libraries/giflib/5.1.nix +++ b/pkgs/development/libraries/giflib/5.1.nix @@ -13,5 +13,6 @@ stdenv.mkDerivation { platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; + branch = "5.1"; }; } diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index 7cab317380e8..7ddbc408ca6d 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/pkgs/development/libraries/git2/default.nix @@ -1,19 +1,19 @@ -{stdenv, fetchurl, cmake, zlib, python}: +{stdenv, fetchurl, cmake, zlib, python, libssh2, openssl, http-parser}: stdenv.mkDerivation rec { - version = "0.21.1"; + version = "0.21.2"; name = "libgit2-${version}"; src = fetchurl { name = "${name}.tar.gz"; url = "https://github.com/libgit2/libgit2/tarball/v${version}"; - sha256 = "0afbvcsryg7bsmbfj23l09b1xngkmqhf043njl8wm44qslrxibkz"; + sha256 = "0icf119lhha96rk8m6s38sczjr0idr7yczw6knby61m81a25a96y"; }; cmakeFlags = "-DTHREADSAFE=ON"; nativeBuildInputs = [ cmake python ]; - buildInputs = [ zlib ]; + buildInputs = [ zlib libssh2 openssl http-parser ]; meta = { description = "the Git linkable library"; diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 839ba7cfa951..4df07c8f6b86 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -39,8 +39,8 @@ let ln -sr -t "$out/include/" "$out"/lib/*/include/* 2>/dev/null || true ''; - ver_maj = "2.40"; - ver_min = "0"; + ver_maj = "2.42"; + ver_min = "1"; in stdenv.mkDerivation rec { @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz"; - sha256 = "1d98mbqjmc34s8095lkw1j1bwvnnkw9581yfvjaikjvfjsaz29qd"; + sha256 = "16pqvikrps1fvwwqvk0qi4a13mfg7gw6w5qfhk7bhi8f51jhhgwg"; }; patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch; @@ -77,6 +77,7 @@ stdenv.mkDerivation rec { ''; enableParallelBuilding = true; + DETERMINISTIC_BUILD = 1; inherit doCheck; preCheck = optionalString doCheck diff --git a/pkgs/development/libraries/glibc/2.19/common.nix b/pkgs/development/libraries/glibc/2.19/common.nix index a828148c3d5f..23efc01a3975 100644 --- a/pkgs/development/libraries/glibc/2.19/common.nix +++ b/pkgs/development/libraries/glibc/2.19/common.nix @@ -61,17 +61,28 @@ stdenv.mkDerivation ({ ./cve-2014-0475.patch ./cve-2014-5119.patch + + /* Remove references to the compilation date. */ + ./glibc-remove-date-from-compilation-banner.patch ]; - postPatch = '' + postPatch = # Needed for glibc to build with the gnumake 3.82 # http://comments.gmane.org/gmane.linux.lfs.support/31227 - sed -i 's/ot \$/ot:\n\ttouch $@\n$/' manual/Makefile - + '' + sed -i 's/ot \$/ot:\n\ttouch $@\n$/' manual/Makefile + '' # nscd needs libgcc, and we don't want it dynamically linked # because we don't want it to depend on bootstrap-tools libs. - echo "LDFLAGS-nscd += -static-libgcc" >> nscd/Makefile - ''; + + '' + echo "LDFLAGS-nscd += -static-libgcc" >> nscd/Makefile + '' + # Replace the date and time in nscd by $out. + # It is used as a protocol compatibility check. + + '' + cat ${./glibc-remove-datetime-from-nscd.patch} \ + | sed "s,@out@,$out," | patch -p1 + ''; configureFlags = [ "-C" diff --git a/pkgs/development/libraries/glibc/2.19/glibc-remove-date-from-compilation-banner.patch b/pkgs/development/libraries/glibc/2.19/glibc-remove-date-from-compilation-banner.patch new file mode 100644 index 000000000000..5d0b1a51762e --- /dev/null +++ b/pkgs/development/libraries/glibc/2.19/glibc-remove-date-from-compilation-banner.patch @@ -0,0 +1,12 @@ +diff -ur glibc-2.17.orig/csu/Makefile glibc-2.17/csu/Makefile +--- glibc-2.17.orig/csu/Makefile 2012-12-25 04:02:13.000000000 +0100 ++++ glibc-2.17/csu/Makefile 2013-08-19 16:01:57.132378550 +0200 +@@ -172,7 +172,7 @@ + os=Linux; \ + fi; \ + printf '"Compiled on a %s %s system on %s.\\n"\n' \ +- "$$os" "$$version" "`date +%Y-%m-%d`";; \ ++ "$$os" "$$version";; \ + *) ;; \ + esac; \ + files="$(all-Banner-files)"; \ diff --git a/pkgs/development/libraries/glibc/2.19/glibc-remove-datetime-from-nscd.patch b/pkgs/development/libraries/glibc/2.19/glibc-remove-datetime-from-nscd.patch new file mode 100644 index 000000000000..0a5456ea5c42 --- /dev/null +++ b/pkgs/development/libraries/glibc/2.19/glibc-remove-datetime-from-nscd.patch @@ -0,0 +1,11 @@ +--- a/nscd/nscd_stat.c ++++ b/nscd/nscd_stat.c +@@ -37,7 +37,7 @@ + + + /* We use this to make sure the receiver is the same. */ +-static const char compilation[21] = __DATE__ " " __TIME__; ++static const char compilation[21] = "@out@"; + + /* Statistic data for one database. */ + struct dbstat diff --git a/pkgs/development/libraries/glm/default.nix b/pkgs/development/libraries/glm/default.nix index 010a2aee88e2..c688e42edeaf 100644 --- a/pkgs/development/libraries/glm/default.nix +++ b/pkgs/development/libraries/glm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "glm-0.9.5.3"; + name = "glm-0.9.6.0"; src = fetchurl { url = "mirror://sourceforge/project/ogl-math/${name}/${name}.zip"; - sha256 = "0ndwaw2mp7pzcwwm4dghbv5qqax5a8c5plnwdgnpc9adm79gj1rl"; + sha256 = "0gq79gxjm449ryi8l94rahrqy2cjccnrvivxgbwp10xdlfdyc4ha"; }; buildInputs = [ unzip ]; diff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/development/libraries/gloox/default.nix index 9ab31e511578..9d06f4b1c5d7 100644 --- a/pkgs/development/libraries/gloox/default.nix +++ b/pkgs/development/libraries/gloox/default.nix @@ -9,14 +9,14 @@ assert sslSupport -> openssl != null; assert idnSupport -> libidn != null; let - version = "1.0.11"; + version = "1.0.12"; in stdenv.mkDerivation rec { name = "gloox-${version}"; src = fetchurl { url = "http://camaya.net/download/gloox-${version}.tar.bz2"; - sha256 = "1hrkvn4ddzmydvpr541l6pi8nr0k6xi9g7yxdp84ns7v463kjrq9"; + sha256 = "1aa3pkg8yz6glg2273yl7310nkx1q31wkwbmmxwk3059k0p5l4k7"; }; buildInputs = [ ] diff --git a/pkgs/development/libraries/gmime/default.nix b/pkgs/development/libraries/gmime/default.nix index a8a3943e409e..6564fc511867 100644 --- a/pkgs/development/libraries/gmime/default.nix +++ b/pkgs/development/libraries/gmime/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, zlib, libgpgerror }: stdenv.mkDerivation rec { - name = "gmime-2.6.19"; + name = "gmime-2.6.20"; src = fetchurl { url = "mirror://gnome/sources/gmime/2.6/${name}.tar.xz"; - sha256 = "0jm1fgbjgh496rsc0il2y46qd4bqq2ln9168p4zzh68mk4ml1yxg"; + sha256 = "0rfzbgsh8ira5p76kdghygl5i3fvmmx4wbw5rp7f8ajc4vxp18g0"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/gmp/4.3.2.nix b/pkgs/development/libraries/gmp/4.3.2.nix index e9cfda032b17..aabb79d27a97 100644 --- a/pkgs/development/libraries/gmp/4.3.2.nix +++ b/pkgs/development/libraries/gmp/4.3.2.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = { + branch = "4"; description = "GNU multiple precision arithmetic library"; longDescription = diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix index 14a6d34d932b..e9495b796dd2 100644 --- a/pkgs/development/libraries/gmp/5.1.x.nix +++ b/pkgs/development/libraries/gmp/5.1.x.nix @@ -16,10 +16,13 @@ stdenv.mkDerivation (rec { # Build a "fat binary", with routines for several sub-architectures # (x86), except on Solaris where some tests crash with "Memory fault". # See <http://hydra.nixos.org/build/2760931>, for instance. + # + # no darwin because gmp uses ASM that clang doesn't like optional (!stdenv.isSunOS) "--enable-fat" ++ (if cxx then [ "--enable-cxx" ] else [ "--disable-cxx" ]) ++ optional (cxx && stdenv.isDarwin) "CPPFLAGS=-fexceptions" + ++ optional stdenv.isDarwin "ABI=64" ++ optional stdenv.is64bit "--with-pic" ; diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index a84d96edca94..e30e2d7cf70f 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -11,11 +11,11 @@ let "${gnupg}/bin/gpg2"; in stdenv.mkDerivation rec { - name = "gpgme-1.5.1"; + name = "gpgme-1.5.2"; src = fetchurl { url = "ftp://ftp.gnupg.org/gcrypt/gpgme/${name}.tar.bz2"; - sha256 = "1qqi9bxwxxsc4r15j7drclgp0w8jk9nj3h2fsivk4c7brvw3lbvc"; + sha256 = "1m7i0krffw4717jx7211d0pk4wi2rldg2bp7xgl6a0kgl6hb160y"; }; propagatedBuildInputs = [ libgpgerror glib libassuan pth ]; diff --git a/pkgs/development/libraries/granite/default.nix b/pkgs/development/libraries/granite/default.nix new file mode 100644 index 000000000000..5a2ff5daa11b --- /dev/null +++ b/pkgs/development/libraries/granite/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, perl, cmake, vala, pkgconfig, gobjectIntrospection, glib, gtk3, gnome3, gettext }: + +stdenv.mkDerivation rec { + majorVersion = "0.3"; + minorVersion = "0"; + name = "granite-${majorVersion}.${minorVersion}"; + src = fetchurl { + url = "https://code.launchpad.net/granite/${majorVersion}/${majorVersion}/+download/${name}.tar.gz"; + sha256 = "1laa109dz7kbd8zxddqw2p1b67yzva7cc5h3smqkj8a9jzbhv5fz"; + }; + cmakeFlags = "-DINTROSPECTION_GIRDIR=share/gir-1.0/ -DINTROSPECTION_TYPELIBDIR=lib/girepository-1.0"; + buildInputs = [perl cmake vala pkgconfig gobjectIntrospection glib gtk3 gnome3.libgee gettext]; + meta = { + description = "An extension to GTK+ used by elementary OS"; + longDescription = "An extension to GTK+ that provides several useful widgets and classes to ease application development. Designed for elementary OS."; + homepage = https://launchpad.net/granite; + license = stdenv.lib.licenses.lgpl3; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.vozz ]; + }; +} diff --git a/pkgs/development/libraries/gsm/default.nix b/pkgs/development/libraries/gsm/default.nix index 04fbb01a3bfc..31be86ee13ec 100644 --- a/pkgs/development/libraries/gsm/default.nix +++ b/pkgs/development/libraries/gsm/default.nix @@ -1,9 +1,9 @@ x@{builderDefsPackage , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) @@ -40,7 +40,7 @@ rec { ''INSTALL_ROOT="$out"'' ''GSM_INSTALL_INC="$out/include/gsm"'' ]; - + meta = { description = "A GSM codec library"; maintainers = with a.lib.maintainers; @@ -49,7 +49,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "free-noncopyleft"; + license = a.lib.licenses.free; }; passthru = { updateInfo = { @@ -57,4 +57,3 @@ rec { }; }; }) x - diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index a02af7f0cd75..a573dc561fdc 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -5,12 +5,13 @@ , openjpeg, libopus, librsvg , wildmidi, fluidsynth, libvdpau, wayland , libwebp, xvidcore, gnutls +, mesa }: assert faacSupport -> faac != null; stdenv.mkDerivation rec { - name = "gst-plugins-bad-1.4.1"; + name = "gst-plugins-bad-1.4.3"; meta = with stdenv.lib; { description = "Gstreamer Bad Plugins"; @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz"; - sha256 = "0268db2faaf0bb22e5b709a11633abbca4f3d289b1f513bb262d0bf3f53e19ae"; + sha256 = "a6840080c469d0db51d6d4d0f7c42c97b3c8c01942f24401c61b1ad36726b97c"; }; nativeBuildInputs = [ pkgconfig python ]; @@ -36,9 +37,9 @@ stdenv.mkDerivation rec { buildInputs = [ gst-plugins-base orc faad2 libass libkate libmms - libmodplug mpeg2dec mpg123 + libmodplug mpeg2dec mpg123 openjpeg libopus librsvg wildmidi fluidsynth libvdpau wayland - libwebp xvidcore gnutls + libwebp xvidcore gnutls mesa ] ++ stdenv.lib.optional faacSupport faac; } diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 3b9e94f4c658..854fa8f0c349 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "gst-plugins-base-1.4.1"; + name = "gst-plugins-base-1.4.3"; meta = { description = "Base plugins and helper libraries"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz"; - sha256 = "aea9e25be6691bd3cc0785d005b2b5d70ce313a2c897901680a3f7e7cab5a499"; + sha256 = "f7b4d2b3ba2bcac485896e2c1c36459cb091ebe8b49e91635c27d40f66792d9d"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 8e9a2b87a017..5ab1ec6a31f5 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "gstreamer-1.4.1"; + name = "gstreamer-1.4.3"; meta = { description = "Open source multimedia framework"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gstreamer/${name}.tar.xz"; - sha256 = "5638f75003282135815c0077d491da11e9a884ad91d4ba6ab3cc78bae0fb452e"; + sha256 = "11f155784d28b85a12b50d2fc8f91c6b75d9ca325cc76aaffba1a58d4c9549c9"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/core/setup-hook.sh b/pkgs/development/libraries/gstreamer/core/setup-hook.sh index 04863ab3b612..3dd7812ece6d 100644 --- a/pkgs/development/libraries/gstreamer/core/setup-hook.sh +++ b/pkgs/development/libraries/gstreamer/core/setup-hook.sh @@ -5,5 +5,5 @@ addGstreamer1LibPath () { fi } -envHooks=(${envHooks[@]} addGstreamer1LibPath) +envHooks+=(addGstreamer1LibPath) diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index daf2ba59a406..df7078a1365a 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "gstreamer-editing-services-1.2.1"; + name = "gstreamer-editing-services-1.4.0"; meta = with stdenv.lib; { description = "Library for creation of audio/video non-linear editors"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gstreamer-editing-services/${name}.tar.xz"; - sha256 = "1c20zg272wgzqw4f93f1prkv9a9gdqxmf3kal29l0r2wmwhqnxpy"; + sha256 = "1cwbh244an6zsxsscvg6xjnb34ylci34g9zx59xjbv5wnw7vj86c"; }; nativeBuildInputs = [ pkgconfig python gobjectIntrospection ]; diff --git a/pkgs/development/libraries/gstreamer/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/gnonlin/default.nix index 44bb1c48c81d..05113973a9d1 100644 --- a/pkgs/development/libraries/gstreamer/gnonlin/default.nix +++ b/pkgs/development/libraries/gstreamer/gnonlin/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "gnonlin-1.2.1"; + name = "gnonlin-1.4.0"; meta = with stdenv.lib; { description = "Gstreamer Non-Linear Multimedia Editing Plugins"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gnonlin/${name}.tar.xz"; - sha256 = "14zb3bz3xn40a2kns719amrr77cp6wyxddml621kyxc424ihcw3q"; + sha256 = "0zv60rq2h736a6fivd3a3wp59dj1jar7b2vwzykahvl168b7wrid"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 176814c5ecd1..72a14b50606c 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation rec { - name = "gst-plugins-good-1.4.1"; + name = "gst-plugins-good-1.4.3"; meta = with stdenv.lib; { description = "Gstreamer Good Plugins"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz"; - sha256 = "8559d4270065b30ed5c49b826e1b7a3a2bd5ee9a340ae745a2ae3f9718e4c637"; + sha256 = "5876a74402f2a24d1d3ae9163c32466bdc7a565696dddeef65e6a9a93efc5537"; }; nativeBuildInputs = [ pkgconfig python ]; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix index a0cd0a4c646f..3382ae783f28 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix @@ -2,6 +2,9 @@ , flac, libjpeg, zlib, speex, libpng, libdv, libcaca, libvpx , libiec61883, libavc1394, taglib, pulseaudio, gdk_pixbuf, orc , glib, gstreamer, bzip2 +, # Whether to build no plugins that have external dependencies + # (except the PulseAudio plugin). + minimalDeps ? false }: stdenv.mkDerivation rec { @@ -15,15 +18,15 @@ stdenv.mkDerivation rec { sha256 = "1ijswgcrdp243mfsyza31fpzq6plz40p4b83vkr2x4x7807889vy"; }; - patches = [ ./v4l.patch ]; + patches = [ ./v4l.patch ./linux-headers-3.9.patch ]; configureFlags = "--disable-oss"; buildInputs = - [ pkgconfig glib gstreamer gst_plugins_base libavc1394 libiec61883 - aalib libcaca cairo libdv flac libjpeg libpng pulseaudio speex - taglib bzip2 libvpx gdk_pixbuf orc - ]; + [ pkgconfig glib gstreamer gst_plugins_base pulseaudio ] + ++ stdenv.lib.optionals (!minimalDeps) + [ aalib libcaca cairo libdv flac libjpeg libpng speex + taglib bzip2 libvpx gdk_pixbuf orc ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/linux-headers-3.9.patch b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/linux-headers-3.9.patch new file mode 100644 index 000000000000..f13d3a166714 --- /dev/null +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/linux-headers-3.9.patch @@ -0,0 +1,27 @@ +http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-plugins/gst-plugins-v4l2/files/gst-plugins-v4l2-0.10.31-linux-headers-3.9.patch + +From 8e633d2059cb835448021cf79becb487aff10975 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera <hadess@hadess.net> +Date: Mon, 18 Mar 2013 14:59:35 +0000 +Subject: v4l2: fix compilation against newer kernel headers as on FC19 + +--- +diff --git a/sys/v4l2/v4l2_calls.c b/sys/v4l2/v4l2_calls.c +index 07d390a..4c10f4f 100644 +--- a/sys/v4l2/v4l2_calls.c ++++ b/sys/v4l2/v4l2_calls.c +@@ -291,8 +291,12 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l2object) + break; + case V4L2_CID_HFLIP: + case V4L2_CID_VFLIP: ++#ifndef V4L2_CID_PAN_RESET + case V4L2_CID_HCENTER: ++#endif ++#ifndef V4L2_CID_TILT_RESET + case V4L2_CID_VCENTER: ++#endif + #ifdef V4L2_CID_PAN_RESET + case V4L2_CID_PAN_RESET: + #endif +-- +cgit v0.9.0.2-2-gbebe diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix index d01961f5cdeb..889f55e50006 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, python, gstreamer - , gst_plugins_base, pygtk +, gst_plugins_base, pygobject }: stdenv.mkDerivation rec { @@ -13,12 +13,16 @@ stdenv.mkDerivation rec { sha256 = "0y1i4n5m1diljqr9dsq12anwazrhbs70jziich47gkdwllcza9lg"; }; + # Need to disable the testFake test case due to bug in pygobject. + # See https://bugzilla.gnome.org/show_bug.cgi?id=692479 + patches = [ ./disable-testFake.patch ]; + buildInputs = - [ pkgconfig gst_plugins_base pygtk ] + [ pkgconfig gst_plugins_base pygobject ] ; propagatedBuildInputs = [ gstreamer python ]; - + meta = { homepage = http://gstreamer.freedesktop.org; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-python/disable-testFake.patch b/pkgs/development/libraries/gstreamer/legacy/gst-python/disable-testFake.patch new file mode 100644 index 000000000000..d0c9960e5d22 --- /dev/null +++ b/pkgs/development/libraries/gstreamer/legacy/gst-python/disable-testFake.patch @@ -0,0 +1,56 @@ +diff -Nurp gst-python-0.10.22.orig/testsuite/test_bin.py gst-python-0.10.22/testsuite/test_bin.py +--- gst-python-0.10.22.orig/testsuite/test_bin.py 2014-10-29 18:58:00.921827721 +0100 ++++ gst-python-0.10.22/testsuite/test_bin.py 2014-10-29 19:00:32.019353092 +0100 +@@ -131,52 +131,6 @@ class BinAddRemove(TestCase): + self.assertRaises(gst.AddError, self.bin.add, src, sink) + self.bin.remove(src, sink) + self.assertRaises(gst.RemoveError, self.bin.remove, src, sink) +- +-class Preroll(TestCase): +- def setUp(self): +- TestCase.setUp(self) +- self.bin = gst.Bin('bin') +- +- def tearDown(self): +- # FIXME: wait for state change thread to settle down +- while self.bin.__gstrefcount__ > 1: +- time.sleep(0.1) +- self.assertEquals(self.bin.__gstrefcount__, 1) +- del self.bin +- TestCase.tearDown(self) +- +- def testFake(self): +- src = gst.element_factory_make('fakesrc') +- sink = gst.element_factory_make('fakesink') +- self.bin.add(src) +- +- # bin will go to paused, src pad task will start and error out +- self.bin.set_state(gst.STATE_PAUSED) +- ret = self.bin.get_state() +- self.assertEquals(ret[0], gst.STATE_CHANGE_SUCCESS) +- self.assertEquals(ret[1], gst.STATE_PAUSED) +- self.assertEquals(ret[2], gst.STATE_VOID_PENDING) +- +- # adding the sink will cause the bin to go in preroll mode +- gst.debug('adding sink and setting to PAUSED, should cause preroll') +- self.bin.add(sink) +- sink.set_state(gst.STATE_PAUSED) +- ret = self.bin.get_state(timeout=0) +- self.assertEquals(ret[0], gst.STATE_CHANGE_ASYNC) +- self.assertEquals(ret[1], gst.STATE_PAUSED) +- self.assertEquals(ret[2], gst.STATE_PAUSED) +- +- # to actually complete preroll, we need to link and re-enable fakesrc +- src.set_state(gst.STATE_READY) +- src.link(sink) +- src.set_state(gst.STATE_PAUSED) +- ret = self.bin.get_state() +- self.assertEquals(ret[0], gst.STATE_CHANGE_SUCCESS) +- self.assertEquals(ret[1], gst.STATE_PAUSED) +- self.assertEquals(ret[2], gst.STATE_VOID_PENDING) +- +- self.bin.set_state(gst.STATE_NULL) +- self.bin.get_state() + + class ConstructorTest(TestCase): + def testGood(self): diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh b/pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh index 10671f9d227c..e89aeda5bc1c 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh +++ b/pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh @@ -5,4 +5,4 @@ addGstreamerLibPath () { fi } -envHooks=(${envHooks[@]} addGstreamerLibPath) +envHooks+=(addGstreamerLibPath) diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index e25492c1d13b..0e8f0684f7be 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -6,7 +6,7 @@ assert withSystemLibav -> libav != null; stdenv.mkDerivation rec { - name = "gst-libav-1.4.1"; + name = "gst-libav-1.4.3"; meta = { homepage = "http://gstreamer.freedesktop.org"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-libav/${name}.tar.xz"; - sha256 = "fc125521187fa84f3210269a0eecc51f8a856802f1ca4bb251f118dab90c5a9d"; + sha256 = "833229d2b1aad6549ad0297435516508cc3ac47b166d6393ecdffc34c31a01d3"; }; configureFlags = stdenv.lib.optionalString withSystemLibav diff --git a/pkgs/development/libraries/gstreamer/python/default.nix b/pkgs/development/libraries/gstreamer/python/default.nix index fad8308703b3..a91b5d81bb32 100644 --- a/pkgs/development/libraries/gstreamer/python/default.nix +++ b/pkgs/development/libraries/gstreamer/python/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - name = "gst-python-1.2.1"; + name = "gst-python-1.4.0"; src = fetchurl { urls = [ - "${meta.homepage}/src/gst-python/${name}.tar.bz2" - "mirror://gentoo/distfiles/${name}.tar.bz2" + "${meta.homepage}/src/gst-python/${name}.tar.xz" + "mirror://gentoo/distfiles/${name}.tar.xz" ]; - sha256 = "1m7gh017f70i5pg6k9sx54ihwaizvi2dlli687gi44n5zylya8w8"; + sha256 = "0gixsp46mv7fvhk669q60wfk9w2lc02sdb1qipq066xlrqlhrr5i"; }; patches = [ ./different-path-with-pygobject.patch ]; diff --git a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix index 057fa7cc83af..b306e737df11 100644 --- a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix @@ -15,4 +15,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake automoc4 flex bison pkgconfig ]; cmakeFlags = "-DUSE_QT_PLUGIN_DIR=OFF -DUSE_GST_PLUGIN_DIR=OFF"; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index 6a80514e8a1c..b04c62021e4a 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "gst-plugins-ugly-1.4.1"; + name = "gst-plugins-ugly-1.4.3"; meta = with stdenv.lib; { description = "Gstreamer Ugly Plugins"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz"; - sha256 = "25440435ac4ed795d213f2420a0e7355e4a2e2e76d1f9d020b2073f815e8b071"; + sha256 = "d581592a82cf3930361430d38436c30a58d8b6c249cad18f7f213b203e206d46"; }; nativeBuildInputs = [ pkgconfig python ]; diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix index 787cd4066c0a..d71c29cbca5d 100644 --- a/pkgs/development/libraries/gtest/default.nix +++ b/pkgs/development/libraries/gtest/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Google test: Google's framework for writing C++ tests."; + description = "Google's framework for writing C++ tests"; homepage = https://code.google.com/p/googletest/; license = licenses.bsd3; platforms = platforms.all; diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index ff4d6ca67336..b95de7105be4 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.24"; + name = "gtk+-2.24.25"; src = fetchurl { url = "mirror://gnome/sources/gtk+/2.24/${name}.tar.xz"; - sha256 = "0v9xxpkypizy9k866rvqc36zvj4kj9p8nd1nxf9znay8k3hv5khj"; + sha256 = "38af1020cb8ff3d10dda2c8807f11e92af9d2fa4045de61c62eedb7fbc7ea5b3"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/gtkdatabox/default.nix b/pkgs/development/libraries/gtkdatabox/default.nix index 69a0341a6953..6e5a1329c9b2 100644 --- a/pkgs/development/libraries/gtkdatabox/default.nix +++ b/pkgs/development/libraries/gtkdatabox/default.nix @@ -1,15 +1,13 @@ { stdenv, fetchurl, pkgconfig, gtk }: stdenv.mkDerivation rec { - name = "gtkdatabox-0.9.1.3"; + name = "gtkdatabox-0.9.2.0"; src = fetchurl { url = "mirror://sourceforge/gtkdatabox/${name}.tar.gz"; - sha256 = "90ff9fc20ea1541dfe75ae04ff98e02c3aa7ad1735d8f0e3b3352910a3f7427c"; + sha256 = "0h20685bzw5j5h6mw8c6apbrbrd9w518c6xdhr55147px11nhnkl"; }; - patches = [ ./deprecated_GTK.patch ]; - buildInputs = [ pkgconfig gtk ]; propagatedBuildInputs = [ gtk ]; diff --git a/pkgs/development/libraries/gtkdatabox/deprecated_GTK.patch b/pkgs/development/libraries/gtkdatabox/deprecated_GTK.patch deleted file mode 100644 index f0572cec1f9b..000000000000 --- a/pkgs/development/libraries/gtkdatabox/deprecated_GTK.patch +++ /dev/null @@ -1,194 +0,0 @@ -# Fixes compilation errors. Stolen from Debian. -Index: libgtkdatabox-0.9.1.1/examples/addremove.c -=================================================================== ---- libgtkdatabox-0.9.1.1.orig/examples/addremove.c 2011-05-21 12:39:01.703594722 +0200 -+++ libgtkdatabox-0.9.1.1/examples/addremove.c 2011-05-21 12:36:16.739594810 +0200 -@@ -203,7 +203,7 @@ - g_signal_connect_swapped (GTK_OBJECT (close_button), "clicked", - G_CALLBACK (gtk_main_quit), GTK_OBJECT (box)); - gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0); -- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); -+ gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT); - gtk_widget_grab_default (close_button); - - gtk_widget_show_all (window); -Index: libgtkdatabox-0.9.1.1/examples/basics.c -=================================================================== ---- libgtkdatabox-0.9.1.1.orig/examples/basics.c 2011-05-21 12:39:02.075594722 +0200 -+++ libgtkdatabox-0.9.1.1/examples/basics.c 2011-05-21 12:36:16.759594820 +0200 -@@ -113,7 +113,7 @@ - g_signal_connect_swapped (GTK_OBJECT (close_button), "clicked", - G_CALLBACK (gtk_main_quit), GTK_OBJECT (box)); - gtk_box_pack_start (GTK_BOX (vbox), close_button, FALSE, FALSE, 0); -- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); -+ gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT); - gtk_widget_grab_default (close_button); - gtk_widget_grab_focus (close_button); - -Index: libgtkdatabox-0.9.1.1/examples/basics2.c -=================================================================== ---- libgtkdatabox-0.9.1.1.orig/examples/basics2.c 2011-05-21 12:39:01.911594722 +0200 -+++ libgtkdatabox-0.9.1.1/examples/basics2.c 2011-05-21 12:36:16.747594818 +0200 -@@ -225,7 +225,7 @@ - g_signal_connect_swapped (GTK_OBJECT (close_button), "clicked", - G_CALLBACK (gtk_main_quit), GTK_OBJECT (box)); - gtk_box_pack_start (GTK_BOX (vbox), close_button, FALSE, FALSE, 0); -- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); -+ gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT); - gtk_widget_grab_default (close_button); - gtk_widget_grab_focus (close_button); - -Index: libgtkdatabox-0.9.1.1/examples/colors.c -=================================================================== ---- libgtkdatabox-0.9.1.1.orig/examples/colors.c 2011-05-21 12:39:02.115594722 +0200 -+++ libgtkdatabox-0.9.1.1/examples/colors.c 2011-05-21 12:36:16.763594819 +0200 -@@ -194,7 +194,7 @@ - g_signal_connect (G_OBJECT (close_button), "clicked", - G_CALLBACK (gtk_main_quit), (gpointer) NULL); - gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0); -- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); -+ gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT); - gtk_widget_grab_default (close_button); - - -Index: libgtkdatabox-0.9.1.1/examples/enable_disable.c -=================================================================== ---- libgtkdatabox-0.9.1.1.orig/examples/enable_disable.c 2011-05-21 12:39:01.787594722 +0200 -+++ libgtkdatabox-0.9.1.1/examples/enable_disable.c 2011-05-21 12:36:16.743594812 +0200 -@@ -145,7 +145,7 @@ - g_signal_connect_swapped (GTK_OBJECT (close_button), "clicked", - G_CALLBACK (gtk_main_quit), GTK_OBJECT (box)); - gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0); -- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); -+ gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT); - for (i = 0; i < noEnableSets; ++i) - { - GtkWidget *vbox = gtk_vbox_new (FALSE, 10); -Index: libgtkdatabox-0.9.1.1/examples/grid.c -=================================================================== ---- libgtkdatabox-0.9.1.1.orig/examples/grid.c 2011-05-21 12:39:01.995594722 +0200 -+++ libgtkdatabox-0.9.1.1/examples/grid.c 2011-05-21 12:36:16.755594821 +0200 -@@ -133,7 +133,7 @@ - G_CALLBACK (gtk_main_quit), - GTK_OBJECT (box)); - gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0); -- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); -+ gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT); - gtk_widget_grab_default (close_button); - - gtk_widget_show_all (window); -Index: libgtkdatabox-0.9.1.1/examples/grid_array.c -=================================================================== ---- libgtkdatabox-0.9.1.1.orig/examples/grid_array.c 2011-05-21 12:39:01.951594722 +0200 -+++ libgtkdatabox-0.9.1.1/examples/grid_array.c 2011-05-21 12:36:16.751594821 +0200 -@@ -134,7 +134,7 @@ - G_CALLBACK (gtk_main_quit), - GTK_OBJECT (box)); - gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0); -- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); -+ gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT); - gtk_widget_grab_default (close_button); - - gtk_widget_show_all (window); -Index: libgtkdatabox-0.9.1.1/examples/keycontrol.c -=================================================================== ---- libgtkdatabox-0.9.1.1.orig/examples/keycontrol.c 2011-05-21 12:39:02.155594722 +0200 -+++ libgtkdatabox-0.9.1.1/examples/keycontrol.c 2011-05-21 12:37:15.211595055 +0200 -@@ -133,7 +133,8 @@ - gtk_databox_create_box_with_scrollbars_and_rulers (&box, &table, - TRUE, TRUE, TRUE, TRUE); - gtk_widget_add_events (box, GDK_KEY_PRESS_MASK); -- GTK_WIDGET_SET_FLAGS (box, GTK_CAN_FOCUS | GTK_CAN_DEFAULT); -+ gtk_widget_set_can_focus(box, GTK_CAN_FOCUS); -+ gtk_widget_set_can_default(box, GTK_CAN_DEFAULT); - - gtk_box_pack_start (GTK_BOX (box1), table, TRUE, TRUE, 0); - -Index: libgtkdatabox-0.9.1.1/examples/lissajous.c -=================================================================== ---- libgtkdatabox-0.9.1.1.orig/examples/lissajous.c 2011-05-21 12:39:02.035594722 +0200 -+++ libgtkdatabox-0.9.1.1/examples/lissajous.c 2011-05-21 12:36:16.759594820 +0200 -@@ -154,7 +154,7 @@ - G_CALLBACK (gtk_main_quit), G_OBJECT (box)); - - gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0); -- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); -+ gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT); - gtk_widget_grab_default (close_button); - lissajous_idle = g_idle_add ((GSourceFunc) lissajous_idle_func, box); - -Index: libgtkdatabox-0.9.1.1/examples/logarithmic.c -=================================================================== ---- libgtkdatabox-0.9.1.1.orig/examples/logarithmic.c 2011-05-21 12:39:01.827594722 +0200 -+++ libgtkdatabox-0.9.1.1/examples/logarithmic.c 2011-05-21 12:36:16.743594812 +0200 -@@ -207,7 +207,7 @@ - g_signal_connect (GTK_OBJECT (close_button), "clicked", - G_CALLBACK (gtk_main_quit), NULL); - gtk_box_pack_start (GTK_BOX (vbox), close_button, FALSE, FALSE, 0); -- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); -+ gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT); - gtk_widget_grab_default (close_button); - gtk_widget_grab_focus (close_button); - -Index: libgtkdatabox-0.9.1.1/examples/markers.c -=================================================================== ---- libgtkdatabox-0.9.1.1.orig/examples/markers.c 2011-05-21 12:39:01.871594722 +0200 -+++ libgtkdatabox-0.9.1.1/examples/markers.c 2011-05-21 12:36:16.747594818 +0200 -@@ -220,7 +220,7 @@ - g_signal_connect_swapped (GTK_OBJECT (close_button), "clicked", - G_CALLBACK (gtk_main_quit), GTK_OBJECT (box)); - gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0); -- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); -+ gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT); - gtk_widget_grab_default (close_button); - - gtk_widget_show_all (window); -Index: libgtkdatabox-0.9.1.1/examples/signals.c -=================================================================== ---- libgtkdatabox-0.9.1.1.orig/examples/signals.c 2011-05-21 12:39:01.751594722 +0200 -+++ libgtkdatabox-0.9.1.1/examples/signals.c 2011-05-21 12:36:16.743594812 +0200 -@@ -287,7 +287,7 @@ - g_signal_connect_swapped (G_OBJECT (close_button), "clicked", - G_CALLBACK (gtk_main_quit), G_OBJECT (box)); - gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0); -- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); -+ gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT); - gtk_widget_grab_default (close_button); - - g_signal_connect (G_OBJECT (box), "zoomed", -Index: libgtkdatabox-0.9.1.1/gtk/gtkdatabox.c -=================================================================== ---- libgtkdatabox-0.9.1.1.orig/gtk/gtkdatabox.c 2011-05-21 12:39:01.583594722 +0200 -+++ libgtkdatabox-0.9.1.1/gtk/gtkdatabox.c 2011-05-21 12:38:43.523595004 +0200 -@@ -453,7 +453,8 @@ - gint width; - gint height; - -- gdk_drawable_get_size (widget->window, &width, &height); -+ width = gdk_window_get_width(widget->window); -+ height = gdk_window_get_height(widget->window); - x = MAX (0, MIN (width - 1, x)); - y = MAX (0, MIN (height - 1, y)); - -@@ -587,7 +588,7 @@ - gint attributes_mask; - - box = GTK_DATABOX (widget); -- GTK_WIDGET_SET_FLAGS (box, GTK_REALIZED); -+ gtk_widget_set_realized(box, GTK_REALIZED); - - attributes.window_type = GDK_WINDOW_CHILD; - attributes.x = widget->allocation.x; -Index: libgtkdatabox-0.9.1.1/gtk/gtkdatabox_ruler.c -=================================================================== ---- libgtkdatabox-0.9.1.1.orig/gtk/gtkdatabox_ruler.c 2011-05-21 12:39:01.631594722 +0200 -+++ libgtkdatabox-0.9.1.1/gtk/gtkdatabox_ruler.c 2011-05-21 12:38:59.963594710 +0200 -@@ -842,7 +842,7 @@ - gint attributes_mask; - - ruler = GTK_DATABOX_RULER (widget); -- GTK_WIDGET_SET_FLAGS (ruler, GTK_REALIZED); -+ gtk_widget_set_realized(ruler, GTK_REALIZED); - - attributes.window_type = GDK_WINDOW_CHILD; - attributes.x = widget->allocation.x; diff --git a/pkgs/development/libraries/gupnp-av/default.nix b/pkgs/development/libraries/gupnp-av/default.nix index 3cbb13972d35..2dcd5b11c386 100644 --- a/pkgs/development/libraries/gupnp-av/default.nix +++ b/pkgs/development/libraries/gupnp-av/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://gupnp.org/; - description = "GUPnP-AV is a collection of helpers for building AV (audio/video) applications using GUPnP."; + description = "A collection of helpers for building AV (audio/video) applications using GUPnP"; longDescription = "GUPnP implements the UPnP specification: resource announcement and discovery, description, control, event notification, and presentation (GUPnP includes basic web server functionality through libsoup). GUPnP does not include helpers for construction or control of specific standardized resources (e.g. MediaServer); this is left for higher level libraries utilizing the GUPnP framework."; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 3f20147d0e97..739b0ad3136a 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, pkgconfig, intltool, libtool , glib, dbus, udev, udisks2, libgcrypt , libgphoto2, avahi, libarchive, fuse, libcdio -, libxml2, libxslt, docbook_xsl -, lightWeight ? true, gnome, samba, libgnome_keyring, gconf, makeWrapper }: +, libxml2, libxslt, docbook_xsl, samba, libmtp +, gnomeSupport ? false, gnome,libgnome_keyring, gconf, makeWrapper }: let ver_maj = "1.18"; @@ -21,10 +21,10 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper glib dbus.libs udev udisks2 libgcrypt libgphoto2 avahi libarchive fuse libcdio - libxml2 libxslt docbook_xsl + libxml2 libxslt docbook_xsl samba libmtp # ToDo: a ligther version of libsoup to have FTP/HTTP support? - ] ++ stdenv.lib.optionals (!lightWeight) (with gnome; [ - gtk libsoup libgnome_keyring gconf samba + ] ++ stdenv.lib.optionals gnomeSupport (with gnome; [ + gtk libsoup libgnome_keyring gconf # ToDo: not working and probably useless until gnome3 from x-updates ]); @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Virtual Filesystem support library" + stdenv.lib.optionalString lightWeight " (light-weight)"; + description = "Virtual Filesystem support library" + stdenv.lib.optionalString gnomeSupport " (full GNOME support)"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/haskell/Boolean/default.nix b/pkgs/development/libraries/haskell/Boolean/default.nix index d7a8474bd5b2..137171b77500 100644 --- a/pkgs/development/libraries/haskell/Boolean/default.nix +++ b/pkgs/development/libraries/haskell/Boolean/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "Boolean"; - version = "0.2.2"; - sha256 = "1awi9ff2gb9gddalzn2hgp8klvcsizicqpd7xb5fds5j3278qrdz"; + version = "0.2.3"; + sha256 = "1lsm06y7hgjp9qmlr6csf24x3wgna7sbf8dgh6sfl2rhs7fn8kgn"; meta = { description = "Generalized booleans and numbers"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/Cabal/1.14.0.nix b/pkgs/development/libraries/haskell/Cabal/1.14.0.nix deleted file mode 100644 index a905017472f6..000000000000 --- a/pkgs/development/libraries/haskell/Cabal/1.14.0.nix +++ /dev/null @@ -1,24 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, extensibleExceptions, filepath, HUnit, QuickCheck -, testFramework, testFrameworkHunit, testFrameworkQuickcheck2 -}: - -cabal.mkDerivation (self: { - pname = "Cabal"; - version = "1.14.0"; - sha256 = "1r5b4x1ham5gdg9m9l8idpvr9czlk1q21vqmg0di4adkp2fhlm3j"; - buildDepends = [ filepath ]; - testDepends = [ - extensibleExceptions filepath HUnit QuickCheck testFramework - testFrameworkHunit testFrameworkQuickcheck2 - ]; - meta = { - homepage = "http://www.haskell.org/cabal/"; - description = "A framework for packaging Haskell software"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = with self.stdenv.lib.maintainers; [ simons ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/Chart-cairo/default.nix b/pkgs/development/libraries/haskell/Chart-cairo/default.nix index 95d346cd9f35..c01793881adc 100644 --- a/pkgs/development/libraries/haskell/Chart-cairo/default.nix +++ b/pkgs/development/libraries/haskell/Chart-cairo/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "Chart-cairo"; - version = "1.3.1"; - sha256 = "15d52x0xr0klkfp9jh9i2aqki8gkm805mm6yk53f3ky92vdylg6q"; + version = "1.3.2"; + sha256 = "19ghd5xav7pn3z5igbkbsa81vhlpvy55xscc42vbxx1v9f6shq7g"; buildDepends = [ cairo Chart colour dataDefaultClass lens mtl operational time ]; diff --git a/pkgs/development/libraries/haskell/Chart-diagrams/default.nix b/pkgs/development/libraries/haskell/Chart-diagrams/default.nix index 6b90954c4a7a..d6b17ec320f9 100644 --- a/pkgs/development/libraries/haskell/Chart-diagrams/default.nix +++ b/pkgs/development/libraries/haskell/Chart-diagrams/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "Chart-diagrams"; - version = "1.3.1"; - sha256 = "0p959m350rj0fl91f94c0gcxnzgy8yrz27naw9ciqi36za7sxl6j"; + version = "1.3.2"; + sha256 = "0q5qvzzl5wirlj26a6zpnyq95lpzzkwiqq0mkh25aa3qzzbg4y6g"; buildDepends = [ blazeSvg Chart colour dataDefaultClass diagramsCore diagramsLib diagramsPostscript diagramsSvg lens mtl operational SVGFonts text diff --git a/pkgs/development/libraries/haskell/Chart-gtk/default.nix b/pkgs/development/libraries/haskell/Chart-gtk/default.nix index 7e6f7d794af3..6d55bedb24f5 100644 --- a/pkgs/development/libraries/haskell/Chart-gtk/default.nix +++ b/pkgs/development/libraries/haskell/Chart-gtk/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "Chart-gtk"; - version = "1.3.1"; - sha256 = "1bnhwiabwjhry6pfwi9xs4zg23vycqx3rpbc5qs7773sij93v7bj"; + version = "1.3.2"; + sha256 = "175bqh5pl4z0gx50z34afg149g94qw8sk87gbp9mavh5bnpj5a07"; buildDepends = [ cairo Chart ChartCairo colour dataDefaultClass gtk mtl time ]; diff --git a/pkgs/development/libraries/haskell/Chart/default.nix b/pkgs/development/libraries/haskell/Chart/default.nix index 94e40a28afaf..c41fa5a5a5d3 100644 --- a/pkgs/development/libraries/haskell/Chart/default.nix +++ b/pkgs/development/libraries/haskell/Chart/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "Chart"; - version = "1.3.1"; - sha256 = "019q77hgv5hyhfpsfs2k1a4qn8fandk1nj7xkzn00z21jqhman2s"; + version = "1.3.2"; + sha256 = "0y4xkqdmbyyaxf810dgz0zsfmywlx07c26s9wkk155iriz0yz4m9"; buildDepends = [ colour dataDefaultClass lens mtl operational time ]; diff --git a/pkgs/development/libraries/haskell/ChasingBottoms/default.nix b/pkgs/development/libraries/haskell/ChasingBottoms/default.nix index 715793c7e9a7..829af010da78 100644 --- a/pkgs/development/libraries/haskell/ChasingBottoms/default.nix +++ b/pkgs/development/libraries/haskell/ChasingBottoms/default.nix @@ -9,6 +9,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ mtl QuickCheck random syb ]; + jailbreak = true; meta = { description = "For testing partial and infinite values"; license = self.stdenv.lib.licenses.mit; diff --git a/pkgs/development/libraries/haskell/ConfigFile/default.nix b/pkgs/development/libraries/haskell/ConfigFile/default.nix index 1de333a04d95..a2923dc19dd0 100644 --- a/pkgs/development/libraries/haskell/ConfigFile/default.nix +++ b/pkgs/development/libraries/haskell/ConfigFile/default.nix @@ -4,15 +4,15 @@ cabal.mkDerivation (self: { pname = "ConfigFile"; - version = "1.1.2"; - sha256 = "0xidr8dk5sc9g1v9gw7fmmrsyqiawx2rxg4c36pm4jbcj8jdzxiq"; + version = "1.1.4"; + sha256 = "057mw146bip9wzs7j4b5xr1x24d8w0kr4i3inri5m57jkwspn25f"; isLibrary = true; isExecutable = true; buildDepends = [ MissingH mtl parsec ]; meta = { homepage = "http://software.complete.org/configfile"; description = "Configuration file reading & writing"; - license = "LGPL"; + license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; }) diff --git a/pkgs/development/libraries/haskell/CouchDB/default.nix b/pkgs/development/libraries/haskell/CouchDB/default.nix index 44a5d50edc5a..18f095cd8b16 100644 --- a/pkgs/development/libraries/haskell/CouchDB/default.nix +++ b/pkgs/development/libraries/haskell/CouchDB/default.nix @@ -15,5 +15,6 @@ cabal.mkDerivation (self: { description = "CouchDB interface"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/DAV/default.nix b/pkgs/development/libraries/haskell/DAV/default.nix index be383fd4143e..b361ae045fbf 100644 --- a/pkgs/development/libraries/haskell/DAV/default.nix +++ b/pkgs/development/libraries/haskell/DAV/default.nix @@ -2,20 +2,21 @@ { cabal, caseInsensitive, dataDefault, either, errors, exceptions , httpClient, httpClientTls, httpTypes, lens, mtl, network -, optparseApplicative, transformers, transformersBase, utf8String -, xmlConduit, xmlHamlet +, networkUri, optparseApplicative, transformers, transformersBase +, utf8String, xmlConduit, xmlHamlet }: cabal.mkDerivation (self: { pname = "DAV"; - version = "1.0.2"; - sha256 = "0xbiq3q8w1cjnh71sfnincir8igvwig734r8schbsps993p2d24b"; + version = "1.0.3"; + sha256 = "1wrs3rdk4sarzi4w1pma8h751mjw5x1l8c6w30wv7fg0rmk2cayd"; isLibrary = true; isExecutable = true; buildDepends = [ caseInsensitive dataDefault either errors exceptions httpClient - httpClientTls httpTypes lens mtl network optparseApplicative - transformers transformersBase utf8String xmlConduit xmlHamlet + httpClientTls httpTypes lens mtl network networkUri + optparseApplicative transformers transformersBase utf8String + xmlConduit xmlHamlet ]; meta = { homepage = "http://floss.scru.org/hDAV"; diff --git a/pkgs/development/libraries/haskell/Decimal/default.nix b/pkgs/development/libraries/haskell/Decimal/default.nix new file mode 100644 index 000000000000..03ae15a24d14 --- /dev/null +++ b/pkgs/development/libraries/haskell/Decimal/default.nix @@ -0,0 +1,22 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, deepseq, HUnit, QuickCheck, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2 +}: + +cabal.mkDerivation (self: { + pname = "Decimal"; + version = "0.4.2"; + sha256 = "0qa2z2lq1hrvakhyhj624mg8sd05ikhb66zwpa6x9vcyji93dxf5"; + buildDepends = [ deepseq ]; + testDepends = [ + deepseq HUnit QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 + ]; + meta = { + homepage = "https://github.com/PaulJohnson/Haskell-Decimal"; + description = "Decimal numbers with variable precision"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/Extra/default.nix b/pkgs/development/libraries/haskell/Extra-lib/default.nix index 0db01edcc61c..d244700e58a1 100644 --- a/pkgs/development/libraries/haskell/Extra/default.nix +++ b/pkgs/development/libraries/haskell/Extra-lib/default.nix @@ -1,19 +1,19 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, bzlib, filepath, HUnit, mtl, network, pureMD5, QuickCheck -, random, regexCompat, time, Unixutils, zlib +{ cabal, bzlib, filepath, HUnit, mtl, networkUri, pureMD5 +, QuickCheck, random, regexCompat, time, Unixutils, zlib }: cabal.mkDerivation (self: { pname = "Extra"; - version = "1.46.1"; - sha256 = "0dgj72s60mhc36x7hpfdcdvxydq5d5aj006gxma9zz3hqzy5nnz9"; + version = "1.46.3"; + sha256 = "1xmwp9cp905nzx5x858wyacjpppn76mkfpkxksdhlq9zhmkp5yyh"; buildDepends = [ - bzlib filepath HUnit mtl network pureMD5 QuickCheck random + bzlib filepath HUnit mtl networkUri pureMD5 QuickCheck random regexCompat time Unixutils zlib ]; meta = { - homepage = "http://src.seereason.com/haskell-extra"; + homepage = "https://github.com/ddssff/haskell-extra"; description = "A grab bag of modules"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/GLURaw/1.3.0.0.nix b/pkgs/development/libraries/haskell/GLURaw/1.3.0.0.nix deleted file mode 100644 index bf23628a7101..000000000000 --- a/pkgs/development/libraries/haskell/GLURaw/1.3.0.0.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, freeglut, mesa, OpenGLRaw }: - -cabal.mkDerivation (self: { - pname = "GLURaw"; - version = "1.3.0.0"; - sha256 = "1sh87jz9161svsf719y63cr21wf4d7wpbz75g2c2xss301qhafg0"; - buildDepends = [ OpenGLRaw ]; - extraLibraries = [ freeglut mesa ]; - meta = { - homepage = "http://www.haskell.org/haskellwiki/Opengl"; - description = "A raw binding for the OpenGL graphics system"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/GLURaw/1.4.0.1.nix b/pkgs/development/libraries/haskell/GLURaw/default.nix index d389d7ecf046..d389d7ecf046 100644 --- a/pkgs/development/libraries/haskell/GLURaw/1.4.0.1.nix +++ b/pkgs/development/libraries/haskell/GLURaw/default.nix diff --git a/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix b/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix deleted file mode 100644 index 88a10caac094..000000000000 --- a/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL }: - -cabal.mkDerivation (self: { - pname = "GLUT"; - version = "2.1.1.2"; - sha256 = "d5ecf4b6bacc5e68ade00710df04fa158c6ed322c74362954716a0baba6bd3fb"; - buildDepends = [ OpenGL ]; - extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ]; - meta = { - homepage = "http://www.haskell.org/HOpenGL/"; - description = "A binding for the OpenGL Utility Toolkit"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix b/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix deleted file mode 100644 index a9988a533285..000000000000 --- a/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix +++ /dev/null @@ -1,19 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL }: - -cabal.mkDerivation (self: { - pname = "GLUT"; - version = "2.1.2.1"; - sha256 = "0r3js5i468lqlsnvb04iw6gdl81gs3cgqids3xpi4p5qpynbyc02"; - buildDepends = [ OpenGL ]; - extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ]; - noHaddock = true; - meta = { - homepage = "http://www.haskell.org/HOpenGL/"; - description = "A binding for the OpenGL Utility Toolkit"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix b/pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix deleted file mode 100644 index c92565ca4afa..000000000000 --- a/pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix +++ /dev/null @@ -1,19 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL }: - -cabal.mkDerivation (self: { - pname = "GLUT"; - version = "2.1.2.2"; - sha256 = "14g2ykcczy1hhpgflxv158zx2izkl1p0wj1x0am1grkkj1n9jbwi"; - buildDepends = [ OpenGL ]; - extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ]; - noHaddock = true; - meta = { - homepage = "http://www.haskell.org/HOpenGL/"; - description = "A binding for the OpenGL Utility Toolkit"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix b/pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix deleted file mode 100644 index 0bac3e0d5dba..000000000000 --- a/pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL -, StateVar, Tensor -}: - -cabal.mkDerivation (self: { - pname = "GLUT"; - version = "2.2.2.1"; - sha256 = "09qpkrwpc3w173mvqwda7vi0ncpzzzrnlfa14ja7jba489a8l1mw"; - buildDepends = [ OpenGL StateVar Tensor ]; - extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ]; - meta = { - homepage = "http://www.haskell.org/haskellwiki/Opengl"; - description = "A binding for the OpenGL Utility Toolkit"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix b/pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix deleted file mode 100644 index 9402d56f687e..000000000000 --- a/pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL -, OpenGLRaw, StateVar, Tensor -}: - -cabal.mkDerivation (self: { - pname = "GLUT"; - version = "2.3.1.0"; - sha256 = "1ijx636py7gpm79r0qjsv8f4pw3m1cgz80gnn3qghs3lw0l8f1ci"; - buildDepends = [ OpenGL OpenGLRaw StateVar Tensor ]; - extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ]; - meta = { - homepage = "http://www.haskell.org/haskellwiki/Opengl"; - description = "A binding for the OpenGL Utility Toolkit"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/GLUT/2.4.0.0.nix b/pkgs/development/libraries/haskell/GLUT/2.4.0.0.nix deleted file mode 100644 index c28194d7adbe..000000000000 --- a/pkgs/development/libraries/haskell/GLUT/2.4.0.0.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL -, OpenGLRaw -}: - -cabal.mkDerivation (self: { - pname = "GLUT"; - version = "2.4.0.0"; - sha256 = "1g6bnj2p9hj6c04pmkjwlw9brp7rrva1fyylr2q2dbfz4kbz438h"; - buildDepends = [ OpenGL OpenGLRaw ]; - extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ]; - meta = { - homepage = "http://www.haskell.org/haskellwiki/Opengl"; - description = "A binding for the OpenGL Utility Toolkit"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/GLUT/2.5.1.1.nix b/pkgs/development/libraries/haskell/GLUT/default.nix index b2cce8565240..b2cce8565240 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.5.1.1.nix +++ b/pkgs/development/libraries/haskell/GLUT/default.nix diff --git a/pkgs/development/libraries/haskell/GLUtil/default.nix b/pkgs/development/libraries/haskell/GLUtil/default.nix index ee99ccc4fee6..0b7910a7e0f4 100644 --- a/pkgs/development/libraries/haskell/GLUtil/default.nix +++ b/pkgs/development/libraries/haskell/GLUtil/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "GLUtil"; - version = "0.8.1"; - sha256 = "026w6rsgs0vmjx9fj4x3r93rifdyjygb83spcwmch31a7qng6l7w"; + version = "0.8.2"; + sha256 = "0z8fi4fd0jrywg595cc67w8pqcn7pgy651hxb4zkqb3400n4jak3"; buildDepends = [ cpphs filepath JuicyPixels linear OpenGL OpenGLRaw transformers vector diff --git a/pkgs/development/libraries/haskell/GenericPretty/default.nix b/pkgs/development/libraries/haskell/GenericPretty/default.nix new file mode 100644 index 000000000000..d2b8fedfc5e8 --- /dev/null +++ b/pkgs/development/libraries/haskell/GenericPretty/default.nix @@ -0,0 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal }: + +cabal.mkDerivation (self: { + pname = "GenericPretty"; + version = "1.2.1"; + sha256 = "0bb70mic7srr7x8k83d1i0m0a32gm72zr78ccdf3ckchj9136php"; + meta = { + homepage = "https://github.com/RazvanRanca/GenericPretty"; + description = "A generic, derivable, haskell pretty printer"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix index cadf9e3e9c24..9622ea5d0dc6 100644 --- a/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix +++ b/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "HDBC-odbc"; - version = "2.3.1.1"; - sha256 = "0zypgwy8yxzp69c2775gkzi8591b0l3wncn7vmq11l16ign95fc7"; + version = "2.4.0.0"; + sha256 = "0zjq5j095jyh0axmgnr59fwhh1nhipj6flz77z46kygagygrg2qz"; isLibrary = true; isExecutable = true; buildDepends = [ HDBC mtl time utf8String ]; diff --git a/pkgs/development/libraries/haskell/HFuse/default.nix b/pkgs/development/libraries/haskell/HFuse/default.nix index 510ffd4acb9c..05caf6975ac3 100644 --- a/pkgs/development/libraries/haskell/HFuse/default.nix +++ b/pkgs/development/libraries/haskell/HFuse/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "HFuse"; - version = "0.2.4.3"; - sha256 = "1daka673mx0gsnsa04pxani7n4wp93hflzxs3imzy4sgb30p7l01"; + version = "0.2.4.4"; + sha256 = "1wsrf9y90dk27da9pm9m11hnrxwrqwvq6c9799b91a91mc2lxslc"; isLibrary = true; isExecutable = true; extraLibraries = [ fuse ]; @@ -17,6 +17,6 @@ cabal.mkDerivation (self: { description = "HFuse is a binding for the Linux FUSE library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.stdenv.lib.platforms.linux; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + maintainers = with self.stdenv.lib.maintainers; [ andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/HSH/default.nix b/pkgs/development/libraries/haskell/HSH/default.nix index bcc297812104..01c0595e900a 100644 --- a/pkgs/development/libraries/haskell/HSH/default.nix +++ b/pkgs/development/libraries/haskell/HSH/default.nix @@ -1,22 +1,23 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, hslogger, MissingH, mtl, regexBase, regexCompat -, regexPosix, fetchpatch +, regexPosix }: cabal.mkDerivation (self: { pname = "HSH"; - version = "2.1.0"; - sha256 = "0gz2hzdvf0gqv33jihn67bvry38c6hkjapb1prxmb3w12lisr4l5"; + version = "2.1.2"; + sha256 = "17ysn131xskx4s1g5kg08zy141q3q16bns4bsg3yjzvf6cjpz2kq"; isLibrary = true; isExecutable = true; buildDepends = [ filepath hslogger MissingH mtl regexBase regexCompat regexPosix ]; - patches = [ (fetchpatch { url = "https://github.com/jgoerzen/hsh/pull/10.patch"; sha256 = "0ddb3vf8ipf37zg4hkqh0frff1a7sv9ils3lw6qd3irpbwna1hdz"; }) ]; meta = { homepage = "http://software.complete.org/hsh"; description = "Library to mix shell scripting with Haskell programs"; license = "LGPL"; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + maintainers = with self.stdenv.lib.maintainers; [ andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/HTF/default.nix b/pkgs/development/libraries/haskell/HTF/default.nix index 76ba94e8bfca..cc27d4cf2ae9 100644 --- a/pkgs/development/libraries/haskell/HTF/default.nix +++ b/pkgs/development/libraries/haskell/HTF/default.nix @@ -1,25 +1,25 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, aeson, base64Bytestring, cpphs, Diff, filepath -, haskellSrcExts, HUnit, liftedBase, monadControl, mtl, QuickCheck -, random, regexCompat, temporary, text, time, unorderedContainers -, vector, xmlgen +{ cabal, aeson, aesonPretty, base64Bytestring, cpphs, Diff +, filepath, haskellLexer, haskellSrc, HUnit, liftedBase +, monadControl, mtl, QuickCheck, random, regexCompat, temporary +, text, time, unorderedContainers, vector, xmlgen }: cabal.mkDerivation (self: { pname = "HTF"; - version = "0.12.1.0"; - sha256 = "1symg1y6i47rd1jshj84cwpn5vgmvh6v07jidjg5w5w3syyxqnz4"; + version = "0.12.2.3"; + sha256 = "0g5z2ypn6i7wpz1439c6qjmi8lw2b86zaljkgwchjn8r8gvw4mbm"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson base64Bytestring cpphs Diff haskellSrcExts HUnit liftedBase - monadControl mtl QuickCheck random regexCompat text time vector - xmlgen + aeson base64Bytestring cpphs Diff haskellLexer haskellSrc HUnit + liftedBase monadControl mtl QuickCheck random regexCompat text time + vector xmlgen ]; testDepends = [ - aeson filepath HUnit mtl random regexCompat temporary text - unorderedContainers + aeson aesonPretty filepath HUnit mtl random regexCompat temporary + text unorderedContainers ]; doCheck = false; meta = { diff --git a/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix b/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix deleted file mode 100644 index a41dd3c25dc4..000000000000 --- a/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl, network, parsec }: - -cabal.mkDerivation (self: { - pname = "HTTP"; - version = "4000.0.6"; - sha256 = "75af1ac4dc21b10c8a1a54a33179ea822e591887bab7278360a3d6b38304d39b"; - buildDepends = [ mtl network parsec ]; - doCheck = false; - meta = { - homepage = "http://projects.haskell.org/http/"; - description = "A library for client-side HTTP"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix b/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix deleted file mode 100644 index e530452b08c3..000000000000 --- a/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl, network, parsec }: - -cabal.mkDerivation (self: { - pname = "HTTP"; - version = "4000.0.9"; - sha256 = "1e2b4a8b782ad1417c8755bb0d248851bc142b351366ed460e07f2945a5e95ba"; - buildDepends = [ mtl network parsec ]; - doCheck = false; - meta = { - homepage = "http://projects.haskell.org/http/"; - description = "A library for client-side HTTP"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix b/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix deleted file mode 100644 index 76356134589e..000000000000 --- a/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl, network, parsec }: - -cabal.mkDerivation (self: { - pname = "HTTP"; - version = "4000.1.1"; - sha256 = "09khx5fb673a0d7m3bl39xjdxvc60m52rmm4865cha2mby0zidy3"; - buildDepends = [ mtl network parsec ]; - doCheck = false; - meta = { - homepage = "http://projects.haskell.org/http/"; - description = "A library for client-side HTTP"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix b/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix deleted file mode 100644 index 344a86a0da88..000000000000 --- a/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl, network, parsec }: - -cabal.mkDerivation (self: { - pname = "HTTP"; - version = "4000.1.2"; - sha256 = "19vcy8xinrvn01caly6sg1p1yvbbf7nwq10kxmnwqssnl4h5cwn8"; - buildDepends = [ mtl network parsec ]; - doCheck = false; - meta = { - homepage = "http://projects.haskell.org/http/"; - description = "A library for client-side HTTP"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix deleted file mode 100644 index c677bbf40db4..000000000000 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix +++ /dev/null @@ -1,23 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, httpdShed, HUnit, mtl, network, parsec, split -, testFramework, testFrameworkHunit -}: - -cabal.mkDerivation (self: { - pname = "HTTP"; - version = "4000.2.1"; - sha256 = "01076rk7ly5228pszn54x4nqc6rqq1xw11ij9ajvhzf419islh0a"; - buildDepends = [ mtl network parsec ]; - testDepends = [ - httpdShed HUnit network split testFramework testFrameworkHunit - ]; - doCheck = false; - meta = { - homepage = "https://github.com/haskell/HTTP"; - description = "A library for client-side HTTP"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix deleted file mode 100644 index c18fd35c8a08..000000000000 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix +++ /dev/null @@ -1,23 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, httpdShed, HUnit, mtl, network, parsec, split -, testFramework, testFrameworkHunit -}: - -cabal.mkDerivation (self: { - pname = "HTTP"; - version = "4000.2.2"; - sha256 = "0qrr9wdj25sdfxifppmw0w14g8skpgf42ic4iqcqylxxzfa8v7vh"; - buildDepends = [ mtl network parsec ]; - testDepends = [ - httpdShed HUnit network split testFramework testFrameworkHunit - ]; - doCheck = false; - meta = { - homepage = "https://github.com/haskell/HTTP"; - description = "A library for client-side HTTP"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix deleted file mode 100644 index 86c4dc8fcc01..000000000000 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix +++ /dev/null @@ -1,23 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, httpdShed, HUnit, mtl, network, parsec, split -, testFramework, testFrameworkHunit -}: - -cabal.mkDerivation (self: { - pname = "HTTP"; - version = "4000.2.3"; - sha256 = "1z7s5rkyljwdl95cwqbqg64i207wjwxgpksrdmvcv82k39srzx80"; - buildDepends = [ mtl network parsec ]; - testDepends = [ - httpdShed HUnit network split testFramework testFrameworkHunit - ]; - doCheck = false; - meta = { - homepage = "https://github.com/haskell/HTTP"; - description = "A library for client-side HTTP"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix deleted file mode 100644 index 54c8733c5840..000000000000 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix +++ /dev/null @@ -1,25 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, caseInsensitive, conduit, deepseq, httpdShed, httpTypes -, HUnit, mtl, network, parsec, pureMD5, split, testFramework -, testFrameworkHunit, wai, warp -}: - -cabal.mkDerivation (self: { - pname = "HTTP"; - version = "4000.2.5"; - sha256 = "03ij1zkykc438x2r1szz6ddvfhrjywlx61nrz377srcpbdmhxpb7"; - buildDepends = [ mtl network parsec ]; - testDepends = [ - caseInsensitive conduit deepseq httpdShed httpTypes HUnit mtl - network pureMD5 split testFramework testFrameworkHunit wai warp - ]; - doCheck = false; - meta = { - homepage = "https://github.com/haskell/HTTP"; - description = "A library for client-side HTTP"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix deleted file mode 100644 index d308d547c78d..000000000000 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix +++ /dev/null @@ -1,26 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, caseInsensitive, conduit, deepseq, httpdShed, httpTypes -, HUnit, mtl, network, parsec, pureMD5, split, testFramework -, testFrameworkHunit, wai, warp -}: - -cabal.mkDerivation (self: { - pname = "HTTP"; - version = "4000.2.8"; - sha256 = "0p0cwzjw2102bsyfaga6m8b53s6qnhd6byg2j2qla653f6kjlsh8"; - buildDepends = [ mtl network parsec ]; - testDepends = [ - caseInsensitive conduit deepseq httpdShed httpTypes HUnit mtl - network pureMD5 split testFramework testFrameworkHunit wai warp - ]; - jailbreak = true; - doCheck = false; - meta = { - homepage = "https://github.com/haskell/HTTP"; - description = "A library for client-side HTTP"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.18.nix b/pkgs/development/libraries/haskell/HTTP/default.nix index 0a5a16dfadc3..0a5a16dfadc3 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.18.nix +++ b/pkgs/development/libraries/haskell/HTTP/default.nix diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix b/pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix deleted file mode 100644 index 7bd199555d79..000000000000 --- a/pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "HUnit"; - version = "1.2.0.3"; - sha256 = "954f584f7c096c3ddef677e70b3811195bb4fd18dfdb4727a260ca7d7465de12"; - meta = { - homepage = "http://hunit.sourceforge.net/"; - description = "A unit testing framework for Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix b/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix deleted file mode 100644 index e995adab83c8..000000000000 --- a/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "HUnit"; - version = "1.2.2.1"; - sha256 = "47235503b666658588181795540d29212283059b21edc42e1b4f1998e46ac853"; - isLibrary = true; - isExecutable = true; - meta = { - homepage = "http://hunit.sourceforge.net/"; - description = "A unit testing framework for Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix b/pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix deleted file mode 100644 index 13483375823f..000000000000 --- a/pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "HUnit"; - version = "1.2.4.2"; - sha256 = "0yijvrjmmz6vvgi5h1195z4psmymvhq6rr7kkd26nqbd34lbrg7x"; - isLibrary = true; - isExecutable = true; - meta = { - homepage = "http://hunit.sourceforge.net/"; - description = "A unit testing framework for Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.4.3.nix b/pkgs/development/libraries/haskell/HUnit/1.2.4.3.nix deleted file mode 100644 index 6f866137945c..000000000000 --- a/pkgs/development/libraries/haskell/HUnit/1.2.4.3.nix +++ /dev/null @@ -1,19 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, deepseq }: - -cabal.mkDerivation (self: { - pname = "HUnit"; - version = "1.2.4.3"; - sha256 = "0sk2s0g28wly64nisgrj4wr914zx940pvj5zvkv9n467vssywzbr"; - isLibrary = true; - isExecutable = true; - buildDepends = [ deepseq ]; - meta = { - homepage = "http://hunit.sourceforge.net/"; - description = "A unit testing framework for Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.5.1.nix b/pkgs/development/libraries/haskell/HUnit/1.2.5.1.nix deleted file mode 100644 index ae33779597bf..000000000000 --- a/pkgs/development/libraries/haskell/HUnit/1.2.5.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, deepseq }: - -cabal.mkDerivation (self: { - pname = "HUnit"; - version = "1.2.5.1"; - sha256 = "0wa4yqgfyrfxzhdyd04xvzi4qaswbg0rrbywz8sxzkp71v91a35w"; - buildDepends = [ deepseq ]; - meta = { - homepage = "http://hunit.sourceforge.net/"; - description = "A unit testing framework for Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.5.2.nix b/pkgs/development/libraries/haskell/HUnit/default.nix index 0ab6f152aeed..0ab6f152aeed 100644 --- a/pkgs/development/libraries/haskell/HUnit/1.2.5.2.nix +++ b/pkgs/development/libraries/haskell/HUnit/default.nix diff --git a/pkgs/development/libraries/haskell/HaTeX/default.nix b/pkgs/development/libraries/haskell/HaTeX/default.nix index 3712dda87eb8..c2968cfc8e6a 100644 --- a/pkgs/development/libraries/haskell/HaTeX/default.nix +++ b/pkgs/development/libraries/haskell/HaTeX/default.nix @@ -6,14 +6,14 @@ cabal.mkDerivation (self: { pname = "HaTeX"; - version = "3.13.1.0"; - sha256 = "1ciifdb7yd79lvwdcxj8dq98dfmm9pg25rx9rc2wjn2jnp8j85r7"; + version = "3.15.0.0"; + sha256 = "1rhxml458d8y0vxns2rp76yvfk66496mvab81i71km653n6g5kky"; buildDepends = [ matrix parsec QuickCheck text transformers wlPprintExtras ]; - testDepends = [ QuickCheck tasty tastyQuickcheck ]; + testDepends = [ QuickCheck tasty tastyQuickcheck text ]; meta = { - homepage = "http://daniel-diaz.github.io/projects/hatex"; + homepage = "http://wrongurl.net/haskell/HaTeX"; description = "The Haskell LaTeX library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/HaXml/default.nix b/pkgs/development/libraries/haskell/HaXml/default.nix index 4199ae4275b6..d20d7be551c7 100644 --- a/pkgs/development/libraries/haskell/HaXml/default.nix +++ b/pkgs/development/libraries/haskell/HaXml/default.nix @@ -4,13 +4,14 @@ cabal.mkDerivation (self: { pname = "HaXml"; - version = "1.24.1"; - sha256 = "1pvqgczksxasayvdb6d4g7ya7g7w1v9hsa35kaxm9bcic9y8q9az"; + version = "1.25"; + sha256 = "02l53v9c8qzkp5zzs31973pp27q4k2h04h9x3852gah78qjvnslk"; isLibrary = true; isExecutable = true; buildDepends = [ filepath polyparse random ]; + noHaddock = true; meta = { - homepage = "http://www.cs.york.ac.uk/fp/HaXml/"; + homepage = "http://projects.haskell.org/HaXml/"; description = "Utilities for manipulating XML documents"; license = "LGPL"; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/HandsomeSoup/default.nix b/pkgs/development/libraries/haskell/HandsomeSoup/default.nix index cbf5e87bcccb..69915ccfeefa 100644 --- a/pkgs/development/libraries/haskell/HandsomeSoup/default.nix +++ b/pkgs/development/libraries/haskell/HandsomeSoup/default.nix @@ -1,16 +1,20 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, HTTP, hxt, hxtHttp, MaybeT, mtl, network, parsec -, transformers +{ cabal, hspec, HTTP, hxt, hxtHttp, MaybeT, mtl, network +, networkUri, parsec, transformers }: cabal.mkDerivation (self: { pname = "HandsomeSoup"; - version = "0.3.2"; - sha256 = "0ixqk32sfv6kj41vc6fzflv6f6jwvnkvcdf9pmgkc675218ggh53"; + version = "0.3.5"; + sha256 = "1d1zanlr1mdxjc69xvbxg5kn5bc08gd960j6lb1x3grhcgmj9krm"; + isLibrary = true; + isExecutable = true; buildDepends = [ - HTTP hxt hxtHttp MaybeT mtl network parsec transformers + HTTP hxt hxtHttp MaybeT mtl network networkUri parsec transformers ]; + testDepends = [ hspec hxt ]; + jailbreak = true; meta = { homepage = "https://github.com/egonSchiele/HandsomeSoup"; description = "Work with HTML more easily in HXT"; diff --git a/pkgs/development/libraries/haskell/HaskellNet-SSL/default.nix b/pkgs/development/libraries/haskell/HaskellNet-SSL/default.nix index d5cc70855382..2aad877f6880 100644 --- a/pkgs/development/libraries/haskell/HaskellNet-SSL/default.nix +++ b/pkgs/development/libraries/haskell/HaskellNet-SSL/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "HaskellNet-SSL"; - version = "0.2.4"; - sha256 = "0rwj69rz8i84qj6n1zd9fllp4333azfxppd7blzd486bczzkgkbb"; + version = "0.2.5.2"; + sha256 = "0jhm43zd6jvhbahk4ki29ydg02qnjj4mw823rckqxk6f91q00qlp"; buildDepends = [ connection dataDefault HaskellNet network tls ]; meta = { homepage = "https://github.com/dpwright/HaskellNet-SSL"; diff --git a/pkgs/development/libraries/haskell/HaskellNet/default.nix b/pkgs/development/libraries/haskell/HaskellNet/default.nix index 940bdbd678d3..284bdce97376 100644 --- a/pkgs/development/libraries/haskell/HaskellNet/default.nix +++ b/pkgs/development/libraries/haskell/HaskellNet/default.nix @@ -1,12 +1,14 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, base64String, Crypto, mimeMail, mtl, network, text }: +{ cabal, base64String, cryptohash, mimeMail, mtl, network, text }: cabal.mkDerivation (self: { pname = "HaskellNet"; - version = "0.3.1"; - sha256 = "168w6y5rizszq1428amxbkhww65sy3b7czxpjyrzzq3dhjn517nr"; - buildDepends = [ base64String Crypto mimeMail mtl network text ]; + version = "0.4"; + sha256 = "152ayk35czl8fi2mar1g6c5mi3pikvnpcy967prg97a9vy0ld1yp"; + buildDepends = [ + base64String cryptohash mimeMail mtl network text + ]; meta = { homepage = "https://github.com/jtdaugherty/HaskellNet"; description = "Client support for POP3, SMTP, and IMAP"; diff --git a/pkgs/development/libraries/haskell/JuicyPixels-util/default.nix b/pkgs/development/libraries/haskell/JuicyPixels-util/default.nix index 4e680b26caed..ca3e10682fa1 100644 --- a/pkgs/development/libraries/haskell/JuicyPixels-util/default.nix +++ b/pkgs/development/libraries/haskell/JuicyPixels-util/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "JuicyPixels-util"; - version = "0.1"; - sha256 = "181wryax2k43qlblink9vcg2hk8f2qxn02ifmgxa2fl95z5ar0dc"; + version = "0.2"; + sha256 = "1b2rx5g8kd83hl50carr02mz21gvkasnsddw1f3pfvfsyfv3yyrc"; buildDepends = [ JuicyPixels vector ]; meta = { homepage = "https://github.com/fumieval/JuicyPixels-util"; diff --git a/pkgs/development/libraries/haskell/MissingH/default.nix b/pkgs/development/libraries/haskell/MissingH/default.nix index cb9b60d13c7a..3115c437b093 100644 --- a/pkgs/development/libraries/haskell/MissingH/default.nix +++ b/pkgs/development/libraries/haskell/MissingH/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "MissingH"; - version = "1.2.1.0"; - sha256 = "08zpzfhl31w35x13vapimwd508j4nydi8v3vid668r4fkqnymbss"; + version = "1.3.0.1"; + sha256 = "1cwdhgqqv2riqwhsgyrpmqyzvg19lx6zp1g7xdp4rikh7rkn03ds"; buildDepends = [ filepath hslogger HUnit mtl network parsec random regexCompat time ]; diff --git a/pkgs/development/libraries/haskell/MonadRandom/0.2.0.1.nix b/pkgs/development/libraries/haskell/MonadRandom/0.2.0.1.nix index cc430e22090f..41796adb963e 100644 --- a/pkgs/development/libraries/haskell/MonadRandom/0.2.0.1.nix +++ b/pkgs/development/libraries/haskell/MonadRandom/0.2.0.1.nix @@ -11,5 +11,6 @@ cabal.mkDerivation (self: { description = "Random-number generation monad"; license = "unknown"; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/MonadRandom/0.1.13.nix b/pkgs/development/libraries/haskell/MonadRandom/0.3.nix index 0cbd926b1f18..8b522b5de43b 100644 --- a/pkgs/development/libraries/haskell/MonadRandom/0.1.13.nix +++ b/pkgs/development/libraries/haskell/MonadRandom/0.3.nix @@ -4,13 +4,12 @@ cabal.mkDerivation (self: { pname = "MonadRandom"; - version = "0.1.13"; - sha256 = "1pi12ymsbl2l0ly3ggihg8r0ac87ax267m419cga60wp5ry5zbnk"; + version = "0.3"; + sha256 = "0bmsccjcz6glb0x0nkjlq3qywfibf0wxxv4dvdhjfw5sx6im9qx3"; buildDepends = [ mtl random transformers ]; meta = { description = "Random-number generation monad"; license = "unknown"; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/NumInstances/default.nix b/pkgs/development/libraries/haskell/NumInstances/default.nix index e5b918a5ad55..38fbbfdbfbf8 100644 --- a/pkgs/development/libraries/haskell/NumInstances/default.nix +++ b/pkgs/development/libraries/haskell/NumInstances/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "NumInstances"; - version = "1.3"; - sha256 = "0w1hls5azsg95c0v510xqgr8hs195y2rxzjc7hpjg8q44d4z78sh"; + version = "1.4"; + sha256 = "0ycnwn09izajv330l7a31mc0alifqmxjsn9qmfswwnbg6i4jmnyb"; meta = { homepage = "https://github.com/conal/NumInstances"; description = "Instances of numeric classes for functions and tuples"; diff --git a/pkgs/development/libraries/haskell/ObjectName/default.nix b/pkgs/development/libraries/haskell/ObjectName/default.nix index 785caabadd2e..e2fed3f2191d 100644 --- a/pkgs/development/libraries/haskell/ObjectName/default.nix +++ b/pkgs/development/libraries/haskell/ObjectName/default.nix @@ -4,10 +4,10 @@ cabal.mkDerivation (self: { pname = "ObjectName"; - version = "1.0.0.0"; - sha256 = "0yr1aa0ail2h9qsq2bslcwwq6cxl2lzajmc1laj19r7ks62p32rm"; + version = "1.0.1.0"; + sha256 = "1aw221i1cisk7jpgchs16f3br0ddllh0n0idhw5v6n6ysv4vv155"; meta = { - homepage = "http://www.haskell.org/HOpenGL/"; + homepage = "https://github.com/haskell-opengl/ObjectName"; description = "Explicitly handled object names"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix b/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix deleted file mode 100644 index 747720eba85c..000000000000 --- a/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, libX11, mesa }: - -cabal.mkDerivation (self: { - pname = "OpenGL"; - version = "2.2.1.1"; - sha256 = "926ca25cf9502cdaaeb8ade484015468cb60594e1bfbf0e04bd01235d8d9a792"; - extraLibraries = [ libX11 mesa ]; - meta = { - homepage = "http://www.haskell.org/HOpenGL/"; - description = "A binding for the OpenGL graphics system"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix b/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix deleted file mode 100644 index af01702b01b1..000000000000 --- a/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, libX11, mesa }: - -cabal.mkDerivation (self: { - pname = "OpenGL"; - version = "2.2.3.0"; - sha256 = "00h5zdm64mfj5fwnd52kyn9aynsbzqwfic0ymjjakz90pdvk4p57"; - extraLibraries = [ libX11 mesa ]; - meta = { - homepage = "http://www.haskell.org/HOpenGL/"; - description = "A binding for the OpenGL graphics system"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/OpenGL/2.2.3.1.nix b/pkgs/development/libraries/haskell/OpenGL/2.2.3.1.nix deleted file mode 100644 index fa3ae576bfae..000000000000 --- a/pkgs/development/libraries/haskell/OpenGL/2.2.3.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, libX11, mesa }: - -cabal.mkDerivation (self: { - pname = "OpenGL"; - version = "2.2.3.1"; - sha256 = "1vl5i1l76mjc0p18awdrvdcpszaz1z891505cqmn1xlld7ijb14z"; - extraLibraries = [ libX11 mesa ]; - meta = { - homepage = "http://www.haskell.org/HOpenGL/"; - description = "A binding for the OpenGL graphics system"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix b/pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix deleted file mode 100644 index 81e754e269f8..000000000000 --- a/pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, GLURaw, libX11, mesa, ObjectName, OpenGLRaw, StateVar -, Tensor -}: - -cabal.mkDerivation (self: { - pname = "OpenGL"; - version = "2.4.0.2"; - sha256 = "00rjvm02p6h8vbyxi3ri4jkk75ki414wk5al2z2fsszjfpdl93b6"; - buildDepends = [ GLURaw ObjectName OpenGLRaw StateVar Tensor ]; - extraLibraries = [ libX11 mesa ]; - meta = { - homepage = "http://www.haskell.org/haskellwiki/Opengl"; - description = "A binding for the OpenGL graphics system"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/OpenGL/2.6.0.1.nix b/pkgs/development/libraries/haskell/OpenGL/2.6.0.1.nix deleted file mode 100644 index a0ae3c84fad9..000000000000 --- a/pkgs/development/libraries/haskell/OpenGL/2.6.0.1.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, GLURaw, libX11, mesa, ObjectName, OpenGLRaw, StateVar -, Tensor -}: - -cabal.mkDerivation (self: { - pname = "OpenGL"; - version = "2.6.0.1"; - sha256 = "1fpabhpjfl1bj0dhlj2sg8zsn3l6py4zw1arplwmqalz3xbkkgdi"; - buildDepends = [ GLURaw ObjectName OpenGLRaw StateVar Tensor ]; - extraLibraries = [ libX11 mesa ]; - meta = { - homepage = "http://www.haskell.org/haskellwiki/Opengl"; - description = "A binding for the OpenGL graphics system"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/OpenGL/2.8.0.0.nix b/pkgs/development/libraries/haskell/OpenGL/2.8.0.0.nix deleted file mode 100644 index ea1fdcc97115..000000000000 --- a/pkgs/development/libraries/haskell/OpenGL/2.8.0.0.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, GLURaw, libX11, mesa, OpenGLRaw }: - -cabal.mkDerivation (self: { - pname = "OpenGL"; - version = "2.8.0.0"; - sha256 = "1wb5772dhh4a81ks9zxz8adpfxa97hcna9s263h9cl2vny6ksxff"; - buildDepends = [ GLURaw OpenGLRaw ]; - extraLibraries = [ libX11 mesa ]; - meta = { - homepage = "http://www.haskell.org/haskellwiki/Opengl"; - description = "A binding for the OpenGL graphics system"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/OpenGL/2.9.2.0.nix b/pkgs/development/libraries/haskell/OpenGL/default.nix index f6767ab577c2..f6767ab577c2 100644 --- a/pkgs/development/libraries/haskell/OpenGL/2.9.2.0.nix +++ b/pkgs/development/libraries/haskell/OpenGL/default.nix diff --git a/pkgs/development/libraries/haskell/OpenGLRaw/1.3.0.0.nix b/pkgs/development/libraries/haskell/OpenGLRaw/1.3.0.0.nix deleted file mode 100644 index c3d8ce498819..000000000000 --- a/pkgs/development/libraries/haskell/OpenGLRaw/1.3.0.0.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mesa }: - -cabal.mkDerivation (self: { - pname = "OpenGLRaw"; - version = "1.3.0.0"; - sha256 = "0ifp5inrm48hzpq0x9hlk5cxh2k64y05phmsdb5hydb7r6dcla32"; - extraLibraries = [ mesa ]; - meta = { - homepage = "http://www.haskell.org/haskellwiki/Opengl"; - description = "A raw binding for the OpenGL graphics system"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/OpenGLRaw/1.4.0.0.nix b/pkgs/development/libraries/haskell/OpenGLRaw/1.4.0.0.nix deleted file mode 100644 index a2ffc9b4ad13..000000000000 --- a/pkgs/development/libraries/haskell/OpenGLRaw/1.4.0.0.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mesa }: - -cabal.mkDerivation (self: { - pname = "OpenGLRaw"; - version = "1.4.0.0"; - sha256 = "112xaz01950pyjaw3cv9yvw4w3gqbf79idyyh05ain7x29m7bxkh"; - extraLibraries = [ mesa ]; - meta = { - homepage = "http://www.haskell.org/haskellwiki/Opengl"; - description = "A raw binding for the OpenGL graphics system"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/OpenGLRaw/1.5.0.0.nix b/pkgs/development/libraries/haskell/OpenGLRaw/default.nix index 65466306fd80..65466306fd80 100644 --- a/pkgs/development/libraries/haskell/OpenGLRaw/1.5.0.0.nix +++ b/pkgs/development/libraries/haskell/OpenGLRaw/default.nix diff --git a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix b/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix deleted file mode 100644 index 465fb510b50e..000000000000 --- a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, random }: - -cabal.mkDerivation (self: { - pname = "QuickCheck"; - version = "1.2.0.0"; - sha256 = "21672d817913ac7ab6d3fd7f102dd5d0f115a0826c95b9604c8c0b0171e8d4ed"; - buildDepends = [ random ]; - meta = { - homepage = "http://www.math.chalmers.se/~rjmh/QuickCheck/"; - description = "Automatic testing of Haskell programs"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix b/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix deleted file mode 100644 index ba16967249db..000000000000 --- a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, random }: - -cabal.mkDerivation (self: { - pname = "QuickCheck"; - version = "1.2.0.1"; - sha256 = "1gxpvbc0ab4n35b5zcbzng8qc7y3mzgym8cj42bci984f08y1bld"; - buildDepends = [ random ]; - meta = { - homepage = "http://www.math.chalmers.se/~rjmh/QuickCheck/"; - description = "Automatic testing of Haskell programs"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix deleted file mode 100644 index 373742a9755a..000000000000 --- a/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, extensibleExceptions, mtl, random }: - -cabal.mkDerivation (self: { - pname = "QuickCheck"; - version = "2.1.1.1"; - sha256 = "626a6f7a69e2bea3b4fe7c573d0bc8da8c77f97035cb2d3a5e1c9fca382b59c9"; - buildDepends = [ extensibleExceptions mtl random ]; - meta = { - homepage = "http://www.cse.chalmers.se/~koen"; - description = "Automatic testing of Haskell programs"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix deleted file mode 100644 index 3bee4ac97026..000000000000 --- a/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, extensibleExceptions, mtl, random }: - -cabal.mkDerivation (self: { - pname = "QuickCheck"; - version = "2.4.0.1"; - sha256 = "1x7jc2svpxbll8qkrbswh5q59sqcjf2v5a6jnqslf5gwr5qpq18r"; - buildDepends = [ extensibleExceptions mtl random ]; - meta = { - homepage = "http://code.haskell.org/QuickCheck"; - description = "Automatic testing of Haskell programs"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix deleted file mode 100644 index d936d4b37841..000000000000 --- a/pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, extensibleExceptions, random }: - -cabal.mkDerivation (self: { - pname = "QuickCheck"; - version = "2.4.1.1"; - sha256 = "06vrn0j26ai2jfl32yd3kx8by4pimcinjf23b0dyc35z2gb139wj"; - buildDepends = [ extensibleExceptions random ]; - meta = { - homepage = "http://code.haskell.org/QuickCheck"; - description = "Automatic testing of Haskell programs"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix b/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix deleted file mode 100644 index 58a04593c494..000000000000 --- a/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, extensibleExceptions, random }: - -cabal.mkDerivation (self: { - pname = "QuickCheck"; - version = "2.4.2"; - sha256 = "17qp73sdp780lha3i6xdsrvgshqz47qwldqknadc0w3vmscw61bg"; - buildDepends = [ extensibleExceptions random ]; - meta = { - homepage = "http://code.haskell.org/QuickCheck"; - description = "Automatic testing of Haskell programs"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.5.1.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.5.1.1.nix deleted file mode 100644 index 438c4cfff8db..000000000000 --- a/pkgs/development/libraries/haskell/QuickCheck/2.5.1.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, random }: - -cabal.mkDerivation (self: { - pname = "QuickCheck"; - version = "2.5.1.1"; - sha256 = "1ff2mhm27l8cc8nrsbw2z65dc9m7h879jykl5g7yqip5l88j0jcq"; - buildDepends = [ random ]; - meta = { - homepage = "http://code.haskell.org/QuickCheck"; - description = "Automatic testing of Haskell programs"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.6.nix b/pkgs/development/libraries/haskell/QuickCheck/2.6.nix deleted file mode 100644 index 0ed568384358..000000000000 --- a/pkgs/development/libraries/haskell/QuickCheck/2.6.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, random }: - -cabal.mkDerivation (self: { - pname = "QuickCheck"; - version = "2.6"; - sha256 = "03cp7mshjy2yrg31i13b9kmc2a6lrmrbl1sh9s8lswcj305c00c0"; - buildDepends = [ random ]; - meta = { - homepage = "http://code.haskell.org/QuickCheck"; - description = "Automatic testing of Haskell programs"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.7.5.nix b/pkgs/development/libraries/haskell/QuickCheck/2.7.5.nix deleted file mode 100644 index 26115cb8814a..000000000000 --- a/pkgs/development/libraries/haskell/QuickCheck/2.7.5.nix +++ /dev/null @@ -1,19 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, random, testFramework, tfRandom, transformers }: - -cabal.mkDerivation (self: { - pname = "QuickCheck"; - version = "2.7.5"; - sha256 = "1bak50yxf8qfwfw1f5bd2p1ynx1ndjv24yp6gd2a2a1fag34x0rb"; - buildDepends = [ random tfRandom transformers ]; - testDepends = [ testFramework ]; - noHaddock = self.stdenv.lib.versionOlder self.ghc.version "6.11"; - meta = { - homepage = "https://github.com/nick8325/quickcheck"; - description = "Automatic testing of Haskell programs"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.7.6.nix b/pkgs/development/libraries/haskell/QuickCheck/default.nix index 3c623e9f0dd5..3c623e9f0dd5 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/2.7.6.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/default.nix diff --git a/pkgs/development/libraries/haskell/RSA/default.nix b/pkgs/development/libraries/haskell/RSA/default.nix index 61c2d0fb225e..53655d467659 100644 --- a/pkgs/development/libraries/haskell/RSA/default.nix +++ b/pkgs/development/libraries/haskell/RSA/default.nix @@ -1,20 +1,14 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, binary, cryptoApi, cryptoPubkeyTypes, DRBG -, monadcryptorandom, pureMD5, QuickCheck, SHA, tagged -, testFramework, testFrameworkQuickcheck2 +{ cabal, binary, cryptoApi, cryptoPubkeyTypes, DRBG, pureMD5 +, QuickCheck, SHA, tagged, testFramework, testFrameworkQuickcheck2 }: cabal.mkDerivation (self: { pname = "RSA"; - version = "2.0.0"; - sha256 = "1v2d6sxpqr0lmiqdr3ym5qzp3p1y57yj6939vdlsac6k6ifj6pwq"; - isLibrary = true; - isExecutable = true; - buildDepends = [ - binary cryptoApi cryptoPubkeyTypes DRBG monadcryptorandom pureMD5 - QuickCheck SHA tagged testFramework testFrameworkQuickcheck2 - ]; + version = "2.1.0"; + sha256 = "0bhnnz7vp1942ac2vg0y6vsag9bm0pslnm4ix6lmw28hy6d1jk2a"; + buildDepends = [ binary cryptoApi cryptoPubkeyTypes pureMD5 SHA ]; testDepends = [ binary cryptoApi cryptoPubkeyTypes DRBG pureMD5 QuickCheck SHA tagged testFramework testFrameworkQuickcheck2 diff --git a/pkgs/development/libraries/haskell/ReadArgs/default.nix b/pkgs/development/libraries/haskell/ReadArgs/default.nix index 484aacb91f02..c9f107449767 100644 --- a/pkgs/development/libraries/haskell/ReadArgs/default.nix +++ b/pkgs/development/libraries/haskell/ReadArgs/default.nix @@ -4,12 +4,13 @@ cabal.mkDerivation (self: { pname = "ReadArgs"; - version = "1.2.1"; - sha256 = "099gg6nq70yf2pl5ya8f083lw8x5rncnv54y2p5jlkdwfwmpmbnv"; + version = "1.2.2"; + sha256 = "1v6yr5zzrrj31prfzxxh1n27sfnkqpkw34v3a47rcnm444ba58a7"; isLibrary = true; isExecutable = true; buildDepends = [ systemFilepath text ]; testDepends = [ hspec systemFilepath text ]; + jailbreak = true; meta = { homepage = "http://github.com/rampion/ReadArgs"; description = "Simple command line argument parsing"; diff --git a/pkgs/development/libraries/haskell/StateVar/default.nix b/pkgs/development/libraries/haskell/StateVar/default.nix index 03d21bbba3cc..b4bd9b44e3f8 100644 --- a/pkgs/development/libraries/haskell/StateVar/default.nix +++ b/pkgs/development/libraries/haskell/StateVar/default.nix @@ -4,10 +4,10 @@ cabal.mkDerivation (self: { pname = "StateVar"; - version = "1.0.0.0"; - sha256 = "1c1b6a6nn1cdnba08zzp0645wl482h7yaa69zw2l3wwyyyccjic4"; + version = "1.0.1.0"; + sha256 = "02n2sxxkr0ydc77dc3amwp5jrw289d2s2z55rhrmhxxg1c7lp5js"; meta = { - homepage = "http://www.haskell.org/HOpenGL/"; + homepage = "https://github.com/haskell-opengl/StateVar"; description = "State variables"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/Tensor/default.nix b/pkgs/development/libraries/haskell/Tensor/default.nix index 55c110b75218..8b5869caae9e 100644 --- a/pkgs/development/libraries/haskell/Tensor/default.nix +++ b/pkgs/development/libraries/haskell/Tensor/default.nix @@ -4,13 +4,12 @@ cabal.mkDerivation (self: { pname = "Tensor"; - version = "1.0.0.1"; - sha256 = "10arhk5gkn5jxpb53r80bblpk0afdax1fc2mik40hj5g5g960cp9"; + version = "1.1.0.0"; + sha256 = "1vn409805p5b47v5mf7rk0gypqag5bn1pzlsmsp9blr3jyj6dgph"; meta = { - homepage = "http://www.haskell.org/HOpenGL/"; + homepage = "https://github.com/haskell-opengl/Tensor"; description = "Tensor data types"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/Thrift/default.nix b/pkgs/development/libraries/haskell/Thrift/default.nix index 6e37fe2ca494..bbd5f45f9caa 100644 --- a/pkgs/development/libraries/haskell/Thrift/default.nix +++ b/pkgs/development/libraries/haskell/Thrift/default.nix @@ -12,5 +12,6 @@ cabal.mkDerivation (self: { description = "Haskell bindings for the Apache Thrift RPC system"; license = "unknown"; platforms = self.ghc.meta.platforms; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/Unixutils/default.nix b/pkgs/development/libraries/haskell/Unixutils/default.nix index baabbbc6546f..c776686509b3 100644 --- a/pkgs/development/libraries/haskell/Unixutils/default.nix +++ b/pkgs/development/libraries/haskell/Unixutils/default.nix @@ -8,7 +8,7 @@ cabal.mkDerivation (self: { sha256 = "1gp04mc6irycwazykl9kpyhkkryn3hbnpn08ih6cjbsm3p8yi8b4"; buildDepends = [ filepath pureMD5 regexTdfa zlib ]; meta = { - homepage = "http://src.seereason.com/haskell-unixutils"; + homepage = "https://github.com/seereason/haskell-unixutils"; description = "A crude interface between Haskell and Unix-like operating systems"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/WAVE/default.nix b/pkgs/development/libraries/haskell/WAVE/default.nix new file mode 100644 index 000000000000..6082f5e76cf5 --- /dev/null +++ b/pkgs/development/libraries/haskell/WAVE/default.nix @@ -0,0 +1,19 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, parseargs }: + +cabal.mkDerivation (self: { + pname = "WAVE"; + version = "0.1.3"; + sha256 = "1cgla9y1lwcsdad5qdspymd7s6skdw961fgzh02kvi7gjbrrcyi7"; + isLibrary = true; + isExecutable = true; + buildDepends = [ parseargs ]; + meta = { + homepage = "http://github.com/BartMassey/WAVE"; + description = "WAVE audio file IO library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/acid-state/default.nix b/pkgs/development/libraries/haskell/acid-state/default.nix index c7067dd66020..ab2e682fdc89 100644 --- a/pkgs/development/libraries/haskell/acid-state/default.nix +++ b/pkgs/development/libraries/haskell/acid-state/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "acid-state"; - version = "0.12.2"; - sha256 = "0hwi2254bj84djxmah23vy3xw8binh75fsn8ac6y89rwc8i35w1f"; + version = "0.12.3"; + sha256 = "099n8a5qxrjzhw0jgmshcpkvynkj2v4a8a6lwy9fvg586nhcy9j1"; buildDepends = [ cereal extensibleExceptions filepath mtl network safecopy stm ]; diff --git a/pkgs/development/libraries/haskell/acme-lookofdisapproval/default.nix b/pkgs/development/libraries/haskell/acme-lookofdisapproval/default.nix new file mode 100644 index 000000000000..6b2a9856a90e --- /dev/null +++ b/pkgs/development/libraries/haskell/acme-lookofdisapproval/default.nix @@ -0,0 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal }: + +cabal.mkDerivation (self: { + pname = "acme-lookofdisapproval"; + version = "0.1"; + sha256 = "194xvcab14bs3b3nrayxp4z3da60afxa9cmip58mkms5016kwhis"; + meta = { + homepage = "https://github.com/llelf/acme-lookofdisapproval"; + description = "Express your disapproval"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/aeson/0.7.0.6.nix b/pkgs/development/libraries/haskell/aeson/0.7.0.6.nix deleted file mode 100644 index b5626f63932a..000000000000 --- a/pkgs/development/libraries/haskell/aeson/0.7.0.6.nix +++ /dev/null @@ -1,28 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, attoparsec, blazeBuilder, deepseq, dlist, hashable, HUnit -, mtl, QuickCheck, scientific, syb, testFramework -, testFrameworkHunit, testFrameworkQuickcheck2, text, time -, unorderedContainers, vector -}: - -cabal.mkDerivation (self: { - pname = "aeson"; - version = "0.7.0.6"; - sha256 = "0vsf9msz9iv7xvsnys5c0kbkldb0pvhiai02vz50b0d1kdsk2mb4"; - buildDepends = [ - attoparsec blazeBuilder deepseq dlist hashable mtl scientific syb - text time unorderedContainers vector - ]; - testDepends = [ - attoparsec HUnit QuickCheck testFramework testFrameworkHunit - testFrameworkQuickcheck2 text time unorderedContainers vector - ]; - meta = { - homepage = "https://github.com/bos/aeson"; - description = "Fast JSON parsing and encoding"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/aeson/0.8.0.0.nix b/pkgs/development/libraries/haskell/aeson/0.8.0.2.nix index de9708f25461..0625dcf19136 100644 --- a/pkgs/development/libraries/haskell/aeson/0.8.0.0.nix +++ b/pkgs/development/libraries/haskell/aeson/0.8.0.2.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "aeson"; - version = "0.8.0.0"; - sha256 = "0p2x03wjawhav87jp57vwclra0gjwn1gqk74zgnji25ypwsvgkk4"; + version = "0.8.0.2"; + sha256 = "1mc8cwmswx69r77wv7dfim525jqajnlxbcx5xf3ygpszzf6mh1q7"; buildDepends = [ attoparsec blazeBuilder deepseq dlist hashable mtl scientific syb text time unorderedContainers vector diff --git a/pkgs/development/libraries/haskell/ansi-terminal/default.nix b/pkgs/development/libraries/haskell/ansi-terminal/default.nix index ecacc374e43c..26fbb43ec04f 100644 --- a/pkgs/development/libraries/haskell/ansi-terminal/default.nix +++ b/pkgs/development/libraries/haskell/ansi-terminal/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "ansi-terminal"; - version = "0.6.1.1"; - sha256 = "06pdcpp2z7wk9mkr5lzwk64lqhj09c7l1ah4s3vz7zwrdzfaccwi"; + version = "0.6.2.1"; + sha256 = "1xmp8wpcyvqys777qpyfx99bhlnvmr7jil7r78j5n6fx3mkkhnln"; isLibrary = true; isExecutable = true; meta = { diff --git a/pkgs/development/libraries/haskell/ariadne/default.nix b/pkgs/development/libraries/haskell/ariadne/default.nix index 758d1a90d3b9..f087787f67f3 100644 --- a/pkgs/development/libraries/haskell/ariadne/default.nix +++ b/pkgs/development/libraries/haskell/ariadne/default.nix @@ -1,19 +1,26 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, bert, Cabal, haskellNames, haskellPackages, haskellSrcExts -, mtl, utf8String +{ cabal, async, bert, Cabal, dataLens, dataLensFd, dataLensTemplate +, filepath, haskellNames, haskellPackages, haskellSrcExts, hseCpp +, hslogger, mtl, stm, tagged, tasty, tastyHunit, transformers +, utf8String }: cabal.mkDerivation (self: { pname = "ariadne"; - version = "0.1.2.1"; - sha256 = "1gx6jrv3s86h02cjx8pvqyklp445ljiysx29hg39qykyhi1q5a3z"; + version = "0.1.2.3"; + sha256 = "02hyn3y4h7w4l5k48kp73al67lp8vzlymblb7al72w14r01ww8p3"; isLibrary = false; isExecutable = true; buildDepends = [ - bert Cabal haskellNames haskellPackages haskellSrcExts mtl - utf8String + async bert Cabal dataLens dataLensFd dataLensTemplate filepath + haskellNames haskellPackages haskellSrcExts hseCpp hslogger mtl stm + tagged transformers utf8String ]; + testDepends = [ + bert filepath haskellSrcExts tasty tastyHunit utf8String + ]; + doCheck = false; meta = { homepage = "https://github.com/feuerbach/ariadne"; description = "Go-to-definition for Haskell"; diff --git a/pkgs/development/libraries/haskell/asn1-encoding/default.nix b/pkgs/development/libraries/haskell/asn1-encoding/default.nix index 1cc87f5ce5e8..cb35f70d1b58 100644 --- a/pkgs/development/libraries/haskell/asn1-encoding/default.nix +++ b/pkgs/development/libraries/haskell/asn1-encoding/default.nix @@ -1,14 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, asn1Types, mtl, text, time }: +{ cabal, asn1Types, hourglass, mtl, tasty, tastyQuickcheck, text }: cabal.mkDerivation (self: { pname = "asn1-encoding"; - version = "0.8.1.3"; - sha256 = "000rajx9gdxfyx521yg2mvp1z8h61sr96w1lzwawiw7n5ng6v8ni"; - isLibrary = true; - isExecutable = true; - buildDepends = [ asn1Types mtl text time ]; + version = "0.9.0"; + sha256 = "02x3lzyl4gavl3lc2lrg8rknyvs6r2hf8kmm7xrmma5m857iks8p"; + buildDepends = [ asn1Types hourglass mtl ]; + testDepends = [ + asn1Types hourglass mtl tasty tastyQuickcheck text + ]; + doCheck = false; meta = { homepage = "http://github.com/vincenthz/hs-asn1"; description = "ASN1 data reader and writer in RAW, BER and DER forms"; diff --git a/pkgs/development/libraries/haskell/asn1-parse/default.nix b/pkgs/development/libraries/haskell/asn1-parse/default.nix index 5786823ce7b8..5d6bf33bb268 100644 --- a/pkgs/development/libraries/haskell/asn1-parse/default.nix +++ b/pkgs/development/libraries/haskell/asn1-parse/default.nix @@ -1,12 +1,12 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, asn1Encoding, asn1Types, mtl, text, time }: +{ cabal, asn1Encoding, asn1Types, mtl, text }: cabal.mkDerivation (self: { pname = "asn1-parse"; - version = "0.8.1"; - sha256 = "021mbm5aayfx9vhxq4x1jj3gpnzq0bqaqcl1zsaa2a6l0qzpnmh9"; - buildDepends = [ asn1Encoding asn1Types mtl text time ]; + version = "0.9.0"; + sha256 = "0m093wwndyxvy72qlnb70bp8w5ahimrlv1dp972l9s9l5jc4pjg3"; + buildDepends = [ asn1Encoding asn1Types mtl text ]; meta = { homepage = "http://github.com/vincenthz/hs-asn1"; description = "Simple monadic parser for ASN1 stream types"; diff --git a/pkgs/development/libraries/haskell/asn1-types/default.nix b/pkgs/development/libraries/haskell/asn1-types/default.nix index ad9492bf3fad..d2566add400b 100644 --- a/pkgs/development/libraries/haskell/asn1-types/default.nix +++ b/pkgs/development/libraries/haskell/asn1-types/default.nix @@ -1,12 +1,12 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, time }: +{ cabal, hourglass }: cabal.mkDerivation (self: { pname = "asn1-types"; - version = "0.2.3"; - sha256 = "1cdzhj6zls6qmy82218cj2a25b7rkxsjbcqnx4zng3wp6s5pghw4"; - buildDepends = [ time ]; + version = "0.3.0"; + sha256 = "1am8nmfarv7ymy3rqm0js2i82v6n6qwz0lnzb1qdmy4ligcdm65r"; + buildDepends = [ hourglass ]; meta = { homepage = "http://github.com/vincenthz/hs-asn1-types"; description = "ASN.1 types"; diff --git a/pkgs/development/libraries/haskell/async/2.0.1.3.nix b/pkgs/development/libraries/haskell/async/2.0.1.3.nix deleted file mode 100644 index a60830309e78..000000000000 --- a/pkgs/development/libraries/haskell/async/2.0.1.3.nix +++ /dev/null @@ -1,19 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, HUnit, stm, testFramework, testFrameworkHunit }: - -cabal.mkDerivation (self: { - pname = "async"; - version = "2.0.1.3"; - sha256 = "1rbjr6xw5sp8npw17fxg0942kikssv2hyci2sy26r0na98483mkh"; - buildDepends = [ stm ]; - testDepends = [ HUnit testFramework testFrameworkHunit ]; - jailbreak = true; - meta = { - homepage = "https://github.com/simonmar/async"; - description = "Run IO operations asynchronously and wait for their results"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/atomic-primops/default.nix b/pkgs/development/libraries/haskell/atomic-primops/default.nix index 466a44290917..5a84686d3a43 100644 --- a/pkgs/development/libraries/haskell/atomic-primops/default.nix +++ b/pkgs/development/libraries/haskell/atomic-primops/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "atomic-primops"; - version = "0.6.0.6"; - sha256 = "10i9s6d9951z9bf88w1vxcfb9z9axm2q4kf8wy6zd5gcc8hm7wcb"; + version = "0.6.1"; + sha256 = "1j8slmqsyhvx7xns1qpvbmcjsfqfkphycv32hgcmk17wl1fzbyi7"; buildDepends = [ primitive ]; meta = { homepage = "https://github.com/rrnewton/haskell-lockfree/wiki"; diff --git a/pkgs/development/libraries/haskell/attoparsec/0.11.3.4.nix b/pkgs/development/libraries/haskell/attoparsec/0.11.3.4.nix deleted file mode 100644 index e322f6de4ce0..000000000000 --- a/pkgs/development/libraries/haskell/attoparsec/0.11.3.4.nix +++ /dev/null @@ -1,22 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, deepseq, QuickCheck, scientific, testFramework -, testFrameworkQuickcheck2, text -}: - -cabal.mkDerivation (self: { - pname = "attoparsec"; - version = "0.11.3.4"; - sha256 = "1zahmkb0n7jz0di35x3r8s0xnfg1awqybh2x2zicxbwazl4f53hi"; - buildDepends = [ deepseq scientific text ]; - testDepends = [ - QuickCheck testFramework testFrameworkQuickcheck2 text - ]; - meta = { - homepage = "https://github.com/bos/attoparsec"; - description = "Fast combinator parsing for bytestrings and text"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/authenticate-oauth/default.nix b/pkgs/development/libraries/haskell/authenticate-oauth/default.nix index ae996df0d5bf..a6f464156835 100644 --- a/pkgs/development/libraries/haskell/authenticate-oauth/default.nix +++ b/pkgs/development/libraries/haskell/authenticate-oauth/default.nix @@ -13,6 +13,7 @@ cabal.mkDerivation (self: { base64Bytestring blazeBuilder blazeBuilderConduit cryptoPubkeyTypes dataDefault httpClient httpTypes random RSA SHA time transformers ]; + jailbreak = true; meta = { homepage = "http://github.com/yesodweb/authenticate"; description = "Library to authenticate with OAuth for Haskell web applications"; diff --git a/pkgs/development/libraries/haskell/auto-update/default.nix b/pkgs/development/libraries/haskell/auto-update/default.nix index edfcbe4e342b..3ca150892447 100644 --- a/pkgs/development/libraries/haskell/auto-update/default.nix +++ b/pkgs/development/libraries/haskell/auto-update/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "auto-update"; - version = "0.1.1.3"; - sha256 = "06izsfd3xiragzac682vg3bmr6947y8s4yr2r7rip7qjvsja2yhy"; + version = "0.1.2"; + sha256 = "0ccix41jjpqkzvnfr5md1cbhsa9fkv6dy7yw73j8dnvqbqnz1z0l"; meta = { homepage = "https://github.com/yesodweb/wai"; description = "Efficiently run periodic, on-demand actions"; diff --git a/pkgs/development/libraries/haskell/aws-ec2/default.nix b/pkgs/development/libraries/haskell/aws-ec2/default.nix new file mode 100644 index 000000000000..8fec25eb9cbc --- /dev/null +++ b/pkgs/development/libraries/haskell/aws-ec2/default.nix @@ -0,0 +1,27 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, aws, base16Bytestring, base64Bytestring +, blazeBuilder, byteable, conduitExtra, cryptohash, httpConduit +, httpTypes, mtl, optparseApplicative, resourcet, scientific, text +, time, unorderedContainers, vector, xmlConduit +}: + +cabal.mkDerivation (self: { + pname = "aws-ec2"; + version = "0.2.2"; + sha256 = "1jlm6a4mb3mzzvql8llnvci4qd8imf58m681iqhcw1qq6hy56srl"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson aws base16Bytestring base64Bytestring blazeBuilder byteable + conduitExtra cryptohash httpConduit httpTypes mtl + optparseApplicative resourcet scientific text time + unorderedContainers vector xmlConduit + ]; + meta = { + homepage = "https://github.com/zalora/aws-ec2"; + description = "AWS EC2/VPC, ELB and CloudWatch client library for Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/base-prelude/default.nix b/pkgs/development/libraries/haskell/base-prelude/default.nix index 1799fa6a6bae..fdbd2b855102 100644 --- a/pkgs/development/libraries/haskell/base-prelude/default.nix +++ b/pkgs/development/libraries/haskell/base-prelude/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "base-prelude"; - version = "0.1.4"; - sha256 = "10xvzkzlmyrq0mi6056rl6hq4bga1k1c6671b1bxjhgzgqrzpjpz"; + version = "0.1.6"; + sha256 = "1lc8j3wfaqh42pqshlizkpr67ghkr1m90m1g9xiw8h36p8n72fcm"; meta = { homepage = "https://github.com/nikita-volkov/base-prelude"; description = "The most complete prelude formed from only the \"base\" package"; diff --git a/pkgs/development/libraries/haskell/basic-prelude/default.nix b/pkgs/development/libraries/haskell/basic-prelude/default.nix index d5a33db11ac7..5cbd6c9fe143 100644 --- a/pkgs/development/libraries/haskell/basic-prelude/default.nix +++ b/pkgs/development/libraries/haskell/basic-prelude/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "basic-prelude"; - version = "0.3.9"; - sha256 = "0f2l8xryagl1f0d30gq1hhydjnn77qhhwgg9l44gvqn30y2n66h7"; + version = "0.3.10"; + sha256 = "10013ni7kpqlc6s3ryfvmklw3ic5h48rm4wsrb31pcp5xja0qk59"; buildDepends = [ hashable liftedBase ReadArgs safe systemFilepath text transformers unorderedContainers vector diff --git a/pkgs/development/libraries/haskell/bert/default.nix b/pkgs/development/libraries/haskell/bert/default.nix index a9521076bd73..953407735e61 100644 --- a/pkgs/development/libraries/haskell/bert/default.nix +++ b/pkgs/development/libraries/haskell/bert/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "bert"; - version = "1.2.2.2"; - sha256 = "0bjrqgm0dpsrk1nivxmw2wvx33v7z7swgy3p5fb51vg7y81776cz"; + version = "1.2.2.3"; + sha256 = "1waq40hd9wqavzhnvfk1i6wjqkmfb4pl17h4acfzzyz8bj76alkq"; buildDepends = [ binary binaryConduit conduit conduitExtra mtl network parsec time void diff --git a/pkgs/development/libraries/haskell/bifunctors/default.nix b/pkgs/development/libraries/haskell/bifunctors/default.nix index 8bbfddd781a2..78a34c53b37d 100644 --- a/pkgs/development/libraries/haskell/bifunctors/default.nix +++ b/pkgs/development/libraries/haskell/bifunctors/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "bifunctors"; - version = "4.1.1.1"; - sha256 = "0b31q6ypndaj6fa9cnkld5k0x3lncp9i28vfkkh6vv4jnnjd6pqi"; + version = "4.2"; + sha256 = "0gxj22qv0avg2rhmfbbjrx35yr83r311vm8asc4q71lzkbyg8qf6"; buildDepends = [ semigroupoids semigroups tagged ]; meta = { homepage = "http://github.com/ekmett/bifunctors/"; diff --git a/pkgs/development/libraries/haskell/binary-conduit/default.nix b/pkgs/development/libraries/haskell/binary-conduit/default.nix index 848004ca6afd..c7547a7b12b7 100644 --- a/pkgs/development/libraries/haskell/binary-conduit/default.nix +++ b/pkgs/development/libraries/haskell/binary-conduit/default.nix @@ -6,15 +6,15 @@ cabal.mkDerivation (self: { pname = "binary-conduit"; - version = "1.2.2"; - sha256 = "12dgqydc4zj1ffrcfqpd1dg40dc9hpynj1j69611kzpcqbj275pf"; + version = "1.2.3"; + sha256 = "0ymhxyf754j1pki7ap2vay8f9j49rzsjzp5yr253sn5wpw3qg8fr"; buildDepends = [ binary conduit resourcet vector ]; testDepends = [ binary conduit hspec QuickCheck quickcheckAssertions resourcet ]; jailbreak = true; meta = { - homepage = "http://github.com/qnikst/binary-conduit"; + homepage = "http://github.com/qnikst/binary-conduit/"; description = "data serialization/deserialization conduit library"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/binary/0.6.1.0.nix b/pkgs/development/libraries/haskell/binary/0.6.1.0.nix deleted file mode 100644 index 06aca17cde3f..000000000000 --- a/pkgs/development/libraries/haskell/binary/0.6.1.0.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "binary"; - version = "0.6.1.0"; - sha256 = "0d423k37973f5v9mz9401zmsfdgspnf9h6s9xgr3zh19giz7c3js"; - meta = { - homepage = "https://github.com/kolmodin/binary"; - description = "Binary serialisation for Haskell values using lazy ByteStrings"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/binary/0.7.2.1.nix b/pkgs/development/libraries/haskell/binary/0.7.2.2.nix index b8803868cd13..60eaf0e00311 100644 --- a/pkgs/development/libraries/haskell/binary/0.7.2.1.nix +++ b/pkgs/development/libraries/haskell/binary/0.7.2.2.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "binary"; - version = "0.7.2.1"; - sha256 = "0s0idmcmribgajxxnxdvppnz62qyxwrj9iy34pi7nvm41gj6q5nz"; + version = "0.7.2.2"; + sha256 = "10z1b9axgfg9kb44b8sfxd5mak5qaqyjfwn4i21y37zgf7wadblr"; testDepends = [ Cabal filepath HUnit QuickCheck random testFramework testFrameworkQuickcheck2 diff --git a/pkgs/development/libraries/haskell/bindings-libusb/default.nix b/pkgs/development/libraries/haskell/bindings-libusb/default.nix index 1c2538dba170..e6f429245883 100644 --- a/pkgs/development/libraries/haskell/bindings-libusb/default.nix +++ b/pkgs/development/libraries/haskell/bindings-libusb/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "bindings-libusb"; - version = "1.4.4.1"; - sha256 = "1cip5a0n8svjkzawpx3wi9z7nywmn9bl3k2w559b3awy0wixybrx"; + version = "1.4.5.0"; + sha256 = "0xnx9p6wqbwiaqigdnf7x6vd0qq7w9wm0vxsh93adpb5wdpjza66"; buildDepends = [ bindingsDSL ]; pkgconfigDepends = [ libusb ]; meta = { diff --git a/pkgs/development/libraries/haskell/bitset/default.nix b/pkgs/development/libraries/haskell/bitset/default.nix new file mode 100644 index 000000000000..dfb71a978cb3 --- /dev/null +++ b/pkgs/development/libraries/haskell/bitset/default.nix @@ -0,0 +1,18 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, deepseq, gmp, QuickCheck, tasty, tastyQuickcheck }: + +cabal.mkDerivation (self: { + pname = "bitset"; + version = "1.4.8"; + sha256 = "0h912i3wb6v8sx0c4mlp0j65l3yhpdsk3my8zhif2jls2sxns988"; + buildDepends = [ deepseq ]; + testDepends = [ QuickCheck tasty tastyQuickcheck ]; + extraLibraries = [ gmp ]; + doCheck = false; + meta = { + description = "A space-efficient set data structure"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/boomerang/default.nix b/pkgs/development/libraries/haskell/boomerang/default.nix index 3747b2cc877c..82d45baf88ae 100644 --- a/pkgs/development/libraries/haskell/boomerang/default.nix +++ b/pkgs/development/libraries/haskell/boomerang/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "boomerang"; - version = "1.4.4"; - sha256 = "0ik2wxcvz2y3bn3r2p9kzjiy78vjhxyz4fn3nkaz5wl3jmh4gydf"; + version = "1.4.5"; + sha256 = "03iaasyg2idvq25wzzjk2yr9lyql7bcgmfkycy1cy4ms5dg91k6q"; buildDepends = [ mtl text ]; meta = { description = "Library for invertible parsing and printing"; diff --git a/pkgs/development/libraries/haskell/bytestring-trie/default.nix b/pkgs/development/libraries/haskell/bytestring-trie/default.nix index c8a4143e2178..da84b55cc0f9 100644 --- a/pkgs/development/libraries/haskell/bytestring-trie/default.nix +++ b/pkgs/development/libraries/haskell/bytestring-trie/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "bytestring-trie"; - version = "0.2.3"; - sha256 = "1zb4s7fd951swc648szrpx0ldailmdinapgbcg1zajb5c5jq57ga"; + version = "0.2.4"; + sha256 = "1fv3xh52hqhzdbq78c3lrgx5vd49cabwp9ww5ki1888zlq29pyck"; buildDepends = [ binary ]; meta = { homepage = "http://code.haskell.org/~wren/"; diff --git a/pkgs/development/libraries/haskell/cabal-cargs/default.nix b/pkgs/development/libraries/haskell/cabal-cargs/default.nix index c96fab45c192..ba535cd13b2d 100644 --- a/pkgs/development/libraries/haskell/cabal-cargs/default.nix +++ b/pkgs/development/libraries/haskell/cabal-cargs/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "cabal-cargs"; - version = "0.7.3"; - sha256 = "10707nja5j9hbx5yj7pq8s9zgfx21n36r4xhs71g70g6hwpciqjb"; + version = "0.7.5"; + sha256 = "0z17s4w9wlmdqbzh0c1jwqfp4d6599hqv0r4dzm9djb0x8vj327k"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/cabal-lenses/default.nix b/pkgs/development/libraries/haskell/cabal-lenses/default.nix index 8bf0148ba6bf..256cba3734cc 100644 --- a/pkgs/development/libraries/haskell/cabal-lenses/default.nix +++ b/pkgs/development/libraries/haskell/cabal-lenses/default.nix @@ -4,9 +4,10 @@ cabal.mkDerivation (self: { pname = "cabal-lenses"; - version = "0.4"; - sha256 = "19ryd1qvsc301kdpk0zvw89aqhvk26ccbrgddm9j5m31mn62jl2d"; + version = "0.4.2"; + sha256 = "0vsicvk979qznm3b174r6d5wkkyhpqx8gxjs5jw9na2jhimzjcjf"; buildDepends = [ Cabal lens unorderedContainers ]; + jailbreak = true; meta = { description = "Lenses and traversals for the Cabal library"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/cairo/default.nix b/pkgs/development/libraries/haskell/cairo/default.nix index b77e31663543..8f64f23585c5 100644 --- a/pkgs/development/libraries/haskell/cairo/default.nix +++ b/pkgs/development/libraries/haskell/cairo/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "cairo"; - version = "0.13.0.0"; - sha256 = "1sw1f50kmqln1mkvrr6g85b46dn0ipwnvyl13kxzhq5g581rra92"; + version = "0.13.0.5"; + sha256 = "0ak6hzfrcyxajx7qybsmd5g26blqb6zxvv8r2a8bnylvm5sdj70r"; buildDepends = [ mtl text utf8String ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ cairo libc pkgconfig zlib ]; diff --git a/pkgs/development/libraries/haskell/case-insensitive/1.1.0.3.nix b/pkgs/development/libraries/haskell/case-insensitive/1.1.0.3.nix deleted file mode 100644 index 3f75b41bb630..000000000000 --- a/pkgs/development/libraries/haskell/case-insensitive/1.1.0.3.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, deepseq, hashable, HUnit, testFramework -, testFrameworkHunit, text -}: - -cabal.mkDerivation (self: { - pname = "case-insensitive"; - version = "1.1.0.3"; - sha256 = "0fr69lfb976gflr8w6d68zn4pz86jfxbb2i49fw3mmam67k5y9bv"; - buildDepends = [ deepseq hashable text ]; - testDepends = [ HUnit testFramework testFrameworkHunit text ]; - meta = { - homepage = "https://github.com/basvandijk/case-insensitive"; - description = "Case insensitive string comparison"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/cereal/default.nix b/pkgs/development/libraries/haskell/cereal/default.nix index af77f37abdb7..906222c3bbb3 100644 --- a/pkgs/development/libraries/haskell/cereal/default.nix +++ b/pkgs/development/libraries/haskell/cereal/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "cereal"; - version = "0.4.0.1"; - sha256 = "12g23cbjxxgh3xzv6hvs093zpycl29h8fmc7kv6jx43ws4cxy2jv"; + version = "0.4.1.0"; + sha256 = "0m0iwjf9bds4nwk1rgr19rvjri4kncn37k51l1n9y869r104b8lb"; meta = { description = "A binary serialization library"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix deleted file mode 100644 index 068d1b7dadfa..000000000000 --- a/pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl, network, parsec, xhtml }: - -cabal.mkDerivation (self: { - pname = "cgi"; - version = "3001.1.7.1"; - sha256 = "7d1d710871fffbbec2a33d7288b2959ddbcfd794d47f0122127576c02550b339"; - buildDepends = [ mtl network parsec xhtml ]; - meta = { - description = "A library for writing CGI programs"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix deleted file mode 100644 index c10fa2416f71..000000000000 --- a/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl, network, parsec, xhtml }: - -cabal.mkDerivation (self: { - pname = "cgi"; - version = "3001.1.7.2"; - sha256 = "ad35971388fa1809a5cd71bb2f051d69d753e4153b43d843b431674cf79a1c39"; - buildDepends = [ mtl network parsec xhtml ]; - meta = { - description = "A library for writing CGI programs"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix deleted file mode 100644 index 7cb7e77dd778..000000000000 --- a/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, extensibleExceptions, mtl, network, parsec, xhtml }: - -cabal.mkDerivation (self: { - pname = "cgi"; - version = "3001.1.7.3"; - sha256 = "f1f4bc6b06e8a191db4ddb43617fee3ef37635e380d6a17c29efb5641ce91df0"; - buildDepends = [ extensibleExceptions mtl network parsec xhtml ]; - meta = { - homepage = "http://andersk.mit.edu/haskell/cgi/"; - description = "A library for writing CGI programs"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix deleted file mode 100644 index 6071ecc7597e..000000000000 --- a/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, extensibleExceptions, mtl, network, parsec, xhtml }: - -cabal.mkDerivation (self: { - pname = "cgi"; - version = "3001.1.7.4"; - sha256 = "1fiild4djzhyz683kwwb0k4wvhd89ihbn6vncjl270xvwj5xmrbd"; - buildDepends = [ extensibleExceptions mtl network parsec xhtml ]; - meta = { - homepage = "http://andersk.mit.edu/haskell/cgi/"; - description = "A library for writing CGI programs"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.8.5.nix b/pkgs/development/libraries/haskell/cgi/3001.1.8.5.nix deleted file mode 100644 index 31d523717c5e..000000000000 --- a/pkgs/development/libraries/haskell/cgi/3001.1.8.5.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, MonadCatchIOMtl, mtl, network, parsec, xhtml }: - -cabal.mkDerivation (self: { - pname = "cgi"; - version = "3001.1.8.5"; - sha256 = "0ffvn9ki5yq2zc65afmy04353v4s66lajc7y563fhj2kz5ib5ks6"; - buildDepends = [ MonadCatchIOMtl mtl network parsec xhtml ]; - meta = { - homepage = "http://andersk.mit.edu/haskell/cgi/"; - description = "A library for writing CGI programs"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - broken = true; - }; -}) diff --git a/pkgs/development/libraries/haskell/cgrep/default.nix b/pkgs/development/libraries/haskell/cgrep/default.nix index e19cac2b2ec3..a49697bccf9d 100644 --- a/pkgs/development/libraries/haskell/cgrep/default.nix +++ b/pkgs/development/libraries/haskell/cgrep/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "cgrep"; - version = "6.4.6"; - sha256 = "13plsh6411k273qllpkcrkakwxcdmw0p6arj0j3gdqa7bbxii99s"; + version = "6.4.8"; + sha256 = "0xz2kzrvxxaa67x21dckv7l01s7jhmak7ka0rp8qygx6zjf836wy"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/charsetdetect-ae/default.nix b/pkgs/development/libraries/haskell/charsetdetect-ae/default.nix new file mode 100644 index 000000000000..39571e4a87c7 --- /dev/null +++ b/pkgs/development/libraries/haskell/charsetdetect-ae/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal }: + +cabal.mkDerivation (self: { + pname = "charsetdetect-ae"; + version = "1.0.1"; + sha256 = "0bvdnv608glim8yn4dvh3av7x0fxxp3z6719j0n005bygdfgjxna"; + meta = { + homepage = "http://github.com/Aelve/charsetdetect-ae"; + description = "Character set detection using Mozilla's Universal Character Set Detector"; + license = "LGPL"; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/chaselev-deque/default.nix b/pkgs/development/libraries/haskell/chaselev-deque/default.nix new file mode 100644 index 000000000000..0b271ce5f687 --- /dev/null +++ b/pkgs/development/libraries/haskell/chaselev-deque/default.nix @@ -0,0 +1,25 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, abstractDeque, abstractDequeTests, atomicPrimops +, bitsAtomic, HUnit, testFramework, testFrameworkHunit +, transformers, vector +}: + +cabal.mkDerivation (self: { + pname = "chaselev-deque"; + version = "0.5.0.3"; + sha256 = "1qkrypqsbfnr6kcl6idqmq2z4nf6jmqmgzddzhh031nxd22p18y6"; + buildDepends = [ + abstractDeque atomicPrimops bitsAtomic transformers vector + ]; + testDepends = [ + abstractDeque abstractDequeTests atomicPrimops HUnit testFramework + testFrameworkHunit vector + ]; + meta = { + homepage = "https://github.com/rrnewton/haskell-lockfree/wiki"; + description = "Chase & Lev work-stealing lock-free double-ended queues (deques)"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/cheapskate/default.nix b/pkgs/development/libraries/haskell/cheapskate/default.nix index 9ad35360fe64..e3b13cdd8069 100644 --- a/pkgs/development/libraries/haskell/cheapskate/default.nix +++ b/pkgs/development/libraries/haskell/cheapskate/default.nix @@ -13,6 +13,7 @@ cabal.mkDerivation (self: { buildDepends = [ blazeHtml dataDefault mtl syb text uniplate xssSanitize ]; + jailbreak = true; meta = { homepage = "http://github.com/jgm/cheapskate"; description = "Experimental markdown processor"; diff --git a/pkgs/development/libraries/haskell/cipher-aes/default.nix b/pkgs/development/libraries/haskell/cipher-aes/default.nix index 7edfe750d373..32c4b878cff0 100644 --- a/pkgs/development/libraries/haskell/cipher-aes/default.nix +++ b/pkgs/development/libraries/haskell/cipher-aes/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "cipher-aes"; - version = "0.2.8"; - sha256 = "13hg8gxhs7hmni72kp14hmhvfv1kj7fnl83i72bz3aq15vx3z61z"; + version = "0.2.9"; + sha256 = "1nkrh8mrrh14zfhjz0lfidw0hw9c70hap9w24rvb14zgfnnasnlq"; buildDepends = [ byteable cryptoCipherTypes securemem ]; testDepends = [ byteable cryptoCipherTests cryptoCipherTypes QuickCheck diff --git a/pkgs/development/libraries/haskell/citeproc-hs/default.nix b/pkgs/development/libraries/haskell/citeproc-hs/default.nix index bb95e920ef97..5f7cce6b0600 100644 --- a/pkgs/development/libraries/haskell/citeproc-hs/default.nix +++ b/pkgs/development/libraries/haskell/citeproc-hs/default.nix @@ -18,5 +18,6 @@ cabal.mkDerivation (self: { description = "A Citation Style Language implementation in Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix index b2a85e356996..3c2d5c6655f4 100644 --- a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "classy-prelude-conduit"; - version = "0.9.5"; - sha256 = "1m26d463h5hxiyc4dm6fwbyjwzmd0bwl2blwpgp4wqnyvspz195m"; + version = "0.10.2"; + sha256 = "0bgic61p05hpnsami199wzs2q4cbdm00nyp03vsxz2ddsz8dwc8l"; buildDepends = [ classyPrelude conduit conduitCombinators monadControl resourcet systemFileio transformers void diff --git a/pkgs/development/libraries/haskell/classy-prelude/default.nix b/pkgs/development/libraries/haskell/classy-prelude/default.nix index b3f94ea7bdfe..4cd9dc1dba39 100644 --- a/pkgs/development/libraries/haskell/classy-prelude/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude/default.nix @@ -1,18 +1,18 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, basicPrelude, chunkedData, enclosedExceptions, exceptions -, hashable, hspec, liftedBase, monoTraversable, mtl, primitive -, QuickCheck, semigroups, stm, systemFilepath, text, time -, transformers, unorderedContainers, vector, vectorInstances +{ cabal, basicPrelude, bifunctors, chunkedData, enclosedExceptions +, exceptions, hashable, hspec, liftedBase, monoTraversable, mtl +, primitive, QuickCheck, semigroups, stm, systemFilepath, text +, time, transformers, unorderedContainers, vector, vectorInstances }: cabal.mkDerivation (self: { pname = "classy-prelude"; - version = "0.9.5"; - sha256 = "1gd5z4gd62v3k59psmrj41ca6mly4fjqgf4l80smv89kc2s2w809"; + version = "0.10.2"; + sha256 = "0pq16rgksbv2ml4wg7jdxlb9y80h8la78hnrcci637s6kbdisd7k"; buildDepends = [ - basicPrelude chunkedData enclosedExceptions exceptions hashable - liftedBase monoTraversable mtl primitive semigroups stm + basicPrelude bifunctors chunkedData enclosedExceptions exceptions + hashable liftedBase monoTraversable mtl primitive semigroups stm systemFilepath text time transformers unorderedContainers vector vectorInstances ]; diff --git a/pkgs/development/libraries/haskell/clay/default.nix b/pkgs/development/libraries/haskell/clay/default.nix index 8eafd67cadbe..4e1b617c0b65 100644 --- a/pkgs/development/libraries/haskell/clay/default.nix +++ b/pkgs/development/libraries/haskell/clay/default.nix @@ -4,10 +4,11 @@ cabal.mkDerivation (self: { pname = "clay"; - version = "0.9.0.1"; - sha256 = "1w2617kpj6rblmycqb97gyshwbvzp5w2h4xh494mvdzi3bkahqpn"; + version = "0.10"; + sha256 = "0xw7j9v2cfs4874l5n852b38m6v2mpkbr93dxxfkp2kwmqkjbl5v"; buildDepends = [ mtl text ]; testDepends = [ HUnit mtl testFramework testFrameworkHunit text ]; + jailbreak = true; meta = { homepage = "http://fvisser.nl/clay"; description = "CSS preprocessor as embedded Haskell"; diff --git a/pkgs/development/libraries/haskell/clean-unions/default.nix b/pkgs/development/libraries/haskell/clean-unions/default.nix new file mode 100644 index 000000000000..9ec71da8eeca --- /dev/null +++ b/pkgs/development/libraries/haskell/clean-unions/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal }: + +cabal.mkDerivation (self: { + pname = "clean-unions"; + version = "0.1.1"; + sha256 = "1y4cj15s6gjcazwk0iycyc2qs7chrqcvchf4g5h4xnf2x8ld4i21"; + meta = { + homepage = "https://github.com/fumieval/clean-unions"; + description = "Open unions without need for Typeable"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix index cee91c51be0c..bd06ff10a86f 100644 --- a/pkgs/development/libraries/haskell/clientsession/default.nix +++ b/pkgs/development/libraries/haskell/clientsession/default.nix @@ -1,17 +1,19 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, base64Bytestring, cereal, cipherAes, cprngAes, cryptoApi -, cryptoRandom, entropy, hspec, HUnit, QuickCheck, skein, tagged -, transformers +, cryptoRandom, entropy, hspec, HUnit, QuickCheck, setenv, skein +, tagged, transformers }: cabal.mkDerivation (self: { pname = "clientsession"; - version = "0.9.0.5"; - sha256 = "0l11wpxr3cgd8q708ay7957mdzq7nhm7c6z3p9iwl0lp3pkcl810"; + version = "0.9.1"; + sha256 = "1hq4f5iq4xb9jilr6qprww9lql314vpfw5khwmizljry9cwd2gq7"; + isLibrary = true; + isExecutable = true; buildDepends = [ base64Bytestring cereal cipherAes cprngAes cryptoApi cryptoRandom - entropy skein tagged + entropy setenv skein tagged ]; testDepends = [ cereal hspec HUnit QuickCheck transformers ]; meta = { diff --git a/pkgs/development/libraries/haskell/clock/default.nix b/pkgs/development/libraries/haskell/clock/default.nix index 60bea4fed839..e97195cb5fc3 100644 --- a/pkgs/development/libraries/haskell/clock/default.nix +++ b/pkgs/development/libraries/haskell/clock/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "clock"; - version = "0.4.1.1"; - sha256 = "0xbhx16sa0rwidaljp8lklb5ifhdc8cccbyznrpxqqwh8icm5pjp"; + version = "0.4.1.3"; + sha256 = "0wqhg8gb10lby01f0v4fl4yp23l4ilizywp5xnsbja03svnb4f0d"; meta = { homepage = "http://corsis.github.com/clock/"; description = "High-resolution clock functions: monotonic, realtime, cputime"; diff --git a/pkgs/development/libraries/haskell/cmdargs/default.nix b/pkgs/development/libraries/haskell/cmdargs/default.nix index a3c7cd1773fe..c4253944c6d1 100644 --- a/pkgs/development/libraries/haskell/cmdargs/default.nix +++ b/pkgs/development/libraries/haskell/cmdargs/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "cmdargs"; - version = "0.10.10"; - sha256 = "17glliishfxc01ippgzb8v12i40id2b6l18rqp6wfygbb7f93rvv"; + version = "0.10.12"; + sha256 = "0axn3ycw4rijh1ka5f73gz9w330s851cpxbv39ia4xnb0l95hrjy"; isLibrary = true; isExecutable = true; buildDepends = [ filepath transformers ]; diff --git a/pkgs/development/libraries/haskell/cmdtheline/default.nix b/pkgs/development/libraries/haskell/cmdtheline/default.nix index 8943eacdd217..aa83ae1a0ec6 100644 --- a/pkgs/development/libraries/haskell/cmdtheline/default.nix +++ b/pkgs/development/libraries/haskell/cmdtheline/default.nix @@ -1,13 +1,15 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, filepath, HUnit, parsec, testFramework, testFrameworkHunit -, transformers +, transformers, fetchpatch }: cabal.mkDerivation (self: { pname = "cmdtheline"; version = "0.2.3"; sha256 = "1jwbr34xgccjbz6nm58bdsg1vqyv87rh45yia5j36vlfbaclyb04"; + doCheck = false; + patches = [ (fetchpatch { url = "https://github.com/eli-frey/cmdtheline/pull/29.patch"; sha256 = "089rfvvjc44wnhph2ricpbz4iifhyvm1qzg8wsd596v81gy0zvrr"; }) ]; buildDepends = [ filepath parsec transformers ]; testDepends = [ filepath HUnit parsec testFramework testFrameworkHunit transformers @@ -18,6 +20,5 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; hydraPlatforms = self.stdenv.lib.platforms.none; - broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/colors/default.nix b/pkgs/development/libraries/haskell/colors/default.nix index 2d4db2cdc4dd..167637863ef8 100644 --- a/pkgs/development/libraries/haskell/colors/default.nix +++ b/pkgs/development/libraries/haskell/colors/default.nix @@ -4,13 +4,14 @@ cabal.mkDerivation (self: { pname = "colors"; - version = "0.1.1"; - sha256 = "1i1n05prbp0l3xgx0w2lxzc5r81pcmbzclsamdr7fmjvhvh8blqm"; + version = "0.2.0.1"; + sha256 = "0xl7hdp1di8gl0g28vz2lm6pbj7hihdkfnr18843016736hll4qn"; buildDepends = [ profunctors ]; meta = { homepage = "https://github.com/fumieval/colors"; description = "A type for colors"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; }; }) diff --git a/pkgs/development/libraries/haskell/concreteTyperep/default.nix b/pkgs/development/libraries/haskell/concreteTyperep/default.nix index 896496dc4a39..24e2569ad0ea 100644 --- a/pkgs/development/libraries/haskell/concreteTyperep/default.nix +++ b/pkgs/development/libraries/haskell/concreteTyperep/default.nix @@ -12,6 +12,7 @@ cabal.mkDerivation (self: { testDepends = [ binary hashable QuickCheck testFramework testFrameworkQuickcheck2 ]; + doCheck = false; meta = { description = "Binary and Hashable instances for TypeRep"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/cond/default.nix b/pkgs/development/libraries/haskell/cond/default.nix index 64b62db5ba8f..4846e5cb61f5 100644 --- a/pkgs/development/libraries/haskell/cond/default.nix +++ b/pkgs/development/libraries/haskell/cond/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "cond"; - version = "0.4.1"; - sha256 = "16xk8clsxv5qi5f745xvs44y8p8dnmlmjkjzwqz9jl8fbmkmki3b"; + version = "0.4.1.1"; + sha256 = "12xcjxli1scd4asr4zc77i5q9qka2100gx97hv3vv12l7gj7d703"; meta = { homepage = "https://github.com/kallisti-dev/cond"; description = "Basic conditional and boolean operators with monadic variants"; diff --git a/pkgs/development/libraries/haskell/conduit-combinators/default.nix b/pkgs/development/libraries/haskell/conduit-combinators/default.nix index 4c194279b4ed..0f237e12cb08 100644 --- a/pkgs/development/libraries/haskell/conduit-combinators/default.nix +++ b/pkgs/development/libraries/haskell/conduit-combinators/default.nix @@ -1,15 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, base16Bytestring, base64Bytestring, chunkedData, conduit -, conduitExtra, hspec, monadControl, monoTraversable, mwcRandom -, primitive, resourcet, silently, systemFileio, systemFilepath -, text, transformers, transformersBase, unixCompat, vector, void +, conduitExtra, hspec, monadControl, monoTraversable, mtl +, mwcRandom, primitive, QuickCheck, resourcet, safe, silently +, systemFileio, systemFilepath, text, transformers +, transformersBase, unixCompat, vector, void }: cabal.mkDerivation (self: { pname = "conduit-combinators"; - version = "0.2.8.3"; - sha256 = "1a3dysrxg7mhm9naqj6vq45k0vxihar7pn650rb8aw22k85ifmkz"; + version = "0.3.0.4"; + sha256 = "1aphk79r3ibpb9gykdnz55isp7kf48jhz4h4vgplb0ndbmz8f8zm"; buildDepends = [ base16Bytestring base64Bytestring chunkedData conduit conduitExtra monadControl monoTraversable mwcRandom primitive resourcet @@ -17,8 +18,9 @@ cabal.mkDerivation (self: { unixCompat vector void ]; testDepends = [ - base16Bytestring base64Bytestring chunkedData hspec monoTraversable - mwcRandom silently systemFilepath text transformers vector + base16Bytestring base64Bytestring chunkedData conduit hspec + monoTraversable mtl mwcRandom QuickCheck safe silently + systemFilepath text transformers vector ]; meta = { homepage = "https://github.com/fpco/conduit-combinators"; diff --git a/pkgs/development/libraries/haskell/conduit-extra/default.nix b/pkgs/development/libraries/haskell/conduit-extra/default.nix index 8443a4909fc1..b9ddeec104fb 100644 --- a/pkgs/development/libraries/haskell/conduit-extra/default.nix +++ b/pkgs/development/libraries/haskell/conduit-extra/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "conduit-extra"; - version = "1.1.4"; - sha256 = "117mzy0qm8w2kzjcshcwcfbx01ybbhn63vdgzllc7cb9x4cj2ibv"; + version = "1.1.4.2"; + sha256 = "0s2ggca6g2104dylbrkn090xwsfrp0946bhwf7fgpfpg9gi1sz1g"; buildDepends = [ attoparsec blazeBuilder conduit filepath monadControl network primitive resourcet stm streamingCommons text transformers @@ -18,6 +18,7 @@ cabal.mkDerivation (self: { async attoparsec blazeBuilder conduit exceptions hspec resourcet stm text transformers transformersBase ]; + doCheck = false; meta = { homepage = "http://github.com/snoyberg/conduit"; description = "Batteries included conduit: adapters for common libraries"; diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index 5b82a2f26a08..81ca10bdb38d 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -1,19 +1,19 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, exceptions, hspec, liftedBase, mmorph, monadControl, mtl -, QuickCheck, resourcet, transformers, transformersBase, void +, QuickCheck, resourcet, safe, transformers, transformersBase, void }: cabal.mkDerivation (self: { pname = "conduit"; - version = "1.2.0.2"; - sha256 = "0gr4vqyvy3jdc1l7sinwr5dgmwzv7dq2z1npwvmbxz85bq89rmd9"; + version = "1.2.3"; + sha256 = "1n4cc5mij9q5wrnm394a2dka7vbnnr9c2kg5d3f4sl1fh156lf6n"; buildDepends = [ exceptions liftedBase mmorph monadControl mtl resourcet transformers transformersBase void ]; testDepends = [ - exceptions hspec mtl QuickCheck resourcet transformers void + exceptions hspec mtl QuickCheck resourcet safe transformers void ]; doCheck = false; meta = { diff --git a/pkgs/development/libraries/haskell/convertible/1.0.11.1.nix b/pkgs/development/libraries/haskell/convertible/1.0.11.1.nix deleted file mode 100644 index 57423c1b71f0..000000000000 --- a/pkgs/development/libraries/haskell/convertible/1.0.11.1.nix +++ /dev/null @@ -1,19 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl, text, time }: - -cabal.mkDerivation (self: { - pname = "convertible"; - version = "1.0.11.1"; - sha256 = "1r50a2rpfsx0s7dv8ww5xck33b1mhy73gfilffrbqd4hxjgnxlj6"; - isLibrary = true; - isExecutable = true; - buildDepends = [ mtl text time ]; - meta = { - homepage = "http://hackage.haskell.org/cgi-bin/hackage-scripts/package/convertible"; - description = "Typeclasses and instances for converting between types"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/convertible/1.1.0.0.nix b/pkgs/development/libraries/haskell/convertible/default.nix index fd8f6dac3a83..fd8f6dac3a83 100644 --- a/pkgs/development/libraries/haskell/convertible/1.1.0.0.nix +++ b/pkgs/development/libraries/haskell/convertible/default.nix diff --git a/pkgs/development/libraries/haskell/cookie/default.nix b/pkgs/development/libraries/haskell/cookie/default.nix index 108fb48f939b..abbafafa5297 100644 --- a/pkgs/development/libraries/haskell/cookie/default.nix +++ b/pkgs/development/libraries/haskell/cookie/default.nix @@ -1,18 +1,17 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, blazeBuilder, dataDefault, deepseq, HUnit, QuickCheck -, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text -, time +, tasty, tastyHunit, tastyQuickcheck, text, time }: cabal.mkDerivation (self: { pname = "cookie"; - version = "0.4.1.3"; - sha256 = "184ymp1pbi49fm4jl9s04dfyrgdbc9vlmqahqha4yncppr5s1sdw"; + version = "0.4.1.4"; + sha256 = "0axvljw34cjw47fxwxqql8rvjsyp9gxfbaijmysy5j10kx8s931d"; buildDepends = [ blazeBuilder dataDefault deepseq text time ]; testDepends = [ - blazeBuilder HUnit QuickCheck testFramework testFrameworkHunit - testFrameworkQuickcheck2 text time + blazeBuilder HUnit QuickCheck tasty tastyHunit tastyQuickcheck text + time ]; doCheck = self.stdenv.lib.versionOlder "7.8" self.ghc.version; meta = { diff --git a/pkgs/development/libraries/haskell/cprng-aes/default.nix b/pkgs/development/libraries/haskell/cprng-aes/default.nix index 64d15480ab87..632647e21825 100644 --- a/pkgs/development/libraries/haskell/cprng-aes/default.nix +++ b/pkgs/development/libraries/haskell/cprng-aes/default.nix @@ -1,12 +1,12 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, byteable, cipherAes, cryptoRandom, random }: +{ cabal, byteable, cipherAes, cryptoRandom }: cabal.mkDerivation (self: { pname = "cprng-aes"; - version = "0.5.2"; - sha256 = "1nf8dd83ywriq2ynv48f2s5lvc9s3srq4j5vbspmf0kc74kmq2pf"; - buildDepends = [ byteable cipherAes cryptoRandom random ]; + version = "0.6.1"; + sha256 = "1wr15kbmk1g3l8a75n0iwbzqg24ixv78slwzwb2q6rlcvq0jlnb4"; + buildDepends = [ byteable cipherAes cryptoRandom ]; meta = { homepage = "http://github.com/vincenthz/hs-cprng-aes"; description = "Crypto Pseudo Random Number Generator using AES in counter mode"; diff --git a/pkgs/development/libraries/haskell/criterion/default.nix b/pkgs/development/libraries/haskell/criterion/default.nix index 5a5ce89f732d..01ea05575652 100644 --- a/pkgs/development/libraries/haskell/criterion/default.nix +++ b/pkgs/development/libraries/haskell/criterion/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "criterion"; - version = "1.0.1.0"; - sha256 = "1mp4rm6jd8g38yyhfrxk1xzhp6mxrwwns9kl6494ylsdpsv0v4ll"; + version = "1.0.2.0"; + sha256 = "02mcb49hiv0gijj5343gffdd3r8hjf4d52llv2gradaijz4zdqhx"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/crypto-conduit/default.nix b/pkgs/development/libraries/haskell/crypto-conduit/default.nix index b63f6a44108c..c7c3f2590a73 100644 --- a/pkgs/development/libraries/haskell/crypto-conduit/default.nix +++ b/pkgs/development/libraries/haskell/crypto-conduit/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "crypto-conduit"; - version = "0.5.4"; - sha256 = "1z628gj4sf50s7pd6p41c670rz98f8b6p3n2dvl93haczcg53l1n"; + version = "0.5.5"; + sha256 = "0zd4smj3rk2x1msl8z8f5y01x4b87rhgm45g26g6c3dsdasn1lyf"; buildDepends = [ cereal conduit conduitExtra cryptoApi resourcet transformers ]; diff --git a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix index f8a51f4fa5b8..6c0060e52a8d 100644 --- a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix +++ b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "crypto-pubkey-types"; - version = "0.4.2.2"; - sha256 = "18z1fnh2xjq600ya8m175m64nwr6bwscr2q47zjy7k38zlm9c8h5"; + version = "0.4.2.3"; + sha256 = "1isfyr1ly9hv8idslpjbyc9hhgb1zqd9gfc1s4kvwy4gcdsvrx52"; buildDepends = [ asn1Types ]; meta = { homepage = "http://github.com/vincenthz/hs-crypto-pubkey-types"; diff --git a/pkgs/development/libraries/haskell/cufft/default.nix b/pkgs/development/libraries/haskell/cufft/default.nix index d24af97f4f24..dfcf9bec757b 100644 --- a/pkgs/development/libraries/haskell/cufft/default.nix +++ b/pkgs/development/libraries/haskell/cufft/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "cufft"; - version = "0.1.0.3"; - sha256 = "1jj1ixacmhwjcb2syv4fglawpya5vmdhdk2xqrw4wwfxw4wc9ypi"; + version = "0.1.1.0"; + sha256 = "0d13nf61698gzh0hcycx1z9bm2xpikkg27bjymsjhfwimvqn7z8h"; buildDepends = [ cuda ]; buildTools = [ c2hs ]; meta = { diff --git a/pkgs/development/libraries/haskell/daemons/default.nix b/pkgs/development/libraries/haskell/daemons/default.nix new file mode 100644 index 000000000000..1ec84449dd32 --- /dev/null +++ b/pkgs/development/libraries/haskell/daemons/default.nix @@ -0,0 +1,25 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, cereal, dataDefault, filepath, HUnit, network, pipes +, testFramework, testFrameworkHunit, transformers +}: + +cabal.mkDerivation (self: { + pname = "daemons"; + version = "0.2.1"; + sha256 = "0zf9831vl1hz606nsp0yhjg46wxzvwkd3hn9shjw5akk26sddi8p"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + cereal dataDefault filepath network pipes transformers + ]; + testDepends = [ + dataDefault HUnit testFramework testFrameworkHunit + ]; + meta = { + homepage = "https://github.com/scvalex/daemons"; + description = "Daemons in Haskell made fun and easy"; + license = self.stdenv.lib.licenses.gpl3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/stm/2.3.nix b/pkgs/development/libraries/haskell/data-flags/default.nix index c5f62c9c8275..ed2c5b682ce7 100644 --- a/pkgs/development/libraries/haskell/stm/2.3.nix +++ b/pkgs/development/libraries/haskell/data-flags/default.nix @@ -3,13 +3,12 @@ { cabal }: cabal.mkDerivation (self: { - pname = "stm"; - version = "2.3"; - sha256 = "1321l1qkmvnqdw73i21jnh2b8c1iw1mxjbp23hmqdvljjb9mlzsm"; + pname = "data-flags"; + version = "0.0.3.1"; + sha256 = "1s0djw1qarjn1fkyf21fd6pacfpfy4cvyw3wbd63ccaf9g0s1gs5"; meta = { - description = "Software Transactional Memory"; + description = "A package for working with bit masks and flags in general"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/data-lens-fd/default.nix b/pkgs/development/libraries/haskell/data-lens-fd/default.nix new file mode 100644 index 000000000000..85935a5ebdad --- /dev/null +++ b/pkgs/development/libraries/haskell/data-lens-fd/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, comonad, dataLens, mtl, transformers }: + +cabal.mkDerivation (self: { + pname = "data-lens-fd"; + version = "2.0.5"; + sha256 = "0r8cfgn6wx304b5ihmwgsxxjwalb7086wii655mgmb6cn3nirpyk"; + buildDepends = [ comonad dataLens mtl transformers ]; + meta = { + homepage = "http://github.com/roconnor/data-lens-fd/"; + description = "Lenses"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/data-lens-template/default.nix b/pkgs/development/libraries/haskell/data-lens-template/default.nix index 923e11bf2e20..d167e8051cd4 100644 --- a/pkgs/development/libraries/haskell/data-lens-template/default.nix +++ b/pkgs/development/libraries/haskell/data-lens-template/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Utilities for Data.Lens"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/data-lens/default.nix b/pkgs/development/libraries/haskell/data-lens/default.nix index 5fba0b4bde34..b65a41f048ee 100644 --- a/pkgs/development/libraries/haskell/data-lens/default.nix +++ b/pkgs/development/libraries/haskell/data-lens/default.nix @@ -7,12 +7,12 @@ cabal.mkDerivation (self: { version = "2.10.5"; sha256 = "11na4wx0f0ihk87d00njwrfc430nb25dkkadv1n47yvcyfc60i90"; buildDepends = [ comonad semigroupoids transformers ]; + jailbreak = true; meta = { homepage = "http://github.com/roconnor/data-lens/"; description = "Used to be Haskell 98 Lenses"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; hydraPlatforms = self.stdenv.lib.platforms.none; - broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/data-ordlist/default.nix b/pkgs/development/libraries/haskell/data-ordlist/default.nix index 959eb57e7791..3db8f1ef067c 100644 --- a/pkgs/development/libraries/haskell/data-ordlist/default.nix +++ b/pkgs/development/libraries/haskell/data-ordlist/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "data-ordlist"; - version = "0.4.6.1"; - sha256 = "1qrvyin5567br99zfip7krdy6snnbm5z5jdi6ghmk0cfmhmyrwy3"; + version = "0.4.7.0"; + sha256 = "03a9ix1fcx08viwv2jg5ndw1qbkydyyrmjvqr9wasmcik9x1wv3g"; meta = { description = "Set and bag operations on ordered lists"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix b/pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix deleted file mode 100644 index 4d7a0b9b818a..000000000000 --- a/pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix +++ /dev/null @@ -1,15 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "deepseq"; - version = "1.1.0.0"; - sha256 = "947c45e7ee862159f190fb8e905c1328f7672cb9e6bf3abd1d207bbcf1eee50a"; - meta = { - description = "Fully evaluate data structures"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix b/pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix deleted file mode 100644 index 7748ff96a8af..000000000000 --- a/pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix +++ /dev/null @@ -1,15 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "deepseq"; - version = "1.1.0.2"; - sha256 = "1iqk8lc2an2rd1j9lcr76yabiz18h10lazlmdg5c528yssyd6135"; - meta = { - description = "Deep evaluation of data structures"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/derive/default.nix b/pkgs/development/libraries/haskell/derive/default.nix index 1f8584a02776..f6bbd6a4a88a 100644 --- a/pkgs/development/libraries/haskell/derive/default.nix +++ b/pkgs/development/libraries/haskell/derive/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "derive"; - version = "2.5.16"; - sha256 = "0vahwnb2hzdm990b2m139kbg9jkk4whcxjdfjvlpimqk72s27viy"; + version = "2.5.18"; + sha256 = "1jqng8v1d4rac8xmrpm7h1pkyr9pfwsbb0ap6pnwzpwz9fns9c3k"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/diagrams/cairo.nix b/pkgs/development/libraries/haskell/diagrams/cairo.nix index cd42f175b969..24c26e052d91 100644 --- a/pkgs/development/libraries/haskell/diagrams/cairo.nix +++ b/pkgs/development/libraries/haskell/diagrams/cairo.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "diagrams-cairo"; - version = "1.2.0.2"; - sha256 = "0qm1s56kg7l96p5cvmdxc0g8r8ibh7vpyavp64178mdy62b6xavh"; + version = "1.2.0.4"; + sha256 = "1yg6ja5jha499b6j5fsgdl4f3l2ff1gp6cl7ixzj9y26m7a10bqq"; buildDepends = [ cairo colour dataDefaultClass diagramsCore diagramsLib filepath hashable JuicyPixels lens mtl optparseApplicative pango split diff --git a/pkgs/development/libraries/haskell/diagrams/contrib.nix b/pkgs/development/libraries/haskell/diagrams/contrib.nix index 832617d64b7c..a958c0b62660 100644 --- a/pkgs/development/libraries/haskell/diagrams/contrib.nix +++ b/pkgs/development/libraries/haskell/diagrams/contrib.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "diagrams-contrib"; - version = "1.1.2.2"; - sha256 = "1a9ayqyffgwq8k9d8l12s6l1pqv27fvzngsklnh3y1bgp20d2z01"; + version = "1.1.2.3"; + sha256 = "00bn9p2a6h26q7hfqqzwimfgr2avf7ilf61z3anz25raz8jqvfxc"; buildDepends = [ arithmoi circlePacking colour dataDefault dataDefaultClass diagramsCore diagramsLib forceLayout lens MonadRandom mtl parsec @@ -20,6 +20,7 @@ cabal.mkDerivation (self: { diagramsLib HUnit QuickCheck testFramework testFrameworkHunit testFrameworkQuickcheck2 ]; + jailbreak = true; meta = { homepage = "http://projects.haskell.org/diagrams/"; description = "Collection of user contributions to diagrams EDSL"; diff --git a/pkgs/development/libraries/haskell/diagrams/core.nix b/pkgs/development/libraries/haskell/diagrams/core.nix index 18f362e0c21f..0ce9a5590590 100644 --- a/pkgs/development/libraries/haskell/diagrams/core.nix +++ b/pkgs/development/libraries/haskell/diagrams/core.nix @@ -6,12 +6,13 @@ cabal.mkDerivation (self: { pname = "diagrams-core"; - version = "1.2.0.2"; - sha256 = "10glkp05pnxx7c7f33654rjcvahslxx010v36wf6zsa8nscdrccn"; + version = "1.2.0.3"; + sha256 = "1pmdz75v2xl8y0clqifs017gq40syxqpfa2h2mc50pip3484a7m5"; buildDepends = [ dualTree lens MemoTrie monoidExtras newtype semigroups vectorSpace vectorSpacePoints ]; + jailbreak = true; meta = { homepage = "http://projects.haskell.org/diagrams"; description = "Core libraries for diagrams EDSL"; diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix index ea5b1aad27fa..3b42584bb285 100644 --- a/pkgs/development/libraries/haskell/diagrams/lib.nix +++ b/pkgs/development/libraries/haskell/diagrams/lib.nix @@ -2,20 +2,21 @@ { cabal, active, colour, dataDefaultClass, diagramsCore, dualTree , filepath, fingertree, hashable, intervals, JuicyPixels, lens -, MemoTrie, monoidExtras, optparseApplicative, safe, semigroups -, tagged, vectorSpace, vectorSpacePoints +, MemoTrie, monoidExtras, optparseApplicative, semigroups, tagged +, vectorSpace, vectorSpacePoints }: cabal.mkDerivation (self: { pname = "diagrams-lib"; - version = "1.2.0.3"; - sha256 = "1rgyv7yywmqk3s2cmv5s923421ybj6mnii7jgxri56jzw0agfyq7"; + version = "1.2.0.5"; + sha256 = "0km2j74riybmlhpb3jp4i3xilz4q2ngkifnsq6bsk8d0m3kqizd6"; buildDepends = [ active colour dataDefaultClass diagramsCore dualTree filepath fingertree hashable intervals JuicyPixels lens MemoTrie - monoidExtras optparseApplicative safe semigroups tagged vectorSpace + monoidExtras optparseApplicative semigroups tagged vectorSpace vectorSpacePoints ]; + jailbreak = true; meta = { homepage = "http://projects.haskell.org/diagrams"; description = "Embedded domain-specific language for declarative graphics"; diff --git a/pkgs/development/libraries/haskell/diagrams/postscript.nix b/pkgs/development/libraries/haskell/diagrams/postscript.nix index 557aae73db56..73bc954de5d5 100644 --- a/pkgs/development/libraries/haskell/diagrams/postscript.nix +++ b/pkgs/development/libraries/haskell/diagrams/postscript.nix @@ -7,12 +7,13 @@ cabal.mkDerivation (self: { pname = "diagrams-postscript"; - version = "1.1.0.1"; - sha256 = "03747g5y33kzf76hs4y0ak9q6b79r92z130b03bcc2892na62ad6"; + version = "1.1.0.2"; + sha256 = "1djvra4igw43746wqhwg1ms76w2qlrsdwhr0b795si4wdx8k28b3"; buildDepends = [ dataDefaultClass diagramsCore diagramsLib dlist filepath hashable lens monoidExtras mtl semigroups split vectorSpace ]; + jailbreak = true; meta = { homepage = "http://projects.haskell.org/diagrams/"; description = "Postscript backend for diagrams drawing EDSL"; diff --git a/pkgs/development/libraries/haskell/diagrams/rasterific.nix b/pkgs/development/libraries/haskell/diagrams/rasterific.nix index 6d20bcd23766..0aa953537ce7 100644 --- a/pkgs/development/libraries/haskell/diagrams/rasterific.nix +++ b/pkgs/development/libraries/haskell/diagrams/rasterific.nix @@ -7,13 +7,14 @@ cabal.mkDerivation (self: { pname = "diagrams-rasterific"; - version = "0.1.0.2"; - sha256 = "16pwpa34hxf8qd7mf3zn4k7sr6p2pkvag3c77iwcs5qwqf5vhyf9"; + version = "0.1.0.4"; + sha256 = "0l6072blz56rc4nxr2s7gh5p3zdcyq8cfndbqgzndsfak6wyixgb"; buildDepends = [ dataDefaultClass diagramsCore diagramsLib filepath FontyFruity JuicyPixels lens mtl optparseApplicative Rasterific split statestack time ]; + jailbreak = true; meta = { homepage = "http://projects.haskell.org/diagrams/"; description = "Rasterific backend for diagrams"; diff --git a/pkgs/development/libraries/haskell/diagrams/svg.nix b/pkgs/development/libraries/haskell/diagrams/svg.nix index 8393d7c6f982..00ce51e8d974 100644 --- a/pkgs/development/libraries/haskell/diagrams/svg.nix +++ b/pkgs/development/libraries/haskell/diagrams/svg.nix @@ -7,13 +7,14 @@ cabal.mkDerivation (self: { pname = "diagrams-svg"; - version = "1.1.0.1"; - sha256 = "02krwy1v7rhcgg0ps7kd8ym50kh48dcfqm2xz3k6hr32jzqa5hlw"; + version = "1.1.0.2"; + sha256 = "0dzws9c3swgnrx70a64614m9pc8rszfajgh674n7x56fbbp3ra1n"; buildDepends = [ base64Bytestring blazeMarkup blazeSvg colour diagramsCore diagramsLib filepath hashable JuicyPixels lens monoidExtras mtl split time vectorSpace ]; + jailbreak = true; meta = { homepage = "http://projects.haskell.org/diagrams/"; description = "SVG backend for diagrams drawing EDSL"; diff --git a/pkgs/development/libraries/haskell/digest-pure/default.nix b/pkgs/development/libraries/haskell/digest-pure/default.nix new file mode 100644 index 000000000000..a36483bf2f7c --- /dev/null +++ b/pkgs/development/libraries/haskell/digest-pure/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, digest, QuickCheck }: + +cabal.mkDerivation (self: { + pname = "digest-pure"; + version = "0.0.3"; + sha256 = "0rb5jkzn1d4z90hd47qh98mf4n90wvj0cqf3qfpj7ndvw52yy95w"; + testDepends = [ digest QuickCheck ]; + meta = { + homepage = "http://github.com/danieldk/digest-pure"; + description = "Pure hash functions for bytestrings"; + license = "unknown"; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix b/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix index 1958307e869c..819d4690da58 100644 --- a/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "digestive-functors-aeson"; - version = "1.1.11"; - sha256 = "0jf62ssyc317x070xkjdnfbb2g8mb19a83hig08j95vyqwjgk4vg"; + version = "1.1.12.1"; + sha256 = "1jwrlmavwjq3bf8ylazi91mwl47n5pdh3lipv4p7v0gq45dm3hg9"; buildDepends = [ aeson digestiveFunctors lens lensAeson safe text vector ]; diff --git a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix index 4c1ca9cd9aeb..29ed05048067 100644 --- a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "digestive-functors-heist"; - version = "0.8.6.0"; - sha256 = "0n73hw8xl70x7c3hn4hz1qqijvvhv0qk30q0c22lnbjaf4n8dki2"; + version = "0.8.6.1"; + sha256 = "1l8ppn2h1nxzn5wxnglc2fyi7r90177v75yf4n7cyvzrcxdaz4bb"; buildDepends = [ blazeBuilder digestiveFunctors heist mtl text xmlhtml ]; diff --git a/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix b/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix index e5a3e0a44c64..71d1a6448fa5 100644 --- a/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { version = "0.6.1.0"; sha256 = "07xb8jr70j03kggk55p3zzp07y7amzm7f8hdzry4vff7yx41rxhr"; buildDepends = [ digestiveFunctors filepath mtl snapCore text ]; + jailbreak = true; meta = { homepage = "http://github.com/jaspervdj/digestive-functors"; description = "Snap backend for the digestive-functors library"; diff --git a/pkgs/development/libraries/haskell/direct-sqlite/default.nix b/pkgs/development/libraries/haskell/direct-sqlite/default.nix index 07eca858972a..c3be0f888ac2 100644 --- a/pkgs/development/libraries/haskell/direct-sqlite/default.nix +++ b/pkgs/development/libraries/haskell/direct-sqlite/default.nix @@ -4,12 +4,12 @@ cabal.mkDerivation (self: { pname = "direct-sqlite"; - version = "2.3.13"; - sha256 = "0d16jmls41cwyzg91fpd32dv8vvx1v3ilypv1wd7ya8j08fwfvdn"; + version = "2.3.14"; + sha256 = "0xxvr2wln54snkvs2r46fkkn7yhm6i2afgww40vnfqamg8g81x5w"; buildDepends = [ text ]; testDepends = [ base16Bytestring HUnit text ]; meta = { - homepage = "http://ireneknapp.com/software/"; + homepage = "https://github.com/IreneKnapp/direct-sqlite"; description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support."; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/distributed-process-monad-control/default.nix b/pkgs/development/libraries/haskell/distributed-process-monad-control/default.nix new file mode 100644 index 000000000000..14adad138441 --- /dev/null +++ b/pkgs/development/libraries/haskell/distributed-process-monad-control/default.nix @@ -0,0 +1,20 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, distributedProcess, monadControl, transformers +, transformersBase +}: + +cabal.mkDerivation (self: { + pname = "distributed-process-monad-control"; + version = "0.5.0"; + sha256 = "1ja6xwdpssm7wafv2id6c3f49iw7pkks2smk6l1n1dxkh029z8nk"; + buildDepends = [ + distributedProcess monadControl transformers transformersBase + ]; + meta = { + homepage = "http://haskell-distributed.github.io"; + description = "Orphan instances for MonadBase and MonadBaseControl"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/distributed-process-p2p/default.nix b/pkgs/development/libraries/haskell/distributed-process-p2p/default.nix new file mode 100644 index 000000000000..165b09d13bf6 --- /dev/null +++ b/pkgs/development/libraries/haskell/distributed-process-p2p/default.nix @@ -0,0 +1,23 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, binary, distributedProcess, mtl, network, networkTransport +, networkTransportTcp +}: + +cabal.mkDerivation (self: { + pname = "distributed-process-p2p"; + version = "0.1.3.0"; + sha256 = "00lvi2x1s8r7lwfvsjnvzc9iwdk4ip8svw85p2h3ra4iqbzj70l2"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + binary distributedProcess mtl network networkTransport + networkTransportTcp + ]; + meta = { + homepage = "https://bitbucket.org/dpwiz/distributed-process-p2p/"; + description = "Peer-to-peer node discovery for Cloud Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/distributed-process-platform/default.nix b/pkgs/development/libraries/haskell/distributed-process-platform/default.nix new file mode 100644 index 000000000000..cb014f53a8a9 --- /dev/null +++ b/pkgs/development/libraries/haskell/distributed-process-platform/default.nix @@ -0,0 +1,37 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, ansiTerminal, binary, dataAccessor, deepseq +, distributedProcess, distributedStatic, fingertree, hashable +, HUnit, mtl, network, networkTransport, networkTransportTcp +, QuickCheck, rematch, stm, testFramework, testFrameworkHunit +, testFrameworkQuickcheck2, time, transformers, unorderedContainers +}: + +cabal.mkDerivation (self: { + pname = "distributed-process-platform"; + version = "0.1.0"; + sha256 = "0bxfynvqkzvah7gbg74yzwpma8j32bamnyysj6dk39da0v880abm"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + binary dataAccessor deepseq distributedProcess fingertree hashable + mtl stm time transformers unorderedContainers + ]; + testDepends = [ + ansiTerminal binary dataAccessor deepseq distributedProcess + distributedStatic fingertree hashable HUnit mtl network + networkTransport networkTransportTcp QuickCheck rematch stm + testFramework testFrameworkHunit testFrameworkQuickcheck2 time + transformers unorderedContainers + ]; + hyperlinkSource = false; + jailbreak = true; + doCheck = false; + patchPhase = "mv Setup.hs Setup.lhs"; + meta = { + homepage = "http://github.com/haskell-distributed/distributed-process-platform"; + description = "The Cloud Haskell Application Platform"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/distributed-process/default.nix b/pkgs/development/libraries/haskell/distributed-process/default.nix index 21cebedefe46..24375cb277a9 100644 --- a/pkgs/development/libraries/haskell/distributed-process/default.nix +++ b/pkgs/development/libraries/haskell/distributed-process/default.nix @@ -13,6 +13,7 @@ cabal.mkDerivation (self: { binary dataAccessor deepseq distributedStatic hashable mtl networkTransport random rank1dynamic stm syb time transformers ]; + jailbreak = true; meta = { homepage = "http://haskell-distributed.github.com/"; description = "Cloud Haskell: Erlang-style concurrency in Haskell"; diff --git a/pkgs/development/libraries/haskell/dsp/default.nix b/pkgs/development/libraries/haskell/dsp/default.nix index 9b038d047f9f..f0d64562d7c1 100644 --- a/pkgs/development/libraries/haskell/dsp/default.nix +++ b/pkgs/development/libraries/haskell/dsp/default.nix @@ -9,6 +9,9 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ random ]; + patchPhase = '' + sed -i -e 's|random.*<1.1,|random,|' dsp.cabal + ''; meta = { homepage = "http://www.haskell.org/haskellwiki/DSP"; description = "Haskell Digital Signal Processing"; diff --git a/pkgs/development/libraries/haskell/dynamic-cabal/default.nix b/pkgs/development/libraries/haskell/dynamic-cabal/default.nix index 40f52b50904c..066c11e5a361 100644 --- a/pkgs/development/libraries/haskell/dynamic-cabal/default.nix +++ b/pkgs/development/libraries/haskell/dynamic-cabal/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "dynamic-cabal"; - version = "0.3.2"; - sha256 = "0f0g4kml17j1j101gnpjjpdmny4m2wgr0dbjq18fw1s3nxc3jagm"; + version = "0.3.3"; + sha256 = "0fq6q0j2fx7ygarzgsvb7scssjnrxjrq188d0habfar6bdm0vqdg"; buildDepends = [ dataDefault filepath ghcPaths haskellGenerate haskellSrcExts time void diff --git a/pkgs/development/libraries/haskell/dynamic-state/default.nix b/pkgs/development/libraries/haskell/dynamic-state/default.nix new file mode 100644 index 000000000000..21eb0fdab281 --- /dev/null +++ b/pkgs/development/libraries/haskell/dynamic-state/default.nix @@ -0,0 +1,18 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, binary, concreteTyperep, hashable, unorderedContainers }: + +cabal.mkDerivation (self: { + pname = "dynamic-state"; + version = "0.1.1.0"; + sha256 = "18dc6fbnyk3q7n7gvqrgy98qc2grq0algr2jnc1ai3vm9bqh2x8n"; + buildDepends = [ + binary concreteTyperep hashable unorderedContainers + ]; + meta = { + description = "Optionally serializable dynamic state keyed by type"; + license = self.stdenv.lib.licenses.gpl2; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/editline/0.2.1.0.nix b/pkgs/development/libraries/haskell/editline/0.2.1.0.nix deleted file mode 100644 index d36a2ee11f28..000000000000 --- a/pkgs/development/libraries/haskell/editline/0.2.1.0.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, libedit }: - -cabal.mkDerivation (self: { - pname = "editline"; - version = "0.2.1.0"; - sha256 = "1qa65iqr5k3ajq1glf5y84lld132i2i3l0zmsw8xqkq7hrgqwqc3"; - extraLibraries = [ libedit ]; - meta = { - homepage = "http://code.haskell.org/editline"; - description = "Bindings to the editline library (libedit)"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/editline/0.2.1.1.nix b/pkgs/development/libraries/haskell/editline/default.nix index 4458a067b1f4..4458a067b1f4 100644 --- a/pkgs/development/libraries/haskell/editline/0.2.1.1.nix +++ b/pkgs/development/libraries/haskell/editline/default.nix diff --git a/pkgs/development/libraries/haskell/either/default.nix b/pkgs/development/libraries/haskell/either/default.nix index d2fb0964dd99..f7e7cead1ac3 100644 --- a/pkgs/development/libraries/haskell/either/default.nix +++ b/pkgs/development/libraries/haskell/either/default.nix @@ -1,16 +1,17 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, exceptions, free, monadControl, MonadRandom, mtl -, semigroupoids, semigroups, transformers, transformersBase +{ cabal, bifunctors, exceptions, free, monadControl, MonadRandom +, mtl, profunctors, semigroupoids, semigroups, transformers +, transformersBase }: cabal.mkDerivation (self: { pname = "either"; - version = "4.3.1"; - sha256 = "1k7aqy3k0ivpbqhym79q49dx41gnrkn1nw2inkm6gv8dy7bj9h6x"; + version = "4.3.2"; + sha256 = "0bmw4qc263fs5ivf94qfzrq26v8kflb13gims7c474d4jhg8g0w1"; buildDepends = [ - exceptions free monadControl MonadRandom mtl semigroupoids - semigroups transformers transformersBase + bifunctors exceptions free monadControl MonadRandom mtl profunctors + semigroupoids semigroups transformers transformersBase ]; noHaddock = self.stdenv.lib.versionOlder self.ghc.version "7.6"; meta = { diff --git a/pkgs/development/libraries/haskell/ekg-bosun/default.nix b/pkgs/development/libraries/haskell/ekg-bosun/default.nix new file mode 100644 index 000000000000..23876662f2ae --- /dev/null +++ b/pkgs/development/libraries/haskell/ekg-bosun/default.nix @@ -0,0 +1,22 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, ekgCore, httpClient, lens, network, networkUri +, text, time, unorderedContainers, vector, wreq +}: + +cabal.mkDerivation (self: { + pname = "ekg-bosun"; + version = "1.0.2"; + sha256 = "0q32yvl5j59s22v357j8vx0i3b5cd0gygh7gyibym5ka5d5xd82m"; + buildDepends = [ + aeson ekgCore httpClient lens network networkUri text time + unorderedContainers vector wreq + ]; + meta = { + homepage = "http://github.com/ocharles/ekg-bosun"; + description = "Send ekg metrics to a Bosun instance"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/ekg-carbon/default.nix b/pkgs/development/libraries/haskell/ekg-carbon/default.nix index 06daad669676..2339009a138b 100644 --- a/pkgs/development/libraries/haskell/ekg-carbon/default.nix +++ b/pkgs/development/libraries/haskell/ekg-carbon/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "ekg-carbon"; - version = "1.0.1"; - sha256 = "1slaykn1a6f09dzn78v2aqw8snmidycvaw5cfyr4f0ndd88vi77d"; + version = "1.0.2"; + sha256 = "0m8cv2hsn1745f7pj552rp9sjsyfh7fbgjw6k2ippqcbxmhqmf4i"; buildDepends = [ ekgCore network networkCarbon text time unorderedContainers vector ]; diff --git a/pkgs/development/libraries/haskell/ekg-core/default.nix b/pkgs/development/libraries/haskell/ekg-core/default.nix index 2bdf088aea3d..6e2189dbadb6 100644 --- a/pkgs/development/libraries/haskell/ekg-core/default.nix +++ b/pkgs/development/libraries/haskell/ekg-core/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "ekg-core"; - version = "0.1.0.1"; - sha256 = "1zha9r43nalxdw22s79mf89fwfzi8lq0q9ldhw7f6c63dnwxyjja"; + version = "0.1.0.2"; + sha256 = "0iipj2q4msawxlvzzikiy7jls22ncbx7v3ldi7y75d52cyl2lmpg"; buildDepends = [ text unorderedContainers ]; meta = { homepage = "https://github.com/tibbe/ekg-core"; diff --git a/pkgs/development/libraries/haskell/ekg/default.nix b/pkgs/development/libraries/haskell/ekg/default.nix index 07c522b98188..c19ec4ec8811 100644 --- a/pkgs/development/libraries/haskell/ekg/default.nix +++ b/pkgs/development/libraries/haskell/ekg/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "ekg"; - version = "0.4.0.2"; - sha256 = "0svw43dnlg93nyaxiq310sp5csbf0w68ipbhqkxm052yvc9k6fv9"; + version = "0.4.0.4"; + sha256 = "1v1kskl1fwwpv72lay8c7nlvg2dswf6wij176fjfml1v8lmll2lr"; buildDepends = [ aeson ekgCore filepath network snapCore snapServer text time transformers unorderedContainers diff --git a/pkgs/development/libraries/haskell/elerea/default.nix b/pkgs/development/libraries/haskell/elerea/default.nix index ff6e4819283c..4d843bb08363 100644 --- a/pkgs/development/libraries/haskell/elerea/default.nix +++ b/pkgs/development/libraries/haskell/elerea/default.nix @@ -1,11 +1,12 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal }: +{ cabal, transformers, transformersBase }: cabal.mkDerivation (self: { pname = "elerea"; - version = "2.7.0.2"; - sha256 = "1n45q1hx548c6yqbj3321lky3xxsffpqvmcq0m9hw36d3cvwbvg0"; + version = "2.8.0"; + sha256 = "1sc71775f787dh70ay9fm6x6npsn81yci9yr984ai87ddz023sab"; + buildDepends = [ transformers transformersBase ]; meta = { description = "A minimalistic FRP library"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/enclosed-exceptions/default.nix b/pkgs/development/libraries/haskell/enclosed-exceptions/default.nix index 3470aab9b2b3..a28c9fc4683c 100644 --- a/pkgs/development/libraries/haskell/enclosed-exceptions/default.nix +++ b/pkgs/development/libraries/haskell/enclosed-exceptions/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "enclosed-exceptions"; - version = "1.0.0.2"; - sha256 = "1jbgqqavkhz2x5br17bdhv17rcmyi7a5mxplakhgyyg73wkjq04h"; + version = "1.0.1"; + sha256 = "1kid1hi392h88a1am0jkm7dhwl3v78lw5wfcyhmh0x454yr3b6zz"; buildDepends = [ async deepseq liftedBase monadControl transformers transformersBase ]; diff --git a/pkgs/development/libraries/haskell/encoding/default.nix b/pkgs/development/libraries/haskell/encoding/default.nix index 5ec0f1502c38..148d4f4debfb 100644 --- a/pkgs/development/libraries/haskell/encoding/default.nix +++ b/pkgs/development/libraries/haskell/encoding/default.nix @@ -9,6 +9,7 @@ cabal.mkDerivation (self: { buildDepends = [ binary extensibleExceptions HaXml mtl regexCompat ]; + jailbreak = true; meta = { homepage = "http://code.haskell.org/encoding/"; description = "A library for various character encodings"; diff --git a/pkgs/development/libraries/haskell/engine-io/default.nix b/pkgs/development/libraries/haskell/engine-io/default.nix index 9e3d6a5b5b16..141d54ab23c8 100644 --- a/pkgs/development/libraries/haskell/engine-io/default.nix +++ b/pkgs/development/libraries/haskell/engine-io/default.nix @@ -1,17 +1,18 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, aeson, async, attoparsec, base64Bytestring, either -, monadLoops, mwcRandom, stm, text, transformers +{ cabal, aeson, async, attoparsec, base64Bytestring, either, free +, monadLoops, mwcRandom, stm, stmDelay, text, transformers , unorderedContainers, vector, websockets }: cabal.mkDerivation (self: { pname = "engine-io"; - version = "1.2.0"; - sha256 = "07k5zc8zbjpcj3iql0kcs4zrw5g24cngkp9yanpdmnhi18ms45dv"; + version = "1.2.2"; + sha256 = "1d8323nxklbhva2y8ymgm5h57j2p86sdjfh0yi1fjjr8p26dh2py"; buildDepends = [ - aeson async attoparsec base64Bytestring either monadLoops mwcRandom - stm text transformers unorderedContainers vector websockets + aeson async attoparsec base64Bytestring either free monadLoops + mwcRandom stm stmDelay text transformers unorderedContainers vector + websockets ]; meta = { homepage = "http://github.com/ocharles/engine.io"; diff --git a/pkgs/development/libraries/haskell/entropy/default.nix b/pkgs/development/libraries/haskell/entropy/default.nix index 207cc0ea5dac..3b40f5959f79 100644 --- a/pkgs/development/libraries/haskell/entropy/default.nix +++ b/pkgs/development/libraries/haskell/entropy/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "entropy"; - version = "0.3.3"; - sha256 = "0px97mims7pbxyh8jqckc14ahdjj7r3hhckzpjqnxpkcisb2c738"; + version = "0.3.4.1"; + sha256 = "10myxs2a7838sywnlfggpsd7lmvzphl10zdh1vbbi18n3x79gyk0"; meta = { homepage = "https://github.com/TomMD/entropy"; description = "A platform independent entropy source"; diff --git a/pkgs/development/libraries/haskell/equivalence/0.2.3.nix b/pkgs/development/libraries/haskell/equivalence/0.2.3.nix deleted file mode 100644 index c21c0e161703..000000000000 --- a/pkgs/development/libraries/haskell/equivalence/0.2.3.nix +++ /dev/null @@ -1,23 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl, QuickCheck, STMonadTrans, testFramework -, testFrameworkQuickcheck2 -}: - -cabal.mkDerivation (self: { - pname = "equivalence"; - version = "0.2.3"; - sha256 = "0dd986y0sn89fparyz6kz9yhzysbqjcp8s99r81ihghg7s9yc743"; - buildDepends = [ mtl STMonadTrans ]; - testDepends = [ - mtl QuickCheck STMonadTrans testFramework testFrameworkQuickcheck2 - ]; - doCheck = false; - meta = { - homepage = "https://bitbucket.org/paba/equivalence/"; - description = "Maintaining an equivalence relation implemented as union-find using STT"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/equivalence/0.2.5.nix b/pkgs/development/libraries/haskell/equivalence/default.nix index 38de239b821b..38de239b821b 100644 --- a/pkgs/development/libraries/haskell/equivalence/0.2.5.nix +++ b/pkgs/development/libraries/haskell/equivalence/default.nix diff --git a/pkgs/development/libraries/haskell/esqueleto/default.nix b/pkgs/development/libraries/haskell/esqueleto/default.nix index c3b4850f5b25..86bc90fae815 100644 --- a/pkgs/development/libraries/haskell/esqueleto/default.nix +++ b/pkgs/development/libraries/haskell/esqueleto/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "esqueleto"; - version = "2.0.2"; - sha256 = "1r8w3h36fhj77llcfgiq6ww634jymz8fpm86fm17arj7m7ll6rq3"; + version = "2.1.2"; + sha256 = "18wcr5jwf7iz0rfrx07b4mm3j15rqwc43a6hycrabijik6s0v95v"; buildDepends = [ conduit monadLogger persistent resourcet tagged text transformers unorderedContainers diff --git a/pkgs/development/libraries/haskell/exception-mtl/default.nix b/pkgs/development/libraries/haskell/exception-mtl/default.nix index d3d21aaf27a5..49fb11535a12 100644 --- a/pkgs/development/libraries/haskell/exception-mtl/default.nix +++ b/pkgs/development/libraries/haskell/exception-mtl/default.nix @@ -4,11 +4,11 @@ cabal.mkDerivation (self: { pname = "exception-mtl"; - version = "0.3.0.4"; - sha256 = "16airfs3z1qmx42qww22m21fryr8210m7ji5rgkl2amjvj4lllvc"; + version = "0.3.0.5"; + sha256 = "1rqrh1wbm67w9rbh1gg5zsavlsw9nfw0hnbs9q2djglh73pq3iqj"; buildDepends = [ exceptionTransformers mtl transformers ]; meta = { - homepage = "http://www.eecs.harvard.edu/~mainland/"; + homepage = "http://www.cs.drexel.edu/~mainland/"; description = "Exception monad transformer instances for mtl2 classes"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/exception-transformers/default.nix b/pkgs/development/libraries/haskell/exception-transformers/default.nix index e6c778e981d3..2e2f828cb307 100644 --- a/pkgs/development/libraries/haskell/exception-transformers/default.nix +++ b/pkgs/development/libraries/haskell/exception-transformers/default.nix @@ -1,15 +1,19 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, HUnit, stm, transformers }: +{ cabal, HUnit, stm, testFramework, testFrameworkHunit +, transformers +}: cabal.mkDerivation (self: { pname = "exception-transformers"; - version = "0.3.0.3"; - sha256 = "0z3z5pppaqqbndd4fgv1czr8f9f4a8r86bwc3bcv88yf7y8cfbwz"; + version = "0.3.0.4"; + sha256 = "1m4mwgzynymdjvrrrvl90q468pgwik07yy2lsff9spxhcd43w2ra"; buildDepends = [ stm transformers ]; - testDepends = [ HUnit transformers ]; + testDepends = [ + HUnit testFramework testFrameworkHunit transformers + ]; meta = { - homepage = "http://www.eecs.harvard.edu/~mainland/"; + homepage = "http://www.cs.drexel.edu/~mainland/"; description = "Type classes and monads for unchecked extensible exceptions"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/extensible-effects/default.nix b/pkgs/development/libraries/haskell/extensible-effects/default.nix index 0c743df4a162..2bae81325ae8 100644 --- a/pkgs/development/libraries/haskell/extensible-effects/default.nix +++ b/pkgs/development/libraries/haskell/extensible-effects/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "extensible-effects"; - version = "1.7.1"; - sha256 = "1i7bmyga63svnky03f5xvz63795pjsqp3x7rn9amj55yj11fmp05"; + version = "1.7.1.2"; + sha256 = "1mvyiqlga6al81j4b4rg9yl46ml5s0hnx1g2hyvqljzr12njmajv"; buildDepends = [ transformers transformersBase ]; testDepends = [ HUnit QuickCheck testFramework testFrameworkHunit diff --git a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.0.nix b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.0.nix deleted file mode 100644 index e9c1f352a095..000000000000 --- a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.0.nix +++ /dev/null @@ -1,15 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "extensible-exceptions"; - version = "0.1.1.0"; - sha256 = "c252dc5a505332700f041d4e1fd3d309cde6158892f9c35339bf5e67bad7f781"; - meta = { - description = "Extensible exceptions"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix deleted file mode 100644 index ee5abc006b67..000000000000 --- a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix +++ /dev/null @@ -1,15 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "extensible-exceptions"; - version = "0.1.1.3"; - sha256 = "1i8rjfczsx1wjfaq423a7cp7qrnxh053865z7bg6hwhk2pxsrxkm"; - meta = { - description = "Extensible exceptions"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.4.nix b/pkgs/development/libraries/haskell/extensible-exceptions/default.nix index 39969527a85a..39969527a85a 100644 --- a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.4.nix +++ b/pkgs/development/libraries/haskell/extensible-exceptions/default.nix diff --git a/pkgs/development/libraries/haskell/extra/default.nix b/pkgs/development/libraries/haskell/extra/default.nix new file mode 100644 index 000000000000..dfbdf73a2ae9 --- /dev/null +++ b/pkgs/development/libraries/haskell/extra/default.nix @@ -0,0 +1,18 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, filepath, QuickCheck, time }: + +cabal.mkDerivation (self: { + pname = "extra"; + version = "0.8"; + sha256 = "06ydgniar294i9xzviz7qmr3xpnlkpvyvgigwxqfz50kv77w8ijw"; + buildDepends = [ filepath time ]; + testDepends = [ filepath QuickCheck time ]; + meta = { + homepage = "https://github.com/ndmitchell/extra#readme"; + description = "Extra functions I use"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ aycanirican ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/fast-logger/default.nix b/pkgs/development/libraries/haskell/fast-logger/default.nix index b4e32fa2bb0c..b0cd40e48fc2 100644 --- a/pkgs/development/libraries/haskell/fast-logger/default.nix +++ b/pkgs/development/libraries/haskell/fast-logger/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "fast-logger"; - version = "2.2.0"; - sha256 = "02gc5f7vgwfdlhfawki4xxrl33lbdl05wh64qm3mb3h2dv1gnwrr"; + version = "2.2.3"; + sha256 = "0zap61gz0snbq42h8nyjh637fr2cm1ny9f77sqd6v3yfqjq0ljh3"; buildDepends = [ autoUpdate blazeBuilder filepath text ]; testDepends = [ hspec ]; meta = { diff --git a/pkgs/development/libraries/haskell/fay-base/default.nix b/pkgs/development/libraries/haskell/fay-base/default.nix index 78f6b104c942..e978d5ec9394 100644 --- a/pkgs/development/libraries/haskell/fay-base/default.nix +++ b/pkgs/development/libraries/haskell/fay-base/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "fay-base"; - version = "0.19.2"; - sha256 = "08iv3097h877hxbmpmar1p526famm5pb1djq3qwla3bkqrzxgmf4"; + version = "0.19.2.1"; + sha256 = "19vzrdbd1c8wws4mccycpq70594qy2ka3mr5x5fsdya56ff4xgld"; buildDepends = [ fay ]; meta = { homepage = "https://github.com/faylang/fay-base"; diff --git a/pkgs/development/libraries/haskell/fay-text/default.nix b/pkgs/development/libraries/haskell/fay-text/default.nix index 68bbe884e874..7f80072335ad 100644 --- a/pkgs/development/libraries/haskell/fay-text/default.nix +++ b/pkgs/development/libraries/haskell/fay-text/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "fay-text"; - version = "0.3.0.2"; - sha256 = "12hgamqbrflmnr3ri0ajvzf6al5nn4adcdmv6ag6h5mrsik2sklf"; + version = "0.3.1"; + sha256 = "0blr39vah0zd3i6clzzgmsfhxncwj8q6j4widk27iz3l27nlyin8"; buildDepends = [ fay fayBase text ]; meta = { homepage = "https://github.com/faylang/fay-text"; diff --git a/pkgs/development/libraries/haskell/fay/default.nix b/pkgs/development/libraries/haskell/fay/default.nix index 90e3c5dadfce..bcb58a44e08e 100644 --- a/pkgs/development/libraries/haskell/fay/default.nix +++ b/pkgs/development/libraries/haskell/fay/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "fay"; - version = "0.20.2.0"; - sha256 = "1xblfsd1rj38nlw0dl56zvvnad3l0bpsncv1k5vjs4h8cmwl1ik2"; + version = "0.21.0.2"; + sha256 = "0hq9jfyl5ki3jcwffb9q7cxrgpchajgwk4j44kz37y1wji63lk96"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/fb/default.nix b/pkgs/development/libraries/haskell/fb/default.nix index b35f994caaaf..f257d26c7d32 100644 --- a/pkgs/development/libraries/haskell/fb/default.nix +++ b/pkgs/development/libraries/haskell/fb/default.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "fb"; - version = "1.0.5"; - sha256 = "1y4i6w659v4zm6kxz8fnzrwm0gjv7siqlh1wdsm03rcadkicyxmr"; + version = "1.0.7"; + sha256 = "0ghyddxf4aqidqvbm93pjgaban0whfj4y1w11b7nxy89srhyjhh8"; buildDepends = [ aeson attoparsec base16Bytestring base64Bytestring cereal conduit conduitExtra cryptoApi cryptohash cryptohashCryptoapi dataDefault diff --git a/pkgs/development/libraries/haskell/fgl/5.4.2.2.nix b/pkgs/development/libraries/haskell/fgl/5.4.2.2.nix deleted file mode 100644 index 61043f82f976..000000000000 --- a/pkgs/development/libraries/haskell/fgl/5.4.2.2.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl }: - -cabal.mkDerivation (self: { - pname = "fgl"; - version = "5.4.2.2"; - sha256 = "8232c337f0792854bf2a12a5fd1bc46726fff05d2f599053286ff873364cd7d2"; - buildDepends = [ mtl ]; - meta = { - homepage = "http://web.engr.oregonstate.edu/~erwig/fgl/haskell"; - description = "Martin Erwig's Functional Graph Library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix b/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix deleted file mode 100644 index 1ecc9fb05e71..000000000000 --- a/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl }: - -cabal.mkDerivation (self: { - pname = "fgl"; - version = "5.4.2.3"; - sha256 = "1f46siqqv8bc9v8nxr72nxabpzfax117ncgdvif6rax5ansl48g7"; - buildDepends = [ mtl ]; - meta = { - homepage = "http://web.engr.oregonstate.edu/~erwig/fgl/haskell"; - description = "Martin Erwig's Functional Graph Library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/fgl/5.4.2.4.nix b/pkgs/development/libraries/haskell/fgl/5.4.2.4.nix deleted file mode 100644 index 65596c350dea..000000000000 --- a/pkgs/development/libraries/haskell/fgl/5.4.2.4.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl }: - -cabal.mkDerivation (self: { - pname = "fgl"; - version = "5.4.2.4"; - sha256 = "0rh22786f37mpsvhkv075wjh5sd0c83nlhk669xil9rd7swcr66f"; - buildDepends = [ mtl ]; - meta = { - homepage = "http://web.engr.oregonstate.edu/~erwig/fgl/haskell"; - description = "Martin Erwig's Functional Graph Library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/fgl/5.5.0.0.nix b/pkgs/development/libraries/haskell/fgl/5.5.0.0.nix deleted file mode 100644 index 4fd2a4d05971..000000000000 --- a/pkgs/development/libraries/haskell/fgl/5.5.0.0.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl }: - -cabal.mkDerivation (self: { - pname = "fgl"; - version = "5.5.0.0"; - sha256 = "1kdqxbpsaka97rx0c7czlc1nfi72mdxs46gnqa8p0wxn1vx437g3"; - buildDepends = [ mtl ]; - meta = { - homepage = "http://web.engr.oregonstate.edu/~erwig/fgl/haskell"; - description = "Martin Erwig's Functional Graph Library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/fgl/5.5.0.1.nix b/pkgs/development/libraries/haskell/fgl/default.nix index 65a67528d01a..65a67528d01a 100644 --- a/pkgs/development/libraries/haskell/fgl/5.5.0.1.nix +++ b/pkgs/development/libraries/haskell/fgl/default.nix diff --git a/pkgs/development/libraries/haskell/filestore/default.nix b/pkgs/development/libraries/haskell/filestore/default.nix index 116875ecbdcf..1fa820a2c5a5 100644 --- a/pkgs/development/libraries/haskell/filestore/default.nix +++ b/pkgs/development/libraries/haskell/filestore/default.nix @@ -6,11 +6,12 @@ cabal.mkDerivation (self: { pname = "filestore"; - version = "0.6.0.3"; - sha256 = "03qmv3cqp1fv7b7pdjdx12cb27bfjbwwjdhkcvkfq89qwk9wh1h0"; + version = "0.6.0.4"; + sha256 = "1b3ymdqwcn84m8kkybshx10bfylby49i0yhbassvlgf0n096lp12"; buildDepends = [ Diff filepath parsec split time utf8String xml ]; testDepends = [ Diff filepath HUnit mtl time ]; jailbreak = true; + doCheck = false; meta = { description = "Interface for versioning file stores"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/fixed-vector/default.nix b/pkgs/development/libraries/haskell/fixed-vector/default.nix new file mode 100644 index 000000000000..81df126dd75c --- /dev/null +++ b/pkgs/development/libraries/haskell/fixed-vector/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, doctest, filemanip, primitive }: + +cabal.mkDerivation (self: { + pname = "fixed-vector"; + version = "0.7.0.0"; + sha256 = "07wpzcpnnz0jjq5gs4ra8c2hyrxzmp0ryk06y3ryf8i4w65awgvf"; + buildDepends = [ primitive ]; + testDepends = [ doctest filemanip primitive ]; + meta = { + description = "Generic vectors with statically known size"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.2.nix b/pkgs/development/libraries/haskell/fixed/default.nix index 8003b47f64e1..5a1aef66051a 100644 --- a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.2.nix +++ b/pkgs/development/libraries/haskell/fixed/default.nix @@ -3,13 +3,13 @@ { cabal }: cabal.mkDerivation (self: { - pname = "extensible-exceptions"; - version = "0.1.1.2"; - sha256 = "0rsdvb7k8mp88s1jjmna17qa6363vbjgvlkpncmn8516dnxhypg3"; + pname = "fixed"; + version = "0.2.1"; + sha256 = "1ayfya62ngcyyhi736fl5cd39iw568lkl16j4mliw3mi1cs2cic0"; meta = { - description = "Extensible exceptions"; + homepage = "http://github.com/ekmett/fixed"; + description = "Signed 15.16 precision fixed point arithmetic"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/focus/default.nix b/pkgs/development/libraries/haskell/focus/default.nix index 480d974e2b88..9a890587f848 100644 --- a/pkgs/development/libraries/haskell/focus/default.nix +++ b/pkgs/development/libraries/haskell/focus/default.nix @@ -1,12 +1,11 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, lochTh, placeholders }: +{ cabal }: cabal.mkDerivation (self: { pname = "focus"; - version = "0.1.2"; - sha256 = "0j157nv668621i94iqg923bfg7594bpfn0q9scb62cik2yikc1p0"; - buildDepends = [ lochTh placeholders ]; + version = "0.1.3"; + sha256 = "11l6rlr22m0z41c9fynpisj0cnx70zzcxhsakz9b09ap8wj0raqy"; meta = { homepage = "https://github.com/nikita-volkov/focus"; description = "A general abstraction for manipulating elements of container data structures"; diff --git a/pkgs/development/libraries/haskell/force-layout/default.nix b/pkgs/development/libraries/haskell/force-layout/default.nix index 09a22c0ac601..91dfc9dca84d 100644 --- a/pkgs/development/libraries/haskell/force-layout/default.nix +++ b/pkgs/development/libraries/haskell/force-layout/default.nix @@ -4,11 +4,12 @@ cabal.mkDerivation (self: { pname = "force-layout"; - version = "0.3.0.7"; - sha256 = "1kq6fg90yj735rpipspykvkmzs2cnwyib6pkph58523bvahgi2dy"; + version = "0.3.0.8"; + sha256 = "00b831l94r3lx0b330ql3w551w0fwziayhsjydzbfqq335syaaxg"; buildDepends = [ dataDefaultClass lens vectorSpace vectorSpacePoints ]; + jailbreak = true; meta = { description = "Simple force-directed layout"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/free-game/default.nix b/pkgs/development/libraries/haskell/free-game/default.nix index ee47e6bb3f5b..a7edf7817ba9 100644 --- a/pkgs/development/libraries/haskell/free-game/default.nix +++ b/pkgs/development/libraries/haskell/free-game/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "free-game"; - version = "1.1.78"; - sha256 = "11f3ib4nx0madbx58gscaqwc1k5mxw70klrq7z7lac9w61phkws6"; + version = "1.1.80"; + sha256 = "1vpwrviwxib22mkaqmwndzfly8iicr85sh1y914gwp5n83lmkava"; buildDepends = [ boundingboxes colors controlBool filepath free freetype2 GLFWB hashable JuicyPixels JuicyPixelsUtil lens linear mtl OpenGL diff --git a/pkgs/development/libraries/haskell/generic-aeson/default.nix b/pkgs/development/libraries/haskell/generic-aeson/default.nix index 7cea462a1cb1..fc3e6c32c724 100644 --- a/pkgs/development/libraries/haskell/generic-aeson/default.nix +++ b/pkgs/development/libraries/haskell/generic-aeson/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "generic-aeson"; - version = "0.2.0.0"; - sha256 = "0w7bwmbjsskynyfisnhp4piikdw2jkr4zg24c9ipsp28szy8qsb9"; + version = "0.2.0.2"; + sha256 = "1x58c7xgdc1asg4n61fpikn7jvspyqawykq4q49xhsp5dp11lzzh"; buildDepends = [ aeson attoparsec genericDeriving mtl tagged text unorderedContainers vector diff --git a/pkgs/development/libraries/haskell/generic-deriving/default.nix b/pkgs/development/libraries/haskell/generic-deriving/default.nix index 4ec1f4517887..06c543911301 100644 --- a/pkgs/development/libraries/haskell/generic-deriving/default.nix +++ b/pkgs/development/libraries/haskell/generic-deriving/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "generic-deriving"; - version = "1.6.3"; - sha256 = "04cjyl5aphf36qbbn75midrqj151fc77z2znpal8dk52gaab2f67"; + version = "1.7.0"; + sha256 = "145bixg4jr0hhw32jznrvl4qjjk7bgjbxlfznqra1s1rnmcyr5v6"; meta = { description = "Generic programming library for generalised deriving"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/ghc-heap-view/default.nix b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix index 704c820797ef..a7032f5a2509 100644 --- a/pkgs/development/libraries/haskell/ghc-heap-view/default.nix +++ b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix @@ -1,12 +1,13 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, binary, transformers }: +{ cabal, binary, deepseq, transformers }: cabal.mkDerivation (self: { pname = "ghc-heap-view"; - version = "0.5.1"; - sha256 = "1qi7f3phj2j63x1wd2cvk36945cxd84s12zs03hlrn49wzx2pf1n"; + version = "0.5.3"; + sha256 = "1jcqi4gahxmhd61hl75wgb9dp99kxld68860jnd9x4hnp5cd33q0"; buildDepends = [ binary transformers ]; + testDepends = [ deepseq ]; postInstall = '' ensureDir "$out/share/ghci" ln -s "$out/share/$pname-$version/ghci" "$out/share/ghci/$pname" @@ -16,8 +17,5 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ andres ]; - hydraPlatforms = self.stdenv.lib.platforms.none; - broken = self.stdenv.lib.versionOlder "7.7" self.ghc.version; - }; }) diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix index af4b76f7b780..93a3d895e366 100644 --- a/pkgs/development/libraries/haskell/ghc-mod/default.nix +++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix @@ -1,26 +1,29 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, async, Cabal, convertible, deepseq, djinnGhc, doctest -, emacs, filepath, ghcPaths, ghcSybUtils, haskellSrcExts, hlint -, hspec, ioChoice, makeWrapper, monadControl, monadJournal, mtl -, split, syb, text, time, transformers, transformersBase +{ cabal, async, Cabal, convertible, dataDefault, deepseq, djinnGhc +, doctest, emacs, filepath, ghcPaths, ghcSybUtils, haskellSrcExts +, hlint, hspec, ioChoice, makeWrapper, monadControl, monadJournal +, mtl, split, syb, temporary, text, time, transformers +, transformersBase }: cabal.mkDerivation (self: { pname = "ghc-mod"; - version = "5.1.0.2"; - sha256 = "0jdni0n5qzz0ncaa3ja4b6vcfykbl7swiafak4wyvm9izssjh8ra"; + version = "5.2.1.1"; + sha256 = "09dg54970s4n54xxmalr5a2g4r5jnwccl9984shmmv0vsr3h5k26"; isLibrary = true; isExecutable = true; buildDepends = [ - async Cabal convertible deepseq djinnGhc filepath ghcPaths - ghcSybUtils haskellSrcExts hlint ioChoice monadControl monadJournal - mtl split syb text time transformers transformersBase + async Cabal convertible dataDefault deepseq djinnGhc filepath + ghcPaths ghcSybUtils haskellSrcExts hlint ioChoice monadControl + monadJournal mtl split syb temporary text time transformers + transformersBase ]; testDepends = [ Cabal convertible deepseq djinnGhc doctest filepath ghcPaths ghcSybUtils haskellSrcExts hlint hspec ioChoice monadControl - monadJournal mtl split syb text time transformers transformersBase + monadJournal mtl split syb temporary text time transformers + transformersBase ]; buildTools = [ emacs makeWrapper ]; doCheck = false; diff --git a/pkgs/development/libraries/haskell/ghc-vis/default.nix b/pkgs/development/libraries/haskell/ghc-vis/default.nix index 741523011eca..5a1da0848b2c 100644 --- a/pkgs/development/libraries/haskell/ghc-vis/default.nix +++ b/pkgs/development/libraries/haskell/ghc-vis/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "ghc-vis"; - version = "0.7.2.3"; - sha256 = "1gl059n85yxksnq8y7i1vrsjdg4al6himzpdmw95v61y59bbs6c2"; + version = "0.7.2.7"; + sha256 = "0kxkmbp71yx5mskzpcyjd8s2yq01q1q6dxmqzmwg6naalcpcbswv"; buildDepends = [ cairo deepseq fgl ghcHeapView graphviz gtk mtl svgcairo text transformers xdot @@ -22,6 +22,5 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ andres ]; - hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/gio/default.nix b/pkgs/development/libraries/haskell/gio/default.nix index 63468acf27f4..c98f772f87a9 100644 --- a/pkgs/development/libraries/haskell/gio/default.nix +++ b/pkgs/development/libraries/haskell/gio/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "gio"; - version = "0.13.0.0"; - sha256 = "05mycm6nrwwpjflcmm3w33b5nmm6fgyzwzrx1piqazvd1magwcyj"; + version = "0.13.0.3"; + sha256 = "15025jj6i1gpvjs46545vzmvs6ka41x15lrllqr9hd0qsyhibsf5"; buildDepends = [ glib mtl ]; buildTools = [ gtk2hsBuildtools ]; pkgconfigDepends = [ glib ]; diff --git a/pkgs/development/libraries/haskell/github/default.nix b/pkgs/development/libraries/haskell/github/default.nix index d912f1c56bb5..86e344dc2ca4 100644 --- a/pkgs/development/libraries/haskell/github/default.nix +++ b/pkgs/development/libraries/haskell/github/default.nix @@ -1,18 +1,19 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, aeson, attoparsec, caseInsensitive, conduit, cryptohash -, dataDefault, failure, hashable, HTTP, httpConduit, httpTypes -, network, text, time, unorderedContainers, vector +{ cabal, aeson, attoparsec, base16Bytestring, byteable +, caseInsensitive, conduit, cryptohash, dataDefault, failure +, hashable, HTTP, httpConduit, httpTypes, network, text, time +, unorderedContainers, vector }: cabal.mkDerivation (self: { pname = "github"; - version = "0.11.1"; - sha256 = "0s94ivp3c40zhwwfxa6nzzgwh2frfih8as81i0kidx4ca35wf92k"; + version = "0.13"; + sha256 = "1vvfrlz6p43mrzskvhp9skh6xbgd5pqcn06wvxw31plpamf5pmzn"; buildDepends = [ - aeson attoparsec caseInsensitive conduit cryptohash dataDefault - failure hashable HTTP httpConduit httpTypes network text time - unorderedContainers vector + aeson attoparsec base16Bytestring byteable caseInsensitive conduit + cryptohash dataDefault failure hashable HTTP httpConduit httpTypes + network text time unorderedContainers vector ]; meta = { homepage = "https://github.com/fpco/github"; diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix index e1ce7b180f03..d256c2f014f0 100644 --- a/pkgs/development/libraries/haskell/gitit/default.nix +++ b/pkgs/development/libraries/haskell/gitit/default.nix @@ -2,25 +2,24 @@ { cabal, aeson, base64Bytestring, blazeHtml, ConfigFile, feed , filepath, filestore, ghcPaths, happstackServer, highlightingKate -, hoauth2, hslogger, HStringTemplate, HTTP, httpClient -, httpClientTls, json, mtl, network, networkUri, pandoc -, pandocTypes, parsec, random, recaptcha, safe, SHA, split, syb -, tagsoup, text, time, uri, url, utf8String, xhtml, xml -, xssSanitize, zlib +, hoauth2, hslogger, HStringTemplate, HTTP, httpClientTls +, httpConduit, json, mtl, network, networkUri, pandoc, pandocTypes +, parsec, random, recaptcha, safe, SHA, split, syb, tagsoup, text +, time, uri, url, utf8String, uuid, xhtml, xml, xssSanitize, zlib }: cabal.mkDerivation (self: { pname = "gitit"; - version = "0.10.5.1"; - sha256 = "0wi40f34xqqz0q8m14g7ay6yk37c3fkdijydv0di43i20bxixjhv"; + version = "0.10.6.1"; + sha256 = "1l6zra0yiwrmiycblp25b5yd1yrz94537l8zkspkf7z6wc8vdkn0"; isLibrary = true; isExecutable = true; buildDepends = [ aeson base64Bytestring blazeHtml ConfigFile feed filepath filestore ghcPaths happstackServer highlightingKate hoauth2 hslogger - HStringTemplate HTTP httpClient httpClientTls json mtl network + HStringTemplate HTTP httpClientTls httpConduit json mtl network networkUri pandoc pandocTypes parsec random recaptcha safe SHA - split syb tagsoup text time uri url utf8String xhtml xml + split syb tagsoup text time uri url utf8String uuid xhtml xml xssSanitize zlib ]; jailbreak = true; diff --git a/pkgs/development/libraries/haskell/gitlib-libgit2/default.nix b/pkgs/development/libraries/haskell/gitlib-libgit2/default.nix index 6d2af5587063..287f98d661da 100644 --- a/pkgs/development/libraries/haskell/gitlib-libgit2/default.nix +++ b/pkgs/development/libraries/haskell/gitlib-libgit2/default.nix @@ -26,6 +26,7 @@ cabal.mkDerivation (self: { description = "Libgit2 backend for gitlib"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; maintainers = with self.stdenv.lib.maintainers; [ ianwookim ]; }; }) diff --git a/pkgs/development/libraries/haskell/gitlib-test/default.nix b/pkgs/development/libraries/haskell/gitlib-test/default.nix index 38e1cbc36e7c..e8ab6aca6cf0 100644 --- a/pkgs/development/libraries/haskell/gitlib-test/default.nix +++ b/pkgs/development/libraries/haskell/gitlib-test/default.nix @@ -18,5 +18,6 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ ianwookim ]; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/gl/default.nix b/pkgs/development/libraries/haskell/gl/default.nix new file mode 100644 index 000000000000..05c7a68d0c3f --- /dev/null +++ b/pkgs/development/libraries/haskell/gl/default.nix @@ -0,0 +1,18 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, filepath, fixed, half, hxt, mesa, split, transformers }: + +cabal.mkDerivation (self: { + pname = "gl"; + version = "0.6.1"; + sha256 = "0wqsbwnp69g6vz5irf65zv1nx4vnlwcm771jxzk70r2wzi2vsg3y"; + buildDepends = [ filepath fixed half hxt split transformers ]; + extraLibraries = [ mesa ]; + noHaddock = true; + meta = { + description = "Complete OpenGL raw bindings"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/glib/default.nix b/pkgs/development/libraries/haskell/glib/default.nix index 4a17862c966a..872364fe985b 100644 --- a/pkgs/development/libraries/haskell/glib/default.nix +++ b/pkgs/development/libraries/haskell/glib/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "glib"; - version = "0.13.0.1"; - sha256 = "0xbv7y1lmy35k6h2cgav7mxvpywvwfw47jq7qkcjj8mmr2sizp8i"; + version = "0.13.0.6"; + sha256 = "1hn3l0vrz76gmk7bjhs4nw68izf29k0pxm92l0zih7wq5ny4lhrv"; buildDepends = [ text utf8String ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; diff --git a/pkgs/development/libraries/haskell/gloss-banana/default.nix b/pkgs/development/libraries/haskell/gloss-banana/default.nix new file mode 100644 index 000000000000..7edbb8649f9a --- /dev/null +++ b/pkgs/development/libraries/haskell/gloss-banana/default.nix @@ -0,0 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, gloss, reactiveBanana }: + +cabal.mkDerivation (self: { + pname = "gloss-banana"; + version = "0.1.0.4"; + sha256 = "0zzpdryfcqvxpzv53ymsvkm2nza9ryvzqgf3n89pnvrni91avgj3"; + buildDepends = [ gloss reactiveBanana ]; + meta = { + homepage = "https://github.com/Twey/gloss-banana"; + description = "An Interface for gloss in terms of a reactive-banana Behavior"; + license = self.stdenv.lib.licenses.gpl3; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ twey ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/graphviz/default.nix b/pkgs/development/libraries/haskell/graphviz/default.nix index 47fc34c55ba8..c50e0403bd68 100644 --- a/pkgs/development/libraries/haskell/graphviz/default.nix +++ b/pkgs/development/libraries/haskell/graphviz/default.nix @@ -1,7 +1,7 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, colour, dlist, fgl, filepath, polyparse, QuickCheck -, temporary, text, transformers, wlPprintText +, systemGraphviz, temporary, text, transformers, wlPprintText }: cabal.mkDerivation (self: { @@ -14,7 +14,8 @@ cabal.mkDerivation (self: { colour dlist fgl filepath polyparse temporary text transformers wlPprintText ]; - testDepends = [ fgl filepath QuickCheck text ]; + testDepends = [ fgl filepath QuickCheck systemGraphviz text ]; + jailbreak = true; doCheck = false; meta = { homepage = "http://projects.haskell.org/graphviz/"; diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix b/pkgs/development/libraries/haskell/greencard/default.nix index 02757e9074c2..530c3be15055 100644 --- a/pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix +++ b/pkgs/development/libraries/haskell/greencard/default.nix @@ -3,16 +3,15 @@ { cabal }: cabal.mkDerivation (self: { - pname = "HUnit"; - version = "1.2.2.3"; - sha256 = "158i6s014ybh5bflzspd21qzdlhdyk89yqpmk8kwc59lxjvvjsxz"; + pname = "greencard"; + version = "3.0.4.2"; + sha256 = "1vl9p6mqss5r4jfqnjir7m1q7fhh9f204c99qd5y5d0j7yc26r5y"; isLibrary = true; isExecutable = true; meta = { - homepage = "http://hunit.sourceforge.net/"; - description = "A unit testing framework for Haskell"; + homepage = "https://github.com/sof/greencard"; + description = "GreenCard, a foreign function pre-processor for Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/grid/default.nix b/pkgs/development/libraries/haskell/grid/default.nix new file mode 100644 index 000000000000..8826d3ca2b5a --- /dev/null +++ b/pkgs/development/libraries/haskell/grid/default.nix @@ -0,0 +1,22 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, cereal, QuickCheck, testFramework +, testFrameworkQuickcheck2 +}: + +cabal.mkDerivation (self: { + pname = "grid"; + version = "7.6.7"; + sha256 = "1sdm47y9hbqn40bfi4fssnbrhksca7gdkgpqvz1gd2lqs729i1nf"; + buildDepends = [ cereal ]; + testDepends = [ + QuickCheck testFramework testFrameworkQuickcheck2 + ]; + doCheck = false; + meta = { + homepage = "https://github.com/mhwombat/grid"; + description = "Tools for working with regular grids (graphs, lattices)"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/gtk/default.nix b/pkgs/development/libraries/haskell/gtk/default.nix index bb6676916771..e9a90659a95f 100644 --- a/pkgs/development/libraries/haskell/gtk/default.nix +++ b/pkgs/development/libraries/haskell/gtk/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "gtk"; - version = "0.13.0.0"; - sha256 = "04xi1415i3qaiif9ha5wnmyzxxw8ix17zpvvfjn61nrxlk6p973m"; + version = "0.13.0.3"; + sha256 = "1l42hn3mhycq2b7z517jjyz3s8kvf5nyy0m674da0h2rixw9r5fh"; buildDepends = [ cairo gio glib mtl pango text ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; diff --git a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix index 1fe97ad01aa0..9fabf287166c 100644 --- a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix +++ b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "gtk2hs-buildtools"; - version = "0.13.0.1"; - sha256 = "0ngdg44hxpyga9kwm70340c8jhsh9wl5rja3wx9mfx194idivaxa"; + version = "0.13.0.3"; + sha256 = "1ijcmcjp8mralpzl1gvh24bzq8njlzkvck1r07b010rrklv04arp"; isLibrary = false; isExecutable = true; buildDepends = [ filepath hashtables random ]; diff --git a/pkgs/development/libraries/haskell/gtk3/default.nix b/pkgs/development/libraries/haskell/gtk3/default.nix index 99d76c03c526..2bcb6848e59b 100644 --- a/pkgs/development/libraries/haskell/gtk3/default.nix +++ b/pkgs/development/libraries/haskell/gtk3/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "gtk3"; - version = "0.13.0.0"; - sha256 = "0aq58gf6bcwnk085in0xilg7p8zyd2v079aqk1c47gjyrcg7p78f"; + version = "0.13.1"; + sha256 = "063my2y0fjsr2dgw066l6ck3mbcp1ahx5rqlzyb5xx1sbafrpl6a"; isLibrary = true; isExecutable = true; buildDepends = [ cairo gio glib mtl pango text time transformers ]; diff --git a/pkgs/development/libraries/haskell/gtksourceview2/default.nix b/pkgs/development/libraries/haskell/gtksourceview2/default.nix index 393c1f076825..d3f0f3136f83 100644 --- a/pkgs/development/libraries/haskell/gtksourceview2/default.nix +++ b/pkgs/development/libraries/haskell/gtksourceview2/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "gtksourceview2"; - version = "0.13.0.0"; - sha256 = "0md4dwg68cgq5qj80rjvsrckwn2ap9d1xp0hy8w1iiyii8dfqcnn"; + version = "0.13.1.1"; + sha256 = "09439drmwfy5bqni1clcn0nng30irn9x43fjak9jljggg1yij9xw"; buildDepends = [ glib gtk mtl text ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; diff --git a/pkgs/development/libraries/haskell/hS3/default.nix b/pkgs/development/libraries/haskell/hS3/default.nix index 65ba25d1d9a8..5cbad954c31a 100644 --- a/pkgs/development/libraries/haskell/hS3/default.nix +++ b/pkgs/development/libraries/haskell/hS3/default.nix @@ -1,18 +1,18 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, Crypto, dataenc, HTTP, hxt, MissingH, network, random -, regexCompat, utf8String +{ cabal, Crypto, dataenc, HTTP, hxt, MissingH, network, networkUri +, random, regexCompat, utf8String }: cabal.mkDerivation (self: { pname = "hS3"; - version = "0.5.8"; - sha256 = "1wmrrmlz4qlhr75lixn385pjpvpq21aafgf0fw8jyfqgdyjkg7bm"; + version = "0.5.9"; + sha256 = "0nf71jb15gkkcrb0x83mmql6j55c6dnz3bl3yq1grphwn0jbmq3y"; isLibrary = true; isExecutable = true; buildDepends = [ - Crypto dataenc HTTP hxt MissingH network random regexCompat - utf8String + Crypto dataenc HTTP hxt MissingH network networkUri random + regexCompat utf8String ]; meta = { homepage = "http://gregheartsfield.com/hS3/"; diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index d8ac50c85a0f..03730449a1aa 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -11,8 +11,8 @@ cabal.mkDerivation (self: { pname = "hakyll"; - version = "4.5.5.0"; - sha256 = "1igna446dsidlq3f9myclgcdawgvyyjxjk3r3icjra6zgdqd6j4l"; + version = "4.6.1.0"; + sha256 = "19yw5yp84vli228zmyz23vs6d5mb14rjbb81kvyra8fi8mmy2l6b"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -28,12 +28,12 @@ cabal.mkDerivation (self: { regexTdfa snapCore snapServer systemFilepath tagsoup testFramework testFrameworkHunit testFrameworkQuickcheck2 text time utillinux ]; + jailbreak = true; meta = { homepage = "http://jaspervdj.be/hakyll"; description = "A static website compiler library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; - broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/stm/2.4.nix b/pkgs/development/libraries/haskell/half/default.nix index 6007e845e9b8..009c141660fc 100644 --- a/pkgs/development/libraries/haskell/stm/2.4.nix +++ b/pkgs/development/libraries/haskell/half/default.nix @@ -3,13 +3,13 @@ { cabal }: cabal.mkDerivation (self: { - pname = "stm"; - version = "2.4"; - sha256 = "13flyzh2vnqnap78qjawdh3150rmp9bxnlgynsf793lm1b3z15fl"; + pname = "half"; + version = "0.2"; + sha256 = "0p5fw17mvcr6yizgdjy681a1gqdidb5yp80gksxrdm1dv6qf6xcp"; meta = { - description = "Software Transactional Memory"; + homepage = "http://github.com/ekmett/half"; + description = "Half-precision floating-point"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/handa-gdata/default.nix b/pkgs/development/libraries/haskell/handa-gdata/default.nix new file mode 100644 index 000000000000..b96c68297cbb --- /dev/null +++ b/pkgs/development/libraries/haskell/handa-gdata/default.nix @@ -0,0 +1,27 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, base64Bytestring, binary, caseInsensitive, cmdargs +, dataDefault, filepath, GenericPretty, HTTP, httpConduit, json +, network, pureMD5, random, regexPosix, resourcet, split, time +, unixCompat, utf8String, xml +}: + +cabal.mkDerivation (self: { + pname = "handa-gdata"; + version = "0.7.0.1"; + sha256 = "1azjfhwcirf6nv7pym8lcrghvjbrb1hh1y2w43g7qxxdmk54n8g7"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + base64Bytestring binary caseInsensitive cmdargs dataDefault + filepath GenericPretty HTTP httpConduit json network pureMD5 random + regexPosix resourcet split time unixCompat utf8String xml + ]; + doCheck = false; + meta = { + homepage = "http://code.google.com/p/hgdata"; + description = "Library and command-line utility for accessing Google services and APIs"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/happstack/happstack-lite.nix b/pkgs/development/libraries/haskell/happstack/happstack-lite.nix index 610220cc09ec..fa904e0434a4 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-lite.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-lite.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "happstack-lite"; - version = "7.3.4"; - sha256 = "06ndqfd4x49yi17kgiz5xr05l1k6sj5g1f6kir10wgsqhmd0q811"; + version = "7.3.5"; + sha256 = "1gkzkmg1ad5k9hb4gix2afq1k4j996qpp8mm1jzqk03a5njdpb4b"; buildDepends = [ happstackServer mtl text ]; meta = { homepage = "http://www.happstack.com/"; diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix index 1bc0b36f1204..24b740736bf7 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "happstack-server"; - version = "7.3.8"; - sha256 = "11jy4r4ih6sndyga3fjg298f5ww8806180dm3fgzsm0xfsjw1ac2"; + version = "7.3.9"; + sha256 = "10js2kmxw5lyy1h5xyz7qx852d29cl48qxyvadc4bdad6w06gdlz"; buildDepends = [ base64Bytestring blazeHtml extensibleExceptions filepath hslogger html monadControl mtl network networkUri parsec sendfile syb diff --git a/pkgs/development/libraries/haskell/hashable/1.1.2.5.nix b/pkgs/development/libraries/haskell/hashable/1.1.2.5.nix deleted file mode 100644 index 3c8330e82ae9..000000000000 --- a/pkgs/development/libraries/haskell/hashable/1.1.2.5.nix +++ /dev/null @@ -1,22 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, QuickCheck, random, testFramework -, testFrameworkQuickcheck2, text -}: - -cabal.mkDerivation (self: { - pname = "hashable"; - version = "1.1.2.5"; - sha256 = "0gbiaj5ck2bvvinndp2pg7qsm2h2izbnz9wi97dbm7i8r4qd9d9z"; - buildDepends = [ text ]; - testDepends = [ - QuickCheck random testFramework testFrameworkQuickcheck2 text - ]; - meta = { - homepage = "http://github.com/tibbe/hashable"; - description = "A class for types that can be converted to a hash value"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/hashable/1.2.2.0.nix b/pkgs/development/libraries/haskell/hashable/default.nix index bfd9ec03c0ec..bfd9ec03c0ec 100644 --- a/pkgs/development/libraries/haskell/hashable/1.2.2.0.nix +++ b/pkgs/development/libraries/haskell/hashable/default.nix diff --git a/pkgs/development/libraries/haskell/hask/default.nix b/pkgs/development/libraries/haskell/hask/default.nix new file mode 100644 index 000000000000..6a9796b596e6 --- /dev/null +++ b/pkgs/development/libraries/haskell/hask/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, constraints, reflection, tagged, transformers, void }: + +cabal.mkDerivation (self: { + pname = "hask"; + version = "0"; + sha256 = "1c87jxafxpnlyblhdif4br61wqvnad0s6hvfhmzhx9y1jri3rb39"; + buildDepends = [ constraints reflection tagged transformers void ]; + meta = { + homepage = "http://github.com/ekmett/hask"; + description = "Categories"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/haskell-generate/default.nix b/pkgs/development/libraries/haskell/haskell-generate/default.nix index 342e8d7c9328..7ca03476110b 100644 --- a/pkgs/development/libraries/haskell/haskell-generate/default.nix +++ b/pkgs/development/libraries/haskell/haskell-generate/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "haskell-generate"; - version = "0.2.1"; - sha256 = "1b7jy4a83lv9zwkzsgbipv7vlzcj27g1h3az7nxxc2gbmyrc15f4"; + version = "0.2.2"; + sha256 = "1wdfs28p195szg6jxq0qbyj4jdbqnsp9frgjnp25mzf14y9i1yid"; buildDepends = [ haskellSrcExts transformers ]; testDepends = [ doctest filepath ]; meta = { diff --git a/pkgs/development/libraries/haskell/haskell-names/default.nix b/pkgs/development/libraries/haskell/haskell-names/default.nix index fb1a1b6e263a..f8ec4d67a0b5 100644 --- a/pkgs/development/libraries/haskell/haskell-names/default.nix +++ b/pkgs/development/libraries/haskell/haskell-names/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "haskell-names"; - version = "0.4"; - sha256 = "02cbs3bwakm9bwh4yy242msh5hibxfr9dsc6a0nbpihj1fhbv6b4"; + version = "0.4.1"; + sha256 = "1zkfq54s7n17g77sqzfhhc4bmqwdwbynz0gzwyaf3m4nmz6lkfl8"; buildDepends = [ aeson Cabal dataLensLight filepath haskellPackages haskellSrcExts hseCpp mtl tagged transformers traverseWithClass typeEq uniplate diff --git a/pkgs/development/libraries/haskell/haskell-packages/default.nix b/pkgs/development/libraries/haskell/haskell-packages/default.nix index 0044d6aa0527..a23c6691a664 100644 --- a/pkgs/development/libraries/haskell/haskell-packages/default.nix +++ b/pkgs/development/libraries/haskell/haskell-packages/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "haskell-packages"; - version = "0.2.4.2"; - sha256 = "03qg6b6vy9c8j9k91jajkjhswcks64vcdd28606aac0bw68lkjkg"; + version = "0.2.4.3"; + sha256 = "0s1z5zzl53nmjnrlf1czri634h8fksbgkqvvz8hpwa60wsaf4dxn"; buildDepends = [ aeson Cabal deepseq filepath haskellSrcExts hseCpp mtl optparseApplicative tagged transformers transformersCompat diff --git a/pkgs/development/libraries/haskell/haskell-platform/2009.2.0.2.nix b/pkgs/development/libraries/haskell/haskell-platform/2009.2.0.2.nix deleted file mode 100644 index eac734a8422e..000000000000 --- a/pkgs/development/libraries/haskell/haskell-platform/2009.2.0.2.nix +++ /dev/null @@ -1,26 +0,0 @@ -{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl, editline, - haskellSrc, html, parallel, regexBase, regexCompat, regexPosix, - stm, time, xhtml, zlib, parsec, network, - cabalInstall, alex, happy, ghc}: - -cabal.mkDerivation (self : { - pname = "haskell-platform"; - version = "2009.2.0.2"; - src = fetchurl { - url = "http://hackage.haskell.org/platform/${self.version}/cabal/${self.pname}-${self.version}.tar.gz"; - sha256 = "e0469fac9b1d091d8299ae16a4e2e7fcd504285bba066b17153a0f0104a049bd"; - }; - isLibrary = false; - propagatedBuildInputs = [ - GLUT HTTP HUnit OpenGL QuickCheck cgi fgl editline - haskellSrc html parallel regexBase regexCompat regexPosix - stm time xhtml zlib parsec network - cabalInstall alex happy ghc - ]; - meta = { - description = "Haskell Platform meta package"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = with self.stdenv.lib.maintainers; [andres simons]; - }; -}) diff --git a/pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix deleted file mode 100644 index 8c1630752ecf..000000000000 --- a/pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix +++ /dev/null @@ -1,27 +0,0 @@ -{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl, - haskellSrc, html, network, parallel, regexBase, regexCompat, regexPosix, - stm, xhtml, zlib, parsec, - cabalInstall, alex, happy, ghc}: - -cabal.mkDerivation (self : { - pname = "haskell-platform"; - version = "2010.1.0.0"; - src = fetchurl { - url = "http://hackage.haskell.org/platform/${self.version}/cabal/${self.pname}-${self.version}.tar.gz"; - sha256 = "0cadj0ql2i5d5njwcbhmjkf4qrkfmxirg5vjv1wlx3ayzbynbrp4"; - }; - isLibrary = false; - propagatedBuildInputs = [ - GLUT HTTP HUnit OpenGL QuickCheck cgi fgl - haskellSrc html network parallel regexBase regexCompat regexPosix - stm xhtml zlib parsec - cabalInstall alex happy ghc - ]; - meta = { - description = "Haskell Platform meta package"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = with self.stdenv.lib.maintainers; [andres simons]; - broken = true; # The source code is no longer available from haskell.org. - }; -}) diff --git a/pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix deleted file mode 100644 index b9a3a841af52..000000000000 --- a/pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix +++ /dev/null @@ -1,26 +0,0 @@ -{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl, - haskellSrc, html, network, parallel, regexBase, regexCompat, regexPosix, - stm, xhtml, zlib, mtl, parsec, deepseq, - cabalInstall, alex, happy, ghc}: - -cabal.mkDerivation (self : { - pname = "haskell-platform"; - version = "2010.2.0.0"; - src = fetchurl { - url = "http://pkgs.fedoraproject.org/repo/pkgs/haskell-platform/haskell-platform-2010.2.0.0.tar.gz/9c9c6422ebfe1a5e78e69ae017f4d54b/haskell-platform-2010.2.0.0.tar.gz"; - sha256 = "c0b0b45151e74cff759ae25083c2ff7a7af4d2f74c19294b78730c879864f3c0"; - }; - isLibrary = false; - propagatedBuildInputs = [ - GLUT HTTP HUnit OpenGL QuickCheck cgi fgl - haskellSrc html network parallel regexBase regexCompat regexPosix - stm xhtml zlib mtl parsec deepseq - cabalInstall alex happy ghc - ]; - meta = { - description = "Haskell Platform meta package"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = with self.stdenv.lib.maintainers; [andres simons]; - }; -}) diff --git a/pkgs/development/libraries/haskell/haskell-platform/2011.2.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2011.2.0.0.nix deleted file mode 100644 index 4a9752a06119..000000000000 --- a/pkgs/development/libraries/haskell/haskell-platform/2011.2.0.0.nix +++ /dev/null @@ -1,28 +0,0 @@ -{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl, - haskellSrc, html, network, parallel, parsec, regexBase, regexCompat, regexPosix, - stm, syb, deepseq, text, transformers, mtl, xhtml, zlib, - cabalInstall, alex, happy, ghc}: - -cabal.mkDerivation (self : { - pname = "haskell-platform"; - version = "2011.2.0.0"; - src = fetchurl { - # url = "http://hackage.haskell.org/platform/${self.version}/cabal/${self.pname}-${self.version}.tar.gz"; - url = "http://lambda.haskell.org/hp-tmp/${self.version}/cabal/${self.pname}-${self.version}.tar.gz"; - sha256 = "01ppv8jdyvbngml9vgvrvnani6fj1nbk8mqmrkd8c508l7q9g6vb"; - }; - isLibrary = false; - propagatedBuildInputs = [ - GLUT HTTP HUnit OpenGL QuickCheck cgi fgl - haskellSrc html network parallel parsec regexBase regexCompat regexPosix - stm syb deepseq text transformers mtl xhtml zlib - cabalInstall alex happy ghc - ]; - noHaddock = true; - meta = { - description = "Haskell Platform meta package"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = with self.stdenv.lib.maintainers; [andres simons]; - }; -}) diff --git a/pkgs/development/libraries/haskell/haskell-platform/2011.2.0.1.nix b/pkgs/development/libraries/haskell/haskell-platform/2011.2.0.1.nix deleted file mode 100644 index cae4cc6796c2..000000000000 --- a/pkgs/development/libraries/haskell/haskell-platform/2011.2.0.1.nix +++ /dev/null @@ -1,38 +0,0 @@ -{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl, - haskellSrc, html, network, parallel, parsec, regexBase, regexCompat, regexPosix, - stm, syb, deepseq, text, transformers, mtl, xhtml, zlib, - cabalInstall, alex, happy, ghc}: - -# This is just a meta-package. Because upstream fails to provide proper versioned -# release tarballs that can be used for the purpose of verifying this package, we -# just create it on the fly from a simple Setup.hs file and a .cabal file that we -# store directly in the nixpkgs repository. - -cabal.mkDerivation (self : { - pname = "haskell-platform"; - version = "2011.2.0.1"; - cabalFile = ./haskell-platform-2011.2.0.1.cabal; - setupFile = ./Setup.hs; - src = null; - isLibrary = false; - propagatedBuildInputs = [ - GLUT HTTP HUnit OpenGL QuickCheck cgi fgl - haskellSrc html network parallel parsec regexBase regexCompat regexPosix - stm syb deepseq text transformers mtl xhtml zlib - cabalInstall alex happy ghc - ]; - unpackPhase = '' - sourceRoot=haskell-platform - mkdir $sourceRoot - cp ${self.cabalFile} $sourceRoot/${self.pname}.cabal - cp ${self.setupFile} $sourceRoot/Setup.hs - touch $sourceRoot/LICENSE - ''; - noHaddock = true; - meta = { - description = "Haskell Platform meta package"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = with self.stdenv.lib.maintainers; [andres simons]; - }; -}) diff --git a/pkgs/development/libraries/haskell/haskell-platform/2011.4.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2011.4.0.0.nix deleted file mode 100644 index 61aa32aff457..000000000000 --- a/pkgs/development/libraries/haskell/haskell-platform/2011.4.0.0.nix +++ /dev/null @@ -1,39 +0,0 @@ -{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl, - haskellSrc, html, network, parallel, parsec, regexBase, regexCompat, regexPosix, - stm, syb, deepseq, text, transformers, mtl, xhtml, zlib, - cabalInstall, alex, happy, ghc}: - -# This is just a meta-package. Because upstream fails to provide proper versioned -# release tarballs that can be used for the purpose of verifying this package, we -# just create it on the fly from a simple Setup.hs file and a .cabal file that we -# store directly in the nixpkgs repository. - -cabal.mkDerivation (self : { - pname = "haskell-platform"; - version = "2011.4.0.0"; - cabalFile = ./haskell-platform-2011.4.0.0.cabal; - setupFile = ./Setup.hs; - src = null; - isLibrary = false; - propagatedBuildInputs = [ - GLUT HTTP HUnit OpenGL QuickCheck cgi fgl - haskellSrc html network parallel parsec regexBase regexCompat regexPosix - stm syb deepseq text transformers mtl xhtml zlib - cabalInstall alex happy ghc - ]; - unpackPhase = '' - sourceRoot=haskell-platform - mkdir $sourceRoot - cp ${self.cabalFile} $sourceRoot/${self.pname}.cabal - cp ${self.setupFile} $sourceRoot/Setup.hs - touch $sourceRoot/LICENSE - ''; - noHaddock = true; - meta = { - homepage = "http://haskell.org/platform"; - description = "Haskell Platform meta package"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = with self.stdenv.lib.maintainers; [andres simons]; - }; -}) diff --git a/pkgs/development/libraries/haskell/haskell-platform/2012.2.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2012.2.0.0.nix deleted file mode 100644 index 9873342fa8d4..000000000000 --- a/pkgs/development/libraries/haskell/haskell-platform/2012.2.0.0.nix +++ /dev/null @@ -1,39 +0,0 @@ -{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl, - haskellSrc, html, network, parallel, parsec, regexBase, regexCompat, regexPosix, - stm, syb, deepseq, text, transformers, mtl, xhtml, zlib, random, - cabalInstall, alex, happy, ghc}: - -# This is just a meta-package. Because upstream fails to provide proper versioned -# release tarballs that can be used for the purpose of verifying this package, we -# just create it on the fly from a simple Setup.hs file and a .cabal file that we -# store directly in the nixpkgs repository. - -cabal.mkDerivation (self : { - pname = "haskell-platform"; - version = "2012.2.0.0"; - cabalFile = ./haskell-platform-2012.2.0.0.cabal; - setupFile = ./Setup.hs; - src = null; - isLibrary = false; - propagatedBuildInputs = [ - GLUT HTTP HUnit OpenGL QuickCheck cgi fgl - haskellSrc html network parallel parsec regexBase regexCompat regexPosix - stm syb deepseq text transformers mtl xhtml zlib random - cabalInstall alex happy ghc - ]; - unpackPhase = '' - sourceRoot=haskell-platform - mkdir $sourceRoot - cp ${self.cabalFile} $sourceRoot/${self.pname}.cabal - cp ${self.setupFile} $sourceRoot/Setup.hs - touch $sourceRoot/LICENSE - ''; - noHaddock = true; - meta = { - homepage = "http://haskell.org/platform"; - description = "Haskell Platform meta package"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = with self.stdenv.lib.maintainers; [andres simons]; - }; -}) diff --git a/pkgs/development/libraries/haskell/haskell-platform/2012.4.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2012.4.0.0.nix deleted file mode 100644 index e54f92641596..000000000000 --- a/pkgs/development/libraries/haskell/haskell-platform/2012.4.0.0.nix +++ /dev/null @@ -1,41 +0,0 @@ -{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, async, cgi, fgl, - haskellSrc, html, network, parallel, parsec, primitive, - regexBase, regexCompat, regexPosix, - split, stm, syb, deepseq, text, transformers, mtl, vector, xhtml, zlib, random, - cabalInstall, alex, happy, ghc}: - -# This is just a meta-package. Because upstream fails to provide proper versioned -# release tarballs that can be used for the purpose of verifying this package, we -# just create it on the fly from a simple Setup.hs file and a .cabal file that we -# store directly in the nixpkgs repository. - -cabal.mkDerivation (self : { - pname = "haskell-platform"; - version = "2012.4.0.0"; - cabalFile = ./haskell-platform-2012.4.0.0.cabal; - setupFile = ./Setup.hs; - src = null; - isLibrary = false; - propagatedBuildInputs = [ - GLUT HTTP HUnit OpenGL QuickCheck async cgi fgl - haskellSrc html network parallel parsec primitive - regexBase regexCompat regexPosix - split stm syb deepseq text transformers mtl vector xhtml zlib random - cabalInstall alex happy ghc - ]; - unpackPhase = '' - sourceRoot=haskell-platform - mkdir $sourceRoot - cp ${self.cabalFile} $sourceRoot/${self.pname}.cabal - cp ${self.setupFile} $sourceRoot/Setup.hs - touch $sourceRoot/LICENSE - ''; - noHaddock = true; - meta = { - homepage = "http://haskell.org/platform"; - description = "Haskell Platform meta package"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = with self.stdenv.lib.maintainers; [andres simons]; - }; -}) diff --git a/pkgs/development/libraries/haskell/haskell-platform/2013.2.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2013.2.0.0.nix deleted file mode 100644 index c7ce9b098150..000000000000 --- a/pkgs/development/libraries/haskell/haskell-platform/2013.2.0.0.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ cabal, fetchurl -, async, attoparsec, caseInsensitive, cgi, fgl, GLUT, GLURaw, haskellSrc -, hashable, html, HTTP, HUnit, mtl, network, OpenGL, OpenGLRaw, parallel -, parsec, QuickCheck, random, regexBase, regexCompat, regexPosix, split, stm -, syb, text, transformers, unorderedContainers, vector, xhtml, zlib -, cabalInstall, alex, happy, primitive, ghc -}: - -# This is just a meta-package. Because upstream fails to provide proper versioned -# release tarballs that can be used for the purpose of verifying this package, we -# just create it on the fly from a simple Setup.hs file and a .cabal file that we -# store directly in the nixpkgs repository. - -cabal.mkDerivation (self : { - pname = "haskell-platform"; - version = "2013.2.0.0"; - cabalFile = ./haskell-platform-2013.2.0.0.cabal; - setupFile = ./Setup.hs; - src = null; - isLibrary = false; - propagatedBuildInputs = [ - async attoparsec caseInsensitive cgi fgl GLUT GLURaw haskellSrc - hashable html HTTP HUnit mtl network OpenGL OpenGLRaw parallel - parsec QuickCheck random regexBase regexCompat regexPosix split stm - syb text transformers unorderedContainers vector xhtml zlib - cabalInstall alex happy primitive ghc - ]; - unpackPhase = '' - sourceRoot=haskell-platform - mkdir $sourceRoot - cp ${self.cabalFile} $sourceRoot/${self.pname}.cabal - cp ${self.setupFile} $sourceRoot/Setup.hs - touch $sourceRoot/LICENSE - ''; - noHaddock = true; - meta = { - homepage = "http://haskell.org/platform"; - description = "Haskell Platform meta package"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = with self.stdenv.lib.maintainers; [andres simons]; - }; -}) diff --git a/pkgs/development/libraries/haskell/haskell-platform/Setup.hs b/pkgs/development/libraries/haskell/haskell-platform/Setup.hs deleted file mode 100644 index 47fd3a5c71b1..000000000000 --- a/pkgs/development/libraries/haskell/haskell-platform/Setup.hs +++ /dev/null @@ -1,10 +0,0 @@ -import Distribution.Simple -import Distribution.Simple.Program - -main = defaultMainWithHooks simpleUserHooks { hookedPrograms = [cabal] } - -cabal :: Program -cabal = (simpleProgram "cabal-install") { - programFindLocation = \x -> findProgramLocation x "cabal", - programFindVersion = findProgramVersion "--numeric-version" id -} diff --git a/pkgs/development/libraries/haskell/haskell-platform/default.nix b/pkgs/development/libraries/haskell/haskell-platform/default.nix deleted file mode 100644 index 2de2809cf53b..000000000000 --- a/pkgs/development/libraries/haskell/haskell-platform/default.nix +++ /dev/null @@ -1,314 +0,0 @@ -{ pkgs }: - -let - haskellPlatformPackages_2013_2_0_0 = pkgs.haskell.packages_ghc763.override { - extension = self : super : { - async = self.async_2_0_1_4; - attoparsec = self.attoparsec_0_10_4_0; - caseInsensitive = self.caseInsensitive_1_0_0_1; - cgi = self.cgi_3001_1_7_5; - fgl = self.fgl_5_4_2_4; - GLUT = self.GLUT_2_4_0_0; - GLURaw = self.GLURaw_1_3_0_0; - haskellSrc = self.haskellSrc_1_0_1_5; - hashable = self.hashable_1_1_2_5; - html = self.html_1_0_1_2; - HTTP = self.HTTP_4000_2_8; - HUnit = self.HUnit_1_2_5_2; - mtl = self.mtl_2_1_2; - network = self.network_2_4_1_2; - OpenGL = self.OpenGL_2_8_0_0; - OpenGLRaw = self.OpenGLRaw_1_3_0_0; - parallel = self.parallel_3_2_0_3; - parsec = self.parsec_3_1_3; - QuickCheck = self.QuickCheck_2_6; - random = self.random_1_0_1_1; - regexBase = self.regexBase_0_93_2; - regexCompat = self.regexCompat_0_95_1; - regexPosix = self.regexPosix_0_95_2; - split = self.split_0_2_2; - stm = self.stm_2_4_2; - syb = self.syb_0_4_0; - text = self.text_0_11_3_1; - transformers = self.transformers_0_3_0_0; - unorderedContainers = self.unorderedContainers_0_2_3_0; - vector = self.vector_0_10_0_1; - xhtml = self.xhtml_3000_2_1; - zlib = self.zlib_0_5_4_1; - cabalInstall = self.cabalInstall_1_16_0_2; - alex = self.alex_3_0_5; - happy = self.happy_1_18_10; - primitive = self.primitive_0_5_0_1; # semi-official, but specified - }; - }; - - haskellPlatformPackages_2012_4_0_0 = pkgs.haskell.packages_ghc742.override { - extension = self : super : { - async = self.async_2_0_1_3; - cgi = self.cgi_3001_1_7_4; - fgl = self.fgl_5_4_2_4; - GLUT = self.GLUT_2_1_2_1; - haskellSrc = self.haskellSrc_1_0_1_5; - html = self.html_1_0_1_2; - HTTP = super.HTTP_4000_2_5.override { network = self.network_2_3_1_0; }; - HUnit = self.HUnit_1_2_5_1; - mtl = self.mtl_2_1_2; - network = self.network_2_3_1_0; - OpenGL = self.OpenGL_2_2_3_1; - parallel = self.parallel_3_2_0_3; - parsec = self.parsec_3_1_3; - QuickCheck = self.QuickCheck_2_5_1_1; - random = self.random_1_0_1_1; - regexBase = self.regexBase_0_93_2; - regexCompat = self.regexCompat_0_95_1; - regexPosix = self.regexPosix_0_95_2; - split = self.split_0_2_1_1; - stm = self.stm_2_4; - syb = self.syb_0_3_7; - text = self.text_0_11_2_3; - transformers = self.transformers_0_3_0_0; - vector = self.vector_0_10_0_1; - xhtml = self.xhtml_3000_2_1; - zlib = self.zlib_0_5_4_0; - cabalInstall = self.cabalInstall_0_14_0; - alex = self.alex_3_0_2; - happy = self.happy_1_18_10; - primitive = self.primitive_0_5_0_1; # semi-official, but specified - }; - }; - - haskellPlatformPackages_2012_2_0_0 = pkgs.haskell.packages_ghc742.override { - ghcPath = ../../../compilers/ghc/7.4.1.nix; - extension = self : super : { - cgi = self.cgi_3001_1_7_4; - fgl = self.fgl_5_4_2_4; - GLUT = self.GLUT_2_1_2_1; - haskellSrc = self.haskellSrc_1_0_1_5; - html = self.html_1_0_1_2; - HTTP = self.HTTP_4000_2_3; - HUnit = self.HUnit_1_2_4_2; - mtl = self.mtl_2_1_1; - network = self.network_2_3_0_13; - OpenGL = self.OpenGL_2_2_3_1; - parallel = self.parallel_3_2_0_2; - parsec = self.parsec_3_1_2; - QuickCheck = self.QuickCheck_2_4_2; - random = self.random_1_0_1_1; - regexBase = self.regexBase_0_93_2; - regexCompat = self.regexCompat_0_95_1; - regexPosix = self.regexPosix_0_95_1; - stm = self.stm_2_3; - syb = self.syb_0_3_6_1; - text = self.text_0_11_2_0; - transformers = self.transformers_0_3_0_0; - xhtml = self.xhtml_3000_2_1; - zlib = self.zlib_0_5_3_3; - cabalInstall = self.cabalInstall_0_14_0; - alex = self.alex_3_0_1; - happy = self.happy_1_18_9; - }; - }; - - haskellPlatformPackages_2011_4_0_0 = pkgs.haskell.packages_ghc704.override { - extension = self : super : { - cgi = self.cgi_3001_1_7_4; - fgl = self.fgl_5_4_2_4; - GLUT = self.GLUT_2_1_2_1; - haskellSrc = self.haskellSrc_1_0_1_4; - html = self.html_1_0_1_2; - HUnit = self.HUnit_1_2_4_2; - network = self.network_2_3_0_5; - OpenGL = self.OpenGL_2_2_3_0; - parallel = self.parallel_3_1_0_1; - parsec = self.parsec_3_1_1; - QuickCheck = self.QuickCheck_2_4_1_1; - regexBase = self.regexBase_0_93_2; - regexCompat = self.regexCompat_0_95_1; - regexPosix = self.regexPosix_0_95_1; - stm = self.stm_2_2_0_1; - syb = self.syb_0_3_3; - xhtml = self.xhtml_3000_2_0_4; - zlib = self.zlib_0_5_3_1; - HTTP = self.HTTP_4000_1_2; - deepseq = self.deepseq_1_1_0_2; - text = self.text_0_11_1_5; - transformers = self.transformers_0_2_2_0; - mtl = self.mtl_2_0_1_0; - cabalInstall = self.cabalInstall_0_10_2; - alex = self.alex_2_3_5; - happy = self.happy_1_18_6; - }; - }; - - haskellPlatformPackages_2011_2_0_1 = pkgs.haskell.packages_ghc704.override { - ghcPath = ../../../compilers/ghc/7.0.3.nix; - extension = self : super : { - cgi = self.cgi_3001_1_7_4; - fgl = self.fgl_5_4_2_3; - GLUT = self.GLUT_2_1_2_1; - haskellSrc = self.haskellSrc_1_0_1_4; - html = self.html_1_0_1_2; - HUnit = self.HUnit_1_2_2_3; - network = self.network_2_3_0_2; - OpenGL = self.OpenGL_2_2_3_0; - parallel = self.parallel_3_1_0_1; - parsec = self.parsec_3_1_1; - QuickCheck = self.QuickCheck_2_4_0_1; - regexBase = self.regexBase_0_93_2; - regexCompat = self.regexCompat_0_93_1; - regexPosix = self.regexPosix_0_94_4; - stm = self.stm_2_2_0_1; - syb = self.syb_0_3; - xhtml = self.xhtml_3000_2_0_1; - zlib = self.zlib_0_5_3_1; - HTTP = self.HTTP_4000_1_1; - deepseq = self.deepseq_1_1_0_2; - text = self.text_0_11_0_6; - transformers = self.transformers_0_2_2_0; - mtl = self.mtl_2_0_1_0; - cabalInstall = self.cabalInstall_0_10_2; - alex = self.alex_2_3_5; - happy = self.happy_1_18_6; - }; - }; - - haskellPlatformPackages_2011_2_0_0 = pkgs.haskell.packages_ghc704.override { - ghcPath = ../../../compilers/ghc/7.0.2.nix; - extension = self : super : { - cgi = self.cgi_3001_1_7_4; - fgl = self.fgl_5_4_2_3; - GLUT = self.GLUT_2_1_2_1; - haskellSrc = self.haskellSrc_1_0_1_4; - html = self.html_1_0_1_2; - HUnit = self.HUnit_1_2_2_3; - network = self.network_2_3_0_2; - OpenGL = self.OpenGL_2_2_3_0; - parallel = self.parallel_3_1_0_1; - parsec = self.parsec_3_1_1; - QuickCheck = self.QuickCheck_2_4_0_1; - regexBase = self.regexBase_0_93_2; - regexCompat = self.regexCompat_0_93_1; - regexPosix = self.regexPosix_0_94_4; - stm = self.stm_2_2_0_1; - syb = self.syb_0_3; - xhtml = self.xhtml_3000_2_0_1; - zlib = self.zlib_0_5_3_1; - HTTP = self.HTTP_4000_1_1; - deepseq = self.deepseq_1_1_0_2; - text = self.text_0_11_0_5; - transformers = self.transformers_0_2_2_0; - mtl = self.mtl_2_0_1_0; - cabalInstall = self.cabalInstall_0_10_2; - alex = self.alex_2_3_5; - happy = self.happy_1_18_6; - }; - }; - - haskellPlatformPackages_2010_2_0_0 = pkgs.haskell.packages_ghc6123.override { - extension = self : super : { - cgi = self.cgi_3001_1_7_3; - fgl = self.fgl_5_4_2_3; - GLUT = self.GLUT_2_1_2_1; - haskellSrc = self.haskellSrc_1_0_1_3; - html = self.html_1_0_1_2; - HUnit = self.HUnit_1_2_2_1; - mtl = self.mtl_1_1_0_2; - network = self.network_2_2_1_7; - OpenGL = self.OpenGL_2_2_3_0; - parallel = self.parallel_2_2_0_1; - parsec = self.parsec_2_1_0_1; - QuickCheck = self.QuickCheck_2_1_1_1; - regexBase = self.regexBase_0_93_2; - regexCompat = self.regexCompat_0_93_1; - regexPosix = self.regexPosix_0_94_2; - stm = self.stm_2_1_2_1; - xhtml = self.xhtml_3000_2_0_1; - zlib = self.zlib_0_5_2_0; - HTTP = self.HTTP_4000_0_9; - deepseq = self.deepseq_1_1_0_0; - text = self.text_0_11_0_5; - cabalInstall = self.cabalInstall_0_8_2; - alex = self.alex_2_3_3; - happy = self.happy_1_18_5; - }; - }; - - haskellPlatformPackages_2010_1_0_0 = pkgs.haskell.packages_ghc6123.override { - extension = self : super : { - haskellSrc = self.haskellSrc_1_0_1_3; - html = self.html_1_0_1_2; - fgl = self.fgl_5_4_2_2; - cabalInstall = self.cabalInstall_0_8_0; - GLUT = self.GLUT_2_1_2_1; - OpenGL = self.OpenGL_2_2_3_0; - zlib = self.zlib_0_5_2_0; - alex = self.alex_2_3_2; - cgi = self.cgi_3001_1_7_2; - QuickCheck = self.QuickCheck_2_1_1_1; - HTTP = self.HTTP_4000_0_9; - deepseq = self.deepseq_1_1_0_0; - HUnit = self.HUnit_1_2_2_1; - network = self.network_2_2_1_7; - parallel = self.parallel_2_2_0_1; - parsec = self.parsec_2_1_0_1; - regexBase = self.regexBase_0_93_1; - regexCompat = self.regexCompat_0_92; - regexPosix = self.regexPosix_0_94_1; - stm = self.stm_2_1_1_2; - xhtml = self.xhtml_3000_2_0_1; - happy = self.happy_1_18_4; - # not actually specified, but important to make the whole thing build - mtl = self.mtl_1_1_0_2; - }; - }; - - haskellPlatformPackages_2009_2_0_2 = pkgs.haskell.packages_ghc6104.override { - extension = self : super : { - time = self.time_1_1_2_4; - cgi = self.cgi_3001_1_7_1; - editline = self.editline_0_2_1_0; - fgl = self.fgl_5_4_2_2; - GLUT = self.GLUT_2_1_1_2; - haskellSrc = self.haskellSrc_1_0_1_3; - html = self.html_1_0_1_2; - HUnit = self.HUnit_1_2_0_3; - network = self.network_2_2_1_4; - OpenGL = self.OpenGL_2_2_1_1; - parallel = self.parallel_1_1_0_1; - parsec = self.parsec_2_1_0_1; - QuickCheck = self.QuickCheck_1_2_0_0; - regexBase = self.regexBase_0_72_0_2; - regexCompat = self.regexCompat_0_71_0_1; - regexPosix = self.regexPosix_0_72_0_3; - stm = self.stm_2_1_1_2; - xhtml = self.xhtml_3000_2_0_1; - zlib = self.zlib_0_5_0_0; - HTTP = self.HTTP_4000_0_6; - cabalInstall = self.cabalInstall_0_6_2; - alex = self.alex_2_3_1; - happy = self.happy_1_18_4; - # not actually specified, but important to make the whole thing build - mtl = self.mtl_1_1_0_2; - }; - }; - -in -{ - "2013_2_0_0" = haskellPlatformPackages_2013_2_0_0.callPackage ./2013.2.0.0.nix {}; - - "2012_4_0_0" = haskellPlatformPackages_2012_4_0_0.callPackage ./2012.4.0.0.nix {}; - - "2012_2_0_0" = haskellPlatformPackages_2012_2_0_0.callPackage ./2012.2.0.0.nix {}; - - "2011_4_0_0" = haskellPlatformPackages_2011_4_0_0.callPackage ./2011.4.0.0.nix {}; - - "2011_2_0_1" = haskellPlatformPackages_2011_2_0_1.callPackage ./2011.2.0.1.nix {}; - - "2011_2_0_0" = haskellPlatformPackages_2011_2_0_0.callPackage ./2011.2.0.0.nix {}; - - "2010_2_0_0" = haskellPlatformPackages_2010_2_0_0.callPackage ./2010.2.0.0.nix {}; - - "2010_1_0_0" = haskellPlatformPackages_2010_1_0_0.callPackage ./2010.1.0.0.nix {}; - - "2009_2_0_2" = haskellPlatformPackages_2009_2_0_2.callPackage ./2009.2.0.2.nix {}; -} diff --git a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2011.2.0.1.cabal b/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2011.2.0.1.cabal deleted file mode 100644 index fa09cb039dab..000000000000 --- a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2011.2.0.1.cabal +++ /dev/null @@ -1,90 +0,0 @@ -name: haskell-platform -version: 2011.2.0.1 -homepage: http://haskell.org/platform -license: BSD3 -license-file: LICENSE -author: libraries@haskell.org -maintainer: haskell-platform@projects.haskell.org -category: System -synopsis: The Haskell Platform -description: - The Haskell Platform (HP) is the blessed set of libraries and tools on - which to build further Haskell libraries and applications. It is - intended to provide a comprehensive, stable, and quality tested base for - Haskell projects to work from. - . - This version specifies the following additional developer tools be - installed, for a system to be in full compliance: - . - * cabal-install - * alex - * happy - * haddock - -cabal-version: >= 1.6 -build-type: Custom -tested-with: GHC ==7.0.3 - -library - build-depends: - -- ghc 7.x - -- Core libraries: provided by every ghc installation - -- We don't include "non-API" packages here. - -- array ==0.3.0.2 - -- base ==4.3.1.0 - -- bytestring ==0.9.1.10 - -- Cabal ==1.10.1.0 - -- containers ==0.4.0.0 - -- directory ==1.1.0.0 - -- extensible-exceptions ==0.1.1.2 - -- filepath ==1.2.0.0 - -- haskell2010 ==1.0.0.0 - -- haskell98 ==1.1.0.1 - -- hpc ==0.5.0.6 - -- old-locale ==1.0.0.2 - -- old-time ==1.0.0.6 - -- pretty ==1.0.1.2 - -- process ==1.0.1.5 - -- random ==1.0.0.3 - -- template-haskell ==2.5.0.0 - -- time ==1.2.0.3 - -- unix ==XXX 2.4.2.0 - -- Win32 ==XXX 2.2.0.1 - - -- Libraries in addition to what GHC provides: - -- Note: newer versions of cgi need monad-catchio. - cgi ==3001.1.7.4, - fgl ==5.4.2.3, - GLUT ==2.1.2.1, - haskell-src ==1.0.1.4, - html ==1.0.1.2, - HUnit ==1.2.2.3, - network ==2.3.0.2, - OpenGL ==2.2.3.0, - parallel ==3.1.0.1, - parsec ==3.1.1, - QuickCheck ==2.4.0.1, - regex-base ==0.93.2, - regex-compat ==0.93.1, - regex-posix ==0.94.4, - stm ==2.2.0.1, - syb ==0.3, - xhtml ==3000.2.0.1, - zlib ==0.5.3.1, - HTTP ==4000.1.1, - deepseq ==1.1.0.2, - - -- 2011.1 proposals: - text ==0.11.0.6, - transformers ==0.2.2.0, - mtl ==2.0.1.0 - - -- Depending on programs does not work, they are not registered - -- We list them to help distro packaging. - build-tools: - cabal-install ==0.10.2, - alex ==2.3.5, - happy ==1.18.6 - -- hscolour ==1.17 - -- haddock ==2.9.2 -- need to use the one shipped with ghc - diff --git a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2011.4.0.0.cabal b/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2011.4.0.0.cabal deleted file mode 100644 index 56414de90c5b..000000000000 --- a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2011.4.0.0.cabal +++ /dev/null @@ -1,90 +0,0 @@ -name: haskell-platform -version: 2011.4.0.0 -homepage: http://haskell.org/platform -license: BSD3 -license-file: LICENSE -author: libraries@haskell.org -maintainer: haskell-platform@projects.haskell.org -category: System -synopsis: The Haskell Platform -description: - The Haskell Platform (HP) is the blessed set of libraries and tools on - which to build further Haskell libraries and applications. It is - intended to provide a comprehensive, stable, and quality tested base for - Haskell projects to work from. - . - This version specifies the following additional developer tools be - installed, for a system to be in full compliance: - . - * cabal-install - * alex - * happy - * haddock - -cabal-version: >= 1.8 -build-type: Custom -tested-with: GHC ==7.0.4 - -library - build-depends: - -- ghc 7.x - -- Core libraries: provided by every ghc installation - -- We don't include "non-API" packages here. - -- array ==0.3.0.2 - -- base ==4.3.1.0 - -- bytestring ==0.9.1.10 - -- Cabal ==1.10.2.0 - -- containers ==0.4.0.0 - -- directory ==1.1.0.0 - -- extensible-exceptions ==0.1.1.2 - -- filepath ==1.2.0.0 - -- haskell2010 ==1.0.0.0 - -- haskell98 ==1.1.0.1 - -- hpc ==0.5.0.6 - -- old-locale ==1.0.0.2 - -- old-time ==1.0.0.6 - -- pretty ==1.0.1.2 - -- process ==1.0.1.5 - -- random ==1.0.0.3 - -- template-haskell ==2.5.0.0 - -- time ==1.2.0.3 - -- unix ==XXX 2.4.2.0 - -- Win32 ==XXX 2.2.0.1 - - -- Libraries in addition to what GHC provides: - -- Note: newer versions of cgi need monad-catchio. - cgi ==3001.1.7.4, - fgl ==5.4.2.4, - GLUT ==2.1.2.1, - haskell-src ==1.0.1.4, - html ==1.0.1.2, - HUnit ==1.2.4.2, - network ==2.3.0.5, - OpenGL ==2.2.3.0, - parallel ==3.1.0.1, - parsec ==3.1.1, - QuickCheck ==2.4.1.1, - regex-base ==0.93.2, - regex-compat ==0.95.1, - regex-posix ==0.95.1, - stm ==2.2.0.1, - syb ==0.3.3, - xhtml ==3000.2.0.4, - zlib ==0.5.3.1, - HTTP ==4000.1.2, - deepseq ==1.1.0.2, - - -- 2011.1 proposals: - text ==0.11.1.5, - transformers ==0.2.2.0, - mtl ==2.0.1.0 - - -- Depending on programs does not work, they are not registered - -- We list them to help distro packaging. - build-tools: - cabal-install ==0.10.2, - alex ==2.3.5, - happy ==1.18.6 - -- hscolour ==1.17 - -- haddock ==2.9.2 -- need to use the one shipped with ghc - diff --git a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.2.0.0.cabal b/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.2.0.0.cabal deleted file mode 100644 index 264d636f9942..000000000000 --- a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.2.0.0.cabal +++ /dev/null @@ -1,89 +0,0 @@ -name: haskell-platform -version: 2012.2.0.0 -homepage: http://haskell.org/platform -license: BSD3 -license-file: LICENSE -author: libraries@haskell.org -maintainer: haskell-platform@projects.haskell.org -category: System -synopsis: The Haskell Platform -description: - The Haskell Platform (HP) is the blessed set of libraries and tools on - which to build further Haskell libraries and applications. It is - intended to provide a comprehensive, stable, and quality tested base for - Haskell projects to work from. - . - This version specifies the following additional developer tools be - installed, for a system to be in full compliance: - . - * cabal-install - * alex - * happy - * haddock - -cabal-version: >= 1.8 -build-type: Custom -tested-with: GHC ==7.4.1 - -library - build-depends: - -- ghc ==7.4.1, - - -- Core libraries: provided by every ghc installation - -- We don't include "non-API" packages here. - -- array ==0.4.0.0, - -- base ==4.5.0.0, - -- bytestring ==0.9.2.1, - -- Cabal ==1.14.0, - -- containers ==0.4.2.1, - -- deepseq ==1.3.0.0, - -- directory ==1.1.0.2, - -- extensible-exceptions ==0.1.1.4, - -- filepath ==1.3.0.0, - -- haskell2010 ==1.1.0.1, - -- haskell98 ==2.0.0.1, - -- hpc ==0.5.1.1, - -- old-locale ==1.0.0.4, - -- old-time ==1.1.0.0, - -- pretty ==1.1.1.0, - -- process ==1.1.0.1, - -- template-haskell ==2.7.0.0, - -- time ==1.4, - -- unix ==2.5.1.0, - -- Win32 ==2.2.2.0, - - -- Libraries in addition to what GHC provides: - -- Note: newer versions of cgi need monad-catchio. - cgi ==3001.1.7.4, - fgl ==5.4.2.4, - GLUT ==2.1.2.1, - haskell-src ==1.0.1.5, - html ==1.0.1.2, - HTTP ==4000.2.3, - HUnit ==1.2.4.2, - mtl ==2.1.1, - network ==2.3.0.13, - OpenGL ==2.2.3.1, - parallel ==3.2.0.2, - parsec ==3.1.2, - QuickCheck ==2.4.2, - random ==1.0.1.1, - regex-base ==0.93.2, - regex-compat ==0.95.1, - regex-posix ==0.95.1, - stm ==2.3, - syb ==0.3.6.1, - text ==0.11.2.0, - transformers ==0.3.0.0, - xhtml ==3000.2.1, - zlib ==0.5.3.3 - - -- Depending on programs does not work, they are not registered - -- We list them to help distro packaging. - build-tools: - cabal-install ==0.14.0, - alex ==3.0.1, - happy ==1.18.9 - -- hscolour ==1.19 - -- haddock ==2.10.0 -- need to use the one shipped with ghc - diff --git a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.4.0.0.cabal b/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.4.0.0.cabal deleted file mode 100644 index 23d1f7a0a7d9..000000000000 --- a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.4.0.0.cabal +++ /dev/null @@ -1,113 +0,0 @@ -name: haskell-platform -version: 2012.4.0.0 -homepage: http://haskell.org/platform -license: BSD3 -license-file: LICENSE -author: libraries@haskell.org -maintainer: haskell-platform@projects.haskell.org -category: System -synopsis: The Haskell Platform -description: - The Haskell Platform (HP) is the blessed set of libraries and tools on - which to build further Haskell libraries and applications. It is - intended to provide a comprehensive, stable, and quality tested base for - Haskell projects to work from. - . - This version specifies the following additional developer tools be - installed, for a system to be in full compliance: - . - * cabal-install - * alex - * happy - * haddock - -cabal-version: >= 1.8 -build-type: Custom -tested-with: GHC ==7.4.2 - -flag include-ghc-depends - description: Include all the GHC provided packages in the dependencies - default: False - -library - if flag(include-ghc-depends) - build-depends: - ghc ==7.4.2, - - -- Core libraries: provided by every ghc installation - -- We don't include "non-API" packages here. - -- begin core packages - array ==0.4.0.0, - base ==4.5.1.0, - bytestring ==0.9.2.1, - Cabal ==1.14.0, - containers ==0.4.2.1, - deepseq ==1.3.0.0, - directory ==1.1.0.2, - extensible-exceptions ==0.1.1.4, - filepath ==1.3.0.0, - haskell2010 ==1.1.0.1, - haskell98 ==2.0.0.1, - hpc ==0.5.1.1, - old-locale ==1.0.0.4, - old-time ==1.1.0.0, - pretty ==1.1.1.0, - process ==1.1.0.1, - template-haskell ==2.7.0.0, - time ==1.4 - if !os(windows) - build-depends: - unix ==2.5.1.1 - -- end core packages - else - build-depends: - Win32 ==2.2.2.0 - - build-depends: - -- Libraries in addition to what GHC provides: - -- Note: newer versions of cgi need monad-catchio. - -- begin platform packages - async ==2.0.1.3, - cgi ==3001.1.7.4, - fgl ==5.4.2.4, - GLUT ==2.1.2.1, - haskell-src ==1.0.1.5, - html ==1.0.1.2, - HTTP ==4000.2.5, - HUnit ==1.2.5.1, - mtl ==2.1.2, - network ==2.3.1.0, - OpenGL ==2.2.3.1, - parallel ==3.2.0.3, - parsec ==3.1.3, - QuickCheck ==2.5.1.1, - random ==1.0.1.1, - regex-base ==0.93.2, - regex-compat ==0.95.1, - regex-posix ==0.95.2, - split ==0.2.1.1, - stm ==2.4, - syb ==0.3.7, - text ==0.11.2.3, - transformers ==0.3.0.0, - vector ==0.10.0.1, - xhtml ==3000.2.1, - zlib ==0.5.4.0, - - -- Libraries that are needed to support the above, - -- though are not officially part of the platform - primitive ==0.5.0.1 - - -- Depending on programs does not work, they are not registered - -- We list them to help distro packaging. - build-tools: - cabal-install ==0.14.0, - alex ==3.0.2, - happy ==1.18.10 - -- end platform packages - -- hscolour ==1.19 -- ??? - -- haddock ==2.11.0 -- need to use the one shipped with ghc - --- N.B.: The begin/end comment annotations are used to build the source --- installer: Packages that are part of the core are checked at build time. --- Source of packages that are part of the platform are included in the tarball. diff --git a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2013.2.0.0.cabal b/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2013.2.0.0.cabal deleted file mode 100644 index cf676ab1d6e0..000000000000 --- a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2013.2.0.0.cabal +++ /dev/null @@ -1,118 +0,0 @@ -name: haskell-platform -version: 2013.2.0.0 -homepage: http://haskell.org/platform -license: BSD3 -license-file: LICENSE -author: libraries@haskell.org -maintainer: haskell-platform@projects.haskell.org -category: System -synopsis: The Haskell Platform -description: - The Haskell Platform (HP) is the blessed set of libraries and tools on - which to build further Haskell libraries and applications. It is - intended to provide a comprehensive, stable, and quality tested base for - Haskell projects to work from. - . - This version specifies the following additional developer tools be - installed, for a system to be in full compliance: - . - * cabal-install - * alex - * happy - * haddock - -cabal-version: >= 1.8 -build-type: Custom -tested-with: GHC ==7.6.3 - -flag include-ghc-depends - description: Include all the GHC provided packages in the dependencies - default: False - -library - if flag(include-ghc-depends) - build-depends: - ghc ==7.6.3, - - -- Core libraries: provided by every ghc installation - -- We don't include "non-API" packages here. - -- begin core packages - array ==0.4.0.1, - base ==4.6.0.1, - bytestring ==0.10.0.2, - Cabal ==1.16.0, - containers ==0.5.0.0, - deepseq ==1.3.0.1, - directory ==1.2.0.1, - filepath ==1.3.0.1, - haskell2010 ==1.1.1.0, - haskell98 ==2.0.0.2, - hpc ==0.6.0.0, - old-locale ==1.0.0.5, - old-time ==1.1.0.1, - pretty ==1.1.1.0, - process ==1.1.0.2, - template-haskell ==2.8.0.0, - time ==1.4.0.1 - if !os(windows) - build-depends: - unix ==2.6.0.1 - -- end core packages - else - build-depends: - Win32 ==2.3.0.0 - - build-depends: - -- Libraries in addition to what GHC provides: - -- Note: newer versions of cgi need monad-catchio. - -- begin platform packages - async ==2.0.1.4, - attoparsec ==0.10.4.0, - case-insensitive ==1.0.0.1, - cgi ==3001.1.7.5, - fgl ==5.4.2.4, - GLUT ==2.4.0.0, - GLURaw ==1.3.0.0, - haskell-src ==1.0.1.5, - hashable ==1.1.2.5, - html ==1.0.1.2, - HTTP ==4000.2.8, - HUnit ==1.2.5.2, - mtl ==2.1.2, - network ==2.4.1.2, - OpenGL ==2.8.0.0, - OpenGLRaw ==1.3.0.0, - parallel ==3.2.0.3, - parsec ==3.1.3, - QuickCheck ==2.6, - random ==1.0.1.1, - regex-base ==0.93.2, - regex-compat ==0.95.1, - regex-posix ==0.95.2, - split ==0.2.2, - stm ==2.4.2, - syb ==0.4.0, - text ==0.11.3.1, - transformers ==0.3.0.0, - unordered-containers ==0.2.3.0, - vector ==0.10.0.1, - xhtml ==3000.2.1, - zlib ==0.5.4.1, - - -- Libraries that are needed to support the above, - -- though are not officially part of the platform - primitive ==0.5.0.1 - - -- Depending on programs does not work, they are not registered - -- We list them to help distro packaging. - build-tools: - cabal-install ==1.16.0.2, - alex ==3.0.5, - happy ==1.18.10 - -- end platform packages - -- hscolour ==1.20.3 -- ??? - -- haddock ==2.13.2 -- need to use the one shipped with ghc - --- N.B.: The begin/end comment annotations are used to build the source --- installer: Packages that are part of the core are checked at build time. --- Source of packages that are part of the platform are included in the tarball. diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/default.nix b/pkgs/development/libraries/haskell/haskell-src-exts/1.15.0.1.nix index b8c0a78001b0..93e07dede858 100644 --- a/pkgs/development/libraries/haskell/haskell-src-exts/default.nix +++ b/pkgs/development/libraries/haskell/haskell-src-exts/1.15.0.1.nix @@ -14,11 +14,11 @@ cabal.mkDerivation (self: { tastySmallcheck ]; buildTools = [ happy ]; - doCheck = false; meta = { homepage = "https://github.com/haskell-suite/haskell-src-exts"; description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/1.13.5.nix b/pkgs/development/libraries/haskell/haskell-src-exts/1.16.0.1.nix index 1f9d3bf4d19e..d837c2f689bd 100644 --- a/pkgs/development/libraries/haskell/haskell-src-exts/1.13.5.nix +++ b/pkgs/development/libraries/haskell/haskell-src-exts/1.16.0.1.nix @@ -1,19 +1,23 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, cpphs, happy }: +{ cabal, cpphs, filepath, happy, mtl, smallcheck, syb, tasty +, tastyGolden, tastySmallcheck +}: cabal.mkDerivation (self: { pname = "haskell-src-exts"; - version = "1.13.5"; - sha256 = "03bzhfp7l9f5hh61qdrr83331nbfgj3jfsfylwmnmcknpisdqnkw"; + version = "1.16.0.1"; + sha256 = "1h8gjw5g92rvvzadqzpscg73x7ajvs1wlphrh27afim3scdd8frz"; buildDepends = [ cpphs ]; + testDepends = [ + filepath mtl smallcheck syb tasty tastyGolden tastySmallcheck + ]; buildTools = [ happy ]; doCheck = false; meta = { - homepage = "http://code.haskell.org/haskell-src-exts"; + homepage = "https://github.com/haskell-suite/haskell-src-exts"; description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix index cc6cc60bb180..e43c0430be7f 100644 --- a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix +++ b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "haskell-src-meta"; - version = "0.6.0.7"; - sha256 = "0cxqh35cd2j6ljsmgjisgm9pn26rj01x43mkn9jk6qs1fbqspb4d"; + version = "0.6.0.8"; + sha256 = "1fv228n9zbqa52aif7pkylrqgz2n63xhxly9f828i18xf02rmxnk"; buildDepends = [ haskellSrcExts syb thOrphans uniplate ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/haskell-src/1.0.1.3.nix b/pkgs/development/libraries/haskell/haskell-src/1.0.1.3.nix deleted file mode 100644 index e2e5ffa304d5..000000000000 --- a/pkgs/development/libraries/haskell/haskell-src/1.0.1.3.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, happy }: - -cabal.mkDerivation (self: { - pname = "haskell-src"; - version = "1.0.1.3"; - sha256 = "a7872900acd2293775a6bdc6dc8f70438ccd80e62d2d1e2394ddff15b1883e89"; - buildTools = [ happy ]; - meta = { - description = "Manipulating Haskell source code"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/haskell-src/1.0.1.4.nix b/pkgs/development/libraries/haskell/haskell-src/1.0.1.4.nix deleted file mode 100644 index 54decb79f2b5..000000000000 --- a/pkgs/development/libraries/haskell/haskell-src/1.0.1.4.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, happy, syb }: - -cabal.mkDerivation (self: { - pname = "haskell-src"; - version = "1.0.1.4"; - sha256 = "02h33d7970641p9vi62sgcxb5v4yaz8xx9vf2yxyvxs3hglm7f0j"; - buildDepends = [ syb ]; - buildTools = [ happy ]; - meta = { - description = "Support for manipulating Haskell source code"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix b/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix deleted file mode 100644 index 02032c21120b..000000000000 --- a/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, happy, syb }: - -cabal.mkDerivation (self: { - pname = "haskell-src"; - version = "1.0.1.5"; - sha256 = "1ay3i2sbrp0pzg6fagg8gqrwq5lcnm5jb5sr11frbk274a82cdwz"; - buildDepends = [ syb ]; - buildTools = [ happy ]; - preConfigure = "runhaskell Setup.hs clean"; - meta = { - description = "Support for manipulating Haskell source code"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/haskell-src/1.0.1.6.nix b/pkgs/development/libraries/haskell/haskell-src/default.nix index 428715ac07bc..428715ac07bc 100644 --- a/pkgs/development/libraries/haskell/haskell-src/1.0.1.6.nix +++ b/pkgs/development/libraries/haskell/haskell-src/default.nix diff --git a/pkgs/development/libraries/haskell/haskelldb/default.nix b/pkgs/development/libraries/haskell/haskelldb/default.nix index ecb92c184934..d732a4655809 100644 --- a/pkgs/development/libraries/haskell/haskelldb/default.nix +++ b/pkgs/development/libraries/haskell/haskelldb/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "haskelldb"; - version = "2.2.2"; - sha256 = "1nwy05wsffagv62kbi8ahm6s591wal7cdl19p0fqi86qz05y9hkm"; + version = "2.2.4"; + sha256 = "0f8c9bz25wzsc65czv0chxk93w947824axl7p821fljlrykcm45y"; buildDepends = [ mtl time ]; meta = { homepage = "https://github.com/m4dc4p/haskelldb"; @@ -13,7 +13,5 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; - hydraPlatforms = self.stdenv.lib.platforms.none; - broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/haskintex/default.nix b/pkgs/development/libraries/haskell/haskintex/default.nix index d5a9a5ff3a28..c659d3966f0c 100644 --- a/pkgs/development/libraries/haskell/haskintex/default.nix +++ b/pkgs/development/libraries/haskell/haskintex/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "haskintex"; - version = "0.5.0.1"; - sha256 = "14x1n7x0dqcj14qkv0lmf2jcrswyjjjygqj5vdj6w29a8v9zr296"; + version = "0.5.0.2"; + sha256 = "1qfqslr8pxks3qmfarmscgvc0q8zn72prqyk5xhmfvkf6q35pmfn"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/haskoin/default.nix b/pkgs/development/libraries/haskell/haskoin/default.nix index d063cc919fc8..7d13d6e797b0 100644 --- a/pkgs/development/libraries/haskell/haskoin/default.nix +++ b/pkgs/development/libraries/haskell/haskoin/default.nix @@ -18,6 +18,7 @@ cabal.mkDerivation (self: { mtl pbkdf QuickCheck split testFramework testFrameworkHunit testFrameworkQuickcheck2 text ]; + jailbreak = true; doCheck = false; meta = { homepage = "http://github.com/haskoin/haskoin"; diff --git a/pkgs/development/libraries/haskell/haskore/default.nix b/pkgs/development/libraries/haskell/haskore/default.nix index cf0b3504e1be..7f1e29a8c6cc 100644 --- a/pkgs/development/libraries/haskell/haskore/default.nix +++ b/pkgs/development/libraries/haskell/haskore/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "haskore"; - version = "0.2.0.4"; - sha256 = "0hhsiazdz44amilcwfxl0r10yxzhql83pgd21k89fmg1gkc4q46j"; + version = "0.2.0.5"; + sha256 = "0zvr7hwxnv01g626617yv7f0vwpmyqvlwbyc6yhb2mrlfqwdgbd0"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/haste-compiler/default.nix b/pkgs/development/libraries/haskell/haste-compiler/default.nix index dfedd812a20a..f2cf3d24f877 100644 --- a/pkgs/development/libraries/haskell/haste-compiler/default.nix +++ b/pkgs/development/libraries/haskell/haste-compiler/default.nix @@ -2,25 +2,28 @@ { cabal, binary, blazeBuilder, bzlib, dataBinaryIeee754 , dataDefault, either, filepath, ghcPaths, HTTP, monadsTf, mtl -, network, random, shellmate, systemFileio, tar, transformers -, utf8String, websockets +, network, networkUri, random, shellmate, systemFileio, tar +, transformers, utf8String, websockets }: cabal.mkDerivation (self: { pname = "haste-compiler"; - version = "0.4.2"; - sha256 = "0agbd21c7mgzxyg6lwjl3n8w2r7xcrv3811y0x86rg7q1m7z730m"; + version = "0.4.3"; + sha256 = "1wkb6a1jwmpjr0jlz5fjq652jz6a6agg0a5pfazyfpdznvd4mm62"; isLibrary = true; isExecutable = true; + noHaddock = true; buildDepends = [ binary blazeBuilder bzlib dataBinaryIeee754 dataDefault either - filepath ghcPaths HTTP monadsTf mtl network random shellmate - systemFileio tar transformers utf8String websockets + filepath ghcPaths HTTP monadsTf mtl network networkUri random + shellmate systemFileio tar transformers utf8String websockets ]; + configureFlags = "-fportable"; meta = { - homepage = "http://github.com/valderman/haste-compiler"; + homepage = "http://haste-lang.org/"; description = "Haskell To ECMAScript compiler"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/haste-perch/default.nix b/pkgs/development/libraries/haskell/haste-perch/default.nix index aec315995c82..221a7fe647ba 100644 --- a/pkgs/development/libraries/haskell/haste-perch/default.nix +++ b/pkgs/development/libraries/haskell/haste-perch/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "haste-perch"; - version = "0.1.0.3"; - sha256 = "1ad7kv47kq0sav49qnqdk76blk44sgjvk1zgn5k2bqvfnr26641j"; + version = "0.1.0.4"; + sha256 = "12ssfik7v671727yxplz44gwgy9i815l44r4z3x066ndcqglr306"; buildDepends = [ hasteCompiler transformers ]; meta = { homepage = "https://github.com/agocorona/haste-perch"; @@ -13,5 +13,6 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.gpl3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ tomberek ]; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/haxr/default.nix b/pkgs/development/libraries/haskell/haxr/default.nix index 4b9fc06cc86a..708959b00457 100644 --- a/pkgs/development/libraries/haskell/haxr/default.nix +++ b/pkgs/development/libraries/haskell/haxr/default.nix @@ -12,6 +12,7 @@ cabal.mkDerivation (self: { base64Bytestring blazeBuilder HaXml HTTP mtl network networkUri time utf8String ]; + jailbreak = true; meta = { homepage = "http://www.haskell.org/haskellwiki/HaXR"; description = "XML-RPC client and server library"; diff --git a/pkgs/development/libraries/haskell/hcltest/default.nix b/pkgs/development/libraries/haskell/hcltest/default.nix index 01f683b55683..579312982aba 100644 --- a/pkgs/development/libraries/haskell/hcltest/default.nix +++ b/pkgs/development/libraries/haskell/hcltest/default.nix @@ -7,20 +7,19 @@ cabal.mkDerivation (self: { pname = "hcltest"; - version = "0.3.4"; - sha256 = "0p8skabp6z4i5xr22qxk1sij2ayla2iqylvlzxfxa8yw1fxs8wsq"; + version = "0.3.6"; + sha256 = "145l3kfxi1slngcmh4dnn09hhpr5v6s5nppk0i5a5jzxpp2yx6sd"; buildDepends = [ dlist either filepath free lens mmorph monadControl mtl optparseApplicative randomShuffle split stm tagged tasty temporary text transformers transformersBase ]; testDepends = [ doctest filepath ]; + jailbreak = true; meta = { homepage = "http://github.com/bennofs/hcltest/"; description = "A testing library for command line applications"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/heist/default.nix b/pkgs/development/libraries/haskell/heist/default.nix index b1422f616c9a..9927e65cfc32 100644 --- a/pkgs/development/libraries/haskell/heist/default.nix +++ b/pkgs/development/libraries/haskell/heist/default.nix @@ -1,19 +1,19 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, aeson, attoparsec, blazeBuilder, blazeHtml, directoryTree -, dlist, errors, filepath, hashable, MonadCatchIOTransformers, mtl -, random, text, time, transformers, unorderedContainers, vector -, xmlhtml +, dlist, errors, filepath, hashable, mapSyntax +, MonadCatchIOTransformers, mtl, random, text, time, transformers +, unorderedContainers, vector, xmlhtml }: cabal.mkDerivation (self: { pname = "heist"; - version = "0.13.1.2"; - sha256 = "0c80lf00n3iv55mw4p61bjx14gildvxnvfdaa755ghkg1wcd59s5"; + version = "0.14.0.1"; + sha256 = "1nhksdn95v35ymml3kgm70axjl4vkjfvj1wvlcm1a1frlnbk993w"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml directoryTree dlist errors - filepath hashable MonadCatchIOTransformers mtl random text time - transformers unorderedContainers vector xmlhtml + filepath hashable mapSyntax MonadCatchIOTransformers mtl random + text time transformers unorderedContainers vector xmlhtml ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/here/default.nix b/pkgs/development/libraries/haskell/here/default.nix index 2179ad0d85f0..a7a1527cd1d1 100644 --- a/pkgs/development/libraries/haskell/here/default.nix +++ b/pkgs/development/libraries/haskell/here/default.nix @@ -1,20 +1,17 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -# The file was later edited to add the state patch. -# https://github.com/np/here/commit/3c16a4e4ce16c08904454972c0d9b43007d1c0cc -{ cabal, haskellSrcMeta, mtl, parsec, fetchpatch }: +{ cabal, haskellSrcMeta, mtl, parsec }: cabal.mkDerivation (self: { pname = "here"; - version = "1.2.5"; - sha256 = "0r7hjsvbx7vshbdhi60955mdfnq6arg5ihfz9f2zyilh4l5cyzwb"; + version = "1.2.6"; + sha256 = "1c7b0a5a42ki8ndvc2k35jnsj433f1nv1j40vviasxksm7acbwif"; buildDepends = [ haskellSrcMeta mtl parsec ]; - patches = [ (fetchpatch { url = "https://github.com/np/here/commit/3c16a4e4ce16c08904454972c0d9b43007d1c0cc.patch"; sha256 = "1qibwbcpnl1cg35zvvdd2k8nr6bgd36qbla3naim3g08qaapm82h"; }) ]; - meta = with self.stdenv.lib; { + meta = { homepage = "https://github.com/tmhedberg/here"; description = "Here docs & interpolated strings via quasiquotation"; - license = licenses.bsd3; + license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = with maintainers; [ edwtjo ]; + maintainers = with self.stdenv.lib.maintainers; [ edwtjo ]; }; }) diff --git a/pkgs/development/libraries/haskell/hexpat/default.nix b/pkgs/development/libraries/haskell/hexpat/default.nix index 9e2e6d93f839..63e92de9424d 100644 --- a/pkgs/development/libraries/haskell/hexpat/default.nix +++ b/pkgs/development/libraries/haskell/hexpat/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hexpat"; - version = "0.20.6"; - sha256 = "02ms6lchj6k0krqjk47bibfb0cbpbc16ip9f22c4rgp04qkzp60b"; + version = "0.20.7"; + sha256 = "03r5j54a250f01km6i8qja1h1k512ds2bp7r0yk2jpbbar2y7c08"; buildDepends = [ deepseq List text transformers utf8String ]; meta = { homepage = "http://haskell.org/haskellwiki/Hexpat/"; diff --git a/pkgs/development/libraries/haskell/higher-leveldb/default.nix b/pkgs/development/libraries/haskell/higher-leveldb/default.nix new file mode 100644 index 000000000000..07afeea6a928 --- /dev/null +++ b/pkgs/development/libraries/haskell/higher-leveldb/default.nix @@ -0,0 +1,25 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, cereal, dataDefault, hspec, leveldbHaskell, liftedBase +, monadControl, mtl, resourcet, transformers, transformersBase +}: + +cabal.mkDerivation (self: { + pname = "higher-leveldb"; + version = "0.2.0.0"; + sha256 = "1al8l96ysmcjx3g93ryfr939jqhjqk8g5bvww5gj9mx6pdkqrcm3"; + buildDepends = [ + cereal dataDefault leveldbHaskell liftedBase monadControl mtl + resourcet transformers transformersBase + ]; + testDepends = [ + cereal hspec leveldbHaskell liftedBase monadControl mtl resourcet + transformers transformersBase + ]; + meta = { + homepage = "https://github.com/jeremyjh/higher-leveldb"; + description = "A rich monadic API for working with leveldb databases"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix index d77479ff0589..d5ee69f5f0db 100644 --- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix +++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "highlighting-kate"; - version = "0.5.9"; - sha256 = "025j6d97nwjhhyhdz7bsfhzgpb1ld28va4r8yv7zfh1dvczs6lkr"; + version = "0.5.11"; + sha256 = "0jfgz4cyn6fylfrsk1yi0fykir8mhxdniq80h7hy5i2xv7qwf5vw"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/hindent/default.nix b/pkgs/development/libraries/haskell/hindent/default.nix index ca76bda7c346..36fe2f7113de 100644 --- a/pkgs/development/libraries/haskell/hindent/default.nix +++ b/pkgs/development/libraries/haskell/hindent/default.nix @@ -1,14 +1,19 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, dataDefault, haskellSrcExts, monadLoops, mtl, text }: +{ cabal, dataDefault, haskellSrcExts, hspec, monadLoops, mtl, text +}: cabal.mkDerivation (self: { pname = "hindent"; - version = "3.4"; - sha256 = "060l4dkqz4fma005yai6mdv2bdr2lp59z289j7rv1ygr6p8pqhci"; + version = "3.9.1"; + sha256 = "1q1a5smykjs36y29cn34kws443kw0w26xjjfdvv0kf69jpcm4b2f"; isLibrary = true; isExecutable = true; buildDepends = [ dataDefault haskellSrcExts monadLoops mtl text ]; + testDepends = [ + dataDefault haskellSrcExts hspec monadLoops mtl text + ]; + doCheck = false; meta = { description = "Extensible Haskell pretty printer"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/hit/default.nix b/pkgs/development/libraries/haskell/hit/default.nix index bf92945d1648..08ff35ca8aaa 100644 --- a/pkgs/development/libraries/haskell/hit/default.nix +++ b/pkgs/development/libraries/haskell/hit/default.nix @@ -2,19 +2,19 @@ { cabal, attoparsec, bytedump, cryptohash, hourglass, HUnit, mtl , parsec, patience, QuickCheck, random, systemFileio -, systemFilepath, testFramework, testFrameworkQuickcheck2, vector -, zlib, zlibBindings +, systemFilepath, testFramework, testFrameworkQuickcheck2 +, unixCompat, vector, zlib, zlibBindings }: cabal.mkDerivation (self: { pname = "hit"; - version = "0.6.1"; - sha256 = "175i6gag596dy341jlr5sjj55qcaqgymrcr1czcaigsxsn5yx8b9"; + version = "0.6.2"; + sha256 = "07lfjbn48v8ykkyj15diy4a9kpgzc93gv0l1rdfcacl3f26a97hs"; isLibrary = true; isExecutable = true; buildDepends = [ attoparsec cryptohash hourglass mtl parsec patience random - systemFileio systemFilepath vector zlib zlibBindings + systemFileio systemFilepath unixCompat vector zlib zlibBindings ]; testDepends = [ bytedump hourglass HUnit QuickCheck testFramework diff --git a/pkgs/development/libraries/haskell/hmatrix-gsl/default.nix b/pkgs/development/libraries/haskell/hmatrix-gsl/default.nix new file mode 100644 index 000000000000..501d84a596f6 --- /dev/null +++ b/pkgs/development/libraries/haskell/hmatrix-gsl/default.nix @@ -0,0 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, gsl, hmatrix, random, vector }: + +cabal.mkDerivation (self: { + pname = "hmatrix-gsl"; + version = "0.16.0.2"; + sha256 = "1l865v2vpjl7f5741z58m9gw1ksskgzfm5gzp9pxiqazsgb2h5ym"; + buildDepends = [ hmatrix random vector ]; + pkgconfigDepends = [ gsl ]; + meta = { + homepage = "https://github.com/albertoruiz/hmatrix"; + description = "Numerical computation"; + license = "GPL"; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/hmatrix-special/default.nix b/pkgs/development/libraries/haskell/hmatrix-special/default.nix index 4a2153f173e8..c6e9f3dbbbf8 100644 --- a/pkgs/development/libraries/haskell/hmatrix-special/default.nix +++ b/pkgs/development/libraries/haskell/hmatrix-special/default.nix @@ -1,18 +1,17 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, hmatrix }: +{ cabal, gsl, hmatrix, hmatrixGsl }: cabal.mkDerivation (self: { pname = "hmatrix-special"; - version = "0.2.0"; - sha256 = "0lp8mvagbzayq3r08wgk498n6d9vgb1skb8wzrzi5a1fc5j8m0wj"; - buildDepends = [ hmatrix ]; + version = "0.3.0.1"; + sha256 = "1ziqzbfrk7xyah5n0cys1ccnmj2z91wxdamanv3y5v717zhdrqix"; + buildDepends = [ hmatrix hmatrixGsl ]; + extraLibraries = [ gsl ]; meta = { - homepage = "http://perception.inf.um.es/hmatrix"; + homepage = "https://github.com/albertoruiz/hmatrix"; description = "Interface to GSL special functions"; license = "GPL"; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/hmatrix/default.nix b/pkgs/development/libraries/haskell/hmatrix/default.nix index 7a335fefb340..cbb4a44655db 100644 --- a/pkgs/development/libraries/haskell/hmatrix/default.nix +++ b/pkgs/development/libraries/haskell/hmatrix/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hmatrix"; - version = "0.16.0.5"; - sha256 = "12019yd4hxqryxsrppijff6w0wmqj2l5cssldh1lyv4dbjaaxb5y"; + version = "0.16.0.6"; + sha256 = "13xbz0dx153m6nc7lv522gihvav5n6a4kiavwsqwh27ql4zyind7"; buildDepends = [ binary deepseq random split storableComplex vector ]; diff --git a/pkgs/development/libraries/haskell/hoauth2/default.nix b/pkgs/development/libraries/haskell/hoauth2/default.nix index e9b0d4bf2601..ec88bb0f1742 100644 --- a/pkgs/development/libraries/haskell/hoauth2/default.nix +++ b/pkgs/development/libraries/haskell/hoauth2/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hoauth2"; - version = "0.4.1"; - sha256 = "145lgy9bxx1xdljbkvi6s97n2z1k5fd0idp415r71ydw8h3i8ppx"; + version = "0.4.3"; + sha256 = "1qmhk9h3rwp29dsjqbgsma4zgzdd6cw1jcryzd17rk32biiiylvg"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/4.2.34.nix index bda89829d68c..d498095f8b32 100644 --- a/pkgs/development/libraries/haskell/hoogle/default.nix +++ b/pkgs/development/libraries/haskell/hoogle/4.2.34.nix @@ -25,5 +25,6 @@ cabal.mkDerivation (self: { description = "Haskell API Search"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/hoogle/4.2.36.nix b/pkgs/development/libraries/haskell/hoogle/4.2.36.nix new file mode 100644 index 000000000000..5b12f8d28c49 --- /dev/null +++ b/pkgs/development/libraries/haskell/hoogle/4.2.36.nix @@ -0,0 +1,30 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, binary, blazeBuilder, Cabal, caseInsensitive +, cmdargs, conduit, deepseq, filepath, haskellSrcExts, httpTypes +, parsec, QuickCheck, random, resourcet, safe, shake, tagsoup +, temporary, text, time, transformers, uniplate, vector +, vectorAlgorithms, wai, warp +}: + +cabal.mkDerivation (self: { + pname = "hoogle"; + version = "4.2.36"; + sha256 = "1h65pl0jfki2pcrywak9mh3hfi3wziffhb2q0xp6r4v01536zifv"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson binary blazeBuilder Cabal caseInsensitive cmdargs conduit + deepseq filepath haskellSrcExts httpTypes parsec QuickCheck random + resourcet safe shake tagsoup text time transformers uniplate vector + vectorAlgorithms wai warp + ]; + testDepends = [ filepath temporary ]; + testTarget = "--test-option=--no-net"; + meta = { + homepage = "http://www.haskell.org/hoogle/"; + description = "Haskell API Search"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/hoogle/hoogle-local-wrapper.sh b/pkgs/development/libraries/haskell/hoogle/hoogle-local-wrapper.sh index c7b15b8f99de..970c0e6845e5 100644 --- a/pkgs/development/libraries/haskell/hoogle/hoogle-local-wrapper.sh +++ b/pkgs/development/libraries/haskell/hoogle/hoogle-local-wrapper.sh @@ -3,4 +3,4 @@ COMMAND=$1 shift HOOGLE_DOC_PATH=@out@/share/hoogle/doc exec @hoogle@/bin/hoogle \ - $COMMAND -d @out@/share/hoogle $@ + $COMMAND -d @out@/share/hoogle "$@" diff --git a/pkgs/development/libraries/haskell/hoogle/local.nix b/pkgs/development/libraries/haskell/hoogle/local.nix index ba907948b14a..822c2bdd82ea 100644 --- a/pkgs/development/libraries/haskell/hoogle/local.nix +++ b/pkgs/development/libraries/haskell/hoogle/local.nix @@ -24,7 +24,7 @@ # refer to their documentation via symlink so they are not garbage collected. { stdenv, hoogle, rehoo -, haskellPlatform, ghc, packages ? [ haskellPlatform ghc.ghc ] +, ghc, packages ? [ ghc.ghc ] }: let diff --git a/pkgs/development/libraries/haskell/hoopl/default.nix b/pkgs/development/libraries/haskell/hoopl/default.nix new file mode 100644 index 000000000000..a0c494d67cf9 --- /dev/null +++ b/pkgs/development/libraries/haskell/hoopl/default.nix @@ -0,0 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal }: + +cabal.mkDerivation (self: { + pname = "hoopl"; + version = "3.10.0.1"; + sha256 = "1wahcngdmb3ixny0havrddkmrhs02rzlf1d1l7g8f6pzg051mr11"; + meta = { + homepage = "http://ghc.cs.tufts.edu/hoopl/"; + description = "A library to support dataflow analysis and optimization"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/hosc/default.nix b/pkgs/development/libraries/haskell/hosc/default.nix new file mode 100644 index 000000000000..2ad4d6210e2b --- /dev/null +++ b/pkgs/development/libraries/haskell/hosc/default.nix @@ -0,0 +1,24 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, binary, blazeBuilder, dataBinaryIeee754, network +, QuickCheck, testFramework, testFrameworkQuickcheck2, time +, transformers +}: + +cabal.mkDerivation (self: { + pname = "hosc"; + version = "0.15"; + sha256 = "1yp25n159p69r32y3x7iwc55l5q9qaamj2vyl1473x8ras5afdcf"; + buildDepends = [ + binary blazeBuilder dataBinaryIeee754 network time transformers + ]; + testDepends = [ + QuickCheck testFramework testFrameworkQuickcheck2 + ]; + meta = { + homepage = "http://rd.slavepianos.org/t/hosc"; + description = "Haskell Open Sound Control"; + license = "GPL"; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/hourglass/default.nix b/pkgs/development/libraries/haskell/hourglass/default.nix index 5b11121a9efc..92e3806b8cd1 100644 --- a/pkgs/development/libraries/haskell/hourglass/default.nix +++ b/pkgs/development/libraries/haskell/hourglass/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hourglass"; - version = "0.2.2"; - sha256 = "015ipy9adi67nfddjsw9c0ihn0banghgawjli0lgrmiyjz01610c"; + version = "0.2.6"; + sha256 = "029fmx5r6krj7y7mn4b4m2lpaa3iw6vhyznrib5lhf469i1jp9m3"; buildDepends = [ deepseq ]; testDepends = [ deepseq mtl tasty tastyHunit tastyQuickcheck time diff --git a/pkgs/development/libraries/haskell/hplayground/default.nix b/pkgs/development/libraries/haskell/hplayground/default.nix index ed116058e92a..c4e9ddbe2aa6 100644 --- a/pkgs/development/libraries/haskell/hplayground/default.nix +++ b/pkgs/development/libraries/haskell/hplayground/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hplayground"; - version = "0.1.0.5"; - sha256 = "0hd4xmw4lfaaar7yxwhq4msg2qbn42q57rvaphl95pbr4x5a0h70"; + version = "0.1.1.0"; + sha256 = "03ya82lxhv7acakhl01835p3wvwr3z14jiww7wvj4bzlib8qsi8b"; buildDepends = [ dataDefault hasteCompiler hastePerch monadsTf transformers ]; @@ -17,5 +17,6 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ tomberek ]; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/hsbencher-fusion/default.nix b/pkgs/development/libraries/haskell/hsbencher-fusion/default.nix new file mode 100644 index 000000000000..c045cf8e720d --- /dev/null +++ b/pkgs/development/libraries/haskell/hsbencher-fusion/default.nix @@ -0,0 +1,23 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, criterion, csv, dataDefault, filepath, handaGdata +, hsbencher, httpConduit, mtl, network, statistics, text, time +}: + +cabal.mkDerivation (self: { + pname = "hsbencher-fusion"; + version = "0.3.3"; + sha256 = "0vp1biv5jwac3bhj7qxl8x3bw73436qn284fippmlr6f54c15yw8"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + criterion csv dataDefault filepath handaGdata hsbencher httpConduit + mtl network statistics text time + ]; + doCheck = false; + meta = { + description = "Backend for uploading benchmark data to Google Fusion Tables"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/hsbencher/default.nix b/pkgs/development/libraries/haskell/hsbencher/default.nix new file mode 100644 index 000000000000..0786aa18b3c3 --- /dev/null +++ b/pkgs/development/libraries/haskell/hsbencher/default.nix @@ -0,0 +1,22 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, async, dataDefault, filepath, GenericPretty, HUnit +, ioStreams, mtl, random, testFramework, testFrameworkHunit, text +, time +}: + +cabal.mkDerivation (self: { + pname = "hsbencher"; + version = "1.20.0.3"; + sha256 = "1qnj4zhq6j4cvnxcparm2xr9qc6l9q7j72h4dr5jz04lz8c2fkcl"; + buildDepends = [ + async dataDefault filepath GenericPretty ioStreams mtl random time + ]; + testDepends = [ HUnit testFramework testFrameworkHunit text time ]; + doCheck = false; + meta = { + description = "Launch and gather data from Haskell and non-Haskell benchmarks"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/hsc3-db/default.nix b/pkgs/development/libraries/haskell/hsc3-db/default.nix new file mode 100644 index 000000000000..13a32c528633 --- /dev/null +++ b/pkgs/development/libraries/haskell/hsc3-db/default.nix @@ -0,0 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, hsc3, safe }: + +cabal.mkDerivation (self: { + pname = "hsc3-db"; + version = "0.15"; + sha256 = "0sj3hq0d8dl4m6fn75lvyr78sg283p6y13lg8yi2yrgz74kn4zbl"; + buildDepends = [ hsc3 safe ]; + noHaddock = true; + meta = { + homepage = "http://rd.slavepianos.org/t/hsc3-db"; + description = "Haskell SuperCollider Unit Generator Database"; + license = "GPL"; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/hsc3-dot/default.nix b/pkgs/development/libraries/haskell/hsc3-dot/default.nix new file mode 100644 index 000000000000..7423525e46fb --- /dev/null +++ b/pkgs/development/libraries/haskell/hsc3-dot/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, filepath, hsc3 }: + +cabal.mkDerivation (self: { + pname = "hsc3-dot"; + version = "0.15"; + sha256 = "1ck2g15zw23smry1xvn9ida8ln57vnvkxvr3khhp5didwisgm90m"; + buildDepends = [ filepath hsc3 ]; + meta = { + homepage = "http://rd.slavepianos.org/t/hsc3-dot"; + description = "haskell supercollider graph drawing"; + license = "GPL"; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/hsc3-lang/default.nix b/pkgs/development/libraries/haskell/hsc3-lang/default.nix new file mode 100644 index 000000000000..dd12067d45e6 --- /dev/null +++ b/pkgs/development/libraries/haskell/hsc3-lang/default.nix @@ -0,0 +1,23 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, bifunctors, dataDefault, dataOrdlist, dlist, hashable +, hmatrixSpecial, hosc, hsc3, MonadRandom, random, randomShuffle +, split, transformers, vector +}: + +cabal.mkDerivation (self: { + pname = "hsc3-lang"; + version = "0.15"; + sha256 = "09qn9kb8h40cwhnjf4pl70i2vi7cn4pa4wkdwjbn07hrdpvxgihf"; + buildDepends = [ + bifunctors dataDefault dataOrdlist dlist hashable hmatrixSpecial + hosc hsc3 MonadRandom random randomShuffle split transformers + vector + ]; + meta = { + homepage = "http://rd.slavepianos.org/t/hsc3-lang"; + description = "Haskell SuperCollider Language"; + license = "GPL"; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/hsc3-process/default.nix b/pkgs/development/libraries/haskell/hsc3-process/default.nix new file mode 100644 index 000000000000..6b81f64b03dd --- /dev/null +++ b/pkgs/development/libraries/haskell/hsc3-process/default.nix @@ -0,0 +1,22 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, dataDefault, filepath, hosc, hsc3, time, timeCompat +, transformers +}: + +cabal.mkDerivation (self: { + pname = "hsc3-process"; + version = "0.10.0"; + sha256 = "1h769akpd5gsmmlzmhya3dh56rhpf4fkj0vl6zngahc5hl4s7qxc"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + dataDefault filepath hosc hsc3 time timeCompat transformers + ]; + meta = { + homepage = "https://github.com/kaoskorobase/hsc3-process"; + description = "Create and control scsynth processes"; + license = "GPL"; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/hsc3-server/default.nix b/pkgs/development/libraries/haskell/hsc3-server/default.nix new file mode 100644 index 000000000000..31f59ed87413 --- /dev/null +++ b/pkgs/development/libraries/haskell/hsc3-server/default.nix @@ -0,0 +1,30 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, bitset, dataDefault, failure, hashtables, hosc, hsc3 +, hsc3Process, liftedBase, ListZipper, monadControl, QuickCheck +, random, resourcet, testFramework, testFrameworkQuickcheck2 +, transformers, transformersBase +}: + +cabal.mkDerivation (self: { + pname = "hsc3-server"; + version = "0.9.2"; + sha256 = "1lq4y57d555jb0yi10n4j69h4whwsm5h2k6j4r7f9avds5ahh6s2"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + bitset dataDefault failure hashtables hosc hsc3 hsc3Process + liftedBase ListZipper monadControl random resourcet transformers + transformersBase + ]; + testDepends = [ + failure QuickCheck random testFramework testFrameworkQuickcheck2 + transformers + ]; + meta = { + homepage = "https://github.com/kaoskorobase/hsc3-server"; + description = "SuperCollider server resource management and synchronization"; + license = "GPL"; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/hsc3/default.nix b/pkgs/development/libraries/haskell/hsc3/default.nix new file mode 100644 index 000000000000..6e05c01220ea --- /dev/null +++ b/pkgs/development/libraries/haskell/hsc3/default.nix @@ -0,0 +1,21 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, binary, dataDefault, dataOrdlist, filepath, hashable, hosc +, network, random, safe, split, transformers +}: + +cabal.mkDerivation (self: { + pname = "hsc3"; + version = "0.15"; + sha256 = "1rmxl1wcly74bjkw79zw9ydmiclk5716w75b4nz8xkqraijiafrg"; + buildDepends = [ + binary dataDefault dataOrdlist filepath hashable hosc network + random safe split transformers + ]; + meta = { + homepage = "http://rd.slavepianos.org/t/hsc3"; + description = "Haskell SuperCollider"; + license = "GPL"; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/hsimport/default.nix b/pkgs/development/libraries/haskell/hsimport/default.nix index c9809d3eff04..cc9b80463222 100644 --- a/pkgs/development/libraries/haskell/hsimport/default.nix +++ b/pkgs/development/libraries/haskell/hsimport/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hsimport"; - version = "0.6"; - sha256 = "07nhymn4kww1c5f9sjbmdg8ng08wbgmpvf5hws4qpwmfw1yfgdpn"; + version = "0.6.4"; + sha256 = "07v7sm98a0vzfk1xx8mf6l2ybf3rwx4ml2wxp1rlw5w1aapffsfw"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/hspec-checkers/default.nix b/pkgs/development/libraries/haskell/hspec-checkers/default.nix new file mode 100644 index 000000000000..7e5022e19b53 --- /dev/null +++ b/pkgs/development/libraries/haskell/hspec-checkers/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, checkers, hspec }: + +cabal.mkDerivation (self: { + pname = "hspec-checkers"; + version = "0.1.0"; + sha256 = "043qzgjp9ch9wqm269dd87jn8wk5c90q25098hnz8ilv5pnywk6d"; + buildDepends = [ checkers hspec ]; + testDepends = [ checkers hspec ]; + meta = { + description = "Allows to use checkers properties from hspec"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/hspec-contrib/default.nix b/pkgs/development/libraries/haskell/hspec-contrib/default.nix new file mode 100644 index 000000000000..53f94edc793d --- /dev/null +++ b/pkgs/development/libraries/haskell/hspec-contrib/default.nix @@ -0,0 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, hspec, hspecCore, HUnit, QuickCheck }: + +cabal.mkDerivation (self: { + pname = "hspec-contrib"; + version = "0.2.0"; + sha256 = "0p6jh3j84cq66gfp2pk957ha4ds7797vfbfri9lsg9gd4998dwkq"; + buildDepends = [ hspecCore HUnit ]; + testDepends = [ hspec hspecCore HUnit QuickCheck ]; + meta = { + homepage = "http://hspec.github.io/"; + description = "Contributed functionality for Hspec"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/hspec-core/default.nix b/pkgs/development/libraries/haskell/hspec-core/default.nix new file mode 100644 index 000000000000..5e8378dd8713 --- /dev/null +++ b/pkgs/development/libraries/haskell/hspec-core/default.nix @@ -0,0 +1,27 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, ansiTerminal, async, deepseq, ghcPaths, hspecExpectations +, hspecMeta, HUnit, QuickCheck, quickcheckIo, random, setenv +, silently, tfRandom, time, transformers +}: + +cabal.mkDerivation (self: { + pname = "hspec-core"; + version = "2.0.2"; + sha256 = "19nssrvwnpa9yib9qqrhf1hi8m624si97874hhdh2hqc7kjqr332"; + buildDepends = [ + ansiTerminal async deepseq hspecExpectations HUnit QuickCheck + quickcheckIo random setenv tfRandom time transformers + ]; + testDepends = [ + ansiTerminal async deepseq ghcPaths hspecExpectations hspecMeta + HUnit QuickCheck quickcheckIo random setenv silently tfRandom time + transformers + ]; + meta = { + homepage = "http://hspec.github.io/"; + description = "A Testing Framework for Haskell"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/hspec-discover/default.nix b/pkgs/development/libraries/haskell/hspec-discover/default.nix new file mode 100644 index 000000000000..bf7d280fca0f --- /dev/null +++ b/pkgs/development/libraries/haskell/hspec-discover/default.nix @@ -0,0 +1,20 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, filepath, hspecMeta }: + +cabal.mkDerivation (self: { + pname = "hspec-discover"; + version = "2.0.2"; + sha256 = "1439134sdgwimjihjy06g4vq3bkym97da4z1zkgxgj91ljfwlb2i"; + isLibrary = true; + isExecutable = true; + buildDepends = [ filepath ]; + testDepends = [ filepath hspecMeta ]; + noHaddock = true; + meta = { + homepage = "http://hspec.github.io/"; + description = "Automatically discover and run Hspec tests"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/hspec-meta/default.nix b/pkgs/development/libraries/haskell/hspec-meta/default.nix index 09d3a8425220..8a10a3001460 100644 --- a/pkgs/development/libraries/haskell/hspec-meta/default.nix +++ b/pkgs/development/libraries/haskell/hspec-meta/default.nix @@ -1,19 +1,19 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, ansiTerminal, async, deepseq, filepath, hspecExpectations -, HUnit, QuickCheck, quickcheckIo, random, setenv, tfRandom, time +, HUnit, QuickCheck, quickcheckIo, random, setenv, time , transformers }: cabal.mkDerivation (self: { pname = "hspec-meta"; - version = "1.11.4"; - sha256 = "047vp6wibkwgs9rryjpys2qqn4s5p91mh36w0gnxwhggp8nhfqg3"; + version = "2.0.0"; + sha256 = "0x1k2d4nycglzn9l4i32xrampr9fgzjpp4j1jyy7pj89cfl8jc8f"; isLibrary = true; isExecutable = true; buildDepends = [ ansiTerminal async deepseq filepath hspecExpectations HUnit - QuickCheck quickcheckIo random setenv tfRandom time transformers + QuickCheck quickcheckIo random setenv time transformers ]; doCheck = false; meta = { diff --git a/pkgs/development/libraries/haskell/hspec-wai/default.nix b/pkgs/development/libraries/haskell/hspec-wai/default.nix index 9cf37d4622c0..cb817c6df43e 100644 --- a/pkgs/development/libraries/haskell/hspec-wai/default.nix +++ b/pkgs/development/libraries/haskell/hspec-wai/default.nix @@ -1,23 +1,23 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, aeson, aesonQq, caseInsensitive, hspec2, httpTypes -, markdownUnlit, scotty, text, transformers, wai, waiExtra +{ cabal, caseInsensitive, hspec, hspecCore, hspecExpectations +, httpTypes, QuickCheck, text, transformers, wai, waiExtra }: cabal.mkDerivation (self: { pname = "hspec-wai"; - version = "0.4.1"; - sha256 = "1005qhzi561zc5kbdc55d3wjngdcal47him19fn5gk4389jdbln7"; + version = "0.6.2"; + sha256 = "0nia4hz41g4264mn4s5j8dn9dh0xhdf1gym92wvjmy43rhj3qpzb"; buildDepends = [ - aeson aesonQq caseInsensitive hspec2 httpTypes text transformers - wai waiExtra + caseInsensitive hspecCore hspecExpectations httpTypes text + transformers wai waiExtra ]; testDepends = [ - aeson caseInsensitive hspec2 httpTypes markdownUnlit scotty text - transformers wai waiExtra + caseInsensitive hspec hspecCore hspecExpectations httpTypes + QuickCheck text transformers wai waiExtra ]; meta = { - description = "Experimental Hspec support for testing WAI applications (depends on hspec2!)"; + description = "Experimental Hspec support for testing WAI applications"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; }; diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix index 1df977dbf57f..fc60a54cd733 100644 --- a/pkgs/development/libraries/haskell/hspec/default.nix +++ b/pkgs/development/libraries/haskell/hspec/default.nix @@ -1,25 +1,18 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, ansiTerminal, async, deepseq, filepath, ghcPaths -, hspecExpectations, hspecMeta, HUnit, QuickCheck, quickcheckIo -, random, setenv, silently, tfRandom, time, transformers +{ cabal, hspecCore, hspecDiscover, hspecExpectations, hspecMeta +, HUnit, QuickCheck, stringbuilder, transformers }: cabal.mkDerivation (self: { pname = "hspec"; - version = "1.11.4"; - sha256 = "044vr6xyk0ih20faa4gbl4y4v6vkss0x2gmxgkk96ha6chws2svn"; - isLibrary = true; - isExecutable = true; + version = "2.0.2"; + sha256 = "19zxsadp1xwxdyp6zksaz4czdnmjd0x3gmbh7pqv6l4dxmd0545a"; buildDepends = [ - ansiTerminal async deepseq filepath hspecExpectations HUnit - QuickCheck quickcheckIo random setenv tfRandom time transformers - ]; - testDepends = [ - ansiTerminal async deepseq filepath ghcPaths hspecExpectations - hspecMeta HUnit QuickCheck quickcheckIo random setenv silently - tfRandom time transformers + hspecCore hspecDiscover hspecExpectations HUnit QuickCheck + transformers ]; + testDepends = [ hspecCore hspecMeta stringbuilder ]; doCheck = false; meta = { homepage = "http://hspec.github.io/"; diff --git a/pkgs/development/libraries/haskell/hspec2/default.nix b/pkgs/development/libraries/haskell/hspec2/default.nix index e459e99e2fe8..c833b80bb9fd 100644 --- a/pkgs/development/libraries/haskell/hspec2/default.nix +++ b/pkgs/development/libraries/haskell/hspec2/default.nix @@ -1,25 +1,12 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, ansiTerminal, async, deepseq, filepath, ghcPaths -, hspecExpectations, hspecMeta, HUnit, QuickCheck, quickcheckIo -, random, setenv, silently, tfRandom, time, transformers -}: +{ cabal, hspec, hspecDiscover }: cabal.mkDerivation (self: { pname = "hspec2"; - version = "0.4.2"; - sha256 = "1wk1lvy3lngfa60n0dyllfqbj4gd4v0qxjw7gpvzknfk2y10536x"; - isLibrary = true; - isExecutable = true; - buildDepends = [ - ansiTerminal async deepseq filepath hspecExpectations HUnit - QuickCheck quickcheckIo random setenv tfRandom time transformers - ]; - testDepends = [ - ansiTerminal async deepseq filepath ghcPaths hspecExpectations - hspecMeta HUnit QuickCheck quickcheckIo random setenv silently - tfRandom time transformers - ]; + version = "0.6.1"; + sha256 = "0zlvm7r46q8yhgx2kx9mfrf6x2f5amdbi3a59fh69dsqs4lbgmf4"; + buildDepends = [ hspec hspecDiscover ]; meta = { homepage = "http://hspec.github.io/"; description = "Alpha version of Hspec 2.0"; diff --git a/pkgs/development/libraries/haskell/html/1.0.1.2.nix b/pkgs/development/libraries/haskell/html/default.nix index a06b1422bc32..a06b1422bc32 100644 --- a/pkgs/development/libraries/haskell/html/1.0.1.2.nix +++ b/pkgs/development/libraries/haskell/html/default.nix diff --git a/pkgs/development/libraries/haskell/http-client/default.nix b/pkgs/development/libraries/haskell/http-client/default.nix index 020fd4973c81..12e69b7c7238 100644 --- a/pkgs/development/libraries/haskell/http-client/default.nix +++ b/pkgs/development/libraries/haskell/http-client/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "http-client"; - version = "0.3.8.2"; - sha256 = "06c34h7wvn3mbr8lrkcmjygj22d94mr5rxzqwpjfdjgimd98hw3s"; + version = "0.4.5"; + sha256 = "04ikxigxhppayzw4bfh52zznly6cd9vfd9gn3a12xz4js6q3pwva"; buildDepends = [ base64Bytestring blazeBuilder caseInsensitive cookie dataDefaultClass deepseq exceptions filepath httpTypes mimeTypes diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index 11efa4968af7..bb5dc9f7505d 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -3,14 +3,14 @@ { cabal, blazeBuilder, caseInsensitive, conduit, conduitExtra , connection, cookie, dataDefaultClass, hspec, httpClient , httpClientTls, httpTypes, HUnit, liftedBase, monadControl, mtl -, network, networkConduit, resourcet, streamingCommons, text, time -, transformers, utf8String, wai, waiConduit, warp, warpTls +, network, resourcet, streamingCommons, text, time, transformers +, utf8String, wai, waiConduit, warp, warpTls }: cabal.mkDerivation (self: { pname = "http-conduit"; - version = "2.1.4.3"; - sha256 = "0318k4k4w1zpifalfa7vb33sd8ksa8jdyaxs4843idmwsz3ahwgq"; + version = "2.1.5"; + sha256 = "0vk2an6h3h7a5klk9xrf3apfm6xdmqm418yrr7pb56b7w5sfq003"; buildDepends = [ conduit httpClient httpClientTls httpTypes liftedBase monadControl mtl resourcet transformers @@ -18,8 +18,8 @@ cabal.mkDerivation (self: { testDepends = [ blazeBuilder caseInsensitive conduit conduitExtra connection cookie dataDefaultClass hspec httpClient httpTypes HUnit liftedBase - network networkConduit streamingCommons text time transformers - utf8String wai waiConduit warp warpTls + network streamingCommons text time transformers utf8String wai + waiConduit warp warpTls ]; doCheck = false; meta = { diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix index c2316799a030..61f4d91d5cc6 100644 --- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix +++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix @@ -2,15 +2,14 @@ { cabal, async, blazeBuilder, caseInsensitive, conduit , conduitExtra, dataDefaultClass, hspec, httpClient, httpConduit -, httpTypes, liftedBase, monadControl, network, networkConduit -, resourcet, streamingCommons, text, transformers, wai, waiLogger -, warp, word8 +, httpTypes, liftedBase, monadControl, network, resourcet +, streamingCommons, text, transformers, wai, waiLogger, warp, word8 }: cabal.mkDerivation (self: { pname = "http-reverse-proxy"; - version = "0.4.0.1"; - sha256 = "0gygmykxsy6rs3xmwb24s5c3brmabdgxb1w0ak82vyvfvsnqxz1h"; + version = "0.4.1.2"; + sha256 = "1gggn5l08g7mxbka0h7h8w687y3awbm19395fi6wvis76isyz8wy"; buildDepends = [ async blazeBuilder caseInsensitive conduit conduitExtra dataDefaultClass httpClient httpTypes liftedBase monadControl @@ -19,8 +18,7 @@ cabal.mkDerivation (self: { ]; testDepends = [ blazeBuilder conduit conduitExtra hspec httpConduit httpTypes - liftedBase network networkConduit resourcet streamingCommons - transformers wai warp + liftedBase network resourcet streamingCommons transformers wai warp ]; doCheck = false; meta = { diff --git a/pkgs/development/libraries/haskell/http-streams/default.nix b/pkgs/development/libraries/haskell/http-streams/default.nix index c4d3686ceb9b..ec993a8b2a51 100644 --- a/pkgs/development/libraries/haskell/http-streams/default.nix +++ b/pkgs/development/libraries/haskell/http-streams/default.nix @@ -3,26 +3,26 @@ { cabal, aeson, aesonPretty, attoparsec, base64Bytestring , blazeBuilder, caseInsensitive, HsOpenSSL, hspec , hspecExpectations, httpCommon, HUnit, ioStreams -, MonadCatchIOTransformers, mtl, network, opensslStreams, snapCore -, snapServer, systemFileio, systemFilepath, text, transformers -, unorderedContainers +, MonadCatchIOTransformers, mtl, network, networkUri +, opensslStreams, snapCore, snapServer, systemFileio +, systemFilepath, text, transformers, unorderedContainers }: cabal.mkDerivation (self: { pname = "http-streams"; - version = "0.7.2.2"; - sha256 = "093ldljnabkmi67vj1qnvdlpjk1mpgqwrzdl9cq93v64sqbfwkjw"; + version = "0.7.2.4"; + sha256 = "1hs2d5qiq5vq6qjxxx061w1iigr05chkv28xvlvxfz0wc7nlipzz"; buildDepends = [ aeson attoparsec base64Bytestring blazeBuilder caseInsensitive - HsOpenSSL httpCommon ioStreams mtl network opensslStreams text - transformers unorderedContainers + HsOpenSSL httpCommon ioStreams mtl network networkUri + opensslStreams text transformers unorderedContainers ]; testDepends = [ aeson aesonPretty attoparsec base64Bytestring blazeBuilder caseInsensitive HsOpenSSL hspec hspecExpectations httpCommon HUnit - ioStreams MonadCatchIOTransformers mtl network opensslStreams - snapCore snapServer systemFileio systemFilepath text transformers - unorderedContainers + ioStreams MonadCatchIOTransformers mtl network networkUri + opensslStreams snapCore snapServer systemFileio systemFilepath text + transformers unorderedContainers ]; jailbreak = true; doCheck = false; diff --git a/pkgs/development/libraries/haskell/httpd-shed/default.nix b/pkgs/development/libraries/haskell/httpd-shed/default.nix index bf5ad9217d3c..4ae04b2c7264 100644 --- a/pkgs/development/libraries/haskell/httpd-shed/default.nix +++ b/pkgs/development/libraries/haskell/httpd-shed/default.nix @@ -14,5 +14,6 @@ cabal.mkDerivation (self: { description = "A simple web-server with an interact style API"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix b/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix index 9f600fd195dc..71d6765f93f3 100644 --- a/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix +++ b/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix @@ -1,12 +1,13 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, hxtCharproperties, parsec }: +{ cabal, HUnit, hxtCharproperties, parsec, text }: cabal.mkDerivation (self: { pname = "hxt-regex-xmlschema"; - version = "9.1.0"; - sha256 = "0l97rkrvl6pmxdgiwbwh2s3l00lyaihrhsffhh69639bgs67zgwr"; - buildDepends = [ hxtCharproperties parsec ]; + version = "9.2.0"; + sha256 = "0pcbyvc71173ad0zkgpdpyyljngrk4p1jjjaw5wbwcvm4ijh44g3"; + buildDepends = [ hxtCharproperties parsec text ]; + testDepends = [ HUnit parsec text ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema"; description = "A regular expression library for W3C XML Schema regular expressions"; diff --git a/pkgs/development/libraries/haskell/hxt/default.nix b/pkgs/development/libraries/haskell/hxt/default.nix index 1ca367a96c92..28eaff157f11 100644 --- a/pkgs/development/libraries/haskell/hxt/default.nix +++ b/pkgs/development/libraries/haskell/hxt/default.nix @@ -1,7 +1,7 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, binary, deepseq, filepath, HUnit, hxtCharproperties -, hxtRegexXmlschema, hxtUnicode, mtl, network, parsec +, hxtRegexXmlschema, hxtUnicode, mtl, networkUri, parsec }: cabal.mkDerivation (self: { @@ -10,9 +10,9 @@ cabal.mkDerivation (self: { sha256 = "1dgdq2l9k8v36iahmkxxjmmv955f9gv6lq09nsah9zcscsgm0v2i"; buildDepends = [ binary deepseq filepath HUnit hxtCharproperties hxtRegexXmlschema - hxtUnicode mtl network parsec + hxtUnicode mtl networkUri parsec ]; - jailbreak = true; + configureFlags = "-fnetwork-uri"; meta = { homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html"; description = "A collection of tools for processing XML with Haskell"; diff --git a/pkgs/development/libraries/haskell/iCalendar/default.nix b/pkgs/development/libraries/haskell/iCalendar/default.nix index 33a5ba4bea6e..734c7587aa9f 100644 --- a/pkgs/development/libraries/haskell/iCalendar/default.nix +++ b/pkgs/development/libraries/haskell/iCalendar/default.nix @@ -1,16 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, base64Bytestring, caseInsensitive, dataDefault, mime, mtl -, network, parsec, text, time +, network, networkUri, parsec, text, time }: cabal.mkDerivation (self: { pname = "iCalendar"; - version = "0.4.0.1"; - sha256 = "08m47nxxz70lmmndlgycfb27x8xfwakxi8izbba0f6w23ddaljp3"; + version = "0.4.0.2"; + sha256 = "0a6kj6ih8dpzvld7hjvjp6gcf4f2y81x6bx17z6wgzwdj9fv7jry"; buildDepends = [ base64Bytestring caseInsensitive dataDefault mime mtl network - parsec text time + networkUri parsec text time ]; meta = { homepage = "http://github.com/tingtun/iCalendar"; diff --git a/pkgs/development/libraries/haskell/ieee754/default.nix b/pkgs/development/libraries/haskell/ieee754/default.nix index 1dd734af6100..de0ce49c83eb 100644 --- a/pkgs/development/libraries/haskell/ieee754/default.nix +++ b/pkgs/development/libraries/haskell/ieee754/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "ieee754"; - version = "0.7.3"; - sha256 = "0gq747h15inxbxbgmzmchb9a8p57rhv3bmj69idx5arh0d3whgv0"; + version = "0.7.4"; + sha256 = "1pxbkfa21mvc869n18nn7r29hcinxdbsnk68nlldzld8f6m13g1h"; meta = { homepage = "http://github.com/patperry/hs-ieee754"; description = "Utilities for dealing with IEEE floating point numbers"; diff --git a/pkgs/development/libraries/haskell/imm/default.nix b/pkgs/development/libraries/haskell/imm/default.nix index 5529f27eb5e9..e21c596fa2fd 100644 --- a/pkgs/development/libraries/haskell/imm/default.nix +++ b/pkgs/development/libraries/haskell/imm/default.nix @@ -2,26 +2,27 @@ { cabal, async, caseInsensitive, cond, dataDefault, dyre, feed , filepath, hslogger, httpConduit, httpTypes, lens, mimeMail -, monadControl, mtl, network, opml, random, resourcet, text -, textIcu, time, timerep, tls, transformers, transformersBase +, monadControl, mtl, network, networkUri, opml, random, resourcet +, text, textIcu, time, timerep, tls, transformers, transformersBase , utf8String, xdgBasedir, xml }: cabal.mkDerivation (self: { pname = "imm"; - version = "0.6.0.2"; - sha256 = "0bawp8zqpkxig33ybv0yxv6bh51rfhsyp0q7l0lh61gy17rx0gsa"; + version = "0.6.0.3"; + sha256 = "0fhqb36xj2xr1hhfrhk1npms9lnvbh6fmvki9mmm3gqs06hb925l"; isLibrary = true; isExecutable = true; buildDepends = [ async caseInsensitive cond dataDefault dyre feed filepath hslogger - httpConduit httpTypes lens mimeMail monadControl mtl network opml - random resourcet text textIcu time timerep tls transformers - transformersBase utf8String xdgBasedir xml + httpConduit httpTypes lens mimeMail monadControl mtl network + networkUri opml random resourcet text textIcu time timerep tls + transformers transformersBase utf8String xdgBasedir xml ]; meta = { description = "Retrieve RSS/Atom feeds and write one mail per new item in a maildir"; license = "unknown"; platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ bergey ]; }; }) diff --git a/pkgs/development/libraries/haskell/implicit/default.nix b/pkgs/development/libraries/haskell/implicit/default.nix index a2fd8cd438e4..81331833cc48 100644 --- a/pkgs/development/libraries/haskell/implicit/default.nix +++ b/pkgs/development/libraries/haskell/implicit/default.nix @@ -21,5 +21,6 @@ cabal.mkDerivation (self: { description = "Math-inspired programmatic 2&3D CAD: CSG, bevels, and shells; gcode export.."; license = "GPL"; platforms = self.ghc.meta.platforms; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/interpolate/default.nix b/pkgs/development/libraries/haskell/interpolate/default.nix index 875759a17eb8..cc62218a928d 100644 --- a/pkgs/development/libraries/haskell/interpolate/default.nix +++ b/pkgs/development/libraries/haskell/interpolate/default.nix @@ -1,16 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, doctest, haskellSrcMeta, hspec, QuickCheck -, quickcheckInstances, text +{ cabal, haskellSrcMeta, hspec, QuickCheck, quickcheckInstances +, text }: cabal.mkDerivation (self: { pname = "interpolate"; - version = "0.0.4"; - sha256 = "0yr0pahb07r7p6d7hb4bqafa64a4jkd37bchr6vkan2zbffwcrcm"; + version = "0.1.0"; + sha256 = "0wlc10qd1bq3xj64a3yq2gzds9kas9zyylkm9kxd46gy35fns6id"; buildDepends = [ haskellSrcMeta ]; testDepends = [ - doctest haskellSrcMeta hspec QuickCheck quickcheckInstances text + haskellSrcMeta hspec QuickCheck quickcheckInstances text ]; meta = { description = "String interpolation done right"; diff --git a/pkgs/development/libraries/haskell/intervals/default.nix b/pkgs/development/libraries/haskell/intervals/default.nix index 962f30de8a09..8c552654bac0 100644 --- a/pkgs/development/libraries/haskell/intervals/default.nix +++ b/pkgs/development/libraries/haskell/intervals/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "intervals"; - version = "0.7"; - sha256 = "00kwq57x72xi5kca7symb98nzs1j82r6bkgvr83aqpvq0ql9ka9d"; + version = "0.7.0.1"; + sha256 = "02qb44ga2yfsymkfixy3fdp943r2flwrsaqhb0pjddr3ixzm4ap9"; buildDepends = [ distributive ]; testDepends = [ doctest filepath ]; meta = { diff --git a/pkgs/development/libraries/haskell/io-streams/default.nix b/pkgs/development/libraries/haskell/io-streams/default.nix index 6d1d3cbfb6b3..a046c234e63f 100644 --- a/pkgs/development/libraries/haskell/io-streams/default.nix +++ b/pkgs/development/libraries/haskell/io-streams/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "io-streams"; - version = "1.2.0.0"; - sha256 = "1lisvwy4pj0ywm1i61qan3vxisl4xazz7z8i8iybww1dv3j6mrn2"; + version = "1.2.0.1"; + sha256 = "12r7j8dzj80f4s9942a6pi60pd9jh44sqyl6hcn0npzmdyl7hg1k"; buildDepends = [ attoparsec blazeBuilder network primitive text time transformers vector zlibBindings diff --git a/pkgs/development/libraries/haskell/ipprint/default.nix b/pkgs/development/libraries/haskell/ipprint/default.nix index d9037a8229b3..c0f012f5747f 100644 --- a/pkgs/development/libraries/haskell/ipprint/default.nix +++ b/pkgs/development/libraries/haskell/ipprint/default.nix @@ -11,5 +11,6 @@ cabal.mkDerivation (self: { description = "Tiny helper for pretty-printing values in ghci console"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/ixset/default.nix b/pkgs/development/libraries/haskell/ixset/default.nix index eb118834e34d..24bbde7098d4 100644 --- a/pkgs/development/libraries/haskell/ixset/default.nix +++ b/pkgs/development/libraries/haskell/ixset/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "ixset"; - version = "1.0.5"; - sha256 = "1hznn7f8f13x5125n76dchayi16z72050qbwifnkrca54nf9q2ns"; + version = "1.0.6"; + sha256 = "097f9fkm9a2n67bzagr9h2v7acdn8h1ayv9c83n7nv1dh157bpyv"; buildDepends = [ safecopy syb sybWithClass ]; meta = { homepage = "http://happstack.com"; diff --git a/pkgs/development/libraries/haskell/js-flot/default.nix b/pkgs/development/libraries/haskell/js-flot/default.nix new file mode 100644 index 000000000000..3bc570d557d1 --- /dev/null +++ b/pkgs/development/libraries/haskell/js-flot/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, HTTP }: + +cabal.mkDerivation (self: { + pname = "js-flot"; + version = "0.8.3"; + sha256 = "0yjyzqh3qzhy5h3nql1fckw0gcfb0f4wj9pm85nafpfqp2kg58hv"; + testDepends = [ HTTP ]; + meta = { + homepage = "https://github.com/ndmitchell/js-flot#readme"; + description = "Obtain minified flot code"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/js-jquery/default.nix b/pkgs/development/libraries/haskell/js-jquery/default.nix new file mode 100644 index 000000000000..ad776b577f41 --- /dev/null +++ b/pkgs/development/libraries/haskell/js-jquery/default.nix @@ -0,0 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, HTTP }: + +cabal.mkDerivation (self: { + pname = "js-jquery"; + version = "1.11.1"; + sha256 = "0k4hrpxsc48nanr2zw6jcirirsarlshycx7d5hzqqv9jfhy1i88d"; + testDepends = [ HTTP ]; + doCheck = false; + meta = { + homepage = "https://github.com/ndmitchell/js-jquery#readme"; + description = "Obtain minified jQuery code"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/json-assertions/default.nix b/pkgs/development/libraries/haskell/json-assertions/default.nix index 9adcaf175726..9a9364d09d0f 100644 --- a/pkgs/development/libraries/haskell/json-assertions/default.nix +++ b/pkgs/development/libraries/haskell/json-assertions/default.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { version = "1.0.5"; sha256 = "1vf6y8xbl48giq1p6d62294rfvfdw62l1q4dspy990ii0v5gkyck"; buildDepends = [ aeson indexed indexedFree lens lensAeson text ]; + jailbreak = true; meta = { homepage = "http://github.com/ocharles/json-assertions.git"; description = "Test that your (Aeson) JSON encoding matches your expectations"; diff --git a/pkgs/development/libraries/haskell/json-rpc/default.nix b/pkgs/development/libraries/haskell/json-rpc/default.nix index 1062a0b35239..c7e5c3373c5e 100644 --- a/pkgs/development/libraries/haskell/json-rpc/default.nix +++ b/pkgs/development/libraries/haskell/json-rpc/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "json-rpc"; - version = "0.2.0.2"; - sha256 = "00ha6hjg9ccwa48ab5ibnkiiri7ki3rv7ms2h9qbwr30lxyb0r88"; + version = "0.2.1.1"; + sha256 = "0h6dkb1rgd6qxzcxvqvgwilmibkdbqpjvflijwf54fx2z687fjld"; buildDepends = [ aeson async conduit conduitExtra deepseq hashable mtl stm stmConduit text unorderedContainers diff --git a/pkgs/development/libraries/haskell/json-schema/default.nix b/pkgs/development/libraries/haskell/json-schema/default.nix index 0c06cb107d59..cd102d358039 100644 --- a/pkgs/development/libraries/haskell/json-schema/default.nix +++ b/pkgs/development/libraries/haskell/json-schema/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "json-schema"; - version = "0.7.0.1"; - sha256 = "1r8f0i3w2g5i5amqpvmi6ys3ax4rzpbvwnvwk9wy95bch3nlvsw0"; + version = "0.7.3.0"; + sha256 = "0jdhmzg1is8dnyz46r6w616xq0w1lypc9xz1c2mcimr9xb9r70zw"; buildDepends = [ aeson genericAeson genericDeriving mtl scientific tagged text time unorderedContainers vector diff --git a/pkgs/development/libraries/haskell/json/default.nix b/pkgs/development/libraries/haskell/json/default.nix index a709c4a0b2d7..3eeb6958f837 100644 --- a/pkgs/development/libraries/haskell/json/default.nix +++ b/pkgs/development/libraries/haskell/json/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "json"; - version = "0.7"; - sha256 = "18v8vbx3pyskf3ap4lpy2d3461gghfsq5bzjyrjvqsd2r9r44rfk"; + version = "0.9"; + sha256 = "1r37hhhhc97sxqrcijss80c0380f36bh6f2y4navwih7r3a2ci8j"; buildDepends = [ mtl parsec syb text ]; meta = { description = "Support for serialising Haskell to and from JSON"; diff --git a/pkgs/development/libraries/haskell/jwt/default.nix b/pkgs/development/libraries/haskell/jwt/default.nix index d9e4ce8f0dd9..27eb104f4dff 100644 --- a/pkgs/development/libraries/haskell/jwt/default.nix +++ b/pkgs/development/libraries/haskell/jwt/default.nix @@ -1,23 +1,23 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, aeson, base64Bytestring, cryptohash, dataDefault -, httpTypes, HUnit, network, QuickCheck, scientific, tasty -, tastyHunit, tastyQuickcheck, tastyTh, text, time +, httpTypes, HUnit, network, networkUri, QuickCheck, scientific +, tasty, tastyHunit, tastyQuickcheck, tastyTh, text, time , unorderedContainers }: cabal.mkDerivation (self: { pname = "jwt"; - version = "0.4.0"; - sha256 = "0kfdrl795h7nyai1gk056kjbw2c5n3bc30aq9466pky5jv6ywlbz"; + version = "0.4.2"; + sha256 = "167qm37y5f3d05spr0z2jwkbm2sszz3khs6zd1p0az5q4nhq295w"; buildDepends = [ aeson base64Bytestring cryptohash dataDefault httpTypes network - scientific text time unorderedContainers + networkUri scientific text time unorderedContainers ]; testDepends = [ aeson base64Bytestring cryptohash dataDefault httpTypes HUnit - network QuickCheck scientific tasty tastyHunit tastyQuickcheck - tastyTh text time unorderedContainers + network networkUri QuickCheck scientific tasty tastyHunit + tastyQuickcheck tastyTh text time unorderedContainers ]; meta = { homepage = "https://bitbucket.org/ssaasen/haskell-jwt"; diff --git a/pkgs/development/libraries/haskell/labeled-tree/default.nix b/pkgs/development/libraries/haskell/labeled-tree/default.nix new file mode 100644 index 000000000000..ef0301ef7739 --- /dev/null +++ b/pkgs/development/libraries/haskell/labeled-tree/default.nix @@ -0,0 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal }: + +cabal.mkDerivation (self: { + pname = "labeled-tree"; + version = "1.0.0.0"; + sha256 = "1cnnyic5z5y21hpxpmx66ph34mjyysckgiasmzg7yx202y2ih7s7"; + meta = { + description = "Labeled tree structure"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ jpbernardy ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/lambdabot-utils/default.nix b/pkgs/development/libraries/haskell/lambdabot-utils/default.nix index c7261c4eed81..34cf827c0275 100644 --- a/pkgs/development/libraries/haskell/lambdabot-utils/default.nix +++ b/pkgs/development/libraries/haskell/lambdabot-utils/default.nix @@ -17,5 +17,6 @@ cabal.mkDerivation (self: { description = "Utility libraries for the advanced IRC bot, Lambdabot"; license = "GPL"; platforms = self.ghc.meta.platforms; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/lambdabot/default.nix b/pkgs/development/libraries/haskell/lambdabot/default.nix index b869c59d1310..6b09752f7d46 100644 --- a/pkgs/development/libraries/haskell/lambdabot/default.nix +++ b/pkgs/development/libraries/haskell/lambdabot/default.nix @@ -16,6 +16,7 @@ cabal.mkDerivation (self: { sha256 = "19pkm4m2xk9ziai3ka4scxjavi0as8dmivz9q6vg3npmv0kyhkhb"; isLibrary = true; isExecutable = true; + patches = [ ./deps.patch ]; buildDepends = [ arrows binary brainfuck dataMemocombinators dependentMap dependentSum dependentSumTemplate dice editDistance filepath @@ -31,6 +32,6 @@ cabal.mkDerivation (self: { license = "GPL"; platforms = self.ghc.meta.platforms; hydraPlatforms = self.stdenv.lib.platforms.none; - broken = self.stdenv.lib.versionOlder "7.7" self.ghc.version; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/lambdabot/deps.patch b/pkgs/development/libraries/haskell/lambdabot/deps.patch new file mode 100644 index 000000000000..a92228067194 --- /dev/null +++ b/pkgs/development/libraries/haskell/lambdabot/deps.patch @@ -0,0 +1,21 @@ +--- a/lambdabot.cabal.orig 2014-10-16 17:39:16.000000000 -0500 ++++ b/lambdabot.cabal 2014-10-16 18:26:58.000000000 -0500 +@@ -166,7 +166,7 @@ + edit-distance >= 0.2, + filepath >= 1.3, + haskeline >= 0.7, +- haskell-src-exts >= 1.14.0, ++ haskell-src-exts >= 1.14.0 && < 1.16, + hstatsd >= 0.1, + hslogger >= 1.2.1, + HTTP >= 4000, +@@ -174,7 +174,8 @@ + misfortune >= 0.1, + monad-control >= 0.3, + mtl >= 2, +- network >= 2.3.0.13, ++ network >= 2.6, ++ network-uri >= 2.6, + oeis >= 0.3.1, + time >= 1.4, + parsec >= 3, diff --git a/pkgs/development/libraries/haskell/language-c-inline/default.nix b/pkgs/development/libraries/haskell/language-c-inline/default.nix index ba06bf860bd9..720d7dd8926c 100644 --- a/pkgs/development/libraries/haskell/language-c-inline/default.nix +++ b/pkgs/development/libraries/haskell/language-c-inline/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "language-c-inline"; - version = "0.7.6.1"; - sha256 = "0giyclrkxbigqpgrvlz896nsiqi7fghm79pzcxmxn7vslmardn4a"; + version = "0.7.7.0"; + sha256 = "10wj8dlsjimgln14y7b50pnnn865ln46v3xcqwr7ahjcl3icavg6"; buildDepends = [ filepath languageCQuote mainlandPretty ]; testDepends = [ languageCQuote ]; meta = { diff --git a/pkgs/development/libraries/haskell/language-c-quote/default.nix b/pkgs/development/libraries/haskell/language-c-quote/default.nix index d08a5c7fab9b..03b1d62546b1 100644 --- a/pkgs/development/libraries/haskell/language-c-quote/default.nix +++ b/pkgs/development/libraries/haskell/language-c-quote/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "language-c-quote"; - version = "0.8.0"; - sha256 = "0k171hbwj108azhlwpnvkl0r4n0kg4yg2mxqvg8cpf47i9bigw5g"; + version = "0.10.1.3"; + sha256 = "0kbnqrplwb5w9jfljsrjxisnrnxbc0221hpznvq4m1ldx2mkrh1k"; buildDepends = [ exceptionMtl exceptionTransformers filepath haskellSrcMeta mainlandPretty mtl srcloc syb symbol diff --git a/pkgs/development/libraries/haskell/language-c/default.nix b/pkgs/development/libraries/haskell/language-c/default.nix index 2fe11c4f071e..9346a10bdf2c 100644 --- a/pkgs/development/libraries/haskell/language-c/default.nix +++ b/pkgs/development/libraries/haskell/language-c/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "language-c"; - version = "0.4.6"; - sha256 = "0pzd3g5q3sjfngs29biannza6l9am75kcjy5q0xcjv7xhz0z1m31"; + version = "0.4.7"; + sha256 = "1r0jlncv6d6ai8kblrdq9gz8abx57b24y6hfh30xx20zdgccjvaz"; buildDepends = [ filepath syb ]; buildTools = [ alex happy ]; meta = { diff --git a/pkgs/development/libraries/haskell/language-java/0.2.6.nix b/pkgs/development/libraries/haskell/language-java/0.2.6.nix deleted file mode 100644 index 316a95481a5b..000000000000 --- a/pkgs/development/libraries/haskell/language-java/0.2.6.nix +++ /dev/null @@ -1,25 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, alex, cpphs, filepath, HUnit, mtl, parsec, QuickCheck, syb -, testFramework, testFrameworkHunit, testFrameworkQuickcheck2 -}: - -cabal.mkDerivation (self: { - pname = "language-java"; - version = "0.2.6"; - sha256 = "1rwkc71c77v1lm5vnfkf7wr4lzvkpdylwz8wia40xwyxidq9qv27"; - buildDepends = [ cpphs parsec syb ]; - testDepends = [ - filepath HUnit mtl QuickCheck testFramework testFrameworkHunit - testFrameworkQuickcheck2 - ]; - buildTools = [ alex ]; - doCheck = false; - meta = { - homepage = "http://github.com/vincenthz/language-java"; - description = "Manipulating Java source: abstract syntax, lexer, parser, and pretty-printer"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/language-java/0.2.7.nix b/pkgs/development/libraries/haskell/language-java/default.nix index dc35a8867ba1..dc35a8867ba1 100644 --- a/pkgs/development/libraries/haskell/language-java/0.2.7.nix +++ b/pkgs/development/libraries/haskell/language-java/default.nix diff --git a/pkgs/development/libraries/haskell/stm/2.2.0.1.nix b/pkgs/development/libraries/haskell/lattices/default.nix index cfe7ff65871b..d37b6d2e8832 100644 --- a/pkgs/development/libraries/haskell/stm/2.2.0.1.nix +++ b/pkgs/development/libraries/haskell/lattices/default.nix @@ -3,13 +3,12 @@ { cabal }: cabal.mkDerivation (self: { - pname = "stm"; - version = "2.2.0.1"; - sha256 = "1p0x414ffsd77mmlfz1cmwg2cbhinnbpxypxgvygg05js67msj8q"; + pname = "lattices"; + version = "1.2.1.1"; + sha256 = "0ppqvc3w7v56zya43b3fqwis50c8b57hlighzmk8jphv39y3ilp6"; meta = { - description = "Software Transactional Memory"; + description = "Fine-grained library for constructing and manipulating lattices"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/lens-aeson/default.nix b/pkgs/development/libraries/haskell/lens-aeson/default.nix index ddf643b899a9..44097f2c9d4e 100644 --- a/pkgs/development/libraries/haskell/lens-aeson/default.nix +++ b/pkgs/development/libraries/haskell/lens-aeson/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "lens-aeson"; - version = "1.0.0.1"; - sha256 = "1gkplcvi570bd824q4zswi1ajb3730b7qng48g1zpjskvikn32qn"; + version = "1.0.0.2"; + sha256 = "1hq0zs1h4wapy1n9vyr4yiysnwbv26di8gl6msx3jkcahvlnkvlp"; buildDepends = [ aeson attoparsec lens scientific text unorderedContainers vector ]; diff --git a/pkgs/development/libraries/haskell/lens-family-core/default.nix b/pkgs/development/libraries/haskell/lens-family-core/default.nix index a5c9e65f8a45..94a53898325d 100644 --- a/pkgs/development/libraries/haskell/lens-family-core/default.nix +++ b/pkgs/development/libraries/haskell/lens-family-core/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "lens-family-core"; - version = "1.1.0"; - sha256 = "0pvc7iv7y5s3496w7ic9qzdw3l76ldnrg0my0jxi1dyn0vm9xwm3"; + version = "1.2.0"; + sha256 = "0hxrbbc4azfafnr4ab2zxgic093wwg6gx5h1ggp4xks55d8rhraz"; buildDepends = [ transformers ]; meta = { description = "Haskell 98 Lens Families"; diff --git a/pkgs/development/libraries/haskell/lens-family-th/default.nix b/pkgs/development/libraries/haskell/lens-family-th/default.nix index 41b08ce9b447..a2ecf7b61efe 100644 --- a/pkgs/development/libraries/haskell/lens-family-th/default.nix +++ b/pkgs/development/libraries/haskell/lens-family-th/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "lens-family-th"; - version = "0.3.0.0"; - sha256 = "0p9z278rpr9mqdpxa5izllplfrbxwzdziqjzjn4x1j2g9f3q5f8s"; + version = "0.4.0.0"; + sha256 = "02fc3kppb7y2c6j22wi2mzcxffj4k3dl3x09vjllqchfpfcpwbm5"; meta = { homepage = "http://github.com/DanBurton/lens-family-th#readme"; description = "Generate lens-family style lenses"; diff --git a/pkgs/development/libraries/haskell/lens-family/default.nix b/pkgs/development/libraries/haskell/lens-family/default.nix index 582f0c52dafc..58ce93e1b650 100644 --- a/pkgs/development/libraries/haskell/lens-family/default.nix +++ b/pkgs/development/libraries/haskell/lens-family/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "lens-family"; - version = "1.1.0"; - sha256 = "0cr4wdnix138iklh4l8nrzp52m7qrrgrq9ngr61zs02gbww46sz3"; + version = "1.2.0"; + sha256 = "0pbyx43ajx96nhcw4brml1r5azs1041k7nv4m94ak6x77n5sr4mb"; buildDepends = [ lensFamilyCore mtl transformers ]; meta = { description = "Lens Families"; diff --git a/pkgs/development/libraries/haskell/lens/4.2.nix b/pkgs/development/libraries/haskell/lens/4.2.nix index 69367fc1fe11..2729e42be61e 100644 --- a/pkgs/development/libraries/haskell/lens/4.2.nix +++ b/pkgs/development/libraries/haskell/lens/4.2.nix @@ -6,18 +6,18 @@ , QuickCheck, reflection, semigroupoids, semigroups, simpleReflect , split, tagged, testFramework, testFrameworkHunit , testFrameworkQuickcheck2, testFrameworkTh, text, transformers -, transformersCompat, unorderedContainers, vector, void, zlib +, transformersCompat, unorderedContainers, vector, void }: cabal.mkDerivation (self: { pname = "lens"; - version = "4.4.0.2"; - sha256 = "03h1r6np1aas5nnw3nsqcvl9an9yriikcgapnfck82pmmdvg5l47"; + version = "4.5"; + sha256 = "009wdzybzmk7cs27fzigsmxknim6f9s7lp7iivgcsfn49pd8imwv"; buildDepends = [ bifunctors comonad contravariant distributive exceptions filepath free hashable mtl parallel primitive profunctors reflection semigroupoids semigroups split tagged text transformers - transformersCompat unorderedContainers vector void zlib + transformersCompat unorderedContainers vector void ]; testDepends = [ deepseq doctest filepath genericDeriving hlint HUnit mtl nats @@ -25,9 +25,6 @@ cabal.mkDerivation (self: { testFrameworkHunit testFrameworkQuickcheck2 testFrameworkTh text transformers unorderedContainers vector ]; - patchPhase = '' - configureFlags="-f-test-hlint" - ''; meta = { homepage = "http://github.com/ekmett/lens/"; description = "Lenses, Folds and Traversals"; diff --git a/pkgs/development/libraries/haskell/leveldb-haskell/default.nix b/pkgs/development/libraries/haskell/leveldb-haskell/default.nix index 0b721be21519..2e3ba0032335 100644 --- a/pkgs/development/libraries/haskell/leveldb-haskell/default.nix +++ b/pkgs/development/libraries/haskell/leveldb-haskell/default.nix @@ -1,17 +1,22 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, async, dataDefault, filepath, leveldb, resourcet, snappy +{ cabal, async, dataDefault, exceptions, filepath, leveldb, mtl +, QuickCheck, resourcet, snappy, tasty, tastyQuickcheck, temporary , transformers }: cabal.mkDerivation (self: { pname = "leveldb-haskell"; - version = "0.3.1"; - sha256 = "09pyji49sdl60xicd32ra7v72qf0jkjhnvpsfr9k698is7lcq06d"; + version = "0.6"; + sha256 = "1r76dvn8scnjfdw1i5cj3s5s1nqf2yib4jdydjnr8p6c8yvpp3z5"; isLibrary = true; isExecutable = true; buildDepends = [ - async dataDefault filepath resourcet transformers + async dataDefault exceptions filepath resourcet transformers + ]; + testDepends = [ + dataDefault exceptions mtl QuickCheck tasty tastyQuickcheck + temporary transformers ]; extraLibraries = [ leveldb snappy ]; meta = { diff --git a/pkgs/development/libraries/haskell/libjenkins/default.nix b/pkgs/development/libraries/haskell/libjenkins/default.nix index 0411cb93063f..a873616f3c01 100644 --- a/pkgs/development/libraries/haskell/libjenkins/default.nix +++ b/pkgs/development/libraries/haskell/libjenkins/default.nix @@ -1,22 +1,25 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, async, conduit, doctest, filepath, free, hspec -, hspecExpectationsLens, httpClient, httpConduit, httpTypes, lens -, monadControl, network, resourcet, text, transformers, xmlConduit +{ cabal, async, attoparsec, doctest, filepath, free, hspec +, hspecExpectationsLens, httpClient, httpClientTls, httpTypes, lens +, liftedAsync, liftedBase, monadControl, mtl, network, networkUri +, profunctors, text, transformers, xmlConduit }: cabal.mkDerivation (self: { pname = "libjenkins"; - version = "0.4.3.0"; - sha256 = "18z1yaf1a1ncvflxzv96b35d44933yrmsmxv5dr87iyfry28qbnv"; + version = "0.6.0"; + sha256 = "0rcqmj5myi2wy2acd59gqdfwiiapw1zwzm71bjqb1y66z0rnrkx4"; buildDepends = [ - async conduit free httpClient httpConduit httpTypes lens - monadControl network resourcet text transformers xmlConduit + attoparsec free httpClient httpClientTls httpTypes liftedAsync + liftedBase monadControl mtl network networkUri profunctors text + transformers ]; testDepends = [ - async conduit doctest filepath free hspec hspecExpectationsLens - httpClient httpConduit httpTypes lens monadControl network - resourcet text transformers xmlConduit + async attoparsec doctest filepath free hspec hspecExpectationsLens + httpClient httpClientTls httpTypes lens liftedAsync liftedBase + monadControl mtl network networkUri profunctors text transformers + xmlConduit ]; jailbreak = true; doCheck = false; diff --git a/pkgs/development/libraries/haskell/liblastfm/default.nix b/pkgs/development/libraries/haskell/liblastfm/default.nix index 2558d18d748c..abfa8a0496b2 100644 --- a/pkgs/development/libraries/haskell/liblastfm/default.nix +++ b/pkgs/development/libraries/haskell/liblastfm/default.nix @@ -1,23 +1,23 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, aeson, cereal, contravariant, cryptoApi, hspec -, hspecExpectationsLens, httpClient, httpClientTls, HUnit, lens -, lensAeson, networkUri, profunctors, pureMD5, semigroups, text -, void, xmlConduit, xmlHtmlConduitLens +{ cabal, aeson, cereal, cryptoApi, hspec, hspecExpectationsLens +, httpClient, httpClientTls, HUnit, lens, lensAeson, networkUri +, profunctors, pureMD5, semigroups, text, xmlConduit +, xmlHtmlConduitLens }: cabal.mkDerivation (self: { pname = "liblastfm"; - version = "0.4.1.0"; - sha256 = "06w8rj2f2r0v15w6498px07krsqh1amcr6q22y3jlvaibm9mrvcw"; + version = "0.5.1"; + sha256 = "1bf508a1rqjb486wcwn0n36bm8lwnj3b4bg0826lp92zmaxiyxpy"; buildDepends = [ - aeson cereal contravariant cryptoApi httpClient httpClientTls - networkUri profunctors pureMD5 semigroups text void xmlConduit + aeson cereal cryptoApi httpClient httpClientTls networkUri + profunctors pureMD5 semigroups text xmlConduit ]; testDepends = [ - aeson cereal contravariant cryptoApi hspec hspecExpectationsLens - httpClient httpClientTls HUnit lens lensAeson networkUri - profunctors pureMD5 text void xmlConduit xmlHtmlConduitLens + aeson cereal cryptoApi hspec hspecExpectationsLens httpClient + httpClientTls HUnit lens lensAeson networkUri profunctors pureMD5 + text xmlConduit xmlHtmlConduitLens ]; meta = { description = "Lastfm API interface"; diff --git a/pkgs/development/libraries/haskell/libmpd/0.8.0.5.nix b/pkgs/development/libraries/haskell/libmpd/0.8.0.5.nix deleted file mode 100644 index f7f83cd973e3..000000000000 --- a/pkgs/development/libraries/haskell/libmpd/0.8.0.5.nix +++ /dev/null @@ -1,26 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, attoparsec, dataDefault, filepath, hspec, HUnit, mtl -, network, QuickCheck, text, time, utf8String -}: - -cabal.mkDerivation (self: { - pname = "libmpd"; - version = "0.8.0.5"; - sha256 = "0jxd2xl9imfvb3dz7zqwzx392aw2cb2pl3drx5wkygbywbi5ijhh"; - buildDepends = [ - attoparsec dataDefault filepath mtl network text time utf8String - ]; - testDepends = [ - dataDefault hspec HUnit mtl network QuickCheck text time utf8String - ]; - jailbreak = true; - doCheck = false; - meta = { - homepage = "http://github.com/joachifm/libmpd-haskell#readme"; - description = "An MPD client library"; - license = "LGPL"; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/libmpd/0.9.0.1.nix b/pkgs/development/libraries/haskell/libmpd/default.nix index 6dc0aede0699..6dc0aede0699 100644 --- a/pkgs/development/libraries/haskell/libmpd/0.9.0.1.nix +++ b/pkgs/development/libraries/haskell/libmpd/default.nix diff --git a/pkgs/development/libraries/haskell/libsystemd-journal/default.nix b/pkgs/development/libraries/haskell/libsystemd-journal/default.nix index 1bb1bcacca3b..e4dc138eae05 100644 --- a/pkgs/development/libraries/haskell/libsystemd-journal/default.nix +++ b/pkgs/development/libraries/haskell/libsystemd-journal/default.nix @@ -1,6 +1,6 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, hashable, hsyslog, pipes, pipesSafe, systemd-journal, text +{ cabal, hashable, hsyslog, pipes, pipesSafe, systemd, text , transformers, uniplate, unixBytestring, unorderedContainers, uuid , vector }: @@ -13,7 +13,8 @@ cabal.mkDerivation (self: { hashable hsyslog pipes pipesSafe text transformers uniplate unixBytestring unorderedContainers uuid vector ]; - extraLibraries = [ systemd-journal ]; + extraLibraries = [ systemd ]; + jailbreak = true; meta = { homepage = "http://github.com/ocharles/libsystemd-journal"; description = "Haskell bindings to libsystemd-journal"; diff --git a/pkgs/development/libraries/haskell/linear/default.nix b/pkgs/development/libraries/haskell/linear/default.nix index 856b8491690d..bbe0763cd23a 100644 --- a/pkgs/development/libraries/haskell/linear/default.nix +++ b/pkgs/development/libraries/haskell/linear/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "linear"; - version = "1.10.1.2"; - sha256 = "05zbqdcdjq7anng2nymy05wsnk9qpk8mgivqcndbfjpk4l1r9k94"; + version = "1.15.4"; + sha256 = "0xpprafv7dndihnk2mapgvhy4cpz2d24k5j1p3q5crrsi2wj7k0b"; buildDepends = [ adjunctions binary distributive hashable lens reflection semigroupoids semigroups tagged transformers unorderedContainers diff --git a/pkgs/development/libraries/haskell/linux-inotify/default.nix b/pkgs/development/libraries/haskell/linux-inotify/default.nix new file mode 100644 index 000000000000..2c5dc577f0ff --- /dev/null +++ b/pkgs/development/libraries/haskell/linux-inotify/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, hashable }: + +cabal.mkDerivation (self: { + pname = "linux-inotify"; + version = "0.2.0.1"; + sha256 = "1970v1zkbp45amylmg79bbdfhk8kg6vzxjznd76gfl5kff2cv12r"; + buildDepends = [ hashable ]; + meta = { + description = "Thinner binding to the Linux Kernel's inotify interface"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/llvm-general-pure/3.3.8.2.nix b/pkgs/development/libraries/haskell/llvm-general-pure/3.3.8.2.nix deleted file mode 100644 index 37b6d6b60c59..000000000000 --- a/pkgs/development/libraries/haskell/llvm-general-pure/3.3.8.2.nix +++ /dev/null @@ -1,23 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, HUnit, mtl, parsec, QuickCheck, setenv, testFramework -, testFrameworkHunit, testFrameworkQuickcheck2, transformers -}: - -cabal.mkDerivation (self: { - pname = "llvm-general-pure"; - version = "3.3.8.2"; - sha256 = "171mp9rydw6r2khcmvkcfjk934ckfahwyx1b4a15gmj8sr1s9hzp"; - buildDepends = [ mtl parsec setenv transformers ]; - testDepends = [ - HUnit mtl QuickCheck testFramework testFrameworkHunit - testFrameworkQuickcheck2 - ]; - doCheck = false; - meta = { - description = "Pure Haskell LLVM functionality (no FFI)"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/llvm-general-pure/3.4.4.0.nix b/pkgs/development/libraries/haskell/llvm-general-pure/default.nix index cd92b67b16aa..cd92b67b16aa 100644 --- a/pkgs/development/libraries/haskell/llvm-general-pure/3.4.4.0.nix +++ b/pkgs/development/libraries/haskell/llvm-general-pure/default.nix diff --git a/pkgs/development/libraries/haskell/llvm-general/3.3.8.2.nix b/pkgs/development/libraries/haskell/llvm-general/3.3.8.2.nix deleted file mode 100644 index 4669358ccbf5..000000000000 --- a/pkgs/development/libraries/haskell/llvm-general/3.3.8.2.nix +++ /dev/null @@ -1,27 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, HUnit, llvmConfig, llvmGeneralPure, mtl, parsec -, QuickCheck, setenv, testFramework, testFrameworkHunit -, testFrameworkQuickcheck2, transformers, utf8String -}: - -cabal.mkDerivation (self: { - pname = "llvm-general"; - version = "3.3.8.2"; - sha256 = "11qnvpnx4i8mjdgn5y58rl70wf8pzmd555hrdaki1f4q0035cmm5"; - buildDepends = [ - llvmGeneralPure mtl parsec setenv transformers utf8String - ]; - testDepends = [ - HUnit llvmGeneralPure mtl QuickCheck testFramework - testFrameworkHunit testFrameworkQuickcheck2 - ]; - buildTools = [ llvmConfig ]; - doCheck = false; - meta = { - description = "General purpose LLVM bindings"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/llvm-general/3.4.4.0.nix b/pkgs/development/libraries/haskell/llvm-general/default.nix index aec66b12723b..aec66b12723b 100644 --- a/pkgs/development/libraries/haskell/llvm-general/3.4.4.0.nix +++ b/pkgs/development/libraries/haskell/llvm-general/default.nix diff --git a/pkgs/development/libraries/haskell/logging-facade-journald/default.nix b/pkgs/development/libraries/haskell/logging-facade-journald/default.nix new file mode 100644 index 000000000000..54a7feee5954 --- /dev/null +++ b/pkgs/development/libraries/haskell/logging-facade-journald/default.nix @@ -0,0 +1,25 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, fetchzip, hspec, libsystemdJournal, loggingFacade, text +, unorderedContainers +}: + +cabal.mkDerivation (self: { + pname = "logging-facade-journald"; + version = "0.0.0"; + src = fetchzip { + url = "https://hackage.haskell.org/package/logging-facade-journald-0.0.0/logging-facade-journald-0.0.0.tar.gz"; + sha256 = "1wvh48y3lz2ipz6cwh7gbwajwrd7ziivhkmgpglzjfy335zin7m6"; + }; + buildDepends = [ + libsystemdJournal loggingFacade text unorderedContainers + ]; + testDepends = [ + hspec libsystemdJournal loggingFacade text unorderedContainers + ]; + meta = { + description = "Journald back-end for logging-facade"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/logging-facade/default.nix b/pkgs/development/libraries/haskell/logging-facade/default.nix new file mode 100644 index 000000000000..9e4e7601d85e --- /dev/null +++ b/pkgs/development/libraries/haskell/logging-facade/default.nix @@ -0,0 +1,19 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, fetchzip, hspec, transformers }: + +cabal.mkDerivation (self: { + pname = "logging-facade"; + version = "0.0.0"; + src = fetchzip { + url = "https://hackage.haskell.org/package/logging-facade-0.0.0/logging-facade-0.0.0.tar.gz"; + sha256 = "0w6bkzgf0lamcdnris95i1xq8wg882wf17b517rgr5d1vhxz9y7s"; + }; + buildDepends = [ transformers ]; + testDepends = [ hspec ]; + meta = { + description = "Simple logging abstraction that allows multiple backends"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/logging/default.nix b/pkgs/development/libraries/haskell/logging/default.nix index 83ee93f84635..94eb14cb0034 100644 --- a/pkgs/development/libraries/haskell/logging/default.nix +++ b/pkgs/development/libraries/haskell/logging/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "logging"; - version = "1.4.1"; - sha256 = "15mhpafv797f8aifjyjb5nc0fkd7if7bvx5hx9mzxycdzlk28gfp"; + version = "2.1.0"; + sha256 = "15ad4g7zkbklawd98m6x838fr5383vkvq92y75f56j1kj17g7rrh"; buildDepends = [ binary fastLogger liftedBase monadControl monadLogger pcreLight text time transformers vectorSpace diff --git a/pkgs/development/libraries/haskell/lushtags/default.nix b/pkgs/development/libraries/haskell/lushtags/default.nix index f7f8997480aa..c3e90c84c566 100644 --- a/pkgs/development/libraries/haskell/lushtags/default.nix +++ b/pkgs/development/libraries/haskell/lushtags/default.nix @@ -9,11 +9,11 @@ cabal.mkDerivation (self: { isLibrary = false; isExecutable = true; buildDepends = [ haskellSrcExts text vector ]; - jailbreak = true; meta = { homepage = "https://github.com/bitc/lushtags"; description = "Create ctags compatible tags files for Haskell programs"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/lzma-conduit/default.nix b/pkgs/development/libraries/haskell/lzma-conduit/default.nix new file mode 100644 index 000000000000..f93a53c8670f --- /dev/null +++ b/pkgs/development/libraries/haskell/lzma-conduit/default.nix @@ -0,0 +1,24 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, bindingsDSL, conduit, HUnit, lzma, QuickCheck, resourcet +, testFramework, testFrameworkHunit, testFrameworkQuickcheck2 +, transformers +}: + +cabal.mkDerivation (self: { + pname = "lzma-conduit"; + version = "1.1.1"; + sha256 = "1i1khkxpia5hp3f0p7h656yvbgwsxffpl2czxjbkiw6iz31rapwg"; + buildDepends = [ bindingsDSL conduit resourcet transformers ]; + testDepends = [ + conduit HUnit QuickCheck resourcet testFramework testFrameworkHunit + testFrameworkQuickcheck2 + ]; + extraLibraries = [ lzma ]; + meta = { + homepage = "http://github.com/alphaHeavy/lzma-conduit"; + description = "Conduit interface for lzma/xz compression"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/machines-directory/default.nix b/pkgs/development/libraries/haskell/machines-directory/default.nix new file mode 100644 index 000000000000..dadae68668ad --- /dev/null +++ b/pkgs/development/libraries/haskell/machines-directory/default.nix @@ -0,0 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, filepath, machines, machinesIo, transformers }: + +cabal.mkDerivation (self: { + pname = "machines-directory"; + version = "0.0.0.1"; + sha256 = "1npgh7f5czx6r3s05y48rs6xkrgpv3if38apwnbvi4ignmsfsvyx"; + buildDepends = [ filepath machines machinesIo transformers ]; + jailbreak = true; + meta = { + homepage = "http://github.com/aloiscochard/machines-io"; + description = "Directory (system) utilities for the machines library"; + license = self.stdenv.lib.licenses.asl20; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/machines-io/default.nix b/pkgs/development/libraries/haskell/machines-io/default.nix new file mode 100644 index 000000000000..f66bfae6730a --- /dev/null +++ b/pkgs/development/libraries/haskell/machines-io/default.nix @@ -0,0 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, chunkedData, machines, transformers }: + +cabal.mkDerivation (self: { + pname = "machines-io"; + version = "0.1.0.0"; + sha256 = "07ky1j9ihn493a8q2g1pc0ynam1mkzdi4hjs74kpfnlvl9x6ic7g"; + buildDepends = [ chunkedData machines transformers ]; + jailbreak = true; + meta = { + homepage = "http://github.com/aloiscochard/machines-io"; + description = "IO utilities for the machines library"; + license = self.stdenv.lib.licenses.asl20; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/machines/default.nix b/pkgs/development/libraries/haskell/machines/default.nix index 1b391739c202..02b2ec272b02 100644 --- a/pkgs/development/libraries/haskell/machines/default.nix +++ b/pkgs/development/libraries/haskell/machines/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "machines"; - version = "0.2.5"; - sha256 = "0745lhmfwq27nna517q7b82q59pda587wgh6840nw65syaj2qfhp"; + version = "0.4.0.1"; + sha256 = "11h1b6hls7v4ifz3p7v1gdsgxqgyx92v978pjfyp81ianwjyclqg"; buildDepends = [ comonad free mtl pointed profunctors semigroups transformers void ]; diff --git a/pkgs/development/libraries/haskell/mainland-pretty/default.nix b/pkgs/development/libraries/haskell/mainland-pretty/default.nix index 8bd0f2dfc21b..1383efab8684 100644 --- a/pkgs/development/libraries/haskell/mainland-pretty/default.nix +++ b/pkgs/development/libraries/haskell/mainland-pretty/default.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { version = "0.2.7"; sha256 = "1g4s2xscj6dpkcghs5lws658ki0rhriivpdr5ilcycvr28k3l35q"; buildDepends = [ srcloc text ]; + jailbreak = true; meta = { homepage = "http://www.eecs.harvard.edu/~mainland/"; description = "Pretty printing designed for printing source code"; diff --git a/pkgs/development/libraries/haskell/map-syntax/default.nix b/pkgs/development/libraries/haskell/map-syntax/default.nix new file mode 100644 index 000000000000..52c42efd3209 --- /dev/null +++ b/pkgs/development/libraries/haskell/map-syntax/default.nix @@ -0,0 +1,21 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, deepseq, HUnit, mtl, QuickCheck, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2, transformers +}: + +cabal.mkDerivation (self: { + pname = "map-syntax"; + version = "0.2"; + sha256 = "02v1dvq86qzbfbwbza4myj3a6a6a5p059fi5m3g548hmqk3v2p1r"; + buildDepends = [ mtl ]; + testDepends = [ + deepseq HUnit mtl QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 transformers + ]; + meta = { + description = "Syntax sugar for defining maps"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/markdown/default.nix b/pkgs/development/libraries/haskell/markdown/default.nix index 9727b7264d47..d2d7ef843756 100644 --- a/pkgs/development/libraries/haskell/markdown/default.nix +++ b/pkgs/development/libraries/haskell/markdown/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "markdown"; - version = "0.1.11"; - sha256 = "1v5bqwzh0v17ylgnbl16bw4n9shyrff7nabwnzzhs2wmqp85n3js"; + version = "0.1.12"; + sha256 = "19qpr9k3yz5c77i4y4qldq4ak0m8iy6ca5wjx6mix9krlnwxkrid"; buildDepends = [ attoparsec blazeHtml conduit conduitExtra dataDefault text transformers xssSanitize diff --git a/pkgs/development/libraries/haskell/mime-mail/default.nix b/pkgs/development/libraries/haskell/mime-mail/default.nix index 532ef28d9b77..f20b20f71b7f 100644 --- a/pkgs/development/libraries/haskell/mime-mail/default.nix +++ b/pkgs/development/libraries/haskell/mime-mail/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "mime-mail"; - version = "0.4.5.2"; - sha256 = "0s5fj20n3lc2hn1mqpsvai63pgrl7vhqv26psdzqdwl70w9c04zf"; + version = "0.4.6"; + sha256 = "051mqpzypg4r6rd06qb75pl3nq9p68r1sl73r0pwl1imcp158aw6"; buildDepends = [ base64Bytestring blazeBuilder filepath random text ]; diff --git a/pkgs/development/libraries/haskell/monad-journal/default.nix b/pkgs/development/libraries/haskell/monad-journal/default.nix index d65eecc6a303..ebf02e5e46d1 100644 --- a/pkgs/development/libraries/haskell/monad-journal/default.nix +++ b/pkgs/development/libraries/haskell/monad-journal/default.nix @@ -5,15 +5,15 @@ cabal.mkDerivation (self: { pname = "monad-journal"; - version = "0.4.0.2"; - sha256 = "0biz564lgddzd6hygb7jd3rh8xa7qmzby4q3fyfa9fizmdcwf9j8"; + version = "0.5.0.1"; + sha256 = "1rxmz6hx8kh8sw497h4kpxkvhgaa7jbzif7qssjqijyfmghsxh80"; buildDepends = [ either monadControl mtl transformers transformersBase ]; meta = { homepage = "http://github.com/phaazon/monad-journal"; description = "Pure logger typeclass and monad transformer"; - license = self.stdenv.lib.licenses.publicDomain; + license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; }; diff --git a/pkgs/development/libraries/haskell/monad-logger/default.nix b/pkgs/development/libraries/haskell/monad-logger/default.nix index d8e724259a0f..4cb44acf652e 100644 --- a/pkgs/development/libraries/haskell/monad-logger/default.nix +++ b/pkgs/development/libraries/haskell/monad-logger/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "monad-logger"; - version = "0.3.7.2"; - sha256 = "03q8l28rwrg00c2zcv0gr5fpis5xz8c5zspziay6p2grbwfxmwda"; + version = "0.3.8"; + sha256 = "08mvz78ak6rf22s2z0b50iky36cnd6f498262aj57l7j0l7zsy7r"; buildDepends = [ blazeBuilder conduit conduitExtra exceptions fastLogger liftedBase monadControl monadLoops mtl resourcet stm stmChans text diff --git a/pkgs/development/libraries/haskell/monad-supply/default.nix b/pkgs/development/libraries/haskell/monad-supply/default.nix index dc6c90bcd977..e8c598d3a302 100644 --- a/pkgs/development/libraries/haskell/monad-supply/default.nix +++ b/pkgs/development/libraries/haskell/monad-supply/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "monad-supply"; - version = "0.4"; - sha256 = "0qvv9j55hw1lrfqnz1aric4mvg62c2vqaf5wirn69gvh74slqyj8"; + version = "0.6"; + sha256 = "1gg4r7fwaq2fa0lz8pz301mk3q16xpbs7qv54hhggxrv3i1h33ir"; buildDepends = [ mtl ]; meta = { description = "Stateful supply monad"; diff --git a/pkgs/development/libraries/haskell/monadIO/default.nix b/pkgs/development/libraries/haskell/monadIO/default.nix new file mode 100644 index 000000000000..ec3efa33ae8b --- /dev/null +++ b/pkgs/development/libraries/haskell/monadIO/default.nix @@ -0,0 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, mtl, stm }: + +cabal.mkDerivation (self: { + pname = "monadIO"; + version = "0.10.1.4"; + sha256 = "08158j978h69knbnzxkzv856sjhhw24h5lh7d8hx2lyhzbpnfarl"; + buildDepends = [ mtl stm ]; + meta = { + description = "Overloading of concurrency variables"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/monadloc-pp/default.nix b/pkgs/development/libraries/haskell/monadloc-pp/default.nix index 13a8dfa3677b..9ff5d5079cef 100644 --- a/pkgs/development/libraries/haskell/monadloc-pp/default.nix +++ b/pkgs/development/libraries/haskell/monadloc-pp/default.nix @@ -4,14 +4,14 @@ cabal.mkDerivation (self: { pname = "monadloc-pp"; - version = "0.3"; - sha256 = "0jr9ngcj3l6kd5cscll5kr3a4bp52sdjgrdxd1j5a21jyc3gdyvn"; + version = "0.3.1"; + sha256 = "0ch25kcz63xhinwd6mjqbhm282hfh280s3z910wnvdp3krgx0mpc"; isLibrary = false; isExecutable = true; buildDepends = [ filepath haskellSrcExts monadloc syb ]; jailbreak = true; meta = { - homepage = "http://github.com/pepeiborra/monadloc"; + homepage = "http://github.com/pepeiborra/monadloc-pp"; description = "A preprocessor for generating monadic call traces"; license = self.stdenv.lib.licenses.publicDomain; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/mono-traversable/default.nix b/pkgs/development/libraries/haskell/mono-traversable/default.nix index 5a5249657eb7..91d160fc3450 100644 --- a/pkgs/development/libraries/haskell/mono-traversable/default.nix +++ b/pkgs/development/libraries/haskell/mono-traversable/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "mono-traversable"; - version = "0.6.2"; - sha256 = "17ipqxzpz1vnv2qlj7rl8iz3awk593z39c716bikx03z67h85qzr"; + version = "0.6.3"; + sha256 = "026qii2i6l8lsvhvb9l8gkzybrvf87skg6mjam2bxc3i1bjx1lkr"; buildDepends = [ comonad dlist dlistInstances hashable semigroupoids semigroups text transformers unorderedContainers vector vectorAlgorithms diff --git a/pkgs/development/libraries/haskell/mtl/1.1.0.2.nix b/pkgs/development/libraries/haskell/mtl/1.1.0.2.nix deleted file mode 100644 index 3cc240114dfe..000000000000 --- a/pkgs/development/libraries/haskell/mtl/1.1.0.2.nix +++ /dev/null @@ -1,15 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "mtl"; - version = "1.1.0.2"; - sha256 = "a225aaf2b1e337f40c31e5c42f95eec9a4608322b0e4c135d2b31b8421a58d36"; - meta = { - description = "Monad transformer library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/mtl/2.0.1.0.nix b/pkgs/development/libraries/haskell/mtl/2.0.1.0.nix deleted file mode 100644 index e528736d95a7..000000000000 --- a/pkgs/development/libraries/haskell/mtl/2.0.1.0.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, transformers }: - -cabal.mkDerivation (self: { - pname = "mtl"; - version = "2.0.1.0"; - sha256 = "1w6jpzyl08mringnd6gxwcl3y9q506r240vm1sv0aacml1hy8szk"; - buildDepends = [ transformers ]; - meta = { - description = "Monad classes, using functional dependencies"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/mtl/2.1.1.nix b/pkgs/development/libraries/haskell/mtl/2.1.1.nix deleted file mode 100644 index 8cfb60ddfefd..000000000000 --- a/pkgs/development/libraries/haskell/mtl/2.1.1.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, transformers }: - -cabal.mkDerivation (self: { - pname = "mtl"; - version = "2.1.1"; - sha256 = "143s0c5hygwnd72x14jwinpnd92gx4y9blhmv6086rxijqbq6l4j"; - buildDepends = [ transformers ]; - meta = { - description = "Monad classes, using functional dependencies"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/mtl/2.1.2.nix b/pkgs/development/libraries/haskell/mtl/2.1.3.1.nix index d72f8bc79d62..372c8706cc91 100644 --- a/pkgs/development/libraries/haskell/mtl/2.1.2.nix +++ b/pkgs/development/libraries/haskell/mtl/2.1.3.1.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "mtl"; - version = "2.1.2"; - sha256 = "1vwb98ci3jnjpndym012amia41h3cjdwpy9330ws881l6dj5fxwc"; + version = "2.1.3.1"; + sha256 = "1xpn2wjmqbh2cg1yssc6749xpgcqlrrg4iilwqgkcjgvaxlpdbvp"; buildDepends = [ transformers ]; meta = { homepage = "http://github.com/ekmett/mtl"; diff --git a/pkgs/development/libraries/haskell/multiarg/default.nix b/pkgs/development/libraries/haskell/multiarg/default.nix index 4c6ffcdaff61..f9912a6d0134 100644 --- a/pkgs/development/libraries/haskell/multiarg/default.nix +++ b/pkgs/development/libraries/haskell/multiarg/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "multiarg"; - version = "0.26.0.0"; - sha256 = "0fjzjr66yan62911kfndnr7xmy3waidh4cqazabk6yr1cznpsx8m"; + version = "0.28.0.0"; + sha256 = "1qy2xlxqhxlj9f5g7wf90vwch3qs1yz733f87irdmak0v4vxdkd5"; buildDepends = [ bifunctors utf8String ]; meta = { homepage = "https://github.com/massysett/multiarg"; diff --git a/pkgs/development/libraries/haskell/mwc-random/default.nix b/pkgs/development/libraries/haskell/mwc-random/default.nix index d64c74c68a87..5e015ecbe967 100644 --- a/pkgs/development/libraries/haskell/mwc-random/default.nix +++ b/pkgs/development/libraries/haskell/mwc-random/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "mwc-random"; - version = "0.13.2.0"; - sha256 = "07nbbn9ainzsqg2hlw6l9vsfqylfcqs1apgvpnhdgids2gvmrkaa"; + version = "0.13.2.2"; + sha256 = "1rsrvadaih66xn8zr8kfvrr65g7wpj6i9jnzkmlik9lqrvz4axcp"; buildDepends = [ primitive time vector ]; testDepends = [ HUnit QuickCheck statistics testFramework testFrameworkHunit diff --git a/pkgs/development/libraries/haskell/mysql/default.nix b/pkgs/development/libraries/haskell/mysql/default.nix index a9801f6415fd..5422443d2fe5 100644 --- a/pkgs/development/libraries/haskell/mysql/default.nix +++ b/pkgs/development/libraries/haskell/mysql/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "mysql"; - version = "0.1.1.6"; - sha256 = "1sxzx5f4ysxhq1nimkj4xwf87i7prwp5wg0kjbhv9pbn65zc9mmj"; + version = "0.1.1.7"; + sha256 = "0hl8z8ynadvvhn4garjrax2b59iqddj884mv3s6804lcjjyc49d0"; buildTools = [ mysqlConfig ]; extraLibraries = [ zlib ]; meta = { diff --git a/pkgs/development/libraries/haskell/ncurses/default.nix b/pkgs/development/libraries/haskell/ncurses/default.nix index f964af3c8b72..3a5cd89b9267 100644 --- a/pkgs/development/libraries/haskell/ncurses/default.nix +++ b/pkgs/development/libraries/haskell/ncurses/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "ncurses"; - version = "0.2.10"; - sha256 = "0qdw5dwi1w42nygvzyq8la7i917f0fz9qjw6ivgl2h1rjxc5j9cb"; + version = "0.2.11"; + sha256 = "08jr224i37jxrprka9c276sid6mw001m8r2krd6g8jscshwd5nzk"; buildDepends = [ text transformers ]; buildTools = [ c2hs ]; extraLibraries = [ ncurses ]; @@ -15,7 +15,5 @@ cabal.mkDerivation (self: { description = "Modernised bindings to GNU ncurses"; license = self.stdenv.lib.licenses.gpl3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/network-carbon/default.nix b/pkgs/development/libraries/haskell/network-carbon/default.nix index c12737a2edf0..82d6c47844d7 100644 --- a/pkgs/development/libraries/haskell/network-carbon/default.nix +++ b/pkgs/development/libraries/haskell/network-carbon/default.nix @@ -4,9 +4,10 @@ cabal.mkDerivation (self: { pname = "network-carbon"; - version = "1.0.1"; - sha256 = "1q3b7vw80yw6fkmpwgazy8ikhbwjmmqmm4fry8c9f8ckkpzahj2b"; + version = "1.0.2"; + sha256 = "0r9riydwvmn8v9iih475agl4idb3z6v3djmn3pjlda28g3p0zw9h"; buildDepends = [ network text time vector ]; + jailbreak = true; meta = { homepage = "http://github.com/ocharles/network-carbon"; description = "A Haskell implementation of the Carbon protocol (part of the Graphite monitoring tools)"; diff --git a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix index 45d912da07a5..5b023f91b66d 100644 --- a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix +++ b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "network-conduit-tls"; - version = "1.1.0"; - sha256 = "1q9wx7bvr4a65rkyfn2vd3h9bfpsvm9zcqqjhjsrgb91l6x5bdqi"; + version = "1.1.0.2"; + sha256 = "1jgv2g3fsfp0rym4g0d9w5hm5ws0sfisj07hcfk2711rm107zaax"; buildDepends = [ conduit conduitExtra connection cprngAes dataDefault monadControl network streamingCommons systemFileio systemFilepath tls diff --git a/pkgs/development/libraries/haskell/network-data/default.nix b/pkgs/development/libraries/haskell/network-data/default.nix new file mode 100644 index 000000000000..d6c94c97a322 --- /dev/null +++ b/pkgs/development/libraries/haskell/network-data/default.nix @@ -0,0 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, cereal, prettyclass }: + +cabal.mkDerivation (self: { + pname = "network-data"; + version = "0.5.2"; + sha256 = "0vbmg1m4qylzbmj3z5746srfkiwvh32qi9zyc39gc87bfw2gzn8s"; + buildDepends = [ cereal prettyclass ]; + meta = { + description = "Library for network data structures and their serialization"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/network-simple/default.nix b/pkgs/development/libraries/haskell/network-simple/default.nix index 41077efed0b8..ba7b0a01f5f4 100644 --- a/pkgs/development/libraries/haskell/network-simple/default.nix +++ b/pkgs/development/libraries/haskell/network-simple/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "network-simple"; - version = "0.4.0.1"; - sha256 = "113vaxgsfny9iv6hnbywk97qr1y6qkap49p803anakamss4bdmyj"; + version = "0.4.0.2"; + sha256 = "0k155m1s7k157rpsz8ww9cs7jyw3faybwfmw97agvskhb4axw6hf"; buildDepends = [ exceptions network transformers ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/network/2.2.1.4.nix b/pkgs/development/libraries/haskell/network/2.2.1.4.nix deleted file mode 100644 index 481ad16a2a34..000000000000 --- a/pkgs/development/libraries/haskell/network/2.2.1.4.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, parsec }: - -cabal.mkDerivation (self: { - pname = "network"; - version = "2.2.1.4"; - sha256 = "16a842bee5db116f754b459ef261426b6705a6d79383c6d545c9df5f6329cd25"; - buildDepends = [ parsec ]; - meta = { - description = "Networking-related facilities"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/network/2.3.0.2.nix b/pkgs/development/libraries/haskell/network/2.3.0.2.nix deleted file mode 100644 index 3cf17949380e..000000000000 --- a/pkgs/development/libraries/haskell/network/2.3.0.2.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, parsec }: - -cabal.mkDerivation (self: { - pname = "network"; - version = "2.3.0.2"; - sha256 = "1s4hm0ilsd67ircrl0h5b72kwrw1imb3cj5z52h99bv7qjdbag03"; - buildDepends = [ parsec ]; - meta = { - homepage = "http://github.com/haskell/network"; - description = "Low-level networking interface"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/network/2.3.0.5.nix b/pkgs/development/libraries/haskell/network/2.3.0.5.nix deleted file mode 100644 index f10d8c0dbcc7..000000000000 --- a/pkgs/development/libraries/haskell/network/2.3.0.5.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, parsec }: - -cabal.mkDerivation (self: { - pname = "network"; - version = "2.3.0.5"; - sha256 = "0y1sbgsffzr0skm6xl8907iclgw9vmf395zvpwgakp69i3snh1z0"; - buildDepends = [ parsec ]; - meta = { - homepage = "http://github.com/haskell/network"; - description = "Low-level networking interface"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/network/2.3.1.0.nix b/pkgs/development/libraries/haskell/network/2.3.1.0.nix deleted file mode 100644 index 02185e860414..000000000000 --- a/pkgs/development/libraries/haskell/network/2.3.1.0.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, HUnit, parsec, testFramework, testFrameworkHunit }: - -cabal.mkDerivation (self: { - pname = "network"; - version = "2.3.1.0"; - sha256 = "1fp25wkl5cc4kx0jv5w02b7pzgqadjg1yrknzzwsqxc5s3cpyz6l"; - buildDepends = [ parsec ]; - testDepends = [ HUnit testFramework testFrameworkHunit ]; - meta = { - homepage = "http://github.com/haskell/network"; - description = "Low-level networking interface"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/network/2.4.1.2.nix b/pkgs/development/libraries/haskell/network/2.4.1.2.nix deleted file mode 100644 index 2ec39f7d4578..000000000000 --- a/pkgs/development/libraries/haskell/network/2.4.1.2.nix +++ /dev/null @@ -1,22 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, HUnit, parsec, testFramework, testFrameworkHunit -, testFrameworkQuickcheck2 -}: - -cabal.mkDerivation (self: { - pname = "network"; - version = "2.4.1.2"; - sha256 = "0f7ykdv7xbsr5m3h2ml0hw3nlbnq785m0gr624pwk2s289jwakdh"; - buildDepends = [ parsec ]; - testDepends = [ - HUnit testFramework testFrameworkHunit testFrameworkQuickcheck2 - ]; - meta = { - homepage = "https://github.com/haskell/network"; - description = "Low-level networking interface"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/numeric-prelude/default.nix b/pkgs/development/libraries/haskell/numeric-prelude/default.nix index 35840ba1716c..003629d7852a 100644 --- a/pkgs/development/libraries/haskell/numeric-prelude/default.nix +++ b/pkgs/development/libraries/haskell/numeric-prelude/default.nix @@ -14,6 +14,7 @@ cabal.mkDerivation (self: { deepseq nonNegative parsec QuickCheck random storableRecord utilityHt ]; + jailbreak = true; meta = { homepage = "http://www.haskell.org/haskellwiki/Numeric_Prelude"; description = "An experimental alternative hierarchy of numeric type classes"; diff --git a/pkgs/development/libraries/haskell/objective/default.nix b/pkgs/development/libraries/haskell/objective/default.nix new file mode 100644 index 000000000000..9ed48a45e923 --- /dev/null +++ b/pkgs/development/libraries/haskell/objective/default.nix @@ -0,0 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, cleanUnions, free, transformers }: + +cabal.mkDerivation (self: { + pname = "objective"; + version = "0.4"; + sha256 = "0zcls4b6i5b9yazy6d6fq2vpc6gbq16cqbycyc909bm7kkqzmb86"; + buildDepends = [ cleanUnions free transformers ]; + meta = { + homepage = "https://github.com/fumieval/objective"; + description = "Extensible objects"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/oeis/default.nix b/pkgs/development/libraries/haskell/oeis/default.nix index b58df3be3148..b1b9bd5820f3 100644 --- a/pkgs/development/libraries/haskell/oeis/default.nix +++ b/pkgs/development/libraries/haskell/oeis/default.nix @@ -1,20 +1,19 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, HTTP, HUnit, network, testFramework, testFrameworkHunit }: +{ cabal, HTTP, HUnit, network, networkUri, testFramework +, testFrameworkHunit +}: cabal.mkDerivation (self: { pname = "oeis"; - version = "0.3.5"; - sha256 = "0r23mqbfvvvx6shzdclzfrqi8r95gxl93cih7ny7w7px3w5yc5x6"; - buildDepends = [ HTTP network ]; + version = "0.3.6"; + sha256 = "1q7ywczm2d5inrjqgz3j8vfk5sj2yixvwdkzlfs2whd0gadbcfa0"; + buildDepends = [ HTTP network networkUri ]; testDepends = [ HUnit testFramework testFrameworkHunit ]; - patchPhase = '' - sed -i -e 's|network *==.*|network|' oeis.cabal - ''; meta = { description = "Interface to the Online Encyclopedia of Integer Sequences (OEIS)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + maintainers = with self.stdenv.lib.maintainers; [ andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/oo-prototypes/default.nix b/pkgs/development/libraries/haskell/oo-prototypes/default.nix new file mode 100644 index 000000000000..b9f011d3aa13 --- /dev/null +++ b/pkgs/development/libraries/haskell/oo-prototypes/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal }: + +cabal.mkDerivation (self: { + pname = "oo-prototypes"; + version = "0.1.0.0"; + sha256 = "0xpm2adf47clhzpwd833w706mc5xfxwr2wp4aywigy11687f9bly"; + meta = { + homepage = "https://github.com/yi-editor/oo-prototypes"; + description = "Support for OO-like prototypes"; + license = self.stdenv.lib.licenses.gpl2; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/opaleye/default.nix b/pkgs/development/libraries/haskell/opaleye/default.nix new file mode 100644 index 000000000000..850267648b07 --- /dev/null +++ b/pkgs/development/libraries/haskell/opaleye/default.nix @@ -0,0 +1,27 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, contravariant, postgresqlSimple, productProfunctors +, profunctors, semigroups, text, time, transformers, uuid +}: + +cabal.mkDerivation (self: { + pname = "opaleye"; + version = "0.2"; + sha256 = "08qlgsr8jcwn7sx2j08nk5lggx37mh0wc8gggj6gxqpafm0jn247"; + buildDepends = [ + contravariant postgresqlSimple productProfunctors profunctors + semigroups text time transformers uuid + ]; + testDepends = [ + postgresqlSimple productProfunctors profunctors time + ]; + jailbreak = true; + doCheck = false; + meta = { + homepage = "https://github.com/tomjaguarpaw/haskell-opaleye"; + description = "An SQL-generating DSL targeting PostgreSQL"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/optparse-applicative/0.10.0.nix b/pkgs/development/libraries/haskell/optparse-applicative/0.10.0.nix index ff546c76eae5..ea2dc95e364b 100644 --- a/pkgs/development/libraries/haskell/optparse-applicative/0.10.0.nix +++ b/pkgs/development/libraries/haskell/optparse-applicative/0.10.0.nix @@ -13,5 +13,6 @@ cabal.mkDerivation (self: { description = "Utilities and combinators for parsing command line options"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/optparse-applicative/0.11.0.1.nix b/pkgs/development/libraries/haskell/optparse-applicative/0.11.0.1.nix index 0685a51d3b0d..bef76ab73ee6 100644 --- a/pkgs/development/libraries/haskell/optparse-applicative/0.11.0.1.nix +++ b/pkgs/development/libraries/haskell/optparse-applicative/0.11.0.1.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { version = "0.11.0.1"; sha256 = "0jdzajj9w0dghv751m59l3imzm2x9lx9cqb6094mncnx8k6cf6f9"; buildDepends = [ ansiWlPprint transformers transformersCompat ]; + jailbreak = true; meta = { homepage = "https://github.com/pcapriotti/optparse-applicative"; description = "Utilities and combinators for parsing command line options"; diff --git a/pkgs/development/libraries/haskell/optparse-applicative/0.9.1.1.nix b/pkgs/development/libraries/haskell/optparse-applicative/0.9.1.1.nix deleted file mode 100644 index 4660e7f37ba8..000000000000 --- a/pkgs/development/libraries/haskell/optparse-applicative/0.9.1.1.nix +++ /dev/null @@ -1,25 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, ansiWlPprint, HUnit, QuickCheck, testFramework -, testFrameworkHunit, testFrameworkQuickcheck2 -, testFrameworkThPrime, transformers, transformersCompat -}: - -cabal.mkDerivation (self: { - pname = "optparse-applicative"; - version = "0.9.1.1"; - sha256 = "1fy8839y9dg2a5pj7abjiqkm3qcz8faip32q3x1zi5mrz4v3q2g6"; - buildDepends = [ ansiWlPprint transformers transformersCompat ]; - testDepends = [ - HUnit QuickCheck testFramework testFrameworkHunit - testFrameworkQuickcheck2 testFrameworkThPrime - ]; - jailbreak = true; - meta = { - homepage = "https://github.com/pcapriotti/optparse-applicative"; - description = "Utilities and combinators for parsing command line options"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index 0fa41e250b40..3788c1f3bf88 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -15,6 +15,7 @@ cabal.mkDerivation (self: { pname = "pandoc"; version = "1.13.1"; sha256 = "0vvysa70xp4pskxrvslmddwdsalc479zb8wn6z1vmpvfssvvj6vv"; + editedCabalFile = "1i57yk1pql4gv97cs86fk82hkwncics1wkzjqd9iz866204y4wrg"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/pango/default.nix b/pkgs/development/libraries/haskell/pango/default.nix index 907a9a2e0325..d79b931132df 100644 --- a/pkgs/development/libraries/haskell/pango/default.nix +++ b/pkgs/development/libraries/haskell/pango/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "pango"; - version = "0.13.0.0"; - sha256 = "0qrsivr6z8pp4ibg1vyzyg2fw0jzrshn6h6g6vff93awxzqq9rlw"; + version = "0.13.0.4"; + sha256 = "1fglwywac36abpjjpgdsk62f4sndgr5nf29fmana0yac7hxsm1sq"; buildDepends = [ cairo glib mtl text ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; diff --git a/pkgs/development/libraries/haskell/parallel-io/default.nix b/pkgs/development/libraries/haskell/parallel-io/default.nix index b9f6eda669e8..2bf50add8620 100644 --- a/pkgs/development/libraries/haskell/parallel-io/default.nix +++ b/pkgs/development/libraries/haskell/parallel-io/default.nix @@ -9,6 +9,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ extensibleExceptions random ]; + jailbreak = true; meta = { homepage = "http://batterseapower.github.com/parallel-io"; description = "Combinators for executing IO actions in parallel on a thread pool"; diff --git a/pkgs/development/libraries/haskell/parallel/1.1.0.1.nix b/pkgs/development/libraries/haskell/parallel/1.1.0.1.nix deleted file mode 100644 index 99575921cc68..000000000000 --- a/pkgs/development/libraries/haskell/parallel/1.1.0.1.nix +++ /dev/null @@ -1,15 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "parallel"; - version = "1.1.0.1"; - sha256 = "0885086660268f3626effacb29a02b5c81f3e5a8dfa99dabe0981ddbc407999f"; - meta = { - description = "parallel programming library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix b/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix deleted file mode 100644 index 52a5d3c3c339..000000000000 --- a/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, deepseq }: - -cabal.mkDerivation (self: { - pname = "parallel"; - version = "2.2.0.1"; - sha256 = "255310023138ecf618c8b450203fa2fc65feb68cd08ee4d369ceae72054168fd"; - buildDepends = [ deepseq ]; - meta = { - description = "Parallel programming library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/parallel/3.1.0.1.nix b/pkgs/development/libraries/haskell/parallel/3.1.0.1.nix deleted file mode 100644 index 095603717b7b..000000000000 --- a/pkgs/development/libraries/haskell/parallel/3.1.0.1.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, deepseq }: - -cabal.mkDerivation (self: { - pname = "parallel"; - version = "3.1.0.1"; - sha256 = "0j03i5467iyz98fl4fnzlwrr93j2as733kbrxnlcgyh455kb89ns"; - buildDepends = [ deepseq ]; - meta = { - description = "Parallel programming library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/parallel/3.2.0.2.nix b/pkgs/development/libraries/haskell/parallel/3.2.0.2.nix deleted file mode 100644 index f881e2f83c78..000000000000 --- a/pkgs/development/libraries/haskell/parallel/3.2.0.2.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, deepseq }: - -cabal.mkDerivation (self: { - pname = "parallel"; - version = "3.2.0.2"; - sha256 = "0sy67cdbwh17wng6b77h9hnkg59mgnyilwvirihmq9535jm9yml2"; - buildDepends = [ deepseq ]; - meta = { - description = "Parallel programming library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/parsec-extra/default.nix b/pkgs/development/libraries/haskell/parsec-extra/default.nix new file mode 100644 index 000000000000..b3dfb2e0a152 --- /dev/null +++ b/pkgs/development/libraries/haskell/parsec-extra/default.nix @@ -0,0 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, monadsTf, parsec, transformers }: + +cabal.mkDerivation (self: { + pname = "parsec-extra"; + version = "0.1.0.5"; + sha256 = "0x5lpkly8z26ygp0k8ddkybgmfi5n2vnf6sv3sjn3xm531xf6qy4"; + buildDepends = [ monadsTf parsec transformers ]; + meta = { + description = "Some miscellaneous basic string parsers"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/parsec/2.1.0.1.nix b/pkgs/development/libraries/haskell/parsec/2.1.0.1.nix deleted file mode 100644 index 458a2bd29773..000000000000 --- a/pkgs/development/libraries/haskell/parsec/2.1.0.1.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "parsec"; - version = "2.1.0.1"; - sha256 = "2d85e5b5c8b2b1f341037ce67e1db7fa47b31c083136796cfef9e5b945c656df"; - meta = { - homepage = "http://www.cs.uu.nl/~daan/parsec.html"; - description = "Monadic parser combinators"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/parsec/3.1.1.nix b/pkgs/development/libraries/haskell/parsec/3.1.1.nix deleted file mode 100644 index e997acd4b49e..000000000000 --- a/pkgs/development/libraries/haskell/parsec/3.1.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl }: - -cabal.mkDerivation (self: { - pname = "parsec"; - version = "3.1.1"; - sha256 = "0x34gwn9k68h69c3hw7yaah6zpdwq8hvqss27f3n4n4cp7dh81fk"; - buildDepends = [ mtl ]; - meta = { - homepage = "http://www.cs.uu.nl/~daan/parsec.html"; - description = "Monadic parser combinators"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/parsec/3.1.2.nix b/pkgs/development/libraries/haskell/parsec/3.1.2.nix deleted file mode 100644 index dd55106fa0df..000000000000 --- a/pkgs/development/libraries/haskell/parsec/3.1.2.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl, text }: - -cabal.mkDerivation (self: { - pname = "parsec"; - version = "3.1.2"; - sha256 = "0lhn9j2j5jlh7g0qx9f6ms63n9x1xlxg9isdvm6z0ksy3ywj9wch"; - buildDepends = [ mtl text ]; - jailbreak = true; - meta = { - homepage = "http://www.cs.uu.nl/~daan/parsec.html"; - description = "Monadic parser combinators"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/parsec/3.1.3.nix b/pkgs/development/libraries/haskell/parsec/3.1.3.nix deleted file mode 100644 index 3e81947cfed7..000000000000 --- a/pkgs/development/libraries/haskell/parsec/3.1.3.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl, text }: - -cabal.mkDerivation (self: { - pname = "parsec"; - version = "3.1.3"; - sha256 = "1a64gzirgpa1i78gbbp9z059nh29xmcja4g8vgjb1fbylx6vn54z"; - buildDepends = [ mtl text ]; - jailbreak = true; - meta = { - homepage = "http://www.cs.uu.nl/~daan/parsec.html"; - description = "Monadic parser combinators"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/parsec/3.1.6.nix b/pkgs/development/libraries/haskell/parsec/default.nix index 5a8d83622f54..f2258da99682 100644 --- a/pkgs/development/libraries/haskell/parsec/3.1.6.nix +++ b/pkgs/development/libraries/haskell/parsec/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "parsec"; - version = "3.1.6"; - sha256 = "12k2gzy7fi83929mr2s4vj3ipfyg7l74v1cb2vbi4613qmq5wrw4"; + version = "3.1.7"; + sha256 = "12h7n367gaw9ifd19yd3ppi4j6kghf7rryacl0ips0fwlxw1x8wa"; buildDepends = [ mtl text ]; testDepends = [ HUnit testFramework testFrameworkHunit ]; jailbreak = true; diff --git a/pkgs/development/libraries/haskell/parsek/default.nix b/pkgs/development/libraries/haskell/parsek/default.nix new file mode 100644 index 000000000000..45bb96561c33 --- /dev/null +++ b/pkgs/development/libraries/haskell/parsek/default.nix @@ -0,0 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal }: + +cabal.mkDerivation (self: { + pname = "parsek"; + version = "1.0.1.2"; + sha256 = "0ybh76cx5y73ywhlv4g2z74x1mvg5n2rxl045mscs6dwcyw9vhbd"; + meta = { + description = "Parallel Parsing Processes"; + license = self.stdenv.lib.licenses.gpl3; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ jpbernardy ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/pdf-toolbox-content/default.nix b/pkgs/development/libraries/haskell/pdf-toolbox-content/default.nix index f9f631827d89..5ca5ab956228 100644 --- a/pkgs/development/libraries/haskell/pdf-toolbox-content/default.nix +++ b/pkgs/development/libraries/haskell/pdf-toolbox-content/default.nix @@ -6,12 +6,13 @@ cabal.mkDerivation (self: { pname = "pdf-toolbox-content"; - version = "0.0.3.0"; - sha256 = "0glcm6mrgg8ixzhp09kfkk3ra3qblvrp1wcsa2nhqlypg3ca8r3h"; + version = "0.0.3.1"; + sha256 = "08icj65l6hjl2r07ipr6c65n7ny771zq714bswhv2q0iwdigz1iz"; buildDepends = [ attoparsec base16Bytestring ioStreams pdfToolboxCore text ]; meta = { + homepage = "https://github.com/Yuras/pdf-toolbox"; description = "A collection of tools for processing PDF files"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/pdf-toolbox-core/default.nix b/pkgs/development/libraries/haskell/pdf-toolbox-core/default.nix index bfccb645fbb2..bc7b179a0da2 100644 --- a/pkgs/development/libraries/haskell/pdf-toolbox-core/default.nix +++ b/pkgs/development/libraries/haskell/pdf-toolbox-core/default.nix @@ -1,14 +1,15 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, attoparsec, errors, ioStreams, transformers, zlibBindings +{ cabal, attoparsec, errors, ioStreams, scientific, transformers +, zlibBindings }: cabal.mkDerivation (self: { pname = "pdf-toolbox-core"; - version = "0.0.2.1"; - sha256 = "14jj6xprzh2k1njal0mgapkm3xivy8370p9kdjxha9gnwmc581df"; + version = "0.0.3.0"; + sha256 = "1d9c275gdr2byri6nbabh2ap6lnq0wnfqfqq76fnb0fj92ydmxc6"; buildDepends = [ - attoparsec errors ioStreams transformers zlibBindings + attoparsec errors ioStreams scientific transformers zlibBindings ]; meta = { homepage = "https://github.com/Yuras/pdf-toolbox"; diff --git a/pkgs/development/libraries/haskell/pdf-toolbox-document/default.nix b/pkgs/development/libraries/haskell/pdf-toolbox-document/default.nix index b62d3e92e5ef..77615ed86650 100644 --- a/pkgs/development/libraries/haskell/pdf-toolbox-document/default.nix +++ b/pkgs/development/libraries/haskell/pdf-toolbox-document/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "pdf-toolbox-document"; - version = "0.0.3.0"; - sha256 = "0y1kb2hf420jx6r81c431avgar32wzx2xr747akcs4rypf6w53fn"; + version = "0.0.4.0"; + sha256 = "1fjchlknkxxgy6rm2q4f9fhy53ip06kzvcv5876gxswdchi6kxwa"; buildDepends = [ cipherRc4 cryptohash ioStreams pdfToolboxContent pdfToolboxCore text transformers diff --git a/pkgs/development/libraries/haskell/persistent-mysql/default.nix b/pkgs/development/libraries/haskell/persistent-mysql/default.nix index dd895b937ce7..db4b89990b26 100644 --- a/pkgs/development/libraries/haskell/persistent-mysql/default.nix +++ b/pkgs/development/libraries/haskell/persistent-mysql/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "persistent-mysql"; - version = "2.0.5"; - sha256 = "1zhva0wikp3d57fsz5phqwi0b3vbgnapf6bw46xmmrp8r21zsnk5"; + version = "2.1.2"; + sha256 = "06i2wcrqvk216bq3853acqi6wgrdzkz3wzah231gv3yz348lr6sv"; buildDepends = [ aeson blazeBuilder conduit monadControl monadLogger mysql mysqlSimple persistent resourcet text transformers diff --git a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix index 8a8b0989e728..1ccdeca92771 100644 --- a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix +++ b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "persistent-postgresql"; - version = "2.0.5"; - sha256 = "1awdxh354y2hxsiijwvc2x7ficrcwmg27ai2mi79a0b2ylrxc9pk"; + version = "2.1.1"; + sha256 = "0mfvzd62qn7ffx6nrgkr52qzl3prjq8xkahvb6j5akb6azdmzg80"; buildDepends = [ aeson blazeBuilder conduit monadControl monadLogger persistent postgresqlLibpq postgresqlSimple resourcet text time transformers diff --git a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix index db5965d378f6..34a427ddb07b 100644 --- a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix +++ b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "persistent-sqlite"; - version = "2.0.5"; - sha256 = "1x65pni93xgsbfwaknd9fgqccz0gbn1ky6k55l2ss5ab92apqy8i"; + version = "2.1.1"; + sha256 = "1hypaixwp6q10gfwbg0xfqfw7vz9j56max5i0k1mklan6js7wy9w"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix index 7060eddc17e3..1c8f502ba7b9 100644 --- a/pkgs/development/libraries/haskell/persistent-template/default.nix +++ b/pkgs/development/libraries/haskell/persistent-template/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "persistent-template"; - version = "2.0.5"; - sha256 = "0mf18n07r2bvvf5448xq4pzylpprkbc1wb86339gaxnax321ipap"; + version = "2.1"; + sha256 = "0rj3yqm38kg7lvj9hi4c5yaypvxj6pwb47b0kg8h2hsa0rshhrdy"; buildDepends = [ aeson monadControl monadLogger pathPieces persistent tagged text transformers unorderedContainers diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix index 588f6163b650..21c49c457f90 100644 --- a/pkgs/development/libraries/haskell/persistent/default.nix +++ b/pkgs/development/libraries/haskell/persistent/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "persistent"; - version = "2.0.5.1"; - sha256 = "14xzqr9f0ggqkakpq6badbrnwr6nhzq61ga7d2m0d0lni039vdax"; + version = "2.1.1"; + sha256 = "0wmvjizz0zx5i9q5sh8hvsks14q6if4s0dnk63f9mw03jb8jpdd1"; buildDepends = [ aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit exceptions fastLogger liftedBase monadControl monadLogger mtl diff --git a/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix b/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix index 51eba83bb82b..d9d5caf4d29e 100644 --- a/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix +++ b/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "pipes-attoparsec"; - version = "0.5.1"; - sha256 = "0qvsvbcn211xp4c669cpljmnsqn9zk1rn94ya1dbq77l970s8xah"; + version = "0.5.1.1"; + sha256 = "1ns8s3p6jh4iya71z3j81cqnrfnr4n92kblwgkjlapb23dykl2qz"; buildDepends = [ attoparsec pipes pipesParse text transformers ]; testDepends = [ attoparsec HUnit mmorph pipes pipesParse tasty tastyHunit text diff --git a/pkgs/development/libraries/haskell/pipes-shell/default.nix b/pkgs/development/libraries/haskell/pipes-shell/default.nix new file mode 100644 index 000000000000..f7f5e20bcf44 --- /dev/null +++ b/pkgs/development/libraries/haskell/pipes-shell/default.nix @@ -0,0 +1,24 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, async, hspec, pipes, pipesBytestring, pipesSafe, stm +, stmChans, text +}: + +cabal.mkDerivation (self: { + pname = "pipes-shell"; + version = "0.1.3"; + sha256 = "0w49il312ns8pyl05144gznxfdchd0rnq8hprmjrgy8yp3v8j4v1"; + buildDepends = [ + async pipes pipesBytestring pipesSafe stm stmChans text + ]; + testDepends = [ + async hspec pipes pipesBytestring pipesSafe stm stmChans text + ]; + jailbreak = true; + doCheck = false; + meta = { + description = "Create proper Pipes from System.Process"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/pipes-text/default.nix b/pkgs/development/libraries/haskell/pipes-text/default.nix index ec4a8e967865..177eb6e7d358 100644 --- a/pkgs/development/libraries/haskell/pipes-text/default.nix +++ b/pkgs/development/libraries/haskell/pipes-text/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "pipes-text"; - version = "0.0.0.12"; - sha256 = "18xf0rhshbl03js50n98k96692w98j0j0dfyi67780i08c39dq6m"; + version = "0.0.0.15"; + sha256 = "10906gdb9gjhxxmxvmib6kw7py6fl2r4df5bryqvbjvr1afcc3x9"; buildDepends = [ pipes pipesBytestring pipesGroup pipesParse pipesSafe streamingCommons text transformers diff --git a/pkgs/development/libraries/haskell/pipes-zlib/default.nix b/pkgs/development/libraries/haskell/pipes-zlib/default.nix index 58894ce6dd6d..bbb555681e04 100644 --- a/pkgs/development/libraries/haskell/pipes-zlib/default.nix +++ b/pkgs/development/libraries/haskell/pipes-zlib/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "pipes-zlib"; - version = "0.4.1"; - sha256 = "0wjx51d3inhsjzqf16l46mhh0mdsa8fk7x1vvp2apg9s6zfw624k"; + version = "0.4.3"; + sha256 = "04iiw0r1mnxl4myyp87wqhff6jm0g2246gwismi7jnwy7xmllsmc"; buildDepends = [ pipes transformers zlib zlibBindings ]; meta = { homepage = "https://github.com/k0001/pipes-zlib"; diff --git a/pkgs/development/libraries/haskell/pipes/default.nix b/pkgs/development/libraries/haskell/pipes/default.nix index 50039d4466b9..9703b14fc71b 100644 --- a/pkgs/development/libraries/haskell/pipes/default.nix +++ b/pkgs/development/libraries/haskell/pipes/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "pipes"; - version = "4.1.2"; - sha256 = "0prxk4qjdcmxjdvpi1bwql0s3l1kwlaz9sydr9swa8bc8ams3a11"; + version = "4.1.4"; + sha256 = "0bv7i18lf15mvfscnif4hkwgm4anw8b7bbqhzdw4wbjqcvrrsppb"; buildDepends = [ mmorph mtl transformers ]; testDepends = [ mtl QuickCheck testFramework testFrameworkQuickcheck2 transformers diff --git a/pkgs/development/libraries/haskell/polynomials-bernstein/default.nix b/pkgs/development/libraries/haskell/polynomials-bernstein/default.nix new file mode 100644 index 000000000000..e2bb34f895c1 --- /dev/null +++ b/pkgs/development/libraries/haskell/polynomials-bernstein/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, vector }: + +cabal.mkDerivation (self: { + pname = "polynomials-bernstein"; + version = "1.1.1"; + sha256 = "0pjdwi84gz5j1rij4m89nyljjafzjnakmf4yd6vj4xz54nmmygg6"; + buildDepends = [ vector ]; + meta = { + description = "A solver for systems of polynomial equations in bernstein form"; + license = "GPL"; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ jpbernardy ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/polyparse/default.nix b/pkgs/development/libraries/haskell/polyparse/default.nix index c9e237b65060..2b4e881421c2 100644 --- a/pkgs/development/libraries/haskell/polyparse/default.nix +++ b/pkgs/development/libraries/haskell/polyparse/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "polyparse"; - version = "1.9"; - sha256 = "12khjhv1dvs4j1jyh3law7m1gmkad8s6q7clh7w6l5ll2n1dc4lz"; + version = "1.10"; + sha256 = "0nz7dv91a2f7gf4jnma8qcqa4n6qjcyggf8qdja46sdcabpd0ij2"; buildDepends = [ text ]; meta = { homepage = "http://code.haskell.org/~malcolm/polyparse/"; diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix index f4d77d70560c..3285a9209aa7 100644 --- a/pkgs/development/libraries/haskell/postgresql-simple/default.nix +++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "postgresql-simple"; - version = "0.4.4.1"; - sha256 = "0lqvy8nc2izwlv7z0n12cknsrb2dkmla84bvjis5z9f63ngs2580"; + version = "0.4.7.0"; + sha256 = "17cs5f7pfh30y2n8b3w76v832sd5z9m5xswpfa5w6r2vf18xpkqs"; buildDepends = [ aeson attoparsec blazeBuilder blazeTextual hashable postgresqlLibpq scientific text time transformers uuid vector diff --git a/pkgs/development/libraries/haskell/primitive/0.5.3.0.nix b/pkgs/development/libraries/haskell/primitive/0.5.3.0.nix index 46d7fbbdcfb3..4f6d728122c7 100644 --- a/pkgs/development/libraries/haskell/primitive/0.5.3.0.nix +++ b/pkgs/development/libraries/haskell/primitive/0.5.3.0.nix @@ -11,5 +11,6 @@ cabal.mkDerivation (self: { description = "Primitive memory-related operations"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/primitive/0.5.2.1.nix b/pkgs/development/libraries/haskell/primitive/0.5.4.0.nix index d9bbd51c1998..08b081d227c7 100644 --- a/pkgs/development/libraries/haskell/primitive/0.5.2.1.nix +++ b/pkgs/development/libraries/haskell/primitive/0.5.4.0.nix @@ -4,13 +4,12 @@ cabal.mkDerivation (self: { pname = "primitive"; - version = "0.5.2.1"; - sha256 = "1vn3y5gh4lwvgvklhn8k1z7gxjy27ik621f4gpa9cb7gqa0nnl8f"; + version = "0.5.4.0"; + sha256 = "05gdgj383xdrdkhxh26imlvs8ji0z28ny38ms9snpvv5i8l2lg10"; meta = { homepage = "https://github.com/haskell/primitive"; description = "Primitive memory-related operations"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/product-profunctors/default.nix b/pkgs/development/libraries/haskell/product-profunctors/default.nix new file mode 100644 index 000000000000..0e5e18de3397 --- /dev/null +++ b/pkgs/development/libraries/haskell/product-profunctors/default.nix @@ -0,0 +1,18 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, contravariant, profunctors }: + +cabal.mkDerivation (self: { + pname = "product-profunctors"; + version = "0.5"; + sha256 = "02hkcq4vzk4641hkm1rf2v2qdbaqalbfgnwfdk7yfz497qv9lmad"; + buildDepends = [ contravariant profunctors ]; + jailbreak = true; + meta = { + homepage = "https://github.com/tomjaguarpaw/product-profunctors"; + description = "product-profunctors"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/profunctors/default.nix b/pkgs/development/libraries/haskell/profunctors/default.nix index 00d339fa44e8..b1336cd59daf 100644 --- a/pkgs/development/libraries/haskell/profunctors/default.nix +++ b/pkgs/development/libraries/haskell/profunctors/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "profunctors"; - version = "4.2.0.1"; - sha256 = "00cfria3zjijx9nm533a25x240c7q0sn9vna6m4y4rz1f7l2gnqc"; + version = "4.3.2"; + sha256 = "06dv9bjz2hsm32kzfqqm6z54197dfjm3wycnbbgl9pib711w484v"; buildDepends = [ comonad distributive semigroupoids tagged transformers ]; diff --git a/pkgs/development/libraries/haskell/protocol-buffers-descriptor/default.nix b/pkgs/development/libraries/haskell/protocol-buffers-descriptor/default.nix index 3b030735bbb2..e7df6ac2075e 100644 --- a/pkgs/development/libraries/haskell/protocol-buffers-descriptor/default.nix +++ b/pkgs/development/libraries/haskell/protocol-buffers-descriptor/default.nix @@ -4,14 +4,13 @@ cabal.mkDerivation (self: { pname = "protocol-buffers-descriptor"; - version = "2.0.14"; - sha256 = "0xbpmm9a4fg42c9zbarawqdl4klfjjc233ilbsibb7asa3v7zmj3"; + version = "2.0.17"; + sha256 = "0jl041645d83iqqiw891d2k760jql6djvi2mmjh9lnmp48lwjy3p"; buildDepends = [ protocolBuffers ]; meta = { homepage = "http://code.haskell.org/protocol-buffers/"; description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/protocol-buffers/default.nix b/pkgs/development/libraries/haskell/protocol-buffers/default.nix index a2cb0efcf74d..d3d81a146580 100644 --- a/pkgs/development/libraries/haskell/protocol-buffers/default.nix +++ b/pkgs/development/libraries/haskell/protocol-buffers/default.nix @@ -1,18 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, binary, filepath, mtl, syb, utf8String }: +{ cabal, binary, filepath, mtl, parsec, syb, utf8String }: cabal.mkDerivation (self: { pname = "protocol-buffers"; - version = "2.0.14"; - sha256 = "1wihnpvc7kjq345a6v702s42gmrqd9cjm50safc7kigyvhr5vm1i"; - buildDepends = [ binary filepath mtl syb utf8String ]; + version = "2.0.17"; + sha256 = "12aky44ssgdj6vsjg0yvr8350cym7n6kn7gdaax0nxzpfxrjfy1v"; + buildDepends = [ binary filepath mtl parsec syb utf8String ]; meta = { homepage = "http://code.haskell.org/protocol-buffers/"; description = "Parse Google Protocol Buffer specifications"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - broken = self.stdenv.lib.versionOlder "7.7" self.ghc.version; }; }) diff --git a/pkgs/development/libraries/haskell/pure-cdb/default.nix b/pkgs/development/libraries/haskell/pure-cdb/default.nix index 871825db1218..b173a619cfd4 100644 --- a/pkgs/development/libraries/haskell/pure-cdb/default.nix +++ b/pkgs/development/libraries/haskell/pure-cdb/default.nix @@ -4,11 +4,10 @@ cabal.mkDerivation (self: { pname = "pure-cdb"; - version = "0.1"; - sha256 = "0fxfhd73h5frnjpk617lspwf17wldsrd5a5cxar5y3a8wi0i4b8c"; + version = "0.1.1"; + sha256 = "1yjh7h02hkhx2vgvn7qfmfd3bp12ibpkf4znybsd2bfh0i1pzn0n"; buildDepends = [ binary mtl vector ]; testDepends = [ mtl testSimple Unixutils vector ]; - doCheck = false; meta = { homepage = "https://github.com/bosu/pure-cdb"; description = "Another pure-haskell CDB (Constant Database) implementation"; diff --git a/pkgs/development/libraries/haskell/purescript/default.nix b/pkgs/development/libraries/haskell/purescript/default.nix index 20739bc45159..3a521ea121b8 100644 --- a/pkgs/development/libraries/haskell/purescript/default.nix +++ b/pkgs/development/libraries/haskell/purescript/default.nix @@ -1,27 +1,27 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, cmdtheline, filepath, haskeline, monadUnify, mtl, parsec -, patternArrows, time, transformers, unorderedContainers -, utf8String, xdgBasedir +{ cabal, cmdtheline, fileEmbed, filepath, haskeline, monadUnify +, mtl, nodejs, parsec, patternArrows, time, transformers +, unorderedContainers, utf8String }: cabal.mkDerivation (self: { pname = "purescript"; - version = "0.5.6.2"; - sha256 = "1zb5jvgwldzvvw1ga125p5048rwkrb636kn7pcf070m615k9w055"; + version = "0.6.1.2"; + sha256 = "0j1fmfcal2m75ji937xxl9cizzpw6v4pr31hxfjmal8fdcf677ma"; isLibrary = true; isExecutable = true; buildDepends = [ - cmdtheline filepath haskeline monadUnify mtl parsec patternArrows - time transformers unorderedContainers utf8String xdgBasedir + cmdtheline fileEmbed filepath haskeline monadUnify mtl parsec + patternArrows time transformers unorderedContainers utf8String + ]; + testDepends = [ + filepath mtl nodejs parsec transformers utf8String ]; - testDepends = [ filepath mtl parsec transformers utf8String ]; - doCheck = false; meta = { homepage = "http://www.purescript.org/"; description = "PureScript Programming Language Compiler"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/pwstore-fast/default.nix b/pkgs/development/libraries/haskell/pwstore-fast/default.nix index a59a9b2d2da3..cca1e04bd4e6 100644 --- a/pkgs/development/libraries/haskell/pwstore-fast/default.nix +++ b/pkgs/development/libraries/haskell/pwstore-fast/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "pwstore-fast"; - version = "2.4.3"; - sha256 = "02dj297s04fxb4ys9nfdw6aap5zrwlryq515gky0c3af6ss2yiz7"; + version = "2.4.4"; + sha256 = "1cpvlwzg3qznhygrr78f75p65mnljd9v5cvnagfxjqppnrkay6bj"; buildDepends = [ base64Bytestring binary byteable cryptohash random ]; diff --git a/pkgs/development/libraries/haskell/random/1.0.1.3.nix b/pkgs/development/libraries/haskell/random/1.0.1.3.nix index 26763deb10a6..3939c4392486 100644 --- a/pkgs/development/libraries/haskell/random/1.0.1.3.nix +++ b/pkgs/development/libraries/haskell/random/1.0.1.3.nix @@ -11,5 +11,6 @@ cabal.mkDerivation (self: { description = "random number library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/random/1.1.nix b/pkgs/development/libraries/haskell/random/1.1.nix new file mode 100644 index 000000000000..5ff11eeefda0 --- /dev/null +++ b/pkgs/development/libraries/haskell/random/1.1.nix @@ -0,0 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, time }: + +cabal.mkDerivation (self: { + pname = "random"; + version = "1.1"; + sha256 = "0nis3lbkp8vfx8pkr6v7b7kr5m334bzb0fk9vxqklnp2aw8a865p"; + buildDepends = [ time ]; + meta = { + description = "random number library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/rawStringsQq/default.nix b/pkgs/development/libraries/haskell/rawStringsQq/default.nix new file mode 100644 index 000000000000..ca5c22489583 --- /dev/null +++ b/pkgs/development/libraries/haskell/rawStringsQq/default.nix @@ -0,0 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal }: + +cabal.mkDerivation (self: { + pname = "raw-strings-qq"; + version = "1.0.2"; + sha256 = "0wnifa97am2s9bqixlidw3nf8w14h2qkg3sn1rxzgvc3fws57jg9"; + meta = { + homepage = "https://github.com/23Skidoo/raw-strings-qq"; + description = "Raw string literals for Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix b/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix index b9e61e32edde..2bff24cd3abe 100644 --- a/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix +++ b/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix @@ -10,6 +10,7 @@ cabal.mkDerivation (self: { isExecutable = true; buildDepends = [ cabalMacosx reactiveBanana wx wxcore ]; configureFlags = "-f-buildExamples"; + jailbreak = true; meta = { homepage = "http://haskell.org/haskellwiki/Reactive-banana"; description = "Examples for the reactive-banana library, using wxHaskell"; diff --git a/pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix b/pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix deleted file mode 100644 index b5b7068da01d..000000000000 --- a/pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "regex-base"; - version = "0.72.0.2"; - sha256 = "38a4901b942fea646a422d52c52ef14eec4d6561c258b3c54cd96a8a354141ee"; - meta = { - homepage = "http://sourceforge.net/projects/lazy-regex"; - description = "Replaces/Enhances Text.Regex"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/regex-base/0.93.1.nix b/pkgs/development/libraries/haskell/regex-base/0.93.1.nix deleted file mode 100644 index 5aa971ac3478..000000000000 --- a/pkgs/development/libraries/haskell/regex-base/0.93.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl }: - -cabal.mkDerivation (self: { - pname = "regex-base"; - version = "0.93.1"; - sha256 = "24a0e76ab308517a53d2525e18744d9058835626ed4005599ecd8dd4e07f3bef"; - buildDepends = [ mtl ]; - meta = { - homepage = "http://sourceforge.net/projects/lazy-regex"; - description = "Replaces/Enhances Text.Regex"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/regex-base/0.93.2.nix b/pkgs/development/libraries/haskell/regex-base/default.nix index 2a99cc96c25d..2a99cc96c25d 100644 --- a/pkgs/development/libraries/haskell/regex-base/0.93.2.nix +++ b/pkgs/development/libraries/haskell/regex-base/default.nix diff --git a/pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix b/pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix deleted file mode 100644 index 306d603a9cb5..000000000000 --- a/pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, regexBase, regexPosix }: - -cabal.mkDerivation (self: { - pname = "regex-compat"; - version = "0.71.0.1"; - sha256 = "904552f7d690686b2602f37494827d09b09fc0a8a2565522b61847bec8d1de8d"; - buildDepends = [ regexBase regexPosix ]; - meta = { - homepage = "http://sourceforge.net/projects/lazy-regex"; - description = "Replaces/Enhances Text.Regex"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/regex-compat/0.92.nix b/pkgs/development/libraries/haskell/regex-compat/0.92.nix deleted file mode 100644 index 91dda463e6d0..000000000000 --- a/pkgs/development/libraries/haskell/regex-compat/0.92.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, regexBase, regexPosix }: - -cabal.mkDerivation (self: { - pname = "regex-compat"; - version = "0.92"; - sha256 = "430d251bd704071fca1e38c9b250543f00d4e370382ed552ac3d7407d4f27936"; - buildDepends = [ regexBase regexPosix ]; - meta = { - homepage = "http://sourceforge.net/projects/lazy-regex"; - description = "Replaces/Enhances Text.Regex"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix b/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix deleted file mode 100644 index 7fddc11a672a..000000000000 --- a/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, regexBase, regexPosix }: - -cabal.mkDerivation (self: { - pname = "regex-compat"; - version = "0.93.1"; - sha256 = "1zlsx7a2iz5gmgrwzr6w5fz6s4ayab5bm71xlq28r3iph3vp80zf"; - buildDepends = [ regexBase regexPosix ]; - meta = { - homepage = "http://sourceforge.net/projects/lazy-regex"; - description = "Replaces/Enhances Text.Regex"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/regex-compat/0.95.1.nix b/pkgs/development/libraries/haskell/regex-compat/default.nix index 83dffb381fcd..83dffb381fcd 100644 --- a/pkgs/development/libraries/haskell/regex-compat/0.95.1.nix +++ b/pkgs/development/libraries/haskell/regex-compat/default.nix diff --git a/pkgs/development/libraries/haskell/regex-posix/0.72.0.3.nix b/pkgs/development/libraries/haskell/regex-posix/0.72.0.3.nix deleted file mode 100644 index 893e36677011..000000000000 --- a/pkgs/development/libraries/haskell/regex-posix/0.72.0.3.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, regexBase }: - -cabal.mkDerivation (self: { - pname = "regex-posix"; - version = "0.72.0.3"; - sha256 = "327ab87f3d4f5315a9414331eb382b8b997de8836d577c3f7d232c574606feb1"; - buildDepends = [ regexBase ]; - meta = { - homepage = "http://sourceforge.net/projects/lazy-regex"; - description = "Replaces/Enhances Text.Regex"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/regex-posix/0.94.1.nix b/pkgs/development/libraries/haskell/regex-posix/0.94.1.nix deleted file mode 100644 index ec4bdaab4319..000000000000 --- a/pkgs/development/libraries/haskell/regex-posix/0.94.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, regexBase }: - -cabal.mkDerivation (self: { - pname = "regex-posix"; - version = "0.94.1"; - sha256 = "63e76de0610d35f1b576ae65a25a38e04e758ed64b9b3512de95bdffd649485c"; - buildDepends = [ regexBase ]; - meta = { - homepage = "http://sourceforge.net/projects/lazy-regex"; - description = "Replaces/Enhances Text.Regex"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix b/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix deleted file mode 100644 index 20f2dd714140..000000000000 --- a/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, regexBase }: - -cabal.mkDerivation (self: { - pname = "regex-posix"; - version = "0.94.2"; - sha256 = "ea0c1ed0ab49ade4dba1eea7a42197652ccb18b7a98c4040e37ba11d26f33067"; - buildDepends = [ regexBase ]; - meta = { - homepage = "http://sourceforge.net/projects/lazy-regex"; - description = "Replaces/Enhances Text.Regex"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/regex-posix/0.94.4.nix b/pkgs/development/libraries/haskell/regex-posix/0.94.4.nix deleted file mode 100644 index 49923bf2d6c1..000000000000 --- a/pkgs/development/libraries/haskell/regex-posix/0.94.4.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, regexBase }: - -cabal.mkDerivation (self: { - pname = "regex-posix"; - version = "0.94.4"; - sha256 = "1ykirysvz9ganm2k7fmrppklsgh0h35mjfsi9g1icv43pqpr6ldw"; - buildDepends = [ regexBase ]; - meta = { - homepage = "http://sourceforge.net/projects/lazy-regex"; - description = "Replaces/Enhances Text.Regex"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/regex-posix/0.95.1.nix b/pkgs/development/libraries/haskell/regex-posix/0.95.1.nix deleted file mode 100644 index 0bcc6d260525..000000000000 --- a/pkgs/development/libraries/haskell/regex-posix/0.95.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, regexBase }: - -cabal.mkDerivation (self: { - pname = "regex-posix"; - version = "0.95.1"; - sha256 = "02pgxwbgz738kpdmsg18xs6kmq6my5hqd9cl4rm7cg2v39di9vbl"; - buildDepends = [ regexBase ]; - meta = { - homepage = "http://sourceforge.net/projects/lazy-regex"; - description = "Replaces/Enhances Text.Regex"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/regex-posix/0.95.2.nix b/pkgs/development/libraries/haskell/regex-posix/default.nix index 292edc235639..292edc235639 100644 --- a/pkgs/development/libraries/haskell/regex-posix/0.95.2.nix +++ b/pkgs/development/libraries/haskell/regex-posix/default.nix diff --git a/pkgs/development/libraries/haskell/rematch/default.nix b/pkgs/development/libraries/haskell/rematch/default.nix new file mode 100644 index 000000000000..0ef47cde9045 --- /dev/null +++ b/pkgs/development/libraries/haskell/rematch/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, hspec, HUnit }: + +cabal.mkDerivation (self: { + pname = "rematch"; + version = "0.2.0.0"; + sha256 = "0law4al9hzn9qljfm8rwgmb15pzpcs8i44v1l6279977q0lxx5pr"; + testDepends = [ hspec HUnit ]; + doCheck = false; + meta = { + description = "A simple api for matchers"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/resource-pool/default.nix b/pkgs/development/libraries/haskell/resource-pool/default.nix index bbd6f1b782ee..cb43b927c2e8 100644 --- a/pkgs/development/libraries/haskell/resource-pool/default.nix +++ b/pkgs/development/libraries/haskell/resource-pool/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "resource-pool"; - version = "0.2.3.0"; - sha256 = "15igbvnqs6ig1k30l3jngyi60ay7k15mwgza5smv8zbpx86vb1mh"; + version = "0.2.3.1"; + sha256 = "02fpw5jfzcdhijx8mfpb6j4c8sxl36f04i2nx3cbivh9yhbgqr92"; buildDepends = [ hashable monadControl stm time transformers transformersBase vector ]; diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix index 81a7c9d28a20..affeff4d1b0e 100644 --- a/pkgs/development/libraries/haskell/resourcet/default.nix +++ b/pkgs/development/libraries/haskell/resourcet/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "resourcet"; - version = "1.1.2.3"; - sha256 = "1n1z1q3k8lg3wqdkrmcfl9mvlx1p81gkh5j911w1006rnm8r87im"; + version = "1.1.3"; + sha256 = "0qai73ip4fwghd27c9ddpbl4kw338xhp17n9r5gh8v9awxc5ppap"; buildDepends = [ exceptions liftedBase mmorph monadControl mtl transformers transformersBase diff --git a/pkgs/development/libraries/haskell/rest-core/default.nix b/pkgs/development/libraries/haskell/rest-core/default.nix index 1da4832cdc31..bea8d8655e15 100644 --- a/pkgs/development/libraries/haskell/rest-core/default.nix +++ b/pkgs/development/libraries/haskell/rest-core/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "rest-core"; - version = "0.33"; - sha256 = "05m8cvkm0nsi1yixk0dj5j6nvzzzs07i0pmyaj0ww6v5vkmcgmfb"; + version = "0.33.1.1"; + sha256 = "0sdknsh2y2lag4n59vdvwq95h0x32s3nvr1alddnpfpw6fsd7m2s"; buildDepends = [ aeson aesonUtils either errors fclabels hxt hxtPickleUtils jsonSchema mtl multipart random restStringmap restTypes safe split diff --git a/pkgs/development/libraries/haskell/rest-gen/default.nix b/pkgs/development/libraries/haskell/rest-gen/default.nix index 229c3f5c7bfd..f876f25c2d98 100644 --- a/pkgs/development/libraries/haskell/rest-gen/default.nix +++ b/pkgs/development/libraries/haskell/rest-gen/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "rest-gen"; - version = "0.16"; - sha256 = "05qpj4zhihmb2cdgw3vx7ir0mqga1w6qidc4vwdjq6dy8d81sdmc"; + version = "0.16.1.2"; + sha256 = "1w2b4b52qa57z5kd9w7czimimzydwbh3qdz7cr22p69ihism38c9"; buildDepends = [ aeson blazeHtml Cabal codeBuilder fclabels filepath hashable haskellSrcExts hslogger HStringTemplate hxt jsonSchema restCore diff --git a/pkgs/development/libraries/haskell/rest-types/default.nix b/pkgs/development/libraries/haskell/rest-types/default.nix index 65e221b43cd9..23a112730baa 100644 --- a/pkgs/development/libraries/haskell/rest-types/default.nix +++ b/pkgs/development/libraries/haskell/rest-types/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "rest-types"; - version = "1.11"; - sha256 = "16ki6sqi88s8ykwdhsk0xparvv90zzj4jidk0mhsd2wi3l4w1l6i"; + version = "1.11.1"; + sha256 = "1dqjch3h3hv4s1v0wkbd4spn26f068bqpsz6mr0vdacdbhjwnigg"; buildDepends = [ aeson genericAeson hxt jsonSchema mtl regular regularXmlpickler restStringmap text uuid diff --git a/pkgs/development/libraries/haskell/rethinkdb/default.nix b/pkgs/development/libraries/haskell/rethinkdb/default.nix index affe39729f32..bcf4272ad7aa 100644 --- a/pkgs/development/libraries/haskell/rethinkdb/default.nix +++ b/pkgs/development/libraries/haskell/rethinkdb/default.nix @@ -1,24 +1,25 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, aeson, attoparsec, dataDefault, mtl, network -, protocolBuffers, protocolBuffersDescriptor, text, time -, unorderedContainers, utf8String, vector +{ cabal, aeson, base64Bytestring, binary, dataDefault, doctest, mtl +, network, scientific, text, time, unorderedContainers, utf8String +, vector }: cabal.mkDerivation (self: { pname = "rethinkdb"; - version = "1.8.0.5"; - sha256 = "1s3mzbs0b2jdvs1gfdxb2fp2lw7978ja63411iz43yjd29d3pwzq"; + version = "1.15.2.1"; + sha256 = "017fq9mhqdw78hrnjm9n0nipi182361bxh1qzjpb8djc8azx49b5"; buildDepends = [ - aeson attoparsec dataDefault mtl network protocolBuffers - protocolBuffersDescriptor text time unorderedContainers utf8String - vector + aeson base64Bytestring binary dataDefault mtl network scientific + text time unorderedContainers utf8String vector ]; + testDepends = [ doctest ]; + jailbreak = true; + doCheck = false; meta = { homepage = "http://github.com/atnnn/haskell-rethinkdb"; - description = "RethinkDB driver for Haskell"; + description = "A driver for RethinkDB 1.15"; license = self.stdenv.lib.licenses.asl20; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/sbv/default.nix b/pkgs/development/libraries/haskell/sbv/default.nix index 0a21f13dbc2a..088fc38d0f8c 100644 --- a/pkgs/development/libraries/haskell/sbv/default.nix +++ b/pkgs/development/libraries/haskell/sbv/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "sbv"; - version = "3.1"; - sha256 = "19rn5ynqqjz0zw7gcb0y4clzxxnmq56a2qx369mz283455l86h5j"; + version = "3.2"; + sha256 = "0hqibdl2bhxyc0akfy97j41mkp9s39ahdz25nyrzpjj89b9hzzi0"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/scientific/0.3.3.1.nix b/pkgs/development/libraries/haskell/scientific/0.3.3.2.nix index 1eb719ed1171..e43b6734d774 100644 --- a/pkgs/development/libraries/haskell/scientific/0.3.3.1.nix +++ b/pkgs/development/libraries/haskell/scientific/0.3.3.2.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "scientific"; - version = "0.3.3.1"; - sha256 = "1p1g9cj827hb1zsn6zip7vgiwrw2vxfali6qvhccd6j1p12drw0b"; + version = "0.3.3.2"; + sha256 = "17lxxjfbmmlr0ppkrhw42lqhcg42nk21n5l2x9i6b87g8qr37jii"; buildDepends = [ deepseq hashable text ]; testDepends = [ QuickCheck smallcheck tasty tastyAntXml tastyHunit tastyQuickcheck diff --git a/pkgs/development/libraries/haskell/sdl2/default.nix b/pkgs/development/libraries/haskell/sdl2/default.nix index d60a69ae9281..2e3eeba018dd 100644 --- a/pkgs/development/libraries/haskell/sdl2/default.nix +++ b/pkgs/development/libraries/haskell/sdl2/default.nix @@ -1,13 +1,15 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, SDL2 }: +{ cabal, SDL2, transformers }: cabal.mkDerivation (self: { pname = "sdl2"; - version = "1.1.1"; - sha256 = "0kqs211ksp25pgkzy9rz8zcfi3pqrbl1zmbjh1vx8r2lkf79z1y5"; + version = "1.3.0"; + sha256 = "0fi9kjf12qlp64r2pxwc1k9241s23j6xm0dmwdsc18y8f6acvqxa"; + buildDepends = [ transformers ]; extraLibraries = [ SDL2 ]; pkgconfigDepends = [ SDL2 ]; + noHaddock = true; meta = { description = "Low-level bindings to SDL2"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/securemem/default.nix b/pkgs/development/libraries/haskell/securemem/default.nix index fddba1934571..c03a92d0fd31 100644 --- a/pkgs/development/libraries/haskell/securemem/default.nix +++ b/pkgs/development/libraries/haskell/securemem/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "securemem"; - version = "0.1.3"; - sha256 = "1kycpk73vh8wwxzn35hmv36vwsc9r4g53f2fy6bn21q9gfm2r90j"; + version = "0.1.4"; + sha256 = "1wdbcnyaarrixfvz79mcyqmfnn9h5zsmrrsa64xj8650ppyaxi48"; buildDepends = [ byteable ]; meta = { homepage = "http://github.com/vincenthz/hs-securemem"; diff --git a/pkgs/development/libraries/haskell/semigroups/default.nix b/pkgs/development/libraries/haskell/semigroups/default.nix index 54df1ebe66b5..23e48c02fd08 100644 --- a/pkgs/development/libraries/haskell/semigroups/default.nix +++ b/pkgs/development/libraries/haskell/semigroups/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "semigroups"; - version = "0.15.3"; - sha256 = "0bzrab88vvgv3bnbcc7gyc05b9h9zz1pnc6bv2d2mpg653pm97k3"; + version = "0.15.4"; + sha256 = "17jr1wz44avcdws3pxh8jif9myylx7d1gwfv0paiq6yb6r089y68"; buildDepends = [ deepseq hashable nats text unorderedContainers ]; meta = { homepage = "http://github.com/ekmett/semigroups/"; diff --git a/pkgs/development/libraries/haskell/serialport/default.nix b/pkgs/development/libraries/haskell/serialport/default.nix new file mode 100644 index 000000000000..5e733f82ca19 --- /dev/null +++ b/pkgs/development/libraries/haskell/serialport/default.nix @@ -0,0 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, HUnit }: + +cabal.mkDerivation (self: { + pname = "serialport"; + version = "0.4.7"; + sha256 = "1z2drw7ighyws72wqms015n5hy0zxbrphdca7ldn34pz28122z07"; + testDepends = [ HUnit ]; + doCheck = false; + meta = { + homepage = "https://github.com/jputcu/serialport"; + description = "Cross platform serial port library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/shake/default.nix b/pkgs/development/libraries/haskell/shake/default.nix index 42dbb2079c89..1983f80b60d7 100644 --- a/pkgs/development/libraries/haskell/shake/default.nix +++ b/pkgs/development/libraries/haskell/shake/default.nix @@ -1,25 +1,26 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, binary, deepseq, filepath, hashable, QuickCheck, random -, time, transformers, unorderedContainers, utf8String +{ cabal, binary, deepseq, extra, filepath, hashable, jsFlot +, jsJquery, QuickCheck, random, time, transformers +, unorderedContainers, utf8String }: cabal.mkDerivation (self: { pname = "shake"; - version = "0.13.4"; - sha256 = "05w78d2hdw13f3i876iq1b5j137p4vr759da273p8k6alk4mi3am"; + version = "0.14.1"; + sha256 = "101sdrp3whp1yvx4n8zri0rjkagq3hkmpd2xpkidzj9ssaz4x4fa"; isLibrary = true; isExecutable = true; buildDepends = [ - binary deepseq filepath hashable random time transformers - unorderedContainers utf8String + binary deepseq extra filepath hashable jsFlot jsJquery random time + transformers unorderedContainers utf8String ]; testDepends = [ - binary deepseq filepath hashable QuickCheck random time - transformers unorderedContainers utf8String + binary deepseq extra filepath hashable jsFlot jsJquery QuickCheck + random time transformers unorderedContainers utf8String ]; meta = { - homepage = "https://github.com/ndmitchell/shake#readme"; + homepage = "http://www.shakebuild.com/"; description = "Build system library, like Make, but more accurate dependencies"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix index 251eb07d8aa6..5c6b804810df 100644 --- a/pkgs/development/libraries/haskell/shakespeare/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "shakespeare"; - version = "2.0.1.1"; - sha256 = "0xddm8xby19323d9bcd196b1ninlvfkv5b93w1da23m7w0hy509p"; + version = "2.0.2.1"; + sha256 = "1s73nlkccfg3wl0qfx6f7q3afiakdhzh5xksnfhsg5hjhx80qhza"; buildDepends = [ aeson blazeHtml blazeMarkup exceptions parsec systemFileio systemFilepath text time transformers diff --git a/pkgs/development/libraries/haskell/shell-conduit/default.nix b/pkgs/development/libraries/haskell/shell-conduit/default.nix index 23ce15222545..409c572603ed 100644 --- a/pkgs/development/libraries/haskell/shell-conduit/default.nix +++ b/pkgs/development/libraries/haskell/shell-conduit/default.nix @@ -1,16 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, conduit, conduitExtra, controlMonadLoop, filepath +{ cabal, async, conduit, conduitExtra, controlMonadLoop, filepath , monadControl, monadsTf, resourcet, semigroups, split, text, these , transformers, transformersBase }: cabal.mkDerivation (self: { pname = "shell-conduit"; - version = "3.0"; - sha256 = "07x920j52zjqh3lpfam5f1nhsgqbcgz458dbrwxsmsn3cnqf2qd6"; + version = "4.4"; + sha256 = "023cqmj5c45d65rcv07m2w1w2b5lhlfhzwv18fxxl3v8s6gr3wb8"; buildDepends = [ - conduit conduitExtra controlMonadLoop filepath monadControl + async conduit conduitExtra controlMonadLoop filepath monadControl monadsTf resourcet semigroups split text these transformers transformersBase ]; diff --git a/pkgs/development/libraries/haskell/shelly/0.15.4.1.nix b/pkgs/development/libraries/haskell/shelly/0.15.4.1.nix deleted file mode 100644 index 2840ba736f5b..000000000000 --- a/pkgs/development/libraries/haskell/shelly/0.15.4.1.nix +++ /dev/null @@ -1,24 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, hspec, HUnit, mtl, systemFileio, systemFilepath, text -, time, unixCompat -}: - -cabal.mkDerivation (self: { - pname = "shelly"; - version = "0.15.4.1"; - sha256 = "12m11s22izz0ny1syb1ykp2hi9n240myf0nhapvn8jx1fgf5iyck"; - buildDepends = [ - mtl systemFileio systemFilepath text time unixCompat - ]; - testDepends = [ - hspec HUnit mtl systemFileio systemFilepath text time unixCompat - ]; - meta = { - homepage = "https://github.com/yesodweb/Shelly.hs"; - description = "shell-like (systems) programming in Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix index 6deaa209dc87..10659c72266f 100644 --- a/pkgs/development/libraries/haskell/shelly/default.nix +++ b/pkgs/development/libraries/haskell/shelly/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "shelly"; - version = "1.5.5"; - sha256 = "1865f5z5wm2qf3ccws9jy8ps7n8slkmfgn0l2m9apja3q2jajqb1"; + version = "1.5.6"; + sha256 = "1vnn0s3i3n76286b7rc70qjzgkmfwllpg7w4zin627v6466pfpzl"; buildDepends = [ async enclosedExceptions exceptions liftedAsync liftedBase monadControl mtl systemFileio systemFilepath text time transformers diff --git a/pkgs/development/libraries/haskell/simple-sendfile/default.nix b/pkgs/development/libraries/haskell/simple-sendfile/default.nix index fc41353d3575..d291aba96308 100644 --- a/pkgs/development/libraries/haskell/simple-sendfile/default.nix +++ b/pkgs/development/libraries/haskell/simple-sendfile/default.nix @@ -4,9 +4,9 @@ cabal.mkDerivation (self: { pname = "simple-sendfile"; - version = "0.2.17"; - sha256 = "1xxzw916v5zwn8i5i61z6p1wa2rm95sa6ry9z3yg2b2ybpyagw5g"; - buildDepends = [ network resourcet ]; + version = "0.2.18"; + sha256 = "1dc7c4bkcwzfhbm982svi9j6dzxxf0z6pjkdrs23m9bc9g8aly49"; + buildDepends = [ network ]; testDepends = [ conduit conduitExtra hspec HUnit network resourcet ]; diff --git a/pkgs/development/libraries/haskell/smtps-gmail/default.nix b/pkgs/development/libraries/haskell/smtps-gmail/default.nix index fbab444444b9..75cb227cd858 100644 --- a/pkgs/development/libraries/haskell/smtps-gmail/default.nix +++ b/pkgs/development/libraries/haskell/smtps-gmail/default.nix @@ -1,16 +1,18 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, base64Bytestring, cprngAes, dataDefault, filepath -, mimeMail, network, stringsearch, text, tls +{ cabal, attoparsec, base64Bytestring, conduit, conduitExtra +, cprngAes, dataDefault, filepath, mimeMail, network, resourcet +, stringsearch, text, tls, transformers }: cabal.mkDerivation (self: { pname = "smtps-gmail"; - version = "1.2.1"; - sha256 = "04sancbfbbszajgb1jp613qp43qxvzz9b14c0v3sgfva7fdhaw9q"; + version = "1.3.0"; + sha256 = "0vbykxqrw0gdhxwgchvgvkxwh7pwyrc1wvl26x5wqlkmkalmkvv9"; buildDepends = [ - base64Bytestring cprngAes dataDefault filepath mimeMail network - stringsearch text tls + attoparsec base64Bytestring conduit conduitExtra cprngAes + dataDefault filepath mimeMail network resourcet stringsearch text + tls transformers ]; meta = { homepage = "https://github.com/enzoh/smtps-gmail"; diff --git a/pkgs/development/libraries/haskell/snap-cors/default.nix b/pkgs/development/libraries/haskell/snap-cors/default.nix index be9147d6c765..f9d043dff806 100644 --- a/pkgs/development/libraries/haskell/snap-cors/default.nix +++ b/pkgs/development/libraries/haskell/snap-cors/default.nix @@ -1,16 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, attoparsec, caseInsensitive, hashable, network, snap, text -, transformers, unorderedContainers +{ cabal, attoparsec, caseInsensitive, hashable, network, networkUri +, snap, text, transformers, unorderedContainers }: cabal.mkDerivation (self: { pname = "snap-cors"; - version = "1.2.5.1"; - sha256 = "1fijby8iryhcjdb7n95hdbjff4rnqyfx5s9x01nbmd9lxrch12dr"; + version = "1.2.6"; + sha256 = "1ihqqpzymgc25shz4dvjfh8lzjczqdqg6ril39d5p7rkn4a8y2d8"; buildDepends = [ - attoparsec caseInsensitive hashable network snap text transformers - unorderedContainers + attoparsec caseInsensitive hashable network networkUri snap text + transformers unorderedContainers ]; meta = { homepage = "http://github.com/ocharles/snap-cors"; diff --git a/pkgs/development/libraries/haskell/snap-error-collector/default.nix b/pkgs/development/libraries/haskell/snap-error-collector/default.nix new file mode 100644 index 000000000000..b9b6376394a6 --- /dev/null +++ b/pkgs/development/libraries/haskell/snap-error-collector/default.nix @@ -0,0 +1,22 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, async, MonadCatchIOTransformers, monadLoops, snap, stm +, time, transformers +}: + +cabal.mkDerivation (self: { + pname = "snap-error-collector"; + version = "1.1.0"; + sha256 = "06pqlv93qgibl5gbrp7p1vg6x421nrpkvhazbrcipdpbawrsgaj2"; + buildDepends = [ + async MonadCatchIOTransformers monadLoops snap stm time + transformers + ]; + meta = { + homepage = "http://github.com/ocharles/snap-error-collector"; + description = "Collect errors in batches and dispatch them"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/snap-web-routes/default.nix b/pkgs/development/libraries/haskell/snap-web-routes/default.nix index 71b8c3c49da3..a8252a4f3f02 100644 --- a/pkgs/development/libraries/haskell/snap-web-routes/default.nix +++ b/pkgs/development/libraries/haskell/snap-web-routes/default.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { version = "0.5.0.0"; sha256 = "1ml0b759k2n9bd2x4akz4dfyk8ywnpgrdlcymng4vhjxbzngnniv"; buildDepends = [ heist mtl snap snapCore text webRoutes xmlhtml ]; + jailbreak = true; meta = { homepage = "https://github.com/lukerandall/snap-web-routes"; description = "Type safe URLs for Snap"; diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix index 0fca2136663f..410e9db6f92a 100644 --- a/pkgs/development/libraries/haskell/snap/core.nix +++ b/pkgs/development/libraries/haskell/snap/core.nix @@ -17,6 +17,7 @@ cabal.mkDerivation (self: { HUnit MonadCatchIOTransformers mtl random regexPosix text time unixCompat unorderedContainers vector zlibEnum ]; + jailbreak = true; meta = { homepage = "http://snapframework.com/"; description = "Snap: A Haskell Web Framework (core interfaces and types)"; diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix index d2278f329f42..cacb0c039456 100644 --- a/pkgs/development/libraries/haskell/snap/server.nix +++ b/pkgs/development/libraries/haskell/snap/server.nix @@ -17,7 +17,7 @@ cabal.mkDerivation (self: { ]; configureFlags = "-fopenssl"; patchPhase = '' - sed -i -e 's|HsOpenSSL >= .*|HsOpenSSL|' snap-server.cabal + sed -i -e 's|text *>= .*,|text,|' -e 's|HsOpenSSL >= .*|HsOpenSSL|' -e 's|network.*2.6,|network,|' snap-server.cabal ''; meta = { homepage = "http://snapframework.com/"; diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix index aab1a7bf89be..14769499c21d 100644 --- a/pkgs/development/libraries/haskell/snap/snap.nix +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "snap"; - version = "0.13.2.9"; - sha256 = "1iv29mbbm1xjfrq3ys7zpskjpcwx6k08zrnrs1yj62yg5aa6bnim"; + version = "0.13.3.1"; + sha256 = "016azx90gxjkhmncpnqvqrwsk9kbkz315z088wm7y67s97lpnr9c"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -21,7 +21,9 @@ cabal.mkDerivation (self: { snapCore snapServer stm syb text time transformers unorderedContainers vector vectorAlgorithms xmlhtml ]; - jailbreak = true; + patchPhase = '' + sed -i -e 's|lens *>=.*|lens|' snap.cabal + ''; meta = { homepage = "http://snapframework.com/"; description = "Top-level package for the Snap Web Framework"; diff --git a/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix b/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix index 0d483a65ad71..96a64488f2a4 100644 --- a/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix +++ b/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { version = "0.2.6.1"; sha256 = "0wlawnsxisslqzspa29swsdmncgx04z3rd1bhwx73mx5pksykw60"; buildDepends = [ acidState snap text ]; + jailbreak = true; meta = { homepage = "https://github.com/mightybyte/snaplet-acid-state"; description = "acid-state snaplet for Snap Framework"; diff --git a/pkgs/development/libraries/haskell/snaplet-postgresql-simple/default.nix b/pkgs/development/libraries/haskell/snaplet-postgresql-simple/default.nix index 5238fee7b9f6..7745fa5ddbe1 100644 --- a/pkgs/development/libraries/haskell/snaplet-postgresql-simple/default.nix +++ b/pkgs/development/libraries/haskell/snaplet-postgresql-simple/default.nix @@ -1,6 +1,6 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, clientsession, configurator, errors +{ cabal, clientsession, configurator, errors, lens , MonadCatchIOTransformers, mtl, postgresqlSimple , resourcePoolCatchio, snap, text, transformers , unorderedContainers @@ -8,10 +8,10 @@ cabal.mkDerivation (self: { pname = "snaplet-postgresql-simple"; - version = "0.5"; - sha256 = "0pzn0lg1slrllrrx1n9s1kp1pmq2ahrkjypcwnnld8zxzvz4g5jm"; + version = "0.6"; + sha256 = "042mpyj84d089pr2qjix9fvzfj4ir74kjkdx3jg84jwn602lhzi6"; buildDepends = [ - clientsession configurator errors MonadCatchIOTransformers mtl + clientsession configurator errors lens MonadCatchIOTransformers mtl postgresqlSimple resourcePoolCatchio snap text transformers unorderedContainers ]; @@ -20,7 +20,5 @@ cabal.mkDerivation (self: { description = "postgresql-simple snaplet for the Snap Framework"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/snaplet-redis/default.nix b/pkgs/development/libraries/haskell/snaplet-redis/default.nix index d6bfcd260ca3..1b7a7b10b213 100644 --- a/pkgs/development/libraries/haskell/snaplet-redis/default.nix +++ b/pkgs/development/libraries/haskell/snaplet-redis/default.nix @@ -1,15 +1,15 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, configurator, hedis, lens, mtl, network, snap +{ cabal, configurator, hedis, lens, mtl, network, snap, text , transformers }: cabal.mkDerivation (self: { pname = "snaplet-redis"; - version = "0.1.3.3"; - sha256 = "17w2b9cnri45m535hyszb1fickhhglid3zy5a4bbljmnwvi4y08l"; + version = "0.1.4.1"; + sha256 = "0vrsvmgrds7l4q88q7gmy1bz36z5ba45rib2vm5z6v2cf0x22qz2"; buildDepends = [ - configurator hedis lens mtl network snap transformers + configurator hedis lens mtl network snap text transformers ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/snaplet-stripe/default.nix b/pkgs/development/libraries/haskell/snaplet-stripe/default.nix index 1024b2ac4ee3..6f0f3d5de06a 100644 --- a/pkgs/development/libraries/haskell/snaplet-stripe/default.nix +++ b/pkgs/development/libraries/haskell/snaplet-stripe/default.nix @@ -1,16 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, configurator, heist, mtl, snap, stripe, text, textFormat -, transformers, xmlhtml +{ cabal, configurator, heist, lensFamilyCore, mtl, snap, stripe +, text, textFormat, transformers, xmlhtml }: cabal.mkDerivation (self: { pname = "snaplet-stripe"; - version = "0.2.0"; - sha256 = "01ichbwk31zfjq5rc09scz0j4ir6b7jnppdvmm8ilvkj7bl442xs"; + version = "0.3.0"; + sha256 = "0j85vzfmw6skag8rfww4gsg1lyfc7qbxiqhmwbsh4vfjiagrc9wp"; buildDepends = [ - configurator heist mtl snap stripe text textFormat transformers - xmlhtml + configurator heist lensFamilyCore mtl snap stripe text textFormat + transformers xmlhtml ]; jailbreak = true; meta = { @@ -18,5 +18,6 @@ cabal.mkDerivation (self: { description = "Stripe snaplet for the Snap Framework"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/sodium/default.nix b/pkgs/development/libraries/haskell/sodium/default.nix index f27c5d0e51c0..0dbd0647a864 100644 --- a/pkgs/development/libraries/haskell/sodium/default.nix +++ b/pkgs/development/libraries/haskell/sodium/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "sodium"; - version = "0.10.0.2"; - sha256 = "0rm1blh0br4gdnqb6ixvql6nrxzcjxjkwp4lmqmsisa2b68gbzqy"; + version = "0.11.0.2"; + sha256 = "0m3ig6nqkw0m6xh6ijgr2w06i4ydyfwx7rsbkrrxflichadm9r2g"; buildDepends = [ mtl ]; meta = { description = "Sodium Reactive Programming (FRP) System"; diff --git a/pkgs/development/libraries/haskell/split/0.2.1.1.nix b/pkgs/development/libraries/haskell/split/0.2.1.1.nix deleted file mode 100644 index 5dfcdf6de0cc..000000000000 --- a/pkgs/development/libraries/haskell/split/0.2.1.1.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, QuickCheck }: - -cabal.mkDerivation (self: { - pname = "split"; - version = "0.2.1.1"; - sha256 = "1zzp4dwf846s74a4lhw2gf4awsk9iblhl5zcg2zccgv1lr4w2dmz"; - testDepends = [ QuickCheck ]; - meta = { - description = "Combinator library for splitting lists"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/srcloc/default.nix b/pkgs/development/libraries/haskell/srcloc/default.nix index 087871bbc53e..8d30afc77add 100644 --- a/pkgs/development/libraries/haskell/srcloc/default.nix +++ b/pkgs/development/libraries/haskell/srcloc/default.nix @@ -4,10 +4,10 @@ cabal.mkDerivation (self: { pname = "srcloc"; - version = "0.4.0"; - sha256 = "00af562n4m3nwlhl86x8rx7hhpnhwaijin61wk574pp47bh2jg0k"; + version = "0.4.1"; + sha256 = "0cd15d9dval7zi4li48yd6a3jk62861d4qxwvhxz4a98m63519cz"; meta = { - homepage = "http://www.eecs.harvard.edu/~mainland/"; + homepage = "http://www.cs.drexel.edu/~mainland/"; description = "Data types for managing source code locations"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/state-plus/default.nix b/pkgs/development/libraries/haskell/state-plus/default.nix new file mode 100644 index 000000000000..d35da29273e1 --- /dev/null +++ b/pkgs/development/libraries/haskell/state-plus/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, checkers, mtl, QuickCheck }: + +cabal.mkDerivation (self: { + pname = "state-plus"; + version = "0.1.1"; + sha256 = "09zc4rymzvpq12mgl59h069m418qr43myhsj8dlf62g477wyx4g1"; + buildDepends = [ mtl ]; + testDepends = [ checkers mtl QuickCheck ]; + meta = { + description = "MonadPlus for StateT"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/stm-containers/default.nix b/pkgs/development/libraries/haskell/stm-containers/default.nix index 91105712a6a4..052c913a98e6 100644 --- a/pkgs/development/libraries/haskell/stm-containers/default.nix +++ b/pkgs/development/libraries/haskell/stm-containers/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "stm-containers"; - version = "0.1.3"; - sha256 = "0ir2b6y1sqr0i68j0fqmwyysk7x9z18n84dbjppyjzzidcsrkar0"; + version = "0.1.4"; + sha256 = "15h7qxxbr1ifkvmxsj30k0v3hp83m04iq25bvi3jmagvvk5hv5bj"; buildDepends = [ basePrelude focus hashable lochTh placeholders primitive ]; diff --git a/pkgs/development/libraries/haskell/stm-delay/default.nix b/pkgs/development/libraries/haskell/stm-delay/default.nix new file mode 100644 index 000000000000..ee2500db8d3d --- /dev/null +++ b/pkgs/development/libraries/haskell/stm-delay/default.nix @@ -0,0 +1,18 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, stm }: + +cabal.mkDerivation (self: { + pname = "stm-delay"; + version = "0.1.1.1"; + sha256 = "0cla21v89gcvmr1iwzibq13v1yq02xg4h6k9l6kcprj7mhd5hcmi"; + buildDepends = [ stm ]; + testDepends = [ stm ]; + meta = { + homepage = "https://github.com/joeyadams/haskell-stm-delay"; + description = "Updatable one-shot timer polled with STM"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/stm/2.1.1.2.nix b/pkgs/development/libraries/haskell/stm/2.1.1.2.nix deleted file mode 100644 index d69827bbb69d..000000000000 --- a/pkgs/development/libraries/haskell/stm/2.1.1.2.nix +++ /dev/null @@ -1,15 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "stm"; - version = "2.1.1.2"; - sha256 = "68d550067ae180373142c51f3fa14bdf0a1516310aee9a37e28f9ac7cf3b8c6d"; - meta = { - description = "Software Transactional Memory"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/stm/2.1.2.1.nix b/pkgs/development/libraries/haskell/stm/2.1.2.1.nix deleted file mode 100644 index ab99000b7e74..000000000000 --- a/pkgs/development/libraries/haskell/stm/2.1.2.1.nix +++ /dev/null @@ -1,15 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "stm"; - version = "2.1.2.1"; - sha256 = "0d7d8babd2f07c726909030461e1f9b3aaf02dc809fd5e1c0509a67d23b784b8"; - meta = { - description = "Software Transactional Memory"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/streaming-commons/default.nix b/pkgs/development/libraries/haskell/streaming-commons/default.nix index f42634473bb2..ba9b8794eb53 100644 --- a/pkgs/development/libraries/haskell/streaming-commons/default.nix +++ b/pkgs/development/libraries/haskell/streaming-commons/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "streaming-commons"; - version = "0.1.5"; - sha256 = "1gmr8yv6r87y1826rc3y3i8darwsaisqpbhjx1bn3m070g9fhqlp"; + version = "0.1.6"; + sha256 = "0wapq6h7c0c3wciqfjz7j4z8kgf7wdr1s0al493jcrdyfy5k43dh"; buildDepends = [ blazeBuilder network random stm text transformers zlib ]; diff --git a/pkgs/development/libraries/haskell/string-conversions/default.nix b/pkgs/development/libraries/haskell/string-conversions/default.nix index 5176cad03cd3..9225bacbfe30 100644 --- a/pkgs/development/libraries/haskell/string-conversions/default.nix +++ b/pkgs/development/libraries/haskell/string-conversions/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "string-conversions"; - version = "0.3.0.2"; - sha256 = "0jcm0vv0ll74zfc7s2l8qpqpbfnkv7ir9d1kg68m6b0f9sq0dgng"; + version = "0.3.0.3"; + sha256 = "0n2ifim9n5vm305r989lh5xlbd8qc6byip2nfavf6gd2bcscs84p"; buildDepends = [ text utf8String ]; meta = { description = "Simplifies dealing with different types for strings"; diff --git a/pkgs/development/libraries/haskell/stylish-haskell/default.nix b/pkgs/development/libraries/haskell/stylish-haskell/default.nix index 9cc43e142a7e..d739d11c17ab 100644 --- a/pkgs/development/libraries/haskell/stylish-haskell/default.nix +++ b/pkgs/development/libraries/haskell/stylish-haskell/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "stylish-haskell"; - version = "0.5.10.2"; - sha256 = "1r1vwn334jdsk6szynzz7w9jpbfqs3zs7wzlpwfigsyyrjy3bn3q"; + version = "0.5.11.0"; + sha256 = "1174gs5a2n6l2flyb2x93yiq7viwb52kbadw6jya6041xrpblckz"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/syb/0.3.3.nix b/pkgs/development/libraries/haskell/syb/0.3.3.nix deleted file mode 100644 index 967bc75e5221..000000000000 --- a/pkgs/development/libraries/haskell/syb/0.3.3.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "syb"; - version = "0.3.3"; - sha256 = "0jskxbnzariq2ahcymvjrp4bhl9cpflc1nh51whdl9axcrd5c901"; - meta = { - homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB"; - description = "Scrap Your Boilerplate"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/syb/0.3.6.1.nix b/pkgs/development/libraries/haskell/syb/0.3.6.1.nix deleted file mode 100644 index de9da0478892..000000000000 --- a/pkgs/development/libraries/haskell/syb/0.3.6.1.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "syb"; - version = "0.3.6.1"; - sha256 = "1xyz6ahyvairzb5n1mrmryzrxrkd4m8ywxa6r6x5nqm2xa7zqv34"; - meta = { - homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB"; - description = "Scrap Your Boilerplate"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/syb/0.3.7.nix b/pkgs/development/libraries/haskell/syb/0.3.7.nix deleted file mode 100644 index 72f883e52432..000000000000 --- a/pkgs/development/libraries/haskell/syb/0.3.7.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "syb"; - version = "0.3.7"; - sha256 = "0wysa348icabskih3k9xbmwaaw34hg58lpz3w3075942h650bx2r"; - meta = { - homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB"; - description = "Scrap Your Boilerplate"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/syb/0.3.nix b/pkgs/development/libraries/haskell/syb/0.3.nix deleted file mode 100644 index 355fd3671e41..000000000000 --- a/pkgs/development/libraries/haskell/syb/0.3.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "syb"; - version = "0.3"; - sha256 = "1gnqw76zy7xvlabhbyk8hml88hpz2igf7b3mz2ic091f77qkkch7"; - meta = { - homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB"; - description = "Scrap Your Boilerplate"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/symbol/default.nix b/pkgs/development/libraries/haskell/symbol/default.nix index 4451b2c3bdb4..46a2979d775d 100644 --- a/pkgs/development/libraries/haskell/symbol/default.nix +++ b/pkgs/development/libraries/haskell/symbol/default.nix @@ -1,12 +1,12 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, deepseq, syb }: +{ cabal, deepseq }: cabal.mkDerivation (self: { pname = "symbol"; - version = "0.2.1"; - sha256 = "1g9rpz40v6wnmp671wvbbinzvvxkibdnny4i6ai28pn3sxa6fgkj"; - buildDepends = [ deepseq syb ]; + version = "0.2.4"; + sha256 = "0cc8kdm68pirb0s7n46v0yvw5b718qf7qip40jkg5q3c3xsafx6h"; + buildDepends = [ deepseq ]; jailbreak = true; meta = { homepage = "http://www.cs.drexel.edu/~mainland/"; diff --git a/pkgs/development/libraries/haskell/system-fileio/default.nix b/pkgs/development/libraries/haskell/system-fileio/default.nix index 9853c4abd08d..98048f503b78 100644 --- a/pkgs/development/libraries/haskell/system-fileio/default.nix +++ b/pkgs/development/libraries/haskell/system-fileio/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "system-fileio"; - version = "0.3.14"; - sha256 = "1x5cricx2n1wwvdad4i3q8s3gb28a129v3kkj9rn9803xh43zh29"; + version = "0.3.15"; + sha256 = "06cnr3hzw8xd75529nfqajgb5xy5i4ddqybgjw1v1nwpq04mhihi"; buildDepends = [ systemFilepath text time ]; testDepends = [ chell systemFilepath temporary text time transformers diff --git a/pkgs/development/libraries/haskell/tagged/default.nix b/pkgs/development/libraries/haskell/tagged/default.nix index 903eccdfed3c..10585eb3412b 100644 --- a/pkgs/development/libraries/haskell/tagged/default.nix +++ b/pkgs/development/libraries/haskell/tagged/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tagged"; - version = "0.7.2"; - sha256 = "06w7gss2vqnly2zijf0hkq60jx13nsxwsjsnyfbn25r4f6gjsnq5"; + version = "0.7.3"; + sha256 = "016bzws7w09xhyyqiz56ahlf7zhagihn370ga0083fgv172lym7b"; meta = { homepage = "http://github.com/ekmett/tagged"; description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments"; diff --git a/pkgs/development/libraries/haskell/tagsoup/default.nix b/pkgs/development/libraries/haskell/tagsoup/default.nix index 35d004445fc2..40ddd46ba547 100644 --- a/pkgs/development/libraries/haskell/tagsoup/default.nix +++ b/pkgs/development/libraries/haskell/tagsoup/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tagsoup"; - version = "0.13.2"; - sha256 = "0q9r4vsdlib6dm0b387zg089b1410f0nspzigx2awqi2xqfsi0xz"; + version = "0.13.3"; + sha256 = "13b6zy6346r3cxhaivys84fnxarg8wbv7r2znazfjdkqil8n5a1j"; isLibrary = true; isExecutable = true; buildDepends = [ text ]; diff --git a/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix b/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix index 1fa30cf368d7..8f6b953e9546 100644 --- a/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix +++ b/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix @@ -1,15 +1,15 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, genericDeriving, mtl, reducers, stm, tagged, tasty -, transformers, xml +{ cabal, genericDeriving, mtl, stm, tagged, tasty, transformers +, xml }: cabal.mkDerivation (self: { pname = "tasty-ant-xml"; - version = "1.0.0.10"; - sha256 = "1qjpgbsj8fh5w3l9zap3wsrf1cp8bmsl1adcxy5z2j8yi3rsljii"; + version = "1.0.1"; + sha256 = "1wb9lm9rbk46g9cm2lpcrzh59zpcy270p824agg61bj1xb9jymsc"; buildDepends = [ - genericDeriving mtl reducers stm tagged tasty transformers xml + genericDeriving mtl stm tagged tasty transformers xml ]; meta = { homepage = "http://github.com/ocharles/tasty-ant-xml"; diff --git a/pkgs/development/libraries/haskell/tasty-hspec/default.nix b/pkgs/development/libraries/haskell/tasty-hspec/default.nix index 6afcdd67b948..6f8ff2e9add9 100644 --- a/pkgs/development/libraries/haskell/tasty-hspec/default.nix +++ b/pkgs/development/libraries/haskell/tasty-hspec/default.nix @@ -17,5 +17,6 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/tasty-hunit/default.nix b/pkgs/development/libraries/haskell/tasty-hunit/default.nix index 067e60818183..edbdf8b9cd65 100644 --- a/pkgs/development/libraries/haskell/tasty-hunit/default.nix +++ b/pkgs/development/libraries/haskell/tasty-hunit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tasty-hunit"; - version = "0.9"; - sha256 = "1ivp9h34cdrahqy8i0y10fa0mqxa947dpbwvhr46sjja053asjxc"; + version = "0.9.0.1"; + sha256 = "0rhdjb4fakcbkz4cvmmf679zad9h5yr31i1g9xm1338p6xd4vwcb"; buildDepends = [ tasty ]; meta = { homepage = "http://documentup.com/feuerbach/tasty"; diff --git a/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix b/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix index f4af3a190972..8692daaa4828 100644 --- a/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix +++ b/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix @@ -1,13 +1,15 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, QuickCheck, tagged, tasty }: +{ cabal, pcreLight, QuickCheck, tagged, tasty, tastyHunit }: cabal.mkDerivation (self: { pname = "tasty-quickcheck"; - version = "0.8.1"; - sha256 = "1diqc5dmddrfc6i0zqkmlnnhsv8paqy2fdmbx8484qa4ylk5r6bs"; + version = "0.8.3.1"; + sha256 = "0shmph95vys2l0ik3k615aigcvfas0f2079c1lbw73d0wrm841gn"; buildDepends = [ QuickCheck tagged tasty ]; + testDepends = [ pcreLight tasty tastyHunit ]; meta = { + homepage = "http://documentup.com/feuerbach/tasty"; description = "QuickCheck support for the Tasty test framework"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/tasty-smallcheck/default.nix b/pkgs/development/libraries/haskell/tasty-smallcheck/default.nix index ea1a37d5e9b5..9bdf0c52895e 100644 --- a/pkgs/development/libraries/haskell/tasty-smallcheck/default.nix +++ b/pkgs/development/libraries/haskell/tasty-smallcheck/default.nix @@ -4,11 +4,11 @@ cabal.mkDerivation (self: { pname = "tasty-smallcheck"; - version = "0.8"; - sha256 = "0c4ccmhql118j4dlvy5cmrnma454b0rdv1wq2ds6xhpdhx20h1br"; + version = "0.8.0.1"; + sha256 = "0yckfbz8na8ccyw2911i3a4hd3fdncclk3ng5343hs5cylw6y4sm"; buildDepends = [ async smallcheck tagged tasty ]; meta = { - homepage = "https://github.com/feuerbach/tasty"; + homepage = "http://documentup.com/feuerbach/tasty"; description = "SmallCheck support for the Tasty test framework"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/tasty-th/default.nix b/pkgs/development/libraries/haskell/tasty-th/default.nix index 2679c57cff07..98d62036e835 100644 --- a/pkgs/development/libraries/haskell/tasty-th/default.nix +++ b/pkgs/development/libraries/haskell/tasty-th/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tasty-th"; - version = "0.1.2"; - sha256 = "1x3kixv0hnb7icigz2kfq959pivdc4jaaalvdgn8dlyqzkvfjzx4"; + version = "0.1.3"; + sha256 = "1fl5pagm9bdqvp7v54ilkr91m667rxw1jifwfdhrikr938aqrzx3"; buildDepends = [ languageHaskellExtract tasty ]; meta = { homepage = "http://github.com/bennofs/tasty-th"; diff --git a/pkgs/development/libraries/haskell/tasty/default.nix b/pkgs/development/libraries/haskell/tasty/default.nix index b06233771140..e99c8672c864 100644 --- a/pkgs/development/libraries/haskell/tasty/default.nix +++ b/pkgs/development/libraries/haskell/tasty/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "tasty"; - version = "0.10"; - sha256 = "1va9rj6k0v8mdkqbgjvn5rcaf2zp785ihfr4b5j87xzaiw32m1l6"; + version = "0.10.1"; + sha256 = "1l8ah7018f3m8css56h59fcly1jhanm5wd0hbgm8mg6pn7rrjml5"; buildDepends = [ ansiTerminal async deepseq mtl optparseApplicative regexTdfaRc stm tagged time unboundedDelays diff --git a/pkgs/development/libraries/haskell/template/default.nix b/pkgs/development/libraries/haskell/template/default.nix index f51ae4f0a3d1..4eceef5729d4 100644 --- a/pkgs/development/libraries/haskell/template/default.nix +++ b/pkgs/development/libraries/haskell/template/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "template"; - version = "0.2.0.9"; - sha256 = "0i1xq6nj240gddbd8d5m42gzix16k81wqmirpy5a4fssnkpwjqnb"; + version = "0.2.0.10"; + sha256 = "10mcnhi2rdflmv79z0359nn5sylifvk9ih38xnjqqby6n4hs7mcg"; buildDepends = [ mtl text ]; meta = { description = "Simple string substitution"; diff --git a/pkgs/development/libraries/haskell/terminal-size/default.nix b/pkgs/development/libraries/haskell/terminal-size/default.nix index 4387ceb423ea..d143a66713a0 100644 --- a/pkgs/development/libraries/haskell/terminal-size/default.nix +++ b/pkgs/development/libraries/haskell/terminal-size/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "terminal-size"; - version = "0.2.1.0"; - sha256 = "0d41af1is3vdb1kgd8dk82fags86bgs67vkbzpdhjdwa3aimsxgn"; + version = "0.3.0"; + sha256 = "0g8v08d20hlfsah9dlgv2v2pzj0m4dva0zp6zi4jrkxjhg6vi7bw"; meta = { description = "Get terminal window height and width"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/terminfo/0.3.2.6.nix b/pkgs/development/libraries/haskell/terminfo/0.3.2.6.nix deleted file mode 100644 index 6a065cb6e845..000000000000 --- a/pkgs/development/libraries/haskell/terminfo/0.3.2.6.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, ncurses }: - -cabal.mkDerivation (self: { - pname = "terminfo"; - version = "0.3.2.6"; - sha256 = "0ag81rwwwaanxdn9ccanvdi1qnh62vy8y2jbgp5bp95hhgqq887f"; - extraLibraries = [ ncurses ]; - meta = { - homepage = "http://code.haskell.org/terminfo"; - description = "Haskell bindings to the terminfo library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/terminfo/0.4.0.0.nix b/pkgs/development/libraries/haskell/terminfo/default.nix index 9bb59e14a1e6..9bb59e14a1e6 100644 --- a/pkgs/development/libraries/haskell/terminfo/0.4.0.0.nix +++ b/pkgs/development/libraries/haskell/terminfo/default.nix diff --git a/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix b/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix deleted file mode 100644 index 5b822c2418c8..000000000000 --- a/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, deepseq, extensibleExceptions, QuickCheck, random -, testFramework -}: - -cabal.mkDerivation (self: { - pname = "test-framework-quickcheck"; - version = "0.3.0"; - sha256 = "0g8sh3x3mhns03svccgbdbw8crzpzmahp1hr1fs6ag66fqr8p9mv"; - buildDepends = [ - deepseq extensibleExceptions QuickCheck random testFramework - ]; - meta = { - homepage = "http://batterseapower.github.com/test-framework/"; - description = "QuickCheck support for the test-framework package"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix b/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix index f53c68e5e7fb..a7881a7ebfce 100644 --- a/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix +++ b/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "test-framework-th-prime"; - version = "0.0.6"; - sha256 = "11fk7sk644ky8f22imrfqk8yx07050vy9szha0pnkkjk9i3bqfcq"; + version = "0.0.7"; + sha256 = "056d66jk7gn0ghsb75f2kpspws0gs1w9vnw0ywpq6kbskv992v0p"; buildDepends = [ cpphs haskellSrcExts testFramework ]; meta = { description = "Template Haskell for test framework"; diff --git a/pkgs/development/libraries/haskell/test-simple/default.nix b/pkgs/development/libraries/haskell/test-simple/default.nix new file mode 100644 index 000000000000..181c92147e3d --- /dev/null +++ b/pkgs/development/libraries/haskell/test-simple/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, executablePath, mtl, QuickCheck, statePlus }: + +cabal.mkDerivation (self: { + pname = "test-simple"; + version = "0.1.7"; + sha256 = "1p9y15vv23j1qn3shxl2wqb8skh0n53vrb39qv1nvff9bclxldka"; + buildDepends = [ mtl QuickCheck statePlus ]; + testDepends = [ executablePath mtl QuickCheck ]; + meta = { + description = "Simple Perl inspired testing"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/text/0.11.0.5.nix b/pkgs/development/libraries/haskell/text/0.11.0.5.nix deleted file mode 100644 index 5f63f68cfe76..000000000000 --- a/pkgs/development/libraries/haskell/text/0.11.0.5.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, deepseq }: - -cabal.mkDerivation (self: { - pname = "text"; - version = "0.11.0.5"; - sha256 = "1a5y2i7qrkyyvm112q44rhd7jbqxvfxssz2g5ngbx11yypl3hcdv"; - buildDepends = [ deepseq ]; - doCheck = false; - meta = { - homepage = "http://bitbucket.org/bos/text"; - description = "An efficient packed Unicode text type"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/text/0.11.0.6.nix b/pkgs/development/libraries/haskell/text/0.11.0.6.nix deleted file mode 100644 index c922db7e9597..000000000000 --- a/pkgs/development/libraries/haskell/text/0.11.0.6.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, deepseq }: - -cabal.mkDerivation (self: { - pname = "text"; - version = "0.11.0.6"; - sha256 = "103l1c8jfwpddsqzwj9jqh89vay8ax1znxqgjqprv2fvr7s0zvkp"; - buildDepends = [ deepseq ]; - doCheck = false; - meta = { - homepage = "http://bitbucket.org/bos/text"; - description = "An efficient packed Unicode text type"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/text/0.11.1.5.nix b/pkgs/development/libraries/haskell/text/0.11.1.5.nix deleted file mode 100644 index afaa25305a32..000000000000 --- a/pkgs/development/libraries/haskell/text/0.11.1.5.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, deepseq }: - -cabal.mkDerivation (self: { - pname = "text"; - version = "0.11.1.5"; - sha256 = "0fxxhw932gdvaqafsbw7dfzccc43hv92yhxppzp6jrg0npbyz04l"; - buildDepends = [ deepseq ]; - doCheck = false; - meta = { - homepage = "https://bitbucket.org/bos/text"; - description = "An efficient packed Unicode text type"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/text/0.11.2.0.nix b/pkgs/development/libraries/haskell/text/0.11.2.0.nix deleted file mode 100644 index f465f4c2afc5..000000000000 --- a/pkgs/development/libraries/haskell/text/0.11.2.0.nix +++ /dev/null @@ -1,24 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, deepseq, HUnit, QuickCheck, random, testFramework -, testFrameworkHunit, testFrameworkQuickcheck2 -}: - -cabal.mkDerivation (self: { - pname = "text"; - version = "0.11.2.0"; - sha256 = "1fx5302m41awzbms410x3gcixsck36rl7i1ma7pz6l5d1pmi538p"; - buildDepends = [ deepseq ]; - testDepends = [ - deepseq HUnit QuickCheck random testFramework testFrameworkHunit - testFrameworkQuickcheck2 - ]; - doCheck = false; - meta = { - homepage = "https://github.com/bos/text"; - description = "An efficient packed Unicode text type"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/text/0.11.3.1.nix b/pkgs/development/libraries/haskell/text/1.2.0.0.nix index 6cbed7c1268d..c588c65ba94a 100644 --- a/pkgs/development/libraries/haskell/text/0.11.3.1.nix +++ b/pkgs/development/libraries/haskell/text/1.2.0.0.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "text"; - version = "0.11.3.1"; - sha256 = "17smd4h8xiqlggwd3n4j2dszfqsjpjjbjgk9badhkmya8ykd9akn"; + version = "1.2.0.0"; + sha256 = "0c681yaqq68imj77qzy0j4iag8q90mhnnaalfwc08nzv8cr6c8z6"; buildDepends = [ deepseq ]; testDepends = [ deepseq HUnit QuickCheck random testFramework testFrameworkHunit @@ -19,6 +19,5 @@ cabal.mkDerivation (self: { description = "An efficient packed Unicode text type"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/th-lift-instances/default.nix b/pkgs/development/libraries/haskell/th-lift-instances/default.nix index 0ecd9d70989a..e81a8cf921e3 100644 --- a/pkgs/development/libraries/haskell/th-lift-instances/default.nix +++ b/pkgs/development/libraries/haskell/th-lift-instances/default.nix @@ -4,10 +4,11 @@ cabal.mkDerivation (self: { pname = "th-lift-instances"; - version = "0.1.3"; - sha256 = "0snqgcdkskwvrsw239j3xq84mwnf5x79kfsn495kprdc6yh3qdkx"; + version = "0.1.4"; + sha256 = "02sf7qn1rs33cdf1dl7vpwkhqzhmj8h3naw0ngh2kz05ymk2qng4"; buildDepends = [ text thLift vector ]; testDepends = [ doctest filepath QuickCheck text vector ]; + jailbreak = true; meta = { homepage = "http://github.com/bennofs/th-lift-instances/"; description = "Lift instances for template-haskell for common data types"; diff --git a/pkgs/development/libraries/haskell/th-orphans/default.nix b/pkgs/development/libraries/haskell/th-orphans/default.nix index d93be541aee5..8f6da0bd038c 100644 --- a/pkgs/development/libraries/haskell/th-orphans/default.nix +++ b/pkgs/development/libraries/haskell/th-orphans/default.nix @@ -1,12 +1,12 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, thLift }: +{ cabal, thLift, thReifyMany }: cabal.mkDerivation (self: { pname = "th-orphans"; - version = "0.8.1"; - sha256 = "1glf1zkiip18l0qdy3856ag7ksbxzd11dzdyq00qrz87kck5y58w"; - buildDepends = [ thLift ]; + version = "0.8.2"; + sha256 = "19d4ls2plxmn5n9c99503mvi99ffp6y6zxi564zf6cdfgw8v73fy"; + buildDepends = [ thLift thReifyMany ]; jailbreak = true; meta = { description = "Orphan instances for TH datatypes"; diff --git a/pkgs/development/libraries/haskell/th-reify-many/default.nix b/pkgs/development/libraries/haskell/th-reify-many/default.nix new file mode 100644 index 000000000000..940f8c8c29d7 --- /dev/null +++ b/pkgs/development/libraries/haskell/th-reify-many/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, mtl, safe, thExpandSyns }: + +cabal.mkDerivation (self: { + pname = "th-reify-many"; + version = "0.1.2"; + sha256 = "1r7ran4vi2mrhcr6qil89cni6ci3dgm775lfw5ciml3gz1948vz9"; + buildDepends = [ mtl safe thExpandSyns ]; + meta = { + homepage = "http://github.com/mgsloan/th-reify-many"; + description = "Recurseively reify template haskell datatype info"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/thread-local-storage/default.nix b/pkgs/development/libraries/haskell/thread-local-storage/default.nix new file mode 100644 index 000000000000..5405f903e1de --- /dev/null +++ b/pkgs/development/libraries/haskell/thread-local-storage/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, atomicPrimops }: + +cabal.mkDerivation (self: { + pname = "thread-local-storage"; + version = "0.1.0.3"; + sha256 = "0ka6xrxzsw2z95qcc4v2hh4ldb22zkd5s62lns3v1853g4dw7k3l"; + testDepends = [ atomicPrimops ]; + doCheck = false; + meta = { + description = "Several options for thread-local-storage (TLS) in Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/threepenny-gui/default.nix b/pkgs/development/libraries/haskell/threepenny-gui/default.nix index fad37db7c9c3..5586c28079b9 100644 --- a/pkgs/development/libraries/haskell/threepenny-gui/default.nix +++ b/pkgs/development/libraries/haskell/threepenny-gui/default.nix @@ -1,7 +1,7 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, aeson, attoparsecEnumerator, dataDefault, deepseq -, filepath, hashable, MonadCatchIOTransformers, network, safe +, filepath, hashable, MonadCatchIOTransformers, networkUri, safe , snapCore, snapServer, stm, text, time, transformers , unorderedContainers, utf8String, vault, websockets , websocketsSnap @@ -9,15 +9,15 @@ cabal.mkDerivation (self: { pname = "threepenny-gui"; - version = "0.4.2.0"; - sha256 = "1746l90h9xkwnwxvfqsr93nax7ihv8lwc4kz203v13rrwckr7m8h"; + version = "0.5.0.0"; + sha256 = "0rr826k6p2hbp66qr12sci6km40krbi7lbs293r11jxi0ivj5drd"; isLibrary = true; isExecutable = true; buildDepends = [ aeson attoparsecEnumerator dataDefault deepseq filepath hashable - MonadCatchIOTransformers network safe snapCore snapServer stm text - time transformers unorderedContainers utf8String vault websockets - websocketsSnap + MonadCatchIOTransformers networkUri safe snapCore snapServer stm + text time transformers unorderedContainers utf8String vault + websockets websocketsSnap ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/thyme/default.nix b/pkgs/development/libraries/haskell/thyme/default.nix index 187637011264..25118d1ff648 100644 --- a/pkgs/development/libraries/haskell/thyme/default.nix +++ b/pkgs/development/libraries/haskell/thyme/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "thyme"; - version = "0.3.5.2"; - sha256 = "1vb5qn9m88y9738d9znim5lprb8z10am5yjaksdjl151li8apd6x"; + version = "0.3.5.4"; + sha256 = "00qsd0ig1zjj7lni7xw5xaxk8w2zwq8jbii8admigrfqsj5qcnam"; buildDepends = [ aeson attoparsec deepseq mtl profunctors QuickCheck random text time vector vectorSpace vectorThUnbox diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix index 45cb3c693944..d9b82d137693 100644 --- a/pkgs/development/libraries/haskell/tls/default.nix +++ b/pkgs/development/libraries/haskell/tls/default.nix @@ -1,26 +1,26 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, asn1Encoding, asn1Types, byteable, cereal, cipherAes -, cipherDes, cipherRc4, cprngAes, cryptoCipherTypes, cryptohash -, cryptoNumbers, cryptoPubkey, cryptoPubkeyTypes, cryptoRandom -, dataDefaultClass, mtl, network, QuickCheck, testFramework -, testFrameworkQuickcheck2, time, x509, x509Store, x509Validation +{ cabal, asn1Encoding, asn1Types, async, byteable, cereal +, cipherAes, cipherDes, cipherRc4, cprngAes, cryptoCipherTypes +, cryptohash, cryptoNumbers, cryptoPubkey, cryptoPubkeyTypes +, cryptoRandom, dataDefaultClass, hourglass, mtl, network +, QuickCheck, tasty, tastyQuickcheck, transformers, x509, x509Store +, x509Validation }: cabal.mkDerivation (self: { pname = "tls"; - version = "1.2.9"; - sha256 = "1cwhwxpsxx9x5hv2c66d3yvbs84lrgaxmaz18skidmhqhs4i0sjy"; + version = "1.2.13"; + sha256 = "1djjscmyn3wcnlzz1r0clz2nxa2y23rlyjk30xjsdp0m1sq0vdc3"; buildDepends = [ - asn1Encoding asn1Types byteable cereal cipherAes cipherDes + asn1Encoding asn1Types async byteable cereal cipherAes cipherDes cipherRc4 cryptoCipherTypes cryptohash cryptoNumbers cryptoPubkey - cryptoPubkeyTypes cryptoRandom dataDefaultClass mtl network x509 - x509Store x509Validation + cryptoPubkeyTypes cryptoRandom dataDefaultClass mtl network + transformers x509 x509Store x509Validation ]; testDepends = [ - cereal cprngAes cryptoPubkey cryptoRandom dataDefaultClass mtl - QuickCheck testFramework testFrameworkQuickcheck2 time x509 - x509Validation + cereal cprngAes cryptoPubkey cryptoRandom dataDefaultClass + hourglass mtl QuickCheck tasty tastyQuickcheck x509 x509Validation ]; doCheck = false; meta = { diff --git a/pkgs/development/libraries/haskell/tostring/default.nix b/pkgs/development/libraries/haskell/tostring/default.nix index 825361354d2a..8b6623d46396 100644 --- a/pkgs/development/libraries/haskell/tostring/default.nix +++ b/pkgs/development/libraries/haskell/tostring/default.nix @@ -1,12 +1,12 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, text, utf8String }: +{ cabal, caseInsensitive, text, utf8String }: cabal.mkDerivation (self: { pname = "tostring"; - version = "0.2.0.2"; - sha256 = "0gjc1576cb4cil55l2jki3y4zp8z6b1m04rf68f2fbc619wji5k6"; - buildDepends = [ text utf8String ]; + version = "0.2.1"; + sha256 = "0lvfvjs1q6hndbchij3zn1xi6vb1v53r379jvyc2m92sqqcfnylw"; + buildDepends = [ caseInsensitive text utf8String ]; meta = { description = "The ToString class"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/transformers/0.2.2.0.nix b/pkgs/development/libraries/haskell/transformers/0.2.2.0.nix deleted file mode 100644 index cb3dd611ef36..000000000000 --- a/pkgs/development/libraries/haskell/transformers/0.2.2.0.nix +++ /dev/null @@ -1,15 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "transformers"; - version = "0.2.2.0"; - sha256 = "1nkazxy2p0w5ad76vg1lc4l0nla1kdqjdf9pymjgk75dpiyijbdz"; - meta = { - description = "Concrete functor and monad transformers"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/traverse-with-class/default.nix b/pkgs/development/libraries/haskell/traverse-with-class/default.nix index 50d5c61dd098..2ec410dc0a4d 100644 --- a/pkgs/development/libraries/haskell/traverse-with-class/default.nix +++ b/pkgs/development/libraries/haskell/traverse-with-class/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "traverse-with-class"; - version = "0.1.1.1"; - sha256 = "0agdgnibv8q65av2fkr2qm0air8zqmygwpkl30wmay5mqqknzxiq"; + version = "0.2.0.3"; + sha256 = "0snms19w3n9ni1wmf4ikwpp298nc6qk6phrjxi5g023ihqqdvr6g"; buildDepends = [ transformers ]; meta = { description = "Generic applicative traversals"; diff --git a/pkgs/development/libraries/haskell/trivia/default.nix b/pkgs/development/libraries/haskell/trivia/default.nix new file mode 100644 index 000000000000..b32653032b54 --- /dev/null +++ b/pkgs/development/libraries/haskell/trivia/default.nix @@ -0,0 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, comonad, distributive }: + +cabal.mkDerivation (self: { + pname = "trivia"; + version = "0.0"; + sha256 = "03xmzjqwk6492jmmbq6066ymsxb0wk0pmyf0c5f018nfps0g3i78"; + buildDepends = [ comonad distributive ]; + meta = { + homepage = "https://github.com/fumieval/trivia"; + description = "The trivial monad and comonad"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/twitter-conduit/default.nix b/pkgs/development/libraries/haskell/twitter-conduit/default.nix index 8720fb3f2beb..31542d43ebcb 100644 --- a/pkgs/development/libraries/haskell/twitter-conduit/default.nix +++ b/pkgs/development/libraries/haskell/twitter-conduit/default.nix @@ -3,27 +3,28 @@ { cabal, aeson, attoparsec, authenticateOauth, caseInsensitive , conduit, conduitExtra, dataDefault, doctest, filepath, hlint , hspec, httpClient, httpConduit, httpTypes, lens, lensAeson -, monadControl, monadLogger, networkUri, resourcet, text, time -, transformers, transformersBase, twitterTypes +, monadControl, networkUri, resourcet, text, time, transformers +, transformersBase, twitterTypes, twitterTypesLens, fetchurl }: cabal.mkDerivation (self: { pname = "twitter-conduit"; - version = "0.0.6"; - sha256 = "1vm4wa3cdmyz2m45rnwkrjcx8wajc89395c28rz1q12hf856970j"; + version = "0.1.0"; + sha256 = "1cymgp3wlswxn5qfdr442cqq2ak48b5w1zcsr67n2g5p1izadwji"; + editedCabalFile = "06z8dwvc17xhzpvb7cm0j6v63r5f3xirj36rr86bds3rw1zbnd0z"; isLibrary = true; isExecutable = true; buildDepends = [ aeson attoparsec authenticateOauth conduit conduitExtra dataDefault - httpClient httpConduit httpTypes lens lensAeson monadLogger - networkUri resourcet text time transformers twitterTypes + httpClient httpConduit httpTypes lens lensAeson networkUri + resourcet text time transformers twitterTypes twitterTypesLens ]; testDepends = [ aeson attoparsec authenticateOauth caseInsensitive conduit conduitExtra dataDefault doctest filepath hlint hspec httpClient - httpConduit httpTypes lens lensAeson monadControl monadLogger - networkUri resourcet text time transformers transformersBase - twitterTypes + httpConduit httpTypes lens lensAeson monadControl networkUri + resourcet text time transformers transformersBase twitterTypes + twitterTypesLens ]; meta = { homepage = "https://github.com/himura/twitter-conduit"; diff --git a/pkgs/development/libraries/haskell/twitter-types-lens/default.nix b/pkgs/development/libraries/haskell/twitter-types-lens/default.nix new file mode 100644 index 000000000000..85407fc00b28 --- /dev/null +++ b/pkgs/development/libraries/haskell/twitter-types-lens/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, lens, text, twitterTypes }: + +cabal.mkDerivation (self: { + pname = "twitter-types-lens"; + version = "0.6.0"; + sha256 = "0n2z7v2mcvj2czkszkp87sf7cv4zj82yccygs9ah5ax28dw823v3"; + buildDepends = [ lens text twitterTypes ]; + meta = { + homepage = "https://github.com/himura/twitter-types-lens"; + description = "Twitter JSON types (lens powered)"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/twitter-types/default.nix b/pkgs/development/libraries/haskell/twitter-types/default.nix index 4a3df6f1b9f8..9ed6a77ac2de 100644 --- a/pkgs/development/libraries/haskell/twitter-types/default.nix +++ b/pkgs/development/libraries/haskell/twitter-types/default.nix @@ -1,18 +1,18 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, aeson, attoparsec, filepath, httpTypes, HUnit -, testFramework, testFrameworkHunit, testFrameworkThPrime, text +{ cabal, aeson, attoparsec, filepath, HUnit, testFramework +, testFrameworkHunit, testFrameworkThPrime, text , unorderedContainers }: cabal.mkDerivation (self: { pname = "twitter-types"; - version = "0.5.0"; - sha256 = "0nnis96rki60ily7ydq155nawmhz7dn51d1d3hwikb1vz16ji47a"; - buildDepends = [ aeson httpTypes text unorderedContainers ]; + version = "0.6.0"; + sha256 = "0yvs57f3m0nq11qpxziazp9r95g1v231d2djmch9c5d8g22cjvdn"; + buildDepends = [ aeson text unorderedContainers ]; testDepends = [ - aeson attoparsec filepath httpTypes HUnit testFramework - testFrameworkHunit testFrameworkThPrime text unorderedContainers + aeson attoparsec filepath HUnit testFramework testFrameworkHunit + testFrameworkThPrime text unorderedContainers ]; doCheck = false; meta = { diff --git a/pkgs/development/libraries/haskell/typography-geometry/default.nix b/pkgs/development/libraries/haskell/typography-geometry/default.nix new file mode 100644 index 000000000000..c0b5b5fb1ab9 --- /dev/null +++ b/pkgs/development/libraries/haskell/typography-geometry/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, parallel, polynomialsBernstein, vector }: + +cabal.mkDerivation (self: { + pname = "typography-geometry"; + version = "1.0.0"; + sha256 = "1vvqch3pdwymjbmir7b208qyzdzljsw1gf8icmzw5pi3vn6wkihf"; + buildDepends = [ parallel polynomialsBernstein vector ]; + meta = { + description = "Drawings for printed text documents"; + license = "GPL"; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ jpbernardy ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/unbound-generics/default.nix b/pkgs/development/libraries/haskell/unbound-generics/default.nix new file mode 100644 index 000000000000..602b28d0aa66 --- /dev/null +++ b/pkgs/development/libraries/haskell/unbound-generics/default.nix @@ -0,0 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, contravariant, mtl, tasty, tastyHunit, transformers }: + +cabal.mkDerivation (self: { + pname = "unbound-generics"; + version = "0.0.1"; + sha256 = "0iwg1292dpwl8icr8p4nyhns4n0r44q8wv4l22j6i9m61li68al1"; + buildDepends = [ contravariant mtl transformers ]; + testDepends = [ mtl tasty tastyHunit ]; + meta = { + homepage = "http://github.com/lambdageek/unbound-generics"; + description = "Reimplementation of Unbound using GHC Generics"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/unification-fd/default.nix b/pkgs/development/libraries/haskell/unification-fd/default.nix new file mode 100644 index 000000000000..5489310e3320 --- /dev/null +++ b/pkgs/development/libraries/haskell/unification-fd/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, logict, mtl }: + +cabal.mkDerivation (self: { + pname = "unification-fd"; + version = "0.9.0"; + sha256 = "0fdnpcpcpjlxlwxpqlawwbgqhs1p9lrksy5ln5isyvr06hwqh7ki"; + buildDepends = [ logict mtl ]; + meta = { + homepage = "http://code.haskell.org/~wren/"; + description = "Simple generic unification algorithms"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/units/default.nix b/pkgs/development/libraries/haskell/units/default.nix index c5d5262750db..2024aacf7ff8 100644 --- a/pkgs/development/libraries/haskell/units/default.nix +++ b/pkgs/development/libraries/haskell/units/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "units"; - version = "2.1"; - sha256 = "1qrjc57j15ras0v43cpd7qhh9nzh9dbnkaik6s4c8aj8nkhgd8vs"; + version = "2.2"; + sha256 = "1hd7klv0h2rsq971rbghvgy2921bf0zxikdsl26qw08yb0zirvza"; buildDepends = [ mtl multimap parsec singletons syb thDesugar vectorSpace ]; @@ -16,7 +16,7 @@ cabal.mkDerivation (self: { thDesugar vectorSpace ]; meta = { - homepage = "http://www.cis.upenn.edu/~eir/packages/units"; + homepage = "https://github.com/goldfirere/units"; description = "A domain-specific type system for dimensional analysis"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/unix-time/default.nix b/pkgs/development/libraries/haskell/unix-time/default.nix index 60f0f21b292a..74bfb2927753 100644 --- a/pkgs/development/libraries/haskell/unix-time/default.nix +++ b/pkgs/development/libraries/haskell/unix-time/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "unix-time"; - version = "0.3.3"; - sha256 = "018wpr5d2kjv8syj97664sqh1v7ws1780qmlfxvrakj86z9k5i8x"; + version = "0.3.4"; + sha256 = "1bni03bzayg3vwj6mwcl4z41zixv8nida8jc3vkv41fr7mzb24g5"; buildDepends = [ binary ]; testDepends = [ doctest hspec QuickCheck time ]; meta = { diff --git a/pkgs/development/libraries/haskell/unordered-containers/0.2.3.0.nix b/pkgs/development/libraries/haskell/unordered-containers/0.2.3.0.nix deleted file mode 100644 index d7040ac611a3..000000000000 --- a/pkgs/development/libraries/haskell/unordered-containers/0.2.3.0.nix +++ /dev/null @@ -1,24 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, ChasingBottoms, deepseq, hashable, HUnit, QuickCheck -, testFramework, testFrameworkHunit, testFrameworkQuickcheck2 -}: - -cabal.mkDerivation (self: { - pname = "unordered-containers"; - version = "0.2.3.0"; - sha256 = "1vzgjr9jxdkmgq970ng9zi2j60awvx8iv1v6kzjlrkwzxx1a9dpd"; - buildDepends = [ deepseq hashable ]; - testDepends = [ - ChasingBottoms hashable HUnit QuickCheck testFramework - testFrameworkHunit testFrameworkQuickcheck2 - ]; - doCheck = false; - meta = { - homepage = "https://github.com/tibbe/unordered-containers"; - description = "Efficient hashing-based container types"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/unordered-containers/0.2.4.0.nix b/pkgs/development/libraries/haskell/unordered-containers/0.2.4.0.nix deleted file mode 100644 index 9cb06b029e66..000000000000 --- a/pkgs/development/libraries/haskell/unordered-containers/0.2.4.0.nix +++ /dev/null @@ -1,24 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, ChasingBottoms, deepseq, hashable, HUnit, QuickCheck -, testFramework, testFrameworkHunit, testFrameworkQuickcheck2 -}: - -cabal.mkDerivation (self: { - pname = "unordered-containers"; - version = "0.2.4.0"; - sha256 = "1x6djgmawzq8i8spib729pdlpnxyi4gz4p08lyn6jhfqjq6fpsil"; - buildDepends = [ deepseq hashable ]; - testDepends = [ - ChasingBottoms hashable HUnit QuickCheck testFramework - testFrameworkHunit testFrameworkQuickcheck2 - ]; - doCheck = false; - meta = { - homepage = "https://github.com/tibbe/unordered-containers"; - description = "Efficient hashing-based container types"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/unordered-containers/0.2.5.0.nix b/pkgs/development/libraries/haskell/unordered-containers/default.nix index 70f00b68d422..07f1b8beb974 100644 --- a/pkgs/development/libraries/haskell/unordered-containers/0.2.5.0.nix +++ b/pkgs/development/libraries/haskell/unordered-containers/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "unordered-containers"; - version = "0.2.5.0"; - sha256 = "0y85a9zg77h05c5ajchvfazg84ksvyi92r6bbmh09qzlf7mlb4bj"; + version = "0.2.5.1"; + sha256 = "06l1xv7vhpxly75saxdrbc6p2zlgz1az278arfkz4rgawfnphn3f"; buildDepends = [ deepseq hashable ]; testDepends = [ ChasingBottoms hashable HUnit QuickCheck testFramework diff --git a/pkgs/development/libraries/haskell/uri-encode/default.nix b/pkgs/development/libraries/haskell/uri-encode/default.nix index 91afed019cbe..d6e445ebd4e6 100644 --- a/pkgs/development/libraries/haskell/uri-encode/default.nix +++ b/pkgs/development/libraries/haskell/uri-encode/default.nix @@ -9,6 +9,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ networkUri text utf8String ]; + jailbreak = true; meta = { description = "Unicode aware uri-encoding"; license = "unknown"; diff --git a/pkgs/development/libraries/haskell/uri/default.nix b/pkgs/development/libraries/haskell/uri/default.nix index 11276f2bc4ae..633818d9518d 100644 --- a/pkgs/development/libraries/haskell/uri/default.nix +++ b/pkgs/development/libraries/haskell/uri/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "uri"; - version = "0.1.6.2"; - sha256 = "0f2ms8awm4x7pw8ms6in0mxspqmnhv8bxas0947rkrzc5m9k0h3s"; + version = "0.1.6.3"; + sha256 = "1dhmrn4mq3ia0iv3y2k5pw71a6677q3vdqqf2w4b3aksi6wna49j"; buildDepends = [ parsec safe utf8String ]; meta = { homepage = "http://gitorious.org/uri"; diff --git a/pkgs/development/libraries/haskell/urlencoded/default.nix b/pkgs/development/libraries/haskell/urlencoded/default.nix index 74ae443f8a6c..e60af0e3152d 100644 --- a/pkgs/development/libraries/haskell/urlencoded/default.nix +++ b/pkgs/development/libraries/haskell/urlencoded/default.nix @@ -14,5 +14,6 @@ cabal.mkDerivation (self: { description = "Generate or process x-www-urlencoded data"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/vado/default.nix b/pkgs/development/libraries/haskell/vado/default.nix index fc95d494e368..87f0ed126fa4 100644 --- a/pkgs/development/libraries/haskell/vado/default.nix +++ b/pkgs/development/libraries/haskell/vado/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "vado"; - version = "0.0.2"; - sha256 = "15kdqgpdy501g4hpldq44s7qgh4xchl6acnr95i5fj8ky4vgwfi0"; + version = "0.0.3"; + sha256 = "1s6fb19p3lc6g13ryh7bmxciv62v8m0ihvzrymsj0nn6jghiys5f"; isLibrary = true; isExecutable = true; buildDepends = [ attoparsec filepath text ]; diff --git a/pkgs/development/libraries/haskell/validation/default.nix b/pkgs/development/libraries/haskell/validation/default.nix new file mode 100644 index 000000000000..2ae7e9c66e52 --- /dev/null +++ b/pkgs/development/libraries/haskell/validation/default.nix @@ -0,0 +1,21 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, bifunctors, doctest, filepath, lens, QuickCheck +, semigroupoids, semigroups, transformers +}: + +cabal.mkDerivation (self: { + pname = "validation"; + version = "0.4.1"; + sha256 = "05mws9gqlqjmzcw6d3kclrh9dybchhp61qsfwg77h31n44j7w0mh"; + buildDepends = [ + bifunctors lens semigroupoids semigroups transformers + ]; + testDepends = [ doctest filepath QuickCheck ]; + meta = { + homepage = "https://github.com/tonymorris/validation"; + description = "A data-type like Either but with an accumulating Applicative"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/vcswrapper/default.nix b/pkgs/development/libraries/haskell/vcswrapper/default.nix index 8c2653c66f5a..ca739b1d9230 100644 --- a/pkgs/development/libraries/haskell/vcswrapper/default.nix +++ b/pkgs/development/libraries/haskell/vcswrapper/default.nix @@ -9,6 +9,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ filepath hxt mtl parsec split text ]; + jailbreak = true; meta = { homepage = "https://github.com/forste/haskellVCSWrapper"; description = "Wrapper for source code management systems"; diff --git a/pkgs/development/libraries/haskell/vector/0.10.0.1.nix b/pkgs/development/libraries/haskell/vector/0.10.0.1.nix deleted file mode 100644 index 0f48fbecf063..000000000000 --- a/pkgs/development/libraries/haskell/vector/0.10.0.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, deepseq, primitive }: - -cabal.mkDerivation (self: { - pname = "vector"; - version = "0.10.0.1"; - sha256 = "1bq8am8qnpnsla315i21f1kikikalyz9ps1izxgpr9q1ic2lbsgc"; - buildDepends = [ deepseq primitive ]; - meta = { - homepage = "http://code.haskell.org/vector"; - description = "Efficient Arrays"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/vector/0.10.11.0.nix b/pkgs/development/libraries/haskell/vector/0.10.11.0.nix deleted file mode 100644 index e93160ff6d0e..000000000000 --- a/pkgs/development/libraries/haskell/vector/0.10.11.0.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, deepseq, primitive }: - -cabal.mkDerivation (self: { - pname = "vector"; - version = "0.10.11.0"; - sha256 = "0f5jks8q0287zgzlfg3x7akpahck6dm1c37hb8kk6qn51csx515j"; - buildDepends = [ deepseq primitive ]; - meta = { - homepage = "https://github.com/haskell/vector"; - description = "Efficient Arrays"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/vector/0.10.12.1.nix b/pkgs/development/libraries/haskell/vector/0.10.12.1.nix new file mode 100644 index 000000000000..e83a53b57a1d --- /dev/null +++ b/pkgs/development/libraries/haskell/vector/0.10.12.1.nix @@ -0,0 +1,23 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, deepseq, primitive, QuickCheck, random, testFramework +, testFrameworkQuickcheck2, transformers +}: + +cabal.mkDerivation (self: { + pname = "vector"; + version = "0.10.12.1"; + sha256 = "0m4m650yxv92dz8xgcjfkbhsl46hgnf02viwgdja5xmvg3aa8fcp"; + buildDepends = [ deepseq primitive ]; + testDepends = [ + QuickCheck random testFramework testFrameworkQuickcheck2 + transformers + ]; + configureFlags = "${self.stdenv.lib.optionalString self.stdenv.isi686 "--ghc-options=-msse2"}"; + meta = { + homepage = "https://github.com/haskell/vector"; + description = "Efficient Arrays"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/vector/0.10.9.3.nix b/pkgs/development/libraries/haskell/vector/0.10.9.3.nix index d07f27bee310..42796bea5481 100644 --- a/pkgs/development/libraries/haskell/vector/0.10.9.3.nix +++ b/pkgs/development/libraries/haskell/vector/0.10.9.3.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { version = "0.10.9.3"; sha256 = "08mlg0v7an6mm04skvxrgfndab0wikfs4glv7jj8ylxwc8959kdx"; buildDepends = [ deepseq primitive ]; + configureFlags = "${self.stdenv.lib.optionalString self.stdenv.isi686 "--ghc-options=-msse2"}"; meta = { homepage = "https://github.com/haskell/vector"; description = "Efficient Arrays"; diff --git a/pkgs/development/libraries/haskell/vk-aws-route53/default.nix b/pkgs/development/libraries/haskell/vk-aws-route53/default.nix new file mode 100644 index 000000000000..4d8188792acd --- /dev/null +++ b/pkgs/development/libraries/haskell/vk-aws-route53/default.nix @@ -0,0 +1,19 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aws, httpConduit, httpTypes, resourcet, text, time +, xmlConduit, xmlHamlet +}: + +cabal.mkDerivation (self: { + pname = "vk-aws-route53"; + version = "0.1.2"; + sha256 = "0sblvj89bb7vxgy09m88gcphqc9w2mpawg8kdz0r77y7db0vzb4x"; + buildDepends = [ + aws httpConduit httpTypes resourcet text time xmlConduit xmlHamlet + ]; + meta = { + description = "Amazon Route53 DNS service plugin for the aws package"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/vk-posix-pty/default.nix b/pkgs/development/libraries/haskell/vk-posix-pty/default.nix new file mode 100644 index 000000000000..533b9ae7215a --- /dev/null +++ b/pkgs/development/libraries/haskell/vk-posix-pty/default.nix @@ -0,0 +1,18 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal }: + +cabal.mkDerivation (self: { + pname = "vk-posix-pty"; + version = "0.2.0.2"; + sha256 = "0dp9kpn1qzfqykmyq20sg0snyk8zrqa2g8c5xp9rfp0zfgmh37dh"; + isLibrary = true; + isExecutable = true; + meta = { + homepage = "https://bitbucket.org/merijnv/posix-pty +https://github.com/proger/posix-pty/tree/fork"; + description = "Pseudo terminal interaction with subprocesses"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/vty-ui/default.nix b/pkgs/development/libraries/haskell/vty-ui/default.nix index e8775c7d112c..33f0b9069733 100644 --- a/pkgs/development/libraries/haskell/vty-ui/default.nix +++ b/pkgs/development/libraries/haskell/vty-ui/default.nix @@ -1,17 +1,18 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, filepath, mtl, QuickCheck, random, regexBase, stm, text -, time, vector, vty +{ cabal, dataDefault, filepath, mtl, QuickCheck, random, regexBase +, stm, text, time, vector, vty }: cabal.mkDerivation (self: { pname = "vty-ui"; - version = "1.7.1"; - sha256 = "1xgv2psbqcqpzgj1f1pis6hr7yvny8y9ajimllam7zsk6kbhngzz"; + version = "1.8"; + sha256 = "08jrcwml5g74mp4wy7kqp9jd5mfbxl04517v5354jiwn4dc77azm"; isLibrary = true; isExecutable = true; buildDepends = [ - filepath mtl QuickCheck random regexBase stm text time vector vty + dataDefault filepath mtl QuickCheck random regexBase stm text time + vector vty ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/vty/4.7.5.nix b/pkgs/development/libraries/haskell/vty/4.7.5.nix deleted file mode 100644 index 1eccdd58fefc..000000000000 --- a/pkgs/development/libraries/haskell/vty/4.7.5.nix +++ /dev/null @@ -1,29 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, Cabal, deepseq, mtl, parallel, parsec, QuickCheck, random -, stringQq, terminfo, utf8String, vector -}: - -cabal.mkDerivation (self: { - pname = "vty"; - version = "4.7.5"; - sha256 = "0ahd5qjszfw1xbl5jxhzfw31mny8hp8clw9qciv15xn442prvvpr"; - isLibrary = true; - isExecutable = true; - buildDepends = [ - deepseq mtl parallel parsec stringQq terminfo utf8String vector - ]; - testDepends = [ - Cabal deepseq mtl parallel parsec QuickCheck random terminfo - utf8String vector - ]; - jailbreak = true; - doCheck = false; - meta = { - homepage = "https://github.com/coreyoconnor/vty"; - description = "A simple terminal UI library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/vty/5.2.3.nix b/pkgs/development/libraries/haskell/vty/default.nix index f4685d3e50ca..023c6de30716 100644 --- a/pkgs/development/libraries/haskell/vty/5.2.3.nix +++ b/pkgs/development/libraries/haskell/vty/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "vty"; - version = "5.2.3"; - sha256 = "0afgysliv7bi3x46cj8bcmahfc1lz2niyfmvnzrf9brhxf7l9y76"; + version = "5.2.5"; + sha256 = "15c49nzmkld4vcdmjbh0azlzsqrqmfb0z87zfixqxcl0bafpzrjy"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix index 055802ad04e8..ce99df0390eb 100644 --- a/pkgs/development/libraries/haskell/wai-app-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "wai-app-static"; - version = "3.0.0.1"; - sha256 = "1xqw7xvbq38m19337vpalnz5c5mvc57mfp53vqbah3lalxy9mqby"; + version = "3.0.0.3"; + sha256 = "0krvjnysmfaqds715mp6lhh5am327swi2vja5insmn08da87zhnb"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/wai-middleware-static/default.nix b/pkgs/development/libraries/haskell/wai-middleware-static/default.nix index 4c89a25dae83..e9db0b365be6 100644 --- a/pkgs/development/libraries/haskell/wai-middleware-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-middleware-static/default.nix @@ -4,12 +4,12 @@ cabal.mkDerivation (self: { pname = "wai-middleware-static"; - version = "0.6.0"; - sha256 = "1rsy8qkxcjqdpzqkar0smyy49p8vqapi47k8d24101lz3rym6018"; + version = "0.6.0.1"; + sha256 = "1ylf2nm535d3dw0ksa9dfz1b4b78mqzkdrpdfd5pxswcqbgs266d"; buildDepends = [ filepath httpTypes mtl text wai ]; jailbreak = true; meta = { - homepage = "https://github.com/scotty-web/scotty"; + homepage = "https://github.com/scotty-web/wai-middleware-static"; description = "WAI middleware that serves requests to static files"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix index 1c63b4ce5964..2effc4fc83bf 100644 --- a/pkgs/development/libraries/haskell/wai/default.nix +++ b/pkgs/development/libraries/haskell/wai/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "wai"; - version = "3.0.1.1"; - sha256 = "04dka0mgqckzhvmz8m9gqvk5qq79g23q8wx40v42fwhkwwy7f8i0"; + version = "3.0.2"; + sha256 = "0k67yzr05d6vjwqamnzzggk1mlj9wabqrm26dqbrrc40jj3kddgw"; buildDepends = [ blazeBuilder httpTypes network text vault ]; testDepends = [ blazeBuilder hspec ]; meta = { diff --git a/pkgs/development/libraries/haskell/warp-tls/default.nix b/pkgs/development/libraries/haskell/warp-tls/default.nix index 4eca4c8c1920..8b4668dcf5a5 100644 --- a/pkgs/development/libraries/haskell/warp-tls/default.nix +++ b/pkgs/development/libraries/haskell/warp-tls/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "warp-tls"; - version = "3.0.0"; - sha256 = "14gm43a811v9h87ia2b9y9kynafrvq3yw89gswlj832469jx9sfw"; + version = "3.0.1"; + sha256 = "0s87ricslidyg6m17q5mllpl47v0d8mvvd6psq4izz5l27dg2xpy"; buildDepends = [ cprngAes dataDefaultClass network streamingCommons tls wai warp ]; diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index bf53afbe8c8f..abca63eaf1bf 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "warp"; - version = "3.0.1.1"; - sha256 = "1sgmcyk9ngys990287wsga3kk6wf29sj414w6jmv8a4sal202mqc"; + version = "3.0.2.3"; + sha256 = "16fwqd3nnw0bpa2a8ki0ynxif8a90qa20fvw5fmyngyvysl8g7qn"; buildDepends = [ autoUpdate blazeBuilder caseInsensitive hashable httpDate httpTypes network simpleSendfile streamingCommons text unixCompat void wai diff --git a/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix b/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix index bed9467a9d25..88f268782805 100644 --- a/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix +++ b/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "web-routes-boomerang"; - version = "0.28.2"; - sha256 = "17237xq8nvy0c1mxzf7pad5kw0mrgbzazy0rflp382ig9q6ipd05"; + version = "0.28.3"; + sha256 = "0d3ccp4hbzjhqzqy901da8dpz23sylwg54xs5iyjhmqvw0v7ljpn"; buildDepends = [ boomerang mtl parsec text webRoutes ]; meta = { description = "Library for maintaining correctness and composability of URLs within an application"; diff --git a/pkgs/development/libraries/haskell/web-routes/default.nix b/pkgs/development/libraries/haskell/web-routes/default.nix index 12f2212c8e35..b29d42dc9611 100644 --- a/pkgs/development/libraries/haskell/web-routes/default.nix +++ b/pkgs/development/libraries/haskell/web-routes/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "web-routes"; - version = "0.27.6"; - sha256 = "16jmiwnwmq9bkifk14dfs88a2kyy7rqybyq68ybrjq1x84x6pkkp"; + version = "0.27.7"; + sha256 = "0q6rl8vasbkq24jdfdq6jrjivcqqmdy34w8zw5zczmscpyjqf0zb"; buildDepends = [ blazeBuilder httpTypes mtl parsec split text utf8String ]; diff --git a/pkgs/development/libraries/haskell/webdriver/default.nix b/pkgs/development/libraries/haskell/webdriver/default.nix index 1f73dda79ede..883359db9ff8 100644 --- a/pkgs/development/libraries/haskell/webdriver/default.nix +++ b/pkgs/development/libraries/haskell/webdriver/default.nix @@ -2,19 +2,19 @@ { cabal, aeson, attoparsec, base64Bytestring, cond, dataDefault , directoryTree, exceptions, filepath, httpClient, httpTypes -, liftedBase, monadControl, mtl, network, parallel, scientific -, temporary, text, time, transformers, transformersBase +, liftedBase, monadControl, mtl, network, networkUri, parallel +, scientific, temporary, text, time, transformers, transformersBase , unorderedContainers, vector, zipArchive }: cabal.mkDerivation (self: { pname = "webdriver"; - version = "0.6.0.1"; - sha256 = "0qpk1i6qr12lcx25bdljwqxgdhf5qk67h04bp6vwmm16dwzsyqd1"; + version = "0.6.0.3"; + sha256 = "1q0l9rs5j4cxzyqsy6r40y425359s246spk3g3pks7s47yynjn4q"; buildDepends = [ aeson attoparsec base64Bytestring cond dataDefault directoryTree exceptions filepath httpClient httpTypes liftedBase monadControl - mtl network scientific temporary text time transformers + mtl network networkUri scientific temporary text time transformers transformersBase unorderedContainers vector zipArchive ]; testDepends = [ parallel text ]; diff --git a/pkgs/development/libraries/haskell/webkit/default.nix b/pkgs/development/libraries/haskell/webkit/default.nix index 0d47aeb79551..2c3cdb39d80d 100644 --- a/pkgs/development/libraries/haskell/webkit/default.nix +++ b/pkgs/development/libraries/haskell/webkit/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "webkit"; - version = "0.13.0.0"; - sha256 = "152rbb01fq9cxjxqm26s1qcv3nashzymkbjy52ql06y7s1n5i3q5"; + version = "0.13.0.3"; + sha256 = "0l05cg6krafpcfszcka03x7gay8wg1fhd0gpbn2cchfshfkicgxc"; buildDepends = [ cairo glib gtk mtl pango text ]; buildTools = [ gtk2hsBuildtools ]; pkgconfigDepends = [ webkit ]; diff --git a/pkgs/development/libraries/haskell/websockets/default.nix b/pkgs/development/libraries/haskell/websockets/default.nix index f4d056f66560..2b80e524d4a8 100644 --- a/pkgs/development/libraries/haskell/websockets/default.nix +++ b/pkgs/development/libraries/haskell/websockets/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "websockets"; - version = "0.9.0.1"; - sha256 = "0advbw1z0g53n8az34287fix16a457jv8z6s0g1l8lr4a8b74x0w"; + version = "0.9.1.0"; + sha256 = "18q2dax5d4qh7didr2jhsns07lsybab4v231wjxn6iiyf9f7f16i"; buildDepends = [ attoparsec base64Bytestring binary blazeBuilder caseInsensitive entropy mtl network random SHA text diff --git a/pkgs/development/libraries/haskell/wl-pprint-text/default.nix b/pkgs/development/libraries/haskell/wl-pprint-text/default.nix index 2d6d48d41aee..b76f50a6bf61 100644 --- a/pkgs/development/libraries/haskell/wl-pprint-text/default.nix +++ b/pkgs/development/libraries/haskell/wl-pprint-text/default.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { version = "1.1.0.2"; sha256 = "0wbfqp38as2qpn66sq4hvl3hzvj66v301cz9rmgnx2i62r0a3s81"; buildDepends = [ text ]; + jailbreak = true; meta = { description = "A Wadler/Leijen Pretty Printer for Text values"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/word-trie/default.nix b/pkgs/development/libraries/haskell/word-trie/default.nix new file mode 100644 index 000000000000..f817254aa629 --- /dev/null +++ b/pkgs/development/libraries/haskell/word-trie/default.nix @@ -0,0 +1,18 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, binary, derive, hspec, QuickCheck }: + +cabal.mkDerivation (self: { + pname = "word-trie"; + version = "0.2.0.4"; + sha256 = "0qgljhl2pj54mhsan9w6gchf3l94rs2c5bi9f93q1nz55va1027f"; + buildDepends = [ binary derive ]; + testDepends = [ binary derive hspec QuickCheck ]; + meta = { + homepage = "https://github.com/yi-editor/word-trie"; + description = "Implementation of a finite trie over words"; + license = self.stdenv.lib.licenses.gpl2; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/wreq/default.nix b/pkgs/development/libraries/haskell/wreq/default.nix index d0a3e94fcd26..c16df5863a01 100644 --- a/pkgs/development/libraries/haskell/wreq/default.nix +++ b/pkgs/development/libraries/haskell/wreq/default.nix @@ -3,7 +3,7 @@ { cabal, aeson, attoparsec, doctest, exceptions, filepath , httpClient, httpClientTls, httpTypes, HUnit, lens, lensAeson , mimeTypes, temporary, testFramework, testFrameworkHunit, text -, time +, time, fetchpatch }: cabal.mkDerivation (self: { @@ -21,6 +21,10 @@ cabal.mkDerivation (self: { temporary testFramework testFrameworkHunit text ]; doCheck = false; + patches = [ (fetchpatch { + url = "https://github.com/relrod/wreq/commit/9a91d57b50a09646ecbda88d126918e49aeb2de4.diff"; + sha256 = "09px4hbqkc9b0ykx7alzq2llzp0nxb2c5zsbaa05rcq9cb3nrq4m"; + })]; meta = { homepage = "http://www.serpentine.com/wreq"; description = "An easy-to-use HTTP client library"; diff --git a/pkgs/development/libraries/haskell/wxHaskell/no-ldconfig.patch b/pkgs/development/libraries/haskell/wxHaskell/no-ldconfig.patch new file mode 100644 index 000000000000..72a8648cab67 --- /dev/null +++ b/pkgs/development/libraries/haskell/wxHaskell/no-ldconfig.patch @@ -0,0 +1,10 @@ +Only in wxc-0.91.0.0: dist +diff -ubr wxc-0.91.0.0-orig/Setup.hs wxc-0.91.0.0/Setup.hs +--- wxc-0.91.0.0-orig/Setup.hs 2014-10-31 13:30:15.514809137 +0100 ++++ wxc-0.91.0.0/Setup.hs 2014-10-31 13:33:53.606372005 +0100 +@@ -507,5 +507,3 @@ + inst_lib_dir = libdir $ absoluteInstallDirs pkg_descr local_bld_info NoCopyDest + + installOrdinaryFile (verbosity flags) (bld_dir </> lib_name) (inst_lib_dir </> lib_name) +- ldconfig inst_lib_dir +- diff --git a/pkgs/development/libraries/haskell/wxHaskell/wx.nix b/pkgs/development/libraries/haskell/wxHaskell/wx.nix index c10897b4b11c..4e8241240508 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wx.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wx.nix @@ -4,15 +4,14 @@ cabal.mkDerivation (self: { pname = "wx"; - version = "0.90.1.0"; - sha256 = "1669mrd73c3v7c4yc0zgyqsnfgzb7561v1wd168y06d0db1nlkn9"; + version = "0.91.0.0"; + sha256 = "133cjc3vfqxyw71a5x99flzg23qa2k28p2zajw6vp0z7qhv8kfjy"; buildDepends = [ stm wxcore ]; - preConfigure = "find . -type f -exec touch {} +"; meta = { homepage = "http://haskell.org/haskellwiki/WxHaskell"; description = "wxHaskell"; license = "unknown"; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + maintainers = with self.stdenv.lib.maintainers; [ andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix index 4026a892f6ed..2a1840432515 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix @@ -4,11 +4,12 @@ cabal.mkDerivation (self: { pname = "wxc"; - version = "0.90.1.1"; - sha256 = "0cvfphskvsq3lsl24h6jh8r6yw5jg8qa9wdc883yasfvmzmxwwgc"; + version = "0.91.0.0"; + sha256 = "0siab2h28dlyliznydxll22l9hdgwbmgddj01k1xw8hj4g7b53sa"; buildDepends = [ wxdirect ]; extraLibraries = [ libX11 mesa wxGTK ]; noHaddock = true; + patches = [ ./no-ldconfig.patch ]; postInstall = '' cp -v dist/build/libwxc.so.${self.version} $out/lib/libwxc.so ''; @@ -17,6 +18,6 @@ cabal.mkDerivation (self: { description = "wxHaskell C++ wrapper"; license = "unknown"; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + maintainers = with self.stdenv.lib.maintainers; [ andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix index 8fc4df1a0ce1..7d1bebe1d88a 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix @@ -6,18 +6,15 @@ cabal.mkDerivation (self: { pname = "wxcore"; - version = "0.90.1.1"; - sha256 = "1ma6vjf87b493vz3sj6hxzifqixk62n6b5gvixpfzfig1lysddgp"; + version = "0.91.0.0"; + sha256 = "01pvaysihyijklyw129vcafjqyh8bpafjzvscxvzll1g86qbqlkz"; buildDepends = [ filepath parsec stm time wxc wxdirect ]; extraLibraries = [ libX11 mesa wxGTK ]; - patchPhase = '' - sed -i -e 's|array >= .*,|array,|' wxcore.cabal - ''; meta = { homepage = "http://haskell.org/haskellwiki/WxHaskell"; description = "wxHaskell core"; license = "unknown"; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + maintainers = with self.stdenv.lib.maintainers; [ andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix index f89d39ca5edd..c178207e6995 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "wxdirect"; - version = "0.90.1.1"; - sha256 = "0ibhxl4n66w094jhca01z2vmibgz0nn7qddgxzqngvajzjvnha98"; + version = "0.91.0.0"; + sha256 = "17xlviyyagcvmc7m1f4djnsw0wdakirarmv12j4fmwbnfnbryp27"; isLibrary = true; isExecutable = true; buildDepends = [ filepath parsec strict time ]; diff --git a/pkgs/development/libraries/haskell/x509-store/default.nix b/pkgs/development/libraries/haskell/x509-store/default.nix index 9b060630edb7..36486dbf40e7 100644 --- a/pkgs/development/libraries/haskell/x509-store/default.nix +++ b/pkgs/development/libraries/haskell/x509-store/default.nix @@ -1,15 +1,15 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, asn1Encoding, asn1Types, cryptoPubkeyTypes, filepath, mtl -, pem, time, x509 +, pem, x509 }: cabal.mkDerivation (self: { pname = "x509-store"; - version = "1.4.4"; - sha256 = "0i3hfrddr0wpfl75a76a1j24az08z4x7ya8l5qcdk7c1lr2c2bw8"; + version = "1.5.0"; + sha256 = "1w9sqb007s4avjzvrdwq13a4c528h7h2lg3m8cl31syrgznc9ny5"; buildDepends = [ - asn1Encoding asn1Types cryptoPubkeyTypes filepath mtl pem time x509 + asn1Encoding asn1Types cryptoPubkeyTypes filepath mtl pem x509 ]; meta = { homepage = "http://github.com/vincenthz/hs-certificate"; diff --git a/pkgs/development/libraries/haskell/x509-system/default.nix b/pkgs/development/libraries/haskell/x509-system/default.nix index b36b8c9cdfbb..87bb4ed1fecc 100644 --- a/pkgs/development/libraries/haskell/x509-system/default.nix +++ b/pkgs/development/libraries/haskell/x509-system/default.nix @@ -1,12 +1,12 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, filepath, mtl, pem, time, x509, x509Store }: +{ cabal, filepath, mtl, pem, x509, x509Store }: cabal.mkDerivation (self: { pname = "x509-system"; - version = "1.4.5"; - sha256 = "0pwn624n6fagg9rw2p09x2k212rc8167jhqz6z5wf6m7y56ql28x"; - buildDepends = [ filepath mtl pem time x509 x509Store ]; + version = "1.5.0"; + sha256 = "159zwg35nq42j1rl0p4x00hdf3iy48hd7kavz0rnpwd2p7ljamr3"; + buildDepends = [ filepath mtl pem x509 x509Store ]; meta = { homepage = "http://github.com/vincenthz/hs-certificate"; description = "Handle per-operating-system X.509 accessors and storage"; diff --git a/pkgs/development/libraries/haskell/x509-validation/default.nix b/pkgs/development/libraries/haskell/x509-validation/default.nix index 32176c8f4b8f..1caec0606bc6 100644 --- a/pkgs/development/libraries/haskell/x509-validation/default.nix +++ b/pkgs/development/libraries/haskell/x509-validation/default.nix @@ -1,18 +1,18 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, asn1Encoding, asn1Types, byteable, cryptohash -, cryptoPubkey, cryptoPubkeyTypes, dataDefaultClass, filepath, mtl -, network, pem, time, x509, x509Store +, cryptoPubkey, cryptoPubkeyTypes, dataDefaultClass, filepath +, hourglass, mtl, network, pem, x509, x509Store }: cabal.mkDerivation (self: { pname = "x509-validation"; - version = "1.5.0"; - sha256 = "1xarn00ipi77whly5yjlpqa0xd25lj0jf4xk8ylp4ba58hvcxqrn"; + version = "1.5.1"; + sha256 = "19cp187id9hdlzkr7sbv2sdxqxnpjv0db09hwf3zdqqqxr30mn6x"; buildDepends = [ asn1Encoding asn1Types byteable cryptohash cryptoPubkey - cryptoPubkeyTypes dataDefaultClass filepath mtl network pem time - x509 x509Store + cryptoPubkeyTypes dataDefaultClass filepath hourglass mtl network + pem x509 x509Store ]; meta = { homepage = "http://github.com/vincenthz/hs-certificate"; diff --git a/pkgs/development/libraries/haskell/x509/default.nix b/pkgs/development/libraries/haskell/x509/default.nix index 71601c9306dd..201b727e2fc3 100644 --- a/pkgs/development/libraries/haskell/x509/default.nix +++ b/pkgs/development/libraries/haskell/x509/default.nix @@ -1,21 +1,20 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, asn1Encoding, asn1Parse, asn1Types, cryptohash -, cryptoPubkeyTypes, filepath, HUnit, mtl, pem, QuickCheck -, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, time +, cryptoPubkeyTypes, filepath, hourglass, mtl, pem, tasty +, tastyQuickcheck }: cabal.mkDerivation (self: { pname = "x509"; - version = "1.4.12"; - sha256 = "0bfsmmngpvghbfljxa2gymf6hvsw04snw6fr2r6hpaw40njxfxxj"; + version = "1.5.0.1"; + sha256 = "03gj4190f0ql1ghn2mri8901xdydhhnwijyfn8lmpjyn7pgpl3ba"; buildDepends = [ asn1Encoding asn1Parse asn1Types cryptohash cryptoPubkeyTypes - filepath mtl pem time + filepath hourglass mtl pem ]; testDepends = [ - asn1Types cryptoPubkeyTypes HUnit mtl QuickCheck testFramework - testFrameworkHunit testFrameworkQuickcheck2 time + asn1Types cryptoPubkeyTypes hourglass mtl tasty tastyQuickcheck ]; meta = { homepage = "http://github.com/vincenthz/hs-certificate"; diff --git a/pkgs/development/libraries/haskell/xdot/default.nix b/pkgs/development/libraries/haskell/xdot/default.nix index 445577c2309a..1ced4424f533 100644 --- a/pkgs/development/libraries/haskell/xdot/default.nix +++ b/pkgs/development/libraries/haskell/xdot/default.nix @@ -4,8 +4,10 @@ cabal.mkDerivation (self: { pname = "xdot"; - version = "0.2.4.3"; - sha256 = "0p6y3ng8nwi8sksy0881bs331asi73x816zd5v7qlg4v719s8jxg"; + version = "0.2.4.6"; + sha256 = "123vygzkqlycc298zh3321y7w85xnynbavzqms6cb8zgzya42wrs"; + isLibrary = true; + isExecutable = true; buildDepends = [ cairo graphviz gtk mtl polyparse text ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix b/pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix deleted file mode 100644 index 3cb0238b82f3..000000000000 --- a/pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix +++ /dev/null @@ -1,15 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "xhtml"; - version = "3000.2.0.1"; - sha256 = "15pcigascajky67v0lhdhn4bv8xq16cvzib05mg4f1ynwr5a9mv0"; - meta = { - description = "An XHTML combinator library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix b/pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix deleted file mode 100644 index 74b9fc5620c0..000000000000 --- a/pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "xhtml"; - version = "3000.2.0.4"; - sha256 = "07kqii5dsfdaf46y4k19l9llhzhxssr24jbjpr5i8p1qh7117abw"; - meta = { - homepage = "https://github.com/haskell/xhtml"; - description = "An XHTML combinator library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix b/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix deleted file mode 100644 index 065252d31b76..000000000000 --- a/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "xhtml"; - version = "3000.2.0.5"; - sha256 = "1gqq910pncqppb2dscxnfxvm1ly4qpb5mwmady2i4irar3gngh9v"; - meta = { - homepage = "https://github.com/haskell/xhtml"; - description = "An XHTML combinator library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/xhtml/3000.2.1.nix b/pkgs/development/libraries/haskell/xhtml/default.nix index be1e32afbe35..be1e32afbe35 100644 --- a/pkgs/development/libraries/haskell/xhtml/3000.2.1.nix +++ b/pkgs/development/libraries/haskell/xhtml/default.nix diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix index ddd6129dd83c..a6e0cdfa3b06 100644 --- a/pkgs/development/libraries/haskell/xml-conduit/default.nix +++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix @@ -1,19 +1,18 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, attoparsec, attoparsecConduit, blazeBuilder -, blazeBuilderConduit, blazeHtml, blazeMarkup, conduit +{ cabal, attoparsec, blazeBuilder, blazeHtml, blazeMarkup, conduit , conduitExtra, dataDefault, deepseq, hspec, HUnit, monadControl , resourcet, systemFilepath, text, transformers, xmlTypes }: cabal.mkDerivation (self: { pname = "xml-conduit"; - version = "1.2.2"; - sha256 = "0rya11zzkqkq9jspd3q75b50l0p42aq3ka77by0wan373hw4ydan"; + version = "1.2.3"; + sha256 = "1knwmvs9hczlknyi27hciy1xkn219s6niv3w7q0wkw6rxz2q555v"; buildDepends = [ - attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit - blazeHtml blazeMarkup conduit conduitExtra dataDefault deepseq - monadControl resourcet systemFilepath text transformers xmlTypes + attoparsec blazeBuilder blazeHtml blazeMarkup conduit conduitExtra + dataDefault deepseq monadControl resourcet systemFilepath text + transformers xmlTypes ]; testDepends = [ blazeMarkup conduit hspec HUnit resourcet text transformers diff --git a/pkgs/development/libraries/haskell/xml-html-conduit-lens/default.nix b/pkgs/development/libraries/haskell/xml-html-conduit-lens/default.nix index 7a53fb456f75..405f165c6a79 100644 --- a/pkgs/development/libraries/haskell/xml-html-conduit-lens/default.nix +++ b/pkgs/development/libraries/haskell/xml-html-conduit-lens/default.nix @@ -12,6 +12,7 @@ cabal.mkDerivation (self: { testDepends = [ doctest hspec hspecExpectationsLens lens xmlConduit ]; + jailbreak = true; meta = { homepage = "https://github.com/supki/xml-html-conduit-lens#readme"; description = "Optics for xml-conduit and html-conduit"; diff --git a/pkgs/development/libraries/haskell/xml-lens/default.nix b/pkgs/development/libraries/haskell/xml-lens/default.nix index f9e604419752..033afd9ee53d 100644 --- a/pkgs/development/libraries/haskell/xml-lens/default.nix +++ b/pkgs/development/libraries/haskell/xml-lens/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "xml-lens"; - version = "0.1.6.1"; - sha256 = "093grvlpm19l3g10ka82xpzl2wr0gli71kfkbvk4gvg3194fkw4h"; + version = "0.1.6.2"; + sha256 = "14x3xz4rydl8x7ddznz90n3z5csy12c7l0r7bms8s7yqv4qzf6hz"; buildDepends = [ lens text xmlConduit ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix index 9173baa97baa..e00e7c4712d0 100644 --- a/pkgs/development/libraries/haskell/yaml/default.nix +++ b/pkgs/development/libraries/haskell/yaml/default.nix @@ -1,21 +1,22 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, aeson, attoparsec, conduit, hspec, HUnit, resourcet -, scientific, text, transformers, unorderedContainers, vector +{ cabal, aeson, aesonQq, attoparsec, conduit, filepath, hspec +, HUnit, resourcet, scientific, text, transformers +, unorderedContainers, vector }: cabal.mkDerivation (self: { pname = "yaml"; - version = "0.8.9.1"; - sha256 = "129pf4gg3mf2ljag8vxknnqxbrbx53hshzpaggndxjir72303njy"; + version = "0.8.10"; + sha256 = "1m51h253gcp77a0sjsckccrwz5ajd991ppczvyhnprphx1y210ig"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson attoparsec conduit resourcet scientific text transformers - unorderedContainers vector + aeson attoparsec conduit filepath resourcet scientific text + transformers unorderedContainers vector ]; testDepends = [ - aeson conduit hspec HUnit resourcet text transformers + aeson aesonQq conduit hspec HUnit resourcet text transformers unorderedContainers vector ]; meta = { diff --git a/pkgs/development/libraries/haskell/yesod-auth-hashdb/default.nix b/pkgs/development/libraries/haskell/yesod-auth-hashdb/default.nix index a47f3bed59da..2cb6609ab77a 100644 --- a/pkgs/development/libraries/haskell/yesod-auth-hashdb/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth-hashdb/default.nix @@ -1,23 +1,23 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, cryptohash, pwstoreFast, text, yesodAuth, yesodCore -, yesodForm, yesodPersistent +{ cabal, cryptohash, hspec, persistent, pwstoreFast, text +, yesodAuth, yesodCore, yesodForm, yesodPersistent }: cabal.mkDerivation (self: { pname = "yesod-auth-hashdb"; - version = "1.3.0.1"; - sha256 = "0q78mw09g6b04zaz54s03222mh59nm604qh8gyw5kka06f93hk4q"; + version = "1.4.1.1"; + sha256 = "0bb37iawsdq3m5p1sjdnz954f3nfdmvvhm0hxap1z2hf9dk516ci"; buildDepends = [ - cryptohash pwstoreFast text yesodAuth yesodCore yesodForm - yesodPersistent + cryptohash persistent pwstoreFast text yesodAuth yesodCore + yesodForm yesodPersistent ]; + testDepends = [ hspec text ]; meta = { - homepage = "http://www.yesodweb.com/"; + homepage = "https://github.com/paul-rouse/yesod-auth-hashdb"; description = "Authentication plugin for Yesod"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ ianwookim ]; - broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index f15d96df0057..cf705ac8fc9e 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -1,27 +1,26 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, aeson, attoparsecConduit, authenticate, base16Bytestring -, base64Bytestring, binary, blazeBuilder, blazeHtml, blazeMarkup -, byteable, conduit, conduitExtra, cryptohash, dataDefault -, emailValidate, fileEmbed, hamlet, httpClient, httpConduit -, httpTypes, liftedBase, mimeMail, networkUri, persistent -, persistentTemplate, random, resourcet, safe, shakespeare -, shakespeareCss, shakespeareJs, text, time, transformers -, unorderedContainers, wai, yesodCore, yesodForm, yesodPersistent +{ cabal, aeson, authenticate, base16Bytestring, base64Bytestring +, binary, blazeBuilder, blazeHtml, blazeMarkup, byteable, conduit +, conduitExtra, cryptohash, dataDefault, emailValidate, fileEmbed +, httpClient, httpConduit, httpTypes, liftedBase, mimeMail +, networkUri, persistent, persistentTemplate, random, resourcet +, safe, shakespeare, text, time, transformers, unorderedContainers +, wai, yesodCore, yesodForm, yesodPersistent }: cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "1.3.4.6"; - sha256 = "17lp99pinq72if527ml4sfqvvjn7kmkcc5jq1l9vsbfgqckmqcff"; + version = "1.4.1"; + sha256 = "1nvc5ni4bwhb10ayr75s3z44ynv9kq3lp6kgd536xyagbi054gdp"; buildDepends = [ - aeson attoparsecConduit authenticate base16Bytestring - base64Bytestring binary blazeBuilder blazeHtml blazeMarkup byteable - conduit conduitExtra cryptohash dataDefault emailValidate fileEmbed - hamlet httpClient httpConduit httpTypes liftedBase mimeMail - networkUri persistent persistentTemplate random resourcet safe - shakespeare shakespeareCss shakespeareJs text time transformers - unorderedContainers wai yesodCore yesodForm yesodPersistent + aeson authenticate base16Bytestring base64Bytestring binary + blazeBuilder blazeHtml blazeMarkup byteable conduit conduitExtra + cryptohash dataDefault emailValidate fileEmbed httpClient + httpConduit httpTypes liftedBase mimeMail networkUri persistent + persistentTemplate random resourcet safe shakespeare text time + transformers unorderedContainers wai yesodCore yesodForm + yesodPersistent ]; meta = { homepage = "http://www.yesodweb.com/"; diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix index 8a5d21a30aa8..4809609036bd 100644 --- a/pkgs/development/libraries/haskell/yesod-bin/default.nix +++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix @@ -3,27 +3,26 @@ { cabal, attoparsec, base64Bytestring, blazeBuilder, Cabal, conduit , conduitExtra, dataDefaultClass, fileEmbed, filepath, fsnotify , ghcPaths, httpConduit, httpReverseProxy, httpTypes, liftedBase -, network, networkConduit, optparseApplicative, parsec -, projectTemplate, resourcet, shakespeare, shakespeareCss -, shakespeareJs, shakespeareText, split, streamingCommons -, systemFileio, systemFilepath, tar, text, time, transformers +, network, optparseApplicative, parsec, projectTemplate, resourcet +, shakespeare, split, streamingCommons, systemFileio +, systemFilepath, tar, text, time, transformers, transformersCompat , unixCompat, unorderedContainers, wai, waiExtra, warp, yaml, zlib }: cabal.mkDerivation (self: { pname = "yesod-bin"; - version = "1.2.13"; - sha256 = "11378w4r48d41cdigcmrcqzrl70vxxqdwq3j1da6dbmdx7nksxfk"; + version = "1.4.0.9"; + sha256 = "0pm45wi72v0kx9cqbwsbq9g6w93cb8aknps6aa153vbv7k8ikn7v"; isLibrary = false; isExecutable = true; buildDepends = [ attoparsec base64Bytestring blazeBuilder Cabal conduit conduitExtra dataDefaultClass fileEmbed filepath fsnotify ghcPaths httpConduit - httpReverseProxy httpTypes liftedBase network networkConduit - optparseApplicative parsec projectTemplate resourcet shakespeare - shakespeareCss shakespeareJs shakespeareText split streamingCommons - systemFileio systemFilepath tar text time transformers unixCompat - unorderedContainers wai waiExtra warp yaml zlib + httpReverseProxy httpTypes liftedBase network optparseApplicative + parsec projectTemplate resourcet shakespeare split streamingCommons + systemFileio systemFilepath tar text time transformers + transformersCompat unixCompat unorderedContainers wai waiExtra warp + yaml zlib ]; meta = { homepage = "http://www.yesodweb.com/"; diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index e27f751e6b15..88b33620edca 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -1,34 +1,33 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, aeson, async, attoparsecConduit, blazeBuilder, blazeHtml +{ cabal, aeson, async, autoUpdate, blazeBuilder, blazeHtml , blazeMarkup, caseInsensitive, cereal, clientsession, conduit , conduitExtra, cookie, dataDefault, deepseq, exceptions -, fastLogger, hamlet, hspec, httpTypes, HUnit, liftedBase -, monadControl, monadLogger, mtl, network, networkConduit, parsec -, pathPieces, QuickCheck, random, resourcet, safe, shakespeare -, shakespeareCss, shakespeareI18n, shakespeareJs, streamingCommons -, text, time, transformers, transformersBase, unixCompat, vector -, wai, waiExtra, waiLogger, waiTest, warp, yesodRoutes +, fastLogger, hspec, httpTypes, HUnit, liftedBase, monadControl +, monadLogger, mtl, mwcRandom, network, parsec, pathPieces +, primitive, QuickCheck, random, resourcet, safe, shakespeare +, streamingCommons, text, time, transformers, transformersBase +, unixCompat, unorderedContainers, vector, wai, waiExtra, waiLogger +, warp, word8 }: cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.2.20.1"; - sha256 = "188mfw9ag6287azb633xznwrbsavy5k12ycg2aahrxd84g6xjnan"; + version = "1.4.4.4"; + sha256 = "0l4a49a3y1m257zkzmvqwg5cm6shxzssgd143qqzhg1svikavv82"; buildDepends = [ - aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup - caseInsensitive cereal clientsession conduit conduitExtra cookie - dataDefault deepseq exceptions fastLogger hamlet httpTypes - liftedBase monadControl monadLogger mtl parsec pathPieces random - resourcet safe shakespeare shakespeareCss shakespeareI18n - shakespeareJs text time transformers transformersBase unixCompat - vector wai waiExtra waiLogger warp yesodRoutes + aeson autoUpdate blazeBuilder blazeHtml blazeMarkup caseInsensitive + cereal clientsession conduit conduitExtra cookie dataDefault + deepseq exceptions fastLogger httpTypes liftedBase monadControl + monadLogger mtl mwcRandom parsec pathPieces primitive random + resourcet safe shakespeare text time transformers transformersBase + unixCompat unorderedContainers vector wai waiExtra waiLogger warp + word8 ]; testDepends = [ - async blazeBuilder conduit conduitExtra hamlet hspec httpTypes - HUnit liftedBase network networkConduit QuickCheck random resourcet - shakespeare shakespeareCss shakespeareJs streamingCommons text - transformers wai waiExtra waiTest + async blazeBuilder conduit conduitExtra hspec httpTypes HUnit + liftedBase mwcRandom network pathPieces QuickCheck random resourcet + shakespeare streamingCommons text transformers wai waiExtra ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index d2e7b45e57ea..f8645b3d108f 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -1,21 +1,20 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, aeson, attoparsec, blazeBuilder, blazeHtml, blazeMarkup -, byteable, dataDefault, emailValidate, hamlet, hspec, networkUri -, persistent, resourcet, shakespeare, shakespeareCss, shakespeareJs -, text, time, transformers, wai, xssSanitize, yesodCore -, yesodPersistent +, byteable, dataDefault, emailValidate, hspec, networkUri +, persistent, resourcet, shakespeare, text, time, transformers, wai +, xssSanitize, yesodCore, yesodPersistent }: cabal.mkDerivation (self: { pname = "yesod-form"; - version = "1.3.16"; - sha256 = "0dqmp0df0ahayvg4f4fvn6kwpr3b5d5qfzvk3vwk8bnivk6jrwj5"; + version = "1.4.1.1"; + sha256 = "0as2hgl78hqyci0f9ysa7sy3r7c8vq1a0a0y7wpbybz0c4690pqi"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml blazeMarkup byteable - dataDefault emailValidate hamlet networkUri persistent resourcet - shakespeare shakespeareCss shakespeareJs text time transformers wai - xssSanitize yesodCore yesodPersistent + dataDefault emailValidate networkUri persistent resourcet + shakespeare text time transformers wai xssSanitize yesodCore + yesodPersistent ]; testDepends = [ hspec text time ]; meta = { diff --git a/pkgs/development/libraries/haskell/yesod-persistent/default.nix b/pkgs/development/libraries/haskell/yesod-persistent/default.nix index fdfd55272470..845fc1c18ff0 100644 --- a/pkgs/development/libraries/haskell/yesod-persistent/default.nix +++ b/pkgs/development/libraries/haskell/yesod-persistent/default.nix @@ -2,20 +2,20 @@ { cabal, blazeBuilder, conduit, hspec, persistent, persistentSqlite , persistentTemplate, resourcePool, resourcet, text, transformers -, waiExtra, waiTest, yesodCore +, waiExtra, yesodCore }: cabal.mkDerivation (self: { pname = "yesod-persistent"; - version = "1.2.3.1"; - sha256 = "1mmy1l91ksjvwi2zr1wnb50vshs4pdri9rcaracwrnrmdpbmyy3s"; + version = "1.4.0.1"; + sha256 = "08648n6b4xhsqbvqh8vpsf3481hvzhrkyqbzs303s6fz683mn0zw"; buildDepends = [ blazeBuilder conduit persistent persistentTemplate resourcePool resourcet transformers yesodCore ]; testDepends = [ blazeBuilder conduit hspec persistent persistentSqlite text - waiExtra waiTest yesodCore + waiExtra yesodCore ]; meta = { homepage = "http://www.yesodweb.com/"; diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix index 5ad4a27b66fe..60a94cfb20d2 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -3,29 +3,29 @@ { cabal, async, attoparsec, base64Bytestring, blazeBuilder , byteable, conduit, conduitExtra, cryptohash, cryptohashConduit , cssText, dataDefault, fileEmbed, filepath, hashable, hjsmin -, hspec, httpTypes, HUnit, mimeTypes, resourcet, shakespeareCss -, systemFileio, systemFilepath, text, transformers, unixCompat -, unorderedContainers, wai, waiAppStatic, waiExtra, waiTest -, yesodCore, yesodTest +, hspec, httpTypes, HUnit, mimeTypes, resourcet, systemFileio +, systemFilepath, text, transformers, unixCompat +, unorderedContainers, wai, waiAppStatic, waiExtra, yesodCore +, yesodTest }: cabal.mkDerivation (self: { pname = "yesod-static"; - version = "1.2.4"; - sha256 = "0r5bz1jmgjd7cmvhkp3ahgl610bssvgxxsvb626dvqz2vqc0061z"; + version = "1.4.0.3"; + sha256 = "15rwlw76rfh18l3ap73aqmwz4bafmxbr5pchyarll14ps0rjs74g"; buildDepends = [ async attoparsec base64Bytestring blazeBuilder byteable conduit conduitExtra cryptohash cryptohashConduit cssText dataDefault fileEmbed filepath hashable hjsmin httpTypes mimeTypes resourcet - shakespeareCss systemFileio systemFilepath text transformers - unixCompat unorderedContainers wai waiAppStatic yesodCore + systemFileio systemFilepath text transformers unixCompat + unorderedContainers wai waiAppStatic yesodCore ]; testDepends = [ async base64Bytestring byteable conduit conduitExtra cryptohash cryptohashConduit dataDefault fileEmbed filepath hjsmin hspec - httpTypes HUnit mimeTypes resourcet shakespeareCss systemFileio - systemFilepath text transformers unixCompat unorderedContainers wai - waiAppStatic waiExtra waiTest yesodCore yesodTest + httpTypes HUnit mimeTypes resourcet systemFileio systemFilepath + text transformers unixCompat unorderedContainers wai waiAppStatic + waiExtra yesodCore yesodTest ]; doCheck = false; meta = { diff --git a/pkgs/development/libraries/haskell/yesod-test/default.nix b/pkgs/development/libraries/haskell/yesod-test/default.nix index f344e5929620..50a6369f1868 100644 --- a/pkgs/development/libraries/haskell/yesod-test/default.nix +++ b/pkgs/development/libraries/haskell/yesod-test/default.nix @@ -1,20 +1,21 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, attoparsec, blazeBuilder, blazeHtml, blazeMarkup -, caseInsensitive, cookie, hspec, htmlConduit, httpTypes, HUnit -, monadControl, network, persistent, text, time, transformers, wai -, waiExtra, waiTest, xmlConduit, xmlTypes, yesodCore, yesodForm +, caseInsensitive, cookie, hspec, hspecCore, htmlConduit, httpTypes +, HUnit, monadControl, network, persistent, text, time +, transformers, wai, waiExtra, xmlConduit, xmlTypes, yesodCore +, yesodForm }: cabal.mkDerivation (self: { pname = "yesod-test"; - version = "1.2.6"; - sha256 = "0509kd0qwwd83fnw2zr156l01h4hi4hd9lfkjx7dp8ky6506515f"; + version = "1.4.2"; + sha256 = "09iia8vligw41ayhp1fp797n783avb0sf89z8midindrhb5plfbl"; buildDepends = [ attoparsec blazeBuilder blazeHtml blazeMarkup caseInsensitive - cookie hspec htmlConduit httpTypes HUnit monadControl network - persistent text time transformers wai waiExtra waiTest xmlConduit - xmlTypes yesodCore + cookie hspecCore htmlConduit httpTypes HUnit monadControl network + persistent text time transformers wai waiExtra xmlConduit xmlTypes + yesodCore ]; testDepends = [ hspec htmlConduit HUnit text wai xmlConduit yesodCore yesodForm diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index 07d4ac958e63..2860cab4d1a3 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -1,23 +1,21 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, aeson, blazeHtml, blazeMarkup, conduitExtra, dataDefault -, fastLogger, hamlet, monadControl, monadLogger, networkConduit -, safe, shakespeare, shakespeareCss, shakespeareJs -, streamingCommons, text, transformers, unorderedContainers, wai -, waiExtra, warp, yaml, yesodAuth, yesodCore, yesodForm -, yesodPersistent +, fastLogger, monadControl, monadLogger, safe, semigroups +, shakespeare, streamingCommons, text, transformers +, unorderedContainers, wai, waiExtra, waiLogger, warp, yaml +, yesodAuth, yesodCore, yesodForm, yesodPersistent }: cabal.mkDerivation (self: { pname = "yesod"; - version = "1.2.6.1"; - sha256 = "1xiqpbcjxisc4lic7ls03rz184d95vkh4kb3ampwbx463qbj9im2"; + version = "1.4.1"; + sha256 = "1h4l78qjaiv3aqw02cj3qakkxv7ds946iagdccm8pav2wlkdl5pw"; buildDepends = [ aeson blazeHtml blazeMarkup conduitExtra dataDefault fastLogger - hamlet monadControl monadLogger networkConduit safe shakespeare - shakespeareCss shakespeareJs streamingCommons text transformers - unorderedContainers wai waiExtra warp yaml yesodAuth yesodCore - yesodForm yesodPersistent + monadControl monadLogger safe semigroups shakespeare + streamingCommons text transformers unorderedContainers wai waiExtra + waiLogger warp yaml yesodAuth yesodCore yesodForm yesodPersistent ]; meta = { homepage = "http://www.yesodweb.com/"; diff --git a/pkgs/development/libraries/haskell/yi-fuzzy-open/default.nix b/pkgs/development/libraries/haskell/yi-fuzzy-open/default.nix new file mode 100644 index 000000000000..4685a08511ae --- /dev/null +++ b/pkgs/development/libraries/haskell/yi-fuzzy-open/default.nix @@ -0,0 +1,22 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, binary, dataDefault, filepath, mtl, text, transformersBase +, vector, yi, yiLanguage, yiRope +}: + +cabal.mkDerivation (self: { + pname = "yi-fuzzy-open"; + version = "0.1.0"; + sha256 = "03y7ddas8w380asx4ldafp1r3h4nlyjky7n4n5sdyvwbi0rix1gc"; + buildDepends = [ + binary dataDefault filepath mtl text transformersBase vector yi + yiLanguage yiRope + ]; + meta = { + homepage = "https://github.com/yi-editor/yi-fuzzy-open"; + description = "Fuzzy open plugin for Yi"; + license = self.stdenv.lib.licenses.gpl2; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/yi-language/default.nix b/pkgs/development/libraries/haskell/yi-language/default.nix new file mode 100644 index 000000000000..d7a6a688d30e --- /dev/null +++ b/pkgs/development/libraries/haskell/yi-language/default.nix @@ -0,0 +1,28 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, alex, binary, dataDefault, derive, filepath, hashable +, hspec, lens, ooPrototypes, pointedlist, QuickCheck, regexBase +, regexTdfa, transformersBase, unorderedContainers +}: + +cabal.mkDerivation (self: { + pname = "yi-language"; + version = "0.1.0.8"; + sha256 = "1lzn1yswrh72lqvc5xcna2xjv5zs3x1mzc1ijkqjl84nvqcabj60"; + buildDepends = [ + binary dataDefault derive hashable lens ooPrototypes pointedlist + regexBase regexTdfa transformersBase unorderedContainers + ]; + testDepends = [ + binary dataDefault derive filepath hashable hspec lens pointedlist + QuickCheck regexBase regexTdfa transformersBase unorderedContainers + ]; + buildTools = [ alex ]; + meta = { + homepage = "https://github.com/yi-editor/yi-language"; + description = "Collection of language-related Yi libraries"; + license = self.stdenv.lib.licenses.gpl2; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/yi-monokai/default.nix b/pkgs/development/libraries/haskell/yi-monokai/default.nix new file mode 100644 index 000000000000..ddae06b7f22b --- /dev/null +++ b/pkgs/development/libraries/haskell/yi-monokai/default.nix @@ -0,0 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, yi }: + +cabal.mkDerivation (self: { + pname = "yi-monokai"; + version = "0.1.1.2"; + sha256 = "1nghfyiy8jdz144nbw0c2cdy8n6xyjmk31g6z24jk8dij7iwb60l"; + buildDepends = [ yi ]; + meta = { + homepage = "https://github.com/Fuuzetsu/yi-monokai"; + description = "Monokai colour theme for the Yi text editor"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/yi-rope/default.nix b/pkgs/development/libraries/haskell/yi-rope/default.nix new file mode 100644 index 000000000000..a92f086f3a6e --- /dev/null +++ b/pkgs/development/libraries/haskell/yi-rope/default.nix @@ -0,0 +1,21 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, binary, charsetdetectAe, dataDefault, deepseq, fingertree +, hspec, QuickCheck, quickcheckInstances, text, textIcu +}: + +cabal.mkDerivation (self: { + pname = "yi-rope"; + version = "0.7.0.0"; + sha256 = "123p0m31h8qa53jl2sd646s1hrs5qnb7y82y7bzgg2zny4qqw9a2"; + buildDepends = [ + binary charsetdetectAe dataDefault deepseq fingertree text textIcu + ]; + testDepends = [ hspec QuickCheck quickcheckInstances text ]; + meta = { + description = "A rope data structure used by Yi"; + license = self.stdenv.lib.licenses.gpl2; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/yi-snippet/default.nix b/pkgs/development/libraries/haskell/yi-snippet/default.nix new file mode 100644 index 000000000000..b1cb7041ff02 --- /dev/null +++ b/pkgs/development/libraries/haskell/yi-snippet/default.nix @@ -0,0 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, yi, yiRope }: + +cabal.mkDerivation (self: { + pname = "yi-snippet"; + version = "0.1.0.0"; + sha256 = "0qbn5x7lbvb9h6gdqgvldzyy7z5y5aa9a02ss48zkccss5p6939d"; + buildDepends = [ yi yiRope ]; + meta = { + homepage = "https://github.com/yi-editor/yi-snippet"; + description = "Snippet support for Yi"; + license = self.stdenv.lib.licenses.gpl2; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/yst/default.nix b/pkgs/development/libraries/haskell/yst/default.nix index 2dadfcbfd686..ea3991eebe9d 100644 --- a/pkgs/development/libraries/haskell/yst/default.nix +++ b/pkgs/development/libraries/haskell/yst/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "yst"; - version = "0.4.1"; - sha256 = "199awgpxn9131a7ijxvvbc4mi1yasnllbpj77k27brx00j87v3nq"; + version = "0.4.1.1"; + sha256 = "0i69pjzrxc330kfy3nvhzf59640h4p9w5lxpjlr31xbl7w1qqx12"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/zeromq4-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq4-haskell/default.nix index e4519c473585..4b7c333c07cc 100644 --- a/pkgs/development/libraries/haskell/zeromq4-haskell/default.nix +++ b/pkgs/development/libraries/haskell/zeromq4-haskell/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "zeromq4-haskell"; - version = "0.6.1"; - sha256 = "14ai6sp39qv6kmj33basnvvfqhzbiqxskv3crjwfdaxbijh23mif"; + version = "0.6.2"; + sha256 = "07dbsapzc4hqq9sg63v4wyjad13sqh9zsx3ckwc5hg5z6vknpafb"; buildDepends = [ async exceptions semigroups transformers ]; testDepends = [ async QuickCheck tasty tastyHunit tastyQuickcheck diff --git a/pkgs/development/libraries/haskell/zlib/0.5.0.0.nix b/pkgs/development/libraries/haskell/zlib/0.5.0.0.nix deleted file mode 100644 index b67604821293..000000000000 --- a/pkgs/development/libraries/haskell/zlib/0.5.0.0.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, zlib }: - -cabal.mkDerivation (self: { - pname = "zlib"; - version = "0.5.0.0"; - sha256 = "20e067cfbec87ec062ac144875a60e158ea6cf7836aac031ec367fcdd5446891"; - extraLibraries = [ zlib ]; - meta = { - description = "Compression and decompression in the gzip and zlib formats"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix b/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix deleted file mode 100644 index f3669c97c0a8..000000000000 --- a/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, zlib }: - -cabal.mkDerivation (self: { - pname = "zlib"; - version = "0.5.2.0"; - sha256 = "4119fb627e0adc2b129acd86fe5724cf05a49d8de5b64eb7a6e519d3befd3b8f"; - extraLibraries = [ zlib ]; - meta = { - description = "Compression and decompression in the gzip and zlib formats"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/zlib/0.5.3.1.nix b/pkgs/development/libraries/haskell/zlib/0.5.3.1.nix deleted file mode 100644 index 1bed95bc2e82..000000000000 --- a/pkgs/development/libraries/haskell/zlib/0.5.3.1.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, zlib }: - -cabal.mkDerivation (self: { - pname = "zlib"; - version = "0.5.3.1"; - sha256 = "1hj56lk4g2zr7acdda39zib1bj02777q0asm5ms9rfj7kp81caiq"; - extraLibraries = [ zlib ]; - meta = { - description = "Compression and decompression in the gzip and zlib formats"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix b/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix deleted file mode 100644 index 5260b55a0277..000000000000 --- a/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, zlib }: - -cabal.mkDerivation (self: { - pname = "zlib"; - version = "0.5.3.3"; - sha256 = "1hrq34w9y8m7nahvrdpnkh9rdb4jycpcpv9ix6qrxijvbz2vdbg2"; - extraLibraries = [ zlib ]; - jailbreak = true; - meta = { - description = "Compression and decompression in the gzip and zlib formats"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/zlib/0.5.4.0.nix b/pkgs/development/libraries/haskell/zlib/0.5.4.0.nix deleted file mode 100644 index 8b13da93ce34..000000000000 --- a/pkgs/development/libraries/haskell/zlib/0.5.4.0.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, zlib }: - -cabal.mkDerivation (self: { - pname = "zlib"; - version = "0.5.4.0"; - sha256 = "18hc4wr8brzbl9qapjbjyb9kyqrznv2xbw7rv1a6k8i3392ilxv1"; - extraLibraries = [ zlib ]; - meta = { - description = "Compression and decompression in the gzip and zlib formats"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/zlib/0.5.4.1.nix b/pkgs/development/libraries/haskell/zlib/default.nix index 28f69ad0a64a..dad288c8fd02 100644 --- a/pkgs/development/libraries/haskell/zlib/0.5.4.1.nix +++ b/pkgs/development/libraries/haskell/zlib/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "zlib"; - version = "0.5.4.1"; - sha256 = "0l550l2qw4gx530h1yjjpdh6rkm59l9l6jbmlm0vx41cqpj6b8yc"; + version = "0.5.4.2"; + sha256 = "15hhsk7z3gvm7sz2ic2z1ca5c6rpsln2rr391mdbm1bxlzc1gmkm"; extraLibraries = [ zlib ]; meta = { description = "Compression and decompression in the gzip and zlib formats"; diff --git a/pkgs/development/libraries/hidapi/default.nix b/pkgs/development/libraries/hidapi/default.nix new file mode 100644 index 000000000000..a6259ac23cc9 --- /dev/null +++ b/pkgs/development/libraries/hidapi/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, udev, libusb }: + +stdenv.mkDerivation rec { + name = "hidapi-0.8.0-rc1"; + + src = fetchFromGitHub { + owner = "signal11"; + repo = "hidapi"; + rev = name; + sha256 = "13d5jkmh9nh4c2kjch8k8amslnxapa9vkqzrk1z6rqmw8qgvzbkj"; + }; + + buildInputs = [ autoreconfHook pkgconfig udev libusb ]; + + meta = with stdenv.lib; { + homepage = https://github.com/signal11/hidapi; + description = "for communicating with USB and Bluetooth HID devices"; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/development/libraries/hivex/default.nix b/pkgs/development/libraries/hivex/default.nix new file mode 100644 index 000000000000..4f0b3826022f --- /dev/null +++ b/pkgs/development/libraries/hivex/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, pkgconfig, automake, autoconf, libtool, makeWrapper +, perl, libxml2, IOStringy }: + +stdenv.mkDerivation rec { + name = "hivex-${version}"; + version = "1.3.11"; + + src = fetchurl { + url = "http://libguestfs.org/download/hivex/${name}.tar.gz"; + sha256 = "0y3nqykwy58divxkv7gmsb067dasyfz3apbp437hl57rgrndyfn6"; + }; + + patches = [ ./hivex-syms.patch ]; + + buildInputs = [ + pkgconfig automake autoconf libtool makeWrapper + perl libxml2 IOStringy + ]; + + preConfigure = '' + AUTOPOINT=true autoreconf --verbose --install + ''; + + postInstall = '' + for bin in $out/bin/*; do + wrapProgram "$bin" --prefix "PATH" : "$out/bin" + done + ''; + + meta = with stdenv.lib; { + description = "Windows registry hive extraction library"; + license = licenses.lgpl2; + homepage = https://github.com/libguestfs/hivex; + maintainers = with maintainers; [offline]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/development/libraries/hivex/hivex-syms.patch b/pkgs/development/libraries/hivex/hivex-syms.patch new file mode 100644 index 000000000000..2280ade59a62 --- /dev/null +++ b/pkgs/development/libraries/hivex/hivex-syms.patch @@ -0,0 +1,13 @@ +diff -rupN hivex-1.3.11/lib/Makefile.am hivex-1.3.11-new/lib/Makefile.am +--- hivex-1.3.11/lib/Makefile.am 2013-09-10 13:04:12.000000000 +0200 ++++ hivex-1.3.11-new/lib/Makefile.am 2014-11-06 01:31:05.956106861 +0100 +@@ -40,8 +40,7 @@ libhivex_la_SOURCES = \ + + libhivex_la_LIBADD = ../gnulib/lib/libgnu.la $(LTLIBOBJS) + libhivex_la_LDFLAGS = \ +- -version-info 0:0:0 \ +- $(VERSION_SCRIPT_FLAGS)$(srcdir)/hivex.syms \ ++ -version-info 0:0:0 + $(LTLIBICONV) \ + $(LTLIBINTL) \ + $(LTLIBTHREAD) diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix index bb1f6b630845..9d5b11501fc1 100644 --- a/pkgs/development/libraries/http-parser/default.nix +++ b/pkgs/development/libraries/http-parser/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, gyp, utillinux, python, fixDarwinDylibNames }: let - version = "2.2.1"; + version = "2.3"; in stdenv.mkDerivation { name = "http-parser-${version}"; src = fetchurl { url = "https://github.com/joyent/http-parser/archive/v${version}.tar.gz"; - sha256 = "0p8wmchqsj9kwa8pg2is7v0h83q5lqns3vnm6sxrld7gaz979zh5"; + sha256 = "1qnm466wp8zncr8na4xj2wndfzzfiahafhsaigj8cv35nx56pziv"; }; patches = [ ./build-shared.patch ]; diff --git a/pkgs/development/libraries/id3lib/default.nix b/pkgs/development/libraries/id3lib/default.nix index 4d94624ce78b..0ea1e96947ea 100644 --- a/pkgs/development/libraries/id3lib/default.nix +++ b/pkgs/development/libraries/id3lib/default.nix @@ -9,6 +9,6 @@ stdenv.mkDerivation { src = fetchurl { url = mirror://sourceforge/id3lib/id3lib-3.8.3.tar.gz; - md5 = "19f27ddd2dda4b2d26a559a4f0f402a7"; + sha256 = "0yfhqwk0w8q2hyv1jib1008jvzmwlpsxvc8qjllhna6p1hycqj97"; }; } diff --git a/pkgs/development/libraries/ijs/default.nix b/pkgs/development/libraries/ijs/default.nix new file mode 100644 index 000000000000..5350630dac40 --- /dev/null +++ b/pkgs/development/libraries/ijs/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, autoreconfHook }: + +let version = "9.15"; +in +stdenv.mkDerivation { + name = "ijs-${version}"; + + src = fetchurl { + url = "http://downloads.ghostscript.com/public/ghostscript-${version}.tar.bz2"; + sha256 = "0p1isp6ssfay141klirn7n9s8b546vcz6paksfmksbwy0ljsypg6"; + }; + + prePatch = "cd ijs"; + + enableParallelBuilding = true; + + nativeBuildInputs = [ autoreconfHook ]; + + configureFlags = [ "--disable-static" "--enable-shared" ]; + + meta = with stdenv.lib; { + homepage = https://www.openprinting.org/download/ijs/; + description = "Raster printer driver architecture"; + + license = licenses.gpl3Plus; + + platforms = platforms.all; + maintainers = [ maintainers.abbradar ]; + }; +} diff --git a/pkgs/development/libraries/imlib/default.nix b/pkgs/development/libraries/imlib/default.nix index 27aaad7598a0..d8193926fef5 100644 --- a/pkgs/development/libraries/imlib/default.nix +++ b/pkgs/development/libraries/imlib/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "imlib-1.9.15"; src = fetchurl { url = http://tarballs.nixos.org/imlib-1.9.15.tar.gz; - md5 = "2a5561457e7f8b2e04d88f73508fd13a"; + sha256 = "0ggjxyvgp4pxc0b88v40xj9daz90518ydnycw7qax011gxpr12d3"; }; configureFlags = " diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index 5b19323f9434..53f978551cdd 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, x11, libjpeg, libtiff, libungif, libpng, bzip2, pkgconfig }: +{ stdenv, fetchurl, x11, libjpeg, libtiff, giflib, libpng, bzip2, pkgconfig }: stdenv.mkDerivation rec { name = "imlib2-1.4.6"; @@ -8,10 +8,14 @@ stdenv.mkDerivation rec { sha256 = "0x1j0ylpclkp8cfpwfpkjywqz124bqskyxbw8pvwzkv2gmrbwldg"; }; - buildInputs = [ x11 libjpeg libtiff libungif libpng bzip2 ]; + buildInputs = [ x11 libjpeg libtiff giflib libpng bzip2 ]; nativeBuildInputs = [ pkgconfig ]; + # From + # https://github.com/PhantomX/slackbuilds/blob/master/imlib2/patches/imlib2-giflib51.patch + patches = [ ./giflib51.patch ]; + preConfigure = '' substituteInPlace imlib2-config.in \ --replace "@my_libs@" "" diff --git a/pkgs/development/libraries/imlib2/giflib51.patch b/pkgs/development/libraries/imlib2/giflib51.patch new file mode 100644 index 000000000000..97eaeb0b96e6 --- /dev/null +++ b/pkgs/development/libraries/imlib2/giflib51.patch @@ -0,0 +1,64 @@ +diff -ruN imlib2-1.4.6.orig/src/modules/loaders/loader_gif.c imlib2-1.4.6/src/modules/loaders/loader_gif.c +--- imlib2-1.4.6.orig/src/modules/loaders/loader_gif.c 2013-12-21 10:16:10.000000000 +0000 ++++ imlib2-1.4.6/src/modules/loaders/loader_gif.c 2014-05-27 09:52:35.857291512 +0000 +@@ -36,7 +36,7 @@ + #endif + if (fd < 0) + return 0; +- gif = DGifOpenFileHandle(fd); ++ gif = DGifOpenFileHandle(fd, NULL); + if (!gif) + { + close(fd); +@@ -60,13 +60,13 @@ + h = gif->Image.Height; + if (!IMAGE_DIMENSIONS_OK(w, h)) + { +- DGifCloseFile(gif); ++ DGifCloseFile(gif, NULL); + return 0; + } + rows = malloc(h * sizeof(GifRowType *)); + if (!rows) + { +- DGifCloseFile(gif); ++ DGifCloseFile(gif, NULL); + return 0; + } + for (i = 0; i < h; i++) +@@ -78,7 +78,7 @@ + rows[i] = malloc(w * sizeof(GifPixelType)); + if (!rows[i]) + { +- DGifCloseFile(gif); ++ DGifCloseFile(gif, NULL); + for (i = 0; i < h; i++) + { + if (rows[i]) +@@ -150,7 +150,7 @@ + im->data = (DATA32 *) malloc(sizeof(DATA32) * w * h); + if (!im->data) + { +- DGifCloseFile(gif); ++ DGifCloseFile(gif, NULL); + free(rows); + return 0; + } +@@ -181,7 +181,7 @@ + last_per = (int)per; + if (!(progress(im, (int)per, 0, last_y, w, i))) + { +- DGifCloseFile(gif); ++ DGifCloseFile(gif, NULL); + for (i = 0; i < h; i++) + { + free(rows[i]); +@@ -198,7 +198,7 @@ + { + progress(im, 100, 0, last_y, w, h); + } +- DGifCloseFile(gif); ++ DGifCloseFile(gif, NULL); + for (i = 0; i < h; i++) + { + free(rows[i]); \ No newline at end of file diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix index 987e1a25d35f..9477aca59733 100644 --- a/pkgs/development/libraries/iso-codes/default.nix +++ b/pkgs/development/libraries/iso-codes/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, gettext, python, xz}: stdenv.mkDerivation rec { - name = "iso-codes-3.51"; + name = "iso-codes-3.56"; src = fetchurl { url = "http://pkg-isocodes.alioth.debian.org/downloads/${name}.tar.xz"; - sha256 = "0zyp99l4m8cd6301x8zi3xxhziam6v0ic1h8qxb1l0mcjafzf8jj"; + sha256 = "0vnfygd03jg21i7r238n450wy2hp354f3ank0v3k34zchbjydl2m"; }; patchPhase = '' for i in `find . -name \*.py` diff --git a/pkgs/development/libraries/java/classpath/default.nix b/pkgs/development/libraries/java/classpath/default.nix index eff52cc177b6..898813be7f88 100644 --- a/pkgs/development/libraries/java/classpath/default.nix +++ b/pkgs/development/libraries/java/classpath/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/classpath/; # The exception makes it similar to LGPLv2+ AFAICS. - license = "GPLv2+ + exception"; + license = stdenv.lib.licenses.gpl2ClasspathPlus; maintainers = [ ]; }; diff --git a/pkgs/development/libraries/java/commons/bsf/default.nix b/pkgs/development/libraries/java/commons/bsf/default.nix new file mode 100644 index 000000000000..b29286831841 --- /dev/null +++ b/pkgs/development/libraries/java/commons/bsf/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation { + name = "commons-bsf-1.2"; + + src = fetchurl { + url = mirror://apache/commons/bsf/binaries/bsf-bin-2.4.0.tar.gz; + sha256 = "1my3hv4y8cvrd1kr315wvbjqsamzlzswnbqcmsa2m4hqcafddfr8"; + }; + + installPhase = '' + mkdir -p $out/share/java + cp lib/bsf.jar $out/share/java/ + ''; + + meta = { + description = "Interface to scripting languages, including JSR-223"; + homepage = http://commons.apache.org/proper/commons-bsf/; + license = stdenv.lib.licenses.asl20; + }; +} + diff --git a/pkgs/development/libraries/java/commons/compress/default.nix b/pkgs/development/libraries/java/commons/compress/default.nix index 2c20d9a9b362..4e04ba47c858 100644 --- a/pkgs/development/libraries/java/commons/compress/default.nix +++ b/pkgs/development/libraries/java/commons/compress/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://commons.apache.org/proper/commons-compress"; - description = "Allows manipulation of ar, cpio, Unix dump, tar, zip, gzip, XZ, Pack200, bzip2, 7z, arj, lzma, snappy, DEFLATE and Z files."; + homepage = http://commons.apache.org/proper/commons-compress; + description = "Allows manipulation of ar, cpio, Unix dump, tar, zip, gzip, XZ, Pack200, bzip2, 7z, arj, lzma, snappy, DEFLATE and Z files"; maintainers = with stdenv.lib.maintainers; [ copumpkin ]; license = stdenv.lib.licenses.asl20; }; diff --git a/pkgs/development/libraries/java/commons/fileupload/default.nix b/pkgs/development/libraries/java/commons/fileupload/default.nix index ebb8a7d7f9db..2018e3f11f2d 100644 --- a/pkgs/development/libraries/java/commons/fileupload/default.nix +++ b/pkgs/development/libraries/java/commons/fileupload/default.nix @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://commons.apache.org/proper/commons-fileupload"; - description = "Makes it easy to add robust, high-performance, file upload capability to your servlets and web applications."; + homepage = http://commons.apache.org/proper/commons-fileupload; + description = "Makes it easy to add robust, high-performance, file upload capability to your servlets and web applications"; maintainers = with stdenv.lib.maintainers; [ copumpkin ]; license = stdenv.lib.licenses.asl20; }; diff --git a/pkgs/development/libraries/java/commons/logging/default.nix b/pkgs/development/libraries/java/commons/logging/default.nix new file mode 100644 index 000000000000..ee4074702024 --- /dev/null +++ b/pkgs/development/libraries/java/commons/logging/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation { + name = "commons-logging-1.2"; + + src = fetchurl { + url = mirror://apache/commons/logging/binaries/commons-logging-1.2-bin.tar.gz; + sha256 = "1gc70pmcv0x6ibl89jglmr22f8zpr63iaifi49nrq399qw2qhx9z"; + }; + + installPhase = '' + mkdir -p $out/share/java + cp commons-logging-*.jar $out/share/java/ + ''; + + meta = { + description = "Wrapper around a variety of logging API implementations"; + homepage = http://commons.apache.org/proper/commons-logging; + license = stdenv.lib.licenses.asl20; + }; +} + diff --git a/pkgs/development/libraries/kyotocabinet/default.nix b/pkgs/development/libraries/kyotocabinet/default.nix new file mode 100644 index 000000000000..6c4575b4e9d4 --- /dev/null +++ b/pkgs/development/libraries/kyotocabinet/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, zlib }: + +stdenv.mkDerivation rec { + name = "kyotocabinet-1.2.76"; + + src = fetchurl { + url = "http://fallabs.com/kyotocabinet/pkg/${name}.tar.gz"; + sha256 = "0g6js20x7vnpq4p8ghbw3mh9wpqksya9vwhzdx6dnlf354zjsal1"; + }; + + buildInputs = [ zlib ]; + + meta = with stdenv.lib; { + homepage = http://fallabs.com/kyotocabinet; + description = "a library of routines for managing a database"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/development/libraries/lcms2/default.nix b/pkgs/development/libraries/lcms2/default.nix index 521118f31757..8bb015a6c5f4 100644 --- a/pkgs/development/libraries/lcms2/default.nix +++ b/pkgs/development/libraries/lcms2/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, libtiff, libjpeg, zlib}: stdenv.mkDerivation rec { - name = "lcms2-2.5"; + name = "lcms2-2.6"; src = fetchurl { url = "mirror://sourceforge/lcms/${name}.tar.gz"; - sha256 = "0ax71bmscjzlpmg1r8vj3dypxf2jr7j9qfx5vc8j22j78hmpf9v7"; + sha256 = "1c8lgq8gfs3nyplvbx9k8wzfj6r2bqi3f611vb1m8z3476454wji"; }; propagatedBuildInputs = [ libtiff libjpeg zlib ]; diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix new file mode 100644 index 000000000000..26748d50479a --- /dev/null +++ b/pkgs/development/libraries/ldb/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, python27, pkgconfig, readline, gettext, tdb, talloc, tevent +, popt, libxslt, docbook_xsl, docbook_xml_dtd_42 +, acl ? null, heimdal ? null, libaio ? null, libcap ? null, libgcrypt ? null +, sasl ? null, pam ? null, zlib ? null, openldap ? null +}: + +stdenv.mkDerivation rec { + name = "ldb-1.1.17"; + + src = fetchurl { + url = "http://samba.org/ftp/ldb/${name}.tar.gz"; + sha256 = "1rmnppbk06aa1kfdrxi4xyjw2zzx54jqyz95dmqn754ys6m158xr"; + }; + + buildInputs = [ + python27 pkgconfig readline gettext tdb talloc tevent popt + libxslt docbook_xsl docbook_xml_dtd_42 + acl heimdal libaio libcap libgcrypt sasl pam zlib openldap + ]; + + preConfigure = '' + sed -i 's,#!/usr/bin/env python,#!${python27}/bin/python,g' buildtools/bin/waf + ''; + + configureFlags = [ + "--bundled-libraries=NONE" + "--builtin-libraries=replace" + ]; + + meta = with stdenv.lib; { + description = "a LDAP-like embedded database"; + homepage = http://ldb.samba.org/; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ wkennington ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix index 8479551d28d0..21c95066b336 100644 --- a/pkgs/development/libraries/ldns/default.nix +++ b/pkgs/development/libraries/ldns/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, openssl, perl}: stdenv.mkDerivation rec { - name = "ldns-1.6.16"; + name = "ldns-1.6.17"; src = fetchurl { url = "http://www.nlnetlabs.nl/downloads/ldns/${name}.tar.gz"; - sha256 = "15gn9m95r6sq2n55dw4r87p2aljb5lvy1w0y0br70wbr0p5zkci4"; + sha256 = "1kf8pkwhcssvgzhh6ha1pjjiziwvwmfaali7kaafh6118mcy124b"; }; patchPhase = '' diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix index ecd63e98f191..ae5d49f28506 100644 --- a/pkgs/development/libraries/leptonica/default.nix +++ b/pkgs/development/libraries/leptonica/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation { description = "Image processing and analysis library"; homepage = http://www.leptonica.org/; # Its own license: http://www.leptonica.org/about-the-license.html - license = "free"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/development/libraries/leveldb/default.nix index 64c03798fea2..fd668fbcad95 100644 --- a/pkgs/development/libraries/leveldb/default.nix +++ b/pkgs/development/libraries/leveldb/default.nix @@ -1,27 +1,34 @@ -{stdenv, fetchurl}: +{ stdenv, fetchFromGitHub, sqlite, kyotocabinet }: stdenv.mkDerivation rec { - name = "leveldb-1.15.0"; + name = "leveldb-${version}"; + version = "1.18"; - src = fetchurl { - url = "https://leveldb.googlecode.com/files/${name}.tar.gz"; - sha256 = "10363j8qmlyh971ipb7fmgk9b97bl5267c0xyccrgvpj3rbyri6p"; + src = fetchFromGitHub { + owner = "google"; + repo = "leveldb"; + rev = "v${version}"; + sha256 = "1bnsii47vbyqnbah42qgq6pbmmcg4k3fynjnw7whqfv6lpdgmb8d"; }; - buildPhase = "make all db_bench"; + buildInputs = [ sqlite kyotocabinet ]; + + buildPhase = '' + make all db_bench{,_sqlite3,_tree_db} leveldbutil + ''; installPhase = " - mkdir -p $out/lib/ - cp libleveldb* $out/lib/ - mkdir -p $out/include/ - cp -r include $out/ - mkdir -p $out/bin/ - cp db_bench $out/lib/ + mkdir -p $out/{bin,lib,include} + cp -r include $out + cp lib* $out/lib + cp db_bench{,_sqlite3,_tree_db} leveldbutil $out/bin "; - meta = { + meta = with stdenv.lib; { homepage = "https://code.google.com/p/leveldb/"; description = "Fast and lightweight key/value database library by Google"; - license = "BSD"; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libantlr3c/default.nix b/pkgs/development/libraries/libantlr3c/default.nix new file mode 100644 index 000000000000..5f0b1ccd18ec --- /dev/null +++ b/pkgs/development/libraries/libantlr3c/default.nix @@ -0,0 +1,19 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation { + name = "libantlr3c-3.4"; + src = fetchurl { + url = http://www.antlr3.org/download/C/libantlr3c-3.4.tar.gz; + sha256 ="0lpbnb4dq4azmsvlhp6khq1gy42kyqyjv8gww74g5lm2y6blm4fa"; + }; + + configureFlags = if stdenv.is64bit then "--enable-64bit" else ""; + + meta = with stdenv.lib; { + description = "C runtime libraries of ANTLR v3"; + homepage = http://www.antlr3.org/; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ vbgl ]; + }; +} diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix index 90ce4f970e3d..2bcf7e5d21c7 100644 --- a/pkgs/development/libraries/libassuan/default.nix +++ b/pkgs/development/libraries/libassuan/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, pth, libgpgerror }: stdenv.mkDerivation rec { - name = "libassuan-2.1.1"; + name = "libassuan-2.1.2"; src = fetchurl { url = "mirror://gnupg/libassuan/${name}.tar.bz2"; - sha256 = "1783nb0b6nr9yjhb5wfh8ykc5w89f4anppz1kz9913mqg5vxdqi3"; + sha256 = "0yxp3mdsxg75aj3h2r94vzad5i1y2mh0df9pv76ggals6k4sgy1r"; }; propagatedBuildInputs = [ libgpgerror pth ]; diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index ce0b0d5d755f..1313bc3feebc 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -28,7 +28,7 @@ let result = { libav_0_8 = libavFun "0.8.16" "df88b8f7d04d47edea8b19d80814227f0c058e57"; libav_9 = libavFun "9.17" "5899d51947b62f6b0cf9795ec2330d5ed59a3273"; - libav_10 = libavFun "10.5" "925a45d2700a436c28e0b663510fc8df5bb7e861"; + libav_11 = libavFun "11" "21f3c7c2154c0ad703872f2faa65ef20d6b7a14f"; }; libavFun = version : sha1 : stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix index 34352484738c..b1a937c1a012 100644 --- a/pkgs/development/libraries/libbluray/default.nix +++ b/pkgs/development/libraries/libbluray/default.nix @@ -13,12 +13,12 @@ assert withFonts -> freetype != null; stdenv.mkDerivation rec { baseName = "libbluray"; - version = "0.6.0"; + version = "0.6.2"; name = "${baseName}-${version}"; src = fetchurl { url = "ftp://ftp.videolan.org/pub/videolan/${baseName}/${version}/${name}.tar.bz2"; - sha256 = "0zsk16p7rxwbyizm87i7x2fcy3gwjfnlfd2gi2n17fv6gajvsyv2"; + sha256 = "1l2wr9mwz5pikqxlxkjfw3rwz0l1j0n7x9hl80sfiqm1lk41194c"; }; nativeBuildInputs = with stdenv.lib; diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index 758f86e5f9a5..bc88d8dc12cd 100644 --- a/pkgs/development/libraries/libbsd/default.nix +++ b/pkgs/development/libraries/libbsd/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: -let name = "libbsd-0.3.0"; +let name = "libbsd-0.7.0"; in stdenv.mkDerivation { inherit name; src = fetchurl { - url = "http://libbsd.freedesktop.org/releases/${name}.tar.gz"; - sha256 = "fbf36ed40443e1d0d795adbae8d461952509e610c3ccf0866ae160b723f7fe38"; + url = "http://libbsd.freedesktop.org/releases/${name}.tar.xz"; + sha256 = "1fqhbi0vd6xjxazf633x388cc8qyn58l78704s0h6k63wlbhwfqg"; }; patchPhase = '' diff --git a/pkgs/development/libraries/libc++/darwin.patch b/pkgs/development/libraries/libc++/darwin.patch new file mode 100644 index 000000000000..bf83f169cfc3 --- /dev/null +++ b/pkgs/development/libraries/libc++/darwin.patch @@ -0,0 +1,30 @@ +diff -ru -x '*~' libcxx-3.4.2.src-orig/lib/CMakeLists.txt libcxx-3.4.2.src/lib/CMakeLists.txt +--- libcxx-3.4.2.src-orig/lib/CMakeLists.txt 2013-11-15 18:18:57.000000000 +0100 ++++ libcxx-3.4.2.src/lib/CMakeLists.txt 2014-09-24 14:04:01.000000000 +0200 +@@ -56,7 +56,7 @@ + "-compatibility_version 1" + "-current_version ${LIBCXX_VERSION}" + "-install_name /usr/lib/libc++.1.dylib" +- "-Wl,-reexport_library,/usr/lib/libc++abi.dylib" ++ "-Wl,-reexport_library,${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib" + "-Wl,-unexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++unexp.exp" + "/usr/lib/libSystem.B.dylib") + else() +@@ -64,14 +64,14 @@ + list(FIND ${CMAKE_OSX_ARCHITECTURES} "armv7" OSX_HAS_ARMV7) + if (OSX_HAS_ARMV7) + set(OSX_RE_EXPORT_LINE +- "${CMAKE_OSX_SYSROOT}/usr/lib/libc++abi.dylib" ++ "${CMAKE_OSX_SYSROOT}${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib" + "-Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++sjlj-abi.exp") + else() + set(OSX_RE_EXPORT_LINE +- "-Wl,-reexport_library,${CMAKE_OSX_SYSROOT}/usr/lib/libc++abi.dylib") ++ "-Wl,-reexport_library,${CMAKE_OSX_SYSROOT}${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib") + endif() + else() +- set (OSX_RE_EXPORT_LINE "/usr/lib/libc++abi.dylib -Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++abi${LIBCXX_LIBCPPABI_VERSION}.exp") ++ set (OSX_RE_EXPORT_LINE "${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib -Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++abi${LIBCXX_LIBCPPABI_VERSION}.exp") + endif() + + list(APPEND link_flags diff --git a/pkgs/development/libraries/libc++/default.nix b/pkgs/development/libraries/libc++/default.nix index 21a07d6f7d4b..99e9bfe1de2e 100644 --- a/pkgs/development/libraries/libc++/default.nix +++ b/pkgs/development/libraries/libc++/default.nix @@ -1,9 +1,8 @@ -{ stdenv, fetchurl, fetchsvn, cmake, libcxxabi, python }: +{ lib, stdenv, fetchurl, cmake, libcxxabi, fixDarwinDylibNames }: -let - version = "3.4.2"; +let version = "3.4.2"; in -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "libc++-${version}"; src = fetchurl { @@ -11,21 +10,32 @@ in stdenv.mkDerivation rec { sha256 = "0z3jdvgcq995khkpis5c5vaxhbmvbqjlalbhn09k6pgb5zp46rc2"; }; - buildInputs = [ cmake libcxxabi python ]; + patches = [ ./darwin.patch ]; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" - "-DLIBCXX_LIBCXXABI_INCLUDE_PATHS=${libcxxabi}/include" - "-DLIBCXX_CXX_ABI=libcxxabi" ]; + buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + + cmakeFlags = + [ "-DCMAKE_BUILD_TYPE=Release" + "-DLIBCXX_LIBCXXABI_INCLUDE_PATHS=${libcxxabi}/include" + "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" + "-DLIBCXX_LIBCPPABI_VERSION=2" + "-DLIBCXX_CXX_ABI=libcxxabi" + ]; enableParallelBuilding = true; - passthru.abi = libcxxabi; + inherit libcxxabi; + + # Remove a Makefile that causes many retained dependencies. + postInstall = "rm $out/include/c++/v1/Makefile"; + + setupHook = ./setup-hook.sh; meta = { homepage = http://libcxx.llvm.org/; description = "A new implementation of the C++ standard library, targeting C++11"; license = "BSD"; maintainers = [ stdenv.lib.maintainers.shlevy ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libc++/setup-hook.sh b/pkgs/development/libraries/libc++/setup-hook.sh new file mode 100644 index 000000000000..8543d09d8f52 --- /dev/null +++ b/pkgs/development/libraries/libc++/setup-hook.sh @@ -0,0 +1,2 @@ +export NIX_CFLAGS_COMPILE+=" -isystem @out@/include/c++/v1 -stdlib=libc++" +export NIX_CFLAGS_LINK+=" -stdlib=libc++ -Wl,-rpath,@libcxxabi@/lib" diff --git a/pkgs/development/libraries/libc++abi/darwin.patch b/pkgs/development/libraries/libc++abi/darwin.patch new file mode 100644 index 000000000000..53ea8783f7a8 --- /dev/null +++ b/pkgs/development/libraries/libc++abi/darwin.patch @@ -0,0 +1,17 @@ +diff -ru -x '*~' libcxxabi-orig/lib/buildit libcxxabi/lib/buildit +--- libcxxabi-orig/lib/buildit 2014-09-18 16:54:14.000000000 +0200 ++++ libcxxabi/lib/buildit 2014-09-24 13:22:27.000000000 +0200 +@@ -51,12 +51,8 @@ + -dynamiclib -nodefaultlibs \ + -current_version ${RC_ProjectSourceVersion} \ + -compatibility_version 1 \ +- -install_name /usr/lib/libc++abi.dylib \ ++ -install_name $out/lib/libc++abi.dylib \ + -lSystem" +- if [ -f "${SDKROOT}/usr/local/lib/libCrashReporterClient.a" ] +- then +- LDSHARED_FLAGS+=" -lCrashReporterClient" +- fi + ;; + *-*-mingw*) + # FIXME: removing libgcc and libsupc++ dependencies means porting libcxxrt and LLVM/compiler-rt diff --git a/pkgs/development/libraries/libc++abi/default.nix b/pkgs/development/libraries/libc++abi/default.nix index dd1f46a9ab38..cbfe8e8f6659 100644 --- a/pkgs/development/libraries/libc++abi/default.nix +++ b/pkgs/development/libraries/libc++abi/default.nix @@ -1,31 +1,43 @@ -{ stdenv, fetchsvn, libcxx, libunwind }: -let - rev = "199626"; -in stdenv.mkDerivation { - name = "libcxxabi-pre-${rev}"; - - src = fetchsvn { - url = http://llvm.org/svn/llvm-project/libcxxabi/trunk; - rev = "199626"; - sha256 = "0h1x1s40x5r65ar53rv34lmgcfil3zxaknqr64dka1mz29xhhrxy"; +{ lib, stdenv, fetchurl, libcxx, coreutils, gnused }: + +let rev = "199626"; in + +stdenv.mkDerivation { + name = "libc++abi-${rev}"; + + src = fetchurl { + url = "http://tarballs.nixos.org/libcxxabi-${rev}.tar.bz2"; + sha256 = "09wr6qwgmdzbmgfkdzfhph9giy0zd6fp3s017fcfy4g0prjn5s4c"; }; - NIX_CFLAGS_LINK="-L${libunwind}/lib -lunwind"; + patches = [ ./no-stdc++.patch ./darwin.patch ]; + + buildInputs = [ coreutils ]; postUnpack = '' unpackFile ${libcxx.src} - export NIX_CFLAGS_COMPILE="-I${libunwind}/include -I$PWD/include -I$(readlink -f libcxx-*)/include" - ''; - - installPhase = '' - install -d -m 755 $out/include $out/lib - install -m 644 lib/libc++abi.so.1.0 $out/lib - install -m 644 include/cxxabi.h $out/include - ln -s libc++abi.so.1.0 $out/lib/libc++abi.so - ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1 + cp -r libcxx-*/include libcxxabi*/ + '' + lib.optionalString stdenv.isDarwin '' + export TRIPLE=x86_64-apple-darwin + # Hack: NIX_CFLAGS_COMPILE doesn't work here because clang++ isn't + # wrapped at this point. + export CXX="clang++ -D_LIBCXX_DYNAMIC_FALLBACK=1" + unset SDKROOT ''; - patchPhase = "sed -e s,-lstdc++,, -i lib/buildit"; + installPhase = if stdenv.isDarwin + then '' + install -d -m 755 $out/include $out/lib + install -m 644 lib/libc++abi.dylib $out/lib + install -m 644 include/cxxabi.h $out/include + '' + else '' + install -d -m 755 $out/include $out/lib + install -m 644 lib/libc++abi.so.1.0 $out/lib + install -m 644 include/cxxabi.h $out/include + ln -s libc++abi.so.1.0 $out/lib/libc++abi.so + ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1 + ''; buildPhase = "(cd lib; ./buildit)"; @@ -33,7 +45,7 @@ in stdenv.mkDerivation { homepage = http://libcxxabi.llvm.org/; description = "A new implementation of low level support for a standard C++ library"; license = "BSD"; - maintainers = [ stdenv.lib.maintainers.shlevy ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ shlevy vlstill ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libc++abi/no-stdc++.patch b/pkgs/development/libraries/libc++abi/no-stdc++.patch new file mode 100644 index 000000000000..ddc9778a486e --- /dev/null +++ b/pkgs/development/libraries/libc++abi/no-stdc++.patch @@ -0,0 +1,12 @@ +diff -ru -x '*~' libcxxabi-orig/lib/buildit libcxxabi/lib/buildit +--- libcxxabi-orig/lib/buildit 2014-09-18 16:54:14.000000000 +0200 ++++ libcxxabi/lib/buildit 2014-09-24 13:22:27.000000000 +0200 +@@ -70,7 +66,7 @@ + SOEXT=so + LDSHARED_FLAGS="-o libc++abi.so.1.0 \ + -shared -nodefaultlibs -Wl,-soname,libc++abi.so.1 \ +- -lpthread -lrt -lc -lstdc++" ++ -lpthread -lrt -lc" + ;; + esac + diff --git a/pkgs/development/libraries/libcaca/default.nix b/pkgs/development/libraries/libcaca/default.nix index f183d9c3cd06..de2ab0ff3b15 100644 --- a/pkgs/development/libraries/libcaca/default.nix +++ b/pkgs/development/libraries/libcaca/default.nix @@ -1,20 +1,20 @@ {stdenv, fetchurl, ncurses}: stdenv.mkDerivation rec { - name = "libcaca-0.99.beta18"; - + name = "libcaca-0.99.beta19"; + src = fetchurl { url = "http://caca.zoy.org/files/libcaca/${name}.tar.gz"; - sha256 = "189kdh7zi88gxb3w33rh0p5l0yhn7s1c2xjgrpf24q2a7xihdskp"; + sha256 = "1x3j6yfyxl52adgnabycr0n38j9hx2j74la0hz0n8cnh9ry4d2qj"; }; - + configureFlags = "--disable-x11 --disable-imlib2 --disable-doc"; - + propagatedBuildInputs = [ncurses]; meta = { homepage = http://libcaca.zoy.org/; description = "A graphics library that outputs text instead of pixels"; - license = "WTFPL"; # http://sam.zoy.org/wtfpl/ + license = stdenv.lib.licenses.wtfpl; }; } diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix index ac7b428bfb00..02dd10841c16 100644 --- a/pkgs/development/libraries/libcdio/default.nix +++ b/pkgs/development/libraries/libcdio/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libcddb, pkgconfig, ncurses, help2man }: stdenv.mkDerivation rec { - name = "libcdio-0.92"; + name = "libcdio-0.93"; src = fetchurl { - url = "mirror://gnu/libcdio/${name}.tar.gz"; - sha256 = "1b9zngn8nnxb1yyngi1kwi73nahp4lsx59j17q1bahzz58svydik"; + url = "mirror://gnu/libcdio/${name}.tar.bz2"; + sha256 = "1a6x2c5bvpnkn7lhmxkjgz4axmh93m1clrlv41s1wzkc48lnc9zq"; }; buildInputs = [ libcddb pkgconfig ncurses help2man ]; diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix new file mode 100644 index 000000000000..853786c34045 --- /dev/null +++ b/pkgs/development/libraries/libcec/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, autoreconfHook, pkgconfig, udev }: + +let version = "2.1.4"; in + +stdenv.mkDerivation { + name = "libcec-${version}"; + + src = fetchurl { + url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz"; + sha256 = "0iz11zclbs3gk4ddq0pm4vyq015qmvy4nb9sra3vk6jw58izbgkr"; + }; + + buildInputs = [ autoreconfHook pkgconfig udev ]; + + # Fix dlopen path + patchPhase = '' + substituteInPlace include/cecloader.h --replace "libcec.so" "$out/lib/libcec.so" + ''; + + meta = with stdenv.lib; { + description = "USB CEC adapter communication library"; + homepage = "http://libcec.pulse-eight.com"; + repositories.git = "https://github.com/Pulse-Eight/libcec.git"; + license = stdenv.lib.licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.titanous ]; + }; +} diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix new file mode 100644 index 000000000000..a29107c38967 --- /dev/null +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchgit, autoconf, automake, libtool, +pkgconfig, perl, git, libevent, openssl}: + +stdenv.mkDerivation { + name = "libcouchbase-2.4.1"; + src = fetchgit { + url = "https://github.com/couchbase/libcouchbase.git"; + rev = "bd3a20f9e18a69dca199134956fd4ad3e1b80ca8"; + sha256 = "0gimvfxvbmhm6zy4vgs2630ygilhryxl8apfmv3iqs23pafwzm8r"; + leaveDotGit = true; + }; + + preConfigure = '' + patchShebangs ./config/ + ./config/autorun.sh + ''; + + configureFlags = "--disable-couchbasemock"; + + buildInputs = [ autoconf automake libtool pkgconfig perl git libevent openssl]; + + meta = { + description = "C client library for Couchbase."; + homepage = "https://github.com/couchbase/libcouchbase"; + license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.unix; + + }; +} \ No newline at end of file diff --git a/pkgs/development/libraries/libdc1394/default.nix b/pkgs/development/libraries/libdc1394/default.nix index bc5f6a1d7a03..afde4e260e8f 100644 --- a/pkgs/development/libraries/libdc1394/default.nix +++ b/pkgs/development/libraries/libdc1394/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libraw1394, libusb1 }: stdenv.mkDerivation rec { - name = "libdc1394-2.2.1"; + name = "libdc1394-2.2.3"; src = fetchurl { url = "mirror://sourceforge/libdc1394/${name}.tar.gz"; - sha256 = "1wkcx4ff094qba1fwllmlr81i7xg7l8dzq7y7pvy3wlbpwd3634j"; + sha256 = "1p9b4ciy97s04gmp7656cybr1zfd79hlw0ffhfb52m3zcn07h6aa"; }; buildInputs = [ libraw1394 libusb1 ]; diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix index d3053b4d2a5f..6cbbddfdba83 100644 --- a/pkgs/development/libraries/libdevil/default.nix +++ b/pkgs/development/libraries/libdevil/default.nix @@ -16,6 +16,15 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-ILU" "--enable-ILUT" ]; + preConfigure = '' + sed -i 's, -std=gnu99,,g' configure + sed -i 's,malloc.h,stdlib.h,g' src-ILU/ilur/ilur.c + ''; + + postConfigure = '' + sed -i '/RESTRICT_KEYWORD/d' include/IL/config.h + ''; + patches = [ ( fetchurl { url = http://patch-tracker.debian.org/patch/series/dl/devil/1.7.8-6.1/03_CVE-2009-3994.diff; diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index d7a6f8d54430..12e25b03a7b0 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.56"; + name = "libdrm-2.4.58"; src = fetchurl { url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "0c20wpfa94d8kww0f2xinmm4axsl4nhq921xj4i88yhpjbhbn3z2"; + sha256 = "b155fae6b9c9a3b02ef8b77f58c7c219194c996a4018dc55ba66c03996a365dd"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libdvdcss/default.nix b/pkgs/development/libraries/libdvdcss/default.nix index 40fa337bd66e..8632da12c735 100644 --- a/pkgs/development/libraries/libdvdcss/default.nix +++ b/pkgs/development/libraries/libdvdcss/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "libdvdcss-1.2.13"; + name = "libdvdcss-1.3.0"; src = fetchurl { - url = http://download.videolan.org/pub/libdvdcss/1.2.13/libdvdcss-1.2.13.tar.bz2; - sha256 = "0b5s25awn2md4jr00rwg5siwvi3kivyaxkjgfxzzh7ggrykbpwc4"; + url = http://download.videolan.org/pub/libdvdcss/1.3.0/libdvdcss-1.3.0.tar.bz2; + sha256 = "158k9zagmbk5bkbz96l6lwhh7xcgfcnzflkr4vblskhcab6llhbw"; }; meta = { diff --git a/pkgs/development/libraries/libechonest/default.nix b/pkgs/development/libraries/libechonest/default.nix new file mode 100644 index 000000000000..42a3c5f243b4 --- /dev/null +++ b/pkgs/development/libraries/libechonest/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, cmake, qt4, qjson, doxygen, boost }: + +stdenv.mkDerivation rec { + name = "libechonest-${version}"; + version = "2.3.0"; + + src = fetchurl { + url = "http://files.lfranchi.com/${name}.tar.bz2"; + sha1 = "cf1b279c96f15c87c36fdeb23b569a60cdfb01db"; + }; + + buildInputs = [ cmake qt4 qjson doxygen boost ]; + enableParallelBuilding = true; + + meta = { + description = "A C++/Qt wrapper around the Echo Nest API"; + homepage = "http://projects.kde.org/projects/playground/libs/libechonest"; + license = stdenv.lib.licenses.gpl2Plus; + }; +} diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix index 27c803fd81e0..f913ab8e4938 100644 --- a/pkgs/development/libraries/libedit/default.nix +++ b/pkgs/development/libraries/libedit/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { NROFF = "${groff}/bin/nroff"; postInstall = '' - sed -i s/-lncurses/-lncursesw/g $out/lib/pkgconfig/libedit.pc + sed -i ${stdenv.lib.optionalString (stdenv.isDarwin && stdenv.gcc.nativeTools) "''"} s/-lncurses/-lncursesw/g $out/lib/pkgconfig/libedit.pc ''; configureFlags = [ "--enable-widec" ]; diff --git a/pkgs/development/libraries/libee/default.nix b/pkgs/development/libraries/libee/default.nix index c3c73381acd1..f3ea67ce93e1 100644 --- a/pkgs/development/libraries/libee/default.nix +++ b/pkgs/development/libraries/libee/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { src = fetchurl { url = http://www.libee.org/download/files/download/libee-0.4.1.tar.gz; - md5 = "7bbf4160876c12db6193c06e2badedb2"; + sha256 = "09xhgzmsq0g3jsyj24vy67bhzk2fv971w5ixdkhfwgar70cw1nn0"; }; buildInputs = [pkgconfig libestr]; diff --git a/pkgs/development/libraries/libetpan/default.nix b/pkgs/development/libraries/libetpan/default.nix new file mode 100644 index 000000000000..e628490f159a --- /dev/null +++ b/pkgs/development/libraries/libetpan/default.nix @@ -0,0 +1,24 @@ +{ autoconf, automake, fetchgit, libtool, stdenv, openssl }: + +let version = "1.5"; in + +stdenv.mkDerivation { + name = "libetpan-${version}"; + + meta = with stdenv.lib; { + description = "An efficient, portable library for different kinds of mail access: IMAP, SMTP, POP, and NNTP"; + homepage = http://www.etpan.org/libetpan.html; + license = licenses.bsd3; + platforms = platforms.linux; + }; + + src = fetchgit { + url = "git://github.com/dinhviethoa/libetpan"; + rev = "refs/tags/" + version; + sha256 = "bf9465121a0fb09418215ee3474a400ea5bc5ed05a6811a2978afe4905e140c9"; + }; + + buildInputs = [ autoconf automake libtool openssl ]; + + configureScript = "./autogen.sh"; +} diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix index 2776a3c0614c..5dac8f888959 100644 --- a/pkgs/development/libraries/libevdev/default.nix +++ b/pkgs/development/libraries/libevdev/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "libevdev-1.2"; + name = "libevdev-1.3"; src = fetchurl { url = "http://www.freedesktop.org/software/libevdev/${name}.tar.xz"; - sha256 = "0h54ym5rsmicl4gx7gcdaifpyndakbl38c5dcxgr27f0cy0635a1"; + sha256 = "0iil4pnla0kjdx52ay7igq65sx32sjbzn1wx9q3v74m5g7712m16"; }; buildInputs = [ python ]; meta = with stdenv.lib; { description = "Wrapper library for evdev devices"; - homepage = http://www.freedesktop.org/software/libevdev/doc/latest/index.html; + homepage = http://www.freedesktop.org/software/libevdev/doc/latest/index.html; license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.amorsillo ]; diff --git a/pkgs/development/libraries/libfakekey/default.nix b/pkgs/development/libraries/libfakekey/default.nix new file mode 100644 index 000000000000..4e74762f3f9d --- /dev/null +++ b/pkgs/development/libraries/libfakekey/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, libX11, libXi, libXtst, pkgconfig, xextproto }: + +stdenv.mkDerivation rec { + name = "libfakekey-${version}"; + version = "0.1"; + + src = fetchurl { + url = "http://downloads.yoctoproject.org/releases/matchbox/libfakekey/0.1/${name}.tar.gz"; + sha256 = "10msplyn535hmzbmbdnx4zc20hkaw6d81if5lzxs82k8sq2mkx9k"; + }; + + buildInputs = [ libX11 libXi libXtst pkgconfig xextproto ]; + + meta = with stdenv.lib; { + description = "X virtual keyboard library"; + homepage = https://www.yoctoproject.org/tools-resources/projects/matchbox; + license = licenses.gpl2; + maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libfaketime/default.nix b/pkgs/development/libraries/libfaketime/default.nix new file mode 100644 index 000000000000..7d430614257e --- /dev/null +++ b/pkgs/development/libraries/libfaketime/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "libfaketime-0.9.6"; + + src = fetchurl { + url = "http://www.code-wizards.com/projects/libfaketime/${name}.tar.gz"; + sha256 = "1dw2lqsv2iqwxg51mdn25b4fjj3v357s0mc6ahxawqp210krg29s"; + }; + + preBuild = '' + makeFlagsArray+=(PREFIX="$out" LIBDIRNAME=/lib) + ''; + + meta = with stdenv.lib; { + description = "Report faked system time to programs without having to change the system-wide time"; + homepage = http://www.code-wizards.com/projects/libfaketime/; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index da5a080521c6..ded6dbf25c81 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -16,13 +16,14 @@ stdenv.mkDerivation rec { "--with-gcc-arch=generic" # no detection of -march= or -mtune= ] ++ stdenv.lib.optional (stdenv.needsPax) "--enable-pax_emutramp"; - doCheck = stdenv.isLinux; # until we solve dejagnu problems on darwin and expect on BSD + #doCheck = stdenv.isLinux; # until we solve dejagnu problems on darwin and expect on BSD + doCheck = false; dontStrip = stdenv ? cross; # Don't run the native `strip' when cross-compiling. postInstall = # Install headers in the right place. - '' ln -s${if stdenv.isFreeBSD then "" else "r"}v "$out/lib/"libffi*/include "$out/include" + '' ln -s${if stdenv.isBSD then "" else "r"}v "$out/lib/"libffi*/include "$out/include" ''; meta = { @@ -46,10 +47,9 @@ stdenv.mkDerivation rec { homepage = http://sourceware.org/libffi/; # See http://github.com/atgreen/libffi/blob/master/LICENSE . - license = "free, non-copyleft"; + license = stdenv.lib.licenses.free; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.all; }; } - diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix index 9f42a1c8c3e8..efa9b90e869f 100644 --- a/pkgs/development/libraries/libfm/default.nix +++ b/pkgs/development/libraries/libfm/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, glib, gtk, intltool, menu-cache, pango, pkgconfig, vala , extraOnly ? false }: -let name = "libfm-1.2.2.1"; +let inherit (stdenv.lib) optional; in stdenv.mkDerivation { - name = if extraOnly then "libfm-extra-1.2.2.1" else "libfm-1.2.2.1"; + name = if extraOnly then "libfm-extra-1.2.3" else "libfm-1.2.3"; src = fetchurl { - url = "mirror://sourceforge/pcmanfm/libfm-1.2.2.1.tar.xz"; - sha256 = "0aa37arr0h2nppjh7ppf00np2d8mb43imvfq9b7wq5cnzpvs7c6v"; + url = "mirror://sourceforge/pcmanfm/libfm-1.2.3.tar.xz"; + sha256 = "1ygvw52262r3jp1f45m9cdpx5xgvd4rkyfszslfqvg2c99ig34n6"; }; buildInputs = [ glib gtk intltool pango pkgconfig vala ] @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = "http://blog.lxde.org/?cat=28/"; - license = licenses.gpl2Plus; + license = licenses.lgpl21Plus; description = "A glib-based library for file management"; maintainers = [ maintainers.ttuegel ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index ed267e23c87b..af2316320229 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation (rec { propagatedBuildInputs = [ libgpgerror ]; + configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-asm"; + doCheck = stdenv.system != "i686-linux"; # "basic" test fails after stdenv+glibc-2.18 # For some reason the tests don't find `libgpg-error.so'. @@ -18,6 +20,8 @@ stdenv.mkDerivation (rec { make check ''; + patches = [ ./no-build-timestamp.patch ]; + meta = { description = "General-pupose cryptographic library"; diff --git a/pkgs/development/libraries/libgcrypt/no-build-timestamp.patch b/pkgs/development/libraries/libgcrypt/no-build-timestamp.patch new file mode 100644 index 000000000000..6ae708f059d7 --- /dev/null +++ b/pkgs/development/libraries/libgcrypt/no-build-timestamp.patch @@ -0,0 +1,12 @@ +diff -ur libgcrypt-1.5.3.orig/configure libgcrypt-1.5.3/configure +--- libgcrypt-1.5.3.orig/configure 2013-07-25 11:22:47.000000000 +0200 ++++ libgcrypt-1.5.3/configure 2014-04-09 00:17:58.659147199 +0200 +@@ -16520,6 +16520,7 @@ + + + BUILD_TIMESTAMP=`date -u +%Y-%m-%dT%H:%M+0000 2>/dev/null || date` ++BUILD_TIMESTAMP=1970-01-01T00:00+0000 + + + cat >>confdefs.h <<_ACEOF +Only in libgcrypt-1.5.3: out diff --git a/pkgs/development/libraries/libgdiplus/giflib.patch b/pkgs/development/libraries/libgdiplus/giflib.patch index b1135f47f3ac..7b90d9863fd6 100644 --- a/pkgs/development/libraries/libgdiplus/giflib.patch +++ b/pkgs/development/libraries/libgdiplus/giflib.patch @@ -1,8 +1,7 @@ -diff --git a/src/gifcodec.c b/src/gifcodec.c -index 8dee0eb..564beed 100644 +diff -Naur libgdiplus-2.10.9-orig/src/gifcodec.c libgdiplus-2.10.9/src/gifcodec.c --- src/gifcodec.c +++ src/gifcodec.c -@@ -39,8 +39,10 @@ GUID gdip_gif_image_format_guid = {0xb96b3cb0U, 0x0728U, 0x11d3U, {0x9d, 0x7b, 0 +@@ -39,8 +39,10 @@ #include "gifcodec.h" @@ -13,7 +12,7 @@ index 8dee0eb..564beed 100644 /* Data structure used for callback */ typedef struct -@@ -105,7 +107,7 @@ gdip_gif_inputfunc (GifFileType *gif, GifByteType *data, int len) +@@ -105,7 +107,7 @@ */ static int @@ -22,7 +21,7 @@ index 8dee0eb..564beed 100644 { ExtensionBlock *ep; -@@ -129,7 +131,7 @@ AddExtensionBlockMono(SavedImage *New, int Len, BYTE ExtData[]) +@@ -129,7 +131,7 @@ if (ExtData) { memcpy(ep->Bytes, ExtData, Len); @@ -31,7 +30,7 @@ index 8dee0eb..564beed 100644 } return (GIF_OK); -@@ -232,20 +234,20 @@ DGifSlurpMono(GifFileType * GifFile, SavedImage *TrailingExtensions) +@@ -232,20 +234,20 @@ } case EXTENSION_RECORD_TYPE: { @@ -55,7 +54,7 @@ index 8dee0eb..564beed 100644 } break; } -@@ -303,12 +305,19 @@ gdip_load_gif_image (void *stream, GpImage **image, BOOL from_file) +@@ -303,12 +305,19 @@ result = NULL; loop_counter = FALSE; @@ -76,7 +75,25 @@ index 8dee0eb..564beed 100644 if (gif == NULL) { goto error; } -@@ -660,11 +669,22 @@ gdip_save_gif_image (void *stream, GpImage *image, BOOL from_file) +@@ -581,7 +590,7 @@ + } + + FreeExtensionMono(&global_extensions); +- DGifCloseFile (gif); ++ DGifCloseFile (gif, NULL); + + *image = result; + return Ok; +@@ -597,7 +606,7 @@ + + if (gif != NULL) { + FreeExtensionMono (&global_extensions); +- DGifCloseFile (gif); ++ DGifCloseFile (gif, NULL); + } + + *image = NULL; +@@ -660,11 +669,22 @@ return InvalidParameter; } @@ -99,7 +116,7 @@ index 8dee0eb..564beed 100644 if (!fp) { return FileNotFound; -@@ -848,8 +868,15 @@ gdip_save_gif_image (void *stream, GpImage *image, BOOL from_file) +@@ -848,8 +868,15 @@ Buffer[0] = 1; Buffer[1] = ptr[0]; Buffer[2] = ptr[1]; @@ -115,3 +132,12 @@ index 8dee0eb..564beed 100644 } } +@@ -923,7 +950,7 @@ + } + } + +- EGifCloseFile (fp); ++ EGifCloseFile (fp, NULL); + + return Ok; + diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index 4a6021918de4..ecea33275fe6 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -1,17 +1,28 @@ -{ stdenv, fetchurl, bash, gettext }: +{ stdenv, fetchurl, gettext }: -stdenv.mkDerivation (rec { - name = "libgpg-error-1.16"; +stdenv.mkDerivation rec { + name = "libgpg-error-1.17"; src = fetchurl { url = "mirror://gnupg/libgpg-error/${name}.tar.bz2"; - sha256 = "16xv59zcr177gvgj97vg0rm4rixrpb4lz1q9fji3xay47i83gm62"; + sha256 = "1dapxzxl1naghf342fwfc2w2f2c5hb9gr1a1s4n8dsqn26kybx1z"; }; + postPatch = "sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:00+0000/' -i ./configure"; + # If architecture-dependent MO files aren't available, they're generated # during build, so we need gettext for cross-builds. crossAttrs.buildInputs = [ gettext ]; + postConfigure = + stdenv.lib.optionalString stdenv.isSunOS + # For some reason, /bin/sh on OpenIndiana leads to this at the end of the + # `config.status' run: + # ./config.status[1401]: shift: (null): bad number + # (See <http://hydra.nixos.org/build/2931046/nixlog/1/raw>.) + # Thus, re-run it with Bash. + "${stdenv.shell} config.status"; + doCheck = true; meta = { @@ -31,15 +42,3 @@ stdenv.mkDerivation (rec { }; } -// - -(stdenv.lib.optionalAttrs stdenv.isSunOS { - # For some reason, /bin/sh on OpenIndiana leads to this at the end of the - # `config.status' run: - # ./config.status[1401]: shift: (null): bad number - # (See <http://hydra.nixos.org/build/2931046/nixlog/1/raw>.) - # Thus, re-run it with Bash. - postConfigure = - '' ${bash}/bin/sh config.status - ''; -})) diff --git a/pkgs/development/libraries/libgphoto2/2.4.nix b/pkgs/development/libraries/libgphoto2/2.4.nix deleted file mode 100644 index 3edc8d0ac6ca..000000000000 --- a/pkgs/development/libraries/libgphoto2/2.4.nix +++ /dev/null @@ -1,30 +0,0 @@ -{stdenv, fetchurl, pkgconfig, libusb, libtool, libexif, libjpeg, gettext}: - -stdenv.mkDerivation rec { - name = "libgphoto2-2.4.14"; - - src = fetchurl { - url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; - sha256 = "14h20s0kwqr1nsj90dgjwzs0r3h7z1cpmnivrikd0rrg4m2jvcsr"; - }; - - nativeBuildInputs = [ pkgconfig gettext ]; - buildInputs = [ libtool libjpeg ]; - - # These are mentioned in the Requires line of libgphoto's pkg-config file. - propagatedBuildInputs = [ libusb libexif ]; - - meta = { - homepage = http://www.gphoto.org/proj/libgphoto2/; - description = "A library for accessing digital cameras"; - longDescription = '' - This is the library backend for gphoto2. It contains the code for PTP, - MTP, and other vendor specific protocols for controlling and transferring data - from digital cameras. - ''; - # XXX: the homepage claims LGPL, but several src files are lgpl21Plus - license = stdenv.lib.licenses.lgpl21Plus; - platforms = with stdenv.lib.platforms; unix; - maintainers = with stdenv.lib.maintainers; [ jcumming ]; - }; -} diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index d739b0948743..24017d6f1c4b 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, libusb, libtool, libexif, libjpeg, gettext}: +{ stdenv, fetchurl, pkgconfig, libusb1, libtool, libexif, libjpeg, gettext }: stdenv.mkDerivation rec { name = "libgphoto2-${meta.version}"; @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; sha256 = "0ij80nixichihv3iic7cgdq3irssk8waz1c25m6yypjl4kg6n3k0"; }; - + nativeBuildInputs = [ pkgconfig gettext ]; - buildInputs = [ libtool libjpeg ]; + buildInputs = [ libtool libjpeg libusb1 ]; # These are mentioned in the Requires line of libgphoto's pkg-config file. - propagatedBuildInputs = [ libusb libexif ]; + propagatedBuildInputs = [ libexif ]; meta = { homepage = http://www.gphoto.org/proj/libgphoto2/; @@ -20,12 +20,13 @@ stdenv.mkDerivation rec { longDescription = '' This is the library backend for gphoto2. It contains the code for PTP, MTP, and other vendor specific protocols for controlling and transferring data - from digital cameras. + from digital cameras. ''; version = "2.5.5.1"; # XXX: the homepage claims LGPL, but several src files are lgpl21Plus - license = stdenv.lib.licenses.lgpl21Plus; + license = stdenv.lib.licenses.lgpl21Plus; platforms = with stdenv.lib.platforms; unix; maintainers = with stdenv.lib.maintainers; [ jcumming ]; }; } + diff --git a/pkgs/development/libraries/libgsystem/default.nix b/pkgs/development/libraries/libgsystem/default.nix new file mode 100644 index 000000000000..a555b4dd5f9d --- /dev/null +++ b/pkgs/development/libraries/libgsystem/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk_doc, gobjectIntrospection +, glib, attr, systemd +}: + +stdenv.mkDerivation { + name = "libgsystem-2014.2"; + + meta = with stdenv.lib; { + description = "GIO-based library with Unix/Linux specific API"; + homepage = "https://wiki.gnome.org/Projects/LibGSystem"; + license = licenses.lgpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ iyzsong ]; + }; + + src = fetchFromGitHub { + owner = "GNOME"; + repo = "libgsystem"; + rev = "v2014.2"; + sha256 = "10mqyy94wbmxv9rizwby4dyvqgranjr3hixr5k7fs90lhgbxbkj6"; + }; + + nativeBuildInputs = [ + autoreconfHook pkgconfig gtk_doc gobjectIntrospection + ]; + + propagatedBuildInputs = [ glib attr systemd ]; + + preAutoreconf = '' + mkdir m4 + ''; +} diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix new file mode 100644 index 000000000000..27e1c6adc008 --- /dev/null +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -0,0 +1,55 @@ +{ stdenv, fetchurl, pkgconfig, autoconf, automake, libtool, makeWrapper +, ncurses, cpio, gperf, perl, cdrkit, flex, bison, qemu, pcre, augeas, libxml2 +, acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex +, gmp, readline, file, libintlperl, GetoptLong, SysVirt }: + +stdenv.mkDerivation rec { + name = "libguestfs-${version}"; + version = "1.29.5"; + + appliance = fetchurl { + url = "http://libguestfs.org/download/binaries/appliance/appliance-1.26.0.tar.xz"; + sha256 = "1kzvgmy845kclvr93y6rdpss2q0p8yfqg14r0i1pi5r4zc68yvj4"; + }; + + src = fetchurl { + url = "http://libguestfs.org/download/1.29-development/libguestfs-${version}.tar.gz"; + sha256 = "1il0p3irwcyfdm83935hj4bvxsx0kdfn8dvqmg2lbzap17jvzj8h"; + }; + + buildInputs = [ + makeWrapper pkgconfig autoconf automake libtool ncurses cpio gperf perl + cdrkit flex bison qemu pcre augeas libxml2 acl libcap libcap_ng libconfig + systemd fuse yajl libvirt gmp readline file hivex libintlperl GetoptLong + SysVirt + ]; + + configureFlags = "--disable-appliance --disable-daemon"; + patches = [ ./libguestfs-syms.patch ]; + NIX_CFLAGS_COMPILE="-I${libxml2}/include/libxml2/"; + + preConfigure = '' + AUTOPOINT=true LIBTOOLIZE=true autoreconf --verbose --install + ''; + + postInstall = '' + for bin in $out/bin/*; do + wrapProgram "$bin" \ + --prefix "PATH" : "$out/bin:${hivex}/bin" \ + --prefix "PERL5LIB" : "$PERL5LIB:$out/lib/perl5/site_perl" + done + ''; + + postFixup = '' + mkdir -p "$out/lib/guestfs" + tar -Jxvf "$appliance" --strip 1 -C "$out/lib/guestfs" + ''; + + meta = with stdenv.lib; { + description = "Tools for accessing and modifying virtual machine disk images"; + license = licenses.gpl2; + homepage = http://libguestfs.org/; + maintainers = with maintainers; [offline]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/development/libraries/libguestfs/libguestfs-syms.patch b/pkgs/development/libraries/libguestfs/libguestfs-syms.patch new file mode 100644 index 000000000000..44cdc4e69b2e --- /dev/null +++ b/pkgs/development/libraries/libguestfs/libguestfs-syms.patch @@ -0,0 +1,13 @@ +diff -rupN libguestfs-1.29.5/src/Makefile.am libguestfs-1.29.5-new/src/Makefile.am +--- libguestfs-1.29.5/src/Makefile.am 2014-11-05 16:43:08.000000000 +0100 ++++ libguestfs-1.29.5-new/src/Makefile.am 2014-11-05 20:07:45.760730596 +0100 +@@ -167,8 +167,7 @@ libguestfs_la_LIBADD = \ + # Force libtool to name the library 'libguestfs.so.0.$(MAX_PROC_NR).0'. + # Include the version script to limit which symbols are exported. + libguestfs_la_LDFLAGS = \ +- -version-info $(MAX_PROC_NR):0:$(MAX_PROC_NR) \ +- $(VERSION_SCRIPT_FLAGS)$(srcdir)/libguestfs.syms ++ -version-info $(MAX_PROC_NR):0:$(MAX_PROC_NR) + + if HAVE_FUSE + # XXX Unfortunately FUSE_CFLAGS defines _FILE_OFFSET_BITS=64. diff --git a/pkgs/development/libraries/libharu/default.nix b/pkgs/development/libraries/libharu/default.nix index 11b3bf4f6d5e..eb617ed6b9e9 100644 --- a/pkgs/development/libraries/libharu/default.nix +++ b/pkgs/development/libraries/libharu/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { meta = { description = "Cross platform, open source library for generating PDF files"; homepage = http://libharu.org/wiki/Main_Page; - license = "ZLIB/LIBPNG"; # see README. + license = stdenv.lib.licenses.zlib; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libiberty/default.nix b/pkgs/development/libraries/libiberty/default.nix new file mode 100644 index 000000000000..b4c256fb340f --- /dev/null +++ b/pkgs/development/libraries/libiberty/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + version = "4.8.3"; + name = "libiberty-${version}"; + + src = fetchurl { + url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2"; + sha256 = "07hg10zs7gnqz58my10ch0zygizqh0z0bz6pv4pgxx45n48lz3ka"; + }; + + postUnpack = "sourceRoot=\${sourceRoot}/libiberty"; + + enable_shared = 1; + + installPhase = '' + mkdir -p $out/lib + cp pic/libiberty.a $out/lib/libiberty_pic.a + ''; + + meta = with stdenv.lib; { + homepage = http://gcc.gnu.org/; + license = licenses.lgpl2; + description = "Collection of subroutines used by various GNU programs"; + maintainers = maintainers.abbradar; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libibverbs/default.nix b/pkgs/development/libraries/libibverbs/default.nix new file mode 100644 index 000000000000..cef34fe6db8d --- /dev/null +++ b/pkgs/development/libraries/libibverbs/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "libibverbs-1.1.8"; + + src = fetchurl { + url = "https://www.openfabrics.org/downloads/verbs/${name}.tar.gz"; + sha256 = "13w2j5lrrqxxxvhpxbqb70x7wy0h8g329inzgfrvqv8ykrknwxkw"; + }; + + meta = with stdenv.lib; { + homepage = https://www.openfabrics.org/; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index 3bdb85a78ebd..9e65e63ffdb8 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -1,11 +1,13 @@ { fetchurl, stdenv }: +assert (!stdenv.isLinux); + stdenv.mkDerivation rec { - name = "libiconv-1.13.1"; + name = "libiconv-1.14"; src = fetchurl { url = "mirror://gnu/libiconv/${name}.tar.gz"; - sha256 = "0jcsjk2g28bq20yh7rvbn8xgq6q42g8dkkac0nfh12b061l638sm"; + sha256 = "04q6lgl3kglmmhw59igq1n7v3rp1rpkypl366cy1k1yn2znlvckj"; }; # On Cygwin, Libtool produces a `.dll.a', which is not a "real" DLL diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix new file mode 100644 index 000000000000..9c825f42166b --- /dev/null +++ b/pkgs/development/libraries/libinput/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, mtdev, udev, libevdev }: + +stdenv.mkDerivation rec { + name = "libinput-0.6.0"; + + src = fetchurl { + url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz"; + sha256 = "1g5za42f60vw87982vjh0n6r78qajj34l323p7623fbw3rvmbd9h"; + }; + + buildInputs = [ pkgconfig mtdev udev libevdev ]; + + meta = with stdenv.lib; { + homepage = http://www.freedesktop.org/wiki/Software/libinput; + description = "handles input devices in Wayland compositors and to provide a generic X.Org input driver"; + platforms = platforms.unix; + license = licenses.mit; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/development/libraries/libixp_for_wmii/default.nix b/pkgs/development/libraries/libixp_for_wmii/default.nix index caeb87ee694b..cbe9e20f0b1b 100644 --- a/pkgs/development/libraries/libixp_for_wmii/default.nix +++ b/pkgs/development/libraries/libixp_for_wmii/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation { meta = { homepage = http://libs.suckless.org/libixp; description = "stand-alone client/server 9P library"; - license = "MIT / LPL"; + license = with stdenv.lib.licenses; [ mit lpl-102 ]; }; } diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index bf27e074dd58..07f3d65ffc1f 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://libjpeg-turbo.virtualgl.org/; description = "A faster (using SIMD) libjpeg implementation"; - license = "free"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix index d7a1bcb46385..bf2ebb27f37f 100644 --- a/pkgs/development/libraries/libjpeg/default.nix +++ b/pkgs/development/libraries/libjpeg/default.nix @@ -1,20 +1,20 @@ -{ stdenv, fetchurl, static ? false }: +{ stdenv, fetchurl, static ? false }: with stdenv.lib; stdenv.mkDerivation { name = "libjpeg-8d"; - + src = fetchurl { url = http://www.ijg.org/files/jpegsrc.v8d.tar.gz; sha256 = "1cz0dy05mgxqdgjf52p54yxpyy95rgl30cnazdrfmw7hfca9n0h0"; }; configureFlags = optional static "--enable-static --disable-shared"; - + meta = { homepage = http://www.ijg.org/; description = "A library that implements the JPEG image file format"; - license = "free"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/development/libraries/libjreen/default.nix b/pkgs/development/libraries/libjreen/default.nix new file mode 100644 index 000000000000..04e37fd14f16 --- /dev/null +++ b/pkgs/development/libraries/libjreen/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, cmake, qt4, pkgconfig, gsasl }: + +stdenv.mkDerivation rec { + name = "libjreen-${version}"; + version = "1.2.0"; + + src = fetchurl { + url = "https://qutim.org/dwnl/73/${name}.tar.bz2"; + sha256 = "14nwwk40xx8w6x7yaysgcr0lgzhs7l064f7ikp32s5y9a8mmp582"; + }; + + buildInputs = [ cmake qt4 pkgconfig gsasl ]; + enableParallelBuilding = true; + + meta = { + description = "C++ Jabber library using Qt framework"; + homepage = "https://qutim.org/jreen/"; + license = stdenv.lib.licenses.gpl2Plus; + }; +} diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix index dbd2516c0595..1293c2245ac2 100644 --- a/pkgs/development/libraries/libksba/default.nix +++ b/pkgs/development/libraries/libksba/default.nix @@ -1,17 +1,20 @@ { stdenv, fetchurl, libgpgerror }: stdenv.mkDerivation rec { - name = "libksba-1.2.0"; + name = "libksba-1.3.2"; src = fetchurl { url = "mirror://gnupg/libksba/${name}.tar.bz2"; - sha256 = "0jwk7hm3x3g4hd7l12z3d79dy7359x7lc88dq6z7q0ixn1jwxbq9"; + sha256 = "01l4hvcknk9nb4bvyb6aqaid19jg0wv3ik54j1b89hnzamwm75gb"; }; - propagatedBuildInputs = [libgpgerror]; + propagatedBuildInputs = [ libgpgerror ]; - meta = { + meta = with stdenv.lib; { homepage = http://www.gnupg.org; description = "CMS and X.509 access library under development"; + platforms = platforms.all; + license = licenses.lgpl3; + maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix index 701b4df3cd81..ad578ac272b1 100644 --- a/pkgs/development/libraries/liblastfm/default.nix +++ b/pkgs/development/libraries/liblastfm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, qt4, pkgconfig, libsamplerate, fftwSinglePrec, which, cmake }: -let version = "1.0.8"; in +let version = "1.0.9"; in stdenv.mkDerivation rec { name = "liblastfm-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/lastfm/liblastfm/tarball/${version}"; name = "${name}.tar.gz"; - sha256 = "17jjhsgbwrzh09i0wcqsnmxzyrqy1png5ixpnx6rbqmhp54a3jn3"; + sha256 = "09qiaxsxw6g2m7mvkffpfsi5wis8nl1x4lgnk0sa30859z54iw53"; }; prefixKey = "--prefix "; diff --git a/pkgs/development/libraries/libltc/default.nix b/pkgs/development/libraries/libltc/default.nix new file mode 100644 index 000000000000..ec306e0f7c34 --- /dev/null +++ b/pkgs/development/libraries/libltc/default.nix @@ -0,0 +1,17 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation { + name = "libltc-1.1.4"; + + src = fetchurl { + url = https://github.com/x42/libltc/releases/download/v1.1.4/libltc-1.1.4.tar.gz; + sha256 = "0xas0zbi11nhq15al6cxn0iwa563s6fcz01hw0np1clh25h4773x"; + }; + + meta = with stdenv.lib; { + homepage = http://x42.github.io/libltc/; + description = "POSIX-C Library for handling Linear/Logitudinal Time Code (LTC)"; + license = licenses.lgpl3Plus; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index dc197fc64099..8b9f6f1dca57 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, curl, libgcrypt}: stdenv.mkDerivation rec { - name = "libmicrohttpd-0.9.37"; + name = "libmicrohttpd-0.9.38"; src = fetchurl { url = "mirror://gnu/libmicrohttpd/${name}.tar.gz"; - sha256 = "1p3wnhr43v6vqdgl86r76298wjfxz2ihj9zh9kpz8l7va30br357"; + sha256 = "08g7p4l0p2fsjj8ayl68zq1bqgrn0pck19bm8yd7k61whvfv9wld"; }; buildInputs = [ curl libgcrypt ]; diff --git a/pkgs/development/libraries/libmng/default.nix b/pkgs/development/libraries/libmng/default.nix index b58e2dd257d7..234f56863c09 100644 --- a/pkgs/development/libraries/libmng/default.nix +++ b/pkgs/development/libraries/libmng/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Reference library for reading, displaying, writing and examining Multiple-Image Network Graphics"; homepage = http://www.libmng.com; - license = "zlib/libpng"; + license = stdenv.lib.licenses.zlib; maintainers = with stdenv.lib.maintainers; [ marcweber urkud ]; hydraPlatforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libmsgpack/CMakeLists.patch b/pkgs/development/libraries/libmsgpack/CMakeLists.patch index 657c30d5fe97..84377962d7f1 100644 --- a/pkgs/development/libraries/libmsgpack/CMakeLists.patch +++ b/pkgs/development/libraries/libmsgpack/CMakeLists.patch @@ -1,9 +1,11 @@ diff -r 791a4edd7e1d CMakeLists.txt --- a/CMakeLists.txt Sun Oct 05 13:14:14 2014 +0100 +++ b/CMakeLists.txt Sun Oct 05 13:20:12 2014 +0100 -@@ -158,7 +158,7 @@ +@@ -157,8 +157,9 @@ + INSTALL (TARGETS msgpack msgpack-static DESTINATION lib) INSTALL (DIRECTORY src/msgpack DESTINATION include) ++INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/src/msgpack/version.h DESTINATION include/msgpack) INSTALL (FILES src/msgpack.h src/msgpack.hpp DESTINATION include) -INSTALL (FILES msgpack.pc DESTINATION lib/pkgconfig) +INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/msgpack.pc DESTINATION lib/pkgconfig) diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix index 10bc9e5eebfe..938c995e755b 100644 --- a/pkgs/development/libraries/libmtp/default.nix +++ b/pkgs/development/libraries/libmtp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, libusb1 }: stdenv.mkDerivation rec { - name = "libmtp-1.1.6"; + name = "libmtp-1.1.8"; propagatedBuildInputs = [ libusb1 ]; buildInputs = [ pkgconfig ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/libmtp/${name}.tar.gz"; - sha256 = "02nbf1cigxmv9sak201f4m5c1d21q6avgzjlxd941plimy1iq71s"; + sha256 = "10i2vnj8r6hyd61xgyhmxbsissq971g50fhm1h6mc3m4d99qg7iz"; }; meta = { diff --git a/pkgs/development/libraries/libmusicbrainz/default.nix b/pkgs/development/libraries/libmusicbrainz/default.nix index 714870fab160..99c253cdb358 100644 --- a/pkgs/development/libraries/libmusicbrainz/default.nix +++ b/pkgs/development/libraries/libmusicbrainz/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "ftp://ftp.musicbrainz.org/pub/musicbrainz/${name}.tar.gz"; - md5 = "f4824d0a75bdeeef1e45cc88de7bb58a"; + sha256 = "1i9qly13bwwmgj68vma766hgvsd1m75236haqsp9zgh5znlmkm3z"; }; meta = { diff --git a/pkgs/development/libraries/libmwaw/default.nix b/pkgs/development/libraries/libmwaw/default.nix index 297d0a2f2ee6..7cb49dc3524b 100644 --- a/pkgs/development/libraries/libmwaw/default.nix +++ b/pkgs/development/libraries/libmwaw/default.nix @@ -3,10 +3,11 @@ let s = # Generated upstream information rec { baseName="libmwaw"; - version="0.3.2"; + version="0.3.3"; name="${baseName}-${version}"; - url="mirror://sourceforge/project/libmwaw/libmwaw/libmwaw-${version}/libmwaw-${version}.tar.bz2"; - sha256="0rzp2bbwyxdq1i9b2y5jz5b2ic7466l8ifgmz7lk8bsmqxbb0a0d"; + hash="0dqwrswqmdhbj7gxsivvnwnsly181x27a5zq9fpizk82cnx2s8ks"; + url="mirror://sourceforge/project/libmwaw/libmwaw/libmwaw-0.3.3/libmwaw-0.3.3.tar.xz"; + sha256="0dqwrswqmdhbj7gxsivvnwnsly181x27a5zq9fpizk82cnx2s8ks"; }; buildInputs = [ boost pkgconfig cppunit zlib libwpg libwpd librevenge diff --git a/pkgs/development/libraries/libndp/default.nix b/pkgs/development/libraries/libndp/default.nix new file mode 100644 index 000000000000..ae0db409a1a5 --- /dev/null +++ b/pkgs/development/libraries/libndp/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "libndp-1.4"; + + src = fetchurl { + url = "http://libndp.org/files/${name}.tar.gz"; + sha256 = "0pym5xxq3avg348q61xggwy05i0r2m4sj3mlwlpxfjq2xi3y42rs"; + }; + + meta = with stdenv.lib; { + homepage = http://libndp.org/; + description = "Library for Neighbor Discovery Protocol"; + platforms = platforms.linux; + maintainers = [ maintainers.lethalman ]; + license = licenses.lgpl21; + }; + +} \ No newline at end of file diff --git a/pkgs/development/libraries/libnetfilter_cthelper/default.nix b/pkgs/development/libraries/libnetfilter_cthelper/default.nix new file mode 100644 index 000000000000..197892897f32 --- /dev/null +++ b/pkgs/development/libraries/libnetfilter_cthelper/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, pkgconfig, libmnl }: + +stdenv.mkDerivation rec { + name = "libnetfilter_cthelper-${version}"; + version = "1.0.0"; + + src = fetchurl { + url = "http://netfilter.org/projects/libnetfilter_cthelper/files/${name}.tar.bz2"; + sha256 = "07618e71c4d9a6b6b3dc1986540486ee310a9838ba754926c7d14a17d8fccf3d"; + }; + + buildInputs = [ pkgconfig libmnl ]; + + meta = { + description = "Userspace library that provides the programming interface to the user-space connection tracking helper infrastructure."; + longDescription = '' + libnetfilter_cthelper is the userspace library that provides the programming interface + to the user-space helper infrastructure available since Linux kernel 3.6. With this + library, you register, configure, enable and disable user-space helpers. This library + is used by conntrack-tools. + ''; + homepage = http://www.netfilter.org/projects/libnetfilter_cthelper/; + license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix b/pkgs/development/libraries/libnetfilter_cttimeout/default.nix new file mode 100644 index 000000000000..0626e91b8ba2 --- /dev/null +++ b/pkgs/development/libraries/libnetfilter_cttimeout/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, pkgconfig, libmnl }: + +stdenv.mkDerivation rec { + name = "libnetfilter_cttimeout-${version}"; + version = "1.0.0"; + + src = fetchurl { + url = "http://netfilter.org/projects/libnetfilter_cttimeout/files/${name}.tar.bz2"; + sha256 = "aeab12754f557cba3ce2950a2029963d817490df7edb49880008b34d7ff8feba"; + }; + + buildInputs = [ pkgconfig libmnl ]; + + meta = { + description = "Userspace library that provides the programming interface to the connection tracking timeout infrastructure."; + longDescription = '' + libnetfilter_cttimeout is the userspace library that provides the programming + interface to the fine-grain connection tracking timeout infrastructure. + With this library, you can create, update and delete timeout policies that can + be attached to traffic flows. This library is used by conntrack-tools. + ''; + homepage = http://netfilter.org/projects/libnetfilter_cttimeout/; + license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libofx/default.nix b/pkgs/development/libraries/libofx/default.nix index 2dce6db1bf26..c17045d5e4be 100644 --- a/pkgs/development/libraries/libofx/default.nix +++ b/pkgs/development/libraries/libofx/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, opensp, pkgconfig, libxml2, curl }: stdenv.mkDerivation rec { - name = "libofx-0.9.9"; + name = "libofx-0.9.10"; src = fetchurl { url = "mirror://sourceforge/libofx/${name}.tar.gz"; - sha256 = "08vvfj1rq0drcdfchrgb5zp05a2xl3a5aapsfgj0gqy3rp2qivwl"; + sha256 = "15gnbh4mszfxk70srdcjkdykk7dbhzqxi3pxgh48a9zg8i4nmqjl"; }; configureFlags = [ "--with-opensp-includes=${opensp}/include/OpenSP" ]; diff --git a/pkgs/development/libraries/libopensc-dnie/default.nix b/pkgs/development/libraries/libopensc-dnie/default.nix index 2d736411780f..1452ec616069 100644 --- a/pkgs/development/libraries/libopensc-dnie/default.nix +++ b/pkgs/development/libraries/libopensc-dnie/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.dnielectronico.es/descargas/; description = "Opensc plugin to access the Spanish national ID smartcard"; - license = "nonfree"; + license = stdenv.lib.licenses.unfree; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; broken = true; diff --git a/pkgs/development/libraries/liboping/default.nix b/pkgs/development/libraries/liboping/default.nix index b48b9c0585bd..83903002c977 100644 --- a/pkgs/development/libraries/liboping/default.nix +++ b/pkgs/development/libraries/liboping/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses ? null, perl ? null }: stdenv.mkDerivation rec { - name = "liboping-1.6.2"; + name = "liboping-1.8.0"; src = fetchurl { url = "http://verplant.org/liboping/files/${name}.tar.bz2"; - sha256 = "1kvkpdcd5jinyc15cgir48v91qphpw22c03inydaga5m4yqv8jjz"; + sha256 = "1nsvlsvapc64h0anip2hz5ydbgk3an94xqiaa9kivcw1r6193jqx"; }; buildInputs = [ ncurses perl ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { Included is a sample application, called oping, which demonstrates the library's abilities. ''; - homepage = http://verplant.org/liboping/; + homepage = http://noping.cc/; license = licenses.lgpl21; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix index 0eb735900b33..7c103d76bd58 100644 --- a/pkgs/development/libraries/libosinfo/default.nix +++ b/pkgs/development/libraries/libosinfo/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "libosinfo-0.2.10"; + name = "libosinfo-0.2.11"; src = fetchurl { url = "https://fedorahosted.org/releases/l/i/libosinfo/${name}.tar.gz"; - sha256 = "564bd487a39dc09a10917c1d7a95f739ee7701d9cd0fbabcacea64f615e20a2d"; + sha256 = "0889zvidhmpk3nd7c1xhh3fkk9i014dkr6zdlddh89kbflva2sxv"; }; buildInputs = [ diff --git a/pkgs/development/libraries/libotr/default.nix b/pkgs/development/libraries/libotr/default.nix index 7b8f40d1886a..aeae2a70d6c3 100644 --- a/pkgs/development/libraries/libotr/default.nix +++ b/pkgs/development/libraries/libotr/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libgcrypt, autoreconfHook }: stdenv.mkDerivation rec { - name = "libotr-4.0.0"; + name = "libotr-4.1.0"; src = fetchurl { url = "https://otr.cypherpunks.ca/${name}.tar.gz"; - sha256 = "1d4k0b7v4d3scwm858cmqr9c6xgd6ppla1vk4x2yg64q82a1k49z"; + sha256 = "0c6rkh58s6wqzcrpccwdik5qs91qj6dgd60a340d72gc80cqknsg"; }; buildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/libowfat/default.nix b/pkgs/development/libraries/libowfat/default.nix new file mode 100644 index 000000000000..aaa1abacab80 --- /dev/null +++ b/pkgs/development/libraries/libowfat/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "libowfat-0.29"; + + src = fetchurl { + url = "http://dl.fefe.de/${name}.tar.bz2"; + sha256 = "09v4phf1d4y617fdqwn214jmkialf7xqcsyx3rzk7x5ysvpbvbab"; + }; + + makeFlags = "prefix=$(out)"; + + meta = with stdenv.lib; { + homepage = http://www.fefe.de/libowfat/; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} \ No newline at end of file diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index 11eccb0a0e31..9ed1aab40346 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -10,14 +10,19 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ flex bison ]; - configureFlags = "--with-pcap=linux"; + # We need to force the autodetection because detection doesn't + # work in pure build enviroments. + configureFlags = + if stdenv.isLinux then [ "--with-pcap=linux" ] + else if stdenv.isDarwin then [ "--with-pcap=bpf" ] + else []; preInstall = ''mkdir -p $out/bin''; crossAttrs = { # Stripping hurts in static libraries dontStrip = true; - configureFlags = [ "--with-pcap=linux" "ac_cv_linux_vers=2" ]; + configureFlags = configureFlags ++ [ "ac_cv_linux_vers=2" ]; }; meta = { diff --git a/pkgs/development/libraries/libpfm/default.nix b/pkgs/development/libraries/libpfm/default.nix new file mode 100644 index 000000000000..cbb314a7bb7d --- /dev/null +++ b/pkgs/development/libraries/libpfm/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + version = "4.5.0"; + name = "libpfm-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/perfmon2/libpfm4/${name}.tar.gz"; + sha1 = "857eb066724e2a5b723d6802d217c8eddff79082"; + }; + + installFlags = "DESTDIR=\${out} PREFIX= LDCONFIG=true"; + + meta = { + description = "Helper library to program the performance monitoring events"; + longDescription = '' + This package provides a library, called libpfm4 which is used to + develop monitoring tools exploiting the performance monitoring + events such as those provided by the Performance Monitoring Unit + (PMU) of modern processors. + ''; + licence = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.pierron ]; + platforms = stdenv.lib.platforms.all; + }; +} \ No newline at end of file diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 06fff495f541..001d8094a271 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -3,11 +3,11 @@ assert zlib != null; let - version = "1.6.13"; - sha256 = "09g631h1f1xvrdiy36mh1034r9w46damp9jcg7nm507wlmacxj6r"; + version = "1.6.14"; + sha256 = "0i5lwh9xnqj490c3mcx7rxaq4zr3wj27ba7vzfls45aqa2jl714n"; patch_src = fetchurl { url = "mirror://sourceforge/libpng-apng/libpng-${version}-apng.patch.gz"; - sha256 = "017pnxp3zhhlh6mg2yqn5xrb6dcxc5p3dp1kr46p8xx052i0hzqb"; + sha256 = "1gwpm9kb57dknicy9j4mf8g9q5zz4ikhbznlk32jhw2b3l0mn446"; }; whenPatched = stdenv.lib.optionalString apngSupport; diff --git a/pkgs/development/libraries/libqb/default.nix b/pkgs/development/libraries/libqb/default.nix new file mode 100644 index 000000000000..a0050daec343 --- /dev/null +++ b/pkgs/development/libraries/libqb/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig }: + +stdenv.mkDerivation rec{ + name = "libqb-0.17.1"; + + src = fetchurl { + url = "https://fedorahosted.org/releases/q/u/quarterback/${name}.tar.xz"; + sha256 = "0a9fy4hb6ixs875fbqw77dfj7519ixg27vg4yajyl87y7gw1a8bs"; + }; + + buildInputs = [ pkgconfig ]; + + meta = with stdenv.lib; { + homepage = https://github.com/clusterlabs/libqb; + description = "a library providing high performance logging, tracing, ipc, and poll"; + license = licenses.lgpl21; + platforms = platforms.unix; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/development/libraries/librdf/raptor.nix b/pkgs/development/libraries/librdf/raptor.nix index dd19d3f179fd..ef194bb0b1ec 100644 --- a/pkgs/development/libraries/librdf/raptor.nix +++ b/pkgs/development/libraries/librdf/raptor.nix @@ -14,10 +14,10 @@ stdenv.mkDerivation rec { sed -e '/curl\/types/d' -i src/*.c src/*.h ''; - meta = { + meta = { description = "The RDF Parser Toolkit"; homepage = "http://librdf.org/raptor"; - license = "LGPL-2.1 Apache-2.0"; + license = with stdenv.lib.licenses; [ lgpl21 asl20 ]; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/librdf/raptor2.nix b/pkgs/development/libraries/librdf/raptor2.nix index 500acdfb2ec1..f84cfa044c6a 100644 --- a/pkgs/development/libraries/librdf/raptor2.nix +++ b/pkgs/development/libraries/librdf/raptor2.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libxml2, libxslt, curl }: stdenv.mkDerivation rec { - name = "raptor2-2.0.12"; # 2.0.9 misses a header and so fails liblrdf + name = "raptor2-2.0.15"; src = fetchurl { url = "http://download.librdf.org/source/${name}.tar.gz"; - sha256 = "1644a1nnw5k6168v9gjfx1rcbij6ybjximd35a3zhcvyyijmb5di"; + sha256 = "ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed"; }; buildInputs = [ libxml2 libxslt ]; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "The RDF Parser Toolkit"; homepage = "http://librdf.org/raptor"; - license = "LGPL-2.1 Apache-2.0"; + license = with stdenv.lib.licenses; [ lgpl21 asl20 ]; maintainers = with stdenv.lib.maintainers; [ marcweber urkud ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/librdf/rasqal.nix b/pkgs/development/libraries/librdf/rasqal.nix index 1acc7c1d73cd..6a5e4578cac7 100644 --- a/pkgs/development/libraries/librdf/rasqal.nix +++ b/pkgs/development/libraries/librdf/rasqal.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, librdf_raptor2, gmp, pkgconfig, pcre, libxml2 }: stdenv.mkDerivation rec { - name = "rasqal-0.9.31"; + name = "rasqal-0.9.32"; src = fetchurl { url = "http://download.librdf.org/source/${name}.tar.gz"; - sha256 = "1vkzifr488i31vxdnykyf2aq87023vx4bag4d94b1rdhy74l7mr8"; + sha256 = "eeba03218e3b7dfa033934d523a1a64671a9a0f64eadc38a01e4b43367be2e8f"; }; nativeBuildInputs = [ pkgconfig ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Library that handles Resource Description Framework (RDF)"; homepage = "http://librdf.org/rasqal"; - license = "LGPL-2.1 Apache-2.0"; + license = with stdenv.lib.licenses; [ lgpl21 asl20 ]; maintainers = with stdenv.lib.maintainers; [ marcweber urkud ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/librdf/redland.nix b/pkgs/development/libraries/librdf/redland.nix index 4863c928988a..8ef900493456 100644 --- a/pkgs/development/libraries/librdf/redland.nix +++ b/pkgs/development/libraries/librdf/redland.nix @@ -7,11 +7,11 @@ }: stdenv.mkDerivation rec { - name = "redland-1.0.16"; + name = "redland-1.0.17"; src = fetchurl { url = "http://download.librdf.org/source/${name}.tar.gz"; - sha256 = "1gcx0h5dxa3c4xhhjk3gr0708zjj0n6zpslvbjfi2qbf13y798nr"; + sha256 = "de1847f7b59021c16bdc72abb4d8e2d9187cd6124d69156f3326dd34ee043681"; }; nativeBuildInputs = [ perl pkgconfig ]; diff --git a/pkgs/development/libraries/librdmacm/default.nix b/pkgs/development/libraries/librdmacm/default.nix new file mode 100644 index 000000000000..0f5500478b4d --- /dev/null +++ b/pkgs/development/libraries/librdmacm/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, libibverbs }: + +stdenv.mkDerivation rec { + name = "librdmacm-1.0.19.1"; + + src = fetchurl { + url = "https://www.openfabrics.org/downloads/rdmacm/${name}.tar.gz"; + sha256 = "0aq9x2aq62j9qn5yqifp4f2y7w2l35571ns260bwd2c60jf5fjlm"; + }; + + buildInputs = [ libibverbs ]; + + meta = with stdenv.lib; { + homepage = https://www.openfabrics.org/; + platforms = platforms.unix; + license = licenses.bsd2; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix index c67df46e89c0..25b4f6617bea 100644 --- a/pkgs/development/libraries/libre/default.nix +++ b/pkgs/development/libraries/libre/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, zlib, openssl}: stdenv.mkDerivation rec { - version = "0.4.9"; + version = "0.4.10"; name = "libre-${version}"; src=fetchurl { url = "http://www.creytiv.com/pub/re-${version}.tar.gz"; - sha256 = "1i98z9qw3jpkaq419189vr8h3qcxqlz40dls77rbn4c0agc69703"; + sha256 = "1ckp5rwdqlhr6n8nwzfd3jwxa6f6n4gxh9ny3c1wcrbzvpkkhkv3"; }; buildInputs = [zlib openssl]; makeFlags = [ diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/development/libraries/libsearpc/default.nix index 32cb7b860c4e..d33ca9a15edd 100644 --- a/pkgs/development/libraries/libsearpc/default.nix +++ b/pkgs/development/libraries/libsearpc/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec meta = { homepage = "https://github.com/haiwen/libsearpc"; - description = "A simple and easy-to-use C language RPC framework (including both server side & client side) based on GObject System."; + description = "A simple and easy-to-use C language RPC framework (including both server side & client side) based on GObject System"; license = stdenv.lib.licenses.lgpl3; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.calrama ]; diff --git a/pkgs/development/libraries/libsieve/default.nix b/pkgs/development/libraries/libsieve/default.nix new file mode 100644 index 000000000000..32fec68ad012 --- /dev/null +++ b/pkgs/development/libraries/libsieve/default.nix @@ -0,0 +1,16 @@ +{stdenv, fetchurl}: +stdenv.mkDerivation rec { + version = "2.3.1"; + name = "libsieve-${version}"; + + src = fetchurl { + url = "https://github.com/downloads/sodabrew/libsieve/libsieve-${version}.tar.gz"; + sha256 = "1gllhl9hbmc86dq3k98d4kjs5bwk0p2rlk7ywqj3fjn7jw6mbhcj"; + }; + + meta = with stdenv.lib; { + description = "An interpreter for RFC 3028 Sieve and various extensions"; + homepage = "http://sodabrew.com/libsieve/"; + license = licenses.lgpl21; + }; +} diff --git a/pkgs/development/libraries/libsigcxx/1.2.nix b/pkgs/development/libraries/libsigcxx/1.2.nix index 29a7093dbbdd..896b321272a9 100644 --- a/pkgs/development/libraries/libsigcxx/1.2.nix +++ b/pkgs/development/libraries/libsigcxx/1.2.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "libsigc++-1.2.7"; - + src = fetchurl { url = "mirror://gnome/sources/libsigc++/1.2/${name}.tar.bz2"; sha256 = "099224v5y0y1ggqrfc8vga8afr3nb93iicn7cj8xxgsrwa83s5nr"; @@ -13,5 +13,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://libsigc.sourceforge.net/; description = "A typesafe callback system for standard C++"; + branch = "1.2"; }; } diff --git a/pkgs/development/libraries/libsigsegv/2.5.nix b/pkgs/development/libraries/libsigsegv/2.5.nix index ba11e0752b2d..81b563bb0228 100644 --- a/pkgs/development/libraries/libsigsegv/2.5.nix +++ b/pkgs/development/libraries/libsigsegv/2.5.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "libsigsegv-2.5"; - + src = fetchurl { url = "mirror://gnu/libsigsegv/${name}.tar.gz"; sha256 = "0fvcsq9msi63vrbpvks6mqkrnls5cfy6bzww063sqhk2h49vsyyg"; @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://libsigsegv.sf.net; description = "A library for handling page faults in user mode"; + branch = "2.5"; }; doCheck = true; diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index dcef77d59197..af3d03cc661b 100644 --- a/pkgs/development/libraries/libsodium/default.nix +++ b/pkgs/development/libraries/libsodium/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "Version of NaCl with harwdare tests at runtime, not build time"; - license = "ISC"; + license = stdenv.lib.licenses.isc; maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 049d6646ec8a..cd2a15ffc668 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -3,15 +3,15 @@ , libintlOrEmpty , intltool, python }: let - majorVersion = "2.45"; - version = "${majorVersion}.3"; + majorVersion = "2.48"; + version = "${majorVersion}.0"; in stdenv.mkDerivation { name = "libsoup-${version}"; src = fetchurl { url = "mirror://gnome/sources/libsoup/${majorVersion}/libsoup-${version}.tar.xz"; - sha256 = "04ma47hcrrbjp90r8jjn686cngnbgac24wgarpwwzlpg66wighva"; + sha256 = "ea34dd64fe44343445daf6dd690d0691e9d973468de44878da97371c16d89784"; }; patchPhase = '' diff --git a/pkgs/development/libraries/libstatgrab/default.nix b/pkgs/development/libraries/libstatgrab/default.nix new file mode 100644 index 000000000000..36327327b4dd --- /dev/null +++ b/pkgs/development/libraries/libstatgrab/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "libstatgrab-0.91"; + + src = fetchurl { + url = "http://ftp.i-scream.org/pub/i-scream/libstatgrab/${name}.tar.gz"; + sha256 = "1azinx2yzs442ycwq6p15skl3mscmqj7fd5hq7fckhjp92735s83"; + }; + + meta = with stdenv.lib; { + homepage = http://www.i-scream.org/libstatgrab/; + description = "a library that provides cross platforms access to statistics about the running system"; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/development/libraries/libtomcrypt/default.nix b/pkgs/development/libraries/libtomcrypt/default.nix new file mode 100644 index 000000000000..4a3196e44b88 --- /dev/null +++ b/pkgs/development/libraries/libtomcrypt/default.nix @@ -0,0 +1,26 @@ +{stdenv, fetchurl, libtool}: + +stdenv.mkDerivation { + name = "libtomcrypt-1.17"; + + src = fetchurl { + url = "http://libtom.org/files/crypt-1.17.tar.bz2"; + sha256 = "e33b47d77a495091c8703175a25c8228aff043140b2554c08a3c3cd71f79d116"; + }; + + buildInputs = [libtool]; + + preBuild = '' + makeFlagsArray=(LIBPATH=$out/lib INCPATH=$out/include \ + DATAPATH=$out/share/doc/libtomcrypt/pdf \ + INSTALL_GROUP=$(id -g) \ + INSTALL_USER=$(id -u)) + ''; + + makefile = "makefile.shared"; + + meta = { + homepage = "http://libtom.org/?page=features&newsitems=5&whatfile=crypt"; + description = "LibTomCrypt is a fairly comprehensive, modular and portable cryptographic toolkit"; + }; +} diff --git a/pkgs/development/libraries/libtorrent-rasterbar/0.16.nix b/pkgs/development/libraries/libtorrent-rasterbar/0.16.nix new file mode 100644 index 000000000000..6298f2f0c0f3 --- /dev/null +++ b/pkgs/development/libraries/libtorrent-rasterbar/0.16.nix @@ -0,0 +1,6 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // { + version = "0.16.17"; + sha256 = "1w5gcizd6jlvzwgy0307az856h0cly685yf275p1v6bdcafd58b7"; +}) diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index becca407ce92..e1f1fc179d63 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -1,28 +1,6 @@ -{ stdenv, fetchurl, boost, openssl, pkgconfig, zlib, python, libiconvOrNull, geoip }: +{ callPackage, ... } @ args: -stdenv.mkDerivation rec { - name = "libtorrent-rasterbar-${version}"; - version = "0.16.16"; - - src = fetchurl { - url = mirror://sourceforge/libtorrent/libtorrent-rasterbar-0.16.16.tar.gz; - sha256 = "1a3yxwjs4qb0rwx6cfpvar0a8jmavb6ik580b27md08jhvq80if7"; - }; - - buildInputs = [ boost boost.lib pkgconfig openssl zlib python libiconvOrNull geoip ]; - - configureFlags = [ - "--with-boost=${boost}/include/boost" - "--with-boost-libdir=${boost.lib}/lib" - "--enable-python-binding" - "--with-libgeoip=system" - "--with-libiconv=yes" - ]; - - meta = with stdenv.lib; { - homepage = http://www.rasterbar.com/products/libtorrent/; - description = "A C++ BitTorrent implementation focusing on efficiency and scalability"; - license = licenses.bsd3; - maintainers = [ maintainers.phreedom ]; - }; -} +callPackage ./generic.nix (args // { + version = "1.0.2"; + sha256 = "1ph4cb6nrk2hiy89j3kz1wj16ph0b9yixrf4f4935rnzhha8x31w"; +}) diff --git a/pkgs/development/libraries/libtorrent-rasterbar/generic.nix b/pkgs/development/libraries/libtorrent-rasterbar/generic.nix new file mode 100644 index 000000000000..f47ff1081bc8 --- /dev/null +++ b/pkgs/development/libraries/libtorrent-rasterbar/generic.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, boost, openssl, pkgconfig, zlib, python, libiconvOrNull, geoip +# Version specific options +, version, sha256 +, ... }: + +stdenv.mkDerivation rec { + name = "libtorrent-rasterbar-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/libtorrent/${name}.tar.gz"; + inherit sha256; + }; + + buildInputs = [ boost pkgconfig openssl zlib python libiconvOrNull geoip ]; + + configureFlags = [ + "--enable-python-binding" + "--with-libgeoip=system" + "--with-libiconv=yes" + "--with-boost=${boost.dev}" + "--with-boost-libdir=${boost.lib}/lib" + ] ++ stdenv.lib.optional (libiconvOrNull != null) "--with-libiconv=yes"; + + meta = with stdenv.lib; { + homepage = http://www.rasterbar.com/products/libtorrent/; + description = "A C++ BitTorrent implementation focusing on efficiency and scalability"; + license = licenses.bsd3; + maintainers = [ maintainers.phreedom ]; + }; +} diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index f6bdbdb3c75f..1a93c53785bc 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -2,8 +2,8 @@ , libvpx, check, libconfig, pkgconfig }: let - version = "900d72f951"; - date = "20140921"; + version = "f6b3e6e8fe98d2457827ac6da944e715f008a08a"; + date = "20141203"; in stdenv.mkDerivation rec { name = "tox-core-${date}-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/irungentoo/toxcore/tarball/${version}"; name = "${name}.tar.gz"; - sha256 = "1fwgflizb21mp4jwkfac7mgmahlly1f3ldbma6h8h6a2qf3pkn2r"; + sha256 = "1zsx7saqs25vva3pp0bw31yqzrn40fx84w42ig6fiv723k9gpdzy"; }; NIX_LDFLAGS = "-lgcc_s"; @@ -37,19 +37,20 @@ stdenv.mkDerivation rec { buildInputs = [ autoconf libtool automake libsodium ncurses - libconfig pkgconfig + check libconfig pkgconfig ] ++ stdenv.lib.optionals (!stdenv.isArm) [ libopus ]; propagatedBuildInputs = stdenv.lib.optionals (!stdenv.isArm) [ libvpx ]; + # Some tests fail in the Sheevaplug due to timeout doCheck = !stdenv.isArm; - meta = { + meta = with stdenv.lib; { description = "P2P FOSS instant messaging application aimed to replace Skype with crypto"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ viric ]; - platforms = stdenv.lib.platforms.all; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ viric jgeerds ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libu2f-host/default.nix b/pkgs/development/libraries/libu2f-host/default.nix new file mode 100644 index 000000000000..fc76a13ad8e9 --- /dev/null +++ b/pkgs/development/libraries/libu2f-host/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, json_c, hidapi }: + +stdenv.mkDerivation rec { + name = "libu2f-host-0.0.1"; + + src = fetchurl { + url = "https://developers.yubico.com/libu2f-host/Releases/${name}.tar.xz"; + sha256 = "1cqgvbh2fim9r7pjazph64xnrhmsydqh8xrnxd4g16mc0k76s4mf"; + }; + + buildInputs = [ pkgconfig json_c hidapi ]; + + meta = with stdenv.lib; { + homepage = https://developers.yubico.com/libu2f-host; + description = "a C library and command-line tool thati mplements the host-side of the U2F protocol"; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/development/libraries/libunistring/clang.patch b/pkgs/development/libraries/libunistring/clang.patch new file mode 100644 index 000000000000..fdcbc0d528d0 --- /dev/null +++ b/pkgs/development/libraries/libunistring/clang.patch @@ -0,0 +1,14 @@ +diff --git a/lib/stdint.in.h b/lib/stdint.in.h +index 997e406..e0827f5 100644 +--- a/lib/stdint.in.h ++++ b/lib/stdint.in.h +@@ -53,7 +53,8 @@ + in <inttypes.h> would reinclude us, skipping our contents because + _GL_STDINT_H is defined. + The include_next requires a split double-inclusion guard. */ +-# @INCLUDE_NEXT@ @NEXT_STDINT_H@ ++# include <inttypes.h> ++// # @INCLUDE_NEXT@ @NEXT_STDINT_H@ + #endif + + #if ! defined _GL_STDINT_H && ! defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix index 2a87d7a32490..9470240fc146 100644 --- a/pkgs/development/libraries/libunistring/default.nix +++ b/pkgs/development/libraries/libunistring/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation (rec { sha256 = "18q620269xzpw39dwvr9zpilnl2dkw5z5kz3mxaadnpv4k3kw3b1"; }; + patches = stdenv.lib.optional stdenv.isDarwin [ ./clang.patch ]; + propagatedBuildInputs = stdenv.lib.optional ((! (stdenv ? glibc)) || (stdenv ? cross && diff --git a/pkgs/development/libraries/libusb/default.nix b/pkgs/development/libraries/libusb/default.nix index 64ef4ed66b6d..7aec64d596fc 100644 --- a/pkgs/development/libraries/libusb/default.nix +++ b/pkgs/development/libraries/libusb/default.nix @@ -1,16 +1,13 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, pkgconfig, libusb1}: stdenv.mkDerivation { - name = "libusb-0.1.12"; + name = "libusb-compat-0.1.5"; - # On non-linux, we get warnings compiling, and we don't want the - # build to break. - patchPhase = '' - sed -i s/-Werror// Makefile.in - ''; + nativeBuildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ libusb1 ]; src = fetchurl { - url = mirror://sourceforge/libusb/libusb-0.1.12.tar.gz; - md5 = "caf182cbc7565dac0fd72155919672e6"; + url = mirror://sourceforge/libusb/libusb-compat-0.1.5.tar.bz2; + sha256 = "0nn5icrfm9lkhzw1xjvaks9bq3w6mjg86ggv3fn7kgi4nfvg8kj0"; }; } diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index 8be17b289f7e..884db2b3b25a 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -1,18 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, udev }: +{ stdenv, fetchurl, pkgconfig, udev ? null }: -let - version = "1.0.18"; -in stdenv.mkDerivation rec { - name = "libusb-${version}"; # at 1.0.18 libusb joined with libusbx + name = "libusb-1.0.19"; src = fetchurl { - url = "mirror://sourceforge/libusb/libusb-${version}.tar.bz2"; - sha256 = "081px0j98az0pjwwyjlq4qcmfn194fvm3qd4im0r9pm58pn5qgy7"; + url = "mirror://sourceforge/libusb/${name}.tar.bz2"; + sha256 = "0h38p9rxfpg9vkrbyb120i1diq57qcln82h5fr7hvy82c20jql3c"; }; buildInputs = [ pkgconfig ]; - propagatedBuildInputs = stdenv.lib.optional (stdenv.isLinux) udev; + propagatedBuildInputs = stdenv.lib.optional stdenv.isLinux udev; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix index afce119e3961..09d2e9dfc43c 100644 --- a/pkgs/development/libraries/libvirt-glib/default.nix +++ b/pkgs/development/libraries/libvirt-glib/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "libvirt-glib-0.1.8"; + name = "libvirt-glib-0.1.9"; src = fetchurl { url = "http://libvirt.org/sources/glib/${name}.tar.gz"; - sha256 = "0ld7g9vlpdzx8rm90i8y1gnpygkn20x5z12gvsgms7dy5nala3ns"; + sha256 = "0n59hp0kwn80z9136g2n7pwkrlhlsxksr6gy4w7783d71qk3cfq5"; }; buildInputs = [ diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index a4c8c167b39a..8bd4866cb21c 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -1,17 +1,20 @@ { stdenv, fetchurl, pkgconfig, libxml2, gnutls, devicemapper, perl, python , iproute, iptables, readline, lvm2, utillinux, udev, libpciaccess, gettext , libtasn1, ebtables, libgcrypt, yajl, makeWrapper, pmutils, libcap_ng -, dnsmasq, libnl +, dnsmasq, libnl, libpcap +, pythonPackages }: -let version = "1.2.7"; in +let version = "1.2.9"; in + +assert version == pythonPackages.libvirt.version; stdenv.mkDerivation rec { name = "libvirt-${version}"; src = fetchurl { url = "http://libvirt.org/sources/${name}.tar.gz"; - sha256 = "1z6yfzzbf9rvqjq1my7x1br73g8dz8kij3khpb4x520ip8n4dyrx"; + sha256 = "1i4ggs50dipz1hm0qlk6kak1n3klll8sx9fnffmvjlgla9d1m4wm"; }; buildInputs = [ @@ -31,6 +34,7 @@ stdenv.mkDerivation rec { "--with-init-script=redhat" "--with-macvtap" "--with-virtualport" + "--with-libpcap" ]; installFlags = [ @@ -58,7 +62,6 @@ stdenv.mkDerivation rec { versions of Linux (and other OSes) ''; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ wizeman ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix index 2346e4b75015..3d52fa3ac9df 100644 --- a/pkgs/development/libraries/libwebp/default.nix +++ b/pkgs/development/libraries/libwebp/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { description = "Tools and library for the WebP image format"; /* It has its own licence, google-related, but that looks like BSD */ - license = "free"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/development/libraries/libxls/default.nix b/pkgs/development/libraries/libxls/default.nix new file mode 100644 index 000000000000..d8477c5fca0f --- /dev/null +++ b/pkgs/development/libraries/libxls/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + name = "libxls-1.4.0"; + + src = fetchurl { + url = "mirror://sourceforge/libxls/${name}.zip"; + sha256 = "1g8ds7wbhsa4hdcn77xc2c0l3vvz5bx2hx9ng9c9n7aii92ymfnk"; + }; + + nativeBuildInputs = [ unzip ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Extract Cell Data From Excel xls files"; + homepage = http://libxls.sourceforge.net/; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = maintainers.abbradar; + }; +} diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 7e3ee3e9adc7..8dfe60f9026d 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -5,7 +5,7 @@ assert pythonSupport -> python != null; #TODO: share most stuff between python and non-python builds, perhaps via multiple-output let - version = "2.9.1"; + version = "2.9.2"; in stdenv.mkDerivation (rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation (rec { src = fetchurl { url = "ftp://xmlsoft.org/libxml2/${name}.tar.gz"; - sha256 = "1nqgd1qqmg0cg09mch78m2ac9klj9n87blilx4kymi7jcv5n8g7x"; + sha256 = "1g6mf03xcabmk5ing1lwqmasr803616gb2xhn7pll10x2l5w6y2i"; }; buildInputs = stdenv.lib.optional pythonSupport python diff --git a/pkgs/development/libraries/libxml2/setup-hook.sh b/pkgs/development/libraries/libxml2/setup-hook.sh index 112dbe0c5136..4acdd25a6b28 100644 --- a/pkgs/development/libraries/libxml2/setup-hook.sh +++ b/pkgs/development/libraries/libxml2/setup-hook.sh @@ -11,17 +11,9 @@ addXMLCatalogs () { if test -z "$libxmlHookDone"; then libxmlHookDone=1 - # Set http_proxy and ftp_proxy to an invalid host to prevent - # xmllint and xsltproc from trying to download DTDs from the - # network even when --nonet is not given. That would be impure. - # (Note that .invalid is a reserved domain guaranteed not to - # work.) - export http_proxy=http://nodtd.invalid/ - export ftp_proxy=http://nodtd.invalid/ - # Set up XML_CATALOG_FILES. An empty initial value prevents # xmllint and xsltproc from looking in /etc/xml/catalog. export XML_CATALOG_FILES if test -z "$XML_CATALOG_FILES"; then XML_CATALOG_FILES=" "; fi - envHooks=(${envHooks[@]} addXMLCatalogs) + envHooks+=(addXMLCatalogs) fi diff --git a/pkgs/development/libraries/libykneomgr/default.nix b/pkgs/development/libraries/libykneomgr/default.nix new file mode 100644 index 000000000000..0356d7c1f4c1 --- /dev/null +++ b/pkgs/development/libraries/libykneomgr/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pkgconfig, pcsclite, libzip, help2man }: + +stdenv.mkDerivation rec { + name = "libykneomgr-0.1.6"; + + src = fetchurl { + url = "https://developers.yubico.com/libykneomgr/Releases/${name}.tar.gz"; + sha256 = "15fa4sslbzhzmkf0xik36as9lsmys1apqwjxv8sx7qlpacmxy3bw"; + }; + + buildInputs = [ pkgconfig pcsclite libzip help2man ]; + + configureFlags = [ + "--with-backend=pcsc" + ]; + + meta = with stdenv.lib; { + homepage = https://developers.yubico.com/libykneomgr; + description = "a C library to interact with the CCID-part of the Yubikey NEO"; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/development/libraries/libyubikey/default.nix b/pkgs/development/libraries/libyubikey/default.nix index 25c2117b059d..9d71c33cb305 100644 --- a/pkgs/development/libraries/libyubikey/default.nix +++ b/pkgs/development/libraries/libyubikey/default.nix @@ -1,21 +1,18 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: -stdenv.mkDerivation rec -{ - version = "1.11"; - name = "libyubikey-${version}"; +stdenv.mkDerivation rec { + name = "libyubikey-1.12"; - src = fetchurl - { - url = "http://opensource.yubico.com/yubico-c/releases/${name}.tar.gz"; - sha256 = "19pm4rqsnm9r0n5j26bqkxa1jpimdavzcvg5g7p416vkjhxc6lw9"; + src = fetchurl { + url = "https://developers.yubico.com/yubico-c/Releases/${name}.tar.gz"; + sha256 = "1f0plzmr1gwry4rfgq9q70v6qwqny009hac289ad5m6sj7vqflxr"; }; - meta = - { + meta = with stdenv.lib; { homepage = "http://opensource.yubico.com/yubico-c/"; description = "C library for manipulating Yubico YubiKey One-Time Passwords (OTPs)"; - license = "bsd"; - maintainers = [ stdenv.lib.maintainers.calrama ]; + license = licenses.bsd2; + maintainers = with maintainers; [ calrama wkennington ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libzdb/default.nix b/pkgs/development/libraries/libzdb/default.nix index 90692569f089..a5799f79b56b 100644 --- a/pkgs/development/libraries/libzdb/default.nix +++ b/pkgs/development/libraries/libzdb/default.nix @@ -15,8 +15,8 @@ stdenv.mkDerivation rec meta = { - homepage = "http://www.tildeslash.com/libzdb/"; - description = "A small, easy to use Open Source Database Connection Pool Library."; + homepage = http://www.tildeslash.com/libzdb/; + description = "A small, easy to use Open Source Database Connection Pool Library"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.calrama ]; diff --git a/pkgs/development/libraries/loudmouth/default.nix b/pkgs/development/libraries/loudmouth/default.nix index ae9f3fc6c18d..5c67aaa4c197 100644 --- a/pkgs/development/libraries/loudmouth/default.nix +++ b/pkgs/development/libraries/loudmouth/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/loudmouth/1.4/${name}.tar.bz2"; - md5 = "55339ca42494690c3942ee1465a96937"; + sha256 = "1qr9z73i33y49pbpq6zy7q537g0iyc8sm56rjf0ylwcv01fkzacm"; }; patches = [ ./glib-2.32.patch ]; diff --git a/pkgs/development/libraries/lucene++/default.nix b/pkgs/development/libraries/lucene++/default.nix new file mode 100644 index 000000000000..74c7b5e72613 --- /dev/null +++ b/pkgs/development/libraries/lucene++/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, fetchpatch, cmake, boost, gtest }: + +stdenv.mkDerivation rec { + name = "lucene++-${version}"; + version = "3.0.6"; + + src = fetchurl { + url = "https://github.com/luceneplusplus/LucenePlusPlus/" + + "archive/rel_${version}.tar.gz"; + sha256 = "068msvh05gsbfj1wwdqj698kxxfjdqy8zb6pqvail3ayjfj94w1y"; + }; + + patches = let + baseurl = "https://github.com/luceneplusplus/LucenePlusPlus"; + in [ + (fetchpatch { + url = "${baseurl}/pull/62.diff"; + sha256 = "0v314877mjb0hljg4mcqi317m1p1v27rgsgf5wdr9swix43vmhgw"; + }) + (fetchpatch { + url = "${baseurl}/commit/994f03cf736229044a168835ae7387696041658f.diff"; + sha256 = "0fcm5b87nxw062wjd7b4qrfcwsyblmcw19s64004pklj9grk30zz"; + }) + ]; + + postPatch = '' + sed -i -e '/Subversion *REQUIRED/d' \ + -e '/include.*CMakeExternal/d' \ + CMakeLists.txt + # not using -f because we want it to fail for the next release + rm CMakeExternal.txt + ''; + + cmakeFlags = [ "-DGTEST_INCLUDE_DIR=${gtest}/include" ]; + buildInputs = [ cmake boost gtest ]; + + enableParallelBuilding = true; + doCheck = true; + checkTarget = "test"; + + meta = { + description = "C++ port of the popular Java Lucene search engine"; + homepage = "https://github.com/luceneplusplus/LucenePlusPlus"; + license = with stdenv.lib.licenses; [ asl20 lgpl3Plus ]; + }; +} diff --git a/pkgs/development/libraries/martyr/default.nix b/pkgs/development/libraries/martyr/default.nix index 2d37a2506c4f..7fbd44b3fa4a 100644 --- a/pkgs/development/libraries/martyr/default.nix +++ b/pkgs/development/libraries/martyr/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { builder = ./builder.sh; src = fetchurl { url = "mirror://sourceforge/martyr/martyr-0.3.9.tar.gz"; - md5 = "b716a6aaabd5622b65d6126438766260"; + sha256 = "1ks8j413bcby345kmq1i7av8kwjvz5vxdn1zpv0p7ywxq54i4z59"; }; inherit stdenv apacheAnt; } diff --git a/pkgs/development/libraries/matio/default.nix b/pkgs/development/libraries/matio/default.nix new file mode 100644 index 000000000000..da4b8a8570b9 --- /dev/null +++ b/pkgs/development/libraries/matio/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl }: +stdenv.mkDerivation rec { + name = "matio-1.5.2"; + src = fetchurl { + url = "mirror://sourceforge/matio/${name}.tar.gz"; + sha256 = "0i8xj4g1gv50y6lj3s8hasjqspaawqbrnc06lrkdghvk6gxx00nv"; + }; + + meta = with stdenv.lib; { + description = "A C library for reading and writing Matlab MAT files"; + license = licenses.bsd2; + platforms = platforms.all; + maintainers = [ maintainers.vbgl ]; + homepage = http://matio.sourceforge.net/; + }; +} diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix index 296744e1d56c..25e1eb0c7269 100644 --- a/pkgs/development/libraries/mdds/default.nix +++ b/pkgs/development/libraries/mdds/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "0.10.3"; + version = "0.11.1"; name = "mdds-${version}"; src = fetchurl { url = "http://kohei.us/files/mdds/src/mdds_${version}.tar.bz2"; - sha256 = "1hp0472mcsgzrz1v60jpywxrrqmpb8bchfsi7ydmp6vypqnr646v"; + sha256 = "1xr74ss8vr67nmwxls4a54hgljwrc8fs485ablh0bxykf6dyr0j1"; }; postInstall = '' diff --git a/pkgs/development/libraries/mesa-darwin/default.nix b/pkgs/development/libraries/mesa-darwin/default.nix index 98936904be59..f259a397c847 100644 --- a/pkgs/development/libraries/mesa-darwin/default.nix +++ b/pkgs/development/libraries/mesa-darwin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, stdenvAdapters, gccApple, fetchurl, pkgconfig, intltool, flex, bison +{ stdenv, stdenvAdapters, fetchurl, pkgconfig, intltool, flex, bison , python, libxml2Python, file, expat, makedepend, xorg, llvm, libffi, libvdpau , enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt , enableExtraFeatures ? false # not maintained diff --git a/pkgs/development/libraries/mesa-glu/default.nix b/pkgs/development/libraries/mesa-glu/default.nix index 502329226ff3..0ea73a3a57f0 100644 --- a/pkgs/development/libraries/mesa-glu/default.nix +++ b/pkgs/development/libraries/mesa-glu/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { meta = { description = "OpenGL utility library"; homepage = http://cgit.freedesktop.org/mesa/glu/; - license = "bsd"; # SGI-B-2.0, which seems BSD-like + license = stdenv.lib.licenses.sgi-b-20; }; } diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 54fd8d3810e3..842f3dc7d9b8 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -24,7 +24,7 @@ else */ let - version = "10.2.6"; + version = "10.2.9"; # this is the default search path for DRI drivers driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32"; in @@ -35,7 +35,7 @@ stdenv.mkDerivation { src = fetchurl { url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2"; - sha256 = "01n8ib190s12m8hiiyi4wfm9jhkbqjd769npjwvf965smp918cqr"; + sha256 = "f6031f8b7113a92325b60635c504c510490eebb2e707119bbff7bd86aa34657d"; }; prePatch = "patchShebangs ."; @@ -78,7 +78,7 @@ stdenv.mkDerivation { "--with-dri-drivers=i965,r200,radeon" "--with-gallium-drivers=i915,nouveau,r300,r600,svga,swrast,radeonsi" - "--with-egl-platforms=x11,wayland,drm" "--enable-gbm" + "--with-egl-platforms=x11,drm" "--enable-gbm" ] ++ optional enableTextureFloats "--enable-texture-float" ++ optionals enableExtraFeatures [ @@ -97,7 +97,7 @@ stdenv.mkDerivation { autoreconfHook intltool expat libxml2Python llvm glproto dri2proto dri3proto presentproto libX11 libXext libxcb libXt libXfixes libxshmfence - libffi wayland libvdpau libelf + libffi /* wayland */ libvdpau libelf ] ++ optionals enableExtraFeatures [ /*libXvMC*/ ] ++ optional stdenv.isLinux udev ; @@ -113,8 +113,8 @@ stdenv.mkDerivation { '' + optionalString enableExtraFeatures '' `#$out/lib/libXvMC*` \ $out/lib/gbm $out/lib/libgbm* \ - $out/lib/gallium-pipe \ '' + '' + $out/lib/gallium-pipe \ $out/lib/libdricore* \ $out/lib/libgallium* \ $out/lib/vdpau \ @@ -134,8 +134,8 @@ stdenv.mkDerivation { sed "/^libdir=/s,$out,$drivers," -i \ '' + optionalString enableExtraFeatures '' `#$drivers/lib/libXvMC*.la` \ - $drivers/lib/gallium-pipe/*.la \ '' + '' + $drivers/lib/gallium-pipe/*.la \ $drivers/lib/libgallium.la \ $drivers/lib/vdpau/*.la \ $drivers/lib/libdricore*.la diff --git a/pkgs/development/libraries/ming/default.nix b/pkgs/development/libraries/ming/default.nix index a470f7715611..9df90555218e 100644 --- a/pkgs/development/libraries/ming/default.nix +++ b/pkgs/development/libraries/ming/default.nix @@ -2,11 +2,11 @@ , perl }: stdenv.mkDerivation rec { - name = "ming-0.4.0.rc1"; + name = "ming-0.4.5"; src = fetchurl { url = "mirror://sourceforge/ming/${name}.tar.bz2"; - sha256 = "19brcqh4mqav5gsnmnb6j4gv9s0rmkg71657ck17xj8fdklq38y7"; + sha256 = "1sws4cs9i9hysr1l0b8hsmqf4gh06ldc24fw6avzr9y3vydhinl2"; }; # We don't currently build the Python, Perl, PHP, etc. bindings. diff --git a/pkgs/development/libraries/minixml/default.nix b/pkgs/development/libraries/minixml/default.nix index f3b1c2c72a77..345ff5d31b5d 100644 --- a/pkgs/development/libraries/minixml/default.nix +++ b/pkgs/development/libraries/minixml/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mxml-${version}"; - version = "2.8"; + version = "2.9"; src = fetchurl { url = "http://www.msweet.org/files/project3/${name}.tar.gz"; - sha256 = "1m8i62dfmgfc1v8y3zx0r4i2hr5n86yw01xh5kiq53bi3bwnk4qc"; + sha256 = "14pzhlfidj5v1qbxy7a59yn4jz9pnjrs2zwalz228jsq7ijm9vfd"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/mpc/default.nix b/pkgs/development/libraries/mpc/default.nix index 3d05fa2e0405..dd132cfb5b7b 100644 --- a/pkgs/development/libraries/mpc/default.nix +++ b/pkgs/development/libraries/mpc/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { buildInputs = [ gmp mpfr ]; + CFLAGS = "-I${gmp}/include"; + doCheck = true; meta = { diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix index 653481aeccd6..d999ba0cda5c 100644 --- a/pkgs/development/libraries/mpfr/default.nix +++ b/pkgs/development/libraries/mpfr/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { buildInputs = [ gmp ]; + CFLAGS = "-I${gmp}/include"; + configureFlags = /* Work around a FreeBSD bug that otherwise leads to segfaults in the test suite: http://hydra.bordeaux.inria.fr/build/34862 diff --git a/pkgs/development/libraries/mtdev/default.nix b/pkgs/development/libraries/mtdev/default.nix index 2363f33de079..51a66b4b92cc 100644 --- a/pkgs/development/libraries/mtdev/default.nix +++ b/pkgs/development/libraries/mtdev/default.nix @@ -1,18 +1,16 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mtdev-1.1.2"; + name = "mtdev-1.1.5"; src = fetchurl { url = "http://bitmath.org/code/mtdev/${name}.tar.bz2"; - sha256 = "0c2sfxxymf20ylvblgmdmybqs0cydmphg9fq6fnp6flbl0fd33b9"; + sha256 = "0zxs7shzgbalkvlaiibi25bd902rbmkv9n1lww6q8j3ri9qdaxv6"; }; - meta = { + meta = with stdenv.lib; { homepage = http://bitmath.org/code/mtdev/; - description = "Multitouch Protocol Translation Library"; - longDescription = '' The mtdev is a stand-alone library which transforms all variants of kernel MT events to the slotted type B protocol. The events put into @@ -20,7 +18,8 @@ stdenv.mkDerivation rec { tracking, type A with contact tracking, or type B with contact tracking. See the kernel documentation for further details. ''; - - license = stdenv.lib.licenses.mit; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/ncurses/clang.patch b/pkgs/development/libraries/ncurses/clang.patch new file mode 100644 index 000000000000..ce33049bf405 --- /dev/null +++ b/pkgs/development/libraries/ncurses/clang.patch @@ -0,0 +1,42 @@ +diff -ruNp ncurses-5.8.orig/c++/cursesf.h ncurses-5.8/c++/cursesf.h +--- ncurses-5.8.orig/c++/cursesf.h 2005-08-13 21:08:24.000000000 +0300 ++++ ncurses-5.8/c++/cursesf.h 2011-04-03 18:29:29.000000000 +0300 +@@ -681,7 +681,7 @@ public: + const T* p_UserData = STATIC_CAST(T*)(0), + bool with_frame=FALSE, + bool autoDelete_Fields=FALSE) +- : NCursesForm (Fields, with_frame, autoDelete_Fields) { ++ : NCursesForm (&Fields, with_frame, autoDelete_Fields) { + if (form) + set_user (const_cast<void *>(p_UserData)); + }; +@@ -694,7 +694,7 @@ public: + const T* p_UserData = STATIC_CAST(T*)(0), + bool with_frame=FALSE, + bool autoDelete_Fields=FALSE) +- : NCursesForm (Fields, nlines, ncols, begin_y, begin_x, ++ : NCursesForm (&Fields, nlines, ncols, begin_y, begin_x, + with_frame, autoDelete_Fields) { + if (form) + set_user (const_cast<void *>(p_UserData)); +diff -ruNp ncurses-5.8.orig/c++/cursesm.h ncurses-5.8/c++/cursesm.h +--- ncurses-5.8.orig/c++/cursesm.h 2005-08-13 21:10:36.000000000 +0300 ++++ ncurses-5.8/c++/cursesm.h 2011-04-03 18:31:42.000000000 +0300 +@@ -639,7 +639,7 @@ public: + const T* p_UserData = STATIC_CAST(T*)(0), + bool with_frame=FALSE, + bool autoDelete_Items=FALSE) +- : NCursesMenu (Items, with_frame, autoDelete_Items) { ++ : NCursesMenu (&Items, with_frame, autoDelete_Items) { + if (menu) + set_user (const_cast<void *>(p_UserData)); + }; +@@ -651,7 +651,7 @@ public: + int begin_x = 0, + const T* p_UserData = STATIC_CAST(T*)(0), + bool with_frame=FALSE) +- : NCursesMenu (Items, nlines, ncols, begin_y, begin_x, with_frame) { ++ : NCursesMenu (&Items, nlines, ncols, begin_y, begin_x, with_frame) { + if (menu) + set_user (const_cast<void *>(p_UserData)); + }; diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 631199bf87c3..3aa27480a0f5 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "0fsn7xis81za62afan0vvm38bvgzg5wfmv1m86flqcj0nj7jjilh"; }; - patches = [ ./patch-ac ]; + patches = [ ./patch-ac ./clang.patch ]; configureFlags = '' --with-shared --without-debug --enable-pc-files --enable-symlinks @@ -35,8 +35,6 @@ stdenv.mkDerivation rec { export configureFlags="$configureFlags --includedir=$out/include" export PKG_CONFIG_LIBDIR="$out/lib/pkgconfig" mkdir -p "$PKG_CONFIG_LIBDIR" - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace configure --replace -no-cpp-precomp "" ''; selfNativeBuildInput = true; diff --git a/pkgs/development/libraries/ndn-cxx/default.nix b/pkgs/development/libraries/ndn-cxx/default.nix new file mode 100644 index 000000000000..d95443da359d --- /dev/null +++ b/pkgs/development/libraries/ndn-cxx/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchgit, openssl, doxygen, boost, sqlite, cryptopp, pkgconfig, python, pythonPackages }: +let + version = "4c32e7"; +in +stdenv.mkDerivation { + name = "ndn-cxx-0.1-${version}"; + src = fetchgit { + url = "https://github.com/named-data/ndn-cxx.git"; + rev = "4c32e748863d5165cc0e3d6b54a8383f4836cdf1"; + sha256 = "18s18inf14wmkfh1z6w087w7l3bqszd0nkhr09j73hqpz90b06hz"; + }; + buildInputs = [ openssl doxygen boost sqlite cryptopp pkgconfig python pythonPackages.sphinx]; + preConfigure = '' + patchShebangs waf + ./waf configure \ + --with-cryptopp=${cryptopp} \ + --boost-includes=${boost.dev}/include \ + --boost-libs=${boost.lib}/lib \ + --with-examples \ + --prefix=$out + ''; + buildPhase = '' + ./waf + ''; + installPhase = '' + ./waf install + ''; + meta = with stdenv.lib; { + homepage = "http://named-data.net/"; + description = "A Named Data Neworking (NDN) or Content Centric Networking (CCN) abstraction"; + longDescription = '' + ndn-cxx is a C++ library, implementing Named Data Networking (NDN) + primitives that can be used to implement various NDN applications. + NDN operates by addressing and delivering Content Objects directly + by Name instead of merely addressing network end-points. In addition, + the NDN security model explicitly secures individual Content Objects + rather than securing the connection or “pipe”. Named and secured + content resides in distributed caches automatically populated on + demand or selectively pre-populated. When requested by name, NDN + delivers named content to the user from the nearest cache, thereby + traversing fewer network hops, eliminating redundant requests, + and consuming less resources overall. + ''; + license = licenses.lgpl3; + platforms = stdenv.lib.platforms.unix; + maintainers = [ maintainers.sjmackenzie ]; + }; +} diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix index 1e354a49cfd2..505c9b5c0d97 100644 --- a/pkgs/development/libraries/netcdf/default.nix +++ b/pkgs/development/libraries/netcdf/default.nix @@ -1,9 +1,22 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, + zlib, hdf5, + curl # for DAP +}: -stdenv.mkDerivation { - name = "netcdf-4.1.1"; +stdenv.mkDerivation rec { + name = "netcdf-4.3.2"; src = fetchurl { - url = http://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-4.1.1.tar.gz; - sha256 = "1c1g6ig24fn1fm5wwzv4w832li2jikblvbjv6wwg0mwc6yfxccvr"; + url = "http://www.unidata.ucar.edu/downloads/netcdf/ftp/${name}.tar.gz"; + sha256 = "57086b4383ce9232f05aad70761c2a6034b1a0c040260577d369b3bbfe6d248e"; }; -} \ No newline at end of file + + buildInputs = [ + zlib hdf5 curl + ]; + + configureFlags = [ + "--enable-netcdf-4" + "--enable-dap" + "--enable-shared" + ]; +} diff --git a/pkgs/development/libraries/nlopt/default.nix b/pkgs/development/libraries/nlopt/default.nix index cc216a59d758..ad1944377271 100644 --- a/pkgs/development/libraries/nlopt/default.nix +++ b/pkgs/development/libraries/nlopt/default.nix @@ -1,19 +1,28 @@ -{ fetchurl, stdenv -, withOctave ? true, octave ? null}: +{ fetchurl, stdenv, octave ? null }: stdenv.mkDerivation rec { - name = "nlopt-2.3"; + name = "nlopt-2.4.2"; src = fetchurl { url = "http://ab-initio.mit.edu/nlopt/${name}.tar.gz"; - sha256 = "1iw2cjgypyqz779f47fz0nmifbrvk4zs4rxi1ibk36f4ly3wg6p6"; + sha256 = "12cfkkhcdf4zmb6h7y6qvvdvqjs2xf9sjpa3rl3bq76px4yn76c0"; }; - buildInputs = stdenv.lib.optional withOctave octave; + buildInputs = [ octave ]; configureFlags = "--with-cxx --enable-shared --with-pic --without-guile --without-python --without-matlab " + - stdenv.lib.optionalString withOctave ("--with-octave " + + stdenv.lib.optionalString (octave != null) ("--with-octave " + "M_INSTALL_DIR=$(out)/${octave.sitePath}/m " + "OCT_INSTALL_DIR=$(out)/${octave.sitePath}/oct "); + + meta = { + homepage = "http://ab-initio.mit.edu/nlopt/"; + description = "Free open-source library for nonlinear optimization"; + license = stdenv.lib.licenses.lgpl21Plus; + + hydraPlatforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; + } diff --git a/pkgs/development/libraries/npapi-sdk/default.nix b/pkgs/development/libraries/npapi-sdk/default.nix index 255468e78103..57b1b3af2d1c 100644 --- a/pkgs/development/libraries/npapi-sdk/default.nix +++ b/pkgs/development/libraries/npapi-sdk/default.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { homepage = https://code.google.com/p/npapi-sdk/; license = licenses.bsd3; - maintainers = with maintainers; [ wizeman ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/npth/default.nix b/pkgs/development/libraries/npth/default.nix index 4f87f2bc230f..ba75c8aefe7d 100644 --- a/pkgs/development/libraries/npth/default.nix +++ b/pkgs/development/libraries/npth/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "npth-0.91"; + name = "npth-1.1"; src = fetchurl { url = "ftp://ftp.gnupg.org/gcrypt/npth/${name}.tar.bz2"; - sha256 = "1qgs1n70x83dyyysabg50dh8s3464jwsa63qi5if2cd3sk78dvya"; + sha256 = "0zyzwmk4mp6pas87jz35zx0jvwdz7x5b13w225gs73gcn8g5cv49"; }; - meta = { + meta = with stdenv.lib; { description = "The New GNU Portable Threads Library"; longDescription = '' This is a library to provide the GNU Pth API and thus a non-preemptive @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { that this is a solid way to provide a co-routine based framework. ''; homepage = http://www.gnupg.org; - license = stdenv.lib.licenses.lgpl3; - platforms = stdenv.lib.platforms.all; + license = licenses.lgpl3; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 630d18904096..51656f7ac426 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { name = "nss-${version}"; - version = "3.16.5"; + version = "3.17.3"; src = fetchurl { - url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_16_5_RTM/src/${name}.tar.gz"; - sha256 = "e744b9fb2a6291d7eaf1b3f0157082f4214984db33f896e4adf3141340d64196"; + url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_17_3_RTM/src/${name}.tar.gz"; + sha256 = "f4d5e9035a2f84f25f35c283de3b0ff60d72e918748de25eaf017ed201fa21d5"; }; buildInputs = [ nspr perl zlib sqlite ]; @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { ''; patches = - [ ./nss-3.15-gentoo-fixups.patch + [ ./nss-3.17-gentoo-fixups.patch # Based on http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.4-1/85_security_load.patch ./85_security_load.patch ]; diff --git a/pkgs/development/libraries/nss/nss-3.15-gentoo-fixups.patch b/pkgs/development/libraries/nss/nss-3.17-gentoo-fixups.patch index b3e35b1d2d19..26b488acb5d8 100644 --- a/pkgs/development/libraries/nss/nss-3.15-gentoo-fixups.patch +++ b/pkgs/development/libraries/nss/nss-3.17-gentoo-fixups.patch @@ -1,5 +1,5 @@ ---- a/nss/config/Makefile -+++ b/nss/config/Makefile +--- nss-3.17.1/nss/config/Makefile ++++ nss-3.17.1/nss/config/Makefile @@ -0,0 +1,40 @@ +CORE_DEPTH = .. +DEPTH = .. @@ -41,8 +41,8 @@ + +dummy: all export libs + ---- a/nss/config/nss-config.in -+++ b/nss/config/nss-config.in +--- nss-3.17.1/nss/config/nss-config.in ++++ nss-3.17.1/nss/config/nss-config.in @@ -0,0 +1,145 @@ +#!/bin/sh + @@ -189,8 +189,8 @@ + echo $libdirs +fi + ---- a/nss/config/nss.pc.in -+++ b/nss/config/nss.pc.in +--- nss-3.17.1/nss/config/nss.pc.in ++++ nss-3.17.1/nss/config/nss.pc.in @@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ @@ -204,8 +204,8 @@ +Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3 +Cflags: -I${includedir} + ---- a/nss/Makefile -+++ b/nss/Makefile +--- nss-3.17.1/nss/Makefile ++++ nss-3.17.1/nss/Makefile @@ -44,7 +44,7 @@ # (7) Execute "local" rules. (OPTIONAL). # ####################################################################### @@ -215,7 +215,7 @@ nss_clean_all: clobber_nspr clobber -@@ -103,12 +103,6 @@ +@@ -109,12 +109,6 @@ --with-dist-prefix='$(NSPR_PREFIX)' \ --with-dist-includedir='$(NSPR_PREFIX)/include' @@ -228,11 +228,14 @@ build_docs: $(MAKE) -C $(CORE_DEPTH)/doc ---- a/nss/manifest.mn -+++ b/nss/manifest.mn -@@ -10,4 +10,4 @@ +--- nss-3.17.1/nss/manifest.mn ++++ nss-3.17.1/nss/manifest.mn +@@ -10,7 +10,7 @@ RELEASE = nss -DIRS = coreconf lib cmd +DIRS = coreconf lib cmd config + + ifdef NSS_BUILD_GTESTS + DIRS += external_tests diff --git a/pkgs/development/libraries/nvidia-texture-tools/default.nix b/pkgs/development/libraries/nvidia-texture-tools/default.nix index 852d72cb9aad..78932259841b 100644 --- a/pkgs/development/libraries/nvidia-texture-tools/default.nix +++ b/pkgs/development/libraries/nvidia-texture-tools/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { description = "A set of cuda-enabled texture tools and compressors"; homepage = "http://developer.nvidia.com/object/texture_tools.html"; - license = "MIT"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index 527bb25dce18..93803b61fb14 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv +{ fetchhg, stdenv , cmake, mesa , freetype, freeimage, zziplib, randrproto, libXrandr , libXaw, freeglut, libXt, libpng, boost, ois @@ -8,11 +8,12 @@ , nvidia_cg_toolkit }: stdenv.mkDerivation { - name = "ogre-1.8.1"; + name = "ogre-1.9.0"; - src = fetchurl { - url = "mirror://sourceforge/ogre/1.8.1/ogre_src_v1-8-1.tar.bz2"; - sha256 = "1avadx87sdfdk8165wlffnd5dzks694dcdnkg3ijap966k4qm46s"; + src = fetchhg { + url = "https://bitbucket.org/sinbad/ogre/src/"; + rev = "v1-9-0"; + sha256 = "06hnf4c2kpycm3mglwdyywvj931k8ym808c15xighpyd8h9j4xdi"; }; cmakeFlags = [ "-DOGRE_INSTALL_SAMPLES=yes" ] diff --git a/pkgs/development/libraries/opencsg/default.nix b/pkgs/development/libraries/opencsg/default.nix index 4df3abcdd71a..89176c10843e 100644 --- a/pkgs/development/libraries/opencsg/default.nix +++ b/pkgs/development/libraries/opencsg/default.nix @@ -2,11 +2,11 @@ }: stdenv.mkDerivation rec { - version = "1.3.2"; + version = "1.4.0"; name = "opencsg-${version}"; src = fetchurl { url = "http://www.opencsg.org/OpenCSG-${version}.tar.gz"; - sha256 = "09drnck27py8qg1l6gqaia85a9skqn0mz0nybjrkq4gpk0lwk467"; + sha256 = "13c73jxadm27h7spdh3qj1v6rnn81v4xwqlv5a6k72pv9kjnpd7c"; }; buildInputs = [mesa freeglut glew libXmu libXext libX11]; diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index 01a4e2e21daf..8ab9becf3461 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, openssl, cyrus_sasl, db, groff}: stdenv.mkDerivation rec { - name = "openldap-2.4.39"; + name = "openldap-2.4.40"; src = fetchurl { url = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/${name}.tgz"; - sha256 = "19zq9dc7dl03wmqd11fbsdii1npyq1vlicl3nxbfygqh8xrwhrw2"; + sha256 = "1nyslrgwxwilgv5sixc37svls5rbvhsv9drb7hlrjr2vqaji29ni"; }; buildInputs = [ openssl cyrus_sasl db groff ]; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index c972635c9c72..29656f7ef888 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -2,7 +2,7 @@ , withCryptodev ? false, cryptodevHeaders }: let - name = "openssl-1.0.1i"; + name = "openssl-1.0.1j"; opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ] (throw "openssl needs its platform name cross building" null) @@ -19,6 +19,8 @@ let # cannot be overriden per-process. For security, the # environment variable is ignored for setuid binaries. ./cert-file.patch + # Remove the compilation time from the library + ./no-date-in-library.patch ] ++ stdenv.lib.optionals (isCross && opensslCrossSystem == "hurd-x86") @@ -43,7 +45,7 @@ stdenv.mkDerivation { "http://www.openssl.org/source/${name}.tar.gz" "http://openssl.linux-mirror.org/source/${name}.tar.gz" ]; - sha256 = "1izwv1wzqdw8aqnvb70jcqpqp0rvkcm22w5c1dm9l1kpr939y5rw"; + sha256 = "1wzdaiix40lz0rsyf51qv0wiq4ywp29j5ni0xzl06vxsi63wlq0v"; }; patches = patchesCross false; diff --git a/pkgs/development/libraries/openssl/no-date-in-library.patch b/pkgs/development/libraries/openssl/no-date-in-library.patch new file mode 100644 index 000000000000..3eb501dfa020 --- /dev/null +++ b/pkgs/development/libraries/openssl/no-date-in-library.patch @@ -0,0 +1,12 @@ +diff -ur openssl-1.0.1f.orig/crypto/Makefile openssl-1.0.1f/crypto/Makefile +--- openssl-1.0.1f.orig/crypto/Makefile 2014-01-06 15:35:56.000000000 +0100 ++++ openssl-1.0.1f/crypto/Makefile 2014-04-09 13:05:28.071346204 +0200 +@@ -57,7 +57,7 @@ + echo ' /* auto-generated by crypto/Makefile for crypto/cversion.c */'; \ + echo ' #define CFLAGS "$(CC) $(CFLAG)"'; \ + echo ' #define PLATFORM "$(PLATFORM)"'; \ +- echo " #define DATE \"`LC_ALL=C LC_TIME=C date`\""; \ ++ echo " #define DATE \"Thu Jan 1 00:00:01 UTC 1970\""; \ + echo '#endif' ) >buildinf.h + + x86cpuid.s: x86cpuid.pl perlasm/x86asm.pl diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix index be6216b758c9..d1778093868c 100644 --- a/pkgs/development/libraries/p11-kit/default.nix +++ b/pkgs/development/libraries/p11-kit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libiconv, pkgconfig, libffi, libtasn1 }: +{ stdenv, fetchurl, libiconvOrEmpty, pkgconfig, libffi, libtasn1 }: stdenv.mkDerivation rec { name = "p11-kit-0.20.2"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { configureFlags = "--without-libtasn1"; - buildInputs = [ libiconv pkgconfig libffi libtasn1 ]; + buildInputs = [ pkgconfig libffi libtasn1 ] ++ libiconvOrEmpty; meta = { homepage = http://p11-glue.freedesktop.org/; diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 40b02c2afbb2..45ca9cb98e8d 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -1,30 +1,35 @@ -{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng, harfbuzz, fontconfig -, libintlOrEmpty, gobjectIntrospection }: - +{ stdenv, fetchurl, pkgconfig, x11, glib, cairo, libpng, harfbuzz +, fontconfig, freetype, libintlOrEmpty, gobjectIntrospection +}: + +let + ver_maj = "1.36"; + ver_min = "8"; +in stdenv.mkDerivation rec { - name = "pango-1.32.5"; #.6 and higher need fontconfig-2.11.* which is troublesome + name = "pango-${ver_maj}.${ver_min}"; src = fetchurl { - url = "mirror://gnome/sources/pango/1.32/${name}.tar.xz"; - sha256 = "08aqis6j8nd1lb4f2h4h9d9kjvp54iwf8zvqzss0qn4v7nfcjyvx"; + url = "mirror://gnome/sources/pango/${ver_maj}/${name}.tar.xz"; + sha256 = "01rdzjh68w8l5zn0648yibyarj8p6g7yfn59nw5awaz1i8dvbnqq"; }; buildInputs = with stdenv.lib; optional (!stdenv.isDarwin) gobjectIntrospection # build problems of itself and flex - ++ optionals stdenv.isDarwin [ gettext fontconfig ]; - + ++ optionals stdenv.isDarwin [ fontconfig ]; nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ x11 glib cairo libpng harfbuzz ] ++ libintlOrEmpty; + propagatedBuildInputs = [ x11 glib cairo libpng fontconfig freetype harfbuzz ] ++ libintlOrEmpty; enableParallelBuilding = true; + doCheck = false; # test-layout fails on 1.36.8 # jww (2014-05-05): The tests currently fail on Darwin: # # ERROR:testiter.c:139:iter_char_test: assertion failed: (extents.width == x1 - x0) # .../bin/sh: line 5: 14823 Abort trap: 6 srcdir=. PANGO_RC_FILE=./pangorc ${dir}$tst # FAIL: testiter - doCheck = !stdenv.isDarwin; + postInstall = "rm -rf $out/share/gtk-doc"; meta = { diff --git a/pkgs/development/libraries/pangomm/default.nix b/pkgs/development/libraries/pangomm/default.nix index ab598f47a52d..f71c52e670bf 100644 --- a/pkgs/development/libraries/pangomm/default.nix +++ b/pkgs/development/libraries/pangomm/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++ interface to the Pango text rendering library"; homepage = http://www.pango.org/; - # TODO license = with licenses; [ lgpl2 lgpl21 ]; + license = with licenses; [ lgpl2 lgpl21 ]; maintainers = with maintainers; [ lovek323 raskin ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index 930d7b86f063..768e87f5ad29 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "pcre-8.35"; + name = "pcre-8.36"; src = fetchurl { url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${name}.tar.bz2"; - sha256 = "0nw66r92dr24vy9k4lw17bkv8x5nlzn6wx9hq4y2dvzgig3w2qd9"; + sha256 = "1fs5p1z67m9f4xnyil3s4lhgyld78f7m4d1yawpyhh0cvrbk90zg"; }; # The compiler on Darwin crashes with an internal error while building the diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/default.nix b/pkgs/development/libraries/phonon-backend-gstreamer/default.nix index 419978a10117..844c2e580093 100644 --- a/pkgs/development/libraries/phonon-backend-gstreamer/default.nix +++ b/pkgs/development/libraries/phonon-backend-gstreamer/default.nix @@ -2,7 +2,7 @@ , gst_plugins_base }: let - version = "4.7.0"; + version = "4.7.2"; pname = "phonon-backend-gstreamer"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://kde/stable/phonon/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "0zg7hnaywk9wpcvzgskx2334cgfz09ii77pvasrn00ikcqqnnxrs"; + sha256 = "1cfjk450aajr8hfhnfq7zbmryprxiwr9ha5x585dsh7mja82mdw0"; }; buildInputs = [ phonon qt4 gstreamer gst_plugins_base ]; diff --git a/pkgs/development/libraries/phonon-backend-vlc/default.nix b/pkgs/development/libraries/phonon-backend-vlc/default.nix index 060f4c45a486..8a196463639c 100644 --- a/pkgs/development/libraries/phonon-backend-vlc/default.nix +++ b/pkgs/development/libraries/phonon-backend-vlc/default.nix @@ -2,7 +2,7 @@ let pname = "phonon-backend-vlc"; - v = "0.7.0"; + v = "0.7.2"; vlc_ = vlc.override { inherit qt4; }; #Force using the same qt version in @@ -11,7 +11,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://kde/stable/phonon/${pname}/${v}/src/${pname}-${v}.tar.xz"; - sha256 = "1rhzc3d188l6ygxgfxwikscj71pyy0nchzikvkkq465r9ajavdgd"; + sha256 = "1acmbn8pmmq16gcz825dlzaf3haj6avp1bmcxzpkjd1fvxh86y0a"; }; nativeBuildInputs = [ cmake pkgconfig automoc4 xz ]; diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index b29deae9260c..7fd99ab0244a 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, automoc4, qt4, pulseaudio }: let - v = "4.7.1"; + v = "4.7.2"; in stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://kde/stable/phonon/${v}/${name}.tar.xz"; - sha256 = "0pdpj7xnalr511zx12akxg6smz7x5gybkpliclb5f5dcxqnq1xsg"; + sha256 = "1ghidabmi6vnnmz8q272qi259nb8bbqlbayqk52ln98fs8s9g7l1"; }; buildInputs = [ qt4 pulseaudio ]; diff --git a/pkgs/development/libraries/physfs/default.nix b/pkgs/development/libraries/physfs/default.nix index 16fb46d1698a..78cfeb13a2c5 100644 --- a/pkgs/development/libraries/physfs/default.nix +++ b/pkgs/development/libraries/physfs/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://icculus.org/physfs/"; description = "Library to provide abstract access to various archives"; - license = "free"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/development/libraries/pocketsphinx/default.nix b/pkgs/development/libraries/pocketsphinx/default.nix index 3111f71369a0..77d3abd4a5e4 100644 --- a/pkgs/development/libraries/pocketsphinx/default.nix +++ b/pkgs/development/libraries/pocketsphinx/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, sphinxbase, pkgconfig }: stdenv.mkDerivation rec { - name = "pocketsphinx-0.7"; + name = "pocketsphinx-0.8"; src = fetchurl { url = "mirror://sourceforge/cmusphinx/${name}.tar.gz"; - sha256 = "0m94x5pridagr0hgmnidrf4z44zcya05d8fh67k0cc0mmghsq36f"; + sha256 = "0ynf5ik4ib2d3ha3r4i8ywpr2dz5i6v51hmfl8kgzj4i7l44qk47"; }; propagatedBuildInputs = [ sphinxbase ]; @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { description = "Voice recognition library written in C"; homepage = http://cmusphinx.sourceforge.net; - license = "free-non-copyleft"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index 6da928a6a23e..7fe16cec56b9 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, glib, expat, pam, intltool, spidermonkey -, gobjectIntrospection, libxslt, docbook_xsl +, gobjectIntrospection, libxslt, docbook_xsl, docbook_xml_dtd_412 , useSystemd ? stdenv.isLinux, systemd }: let @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig glib expat pam intltool spidermonkey gobjectIntrospection ] - ++ [ libxslt docbook_xsl ] # man pages + ++ [ libxslt docbook_xsl docbook_xml_dtd_412 ] # man pages ++ stdenv.lib.optional useSystemd systemd; # Ugly hack to overwrite hardcoded directories diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 083c9bae6b5b..feb3750907f5 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -4,18 +4,8 @@ }: let - version = "0.26.3"; # even major numbers are stable - sha256 = "1ca2lrwvhxzq0g4blbvq099vyydfjyz839jki301p1jgazrimjw8"; - - qtcairo_patches = - let qtcairo = fetchgit { # the version for poppler-0.24 - url = "git://github.com/giddie/poppler-qt4-cairo-backend.git"; - rev = "7b9e1ea763b579e635ee7614b10970b9635841cf"; - sha256 = "0cdq0qw1sm6mxnrhmah4lfsd9wjlcdx86iyikwmjpwdmrkjk85r2"; - }; in - [ "${qtcairo}/0001-Cairo-backend-added-to-Qt4-wrapper.patch" - "${qtcairo}/0002-Setting-default-Qt4-backend-to-Cairo.patch" - "${qtcairo}/0003-Forcing-subpixel-rendering-in-Cairo-backend.patch" ]; + version = "0.28.1"; # even major numbers are stable + sha256 = "01pxjdbhvpxf00ncf8d9wxc8gkcqcxz59lwrpa151ah988inxkrc"; poppler_drv = nameSuff: merge: stdenv.mkDerivation (stdenv.lib.mergeAttrsByFuncDefaultsClean [ rec { @@ -64,7 +54,6 @@ let poppler_qt4 = poppler_drv "qt4" { propagatedBuildInputs = [ qt4 poppler_glib ]; - patches = qtcairo_patches; NIX_LDFLAGS = "-lpoppler"; postConfigure = '' mkdir -p "$out/lib/pkgconfig" diff --git a/pkgs/development/libraries/postgis/default.nix b/pkgs/development/libraries/postgis/default.nix index acf760f4f799..03dc4b8f1f81 100644 --- a/pkgs/development/libraries/postgis/default.nix +++ b/pkgs/development/libraries/postgis/default.nix @@ -52,7 +52,7 @@ let name = "postgis-${version}"; src = fetchurl { - url = "http://postgis.refractions.net/download/postgis-${fix.fixed.version}.tar.gz"; + url = "http://download.osgeo.org/postgis/source/postgis-${fix.fixed.version}.tar.gz"; inherit (fix.fixed) sha256; }; @@ -141,9 +141,9 @@ in rec { sha256 = "0i6inyiwc5zgf5a4ssg0y774f8vn45zn5c38ccgnln9r6i54vc6k"; }); - v_1_5_1 = pgDerivationBase.merge ( fix : { - version = "1.5.1"; - sha256 = "0nymvqqi6pp4nh4dcshzqm76x4sraf119jp7l27c2q1lygm6p6jr"; + v_1_5_8 = pgDerivationBase.merge ( fix : { + version = "1.5.8"; + sha256 = "016qn2hk3w8rg60rqn91l2nfk9zcsw0pv2s5rb1qhjw15ypgv5j8"; sql_srcs = ["postgis.sql" "spatial_ref_sys.sql"]; }); diff --git a/pkgs/development/libraries/qhull/default.nix b/pkgs/development/libraries/qhull/default.nix index a82acd2745db..76ceb12b401f 100644 --- a/pkgs/development/libraries/qhull/default.nix +++ b/pkgs/development/libraries/qhull/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.qhull.org/; description = "Computes the convex hull, Delaunay triangulation, Voronoi diagram and more"; - license = "free"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix new file mode 100644 index 000000000000..63ba58f23432 --- /dev/null +++ b/pkgs/development/libraries/qpdf/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, pcre, zlib, perl }: + +let version = "5.1.2"; +in +stdenv.mkDerivation rec { + name = "qpdf-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/qpdf/qpdf/${version}/${name}.tar.gz"; + sha256 = "1zbvhrp0zjzbi6q2bnbxbg6399r47pq5gw3kspzph81j19fqvpg9"; + }; + + nativeBuildInputs = [ perl ]; + + buildInputs = [ pcre zlib ]; + + postPatch = '' + patchShebangs qpdf/fix-qdf + ''; + + preCheck = '' + patchShebangs qtest/bin/qtest-driver + ''; + + doCheck = true; + + meta = with stdenv.lib; { + homepage = http://qpdf.sourceforge.net/; + description = "A C++ library and set of programs that inspect and manipulate the structure of PDF files"; + licenses = licenses.artistic2; + maintainers = maintainers.abbradar; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 1679b4953e77..943d780473ac 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, substituteAll, libXrender, libXinerama, libXcursor, libXmu, libXv, libXext +{ stdenv, fetchurl, fetchpatch, substituteAll +, libXrender, libXinerama, libXcursor, libXmu, libXv, libXext , libXfixes, libXrandr, libSM, freetype, fontconfig, zlib, libjpeg, libpng , libmng, which, mesaSupported, mesa, mesa_glu, openssl, dbus, cups, pkgconfig , libtiff, glib, icu, mysql, postgresql, sqlite, perl, coreutils, libXi @@ -64,7 +65,13 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional flashplayerFix (substituteAll { src = ./dlopen-webkit-nsplugin.diff; inherit gtk gdk_pixbuf; - }); + }) + ++ [(fetchpatch { + name = "fix-medium-font.patch"; + url = "http://anonscm.debian.org/cgit/pkg-kde/qt/qt4-x11.git/plain/debian/patches/" + + "kubuntu_39_fix_medium_font.diff?id=21b342d71c19e6d68b649947f913410fe6129ea4"; + sha256 = "0bli44chn03c2y70w1n8l7ss4ya0b40jqqav8yxrykayi01yf95j"; + })]; preConfigure = '' export LD_LIBRARY_PATH="`pwd`/lib:$LD_LIBRARY_PATH" @@ -78,8 +85,6 @@ stdenv.mkDerivation rec { -translationdir $out/share/${name}/translations " '' + optionalString stdenv.isDarwin '' - export CXX=clang++ - export CC=clang sed -i 's/QMAKE_CC = gcc/QMAKE_CC = clang/' mkspecs/common/g++-base.conf sed -i 's/QMAKE_CXX = g++/QMAKE_CXX = clang++/' mkspecs/common/g++-base.conf ''; diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix new file mode 100644 index 000000000000..6ab29fa9ac51 --- /dev/null +++ b/pkgs/development/libraries/qtkeychain/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, cmake, qt4 }: + +stdenv.mkDerivation rec { + name = "qtkeychain-${version}"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "frankosterfeld"; + repo = "qtkeychain"; + rev = "v${version}"; + sha256 = "10msaylisbwmgpwd59vr4dfgml75kji8mlfwnwq8yp29jikj5amq"; + }; + + cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=$out/share/qt/translations" ]; + + buildInputs = [ cmake qt4 ]; + + meta = { + description = "Platform-independent Qt API for storing passwords securely"; + homepage = "https://github.com/frankosterfeld/qtkeychain"; + license = stdenv.lib.licenses.bsd3; + }; +} diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix index 9eb068bebb0d..7b1e70e0eed3 100644 --- a/pkgs/development/libraries/quazip/default.nix +++ b/pkgs/development/libraries/quazip/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, zip, zlib, qt5 }: +{ fetchurl, stdenv, zip, zlib, qt }: stdenv.mkDerivation rec { name = "quazip-0.7"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { installFlags = "INSTALL_ROOT=$(out)"; - buildInputs = [ zlib qt5 ]; + buildInputs = [ zlib qt ]; meta = { description = "Provides access to ZIP archives from Qt programs"; diff --git a/pkgs/development/libraries/qwt/6.nix b/pkgs/development/libraries/qwt/6.nix index c13862775268..3660ff889813 100644 --- a/pkgs/development/libraries/qwt/6.nix +++ b/pkgs/development/libraries/qwt/6.nix @@ -20,8 +20,9 @@ stdenv.mkDerivation rec { description = "Qt widgets for technical applications"; homepage = http://qwt.sourceforge.net/; # LGPL 2.1 plus a few exceptions (more liberal) - license = "Qwt License, Version 1.0"; + license = stdenv.lib.licenses.qwt; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; + branch = "6"; }; } diff --git a/pkgs/development/libraries/qwt/default.nix b/pkgs/development/libraries/qwt/default.nix index fe73e0beabd9..4aa7c0bc7d5a 100644 --- a/pkgs/development/libraries/qwt/default.nix +++ b/pkgs/development/libraries/qwt/default.nix @@ -1,20 +1,19 @@ { stdenv, fetchurl, qt4 }: stdenv.mkDerivation rec { - name = "qwt-5.2.1"; + name = "qwt-5.2.3"; src = fetchurl { url = "mirror://sourceforge/qwt/${name}.tar.bz2"; - sha256 = "17snmh8qwsgb4j2yiyzmi0s1jli14vby5wv1kv4kvjq4aisvpf72"; + sha256 = "1dqa096mm6n3bidfq2b67nmdsvsw4ndzzd1qhl6hn8skcwqazzip"; }; propagatedBuildInputs = [ qt4 ]; - patches = [ ./prefix.diff ]; - postPatch = '' sed -e "s@\$\$\[QT_INSTALL_PLUGINS\]@$out/lib/qt4/plugins@" -i designer/designer.pro - ''; + sed -e "s|INSTALLBASE.*=.*|INSTALLBASE = $out|g" -i qwtconfig.pri + ''; configurePhase = ''qmake INSTALLBASE=$out -after doc.path=$out/share/doc/${name} -r''; @@ -22,7 +21,7 @@ stdenv.mkDerivation rec { description = "Qt widgets for technical applications"; homepage = http://qwt.sourceforge.net/; # LGPL 2.1 plus a few exceptions (more liberal) - license = "Qwt License, Version 1.0"; + license = stdenv.lib.licenses.qwt; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/development/libraries/qwt/prefix.diff b/pkgs/development/libraries/qwt/prefix.diff deleted file mode 100644 index a97efe5ab4a8..000000000000 --- a/pkgs/development/libraries/qwt/prefix.diff +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/qwtconfig.pri b/qwtconfig.pri -index 2be4a68..8625686 100644 ---- a/qwtconfig.pri -+++ b/qwtconfig.pri -@@ -7,12 +7,14 @@ VER_MIN = 2 - VER_PAT = 1 - VERSION = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT} - --unix { -- INSTALLBASE = /usr/local/qwt-5.2.1 --} -+isEmpty(INSTALLBASE) { -+ unix { -+ INSTALLBASE = /usr/local/qwt-5.2.1 -+ } - --win32 { -- INSTALLBASE = C:/Qwt-5.2.1 -+ win32 { -+ INSTALLBASE = C:/Qwt-5.2.1 -+ } - } - - target.path = $$INSTALLBASE/lib diff --git a/pkgs/development/libraries/readline/5.x.nix b/pkgs/development/libraries/readline/5.x.nix index ad9860d855ef..13916040fbaf 100644 --- a/pkgs/development/libraries/readline/5.x.nix +++ b/pkgs/development/libraries/readline/5.x.nix @@ -11,5 +11,7 @@ stdenv.mkDerivation { propagatedBuildInputs = [ncurses]; patches = stdenv.lib.optional stdenv.isDarwin ./shobj-darwin.patch; + meta = { + branch = "5"; + }; } - diff --git a/pkgs/development/libraries/readline/6.2.nix b/pkgs/development/libraries/readline/6.2.nix index d72d6566bbc9..f50331ba684a 100644 --- a/pkgs/development/libraries/readline/6.2.nix +++ b/pkgs/development/libraries/readline/6.2.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation (rec { patches = [ ./link-against-ncurses.patch ./no-arch_only.patch + ./clang.patch ] ++ (let @@ -48,6 +49,7 @@ stdenv.mkDerivation (rec { license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; + branch = "6.2"; }; } diff --git a/pkgs/development/libraries/readline/6.3.nix b/pkgs/development/libraries/readline/6.3.nix index 38ecc034d892..ea459f291b36 100644 --- a/pkgs/development/libraries/readline/6.3.nix +++ b/pkgs/development/libraries/readline/6.3.nix @@ -54,5 +54,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.ludo ]; platforms = platforms.unix; + branch = "6.3"; }; } diff --git a/pkgs/development/libraries/readline/clang.patch b/pkgs/development/libraries/readline/clang.patch new file mode 100644 index 000000000000..42bb0be09c39 --- /dev/null +++ b/pkgs/development/libraries/readline/clang.patch @@ -0,0 +1,13 @@ +diff --git a/support/shobj-conf b/support/shobj-conf +index 5a63e80..4b2a741 100644 +--- support/shobj-conf ++++ support/shobj-conf +@@ -189,7 +189,7 @@ darwin*|macosx*) + darwin[789]*|darwin10*) SHOBJ_LDFLAGS='' + SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v' + ;; +- *) SHOBJ_LDFLAGS='-dynamic' ++ *) SHOBJ_LDFLAGS='-dynamiclib' + SHLIB_XLDFLAGS='-arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v' + ;; + esac diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix index 1bc7eff31819..fa8412ccb6db 100644 --- a/pkgs/development/libraries/science/math/blas/default.nix +++ b/pkgs/development/libraries/science/math/blas/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation { meta = { description = "Basic Linear Algebra Subprograms"; - license = "public domain"; + license = stdenv.lib.licenses.publicDomain; homepage = "http://www.netlib.org/blas/"; }; } diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix new file mode 100644 index 000000000000..3a22ecb73fca --- /dev/null +++ b/pkgs/development/libraries/science/math/ipopt/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, unzip, blas, liblapack, gfortran }: + +stdenv.mkDerivation rec { + version = "3.11.9"; + name = "ipopt-${version}"; + + src = fetchurl { + url = "http://www.coin-or.org/download/source/Ipopt/Ipopt-${version}.zip"; + sha256 = "0sji4spl5dhw1s3f9y0ym09gi7d1c8wldn6wbiap4q8dq7cvklq5"; + }; + + nativeBuildInputs = [ unzip ]; + + buildInputs = [ gfortran blas liblapack ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A software package for large-scale nonlinear optimization"; + homepage = https://projects.coin-or.org/Ipopt; + license = licenses.epl10; + platforms = platforms.unix; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/libraries/scmccid/default.nix b/pkgs/development/libraries/scmccid/default.nix index f18107c48a5e..1b0039952d7d 100644 --- a/pkgs/development/libraries/scmccid/default.nix +++ b/pkgs/development/libraries/scmccid/default.nix @@ -4,7 +4,7 @@ assert stdenv ? gcc && stdenv.gcc.libc != null; stdenv.mkDerivation rec { name = "scmccid-5.0.11"; - + src = if stdenv.system == "i686-linux" then (fetchurl { url = "http://www.scmmicro.com/support/download/scmccid_5.0.11_linux.tar.gz"; sha256 = "1r5wkarhzl09ncgj55baizf573czw0nplh1pgddzx9xck66kh5bm"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.scmmicro.com/support/pc-security-support/downloads.html; description = "PCSC drivers for linux, for the SCM SCR3310 v2.0 card and others"; - license = "nonfree"; + license = stdenv.lib.licenses.unfree; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix index 1e8eec6ae452..49d7cec95901 100644 --- a/pkgs/development/libraries/serf/default.nix +++ b/pkgs/development/libraries/serf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, krb5, pkgconfig }: +{ stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, krb5, pkgconfig, gnused }: stdenv.mkDerivation rec { name = "serf-1.3.7"; @@ -11,16 +11,20 @@ stdenv.mkDerivation rec { buildInputs = [ apr scons openssl aprutil zlib krb5 pkgconfig ]; configurePhase = '' - sed -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"PATH":os.environ["PATH"]})' -i SConstruct - sed -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"NIX_CFLAGS_COMPILE":os.environ["NIX_CFLAGS_COMPILE"]})' -i SConstruct - sed -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"NIX_LDFLAGS":os.environ["NIX_LDFLAGS"]})' -i SConstruct + ${gnused}/bin/sed -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"PATH":os.environ["PATH"]})' -i SConstruct + ${gnused}/bin/sed -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"NIX_CFLAGS_COMPILE":os.environ["NIX_CFLAGS_COMPILE"]})' -i SConstruct + ${gnused}/bin/sed -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"NIX_LDFLAGS":os.environ["NIX_LDFLAGS"]})' -i SConstruct ''; buildPhase = '' scons PREFIX="$out" OPENSSL="${openssl}" ZLIB="${zlib}" APR="$(echo "${apr}"/bin/*-config)" \ - APU="$(echo "${aprutil}"/bin/*-config)" GSSAPI="${krb5}" CC="${stdenv.gcc}/bin/gcc" + APU="$(echo "${aprutil}"/bin/*-config)" GSSAPI="${krb5}" CC="${ + if stdenv.isDarwin then "clang" else "${stdenv.gcc}/bin/gcc" + }" ''; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-L/usr/lib"; + installPhase = '' scons install ''; diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix index 842d74848df6..55c69b137e52 100644 --- a/pkgs/development/libraries/skalibs/default.nix +++ b/pkgs/development/libraries/skalibs/default.nix @@ -1,10 +1,14 @@ -{stdenv, fetchurl}: +{ stdenv +, skarnetConfCompile +, fetchurl +}: let version = "1.6.0.0"; in stdenv.mkDerivation rec { + name = "skalibs-${version}"; src = fetchurl { @@ -17,32 +21,7 @@ in stdenv.mkDerivation rec { # See http://skarnet.org/cgi-bin/archive.cgi?1:mss:75:201405:pkmodhckjklemogbplje patches = [ ./getpeereid.patch ]; - configurePhase = '' - pushd conf-compile - - printf "$out/bin" > conf-defaultpath - printf "$out/etc" > conf-etc - printf "$out/bin" > conf-install-command - printf "$out/include" > conf-install-include - printf "$out/libexec" > conf-install-libexec - printf "$out/lib" > conf-install-library - printf "$out/lib" > conf-install-library.so - printf "$out/sysdeps" > conf-install-sysdeps - - # let nix builder strip things, cross-platform - truncate --size 0 conf-stripbins - truncate --size 0 conf-striplibs - - rm -f flag-slashpackage - touch flag-allstatic - touch flag-forcedevr - - popd - ''; - - preBuild = '' - patchShebangs src/sys - ''; + buildInputs = [ skarnetConfCompile ]; preInstall = '' mkdir -p "$out/etc" @@ -50,7 +29,7 @@ in stdenv.mkDerivation rec { meta = { homepage = http://skarnet.org/software/skalibs/; - description = "A set of general-purpose C programming libraries."; + description = "A set of general-purpose C programming libraries"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.isc; }; diff --git a/pkgs/development/libraries/slib/default.nix b/pkgs/development/libraries/slib/default.nix index 4c615b81552f..02e7dc24159f 100644 --- a/pkgs/development/libraries/slib/default.nix +++ b/pkgs/development/libraries/slib/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ''; # Public domain + permissive (non-copyleft) licensing of some files. - license = "public domain"; + license = stdenv.lib.licenses.publicDomain; homepage = http://people.csail.mit.edu/jaffer/SLIB; diff --git a/pkgs/development/libraries/slib/setup-hook.sh b/pkgs/development/libraries/slib/setup-hook.sh index 32dde7d1f7a2..62b72d6dc0ab 100644 --- a/pkgs/development/libraries/slib/setup-hook.sh +++ b/pkgs/development/libraries/slib/setup-hook.sh @@ -10,4 +10,4 @@ addSlibPath () { fi } -envHooks=(${envHooks[@]} addSlibPath) +envHooks+=(addSlibPath) diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix index 30c1f4937ecf..c2473ae2c5db 100644 --- a/pkgs/development/libraries/smpeg/default.nix +++ b/pkgs/development/libraries/smpeg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, SDL, autoconf, automake, libtool, gtk, m4, pkgconfig, mesa }: +{ stdenv, fetchsvn, SDL, autoconf, automake, libtool, gtk, m4, pkgconfig, mesa, makeWrapper }: stdenv.mkDerivation rec { name = "smpeg-svn${version}"; @@ -12,7 +12,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ SDL autoconf automake libtool gtk m4 pkgconfig mesa ]; + buildInputs = [ SDL gtk mesa ]; + + nativeBuildInputs = [ autoconf automake libtool m4 pkgconfig makeWrapper ]; preConfigure = '' touch NEWS AUTHORS ChangeLog @@ -26,6 +28,10 @@ stdenv.mkDerivation rec { -e 's,"SDL_thread.h",<SDL/SDL_thread.h>,' \ -e 's,"SDL_types.h",<SDL/SDL_types.h>,' \ $out/include/smpeg/*.h + + wrapProgram $out/bin/smpeg-config \ + --prefix PATH ":" "${pkgconfig}/bin" \ + --prefix PKG_CONFIG_PATH ":" "${SDL}/lib/pkgconfig" ''; meta = { diff --git a/pkgs/development/libraries/speech-tools/default.nix b/pkgs/development/libraries/speech-tools/default.nix index 48168ceb92dd..79a633c65417 100644 --- a/pkgs/development/libraries/speech-tools/default.nix +++ b/pkgs/development/libraries/speech-tools/default.nix @@ -2,9 +2,9 @@ x@{builderDefsPackage , gawk, alsaLib, ncurses , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) @@ -28,7 +28,7 @@ rec { /* doConfigure should be removed if not needed */ phaseNames = ["doUnpack" "killUsrBin" "doConfigure" "doMakeInstall" "doDeploy" "fixPaths"]; - + killUsrBin = a.fullDepEntry '' sed -e s@/usr/bin/@@g -i $( grep -rl '/usr/bin/' . ) sed -re 's@/bin/(rm|printf|uname)@\1@g' -i $( grep -rl '/bin/' . ) @@ -55,7 +55,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "free-noncopyleft"; + license = a.lib.licenses.free; }; passthru = { updateInfo = { @@ -63,4 +63,3 @@ rec { }; }; }) x - diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index f649401c5ca8..e7a048f0a312 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "spice-gtk-0.24"; + name = "spice-gtk-0.25"; src = fetchurl { url = "http://www.spice-space.org/download/gtk/${name}.tar.bz2"; - sha256 = "1l8y1pbaqyzb6w8w8xa097dvj4zxhksn85pif1b9847r8l451zkf"; + sha256 = "11yh593frbafp0ywkk7pfc2k17q1fwrl8zcjclph3xfr1alccc07"; }; buildInputs = [ diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index ec392e715315..0598b0bd684a 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -1,25 +1,25 @@ -{ stdenv, fetchurl, readline ? null, ncurses ? null }: +{ lib, stdenv, fetchurl, interactive ? false, readline ? null, ncurses ? null }: -assert readline != null -> ncurses != null; +assert interactive -> readline != null && ncurses != null; stdenv.mkDerivation { - name = "sqlite-3.8.4.3"; + name = "sqlite-3.8.7.1"; src = fetchurl { - url = "http://www.sqlite.org/2014/sqlite-autoconf-3080403.tar.gz"; - sha1 = "zd9nqg1fc41222hvzvmvzr92z80b3wvh"; + url = "http://www.sqlite.org/2014/sqlite-autoconf-3080701.tar.gz"; + sha1 = "5601be1263842209d7c5dbf6128f1cc0b6bbe2e5"; }; - buildInputs = [ readline ncurses ]; + buildInputs = lib.optionals interactive [ readline ncurses ]; configureFlags = "--enable-threadsafe"; - CFLAGS = "-DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_SECURE_DELETE=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY=1"; - LDFLAGS = if readline != null then "-lncurses" else ""; + NIX_CFLAGS_COMPILE = "-DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_SECURE_DELETE=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY=1"; meta = { homepage = http://www.sqlite.org/; description = "A self-contained, serverless, zero-configuration, transactional SQL database engine"; platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.eelco ]; }; } diff --git a/pkgs/development/libraries/stlport/default.nix b/pkgs/development/libraries/stlport/default.nix index f1c8a84fee26..5588646e53ad 100644 --- a/pkgs/development/libraries/stlport/default.nix +++ b/pkgs/development/libraries/stlport/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { meta = { description = "An implementation of the C++ Standard Library"; homepage = http://sourceforge.net/projects/stlport/; - license = "free"; # seems BSD-like + license = stdenv.lib.licenses.free; # seems BSD-like }; } diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index 15e89d9210a1..2459284b2703 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -1,24 +1,37 @@ -{ fetchurl, stdenv }: +{ stdenv, fetchurl, python27, pkgconfig, readline, gettext, libxslt, docbook_xsl +, docbook_xml_dtd_42 +, acl ? null, heimdal ? null, libaio ? null, pam ? null, zlib ? null +, libgcrypt ? null, libcap ? null +}: stdenv.mkDerivation rec { - name = "talloc-2.0.1"; + name = "talloc-2.1.1"; src = fetchurl { url = "http://samba.org/ftp/talloc/${name}.tar.gz"; - md5 = "c6e736540145ca58cb3dcb42f91cf57b"; + sha256 = "0x31id42b425dbxv5whrqlc6dj14ph7wzs3wsp1ggi537dncwa9y"; }; - configureFlags = "--enable-talloc-compat1 --enable-largefile"; - - # https://bugzilla.samba.org/show_bug.cgi?id=7000 - postConfigure = if stdenv.isDarwin then '' - substituteInPlace "Makefile" --replace "SONAMEFLAG = #" "SONAMEFLAG = -install_name" - '' else ""; + buildInputs = [ + python27 pkgconfig readline gettext libxslt docbook_xsl docbook_xml_dtd_42 + acl heimdal libaio pam zlib libgcrypt libcap + ]; - meta = { + preConfigure = '' + sed -i 's,#!/usr/bin/env python,#!${python27}/bin/python,g' buildtools/bin/waf + ''; + + configureFlags = [ + "--enable-talloc-compat1" + "--bundled-libraries=NONE" + "--builtin-libraries=replace" + ]; + + meta = with stdenv.lib; { description = "Hierarchical pool based memory allocator with destructors"; homepage = http://tdb.samba.org/; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.all; + license = licenses.gpl3; + maintainers = with maintainers; [ wkennington ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix index c53316564351..ce43202ee438 100644 --- a/pkgs/development/libraries/tdb/default.nix +++ b/pkgs/development/libraries/tdb/default.nix @@ -1,16 +1,32 @@ -{ fetchurl, stdenv, libxslt, libxml2, docbook_xsl }: +{ stdenv, fetchurl, python27, pkgconfig, gettext, readline, libxslt +, docbook_xsl, docbook_xml_dtd_42 +, libaio ? null, acl ? null, heimdal ? null, libcap ? null, sasl ? null, pam ? null, zlib ? null +, libgcrypt ? null +}: stdenv.mkDerivation rec { - name = "tdb-1.2.1"; + name = "tdb-1.3.1"; src = fetchurl { url = "http://samba.org/ftp/tdb/${name}.tar.gz"; - sha256 = "1yndfc2hn28v78vgvrds7cjggmmhf9q5dcfklgdfvpsx9j9knhpg"; + sha256 = "1qzcl8n57vpxwd8048djna3zwjy6ji56c2bnvmnr1hw0x1d9hagz"; }; - buildInputs = [ libxslt libxml2 docbook_xsl ]; + buildInputs = [ + python27 pkgconfig gettext readline libxslt docbook_xsl docbook_xml_dtd_42 + libaio acl heimdal libcap sasl pam zlib libgcrypt + ]; - meta = { + preConfigure = '' + sed -i 's,#!/usr/bin/env python,#!${python27}/bin/python,g' buildtools/bin/waf + ''; + + configureFlags = [ + "--bundled-libraries=NONE" + "--builtin-libraries=replace" + ]; + + meta = with stdenv.lib; { description = "The trivial database"; longDescription = '' TDB is a Trivial Database. In concept, it is very much like GDBM, @@ -18,11 +34,9 @@ stdenv.mkDerivation rec { uses locking internally to keep writers from trampling on each other. TDB is also extremely small. ''; - homepage = http://tdb.samba.org/; - license = stdenv.lib.licenses.lgpl3Plus; - - maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ wkennington ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix new file mode 100644 index 000000000000..e92ae2ecef1e --- /dev/null +++ b/pkgs/development/libraries/tevent/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, python27, pkgconfig, readline, gettext, talloc +, libxslt, docbook_xsl, docbook_xml_dtd_42 +, acl ? null, heimdal ? null, libaio ? null, libcap ? null, sasl ? null +, pam ? null, zlib ? null, libgcrypt ? null +}: + +stdenv.mkDerivation rec { + name = "tevent-0.9.22"; + + src = fetchurl { + url = "http://samba.org/ftp/tevent/${name}.tar.gz"; + sha256 = "0myyi3lwsi6f3f0a5qw8rjpm2d5yf18pw4vljdwyi885l411sksl"; + }; + + buildInputs = [ + python27 pkgconfig readline gettext talloc libxslt docbook_xsl + docbook_xml_dtd_42 + acl heimdal libaio libcap sasl pam zlib libgcrypt + ]; + + preConfigure = '' + sed -i 's,#!/usr/bin/env python,#!${python27}/bin/python,g' buildtools/bin/waf + ''; + + configureFlags = [ + "--bundled-libraries=NONE" + "--builtin-libraries=replace" + ]; + + meta = with stdenv.lib; { + description = "an event system based on the talloc memory management library."; + homepage = http://tevent.samba.org/; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ wkennington ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix index f8c437f2b0f1..53c3ddc35393 100644 --- a/pkgs/development/libraries/thrift/default.nix +++ b/pkgs/development/libraries/thrift/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { patches = [ ./yylex.patch ]; # Workaround to make the python wrapper not drop this package: - # pythonFull.override { extraLibs = [ thrift ]; } + # pythonFull.buildEnv.override { extraLibs = [ thrift ]; } pythonPath = []; buildInputs = [ @@ -35,7 +35,7 @@ stdenv.mkDerivation { description = "Library for scalable cross-language services"; homepage = http://thrift.apache.org/; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/development/libraries/tinyxml/2.6.2.nix b/pkgs/development/libraries/tinyxml/2.6.2.nix index e1cc1f27c1d0..7f0a343eba23 100644 --- a/pkgs/development/libraries/tinyxml/2.6.2.nix +++ b/pkgs/development/libraries/tinyxml/2.6.2.nix @@ -4,20 +4,20 @@ let version = "2.6.2"; in stdenv.mkDerivation { name = "tinyxml-${version}"; - + src = fetchurl { url = "mirror://sourceforge/project/tinyxml/tinyxml/${version}/tinyxml_2_6_2.zip"; sha256 = "04nmw6im2d1xp12yir8va93xns5iz816pwi25n9cql3g3i8bjsxc"; }; - + patches = [ # add pkgconfig file ./2.6.2-add-pkgconfig.patch - + # http://sourceforge.net/tracker/index.php?func=detail&aid=3031828&group_id=13559&atid=313559 ./2.6.2-entity.patch ]; - + buildInputs = [ unzip ]; buildPhase = '' # use STL (xbmc requires it) @@ -26,13 +26,13 @@ in stdenv.mkDerivation { # build xmltest make - + # build the lib as a shared library g++ -Wall -O2 -shared -fpic tinyxml.cpp \ tinyxmlerror.cpp tinyxmlparser.cpp \ tinystr.cpp -o libtinyxml.so ''; - + doCheck = true; checkPhase = '' ./xmltest @@ -41,25 +41,25 @@ in stdenv.mkDerivation { exit $result fi ''; - + installPhase = '' mkdir -pv $out/include/ mkdir -pv $out/lib/pkgconfig/ mkdir -pv $out/share/doc/tinyxml/ - + cp -v libtinyxml.so $out/lib/ cp -v *.h $out/include/ - + substituteInPlace tinyxml.pc --replace "@out@" "$out" substituteInPlace tinyxml.pc --replace "@version@" "${version}" cp -v tinyxml.pc $out/lib/pkgconfig/ - + cp -v docs/* $out/share/doc/tinyxml/ ''; - + meta = { description = "Simple, small, C++ XML parser that can be easily integrating into other programs"; homepage = "http://www.grinninglizard.com/tinyxml/index.html"; - license = "free-non-copyleft"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/development/libraries/tokyo-cabinet/default.nix b/pkgs/development/libraries/tokyo-cabinet/default.nix index 7741549666ad..0b210a589d41 100644 --- a/pkgs/development/libraries/tokyo-cabinet/default.nix +++ b/pkgs/development/libraries/tokyo-cabinet/default.nix @@ -1,17 +1,15 @@ { fetchurl, stdenv, zlib, bzip2 }: stdenv.mkDerivation rec { - name = "tokyocabinet-1.4.46"; + name = "tokyocabinet-1.4.48"; src = fetchurl { - url = "http://www.1978th.net/tokyocabinet/${name}.tar.gz"; - sha256 = "18rkv6kq43cqabc9mvfw534nsv6v8bc2i2r2bmax0yxnbhqa7ahf"; + url = "http://fallabs.com/tokyocabinet/${name}.tar.gz"; + sha256 = "140zvr0n8kvsl0fbn2qn3f2kh3yynfwnizn4dgbj47m975yg80x0"; }; buildInputs = [ zlib bzip2 ]; - doCheck = true; - postInstall = '' sed -i "$out/lib/pkgconfig/tokyocabinet.pc" \ -e 's|-lz|-L${zlib}/lib -lz|g; diff --git a/pkgs/development/libraries/tsocks/default.nix b/pkgs/development/libraries/tsocks/default.nix index bdc2b4da6e3e..e33234304d2f 100644 --- a/pkgs/development/libraries/tsocks/default.nix +++ b/pkgs/development/libraries/tsocks/default.nix @@ -2,14 +2,18 @@ stdenv.mkDerivation rec { name = "tsocks-${version}"; version = "1.8beta5"; - + src = fetchurl { url = "mirror://sourceforge/tsocks/${name}.tar.gz"; sha256 = "0ixkymiph771dcdzvssi9dr2pk1bzaw9zv85riv3xl40mzspx7c4"; }; + patches = [ ./poll.patch ]; + preConfigure = '' - export configureFlags="$configureFlags --libdir=$out/lib" + sed -i -e "s,\\\/usr,"$(echo $out|sed -e "s,\\/,\\\\\\\/,g")",g" tsocks + substituteInPlace tsocks --replace /usr $out + export configureFlags="$configureFlags --libdir=$out/lib" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/tsocks/poll.patch b/pkgs/development/libraries/tsocks/poll.patch new file mode 100644 index 000000000000..2bfeb9f779ca --- /dev/null +++ b/pkgs/development/libraries/tsocks/poll.patch @@ -0,0 +1,26 @@ +From Ingo Hadan <ingo.hadan@sdm.de> Fri, 02 Apr 2010 21:08:50 +0200 +From: Julien Moutinho <julm+tsocks@autogeree.net> +Date: Fri, 26 Apr 2013 01:57:26 +0200 +Subject: tsocks fails if socksified application uses poll(2) (e.g. subversion-1.5) + +--- +diff --git a/tsocks.c b/tsocks.c +index 9cfdfff..470babd 100644 +--- a/tsocks.c ++++ b/tsocks.c +@@ -657,10 +657,11 @@ int poll(POLL_SIGNATURE) { + * be ready for writing), otherwise we'll just let the select loop + * come around again (since we can't flag it for read, we don't know + * if there is any data to be read and can't be bothered checking) */ +- if (conn->selectevents & WRITE) { +- setevents |= POLLOUT; ++ if (conn->selectevents & POLLOUT) { ++ ufds[i].revents |= POLLOUT; + nevents++; + } ++ ufds[i].events = conn->selectevents; + } + } + } while (nevents == 0); + + diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix index 0e8a95d5ac16..0fc325137179 100644 --- a/pkgs/development/libraries/ucommon/default.nix +++ b/pkgs/development/libraries/ucommon/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, gnutls, pkgconfig, zlib, libgcrypt }: stdenv.mkDerivation rec { - name = "ucommon-6.0.7"; + name = "ucommon-6.1.11"; src = fetchurl { - url = mirror://gnu/commoncpp/ucommon-6.0.7.tar.gz; - sha256 = "1rlvchmg6qq8jq79qjgv0l0wqi1dqhmm4ng1qj9f012dbhwcap3x"; + url = "mirror://gnu/commoncpp/${name}.tar.gz"; + sha256 = "0hpwxiyd7c3qnzksk6vw94cdig1v8yy6khgcaa87a7hb3zbkv4zg"; }; buildInputs = [ pkgconfig gnutls zlib ]; diff --git a/pkgs/development/libraries/udunits/configure.patch b/pkgs/development/libraries/udunits/configure.patch new file mode 100644 index 000000000000..36a0efb8590e --- /dev/null +++ b/pkgs/development/libraries/udunits/configure.patch @@ -0,0 +1,12 @@ +diff -ru -x '*~' udunits-2.1.24_orig/configure udunits-2.1.24/configure +--- udunits-2.1.24_orig/configure 2011-09-13 05:58:39.000000000 +0900 ++++ udunits-2.1.24/configure 2014-11-21 21:59:30.308180814 +0900 +@@ -7033,7 +7033,7 @@ + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- case `/usr/bin/file conftest.o` in ++ case `$MAGIC_CMD conftest.o` in + *32-bit*) + case $host in + x86_64-*kfreebsd*-gnu) diff --git a/pkgs/development/libraries/udunits/default.nix b/pkgs/development/libraries/udunits/default.nix new file mode 100644 index 000000000000..608900c85ade --- /dev/null +++ b/pkgs/development/libraries/udunits/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, + bison, flex, expat, file +}: + +stdenv.mkDerivation rec { + name = "udunits-2.1.24"; + src = fetchurl { + url = "ftp://ftp.unidata.ucar.edu/pub/udunits/${name}.tar.gz"; + sha256 = "1l0fdsl55374w7fjyd1wdx474f3p265b6rw1lq269cii61ca8prf"; + }; + + buildInputs = [ + bison flex expat file + ]; + + patches = [ ./configure.patch ]; + + MAGIC_CMD="${file}/bin/file"; +} diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index fda32a7ddbd3..3abac0feab38 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Google's open source JavaScript engine"; - platforms = with platforms; linux ++ darwin; + platforms = with platforms; linux; license = licenses.bsd3; }; } diff --git a/pkgs/development/libraries/vrpn/default.nix b/pkgs/development/libraries/vrpn/default.nix index 3544e984077a..d07c1d550472 100644 --- a/pkgs/development/libraries/vrpn/default.nix +++ b/pkgs/development/libraries/vrpn/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { homepage = http://www.cs.unc.edu/Research/vrpn/; - license = "BSL1.0"; # Boost Software License, + license = stdenv.lib.licenses.boost; # see # <http://www.cs.unc.edu/Research/vrpn/obtaining_vrpn.html> }; diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index ae9fac06eeec..8c1ac2deb66a 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, libffi, expat, pkgconfig, libxslt, docbook_xsl, doxygen }: -let version = "1.5.0"; in +let version = "1.6.0"; in stdenv.mkDerivation rec { name = "wayland-${version}"; src = fetchurl { url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "1da179livkkmfsds32yhh4zflxn9qs6av023702kx2w8mzly2s80"; + sha256 = "0zzwlrmxil10g9rvdgha0y1d8z0x97g65g14kl2qrl2krwni1md7"; }; buildInputs = [ pkgconfig libffi expat libxslt docbook_xsl doxygen ]; diff --git a/pkgs/development/libraries/webkitgtk/2.4.6.nix b/pkgs/development/libraries/webkitgtk/2.4.6.nix new file mode 100644 index 000000000000..a2344f71f882 --- /dev/null +++ b/pkgs/development/libraries/webkitgtk/2.4.6.nix @@ -0,0 +1,62 @@ +{ stdenv, fetchurl, perl, python, ruby, bison, gperf, flex +, pkgconfig, which, gettext, gobjectIntrospection +, gtk2, gtk3, wayland, libwebp, enchant +, libxml2, libsoup, libsecret, libxslt, harfbuzz +, gst-plugins-base +, withGtk2 ? false +, enableIntrospection ? true +}: + +stdenv.mkDerivation rec { + name = "webkitgtk-${version}"; + version = "2.4.6"; + + meta = with stdenv.lib; { + description = "Web content rendering engine, GTK+ port"; + homepage = "http://webkitgtk.org/"; + license = licenses.bsd2; + platforms = platforms.linux; + maintainers = [ maintainers.iyzsong ]; + }; + + src = fetchurl { + url = "http://webkitgtk.org/releases/${name}.tar.xz"; + sha256 = "0mqlq4ivh921k92xjsp5pdvbg9vf75qjliqmx81qwrm2sjl4mvvg"; + }; + + patches = [ ./webcore-svg-libxml-cflags.patch ]; + + CC = "cc"; + + prePatch = '' + patchShebangs Tools/gtk + ''; + + configureFlags = with stdenv.lib; [ + "--disable-geolocation" + (optionalString enableIntrospection "--enable-introspection") + ] ++ stdenv.lib.optional withGtk2 [ + "--with-gtk=2.0" + "--disable-webkit2" + ]; + + dontAddDisableDepTrack = true; + + nativeBuildInputs = [ + perl python ruby bison gperf flex + pkgconfig which gettext gobjectIntrospection + ]; + + buildInputs = [ + gtk2 wayland libwebp enchant + libxml2 libsecret libxslt harfbuzz + gst-plugins-base + ]; + + propagatedBuildInputs = [ + libsoup + (if withGtk2 then gtk2 else gtk3) + ]; + + #enableParallelBuilding = true; # build problems on Hydra +} diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index fa3cdc82c41f..3cbf36987323 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -1,61 +1,47 @@ -{ stdenv, fetchurl, perl, python, ruby, bison, gperf, flex -, pkgconfig, which, gettext, gobjectIntrospection +{ stdenv, fetchurl, perl, python, ruby, bison, gperf, cmake +, pkgconfig, gettext, gobjectIntrospection , gtk2, gtk3, wayland, libwebp, enchant -, libxml2, libsoup, libsecret, libxslt, harfbuzz +, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs , gst-plugins-base -, withGtk2 ? false -, enableIntrospection ? true }: stdenv.mkDerivation rec { - name = "webkitgtk-2.4.6"; + name = "webkitgtk-${version}"; + version = "2.6.2"; - meta = { + meta = with stdenv.lib; { description = "Web content rendering engine, GTK+ port"; homepage = "http://webkitgtk.org/"; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ iyzsong ]; + license = licenses.bsd2; + platforms = platforms.linux; + maintainers = with maintainers; [ iyzsong koral ]; }; + preConfigure = "patchShebangs Tools"; + src = fetchurl { url = "http://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "0mqlq4ivh921k92xjsp5pdvbg9vf75qjliqmx81qwrm2sjl4mvvg"; + sha256 = "1f9qm5g1mbjm2hrnlzymas99piws4h4y3yxz4p6f6gavnsvfjwji"; }; - patches = [ ./webcore-svg-libxml-cflags.patch ]; - - CC = "cc"; - - prePatch = '' - patchShebangs Tools/gtk - ''; - - configureFlags = with stdenv.lib; [ - "--disable-geolocation" - (optionalString enableIntrospection "--enable-introspection") - ] ++ stdenv.lib.optional withGtk2 [ - "--with-gtk=2.0" - "--disable-webkit2" - ]; + patches = [ ./finding-harfbuzz-icu.patch ]; - dontAddDisableDepTrack = true; + cmakeFlags = [ "-DPORT=GTK" ]; nativeBuildInputs = [ - perl python ruby bison gperf flex - pkgconfig which gettext gobjectIntrospection + cmake perl python ruby bison gperf + pkgconfig gettext gobjectIntrospection ]; buildInputs = [ gtk2 wayland libwebp enchant - libxml2 libsecret libxslt harfbuzz + libxml2 libsecret libxslt harfbuzz libpthreadstubs gst-plugins-base ]; propagatedBuildInputs = [ - libsoup - (if withGtk2 then gtk2 else gtk3) + libsoup gtk3 ]; - #enableParallelBuilding = true; # build problems on Hydra + # enableParallelBuilding = true; # build problems on Hydra } diff --git a/pkgs/development/libraries/webkitgtk/finding-harfbuzz-icu.patch b/pkgs/development/libraries/webkitgtk/finding-harfbuzz-icu.patch new file mode 100644 index 000000000000..14d58ef04f68 --- /dev/null +++ b/pkgs/development/libraries/webkitgtk/finding-harfbuzz-icu.patch @@ -0,0 +1,52 @@ +--- webkitgtk-2.6.1.orig/Source/cmake/FindHarfBuzz.cmake 2014-10-09 01:54:38.000000000 +0800 ++++ webkitgtk-2.6.1/Source/cmake/FindHarfBuzz.cmake 2014-10-15 13:41:29.832290412 +0800 +@@ -34,21 +34,39 @@ + + pkg_check_modules(PC_HARFBUZZ harfbuzz>=0.9.7) + +-find_path(HARFBUZZ_INCLUDE_DIRS NAMES hb.h +- HINTS ${PC_HARFBUZZ_INCLUDE_DIRS} ${PC_HARFBUZZ_INCLUDEDIR} +-) +- +-find_library(HARFBUZZ_LIBRARIES NAMES harfbuzz +- HINTS ${PC_HARFBUZZ_LIBRARY_DIRS} ${PC_HARFBUZZ_LIBDIR} +-) +- + # HarfBuzz 0.9.18 split ICU support into a separate harfbuzz-icu library. + if ("${PC_HARFBUZZ_VERSION}" VERSION_GREATER "0.9.17") + pkg_check_modules(PC_HARFBUZZ_ICU harfbuzz-icu>=0.9.18 REQUIRED) +- find_library(HARFBUZZ_ICU_LIBRARIES NAMES harfbuzz-icu ++ ++ find_path(HARFBUZZ_ICU_INCLUDEDIR NAMES hb-icu.h ++ HINTS ${PC_HARFBUZZ_ICU_INCLUDE_DIRS} ${PC_HARFBUZZ_INCLUDEDIR} ++ ) ++ ++ find_library(HARFBUZZ_ICU_LIBRARY NAMES harfbuzz-icu + HINTS ${PC_HARFBUZZ_ICU_LIBRARY_DIRS} ${PC_HARFBUZZ_ICU_LIBDIR} + ) +- list(APPEND HARFBUZZ_LIBRARIES "${HARFBUZZ_ICU_LIBRARIES}") ++ ++ find_library(HARFBUZZ_LIBRARY NAMES harfbuzz ++ HINTS ${PC_HARFBUZZ_LIBRARY_DIRS} ${PC_HARFBUZZ_LIBDIR} ++ ) ++ ++ set(HARFBUZZ_INCLUDE_DIRS ++ ${PC_HARFBUZZ_INCLUDE_DIRS} ${HARFBUZZ_ICU_INCLUDEDIR} ++ CACHE INTERNAL "" ++ ) ++ ++ set(HARFBUZZ_LIBRARIES ++ ${HARFBUZZ_LIBRARY} ${HARFBUZZ_ICU_LIBRARY} ++ CACHE INTERNAL "" ++ ) ++else () ++ find_path(HARFBUZZ_INCLUDE_DIRS NAMES hb.h ++ HINTS ${PC_HARFBUZZ_INCLUDE_DIRS} ${PC_HARFBUZZ_INCLUDEDIR} ++ ) ++ ++ find_library(HARFBUZZ_LIBRARIES NAMES harfbuzz ++ HINTS ${PC_HARFBUZZ_LIBRARY_DIRS} ${PC_HARFBUZZ_LIBDIR} ++ ) + endif () + + include(FindPackageHandleStandardArgs) diff --git a/pkgs/development/libraries/websocket++/default.nix b/pkgs/development/libraries/websocket++/default.nix new file mode 100644 index 000000000000..7146ec4bb5b5 --- /dev/null +++ b/pkgs/development/libraries/websocket++/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + name = "websocket++-${version}"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "zaphoyd"; + repo = "websocketpp"; + rev = version; + sha256 = "1n6j0dh3qpis0f7crd49a2nhxd5459h0blch408z3kwlasx2g0i5"; + }; + + buildInputs = [ cmake ]; + + meta = { + homepage = "http://www.zaphoyd.com/websocketpp/"; + description = "C++/Boost Asio based websocket client/server library"; + license = stdenv.lib.licenses.bsd3; + }; +} diff --git a/pkgs/development/libraries/wxGTK-2.8/default.nix b/pkgs/development/libraries/wxGTK-2.8/default.nix index 62d2de0238f1..d7ca92f70d9b 100644 --- a/pkgs/development/libraries/wxGTK-2.8/default.nix +++ b/pkgs/development/libraries/wxGTK-2.8/default.nix @@ -57,4 +57,8 @@ stdenv.mkDerivation rec { passthru = {inherit gtk compat24 compat26 unicode;}; enableParallelBuilding = true; + + meta = { + platforms = stdenv.lib.platforms.all; + }; } diff --git a/pkgs/development/libraries/wxGTK-2.9/default.nix b/pkgs/development/libraries/wxGTK-2.9/default.nix index f61c7eafd732..47760cdb2884 100644 --- a/pkgs/development/libraries/wxGTK-2.9/default.nix +++ b/pkgs/development/libraries/wxGTK-2.9/default.nix @@ -55,4 +55,8 @@ stdenv.mkDerivation { passthru = {inherit gtk compat24 compat26 unicode;}; enableParallelBuilding = true; + + meta = { + platforms = stdenv.lib.platforms.all; + }; } diff --git a/pkgs/development/libraries/wxGTK-3.0/default.nix b/pkgs/development/libraries/wxGTK-3.0/default.nix index faa17c08363f..93f771e8c8ff 100644 --- a/pkgs/development/libraries/wxGTK-3.0/default.nix +++ b/pkgs/development/libraries/wxGTK-3.0/default.nix @@ -8,14 +8,14 @@ assert withMesa -> mesa != null; with stdenv.lib; let - version = "3.0.1"; + version = "3.0.2"; in stdenv.mkDerivation { name = "wxwidgets-${version}"; src = fetchurl { url = "mirror://sourceforge/wxwindows/wxWidgets-${version}.tar.bz2"; - sha256 = "1xf5s8cnq6xr0r6l0y9cn1pjg961xbycl4afhjrqzbsnxiwinrxx"; + sha256 = "0paq27brw4lv8kspxh9iklpa415mxi8zc117vbbbhfjgapf7js1l"; }; buildInputs = @@ -55,4 +55,8 @@ stdenv.mkDerivation { passthru = {inherit gtk compat24 compat26 unicode;}; enableParallelBuilding = true; + + meta = { + platforms = stdenv.lib.platforms.all; + }; } diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix new file mode 100644 index 000000000000..d7e66a4f618b --- /dev/null +++ b/pkgs/development/libraries/x265/default.nix @@ -0,0 +1,7 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // { + version = "1.4"; + rev = "5e604833c5aa605d0b6efbe5234492b5e7d8ac61"; + sha256 = "1aqksqi1qmjpva5cal6j7h0hzk298wk3nhqv73wnyqdchq2sa8v5"; +}) \ No newline at end of file diff --git a/pkgs/development/libraries/x265/generic.nix b/pkgs/development/libraries/x265/generic.nix new file mode 100644 index 000000000000..58a39dbbe384 --- /dev/null +++ b/pkgs/development/libraries/x265/generic.nix @@ -0,0 +1,58 @@ +{ stdenv, cmake, fetchhg, mercurial, yasm +, rev , sha256, version +, highBitDepth ? false +, debuggingSupport ? false +, enableCli ? true +, testSupport ? false +, ... +}: + +stdenv.mkDerivation rec { + name = "x265-${version}"; + + src = fetchhg { + url = "https://bitbucket.org/multicoreware/x265/src"; + inherit rev; + inherit sha256; + }; + + patchPhase = '' + sed -i 's/unknown/${version}/g' source/cmake/version.cmake + ''; + + cmakeFlags = with stdenv.lib; + '' + ${if debuggingSupport + then "-DCHECKED_BUILD=ON" + else "-DCHECKED_BUILD=OFF" + } + -DSTATIC_LINK_CRT=OFF + ${if (stdenv.system == "x86_64-linux" && highBitDepth) + then "-DHIGH_BIT_DEPTH=ON" + else "-DHIGH_BIT_DEPTH=OFF" + } + -DWARNINGS_AS_ERRORS=OFF + -DENABLE_PPA=OFF + -DENABLE_SHARED=ON + ${if enableCli + then "-DENABLE_CLI=ON" + else "-DENABLE_CLI=OFF" + } + ${if testSupport + then "-DENABLE_TESTS=ON" + else "-DENABLE_TESTS=OFF" + } + ''; + + preConfigure = "cd source"; + + buildInputs = [ cmake yasm ]; + + meta = with stdenv.lib; { + homepage = "http://x265.org"; + description = "Library for encoding h.265/HEVC video streams"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ codyopel ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/libraries/x265/hg.nix b/pkgs/development/libraries/x265/hg.nix new file mode 100644 index 000000000000..db15e223047e --- /dev/null +++ b/pkgs/development/libraries/x265/hg.nix @@ -0,0 +1,7 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "hg-${rev}"; + rev = "eebb372eec893efc50e66806fcc19b1c1bd89683"; + sha256 = "03dpbjqcmbmyid45560byabybfzy2bvic0gqa6k6hxci6rvmynpi"; +}) \ No newline at end of file diff --git a/pkgs/development/libraries/xlslib/default.nix b/pkgs/development/libraries/xlslib/default.nix new file mode 100644 index 000000000000..760f9cdc5745 --- /dev/null +++ b/pkgs/development/libraries/xlslib/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + version = "2.4.0"; + name = "xlslib-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/xlslib/xlslib-package-${version}.zip"; + sha256 = "0h7qhxcc55cz3jvrfv4scjnzf5w9g97wigyviandi4ag54qjxjdc"; + }; + + nativeBuildInputs = [ unzip ]; + + setSourceRoot = "export sourceRoot=xlslib/xlslib"; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "C++/C library to construct Excel .xls files in code"; + homepage = http://xlslib.sourceforge.net/; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = maintainers.abbradar; + }; +} diff --git a/pkgs/development/libraries/xmlrpc-c/default.nix b/pkgs/development/libraries/xmlrpc-c/default.nix index 9f578e4b9dde..f3b91f442de2 100644 --- a/pkgs/development/libraries/xmlrpc-c/default.nix +++ b/pkgs/development/libraries/xmlrpc-c/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, curl }: stdenv.mkDerivation rec { - name = "xmlrpc-c-1.25.27"; + name = "xmlrpc-c-1.25.30"; src = fetchurl { url = "mirror://sourceforge/xmlrpc-c/${name}.tgz"; - sha256 = "0g9m9n258lpbs42a2lagd4h7qim1g34gkaqyx8h50qrsk49ipspn"; + sha256 = "161gj237baagy5jaa08m54zfyvilb19gql0i5c9ysl3xqm7fvrla"; }; buildInputs = [ curl ]; diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index 80f4e2fc8604..3fba451c7111 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, libxml2, gnutls, libxslt, pkgconfig, libgcrypt, libtool }: let - version = "1.2.19"; + version = "1.2.20"; in stdenv.mkDerivation rec { name = "xmlsec-${version}"; src = fetchurl { url = "http://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz"; - sha256 = "1h5ar0h8n0l8isgic82w00cwfpw7i9wxw17kbdb6q3yvzb4zgj1g"; + sha256 = "01bkbv2y3x8d1sf4dcln1x3y2jyj391s3208d9a2ndhglly5j89j"; }; buildInputs = [ libxml2 gnutls libxslt pkgconfig libgcrypt libtool ]; diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix index 08eb6317fcb9..db4c8fb8b94e 100644 --- a/pkgs/development/libraries/zeromq/4.x.nix +++ b/pkgs/development/libraries/zeromq/4.x.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, libuuid}: stdenv.mkDerivation rec { - name = "zeromq-4.0.4"; + name = "zeromq-4.0.5"; src = fetchurl { url = "http://download.zeromq.org/${name}.tar.gz"; - sha256 = "16fkax2f6h2h4wm7jrv95m6vwffd4vb1wrm1smyy4csgx531vxqy"; + sha256 = "0arl8fy8d03xd5h0mgda1s5bajwg8iyh1kk4hd1420rpcxgkrj9v"; }; buildInputs = [ libuuid ]; diff --git a/pkgs/development/lisp-modules/asdf/default.nix b/pkgs/development/lisp-modules/asdf/default.nix index 100577b3a7ff..33cd07b48076 100644 --- a/pkgs/development/lisp-modules/asdf/default.nix +++ b/pkgs/development/lisp-modules/asdf/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="asdf"; - version="3.1.3"; + version="3.1.4"; name="${baseName}-${version}"; - hash="11jgbl2ys98i7lir0z76g0msm89zmz1b91gwkdz0gnxr6gavj6cn"; - url="http://common-lisp.net/project/asdf/archives/asdf-3.1.3.tar.gz"; - sha256="11jgbl2ys98i7lir0z76g0msm89zmz1b91gwkdz0gnxr6gavj6cn"; + hash="0hyc2g22khcmvxmlcaq0xbxqhq59spgc2nc1s0gz1r9mcgrzm2xw"; + url="http://common-lisp.net/project/asdf/archives/asdf-3.1.4.tar.gz"; + sha256="0hyc2g22khcmvxmlcaq0xbxqhq59spgc2nc1s0gz1r9mcgrzm2xw"; }; buildInputs = [ texinfo texLive @@ -19,6 +19,7 @@ stdenv.mkDerivation { src = fetchurl { inherit (s) url sha256; }; + sourceRoot="."; buildPhase = '' make build/asdf.lisp make -C doc asdf.info asdf.html diff --git a/pkgs/development/lisp-modules/clwrapper/build-with-lisp.sh b/pkgs/development/lisp-modules/clwrapper/build-with-lisp.sh new file mode 100755 index 000000000000..030e9e403237 --- /dev/null +++ b/pkgs/development/lisp-modules/clwrapper/build-with-lisp.sh @@ -0,0 +1,67 @@ +#! /bin/sh +# Part of NixPkgs package collection +# This script can be used at your option under the same license as NixPkgs or +# under MIT/X11 license + +lisp="$1" +systems="$2" +target="$3" +code="$4" + +NIX_LISP_SKIP_CODE=1 NIX_LISP_COMMAND="$lisp" source "$(dirname "$0")/cl-wrapper.sh" + +NIX_LISP_BUILD_CODE= + +case "$NIX_LISP" in + sbcl) + NIX_LISP_BUILD_CODE="(progn + (let* + ((old-fn (symbol-function 'sb-alien::dlopen-or-lose ))) + (sb-ext:with-unlocked-packages (:sb-sys :sb-alien) + (defun sb-alien::dlopen-or-lose (&rest args) + (or + (ignore-errors (progn (apply old-fn args))) + (and + args + (loop + with try = nil + with obj = (first args) + with original-namestring = (sb-alien::shared-object-namestring obj) + for path in (list $(echo "$NIX_LISP_LD_LIBRARY_PATH" | sed -e 's/:/" "/g; s/^/"/; s/$/"/')) + for target := (format nil \"~a/~a\" path original-namestring) + when (ignore-errors + (progn + (setf (sb-alien::shared-object-namestring obj) target) + (setf try (apply old-fn args)) + t)) do + (progn (return try)) + finally (progn (setf (sb-alien::shared-object-namestring obj) original-namestring) + (return (apply old-fn args))) + ) + ) + ) + ) + ) + ) + (sb-ext:save-lisp-and-die \"$target\" + :toplevel (lambda () + (setf common-lisp:*standard-input* (sb-sys::make-fd-stream 0 :input t :buffering :line)) + (setf common-lisp:*standard-output* (sb-sys::make-fd-stream 1 :output t :buffering :line)) + (setf asdf/image:*command-line-arguments* (cdr sb-ext:*posix-argv*)) + $code) + :executable t :save-runtime-options t :purify t))" + systems=":sb-posix $systems" + ;; + ecl) + NIX_LISP_BUILD_CODE="()" + ;; + clisp) + NIX_LISP_BUILD_CODE="(ext:saveinitmem \"$target\" :norc t :init-function (lambda () $code (ext:bye)) :script nil :executable 0)" + ;; +esac + +"$lisp" \ + "$NIX_LISP_EXEC_CODE" "(load \"$NIX_LISP_ASDF/lib/common-lisp/asdf/build/asdf.lisp\")" \ + "$NIX_LISP_EXEC_CODE" "(mapcar 'asdf:load-system (list $systems))" \ + "$NIX_LISP_EXEC_CODE" "$NIX_LISP_BUILD_CODE" \ + "$NIX_LISP_EXEC_CODE" "(quit)" diff --git a/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh b/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh index 91b8a0c2bb0f..6452bd5d95ae 100755 --- a/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh +++ b/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh @@ -12,6 +12,9 @@ shift export NIX_LISP NIX_LISP_LOAD_FILE NIX_LISP_EXEC_CODE NIX_LISP_COMMAND NIX_LISP_FINAL_PARAMETERS +test -n "$NIX_LISP_LD_LIBRARY_PATH" && + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH${LD_LIBRARY_PATH+:}$NIX_LISP_LD_LIBRARY_PATH" + case "$NIX_LISP" in sbcl) NIX_LISP_LOAD_FILE="--load" diff --git a/pkgs/development/lisp-modules/clwrapper/default.nix b/pkgs/development/lisp-modules/clwrapper/default.nix index efaadf5606e1..9641dc305bec 100644 --- a/pkgs/development/lisp-modules/clwrapper/default.nix +++ b/pkgs/development/lisp-modules/clwrapper/default.nix @@ -8,6 +8,7 @@ stdenv.mkDerivation { mkdir -p "$out"/bin cp ${./cl-wrapper.sh} "$out"/bin/cl-wrapper.sh cp ${./common-lisp.sh} "$out"/bin/common-lisp.sh + substituteAll "${./build-with-lisp.sh}" "$out/bin/build-with-lisp.sh" chmod a+x "$out"/bin/* ''; diff --git a/pkgs/development/lisp-modules/clwrapper/setup-hook.sh b/pkgs/development/lisp-modules/clwrapper/setup-hook.sh index e5deb47fd5df..b48f916ac7a0 100644 --- a/pkgs/development/lisp-modules/clwrapper/setup-hook.sh +++ b/pkgs/development/lisp-modules/clwrapper/setup-hook.sh @@ -33,7 +33,7 @@ collectNixLispLDLP () { export NIX_LISP_COMMAND NIX_LISP CL_SOURCE_REGISTRY NIX_LISP_ASDF -envHooks=(envHooks[@] addASDFPaths setLisp collectNixLispLDLP) +envHooks+=(addASDFPaths setLisp collectNixLispLDLP) mkdir -p "$HOME"/.cache/common-lisp || HOME="$TMP/.temp-$USER-home" mkdir -p "$HOME"/.cache/common-lisp diff --git a/pkgs/development/lisp-modules/define-package.nix b/pkgs/development/lisp-modules/define-package.nix index 675fc7e74681..8623032ed375 100644 --- a/pkgs/development/lisp-modules/define-package.nix +++ b/pkgs/development/lisp-modules/define-package.nix @@ -1,5 +1,5 @@ args @ {stdenv, clwrapper, baseName, version ? "latest", src, description, deps, - buildInputs ? [], meta ? {}, overrides?(x: {})}: + buildInputs ? [], meta ? {}, overrides?(x: {}), propagatedBuildInputs ? []}: let deployConfigScript = '' config_script="$out"/lib/common-lisp-settings/${args.baseName}-shell-config.sh @@ -30,6 +30,8 @@ basePackage = { inherit deployConfigScript deployLaunchScript; installPhase = '' + eval "$preInstall" + mkdir -p "$out"/share/doc/${args.baseName}; mkdir -p "$out"/lib/common-lisp/${args.baseName}; cp -r . "$out"/lib/common-lisp/${args.baseName}; @@ -37,8 +39,11 @@ basePackage = { ${deployConfigScript} ${deployLaunchScript} + + eval "$postInstall" ''; - propagatedBuildInputs = args.deps ++ [clwrapper clwrapper.lisp]; + propagatedBuildInputs = (args.deps or []) ++ [clwrapper clwrapper.lisp] + ++ (args.propagatedBuildInputs or []); buildInputs = buildInputs; dontStrip=true; meta = { diff --git a/pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh b/pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh index 61c00eb92ae8..8693a304899a 100755 --- a/pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh +++ b/pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh @@ -2,10 +2,16 @@ name="$1" -nix-instantiate "$(dirname "$0")"/../../../../ -A "lispPackages.$name" > /dev/null && exit -[ "$NIX_LISP_PACKAGES_DEFINED" != "${NIX_LISP_PACKAGES_DEFINED/$name/@@}" ] && exit +[ -z "$NIX_LISP_PACKAGES_DEFINED_LIST" ] && export NIX_LISP_PACKAGES_DEFINED_LIST="$(mktemp)" -NIX_LISP_PACKAGES_DEFINED="$NIX_LISP_PACKAGES_DEFINED $1 " +if [ -n "$NIX_LISP_UPDATE_PACKAGE" ] || [ -n "$NIX_LISP_UPDATE_PACKAGES" ]; then + export NIX_LISP_UPDATE_PACKAGE= +else + nix-instantiate "$(dirname "$0")"/../../../../ -A "lispPackages.$name" > /dev/null && exit +fi +grep "^$name\$" "$NIX_LISP_PACKAGES_DEFINED_LIST" > /dev/null && exit + +echo "$name" >> "$NIX_LISP_PACKAGES_DEFINED_LIST" [ -z "$NIX_QUICKLISP_DIR" ] && { export NIX_QUICKLISP_DIR="$(mktemp -d --tmpdir nix-quicklisp.XXXXXX)" @@ -26,14 +32,39 @@ ql_src="$(curl -L https://github.com/quicklisp/quicklisp-projects/raw/master/"$n ql_src_type="${ql_src%% *}" url="${ql_src##* }" +[ "$ql_src_type" = "kmr-git" ] && { + ql_src_type=git + url="http://git.b9.com/$url.git" + export NIX_PREFETCH_GIT_DEEP_CLONE=1 +} + +[ "$ql_src_type" = ediware-http ] && { + ql_src_type=github + url="edicl/$url"; +} + +[ "$ql_src_type" = xach-http ] && { + ql_src_type=github + url="xach/$url"; +} + +[ "$ql_src_type" = github ] && { + ql_src_type=git + url="https://github.com/$url"; + version="$("$(dirname "$0")/../../../build-support/upstream-updater/urls-from-page.sh" "$url/releases/" | grep /tag/ | head -n 1 | xargs -l1 basename)" + rev="refs/tags/$version"; +} + [ "$ql_src_type" = git ] && { fetcher="pkgs.fetchgit" - [ "${url#git://github.com/}" != "$url" ] && { + ( [ "${url#git://github.com/}" != "$url" ] || + [ "${url#https://github.com/}" != "$url" ] + ) && { url="${url/git:/https:}" url="${url%.git}" - rev=$("$(dirname "$0")/../../../build-support/upstream-updater/urls-from-page.sh" "$url/commits" | grep /commit/ | head -n 1 | xargs basename) - hash=$("$(dirname "$0")/../../../build-support/fetchgit/nix-prefetch-git" "$url" "$rev") - version="git-$(date +%Y%m%d)"; + [ -z "$rev" ] && rev=$("$(dirname "$0")/../../../build-support/upstream-updater/urls-from-page.sh" "$url/commits" | grep /commit/ | head -n 1 | xargs basename) + hash=$("$(dirname "$0")/../../../build-support/fetchgit/nix-prefetch-git" "$url" "$rev" | grep . | tail -n 1) + [ -z "$version" ] && version="git-$(date +%Y%m%d)"; } [ "${url#git://common-lisp.net/}" != "$url" ] && { http_repo_url="$url" @@ -41,8 +72,26 @@ url="${ql_src##* }" http_repo_url="${http_repo_url/\/projects\// /r/projects/}" http_repo_head="$http_repo_url/refs/heads/master" echo "$http_repo_head" >&2 - rev=$(curl -L "$http_repo_head"); + [ -z "$rev" ] && rev=$(curl -L "$http_repo_head"); hash=$("$(dirname "$0")/../../../build-support/fetchgit/nix-prefetch-git" "$url" "$rev") + [ -z "$version" ] && version="git-$(date +%Y%m%d)"; + } + [ "${url#http://git.b9.com/}" != "$url" ] && { + http_repo_url="$url" + http_repo_url="${http_repo_url/git:/http:}" + http_repo_head="$http_repo_url/refs/heads/master" + echo "$http_repo_head" >&2 + rev=$(curl -L "$http_repo_head"); + hash=$("$(dirname "$0")/../../../build-support/fetchgit/nix-prefetch-git" "$url" "$rev" | tail -n 1) + version="git-$(date +%Y%m%d)"; + } + [ "${url#http://common-lisp.net/}" != "$url" ] && { + http_repo_url="$url" + http_repo_url="${http_repo_url/git:/http:}" + http_repo_head="$http_repo_url/refs/heads/master" + echo "$http_repo_head" >&2 + rev=$(curl -L "$http_repo_head"); + hash=$("$(dirname "$0")/../../../build-support/fetchgit/nix-prefetch-git" "$url" "$rev" | tail -n 1) version="git-$(date +%Y%m%d)"; } } @@ -57,13 +106,59 @@ url="${ql_src##* }" unset url } -cat << EOF +[ "$ql_src_type" = clnet-darcs ] && { + ql_src_type=darcs + url="http://common-lisp.net/project/$url/darcs/$url/" +} + +[ "$ql_src_type" = darcs ] && { + fetcher="pkgs.fetchdarcs" + [ -z "$version" ] && + version="$(curl "$url/_darcs/inventory" | grep '\[TAG ' | tail -n 1 | sed -e 's/.* //')" + [ -z "$version" ] && + version="$(curl "$url/_darcs/hashed_inventory" | grep '\[TAG ' | tail -n 1 | sed -e 's/.* //')" + rev="$version"; + hash=$(echo " + with (import <nixpkgs> {}); + fetchdarcs { + url=''$url''; + rev=''$version''; + sha256=''0000000000000000000000000000000000000000000000000000000000000000''; + }" | nix-instantiate - | tail -n 1 | + xargs nix-store -r 2>&1 | tee /dev/stderr | grep 'instead has' | tail -n 1 | + sed -e 's/.* instead has .//;s/[^0-9a-z].*//') +} + +[ "$ql_src_type" = froydware-http ] && { + dirurl="http://method-combination.net/lisp/files/"; + url="$("$(dirname "$0")/../../../build-support/upstream-updater/urls-from-page.sh" "$dirurl" | + grep "/${url}_" | grep -v "[.]asc\$" | tail -n 1)" + ql_src_type=http +} + +[ "$ql_src_type" = http ] && { + fetcher="pkgs.fetchurl"; + version="$(echo "$url" | sed -re 's@.*[-_]([0-9.]+)[-._].*@\1@')" + hash="$(nix-prefetch-url "$url" | grep . | tail -n 1)" +} + +[ "$ql_src_type" = https ] && { + fetcher="pkgs.fetchurl"; + version="$(echo "$url" | sed -re 's@.*[-_]([0-9.]+)[-._].*@\1@')" + hash="$(nix-prefetch-url "$url" | grep . | tail -n 1)" +} + +if [ "$ql_src" = '{"error":"Not Found"}' ]; then + echo "# $name: not found" +else +cat << EOF | grep -Ev '^[ ]+$' $name = buildLispPackage rec { baseName = "$name"; version = "${version:-\${Set me //}"; description = "$description"; deps = [$dependencies]; + # Source type: $ql_src_type src = ${fetcher:-pkgs.fetchurl} { ${url:+url = ''$url'';} sha256 = "${hash:-0000000000000000000000000000000000000000000000000000000000000000}"; @@ -74,5 +169,6 @@ cat << EOF }; }; EOF +fi for i in $dependencies; do "$0" "$i"; done diff --git a/pkgs/development/lisp-modules/from-quicklisp/tmp.nix b/pkgs/development/lisp-modules/from-quicklisp/tmp.nix deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/pkgs/development/lisp-modules/from-quicklisp/tmp.nix +++ /dev/null diff --git a/pkgs/development/lisp-modules/iterate.darcs-context b/pkgs/development/lisp-modules/iterate.darcs-context new file mode 100644 index 000000000000..533faaec8e77 --- /dev/null +++ b/pkgs/development/lisp-modules/iterate.darcs-context @@ -0,0 +1,116 @@ + +Context: + +[make the #L reader macro standard conformant by not assuming anything about the representation of quasiquoted forms. +Douglas Katzman <dougk@google.com>**20140423044759 + Ignore-this: ccdda48acdf7b2033ac0f51ed48582fc +] + +[fix for test for.previous.var-with-type-declaration +Jan Moringen <jmoringe@techfak.uni-bielefeld.de>**20140129144214 + Ignore-this: a617d046d90816827d370d3bbf38d2df +] + +[housekeeping +attila.lendvai@gmail.com**20140129143709 + Ignore-this: a05c5fbace98b282a464b829711e064f +] + +[added test for.previous.var-with-type-declaration +attila.lendvai@gmail.com**20140129143435 + Ignore-this: 6e9f419e118724c660d519c3fa9f8dd2 +] + +[added a restart to remove conflicting clauses +Russ Tyndall <russ@acceleration.net>**20120508185107 + Ignore-this: b7c4c6eec565dd435b8e9e5403fcb0a8 +] + +[added new failing test bug/collect-at-beginning, as reported by Paul Sexton +attila.lendvai@gmail.com**20121218144220 + Ignore-this: d55e7c22deeaf89b90d03d7ef01179d6 +] + +[Fix: If both AT BEGINNING and RESULT-TYPE are specified, RESULT-TYPE was ignored. +attila.lendvai@gmail.com**20120509225435 + Ignore-this: 20cf116df585ffedfbe63ce7a4092249 + + Patched by Ilya Perminov +] + +[fix package nickname in case sensitive mode +attila.lendvai@gmail.com**20110927152614 + Ignore-this: fb1ba1d418b4a20a0cd4e697d943a0e6 +] + +[move list-of-forms? out of the #L eval-when, because it's also used by other parts of iterate +attila.lendvai@gmail.com**20110119161133 + Ignore-this: 97545988c4a3eab02434f222120b1a1 +] + +[added bug/walk.2 +attila.lendvai@gmail.com**20100603093335 + Ignore-this: faa1bd48d0450e76652552bb47bcff02 +] + +[first-time-p bugfix: return-code :body must return list of forms +Joerg-Cyril Hoehle <hoehle@users.sourceforge.net>**20070525141533 + if-first-time not declared obsolete + documentation strings for (iter:display-iterate-clauses) complete +] + +[fix defmacro-driver example in manual +Joerg-Cyril Hoehle <hoehle@users.sourceforge.net>**20070525081443] + +[Use @:, @. and two spaces between sentences +Joerg-Cyril Hoehle <hoehle@users.sourceforge.net>**20070525080932 + Move section on predicate (first-time-p) outside of gathering clauses + Various typos and some clarifications +] + +[document *list-end-test* removal in FOR...IN+ON +Joerg-Cyril Hoehle <hoehle@users.sourceforge.net>**20070525074338] + +[Renamed back to sharpL-reader +attila.lendvai@gmail.com**20070506100744] + +[Fix sharpL reader, add :execute to the eval-when to make (load "iterate" :compiling t) work on clisp +attila.lendvai@gmail.com**20070506100704] + +[Convert manual to Texinfo. +Luis Oliveira <loliveira@common-lisp.net>**20060713142915] + +[make FOR...IN/ON with dotted lists work like LOOP +hoehle@users.sourceforge.net**20070503130604 + More precisely, FOR ON accepts dotted lists, FOR IN errors out. + As a result, iterate::*list-end-test* was eliminated. + Behaviour is now constant and does not depend on some special variable. + Note: Documentation not yet updated, pending move to Texinfo. +] + +[walk-tagbody: more testcases +Joerg-Cyril Hoehle <hoehle@users.sourceforge.net>**20070503095309] + +[walk-tagbody must not macroexpand symbol/tags among its statements +Joerg-Cyril Hoehle <hoehle@users.sourceforge.net>**20070404124132] + +[add ELSE test cases, remove GNU Arch tag +Joerg-Cyril Hoehle <hoehle@users.sourceforge.net>**20070503093008] + +[Clean up #L stuff, do not leave #L enabled after loading iterate +attila.lendvai@gmail.com**20070426153431] + +[Set *list-end-test* to 'endp instead of 'atom, so (iter (for foo :in something-non-list)) fails instead of silently exists +attila.lendvai@gmail.com**20070215151652] + +[wrap code in progns, to avoid possiblity of multiple nil tags in tagbody + Henrik Hjelte <henrik@evahjelte.com>**20061025145324] + +[test to detect bug, more than one nil tag in tagbody + Henrik Hjelte <henrik@evahjelte.com>**20061025145128] + +[Added release.sh +attila.lendvai@gmail.com**20060506155953] + +[TAG 1.4.3 +attila.lendvai@gmail.com**20060505134701] diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index 14c996fa05a8..6456be327b7e 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -19,37 +19,36 @@ let lispPackages = rec { clx = buildLispPackage rec { baseName = "clx"; - version = "2013-09"; + version = "2014-11-03"; description = "X11 bindings for Common Lisp"; deps = []; src = pkgs.fetchgit { url = "https://github.com/sharplispers/clx.git"; - rev = "e2b762ac93d78d6eeca4f36698c8dfd1537ce998"; - sha256 = "0jcrmlaayz7m8ixgriq7id3pdklyk785qvpcxdpcp4aqnfiiqhij"; + rev = "c2910c5d707a97e87b354de3f2fbe2ae038e9bc8"; + sha256 = "1jk0hfk6rb9cf58xhqq7vaisj63k3x9jpj06wqpa32y5ppjcyijw"; + name = "clx-git-checkout-${version}"; }; }; iterate = buildLispPackage rec { baseName = "iterate"; - version = "1.4.3"; + version = "darcs-2014-11-01"; description = "Iteration package for Common Lisp"; deps = []; src = pkgs.fetchdarcs { url = "http://common-lisp.net/project/iterate/darcs/iterate"; - sha256 = "0m3q0s7h5s8varwx584m2akgdslj14df7kg4w1bj1fbgzsag5m1w"; - rev = version; + sha256 = "0gm05s3laiivsqgqjfj1rkz83c2c0jyn4msfgbv6sz42znjpam25"; + context = ./iterate.darcs-context; }; overrides = x: { configurePhase="buildPhase(){ true; }"; }; }; - stumpwm = callPackage ./stumpwm {}; - alexandria = buildLispPackage rec { baseName = "alexandria"; version = "git-20131029"; - description = "Alexandria is a collection of portable public domain utilities."; + description = "A collection of portable public domain utilities"; deps = []; src = pkgs.fetchgit { url = "git://common-lisp.net/projects/alexandria/alexandria.git"; @@ -67,8 +66,6 @@ let lispPackages = rec { url = "https://github.com/fb08af68/esrap-peg.git"; sha256 = "48e616a697aca95e90e55052fdc9a7f96bf29b3208b1b4012fcd3189c2eceeb1"; rev = ''1f2f21e32e618f71ed664cdc5e7005f8b6b0f7c8''; - - }; }; @@ -79,7 +76,6 @@ let lispPackages = rec { deps = []; src = pkgs.fetchcvs { sha256 = "a574b7f9615232366e3e5e7ee400d60dbff23f6d0e1def5a3c77aafdfd786e6a"; - date = ''2013-10-28''; module = ''cl-unification''; cvsRoot = '':pserver:anonymous:anonymous@common-lisp.net:/project/cl-unification/cvsroot''; @@ -89,14 +85,465 @@ let lispPackages = rec { esrap = buildLispPackage rec { baseName = "esrap"; version = "git-20131029"; - description = "A Packrat / Parsing Grammar / TDPL parser for Common Lisp."; + description = "A Packrat / Parsing Grammar / TDPL parser for Common Lisp"; deps = [alexandria]; src = pkgs.fetchgit { url = "https://github.com/scymtym/esrap.git"; sha256 = "c56616ac01be0f69e72902f9fd830a8af2c2fa9018b66747a5da3988ae38817f"; rev = ''c71933b84e220f21e8a509ec26afe3e3871e2e26''; - - + }; + }; + + clx-truetype = buildLispPackage rec { + baseName = "clx-truetype"; + version = "git-20141112"; + description = "clx-truetype is pure common lisp solution for antialiased TrueType font rendering using CLX and XRender extension."; + deps = [cl-fad cl-store cl-vectors clx trivial-features zpb-ttf]; + # Source type: git + src = pkgs.fetchgit { + url = ''https://github.com/filonenko-mikhail/clx-truetype''; + sha256 = "fe3d3923909a8f0a19298bfa366bb265c5155eed43d4dd315920535d15424d65"; + rev = ''6f72905c6886a656e5a1c8167097f12375c6da7d''; + }; + overrides = x:{ + configurePhase = "rm Makefile"; + }; + }; + + cl-fad = buildLispPackage rec { + baseName = "cl-fad"; + version = "v0.7.2"; + description = "Portable pathname library"; + deps = [alexandria bordeaux-threads]; + # Source type: git + src = pkgs.fetchgit { + url = ''https://github.com/edicl/cl-fad''; + sha256 = "87917ab4af4f713ad41faa72c7eaed2872f8dac47f49c0668ba8782590fdbca4"; + rev = ''refs/tags/v0.7.2''; + }; + }; + + bordeaux-threads = buildLispPackage rec { + baseName = "bordeaux-threads"; + version = "0.8.3"; + description = "Bordeaux Threads makes writing portable multi-threaded apps simple"; + deps = [alexandria]; + # Source type: http + src = pkgs.fetchurl { + url = ''http://common-lisp.net/project/bordeaux-threads/releases/bordeaux-threads-0.8.3.tar.gz''; + sha256 = "0c3n7qsx4jc3lg8s0n9kxfvhhyl0s7123f3038nsb96rf0bvb5hy"; + }; + }; + + zpb-ttf = buildLispPackage rec { + baseName = "zpb-ttf"; + version = "release-1.0.3"; + description = "Access TrueType font metrics and outlines from Common Lisp"; + deps = []; + # Source type: git + src = pkgs.fetchgit { + url = ''https://github.com/xach/zpb-ttf''; + sha256 = "3092a3ba9f27b091224d11c0ccfb09c9a4632ebfd6c3986df3147f19e53606f2"; + rev = ''refs/tags/release-1.0.3''; + }; + }; + + cl-store = buildLispPackage rec { + baseName = "cl-store"; + version = "git-20141112"; + description = "Serialization package"; + deps = []; + # Source type: git + src = pkgs.fetchgit { + url = ''https://github.com/skypher/cl-store''; + sha256 = "7096ad38d5c77d58f7aa0ef8df1884411173c140408cb7967922b315ab505472"; + rev = ''2d2455c024fe64ee24cbf914c82254fa5bd09cab''; + }; + }; + + cl-vectors = buildLispPackage rec { + baseName = "cl-vectors"; + version = "git-20141112"; + description = "cl-paths: vectorial paths manipulation"; + deps = []; + # Source type: git + src = pkgs.fetchgit { + url = ''https://github.com/fjolliton/cl-vectors''; + sha256 = "2d1428911cd2699513a0b886661e9b54d1edf78558277ac83723a22c7fc9dea7"; + rev = ''7b3e5d6a8abe3de307c1dc0c4347f4efa4f25f29''; + }; + }; + + trivial-features = buildLispPackage rec { + baseName = "trivial-features"; + version = "git-20141112"; + description = "Ensures consistent *FEATURES* across multiple CLs."; + deps = []; + # Source type: git + src = pkgs.fetchgit { + url = ''https://github.com/trivial-features/trivial-features''; + sha256 = "2006aebe0c2bfed1c39a2195639e221fdc52a443b6c8522e535cbef2370a07fc"; + rev = ''2b7cdc3b8073eb33655850b51223770b535da6d9''; + }; + }; + + clsql = buildLispPackage rec { + baseName = "clsql"; + version = "git-20141112"; + description = "Common Lisp SQL Interface library"; + deps = [uffi]; + buildInputs = [pkgs.mysql pkgs.zlib]; + # Source type: git + src = pkgs.fetchgit { + url = ''http://git.b9.com/clsql.git''; + sha256 = "dacd56bc9a0348e8101184bf154b971407a98f3a753d7cce34c7a44b4b19f8fd"; + rev = ''180b52cb686a87487e12e87b13bafe131e6c3bef''; + }; + overrides = x:{ + preConfigure = '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.mysql}/include/mysql" + export NIX_LDFLAGS="$NIX_LDFLAGS -L${pkgs.mysql}/lib/mysql" + ''; + }; + }; + + uffi = buildLispPackage rec { + baseName = "uffi"; + version = "git-20141112"; + description = "Universal Foreign Function Library for Common Lisp"; + deps = []; + # Source type: git + src = pkgs.fetchgit { + url = ''http://git.b9.com/uffi.git''; + sha256 = "219e4cfebfac251c922bcb9d517980b0988d765bd18b7f5cc765a43913aaacc6"; + rev = ''a63da5b764b6fa30e32fcda4ddac88de385c9d5b''; + }; + }; + + query-fs = buildLispPackage rec { + baseName = "query-fs"; + version = "git-20141113"; + description = "High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries"; + deps = [bordeaux-threads cl-fuse cl-fuse-meta-fs cl-ppcre command-line-arguments iterate trivial-backtrace]; + # Source type: git + src = pkgs.fetchgit { + url = ''https://github.com/fb08af68/query-fs''; + sha256 = "4ed66f255e50d2c9ea9f0b3fbaa92bde9b8acf6a5fafb0d7f12b254be9de99e9"; + rev = ''831f0180967f09b1dd345fef82144f48334279c3''; + }; + overrides = x: { + linkedSystems = []; + postInstall = '' + export CL_SOURCE_REGISTRY="$CL_SOURCE_REGISTRY:$out/lib/common-lisp/query-fs" + export HOME=$PWD + build-with-lisp.sh sbcl \ + ":query-fs $(echo "$linkedSystems" | sed -re 's/(^| )([^ :])/:\2/g')" \ + "$out/bin/query-fs" \ + "(query-fs:run-fs-with-cmdline-args)" + ''; + }; + }; + + cl-fuse = buildLispPackage rec { + baseName = "cl-fuse"; + version = "git-20141113"; + description = "CFFI bindings to FUSE (Filesystem in user space)"; + deps = [bordeaux-threads cffi cl-utilities iterate trivial-backtrace trivial-utf-8]; + # Source type: git + src = pkgs.fetchgit { + url = ''https://github.com/fb08af68/cl-fuse''; + sha256 = "1l4ydxbwzlj6gkb1c9vc96rfbj951snaidpx10pxz4wdnzg3kq99"; + rev = ''6feffaa34a21cfc7890b25357284858f924e8cb3''; + }; + propagatedBuildInputs = [pkgs.fuse]; + overrides = x : { + configurePhase = '' + export CL_SOURCE_REGISTRY="$CL_SOURCE_REGISTRY:$PWD" + export makeFlags="$makeFlags LISP=common-lisp.sh" + ''; + }; + }; + + cffi = buildLispPackage rec { + baseName = "cffi"; + version = "0.14.0"; + description = "The Common Foreign Function Interface"; + deps = [alexandria babel trivial-features]; + # Source type: http + src = pkgs.fetchurl { + url = ''http://common-lisp.net/project/cffi/releases/cffi_${version}.tar.gz''; + sha256 = "155igjh096vrp7n71c0xcg9qbcpj6547qjvzi9shxbpi6piw6fkw"; + }; + }; + + babel = buildLispPackage rec { + baseName = "babel"; + version = "git-20141113"; + description = "Babel, a charset conversion library."; + deps = [alexandria trivial-features]; + # Source type: git + src = pkgs.fetchgit { + url = ''https://github.com/cl-babel/babel''; + sha256 = "abe7150f25ceb7eded520d95f1665a46f4233cf13b577fd02c3f6be54c32facc"; + rev = ''74b35ea79b769c4f9aefad933923778ffa7915ab''; + }; + }; + + cl-utilities = buildLispPackage rec { + baseName = "cl-utilities"; + version = "1.2.4"; + description = "A collection of Common Lisp utility functions"; + deps = []; + # Source type: http + src = pkgs.fetchurl { + url = ''http://common-lisp.net/project/cl-utilities/cl-utilities-${version}.tar.gz''; + sha256 = "1z2ippnv2wgyxpz15zpif7j7sp1r20fkjhm4n6am2fyp6a3k3a87"; + }; + }; + + trivial-utf-8 = buildLispPackage rec { + baseName = "trivial-utf-8"; + version = "2011-09-08"; + description = "A UTF-8 encoding library"; + deps = []; + # Source type: darcs + src = pkgs.fetchdarcs { + url = ''http://common-lisp.net/project/trivial-utf-8/darcs/trivial-utf-8/''; + sha256 = "1jz27gz8gvqdmvp3k9bxschs6d5b3qgk94qp2bj6nv1d0jc3m1l1"; + }; + }; + + cl-fuse-meta-fs = buildLispPackage rec { + baseName = "cl-fuse-meta-fs"; + version = "git-20141113"; + description = "CFFI bindings to FUSE (Filesystem in user space)"; + deps = [bordeaux-threads cl-fuse iterate pcall]; + # Source type: git + src = pkgs.fetchgit { + url = ''https://github.com/fb08af68/cl-fuse-meta-fs''; + sha256 = "259303effea61baf293ffc5d080cb071ef15bed8fa1c76f0c1631f68d2aa3c85"; + rev = ''d3d332471ce9330e3eaebf9d6cecdd2014c3599b''; + }; + }; + + pcall = buildLispPackage rec { + baseName = "pcall"; + version = "0.3"; + description = "Common Lisp library intended to simplify 'result-oriented' parallelism"; + deps = [bordeaux-threads]; + # Source type: http + src = pkgs.fetchgit { + url = ''https://github.com/marijnh/pcall''; + sha256 = "00ix5d9ljymrrpwsri0hhh3d592jqr2lvgbvkhav3k96rwq974ps"; + rev = "4e1ef32c33c2ca18fd8ab9afb4fa793c179a3578"; + }; + }; + + command-line-arguments = buildLispPackage rec { + baseName = "command-line-arguments"; + version = "git-20141113"; + description = "small library to deal with command-line arguments"; + deps = []; + # Source type: git + src = pkgs.fetchgit { + url = ''http://common-lisp.net/project/qitab/git/command-line-arguments.git''; + sha256 = "91bb321e201034c35121860cb6ec05e39c6392d5906a52b9a2d33d0f76b06123"; + rev = ''121f303bbef9c9cdf37a7a12d8adb1ad4be5a6ae''; + }; + }; + + trivial-backtrace = buildLispPackage rec { + baseName = "trivial-backtrace"; + version = "git-2014-11-01"; + description = "trivial-backtrace"; + deps = []; + # Source type: git + src = pkgs.fetchgit { + url = ''http://common-lisp.net/project/trivial-backtrace/trivial-backtrace.git''; + sha256 = "1ql80z0igsng32rbp24h81pj5c4l87c1ana6c9lx3dlqpixzl4kj"; + rev = ''48a6b081e00b0d85f1e001c7258393ed34d06bc9''; + }; + }; + + drakma = buildLispPackage rec { + baseName = "drakma"; + version = "v1.3.10"; + description = "Full-featured http/https client based on usocket"; + deps = [chipz chunga cl-ssl cl-base64 cl-ppcre flexi-streams puri usocket]; + # Source type: git + src = pkgs.fetchgit { + url = ''https://github.com/edicl/drakma''; + sha256 = "0ecc37c9d5cc91a3b86746c4f20c0b1609969db01041df04ff6a9df1d021b30a"; + rev = ''refs/tags/v1.3.10''; + }; + }; + + chipz = buildLispPackage rec { + baseName = "chipz"; + version = "git-20141113"; + description = "A library for decompressing deflate, zlib, and gzip data"; + deps = []; + # Source type: git + src = pkgs.fetchgit { + url = ''https://github.com/froydnj/chipz''; + sha256 = "73ae22d58b6db5b2c86af4a465260e48a5aca19827d2b7329e2870c1148da8e2"; + rev = ''3402c94df1d0af7742df08d3ffa23fd5c04c9bf2''; + }; + }; + + chunga = buildLispPackage rec { + baseName = "chunga"; + version = "v1.1.5"; + description = "Portable chunked streams"; + deps = [trivial-gray-streams]; + # Source type: git + src = pkgs.fetchgit { + url = ''https://github.com/edicl/chunga''; + sha256 = "5d045882be34b158185c491da85cfd4671f456435c9ff8fa311a864f633b0446"; + rev = ''refs/tags/v1.1.5''; + }; + }; + + trivial-gray-streams = buildLispPackage rec { + baseName = "trivial-gray-streams"; + version = "git-20141113"; + description = "Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams)."; + deps = []; + # Source type: git + src = pkgs.fetchgit { + url = ''https://github.com/trivial-gray-streams/trivial-gray-streams''; + sha256 = "8d5c041f95eb31aa313adc433edf91bb14656400cae1e0ec98ad7ed085bb7954"; + rev = ''0483ade330508b4b2edeabdb47d16ec9437ee1cb''; + }; + }; + + cl-ssl = buildLispPackage rec { + baseName = "cl+ssl"; + version = "git-20141113"; + description = "Common Lisp interface to OpenSSL."; + deps = [bordeaux-threads cffi flexi-streams trivial-garbage trivial-gray-streams]; + # Source type: git + src = pkgs.fetchgit { + url = ''https://github.com/cl-plus-ssl/cl-plus-ssl''; + sha256 = "6b99fc49ac38e49ee69a47ce5791606b8b811c01e5563bfd3164d393db6c4040"; + rev = ''f8695c5df48ebc3557f76a8a08dd96429bdf8df2''; + }; + propagatedBuildInputs = [pkgs.openssl]; + }; + + flexi-streams = buildLispPackage rec { + baseName = "flexi-streams"; + version = "v1.0.13"; + description = "Flexible bivalent streams for Common Lisp"; + deps = [trivial-gray-streams]; + # Source type: git + src = pkgs.fetchgit { + url = ''https://github.com/edicl/flexi-streams''; + sha256 = "46d6b056cffc9ea201dedde847b071db744dfbadf0a21a261717272fe3d85cab"; + rev = ''refs/tags/v1.0.13''; + }; + }; + + trivial-garbage = buildLispPackage rec { + baseName = "trivial-garbage"; + version = "git-20141113"; + description = "Portable finalizers, weak hash-tables and weak pointers."; + deps = []; + # Source type: git + src = pkgs.fetchgit { + url = ''https://github.com/trivial-garbage/trivial-garbage''; + sha256 = "69f6c910921de436393ff5f93bee36443534756965fa34e43e04d9e8919212df"; + rev = ''2721d36d71748d9736a82fe5afe333c52bae3084''; + }; + }; + + cl-base64 = buildLispPackage rec { + baseName = "cl-base64"; + version = "git-20141113"; + description = "Base64 encoding and decoding with URI support."; + deps = []; + # Source type: git + src = pkgs.fetchgit { + url = ''http://git.b9.com/cl-base64.git''; + sha256 = "a34196544cc67d54aef74e31eff2cee62a7861a5675d010fcd925f1c61c23e81"; + rev = ''f375d1fc3a6616e95ae88bb33493bb99f920ba13''; + }; + }; + + puri = buildLispPackage rec { + baseName = "puri"; + version = "git-20141113"; + description = "Portable Universal Resource Indentifier Library"; + deps = []; + # Source type: git + src = pkgs.fetchgit { + url = ''http://git.b9.com/puri.git''; + sha256 = "71804698e7f3009fb7f570656af5d952465bfe77f72e9c41f7e2dda8a5b45c5e"; + rev = ''68260dbf320c01089c8cee54ef32c800eefcde7f''; + }; + }; + + usocket = buildLispPackage rec { + baseName = "usocket"; + version = "0.6.1"; + description = "Universal socket library for Common Lisp"; + deps = []; + # Source type: http + src = pkgs.fetchurl { + url = ''http://common-lisp.net/project/usocket/releases/usocket-${version}.tar.gz''; + sha256 = "1lnhjli85w20iy5nn6j6gsyxx42mvj8l0dfhwcjpl6dl2lz80r7a"; + }; + }; + + cl-html-parse = buildLispPackage rec { + baseName = "cl-html-parse"; + version = "git-20141113"; + description = "HTML Parser"; + deps = []; + # Source type: git + src = pkgs.fetchgit { + url = ''https://github.com/gwkkwg/cl-html-parse''; + sha256 = "0153d4962493f106849fc7cbfe03c5ff874adae8d307ea2e1ceebbb009e2f89f"; + rev = ''b21e8757210a1eb2a47104a563f58bf82ba9a579''; + }; + }; + + nibbles = buildLispPackage rec { + baseName = "nibbles"; + version = "git-20141116"; + description = "A library for accessing octet-addressed blocks of data"; + deps = []; + # Source type: git + src = pkgs.fetchgit { + url = ''https://github.com/froydnj/nibbles''; + sha256 = "39ad95be2b9f9ea80dbccd205a0ed6f9c5ef175a10da6eec55b7ba09a8f1a76a"; + rev = ''ace095d85e48b18bf9cf9e21249ba7fb57e3efe2''; + }; + }; + + ironclad = buildLispPackage rec { + baseName = "ironclad"; + version = "0.33.0"; + description = "A cryptographic toolkit written in pure Common Lisp"; + deps = [nibbles]; + # Source type: http + src = pkgs.fetchurl { + url = ''http://method-combination.net/lisp/files/ironclad_0.33.0.tar.gz''; + sha256 = "1ld0xz8gmi566zxl1cva5yi86aw1wb6i6446gxxdw1lisxx3xwz7"; + }; + }; + + cl-smtp = buildLispPackage rec { + baseName = "cl-smtp"; + version = "cvs-2014-11-15"; + description = "SMTP client library"; + deps = [cl-ssl cl-base64 flexi-streams trivial-gray-streams usocket]; + # Source type: cvs + src = pkgs.fetchcvs { + sha256 = "15b7lvayn1izzfism7s7rcw2mv1hwgp9l2lgb5na9qxmqzjlw0r9"; + date = ''2014-11-15''; + module = ''cl-smtp''; + cvsRoot = '':pserver:anonymous:anonymous@common-lisp.net:/project/cl-smtp/cvsroot''; }; }; }; diff --git a/pkgs/development/lisp-modules/stumpwm/default.nix b/pkgs/development/lisp-modules/stumpwm/default.nix deleted file mode 100644 index ae0dab1ec9d4..000000000000 --- a/pkgs/development/lisp-modules/stumpwm/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{pkgs, nixLib, clwrapper, cl-ppcre, clx, buildLispPackage}: -buildLispPackage rec { - baseName = "stumpwm"; - version = "2013-09"; - src = pkgs.fetchgit { - url = "https://github.com/sabetts/stumpwm"; - sha256 = "0dd69myssfn2bsdx3xdp65mjrvs9x81dl3y3659pyf1avnjlir7h"; - rev = "565ef58f04f59e1667ec1da4087f1a43a32cd67f"; - }; - description = "Tiling window manager for X11"; - deps = [cl-ppcre clx]; - buildInputs = with pkgs; [texinfo4 autoconf which makeWrapper]; - meta = { - maintainers = [nixLib.maintainers.raskin]; - platforms = nixLib.platforms.linux; - }; - overrides = x: { - preConfigure = '' - ${x.deployConfigScript} - export CL_SOURCE_REGISTRY="$CL_SOURCE_REGISTRY:$PWD/" - ./autogen.sh - configureFlags=" --with-lisp=$NIX_LISP --with-$NIX_LISP=$(which common-lisp.sh) --with-contrib-dir=$out/lib/common-lisp/stumpwm/contrib/" - ''; - installPhase = with pkgs; x.installPhase + '' - make install - - if [ "$NIX_LISP" = "sbcl" ]; then - wrapProgram "$out"/bin/stumpwm --set SBCL_HOME "${clwrapper.lisp}/lib/sbcl" - fi; - - mv $out/lib/common-lisp/stumpwm/contrib/stumpish $out/bin/stumpish - wrapProgram "$out"/bin/stumpish --prefix PATH : "${xlibs.xprop}/bin:${coreutils}/bin:${gnugrep}/bin:${gnused}/bin:${rlwrap}/bin:${ncurses}/bin" - ''; - postInstall = ''false''; - }; -} diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix index 2b3bb3339481..91dbdc77361a 100644 --- a/pkgs/development/mobile/androidenv/androidndk.nix +++ b/pkgs/development/mobile/androidenv/androidndk.nix @@ -1,35 +1,80 @@ -{ stdenv, fetchurl, zlib, ncurses +{ stdenv, fetchurl, zlib, ncurses, p7zip, lib, makeWrapper +, coreutils, file, findutils, gawk, gnugrep, gnused, jdk, which +, platformTools }: +assert stdenv.isLinux; + stdenv.mkDerivation rec { - name = "android-ndk-r9d"; + name = "android-ndk-r10c"; src = if stdenv.system == "i686-linux" then fetchurl { - url = "http://dl.google.com/android/ndk/${name}-linux-x86.tar.bz2"; - md5 = "6c1d7d99f55f0c17ecbcf81ba0eb201f"; + url = "http://dl.google.com/android/ndk/${name}-linux-x86.bin"; + sha256 = "0gyq68zrpzj3gkh81czs6r0jmikg5rwzh1bqg4rk16g2nxm4lll3"; } else if stdenv.system == "x86_64-linux" then fetchurl { - url = "http://dl.google.com/android/ndk/${name}-linux-x86_64.tar.bz2"; - md5 = "c7c775ab3342965408d20fd18e71aa45"; + url = "http://dl.google.com/android/ndk/${name}-linux-x86_64.bin"; + sha256 = "126rqzkmf8xz1hqdziwx81yln17hpivs2j45rxhzdr45iw9b758c"; } - else throw "platform not ${stdenv.system} supported!"; + else throw "platform ${stdenv.system} not supported!"; + + phases = "buildPhase"; - phases = "installPhase"; + buildInputs = [ p7zip makeWrapper ]; - installPhase = '' + buildCommand = let + bin_path = "$out/bin"; + pkg_path = "$out/libexec/${name}"; + sed_script_1 = + "'s|^PROGDIR=`dirname $0`" + + "|PROGDIR=`dirname $(readlink -f $(which $0))`|'"; + sed_script_2 = + "'s|^MYNDKDIR=`dirname $0`" + + "|MYNDKDIR=`dirname $(readlink -f $(which $0))`|'"; + runtime_paths = (lib.makeSearchPath "bin" [ + coreutils file findutils + gawk gnugrep gnused + jdk + which + ]) + ":${platformTools}/platform-tools"; + in '' set -x - mkdir -pv $out - tar xf $src - mv */* $out + mkdir -pv $out/libexec + cd $out/libexec + 7z x $src # so that it doesn't fail because of read-only permissions set - patch -p1 -d $out < ${ ./make-standalone-toolchain.patch } + cd - + patch -p1 \ + --no-backup-if-mismatch \ + -d $out/libexec/${name} < ${ ./make-standalone-toolchain.patch } + cd ${pkg_path} find $out \( \ \( -type f -a -name "*.so*" \) -o \ - \( -type f -a -perm +0100 \) \ + \( -type f -a -perm /0100 \) \ \) -exec patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-*so.? \ - --set-rpath ${zlib}/lib:${ncurses}/lib {} \; + --set-rpath ${zlib}/lib:${ncurses}/lib {} \; + # fix ineffective PROGDIR / MYNDKDIR determination + for i in ndk-build ndk-gdb ndk-gdb-py + do + sed -i -e ${sed_script_1} $i + done + sed -i -e ${sed_script_2} ndk-which + # a bash script + patchShebangs ndk-which + # make some executables available in PATH + mkdir -pv ${bin_path} + for i in \ + ndk-build ndk-depends ndk-gdb ndk-gdb-py ndk-gdb.py ndk-stack ndk-which + do + ln -sf ${pkg_path}/$i ${bin_path}/$i + done + # wrap + for i in ndk-build ndk-gdb ndk-gdb-py ndk-which + do + wrapProgram "${bin_path}/$i" --prefix PATH : "${runtime_paths}" + done ''; } diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index 560753eecfc5..533c605cf24a 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -192,6 +192,14 @@ stdenv.mkDerivation rec { ln -sf $i $out/bin/$(basename $i) fi done + + for i in $out/libexec/android-sdk-*/build-tools/android-*/* + do + if [ ! -d $i ] && [ -x $i ] + then + ln -sf $i $out/bin/$(basename $i) + fi + done ''; buildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/development/mobile/androidenv/build-app.nix b/pkgs/development/mobile/androidenv/build-app.nix index ca00e78b2cb8..25af902679db 100644 --- a/pkgs/development/mobile/androidenv/build-app.nix +++ b/pkgs/development/mobile/androidenv/build-app.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation ({ ${if useNDK then '' export GNUMAKE=${gnumake}/bin/make export NDK_HOST_AWK=${gawk}/bin/gawk - ${androidndk}/ndk-build + ${androidndk}/bin/ndk-build '' else ""} ant ${antFlags} ${if release then "release" else "debug"} ''; diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index 796f0f862bdd..37e4db458220 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -129,7 +129,9 @@ rec { }; androidndk = import ./androidndk.nix { - inherit (pkgs) stdenv fetchurl zlib ncurses; + inherit (pkgs) stdenv fetchurl zlib ncurses p7zip lib makeWrapper; + inherit (pkgs) coreutils file findutils gawk gnugrep gnused jdk which; + inherit platformTools; }; buildApp = import ./build-app.nix { diff --git a/pkgs/development/mobile/androidenv/make-standalone-toolchain.patch b/pkgs/development/mobile/androidenv/make-standalone-toolchain.patch index afc3470aaba1..5eeadbbd12da 100644 --- a/pkgs/development/mobile/androidenv/make-standalone-toolchain.patch +++ b/pkgs/development/mobile/androidenv/make-standalone-toolchain.patch @@ -1,7 +1,7 @@ -diff -ru android-ndk-r9d.old/build/tools/make-standalone-toolchain.sh android-ndk-r9d/build/tools/make-standalone-toolchain.sh ---- android-ndk-r9d.old/build/tools/make-standalone-toolchain.sh 2014-09-25 11:42:09.990500975 +0200 -+++ android-ndk-r9d/build/tools/make-standalone-toolchain.sh 2014-09-25 11:43:06.097501636 +0200 -@@ -252,6 +252,9 @@ +diff -ru android-ndk-r10c.old/build/tools/make-standalone-toolchain.sh android-ndk-r10c/build/tools/make-standalone-toolchain.sh +--- android-ndk-r10c.old/build/tools/make-standalone-toolchain.sh 2014-10-16 03:46:32.000000000 +0200 ++++ android-ndk-r10c/build/tools/make-standalone-toolchain.sh 2014-10-24 23:46:22.544928306 +0200 +@@ -310,6 +310,9 @@ # Now copy the GCC toolchain prebuilt binaries run copy_directory "$TOOLCHAIN_PATH" "$TMPDIR" diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index fa959035a9e9..059f67baa08e 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -1,7 +1,7 @@ -{stdenv, androidsdk, titaniumsdk, titanium, xcodewrapper, jdk, python, which}: +{stdenv, androidsdk, titaniumsdk, titanium, xcodewrapper, jdk, python, which, xcodeBaseDir}: { name, src, target, androidPlatformVersions ? [ "8" ], androidAbiVersions ? [ "armeabi" "armeabi-v7a" ], tiVersion ? null , release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null -, iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null +, iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosVersion ? "8.0", iosWwdrCertificate ? null , enableWirelessDistribution ? false, installURL ? null }: @@ -16,7 +16,10 @@ let useGoogleAPIs = true; }; - deleteKeychain = "security delete-keychain $keychainName"; + deleteKeychain = '' + security default-keychain -s login.keychain + security delete-keychain $keychainName + ''; in stdenv.mkDerivation { name = stdenv.lib.replaceChars [" "] [""] name; @@ -49,6 +52,13 @@ stdenv.mkDerivation { '' titanium config --config-file $TMPDIR/config.json --no-colors android.sdkPath ${androidsdkComposition}/libexec/android-sdk-* + # Add zipalign to PATH to make Ti 3.1 builds still work + for i in $(find -L ${androidsdkComposition}/libexec/android-sdk-*/build-tools -name zipalign) + do + export PATH=$(dirname $i):$PATH + break + done + ${if release then ''titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target dist-playstore --keystore ${androidKeyStore} --alias ${androidKeyAlias} --password ${androidKeyStorePassword} --output-dir $out'' else @@ -68,7 +78,9 @@ stdenv.mkDerivation { security default-keychain -s $keychainName security unlock-keychain -p "" $keychainName security import ${iosCertificate} -k $keychainName -P "${iosCertificatePassword}" -A - + ${stdenv.lib.optionalString (iosWwdrCertificate != null) '' + security import ${iosWwdrCertificate} -k $keychainName + ''} provisioningId=$(grep UUID -A1 -a ${iosMobileProvisioningProfile} | grep -o "[-A-Za-z0-9]\{36\}") # Ensure that the requested provisioning profile can be found @@ -94,12 +106,15 @@ stdenv.mkDerivation { cat > $HOME/.titanium/auth_session.json <<EOF { "loggedIn": true } EOF - + + # Configure the path to Xcode + titanium --config-file $TMPDIR/config.json --no-colors config paths.xcode ${xcodeBaseDir} + # Set the SDK to our copy titanium --config-file $TMPDIR/config.json --no-colors config sdk.defaultInstallLocation $TMPDIR/titaniumsdk # Do the actual build - titanium build --config-file $TMPDIR/config.json --force --no-colors --platform ios --target dist-adhoc --pp-uuid $provisioningId --distribution-name "${iosCertificateName}" --keychain $HOME/Library/Keychains/$keychainName --device-family universal --output-dir $out + titanium build --config-file $TMPDIR/config.json --force --no-colors --platform ios --target dist-adhoc --pp-uuid $provisioningId --distribution-name "${iosCertificateName}" --keychain $HOME/Library/Keychains/$keychainName --device-family universal --ios-version ${iosVersion} --output-dir $out # Remove our generated keychain @@ -115,7 +130,10 @@ stdenv.mkDerivation { cp -av * $out cd $out - titanium build --config-file $TMPDIR/config.json --force --no-colors --platform ios --target simulator --build-only --device-family universal --output-dir $out + # Configure the path to Xcode + titanium --config-file $TMPDIR/config.json --no-colors config paths.xcode ${xcodeBaseDir} + + titanium build --config-file $TMPDIR/config.json --force --no-colors --platform ios --target simulator --build-only --device-family universal --ios-version ${iosVersion} --output-dir $out ''} '' diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix index 6c71116b5e81..34e14b67c006 100644 --- a/pkgs/development/mobile/titaniumenv/default.nix +++ b/pkgs/development/mobile/titaniumenv/default.nix @@ -1,4 +1,4 @@ -{pkgs, pkgs_i686, xcodeVersion ? "5.0", tiVersion ? "3.2.3.GA"}: +{pkgs, pkgs_i686, xcodeVersion ? "6.0.1", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "3.4.0.GA"}: let # We have to use Oracle's JDK. On Darwin, just simply expose the host system's @@ -25,12 +25,14 @@ rec { xcodeenv = if pkgs.stdenv.system == "x86_64-darwin" then pkgs.xcodeenv.override { version = xcodeVersion; + inherit xcodeBaseDir; } else null; titaniumsdk = let titaniumSdkFile = if tiVersion == "3.1.4.GA" then ./titaniumsdk-3.1.nix else if tiVersion == "3.2.3.GA" then ./titaniumsdk-3.2.nix else if tiVersion == "3.3.0.GA" then ./titaniumsdk-3.3.nix + else if tiVersion == "3.4.0.GA" then ./titaniumsdk-3.4.nix else throw "Titanium version not supported: "+tiVersion; in import titaniumSdkFile { @@ -45,6 +47,6 @@ rec { inherit (pkgs.nodePackages) titanium; inherit (androidenv) androidsdk; inherit (xcodeenv) xcodewrapper; - inherit titaniumsdk; + inherit titaniumsdk xcodeBaseDir; }; } diff --git a/pkgs/development/mobile/titaniumenv/examples/default.nix b/pkgs/development/mobile/titaniumenv/examples/default.nix index d595db408178..786483d73477 100644 --- a/pkgs/development/mobile/titaniumenv/examples/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/default.nix @@ -1,9 +1,10 @@ { nixpkgs ? <nixpkgs> , systems ? [ "x86_64-linux" "x86_64-darwin" ] -, xcodeVersion ? "5.0" -, tiVersion ? "3.2.3.GA" +, xcodeVersion ? "6.0.1" +, xcodeBaseDir ? "/Applications/Xcode.app" +, tiVersion ? "3.4.0.GA" , rename ? false -, newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "" +, newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "", iosVersion ? "8.0", iosWwdrCertificate ? null , allowUnfree ? false , enableWirelessDistribution ? false, installURL ? null }: @@ -18,7 +19,7 @@ rec { in import ./kitchensink { inherit (pkgs) fetchgit; - titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion tiVersion; }; + titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion xcodeBaseDir tiVersion; }; inherit tiVersion; target = "android"; }); @@ -29,7 +30,7 @@ rec { in import ./kitchensink { inherit (pkgs) fetchgit; - titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion tiVersion; }; + titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion xcodeBaseDir tiVersion; }; inherit tiVersion; target = "android"; release = true; @@ -60,23 +61,16 @@ rec { rec { kitchensink_ios_development = import ./kitchensink { inherit (pkgs) fetchgit; - titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion tiVersion; }; - inherit tiVersion; + titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion xcodeBaseDir tiVersion; }; + inherit tiVersion iosVersion; target = "iphone"; }; - simulate_kitchensink_iphone = import ./simulate-kitchensink { - inherit (pkgs) stdenv; - xcodeenv = pkgs.xcodeenv.override { version = xcodeVersion; }; - kitchensink = kitchensink_ios_development; - device = "iPhone"; - }; - - simulate_kitchensink_ipad = import ./simulate-kitchensink { + simulate_kitchensink = import ./simulate-kitchensink { inherit (pkgs) stdenv; - xcodeenv = pkgs.xcodeenv.override { version = xcodeVersion; }; + xcodeenv = pkgs.xcodeenv.override { version = xcodeVersion; inherit xcodeBaseDir; }; kitchensink = kitchensink_ios_development; - device = "iPad"; + bundleId = if rename then newBundleId else "com.appcelerator.kitchensink"; }; } else {}) // (if rename then let @@ -85,12 +79,12 @@ rec { { kitchensink_ipa = import ./kitchensink { inherit (pkgs) stdenv fetchgit; - titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion tiVersion; }; + titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion xcodeBaseDir tiVersion; }; target = "iphone"; inherit tiVersion; release = true; rename = true; - inherit newBundleId iosMobileProvisioningProfile iosCertificate iosCertificateName iosCertificatePassword; + inherit newBundleId iosMobileProvisioningProfile iosCertificate iosCertificateName iosCertificatePassword iosVersion iosWwdrCertificate; inherit enableWirelessDistribution installURL; }; } diff --git a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix index 953726709694..a03a4830ab3d 100644 --- a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix @@ -1,5 +1,5 @@ { titaniumenv, fetchgit, target, androidPlatformVersions ? [ "14" ], tiVersion ? "3.2.3.GA", release ? false -, rename ? false, stdenv ? null, newBundleId ? null, iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? null, iosCertificatePassword ? null +, rename ? false, stdenv ? null, newBundleId ? null, iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? null, iosCertificatePassword ? null, iosVersion ? "8.0", iosWwdrCertificate ? null , enableWirelessDistribution ? false, installURL ? null }: @@ -37,6 +37,6 @@ titaniumenv.buildApp { androidKeyAlias = "myfirstapp"; androidKeyStorePassword = "mykeystore"; - inherit iosMobileProvisioningProfile iosCertificate iosCertificateName iosCertificatePassword; + inherit iosMobileProvisioningProfile iosCertificate iosCertificateName iosCertificatePassword iosVersion iosWwdrCertificate; inherit enableWirelessDistribution installURL; } diff --git a/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix index a5ab8d59a743..15a86e338dea 100644 --- a/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix @@ -1,9 +1,7 @@ -{stdenv, xcodeenv, kitchensink, device}: +{stdenv, xcodeenv, kitchensink, bundleId}: xcodeenv.simulateApp { - name = "simulate-${kitchensink.name}-${stdenv.lib.replaceChars [" " "(" ")"] ["_" "" ""] device}"; - appName = "KitchenSink"; - app = kitchensink; - inherit device; - baseDir = "build/iphone/build/Debug-iphonesimulator"; + name = "simulate-${kitchensink.name}"; + inherit bundleId; + app = "${kitchensink}/build/iphone/build/Debug-iphonesimulator"; } diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.1.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.1.nix index fa01dadc7756..50346ac5115d 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.1.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.1.nix @@ -53,8 +53,10 @@ stdenv.mkDerivation { '' else ""} - # Wrap builder script + # Fix zipalign compatibility issue with newer Android SDKs + sed -i -e 's|zipalign = self.sdk.get_zipalign()|zipalign = "zipalign"|' builder.py + # Wrap builder script mv builder.py .builder.py cat > builder.py <<EOF #!${python}/bin/python diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.4.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.4.nix new file mode 100644 index 000000000000..1baf57a94cfb --- /dev/null +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.4.nix @@ -0,0 +1,77 @@ +{stdenv, fetchurl, unzip, makeWrapper, python, jdk}: + +stdenv.mkDerivation { + name = "mobilesdk-3.4.0.GA"; + src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { + url = http://builds.appcelerator.com/mobile/3.4.0/mobilesdk-3.4.0.GA-linux.zip; + sha1 = "c281a3a3f3af35adc95fc00dcd525b84516c2083"; + } + else if stdenv.system == "x86_64-darwin" then fetchurl { + url = http://builds.appcelerator.com/mobile/3.4.0/mobilesdk-3.4.0.GA-osx.zip; + sha1 = "2f10426462e5f8e487be83c8038f2934d5079f0d"; + } + else throw "Platform: ${stdenv.system} not supported!"; + + buildInputs = [ unzip makeWrapper ]; + + buildCommand = '' + mkdir -p $out + cd $out + yes y | unzip $src + + # Fix shebang header for python scripts + + find . -name \*.py | while read i + do + sed -i -e "s|#!/usr/bin/env python|#!${python}/bin/python|" $i + done + + # Rename ugly version number + cd mobilesdk/* + cd 3.4.0.GA + + # Zip files do not support timestamps lower than 1980. We have to apply a few work-arounds to cope with that + # Yes, I know it's nasty :-) + + cd android + + sed -i -f ${./fixtiverify.sed} builder.py + sed -i -f ${./fixtiprofiler.sed} builder.py + sed -i -f ${./fixso.sed} builder.py + sed -i -f ${./fixnativelibs.sed} builder.py + + # Patch some executables + + ${if stdenv.system == "i686-linux" then + '' + patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux.so.2 titanium_prep.linux32 + '' + else if stdenv.system == "x86_64-linux" then + '' + patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64 + '' + else ""} + + # Wrap builder script + + mv builder.py .builder.py + cat > builder.py <<EOF + #!${python}/bin/python + + import os, sys + + os.environ['PYTHONPATH'] = '$(echo ${python.modules.sqlite3}/lib/python*/site-packages)' + os.environ['JAVA_HOME'] = '${if stdenv.system == "x86_64-darwin" then jdk else "${jdk}/lib/openjdk"}' + + os.execv('$(pwd)/.builder.py', sys.argv) + EOF + + chmod +x builder.py + + '' + stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") '' + # 'ditto' utility is needed to copy stuff to the Xcode organizer. Dirty, but this allows it to work. + sed -i -e "s|ditto|/usr/bin/ditto|g" $out/mobilesdk/osx/*/iphone/builder.py + + sed -i -e "s|--xcode|--xcode '+process.env['NIX_TITANIUM_WORKAROUND']+'|" $out/mobilesdk/osx/*/iphone/cli/commands/_build.js + ''; +} diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix index 1b4940b0c3d9..6af32ba41981 100644 --- a/pkgs/development/mobile/xcodeenv/build-app.nix +++ b/pkgs/development/mobile/xcodeenv/build-app.nix @@ -46,7 +46,10 @@ let else sdk; # The following is to prevent repetition - deleteKeychain = "security delete-keychain $keychainName"; + deleteKeychain = '' + security default-keychain -s login.keychain + security delete-keychain $keychainName + ''; in stdenv.mkDerivation { name = stdenv.lib.replaceChars [" "] [""] name; diff --git a/pkgs/development/mobile/xcodeenv/default.nix b/pkgs/development/mobile/xcodeenv/default.nix index 0d221a8952bd..341b06d98228 100644 --- a/pkgs/development/mobile/xcodeenv/default.nix +++ b/pkgs/development/mobile/xcodeenv/default.nix @@ -1,4 +1,4 @@ -{stdenv, version ? "5.0", xcodeBaseDir ? "/Applications/Xcode.app"}: +{stdenv, version ? "6.0.1", xcodeBaseDir ? "/Applications/Xcode.app"}: rec { xcodewrapper = import ./xcodewrapper.nix { diff --git a/pkgs/development/mobile/xcodeenv/simulate-app.nix b/pkgs/development/mobile/xcodeenv/simulate-app.nix index c999497d8c09..645bcd69da0c 100644 --- a/pkgs/development/mobile/xcodeenv/simulate-app.nix +++ b/pkgs/development/mobile/xcodeenv/simulate-app.nix @@ -1,22 +1,47 @@ {stdenv, xcodewrapper}: -{ name, appName ? null, app -, device ? "iPhone", baseDir ? "" -, sdkVersion ? "7.0" -}: +{name, bundleId, app}: -let - _appName = if appName == null then name else appName; -in stdenv.mkDerivation { name = stdenv.lib.replaceChars [" "] [""] name; buildCommand = '' mkdir -p $out/bin cat > $out/bin/run-test-simulator << "EOF" #! ${stdenv.shell} -e - - cd "${app}/${baseDir}/${_appName}.app" - "$(readlink "${xcodewrapper}/bin/iPhone Simulator")" -SimulateApplication './${_appName}' -SimulateDevice '${device}' -currentSDKRoot "$(readlink "${xcodewrapper}/SDKs")/iPhoneSimulator${sdkVersion}.sdk" + + if [ "$1" = "" ] + then + # Show the user the possibile UDIDs and let him pick one, if none is provided as a command-line parameter + xcrun simctl list + + echo "Please provide a UDID of a simulator:" + read udid + else + # If a parameter has been provided, consider that a device UDID an use that + udid="$1" + fi + + # Open the simulator instance + open -a "$(readlink "${xcodewrapper}/bin/iOS Simulator")" --args -CurrentDeviceUDID $udid + + # Copy the app and restore the write permissions + appTmpDir=$(mktemp -d -t appTmpDir) + cp -r "$(echo ${app}/*.app)" $appTmpDir + chmod -R 755 "$(echo $appTmpDir/*.app)" + + # Wait for the simulator to start + echo "Press enter when the simulator is started..." + read + + # Install the app + xcrun simctl install $udid "$(echo $appTmpDir/*.app)" + + # Remove the app tempdir + rm -Rf $appTmpDir + + # Launch the app in the simulator + xcrun simctl launch $udid "${bundleId}" EOF + chmod +x $out/bin/run-test-simulator ''; } diff --git a/pkgs/development/mobile/xcodeenv/xcodewrapper.nix b/pkgs/development/mobile/xcodeenv/xcodewrapper.nix index 4545ea8dae15..4be204d5dc52 100644 --- a/pkgs/development/mobile/xcodeenv/xcodewrapper.nix +++ b/pkgs/development/mobile/xcodeenv/xcodewrapper.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { ln -s /usr/bin/codesign ln -s "${xcodeBaseDir}/Contents/Developer/usr/bin/xcodebuild" ln -s "${xcodeBaseDir}/Contents/Developer/usr/bin/xcrun" - ln -s "${xcodeBaseDir}/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/Applications/iPhone Simulator.app/Contents/MacOS/iPhone Simulator" + ln -s "${xcodeBaseDir}/Contents/Developer/Applications/iOS Simulator.app/Contents/MacOS/iOS Simulator" cd .. ln -s "${xcodeBaseDir}/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs" diff --git a/pkgs/development/ocaml-modules/ansiterminal/default.nix b/pkgs/development/ocaml-modules/ansiterminal/default.nix new file mode 100644 index 000000000000..64b4f8263ff6 --- /dev/null +++ b/pkgs/development/ocaml-modules/ansiterminal/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, ocaml, findlib }: + +stdenv.mkDerivation { + + name = "ansiterminal-0.6.5"; + + src = fetchurl { + url = "https://forge.ocamlcore.org/frs/download.php/1206/ANSITerminal-0.6.5.tar.gz"; + sha256 = "1j9kflv2i16vf9hy031cl6z8hv6791mjbhnd9bw07y1pswdlx1r6"; + }; + + buildInputs = [ ocaml findlib ]; + + configurePhase = "ocaml setup.ml -configure --prefix $out"; + + buildPhase = "ocaml setup.ml -build"; + + installPhase = "ocaml setup.ml -install"; + + createFindlibDestdir = true; + + meta = with stdenv.lib; { + homepage = "https://forge.ocamlcore.org/projects/ansiterminal"; + description = "A module allowing to use the colors and cursor movements on ANSI terminals"; + longDescription = '' + ANSITerminal is a module allowing to use the colors and cursor + movements on ANSI terminals. It also works on the windows shell (but + this part is currently work in progress). + ''; + license = licenses.lgpl3; + platforms = ocaml.meta.platforms; + maintainers = [ maintainers.jirkamarsik ]; + }; +} diff --git a/pkgs/development/ocaml-modules/bolt/default.nix b/pkgs/development/ocaml-modules/bolt/default.nix new file mode 100644 index 000000000000..9b0efd816bdc --- /dev/null +++ b/pkgs/development/ocaml-modules/bolt/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, ocaml, findlib, which }: + +let inherit (stdenv.lib) getVersion versionAtLeast; in + +assert versionAtLeast (getVersion ocaml) "4.00.0"; +assert versionAtLeast (getVersion findlib) "1.3.3"; + +stdenv.mkDerivation rec { + + name = "bolt-1.4"; + + src = fetchurl { + url = "https://forge.ocamlcore.org/frs/download.php/1043/${name}.tar.gz"; + sha256 = "1c807wrpxra9sbb34lajhimwra28ldxv04m570567lh2b04n38zy"; + }; + + buildInputs = [ ocaml findlib which ]; + + # The custom `configure` script does not expect the --prefix + # option. Installation is handled by ocamlfind. + dontAddPrefix = true; + + createFindlibDestdir = true; + + buildFlags = "all"; + + doCheck = true; + checkTarget = "tests"; + + meta = with stdenv.lib; { + homepage = "http://bolt.x9c.fr"; + description = "A logging tool for the OCaml language"; + longDescription = '' + Bolt is a logging tool for the OCaml language. It is inspired by and + modeled after the famous log4j logging framework for Java. + ''; + license = licenses.lgpl3; + platforms = ocaml.meta.platforms; + maintainers = [ maintainers.jirkamarsik ]; + }; +} diff --git a/pkgs/development/ocaml-modules/calendar/default.nix b/pkgs/development/ocaml-modules/calendar/default.nix index 6af7ce250772..48aaf9725037 100644 --- a/pkgs/development/ocaml-modules/calendar/default.nix +++ b/pkgs/development/ocaml-modules/calendar/default.nix @@ -1,9 +1,9 @@ {stdenv, fetchurl, ocaml, findlib}: stdenv.mkDerivation { - name = "ocaml-calendar-2.03.2"; + name = "ocaml-calendar-2.5"; src = fetchurl { - url = https://forge.ocamlcore.org/frs/download.php/915/calendar-2.03.2.tar.gz; + url = https://forge.ocamlcore.org/frs/download.php/915/calendar-2.5.tar.bz2; sha256 = "04pvhwb664g3s644c7v7419a3kvf5s3pynkhmk5j59dvlfm1yf0f"; }; diff --git a/pkgs/development/ocaml-modules/camlimages/default.nix b/pkgs/development/ocaml-modules/camlimages/4.0.nix index ff344ef6f327..4f47680dcec9 100644 --- a/pkgs/development/ocaml-modules/camlimages/default.nix +++ b/pkgs/development/ocaml-modules/camlimages/4.0.nix @@ -1,7 +1,6 @@ {stdenv, fetchurl, omake, ocaml, omake_rc1, libtiff, libjpeg, libpng, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript }: let - ocaml_version = (builtins.parseDrvName ocaml.name).version; pname = "camlimages"; version = "4.0.1"; in @@ -14,9 +13,9 @@ stdenv.mkDerivation { sha256 = "b40237c1505487049799a7af296eb3996b3fa08eab94415546f46d61355747c4"; }; - buildInputs = [ocaml omake_rc1 findlib graphicsmagick ghostscript libtiff libjpeg libpng giflib freetype libXpm ]; + buildInputs = [ocaml omake_rc1 findlib graphicsmagick ghostscript ]; - propagatedbuildInputs = [libtiff libjpeg libpng giflib freetype libXpm ]; + propagatedBuildInputs = [libtiff libjpeg libpng giflib freetype libXpm ]; createFindlibDestdir = true; @@ -32,12 +31,11 @@ stdenv.mkDerivation { omake install ''; - #makeFlags = "BINDIR=$(out)/bin MANDIR=$(out)/usr/share/man/man1 DYPGENLIBDIR=$(out)/lib/ocaml/${ocaml_version}/site-lib"; - - meta = { - homepage = http://cristal.inria.fr/camlimages; - description = "Image manipulation library"; - license = stdenv.lib.licenses.gpl2; -# maintainers = [ stdenv.lib.maintainers.roconnor ]; + meta = with stdenv.lib; { + branch = "4.0"; + homepage = https://bitbucket.org/camlspotter/camlimages; + description = "OCaml image processing library"; + license = licenses.lgpl2; + maintainers = [ maintainers.vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/camlimages/4.1.nix b/pkgs/development/ocaml-modules/camlimages/4.1.nix new file mode 100644 index 000000000000..f98d149c4829 --- /dev/null +++ b/pkgs/development/ocaml-modules/camlimages/4.1.nix @@ -0,0 +1,38 @@ +{stdenv, fetchurl, omake, ocaml, omake_rc1, libtiff, libjpeg, libpng, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript }: + +assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00"; + +let + pname = "camlimages"; + version = "4.1.2"; +in + +stdenv.mkDerivation { + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/camlspotter/camlimages/get/${version}.tar.bz2"; + sha256 = "1ppddhfknpirj1vilm5dxgyp82kf7ahpvjmh7z75a1fnaqv3kpki"; + }; + + buildInputs = [ocaml omake_rc1 findlib graphicsmagick ghostscript ]; + + propagatedBuildInputs = [libtiff libjpeg libpng giflib freetype libXpm ]; + + createFindlibDestdir = true; + + buildPhase = '' + omake + ''; + + installPhase = '' + omake install + ''; + + meta = with stdenv.lib; { + homepage = https://bitbucket.org/camlspotter/camlimages; + description = "OCaml image processing library"; + license = licenses.lgpl2; + maintainers = [ maintainers.vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/camlpdf/default.nix b/pkgs/development/ocaml-modules/camlpdf/default.nix new file mode 100644 index 000000000000..9c6bae89f689 --- /dev/null +++ b/pkgs/development/ocaml-modules/camlpdf/default.nix @@ -0,0 +1,31 @@ +{stdenv, fetchgit, ocaml, findlib, ncurses}: + +stdenv.mkDerivation { + name = "ocaml-camlpdf-1.7.2"; + src = fetchgit { + url = https://github.com/johnwhitington/camlpdf.git; + rev = "73ee0c4cc71e4d5f2f046d0b41d301e0df1d78d9"; + sha256 = "0n3jpkwbh0qi282hvsvgz0hv9lwwd8rqy3pwgmpqr0rmbim8wss5"; + }; + + buildInputs = [ ocaml findlib ncurses ]; + + # Version number in META file is wrong + patchPhase = '' + patch -p 0 META <<EOF + 3c3 + < version="1.7.1" + --- + > version="1.7.2" + EOF + ''; + + createFindlibDestdir = true; + + meta = with stdenv.lib; { + description = "An OCaml library for reading, writing and modifying PDF files"; + homepage = https://github.com/johnwhitington/camlpdf; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [vbgl]; + }; +} diff --git a/pkgs/development/ocaml-modules/camomile/0.8.2.nix b/pkgs/development/ocaml-modules/camomile/0.8.2.nix index adbdc936d1e4..f6d22f62ec09 100644 --- a/pkgs/development/ocaml-modules/camomile/0.8.2.nix +++ b/pkgs/development/ocaml-modules/camomile/0.8.2.nix @@ -20,7 +20,8 @@ stdenv.mkDerivation { meta = { homepage = http://camomile.sourceforge.net/; description = "A comprehensive Unicode library for OCaml"; - license = "LGPL"; + license = stdenv.lib.licenses.lgpl21; + branch = "0.8.2"; platforms = ocaml.meta.platforms; maintainers = [ stdenv.lib.maintainers.z77z diff --git a/pkgs/development/ocaml-modules/cil/default.nix b/pkgs/development/ocaml-modules/cil/default.nix new file mode 100644 index 000000000000..43522e180b63 --- /dev/null +++ b/pkgs/development/ocaml-modules/cil/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, perl, ocaml, findlib }: +stdenv.mkDerivation { + name = "ocaml-cil-1.7.3"; + src = fetchurl { + url = mirror://sourceforge/cil/cil-1.7.3.tar.gz; + sha256 = "05739da0b0msx6kmdavr3y2bwi92jbh3szc35d7d8pdisa8g5dv9"; + }; + + buildInputs = [ perl ocaml findlib ]; + + createFindlibDestdir = true; + + preConfigure = '' + export FORCE_PERL_PREFIX=1 + ''; + prefixKey = "-prefix="; + + meta = with stdenv.lib; { + homepage = http://kerneis.github.io/cil/; + description = "A front-end for the C programming language that facilitates program analysis and transformation"; + license = licenses.bsd3; + maintainers = [ maintainers.vbgl ]; + platforms = ocaml.meta.platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/cmdliner/default.nix b/pkgs/development/ocaml-modules/cmdliner/default.nix index 2dfd7ba12860..0a35dc922960 100644 --- a/pkgs/development/ocaml-modules/cmdliner/default.nix +++ b/pkgs/development/ocaml-modules/cmdliner/default.nix @@ -2,7 +2,7 @@ let pname = "cmdliner"; - version = "0.9.5"; + version = "0.9.6"; ocaml_version = (builtins.parseDrvName ocaml.name).version; in @@ -14,7 +14,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://erratique.ch/software/${pname}/releases/${pname}-${version}.tbz"; - sha256 = "a0e199c4930450e12edf81604eeceddeeb32d55c43438be689e60df282277a7e"; + sha256 = "1i08yjkk5wln60bw9rrllh6ajjgq14cvzvcci8y1nk5v6ys7jr8p"; }; unpackCmd = "tar xjf $src"; diff --git a/pkgs/development/ocaml-modules/dypgen/default.nix b/pkgs/development/ocaml-modules/dypgen/default.nix index 73f543f5b626..9de4df9288b3 100644 --- a/pkgs/development/ocaml-modules/dypgen/default.nix +++ b/pkgs/development/ocaml-modules/dypgen/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = { homepage = http://dypgen.free.fr; description = "Dypgen GLR self extensible parser generator"; - license = "CeCILL-B_V1"; + license = stdenv.lib.licenses.cecill-b; # maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index 8a7045e263ad..9700a1d8cc5e 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -1,30 +1,34 @@ { stdenv, fetchurl, ocaml, findlib, which, ocsigen_server, ocsigen_deriving, js_of_ocaml, ocaml_react, ocaml_lwt, calendar, cryptokit, tyxml, - ocaml_ipaddr, ocamlnet, ocaml_ssl, ocaml_pcre, ocaml_optcomp}: + ocaml_ipaddr, ocamlnet, ocaml_ssl, ocaml_pcre, ocaml_optcomp, + reactivedata, opam}: -stdenv.mkDerivation +stdenv.mkDerivation rec { - name = "eliom-4.0.0"; + pname = "eliom"; + version = "4.1.0"; + name = "${pname}-${version}"; src = fetchurl { - url = https://github.com/ocsigen/eliom/archive/4.0.0.tar.gz; - sha256 = "1xf2l6lvngxzwaw6lvr6sgi48rz0wxg65q9lz4jzqjarkp0sx206"; + url = https://github.com/ocsigen/eliom/archive/4.1.0.tar.gz; + sha256 = "10v7mrq3zsbxdlg8k8xif777mbvcdpabvnd1g7p2yqivr7f1qm24"; }; buildInputs = [ocaml which ocsigen_server findlib ocsigen_deriving - js_of_ocaml ocaml_react ocaml_lwt calendar - cryptokit tyxml ocaml_ipaddr ocamlnet ocaml_ssl - ocaml_pcre ocaml_optcomp]; - - preConfigure = - ''chmod a+x configure - sed s/deriving-ocsigen/deriving/g -i configure + js_of_ocaml ocaml_optcomp opam]; + + propagatedBuildInputs = [ ocaml_lwt reactivedata tyxml ocaml_ipaddr + calendar cryptokit ocamlnet ocaml_react ocaml_ssl + ocaml_pcre ]; + + installPhase = + let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version; + in + ''opam-installer --script --prefix=$out ${pname}.install > install.sh + sh install.sh + ln -s $out/lib/${pname} $out/lib/ocaml/${ocamlVersion}/site-lib/ ''; - configureFlags = "--root $(out) --prefix /"; - - dontAddPrefix = true; - createFindlibDestdir = true; meta = { diff --git a/pkgs/development/ocaml-modules/gg/default.nix b/pkgs/development/ocaml-modules/gg/default.nix new file mode 100644 index 000000000000..a40d4ae79784 --- /dev/null +++ b/pkgs/development/ocaml-modules/gg/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, ocaml, findlib, opam }: + +let + inherit (stdenv.lib) getVersion versionAtLeast; + + pname = "gg"; + version = "0.9.0"; + webpage = "http://erratique.ch/software/${pname}"; +in + +assert versionAtLeast (getVersion ocaml) "4.01.0"; + +stdenv.mkDerivation rec { + + name = "ocaml-${pname}-${version}"; + + src = fetchurl { + url = "${webpage}/releases/${pname}-${version}.tbz"; + sha256 = "055pza6jbjjj7wgzf7pbn0ccxw76i8w5b2bcnaz8b9m4x6jaa6gh"; + }; + + buildInputs = [ ocaml findlib opam ]; + + createFindlibDestdir = true; + + unpackCmd = "tar xjf $src"; + + buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true"; + + installPhase = '' + opam-installer --script --prefix=$out ${pname}.install | sh + ln -s $out/lib/${pname} $out/lib/ocaml/${getVersion ocaml}/site-lib/${pname} + ''; + + meta = with stdenv.lib; { + description = "Basic types for computer graphics in OCaml"; + longDescription = '' + Gg is an OCaml module providing basic types for computer graphics. It + defines types and functions for floats, vectors, points, sizes, + matrices, quaternions, axis aligned boxes, colors, color spaces, and + raster data. + ''; + homepage = "${webpage}"; + platforms = ocaml.meta.platforms; + license = licenses.bsd3; + maintainers = [ maintainers.jirkamarsik ]; + }; +} diff --git a/pkgs/development/ocaml-modules/http/default.nix b/pkgs/development/ocaml-modules/http/default.nix index 8b611c65a41d..932a5811bec7 100644 --- a/pkgs/development/ocaml-modules/http/default.nix +++ b/pkgs/development/ocaml-modules/http/default.nix @@ -1,20 +1,15 @@ -{stdenv, fetchurl, ocaml_pcre, ocamlnet, ocaml, findlib}: - -let - ocaml_version = (builtins.parseDrvName ocaml.name).version; - pname = "ocaml-http"; - version = "0.1.3"; -in +{stdenv, fetchurl, ocaml_pcre, ocamlnet, ocaml, findlib, camlp4}: stdenv.mkDerivation { - name = "${pname}-${version}"; + name = "ocaml-http-0.1.5"; src = fetchurl { - url = "http://upsilon.cc/~zack/hacking/software/${pname}/${pname}-${version}.tar.gz"; - sha256 = "070xw033r4pk6f4l0wcknm75y9qm4mp622a4cgzmcfhm58v6kssn"; + url = https://forge.ocamlcore.org/frs/download.php/545/ocaml-http-0.1.5.tar.gz; + sha256 = "09q12b0j01iymflssxigsqggbsp8dqh9pfvkm76dv860544mygws"; }; - buildInputs = [ocaml_pcre ocamlnet ocaml findlib]; + buildInputs = [ocaml findlib camlp4]; + propagatedBuildInputs = [ocaml_pcre ocamlnet]; createFindlibDestdir = true; @@ -30,10 +25,11 @@ stdenv.mkDerivation { make all opt ''; - meta = { - homepage = "http://upsilon.cc/~zack/hacking/software/ocaml-http/"; + meta = with stdenv.lib; { + homepage = http://ocaml-http.forge.ocamlcore.org/; + platforms = ocaml.meta.platforms; description = "do it yourself (OCaml) HTTP daemon"; - license = stdenv.lib.licenses.lgpl2; - maintainers = [ stdenv.lib.maintainers.roconnor ]; + license = licenses.lgpl2; + maintainers = with maintainers; [ roconnor vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/lablgl/META.patch b/pkgs/development/ocaml-modules/lablgl/META.patch new file mode 100644 index 000000000000..bf5b2184ac0a --- /dev/null +++ b/pkgs/development/ocaml-modules/lablgl/META.patch @@ -0,0 +1,18 @@ +diff -r 562eb6ecb8ca META +--- a/META Wed Oct 01 20:09:24 2014 +0100 ++++ b/META Wed Oct 01 20:22:15 2014 +0100 +@@ -1,6 +1,5 @@ +-description "Bindings for OpenGL" ++description="Bindings for OpenGL" + version="1.05" +-directory="+lablGL" + archive(byte) = "lablgl.cma" + archive(native) = "lablgl.cmxa" + +@@ -16,4 +15,4 @@ + requires = "lablgl" + archive(byte) = "lablglut.cma" + archive(native) = "lablglut.cmxa" +-) +\ No newline at end of file ++) diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix index 7cefe26746f8..7c273061bd11 100644 --- a/pkgs/development/ocaml-modules/lablgl/default.nix +++ b/pkgs/development/ocaml-modules/lablgl/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, lablgtk, findlib, mesa, freeglut } : +{stdenv, fetchurl, ocaml, lablgtk, findlib, mesa, freeglut, camlp4 } : let ocaml_version = (builtins.parseDrvName ocaml.name).version; @@ -14,15 +14,16 @@ stdenv.mkDerivation { sha256 = "0qabydd219i4ak7hxgc67496qnnscpnydya2m4ijn3cpbgih7zyq"; }; - buildInputs = [ocaml findlib lablgtk mesa freeglut ]; + buildInputs = [ocaml findlib lablgtk freeglut camlp4]; + propagatedBuildInputs = [ mesa ]; - patches = [ ./Makefile.config.patch ]; + patches = [ ./Makefile.config.patch ./META.patch ]; preConfigure = '' substituteInPlace Makefile.config \ --subst-var-by BINDIR $out/bin \ --subst-var-by INSTALLDIR $out/lib/ocaml/${ocaml_version}/site-lib/lablgl \ - --subst-var-by DLLDIR $out/lib/ocaml/${ocaml_version}/site-lib/lablgl/stublibs \ + --subst-var-by DLLDIR $out/lib/ocaml/${ocaml_version}/site-lib/lablgl \ --subst-var-by TKINCLUDES "" \ --subst-var-by XINCLUDES "" ''; @@ -35,10 +36,10 @@ stdenv.mkDerivation { cp ./META $out/lib/ocaml/${ocaml_version}/site-lib/lablgl ''; - meta = { + meta = with stdenv.lib; { homepage = http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgl.html; description = "OpenGL bindings for ocaml"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.pSub ]; + license = licenses.gpl2; + maintainers = with maintainers; [ pSub vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix index 5fb9969e62ef..2e50b897f3d3 100644 --- a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix +++ b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation (rec { ''; meta = { + branch = "2.14"; platforms = ocaml.meta.platforms; maintainers = [ stdenv.lib.maintainers.z77z diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index 7499be9c5dd3..4c1665540ec2 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -3,16 +3,16 @@ let ocaml_version = (builtins.parseDrvName ocaml.name).version; pname = "lablgtk"; - version = "2.16.0"; + version = "2.18.3"; in assert stdenv.lib.versionAtLeast ocaml_version "3.12"; -stdenv.mkDerivation (rec { +stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { - url = "https://forge.ocamlcore.org/frs/download.php/979/${name}.tar.gz"; - sha256 = "a0ea9752eb257dadcfc2914408fff339d4c34357802f02c63329dd41b777de2f"; + url = https://forge.ocamlcore.org/frs/download.php/1479/lablgtk-2.18.3.tar.gz; + sha256 = "1bybn3jafxf4cx25zvn8h2xj9agn1xjbn7j3ywxxqx6az7rfnnwp"; }; buildInputs = [ocaml findlib pkgconfig gtk libgnomecanvas libglade gtksourceview camlp4]; @@ -25,14 +25,13 @@ stdenv.mkDerivation (rec { export OCAMLPATH=$out/lib/ocaml/${ocaml_version}/site-lib/:$OCAMLPATH ''; - meta = { + meta = with stdenv.lib; { platforms = ocaml.meta.platforms; - maintainers = [ - stdenv.lib.maintainers.z77z - stdenv.lib.maintainers.roconnor + maintainers = with maintainers; [ + z77z roconnor vbgl ]; - homepage = http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgtk.html; - description = "LablGTK is is an Objective Caml interface to gtk+"; - license = stdenv.lib.licenses.lgpl21Plus; + homepage = http://lablgtk.forge.ocamlcore.org/; + description = "An OCaml interface to gtk+"; + license = licenses.lgpl21Plus; }; -}) +} diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index 061dbb398fe2..4254b78287c5 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -1,7 +1,9 @@ -{stdenv, fetchgit, which, cryptopp, ocaml, findlib, ocaml_react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, ocaml_text, glib}: +{stdenv, fetchgit, which, cryptopp, ocaml, findlib, ocaml_react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, ocaml_text, glib, camlp4}: let version = "2.4.5"; + inherit (stdenv.lib) optional getVersion versionAtLeast; + ocaml_version = getVersion ocaml; in stdenv.mkDerivation { @@ -15,21 +17,22 @@ stdenv.mkDerivation { sha256 = "2bbf4f216dd62eeb765a89413f3b2b6d417a9c289ca49d595bb4d7a0545e343e"; }; - buildInputs = [ocaml_oasis pkgconfig which cryptopp ocaml findlib glib libev ncurses]; + buildInputs = [ocaml_oasis pkgconfig which cryptopp ocaml findlib glib libev ncurses camlp4]; propagatedBuildInputs = [ ocaml_react ocaml_ssl ocaml_text ]; - configureFlags = [ "--enable-all" ]; + configureFlags = [ "--enable-react" "--enable-glib" "--enable-ssl" "--enable-text" ] + ++ optional (versionAtLeast ocaml_version "4.0" && ! versionAtLeast ocaml_version "4.02") "--enable-toplevel"; createFindlibDestdir = true; - meta = { + meta = with stdenv.lib; { homepage = http://ocsigen.org/lwt; description = "Lightweight thread library for Objective Caml"; - license = "LGPL"; + license = licenses.lgpl21; platforms = ocaml.meta.platforms; - maintainers = [ - stdenv.lib.maintainers.z77z stdenv.lib.maintainers.gal_bolle + maintainers = with maintainers; [ + z77z vbgl gal_bolle ]; }; } diff --git a/pkgs/development/ocaml-modules/macaque/default.nix b/pkgs/development/ocaml-modules/macaque/default.nix new file mode 100644 index 000000000000..f2d13ad1f137 --- /dev/null +++ b/pkgs/development/ocaml-modules/macaque/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchurl, ocaml, findlib, pgocaml, camlp4}: + +stdenv.mkDerivation { + name = "ocaml-macaque-0.7.1"; + src = fetchurl { + url = https://github.com/ocsigen/macaque/archive/0.7.1.tar.gz; + sha256 = "0wnq3pgpcrfpivr8j7p827rhag6hdx0yr0bdvma0hw1g30vwf9qa"; + }; + + buildInputs = [ ocaml findlib camlp4 ]; + propagatedBuildInputs = [ pgocaml ]; + + createFindlibDestdir = true; + + meta = with stdenv.lib; { + description = "Macros for Caml Queries"; + homepage = https://github.com/ocsigen/macaque; + license = licenses.lgpl2; + platforms = ocaml.meta.platforms; + maintainers = with maintainers; [ vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix new file mode 100644 index 000000000000..97178ac701f8 --- /dev/null +++ b/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchurl, ocaml, findlib, pkgconfig, cairo, lablgtk, gtk, + enableGtkSupport ? true # Whether to compile with support for Gtk + # integration (library file cairo2_gtk). Depends + # on lablgtk and gtk. +}: + +let + inherit (stdenv.lib) optionals; + pname = "ocaml-cairo2"; + version = "0.4.6"; +in + +stdenv.mkDerivation { + + name = "${pname}-${version}"; + + src = fetchurl { + url = "http://forge.ocamlcore.org/frs/download.php/1279/cairo2-0.4.6.tar.gz"; + sha256 = "1lc1iv5yz49avbc0wbrw9nrx8dn0c35r7cykivjln1zc2fwscf7w"; + }; + + buildInputs = [ ocaml findlib pkgconfig cairo ] + ++ optionals enableGtkSupport [ gtk ]; + + # lablgtk2 is marked as a propagated build input since loading the + # cairo.lablgtk2 package from the toplevel tries to load lablgtk2 as + # well. + propagatedBuildInputs = optionals enableGtkSupport [ lablgtk ]; + + createFindlibDestdir = true; + + configurePhase = "ocaml setup.ml -configure --prefix $out" + + (if enableGtkSupport then " --enable-lablgtk2" + else " --disable-lablgtk2"); + + buildPhase = "ocaml setup.ml -build"; + + installPhase = "ocaml setup.ml -install"; + + meta = with stdenv.lib; { + homepage = "http://forge.ocamlcore.org/projects/cairo"; + description = "Binding to Cairo, a 2D Vector Graphics Library"; + longDescription = '' + This is a binding to Cairo, a 2D graphics library with support for + multiple output devices. Currently supported output targets include + the X Window System, Quartz, Win32, image buffers, PostScript, PDF, + and SVG file output. + ''; + license = licenses.lgpl3; + platforms = ocaml.meta.platforms; + maintainers = [ maintainers.jirkamarsik ]; + }; +} diff --git a/pkgs/development/ocaml-modules/ocaml-text/default.nix b/pkgs/development/ocaml-modules/ocaml-text/default.nix index 08136dd2b100..387c5cef19ad 100644 --- a/pkgs/development/ocaml-modules/ocaml-text/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-text/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libiconv, ocaml, findlib, ncurses}: +{stdenv, fetchurl, libiconvOrNull, ocaml, findlib, ncurses}: stdenv.mkDerivation { name = "ocaml-text-0.6"; @@ -8,9 +8,12 @@ stdenv.mkDerivation { sha256 = "0j8gaak0ajnlmn8knvfygqwwzs7awjv5rfn5cbj6qxqbxhjd5m6g"; }; - buildInputs = [ocaml findlib libiconv ncurses]; + buildInputs = [ocaml findlib ncurses] + ++ stdenv.lib.optional (libiconvOrNull != null) libiconvOrNull; - configurePhase = "iconv_prefix=${libiconv} ocaml setup.ml -configure"; + configurePhase = + (stdenv.lib.optionalString (libiconvOrNull != null) "iconv_prefix=${libiconvOrNull} ") + + "ocaml setup.ml -configure"; createFindlibDestdir = true; @@ -18,9 +21,7 @@ stdenv.mkDerivation { meta = { homepage = "http://ocaml-text.forge.ocamlcore.org/"; description = "OCaml-Text is a library for dealing with ``text'', i.e. sequence of unicode characters, in a convenient way. "; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; platforms = ocaml.meta.platforms; - maintainers = [ - ]; }; } diff --git a/pkgs/development/ocaml-modules/ocamlgraph/default.nix b/pkgs/development/ocaml-modules/ocamlgraph/default.nix index 98747e2a193e..c7427558314e 100644 --- a/pkgs/development/ocaml-modules/ocamlgraph/default.nix +++ b/pkgs/development/ocaml-modules/ocamlgraph/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { meta = { homepage = http://ocamlgraph.lri.fr/; description = "Graph library for Objective Caml"; - license = "GNU Library General Public License version 2, with the special exception on linking described in file LICENSE"; + license = stdenv.lib.licenses.gpl2Oss; platforms = ocaml.meta.platforms; maintainers = [ stdenv.lib.maintainers.kkallio diff --git a/pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh b/pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh index 876556a7b922..a93a7250bebb 100644 --- a/pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh +++ b/pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh @@ -2,4 +2,4 @@ addOcamlMakefile () { export OCAMLMAKEFILE="@out@/include/OCamlMakefile" } -envHooks=(${envHooks[@]} addOcamlMakefile) +envHooks+=(addOcamlMakefile) diff --git a/pkgs/development/ocaml-modules/ocamlnat/default.nix b/pkgs/development/ocaml-modules/ocamlnat/default.nix index a8e0f28628a4..dc5d191f75af 100644 --- a/pkgs/development/ocaml-modules/ocamlnat/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnat/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = "OCaml native toplevel"; homepage = http://benediktmeurer.de/ocamlnat/; - license = "QPL"; + license = stdenv.lib.licenses.qpl; longDescription = '' The ocamlnat project provides a new native code OCaml toplevel ocamlnat, which is mostly compatible to the byte code toplevel ocaml, diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix index 06e54a677334..0948b7132a4e 100644 --- a/pkgs/development/ocaml-modules/ocamlnet/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix @@ -5,11 +5,11 @@ let in stdenv.mkDerivation { - name = "ocamlnet-3.7.6"; + name = "ocamlnet-3.7.7"; src = fetchurl { - url = http://download.camlcity.org/download/ocamlnet-3.7.6.tar.gz; - sha256 = "0z17kxn1cyn1x5wgajw737m9rsjwji823rxdwvv8a5239xd1whji"; + url = http://download.camlcity.org/download/ocamlnet-3.7.7.tar.gz; + sha256 = "02bnks9jshpq9nqva5lky5hl009yp19cgvf1izjca620hx54d3jv"; }; buildInputs = [ncurses ocaml findlib ocaml_pcre camlzip openssl ocaml_ssl cryptokit]; diff --git a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix index d2a1ed3a6240..544d85c6f5fc 100644 --- a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchgit, ocaml, findlib, ocaml_oasis, ocaml_data_notation, ocaml_optcomp}: +{stdenv, fetchgit, ocaml, findlib, ocaml_oasis, ocaml_data_notation, ocaml_optcomp, camlp4}: stdenv.mkDerivation { name = "ocsigen-deriving"; @@ -7,8 +7,8 @@ stdenv.mkDerivation { rev = "refs/tags/0.6.2"; sha256 = "2b3bf3f4972d0e6eaf075f7353ce482b776726e0cd04947a89b7156384ec0662"; }; - - buildInputs = [ocaml findlib ocaml_oasis ocaml_data_notation ocaml_optcomp]; + + buildInputs = [ocaml findlib ocaml_oasis ocaml_data_notation ocaml_optcomp camlp4]; configurePhase = '' make setup-dev.exe @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { homepage = https://github.com/ocsigen/deriving; description = "Extension to OCaml for deriving functions from type declarations"; - license = "MIT"; + license = stdenv.lib.licenses.mit; platforms = ocaml.meta.platforms; maintainers = [ stdenv.lib.maintainers.gal_bolle diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index e33d40373796..d5c066ae2aa0 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -1,14 +1,18 @@ -{stdenv, fetchurl, ocaml, findlib, which, ocaml_react, ocaml_ssl, ocaml_lwt, ocamlnet, ocaml_pcre, cryptokit, tyxml, ocaml_ipaddr, zlib, libev, openssl, ocaml_sqlite3, tree}: +{stdenv, fetchurl, ocaml, findlib, which, ocaml_react, ocaml_ssl, +ocaml_lwt, ocamlnet, ocaml_pcre, cryptokit, tyxml, ocaml_ipaddr, zlib, +libev, openssl, ocaml_sqlite3, tree, uutf}: stdenv.mkDerivation { - name = "ocsigenserver-2.4.0"; + name = "ocsigenserver-2.5"; src = fetchurl { - url = https://github.com/ocsigen/ocsigenserver/archive/2.4.0.tar.gz; - sha256 = "1fjj8g6ivyfsa0446w77rjihhbw0gh5pgx7brywql2shk999riby"; + url = https://github.com/ocsigen/ocsigenserver/archive/2.5.tar.gz; + sha256 = "0ayzlzjwg199va4sclsldlcp0dnwdj45ahhg9ckb51m28c2pw46r"; }; - buildInputs = [ocaml which findlib ocaml_react ocaml_ssl ocaml_lwt ocamlnet ocaml_pcre cryptokit tyxml ocaml_ipaddr zlib libev openssl ocaml_sqlite3 tree]; + buildInputs = [ocaml which findlib ocaml_react ocaml_ssl ocaml_lwt + ocamlnet ocaml_pcre cryptokit tyxml ocaml_ipaddr zlib libev openssl + ocaml_sqlite3 tree uutf]; configureFlags = "--root $(out) --prefix /"; diff --git a/pkgs/development/ocaml-modules/odn/default.nix b/pkgs/development/ocaml-modules/odn/default.nix index 5f72afcf7666..bfffb67d4b0e 100644 --- a/pkgs/development/ocaml-modules/odn/default.nix +++ b/pkgs/development/ocaml-modules/odn/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, ocaml_typeconv, ounit}: +{stdenv, fetchurl, ocaml, findlib, ocaml_typeconv, ounit, camlp4}: stdenv.mkDerivation { name = "ocaml-data-notation-0.0.11"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "09a8zdyifpc2nl4hdvg9206142y31cq95ajgij011s1qcg3z93lj"; }; - buildInputs = [ocaml findlib ocaml_typeconv ounit]; + buildInputs = [ocaml findlib ocaml_typeconv ounit camlp4]; createFindlibDestdir = true; @@ -16,13 +16,13 @@ stdenv.mkDerivation { buildPhase = "ocaml setup.ml -build"; installPhase = "ocaml setup.ml -install"; - meta = { + meta = with stdenv.lib; { description = "Store data using OCaml notation"; homepage = https://forge.ocamlcore.org/projects/odn/; - license = stdenv.lib.licenses.lgpl21; + license = licenses.lgpl21; platforms = ocaml.meta.platforms; - maintainers = with stdenv.lib.maintainers; [ - z77z + maintainers = with maintainers; [ + vbgl z77z ]; }; } diff --git a/pkgs/development/ocaml-modules/optcomp/default.nix b/pkgs/development/ocaml-modules/optcomp/default.nix index 6075bc4ab2aa..4449766767cb 100644 --- a/pkgs/development/ocaml-modules/optcomp/default.nix +++ b/pkgs/development/ocaml-modules/optcomp/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib}: +{stdenv, fetchurl, ocaml, findlib, camlp4}: stdenv.mkDerivation { name = "ocaml-optcomp"; @@ -9,13 +9,13 @@ stdenv.mkDerivation { createFindlibDestdir = true; - buildInputs = [ocaml findlib]; + buildInputs = [ocaml findlib camlp4]; meta = { homepage = https://github.com/diml/optcomp; description = "Optional compilation for OCaml with cpp-like directives"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; platforms = ocaml.meta.platforms; maintainers = [ stdenv.lib.maintainers.gal_bolle diff --git a/pkgs/development/ocaml-modules/otfm/default.nix b/pkgs/development/ocaml-modules/otfm/default.nix new file mode 100644 index 000000000000..5a118c0bcd89 --- /dev/null +++ b/pkgs/development/ocaml-modules/otfm/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchurl, ocaml, findlib, opam, uutf }: + +let + inherit (stdenv.lib) getVersion versionAtLeast; + + pname = "otfm"; + version = "0.2.0"; + webpage = "http://erratique.ch/software/${pname}"; +in + +assert versionAtLeast (getVersion ocaml) "4.01.0"; + +stdenv.mkDerivation rec { + + name = "ocaml-${pname}-${version}"; + + src = fetchurl { + url = "${webpage}/releases/${pname}-${version}.tbz"; + sha256 = "1wgi9plf98gd7x3b7fzjxds089sivsap97bl1bw2lj73nxwnyb9c"; + }; + + buildInputs = [ ocaml findlib opam ]; + + propagatedBuildInputs = [ uutf ]; + + createFindlibDestdir = true; + + unpackCmd = "tar xjf $src"; + + buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true"; + + installPhase = '' + opam-installer --script --prefix=$out ${pname}.install | sh + ln -s $out/lib/${pname} $out/lib/ocaml/${getVersion ocaml}/site-lib/${pname} + ''; + + meta = with stdenv.lib; { + description = "OpenType font decoder for OCaml"; + longDescription = '' + Otfm is an in-memory decoder for the OpenType font data format. It + provides low-level access to font tables and functions to decode some + of them. + ''; + homepage = "${webpage}"; + platforms = ocaml.meta.platforms; + license = licenses.bsd3; + maintainers = [ maintainers.jirkamarsik ]; + }; +} diff --git a/pkgs/development/ocaml-modules/pgocaml/default.nix b/pkgs/development/ocaml-modules/pgocaml/default.nix new file mode 100644 index 000000000000..f1166d1c3249 --- /dev/null +++ b/pkgs/development/ocaml-modules/pgocaml/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchurl, ocaml, findlib, camlp4, calendar, csv, ocaml_pcre}: + +stdenv.mkDerivation { + name = "ocaml-pgocaml-2.1"; + src = fetchurl { + url = http://forge.ocamlcore.org/frs/download.php/1413/pgocaml-2.1.tgz; + sha256 = "0m7whlmhm7z58pfaarvkyiwaylmrz05aj6fr773zd9xlv07ljiym"; + }; + + buildInputs = [ocaml findlib camlp4]; + propagatedBuildInputs = [calendar csv ocaml_pcre]; + + createFindlibDestdir = true; + + meta = with stdenv.lib; { + description = "An interface to PostgreSQL databases for OCaml applications"; + homepage = http://pgocaml.forge.ocamlcore.org/; + license = licenses.lgpl2; + platforms = ocaml.meta.platforms; + maintainers = with maintainers; [ vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/reactivedata/default.nix b/pkgs/development/ocaml-modules/reactivedata/default.nix new file mode 100644 index 000000000000..eecae885302f --- /dev/null +++ b/pkgs/development/ocaml-modules/reactivedata/default.nix @@ -0,0 +1,34 @@ +{stdenv, fetchurl, ocaml, findlib, ocaml_react, opam}: + +let + ocamlVersion = stdenv.lib.getVersion ocaml; +in + +assert stdenv.lib.versionAtLeast ocamlVersion "3.11"; + +stdenv.mkDerivation { + name = "ocaml-reactiveData-0.1"; + src = fetchurl { + url = https://github.com/hhugo/reactiveData/archive/0.1.tar.gz; + sha256 = "056y9in6j6rpggdf8apailvs1m30wxizpyyrj08xyfxgv91mhxgw"; + }; + + buildInputs = [ocaml findlib opam]; + propagatedBuildInputs = [ocaml_react]; + + buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true"; + + installPhase = '' + opam-installer --script --prefix=$out reactiveData.install > install.sh + sed -i s!lib/reactiveData!lib/ocaml/${ocamlVersion}/site-lib/reactiveData! install.sh + sh install.sh + ''; + + meta = with stdenv.lib; { + description = "An OCaml module for functional reactive programming (FRP) based on React"; + homepage = https://github.com/hhugo/reactiveData; + license = licenses.lgpl21; + platforms = ocaml.meta.platforms; + maintainers = with maintainers; [ vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/sexplib/108.08.00.nix b/pkgs/development/ocaml-modules/sexplib/108.08.00.nix index 3dbb0ea8e818..bde9c2713715 100644 --- a/pkgs/development/ocaml-modules/sexplib/108.08.00.nix +++ b/pkgs/development/ocaml-modules/sexplib/108.08.00.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = with stdenv.lib; { + branch = "108"; homepage = https://ocaml.janestreet.com/; description = "Library for serializing OCaml values to and from S-expressions"; license = licenses.asl20; diff --git a/pkgs/development/ocaml-modules/sqlite3/default.nix b/pkgs/development/ocaml-modules/sqlite3/default.nix index d92207cd20b1..4111e2646583 100644 --- a/pkgs/development/ocaml-modules/sqlite3/default.nix +++ b/pkgs/development/ocaml-modules/sqlite3/default.nix @@ -1,32 +1,24 @@ {stdenv, fetchurl, sqlite, ocaml, findlib, pkgconfig}: stdenv.mkDerivation { - name = "ocaml-sqlite3-2.0.4"; + name = "ocaml-sqlite3-2.0.7"; src = fetchurl { - url = https://bitbucket.org/mmottl/sqlite3-ocaml/downloads/sqlite3-ocaml-2.0.4.tar.gz; - sha256 = "51ccb4c7a240eb40652c59e1770cfe1827dfa1eb926c969d19ff414aef4e80a1"; + url = https://github.com/mmottl/sqlite3-ocaml/archive/v2.0.7.tar.gz; + sha256 = "04m7qz251m6l2b7slkgml2j8bnx60lwzbdbsv95vidwzqcwg7bdq"; }; - buildInputs = [ocaml findlib pkgconfig ]; - - #configureFlags = "--with-sqlite3=${sqlite}"; - - preConfigure = '' - export PKG_CONFIG_PATH=${sqlite}/lib/pkgconfig/ - export OCAMLPATH=$OCAMLPATH:$OCAMLFIND_DESTDIR - mkdir -p $out/bin - ''; + buildInputs = [ocaml findlib pkgconfig sqlite]; createFindlibDestdir = true; - meta = { - homepage = https://bitbucket.org/mmottl/sqlite3-ocaml; + meta = with stdenv.lib; { + homepage = http://mmottl.github.io/sqlite3-ocaml/; description = "OCaml bindings to the SQLite 3 database access library"; - license = stdenv.lib.licenses.mit; + license = licenses.mit; platforms = ocaml.meta.platforms; - maintainers = [ - stdenv.lib.maintainers.z77z + maintainers = with maintainers; [ + z77z vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/ssl/default.nix b/pkgs/development/ocaml-modules/ssl/default.nix index 9a495002f1de..ad75b4a3dac0 100644 --- a/pkgs/development/ocaml-modules/ssl/default.nix +++ b/pkgs/development/ocaml-modules/ssl/default.nix @@ -2,7 +2,7 @@ let ocaml_version = (builtins.parseDrvName ocaml.name).version; - version = "0.4.4"; + version = "0.4.7"; in stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://debian/pool/main/o/ocaml-ssl/ocaml-ssl_${version}.orig.tar.gz"; - sha256 = "1m45d0bd4ndxswaa1symp6c1npzjmm9pz0nf7w0q15gflqhba5ch"; + sha256 = "0i0j89b10n3xmmawcq4qfwa42133pddw4x5nysmsnpd15srv5gp9"; }; buildInputs = [which openssl ocaml findlib]; diff --git a/pkgs/development/ocaml-modules/typeconv/108.08.00.nix b/pkgs/development/ocaml-modules/typeconv/108.08.00.nix index 805a8926e186..24daa366b2af 100644 --- a/pkgs/development/ocaml-modules/typeconv/108.08.00.nix +++ b/pkgs/development/ocaml-modules/typeconv/108.08.00.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = https://ocaml.janestreet.com/; description = "Support library for OCaml preprocessor type conversions"; - #license = licenses.apl20; invalid license + license = licenses.asl20; + branch = "108"; platforms = ocaml.meta.platforms; maintainers = with maintainers; [ z77z ]; }; diff --git a/pkgs/development/ocaml-modules/tyxml/default.nix b/pkgs/development/ocaml-modules/tyxml/default.nix index 648f0a9cd170..77cf0638255f 100644 --- a/pkgs/development/ocaml-modules/tyxml/default.nix +++ b/pkgs/development/ocaml-modules/tyxml/default.nix @@ -1,15 +1,17 @@ -{stdenv, fetchurl, ocaml, findlib, ocaml_oasis, camlp4}: +{stdenv, fetchurl, ocaml, findlib, ocaml_oasis, camlp4, uutf}: stdenv.mkDerivation { - name = "tyxml-3.1.1"; + name = "tyxml-3.3.0"; src = fetchurl { - url = http://github.com/ocsigen/tyxml/archive/3.1.1.tar.gz; - sha256 = "1r8im382r68kn8qy0857nv3y7h42i6ajyclxzmigfai7v2xdd05z"; + url = http://github.com/ocsigen/tyxml/archive/3.3.0.tar.gz; + sha256 = "0r1hj8qy91i48nd7wj0x2dqrgspqrry5awraxl4pl10vh0mn6pk7"; }; buildInputs = [ocaml findlib ocaml_oasis camlp4]; + propagatedBuildInputs = [uutf]; + createFindlibDestdir = true; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/uucp/default.nix b/pkgs/development/ocaml-modules/uucp/default.nix new file mode 100644 index 000000000000..2ee39cab9f4b --- /dev/null +++ b/pkgs/development/ocaml-modules/uucp/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, ocaml, findlib, opam }: + +let + inherit (stdenv.lib) getVersion versionAtLeast; + + pname = "uucp"; + version = "0.9.0"; + webpage = "http://erratique.ch/software/${pname}"; +in + +assert versionAtLeast (getVersion ocaml) "4.00"; + +stdenv.mkDerivation { + + name = "ocaml-${pname}-${version}"; + + src = fetchurl { + url = "${webpage}/releases/${pname}-${version}.tbz"; + sha256 = "1cwjr16cg03h30r97lnb32g725qi7ma76kr2aly5smc3m413dhqy"; + }; + + buildInputs = [ ocaml findlib opam ]; + + createFindlibDestdir = true; + + unpackCmd = "tar xjf $src"; + + buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true"; + + installPhase = '' + opam-installer --script --prefix=$out ${pname}.install | sh + ln -s $out/lib/${pname} $out/lib/ocaml/${getVersion ocaml}/site-lib/${pname} + ''; + + meta = with stdenv.lib; { + description = "An OCaml library providing efficient access to a selection of character properties of the Unicode character database"; + homepage = "${webpage}"; + platforms = ocaml.meta.platforms; + license = licenses.bsd3; + maintainers = [ maintainers.vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/vg/default.nix b/pkgs/development/ocaml-modules/vg/default.nix new file mode 100644 index 000000000000..bfff4c68cef9 --- /dev/null +++ b/pkgs/development/ocaml-modules/vg/default.nix @@ -0,0 +1,62 @@ +{ stdenv, fetchurl, ocaml, findlib, opam, gg, uutf, otfm, js_of_ocaml, + pdfBackend ? true, # depends on uutf and otfm + htmlcBackend ? true # depends on js_of_ocaml +}: + +let + inherit (stdenv.lib) getVersion optionals versionAtLeast; + + pname = "vg"; + version = "0.8.1"; + webpage = "http://erratique.ch/software/${pname}"; +in + +assert versionAtLeast (getVersion ocaml) "4.01.0"; + +stdenv.mkDerivation rec { + + name = "ocaml-${pname}-${version}"; + + src = fetchurl { + url = "${webpage}/releases/${pname}-${version}.tbz"; + sha256 = "1cdcvsr5z8845ndilnrz7p4n6yn4gv2p91z2mgi4vrailcmn5vzd"; + }; + + buildInputs = [ ocaml findlib opam ]; + + propagatedBuildInputs = [ gg ] + ++ optionals pdfBackend [ uutf otfm ] + ++ optionals htmlcBackend [ js_of_ocaml ]; + + createFindlibDestdir = true; + + unpackCmd = "tar xjf $src"; + + buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true" + + (if pdfBackend then " uutf=true otfm=true" + else " uutf=false otfm=false") + + (if htmlcBackend then " jsoo=true" + else " jsoo=false"); + + installPhase = '' + opam-installer --script --prefix=$out ${pname}.install | sh + ln -s $out/lib/${pname} $out/lib/ocaml/${getVersion ocaml}/site-lib/${pname} + ''; + + meta = with stdenv.lib; { + description = "Declarative 2D vector graphics for OCaml"; + longDescription = '' + Vg is an OCaml module for declarative 2D vector graphics. In Vg, images + are values that denote functions mapping points of the cartesian plane + to colors. The module provides combinators to define and compose these + values. + + Renderers for PDF, SVG and the HTML canvas are distributed with the + module. An API allows to implement new renderers. + ''; + homepage = "${webpage}"; + platforms = ocaml.meta.platforms; + license = licenses.bsd3; + maintainers = [ maintainers.jirkamarsik ]; + }; +} diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix index 10ac88bcb90b..ccd278a2faaf 100644 --- a/pkgs/development/ocaml-modules/zarith/default.nix +++ b/pkgs/development/ocaml-modules/zarith/default.nix @@ -3,16 +3,20 @@ let ocaml_version = (builtins.parseDrvName ocaml.name).version; in + +assert stdenv.lib.versionAtLeast ocaml_version "3.12.1"; + stdenv.mkDerivation rec { name = "zarith-${version}"; - version = "1.2.1"; + version = "1.3"; src = fetchurl { - url = "http://forge.ocamlcore.org/frs/download.php/1199/${name}.tgz"; - sha256 = "0i21bsx41br0jgw8xmlpnky5zamzqkpbykrq0z53z7ar77602s4i"; + url = http://forge.ocamlcore.org/frs/download.php/1471/zarith-1.3.tgz; + sha256 = "1mx3nxcn5h33qhx4gbg0hgvvydwlwdvdhqcnvfwnmf9jy3b8frll"; }; - buildInputs = [ ocaml findlib pkgconfig gmp perl ]; + buildInputs = [ ocaml findlib pkgconfig perl ]; + propagatedBuildInputs = [ gmp ]; patchPhase = '' substituteInPlace ./z_pp.pl --replace '/usr/bin/perl' '${perl}/bin/perl' @@ -22,11 +26,11 @@ stdenv.mkDerivation rec { ''; preInstall = "mkdir -p $out/lib/ocaml/${ocaml_version}/site-lib"; - meta = { + meta = with stdenv.lib; { description = "fast, arbitrary precision OCaml integers"; homepage = "http://forge.ocamlcore.org/projects/zarith"; - license = stdenv.lib.licenses.lgpl2; + license = licenses.lgpl2; platforms = ocaml.meta.platforms; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + maintainers = with maintainers; [ thoughtpolice vbgl ]; }; } diff --git a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix index 93cef5d844cc..20362a51a7be 100644 --- a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix +++ b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix @@ -21,6 +21,6 @@ buildPerlPackage rec { doCheck = !stdenv.isDarwin; meta = { - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; } diff --git a/pkgs/development/perl-modules/DBD-Pg/default.nix b/pkgs/development/perl-modules/DBD-Pg/default.nix index 619f2f14b96b..f6c8bcc2e2fc 100644 --- a/pkgs/development/perl-modules/DBD-Pg/default.nix +++ b/pkgs/development/perl-modules/DBD-Pg/default.nix @@ -16,7 +16,7 @@ buildPerlPackage rec { meta = { homepage = http://search.cpan.org/dist/DBD-Pg/; description = "DBI PostgreSQL interface"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/perl-modules/DBD-SQLite/default.nix b/pkgs/development/perl-modules/DBD-SQLite/default.nix index 7b1741c3d1e9..fbdcec06d0dd 100644 --- a/pkgs/development/perl-modules/DBD-SQLite/default.nix +++ b/pkgs/development/perl-modules/DBD-SQLite/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, buildPerlPackage, DBI, sqlite }: buildPerlPackage rec { - name = "DBD-SQLite-1.42"; + name = "DBD-SQLite-1.44"; src = fetchurl { url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/${name}.tar.gz"; - sha256 = "14x9cjsc8dz8ad1nad0bqiq9cbk1rjfb8h5y0rpk3pdl38y6afxb"; + sha256 = "10r7wv5x4vzn9zbk3c7mhbx6kz76xxd9p357592c0wamj458qlml"; }; propagatedBuildInputs = [ DBI ]; diff --git a/pkgs/development/perl-modules/net-amazon-s3-moose-warning.patch b/pkgs/development/perl-modules/net-amazon-s3-moose-warning.patch new file mode 100644 index 000000000000..3ac3f4e2a821 --- /dev/null +++ b/pkgs/development/perl-modules/net-amazon-s3-moose-warning.patch @@ -0,0 +1,25 @@ +https://github.com/pfig/net-amazon-s3/pull/42 + +From 116d73235d8243ec4427e6d7bf1f14f7fb9129aa Mon Sep 17 00:00:00 2001 +From: Jay Hannah <jay.hannah@iinteractive.com> +Date: Thu, 8 May 2014 02:29:14 +0000 +Subject: [PATCH] Patch for current versions of Moose: "Passing a list of + values to enum is deprecated. Enum values should be wrapped in an arrayref." + +--- + lib/Net/Amazon/S3/Client/Object.pm | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/Net/Amazon/S3/Client/Object.pm b/lib/Net/Amazon/S3/Client/Object.pm +index 08e48c6..106f2fd 100755 +--- a/lib/Net/Amazon/S3/Client/Object.pm ++++ b/lib/Net/Amazon/S3/Client/Object.pm +@@ -16,7 +16,7 @@ enum 'AclShort' => + [ qw(private public-read public-read-write authenticated-read) ]; + + enum 'StorageClass' => +- qw(standard reduced_redundancy); ++ [ qw(standard reduced_redundancy) ]; + + has 'client' => + ( is => 'ro', isa => 'Net::Amazon::S3::Client', required => 1 ); diff --git a/pkgs/development/perl-modules/perl-opengl-gl-extensions.txt b/pkgs/development/perl-modules/perl-opengl-gl-extensions.txt new file mode 100644 index 000000000000..42df14c40960 --- /dev/null +++ b/pkgs/development/perl-modules/perl-opengl-gl-extensions.txt @@ -0,0 +1,5 @@ +GLUT=20801 +VERSION=3.0 Mesa 10.2.6 +VENDOR=Intel Open Source Technology Center +RENDERER=Mesa DRI Intel(R) Ivybridge Mobile +EXTENSIONS=GL_ARB_multisample GL_EXT_abgr GL_EXT_bgra GL_EXT_blend_color GL_EXT_blend_minmax GL_EXT_blend_subtract GL_EXT_copy_texture GL_EXT_polygon_offset GL_EXT_subtexture GL_EXT_texture_object GL_EXT_vertex_array GL_EXT_compiled_vertex_array GL_EXT_texture GL_EXT_texture3D GL_IBM_rasterpos_clip GL_ARB_point_parameters GL_EXT_draw_range_elements GL_EXT_packed_pixels GL_EXT_point_parameters GL_EXT_rescale_normal GL_EXT_separate_specular_color GL_EXT_texture_edge_clamp GL_SGIS_generate_mipmap GL_SGIS_texture_border_clamp GL_SGIS_texture_edge_clamp GL_SGIS_texture_lod GL_ARB_framebuffer_sRGB GL_ARB_multitexture GL_EXT_framebuffer_sRGB GL_IBM_multimode_draw_arrays GL_IBM_texture_mirrored_repeat GL_3DFX_texture_compression_FXT1 GL_ARB_texture_cube_map GL_ARB_texture_env_add GL_ARB_transpose_matrix GL_EXT_blend_func_separate GL_EXT_fog_coord GL_EXT_multi_draw_arrays GL_EXT_secondary_color GL_EXT_texture_env_add GL_EXT_texture_filter_anisotropic GL_EXT_texture_lod_bias GL_INGR_blend_func_separate GL_NV_blend_square GL_NV_light_max_exponent GL_NV_texgen_reflection GL_NV_texture_env_combine4 GL_S3_s3tc GL_SUN_multi_draw_arrays GL_ARB_texture_border_clamp GL_ARB_texture_compression GL_EXT_framebuffer_object GL_EXT_texture_compression_s3tc GL_EXT_texture_env_combine GL_EXT_texture_env_dot3 GL_MESA_window_pos GL_NV_packed_depth_stencil GL_NV_texture_rectangle GL_ARB_depth_texture GL_ARB_occlusion_query GL_ARB_shadow GL_ARB_texture_env_combine GL_ARB_texture_env_crossbar GL_ARB_texture_env_dot3 GL_ARB_texture_mirrored_repeat GL_ARB_window_pos GL_ATI_envmap_bumpmap GL_EXT_stencil_two_side GL_EXT_texture_cube_map GL_NV_depth_clamp GL_APPLE_packed_pixels GL_APPLE_vertex_array_object GL_ARB_draw_buffers GL_ARB_fragment_program GL_ARB_fragment_shader GL_ARB_shader_objects GL_ARB_vertex_program GL_ARB_vertex_shader GL_ATI_draw_buffers GL_ATI_texture_env_combine3 GL_ATI_texture_float GL_EXT_shadow_funcs GL_EXT_stencil_wrap GL_MESA_pack_invert GL_NV_primitive_restart GL_ARB_depth_clamp GL_ARB_fragment_program_shadow GL_ARB_half_float_pixel GL_ARB_occlusion_query2 GL_ARB_point_sprite GL_ARB_shading_language_100 GL_ARB_sync GL_ARB_texture_non_power_of_two GL_ARB_vertex_buffer_object GL_ATI_blend_equation_separate GL_EXT_blend_equation_separate GL_OES_read_format GL_ARB_color_buffer_float GL_ARB_pixel_buffer_object GL_ARB_texture_compression_rgtc GL_ARB_texture_float GL_ARB_texture_rectangle GL_EXT_packed_float GL_EXT_pixel_buffer_object GL_EXT_texture_compression_dxt1 GL_EXT_texture_compression_rgtc GL_EXT_texture_rectangle GL_EXT_texture_sRGB GL_EXT_texture_shared_exponent GL_ARB_framebuffer_object GL_EXT_framebuffer_blit GL_EXT_framebuffer_multisample GL_EXT_packed_depth_stencil GL_APPLE_object_purgeable GL_ARB_vertex_array_object GL_ATI_separate_stencil GL_EXT_draw_buffers2 GL_EXT_draw_instanced GL_EXT_gpu_program_parameters GL_EXT_texture_array GL_EXT_texture_integer GL_EXT_texture_sRGB_decode GL_EXT_timer_query GL_OES_EGL_image GL_AMD_performance_monitor GL_ARB_copy_buffer GL_ARB_depth_buffer_float GL_ARB_draw_instanced GL_ARB_half_float_vertex GL_ARB_instanced_arrays GL_ARB_map_buffer_range GL_ARB_texture_rg GL_ARB_texture_swizzle GL_ARB_vertex_array_bgra GL_EXT_texture_swizzle GL_EXT_vertex_array_bgra GL_NV_conditional_render GL_AMD_conservative_depth GL_AMD_draw_buffers_blend GL_AMD_seamless_cubemap_per_texture GL_ARB_ES2_compatibility GL_ARB_blend_func_extended GL_ARB_debug_output GL_ARB_draw_buffers_blend GL_ARB_draw_elements_base_vertex GL_ARB_explicit_attrib_location GL_ARB_fragment_coord_conventions GL_ARB_provoking_vertex GL_ARB_sample_shading GL_ARB_sampler_objects GL_ARB_seamless_cube_map GL_ARB_shader_texture_lod GL_ARB_texture_cube_map_array GL_ARB_texture_gather GL_ARB_texture_multisample GL_ARB_texture_query_lod GL_ARB_texture_rgb10_a2ui GL_ARB_uniform_buffer_object GL_ARB_vertex_type_2_10_10_10_rev GL_EXT_provoking_vertex GL_EXT_texture_snorm GL_MESA_texture_signed_rgba GL_ARB_get_program_binary GL_ARB_robustness GL_ARB_separate_shader_objects GL_ARB_shader_bit_encoding GL_ARB_timer_query GL_ARB_transform_feedback2 GL_ARB_transform_feedback3 GL_ANGLE_texture_compression_dxt3 GL_ANGLE_texture_compression_dxt5 GL_ARB_conservative_depth GL_ARB_internalformat_query GL_ARB_map_buffer_alignment GL_ARB_shader_atomic_counters GL_ARB_shading_language_420pack GL_ARB_shading_language_packing GL_ARB_texture_storage GL_ARB_transform_feedback_instanced GL_EXT_framebuffer_multisample_blit_scaled GL_EXT_transform_feedback GL_AMD_shader_trinary_minmax GL_ARB_ES3_compatibility GL_ARB_clear_buffer_object GL_ARB_invalidate_subdata GL_ARB_texture_query_levels GL_ARB_texture_storage_multisample GL_ARB_texture_view GL_ARB_vertex_attrib_binding GL_KHR_debug GL_ARB_buffer_storage GL_ARB_multi_bind GL_ARB_texture_mirror_clamp_to_edge GL_ARB_vertex_type_10f_11f_11f_rev GL_EXT_shader_integer_mix GL_INTEL_performance_query diff --git a/pkgs/development/perl-modules/perl-opengl.patch b/pkgs/development/perl-modules/perl-opengl.patch new file mode 100644 index 000000000000..77bba1efa41c --- /dev/null +++ b/pkgs/development/perl-modules/perl-opengl.patch @@ -0,0 +1,55 @@ +diff --git a/Makefile.PL b/Makefile.PL +index 55c485c..8501c02 100644 +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -116,12 +116,7 @@ if ($^O eq 'MSWin32' || $IS_W32API) + # Look for available libs + our @libdirs = qw + { +- -L/usr/lib +- -L/usr/X11R6/lib +- -L/usr/local/lib +- -L/usr/openwin/lib +- -L/opt/csw/lib +- -L/usr/local/freeglut/lib ++ @@libpaths@@ + }; + + our @check_libs = qw +@@ -764,7 +759,6 @@ sub get_extensions + my $exc_file = 'gl_exclude.h'; + unlink($exc_file) if (-e $exc_file); + my $glv_file = 'utils/glversion.txt'; +- unlink($glv_file) if (-e $glv_file); + + # Only run the rest if GLUT is installed + print "Testing GLUT version\n" if ($verbose); +@@ -817,7 +811,7 @@ sub get_extensions + $make_ver = ";make -f Makefile " . (length($lib) ? "GLUT_LIB=$lib " : "") . (length($def) ? "GLUT_DEF=$def " : ""); + print "glversion: '$make_ver'\n" if $verbose>1; + } +- my $exec = 'cd utils'."$make_ver clean".$make_ver; ++ my $exec = 'cd utils'.$make_ver; + print "glversion: $exec\n" if ($verbose); + my $stat = `$exec`; + print "\n$stat\n\n" if ($verbose); +diff --git a/utils/Makefile b/utils/Makefile +index 910dcaf..1b1ac57 100644 +--- a/utils/Makefile ++++ b/utils/Makefile +@@ -21,14 +21,13 @@ EXTRALIBS=-lGLU -lXi -lXmu -lXext -lX11 -lm + all: glversion.txt + + glversion.txt: glversion +- ./glversion > glversion.txt ++ echo "skipping build of glversion.txt" + + glversion: glversion.o + ${LINK} glversion.o ${LDFLAGS} ${EXTRALIBS} -o glversion + chmod u+x glversion + + clean: +- rm -f glversion.txt + rm -f glversion + rm -f glversion.o + diff --git a/pkgs/development/pharo/vm/default.nix b/pkgs/development/pharo/vm/default.nix index 62c282949aab..45e54496b9c8 100644 --- a/pkgs/development/pharo/vm/default.nix +++ b/pkgs/development/pharo/vm/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, mesa, freetype, xlibs, alsaLib }: +{ stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, mesa, freetype, xlibs, alsaLib, cairo }: stdenv.mkDerivation rec { - version = "2014.09.20"; + version = "2014.11.29"; name = "pharo-vm-core-i386-${version}"; system = "x86_32-linux"; src = fetchurl { url = "http://files.pharo.org/vm/src/vm-unix-sources/blessed/pharo-vm-${version}.tar.bz2"; - md5 = "f4183566aeeb7cb9d0d7832b4e40b573"; + md5 = "529cff4639cee313ddf55fd377bd6fb3"; }; sources10Zip = fetchurl { @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { unzip ${sources30Zip} -d $prefix/lib/pharo-vm/ ''; - buildInputs = [ bash unzip cmake glibc openssl gcc mesa freetype xlibs.libX11 xlibs.libICE xlibs.libSM alsaLib ]; + buildInputs = [ bash unzip cmake glibc openssl gcc mesa freetype xlibs.libX11 xlibs.libICE xlibs.libSM alsaLib cairo ]; meta = { description = "Clean and innovative Smalltalk-inspired environment"; @@ -98,4 +98,4 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.DamienCassou ]; platforms = stdenv.lib.platforms.mesaPlatforms; }; -} \ No newline at end of file +} diff --git a/pkgs/development/pure-modules/pure-gsl/default.nix b/pkgs/development/pure-modules/pure-gsl/default.nix new file mode 100644 index 000000000000..bbad1e380d50 --- /dev/null +++ b/pkgs/development/pure-modules/pure-gsl/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, pure, pkgconfig, gsl }: + +stdenv.mkDerivation { + name = "pure-gsl-0.12"; + src = fetchurl { + url = https://bitbucket.org/purelang/pure-lang/downloads/pure-gsl-0.12.tar.gz; + sha256 = "06bdd873d5417d90ca35093056a060b77365123ed24c3ac583cd3922d4c78a75"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pure gsl ]; + + installPhase = '' + mkdir -p $out/lib/pure/gsl + install gsl.pure gsl$(pkg-config pure --variable DLL) $out/lib/pure + install gsl/*.pure $out/lib/pure/gsl + ''; + + setupHook = ./setup-hook.sh; + + meta = { + description = "GNU Scientific Library interface for Pure"; + homepage = http://puredocs.bitbucket.org/pure-gsl.html; + license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/pure-modules/pure-gsl/setup-hook.sh b/pkgs/development/pure-modules/pure-gsl/setup-hook.sh new file mode 100644 index 000000000000..efaa2211ae66 --- /dev/null +++ b/pkgs/development/pure-modules/pure-gsl/setup-hook.sh @@ -0,0 +1,2 @@ +addToSearchPath PURE_INCLUDE $1/lib/pure +addToSearchPath PURE_LIBRARY $1/lib/pure diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix index c1b36bf909de..f84c836c056f 100644 --- a/pkgs/development/python-modules/blivet/default.nix +++ b/pkgs/development/python-modules/blivet/default.nix @@ -1,52 +1,42 @@ -{ stdenv, fetchurl, buildPythonPackage, pykickstart, pyparted, pyblock -, libselinux, cryptsetup, multipath_tools, lsof, utillinux -, useNixUdev ? true, udev ? null -# This is only used when useNixUdev is false -, udevSoMajor ? 1 +{ stdenv, fetchFromGitHub, buildPythonPackage, pykickstart, pyparted, pyblock +, pyudev, six, libselinux, cryptsetup, multipath_tools, lsof, utillinux }: -assert useNixUdev -> udev != null; - let pyenable = { enablePython = true; }; selinuxWithPython = libselinux.override pyenable; cryptsetupWithPython = cryptsetup.override pyenable; in buildPythonPackage rec { name = "blivet-${version}"; - version = "0.17-1"; + version = "0.67"; - src = fetchurl { - url = "https://git.fedorahosted.org/cgit/blivet.git/snapshot/" - + "${name}.tar.bz2"; - sha256 = "1k3mws2q0ryb7422mml6idmaasz2i2v6ngyvg6d976dx090qnmci"; + src = fetchFromGitHub { + owner = "dwlehman"; + repo = "blivet"; + rev = name; + sha256 = "1gk94ghjrxfqnx53hph1j2s7qcv86fjz48is7l099q9c24rjv8ky"; }; postPatch = '' - sed -i -e 's|"multipath"|"${multipath_tools}/sbin/multipath"|' \ - blivet/devicelibs/mpath.py blivet/devices.py + sed -i \ + -e 's|"multipath"|"${multipath_tools}/sbin/multipath"|' \ + -e '/^def set_friendly_names/a \ return False' \ + blivet/devicelibs/mpath.py sed -i -e '/"wipefs"/ { s|wipefs|${utillinux}/sbin/wipefs| s/-f/--force/ }' blivet/formats/__init__.py sed -i -e 's|"lsof"|"${lsof}/bin/lsof"|' blivet/formats/fs.py sed -i -r -e 's|"(u?mount)"|"${utillinux}/bin/\1"|' blivet/util.py - sed -i '/pvscan/s/, *"--cache"//' blivet/devicelibs/lvm.py - '' + (if useNixUdev then '' - sed -i -e '/find_library/,/find_library/ { - c libudev = "${udev}/lib/libudev.so.1" - }' blivet/pyudev.py - '' else '' - sed -i \ - -e '/^somajor *=/s/=.*/= ${toString udevSoMajor}/p' \ - -e 's|common =.*|& + ["/lib/x86_64-linux-gnu", "/lib/i686-linux-gnu"]|' \ - blivet/pyudev.py - ''); + sed -i -e '/pvscan/s/, *"--cache"//' blivet/devicelibs/lvm.py + ''; propagatedBuildInputs = [ - pykickstart pyparted pyblock selinuxWithPython cryptsetupWithPython - ] ++ stdenv.lib.optional useNixUdev udev; + pykickstart pyparted pyblock pyudev selinuxWithPython cryptsetupWithPython + six + ]; - # tests are currently _heavily_ broken upstream + # Tests are in <nixos/tests/blivet.nix>. doCheck = false; meta = { diff --git a/pkgs/development/python-modules/box2d/disable-test.patch b/pkgs/development/python-modules/box2d/disable-test.patch new file mode 100644 index 000000000000..bc2897a8b100 --- /dev/null +++ b/pkgs/development/python-modules/box2d/disable-test.patch @@ -0,0 +1,14 @@ +Common subdirectories: Box2D-2.3b0/Box2D and Box2D-2.3b0.new/Box2D +Common subdirectories: Box2D-2.3b0/examples and Box2D-2.3b0.new/examples +Common subdirectories: Box2D-2.3b0/library and Box2D-2.3b0.new/library +diff -u Box2D-2.3b0/setup.py Box2D-2.3b0.new/setup.py +--- Box2D-2.3b0/setup.py 2013-02-02 18:09:34.000000000 +0100 ++++ Box2D-2.3b0.new/setup.py 2014-10-25 13:32:07.136922343 +0200 +@@ -176,7 +176,6 @@ + package_dir = {'Box2D': library_path, + 'Box2D.b2': os.path.join(library_path, 'b2'), + 'Box2D.tests' : 'tests'}, +- test_suite = 'tests', + options = { 'build_ext': { 'swig_opts' : swig_arguments }, + 'egg_info' : { 'egg_base' : library_base }, + }, diff --git a/pkgs/development/python-modules/bsddb3/default.nix b/pkgs/development/python-modules/bsddb3/default.nix index 574796e2c681..bd5b953f048a 100644 --- a/pkgs/development/python-modules/bsddb3/default.nix +++ b/pkgs/development/python-modules/bsddb3/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, python, db}: stdenv.mkDerivation rec { - name = "bsddb3-6.0.1"; + name = "bsddb3-6.1.0"; src = fetchurl { url = "https://pypi.python.org/packages/source/b/bsddb3/${name}.tar.gz"; - md5 = "2b22ab1b4d896961c30e4106660e9139"; + sha256 = "05gx3rfgq1qrgdmpd6hri6y5l97bh1wczvb6x853jchwi7in6cdi"; }; buildInputs = [python]; buildPhase = "true"; diff --git a/pkgs/development/python-modules/bugzilla/checkPhase-fix-cookie-compare.patch b/pkgs/development/python-modules/bugzilla/checkPhase-fix-cookie-compare.patch new file mode 100644 index 000000000000..63c0fdc3c502 --- /dev/null +++ b/pkgs/development/python-modules/bugzilla/checkPhase-fix-cookie-compare.patch @@ -0,0 +1,30 @@ +From e7ed770363e8769727a915b2390c0ce1ab2ce964 Mon Sep 17 00:00:00 2001 +From: Michal Hlavinka <mhlavink@redhat.com> +Date: Wed, 18 Jun 2014 20:07:24 -0400 +Subject: tests: Fix cookie comparison on rawhide + +Cookie comments changed, so just strip them out + +(crobinso: Add commit message, make change more readable) + +diff --git a/tests/misc.py b/tests/misc.py +index 4b4f99d..12da806 100644 +--- a/tests/misc.py ++++ b/tests/misc.py +@@ -83,7 +83,12 @@ class MiscAPI(unittest.TestCase): + + # Mozilla should be converted inplace to LWP + bugzilla.Bugzilla3(url=None, cookiefile=cookiesnew) +- self.assertEquals(open(cookiesmoz).read(), open(cookiesnew).read()) ++ ++ def strip_comments(content): ++ return [l for l in content.split("\n") if not l.startswith("#")] ++ self.assertEquals( ++ strip_comments(open(cookiesmoz).read()), ++ strip_comments(open(cookiesnew).read())) + + # Make sure bad cookies raise an error + try: +-- +cgit v0.10.2 + diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 6ec7934e5638..260128a2ddac 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -57,12 +57,13 @@ if disabled then throw "${name} not supported for interpreter ${python.executabl name = namePrefix + name; buildInputs = [ - python wrapPython setuptools + wrapPython setuptools (distutils-cfg.override { extraCfg = distutilsExtraCfg; }) ] ++ buildInputs ++ pythonPath ++ (lib.optional (lib.hasSuffix "zip" attrs.src.name or "") unzip); - propagatedBuildInputs = propagatedBuildInputs ++ [ recursivePthLoader ]; + # propagate python to active setup-hook in nix-shell + propagatedBuildInputs = propagatedBuildInputs ++ [ recursivePthLoader python ]; pythonPath = [ setuptools ] ++ pythonPath; diff --git a/pkgs/development/python-modules/mygpoclient/default.nix b/pkgs/development/python-modules/mygpoclient/default.nix index d44617883818..e83cc9ad1f4c 100644 --- a/pkgs/development/python-modules/mygpoclient/default.nix +++ b/pkgs/development/python-modules/mygpoclient/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { to the gpodder.net web services. ''; homepage = "https://thp.io/2010/mygpoclient/"; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; maintainers = [ stdenv.lib.maintainers.skeidel ]; }; diff --git a/pkgs/development/python-modules/pycdio/add-cdtext-toc.patch b/pkgs/development/python-modules/pycdio/add-cdtext-toc.patch new file mode 100644 index 000000000000..4e36612d80d0 --- /dev/null +++ b/pkgs/development/python-modules/pycdio/add-cdtext-toc.patch @@ -0,0 +1,52 @@ +diff -Nurp pycdio-0.20-orig/test/cdtext.toc pycdio-0.20/test/cdtext.toc +--- pycdio-0.20-orig/test/cdtext.toc 1970-01-01 01:00:00.000000000 +0100 ++++ pycdio-0.20/test/cdtext.toc 2014-11-06 23:36:12.520708320 +0100 +@@ -0,0 +1,48 @@ ++CD_DA ++ ++// global CD-TEXT data ++ ++CD_TEXT { ++ ++ // Mapping from language number (0..7) used in 'LANGUAGE' statements ++ // to language code. ++/// LANGUAGE_MAP { ++/// 0 : EN // 9 is the code for ENGLISH, ++/// // I don't know any other language code, yet ++/// } ++ ++ // Language number should always start with 0 ++ LANGUAGE 0 { ++ // Required fields - at least all CD-TEXT CDs I've seen so far have them. ++ TITLE "CD Title" ++ PERFORMER "Performer" ++ DISC_ID "XY12345" ++ UPC_EAN "" // usually empty ++ ++ // Further possible items, all of them are optional ++ ARRANGER "" ++ SONGWRITER "" ++ MESSAGE "" ++ GENRE "" // I'm not sure if this should be really ascii data ++ } ++} ++ ++ ++TRACK AUDIO ++// track specific CD-TEXT data ++CD_TEXT { ++ LANGUAGE 0 { ++ // if an item is defined for one track it should be defined for all tracks ++ TITLE "Track Title" ++ ++ PERFORMER "Performer" ++ ISRC "US-XX1-98-01234" ++ ++ ARRANGER "" ++ SONGWRITER "" ++ MESSAGE "" ++ } ++} ++ ++SILENCE 1:0:0 ++ diff --git a/pkgs/development/python-modules/pycups/default.nix b/pkgs/development/python-modules/pycups/default.nix index a61106f476d7..766dcaa58f79 100644 --- a/pkgs/development/python-modules/pycups/default.nix +++ b/pkgs/development/python-modules/pycups/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, python, cups }: -let version = "1.9.57"; in +let version = "1.9.68"; in stdenv.mkDerivation { name = "pycups-${version}"; src = fetchurl { url = "http://cyberelk.net/tim/data/pycups/pycups-${version}.tar.bz2"; - sha256 = "12m3lh4nmfp6yn6sqlskl9gb1mfiwx42m8dnms6j6xc2nimn5k14"; + sha256 = "1i1ph9k1wampa7r6mgc30a99w0zjmxhvcxjxrgjqa5vdknynqd24"; }; installPhase = '' diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index 93fa70e44bcf..3a24767ae4ee 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, python, pkgconfig -, SDL, SDL_image, SDL_mixer, SDL_ttf, libpng, libjpeg +{ stdenv, fetchurl, buildPythonPackage, pkgconfig, smpeg, libX11 +, SDL, SDL_image, SDL_mixer, SDL_ttf, libpng, libjpeg, portmidi }: -stdenv.mkDerivation { +buildPythonPackage { name = "pygame-1.9.1"; src = fetchurl { @@ -11,24 +11,21 @@ stdenv.mkDerivation { }; buildInputs = [ - python pkgconfig SDL SDL_image SDL_mixer SDL_ttf libpng libjpeg + pkgconfig SDL SDL_image SDL_mixer SDL_ttf libpng libjpeg + smpeg portmidi libX11 ]; patches = [ ./pygame-v4l.patch ]; - configurePhase = '' - for i in ${SDL_image} ${SDL_mixer} ${SDL_ttf} ${libpng} ${libjpeg}; do + preConfigure = '' + for i in ${SDL_image} ${SDL_mixer} ${SDL_ttf} ${libpng} ${libjpeg} ${portmidi} ${libX11}; do sed -e "/origincdirs =/a'$i/include'," -i config_unix.py sed -e "/origlibdirs =/aoriglibdirs += '$i/lib'," -i config_unix.py done - yes Y | LOCALBASE=/ python config.py + LOCALBASE=/ python config.py ''; - buildPhase = "python setup.py build"; - - installPhase = "python setup.py install --prefix=$out"; - meta = { description = "Python library for games"; homepage = "http://www.pygame.org/"; diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix deleted file mode 100644 index 5f92e2cf2025..000000000000 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -a : -let - fetchurl = a.fetchurl; - - version = a.lib.attrByPath ["version"] "0.13.1" a; - propagatedBuildInputs = with a; [ - openssl python - ]; -in -rec { - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-${version}.tar.gz"; - sha256 = "1nrg2kas0wsv65j8sia8zkkc6ir5i20lrhkfavjxzxhl0iqyq1ms"; - }; - - inherit propagatedBuildInputs; - configureFlags = []; - - /* doConfigure should be removed if not needed */ - phaseNames = ["installPythonPackage"]; - - name = "pyOpenSSL-" + version; - meta = { - description = "Python OpenSSL wrapper capable of checking certificates"; - }; -} diff --git a/pkgs/development/python-modules/rhpl/builder.sh b/pkgs/development/python-modules/rhpl/builder.sh index b37e9081832f..dc93effe802f 100644 --- a/pkgs/development/python-modules/rhpl/builder.sh +++ b/pkgs/development/python-modules/rhpl/builder.sh @@ -1,6 +1,6 @@ source $stdenv/setup -rpm2cpio $src | cpio -idv +rpmextract $src tar xfvj rhpl-*.tar.bz2 rm rhpl-*.tar.bz2 cd rhpl-* diff --git a/pkgs/development/python-modules/rhpl/default.nix b/pkgs/development/python-modules/rhpl/default.nix index 92330a378c89..ee1d0ec1738b 100644 --- a/pkgs/development/python-modules/rhpl/default.nix +++ b/pkgs/development/python-modules/rhpl/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, rpm, cpio, python, wirelesstools, gettext}: +{stdenv, fetchurl, rpmextract, python, wirelesstools, gettext}: stdenv.mkDerivation { name = "rhpl-0.218"; @@ -12,5 +12,5 @@ stdenv.mkDerivation { builder = ./builder.sh; - buildInputs = [ rpm cpio python wirelesstools gettext ]; + buildInputs = [ rpmextract python wirelesstools gettext ]; } diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 4649bc5a2a7a..01fe46686797 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { shortName = "setuptools-${version}"; name = "${python.executable}-${shortName}"; - version = "5.8"; + version = "7.0"; src = fetchurl { url = "http://pypi.python.org/packages/source/s/setuptools/${shortName}.tar.gz"; - sha256 = "15h643gf821b72d0s59cjj60c6dm5l57rggv5za9d05mccp3psff"; + sha256 = "0qg07f035agwcz9m0p3kgdjs18xpl3h00rv28aqsfdyz1wm1m76x"; }; buildInputs = [ python wrapPython distutils-cfg ]; diff --git a/pkgs/development/python-modules/taskw/use-template-for-taskwarrior-install-path.patch b/pkgs/development/python-modules/taskw/use-template-for-taskwarrior-install-path.patch new file mode 100644 index 000000000000..006d964d4016 --- /dev/null +++ b/pkgs/development/python-modules/taskw/use-template-for-taskwarrior-install-path.patch @@ -0,0 +1,48 @@ +commit 4de021d049a9b194da93d7e96ff12cc1cbabac83 +Author: Nicolas B. Pierron <nixos@nbp.name> +Date: Sun Nov 16 15:19:38 2014 +0100 + + Use a template for taskwarrior install path. + +diff --git a/taskw/warrior.py b/taskw/warrior.py +index 21dde88..e0509f2 100644 +--- a/taskw/warrior.py ++++ b/taskw/warrior.py +@@ -451,17 +451,17 @@ class TaskWarriorShellout(TaskWarriorBase): + def _execute(self, *args): + """ Execute a given taskwarrior command with arguments + + Returns a 2-tuple of stdout and stderr (respectively). + + """ + command = ( + [ +- 'task', ++ '@@taskwarrior@@/bin/task', + 'rc:%s' % self.config_filename, + ] + + self.get_configuration_override_args() + + [six.text_type(arg) for arg in args] + ) + + # subprocess is expecting bytestrings only, so nuke unicode if present + for i in range(len(command)): +@@ -525,17 +525,17 @@ class TaskWarriorShellout(TaskWarriorBase): + except OSError: + # OSError is raised if subprocess.Popen fails to find + # the executable. + return False + + @classmethod + def get_version(cls): + taskwarrior_version = subprocess.Popen( +- ['task', '--version'], ++ ['@@taskwarrior@@/bin/task', '--version'], + stdout=subprocess.PIPE + ).communicate()[0] + return LooseVersion(taskwarrior_version.decode()) + + def sync(self, init=False): + if self.get_version() < LooseVersion('2.3'): + raise UnsupportedVersionException( + "'sync' requires version 2.3 of taskwarrior or later." diff --git a/pkgs/development/python-modules/wxPython/2.8.nix b/pkgs/development/python-modules/wxPython/2.8.nix index 64dd59242c2d..a6fd0100f587 100644 --- a/pkgs/development/python-modules/wxPython/2.8.nix +++ b/pkgs/development/python-modules/wxPython/2.8.nix @@ -17,4 +17,8 @@ if isPyPy then throw "wxPython-${version} not supported for interpreter ${python buildInputs = [ pkgconfig wxGTK (wxGTK.gtk) pythonPackages.python pythonPackages.wrapPython ]; passthru = { inherit wxGTK; }; + + meta = { + platforms = stdenv.lib.platforms.all; + }; } diff --git a/pkgs/development/python-modules/wxPython/3.0.nix b/pkgs/development/python-modules/wxPython/3.0.nix index 4f89dbeb4105..4974daebb2bb 100644 --- a/pkgs/development/python-modules/wxPython/3.0.nix +++ b/pkgs/development/python-modules/wxPython/3.0.nix @@ -22,4 +22,8 @@ if isPyPy then throw "wxPython-${version} not supported for interpreter ${python inherit openglSupport; passthru = { inherit wxGTK openglSupport; }; -} + + meta = { + platforms = stdenv.lib.platforms.all; + }; +} \ No newline at end of file diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix index f7ca5f2ec938..47564a112ee4 100644 --- a/pkgs/development/qtcreator/default.nix +++ b/pkgs/development/qtcreator/default.nix @@ -4,7 +4,7 @@ with stdenv.lib; let baseVersion = "3.2"; - revision = "0"; + revision = "1"; version = "${baseVersion}.${revision}"; in @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.gz"; - sha256 = "0giilb0sl71w2p0vlaj4f9qjyaa4llbflp4m1dfdal30facbwizd"; + sha256 = "0kp7czn9mzncdpq8bx15s3sy13g4xlcdz7y7zy0s9350g4ijs8fx"; }; # This property can be used in a nix development environment to refer to the Qt package diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix index 2f1f26510634..c64d8b249e94 100644 --- a/pkgs/development/r-modules/cran-packages.nix +++ b/pkgs/development/r-modules/cran-packages.nix @@ -1,5896 +1,6117 @@ -/* This file defines the composition for CRAN (R) packages. +# This file is generated from generate-cran-packages.R. DO NOT EDIT. +# Execute the following command to update the file. +# +# Rscript generate-cran-packages.R > cran-packages.nix - It was generated automatically by the following R program: - - | library(data.table) - | library(parallel) - | cl <- makeCluster(10) - | options(repos=structure(c(CRAN="http://cran.rstudio.com/"))) - | - | nixPrefetch <- function(name, version) { - | system(paste0("nix-prefetch-url 2>/dev/null http://cran.rstudio.com/src/contrib/", name, "_", version, ".tar.gz"), intern=TRUE) - | } - | - | formatPackage <- function(name, version, sha256, depends, imports, knownPackages) { - | attr <- gsub(".", "_", name, fixed=TRUE) - | if (is.na(depends)) depends <- ""; - | depends <- unlist(strsplit(depends, split="[ \t\n]*,[ \t\n]*", fixed=FALSE)) - | depends <- c(depends, unlist(strsplit(imports, split="[ \t\n]*,[ \t\n]*", fixed=FALSE))) - | depends <- sapply(depends, gsub, pattern="([^ \t\n(]+).*", replacement="\\1") - | depends <- depends[depends %in% knownPackages] - | depends <- sapply(depends, gsub, pattern=".", replacement="_", fixed=TRUE) - | depends <- paste(depends, collapse=" ") - | paste0(attr, " = derive { name=\"", name, "\"; version=\"", version, "\"; sha256=\"", sha256, "\"; depends=[", depends, "]; };") - | } - | - | clusterExport(cl, c("nixPrefetch")) - | - | pkgs <- as.data.table(available.packages(filters=c("R_version", "OS_type", "CRAN", "duplicates"))) - | pkgs <- subset(pkgs, Repository=="http://cran.rstudio.com/src/contrib") - | pkgs$sha256 <- parApply(cl, pkgs, 1, function(p) nixPrefetch(p[1], p[2])) - | knownPackages <- unique(pkgs$Package) - | - | nix <- apply(pkgs, 1, function(p) formatPackage(p[1], p[2], p[18], p[4], p[5], knownPackages)) - | cat(paste(nix, collapse="\n"), "\n", file="/tmp/r-packages.nix") -*/ - -{ pkgs, overrides }: - -let - - inherit (pkgs) R fetchurl stdenv; - - buildRPackage = import ./generic-builder.nix R; - - derive = { name, version, sha256, depends ? [] }: buildRPackage { - name = "${name}-${version}"; - src = fetchurl { - urls = [ - "mirror://cran/src/contrib/${name}_${version}.tar.gz" - "mirror://cran/src/contrib/Archive/${name}/${name}_${version}.tar.gz" - ]; - inherit sha256; - }; - propagatedBuildInputs = depends; - meta.homepage = "http://cran.r-project.org/web/packages/${name}/"; - meta.hydraPlatforms = R.meta.hydraPlatforms; - }; - -in - -let self = _self // overrides; _self = with self; { - - RcppArmadillo = buildRPackage { - name = "RcppArmadillo-0.4.320.0"; - src = fetchurl { - url = "mirror://cran/src/contrib/RcppArmadillo_0.4.320.0.tar.gz"; - sha256 ="0cicjn63w9awr9cd5wj09s2rsr83j7rn45cnqlflgx5wmh512jwm"; - }; - propagatedBuildInputs = [Rcpp]; - patchPhase = "patchShebangs configure"; - meta.hydraPlatforms = R.meta.hydraPlatforms; - }; - - /* Needed to add one more entry to depends: */ - dplyr = derive { name="dplyr"; version="0.2"; sha256="04kby4n2qvngfdmpqarhizavpy9mr99zpwfxpknqbnbpbya5px1q"; depends=[assertthat Rcpp magrittr Lahman hflights BH]; }; - png = derive { name="png"; version="0.1-7"; sha256="0g2mcp55lvvpx4kd3mn225mpbxqcq73wy5qx8b4lyf04iybgysg2"; depends=[ pkgs.libpng ]; }; - - A3 = derive { name="A3"; version="0.9.2"; sha256="01s7znhph2mr3snpscci3y7nbcisa6kg6hy7im3742r6ah0z3jv7"; depends=[xtable pbapply]; }; - abc = derive { name="abc"; version="2.0"; sha256="0fs6hxyk95c61mn3p642xs3ib9wfjii2v9a74pf488iaywc1kd7d"; depends=[nnet quantreg MASS locfit]; }; - abcdeFBA = derive { name="abcdeFBA"; version="0.4"; sha256="1rxjripy8v6bxi25vdfjnbk24zkmf752qbl73cin6nvnqflwxkx4"; depends=[Rglpk rgl corrplot lattice]; }; - ABCExtremes = derive { name="ABCExtremes"; version="1.0"; sha256="032bc9a6cxy4war95n8v4vaax3q96k2wryjbcipi3z55b2l8hdny"; depends=[SpatialExtremes combinat]; }; - ABCoptim = derive { name="ABCoptim"; version="0.13.11"; sha256="1j2pbfl5g9x71gq9f7vg6wznsds8sn8dj3q2h5fhjcv58di3gjhl"; depends=[]; }; - ABCp2 = derive { name="ABCp2"; version="1.1"; sha256="0s0lbwlc8nycm7b8vx0v01f8dmy91r1zqcj9zgrlj7dnpg4cpkml"; depends=[MASS]; }; - abctools = derive { name="abctools"; version="0.3-2"; sha256="0l5gxrkxiq3ri9iqgy0swc8910c84zkskcr0lc57l3y0dmf90r7q"; depends=[abc abind pls plyr]; }; - abd = derive { name="abd"; version="0.2-6"; sha256="0nlqgjmzpn715kg7pb4zz3rcrf11zd4inj7gam8mr8faf4b5qq2w"; depends=[nlme lattice mosaic]; }; - abf2 = derive { name="abf2"; version="0.7-0"; sha256="0ybl7w8sjfghy8svbxj01q5ldfi05g1r24q9ah1nfca8xzby410n"; depends=[]; }; - abind = derive { name="abind"; version="1.4-0"; sha256="0s7m7wv23z485fc0nb61svcszx0skxl3m8kiilrj506ndazk95hv"; depends=[]; }; - abn = derive { name="abn"; version="0.83"; sha256="12nhk7hb26285pyyppl5289m7y8zvssnriyj84hlnz0ykar66mpi"; depends=[]; }; - abundant = derive { name="abundant"; version="1.0"; sha256="0n2yvq057vq5idi7mynnp15cbsijyyipgbl4p7rqfbbgpk5hy3qb"; depends=[QUIC]; }; - accelerometry = derive { name="accelerometry"; version="2.2.2"; sha256="04gajhx9xha6ks25s9lrn7q4i055bhfx8k7hfrbpwnn3hf5yyfag"; depends=[Rcpp]; }; - AcceptanceSampling = derive { name="AcceptanceSampling"; version="1.0-3"; sha256="1camxmvz8prkvpf3d3rc07bnfphakwdlickqlr4sgzrs4k27rr4f"; depends=[]; }; - ACCLMA = derive { name="ACCLMA"; version="1.0"; sha256="1na27sp18fq12gp6vxgqw1ffsz2yi1d8xvrxbrzx5g1kqxrayy0v"; depends=[]; }; - accrual = derive { name="accrual"; version="1.0"; sha256="0gw418i9nlrm7nkg6d4m2icd4a04a7avqfjj7nidhl6vy4nflg3k"; depends=[fgui SMPracticals]; }; - accrued = derive { name="accrued"; version="1.1"; sha256="1xmrlllh535wdcx6bcwl9hh2ps3ms4rdgal0ziq444rw2phxr48i"; depends=[]; }; - ACD = derive { name="ACD"; version="1.5.3"; sha256="1a67bi3hklq8nlc50r0qnyr4k7m9kpvijy8sqqpm54by5hsysfd6"; depends=[]; }; - Ace = derive { name="Ace"; version="0.0.8"; sha256="0zjg6xwzd2lc555rviaq60rb1fq9vdf8cdazlf3c9m0i1pvz990i"; depends=[]; }; - acepack = derive { name="acepack"; version="1.3-3.3"; sha256="17xfxjflc79y15hnrks3wina5irrggrxb9al9h5q0x1c401ds843"; depends=[]; }; - acer = derive { name="acer"; version="0.1.2"; sha256="17x7281m2wa6a1pcga3xarg3infw5vygr7z068h8pqm30ix34ky4"; depends=[Rcpp]; }; - aCGH_Spline = derive { name="aCGH.Spline"; version="2.2"; sha256="1ll045qgwl1170a4x93vj1xrn197l5ds648qasxlpnsm1a6svwas"; depends=[rJava]; }; - acm4r = derive { name="acm4r"; version="1.0"; sha256="1wqzc35i1rshx0zlmas8y4qkkvy6h9r4i4apscjjv1xg2wjflzxa"; depends=[MASS]; }; - ACNE = derive { name="ACNE"; version="0.7.0"; sha256="137xp69adhggz1wxzm5r95vcphrlrqpxsrz0gny59isx4xr28aal"; depends=[aroma_affymetrix MASS R_methodsS3 R_oo R_utils matrixStats R_filesets]; }; - acopula = derive { name="acopula"; version="0.9.2"; sha256="1z8bs4abbfsdxfpbczdrf1ma84bmh7akwx2ki9070zavrhbf00cf"; depends=[]; }; - acp = derive { name="acp"; version="1.0"; sha256="1i7ryk2scsvck5rg8gglfvqrkzbpn505g7cr7slxykp8wkyhwplm"; depends=[tseries]; }; - aCRM = derive { name="aCRM"; version="0.1.1"; sha256="0kzp568hd9c9a9qgniia5s5gv0q5f89xfvvwpzb197gqhs3x092v"; depends=[dummies randomForest kernelFactory ada]; }; - acs = derive { name="acs"; version="1.2"; sha256="1vw4ghqcz53m3qy7hy2j7nrdinbbqjpwvr1hsvglq31fq7wss3bd"; depends=[stringr plyr XML]; }; - acss = derive { name="acss"; version="0.2-4"; sha256="0lndsmxrnwhqlw32zc89kpx9ajbg7pa51jck2fgwsrjh0j8gxmm0"; depends=[acss_data zoo]; }; - acss_data = derive { name="acss.data"; version="1.0"; sha256="09kl4179ipr8bq19g89xcdi1xxs397zcx5cvgp6viy8gn687ilgv"; depends=[]; }; - ACTCD = derive { name="ACTCD"; version="1.0-0"; sha256="0zn8f6l5vmn4w1lqjnpcxvfbr2fhwbhdjx4144h3bk71bk9raavl"; depends=[R_methodsS3]; }; - Actigraphy = derive { name="Actigraphy"; version="1.2"; sha256="02xxmzjqym46q0fzddmy29i8la9knrna3b46y8849nmbpqvmp3qn"; depends=[fda lattice SDMTools]; }; - actuar = derive { name="actuar"; version="1.1-6"; sha256="0f0zvk4a3rni656jfml2nqb3h3amks3g4aczp8j2x01ywwmazqr9"; depends=[]; }; - ActuDistns = derive { name="ActuDistns"; version="3.0"; sha256="04rff9czcgac80clpv32a1dl0jbyvfsa7wqxyywgk99w672x50i2"; depends=[reliaR actuar hypergeo]; }; - ada = derive { name="ada"; version="2.0-3"; sha256="1c0nj9k628bcl4r8j0rmyp5f1igdjq6qhjxyif6575fvn2gdzmbw"; depends=[rpart]; }; - adabag = derive { name="adabag"; version="3.2"; sha256="1ijr5i5p8sf2cq7cgiwh0qk3c4wxagk6r06a2vrjy76d262m1060"; depends=[rpart mlbench caret]; }; - adagio = derive { name="adagio"; version="0.5.9"; sha256="1yp9w557advb7dzrdqwkffpdmhn6mk4879lrrjd0d6kv89fwz5yr"; depends=[]; }; - AdapEnetClass = derive { name="AdapEnetClass"; version="1.0"; sha256="0m8wg515djdpkq5lv8nkcny9s2iq9ym092jd99nysazqw0qy6a8r"; depends=[imputeYn glmnet lars]; }; - AdaptFit = derive { name="AdaptFit"; version="0.2-2"; sha256="124lj1sq5cbp35z4ybkc7ci3fi6pgf8pc5k9mpqmyb6dj870q836"; depends=[SemiPar MASS nlme cluster]; }; - AdaptFitOS = derive { name="AdaptFitOS"; version="0.54"; sha256="0h9jfq9mk5wd6v6an40l3sk2adn6fcaks22bi8d9s7zr2ldpzrjq"; depends=[SemiPar nlme MASS mgcv]; }; - AdaptiveSparsity = derive { name="AdaptiveSparsity"; version="1.4"; sha256="1az7isvalf3kmdiycrfl6s9k9xqk22k1mc6rh8v0jmcz402qyq8z"; depends=[Rcpp]; }; - adaptivetau = derive { name="adaptivetau"; version="2.1"; sha256="0q8i9gxybv1xyyxvrppr00jmhg80n0iphwlsqjdp34dd0y8ksx4m"; depends=[]; }; - adaptMCMC = derive { name="adaptMCMC"; version="1.1"; sha256="1y1qxn3qm59nyy9ld5x30p452yam7b2fyl236b14xvpm8g3xx1fa"; depends=[coda Matrix]; }; - adaptsmoFMRI = derive { name="adaptsmoFMRI"; version="1.1"; sha256="1h79gh1bd6s2xhwf4whh72wf2cz4di2p8dnlf6192mfg108qc6nw"; depends=[Matrix coda mvtnorm MCMCpack spatstat]; }; - adaptTest = derive { name="adaptTest"; version="1.0"; sha256="08d7a5dlzhaj236jvaw3c91008l66vf5i4k5anhcs32a3j8yh2iv"; depends=[lattice]; }; - additivityTests = derive { name="additivityTests"; version="1.1-2"; sha256="0ijk91whhsb7nm1ax9wpfw9qgxfb1bvg2cq939m81gvk09kzrvgz"; depends=[]; }; - ade4 = derive { name="ade4"; version="1.6-2"; sha256="0h136nhfqrapwscm3c7frlcynrfxb9x8gmd1s44gaa8m25rjgdqf"; depends=[]; }; - ade4TkGUI = derive { name="ade4TkGUI"; version="0.2-6"; sha256="010ggsxcmljh0cdba4lcfnsd9r49pwqs6kbw88syfn2qv65hh5kq"; depends=[ade4]; }; - adegenet = derive { name="adegenet"; version="1.4-2"; sha256="13fglxy40rnwi5hsmmvwlfcvfn8dybxyy3k5qhpml8jgpbl3fsdb"; depends=[ade4 MASS igraph ape shiny ggplot2]; }; - adehabitat = derive { name="adehabitat"; version="1.8.14"; sha256="048jp9408x80akfnxqpyhhlzl2f89axsc90vr8cgqkimlg6h6xjh"; depends=[ade4 tkrplot shapefiles sp]; }; - adehabitatHR = derive { name="adehabitatHR"; version="0.4.11"; sha256="1llpmpfax9846v3s2finyq9x97hyi87148jx83phzjl7daag3qn1"; depends=[sp deldir ade4 adehabitatMA adehabitatLT]; }; - adehabitatHS = derive { name="adehabitatHS"; version="0.3.9"; sha256="0jv7470z1m219q5paw8cglx3d5l99iagkpm24v6q0xgdffvcq94l"; depends=[sp ade4 adehabitatMA adehabitatHR]; }; - adehabitatLT = derive { name="adehabitatLT"; version="0.3.16"; sha256="1rav2q1n1ahrj2iik93rqc52c1gcxha5idrh7rfds0qb15jpmsvh"; depends=[sp ade4 adehabitatMA CircStats]; }; - adehabitatMA = derive { name="adehabitatMA"; version="0.3.8"; sha256="1j3ngry7qyhl4p5m02bgdynixb0v9hd5nbjs6ndfqw23layh8yig"; depends=[sp]; }; - adephylo = derive { name="adephylo"; version="1.1-6"; sha256="1sk639gmk3cs711xn68mx18r28kjd1pychcg89qlki03y1hnxg7j"; depends=[ade4 phylobase ape adegenet]; }; - AdequacyModel = derive { name="AdequacyModel"; version="1.0.8"; sha256="1bpb6lwgkh5g82h4yaf5dh2jbl6f0vz36k22538rhb3kdld6w0i3"; depends=[]; }; - ADGofTest = derive { name="ADGofTest"; version="0.3"; sha256="0ik817qzqp6kfbckjp1z7srlma0w6z2zcwykh0jdiv7nahwk3ncw"; depends=[]; }; - adhoc = derive { name="adhoc"; version="1.0"; sha256="193adddarjkc2kk1xncfkm919s1lkmc1yzgyz9793p74nqmfsj0a"; depends=[spider ape polynom]; }; - adimpro = derive { name="adimpro"; version="0.7.8"; sha256="06zwdgl7g4azg2mn7p35may8hsjcvf2dz7dj86zqngjspda123s4"; depends=[]; }; - adlift = derive { name="adlift"; version="1.3-2"; sha256="0nzg16vhm5qg3xzczi3f6cynvp9ym2jsfrc4fdyxq7bwp9kry2i4"; depends=[EbayesThresh]; }; - ADM3 = derive { name="ADM3"; version="1.3"; sha256="1hg9wjdhckilqd13dr4cim4j6jsh2sdwm18i3pfmfdj8cyswm3h0"; depends=[]; }; - AdMit = derive { name="AdMit"; version="2.0.1"; sha256="0bqzq2pf5449qyr8ff5d3sq0lbsph29ppv6zzf1rbjz06sc5d6ff"; depends=[mvtnorm]; }; - ads = derive { name="ads"; version="1.5-2.1"; sha256="1jwgk48qypg36v53kj7wy5rcz059p1qg8awm3nf7xngrb2zff6h3"; depends=[ade4 spatstat]; }; - aemo = derive { name="aemo"; version="0.1.0"; sha256="1iik0rrqkkx9n1qb1pvq5iwxqmvs6vnx8z80hdzb5vqq0lvi1bsx"; depends=[dplyr stringr assertthat lubridate]; }; - AER = derive { name="AER"; version="1.2-2"; sha256="0ny9khzqxzx4npaqmknhpi3aldz11ipg71zw4skxphclamlsgp86"; depends=[car lmtest sandwich survival zoo Formula]; }; - afex = derive { name="afex"; version="0.10-113"; sha256="19fr444dy50d6psfc84qqkc04fp792jb7nxrv5b29q8j1yznkqnq"; depends=[car lme4 pbkrtest reshape2 stringr coin Matrix]; }; - AFLPsim = derive { name="AFLPsim"; version="0.3-3"; sha256="1vknmd98v65118c093gqpfckcggnk4c8rn6bblsaclwmx0jdi78s"; depends=[adegenet introgress]; }; - aftgee = derive { name="aftgee"; version="0.4-3"; sha256="0r1fq3n28hfkdih6a2nyz5vy832fsxxs0fr2zlml6cikpbay8zqx"; depends=[MASS BB survival geepack]; }; - AGD = derive { name="AGD"; version="0.30"; sha256="175hsii3g8vx5ms552wnh1hcn3p6hgfggv1zi5gpwlsc0i875iag"; depends=[gamlss]; }; - agop = derive { name="agop"; version="0.1-3"; sha256="02yc7n8avg69750cnc1prvp2fnz964sfc7vggxfyyqrig9q5ppyq"; depends=[Matrix igraph]; }; - agRee = derive { name="agRee"; version="0.3-1"; sha256="1gqbhv44z1r9m54fmrg0frnzsgsp13v5ppmzpv28frz9d8x7sxx6"; depends=[miscF lme4 R2jags]; }; - Agreement = derive { name="Agreement"; version="0.8-1"; sha256="1g29rxr8xsr0dh2r6c6j2bqs0q6snz9wz0hrnb92cxj27ili55yq"; depends=[R2HTML]; }; - agricolae = derive { name="agricolae"; version="1.2-0"; sha256="1r9x6skkim25qp50xzg3jmv8hibpnr5kig4dqaycc6xki49pps50"; depends=[]; }; - agridat = derive { name="agridat"; version="1.9"; sha256="0ip8ln0hxx2ax21hhrxnksvkzw6mfwhvxfgj7xph5insly3x9h88"; depends=[lattice reshape2]; }; - agrmt = derive { name="agrmt"; version="1.31"; sha256="0s0av1fg9aswkyj1vzr6fng53r5cnkfb3x0n46zrkb1fgb5fwdgm"; depends=[]; }; - AGSDest = derive { name="AGSDest"; version="2.1"; sha256="1l36x3sjb0732aic2y4yrvx64phii1xjfzr4nc3x9b2crr988n0g"; depends=[ldbounds]; }; - 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]; }; - AICcmodavg = derive { name="AICcmodavg"; version="2.00"; sha256="1k156yziqd376mkcyz94c76a3rpmf8afgxdy9rn3dgalxfkb0rx6"; depends=[]; }; - AID = derive { name="AID"; version="1.4"; sha256="1wj2jmqla0b2y9hrvl5i69bncdx1xjdd7if69j6dy1dnxv6clx1z"; depends=[MASS tseries nortest]; }; - aidar = derive { name="aidar"; version="1.0.0"; sha256="01vs14bz4k504q5lx65b60kyi7hgvjdmib8igiipjmg4snwh8hdk"; depends=[XML]; }; - AIM = derive { name="AIM"; version="1.01"; sha256="11lkfilxk265a7jkc1wq5xlgxa56xhg302f1q9xb7gmjnzdigb21"; depends=[survival survival]; }; - 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="2011.9-1"; sha256="05c1a8707akwy39n2gjg3ahdp9xdkl18a32wdchw60f0h4ixqfdi"; depends=[numDeriv]; }; - ALDqr = derive { name="ALDqr"; version="0.5"; sha256="0294d6cjfl5m63jhrv4rbh7npwrbmmw5101jz5bbwihhj94qcxp9"; depends=[HyperbolicDist]; }; - aLFQ = derive { name="aLFQ"; version="1.3.1"; sha256="0i351xa5x3sn0li5qway0wjhifvf9jfjb7hxk5vw13gzn0cq9sd5"; depends=[data_table plyr caret seqinr]; }; - AlgDesign = derive { name="AlgDesign"; version="1.1-7.2"; sha256="1c0hxg02dzjnns6awwsfaa5sc00x4zkc5jmsdz5vssjkliviwm9k"; depends=[]; }; - ALKr = derive { name="ALKr"; version="0.5.3.1"; sha256="09df3vx2q0sn8fwz2cc9lckzwrf2hgbglzyn376d6nkrm6gq792a"; depends=[MASS Rcpp]; }; - allan = derive { name="allan"; version="1.01"; sha256="02bv9d5ywbq67achfjifb3i7iiaaxa8r9x3qvpri2jl1cxnlf27m"; depends=[biglm]; }; - allanvar = derive { name="allanvar"; version="1.0"; sha256="0wpywdr15gb49m9kxrpjfsxlxrm4hwm46x42k8dgc6sihfsqbm22"; depends=[gplots]; }; - alleHap = derive { name="alleHap"; version="0.7.2"; sha256="1x10grrv732a0iidr2c96vbl46553njhvvlq249jxn3y11lfq2gv"; depends=[gtools]; }; - allelematch = derive { name="allelematch"; version="2.03"; sha256="1dmalyljsmf7njr6fj8bcjii13swvh89dj3r1mp2xxf1r0p6jry8"; depends=[dynamicTreeCut]; }; - AlleleRetain = derive { name="AlleleRetain"; version="1.3.1"; sha256="1k2iwns1wk5n02cii6p9prgdb6asys3vwiq5dq2i26fk2xr6j4gq"; depends=[]; }; - allelic = derive { name="allelic"; version="0.1"; sha256="0xs4kd3vqb5ph8kqc3lcqgirrdkz8b627pvnczvci2g0sr3cl18j"; depends=[]; }; - AllPossibleSpellings = derive { name="AllPossibleSpellings"; version="1.1"; sha256="0ksfm2pfjka3yjgcd257v7sns1niaylsfxvhhh2jwdi016cpdw10"; depends=[]; }; - alm = derive { name="alm"; version="0.1.9"; sha256="13i5f9b8bz6chdczlwfd3ka3mvn3i87jgpr2b6df03yc1vd9z25v"; depends=[ggplot2 RCurl plyr stringr reshape reshape2 httr RJSONIO lubridate]; }; - alphahull = derive { name="alphahull"; version="1.0"; sha256="0k3n9l4vbvpmdb4m37y1ynsiv27l8b5fmm6l35sazlfbbinhzwc1"; depends=[tripack sgeostat splancs]; }; - alphashape3d = derive { name="alphashape3d"; version="1.1"; sha256="1hfxvzqgirc587vxyggxdqii90nvypzi3wddvd2zdw2h95v9kfyg"; depends=[geometry rgl]; }; - alr3 = derive { name="alr3"; version="2.0.5"; sha256="0zrrsv2kjq3cky3bhk6gp32p1qpr1i5k2lx7c1w08bql0nb1x740"; depends=[car]; }; - alr4 = derive { name="alr4"; version="1.0.3"; sha256="1m73b626fljfs96wvv1v627v48qilq5dyi5clqn8b4a5lyjjs2mg"; depends=[car effects]; }; - ALS = derive { name="ALS"; version="0.0.5"; sha256="1ryviknpf7c0v20bmc40khhmx51b83hbh9q9iwz9d694by51xryc"; depends=[nnls Iso]; }; - ALSCPC = derive { name="ALSCPC"; version="1.0"; sha256="0ippxzq5qwb9dnpvm1kxhc0fxh83rs9ny5rcvd30w2bp632q9qdx"; depends=[]; }; - amap = derive { name="amap"; version="0.8-12"; sha256="0z7c5lrwqvjcnjm48zq2ifyx089fabvwf1zz17qlxq44i8xzpx8j"; depends=[]; }; - AMAP_Seq = derive { name="AMAP.Seq"; version="1.0"; sha256="0z0rrzps6rm58k4m1ybg77s3w05m5zfya4x8ril78ksxsjwi3636"; depends=[]; }; - amei = derive { name="amei"; version="1.0-7"; sha256="0dyx6a1y5i0abwka0y89d0mpj55rm5ywb4r9c2mqmy43djp181hn"; depends=[]; }; - Amelia = derive { name="Amelia"; version="1.7.2"; sha256="1zmaqnjqam8f4spdgy9gfvd5r0a48amvlsqdpdq9zwn7sq7702jj"; depends=[foreign Rcpp RcppArmadillo]; }; - amen = derive { name="amen"; version="0.999"; sha256="1p9ma31bzrxylcgi43nk44bq0cg4xgk9fzmxw2dpqz33x4xlrfiq"; depends=[]; }; - AmericanCallOpt = derive { name="AmericanCallOpt"; version="0.95"; sha256="1nhy44j5bmmjsp6g79nrn741rzzxikhdnxk4wwbdj9igcc1bs573"; depends=[]; }; - AMGET = derive { name="AMGET"; version="1.0"; sha256="18wdzzg5wr7akbd1iasa4mvmy44fb2n5gpghwcrx80knnicy3dxq"; depends=[]; }; - aml = derive { name="aml"; version="0.1-1"; sha256="09xxlxp784wlb561apns3j8f2h9pfk497cy5pk8wr4hhqqv4d3al"; depends=[lars]; }; - AMOEBA = derive { name="AMOEBA"; version="1.0"; sha256="0iaznr19hdi40mkj82ai4r83b8whvvzmbiba0kwkp2g8g38a5brk"; depends=[snowfall rlecuyer spdep]; }; - AMORE = derive { name="AMORE"; version="0.2-15"; sha256="00zfqcsah2353mrhqkv8bbh24l8gaxk4y78icr9kxy4pqb2988yz"; depends=[]; }; - AmpliconDuo = derive { name="AmpliconDuo"; version="1.0"; sha256="0l6p5c2802a1f3b77cdrrk3wdf41926mh34630p462fb3wqipps0"; depends=[ggplot2 xtable]; }; - anacor = derive { name="anacor"; version="1.0-4"; sha256="13f5cnna7vdimv4mxmjj21alxjzi1rk0hksajfy2m0b3yn2vl612"; depends=[rgl scatterplot3d fda colorspace car]; }; - anaglyph = derive { name="anaglyph"; version="0.1-1"; sha256="1a9c7rl7r2sgl230mcwqnmxjqba8skycdhi09i834qaw2h9qd4k5"; depends=[]; }; - analogue = derive { name="analogue"; version="0.12-0"; sha256="16bdrvhk4ivq43lfl7pncrwzjdsvwqj8d3j2krskmpdh9qc3sq65"; depends=[vegan lattice rgl mgcv MASS brglm princurve]; }; - AnalyzeFMRI = derive { name="AnalyzeFMRI"; version="1.1-16"; sha256="1mbjb682ns5230jd3vcvd6x4gnn9hpbmjd7r8120y4sp2g733b0f"; depends=[R_matlab fastICA]; }; - anametrix = derive { name="anametrix"; version="1.6"; sha256="14xrrnvz7jn1jqds48l5pvzlx6hsaxrjc932lqnvv70sfypinjkm"; depends=[RCurl XML pastecs]; }; - anapuce = derive { name="anapuce"; version="2.2"; sha256="0qs27as628090k3sq5b14l90g7qdp23d0jz5lb1wxsgi3ji0f7qj"; depends=[]; }; - AncestryMapper = derive { name="AncestryMapper"; version="1.1"; sha256="0nc9iacdgmdda9d9ga9mn0dvmv8d1571sblifqdrz35p5yl7fr0g"; depends=[]; }; - anchors = derive { name="anchors"; version="3.0-8"; sha256="12gd2526y7s2a8i6b9xma2c3sc6zxnwzl6sn8b50hbxizwr8d34j"; depends=[rgenoud MASS]; }; - AnDE = derive { name="AnDE"; version="1.0"; sha256="1yil8ab50wvlqmdla9kmfba8vfgy5r694r6igb58s6vnmld78yf2"; depends=[discretization functional foreign stringr]; }; - andrews = derive { name="andrews"; version="1.0"; sha256="130i86qkdy1xpcf611jpzqgmd17iik7j7spdcfwzk48f31biyp8v"; depends=[]; }; - anesrake = derive { name="anesrake"; version="0.70"; sha256="17127rmjfrdwnr2m6205cci3b0kd9girp82qranxwac4mgb7p7ld"; depends=[Hmisc]; }; - Animal = derive { name="Animal"; version="1.04"; sha256="0hahvq1x81s0qmr58jv6q96jnc8lzn4ycljd8adhpgsx3wn8s7mq"; depends=[]; }; - animalTrack = derive { name="animalTrack"; version="1.0.0"; sha256="0jlvfflpaq64s48sblzh1n1vx8g3870iss97whigri29s6hn79ry"; depends=[rgl]; }; - animation = derive { name="animation"; version="2.3"; sha256="1hqgkaxmyyfrx7cfzv00010r9l2n8gxm35jd41p3kc208mhd7ssp"; depends=[]; }; - AnnotLists = derive { name="AnnotLists"; version="1.2"; sha256="1g2khb2ggniwg2zcjamsm3bxyrl2zabvk540b5vyy9am9k83m1g9"; depends=[]; }; - anoint = derive { name="anoint"; version="1.3"; sha256="0hwvwd6ghxhkfymf124igski8l98k29pj3ahi5mflm8gv0qan92g"; depends=[survival glmnet MASS]; }; - anominate = derive { name="anominate"; version="0.4"; sha256="00cqwlka33aqr3jks1fsxizwdlrfmv5w5bpnkzknhgz70l60h38n"; depends=[wnominate oc pscl MCMCpack]; }; - AnthropMMD = derive { name="AnthropMMD"; version="0.9.9"; sha256="10wn0fkcli5yz3fhngsz8sg1mfllqkvjrpjggd9qynay2zrpiw1n"; depends=[tcltk2]; }; - Anthropometry = derive { name="Anthropometry"; version="1.0"; sha256="1cvq06hyxcgg95n21bi22csdgc6l6av78bvz7r7qdsl7wffddk0w"; depends=[shapes rgl archetypes nnls depth FNN ICGE cluster]; }; - antitrust = derive { name="antitrust"; version="0.94"; sha256="1k768lmx5vv069bd9fzly1205rxr9mkqi1p8jjx67kwmyhhw5sd2"; depends=[MASS evd BB numDeriv ggplot2]; }; - AntWeb = derive { name="AntWeb"; version="0.6.1"; sha256="1m4r7zx6mmxwdf1ldwmqad2lzc9kw150l0b3z2994nvcx36r4cj4"; depends=[rjson plyr assertthat httr leafletR]; }; - aod = derive { name="aod"; version="1.3"; sha256="1a6xs5d5289w69xd2salsxwikjjhjzvsnplqrq78b1sr6kzfyxz3"; depends=[]; }; - aods3 = derive { name="aods3"; version="0.4-1"; sha256="074c16wmgd1vc2yvwx1y84bg55hvmm5yi8zgpwh51jcsbqlhbpgn"; depends=[lme4 boot]; }; - AOfamilies = derive { name="AOfamilies"; version="1.01"; sha256="0v3b83k12lsrdcrkjl2ff38d0g8sbrnm5pmm9xphyrk3lfgap76k"; depends=[lqmm quantreg]; }; - aoristic = derive { name="aoristic"; version="0.5"; sha256="0hvq6qf5ib7x7c7jg9qbsglhazvbr5rkhfi1r43h4i2fhdvymhrn"; depends=[ggplot2 spatstat GISTools lubridate classInt reshape2 rgdal plotKML]; }; - apcluster = derive { name="apcluster"; version="1.3.5"; sha256="1hckvir43s0jshn9kiwqmpsnav04lxv060l6xlf60a8yk5zf1cqs"; depends=[Rcpp]; }; - ape = derive { name="ape"; version="3.1-4"; sha256="04vkzbqjy89vs2n421ji2r4p60x5frjnlgpjp42k9n5x295hb89s"; depends=[nlme lattice]; }; - aplpack = derive { name="aplpack"; version="1.2.9"; sha256="024q0vsimhr3cj4fz2x10hf7mm89psn8f04j013qas7wdsixkswk"; depends=[]; }; - apmsWAPP = derive { name="apmsWAPP"; version="1.0"; sha256="1azgif06dsbadwlvv9nqs8vwixp6balrrbpj62khzmv1jvqr4072"; depends=[seqinr gtools]; }; - appell = derive { name="appell"; version="0.0-4"; sha256="0g7pzhxqgscnyf07xycbrpyimp1z1hljgcr3nqigpx09w7zi5wlw"; depends=[]; }; - apple = derive { name="apple"; version="0.3"; sha256="194z2f6hwdjjxdkjwlmfhpfp26p9yp3gparklhdbb6zlb4a9nnhz"; depends=[MASS]; }; - AppliedPredictiveModeling = derive { name="AppliedPredictiveModeling"; version="1.1-6"; sha256="004d2k3mhl45inb7kx1ph8xc8h9bgm7f7l3prmvqrl5792400cn4"; depends=[CORElearn MASS plyr reshape2]; }; - approximator = derive { name="approximator"; version="1.2-6"; sha256="165qvx5946wkv1qsgbmjhmwvik7m23r1vbpnp7claylflgj1ycnm"; depends=[emulator]; }; - aprof = derive { name="aprof"; version="0.2.1"; sha256="0lsni1p9gpfgsbqs1lrp4bs6ckvp02hny0k1v6q6rj2zp6silwa2"; depends=[]; }; - APSIMBatch = derive { name="APSIMBatch"; version="0.1.0.2374"; sha256="0j44ijq1v1k60lka9nmw8m1jfjw7pidny9bvswqy5v82gzmwl29d"; depends=[]; }; - apsimr = derive { name="apsimr"; version="0.1"; sha256="03j1g16drch5xkxb86czxmihs9a96f0v2kxjp73k7vig9md625dy"; depends=[ggplot2 XML lubridate reshape2]; }; - apsrtable = derive { name="apsrtable"; version="0.8-8"; sha256="1qmm89npjgqij0bh6p393wywl837lfsshp2mv9b5izh1sg2qfwvw"; depends=[]; }; - apt = derive { name="apt"; version="2.2"; sha256="0y4wv8pxi1n98ji0yy1jy0lhdwjb2b95h10mpj4vqf24dlx61z10"; depends=[erer gWidgets car urca copula]; }; - apTreeshape = derive { name="apTreeshape"; version="1.4-5"; sha256="0mvnjchhfbpbnrgnplb6qxa7r2kkvw29gqiprwggkf553wi6zl48"; depends=[ape quantreg]; }; - aqfig = derive { name="aqfig"; version="0.8"; sha256="0ha0jb5ag3zx6v7c63lsm81snslzb8y8g565mxjmf7vxpcmzzqsi"; depends=[geoR]; }; - aqp = derive { name="aqp"; version="1.7"; sha256="034lxhssn98rkcvwyycqcpppabm4xi89kr19d8ydj74dfgbhyx1z"; depends=[plyr reshape lattice cluster sp Hmisc stringr scales plotrix RColorBrewer]; }; - aqr = derive { name="aqr"; version="0.4"; sha256="04frgil3nbxsww66r9x0c6f308pzqr1970prp20bdv9qm3ym5axw"; depends=[xts RCurl]; }; - AquaEnv = derive { name="AquaEnv"; version="1.0-3"; sha256="1hkygw09w70im9f6l6q5yxk86mdl5pkczqfqrwc4wl1yhz7z1gjb"; depends=[minpack_lm deSolve]; }; - AR1seg = derive { name="AR1seg"; version="1.0"; sha256="0v9adx5wj9r4jwl3bqqmj0byiqfp585jz013qfqrq601wj8v4zi3"; depends=[Segmentor3IsBack]; }; - ARAMIS = derive { name="ARAMIS"; version="1.0.1"; sha256="12bsn5lpb9cv0py1ymbqhbnjrpisf09yixpnqbazsmrz7lrin079"; depends=[MASS LearnBayes]; }; - archdata = derive { name="archdata"; version="0.1"; sha256="1k7cpqwgvkwfz25a9db0c8g6ii6xsbhkj3c9alghhaafs7x8n47w"; depends=[]; }; - archetypes = derive { name="archetypes"; version="2.2-0"; sha256="1djzlnl1pjb0ndgpfj905kf9kpgf9yizrcvh4i1p6f043qiy0axf"; depends=[modeltools nnls]; }; - ArDec = derive { name="ArDec"; version="2.0"; sha256="14niggcq7xlvpdhxhy8j870gb11cpk4rwn9gwsfmcfvh49g58i80"; depends=[]; }; - arf3DS4 = derive { name="arf3DS4"; version="2.5-10"; sha256="12cbrk57c9m7fj1x7nfmcj1vp28wj0wymsjdz8ylxhm3jblbgmxc"; depends=[corpcor]; }; - arfima = derive { name="arfima"; version="1.2-6"; sha256="1xdcvfaaza3bn5p5yhafqh67018z260aqp9gwwnw1nrrmz7fsh2h"; depends=[ltsa]; }; - argosfilter = derive { name="argosfilter"; version="0.63"; sha256="0rrc2f28hla0azw90a5gk3zj72vxhm1b6yy8ani7r78yyfhgm9ig"; depends=[]; }; - argparse = derive { name="argparse"; version="1.0.1"; sha256="03p8dpwc26xz01lfbnmckcx6wzky43dyq71085b0anzsavgx0786"; depends=[proto findpython getopt rjson]; }; - argparser = derive { name="argparser"; version="0.1"; sha256="0x4wm8hjzb779pp39v8q210npg7kzh9m8wwqmd17aaqaa3l2al9f"; depends=[]; }; - arm = derive { name="arm"; version="1.7-05"; sha256="1cpgbhp7pz1m9r40ia08hi2mdl87ar9m1h72cldvajq0imlckcrl"; depends=[MASS Matrix lme4 abind coda nlme]; }; - arnie = derive { name="arnie"; version="0.1.2"; sha256="14xkgyfn9zvkbgram15w7qzqc5pl1a8ig66cif7a79najrgd914r"; depends=[]; }; - aroma_affymetrix = derive { name="aroma.affymetrix"; version="2.12.0"; sha256="1r3ywi97xqvk6dif7kkc3gqapiydd2sbq0ibxs1qf6s2v236d71r"; depends=[R_utils aroma_core R_methodsS3 R_oo R_cache R_filesets aroma_apd MASS matrixStats]; }; - aroma_apd = derive { name="aroma.apd"; version="0.5.0"; sha256="1pi4k7psrc120r8mn352vg60mjvbnm1f56dm9svfxfyl0qhcfd00"; depends=[R_methodsS3 R_oo R_utils R_huge]; }; - aroma_cn = derive { name="aroma.cn"; version="1.5.0"; sha256="1aih11r3gs969ci5gs7x7z5pia51y75iy559y23cz40q2qsq4ikc"; depends=[R_utils aroma_core R_methodsS3 R_oo R_filesets R_cache matrixStats PSCBS]; }; - aroma_core = derive { name="aroma.core"; version="2.12.1"; sha256="1rg7m9z2j9hn0adj407amyabyh6jhpgip51zd8fb8rplzgbkrm7s"; depends=[R_utils R_filesets R_devices R_methodsS3 R_oo R_cache R_rsp matrixStats RColorBrewer PSCBS]; }; - ARPobservation = derive { name="ARPobservation"; version="1.0"; sha256="0m9sr0pgwzndia2286fmhlw7xsyn3pvy0044xlp5sw3i3gqhv39f"; depends=[]; }; - aRpsDCA = derive { name="aRpsDCA"; version="1.0.0"; sha256="035888scbl5333sz25f9n6xh1zis7l2752p4nhsbs2g44q38l9h6"; depends=[]; }; - ArrayBin = derive { name="ArrayBin"; version="0.2"; sha256="0jlhcv2d7pmqi32w71nz063ri1yj4i4isr3msnw7ckzvi9r42jwm"; depends=[]; }; - arrayhelpers = derive { name="arrayhelpers"; version="0.76-20120816"; sha256="1q80dykcbqbcigv2f9xg1brfm3835i0zvs0810q6kh682a3hpqbi"; depends=[]; }; - ars = derive { name="ars"; version="0.4"; sha256="0ynciw8n2jpqi40gsrj189419vgr1lgs9wridh09nj7n451b4kvg"; depends=[]; }; - ARTIVA = derive { name="ARTIVA"; version="1.2.2"; sha256="1k51yfh2xxchbiq9b64llc3sp330kh30lai75fgnbycwynkpsk5m"; depends=[MASS igraph gplots]; }; - ARTP = derive { name="ARTP"; version="2.0.4"; sha256="1f6ay9lyaqsc33b0larb8v6imp5adaycya84wif2sg32rv4gx3yl"; depends=[]; }; - arules = derive { name="arules"; version="1.1-4"; sha256="0i2s706rm6bbzqxb0vfqq14m9zr4djyjjkvsqgrqbsvwgp8i29zk"; depends=[Matrix]; }; - arulesNBMiner = derive { name="arulesNBMiner"; version="0.1-4"; sha256="05vj7pzzh84xr6d0m16dhzr7bw50hkiyq99vl46zinak648my338"; depends=[arules rJava]; }; - arulesSequences = derive { name="arulesSequences"; version="0.2-6"; sha256="1fvph6c8dy3hj0h63h85bzzzka8dx0cc0lcncz9svyahy1j4q3z0"; depends=[arules]; }; - arulesViz = derive { name="arulesViz"; version="0.1-9"; sha256="1s1hsf64fg32r3p1h8bvzbpr7a28szdh9hs7ck9qykh2s93xh12z"; depends=[arules scatterplot3d vcd seriation igraph]; }; - asbio = derive { name="asbio"; version="1.0-5"; sha256="1wvg8j9hlla9z9di4qinmkn9d8wmindiqxa3jgdqx6srlwdx1b09"; depends=[scatterplot3d pixmap tkrplot plotrix mvtnorm deSolve lattice]; }; - ascii = derive { name="ascii"; version="2.1"; sha256="19dfbp7k4bjxjn8wdzhbmz7g3za6gn8vcnd5qkm4dz7gg1fg7b8p"; depends=[]; }; - ascrda = derive { name="ascrda"; version="1.15"; sha256="17anzlhcjmrk13s5gs752rsc735y5wvba6r3w1nbv0cnkpnyk8i7"; depends=[class nnet rda MASS sfsmisc e1071 pamr]; }; - asd = derive { name="asd"; version="2.0"; sha256="1nnsbh6g0bhvhp6644zf2l6frr3qnls0s7y7r0g211b5zagq20z3"; depends=[mvtnorm]; }; - ash = derive { name="ash"; version="1.0-14"; sha256="15x16ld25i160asqf4z4difa6zn2yfgl04j8y8nqb0djymdx7a1f"; depends=[]; }; - aspace = derive { name="aspace"; version="3.2"; sha256="1g51mrzb6amafky2kg2mx63g6n327f505ndhna6s488xlsr1sl49"; depends=[splancs Hmisc shapefiles]; }; - aspect = derive { name="aspect"; version="1.0-2"; sha256="1p06vglsj2z0qal3sacjfm6cr9vb3jidk1c1rsmwy4cfv7dzh58n"; depends=[]; }; - assertive = derive { name="assertive"; version="0.1-8"; sha256="0j1phpx2w34rdjaar3fqhp0rsvdlidvw2irfazbh9955mdn2cwq1"; depends=[]; }; - assertthat = derive { name="assertthat"; version="0.1"; sha256="0dwsqajyglfscqilj843qfqn1ndbqpswa7b4l1d633qjk9d68qqk"; depends=[]; }; - AssetPricing = derive { name="AssetPricing"; version="1.0-0"; sha256="12v8hmmknkp472x406zgzwjp7x8sc90byc3s3dvmwd5qhryxkkix"; depends=[polynom deSolve]; }; - AssotesteR = derive { name="AssotesteR"; version="0.1-10"; sha256="0aysilg79vprcyjirqz6c5s1ry1ia92xik3l38qrw1gf3vfli9cw"; depends=[mvtnorm]; }; - aster = derive { name="aster"; version="0.8-30"; sha256="0vdlimkkmd9ar5v3xrbi9gshvj980l7641brd7cqs78sqf0v71fn"; depends=[trust]; }; - aster2 = derive { name="aster2"; version="0.1"; sha256="1qbh1l2cnhvdfxaw1bv8cpj96nv03g155b1xh1vdigniwc04mssw"; depends=[]; }; - astro = derive { name="astro"; version="1.1"; sha256="15xxa3ynlgk6dhlb1z9lwvf9jqvfw9ghkl7rjbdcrvc52b92nwd3"; depends=[MASS plotrix]; }; - astrochron = derive { name="astrochron"; version="0.3.1"; sha256="0anm8k31kgvbdkzid2f9mg7ivdrihwb6g1i82jqpljbwvmkp0fmw"; depends=[baseline multitaper fields]; }; - astroFns = derive { name="astroFns"; version="4.1-0"; sha256="0g5q0y067xf1ah91b4lg8mr9imj0d6lgig7gbj3b69fn335k363g"; depends=[]; }; - astrolibR = derive { name="astrolibR"; version="0.1"; sha256="0gkgry5aiz29grp9vdq9zgg6ss47ql08nwcmz1pfvd0g0h9h75l8"; depends=[]; }; - astsa = derive { name="astsa"; version="1.2"; sha256="13nlk5m5j9rygjih2hd3nj5iyncm1cx4smcj9zpr6nrsc79brwzj"; depends=[]; }; - asympTest = derive { name="asympTest"; version="0.1.3"; sha256="11nlkgws3y8xbz3yli55414a2rkk7367q9q5r2ssa61jaiimibhh"; depends=[]; }; - asypow = derive { name="asypow"; version="2013.9-1"; sha256="0zd42ha30kysjhd6rwxr91k1hhsimw3py2inymbpxgyq4s890whs"; depends=[]; }; - AtelieR = derive { name="AtelieR"; version="0.24"; sha256="0yialpmbsbx70gvps4r58xg9wvqcril8j8yd61lkkmz4b3195zai"; depends=[proto cairoDevice gWidgetsRGtk2 partitions]; }; - ATmet = derive { name="ATmet"; version="1.2"; sha256="047ibxxf5si45zw22zy8a1kpj36q0pd3bsmxwvn0dhf4h65ah0zz"; depends=[DiceDesign lhs metRology msm sensitivity]; }; - AtmRay = derive { name="AtmRay"; version="1.31"; sha256="162078jd032i72sgaar9hqcnn1lh60ajcqpsz4l5ysxfkghcxlh8"; depends=[]; }; - attfad = derive { name="attfad"; version="1.1"; sha256="10vdb60i8iigslcd0f3ipkf7m3d7h8zhq9x0n7yilc1xpd79r3ha"; depends=[]; }; - AUC = derive { name="AUC"; version="0.3.0"; sha256="0ripcib2qz0m7rgr1kiz68nx8f6p408l1ww7j78ljqik7p3g41g7"; depends=[]; }; - AUCRF = derive { name="AUCRF"; version="1.1"; sha256="00d7jcg2dyvf7sc9w7vxxd85m7nsbcmfqsavrv236vxfpfc9yn7i"; depends=[randomForest]; }; - audio = derive { name="audio"; version="0.1-5"; sha256="1hv4052n2r6jkzkilhkfsk4dj1xhbgk4bhba2ca9nf8ag92jkqml"; depends=[]; }; - audiolyzR = derive { name="audiolyzR"; version="0.4-9"; sha256="09jsrjy15vcn6da0kgk06ghayyrf3s853gqv8qdawg745ky2hbgi"; depends=[hexbin RJSONIO plotrix]; }; - audit = derive { name="audit"; version="0.1-1"; sha256="0hrcdcwda5c0snskrychiyfjcbnymkcl2x43bapb6inw9y8989qv"; depends=[]; }; - autoencoder = derive { name="autoencoder"; version="1.0"; sha256="18i6b2vjhlq9f82syw3k88gm9bvklv827nflgzq0xzjnzh6z5nr8"; depends=[]; }; - automap = derive { name="automap"; version="1.0-14"; sha256="1190kbmp0x80x0hyifdbblb4ijq79kvrfn9rkp5k6diig4v30n0w"; depends=[sp gstat lattice reshape]; }; - autopls = derive { name="autopls"; version="1.2-7"; sha256="173i1g11waz72myclfdch9v3wsvdr9mdz2gxdqifq9wj50s4zrg4"; depends=[pls]; }; - AutoSEARCH = derive { name="AutoSEARCH"; version="1.2"; sha256="1zl5zd96249y2zfpidpl9n3zwcp74kvcxn4s10v0lypvr19cr3hn"; depends=[zoo]; }; - avgrankoverlap = derive { name="avgrankoverlap"; version="1.0"; sha256="1wyafcygwdk754wp25283nd84lnn9qxha41xij55ylrn4nvg57l1"; depends=[]; }; - aws = derive { name="aws"; version="1.9-4"; sha256="11vbsg4yhnl4995m8gq5gykrlk61y3a618g2zxkc9wdf5z4xqdny"; depends=[awsMethods gsl]; }; - awsMethods = derive { name="awsMethods"; version="1.0-3"; sha256="1r6rbrlc5wbljp2x9aqhhnjblnb3gjm217x0cbmrw1pa0cf7q5jq"; depends=[]; }; - AWS_tools = derive { name="AWS.tools"; version="0.0.5"; sha256="0z0mh8pdrqvsg49dbhds8aj0lmxmvhfi05im0gg01vdidxpmabyn"; depends=[XML]; }; - aylmer = derive { name="aylmer"; version="1.0-11"; sha256="1b6dryvfz9yp00nj8lv8j1isnshcgwn9fx41knah9pw7dn4pxkk2"; depends=[Brobdingnag]; }; - B2Z = derive { name="B2Z"; version="1.4"; sha256="0w7394vs883vb32gs6yhrc1kh5406rs851yb2gs8hqzxad1alvpn"; depends=[numDeriv coda mvtnorm]; }; - b6e6rl = derive { name="b6e6rl"; version="1.1"; sha256="17scdskn677vaxx1h2jypqaffvjgczryplg17nr3wigi1x0cxg7a"; depends=[]; }; - babel = derive { name="babel"; version="0.2-6"; sha256="1dsxjnhr0cky7wlzz8pr8rn3cldfcyrh8v6gn2ba4abr0df7i4dd"; depends=[]; }; - BaBooN = derive { name="BaBooN"; version="0.1-6"; sha256="1splid5mvyd04d1lxkq45md910ry6n516cph20j6vqfhla0arxjg"; depends=[MASS nnet]; }; - babynames = derive { name="babynames"; version="0.1"; sha256="0qq0303mmcnpfy5630d7rqmb8rl36p7hg2z842rzd4lkhy8c2l07"; depends=[]; }; - BACCO = derive { name="BACCO"; version="2.0-9"; sha256="0i1dnk0g3miyv3b60rzgjjm60180wxzv6v2q477r71q74b0v0r1y"; depends=[emulator calibrator approximator]; }; - backtest = derive { name="backtest"; version="0.3-2"; sha256="06q488pynxgis1m6rxc8hgscpy8vimffpi4aamviwb089sjzilnn"; depends=[lattice]; }; - BACprior = derive { name="BACprior"; version="1.2.1"; sha256="1xwszrnb6fnfl4pz89y24jykzyjnkzwzkicdp1rp7q3jwp986fxi"; depends=[mvtnorm leaps]; }; - BAEssd = derive { name="BAEssd"; version="1.0.1"; sha256="04wkhcj4wm93hvmfnnzryswaylnxz5qsgnqky9lsx4jqhvg340l6"; depends=[mvtnorm]; }; - bagRboostR = derive { name="bagRboostR"; version="0.0.2"; sha256="1k9w98p3ad3myzyqhcrc4rsn7196qvhnmk5ddx3fpd1rdvy2dnby"; depends=[randomForest]; }; - BalancedSampling = derive { name="BalancedSampling"; version="1.4"; sha256="0l8jxszd0j27kb58xrn7lvf52mhifqjd1w42cp4kdiax8c6s7421"; depends=[Rcpp]; }; - BaM = derive { name="BaM"; version="0.99"; sha256="1q04va2s876ydlmaalx63r520pfx1qzpjg6hbnl9pvn86b5grnf4"; depends=[bayesm coda MASS mice survival foreign nnet]; }; - bamdit = derive { name="bamdit"; version="1.1-1"; sha256="0f865yfwd2pvbkcx8jm4iyilldmprsgyqnscp1n28rp3sbdii4bl"; depends=[coda rjags]; }; - BAMMtools = derive { name="BAMMtools"; version="2.0.2"; sha256="10z638f79j3jksb69sqrnkzs5nzxi9srsxww4ky3bk21zb66ikhd"; depends=[ape]; }; - bams = derive { name="bams"; version="1.6"; sha256="1pplnpilpydxf7gcs87424cajss74q8cr9pyv2biy4pkvfql0nxl"; depends=[]; }; - bandit = derive { name="bandit"; version="0.5.0"; sha256="03mv4vbn9g4mqikd9map33gmw2fl9xvb62p7gpxs1240w5r4w3fp"; depends=[boot gam]; }; - BANOVA = derive { name="BANOVA"; version="0.2"; sha256="1zgn9wxh4c89rris58hhj5fh37mmy8wjvligr02id7a1pcw177m3"; depends=[rjags runjags coda]; }; - barcode = derive { name="barcode"; version="1.1"; sha256="14zh714cwgq80zspvhw88cs5b82gvz4b6yfbshj9b7x0y2961nxd"; depends=[lattice]; }; - bark = derive { name="bark"; version="0.1-0"; sha256="00sgwr1sfbx0gb2ssbnmbz90mwb40sk3s24asj7lhadwgm150nly"; depends=[]; }; - Barnard = derive { name="Barnard"; version="1.3"; sha256="1kyc6rph0c9lxv6mkdl5n11xw1pvavlm2kknplb3sv6f94ss2yci"; depends=[]; }; - bartMachine = derive { name="bartMachine"; version="1.0.2"; sha256="1mxl8yra44ypxchqlyfv950gac1m8mw85qqaifzylm7fqb12xr8s"; depends=[rJava car randomForest missForest]; }; - BAS = derive { name="BAS"; version="1.0"; sha256="1j5crafky3jb25kim3b7gxg9azn3ya357ckq1v7wryzi3zi674sg"; depends=[MASS]; }; - BaSAR = derive { name="BaSAR"; version="1.3"; sha256="0n18gjgnqdmwdna6b5r664rw2svjqlpis95vchnlk19cr3pjvqc1"; depends=[polynom orthopolynom]; }; - base64 = derive { name="base64"; version="1.1"; sha256="1wn3zj1qlgybzid4nr6hvlyqg1rp2dwfh88vxrfby2fy2ba1nl5x"; depends=[]; }; - base64enc = derive { name="base64enc"; version="0.1-2"; sha256="0d2b7vl08abssfwprfiqc0yscb1gz4xlzlwwbf7y9z19wbyxizh5"; depends=[]; }; - baseline = derive { name="baseline"; version="1.1-3"; sha256="1n3g1ads26nq3y31nniirac453pdshzkdfg774w46x83cc5pc0xj"; depends=[SparseM]; }; - basicspace = derive { name="basicspace"; version="0.07"; sha256="0lpj03a5cwrj0pag6hb29rfi8dw51hqx7rrc4r00lsbqf5picin2"; depends=[]; }; - BASIX = derive { name="BASIX"; version="1.1"; sha256="18dkvv1iwskfnlpl6xridcgqpalbbpm2616mvc3hfrc0b26v01id"; depends=[]; }; - BaSTA = derive { name="BaSTA"; version="1.9.3"; sha256="1jfki5lnsvd6fjrld2qp179lyzli61pi2308lkkl1h6vgp11zp2v"; depends=[msm]; }; - batade = derive { name="batade"; version="0.1"; sha256="1lr0j20iydh15l6gbn471vzbwh29n58dlpv9bcx1mnsqqnsgpmal"; depends=[hwriter]; }; - batch = derive { name="batch"; version="1.1-4"; sha256="03v8a1hsjs6nfgmhdsv6fhy3af2vahc67wsk71wrvdxwslmn669q"; depends=[]; }; - BatchExperiments = derive { name="BatchExperiments"; version="1.2"; sha256="0kvn8vaxzdvzfx05639v3jbrxvwrr9rr8zssw62pdr77h7j9a3gf"; depends=[BatchJobs checkmate BBmisc DBI RSQLite plyr]; }; - BatchJobs = derive { name="BatchJobs"; version="1.3"; sha256="1vcncmy7zzri93gh9gfbz8dz4agz2nkhv1bddzddx27b2sqjq4dn"; depends=[BBmisc checkmate digest DBI RSQLite sendmailR brew stringr fail]; }; - batchmeans = derive { name="batchmeans"; version="1.0-1"; sha256="06p51ipc603zqkf7ifv495jxbnqqxzx5h8mnz5l5sz9rq5pixg13"; depends=[]; }; - BayesBridge = derive { name="BayesBridge"; version="0.5"; sha256="1czyna2mrznlr5swvm9i7x99yfwjvwbzy42avh6xb0342q5glnhw"; depends=[]; }; - bayesclust = derive { name="bayesclust"; version="3.1"; sha256="0zxjd64nz8c6vg6jwb2xh6kbw41a2pcmlwq5cl6k2kbplqbm2jdf"; depends=[]; }; - BayesComm = derive { name="BayesComm"; version="0.1-0"; sha256="17hnq4z451g2j3p73awllihhwsdy3grh6ki3qy9bkr064wvzbvcj"; depends=[Rcpp RcppArmadillo coda]; }; - bayescount = derive { name="bayescount"; version="0.9.9-2"; sha256="1f27dkdgpylk1v0m722r0jxha9sl17zgl1s5apnd8ihgsajm7sdc"; depends=[runjags coda lattice]; }; - BayesCR = derive { name="BayesCR"; version="1.0"; sha256="0cq1ii01j0nprnyvfxml1nrajrbb9yanr4fa5fcwn764cq5s30n9"; depends=[MCMCpack mvtnorm Rlab truncdist truncnorm]; }; - BayesDA = derive { name="BayesDA"; version="2012.04-1"; sha256="0fp27cmhw8dsxr4mc1flm6qh907476kph8ch2889g9p31xm1psjc"; depends=[]; }; - bayesDem = derive { name="bayesDem"; version="2.4-1"; sha256="0s2dhy8c90smvaxcng6ixhjm7kvwwz2c4lgplynrggrm8rfb19ay"; depends=[gWidgets gWidgetsRGtk2 bayesTFR bayesLife bayesPop RGtk2 wpp2012]; }; - BayesFactor = derive { name="BayesFactor"; version="0.9.7"; sha256="02bqsvxsxkyhxm0llwnscsp204ffjygdk9xraml1l2fkz3cg62vl"; depends=[coda pbapply mvtnorm stringr]; }; - bayesGARCH = derive { name="bayesGARCH"; version="2.0.1"; sha256="1gz18wjikkg3yf71b1g21cx918dyz89f5m295iv8ah807cdx7vjk"; depends=[mvtnorm coda]; }; - bayesGDS = derive { name="bayesGDS"; version="0.6.0"; sha256="17ihpsh7lqjninprfwbx3v2415s27qybr5c2z4ls43slv8zrv8mz"; depends=[Matrix]; }; - BayesGESM = derive { name="BayesGESM"; version="1.0"; sha256="1ssg4l86jfriq4izlgzypz37c7xzcfsr6ngh8ksak8ka1lmidsig"; depends=[truncdist GIGrvg normalp gsl]; }; - Bayesianbetareg = derive { name="Bayesianbetareg"; version="1.2"; sha256="0imsz2761ngbnap0vnxks9527la51m5g8gkkn1vrgwis43i6qcgs"; depends=[mvtnorm betareg]; }; - BayesLCA = derive { name="BayesLCA"; version="1.5"; sha256="0ikx0qxp9mw4206c0i2g8cjr3d5i591wb1qak28c11m22rn1s7gc"; depends=[e1071 coda fields nlme MCMCpack]; }; - bayesLife = derive { name="bayesLife"; version="2.1-1"; sha256="0vb9frpla7rvd925h5d23mjza423qhpc4hqy0f9zayj9nnisv212"; depends=[bayesTFR wpp2012 hett car coda]; }; - BayesLogit = derive { name="BayesLogit"; version="0.5.1"; sha256="0nr215wzhqlfi32617mmqb6i3w5x1kh5fiy68k0xzdqjsyjr65m0"; depends=[]; }; - bayesm = derive { name="bayesm"; version="2.2-5"; sha256="16cnm1i7vwviqxwq3yhj5r9a46qaanq2mb4snd0659rkia6p8h7a"; depends=[]; }; - bayesMCClust = derive { name="bayesMCClust"; version="1.0"; sha256="14cyvcyx3nmkbvsy7n4xjp7zvcgdhy013dv9d72y8j5dvlv82pb4"; depends=[gplots xtable mnormt MASS bayesm boa e1071 gtools]; }; - BayesMed = derive { name="BayesMed"; version="1.0"; sha256="1ppl5g8c5yy8jzhm34wvvprn9dj697ihcg8jb5111qmjybzzp0dh"; depends=[R2jags QRM polspline MCMCpack]; }; - bayesmix = derive { name="bayesmix"; version="0.7-3"; sha256="142132aslmmm35yai4n1d2hqqkczvrnm8ln9gwxvbczmxaggnc01"; depends=[rjags coda]; }; - BayesNetDiscovery = derive { name="BayesNetDiscovery"; version="0.1"; sha256="1p3mxl75ds75snqim59w9xvr7f4a1mbks2k05zd9wwwy4w7v74l7"; depends=[DPpackage igraph mclust pscl tmvtnorm]; }; - BayesNI = derive { name="BayesNI"; version="0.1"; sha256="0zvr6rkb5zxgl53xby69d0j3yrfnlcmac6kwkxz77q5616w9dwq0"; depends=[]; }; - BayesPen = derive { name="BayesPen"; version="1.0"; sha256="1c31n0mrx07j9mw4afdh1qznkiq2jrig3ldpsnhkv2nd2apgjbbp"; depends=[lars MCMCpack SuppDists]; }; - bayesPop = derive { name="bayesPop"; version="5.0-0"; sha256="0a577jkm0v88q2i7dmn2xqndm9z5y3hwfxr4a5d65cnrlsahfzdl"; depends=[bayesTFR bayesLife abind plyr wpp2012]; }; - bayespref = derive { name="bayespref"; version="1.0"; sha256="0gwlzs7qkgmf90np7xv85d27jjqggyhfj00vpya664a2znyjb3jm"; depends=[coda lattice MASS MCMCpack RColorBrewer]; }; - bayesQR = derive { name="bayesQR"; version="2.2"; sha256="0w5fg7hdwpgs2dg4vzcdsm60wkxgjxhcssw9jzig5qgdjdkm07nm"; depends=[]; }; - bayess = derive { name="bayess"; version="1.4"; sha256="0axipk5hn2hw3g4dfh7y3xa0dxqmi8kqpbr77nl14y7ydpija6xm"; depends=[MASS mnormt gplots combinat]; }; - BayesSAE = derive { name="BayesSAE"; version="1.0-1"; sha256="09s7f472by689b2b0gahnkhyjriizpsx6r5qa95nf3f4bfqi2cpf"; depends=[Formula coda lattice]; }; - BayesSingleSub = derive { name="BayesSingleSub"; version="0.6.2"; sha256="0hgmyhg4mpxx7k91hbfa9h3533mqyn9rz4kl9kb30cc9g7g0m045"; depends=[coda mvtnorm MCMCpack]; }; - bayesSurv = derive { name="bayesSurv"; version="2.3-1"; sha256="1p3ppvz7qjd0yjnc3k1mrjqa6v00aind613wxg6xhgk5iz0590rg"; depends=[survival coda smoothSurv]; }; - bayesTFR = derive { name="bayesTFR"; version="4.0-5"; sha256="1cyzkgx0f275ng0ds0lvm3rwryd2ai20shhilp7ajvsria4h4dcw"; depends=[mvtnorm MASS coda wpp2012]; }; - Bayesthresh = derive { name="Bayesthresh"; version="2.0.1"; sha256="0w26h1ragqcg1i4h7c2y6vd8fig2jb2zrnvvchgg5z2hg9qdplsf"; depends=[lme4 MASS VGAM mvtnorm matrixcalc coda]; }; - BayesValidate = derive { name="BayesValidate"; version="0.0"; sha256="1gli65avpkb90asx92l1yjbwaxcsyb920idyjwgd2sl2b3l657ly"; depends=[]; }; - BayesVarSel = derive { name="BayesVarSel"; version="1.5.1"; sha256="0r2al4d74dbra7va88fcazq5h19f0i4wymd39apsz3a3hsb8vdvv"; depends=[MASS]; }; - BayesX = derive { name="BayesX"; version="0.2-8"; sha256="1kj0xwy972383vx52i8dn7vp0x8r5cbbii0s7nwfz0bn2iaks0c0"; depends=[shapefiles sp maptools colorspace coda]; }; - BayesXsrc = derive { name="BayesXsrc"; version="2.1-2"; sha256="114804f6maak5dmwzw4cbigjcdw7c6sgx48af35yrvkspi1gsz3b"; depends=[]; }; - BayHap = derive { name="BayHap"; version="1.0.1"; sha256="0xqnl2cbf0pyjlpywyy0j4mwknfn8msz4s719dsri3r7hvn9m6kd"; depends=[boa]; }; - BayHaz = derive { name="BayHaz"; version="0.1-3"; sha256="08ilghlkgyma5758yw7mdgqycqcillqmx73knzzdlg2kzc77dvg6"; depends=[]; }; - BaylorEdPsych = derive { name="BaylorEdPsych"; version="0.5"; sha256="1kq6nvzdqwawygp7k62lw5hyccsj81jg82hq60yidgxnmmnnf7y2"; depends=[]; }; - bayou = derive { name="bayou"; version="1.0.1"; sha256="0l342a4lsn6b18i2kyk2hr50k69bb7jcw8dlnbi96yf1i58qcdri"; depends=[ape geiger phytools coda Rcpp MASS mnormt fitdistrplus denstrip]; }; - BaySIC = derive { name="BaySIC"; version="1.0"; sha256="023ji6q1nvksmhp3ny8ad39xxccc0a1rv9iaiaagwavgzzc0pjd9"; depends=[rjags fields poibin]; }; - BAYSTAR = derive { name="BAYSTAR"; version="0.2-9"; sha256="0crillww1f1jvhjw639sf09lpc3wpzd69milah143gk9zlrkhmz2"; depends=[mvtnorm coda]; }; - BB = derive { name="BB"; version="2014.1-1"; sha256="05ang9k03cpdyjskifp8y68sjgbsnp8xj1a85hzqychlb7d4f2qk"; depends=[]; }; - bbefkr = derive { name="bbefkr"; version="4.2"; sha256="1wjx652w3p41sq71a2zdzmb7frjxm6xvcgrc2ark2spwb0lbjjw6"; depends=[]; }; - bbemkr = derive { name="bbemkr"; version="2.0"; sha256="015c57s8mpimm82nddnh382wlkisxgdmc2hvp7k38pcnqxc5gb5q"; depends=[MASS]; }; - BBmisc = derive { name="BBmisc"; version="1.7"; sha256="06lr7yjq9ypyvrvkf3gn1dl7ppf2mpn6jnvv3m4724g2sgh53cv4"; depends=[checkmate]; }; - bbmle = derive { name="bbmle"; version="1.0.17"; sha256="1j3x2glnn0i0fc0mmafwkkqh1js90g8q7gix2vrhif0pmwinsrak"; depends=[numDeriv lattice MASS]; }; - BBMM = derive { name="BBMM"; version="3.0"; sha256="1cvv786wf1rr5906qg1di2krrv5jgw3dnyl8z2pvs8jyn0kb3fkj"; depends=[]; }; - bbo = derive { name="bbo"; version="0.1"; sha256="1giif78135f3hy8dqims83imism0k3507jlppgcb3x6pxk7dgwbs"; depends=[]; }; - BBRecapture = derive { name="BBRecapture"; version="0.1"; sha256="05xzp5zjmkh0cyl47qfsz0l8drg8mimssybhycc4q69aif9scqxb"; depends=[HI locfit lme4 secr]; }; - bc3net = derive { name="bc3net"; version="1.0.2"; sha256="0iakqf4apscxb4mb5klj9qklbi25dmdd77la3ads2y882gm2nj0z"; depends=[c3net infotheo igraph Matrix lattice]; }; - BCA = derive { name="BCA"; version="0.9-2"; sha256="1kry9v0sfcpn5vv4hwd983svwcgv841y9pkjdzi849gspmc9291r"; depends=[car clv cluster class flexclust rpart nnet rgl Rcmdr]; }; - BCBCSF = derive { name="BCBCSF"; version="1.0-0"; sha256="1ag8wz8a9vh1x4jgppimgchfs53rr6hbg5xzzr6k2h4bfsg7pmn3"; depends=[abind]; }; - BCDating = derive { name="BCDating"; version="0.9.3"; sha256="1ibm34wab1dpigrhifkyr1nylgbprbh22fdw9zpmg8bawb7zgbsl"; depends=[]; }; - BcDiag = derive { name="BcDiag"; version="1.0.4"; sha256="1cpy80cza2yqwgp6zma1p3chdbfbxb3in19rj1zndf89baggr520"; depends=[]; }; - BCE = derive { name="BCE"; version="2.1"; sha256="0dqp08pbq7r88yhvlwgzzk9dcdln7awlliy5mfq18j5jhiy7axiz"; depends=[FME limSolve Matrix]; }; - BCEA = derive { name="BCEA"; version="2.0-2"; sha256="1n0fp6na2y4n7p6ncwgi6hwx97mfrga3fkp3i0z06bh1p1jh8m88"; depends=[]; }; - BCEs0 = derive { name="BCEs0"; version="1.1"; sha256="0q63bkmk0kk9p5d3xb0f5srzfrbr743isyw4v2h9ch5yyxizcizb"; depends=[]; }; - Bchron = derive { name="Bchron"; version="4.1.1"; sha256="0dnfz7xpmbygyarh9ai9x3xfsqiizi0zhnxm8bmkvqyb8h7zpghb"; depends=[inline hdrcde MASS ellipse coda mclust]; }; - Bclim = derive { name="Bclim"; version="2.3.1"; sha256="160c9v83bpik73yjj45lr8sdgl8v4ymlkqw424ncc3lficyhvfjg"; depends=[MASS mclust hdrcde statmod]; }; - bclust = derive { name="bclust"; version="1.4"; sha256="1s04fqff5bw6d5kk0smvach6yq492dv1w0ahh9mrm2jsi2q58h7p"; depends=[]; }; - bcool = derive { name="bcool"; version="1.1"; sha256="03z6wdqpk491gyysbzz1lgfavskmi0j65r3df7baz6lrvzkg30ji"; depends=[MCMCglmm doMPI seqinr]; }; - bcp = derive { name="bcp"; version="3.0.1"; sha256="08sa1az1ljsi00zmj3l7z8p1j5im1w79yjxy8k1p6ba90bck7l4h"; depends=[foreach iterators Rcpp]; }; - bcpa = derive { name="bcpa"; version="1.0"; sha256="02vyvwd1j5d1nvwmhjbldyav1zx8sh8kvchwz73i0vs0jdrwp3q4"; depends=[Rcpp intervals plyr]; }; - bcpmeta = derive { name="bcpmeta"; version="1.0"; sha256="02fw1qz9cvr7pvmcng7qg7p04wxxpmvb2s8p78f52w4bf694iqhl"; depends=[mvtnorm]; }; - bcrm = derive { name="bcrm"; version="0.4.4"; sha256="0gcigc7505fsk1m70df3n0dz553adkbs8yz2bhskb4qrw4gbmvr7"; depends=[mvtnorm ggplot2]; }; - bcv = derive { name="bcv"; version="1.0"; sha256="053if27miv46mbkni6pcpdpz0l336r5l95k7927dqalnri894xwz"; depends=[]; }; - bda = derive { name="bda"; version="3.2.0-3"; sha256="1725qdlkcf7hfklnksy7jslh66cfm7gsil1xgm2rw8hr6v2l0pmx"; depends=[]; }; - BDgraph = derive { name="BDgraph"; version="2.10"; sha256="0f35i3r8i6fbh86537z8lvfmhydp87kmmcs4vycaa9ja88fb6czl"; depends=[Matrix igraph]; }; - bdoc = derive { name="bdoc"; version="1.2"; sha256="15d7grc0a1hakkxhgbm2gp0awggzlmsp8zf8abj5bgfih63gcmj2"; depends=[]; }; - bdpv = derive { name="bdpv"; version="1.1"; sha256="0i6wdf27243ch8pn2chqriwxjg3g72wbvzlx52mz4ahw700xjc7n"; depends=[]; }; - bdsmatrix = derive { name="bdsmatrix"; version="1.3-1"; sha256="1iiqz34ssb5i5jd1x5d0mccir9ycrq2vq30g67ggw12apl7yks1l"; depends=[]; }; - bdvis = derive { name="bdvis"; version="0.1.0"; sha256="1f837i48gmspx9xrnxzsgdbg6ykxmvkp8l20y19yd9iakhv7k3jy"; depends=[maps plotrix sqldf plyr taxize treemap ggplot2]; }; - bdynsys = derive { name="bdynsys"; version="1.2"; sha256="06n4n5yix6yd5180c5y7qdk2p5jpjqiw28147l8fp58zqxvwjrxb"; depends=[plm Formula MASS Hmisc deSolve pracma caTools matrixStats]; }; - beadarrayFilter = derive { name="beadarrayFilter"; version="1.1.0"; sha256="044dq5irc00v2f2gjz0vb69w7q7b84lppc55ganabdv4f0dxdblc"; depends=[RColorBrewer]; }; - beadarrayMSV = derive { name="beadarrayMSV"; version="1.1.0"; sha256="0785vmjsli37hjyppk7hlqmn0b683s1apysx9dghbw4h6rgvr8n9"; depends=[rggobi]; }; - beanplot = derive { name="beanplot"; version="1.1"; sha256="0h1ns2y0f6x5z9bn4wsv640509q4jxhqvmqr7snf8vk54vc35zs5"; depends=[]; }; - bear = derive { name="bear"; version="2.6.3"; sha256="1w933rb1v4ixgmxpbjxrfwzhiddpr0vxwr3gryl6z6p4wvwdwvp7"; depends=[reshape nlme gdata ICSNP sciplot plotrix ggplot2 png]; }; - BEDASSLE = derive { name="BEDASSLE"; version="1.4"; sha256="02638v89rcqky6npfckr1h7g563lbhs51bsprfr10jk44aj527np"; depends=[MASS matrixcalc emdbook]; }; - beepr = derive { name="beepr"; version="1.1"; sha256="187gww50yc8hzrzwz6j9ib101196g6ci9fx3dqyhg764ydn8if1n"; depends=[stringr audio]; }; - beeswarm = derive { name="beeswarm"; version="0.1.6"; sha256="05n2a1fqmh4m7d0b8vmcprss5ivgb0dlyly07jywj3vrf2z81yhy"; depends=[]; }; - benchden = derive { name="benchden"; version="1.0.5"; sha256="1cwcgcm660k8rc8cpd9sfpzz66r55b4f4hcjc0hznpml35015zla"; depends=[]; }; - benchmark = derive { name="benchmark"; version="0.3-6"; sha256="05rgrjhbvkdv06nzbh0v57b06vdikrqc1d29wirzficxxbjk1hih"; depends=[proto ggplot2 relations psychotools reshape scales plyr]; }; - Benchmarking = derive { name="Benchmarking"; version="0.23"; sha256="0q0m34l3216m467b28nckg7l4g0z7jmxdamba3jgzfm4rv73d6rd"; depends=[lpSolveAPI ucminf]; }; - benford_analysis = derive { name="benford.analysis"; version="0.1.1"; sha256="00ynk1af5nbq8bn8y77sckx4w32g5zxcp06pdpcxwvp38d7hxhvc"; depends=[data_table]; }; - BenfordTests = derive { name="BenfordTests"; version="1.1.1"; sha256="12xzc4gq4h7p18ypbkybrzjj2qh71rgd7nzznij36yv7n6h21mlw"; depends=[]; }; - bentcableAR = derive { name="bentcableAR"; version="0.2.3"; sha256="0d20cc3zis3pc3r86z12cwcz013w0mglbg6xgv90wq912jjpkxk9"; depends=[]; }; - BEQI2 = derive { name="BEQI2"; version="1.0-1"; sha256="0afp8f6kfmpa8qi952qnyxl2nn6kszc8fgvplvbl13v572261m7s"; depends=[knitr markdown RJSONIO xtable plyr reshape2]; }; - ber = derive { name="ber"; version="4.0"; sha256="0gl7rms92qpa5ksn8h3ppykmxk5lzbcs13kf2sjiy0r2535n8ydi"; depends=[MASS]; }; - Bergm = derive { name="Bergm"; version="2.9"; sha256="1sjc9vkcbbhdc93gzsm25ld5h7hkwb8n6i51xzflphi0w1a66zkv"; depends=[ergm network coda mvtnorm]; }; - BerlinData = derive { name="BerlinData"; version="1.0.0"; sha256="1i4vb1gs3ffb2lxdhl8hzqwcr9nm8ya484glds3bdvj10ypncrya"; depends=[XML stringr]; }; - berryFunctions = derive { name="berryFunctions"; version="1.4"; sha256="13kzrz0lrqlbysd7ymphcw12fg237knmvkdc71cl85929ydr09d8"; depends=[]; }; - Bessel = derive { name="Bessel"; version="0.5-5"; sha256="1apcpwqgnbsn544x2mfjkp4136xn33pijazmbzas7lr14syl5a6b"; depends=[Rmpfr]; }; - BEST = derive { name="BEST"; version="0.2.2"; sha256="160lvrd0zjm1lr8llra6lyz3qsmqhn3bpdlmwingwfimbpb754rz"; depends=[rjags coda]; }; - bestglm = derive { name="bestglm"; version="0.34"; sha256="0b6lj91v0vww0fy50sqdn99izkxqbhv83y3zkyrrpvdzwia4dg9w"; depends=[leaps]; }; - betafam = derive { name="betafam"; version="1.0"; sha256="1nf5509alqnr5qpva36f1wb7rdnc084p170h91jv89xvzsidqxca"; depends=[]; }; - betapart = derive { name="betapart"; version="1.3"; sha256="0h2y2c3q6njzh2rlxh8izgkrq9y7abkbb0b13f2iyj9pnalvdv52"; depends=[ape geometry picante rcdd]; }; - betaper = derive { name="betaper"; version="1.1-0"; sha256="1gr533iw71n2sq8gga9kzlah7k28cnlwxb2yh562gw6mh1axmidm"; depends=[vegan ellipse]; }; - betareg = derive { name="betareg"; version="3.0-4"; sha256="1crkp1j11zpzd92hc1zaw0pb68ngga8gl6v504p4r7629806g5hv"; depends=[Formula flexmix lmtest modeltools sandwich]; }; - betategarch = derive { name="betategarch"; version="3.1"; sha256="1m4xif7xn1hhz9a77mmy0hlqrfp7qxardc95jcvx1jy76nny21af"; depends=[zoo]; }; - bethel = derive { name="bethel"; version="0.2"; sha256="1zlkw672k1c5px47bpa2vk3w2906vkhvifz20h6xm7s51gmm64i0"; depends=[]; }; - bezier = derive { name="bezier"; version="1.1"; sha256="1bhqf1zbshkf1x8mgqp4mkgdxk9jxi51xj6i47kqkyn9gbdzch0c"; depends=[]; }; - bfa = derive { name="bfa"; version="0.3.1"; sha256="02vnbm77blllb74kll8w1i91k0llk43vq60aqjwpc5kqmzy652pk"; depends=[coda Rcpp RcppArmadillo]; }; - bfast = derive { name="bfast"; version="1.4.4"; sha256="1k8rwlzrnkgs0wj0yy4gh4lj4zd5zyzwgwckgjy8k53r4296js66"; depends=[strucchange MASS forecast zoo raster sp strucchange zoo raster]; }; - bfp = derive { name="bfp"; version="0.0-27"; sha256="08hlr33dwwjc4ag8vfsa3w4rcsc2093j8zwb05xkkl5nwqsq3mq0"; depends=[Rcpp]; }; - bgeva = derive { name="bgeva"; version="0.2"; sha256="178c2jkg5578mh1yq37713lwfbz98nbsc2p1bmacgmbxbqnkba3x"; depends=[mgcv magic trust]; }; - BGLR = derive { name="BGLR"; version="1.0.3"; sha256="02aw71r8khnkahqplycwziz7fh8hmnniq5bqnsk4fijv7z9gkbkg"; depends=[]; }; - bgmm = derive { name="bgmm"; version="1.6"; sha256="04d06rhb8ax1q4ayl03cw18j4wk4g4690kwdgiyym9yi0gh8hjij"; depends=[mvtnorm car lattice combinat]; }; - BGPhazard = derive { name="BGPhazard"; version="1.0"; sha256="14nk8gxzd0xd4fcc16m026rlq3prnppv3jywllfapk5986cacq4g"; depends=[survival]; }; - BGSIMD = derive { name="BGSIMD"; version="1.0"; sha256="0xkr56z8l72wps7faqi5pna1nzalc3qj09jvd3v9zy8s7zf5r7w4"; depends=[]; }; - BH = derive { name="BH"; version="1.54.0-3"; sha256="18n82c37562aklykw074ma0x95k9s4xp3l94jrjw2grajcrhx68b"; depends=[]; }; - Bhat = derive { name="Bhat"; version="0.9-10"; sha256="1vg4pzrk3y0dk1kbf80mxsbz9ammkysh6bn26maiplmjagbj954v"; depends=[]; }; - BHH2 = derive { name="BHH2"; version="2012.04-0"; sha256="10ixvjpkqamlddrndpnw5gsdm4gdhp693jdvc0f774ngmf32rbaa"; depends=[]; }; - BHMSMAfMRI = derive { name="BHMSMAfMRI"; version="1.0"; sha256="0j5ivknsr441clgm0b95f2rz4pr29ixvw3dgsi8nb0ffh52dgz7q"; depends=[fmri AnalyzeFMRI wavethresh]; }; - biasbetareg = derive { name="biasbetareg"; version="1.0"; sha256="1562zdin0y5mrp36ih11ir3h9cv49cx1l98chxd89fkj8x3c1fbg"; depends=[betareg]; }; - BiasedUrn = derive { name="BiasedUrn"; version="1.06.1"; sha256="1ra9fmymm97a2b8jsrsi98cjnnxc478zq51lx7a5pgafprcwcgkg"; depends=[]; }; - bibtex = derive { name="bibtex"; version="0.3-6"; sha256="06v6pzwpx5dh3h4cf382hf0mszxchvzjsjaw880gfbgc9yl931z7"; depends=[]; }; - biclust = derive { name="biclust"; version="1.0.2"; sha256="09w164zsnc48apf3r0yr6bfjxlpy4s2wqpzfhlg60c3c7bk1bf7v"; depends=[MASS colorspace lattice]; }; - BiDimRegression = derive { name="BiDimRegression"; version="1.0.6"; sha256="1kgrk4xanvxqdq619ha08wwplmsn2xqygx4dziagx48iqfpp1lxj"; depends=[nlme]; }; - bifactorial = derive { name="bifactorial"; version="1.4.7"; sha256="187zlsqph7m63wf6wajvs6a4a08aax9hiqssgvma6cpkpisfiz4k"; depends=[mvtnorm multcomp lattice Rcpp]; }; - BIFIEsurvey = derive { name="BIFIEsurvey"; version="0.3-47"; sha256="10x2zfn19966mmmy2zxjhksxpzs38y8v25bmdn13vdmx70768gsc"; depends=[Rcpp miceadds]; }; - bigalgebra = derive { name="bigalgebra"; version="0.8.4"; sha256="19rv552ac0q9djc1yvpldkc0lipdf6q143m9dnndpsqs7ayqlr4g"; depends=[bigmemory]; }; - biganalytics = derive { name="biganalytics"; version="1.1.1"; sha256="0g45b293c1z9n2z9ab66jsy8yaiqm7bbs2d6pglzwgmmdvwy03qd"; depends=[bigmemory]; }; - bigdata = derive { name="bigdata"; version="0.1"; sha256="1n1zcjhvb2s87d7fkcm95x11ss4b8pczza0n55gxjv4przfiq0in"; depends=[glmnet Matrix lattice]; }; - bigGP = derive { name="bigGP"; version="0.1-3"; sha256="1a81an1wkkvdv1jh6d41wl54ac8h4yal27v4m8zp9jmx3ch3y2wy"; depends=[Rmpi]; }; - biglars = derive { name="biglars"; version="1.0.2"; sha256="17zs25dvlja9ynx2fm5f4nmgkx4mnyqs5iscwsyahr6qigx1rz9x"; depends=[ff]; }; - biglm = derive { name="biglm"; version="0.9-1"; sha256="1z7h4by457z93k5i6qf5rq7xmd1y2kcd1rq4pv465cd32d4mb2g1"; depends=[DBI]; }; - bigmemory = derive { name="bigmemory"; version="4.4.6"; sha256="1pplnpxqg380l5mjgz0ak4ipsx7x54339n2wr3dd29xv3w2fb5rp"; depends=[bigmemory_sri BH]; }; - bigmemory_sri = derive { name="bigmemory.sri"; version="0.1.2"; sha256="01nz4phifx10r1hs83avisnaqxvs3y70v0yczjgcr8kih2cnvbsd"; depends=[]; }; - bigml = derive { name="bigml"; version="0.1-1"; sha256="0x0gn5pyffc8s0z2hp9iqgc63mmb3q7fb8lafzz2x67z2gghxi77"; depends=[RJSONIO RCurl plyr]; }; - bigpca = derive { name="bigpca"; version="1.0"; sha256="1s4qmg7xl8z0sv1b1vfqw0r5cvlbrxx1n0m03ira8fpykcck2clm"; depends=[reader NCmisc bigmemory biganalytics bigmemory_sri BH irlba]; }; - bigrf = derive { name="bigrf"; version="0.1-11"; sha256="0lazi8jk8aapdyyynd5yfcbn4jpjyxh8l64ayd0jj3nisl6hvmdh"; depends=[bigmemory foreach]; }; - bigsplines = derive { name="bigsplines"; version="1.0-2"; sha256="0sbjq1vh8im6rwyz27h5m8rpckqiiaz9h22kcbzissy2dckis3l8"; depends=[]; }; - bigtabulate = derive { name="bigtabulate"; version="1.1.2"; sha256="0vp873r3gww6kfkjdm87qgcdi85362kq946lvs45ggvyv7iaw0wa"; depends=[bigmemory]; }; - BigTSP = derive { name="BigTSP"; version="1.0"; sha256="1jdpa8rcnrhzn0hilb422pdxprdljrzpgr4f26668c1vv0kd6k4v"; depends=[glmnet tree randomForest gbm]; }; - bilan = derive { name="bilan"; version="2013.12"; sha256="0wrrs6l8iwy6r707djsmlmwiw0y5z6wwnsn27fvmq9cb8scvbfan"; depends=[Rcpp]; }; - bild = derive { name="bild"; version="1.1-3"; sha256="02fi3h6mhg2m1ppkcpxpwzjfchkk9h7yv73j0365srr1jxki44pm"; depends=[]; }; - bimetallic = derive { name="bimetallic"; version="1.0"; sha256="181qi4dr0zc7x6wziq7jdc1his20jmprfpq3hrfm56fr5n1sj8wl"; depends=[]; }; - binda = derive { name="binda"; version="1.0.0"; sha256="0h5a67ygn4hwkdzbmhdkqjngln32yr8rk36k87m3hq1ahj4jn73x"; depends=[entropy]; }; - bindata = derive { name="bindata"; version="0.9-19"; sha256="15ya21fz1kvq4qsppkn9ypiqvaq8q4vszdcgcymampa7zc07z2ld"; depends=[e1071 mvtnorm]; }; - bingat = derive { name="bingat"; version="1.1"; sha256="1pb1yy1xrfvh71pg237lkmi56p8pbam60rii5i5km1i960lq0wc1"; depends=[matrixStats network]; }; - binGroup = derive { name="binGroup"; version="1.1-0"; sha256="1sf7prg2x1ryynf1kz7jr50svmga7kjgd5pi9qm3g2hyimz8mvs4"; depends=[]; }; - binhf = derive { name="binhf"; version="1.0-1"; sha256="0l8925bj6mjv2y7fn76zh2g8xjig3kbbdy4jl0ip3gd9kbrakl9k"; depends=[wavethresh adlift]; }; - binMto = derive { name="binMto"; version="0.0-6"; sha256="1h9s42wk848x15f4glhsh2iikpra64miwlia6xz5dqlzbs4vw86k"; depends=[mvtnorm]; }; - BinNor = derive { name="BinNor"; version="2.0"; sha256="0c1qy93ccgzg8g25wm1j4ninsa0ck4y3jjh25za92w070cqhkd8m"; depends=[mvtnorm corpcor psych Matrix]; }; - binom = derive { name="binom"; version="1.1-1"; sha256="0mjj92dqf5q69jxzqya4izb1mly3mkydbnmlm4wb3zqqg82a324c"; depends=[]; }; - binomialcftp = derive { name="binomialcftp"; version="1.0"; sha256="00c7ymlxk1xnx3x1814x7bcyir7q5sy4rb82dcpzf2bdly4xa1qr"; depends=[]; }; - binomlogit = derive { name="binomlogit"; version="1.2"; sha256="1njz1g9sciwa8q6h0zd8iw45vg3i1fwcvicj5y8srpk8wqw3qp7k"; depends=[]; }; - binomSamSize = derive { name="binomSamSize"; version="0.1-3"; sha256="0hryaf0y3yjxp84c0k80mhxj8zzlad697bv2yrvcjvllkzdvzbm7"; depends=[binom]; }; - binomTools = derive { name="binomTools"; version="1.0-1"; sha256="14594i7iapd6hy4j36yb88xmrbmczg8zgbs0b6k0adnmqf83bn4v"; depends=[]; }; - binr = derive { name="binr"; version="1.0"; sha256="0wgc78kx51qfn5wfzll5nz8iwanixkyb5sbqwi40fak93bvycklm"; depends=[]; }; - binseqtest = derive { name="binseqtest"; version="1.0"; sha256="103nbi3zq9m632665iqz0z79v963ixhd5xrjfx6drwpfp4i69pbl"; depends=[clinfun]; }; - Biodem = derive { name="Biodem"; version="0.3"; sha256="0wfyypr46awki2nrvhcjwacmaxrr2wvhdv9hddnf10msssflvshc"; depends=[]; }; - BiodiversityR = derive { name="BiodiversityR"; version="2.4-4"; sha256="1sgjvjhvfdljjap69hi3f5j0ma9nikh43vgzbj8zkrz95d3jwd66"; depends=[Rcmdr]; }; - BioGeoBEARS = derive { name="BioGeoBEARS"; version="0.2.1"; sha256="0wyddc5ma47ljpqipfkwsgddp12m9iy4kqwwgklyhf0rqia56b1h"; depends=[rexpokit cladoRcpp ape phylobase optimx FD xtable plotrix gdata]; }; - Biograph = derive { name="Biograph"; version="2.0.4"; sha256="1mik5yvbi28xnyzha8p3xjaa064x29wgn18yx766wha7djxxr353"; depends=[etm msm Epi lubridate reshape plyr survival mstate ggplot2]; }; - bio_infer = derive { name="bio.infer"; version="1.3-3"; sha256="14pdv6yk0sk6v8g9p6bazbp7mr3wmxgfi6p6dj9n77lhqlvjcgm9"; depends=[]; }; - biom = derive { name="biom"; version="0.3.12"; sha256="18fmzp2zqjk7wm39yjlln7mpw5vw01m5kmivjb26sd6725w7zlaa"; depends=[plyr RJSONIO Matrix]; }; - BioMark = derive { name="BioMark"; version="0.4.2"; sha256="17r4q2migmdk2vqfbr69q07cgdzwpjgs3ijmnm42srs5d3brw8cr"; depends=[pls glmnet MASS st]; }; - BiomarkeR = derive { name="BiomarkeR"; version="1.3"; sha256="0djhqindpmzx6kkj17db6d1n3w5v5wl1l3z14lnl0r2k1hf276fy"; depends=[igraph Hmisc]; }; - biomod2 = derive { name="biomod2"; version="3.1-48"; sha256="1qsxzgikzxvgfrvm3lqfbwk1fnd55z1jgi9d6nyjxxcmn65lgx5l"; depends=[sp raster reshape abind rasterVis pROC nnet gbm mda randomForest rpart MASS]; }; - bionetdata = derive { name="bionetdata"; version="1.0"; sha256="1y5nnyfzbdk8673jyi733j4ncsc62kbsn1b8ghq10cb4xzxf2mvf"; depends=[]; }; - biopara = derive { name="biopara"; version="1.5"; sha256="1fhhs6lkm3iphlkx6wklh9sgr1mkjkka9wv2m8fnk0xw01bdsyl5"; depends=[]; }; - BioPhysConnectoR = derive { name="BioPhysConnectoR"; version="1.6-10"; sha256="1cc22knlvbvwsrz2a7syk2ampm1ljc44ykv5wf0szhnh75pxg13l"; depends=[snow matrixcalc]; }; - bioPN = derive { name="bioPN"; version="1.2.0"; sha256="0mvqgsfc7d4h6npgg728chyp5jcsf49xhnq8cgjxfzmdayr1fwr8"; depends=[]; }; - bios2mds = derive { name="bios2mds"; version="1.2.2"; sha256="1avzkbk91b7ifjba5zby5r2yw5mibf2wv05a4nj27gwxfwrr21cd"; depends=[amap e1071 scales cluster rgl]; }; - BioStatR = derive { name="BioStatR"; version="1.0.4"; sha256="043fakac56kf1mdmwlm8q3hjdxlclissxbkv26y2brqp2sfr01pb"; depends=[]; }; - biotools = derive { name="biotools"; version="1.2"; sha256="0wiv10qqah6yp5kwsndv48agnvrfl3j04pj0nsyiwyf9nvajxvic"; depends=[rpanel tkrplot MASS boot]; }; - bipartite = derive { name="bipartite"; version="2.04"; sha256="0rp2j2ip8523jmvgvbnj56q49yazwz2wqyqc0l00flvp4920svf0"; depends=[vegan sna fields igraph MASS permute]; }; - biplotbootGUI = derive { name="biplotbootGUI"; version="1.0"; sha256="0pgm31nhh1b78a8ciqjxw7gf3j7hh9wjc3myj29jpl92flbqmsw0"; depends=[rgl tkrplot vegan tcltk2]; }; - BIPOD = derive { name="BIPOD"; version="0.2.1"; sha256="04r58gzk3hldbn115j9ik4bclzz5xb2i3x6b90m2w9sq7ymn3zg1"; depends=[Rcpp]; }; - birdring = derive { name="birdring"; version="1.1"; sha256="0j24s1vwf848bpswphzf0liyyda9rknh03gnqpflk66imxkbvgxc"; depends=[geosphere ks lazyData raster rgdal rgeos rworldmap rworldxtra sp]; }; - birk = derive { name="birk"; version="1.0"; sha256="09arzwpgcanp6cds70rr7qnpnva0fag88k1gg9yhg4k0yvbhqdbd"; depends=[]; }; - bisectr = derive { name="bisectr"; version="0.1.0"; sha256="1vjsjshvzj66qqzg32rviklqswrb00jyq6vwrywg1hpqhf4kisv7"; depends=[devtools]; }; - BiSEp = derive { name="BiSEp"; version="1.0"; sha256="1iw3ask3gpjhx0gnjgl3402fygi7bnsrha6dfxfsmyzz94im352x"; depends=[mclust]; }; - bisoreg = derive { name="bisoreg"; version="1.1"; sha256="16d6nxbj18y6wv57nxbmwv0gypsgf7hw76hsyv0fhydrkf404igb"; depends=[bootstrap monreg R2WinBUGS coda]; }; - bit = derive { name="bit"; version="1.1-12"; sha256="0a6ig6nnjzq80r2ll4hc74za3xwzbzig6wlyb4dby0knzf3iqa6f"; depends=[]; }; - bit64 = derive { name="bit64"; version="0.9-4"; sha256="1w734l5ayr7w17a3gk2kmkqwz7v5jm830kfhyqmnd15i816lnjb9"; depends=[bit]; }; - bitops = derive { name="bitops"; version="1.0-6"; sha256="176nr5wpnkavn5z0yy9f7d47l37ndnn2w3gv854xav8nnybi6wwv"; depends=[]; }; - bivarRIpower = derive { name="bivarRIpower"; version="1.2"; sha256="0vgi0476rwali6k8bkp317jawzq5pf04v75xmycpmadb7drnpzy0"; depends=[]; }; - biwavelet = derive { name="biwavelet"; version="0.17.3"; sha256="08lj0v53l9s12pssy3hgzys988w3y490nab7js655ljs825d2lpc"; depends=[fields]; }; - biwt = derive { name="biwt"; version="1.0"; sha256="1mb3x8ky3x8j4n8d859i7byyjyfzq035i674b2dmdca6mn7paa14"; depends=[rrcov MASS]; }; - bizdays = derive { name="bizdays"; version="0.1.5"; sha256="0y25sm77chk77s4wdb5a4r583ks44mpny9w8c8azbx7nhcvfb4yq"; depends=[]; }; - BlakerCI = derive { name="BlakerCI"; version="1.0-4"; sha256="1sa9qq5frjjcw46p3ankn7v3gj0gwn9lww6jacz8flf5qpplhn4l"; depends=[]; }; - Blaunet = derive { name="Blaunet"; version="1.0.1"; sha256="1qcp5wag4081pcjg5paryxz3hk3rqql15v891ppqc1injni7rljz"; depends=[network]; }; - BLCOP = derive { name="BLCOP"; version="0.2.8"; sha256="1x4dq7ri23wyhdz4hb80iqwwfijg8a3bj0nqgh4rvrwwdjx96ikv"; depends=[MASS quadprog]; }; - blender = derive { name="blender"; version="0.1.2"; sha256="1qqkfgf7fzwcz88a43cqr8bw86qda33f18dg3rv1k77gpjqr999c"; depends=[vegan]; }; - blighty = derive { name="blighty"; version="3.1-4"; sha256="1fkz3vfcnciy6rfybddcp5j744dcsdpmf7cln2jky0krag8pjzpn"; depends=[]; }; - blkergm = derive { name="blkergm"; version="1.0"; sha256="00xqmqn7y3vwygfx2v6kqm52n96vxlip2yk09gf30cqn2p3b6sck"; depends=[ergm ergm_userterms]; }; - blm = derive { name="blm"; version="2013.2.4.4"; sha256="1w6c30cq38j4i1q4hjg12l70mhy5viw886l1lsnxyvniy113in4i"; depends=[]; }; - blme = derive { name="blme"; version="1.0-2"; sha256="11m98j9xr6w0hfcss4bbx2aa34gnc5p9if9r8ilw9ify18by77np"; depends=[lme4]; }; - blockcluster = derive { name="blockcluster"; version="3.0.1"; sha256="1lxm20f8dhxfnm13j08sj7h3sfwc8limyqn8n87c3kl87066gdaq"; depends=[Rcpp]; }; - blockmatrix = derive { name="blockmatrix"; version="1.0"; sha256="14k69ly4i8pb8z59005kaf5rpv611kk1mk96q6piyn1gz1s6sk6r"; depends=[]; }; - BlockMessage = derive { name="BlockMessage"; version="1.0"; sha256="1jrcb9j1ikbpw098gqbcj29yhffa15xav90y6vpginmhbfpwlbf4"; depends=[]; }; - blockmodeling = derive { name="blockmodeling"; version="0.1.8"; sha256="0x71w1kysj9x6v6vsirq0nndsf6f3wzkf8pbsq3x68sf4cdji1xl"; depends=[]; }; - blockrand = derive { name="blockrand"; version="1.3"; sha256="1090vb26w6s7iqjcal0xbb3qb6p6j46a5w25f1wjdppd1spvh7f9"; depends=[]; }; - blockTools = derive { name="blockTools"; version="0.6-1"; sha256="10f2rkailk0bvg5hj9hxy0p3snknbpvsydx3cpsy0n6y5srwhrfr"; depends=[MASS]; }; - blowtorch = derive { name="blowtorch"; version="1.0.1"; sha256="19z2z2alq5lr3f4nmjzpmyxssxalwfkm437bsjnzyf0r3zvycy9c"; depends=[ggplot2 foreach iterators]; }; - BLR = derive { name="BLR"; version="1.3"; sha256="02p29p06vhh8gxkfnqdf9niq09bygshmiipvd3q19k92g0a10l69"; depends=[SuppDists]; }; - BMA = derive { name="BMA"; version="3.17.1"; sha256="0lq42qn82969vhk2vdyxb1d7lrqqgp8793m9rlzgg011c6b38qam"; depends=[survival leaps robustbase]; }; - BMAmevt = derive { name="BMAmevt"; version="1.0"; sha256="0cy3h81xd1jjg7fdwndb5az67cp7kn1wp87p17za8506vyxj1pa0"; depends=[coda]; }; - bmd = derive { name="bmd"; version="0.5"; sha256="0d4wxyymycb416sdn272292l70s1h2m5kv568vakx3rbvb8y6agy"; depends=[drc]; }; - bmem = derive { name="bmem"; version="1.5"; sha256="1miiki743rraralk9dp12dsjjajj3iizcrfwmplf6xas6pl8sfk6"; depends=[Amelia MASS lavaan sem snowfall]; }; - BMhyd = derive { name="BMhyd"; version="1.2-2"; sha256="09gb1pq9y3gq9avpaqrlxdsm9iqsxpbnr0bg2mw1vkhc0d5z8zv7"; depends=[corpcor numDeriv]; }; - Bmix = derive { name="Bmix"; version="0.3"; sha256="0p3ks3miniz356spmdikynwa7yrdk1mwlpz081fnkjnwxa3kdsw7"; depends=[mvtnorm]; }; - bmk = derive { name="bmk"; version="1.0"; sha256="1wxkrlrhmsxsiraj8nyiax9bqs834ln2swykmpf40wxspkykgfdq"; depends=[coda plyr functional]; }; - bmmix = derive { name="bmmix"; version="0.1-2"; sha256="00php2pgpnm9n0mnamchi6a3dgaa97kdz2ynivrf38s0vca7fqx8"; depends=[ggplot2 reshape2]; }; - BMN = derive { name="BMN"; version="1.02"; sha256="12gyq01cn6a9ixqgki1ihx5jrp2gw6jdj7q210rb12xlvj3p6x7w"; depends=[]; }; - bmp = derive { name="bmp"; version="0.2"; sha256="059ps1sy02b22xs138ba99fkxq92vzgfbyf2z5pyxwzszahgy869"; depends=[]; }; - bmrm = derive { name="bmrm"; version="1.8"; sha256="1kw9i84v5larzy79aghp08760krp29xlwrjg4mh9fsa9nl9wxqda"; depends=[clpAPI kernlab]; }; - BMS = derive { name="BMS"; version="0.3.3"; sha256="1yj9vi8jvhkwpcjkclf0zbah0dayridklpj65ay6r18fyf4crnd2"; depends=[]; }; - bnlearn = derive { name="bnlearn"; version="3.6"; sha256="0q5w5lsjgr7lgfgb7yhybq5ixaps2p91gx19l6dg2xlxw2m5fnab"; depends=[]; }; - BNPdensity = derive { name="BNPdensity"; version="2013.8"; sha256="1qlhav764ji289kcibbmqjj62mmxiw3zsiwjz1gkifzgpmzyar85"; depends=[]; }; - bnpmr = derive { name="bnpmr"; version="1.1"; sha256="0hvwkdbs2p2l0iw0425nca614qy3gsqfq4mifipy98yxxvgh8qgc"; depends=[]; }; - boa = derive { name="boa"; version="1.1.7-2"; sha256="1n7i0i8jq2sa1kzhbgyqzl9d53wja7fsxd7rligc8xjm0sdsb386"; depends=[]; }; - BOG = derive { name="BOG"; version="1.1"; sha256="0lr2n4j32b7qzmyb2048kssc7sbchivhi2a8skmahhjl85jgy166"; depends=[hash DIME]; }; - boilerpipeR = derive { name="boilerpipeR"; version="1.2"; sha256="00r8rlwx9qkfqk8x0mcskklz3skvnmcc55r9pd9rqxz7sp7s71h5"; depends=[rJava]; }; - bold = derive { name="bold"; version="0.1.2"; sha256="0fjsnn9iqvlhgq9l5r17l5125arlsaz68pgd3b9i7596767zm1f2"; depends=[XML httr stringr assertthat]; }; - Bolstad = derive { name="Bolstad"; version="0.2-25"; sha256="1dj0ib3jndnsdx2cqsy0dz54szdx1xq3r2xqnxzk4ysng6svdym8"; depends=[]; }; - Bolstad2 = derive { name="Bolstad2"; version="1.0-28"; sha256="08cfadvl9jl9278ilsf8cm2i2a3i8zsa2f3vjzw2nlv85fwi2c7v"; depends=[]; }; - boolean3 = derive { name="boolean3"; version="3.1.5"; sha256="0ayjiff1mv7mvzfbqlxryg3vmmq85a63yslw4rk04awh5k4kpr88"; depends=[optimx numDeriv lattice rgenoud mvtnorm rlecuyer]; }; - BoolNet = derive { name="BoolNet"; version="2.0"; sha256="1zg6knqdmcx1wv6i72fpyh86jjkhb9k0xplaczcxfx2f294y4bfr"; depends=[]; }; - Boom = derive { name="Boom"; version="0.1"; sha256="03xsfzfl1wvhbd6d1blhwx4dd0vpf7kaha2f50p6q17q6c1ph2vv"; depends=[MASS]; }; - BoomSpikeSlab = derive { name="BoomSpikeSlab"; version="0.4.1"; sha256="0s0pbb5dmry736x19li5g364kirvhkhpyjm5q0kp5nvq83bi1hq0"; depends=[Boom]; }; - boostr = derive { name="boostr"; version="1.0.0"; sha256="123ag8m042i1dhd4i5pqayqxbkfdj4z0kq2fyhxfy92a7550gib2"; depends=[foreach iterators stringr]; }; - boostSeq = derive { name="boostSeq"; version="1.0"; sha256="0sikyzhn1i6f6n7jnk1kb82j0x72rj8g5cimp2qx3fxz33i0asx6"; depends=[genetics lpSolveAPI]; }; - boot = derive { name="boot"; version="1.3-11"; sha256="0s8v5mpyz2pqmm0kk8qkjiqr3wb1j1mqazx5hgsdabq6ga85ah8j"; depends=[]; }; - bootES = derive { name="bootES"; version="1.01"; sha256="00y901d5cjdpzras5w6mv851h5zgp36m5ib6dazs4vqrfpqymva8"; depends=[boot]; }; - bootfs = derive { name="bootfs"; version="1.4.2"; sha256="1qac7v0yzhxzqbdhkpgb4z1gqr6v6hjyb2y5lsxlq5dg1ka1cnb0"; depends=[pROC igraph ROCR gbm colorRamps gplots gtools pamr randomForest Boruta caret tgp mlegp penalizedSVM]; }; - bootLR = derive { name="bootLR"; version="0.9"; sha256="0p4hq8nfdd8jw8r8dmlb6va4g7jjnkbsah69hissa9lqawbj9pi7"; depends=[boot]; }; - BootPR = derive { name="BootPR"; version="0.60"; sha256="03zw7hz4gyhp6iq3sb03pc5k2fhvrpkspzi22zks25s1l7mq51bi"; depends=[]; }; - bootRes = derive { name="bootRes"; version="1.2.3"; sha256="0bb7w6wyp9wjrrdcyd3wh44f5sgdj07p5sz5anhdnm97rn1ib6dz"; depends=[]; }; - bootruin = derive { name="bootruin"; version="1.2-1"; sha256="1ii1fcj8sn9x82w23yfzxkgngrgsncnyrik4gcqn6kv7sl58f4r3"; depends=[]; }; - bootspecdens = derive { name="bootspecdens"; version="3.0"; sha256="0hnxhfsc3ac4153lrjlxan8xi4sg1glwb5947ps6pkkyhixm0kc1"; depends=[MASS]; }; - bootStepAIC = derive { name="bootStepAIC"; version="1.2-0"; sha256="0p6v4zjsaj1p6c678010fazdh40lpv0rvhczd1halj8aic98avdx"; depends=[MASS]; }; - bootstrap = derive { name="bootstrap"; version="2014.4"; sha256="1kf5jml03yfqz2868jbnjvy839x09ml0niyq85va503pq8gmj5br"; depends=[]; }; - bootSVD = derive { name="bootSVD"; version="0.1"; sha256="1rzwp8kadyc0dg6lscag586xliapp1ninz7qxczl8jmxa9sx9z89"; depends=[]; }; - Boruta = derive { name="Boruta"; version="3.1.0"; sha256="0dmg8yyx6bb5s6glqsajk0qqf6xwb8qzwi6gbi5agd3i57xm8nak"; depends=[randomForest rFerns]; }; - boss = derive { name="boss"; version="2.1"; sha256="1knsnf19b1xvvq20pjiv56anbnk0d51aq6z3ikhi8y92ijkzh0y8"; depends=[lme4 geepack Matrix ncdf]; }; - BoSSA = derive { name="BoSSA"; version="1.2"; sha256="0rvb6y7jwy0nmjvnpkim09fdph5kazg8cr0jchnz1s46n16gvc96"; depends=[ape SoDA]; }; - boussinesq = derive { name="boussinesq"; version="1.0.3"; sha256="1j1jarc3j5rby1wvj1raj779c1ka5w68z7v3q8xhzjcaccrjhzxk"; depends=[]; }; - boxplotdbl = derive { name="boxplotdbl"; version="1.2.2"; sha256="01bvp6vjnlhc4lndxwd705bzlsh7zq0i9v66mxszrcz6v8hb9rwi"; depends=[]; }; - bpca = derive { name="bpca"; version="1.2-2"; sha256="05ldz6b2s379mymj8jzvia9x6gj047gwsxvnv3zj9x8b1hvndnd6"; depends=[scatterplot3d rgl]; }; - bpcp = derive { name="bpcp"; version="1.1.0"; sha256="15dy3bbpazm4g72lwdf925f13a4dpdhi771283564v9f3n7qm3qf"; depends=[]; }; - bPeaks = derive { name="bPeaks"; version="1.2"; sha256="1z6jghcmw0lwv17ms7gdp5zzimaawq3ahbwkxa4062g373592smd"; depends=[]; }; - bpkde = derive { name="bpkde"; version="1.0-4"; sha256="142wmbs7hm5rs6vfgkg5q1rcc2jvg87kpxc8jbywf620ryycpc5z"; depends=[]; }; - bqtl = derive { name="bqtl"; version="1.0-30"; sha256="1v1p3wvqm5hmwpnjqaz8vlpzm036gpzpxsvy7m0v4x7nc5vrq7g6"; depends=[]; }; - BradleyTerry2 = derive { name="BradleyTerry2"; version="1.0-5"; sha256="131z9ccfh55inlczy5wnzni2pch4brs6nzjrg8f5xnvkpyy6jqsp"; depends=[lme4 brglm gtools]; }; - BrailleR = derive { name="BrailleR"; version="0.9"; sha256="11aygays2f3qy6z8x8srs9d7saggqpcamns36f7dbcc94b84aqkj"; depends=[]; }; - brainR = derive { name="brainR"; version="1.2"; sha256="1515v6kk73p4s3vrnkpkilfxfyqrf7b762sq6j364ygsyfybvh2z"; depends=[rgl misc3d oro_nifti]; }; - brainwaver = derive { name="brainwaver"; version="1.6"; sha256="0r79dpd9bbbn34rm29512srzj3m29qgvbryvrp1mwv8mmcsh6ij6"; depends=[waveslim]; }; - branchLars = derive { name="branchLars"; version="1.0"; sha256="1adk9j77ynv7y8q04nvb468ik4nq4ff3j2nbxw596kgg5bg1ymz0"; depends=[lars]; }; - breakage = derive { name="breakage"; version="1.0-1"; sha256="1zn0hxkz4zqhrfny75gkp2sgc0fs4v3y940aw32fmjh4j8kl3n4j"; depends=[Imap]; }; - breakaway = derive { name="breakaway"; version="1.0"; sha256="1agigb3b2ff1p9lx9ndz4hs1sgyv1g2zjb41l5p23370i5gk1nbn"; depends=[]; }; - breakpoint = derive { name="breakpoint"; version="1.0"; sha256="0clmrad4ycpi0rxrvkh4agwixdayypjdnk3lfyb5g2w2hngrxv73"; depends=[ggplot2 foreach]; }; - bReeze = derive { name="bReeze"; version="0.3-2"; sha256="1k5xc3ymi53pib4hpgy9x6s5c6dvw5v1xrqyiqmbzx2djfw65dr5"; depends=[RColorBrewer]; }; - brew = derive { name="brew"; version="1.0-6"; sha256="1vghazbcha8gvkwwcdagjvzx6yl8zm7kgr0i9wxr4jng06d1l3fp"; depends=[]; }; - brglm = derive { name="brglm"; version="0.5-9"; sha256="14hxjamxyd0npak8wyfmmb17qclj5f86wz2y9qq3gbyi2s1bqw2v"; depends=[profileModel]; }; - bride = derive { name="bride"; version="1.3"; sha256="03k9jwklg1l8sqyjfh914570880ii0qb5dd9l0bg0d0qrghbj0rk"; depends=[]; }; - brnn = derive { name="brnn"; version="0.3"; sha256="0fpmjmxzcsxqv3vfy568r7js0zpydh2q70vw2s8yki2jzxl4gsl9"; depends=[Formula]; }; - Brobdingnag = derive { name="Brobdingnag"; version="1.2-4"; sha256="1saxa492f32f511vw0ys55z3kgyzhswxkylw9k9ccl87zgbszf3a"; depends=[]; }; - broman = derive { name="broman"; version="0.48-2"; sha256="0w3fxs753ds2d4vzz7mck3cdjh4d1mjbwdbzqkb2rxdx5l4w2jp8"; depends=[assertthat]; }; - Brq = derive { name="Brq"; version="1.0"; sha256="0m01qw0mh9za1gx1vkbyvwny4k5fvmvs9dbp0504q8jqfqf4l1vj"; depends=[quantreg truncnorm]; }; - BRugs = derive { name="BRugs"; version="0.8-3"; sha256="1qjwm6qizg70nvpl5p2yx65ynghazchqw7d2iadhdjz7dd293sqi"; depends=[coda]; }; - BSagri = derive { name="BSagri"; version="0.1-8"; sha256="148pr4lkgdi4bwc9lavgj356nh240iazz28xklq14rw4gzhmz2k4"; depends=[gamlss multcomp MCPAN mvtnorm boot mratios]; }; - BSDA = derive { name="BSDA"; version="1.01"; sha256="06mgmwwh56bj27wdya8ln9mr3v5gb6fcca7v9s256k64i19z12yi"; depends=[e1071 lattice]; }; - bshazard = derive { name="bshazard"; version="1.0"; sha256="151c63pyapddc4z77bgkhmd7rsa1jl47x8s2n2s8yc6alwmj6dvs"; depends=[survival Epi]; }; - BsMD = derive { name="BsMD"; version="2013.0718"; sha256="1yvazqlbmm221r7nkhrhi309gkk6vx7ji5xlvf07klya2zg20gcj"; depends=[]; }; - bspec = derive { name="bspec"; version="1.4"; sha256="1iq66hx4d0f5pvsh6qcsd2kzm913aqil4w66bfshj192fwbfziix"; depends=[]; }; - bspmma = derive { name="bspmma"; version="0.1-1"; sha256="0bd6221rrbxjvabf1lqr9nl9s0qwav47gc56sxdw32pd99j9x5a9"; depends=[]; }; - BSquare = derive { name="BSquare"; version="1.1"; sha256="1s16307m5gj60nv4m652iisyqi3jw5pmnvar6f52rw1sypfp5n49"; depends=[quadprog quantreg VGAM]; }; - BSSasymp = derive { name="BSSasymp"; version="1.0-2"; sha256="1m0rssdi4v68sm28x99j5igcl3z2hnlj8f4wx9xxxbj4l6mqy6yv"; depends=[fICA JADE]; }; - bst = derive { name="bst"; version="0.3-4"; sha256="1s7qv2q9mcgg1c5mhblqg3nk9hary4pq6z0xgi3a6rs1929mgdyf"; depends=[rpart gbm]; }; - bstats = derive { name="bstats"; version="1.1-11-5"; sha256="15is47404zlcqrniydhxc9ssixnm846spxcfds4cjg9d9x3mdscj"; depends=[]; }; - bsts = derive { name="bsts"; version="0.5.1"; sha256="0qzyrn8zbfxrplyw04yrcakig6lc1i8fpwl893vbzciyhwmrjlya"; depends=[BoomSpikeSlab zoo xts Boom]; }; - btf = derive { name="btf"; version="1.1"; sha256="0n1h4hmjpvj97mpvannh3s5l08m4zfv0w64hrgdv4s5808miwfzc"; depends=[Matrix coda]; }; - BTYD = derive { name="BTYD"; version="2.3"; sha256="032xcy4z3gs4kqn91z7l6anp1vn5j60g32k2h87jx2aymy796cl0"; depends=[gsl Matrix]; }; - bujar = derive { name="bujar"; version="0.1-4"; sha256="0v48mkg78sy91z1z4xvy2r3xmay74615kzqxjqlclkk20999z56m"; depends=[mda ncvreg mboost gbm earth elasticnet rms]; }; - BurStFin = derive { name="BurStFin"; version="1.02"; sha256="16w2s0bg73swdps9r0i8lwvf1najiqyx7w7f91xrsfhmnqkkjzka"; depends=[]; }; - BurStMisc = derive { name="BurStMisc"; version="1.00"; sha256="0718a1p7iiqkfhhmnzxggc6hd8sm847n1qh7rfbdl8b0k0bgvnj0"; depends=[]; }; - bursts = derive { name="bursts"; version="1.0-1"; sha256="172g09d1vmwl83xs6gr4gfblqmx3apvblpzdr5d7fcw1ybsx0kj6"; depends=[]; }; - bvenn = derive { name="bvenn"; version="0.1"; sha256="1xrya49w5bd2b7plfxpqla60b2828rkm0rjmc4qnqzvrahsbal0y"; depends=[]; }; - bvls = derive { name="bvls"; version="1.4"; sha256="18aaf7kk5mks3a59wwqhm1ckpn6s704l9m5nzy0x5iw0s98ijbm2"; depends=[]; }; - bvpSolve = derive { name="bvpSolve"; version="1.2.4"; sha256="1ss25md3q59cm40rxw29x9421xjc7gd964hx9xwvx4h8dis34rgd"; depends=[rootSolve deSolve]; }; - BVS = derive { name="BVS"; version="4.12.1"; sha256="111g61bpwh80v6gy44q087swcrnnnzdcibm22pzzi9jsfphy6l0c"; depends=[MASS msm haplo_stats]; }; - c060 = derive { name="c060"; version="0.2-3"; sha256="1lynkmdlqi41szrpqqa79d5i65lindqgi0dwqpvvw94yjnbnm6b3"; depends=[glmnet survival mlegp tgp peperr penalizedSVM lattice]; }; - c3net = derive { name="c3net"; version="1.1.1"; sha256="0m4nvrs41kmlakc6m203zlncqwgj94wns8kzcb31xngjcacmcq42"; depends=[igraph]; }; - C50 = derive { name="C50"; version="0.1.0-19"; sha256="1x8a284w1fffvvd7mx3xn1i7sr266wq7j6k0d0v8rln2fwilkd07"; depends=[]; }; - ca = derive { name="ca"; version="0.55"; sha256="1mk6hias079ys4khlq0mb4z80mcqhml2n8fdiyfcxy61vj522yb8"; depends=[]; }; - cabootcrs = derive { name="cabootcrs"; version="1.0"; sha256="0a6y04jq837k1pk8b9nhgz7rima7s8jid6vdjyfvrqshgaiabg1q"; depends=[]; }; - cacher = derive { name="cacher"; version="1.1-2"; sha256="17zw30mpi1vrgk1jsxqpw2id3k78rrs6i55kq0yl64aikmq91c0v"; depends=[]; }; - cacheSweave = derive { name="cacheSweave"; version="0.6-1"; sha256="0w30ryd24x2z204k8j41knayq3ax4b5zf0ai1andgdzjvf5jmmas"; depends=[filehash stashR digest]; }; - cacIRT = derive { name="cacIRT"; version="1.3"; sha256="1qd9qw47d9dmxhnva3ik62q5rfcw0pd1ha1y689345nl05wysjkh"; depends=[]; }; - CaDENCE = derive { name="CaDENCE"; version="1.2.1"; sha256="1l6mqra36syvpg9aqh4p6ndj3yj50rabx8hh788zpy4n57m5lpv7"; depends=[]; }; - CADFtest = derive { name="CADFtest"; version="0.3-2"; sha256="00nsnzgjwkif7mbrw7msswjxhi9aysjdx3qg3i4mdmj1rmp7c4dc"; depends=[dynlm sandwich tseries urca]; }; - cAIC4 = derive { name="cAIC4"; version="0.2"; sha256="13sp3wywv82wgi1vsbxwn68v9xigy0fi3mcwyxjmmgmnsxns2fza"; depends=[lme4 Matrix]; }; - Cairo = derive { name="Cairo"; version="1.5-6"; sha256="0x5xd2xq5q8a3kzmz7f9bawg3j131rhyb3s7w34acg7rd79l1935"; depends=[]; }; - cairoDevice = derive { name="cairoDevice"; version="2.20"; sha256="1v9sdv35a1sl42gsz1y9jw1p6fr19yny07cc2pwmcrb4vs5lhysf"; depends=[]; }; - CALIBERrfimpute = derive { name="CALIBERrfimpute"; version="0.1-6"; sha256="036nwnday098mawc9qlgl3jjjcdjnja1immg6xkq27hvv2xfbz82"; depends=[mice mvtnorm randomForest]; }; - calibrate = derive { name="calibrate"; version="1.7.2"; sha256="010nb1nb9y7zhw2k6d2i2drwy5brp7b83mjj2w7i3wjp9xb6l1kq"; depends=[MASS]; }; - calibrator = derive { name="calibrator"; version="1.2-6"; sha256="1arprrqmczbhc1gl85fh37cwpcky8vvqdh6zfza3hy21pn21i4kh"; depends=[emulator cubature]; }; - CALINE3 = derive { name="CALINE3"; version="1.0-2"; sha256="07w1kb7wqdi1qslpvpmqcmq6da4h7sgwv3aih4brdprym61c3rkm"; depends=[]; }; - calmate = derive { name="calmate"; version="0.11.0"; sha256="1zy836nk607ra67q0x7yc4czkcn9ffzlipzhr4mhjk6l5d8sys2q"; depends=[R_utils aroma_core MASS R_methodsS3 R_oo matrixStats R_filesets]; }; - CAMAN = derive { name="CAMAN"; version="0.71"; sha256="1pfdypzj0s1nrlyzlam7pprggiriksfdri5xpmm43gmx3bybx8zb"; depends=[sp mvtnorm]; }; - camel = derive { name="camel"; version="0.2.0"; sha256="0krilird8j69zbll96k46pcys4gfkcnkisww138wslwbicl52334"; depends=[lattice igraph MASS Matrix]; }; - cancerTiming = derive { name="cancerTiming"; version="2.0.0"; sha256="0p5hxzhql2rlyx334d8km676va50ql73kxsqjr15q80z7zffyq9d"; depends=[LearnBayes]; }; - candisc = derive { name="candisc"; version="0.6-5"; sha256="0rbmfyhnyaq1j7sql2sgi47ahrggbb71z2z5pw2gg16kd2f465qk"; depends=[car heplots]; }; - cape = derive { name="cape"; version="1.2"; sha256="01bh8lngp346w6pjvbw4jllbr8f9f8ypsxv6c9p6zv5l7w5yzri8"; depends=[corpcor evd qpcR Matrix igraph fdrtool]; }; - 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]; }; - capme = derive { name="capme"; version="1.3"; sha256="0d4acwp4y8djcry8gr34dx3h8bn8sj3z2di5zl9657czw5289zm8"; depends=[lpSolve]; }; - 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-20"; sha256="0dbq3ndw9srrf7pp7wl8gj7cwcgggnjh4i6c9aqmrap7wnaa14fb"; depends=[MASS nnet]; }; - CARBayes = derive { name="CARBayes"; version="3.0"; sha256="0wflay6k159cw8149qb4ib1mlpsbgddlbkiyfxd4qz3vwl06dg3q"; depends=[MASS Rcpp truncdist spam coda]; }; - CARBayesST = derive { name="CARBayesST"; version="1.0"; sha256="1mn2g9i39pzq0jvz1qml41mf1bj6qx3cp5c3hszgm8vbamc2a1xx"; depends=[Rcpp truncdist coda]; }; - carcass = derive { name="carcass"; version="1.2"; sha256="104lpqs65h9z8d3bl0m1f30anadk9hq4sg2ahgppm5n3d4yhcdl5"; depends=[lme4 survival expm arm]; }; - cardidates = derive { name="cardidates"; version="0.4.5"; sha256="1zw8c8jiq8bz748xppwj88z1882qk7k2r0k2gkrsvw7b6c9h35pb"; depends=[boot pastecs]; }; - care = derive { name="care"; version="1.1.5"; sha256="1gvx4a88ci7428sxna74jxfi8ykzjgnarc18mvm8h3mk7i03r4mj"; depends=[corpcor]; }; - CARE1 = derive { name="CARE1"; version="1.1.0"; sha256="1zwl4zv60mrzlzfgd7n37jjlr0j918a8ji36n94s5xw8wwipiznw"; depends=[]; }; - caret = derive { name="caret"; version="6.0-30"; sha256="11298kqidv69zfaqzf7px539dchvkk64ilxy8k55nx37pn665v01"; depends=[lattice ggplot2 car reshape2 foreach plyr nlme BradleyTerry2]; }; - caribou = derive { name="caribou"; version="1.1"; sha256="0ibl3jhvsgjfcva0113z0di9n5n30bs90yz0scckfv1c0pjhn4xd"; depends=[]; }; - CarletonStats = derive { name="CarletonStats"; version="1.1"; sha256="18pd1hi8bnbv0sdixw746xvdg9szvng422yj12mk0k50v60403xg"; depends=[]; }; - caroline = derive { name="caroline"; version="0.7.6"; sha256="1afxxbrd7w628l4pxdmvwbs7mbgxlhnfq3nxk2s93w47gn7r9fp7"; depends=[]; }; - CARramps = derive { name="CARramps"; version="0.1.2"; sha256="097xxvql6qglk6x4yi7xsvr15n0yj21613zv003z0mhgvqr1n5vf"; depends=[]; }; - CARrampsOcl = derive { name="CARrampsOcl"; version="0.1.4"; sha256="1sdrir7h7xl1imipm9b71vca062dxqsqd8mg3w9f3s80x2aghxl8"; depends=[OpenCL fields]; }; - caschrono = derive { name="caschrono"; version="1.4"; sha256="1l9hmsacynh73kh14jrp7a42385v78znn9ll1jchzgkyz2x4dibw"; depends=[forecast Hmisc its timeSeries]; }; - caseMatch = derive { name="caseMatch"; version="1.0"; sha256="1nq1ca59akdsp1a5j3y252zy3fcw5908a7k83k93gjy7j1m7q6f8"; depends=[]; }; - cat = derive { name="cat"; version="0.0-6.5"; sha256="1gv7chqp6kccipkrxjwhsa7yizizsmk4pj8672rgjmpfcc64pqfm"; depends=[]; }; - catdata = derive { name="catdata"; version="1.2"; sha256="0907sr7kjlr47sxaxvkk3za5j2rn6zvckkgjc9inr5hrn5nv5hsv"; depends=[MASS]; }; - CatDyn = derive { name="CatDyn"; version="1.0-5"; sha256="1syc40256104nm8n7h5b7w3ia2iya0y47p1sdxk8g1dy4l5wnalm"; depends=[optimx BB]; }; - catenary = derive { name="catenary"; version="1.1"; sha256="0khdk61fh8ngr70qf9i2655h5nblj98r8zl724ljv1cjb5x1vphv"; depends=[ggplot2 boot]; }; - cati = derive { name="cati"; version="0.8"; sha256="0kz58dyq5jacf2w2nvhyh3dvk0vgcrm7fjfirywykbrbh5srfw2a"; depends=[nlme ade4 ape e1071 mice rasterVis hypervolume]; }; - catIrt = derive { name="catIrt"; version="0.4-2"; sha256="1s6r85ylznhsf4wwlf2rlyhfp5p84lkp0mxpg1p9bwrqnhahygmk"; depends=[numDeriv sfsmisc]; }; - catnet = derive { name="catnet"; version="1.14.3"; sha256="099vxi3fy5y4w635mqmbzsyqiswsw76kz3l5vgg8ckrj1cqshh5z"; depends=[]; }; - caTools = derive { name="caTools"; version="1.17"; sha256="00jgbna2dm99y5hwk3y28ng2w2c0vxrx4rlz6mhd15z4lsdx1ys6"; depends=[bitops]; }; - catR = derive { name="catR"; version="3.1"; sha256="03mp0gmzjdxy5ashlir3l6id5r7iw9mvmwvi12jg2byggm5blby3"; depends=[]; }; - catspec = derive { name="catspec"; version="0.97"; sha256="1crry0vg2ijahkq9msbkqknljx6vnx2m88bmy34p9vb170g9dbs1"; depends=[]; }; - CausalGAM = derive { name="CausalGAM"; version="0.1-3"; sha256="0g68m2kxixwr7rx65r57m1n0qa161igc428zh9rj91fg6h4pdq4w"; depends=[gam]; }; - causalsens = derive { name="causalsens"; version="0.1"; sha256="1v72zjplsa073f92qdza1zvwa1fwxlpmh8f6w5z8qcyiwqcbmifr"; depends=[]; }; - Causata = derive { name="Causata"; version="4.2-0"; sha256="04lndjy4rdf063z75zv42b000z06ffnr91pv2sql1ks6w60zmh1m"; depends=[XML R_utils rjson RMySQL RCurl stringr yaml boot foreach data_table glmnet ggplot2]; }; - CAvariants = derive { name="CAvariants"; version="2.1"; sha256="105bj6r6i7xz95lr5g4ld9xfgyq1dn15lw117jivx76z3k2zpi59"; depends=[]; }; - cba = derive { name="cba"; version="0.2-14"; sha256="067rm1rfz0rrq8xkzibd81pwvc9rx7ki46bncim4j5ra6i9pn24n"; depends=[proxy]; }; - CBPS = derive { name="CBPS"; version="0.8"; sha256="0a619sgr4iv66y16a7bfywxhniaxsrixr6pqwn88hj0j0k5b312i"; depends=[MASS MatchIt nnet numDeriv]; }; - CCA = derive { name="CCA"; version="1.2"; sha256="00zy6bln22qshhlll0y0adnvb8wa1f7famqyws71b6pcnwxki5ha"; depends=[fda fields]; }; - CCAGFA = derive { name="CCAGFA"; version="1.0.3"; sha256="1qicxrrwwd9il894v11lmmf4i88j72nyqm3z8iz9f7m17l9yiwwf"; depends=[]; }; - ccaPP = derive { name="ccaPP"; version="0.3.0"; sha256="1wj5yij02372xarhvxsnh43v0l6xb2p8rflmskw6x86vpcdqd6zw"; depends=[Rcpp pcaPP robustbase RcppArmadillo]; }; - cccd = derive { name="cccd"; version="1.04"; sha256="0mhqv9hzvw3w6wp23kvw4py54ij6x9r19b87i97wwgqr5rhhh1f3"; depends=[igraph plotrix proxy]; }; - ccChooser = derive { name="ccChooser"; version="0.2.6"; sha256="1vgp4zhg46hcf9ma2cmwgnfrqkmq1arh0ahyzjpfk3817vh7disc"; depends=[cluster]; }; - cccrm = derive { name="cccrm"; version="1.1"; sha256="0q7vxzj3lblz5ddgzm8z99k0b0z194963hx96bbkqm4rv705dgb0"; depends=[nlme gdata]; }; - ccda = derive { name="ccda"; version="1.0"; sha256="13wxzwpld55rbpbslrgm2f7gamvkbmkaic7xrp1nn4l3lvg236dy"; depends=[MASS]; }; - ccgarch = derive { name="ccgarch"; version="0.2.3"; sha256="0angffla3sk9i86v6bbsav95fp3mz5yvq7qfv0fx2v0nd2cx116w"; depends=[]; }; - cclust = derive { name="cclust"; version="0.6-18"; sha256="1lyk205i6q0s194r4l575l531c60kdql6p8aqhjjfkjfhczh5hq3"; depends=[]; }; - CCM = derive { name="CCM"; version="1.1"; sha256="0gya1109w61ia6cq3jg2z5gmvjkv9xg71l2rxhrrf6bx1c2nsrq6"; depends=[]; }; - CCMnet = derive { name="CCMnet"; version="0.0-2"; sha256="1x5xjnnyr31yq9cgqfrvg71x7mmc2c54r59fv0az49njh3yg3vja"; depends=[sna network ergm]; }; - CCP = derive { name="CCP"; version="1.1"; sha256="07jxh33pb8llk1gx4rc80ppi35z8y1gwsf19zrca9w91aahcs8cx"; depends=[]; }; - CCpop = derive { name="CCpop"; version="1.0"; sha256="10kgw3b98r0kn74w89znq6skgk8b3ldil6yb0hn5rlcf6lazjzca"; depends=[nloptr]; }; - CCTpack = derive { name="CCTpack"; version="1.2"; sha256="13350yqfj8fdmlhi2il0jvjfa58q6xrjw6jjwnla0y0kh1hgycb3"; depends=[R2jags rjags psych mvtnorm polycor MASS]; }; - cda = derive { name="cda"; version="1.5.1"; sha256="09a2jb25219hq6if3bx03lsp94rp2ll9g73dhkdi665y7rlhgqwh"; depends=[dielectric Rcpp statmod randtoolbox reshape2 plyr]; }; - cdb = derive { name="cdb"; version="0.0.1"; sha256="1rdb4lacjcw67apdyiv7cl1xvv9d1mrzck1qk605n6794k7wf2ys"; depends=[bitops]; }; - CDFt = derive { name="CDFt"; version="1.0.1"; sha256="0sc8ga48l3vvqfjq3ak5j1y27hgr5dw61wp0w5jpwzjz22jzqbap"; depends=[]; }; - CDLasso = derive { name="CDLasso"; version="1.1"; sha256="0n699y18ia2yqpk78mszgggy7jz5dybwsi2y56kdyblddcmz1yv7"; depends=[]; }; - CDM = derive { name="CDM"; version="3.3-24"; sha256="1s6bp45b9y80i3ildha2v4zb41rpf0vxrwc7rh38pzalvvyawgq7"; depends=[mvtnorm MASS psych polycor sfsmisc Rcpp]; }; - CDNmoney = derive { name="CDNmoney"; version="2012.4-1"; sha256="1bnfsygbzdd70m5s9qq7524b1fybdws46axxjbw9dhwqpr8w85id"; depends=[]; }; - CDVine = derive { name="CDVine"; version="1.2"; sha256="1qfjbzdfz2dydkfw3b0jjma4csn62177j5sgzh6rszf0nifsi97g"; depends=[MASS mvtnorm igraph]; }; - cec2005benchmark = derive { name="cec2005benchmark"; version="1.0.3"; sha256="1fc833ji557y2vb6snlxh90gz1n7fxjfkwjmdcmasj1sfzaalsjy"; depends=[]; }; - cec2013 = derive { name="cec2013"; version="0.1-4"; sha256="199r6b1gkay9a7v1x7v2w8xmxmafvizdyb1dkiq3qylsqvhq994d"; depends=[]; }; - celestial = derive { name="celestial"; version="1.1"; sha256="19yxaa63px9byn5k2k2qr89f5vy73cqb5l4zq4qj1v27g06k5dy7"; depends=[]; }; - CellularAutomaton = derive { name="CellularAutomaton"; version="1.1-1"; sha256="0kmw2ic161xwalqa63hznic4n4hdz20hsilf2awlcldg7m9si1zd"; depends=[R_oo R_methodsS3]; }; - cellVolumeDist = derive { name="cellVolumeDist"; version="1.3"; sha256="00hq3nbfbnmg2lhrqd0glkh5ld50fv54ll3q6v875d1lgs44sln1"; depends=[minpack_lm gplots]; }; - cem = derive { name="cem"; version="1.1.10"; sha256="0lykr7sksii30nk4z8pvn4bdmvhm5952grrsvb63qblazg3b84qc"; depends=[nlme lattice randomForest combinat]; }; - censNID = derive { name="censNID"; version="0-0-1"; sha256="1ij5ci6nkqf0rq51vyh4jw5sr3y46yndfkjmwl78ppdj66axxir5"; depends=[]; }; - censReg = derive { name="censReg"; version="0.5-20"; sha256="15k7iq4275dyah3r47vgxsx6g6mr7ma53lkv6d1n89bczzys72kx"; depends=[maxLik glmmML sandwich miscTools]; }; - CensRegMod = derive { name="CensRegMod"; version="0.0"; sha256="0vfkyj2mx5l1pmcah8zilxrjlb6iign1by4ydjq8ddk1zyi242sw"; depends=[]; }; - CePa = derive { name="CePa"; version="0.5"; sha256="1y2q72j8bqx509i62a2x9j40rj5bkpgx4z6fwj05ibazc1441asd"; depends=[igraph snow]; }; - cepp = derive { name="cepp"; version="1.0"; sha256="0lw3qr0vp0qbg2b62abhi1ady1dwig68m4nzqnjnk3lqxzp0fs8f"; depends=[trust randtoolbox]; }; - CerioliOutlierDetection = derive { name="CerioliOutlierDetection"; version="1.0.8"; sha256="0n67y7ah496wck9hlrphya9k753gk44v7zgfz4s2a5ii49739zqi"; depends=[robustbase]; }; - cfa = derive { name="cfa"; version="0.9-3"; sha256="0pl1mxv6jxn3mvlh75gr8as0daklyr7gkh37fcgmn2bwi973sspy"; depends=[]; }; - CfEstimateQuantiles = derive { name="CfEstimateQuantiles"; version="1.0"; sha256="1qf85pnl81r0ym1mmsrhbshwi4h1iv19a2wjnghbylpjaslgxp6i"; depends=[]; }; - CFL = derive { name="CFL"; version="0.1"; sha256="1vi1iiyg7qga7knpqgf30zfzy46aqzs8digkv5933lc2xrv03ap1"; depends=[]; }; - cg = derive { name="cg"; version="1.0-1"; sha256="0qi3xzjwx303b9m1sddyvz1raw78m5gy9bxqy08hyja2gqj8v855"; depends=[Hmisc VGAM MASS lattice survival multcomp nlme]; }; - cgam = derive { name="cgam"; version="1.1"; sha256="1dy23ix0ll0riqpdqxhf86fmw4m8mgqmp6m1c4nyhwk2z2adxd3k"; depends=[coneproj]; }; - cgAUC = derive { name="cgAUC"; version="1.1.2"; sha256="1y3q4hmkd6wbn4zjgclla3jif272sn4vv63ijxnfrsylzy02xhln"; depends=[]; }; - cgdsr = derive { name="cgdsr"; version="1.1.30"; sha256="0c8n2c6gqhk5klrxmmyf77czn2zwmm1f9cbp8n8yrhdcdqminznm"; depends=[R_oo R_methodsS3]; }; - cggd = derive { name="cggd"; version="0.8"; sha256="06z0mrxxc02parn9vkjv89qq4yqmsccsy319fi6c5iarssyvin1r"; depends=[]; }; - cgh = derive { name="cgh"; version="1.0-7.1"; sha256="1fgjz43bgnswlyvrm669x697lybq3jyzz4l8ppgxqwxp4p4d2yqn"; depends=[]; }; - cghFLasso = derive { name="cghFLasso"; version="0.2-1"; sha256="0b1hnjf9g0v47hbz0dy9m6jhcl1ky20yyhhmm8myng2sndcpjsbf"; depends=[]; }; - cghseg = derive { name="cghseg"; version="1.0.2"; sha256="0nz52wlgpl9r9pa41lz7nzk35fvcn3zr0gyliiw8q1nyxl2m0q1s"; depends=[]; }; - cgwtools = derive { name="cgwtools"; version="1.1"; sha256="11ryc20iqz0xwpq0cfjy37f6mnyrwvhf7kkf574j0v9fn6zg2jic"; depends=[]; }; - ChainLadder = derive { name="ChainLadder"; version="0.1.7"; sha256="06jgxhjlvzcgfm7dnzd81ycf1xx7qcyvk5541qmnvniwqppfvm19"; depends=[systemfit Matrix actuar Hmisc statmod reshape2 MASS lattice tweedie]; }; - changeLOS = derive { name="changeLOS"; version="2.1"; sha256="1bld2phnvcwfpqbkg1ycjci4i4dc4di8gjckbqjp997zyr42nnay"; depends=[survival]; }; - changepoint = derive { name="changepoint"; version="1.1.5"; sha256="090rak3ydlh92w0mpp2sjjx4m9x33clcs77waj20gzxbq38mqdci"; depends=[zoo]; }; - ChargeTransport = derive { name="ChargeTransport"; version="1.0.2"; sha256="0mq06ckp3yyj5g1z2sla79fiqdk2nlbclm618frhqcgmq93h0vha"; depends=[]; }; - CHAT = derive { name="CHAT"; version="1.1"; sha256="1hl4xr4lkvb7r36gcbgax6ipqc3rsvn1r03w7fk9gf9bbyg7bkhg"; depends=[DPpackage]; }; - CHCN = derive { name="CHCN"; version="1.5"; sha256="18n8f002w0p0l1s5mrrsyjddn10kdbb6b7jx1v9h1m81ifdbv0xb"; depends=[bitops RCurl]; }; - cheb = derive { name="cheb"; version="0.3"; sha256="0vqkdx7i40w493vr7xywjypr398rjzdk5g410m1yi95cy1nk4mc7"; depends=[]; }; - chebpol = derive { name="chebpol"; version="1.3-1040"; sha256="13x6li7cs72pnhxxdigg6r9f0nay89hldzh76vp0hi0i2y9vw0dz"; depends=[]; }; - CheckDigit = derive { name="CheckDigit"; version="0.1-1"; sha256="0091q9f77a0n701n668zaghi6b2k3n2jlb1y91nghijkv32a7d0j"; depends=[]; }; - checkmate = derive { name="checkmate"; version="1.2"; sha256="0n1qqyzwyxg6ymibxpbr84gg5bnrwfgw9klwyyvlq1bhd3qs3njn"; depends=[]; }; - cheddar = derive { name="cheddar"; version="0.1-625"; sha256="1qdxid6h7kyja0ac4v6ml2s6vw5lhrlchcz8lbf37gs9bpx6b4jc"; depends=[]; }; - chemCal = derive { name="chemCal"; version="0.1-34"; sha256="0sn0mhp2d9a9rddfpkiv1pkrmvnv4sy18c1x2ks0lwpaklg78fbs"; depends=[]; }; - chemometrics = derive { name="chemometrics"; version="1.3.8"; sha256="0vd5p2qhd17hr9psk6pg4jvcadz2pjffkjaffva4spa7m7qpp5ss"; depends=[class e1071 gclus lars MASS mclust nnet pcaPP pls rpart robustbase som]; }; - ChemometricsWithR = derive { name="ChemometricsWithR"; version="0.1.8"; sha256="084da2hx6agryw7bv6img10pqmsdz2mpihbrj6j081lammrik4fj"; depends=[ChemometricsWithRData MASS pls]; }; - ChemometricsWithRData = derive { name="ChemometricsWithRData"; version="0.1.3"; sha256="14l1y4md8hxq8gvip5vgg07vcr0d9yyhm5ckhzk8zwprdabn9a10"; depends=[]; }; - chemosensors = derive { name="chemosensors"; version="0.7.7"; sha256="1yi0d69nxknca3k7pnxppgjaqyzlc1ksxaa7w31favq0xbdw508n"; depends=[pls plyr reshape2 ggplot2 LearnBayes quadprog RColorBrewer]; }; - ChemoSpec = derive { name="ChemoSpec"; version="2.0-2"; sha256="01zng3nhsynj8kbnk7aisj1803q9svd9n6jnnl0vb82lsb29bfw7"; depends=[pls amap chemometrics robustbase RColorBrewer plyr pcaPP mvtnorm mvoutlier rgl R_utils mclust MASS baseline IDPmisc gsubfn lattice seriation]; }; - cherry = derive { name="cherry"; version="0.5-10"; sha256="0fs4p5k1lwwlin5fj9z91aw59ybp60phjk293imizg6vpai5h39p"; depends=[bitops lpSolve Matrix]; }; - chillR = derive { name="chillR"; version="0.54"; sha256="1qcwspww5nvp6nh26ly6ckqd0jzq4fkq5svjj5a55pvk04xk9frs"; depends=[pls Kendall spam fields]; }; - chipPCR = derive { name="chipPCR"; version="0.0.7"; sha256="0acj8z92zbfv8b14j31h7vlaf8k4w44z8gcg8vcfhxgskfajcwk0"; depends=[MASS outliers ptw quantreg Rfit robustbase shiny signal]; }; - chngpt = derive { name="chngpt"; version="2014.5-29"; sha256="0i8hz8cixy3fx9cpprraqpadrs835zna8y64irp85xhckdrv9xzv"; depends=[kyotil MASS]; }; - CHNOSZ = derive { name="CHNOSZ"; version="1.0.3.1"; sha256="0cmirnb8jkaxnscpkwm2a8yyzl9zaf3q323avpgg7fwwhr6c1l19"; depends=[]; }; - ChoiceModelR = derive { name="ChoiceModelR"; version="1.2"; sha256="0dkp3354gvrn44010s8fjbmkpgn1hpl4xbfs5xslql8sk8rw0n2c"; depends=[]; }; - choplump = derive { name="choplump"; version="1.0-0.3"; sha256="10nkkcmpay4rcqbkdhlksnxqb177j5bjpsffyy6q5dbl7nf7whx1"; depends=[]; }; - chords = derive { name="chords"; version="0.67"; sha256="0dj9bbl5abdvvfrn17xxnrnrlvdxw4m841ds37a6pf8dzprs1gdv"; depends=[]; }; - choroplethr = derive { name="choroplethr"; version="1.7.0"; sha256="1sq518zb6pv1sg7vb7ml4wsfpk1a5a73mcmdz8an1lnwnqbywsmy"; depends=[ggplot2 scales plyr Hmisc acs stringr]; }; - chromoR = derive { name="chromoR"; version="1.0"; sha256="1x11byr6i89sdk405h6jd2rbvgwrcvqvb112bndv2rh9jnrvcw4z"; depends=[haarfisz gdata]; }; - chron = derive { name="chron"; version="2.3-45"; sha256="0jkanbisi1bxh35rg0i6sl82f8r9v8va8mf8hknfvwv7p7n3ddpx"; depends=[]; }; - CHsharp = derive { name="CHsharp"; version="0.3"; sha256="0aa9v6yih6qmqsmc8zsl8k1wqsp3sp2bfwri3d37k06vfj7gwbh0"; depends=[scatterplot3d KernSmooth]; }; - CIDnetworks = derive { name="CIDnetworks"; version="0.6.0"; sha256="0bx1wgcsbkg6zqza435fd11kaqkdspl4mlnjjjca8j0gcfvdjxgc"; depends=[mvtnorm msm Rcpp igraph numDeriv pbivnorm]; }; - CIFsmry = derive { name="CIFsmry"; version="1.0.1"; sha256="118vyiiy4iqn86n9xf84n5hrwrhzhr1mdsmyg9sm6qq6dm7zg6la"; depends=[]; }; - cin = derive { name="cin"; version="0.1"; sha256="1pwvy5nh5nrnysfqrzllb9fcrpddqg02c7iw3w9fij2h8s2v6kq5"; depends=[]; }; - CINID = derive { name="CINID"; version="1.0"; sha256="0xa9zbd578ac5gc2mm7k5yisw5sx8x259c5gwyy6frpkldhbwldn"; depends=[]; }; - CINOEDV = derive { name="CINOEDV"; version="1.0"; sha256="1a6c0y7nzqmb0x5baf54fyddnhi94ixybwm3mgim45z2jzak6435"; depends=[R_matlab igraph ggplot2 reshape2]; }; - CircE = derive { name="CircE"; version="1.0"; sha256="1fik612iggqv9hvp9nmpx0h6g6s6vfk99z8anvqkk5ify5690g1x"; depends=[]; }; - circlize = derive { name="circlize"; version="0.1.0"; sha256="0v5czgs21wn261bw686nbsn3c15ssdkx3frclwqcvqlk61xfghqr"; depends=[]; }; - CircNNTSR = derive { name="CircNNTSR"; version="2.1"; sha256="1rl17kw6bl5xf7pgsc4im12i2kqz4a3b11vzzlb6wfl5yck6iff5"; depends=[]; }; - CircStats = derive { name="CircStats"; version="0.2-4"; sha256="1f2pf1ppp843raa82s2qxm3xlcv6zpi578zc4pl0d7qyxqnh603s"; depends=[MASS boot]; }; - circular = derive { name="circular"; version="0.4-7"; sha256="1kgis2515c931ir76kpxnjx0cscw4n09a5qz1rbrhf34gv81pzqw"; depends=[boot]; }; - cit = derive { name="cit"; version="1.2"; sha256="1mk3bgac8qhc48vm0z8fhygsrrd5mqznyblbfv03y4rjiyh7f2qs"; depends=[]; }; - CITAN = derive { name="CITAN"; version="2011.08-1"; sha256="1viv2iha6hcghh4iy4ndnbrnhcdrjixk837v78w43mdcmrkjh3rb"; depends=[DBI RSQLite RGtk2 hash ADGofTest]; }; - citbcmst = derive { name="citbcmst"; version="1.0.4"; sha256="1zkd117h9nahwbg5z6byw2grg5n3l0kyvv2ifrkww7ar30a2yikl"; depends=[]; }; - citccmst = derive { name="citccmst"; version="1.0.2"; sha256="1b7awn1hjckxisfdi4ck697hwd4a5sqklwi7xzh6kgqhk9pv7vjn"; depends=[]; }; - CityPlot = derive { name="CityPlot"; version="2.0"; sha256="0lskgxmagqjglvpq39hgbygkf4qp28i2bj6b4m2av1s3pzb4465g"; depends=[]; }; - Ckmeans_1d_dp = derive { name="Ckmeans.1d.dp"; version="3.02"; sha256="1r7zxvrcn8lg8i74fnjr7mqcnhc0y5lsxy1zch1bhbrnbr19sgq5"; depends=[]; }; - cladoRcpp = derive { name="cladoRcpp"; version="0.14.4"; sha256="0d4vl7xrrwbhhx56ymw52rb5svw9nskxdya4dl04lw1qxc45p4jy"; depends=[Rcpp]; }; - CLAG = derive { name="CLAG"; version="2.18.1"; sha256="0y8m6m01vw3rxwrmxvwhpiy6dd2snr0lhb026l1494y43hhqi3wy"; depends=[]; }; - class = derive { name="class"; version="7.3-11"; sha256="1j6wqirih9x6q50vq21543np4i99ia6ih2ffriiw1gms8xmdfrsk"; depends=[MASS]; }; - classGraph = derive { name="classGraph"; version="0.7-4"; sha256="08cid5bdbciyijlzkx3684gx0cyzcj8myawf4dhcrz00jqrg8v60"; depends=[]; }; - classifly = derive { name="classifly"; version="0.4"; sha256="0mw1vcas0gr1r4yvh0j02zhk7kp5342r0bhhg776hqgqdczgh5zj"; depends=[class plyr]; }; - classify = derive { name="classify"; version="1.2"; sha256="1c1919phhn3xlm807408hhryy1ifm8vf68zcb0gj3adiczpj5xcy"; depends=[Rcpp plyr ggplot2 lattice R2jags reshape2]; }; - classInt = derive { name="classInt"; version="0.1-21"; sha256="1sld7bw1x2i8qqj0fbavifl9ni8724fg2wrwjyg657ib8f2yqj5z"; depends=[e1071 class]; }; - clere = derive { name="clere"; version="1.1"; sha256="1jna5dqy47mldd557qxl7vr59v5lalhligvm3c4k6b2dfararhfr"; depends=[Rcpp]; }; - clhs = derive { name="clhs"; version="0.5-1"; sha256="09165qcnlwz6aaafq4lzzpm7id15wgfbz3am9gfp2g5fyh0irsr2"; depends=[ggplot2 sp raster reshape2 plyr scales]; }; - ClickClust = derive { name="ClickClust"; version="0.1.1"; sha256="1mgim5z4j0lmjlazqqigc88r41ciqnz9d49irm9b2bdjwg2rpilw"; depends=[]; }; - clickstream = derive { name="clickstream"; version="1.1.2"; sha256="1l59411jsph6v4rkwanbjcgjcyknywl7ri0hh7z957v02h4m7as1"; depends=[igraph plyr reshape2 Rsolnp]; }; - climdex_pcic = derive { name="climdex.pcic"; version="1.1-1"; sha256="1payygvw327qjab9vzivqd21f5w0gwq3f2jjpmkk89fn7rznz7y2"; depends=[PCICt caTools Rcpp]; }; - clime = derive { name="clime"; version="0.4.1"; sha256="0qs9i7cprxddg1cmxhnmcfhl7v7g1r519ff2zfipxbs59m5xk9sf"; depends=[lpSolve]; }; - clinfun = derive { name="clinfun"; version="1.0.6"; sha256="00prrdm6qm5p2sjjlhi99msvqpxcm492z378wgl65iwf0jywdnpw"; depends=[mvtnorm]; }; - clinsig = derive { name="clinsig"; version="1.0-4"; sha256="0w2qb9k6fkw9lqi0ib6kzi6pvpb5hpq78w9x2jjs0yyqsj0rydwv"; depends=[]; }; - clinUtiDNA = derive { name="clinUtiDNA"; version="1.0"; sha256="0x3hb09073gkh60fc8ia0sfk948sm6z6j8sqkz275k4m8ryrabas"; depends=[]; }; - clogitL1 = derive { name="clogitL1"; version="1.4"; sha256="0m9yrg9mzzfv5qkdf6w55xyrjdghyrf27kk7b4x2gyvwvi5b7dkm"; depends=[Rcpp]; }; - cloudUtil = derive { name="cloudUtil"; version="0.1.10"; sha256="1j86vpd4ngrdpfjk44wb1mp0l88dxia64pjd2idfcd276giplh6s"; depends=[]; }; - clpAPI = derive { name="clpAPI"; version="1.2.6"; sha256="1kgzmzf87b0j43ch21anmm2d73bj2d16slmyavpbkdwg72dg1sjb"; depends=[]; }; - CLSOCP = derive { name="CLSOCP"; version="1.0"; sha256="0rkwq9rl2ph4h5zwb2i3yphjyzxmh6b6k23a8gcczycx6xdq4yhw"; depends=[Matrix]; }; - clue = derive { name="clue"; version="0.3-48"; sha256="1lwfm5sk9d35khcrvjs91bixfnjc3zwyfzq5ma9ljsc6hs80y8ar"; depends=[cluster]; }; - clues = derive { name="clues"; version="0.5-4"; sha256="0pgd3vjfplvsfn3nw6sqlkfsv6lbpjlcai7z9qp31qcih3g71vgr"; depends=[]; }; - cluster = derive { name="cluster"; version="1.15.2"; sha256="0bv7qsbf6x3gq2iz3rwbjsj3cs8j0dvzxjhwdsvnqgkc1yhpkr13"; depends=[]; }; - clusterCrit = derive { name="clusterCrit"; version="1.2.3"; sha256="0xd06w7jsl3srvhqx08vywy191k97lk3mgl2hsx1ki8ydplrdyha"; depends=[]; }; - cluster_datasets = derive { name="cluster.datasets"; version="1.0-1"; sha256="0i68s9305q08fhynpq24qnlw03gg4hbk4184z3q3ycbi8njpr4il"; depends=[]; }; - 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]; }; - clusterGeneration = derive { name="clusterGeneration"; version="1.3.1"; sha256="0lvkqqcshnaqk40s5y736r53y9yss3hlvgs6gs7p8ksk14vj7i2q"; depends=[MASS]; }; - 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=[]; }; - clusterSim = derive { name="clusterSim"; version="0.43-5"; sha256="07vdvhlvk31srnw1vwgwqgj2dimgbagp7mnz7n1rwcm1qxnndsmy"; depends=[cluster MASS ade4 e1071 rgl R2HTML]; }; - clusteval = derive { name="clusteval"; version="0.1"; sha256="1ld0bdl4fy8dsfzm3k7a37cyxc6pfc9qs31x4pxd3z5rslghz7rj"; depends=[mvtnorm Rcpp]; }; - clusthaplo = derive { name="clusthaplo"; version="1.2"; sha256="17vxk61bw99h34n9a6vp40nanigfai34s237ydb56jpamsq8sf2b"; depends=[ggplot2]; }; - clustMD = derive { name="clustMD"; version="1.0"; sha256="1i3c790k300a7y5xhqanp8f1bid2q3a0ajwgf5qsr6dv3ld4h7vj"; depends=[tmvtnorm mvtnorm truncnorm MASS mclust msm]; }; - ClustOfVar = derive { name="ClustOfVar"; version="0.8"; sha256="17y8q2g4yjxs2jl1s8n5svxi021nlm0phs1g5hcnfxzpadq84wbs"; depends=[]; }; - clustrd = derive { name="clustrd"; version="0.1.2"; sha256="022lzp1wvbaa20d8hribgq9miy6i7jxm5m1p3p52h9b7bzga3q6g"; depends=[corpcor e1071 ggplot2 irlba]; }; - clustsig = derive { name="clustsig"; version="1.1"; sha256="0n5nf712vsa8zb0c2lv4gjqsgva62678vjngr9idgswb73shxm8v"; depends=[]; }; - ClustVarLV = derive { name="ClustVarLV"; version="1.3"; sha256="13v7ip42wdzgvzpmkd8pzhv8j0kcavkby8fl4x4wn35ds46hx1v5"; depends=[Rcpp]; }; - clustvarsel = derive { name="clustvarsel"; version="2.0"; sha256="0ql98r2aqwfmbn48xd68wpi2lk671aj2l8dqjn0jjp1vrk9fbw1m"; depends=[mclust BMA foreach iterators]; }; - clv = derive { name="clv"; version="0.3-2.1"; sha256="1qgp2qhblg6ysyrlg0ad169ahwhcyn5pvsqzdlqj700y1k7wl7mc"; depends=[cluster class]; }; - clValid = derive { name="clValid"; version="0.6-6"; sha256="1l9q7684vv75jnbymaa10md13qri2wjjg7chr1z1m0rai8iq3xxw"; depends=[cluster class]; }; - cmaes = derive { name="cmaes"; version="1.0-11"; sha256="1hwf49d1m660jdngqak9pqasysmpc4jcgr8m04szwbyzyy6xrm5k"; depends=[]; }; - CMC = derive { name="CMC"; version="1.0"; sha256="1r9a5k79fyw01yiwxq02327hpn4l1v2lp0958jj9217wxmhn3pr5"; depends=[]; }; - CMF = derive { name="CMF"; version="1.0"; sha256="0hvqcbmg2vd0i1rjb1m1bkrbv2vkj1siank1v8w0n5b6881cyz7q"; depends=[Rcpp]; }; - cmm = derive { name="cmm"; version="0.7"; sha256="16pw9namrc3crcqnsn4ckk8m4r3af908wm2siw6fzbk6hwac17i6"; depends=[]; }; - CMPControl = derive { name="CMPControl"; version="1.0"; sha256="0cp29cibiydawsl0cq433l9abdivr16b431zlrh45wzr5kzfcs0v"; depends=[compoisson]; }; - cmprsk = derive { name="cmprsk"; version="2.2-7"; sha256="1imr3wpnj4g57n2x4ryahl4lk8lvq9y2r7319zv3k82mznha8bcm"; depends=[survival]; }; - cmrutils = derive { name="cmrutils"; version="1.2-2"; sha256="0gc4sx8g9364sybmrqdjdvddqjd9ps6v205kaw0nqdx30xn96hmm"; depends=[chron]; }; - cna = derive { name="cna"; version="0.1-3"; sha256="0y6qqg4454njldm8qipq260jbwfkh23iffpyghjnj2raw5fjgh8b"; depends=[]; }; - cncaGUI = derive { name="cncaGUI"; version="0.0-2"; sha256="1rgs7446qb40b4qi1i4m5c3111kbqap4z1g7s01pnbylil0m80fd"; depends=[rgl tcltk2 tkrplot]; }; - CNOGpro = derive { name="CNOGpro"; version="1.0"; sha256="02vqnjsz0402xdqsxrxicgdsyi3nqc3cfrbabfkywn3q102gzq0f"; depends=[seqinr]; }; - CNprep = derive { name="CNprep"; version="1.0"; sha256="1i8iz0ir14g56zjsj8z4kmds5rybg8jjra33v0qcjwp489s6475a"; depends=[mclust rlecuyer]; }; - CNVassoc = derive { name="CNVassoc"; version="2.0.1"; sha256="0xf5rrcv7pl158fbz0yjibmrigpqgzwvdyl1gw0fkn5jjsm62hsm"; depends=[CNVassocData mixdist mclust survival]; }; - CNVassocData = derive { name="CNVassocData"; version="1.0"; sha256="17r3b1w9i9v6llawnjnrjns6jkd82m2cn9c90aif8j0bf4dmgdli"; depends=[]; }; - coalescentMCMC = derive { name="coalescentMCMC"; version="0.4"; sha256="115kvrk46hzhr83vkk57jn90dw2fvj1pl56w6mlja16i93yaz10h"; depends=[ape coda Matrix phangorn]; }; - coarseDataTools = derive { name="coarseDataTools"; version="0.6-2"; sha256="1nnh61kfw294cxawz9i8yf37ddzsn5s532vvkaz0ychk0390wmi5"; depends=[MCMCpack]; }; - COBRA = derive { name="COBRA"; version="0.99.4"; sha256="1r1cw12d7c148pcgcg08bfsr1q1s736kfpyyss6b4d7ny7wgmqy4"; depends=[]; }; - cobs = derive { name="cobs"; version="1.2-2"; sha256="1g8qwnda7fqrqknz7lnlq47kqs5k83pg9qq205alm12jgx3180a1"; depends=[SparseM quantreg]; }; - cobs99 = derive { name="cobs99"; version="0.9-12"; sha256="0zd0nyw8ma7k90i1k3ryn6qcb6yivrrajc6nmdh4f95ihvhc9ksm"; depends=[]; }; - CoClust = derive { name="CoClust"; version="0.3-0"; sha256="0vcjy8mr8vfs5j1x0xz1zkjn6l08pg6r28ffbdvrqrbalnh87v3s"; depends=[copula gtools]; }; - cocor = derive { name="cocor"; version="1.0-0"; sha256="173kszv661hailav69khqh9c15y9m5n6l7crc9i6vf71yrig1vqs"; depends=[]; }; - cocorresp = derive { name="cocorresp"; version="0.2-1"; sha256="0q41clhp4nl9vyakfmnhr5ix7nxfq0phq8xa02na38qhfwpxznfn"; 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]; }; - 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-8"; sha256="0m326kfxihm5ayfn5b4k8awdf34002iy094gazbc3h0y42r4g86b"; depends=[]; }; - coefficientalpha = derive { name="coefficientalpha"; version="0.2.6"; sha256="0a0fvg22sg3idavv2qrb9sjvjjfm39fvpjsxz83a7bk6400vflsr"; depends=[MASS]; }; - coefplot = derive { name="coefplot"; version="1.2.0"; sha256="1v6c3fk2wrjgs3b31vajmig6dvmp5acfm72wh0iffpg0qgvf5hh7"; depends=[ggplot2 plyr reshape2 useful scales proto]; }; - coenocliner = derive { name="coenocliner"; version="0.1-0"; sha256="0hys1a4ai09pax5ydcaq39ll3rdjzyhgvz72z0iv9fwv4fbmwbr9"; depends=[]; }; - coexist = derive { name="coexist"; version="1.0"; sha256="15ydhrx996i6caa0360c2bgn2zvgwfg5wdhsqq1gvrggs15w7nml"; depends=[]; }; - CoImp = derive { name="CoImp"; version="0.2-3"; sha256="04n0drx98hi8hmlb5xwl87ylv03j1ld04vp9d8s5sphvm9bbx690"; depends=[copula nnet gtools locfit]; }; - coin = derive { name="coin"; version="1.0-23"; sha256="07433fblandxb8gzkzln49cckv75mqr2z847dwsa3qz68callxba"; depends=[survival modeltools mvtnorm]; }; - CoinMinD = derive { name="CoinMinD"; version="1.1"; sha256="0invnbj5589wbs0k2w5aq9qak7axc3s0g9nw85c48lnl0v95s91i"; depends=[MCMCpack]; }; - colbycol = derive { name="colbycol"; version="0.8"; sha256="198zc4jd7gby1dhvmg7fy41ldbxkgqj6ram54g3w6sw0yv9ilk8r"; depends=[rJava filehash]; }; - cold = derive { name="cold"; version="1.0-3"; sha256="17nlqhp5415m8wjkb2ykmk1q3lgw1aycf85b6byl8p06bfrvmw2p"; depends=[]; }; - CollocInfer = derive { name="CollocInfer"; version="1.0.1"; sha256="0wfk3qw28msz3wqm5xmivjgi18kqv1s6w76vh71zq777d6a7al6i"; depends=[fda deSolve MASS Matrix spam]; }; - coloc = derive { name="coloc"; version="2.3-1"; sha256="1j3m9afpkm0bzib38yqvk85b6s6l56s6j2ni96gii4a06r87ig60"; depends=[colorspace MASS BMA]; }; - colorfulVennPlot = derive { name="colorfulVennPlot"; version="2.4"; sha256="01b3c060fbnap78h9kh21v3zav547ak2crdkvraynpd2096yk51w"; depends=[]; }; - colorRamps = derive { name="colorRamps"; version="2.3"; sha256="0shbjh83x1axv4drm5r3dwgbyv70idih8z4wlzjs4hiac2qfl41z"; depends=[]; }; - colorscience = derive { name="colorscience"; version="1.0.0"; sha256="0429vlirc95nblmhs5lplh3lw9aay9qnkpib77rbmjzczv551m3d"; depends=[Hmisc munsellinterpol pracma]; }; - colorspace = derive { name="colorspace"; version="1.2-4"; sha256="1ppvkcclqjdj1b9j59sc2gda55kmwq9l00n5643ggjb15m2dm76h"; depends=[]; }; - colortools = derive { name="colortools"; version="0.1.5"; sha256="0z9sx0xzfyb5ii6bzhpii10vmmd2vy9vk4wr7cj9a3mkadlyjl63"; depends=[]; }; - colourlovers = derive { name="colourlovers"; version="0.1.3"; sha256="09hacmzcw6am8l6725wny2rrrzzn46vk2730ni7rgynk49b2wr9h"; depends=[XML RJSONIO png]; }; - comato = derive { name="comato"; version="1.0"; sha256="03jnvv0sczy13r81aljhj9kv09sl5hrs0n5bn3pdi7ba64zgbjiw"; depends=[igraph Matrix lattice gdata XML cluster clusterSim]; }; - combinat = derive { name="combinat"; version="0.0-8"; sha256="1h9hr88gigihc4na7lb5i7rn4az1xa7sb34zvnznaj6pdrmwy4qm"; depends=[]; }; - CombinS = derive { name="CombinS"; version="1.0"; sha256="0gi66hmj3jmr301r2ahrln4zjjjvl6gabdv3y5df7aqidxlbhqbb"; depends=[]; }; - CombMSC = derive { name="CombMSC"; version="1.4.2"; sha256="1wkawxisn9alpwrymja8dla8n25z2fhai3l2xhin0b914y2kai09"; depends=[]; }; - comclim = derive { name="comclim"; version="0.9.2"; sha256="14x9qpflprdi7j94xipndzp76bbs7cqmyhqd2cakxgnl1q915pnx"; depends=[]; }; - commandr = derive { name="commandr"; version="0.9.5"; sha256="1i960c4hszxm10qcpn9hrhxfzxfp9yywkbj4i9hraj8ka759z75a"; depends=[]; }; - CommonJavaJars = derive { name="CommonJavaJars"; version="1.0-4"; sha256="0amn8z8im64q1k6j6l2bh4795b6i665wxqpgabhv471zfhdk0nil"; depends=[]; }; - CommonTrend = derive { name="CommonTrend"; version="0.7-1"; sha256="088pg2hy2g2jgs84xawrnsf7gpvrpqjsimkx7g0i5r5fmkx169f9"; depends=[MASS urca]; }; - CommunityCorrelogram = derive { name="CommunityCorrelogram"; version="1.0"; sha256="1wkrm5lil595sc4ih3qsf4sgvfipzlav0n7339ixqw9zxm2pg4nj"; depends=[vegan]; }; - comorbidities = derive { name="comorbidities"; version="1.0"; sha256="01aisxy4cx3jw37cg6mwvfj4nv10ndmwjxf8xsfv7s20hdb0gmqn"; depends=[]; }; - Comp2ROC = derive { name="Comp2ROC"; version="1.0"; sha256="0vymjbxdlvm5dvss4z4zjdc7y7040s3j972gh2138wfygji1szg7"; depends=[ROCR boot]; }; - compactr = derive { name="compactr"; version="0.1"; sha256="0f2yds6inmx0lixj08ibqyd2i61l2cbg1ckgpb8dl2q7kcyyd6mx"; depends=[]; }; - compare = derive { name="compare"; version="0.2-4"; sha256="0fhw7y7xwrv79wxvs9gy4xddjzc6hh97m81a10j64jssy4p291b6"; depends=[]; }; - compareGroups = derive { name="compareGroups"; version="2.0.4"; sha256="1z2aipcjnqh83g33aypspwk8kkab5i2h5ms0lnnmcp3c8wn8pzi8"; depends=[Hmisc xtable gdata SNPassoc survival epitools HardyWeinberg]; }; - compareODM = derive { name="compareODM"; version="1.2"; sha256="019hq8j56asjvh4x1p65785mf38xr05j3by0749gl9k9yl8645da"; depends=[XML]; }; - CompareTests = derive { name="CompareTests"; version="1.0"; sha256="098axl20jid35pqvgiwk6h91waafigwks6n5f4pg7xxx1fifks4f"; depends=[]; }; - comparison = derive { name="comparison"; version="1.0-4"; sha256="0pc462rhk8gr8zrf08ksi315kmhydlp027q5gd40ap5mmhk7rd82"; depends=[isotone]; }; - compeir = derive { name="compeir"; version="1.0"; sha256="1bb5459wcqpjic2b9kjn0l0qdn7sqmmx34hdb2aqg80q22mhx5dv"; depends=[lattice etm]; }; - CompGLM = derive { name="CompGLM"; version="1.0"; sha256="04bjal92r0m7is5ygqpd0mdz3fb3pwcr7rc3mbxg9sg57nff3kf5"; depends=[Rcpp]; }; - compHclust = derive { name="compHclust"; version="1.0-2"; sha256="1h39krvz516xwsvn5987i1zbzan8vx2411qz6dad112hpss0vyk9"; depends=[]; }; - complex_surv_dat_sim = derive { name="complex.surv.dat.sim"; version="2.0.0"; sha256="1x4whyq0bds0zblppcvv7lk6qy567c37x19n1r0xjgyl3id40f7c"; depends=[eha statmod]; }; - CompLognormal = derive { name="CompLognormal"; version="3.0"; sha256="1dhgr9l713l2n889bpa47lbg2qab0fz0r15qa928c0b9nz688ddm"; depends=[numDeriv]; }; - compoisson = derive { name="compoisson"; version="0.3"; sha256="0v5dl7xydqi4p97nipn4hyhpq2gghmx81ygvl0vc8b65jhq89y0p"; depends=[MASS]; }; - COMPoissonReg = derive { name="COMPoissonReg"; version="0.3.4"; sha256="1mf2q7phc2bn700yp7i2i6ccj6lrvh8b2dmibqihh76a85j1ycrq"; depends=[]; }; - compositions = derive { name="compositions"; version="1.40-1"; sha256="1hn139g86bc1q3dj6kj9f21042v4x0xgrp4ni1zvx1zx8xmy3h8b"; depends=[tensorA robustbase energy bayesm]; }; - compound_Cox = derive { name="compound.Cox"; version="1.4"; sha256="08sdkq040zk9mb1lcy4nm32gwab26vaig8brp2n3aizagx9fv3r9"; depends=[numDeriv survival]; }; - Compounding = derive { name="Compounding"; version="1.0.2"; sha256="1xlb3ylwjv70850agir0mx79kcvs43h0n1sm22zcny3509s2r7lf"; depends=[hypergeo]; }; - CompQuadForm = derive { name="CompQuadForm"; version="1.4.1"; sha256="1kv4bdkwidkjw0hgn2krv42p9v1a03p47g0p03lja3flhfbmiifj"; depends=[]; }; - CompRandFld = derive { name="CompRandFld"; version="1.0.3"; sha256="1qfq1zkdxk6jh3z7vfp91c6jcvj4smq21cndxdmq150f6vsx35fl"; depends=[]; }; - compute_es = derive { name="compute.es"; version="0.2-3"; sha256="17g1s9vz61kyqsm16vbzwmaw2qz6r99p9cg3s6c7lk73vr2qrwni"; depends=[]; }; - ConConPiWiFun = derive { name="ConConPiWiFun"; version="0.4.2"; sha256="0x3md1xfrrg41qfyafbvl9qaa6yy81nky3pl5z9qs850mjbs8qdl"; depends=[Rcpp]; }; - concor = derive { name="concor"; version="1.0-0.1"; sha256="0hjyvi6p16cyrmq0bq7fph1r5f3adp7zpf123wkm5bkjnc5122k0"; depends=[]; }; - concreg = derive { name="concreg"; version="0.5"; sha256="0psvnirl5rqicyzxs9sivh23bzzwdgviqczdl2in2gnrvdiw7m6f"; depends=[survival]; }; - cond = derive { name="cond"; version="1.2-3"; sha256="0y7m7valk7zn40y62348czmdvfkx59il9sl6wy565lzqfiimd9ps"; depends=[statmod survival]; }; - condGEE = derive { name="condGEE"; version="0.1-4"; sha256="0mqj2pc91n8h3arpd4b9f7ndbcnai21c67is22qg22wj7vhhs87h"; depends=[numDeriv rootSolve]; }; - condmixt = derive { name="condmixt"; version="1.0"; sha256="05q1fj7akf6lsq9rbcqqkzlx82jvk6mlvmwx6jzk8j228fwqmg90"; depends=[evd]; }; - CondReg = derive { name="CondReg"; version="0.20"; sha256="1ffnrjfjcb66i9nyvidkcn4k9pcj4r7xanjwzcxcrj2qm39apkqx"; depends=[]; }; - coneproj = derive { name="coneproj"; version="1.4"; sha256="07zhqidjinpphvr7xdzrn3f5iq6bx8c2sj5gya2bz8glf4x74h9d"; depends=[Rcpp]; }; - conf_design = derive { name="conf.design"; version="2.0.0"; sha256="06vdxljkjq1x56xkg041l271an1xv9wq79swxvzzk64dqqnmay51"; depends=[]; }; - confReg = derive { name="confReg"; version="0.1.3"; sha256="0cwz5wnrk0qppj65gskizy2jb9y6x6xhkyb5qhd5xfc698x6ivs2"; depends=[e1071]; }; - confreq = derive { name="confreq"; version="1.1"; sha256="14d0vlf4bwmdwayqg2fsyqblyinx1d3mqhndhjjk0d59qmr44lsa"; depends=[]; }; - conicfit = derive { name="conicfit"; version="1.0.0"; sha256="032a9ajrv1xl2i4p3a32fyzg6s76vngdcmwqnh2lgk72srlhryzj"; depends=[pracma geigen]; }; - conics = derive { name="conics"; version="0.3"; sha256="06p6dj5dkkcy7hg1aa7spi9py45296dk0m6n8s2n3bzh3aal5nzq"; depends=[]; }; - conjoint = derive { name="conjoint"; version="1.39"; sha256="0f8fwf419js9c292i3ac89rlrwxs2idhwxml1qd8xd2ggwfh6w5m"; depends=[AlgDesign clusterSim]; }; - ConjointChecks = derive { name="ConjointChecks"; version="0.0.9"; sha256="097mhiz8zjmmkiiapr3zfx7v35xirg57nqp1swd72dixaa23nhr1"; depends=[]; }; - ConnMatTools = derive { name="ConnMatTools"; version="0.1.5"; sha256="02cv2rlfp9shwqc9nwb8278akmwv7yvviwl23jglzsyh721dpqkr"; depends=[]; }; - CONOR = derive { name="CONOR"; version="1.0.2"; sha256="1h6vx8hq8lbjdhv466q9q4h13hir1pfj6bjmg90gmqjwrpbdciw1"; depends=[CLSOCP tseries outliers nortest quadprog zoo fields fpc flexclust plyr CONORData]; }; - CONORData = derive { name="CONORData"; version="1.0.2"; sha256="0a52wz9i9md15wqvhh105wjvlw4byx7qgy9i1sd1wr4jn84ir5wf"; depends=[CLSOCP tseries outliers nortest quadprog zoo fields fpc flexclust plyr]; }; - constrainedKriging = derive { name="constrainedKriging"; version="0.2.3"; sha256="1hppfc0pv0jphmj7pip1cn65sfrcwvnpymlvpyp7sbn3nmy2qqrb"; depends=[sp spatialCovariance rgeos RandomFields]; }; - contfrac = derive { name="contfrac"; version="1.1-9"; sha256="16yl96bmr16a18qfz6y5zf7p02ky1jy2iimcb1wp50g7imlcq840"; depends=[]; }; - conting = derive { name="conting"; version="1.3"; sha256="1aw3hp88xif5s94388g4805xqnv21dj47wshgkbg33dn11lf2hwf"; depends=[mvtnorm BMS gtools tseries coda]; }; - contrast = derive { name="contrast"; version="0.19"; sha256="1kc3scz3msa52lplc79mmn4z99kq1p2vlb18wqxa9q2ma133x6pl"; depends=[rms]; }; - ConvCalendar = derive { name="ConvCalendar"; version="1.2"; sha256="0yq9a42gw3pxxwvpbj6zz5a5zl7g5vkswq3mjjv5r28zwa3v05vc"; depends=[]; }; - ConvergenceConcepts = derive { name="ConvergenceConcepts"; version="1.0"; sha256="1s6yxiaxmv7yxydwjhxi778vznh4gs8l5cgy308bxj53d4d6kfkz"; depends=[tkrplot lattice]; }; - convexHaz = derive { name="convexHaz"; version="0.2"; sha256="0lfksb01iilhyjbr9wj3w4s9nbkdcl649w86fp2mz6s6makmq84x"; depends=[]; }; - cooccur = derive { name="cooccur"; version="1.1"; sha256="1q2x89jpr81jq0hw218c9h8spc1gwgax58j8npgd6rnzlkpxxyam"; depends=[reshape2 gmp ggplot2]; }; - COP = derive { name="COP"; version="1.0-2"; sha256="1gynknplvx97hjhi7adsgq9r9lqismch1q1pqvgmz0x1wkg4jj40"; depends=[dr MASS]; }; - COPASutils = derive { name="COPASutils"; version="0.1"; sha256="1w080k6fpbvcx1pqaa2n5vhf7nmr1z403wj7ilkxy5s6cw7gmyi5"; depends=[ggplot2 reshape2 dplyr kernlab stringr knitr]; }; - copBasic = derive { name="copBasic"; version="1.5.4"; sha256="1za91mkahkrcg4h54ii2zk3c22rn8krsa95aj9y0kgg3rxnd09hz"; depends=[lmomco]; }; - copula = derive { name="copula"; version="0.999-10"; sha256="1xx7f1mzym8amlyf84s7yrwygyfcvfqisar64ikyr1ksf571l77i"; depends=[Matrix gsl ADGofTest stabledist mvtnorm pspline]; }; - copulaedas = derive { name="copulaedas"; version="1.4.1"; sha256="1xs02s91la4i1x1zs8k5gfvd9jhs2zqhv58431p1j3spfapzf2rc"; depends=[copula vines mvtnorm truncnorm]; }; - CopulaRegression = derive { name="CopulaRegression"; version="0.1-4"; sha256="17cfs47g5am0gf6kv366v87zv2gcmc7s7bcay4ccfqzqhbhli2i4"; depends=[MASS VineCopula]; }; - CopyDetect = derive { name="CopyDetect"; version="1.1"; sha256="0h9bf7ay5yr6dwk7q28b6xxfzy6smljkq6qwjkzfscy5hnmwxkpa"; depends=[irtoys]; }; - corclass = derive { name="corclass"; version="0.1"; sha256="02mxypdrjwf8psk0j9ggbw14889a87c6lw11qki3s3biq52qsx3y"; depends=[igraph]; }; - corcounts = derive { name="corcounts"; version="1.4"; sha256="0irlx62ql5rp5s7nnjdy6jh723wl4039wn10zxri8ihxwqsyyz3f"; depends=[]; }; - CORE = derive { name="CORE"; version="2.0"; sha256="18vnqfasrn0bkplr3qj21wrksnj8wbsfhg7r0aimaa9c9nz9l7kg"; depends=[]; }; - CORElearn = derive { name="CORElearn"; version="0.9.43"; sha256="0qzj2fx8if157dplxcsss5s0gllwf183vhiqmapbkdix2h9l9jk5"; depends=[cluster rpart]; }; - corHMM = derive { name="corHMM"; version="1.14"; sha256="03kwj8y4c4jw9lwpvyi3539184yifhcavbhh6rbw9pasnxkzj28l"; depends=[ape nloptr expm numDeriv corpcor phangorn rgenoud]; }; - CORM = derive { name="CORM"; version="1.0.2"; sha256="0g5plafx2h1ija8jd6rxvy8qsrqprfbwbi1kq1p4jdr9miha20nv"; depends=[cluster]; }; - corpcor = derive { name="corpcor"; version="1.6.6"; sha256="0rjlqbh76f5q3sjbh9nhvsip9391mnh05x5f7cqi6rp63c194v12"; depends=[]; }; - corpora = derive { name="corpora"; version="0.4-3"; sha256="0zh8mabfy9yqgx7asi4yqv4c0kj59yvyxxaxjgdjy5kkr17zd4g4"; depends=[]; }; - CorrBin = derive { name="CorrBin"; version="1.4"; sha256="0xnj2rhm4ph9277v2wfrp15p8nbdxiqfpcj0shj0d9z8rasx7p8m"; depends=[boot combinat]; }; - CorReg = derive { name="CorReg"; version="0.15.0"; sha256="17cgq5ssqxa8v5afjhnfg4fr1p9bs3migzmh5b9b2kxixm81flk5"; depends=[Rcpp lars elasticnet clere spikeslab corrplot Matrix mclust Rmixmod ridge rpart MASS parcor mvtnorm]; }; - correlate = derive { name="correlate"; version="1.0"; sha256="0hv0i928f49p8n78hd3bcx923l2x0zcs4kwj71ph8gm7s8540fhc"; depends=[]; }; - Correlplot = derive { name="Correlplot"; version="1.0-2"; sha256="0prxnbi7ga5d23i0i4qpynfb3zrsgjxam47km6nsj1prakdkrq7w"; depends=[calibrate xtable]; }; - corrgram = derive { name="corrgram"; version="1.5"; sha256="015h4vnbmjir81x9ifqbnl25havpi8m7p3iaj30rl1hdhhbpy0dz"; depends=[seriation]; }; - corrplot = derive { name="corrplot"; version="0.73"; sha256="0xnlkb8lhdjcc10drym9ymqzvfwa3kvf955y0k66z5jvabzyjkck"; depends=[]; }; - corrsieve = derive { name="corrsieve"; version="1.6-8"; sha256="0ak3j9khcwv5rxbicck2sr260wpmd3xj254y7pdavx2fk0b72yxs"; depends=[]; }; - corTools = derive { name="corTools"; version="1.0"; sha256="0arvqk2xp19ap73zmdk0kb1fycb3v2mf65b4bhanvcqwr4kg4vdk"; depends=[]; }; - COSINE = derive { name="COSINE"; version="2.1"; sha256="10ypj849pmvhx117ph3k1jqa62nc4sdmv8665yahds7mh0ymhpjj"; depends=[MASS genalg]; }; - cosinor = derive { name="cosinor"; version="1.1"; sha256="02nnqg51vq48lzk667cyarnmhcf5mifnsdij7dlgqvz2k4fdq4pl"; depends=[ggplot2 shiny]; }; - cosmoFns = derive { name="cosmoFns"; version="1.0-1"; sha256="0a6xhbgxxnymlvicg99yhgny2lscxcbmvqmy17kxmahdi797dsg6"; depends=[]; }; - cosmosR = derive { name="cosmosR"; version="1.0"; sha256="0w4qywnkgcybgyyhnvvg33amqi2vnkry6iajakyqr1x2hzfpf9sv"; depends=[xlsx]; }; - cosso = derive { name="cosso"; version="2.1-1"; sha256="1wyq27qak0kz4bbzynm24r5ksvb6ddd43h2ykh6m935xck16blyb"; depends=[quadprog Rglpk glmnet]; }; - costat = derive { name="costat"; version="2.3"; sha256="1kqyl89lx1amap9zgrfy1bqnl93kahrksj6yms44yrxr1as2g4nk"; depends=[wavethresh]; }; - cotrend = derive { name="cotrend"; version="1.0"; sha256="0h0y502wqq83wlf9ab1b9rxg1wycvi3sp4lbqfpvy46vgljrjw87"; depends=[xts]; }; - COUNT = derive { name="COUNT"; version="1.3.1"; sha256="1j67f9cjqn523g3khawxj41c19c2l6l287f8ry8mnmijfs0hvpr4"; depends=[msme sandwich MASS]; }; - countrycode = derive { name="countrycode"; version="0.17"; sha256="0rmmqh0x34bdnyb19r719rsm46q8193lf7wcynd5s3c2i4vbkx8n"; depends=[]; }; - CountsEPPM = derive { name="CountsEPPM"; version="1.0"; sha256="19l0nb1rrhqcxcjx4lrp298xgxprziz1ccl3r1q3h16yj5vhkqrw"; depends=[Matrix Formula]; }; - covLCA = derive { name="covLCA"; version="1.0"; sha256="15jsjrlaws1cqyrwvh4lzbhxkb11jmgpmddg98nfrzmjpczn2iw3"; depends=[Matrix mlogit poLCA]; }; - covreg = derive { name="covreg"; version="1.0"; sha256="0v19yhknklmgl58zhvg4szznb374cdh65i7s8pcj2nwrarycwzaq"; depends=[]; }; - covRobust = derive { name="covRobust"; version="1.1-0"; sha256="1nvy5cqs4g565qj2hhgk5spr58ps2bhas3i752rf7wvrskb89fk7"; depends=[]; }; - CovSel = derive { name="CovSel"; version="1.1"; sha256="13dh97857h3r684yw1bzyr1rkpk8l7sshgy9hvg5y95csgai2qhw"; depends=[MASS dr np boot cubature]; }; - covTest = derive { name="covTest"; version="1.02"; sha256="0p4di8bdjghsq5jd678dprlhiwnxr5piqlx2z7hi2bjjpvvl5657"; depends=[lars glmnet glmpath MASS]; }; - CoxBoost = derive { name="CoxBoost"; version="1.4"; sha256="1bxkanc8zr4g3abn4ds5wqibv65flvm4y648fs9s0l4vc9vmyshg"; depends=[survival Matrix prodlim]; }; - 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]; }; - coxphf = derive { name="coxphf"; version="1.10"; sha256="15bpy6vcn65pnknqbiqhpbpddhzyslgsc06g8rnamg60akg4p3v8"; depends=[survival]; }; - coxphw = derive { name="coxphw"; version="3.0.0"; sha256="11pyd09dwkbixjz1riv8rz3jrp1ix6cbn1fw9nm8vnrc19x5lkz5"; depends=[survival]; }; - CoxRidge = derive { name="CoxRidge"; version="0.9.1"; sha256="11vlsrv03j6kcxq9an7g210nq6cc6qd04b7w0pfbdk4bniqc0k60"; depends=[survival]; }; - coxrobust = derive { name="coxrobust"; version="1.0"; sha256="08hp0fz5gfxgs3ipglj6qfr6v63kzxkrzg650bmzabq8dvrxd97q"; depends=[survival]; }; - cpa = derive { name="cpa"; version="1.0"; sha256="14kcxayw4cdbjfa6bvfzqp8flwc0sr3hmh2dnr1dfax0hnccd71m"; depends=[]; }; - cpca = derive { name="cpca"; version="0.1.2"; sha256="1pccsjahb1qynnxa0akhfpcmhfmdg4rd1s6pfqrdl7bwbcmq4lqf"; depends=[]; }; - CPE = derive { name="CPE"; version="1.4.4"; sha256="09sqp2a0j43jr9ya9piv8575rwd5fdvwmiz4chv75r3mw8p128mn"; depends=[survival rms]; }; - CpGassoc = derive { name="CpGassoc"; version="2.11"; sha256="01hx9flf4mq1kgg77dah7s33kdkdgnmckppcl1y806xsnxqxmrxq"; depends=[nlme]; }; - CPHshape = derive { name="CPHshape"; version="1.0.1"; sha256="05krqcd4spgghp3ihv1zfql6ikd64vkqnrjghjvfki3hi3zi5k7h"; depends=[]; }; - 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]; }; - CPMCGLM = derive { name="CPMCGLM"; version="1.1"; sha256="1w8yp37vxz2cl0yqdzpyxdfq2scz2h9i4crjzjmjzpzffi45f06s"; depends=[mvtnorm plyr]; }; - Cprob = derive { name="Cprob"; version="1.2.2"; sha256="18dzyfgxx32azmb02i1gr0fb6nq1b81wni9cgj3qgw8ga7lplgik"; depends=[prodlim tpr geepack lgtdl lattice]; }; - CR = derive { name="CR"; version="1.0"; sha256="0smb2i560dwbxg3mp1svfxmaiw193pd3klwqq0i27czf07k1xfvj"; depends=[]; }; - CRAC = derive { name="CRAC"; version="1.0"; sha256="0vnqmmmwakx5jnzqp20dng35p7rvmz3ypm2m7bs41m8nhh2wq1xa"; 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]; }; - crank = derive { name="crank"; version="1.0-5"; sha256="1zy0z308kw0qgyppkm66p8vqw5b1qcn5avhm78zh0r9k60069dm5"; depends=[]; }; - crantastic = derive { name="crantastic"; version="0.1"; sha256="0y2w9g100llnyw2qwjrib17k2r2q9yws77mf6999c93r8ygzn4f5"; depends=[]; }; - crawl = derive { name="crawl"; version="1.4-1"; sha256="175w5933h5hhhjnrc0l1kg5q24b8pclnf5sf36gj1pmg8s58d1gp"; depends=[mvtnorm sp raster]; }; - crblocks = derive { name="crblocks"; version="0.9-1"; sha256="1m6yy6jb1dld7m9jaasms5ps8sn3v039jvlk8b0c08hmm7y0rm3z"; depends=[]; }; - crch = derive { name="crch"; version="0.1-0"; sha256="1f4y2dd6lxsryyjjv569bxh1b4ymcnma0m9k7j150anzvkbrgnjn"; depends=[Formula ordinal]; }; - CreditMetrics = derive { name="CreditMetrics"; version="0.0-2"; sha256="16g3xw8r6axqwqv2f0bbqmwicgyx7nwzff59dz967iqna1wh3spi"; depends=[]; }; - CRF = derive { name="CRF"; version="0.3-8"; sha256="0w9wfjlx6hvd07k0iszfyip0vn0ca5ax2d5g7hsg6pm2isnzap8a"; depends=[Rglpk Matrix]; }; - crimCV = derive { name="crimCV"; version="0.9.3"; sha256="1p2cma78fb9a2ckmwdvpb6fc0818xw2mvq565dgiimgkdmmr0iid"; depends=[]; }; - CRM = derive { name="CRM"; version="1.1.1"; sha256="09h6xvqc2h2gxhdhc7592z93cnw16l549pn9i26ml0f0n20hljmf"; depends=[]; }; - crmn = derive { name="crmn"; version="0.0.19"; sha256="0gja9a2nk328hxali15kc2za32dgbjfznxh08yka6qf6jc6jx9g1"; depends=[pls]; }; - crn = derive { name="crn"; version="1.1"; sha256="1fw0cwx478bs6hxidisykz444jj5g136zld1i8cv859lf44fvx2d"; depends=[chron RCurl]; }; - crossdes = derive { name="crossdes"; version="1.1-1"; sha256="1d7lv3ibq1rwxx8kc3ia6l9dbz2dxdd5pnf2vhhjmwm448iamcfd"; depends=[AlgDesign gtools]; }; - crossmatch = derive { name="crossmatch"; version="1.3-1"; sha256="082lrv2129mfhwlh99z3g8id3a29s8854skl152bl3ig8pk2gbjz"; depends=[survival nbpMatching]; }; - crossReg = derive { name="crossReg"; version="1.0"; sha256="1866jhfnksv9rk89vw7w4gaxi76bxfjvqxx7cfa8nlrcsmaqd7rf"; depends=[]; }; - crossval = derive { name="crossval"; version="1.0.1"; sha256="1xdl6cmmfkl46arbm71jhdsscjknclvsiaysijlp2p4vgw2762pa"; depends=[]; }; - crp_CSFP = derive { name="crp.CSFP"; version="2.0"; sha256="0ji208hn3zimql0xhy8bl7w0vg40szw28fia7k1f7g9z0wbl9xqp"; depends=[MASS]; }; - crqa = derive { name="crqa"; version="1.0.4"; sha256="05sp7dbi89wanhjlrbqb3ms9gl7s1h1iww26s4iy84i0pr0wg7br"; depends=[Matrix tseriesChaos fields]; }; - crrSC = derive { name="crrSC"; version="1.1"; sha256="171cw56q2yv1vb4qd0va75i2q89jcw1126q8pcbv0235g7p2a86z"; depends=[survival]; }; - crrstep = derive { name="crrstep"; version="2014-07.16"; sha256="15di36j44wxvwl7zhnz3s16lf65rnpj1bvgxf0glkkm0pw94ibrl"; depends=[cmprsk]; }; - crs = derive { name="crs"; version="0.15-23"; sha256="0psb0qaj7xxpfsxylzyzsc4pzfybrrzjzgmr974znaqqwkngdkl4"; depends=[boot]; }; - CRTSize = derive { name="CRTSize"; version="0.3"; sha256="0m7dc29p2vdpcgji4k4yrpmhv29b7n9i2n6qz6fm19jb2byqsrr5"; depends=[]; }; - CrypticIBDcheck = derive { name="CrypticIBDcheck"; version="0.3-1"; sha256="1lrpwgvsif1wnp19agh8fs3nhlb7prr3hhqg28fi4ikdd1l2j3r4"; depends=[rJPSGCS car ellipse]; }; - csampling = derive { name="csampling"; version="1.2-2"; sha256="0gj85cgc3lgv7isqbkng4wgzg8gqcic89768q2p23k4jhhn6xm2w"; depends=[marg statmod survival]; }; - cSFM = derive { name="cSFM"; version="1.1"; sha256="1znxsqa8xdifmryg7jiqbpzm837n4n862kg5x1aki52crc4zyk3k"; depends=[sn mgcv mnormt MASS moments]; }; - cshapes = derive { name="cshapes"; version="0.4-2"; sha256="015mkh0iwdbhpbk8gpnq48pp026mfidd69rj70arpmg3knd2jvff"; depends=[sp maptools plyr]; }; - cslogistic = derive { name="cslogistic"; version="0.1-3"; sha256="1s8p3qpz81nn6zr0pzw6h9ca3p6ahd8zj640vy5gcb5waqwj6bfj"; depends=[mvtnorm]; }; - csn = derive { name="csn"; version="1.1"; sha256="1cv5pv6g1b635c5bamq43339vh1rxadwjl4vxyrx56991wyr36sl"; depends=[mnormt]; }; - csound = derive { name="csound"; version="0.1-1"; sha256="0d4bad8qld29k0yavg7f2srljnbax0gj53dljqw1b1z7shyqd1n5"; depends=[rdyncall]; }; - CSS = derive { name="CSS"; version="1.0.2"; sha256="0p0c3gfj6p58hd4398kkpjg7rhx6wh5z6qddpqnvbm24acq7nrvh"; depends=[XML stringr]; }; - csSAM = derive { name="csSAM"; version="1.2.4"; sha256="1ms8w4v5m9cxs9amqyljc2hr1178cz6pbhmv7iiq9yj1ijnl4r1x"; depends=[]; }; - cstar = derive { name="cstar"; version="1.0"; sha256="1zws4cq5d37hqdxdk86g85p2wwihbqnkdsg48vx66sgffsf1fgxd"; depends=[]; }; - csvread = derive { name="csvread"; version="1.0"; sha256="0llldk4jg8kbr5nq91sb81hi0cn2ykgpg4bhky8zl8i90x2j8l63"; depends=[]; }; - cts = derive { name="cts"; version="1.0-19"; sha256="16f6nah3w63bz8b9xlhi3a7mpkiywq6gqkxgm5am90g0bqg5j3py"; depends=[]; }; - CTT = derive { name="CTT"; version="2.1"; sha256="0v8k54x9pib6hq3nz3m80g1a3p003f7bn8wnj9swwvacc90d6n44"; depends=[]; }; - ctv = derive { name="ctv"; version="0.8-0"; sha256="1rh38i872hmhj36lmpg7c2p0p7hcvy2kfr5bfl9w7mqn9d9n39qs"; depends=[]; }; - cubature = derive { name="cubature"; version="1.1-2"; sha256="1vgyvygg37b6yhy8nkly4w6p01jsqg2kyam4cn0vvml5vjdlc18a"; depends=[]; }; - cubfits = derive { name="cubfits"; version="0.1-0"; sha256="0iylwxzz2aa70q1xqk8r1rkfiiscj3blwq7dshkwshh91l2fgzfw"; depends=[]; }; - Cubist = derive { name="Cubist"; version="0.0.18"; sha256="176k9l7vrxamahvw346aysj19j7il9a2v6ka6dzmk0qq7hf3w9ka"; depends=[lattice reshape2]; }; - cudaBayesreg = derive { name="cudaBayesreg"; version="0.3-15"; sha256="02akp2ib06hqb1vfqj27vj4y5m0pimy6qg69argq6g0bz5msrgp8"; depends=[cudaBayesregData oro_nifti]; }; - cudaBayesregData = derive { name="cudaBayesregData"; version="0.3-11"; sha256="1cls9xqgps7icjpi1mllkrksdxwc1jfhxgffvrcrqx2l16vw6qfx"; depends=[]; }; - cudia = derive { name="cudia"; version="0.1"; sha256="1ms3bc8sp6l3bm75j418mmb707sy3gyvxznhfias3nd4sw7i074x"; depends=[MCMCpack mvtnorm]; }; - CUMP = derive { name="CUMP"; version="1.0"; sha256="0dbpgm75nbd4h8rf3ca5n4mgdn3qm4yyf2d48vlihakzw6rqbpka"; depends=[]; }; - cumplyr = derive { name="cumplyr"; version="0.1-1"; sha256="07sz1wryl3kxbk67qyvnkrkdrp4virlsaia0y6rf9bqdw7rc6vi2"; depends=[]; }; - cumSeg = derive { name="cumSeg"; version="1.1"; sha256="01hn3j1i7bi2r9vsqwbgy1f1alcisxyf4316xx57bg82lb34d0s5"; depends=[lars]; }; - currentSurvival = derive { name="currentSurvival"; version="1.0"; sha256="0bqpfwf4v4pb024a98qwg81m6zd7ljg1ps42ifhxpqx7b9gdyi6c"; depends=[survival cmprsk]; }; - curvetest = derive { name="curvetest"; version="2.2"; sha256="1lz6rx9fmgyrlci1dyanscp2a18ki9lhrwnrzhp062flysffimg6"; depends=[locfit R_oo R_methodsS3]; }; - curvHDR = derive { name="curvHDR"; version="1.0-3"; sha256="0rq72prxv2r5nicss9mh4wpkfjvlbb885w85ag4qrqijzq6y8q04"; depends=[feature geometry hdrcde ks misc3d ptinpoly rgl]; }; - cusp = derive { name="cusp"; version="2.2"; sha256="0c8hxsvvp2p86jwcbx1rzs6i8w2mh3dnsfmfkwpq9x28aps3dmd5"; depends=[]; }; - cutoffR = derive { name="cutoffR"; version="1.0"; sha256="1801jylmpp4msyf07rhg4153kky1zvi4v0kkjb9d51dc7zkhh531"; depends=[ggplot2 reshape2]; }; - cuttlefish_model = derive { name="cuttlefish.model"; version="1.0"; sha256="1rmkfyfd1323g2ymd5gi1aksp160cwy5ha5cjqh5r6fzd8hhqjxs"; depends=[]; }; - cvAUC = derive { name="cvAUC"; version="1.0-0"; sha256="1z8l2ivv7h8din6q46ds3gnlsff10l4ry2kavqv9qsl4xkd8rim0"; depends=[ROCR]; }; - CVcalibration = derive { name="CVcalibration"; version="1.0-1"; sha256="0ca582fnysrldlzxc3pihsph9pvdgygdh7sfzgxvr5fc3z1jbjzb"; depends=[]; }; - CVD = derive { name="CVD"; version="1.0.0"; sha256="1lqx3rrq4abm7rxc6c9zlw0sc6flc6mll4xgfnasfrkai82kaf44"; depends=[]; }; - cvplogistic = derive { name="cvplogistic"; version="3.1-0"; sha256="1lm66nn0q7665r64rdslxp35b7drdss4mys42ks54xdydcminns9"; depends=[]; }; - cvq2 = derive { name="cvq2"; version="1.2.0"; sha256="19k95xg2y3wd4mx3wvbrc1invybd446g13vsp3dv05nw2kx4f6w8"; depends=[]; }; - CVST = derive { name="CVST"; version="0.2-1"; sha256="17xacyi8cf37rr2xswx96qy7pwkaqq394awdlswykz3qlyzx4zx2"; depends=[kernlab Matrix]; }; - CVThresh = derive { name="CVThresh"; version="1.1.1"; sha256="19d7pslzj8r3z5gn3cplpz2h2ayz6k1nrfx3s2b7a8w1il3vmi69"; depends=[wavethresh EbayesThresh]; }; - cvTools = derive { name="cvTools"; version="0.3.2"; sha256="0b7xb6dmhqbvz32zyfbdvm9zjyc59snic6wp1r21ina48hchn3sj"; depends=[lattice robustbase lattice robustbase]; }; - cvxclustr = derive { name="cvxclustr"; version="1.1.1"; sha256="0idmx4wgz4d0b1xzmlq5bsk2f2q38lpf9c117hg97xsfndzn7vqj"; depends=[Matrix igraph]; }; - cwhmisc = derive { name="cwhmisc"; version="4.0"; sha256="1lvq2mcbdr38nzbx344c2y9ayi3lv9fkzwwf0l2jzan9s2sppxx2"; depends=[lattice]; }; - cwm = derive { name="cwm"; version="0.0.3"; sha256="1ln2l12whjhc2gx38hkf3xx26w5vz7m377kv67irh6rrywqqsyxn"; depends=[MASS matlab permute]; }; - cxxfunplus = derive { name="cxxfunplus"; version="1.0"; sha256="0kyy5shgkn7wikjdqrxlbpfl3zkkv4v1p8a1vv0xkncwarjs4n8d"; depends=[inline]; }; - cycloids = derive { name="cycloids"; version="1.0"; sha256="00pdxny11mhfi8hf76bfyhd1d53557wcbl2bqwjzlpw5x3vdnsan"; depends=[]; }; - cyphid = derive { name="cyphid"; version="1.1"; sha256="0ya9w8aw27n0mvvjvni4hxsr4xc8dd08pjxx7zkfl1ynfn5b08am"; depends=[fda]; }; - cytoDiv = derive { name="cytoDiv"; version="0.5-3"; sha256="00c0gqgypywgbhavb15bvj6ijrk4b5zk86w85n9kwr4069b7jvwc"; depends=[GenKern plotrix]; }; - d3Network = derive { name="d3Network"; version="0.5.1"; sha256="1nc5gca9jsny5jj8m37081l3rwvmp1cxqpqaimzyr475j6cac40r"; depends=[plyr rjson whisker]; }; - DAAG = derive { name="DAAG"; version="1.20"; sha256="05jlsrs0frk9ky20h17c5vj9d4j28c9n0a1jww5lssacimn1d4x5"; depends=[lattice latticeExtra]; }; - DAAGbio = derive { name="DAAGbio"; version="0.62"; sha256="18m4vq8vv0yi79na62nrm0cy1nlk7bg0xbddzxv5gpkmzi1i6m9s"; depends=[]; }; - DAAGxtras = derive { name="DAAGxtras"; version="0.8-4"; sha256="18lg13mbyharidj5j7ncx8s7d72v2hcnqr00vilhf3djk2mjq7xn"; depends=[]; }; - dae = derive { name="dae"; version="2.1-7"; sha256="0wchpq8hg2s33nm86dj6vqqvajg2062gbrxg6z7n9i2r6s1hmdjv"; depends=[lattice]; }; - daewr = derive { name="daewr"; version="1.0-10"; sha256="09ra3zkmvxdxn0fvrbzixvvgddb066bba9q5zih5kifc8kd0a5xp"; depends=[FrF2 BsMD]; }; - dafs = derive { name="dafs"; version="1.0-37"; sha256="1vdi57qaqdn39yf1ih2gzry02l289q4bffpksglsl4shs6bg2206"; depends=[s20x]; }; - dagbag = derive { name="dagbag"; version="1.1"; sha256="1hpg7fs1yhnycziahscymkr0s3a2lyasfpj0cg677va73nrpdz12"; depends=[]; }; - DAGGER = derive { name="DAGGER"; version="1.4"; sha256="0b2hzv001xhch7pqgb53lfpdcjwg5lj33i6pb884l1kx92svjfr7"; depends=[Rglpk quadprog Matrix]; }; - dagR = derive { name="dagR"; version="1.1.3"; sha256="13jyhwjvvrjjja18rqzfdcw9ck90qm5yjwd25nygxgdf1894y03b"; depends=[]; }; - Daim = derive { name="Daim"; version="1.1.0"; sha256="19s0p3a4db89i169n2jz7lf8r7pdmrksw7m3cp9n275b5h8yjimx"; depends=[rms]; }; - DAKS = derive { name="DAKS"; version="2.1-2"; sha256="1817s7xd4h2zzaagmnw423qaxpa5fmxi3fh4h9hm2ra9w7nh6ljj"; depends=[relations sets]; }; - DALY = derive { name="DALY"; version="1.3.0"; sha256="18naa4422zphdcngbdzahjn9gb7vgzg8jk3kpvn7vccjjcl36gjd"; depends=[]; }; - DAMisc = derive { name="DAMisc"; version="1.2"; sha256="1fkp21inpgfr5lfid8wmajlcsqbnrgl5c35j0863sywvz6gamgc2"; depends=[car effects lattice sm MASS nnet pscl gdata xtable]; }; - dams = derive { name="dams"; version="0.1"; sha256="0h0chh9ahsfvqhv1a0dfw88q7gdl1d0w11qcw0w4qmc2ipsl52i6"; depends=[RCurl]; }; - DandEFA = derive { name="DandEFA"; version="1.5"; sha256="0d82rjkgqf4w7qg7irlqvzzav1f23i2gmygkbf8jycaa6xhli80d"; depends=[gplots polycor]; }; - darch = derive { name="darch"; version="0.9.1"; sha256="0syrzmmz43msd51whkb4xy5n0kgcl50yw4w3i9sdd9k20glvwpsx"; depends=[futile_logger ff]; }; - darts = derive { name="darts"; version="1.0"; sha256="07i5349s335jaags352mdx8chf47ay41q7b0mh2xjwn2h9kzgqib"; depends=[]; }; - DatABEL = derive { name="DatABEL"; version="0.9-4.1"; sha256="1vfsfx8kmjdid5xxmm9sn873gs8nwk3bkdkiav74y1qa1fq2cyd5"; depends=[]; }; - datacheck = derive { name="datacheck"; version="1.0.0"; sha256="03lms1m3g1rc6jj224hzzbv975xkdd0jsm602zn74j73i227fvmz"; depends=[Hmisc stringr shiny testthat xtable]; }; - DataCombine = derive { name="DataCombine"; version="0.1.26"; sha256="0wvlr7983v5w0cnwqzv72qzx9abwaw2v2r0bq1ay0n1yxi9wnlf9"; depends=[data_table dplyr]; }; - dataframes2xls = derive { name="dataframes2xls"; version="0.4.5"; sha256="0lfdp87k0yypwvnsr7803ylzqfy51l37zgwy9zn5nb6n30p588fv"; depends=[]; }; - datalist = derive { name="datalist"; version="0.2"; sha256="0q82wira0sfi63cn66f5cfyd15f19ig7pbmpk56j38a3115l2fmn"; depends=[assertthat]; }; - datamap = derive { name="datamap"; version="0.1-1"; sha256="0qm4zb9ldg4wz1a7paj5ilr1dhyagq81rk9l2v43hmkv52sssgkv"; depends=[DBI]; }; - datamart = derive { name="datamart"; version="0.4.2"; sha256="1khhjva0kpl4j406lpn4n1bxlxk5wcmz4cbbrw71gi3bg3sxpd5y"; depends=[RJSONIO XML RCurl base64 markdown]; }; - datamerge = derive { name="datamerge"; version="1.0-1"; sha256="03xb48igkh0f91iq6qc2j5xzqfy2n51ci5i850gn09mm9k4lxij1"; depends=[xtermStyle]; }; - dataone = derive { name="dataone"; version="1.0.0"; sha256="0r2andiv1igygdd3rby4jqs0imhkyfyl0jzb67lc2vjgwh3m2rx0"; depends=[rJava XML dataonelibs rJava XML]; }; - dataonelibs = derive { name="dataonelibs"; version="1.0.0"; sha256="12qp8vgdqhsfsnh06ml6lz0vvk934q4bpbg79p9l1hsnbxwnj2w6"; depends=[rJava]; }; - dataQualityR = derive { name="dataQualityR"; version="1.0"; sha256="0f2410sd6kldv7zkqsmbz1js0p5iq7zwlnfwmmnlbrd303p35p3j"; depends=[]; }; - data_table = derive { name="data.table"; version="1.9.2"; sha256="1fchjg939av89m0zsv85w2xcc8qriwkskk0mcsqy8ip6pcfnlg66"; depends=[reshape2]; }; - datautils = derive { name="datautils"; version="0.1.4"; sha256="0adg87p9rzz62cm0s80x71mhsg3yfg93gskv1hs1l8gaj78zd1y1"; depends=[deldir gplots gtools]; }; - dataview = derive { name="dataview"; version="2.0-9"; sha256="0519h2c33v04vwdd8nz9xmqha15svhxdj761d68qmi52jrw6858d"; depends=[xtermStyle]; }; - date = derive { name="date"; version="1.2-34"; sha256="066zsddpw87x1bhl3479k6fd1wrl3x91n5rd454diwmwq2s8i5qb"; depends=[]; }; - DATforDCEMRI = derive { name="DATforDCEMRI"; version="0.55"; sha256="0v26a1gi8l21ga5nqcnyfaa7gc8zxq6wk95b96ajgpdybb0l9s53"; depends=[xtable akima R_oo R_methodsS3 matlab lattice locfit]; }; - dave = derive { name="dave"; version="1.5"; sha256="0sw9hc4y9wdfbnnk6isg7z7sky6ni68pkjxdlrph5m7jcyqphz96"; depends=[labdsv vegan]; }; - Davies = derive { name="Davies"; version="1.1-8"; sha256="1wp7ifbs4vqfrn4vwh09lc53yiagpww91m5mxmcr62mjbw8q7zhr"; depends=[]; }; - dawai = derive { name="dawai"; version="1.0"; sha256="0vff248ldm24dk7kh2z2sj5m4g7jc5nmnlqay5j4h0gsk95fb8d5"; depends=[mvtnorm ibdreg boot]; }; - dbarts = derive { name="dbarts"; version="0.8-3"; sha256="17yd0xsb9z175p8gjq06yycbxlqc58q0bd5mz31aspwva96brmjh"; depends=[]; }; - dbConnect = derive { name="dbConnect"; version="1.0"; sha256="1vab5l4cah5vgq6a1b9ywx7abwlsk0kjx8vb3ha03hylcx546w42"; depends=[RMySQL gWidgets]; }; - dbEmpLikeGOF = derive { name="dbEmpLikeGOF"; version="1.2.4"; sha256="0vhpcxy702cp3lvlif2fzmvccys8iy7bv1fbg6ki2l8bvn2f7c5p"; depends=[]; }; - dbEmpLikeNorm = derive { name="dbEmpLikeNorm"; version="1.0.0"; sha256="0h5r2mqgallxf9hin64771qqn9ilgk1kpsjsdj2dqfl3m8zg967l"; depends=[dbEmpLikeGOF]; }; - DBFTest = derive { name="DBFTest"; version="1.0"; sha256="0h83ic16z0lg7grjh4jbrxf672qchqv4zzypm2b1mhmzl01jn1wg"; depends=[]; }; - DBGSA = derive { name="DBGSA"; version="1.2"; sha256="04zqh9y3nqcdzs5jn8aaq5idy9zl450ikvl788xs860wlg692qv2"; depends=[fdrtool]; }; - DBI = derive { name="DBI"; version="0.2-7"; sha256="1qxmcgswrbisvzmaz2s6bcfbh3lb2hmizjxaqkan147r823rh2p9"; depends=[]; }; - DBKGrad = derive { name="DBKGrad"; version="1.5"; sha256="0k0bl680ynblbla5k9fndh5x7a6f8jyr402a7dg9cjnhhw5q7bxc"; depends=[minpack_lm SDD TSA lattice]; }; - dblcens = derive { name="dblcens"; version="1.1.7"; sha256="02639vyaqg7jpxih8cljc8snijb78bb084f4j3ns6byd09xbdwcw"; depends=[]; }; - dbmss = derive { name="dbmss"; version="2.1.1"; sha256="1x1148csb6r2xckah3ha595hxx26i3cx3xp99sdwp9dic1hg8ral"; depends=[spatstat Rcpp cubature]; }; - dbstats = derive { name="dbstats"; version="1.0.3"; sha256="1l7yy6m98pkkrzycxcajjjw2h0crbm0fazyq9xg8875ar29i291p"; depends=[cluster pls]; }; - dcemriS4 = derive { name="dcemriS4"; version="0.51"; sha256="14ir9g4jg8asim8f33wizmvj6vm96583h212yygsa6yc301bhad8"; depends=[oro_nifti]; }; - DCGL = derive { name="DCGL"; version="2.1.1"; sha256="16jdlpl09q9pcymk5xxca2ba0vqv2l05wzi4ffb9ffydxpxy61j9"; depends=[igraph]; }; - dcGOR = derive { name="dcGOR"; version="1.0.2"; sha256="03k6bmnn7qi0192243s9n640fh55rng2r1s8z5zs6ziwrlym7zm2"; depends=[Matrix igraph dnet]; }; - DCL = derive { name="DCL"; version="0.1.0"; sha256="1ls3x3v0wmddfy7ii7509cglb28l1ix1zaicdc6mhwin0rpp2rx3"; depends=[lattice latticeExtra]; }; - dclone = derive { name="dclone"; version="2.0-0"; sha256="1j8g955rvdgcmc9vnz3xizlkq8w1bslav5h72igvzzffcvqbj9hq"; depends=[coda]; }; - DCluster = derive { name="DCluster"; version="0.2-6"; sha256="0g7d15kq3dbrjmd5fmiwwg2b6gakz1lpsgrpkg6q89pzwlqx8xr9"; depends=[boot spdep MASS]; }; - dcmle = derive { name="dcmle"; version="0.2-4"; sha256="0ddb0x0lwk8jgx05k747sa33d2rrj4g2p4aj0m5bw1c9d5gril0m"; depends=[dclone rjags coda lattice]; }; - dcmr = derive { name="dcmr"; version="1.0"; sha256="1a89wr1n8sykjbwa316zlmcffaysksrqnbd89anxqj8sgw9xv6jq"; depends=[ggplot2 KFAS plyr reshape2 tableplot]; }; - dcv = derive { name="dcv"; version="0.1.1"; sha256="12c716x8dnxnqksibpmyysqp2axggvy9dpd55s9bhnsvqvi6dshj"; depends=[lmtest]; }; - ddalpha = derive { name="ddalpha"; version="1.0.6"; sha256="1scfmq6zsbd15n6mnnplj0c4a0yl8bp7nqqh91cvvycggb5y0a1v"; depends=[MASS class robustbase]; }; - DDD = derive { name="DDD"; version="2.5"; sha256="1svm6l8ssnnf5g3hci46pvw6amisyy1dvfm0mvdryglgfc8vv6jd"; depends=[deSolve ape ade4]; }; - ddepn = derive { name="ddepn"; version="2.2"; sha256="1zwz664jq6qvf1lcwyfn6kyn6dwxhh2nnyirayx0vqs9c6xzpir7"; depends=[lattice coda igraph gam gplots]; }; - DDHFm = derive { name="DDHFm"; version="1.1.1"; sha256="03zs2zbrhjcb321baghva7b8y61c8p9z6bfj2vg9cvadpb0260nk"; depends=[]; }; - DDIwR = derive { name="DDIwR"; version="0.1-0"; sha256="0rf1gj1lzbivkz0pqxbih1zqjccv2rhaqrfdhpwbsqhlw12qkkg5"; depends=[XML foreign]; }; - ddst = derive { name="ddst"; version="1.03"; sha256="0zbqw4qmrh80jjgn8jzbnq3kykj1v5bsg6k751vircc0x9vnig3j"; depends=[orthopolynom evd]; }; - deal = derive { name="deal"; version="1.2-37"; sha256="1nn2blmxz3j5yzpwfviarnmabbyivc25cbfhcf814avrhpysvpxa"; depends=[]; }; - deamer = derive { name="deamer"; version="1.0"; sha256="1xbxr78n6s1yhf192ab4syi1naqlwl9z4cxzchrkw80q7bxqfiz8"; depends=[]; }; - debug = derive { name="debug"; version="1.3.1"; sha256="0mpwi6sippxyr1l8xf48xqv6qw6pmfkxs13k1gjyd7bkzlbchgqd"; depends=[mvbutils]; }; - decctools = derive { name="decctools"; version="0.2.0"; sha256="0k5w49s9s51m7w1h5adk26nw1ypwv5g1mlal78qmx5a4jzaf5bw9"; depends=[XLConnect stringr XML reshape2 RCurl lubridate plyr]; }; - DECIDE = derive { name="DECIDE"; version="1.1"; sha256="1g6l2k4nmspg5y4gzxcnx58kix0br6sgmf54jlaxk69nkvdxm9xy"; depends=[]; }; - decon = derive { name="decon"; version="1.2-4"; sha256="1v4l0xq29rm8mks354g40g9jxn0didzlxg3g7z08m0gvj29zdj7s"; depends=[]; }; - Deducer = derive { name="Deducer"; version="0.7-7"; sha256="1x97rz92v1hx30fdmgd1lnzydgygjp6zh20v082qymvh997l1zzd"; depends=[ggplot2 JGR car MASS rJava e1071 scales plyr foreign multcomp effects]; }; - DeducerExtras = derive { name="DeducerExtras"; version="1.7"; sha256="0sngsq31469a74y7nhskl82fwy2i0ga68m9g6b1xyhxz1a8kgvlg"; depends=[Deducer irr rJava]; }; - DeducerPlugInExample = derive { name="DeducerPlugInExample"; version="0.2-0"; sha256="03aw7wr957xzw920ybyzxnck5kx0q2xpcrpq8jh2afyzszy6hzbi"; depends=[Deducer]; }; - DeducerPlugInScaling = derive { name="DeducerPlugInScaling"; version="0.1-0"; sha256="1qg11vi4szznchh54p9345jbmrfzfr9z5l3x5xz4m86myjkys1mb"; depends=[Deducer psych GPArotation mvnormtest irr klaR]; }; - DeducerSpatial = derive { name="DeducerSpatial"; version="0.7"; sha256="0133qk3yjcifyha7c4pqr5s0hmbci72bzgil2r0sxjmrljs3q727"; depends=[JavaGD Deducer sp maptools OpenStreetMap scales rgdal UScensus2010 Hmisc]; }; - DeducerSurvival = derive { name="DeducerSurvival"; version="0.1-0"; sha256="03qk3y4pibvrxbnxbm5rlksw807dvbilip1jbpn1r7k02ibzq676"; depends=[Deducer]; }; - DeducerText = derive { name="DeducerText"; version="0.1-2"; sha256="0if2p9j74wa5rva4iv0i8iax22grl9j7lqcqzqlywjgqwnlzxa05"; depends=[Deducer tm wordcloud RColorBrewer SnowballC]; }; - deducorrect = derive { name="deducorrect"; version="1.3-4"; sha256="0hpq0cahfar9y9f6mvpmx35mvinwnnmqq16y9yzrmzbxjkylz2ja"; depends=[editrules]; }; - deepnet = derive { name="deepnet"; version="0.2"; sha256="09crwiq12wzwvdp3yxhc40vdh7hsnm4smqamnk4i6hli11ca90h4"; depends=[]; }; - Defaults = derive { name="Defaults"; version="1.1-1"; sha256="0ikgd5mswlky327pzp09cz93bn3mq7qnybq1r64y19c2brbax00d"; depends=[]; }; - degenes = derive { name="degenes"; version="1.1"; sha256="1xxn5j06qizywimrp1pl8z3yjdy1a167b9jnm77gmv87rp6j240c"; depends=[]; }; - degreenet = derive { name="degreenet"; version="1.2"; sha256="07b6phgyydfp8jwjvrqcvcx3b2qhbkr44xkcn20ya1igsbyh6kzz"; depends=[]; }; - Delaporte = derive { name="Delaporte"; version="2.2-0"; sha256="063cqcizqby81k71lnkrnrcxafrnwqfj20y1k38yp9giwgm1ndxs"; depends=[Rcpp]; }; - deldir = derive { name="deldir"; version="0.1-6"; sha256="1hbvkcyclnrrh3xrixn23z1f51n41khcqi5b6gx40qpq0zsbn7sn"; depends=[]; }; - deltaPlotR = derive { name="deltaPlotR"; version="1.4"; sha256="0lmwwaazyrbnp4nsvl2mydcpij34xv9hbyqwcjwx4vij33034k2p"; depends=[MASS]; }; - Demerelate = derive { name="Demerelate"; version="0.8-1"; sha256="1qngwlzzpd2cmij5ldrmhcn12s9yxd0rargc5vzvkrwcqpkgylkn"; depends=[Formula fts sfsmisc vegan mlogit]; }; - DEMEtics = derive { name="DEMEtics"; version="0.8-7"; sha256="1s59qim60d4gp5rxjacdbmxdbpdm7cy9samn088w8fs0q232vjjx"; depends=[]; }; - demi = derive { name="demi"; version="1.1.1"; sha256="19zszmjcczmz9qjp1dhvf92w134266w4qwskdpz36q72m5455zdb"; depends=[plyr R_utils]; }; - demography = derive { name="demography"; version="1.17"; sha256="01yq3wzzcdclgklxqr3sgxglnw18ljxnhzlmzaj9fzqqdw6xngv3"; depends=[forecast rainbow ftsa cobs mgcv strucchange RCurl]; }; - demoKde = derive { name="demoKde"; version="0.9-3"; sha256="1nkvsjms1gfvjz5l7zza0cgx4yqmn2kgnax44pysn0zqmhfny8bw"; depends=[]; }; - dendextend = derive { name="dendextend"; version="0.16.1"; sha256="1qgvr26kn016qwgbaff4r8xqpsvxl3plv1nxafq7rq4havzhfgf9"; depends=[magrittr whisker ape]; }; - dendextendRcpp = derive { name="dendextendRcpp"; version="0.5.1"; sha256="062f7yjsg196v8c09h6gvbhi0fzgwg40a8xhi751avkjc68z30cq"; depends=[Rcpp dendextend]; }; - dendroextras = derive { name="dendroextras"; version="0.2.1"; sha256="0k1w374r4fvfcbzhrgcvklccjggyz755z7wc2vqfi3c5hvdb9ns4"; depends=[]; }; - DendSer = derive { name="DendSer"; version="1.0.1"; sha256="0id6pqx54zjg5bcc7qbxiigx3wyic771xn9n0hbm7yhybz6p3gz9"; depends=[gclus seriation]; }; - dendsort = derive { name="dendsort"; version="0.2.1"; sha256="10qhvxbyziy0xw40j35xsk4sixqc4l0653jgd01spmn4dm1ihj33"; depends=[]; }; - denpro = derive { name="denpro"; version="0.9.1"; sha256="0ihgk300njhp6dzm1gsmknlx4c5h6kiwprgv3l3f29s6gdxx4f6n"; depends=[]; }; - densityClust = derive { name="densityClust"; version="0.1-1"; sha256="1apv9n871dshln5ccg8x3pwqi8yfx73ijfqsvzcljqnv36qpqpqd"; depends=[]; }; - Density_T_HoldOut = derive { name="Density.T.HoldOut"; version="1.02"; sha256="0xjr6z136c0vgsb609xcqf6g4ivyvgpfr4qkwdlj9z5g7gcf3bhl"; depends=[histogram]; }; - denstrip = derive { name="denstrip"; version="1.5.3"; sha256="10h8ivs7nd6gkf93zvqzqjb1lzfabvvs182636m67f86jfn6d4y4"; depends=[]; }; - DEoptim = derive { name="DEoptim"; version="2.2-2"; sha256="0yayp056knd7d6bvk07k7rnj79vibmkzflnk71dsfbkk5yx7vc77"; depends=[]; }; - DEoptimR = derive { name="DEoptimR"; version="1.0-1"; sha256="02c1pmpg42wwmp3wjfi09qbidclclwmrmd3gbfvrnivq7ngp2zil"; depends=[]; }; - depend_truncation = derive { name="depend.truncation"; version="2.1"; sha256="1b13mqm8pjw0r0z5h7vizz15nzhslxhcn4cb8pzadyq98mcmk4g2"; depends=[mvtnorm]; }; - depmix = derive { name="depmix"; version="0.9.12"; sha256="0brs6cskrk52dn41zaqa59dxz377sl9lnh89457d3ykbj4jbc97c"; 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]; }; - depthTools = derive { name="depthTools"; version="0.4"; sha256="1699r0h1ksgrlz9xafw2jnqfsc7xs0yaw97fc6dv3r11x6gxk00y"; depends=[]; }; - descr = derive { name="descr"; version="1.0.3"; sha256="0x3hpr1sy6cpqn434i5z9g4n2insfv7hmks9igx3fnkr5vad7q8l"; depends=[xtable]; }; - DescribeDisplay = derive { name="DescribeDisplay"; version="0.2.4"; sha256="13npxq1314n4n08j6hbmij7qinl1xrxrgc5hxpbbpbd16d75c7iw"; depends=[proto reshape2 ggplot2 plyr scales GGally]; }; - DescTools = derive { name="DescTools"; version="0.99.7"; sha256="0a53r3spwwq641mgzgj7xipfbrgnwd0radn92n17ra4ffxa6f3bh"; depends=[boot]; }; - 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=[]; }; - desire = derive { name="desire"; version="1.0.7"; sha256="0jmj644nj6ck0gsk7c30af9wbg3asf0pqv1fny98irndqv508kf6"; depends=[loglognorm]; }; - DESnowball = derive { name="DESnowball"; version="1.0"; sha256="012kdnxmzap6afc3ffkcvk1mazlkp286av6g9fwz2wcbf5mh9n1m"; depends=[clue combinat MASS cluster]; }; - deSolve = derive { name="deSolve"; version="1.10-9"; sha256="03zqq3lfcc9k0zyfm2mhyzkq2crn1m5gaw1w0x377zrrasl3fw9g"; depends=[]; }; - detect = derive { name="detect"; version="0.3-2"; sha256="1mjc8h3xb2zbj4dxala8yqbdl94knf9q0qvkc37ag1b2w4y2d2b0"; depends=[Formula]; }; - deTestSet = derive { name="deTestSet"; version="1.1.1"; sha256="1qc8sj44zlndyr9k5r179pmy8kyq0wawz7q2xgdmnx27j2rjls43"; depends=[ReacTran]; }; - detrendeR = derive { name="detrendeR"; version="1.0.4"; sha256="1z10gf6mgqybb9ml6z3drq65n7g28h2pqpilc2h84l6y76sy909c"; depends=[dplR]; }; - DetSel = derive { name="DetSel"; version="1.0.2"; sha256="0igkccclmjwzk7sl414zlhiykym0qwaz5p76wf4i7yrpjgk7mhl9"; depends=[ash]; }; - devEMF = derive { name="devEMF"; version="1.2"; sha256="14nqx1gy6hlkmzrrayd7kgljla9flxx4xm329436znd66184sass"; depends=[]; }; - Devore6 = derive { name="Devore6"; version="0.6-0"; sha256="093jbz405wi0zf4nhracy80pl3m7255lq7jkbymfd5snpr9gnb53"; depends=[]; }; - Devore7 = derive { name="Devore7"; version="0.7.6"; sha256="1m18p8h9vv4v0aq2fkjyj39vzb8a09azbbczhfiv4y88w540i8nw"; depends=[MASS lattice]; }; - devtools = derive { name="devtools"; version="1.5"; sha256="1gd8skhj7612zbci361h3yys6iwxr7dvgrjr99vs7b0c0mglm7hp"; depends=[httr RCurl memoise whisker evaluate digest]; }; - df2json = derive { name="df2json"; version="0.0.2"; sha256="10m7xn7rm4aql1bzpckjcx5kvdw44m1pxgzqkgkd40lzqb1cwk18"; depends=[rjson]; }; - dfcrm = derive { name="dfcrm"; version="0.2-2"; sha256="1kwgxfqnz2bcicyb27lp6bnvrj30lqjpn5fg7kaqshgkj53g0s4f"; depends=[]; }; - dfexplore = derive { name="dfexplore"; version="0.2.1"; sha256="04nbhn59l1kas26nwj4qflkjvvr33sj1mm7zg7fhvya85gvlhrbf"; depends=[ggplot2]; }; - DFIT = derive { name="DFIT"; version="1.0-1"; sha256="190k577qvbpbzgyys1r52fq1w642aq5syp2p9d7y6zp4g3xra1sr"; depends=[simex mvtnorm ggplot2]; }; - dfoptim = derive { name="dfoptim"; version="2011.8-1"; sha256="19j0h5xdrbmykz2nrjrwqwaw7466zvqaiwafrm1jc12mk5azfcqx"; depends=[]; }; - dglars = derive { name="dglars"; version="1.0.5"; sha256="02g8x4p98jv3cfwfxvh68aivb72651w4977g4xqksq0p4nqcs636"; depends=[]; }; - dglm = derive { name="dglm"; version="1.6.2"; sha256="0w9rrvlhy2vd9mmp04i1hc3s1w228p0sicwg56rjywsmfqfr81vv"; depends=[statmod]; }; - dgmb = derive { name="dgmb"; version="1.1"; sha256="134ckgq7rsdypg3c586kkhr9rx5ya34smp38i9lzvbdanzrpf33w"; depends=[MASS abind]; }; - dgof = derive { name="dgof"; version="1.2"; sha256="02qnb3i131hx05k8l5n3xbl5sqmmc2fh19bsgcacgj8ixs4wyjvi"; depends=[]; }; - dhglm = derive { name="dhglm"; version="1.2"; sha256="14wa0xkwb1qvkynk95aw6y4rx3jjdki19wdydg3wv5nfagcc4vdz"; depends=[Matrix numDeriv boot]; }; - diagram = derive { name="diagram"; version="1.6.2"; sha256="0jxy1rwph29w8q1383ykbnpq61p220azyv6miq1dx0v2fk5579da"; depends=[shape]; }; - DiagTest3Grp = derive { name="DiagTest3Grp"; version="1.6"; sha256="04dxyyqv333rkjf2vlfpal59m7klhw6y7qilym6nw78qb1kqqys7"; depends=[car KernSmooth gplots]; }; - diaplt = derive { name="diaplt"; version="1.2.1"; sha256="0pya6rqzsvc5nd3smhydvabarglc4nn04q605vbllmbhq9rv00pa"; depends=[]; }; - dice = derive { name="dice"; version="1.1"; sha256="0wnmiyrf57kjkby26z9lgplphv3p15dfxgsbbsgwq65md2d6idyn"; depends=[gtools]; }; - DiceDesign = derive { name="DiceDesign"; version="1.6"; sha256="1djq7clga3cvpgfycs3zjj106213yhfj9909sqrni70nj1nwdpj9"; depends=[]; }; - DiceEval = derive { name="DiceEval"; version="1.3"; sha256="1vp9zwd09cwl3c8066jr9d3w4yic70fvd40r7hsj2y8d0bhiwl82"; depends=[DiceKriging]; }; - DiceKriging = derive { name="DiceKriging"; version="1.5.3"; sha256="14826fwsj6cifksyd605nbfxlfwnapr80inm4chjmm0f2xjc4r5n"; depends=[]; }; - DiceOptim = derive { name="DiceOptim"; version="1.4"; sha256="11k6gqw8bcfcnxhm6a039vnkdm7526h3aszjqwfp1s7m157w8kp2"; depends=[DiceKriging rgenoud MASS lhs]; }; - DiceView = derive { name="DiceView"; version="1.3-1"; sha256="0c7i1jy13d5bj822q1rp0d7gmmfjd00jaah34pnj8fzwyrq404z9"; depends=[DiceKriging DiceEval rgl]; }; - dichromat = derive { name="dichromat"; version="2.0-0"; sha256="1l8db1nk29ccqg3mkbafvfiw0775iq4gapysf88xq2zp6spiw59i"; depends=[]; }; - dicionariosIBGE = derive { name="dicionariosIBGE"; version="1.5"; sha256="03gsp5h39a4s6zgvwnrfdyj1wzrp688qk8g5hdr8rk3a2rzbbzgg"; depends=[]; }; - dielectric = derive { name="dielectric"; version="0.2.3"; sha256="1p1c0w7a67zxp1cb99yinylk5r1v89mmpfybcy94ydydhydbhivk"; depends=[]; }; - DierckxSpline = derive { name="DierckxSpline"; version="1.1-9"; sha256="07bp86zfbcp3d7jdhfap3z1sy15534qvdapdzscbyr2x82mmqpy3"; depends=[lattice PolynomF fda]; }; - diffdepprop = derive { name="diffdepprop"; version="0.1-9"; sha256="0mgrm1isr26v2mcm6fkzc7443ji00vpnqmw4zngx81n7442b3cl2"; depends=[gee rootSolve PropCIs]; }; - diffEq = derive { name="diffEq"; version="1.0"; sha256="17b6yw5xhlk70wvv58348hy1237sjwkxfrgkyw876piy50dxmnz8"; depends=[deSolve rootSolve bvpSolve ReacTran diagram deTestSet scatterplot3d]; }; - diffIRT = derive { name="diffIRT"; version="1.4"; sha256="13axwzsrlr1akj4viwsyaplh11krixg3l07qi58c81jrcrmqpgv1"; depends=[statmod]; }; - diffractometry = derive { name="diffractometry"; version="0.1-8"; sha256="1m6cyf1kxm9xf1z4mn4iz0ggiy9wcyi8ysbgcsk7l78y7nqh1h99"; depends=[]; }; - diffusionMap = derive { name="diffusionMap"; version="1.1-0"; sha256="1l985q2hfc8ss5afajik4p25dx628yikvhdimz5s0pql800q2yv3"; depends=[scatterplot3d igraph Matrix]; }; - DIFlasso = derive { name="DIFlasso"; version="1.0-1"; sha256="048d5x9nzksphsdk9lwfagl165bb40r0pvjq2ihvhqvxspgpar4b"; depends=[grplasso penalized miscTools]; }; - difR = derive { name="difR"; version="4.5"; sha256="0qlaqpywyjggw74h5y5r2aivcyknc6b7l8b1p69g3lyx4d2hz8wp"; depends=[lme4 ltm]; }; - digest = derive { name="digest"; version="0.6.4"; sha256="06xbklq6laffv609hsfqyj04fhdnr9bgjh6ala7253h9vvkjch1k"; depends=[]; }; - Digiroo2 = derive { name="Digiroo2"; version="0.6"; sha256="1b1ahhqz5largjadlk5n6nw2183c05k28mksb1wm26y0lps0vdgr"; depends=[maptools spatstat spdep]; }; - dils = derive { name="dils"; version="0.8.1"; sha256="1q6ba9j14hzf7xy895mzxc6n9yjgind55jf350iqscwzxf7ynp33"; depends=[igraph Rcpp]; }; - DIME = derive { name="DIME"; version="1.2"; sha256="11l6mk6i3kqphrnq4iwk4b0ridbbpg2pr4pyqaqbsb06ng899xw0"; depends=[]; }; - dinamic = derive { name="dinamic"; version="1.0"; sha256="0mx72q83bbwm10ayr3f1dzwr5wgz7gclw7rh39yyh95slg237nzr"; depends=[]; }; - diptest = derive { name="diptest"; version="0.75-5"; sha256="13nml4fp2y77x396xm4j9h8k2cdinfmkna1fr0jpmy3lpcj3h6vs"; depends=[]; }; - DIRECT = derive { name="DIRECT"; version="1.0"; sha256="129bx45zmd6h7j6ilbzj2hjg4bcdc08dvm2igggi8ajndl1l5q9j"; depends=[]; }; - directlabels = derive { name="directlabels"; version="2013.6.15"; sha256="083cwahz320r4w4jbh62pxmzn1i1hixp398zm8f2fpzh4qp5y44g"; depends=[quadprog]; }; - directPA = derive { name="directPA"; version="1.0"; sha256="16bllp7afb83y73zr5wxfkad7vxzfqwdmhcxfa5jml4hlvkhgv1r"; depends=[]; }; - DirichletReg = derive { name="DirichletReg"; version="0.4-0"; sha256="1azrqx1wa7yaary3qk4pz605xzvzdvwqwz5darl2aighwafzgy8d"; depends=[maxLik Formula rgl]; }; - dirmult = derive { name="dirmult"; version="0.1.3-4"; sha256="1r9bhw1z0c1cgfv7jc0pvdx3fpnwplkxwz8j8jjvw14zyx803rnz"; depends=[]; }; - Disake = derive { name="Disake"; version="1.0"; sha256="1i58q6dqk980mk8qj66hbqd64wmkvpa4v0z6c0q3lkirsvdm4cwv"; depends=[]; }; - disclap = derive { name="disclap"; version="1.5"; sha256="0piv9gxhxcd4pbh5qjn9c3199f32y3qiw5vy8cr77ki70dnmr66n"; depends=[]; }; - disclapmix = derive { name="disclapmix"; version="1.5"; sha256="03y1ajaz52kar5wj8csh66kdm8ywin9jpwnj40mkz6fjqi50lhb1"; depends=[Rcpp disclap cluster]; }; - DiscML = derive { name="DiscML"; version="1.0.1"; sha256="0qkh0yak1kmzxxx0cqb47zgrj8v2s1d5danpibwwg43j138sb73l"; depends=[ape]; }; - DiscreteInverseWeibull = derive { name="DiscreteInverseWeibull"; version="1.0"; sha256="0lnpcpwfgl5ncaa67a32nvviv1wn60dprd781dpjljhgja4hrsa7"; depends=[Rsolnp]; }; - DiscreteLaplace = derive { name="DiscreteLaplace"; version="1.0"; sha256="1mwqvlhgswqp697zjl6yjzqbgazycwwz6dfdvx8s72hdmnlqqr9r"; depends=[]; }; - discreteMTP = derive { name="discreteMTP"; version="0.1-2"; sha256="13qsf1kc3rph0kkdkz31qj072www5dwjyk73lfpy141rzhcn1v1x"; depends=[]; }; - discreteRV = derive { name="discreteRV"; version="1.1.2"; sha256="1mq05an70m7k36ip22igbmb2i63gxxf7y9ivb5wn25yx0fynarpk"; depends=[]; }; - DiscreteWeibull = derive { name="DiscreteWeibull"; version="1.0"; sha256="0v8za4arqarf20jrw38dzcjxdwfdpn0ss7p5yxbwhylnj7qz207w"; depends=[Rsolnp]; }; - discretization = derive { name="discretization"; version="1.0-1"; sha256="00vq2qsssnvgpx7ihbi9wcafpb29rgv01r06fwqf9nmv5hpwqbmp"; depends=[]; }; - discrimARTs = derive { name="discrimARTs"; version="0.2"; sha256="088v4awic4bhzqcr7nvk2nldf8cm1jqshg2pzjd2l2p1cgwmlxib"; depends=[RUnit]; }; - DiscriMiner = derive { name="DiscriMiner"; version="0.1-29"; sha256="1ii8aa4dwfk991qdnpmkva20wvs5fqcna9030c799ybf11qpdass"; depends=[]; }; - diseasemapping = derive { name="diseasemapping"; version="0.7.5"; sha256="0i5za00p2pgbwak5gl006yamklzg2m6xcxmqba1kiz16dddfscqq"; depends=[sp mgcv]; }; - diskmemoiser = derive { name="diskmemoiser"; version="1.0-1"; sha256="0lacadc3mm1w55sff3lphp3xrr1inn2r382c1z8gf6kzal7c9pd8"; depends=[digest]; }; - dismo = derive { name="dismo"; version="0.9-3"; sha256="1vr24kx4mv15wivpk6lw1j8l4422p5al80fld8x6fcp31sf7q652"; depends=[raster sp]; }; - disp2D = derive { name="disp2D"; version="1.0"; sha256="0q5bds2r1mqzcwmnj61dmwqv6b0s0scq5h3nim47q3wp0n4gbslz"; depends=[geometry]; }; - displayHTS = derive { name="displayHTS"; version="1.0"; sha256="0mqfdyvn2c5c3204ykyq29ydldsq0kb3a1d7mrzqr7cvrj1ahlqa"; depends=[]; }; - dispmod = derive { name="dispmod"; version="1.1"; sha256="141gzhnmxxl495cpjgd4wnvdrbz6715m6sd1pycrbaqrsdc1pv57"; depends=[]; }; - dissUtils = derive { name="dissUtils"; version="1.0"; sha256="00fzlmkdfw2s3k824wp2pk3v7cvxnywi1hfp86g4mm95z2qlw9br"; depends=[]; }; - Distance = derive { name="Distance"; version="0.9.1"; sha256="04bk0kplpmz3qifyar1fs8jrkyk55a4z1yxwkxx957r419afl6l4"; depends=[mrds]; }; - DistatisR = derive { name="DistatisR"; version="1.0"; sha256="1il00v26q68h5dd5c9lm2jblgn8hs6n0457r13mlw6r7pcj0158j"; depends=[prettyGraphs car]; }; - distfree_cr = derive { name="distfree.cr"; version="1.0"; sha256="13y714l6b3kkpp75fdrsbdclgj1vw1xsvbj9pxi4lkwf11wwmrqr"; depends=[]; }; - distillery = derive { name="distillery"; version="1.0-1"; sha256="0hfj4qbfb5219dm7yrgf2h4jrh2qsjhwrbv8gbrxcr0xf6gqbxmv"; depends=[]; }; - distory = derive { name="distory"; version="1.4.2"; sha256="12j19cb1b4prm8m43gya15kia1ii1k0yy7hkngpn2vsyk7n2z65m"; depends=[ape]; }; - distr = derive { name="distr"; version="2.5.3"; sha256="13ssdidbh4x534f0vvhfpi5cdrhlpmrz8s0y33q7ccf3dfmdsyan"; depends=[startupmsg sfsmisc SweaveListingUtils]; }; - distrDoc = derive { name="distrDoc"; version="2.5"; sha256="104y8q7p53pzwr5pgspa0zczmnhylac2k9aj9flqd75ka6icfqh8"; depends=[distr distrEx distrSim distrTEst distrTeach RandVar distrMod MASS SweaveListingUtils startupmsg]; }; - distrEllipse = derive { name="distrEllipse"; version="2.5"; sha256="1slzzmcf09mqqba287rpgpwbsq6j5lprjgxda5lrc21znvrgfxn3"; depends=[mvtnorm setRNG distr distrEx distrSim]; }; - distrEx = derive { name="distrEx"; version="2.5"; sha256="0mbccd53r9wl875i702j14wlrv7pjgrwzlnyc511cqa5pg3mn81i"; depends=[distr]; }; - DistributionUtils = derive { name="DistributionUtils"; version="0.5-1"; sha256="1in2k7xsaa0wadjgdh8m0v25v0dzx89pb20i5nsa19vx2iiysqbd"; depends=[RUnit]; }; - distrMod = derive { name="distrMod"; version="2.5.2"; sha256="1vgb06qhfpav93xv9lamzmn8mccx5bqdfplkcqpv3i7qlgmngvh9"; depends=[distr distrEx RandVar MASS]; }; - distrom = derive { name="distrom"; version="0.2"; sha256="1mvqqwaa6jwg483gjzgb0wplg1r8p7q7ihypa2z0c8pcbja8i9ff"; depends=[Matrix gamlr]; }; - distrRmetrics = derive { name="distrRmetrics"; version="2.5"; sha256="0c7fhckw7hav68gag8ymgicywl2vbnvqpjxca0x24wpdi1gs4jf6"; depends=[distr fBasics fGarch]; }; - distrSim = derive { name="distrSim"; version="2.5.2"; sha256="0ipg4l2vyifaj1r9a4cc8kg32s65jpz5wxrlnrix95xk5wasdpbh"; depends=[setRNG distr]; }; - distrTeach = derive { name="distrTeach"; version="2.5"; sha256="0a7qfqpirzcd94dvcvmprhhj2j1yl3lpizsi8mdqr19zcp6dw21k"; depends=[distr distrEx]; }; - distrTEst = derive { name="distrTEst"; version="2.5"; sha256="1swl4v70gkkpidddsgqf0dqz9j0xz5j1wk44bhpi4ficim7hap3l"; depends=[setRNG distrSim startupmsg]; }; - divagis = derive { name="divagis"; version="1.0.0"; sha256="1kcz7i3h9xxpqhlq0rl08pgcwd16ygjjmm0jjv9knn2ggc3j1jzz"; depends=[rgdal sp]; }; - DivE = derive { name="DivE"; version="1.0"; sha256="1ixkk8kd3ri78ykq178izib0vwppnbiwbpc1139rcl8f5giiwcdh"; depends=[deSolve FME rgeos sp]; }; - diveMove = derive { name="diveMove"; version="1.3.9"; sha256="0782b8fvh676g6fy05g1da52q398rxmgz46vk6yxwrmnvg78wcq5"; depends=[caTools KernSmooth quantreg geosphere]; }; - diversitree = derive { name="diversitree"; version="0.9-7"; sha256="0hr3hzrrbmfqbzcwn18lnqmychs9f21j1x214zry0jmw9pnai0s0"; depends=[deSolve ape subplex Rcpp]; }; - diveRsity = derive { name="diveRsity"; version="1.9.5"; sha256="0rybnjkkxsam0fhsfcxb2h00p65169iw8kb7xgzzgzdfi258zp9s"; depends=[ggplot2 shiny qgraph Rcpp]; }; - DiversitySampler = derive { name="DiversitySampler"; version="2.1"; sha256="1sfx7craykb82ncphvdj19mzc0kwzafhxlk9jcxkskygrlwsxfgg"; depends=[]; }; - DivMelt = derive { name="DivMelt"; version="1.0.3"; sha256="03vkz8d283l3zgqg7bh5dg3bss27pxv4qih7zwspwyjk81nw3xmr"; depends=[glmnet]; }; - dixon = derive { name="dixon"; version="0.0-5"; sha256="0x7x0l7p8kmkfqqqah8hck2r96b3w8padd41skd3q35vq8kmnsqc"; depends=[splancs spatstat]; }; - dkDNA = derive { name="dkDNA"; version="0.1.0"; sha256="1waqj8l48yqlzi3rb3ilxyx79n5d4w0sp02flvynwaxck6jvh8gc"; depends=[]; }; - dlm = derive { name="dlm"; version="1.1-3"; sha256="1mk5hlhm4bm8a5ilrbiwqggj1wg2jiv44s6gjjkjigs24673lg27"; depends=[]; }; - dlmap = derive { name="dlmap"; version="1.13"; sha256="0s6wlkggkm3qndwyvw72xv1n0mcjb7ss3ajbq2ll6rv30splq0db"; depends=[qtl ibdreg wgaim nlme mgcv]; }; - dlmodeler = derive { name="dlmodeler"; version="1.4-2"; sha256="06gqvk2wrzz4kpsh4vyrbqwmxirsvg78qj7clvcxdac0sfqn4gl7"; depends=[KFAS]; }; - dlnm = derive { name="dlnm"; version="2.1.3"; sha256="044khdhk4dgd09cwmidsfa2rgd43h7wnd48bmmrnsvj3314bic0f"; depends=[nlme]; }; - dma = derive { name="dma"; version="1.2-0"; sha256="1q0zclp7y1y1ksy8j64z05jy1fi0lmgd9a5cswxyl8l4xbs894wn"; depends=[]; }; - DMR = derive { name="DMR"; version="2.0"; sha256="1kal3bvhwqs00b6p6kl0ja35pcz9v9y569148qfhy94m319fcpzm"; depends=[magic]; }; - dmt = derive { name="dmt"; version="0.8.20"; sha256="0rwc8l9k2y46hslsb3y8a1g2yjxalcvp1l3v7jix0c5kz2q7917w"; depends=[mvtnorm MASS Matrix]; }; - DMwR = derive { name="DMwR"; version="0.4.1"; sha256="1qrykl9zdvgm4c801iix5rxmhk9vbwnrq9cnc58ms5jf34hnmbcf"; depends=[lattice xts quantmod zoo abind rpart class ROCR]; }; - dna = derive { name="dna"; version="1.1-1"; sha256="0gw70h1j67h401hdvd38d6jz71x1a6xlz6ziba6961zy6m3k5xbm"; depends=[]; }; - DNAprofiles = derive { name="DNAprofiles"; version="0.2"; sha256="15la7csf45175g4hkfdz41jgbj5njad5d4jwfhpadxkb9v2mgaw4"; depends=[RcppProgress Rcpp bit]; }; - DNAtools = derive { name="DNAtools"; version="0.1-8"; sha256="146r59lhj57b0dlwwsddks9lpfdyvbjm8i5mvkc6w9wwj32g931i"; depends=[Rsolnp multicool]; }; - DnE = derive { name="DnE"; version="1.01"; sha256="04b2zz1b47nxpl8060ravybwq6y3s08fbkg5a4qiiaz9a84kvbhw"; depends=[]; }; - dnet = derive { name="dnet"; version="1.0.5"; sha256="12kx9701gl33rhym6xzfhqjlz1xq0zzqblha6rn9l8wkkkva3aq5"; depends=[igraph Matrix]; }; - DOBAD = derive { name="DOBAD"; version="1.0.3"; sha256="0q8sjcbfdg66jrhii98kls1l2gzx5s8nzv5xrbyl497cn6ysiww0"; depends=[numDeriv]; }; - doBy = derive { name="doBy"; version="4.5-10"; sha256="1axdy61n6jf0chr9276aj16h4dbq9nh4cw82md2r7mgw746ccvcn"; depends=[survival MASS Matrix lme4]; }; - docopt = derive { name="docopt"; version="0.1.1"; sha256="1fgwh5r216g4ndgpwpp8vb7scls5f47mn29y1fl9rp4mwzr2vpdh"; depends=[stringr]; }; - Dodge = derive { name="Dodge"; version="0.8"; sha256="1vnvqb2qvl6c13s48pyfn1g6yfhc60ql3vn7yh2zymxcsr1gxgcw"; depends=[]; }; - DoE_base = derive { name="DoE.base"; version="0.26-1"; sha256="07mcbxz9xf87ldsigr8bxczhq487ixv4m2xcz622sc43nbzri8la"; depends=[conf_design vcd combinat MASS]; }; - DoE_wrapper = derive { name="DoE.wrapper"; version="0.8-9"; sha256="1f4q7i0d620wn13c6l3bifqqr5b1g1ihdw5fw92yaw1zv9dwzx0c"; depends=[FrF2 DoE_base rsm lhs DiceDesign AlgDesign]; }; - doMC = derive { name="doMC"; version="1.3.3"; sha256="0g5psgk92b2zk9fkap3a86haay2y0kfz75cyk3d1ila9m7cd2cn4"; depends=[foreach iterators]; }; - Dominance = derive { name="Dominance"; version="1.0.0"; sha256="0xcmslzfdcy826vcnlybhdyym5kqkrdqidq6jn10s4jic7jk8nl3"; depends=[igraph chron gdata]; }; - domino = derive { name="domino"; version="0.1-7"; sha256="0xlmry11jmv4x3pq89w02yjq9qrvaqc8r71lr2cw5k1jsi0swxas"; depends=[]; }; - doMPI = derive { name="doMPI"; version="0.2"; sha256="0cvws4zwbjj9ji0s69qy1843404a221pyxg9y35ihfcrjknfjc0l"; depends=[foreach iterators Rmpi]; }; - doParallel = derive { name="doParallel"; version="1.0.8"; sha256="1z6cwqnjvqsbck44padqkv4r75cy32p5vrlkkan4mq84cc8062nx"; depends=[foreach iterators]; }; - doRedis = derive { name="doRedis"; version="1.1.1"; sha256="10ldfzq6m83b9w24az9bf5wbfm6y9gi233s8qgsk4dnr84n3nizx"; depends=[rredis foreach iterators]; }; - doRNG = derive { name="doRNG"; version="1.6"; sha256="0yvg4052gfdh54drn6xnpiqyd77p8765yi525nag3ismw2yn9y58"; depends=[foreach rngtools iterators pkgmaker]; }; - DoseFinding = derive { name="DoseFinding"; version="0.9-11"; sha256="10i2vpv09avspn2daa9bcpj0nicdjm71gixhvh3x7xb3681zsw2d"; depends=[lattice mvtnorm]; }; - doSNOW = derive { name="doSNOW"; version="1.0.12"; sha256="0j71n0l9lbvwllw9iigvjgv0x8z2j57grl3yazkgcyzy0mcgf741"; depends=[foreach iterators snow]; }; - dosresmeta = derive { name="dosresmeta"; version="1.3.0"; sha256="0yfm8dkds8abdl6jrib5vvgkyrd5cl5a99qs27safxx0fcpdiz4k"; depends=[mvmeta aod Matrix]; }; - dostats = derive { name="dostats"; version="1.3.1"; sha256="0xcp9arpvqb7am6caiazlgllvd3hhk4gqjd2wizr2jc5dkwfl4qn"; depends=[]; }; - DoubleCone = derive { name="DoubleCone"; version="1.0"; sha256="1pba9ypp0n3i2k3ji1x8j7h548pfam9z99hxylcjcxnnvc7xs2fw"; depends=[coneproj Matrix MASS]; }; - DoubleExpSeq = derive { name="DoubleExpSeq"; version="1.0"; sha256="0y797iqmxihrsp8lhy84p5hlyw3ckpklv0pgcqv4h39a6cpglbvd"; depends=[numDeriv]; }; - downloader = derive { name="downloader"; version="0.3"; sha256="0jpq8z3i9fkgs8wwjrq5qd7qfi5w3rxmzmsi1c1dxlnxzzhg6kxq"; depends=[digest]; }; - dpa = derive { name="dpa"; version="1.0-3"; sha256="0chkbbqxpq5fmqzr74jvflls9h0i2y25jp8gvlg3pfam9j07w7i5"; depends=[sem igraph]; }; - dpcR = derive { name="dpcR"; version="0.1.2-1"; sha256="1czkwyqnly7lwn00mifm0apnh8ahfv4v9iwzvfwcamfl7qkwbvx6"; depends=[qpcR binom chipPCR e1071 dgof pracma rateratio_test signal shiny spatstat]; }; - dpglasso = derive { name="dpglasso"; version="1.0"; sha256="1mx28xbm2z2bxyp33wv2v6vgn1yfsdsa0bzjjdxasgd6lvr51myf"; depends=[]; }; - dplR = derive { name="dplR"; version="1.6.0"; sha256="1rjb10adhycp16xav7z5c93jfcjwpcrp8cdiyab8skrijgzbp0vx"; depends=[gmp digest lattice stringr XML]; }; - dpmixsim = derive { name="dpmixsim"; version="0.0-8"; sha256="0paa2hmpd6bqf0m7p9j7l2h3j18lm64ya6ya8zvp55wm8pf7xgqg"; depends=[oro_nifti cluster]; }; - DPpackage = derive { name="DPpackage"; version="1.1-6"; sha256="01qdl6cp6wkddl9fwwpxwvyhb7lpjxis6wnbm2s288y2n9wi4j24"; depends=[MASS nlme survival]; }; - DPw = derive { name="DPw"; version="1.1.2"; sha256="0waprp6xql67ijwwsy0z8f0fnazkzci0nzwiajwkvy7vbwcch5bx"; depends=[]; }; - dr = derive { name="dr"; version="3.0.8"; sha256="0plvdkk041giqx8cgph4vdcabq9nv5bvjwz0pvjmhvb3z7q15cgj"; depends=[MASS]; }; - 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]; }; - drgee = derive { name="drgee"; version="1.0.1"; sha256="0vrmi3q6dhmk9z5168pdfhi18nkm4pgj4zx8d24r4k1jcqvgckl0"; depends=[nleqslv]; }; - DRI = derive { name="DRI"; version="1.1"; sha256="11dqwjqddwis8y8yq248k90wwk2fi3mcy0rwq2dz95m17wvd1v0k"; depends=[cghFLasso]; }; - drm = derive { name="drm"; version="0.5-8"; sha256="1p6ixd7hnv41gfmvan3rv9xzz1279hmrnvfrl6pxwzs9zcnbb53a"; depends=[]; }; - drmdel = derive { name="drmdel"; version="1.3"; sha256="0yflpja6r8cm4yv07ac1wic8w2iv0pwqpgh3ls2pjwv3vqzg7jrm"; depends=[]; }; - drsmooth = derive { name="drsmooth"; version="1.0"; sha256="1cxhj28dkll704kif040vqnp9grb61v891rswvyx7aa9216156px"; depends=[car clinfun mgcv multcomp pgirmess DTK segmented mvtnorm]; }; - ds = derive { name="ds"; version="2.0"; sha256="0jxkwp8hm36aqh8xdxh3q5zgafwik6i9ihs52sxrllpmhyb39x3p"; depends=[]; }; - dsample = derive { name="dsample"; version="0.91.1"; sha256="0nxx3x55zj089aq2shk7cg9bgh6xw7jnrr2qmlaq6bflwn58wn1q"; depends=[]; }; - DSBayes = derive { name="DSBayes"; version="1.1"; sha256="0iv4l11dww45qg8x6xcf82f9rcz8bcb9w1mj7c7ha9glv5sfb25v"; depends=[BB]; }; - dse = derive { name="dse"; version="2013.3-2"; sha256="170bpd0ix5bslbif2blcyb8dkbxwl3334h2nw0fgcx495vxvvx2x"; depends=[tframe setRNG tfplot]; }; - dse1 = derive { name="dse1"; version="2011.11-2"; sha256="0h8f1f4qqycyc4k8ksdlz7cprayaa08gnsgj6hxa0kxnfs726qb6"; depends=[dse]; }; - dse2 = derive { name="dse2"; version="2011.11-2"; sha256="05kf2072a50wd6p42yx5wpy0m7wq1gssy877nfyyc5l0pwviy3zs"; depends=[EvalEst]; }; - DSL = derive { name="DSL"; version="0.1-5"; sha256="0k320cmim9mvi5cmr6964h9i2jbskh76xws3p6zsfakk63ndg3rr"; depends=[]; }; - dslice = derive { name="dslice"; version="1.0.2"; sha256="0y8q52g7d01hfyysrbqgg0xrqvia046phr9xfwgy0bp254xdwfcp"; depends=[Rcpp ggplot2 scales]; }; - dsm = derive { name="dsm"; version="2.2.4"; sha256="1pbvirxwxr35hcd64sn1cd3cv40nrq7dz92apdvaf754sxfqx2xw"; depends=[mgcv mrds nlme ggplot2 statmod]; }; - DSpat = derive { name="DSpat"; version="0.1.5"; sha256="1njc9p2cxszcskdm21x00yvcs7gx71x18fdayih6l3g5l40c698a"; depends=[spatstat RandomFields mgcv rgeos]; }; - DSsim = derive { name="DSsim"; version="1.0.1"; sha256="0a62l8jfrnr2h9laxw27p8icvfa8f1gdhdiywwb33328barhzfrk"; depends=[shapefiles splancs mrds mgcv]; }; - DTComPair = derive { name="DTComPair"; version="1.0.3"; sha256="1af2293ckkpz0gjcibgzzvz37852cav4wa4girpc87yn3p4ajlri"; depends=[gee PropCIs]; }; - DTDA = derive { name="DTDA"; version="2.1-1"; sha256="0hi2qjcwd6zrzx87mdn1kns5f2h6jh7sz9jpgbi0p0i80xg8jnn3"; depends=[]; }; - dti = derive { name="dti"; version="1.2-0"; sha256="01z51x1fpsc79b298gsx5fq2y5w3pwiq58a13pm96a4mkyzzwhk7"; depends=[awsMethods adimpro rgl oro_nifti oro_dicom gsl]; }; - DTK = derive { name="DTK"; version="3.5"; sha256="0nxcvx25by2nfi47samzpfrd65qpgvcgd5hnq9psx83gv502g55l"; depends=[]; }; - DTMCPack = derive { name="DTMCPack"; version="0.1-2"; sha256="0bibas5cf06qq834x9q2l2fyh6q9wrg07k8cn6almcyirzax6811"; depends=[]; }; - DTR = derive { name="DTR"; version="1.5"; sha256="1c73ay0j6jkjm4iv32waz3wnn0qy399k1h72l7rwfzpyidnaprvi"; depends=[survival ggplot2 gridExtra aod proto]; }; - dtt = derive { name="dtt"; version="0.1-2"; sha256="0n8gj5iylfagdbaqirpykb01a9difsy4zl6qq55f0ghvazxqdvmn"; depends=[]; }; - dtw = derive { name="dtw"; version="1.17-1"; sha256="0kbf38a14k112vdi7yaql18w0sj694smlm6pmdw5q4sqpk7azhqg"; depends=[proxy]; }; - dualScale = derive { name="dualScale"; version="0.9.1"; sha256="11hqxprai0s5id6wk4n2q174r1sqx9fzw3fscvqd2cgw8cjn1iwl"; depends=[matrixcalc ff vcd lattice Matrix]; }; - dummies = derive { name="dummies"; version="1.5.6"; sha256="01f84crqx17xd6xy55qxlvsj3knm8lhw7jl26p2rh2w3y0nvqlbm"; depends=[]; }; - DunnettTests = derive { name="DunnettTests"; version="2.0"; sha256="1sf0bdxays10n8jh2qy85fv7p593x58d4pas9dwlvvah0bddhggg"; depends=[mvtnorm]; }; - dupiR = derive { name="dupiR"; version="1.1"; sha256="01yhwgqm2y6znxds3p2admcyayvjj5xw7vvc9djd7b6ywsivb8sa"; 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]; }; - DWD = derive { name="DWD"; version="0.11"; sha256="1yqcww4jbbvdcv0yj9h8q2w7ck7pwr0zcvmncp9mc4n4k9y67r9j"; depends=[Matrix]; }; - dyn = derive { name="dyn"; version="0.2-9"; sha256="16zd32567aj0gqv9chbcdgi6sj78pnnfy5k8si15v5pnfvkkwslp"; depends=[zoo]; }; - DynamicDistribution = derive { name="DynamicDistribution"; version="1.1"; sha256="1s78hpj2pxjs4vixin1i816qjbn3wk7b8rd2zdjp4d4rbxifcqf5"; depends=[]; }; - dynamicGraph = derive { name="dynamicGraph"; version="0.2.2.6"; sha256="1xnsp8mr3is4yyn0pyrvqhl893gdx2y1zv8d2d55aah2xbfk0fjj"; depends=[ggm]; }; - dynamicTreeCut = derive { name="dynamicTreeCut"; version="1.62"; sha256="1y11gg6k32wpsyb10kdv176ivczx2jlizs1xsrjrs6iwbncwzrkp"; depends=[]; }; - dynatopmodel = derive { name="dynatopmodel"; version="1.0"; sha256="1dq18wqbf7y597mbqv8fwwc5fm8l618mkqvb2l95bplq7n508hng"; depends=[raster xts shape fields rgeos maptools rgdal sp spam hydroGOF topmodel intervals]; }; - dynaTree = derive { name="dynaTree"; version="1.2-7"; sha256="06pw78j6wwx7yc175bns1m2p5kg5400vg8x14v4hbrz3ydagx4dn"; depends=[]; }; - dynBiplotGUI = derive { name="dynBiplotGUI"; version="1.1.0"; sha256="15m4gxdlwzvvj64vjkkb1608q4k0w84my7m8x1qc04bly9p3q038"; depends=[tcltk2 tkrplot]; }; - DynClust = derive { name="DynClust"; version="3.13"; sha256="020zl2yljp47r03rcbzrbdmwk482xx27awwzv4kdrbchbzwhxqgm"; depends=[]; }; - dynCorr = derive { name="dynCorr"; version="0.1-2"; sha256="0qzhhfhkwpq6mwg7y6sxpqvcj8klvivnfv69g7x3ycha1kw2xk3w"; depends=[lpridge]; }; - dynia = derive { name="dynia"; version="0.2"; sha256="1swip4kqjln3wsa9xl0g92zklqafarva923nw7s44g4pjdy73d5l"; depends=[]; }; - dynlm = derive { name="dynlm"; version="0.3-3"; sha256="0ym23gv2vkvvnxvzk5kh6xy4gb5wbnpdbgkb5s6zx24lh81whvcs"; depends=[zoo car lmtest]; }; - dynsim = derive { name="dynsim"; version="0.2.4"; sha256="1b4j47asqanrfhyg9r730brp3xaw1853jk23va2sx606q2rh94wv"; depends=[DataCombine ggplot2 gridExtra Zelig]; }; - dynsurv = derive { name="dynsurv"; version="0.2-2"; sha256="0418r7adki48pg3h7i1mgv3xpbryi520va3jpd03dx15zrq8zaqg"; depends=[survival reshape plyr nleqslv ggplot2]; }; - e1071 = derive { name="e1071"; version="1.6-3"; sha256="0scyxk3y2fizvw5zrddxid37vzayd879g67faq0a879nhk7fkm1z"; depends=[class]; }; - eaf = derive { name="eaf"; version="1.05"; sha256="12jwkz4cn3kgg3yczb0xgbp394bzgzps1mz0b999i3p1k6vn46z6"; depends=[modeltools]; }; - earlywarnings = derive { name="earlywarnings"; version="1.0.59"; sha256="06j5g5lrzl4p5pb1pp79h00iqpbwralzhpzxmaiymv7j8kz87nr0"; depends=[ggplot2 moments tgp tseries fields nortest quadprog Kendall KernSmooth lmtest som spam]; }; - earth = derive { name="earth"; version="3.2-7"; sha256="1j9w03i4pvz8a6s9rkfssj7bqz5sql0g7rzwpmis33kvi0d7wihn"; depends=[plotmo plotrix]; }; - easi = derive { name="easi"; version="0.2"; sha256="0kvcixbiijh3akxqy2w6kwydayqlr7lk2ws747a1z4whhclm1623"; depends=[systemfit micEcon]; }; - easingr = derive { name="easingr"; version="1.0.0"; sha256="18q9r5wvfhn03500lvwriycdw3gqbg3fpd86137mz8gxdg2pawic"; depends=[xts lattice latticeExtra]; }; - EasyABC = derive { name="EasyABC"; version="1.3.1"; sha256="1d1j7n6mhpmbbczg0yjs4kqjxlclc7pm5fl7pkxp9dmfic002y34"; depends=[abc pls mnormt MASS lhs]; }; - easyanova = derive { name="easyanova"; version="3.0"; sha256="19mcjj1lvy8kf6s004rqnalv80jf62g7dpsnrwkrklb19n1164v8"; depends=[car nlme]; }; - EasyHTMLReport = derive { name="EasyHTMLReport"; version="0.1.1"; sha256="1hgg8i7py7bx48cldyc7yydf0bggmbj3fx3kwiv9jh1x5wyh929z"; depends=[base64enc markdown knitr ggplot2 scales xtable reshape2]; }; - EasyMARK = derive { name="EasyMARK"; version="1.0"; sha256="10slkblbyxq98c3sxgs194dnkx996khfcpxj6jhz355dp35z7c9d"; depends=[MASS stringr rjags coda foreach doParallel random]; }; - easynls = derive { name="easynls"; version="4.0"; sha256="1j2crqvgsf84bpwzf4qh5xkzn5mhxhfx9c0y3p8dbyn8bg7zc2rf"; depends=[]; }; - EasyStrata = derive { name="EasyStrata"; version="8.6"; sha256="0agmap9lmqbpfw8ijwxmjkcqjvc1ng0jsadkqpfz71a963nkqdcl"; depends=[Cairo plotrix]; }; - eba = derive { name="eba"; version="1.7-1"; sha256="0kxdhl7bc4f570m9rbxxzg748zvq0q7a0slvfr4w1f45vfzhyh17"; depends=[nlme]; }; - ebal = derive { name="ebal"; version="0.1-6"; sha256="1cpinmbrgxxv0fzi9qi2inv4hw2lz7iq4b0ggp316rdqqb5bj9r0"; depends=[]; }; - EbayesThresh = derive { name="EbayesThresh"; version="1.3.2"; sha256="0n7cr917jrvmgwfqki7shvz9g9zpmbz9z8hm5ax7s8nnfzphrh4g"; depends=[]; }; - ebdbNet = derive { name="ebdbNet"; version="1.2.3"; sha256="123iqp8rnm3pac5fvpzq5sqbf8nyfpf05g23nawanid6yv23ba9a"; depends=[igraph]; }; - EBEN = derive { name="EBEN"; version="1.1.1"; sha256="12nh96avcx4rrbmlr1q046i5ymrsnqvf0ra5ynh58akajfx7wy49"; depends=[]; }; - EBMAforecast = derive { name="EBMAforecast"; version="0.42"; sha256="161l6jxbzli2g5lcmlp74z320rsvsi80pxk1vc1ypa1hgwz3q80x"; depends=[separationplot ensembleBMA plyr Hmisc abind]; }; - EBS = derive { name="EBS"; version="3.0"; sha256="0nrqglbfr7wagd4xrk5jx0kficjgvk7wqwzqrbs589dkll24sn5b"; depends=[MASS]; }; - ebSNP = derive { name="ebSNP"; version="1.0"; sha256="0x3ijwg4yycsfy6jch1zvakzfvdgpiq8i7sqdp5assb8z1823w0b"; depends=[]; }; - Ecdat = derive { name="Ecdat"; version="0.2-6"; sha256="1chx78xi04jr9qpc3z2g9x3sj41sdqp3zpjcgv817mcz84zc8mkc"; depends=[Ecfun]; }; - ecespa = derive { name="ecespa"; version="1.1-7"; sha256="0ynyphc1jnk088041i0yk22bh4ga1v9xwrcghy70q1ipv0z279ph"; depends=[splancs spatstat]; }; - Ecfun = derive { name="Ecfun"; version="0.1-0"; sha256="0jfcqxbx27dwbipx1b994iy4qnpkg1sh4xpq7qq8yy823rgpkhrp"; depends=[]; }; - ecipex = derive { name="ecipex"; version="1.0"; sha256="0pzmrpnis52hvy80p3k60mg9xldq6fx8g9n3nnqi3z56wxmqpdv7"; depends=[CHNOSZ]; }; - ecodist = derive { name="ecodist"; version="1.2.9"; sha256="199f3lwwm8r2bnik595m540la1p4z6vbkwfqh9kimy9d0fjp8nps"; depends=[]; }; - ecoengine = derive { name="ecoengine"; version="1.4"; sha256="0smjwgci2kz09idzq10q50z0hs2nr7rjj7i0r7iksdyb7ggb3hzm"; depends=[httr plyr assertthat whisker dplyr RJSONIO lubridate leafletR]; }; - EcoHydRology = derive { name="EcoHydRology"; version="0.4.12"; sha256="03dzdw79s0cnnd7mv6wfxw374yf66dlcmj10xh6sh5i352697xp1"; depends=[operators topmodel DEoptim XML]; }; - ecolMod = derive { name="ecolMod"; version="1.2.5"; sha256="07dr3q17vd60569w34apylpsv81qcf31l7v0bqdycb5mlaifdahz"; depends=[rootSolve diagram deSolve]; }; - ecoreg = derive { name="ecoreg"; version="0.2"; sha256="08iw7w9z7zqwhvirnhdc2jr2qjp9yma8ddc831d5dvbvi2j7kq84"; 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]; }; - EcoTroph = derive { name="EcoTroph"; version="1.6"; sha256="0zi6g0ra107s47r32mm9h6r1wll3avi0mpjmhcr0nj9y48nv14w3"; depends=[XML]; }; - ecp = derive { name="ecp"; version="1.6.0"; sha256="1xzawnqk8maxk9ha4cms5xvylwb4m1mkxps88p5xh7grgpcw6drn"; depends=[Rcpp]; }; - edcc = derive { name="edcc"; version="1.0-0"; sha256="036fi6mnn9480hkb378xb5jilkfvdydjmkyw4mcc9s1lz195f62w"; depends=[spc]; }; - edeR = derive { name="edeR"; version="1.0.0"; sha256="1dg0aqm5c4zyf015hz1hhn3m4lfvybc4gc1s7sp8jcsk46rxz0cc"; depends=[rJava rjson rJython]; }; - EDISON = derive { name="EDISON"; version="1.0"; sha256="17yjvvsgsmd4i00wzmih50qz3wqig2zdg5r877b4hqk1dsv5kxym"; depends=[corpcor MASS]; }; - editrules = derive { name="editrules"; version="2.7.2"; sha256="19g07caacwphvrqn900chrz3k6x4z8gmvlcvna5x2mqidcjkf25i"; depends=[igraph lpSolveAPI]; }; - EDR = derive { name="EDR"; version="0.6-5.1"; sha256="10ldygd1ymc4s9gqhhnpipggsiv4rwbgajvdk4mykkg3zmz7cbpm"; depends=[]; }; - edrGraphicalTools = derive { name="edrGraphicalTools"; version="2.1"; sha256="09y63xj3gqrz66mym20g4pmfwrb0wnc2n67692hnqq8dz31q7p3i"; depends=[rgl mvtnorm MASS lasso2]; }; - eegAnalysis = derive { name="eegAnalysis"; version="0.0"; sha256="1lrwjbhm5fnf5fhyyga2b21j2snnmj3zfvfxfkvgsbdnzr3qxaxb"; depends=[e1071 wmtsa fields splus2R]; }; - eeptools = derive { name="eeptools"; version="0.3.1"; sha256="0m6i0hiw565wgziknlf19rh2fq8zvzq2v5a0ppnwcv8vhbhyph3g"; depends=[ggplot2 MASS stringr maptools arm data_table memisc]; }; - effects = derive { name="effects"; version="3.0-0"; sha256="075vd540d8wry1l70s28pkmd1g3424yan9f7mwvcrqf0l62ahmfg"; depends=[lattice colorspace]; }; - EffectsRelBaseline = derive { name="EffectsRelBaseline"; version="0.5"; sha256="1dsnakcrgmlx44599ii92wvhxbxrh0hij59709wsskx1x1152zvh"; depends=[]; }; - EffectStars = derive { name="EffectStars"; version="1.3"; sha256="193j2dbp6bp60yb2qym119ciry3s5z54iv1vmb9wrddjzb77nnvv"; depends=[VGAM]; }; - effsize = derive { name="effsize"; version="0.5.1"; sha256="0dy9q3zbcr5c4nijknly9mfr6rbs2qlv4jgzn0wpl2cz7hpngvk4"; depends=[]; }; - egcm = derive { name="egcm"; version="1.0.2"; sha256="17fzxl34vc38308wbvjp5xdv1q48k4lf6gsw7ax27zc4chqlmqfz"; depends=[ggplot2 tseries zoo MASS]; }; - eggCounts = derive { name="eggCounts"; version="0.2"; sha256="0ilwhw2fk8mvqsnranpj4mny98vhha8jrrxccz6x0f8hsy34b27k"; depends=[coda actuar boot]; }; - egonet = derive { name="egonet"; version="1.2"; sha256="1f0fbqyk2ilmhirxvf1iwgfappi5r7807ag77r89lbaf5jq8akl0"; depends=[sna]; }; - eha = derive { name="eha"; version="2.4-1"; sha256="1znxpcrwp8fllr3m14gbxwgp7yln55jwvkilmbsqldz00za6xn0w"; depends=[survival]; }; - eHOF = derive { name="eHOF"; version="1.4"; sha256="050wlckw2i8iqymdmq68zj2fwq74slsbk83p5kkhxlyn132m0k47"; depends=[mgcv lattice]; }; - EIAdata = derive { name="EIAdata"; version="0.0.1"; sha256="0adgkjfymgsimlaalcgcqdsagfvycrnsx93bx2xsbvlbywjk9fhn"; depends=[XML plyr xts zoo]; }; - eigeninv = derive { name="eigeninv"; version="2011.8-1"; sha256="18dh29js824d7mrvmq3a33gl05fyldzvgi8mmmr477573iy9r30g"; depends=[]; }; - eigenmodel = derive { name="eigenmodel"; version="1.01"; sha256="0p9n28x5gg46nszzd2z9ky5fhv6qa070673i1df6bhjh962aqgaf"; depends=[]; }; - eigenprcomp = derive { name="eigenprcomp"; version="1.0"; sha256="156qyv7sl8nng55n3ay6dnpayyfrqv27ndz40xf4w92is9zmymy0"; depends=[]; }; - EILA = derive { name="EILA"; version="0.1-2"; sha256="0wxl9k4fa0f7jadw3lvn97iwy7n2d02m8wvm9slnhr2n8r8sx3hb"; depends=[class quantreg]; }; - eiPack = derive { name="eiPack"; version="0.1-7"; sha256="1cxk31bj012ijm85sf6l4rjrwayw94j2d6aav8p9g1f0raha2s6y"; depends=[MASS coda msm]; }; - eive = derive { name="eive"; version="2.1"; sha256="1vazl5dnrvljd07csy9rjs4302w09h94i411gffg9fvxn70km7qg"; depends=[Rcpp]; }; - eiwild = derive { name="eiwild"; version="0.6.7"; sha256="1fp4kvlmcjjnzn2a5cmlzaf6y5q6cdbbi2nmvjyqc4y1bmwh3srf"; depends=[gtools coda lattice]; }; - EL = derive { name="EL"; version="1.0"; sha256="13r7vjy2608h8jph8kwy69rnkg98b2v69117nrl728r3ayc46a18"; depends=[]; }; - elasticnet = derive { name="elasticnet"; version="1.1"; sha256="1x8rwqb275lz86vi044m1fy8xanmvs7f7irr1vczps1w45nsmqr2"; depends=[lars]; }; - elec = derive { name="elec"; version="0.1.2"; sha256="0f7ahrjb52w8a8l5v00xla6z9afpz2zrckl9v04xalp34snhdwan"; depends=[]; }; - elec_strat = derive { name="elec.strat"; version="0.1.1"; sha256="09196k5c3jsikh98d33bn70izwcbx0wb5ki9fv1ij0dw9mnv4c3p"; depends=[elec]; }; - ElemStatLearn = derive { name="ElemStatLearn"; version="2012.04-0"; sha256="107x2mybadqgw03j3yq8ibq3ljs4fpx90chvsirpylqhv77wsabl"; depends=[]; }; - elliplot = derive { name="elliplot"; version="1.1.1"; sha256="1sl85kyjpxiw0gs3syhlhfrci03fl054py7m24xln5vk07665vbp"; depends=[]; }; - ellipse = derive { name="ellipse"; version="0.3-8"; sha256="0ibz1qvf1qbb5sigyhpxb8hgip69z3wcimk3az1701rg2i64g3ah"; depends=[]; }; - elliptic = derive { name="elliptic"; version="1.3-3"; sha256="1spl19yh2fqii1ffcmg4y11v6ccb83q6znvjn0scgzv6646c7xi4"; depends=[MASS]; }; - elmNN = derive { name="elmNN"; version="1.0"; sha256="129r6d3qa48gqvqxks53hdmyk3jjakddsj5fwj91kqq0hkm34kyd"; depends=[MASS]; }; - EloRating = derive { name="EloRating"; version="0.41"; sha256="1d7kcng0iv4paagm0jljkfk7c2n3vvs91khjvlc7jpifisf1zi7a"; depends=[zoo]; }; - elrm = derive { name="elrm"; version="1.2.2"; sha256="0wz0l703v0iyp7nswdmh65n0cy3a7rfvyxd795a6nzk3nich8bfg"; depends=[coda]; }; - ElstonStewart = derive { name="ElstonStewart"; version="1.1"; sha256="1y2g4x3fhi78c2406bk8r8c3x9zhx8ya3qlbnypdm65j0minixsn"; depends=[kinship2 digest]; }; - ELT = derive { name="ELT"; version="1.2"; sha256="19q6i1ilsi09mlbs3l0p6n86390jmrs0g93zpa1h0hql7ymcb8p2"; depends=[locfit lattice latticeExtra xlsx]; }; - em2 = derive { name="em2"; version="0.9"; sha256="120731nh5qq3kzbfj9p2s4fhrr3xvddj5n0bv5m3dp5l5495px1b"; depends=[plyr]; }; - EMA = derive { name="EMA"; version="1.4.4"; sha256="1hqkan9k6ps4qckjrhsgxzham106fm38m5rgayz8i2ji3spvbfca"; depends=[survival xtable heatmap_plus GSA MASS FactoMineR cluster]; }; - EMC = derive { name="EMC"; version="1.3"; sha256="0sdpxf229z3j67mr9s7z4adzvvphgvynna09xkkpdj21mpml23p6"; depends=[mvtnorm MASS]; }; - EMCC = derive { name="EMCC"; version="1.2"; sha256="1qff8yvw7iqdsrqkvwb7m14xh7gcnjcrf8gw00g4j6aq0h0cgk2z"; depends=[MASS mclust EMC]; }; - EMCluster = derive { name="EMCluster"; version="0.2-4"; sha256="0m5cl5mrg6q0ixfpjj1jwd7l5hcldc33lr7n6xgy7p9nlr52mimz"; depends=[MASS]; }; - EMD = derive { name="EMD"; version="1.5.7"; sha256="0m2g7akg9h964d6qr1mj20h9pcb2fcmala3skhl0qpy8qz01w5ck"; depends=[fields locfit]; }; - emdatr = derive { name="emdatr"; version="0.2"; sha256="11s9yiziswgll12c1sm3jb7hvy469ks64zx6w8dk1b36cx4lzf3h"; depends=[RCurl]; }; - emdbook = derive { name="emdbook"; version="1.3.4"; sha256="19i8i1wp6vqgc77ajaqrfrjw6ijjafkgdqgfpa0dvl1w117rpy2d"; depends=[MASS lattice plyr]; }; - emdist = derive { name="emdist"; version="0.3-1"; sha256="1z14pb9z9nkd0f2c8pln4hzkfqa9dk9n3vg8czc8jiv0ndnqi7rq"; depends=[]; }; - emg = derive { name="emg"; version="1.0.5"; sha256="028g8gqjjqfwly6vzvinbpilay5jj9rnm7ri9aby9q0hj5prh56m"; depends=[]; }; - emil = derive { name="emil"; version="1.1-6"; sha256="1qk655swpl8f492y9smzlfxf7aysbwashfs6whnsi7f9dbigw6cd"; depends=[]; }; - EMJumpDiffusion = derive { name="EMJumpDiffusion"; version="1.4.1"; sha256="10lw6717yq9vlywn5ilsl0d99fpx3zvc87vf7s0zxswhs81h7x1w"; depends=[]; }; - emma = derive { name="emma"; version="0.1-0"; sha256="0psd8lrbcqla8mkhp0wlassaaimgwlmqy5yv2wwcq59mc5k1v27f"; depends=[earth clusterSim]; }; - EMMAgeo = derive { name="EMMAgeo"; version="0.9.1"; sha256="1rxbb666gh9g35m4jqa6y1zjp82s62ha6n92fkjvkk9wm25w6imr"; depends=[GPArotation limSolve shape]; }; - emme2 = derive { name="emme2"; version="0.9"; sha256="035s4h95ychqb14wib0dqbg4sjy9q01fsryr0ri25g1hsi5f8lpm"; depends=[reshape]; }; - EMMIXcontrasts = derive { name="EMMIXcontrasts"; version="1.0.0"; sha256="1q7bwf7kkpraj38lz5s1lhhghp7a5lzyj5b9x8024g6rh2qlwp7v"; depends=[]; }; - EMMIXskew = derive { name="EMMIXskew"; version="1.0.1"; sha256="16jkq0a9k1gf6gia8r65nwa2lh8zny4jmnq51g2rcqm44s5ylqbh"; depends=[lattice mvtnorm KernSmooth]; }; - EMMIXuskew = derive { name="EMMIXuskew"; version="0.11-6"; sha256="0japf0l0sj84jna7b5kirp6pgqa4c923ldwphb16ch2xxrgk5n5k"; depends=[MASS]; }; - EMMREML = derive { name="EMMREML"; version="2.0"; sha256="0fyqwyym6d1adn5pvrfspmr933qhi30h58hxr2rbzwm5kwh6c8jr"; depends=[Matrix]; }; - emoa = derive { name="emoa"; version="0.5-0"; sha256="1wcnsnkdmpcn21dyql5dmj728n794bmfr6g9hgh9apzbhn4cri8p"; depends=[]; }; - EMP = derive { name="EMP"; version="1.0.1"; sha256="12ahyfav918qf7bphhy251x0gzhdziaz2gg064hcwh6jaqw0jw0g"; depends=[]; }; - emplik = derive { name="emplik"; version="0.9-9-2"; sha256="131wk9nfymkygb89jk9cwi53dx4857c06ip9pfzzvswch3hhdqwb"; depends=[quantreg]; }; - emplik2 = derive { name="emplik2"; version="1.10"; sha256="19s19jhcaqnh6vjfgrsgjvjlrsm5fa1mgwc5v36hzdf2mv1xhr3q"; depends=[]; }; - EMT = derive { name="EMT"; version="1.1"; sha256="0m3av1x3jcp3hxnzrfb128kch9gy2zlr6wpy96c5c8kgbngndmph"; depends=[]; }; - emulator = derive { name="emulator"; version="1.2-13"; sha256="1y8mrrz4dw66wn3lhi7x7r72bxa77rpc68zqab6c67ndyi4wamxr"; depends=[mvtnorm]; }; - EMVC = derive { name="EMVC"; version="0.1"; sha256="1725zrvq419yj0gd79h8bm56lv2mmk296wq3wapivcy6xn0j97jh"; depends=[]; }; - ENA = derive { name="ENA"; version="1.3-0"; sha256="02gsngkzc8vfpg2jvcabwp4kpfs14cajs9xv1rh76807l5ylqihz"; depends=[GeneNet space WGCNA parmigene]; }; - enaR = derive { name="enaR"; version="2.7"; sha256="0jjxqrxyak9b39j9yycfgp7bhb82y8zinc2kcc6pbs5w6m5dsyvr"; depends=[sna network MASS stringr gdata]; }; - endogMNP = derive { name="endogMNP"; version="0.2-1"; sha256="0maxcp321ngbxrg0i23nlwhj849v771xahh53367x928ss4f8v7i"; depends=[]; }; - endorse = derive { name="endorse"; version="1.4.1"; sha256="0xyi2cq4k4xa8kr717i4njl6rgjf5z99056jbhp2rbzfyy4sw61d"; depends=[coda]; }; - energy = derive { name="energy"; version="1.6.1"; sha256="08s7kzl12fcp1lz86jzwznxk6dqvls418zcqwd31shqqynna25vm"; depends=[boot]; }; - english = derive { name="english"; version="1.0-1"; sha256="1413axjp2icj9wwnkz3vl4gvrwlgmjpc2djzv5bllbnc4a4dgj24"; depends=[]; }; - EngrExpt = derive { name="EngrExpt"; version="0.1-8"; sha256="0zclvckj2i7j4kfs58hcjcl722vl2y6dcnjz238cjfgwv279gqhp"; depends=[lattice]; }; - ENmisc = derive { name="ENmisc"; version="1.2-7"; sha256="07rix4nbwx3a4p2fif4wxbm0nh0qr7wbs7nfx2fblafxfzhh6jc7"; depends=[Hmisc vcd RColorBrewer]; }; - EnQuireR = derive { name="EnQuireR"; version="0.10"; sha256="00kyclcr8da79lwpqa1vzkwn6pgf197h2biackwgphb0byhi8ssx"; depends=[FactoMineR SensoMineR Rcmdr MASS]; }; - enRich = derive { name="enRich"; version="2.0"; sha256="13ahwdifm33h4h5mvmc49v39fbhiy291rbdwm4c8kxjrqjq9ip66"; depends=[]; }; - enrichvs = derive { name="enrichvs"; version="0.0.5"; sha256="0x91s03hz1yprddm6mqi75bm45ki3yapfrxmap7d4qc0hi06h22k"; depends=[]; }; - ensembleBMA = derive { name="ensembleBMA"; version="5.0.8"; sha256="1wv1g1iwpmxhcgxgx78jc4w5kcbbzjxljj7pbfykgq7hjpkb109f"; depends=[chron]; }; - ensembleMOS = derive { name="ensembleMOS"; version="0.7"; sha256="0g5qzdic5jvgn6wv7zh0jnz8malfgfxn26l7lg30y96vcmi4hk54"; depends=[ensembleBMA chron]; }; - entropart = derive { name="entropart"; version="1.2.0"; sha256="11k05nk8lf5790wmx2323w5wk233xmk48scfv3hrph8y6665vddq"; depends=[ade4]; }; - entropy = derive { name="entropy"; version="1.2.0"; sha256="1qs8g5jp6ydhirxnrck3qqq3cc232hcaizy401c8gjn2vn23s15d"; depends=[]; }; - EntropyEstimation = derive { name="EntropyEstimation"; version="0.1"; sha256="1l31vc9478db22zg79zm26xahagvw7p5ywkhyq4lanl38gh2my6y"; depends=[]; }; - enviPat = derive { name="enviPat"; version="1.9"; sha256="0xm23gv4ixmsal9rf0cbq0lwvlpagpmapskz3c4d8qzvhr8qrl3b"; depends=[]; }; - enviPick = derive { name="enviPick"; version="1.0"; sha256="117m06qp0l554sssv1vzhrysbi6rj9dm53szzkl8i8riqqm1m442"; depends=[shiny readMzXmlData]; }; - EnviroStat = derive { name="EnviroStat"; version="0.4-0"; sha256="05sa63z6yzny2ncxpm5d3x0bx8snkn0x5pzpj2a7y6rwf6al5q4r"; depends=[MASS]; }; - EnvNicheR = derive { name="EnvNicheR"; version="1.0"; sha256="1vw21gsdrx8gkf1rf8cnazv8l9ddcdmy2gckyf33fz7z2mbzgbkk"; depends=[]; }; - EnvStats = derive { name="EnvStats"; version="1.0.2"; sha256="0914j7v190j401rdqqpfz3s69pb6crmq297wiw2q99syx0fnimnw"; depends=[]; }; - epade = derive { name="epade"; version="0.3.8"; sha256="1alvsifc6i71ilm1xxs1d7sqlapb48bqd6z2n4wi6pqcjvwp7bif"; depends=[plotrix]; }; - Epi = derive { name="Epi"; version="1.1.67"; sha256="12wbzv21whjnzlyqacgqmsgrjbkgj2495y9fwvav5mr21yfrjds3"; depends=[]; }; - epi2loc = derive { name="epi2loc"; version="1.0-1"; sha256="16abk1v177sg7gmaw42ldf6hf20l7dvyq295zwbq76nxj467khdv"; depends=[pwr]; }; - epibasix = derive { name="epibasix"; version="1.3"; sha256="0d0087sa8lqw35pn7gdg2qqzw3dvz57sgavymwl1ybcj5d4lsbyk"; depends=[]; }; - epicalc = derive { name="epicalc"; version="2.15.1.0"; sha256="11x9q990hc7rf5xfvba47axdy7vld76xcf3kd9lkr0c8nbl5ss9v"; depends=[foreign survival MASS nnet]; }; - EpiContactTrace = derive { name="EpiContactTrace"; version="0.8.8"; sha256="1vlr2xxnyq1i6ky39g8j3pf3m5775bmhii7vpskb0x7nnq161yzb"; depends=[Rcpp plyr R2HTML]; }; - EpiDynamics = derive { name="EpiDynamics"; version="0.1"; sha256="11gbqpqnv6aydpwvki912cknvbzn24b3ajbc8ivzj7vvfp9blcmd"; depends=[deSolve FME reshape2 ggplot2]; }; - EpiEstim = derive { name="EpiEstim"; version="1.1-2"; sha256="0r56iglhkrqvlsf3gbahd544h944fmbyn6jdc113rhjscf6dl605"; depends=[]; }; - EpiModel = derive { name="EpiModel"; version="1.0.1"; sha256="00afgdvbmc7qxq1r8kpldkfqvnwqp23ig2y06jmipmrcga3xf5z2"; depends=[network networkDynamic tergm deSolve ergm RColorBrewer statnet_common]; }; - epinet = derive { name="epinet"; version="0.0-8.1"; sha256="00mq2bqdnjp7wwsb3dldlxd0l3vyij48az4s3vrmycab8g9dffk5"; depends=[]; }; - epiR = derive { name="epiR"; version="0.9-59"; sha256="0x0k7s2kl9mj7x2vnrj1bc586jkvc6sb34jsgjhwk3gyh9prp57q"; depends=[survival]; }; - epitools = derive { name="epitools"; version="0.5-7"; sha256="163sibnbihdsnkxf313fr8n8rh5d64dwjagv95vhhzr87f21sw22"; depends=[]; }; - epoc = derive { name="epoc"; version="0.2.5-1"; sha256="1r19cvcqf39yf09n3znbdy3dsr7z96yx6zib6031mqqdsxaav5qd"; depends=[lassoshooting Matrix irr elasticnet survival]; }; - epr = derive { name="epr"; version="2.0"; sha256="1xqc0jhgdwwvilqpljxzpzz3wx30kigy09sxvzcfvsjmxyyvflqy"; depends=[car]; }; - EQL = derive { name="EQL"; version="1.0-0"; sha256="0lxfiizkvsfls1km1zr9v980191af6qjrxwcqsa2n6ygzcb17dp5"; depends=[ttutils lattice]; }; - eqs2lavaan = derive { name="eqs2lavaan"; version="3.0"; sha256="1lj6jwkfd84h9ldb6l74lrx2pnsl1c0d7mnrcrjkska87djb2nzd"; depends=[lavaan stringr]; }; - eqtl = derive { name="eqtl"; version="1.1-7"; sha256="0xfr8344irhzyxs9flnqn4avk3iv1scqhzac5c2ppmzqhb398azr"; depends=[qtl]; }; - equate = derive { name="equate"; version="2.0-2"; sha256="1n83rr01y5rcsr2wgcd1n7ihjk5bvxdl7f9abcjdz6vja7qg6h83"; depends=[]; }; - equateIRT = derive { name="equateIRT"; version="1.1"; sha256="0z889z973yvklbn6i4jf6cxzvs2x9bn7454v5f23xmnj1wh5qv2s"; depends=[statmod]; }; - equivalence = derive { name="equivalence"; version="0.6.0"; sha256="1q17c2bs36f46bmm6wzmp0g2lg7d0j9mlrfnkzxnlvmspwksc0zl"; depends=[lattice boot PairedData]; }; - erboost = derive { name="erboost"; version="1.2"; sha256="0afgh0zkl3h3ab4s7wl0cn24qdyhszssai9i390mi7w0p88wgba9"; depends=[lattice]; }; - erer = derive { name="erer"; version="2.2"; sha256="198bahz958dpdlk3himrjs0sa4j2hdppy3v4l3h8l52jaf1iq4n1"; depends=[lmtest systemfit tseries urca ggplot2]; }; - ergm = derive { name="ergm"; version="3.1.3"; sha256="0g4cap1gx0l57l0aix29wz9lspnxv2vqkkdlcghbdv41fdddvdlm"; depends=[statnet_common network robustbase coda trust Matrix]; }; - ergm_count = derive { name="ergm.count"; version="3.1.1"; sha256="0l66shy5p7h9j3h5gpkn48ps069mdaqbscnnkvmwjfvcc7k5vr8m"; depends=[statnet_common ergm network]; }; - ergm_graphlets = derive { name="ergm.graphlets"; version="1.0.1"; sha256="0j2z8dvgfrkvm9sqpyqvylz6sakxl8wpy4fbgc20wwznfzbaaal6"; depends=[statnet]; }; - ergmharris = derive { name="ergmharris"; version="1.0"; sha256="1bfijhsljlykb94wi25lbpv35zkmgqpmgzmxcq98gjvzbn5j9pdq"; depends=[]; }; - ergm_userterms = derive { name="ergm.userterms"; version="3.1.1"; sha256="0pvklvyxi7sjc5041zl8vcisni0jz1283gyjw5mhas9bl47g1cwc"; depends=[network ergm statnet_common]; }; - eRm = derive { name="eRm"; version="0.15-4"; sha256="0x05vsf8kp0z422w1b1wqayada2vbl7jh4ifa52sqlq7ygsmnmi1"; depends=[MASS Matrix]; }; - ERP = derive { name="ERP"; version="1.0.1"; sha256="0wy1p7pp9dvc3krylskb627rmfqaj11qvia97m88x05ydqx1fwmr"; depends=[fdrtool mnormt]; }; - erpR = derive { name="erpR"; version="0.2.0"; sha256="1y6abc5fkcyyjh36maj1zbxppqzwd5wkvzvqahyvzsz5fqpjkcdx"; depends=[rpanel]; }; - ES = derive { name="ES"; version="1.0"; sha256="1rapwf6kryr6allzbjk6wmxpj9idd3xlnh87rwbh6196xb7rp8lv"; depends=[]; }; - ESG = derive { name="ESG"; version="0.1"; sha256="1jw6239asv6lwxrz5v0r5pzg6v500bqxg8361sh4jj67rsrc7g9m"; depends=[]; }; - ESGtoolkit = derive { name="ESGtoolkit"; version="0.1"; sha256="0r09arhsvamdyahini5yhgc43msdxwvn45l57xbfszahsnr3b3aq"; depends=[CDVine ggplot2 gridExtra reshape2 ycinterextra Rcpp]; }; - esotericR = derive { name="esotericR"; version="1.0"; sha256="0kl9c2z2mpg3mk8jnl0ssgcf6y0i9jpczms746j8f07ydrcxpf41"; depends=[]; }; - ESPRESSO = derive { name="ESPRESSO"; version="2.0"; sha256="1xz4lw1rczs4laz1drrqyz91w62a99z7jzs2wkcdrhcirgmmpjp3"; depends=[MASS]; }; - EstCRM = derive { name="EstCRM"; version="1.3"; sha256="0fmnlh0pnprskq01iq3rfassyxq7fywiprvqw0xdlh8yxl3w2c9n"; depends=[Hmisc lattice]; }; - estout = derive { name="estout"; version="1.2"; sha256="0whrwlh4kzyip45s4zifj64mgsbnrllpvphs6i5csb7hi3mdb3i5"; depends=[]; }; - etable = derive { name="etable"; version="1.2.0"; sha256="17xahaf2fz1qgqjaw8qbnss95il6g47m3w00yqc5nkvv37gs0q7c"; depends=[xtable Hmisc]; }; - ETAS = derive { name="ETAS"; version="0.0-1"; sha256="1p38ay3vnca8b8wszm66whxap8k58c004l1nlsk7zkynyia0im6c"; depends=[spatstat]; }; - etasFLP = derive { name="etasFLP"; version="1.0.3"; sha256="1krfpnqh7w157cfy8rwa6dmr0j8xqvnhwvygbrcvns3a3y4v4ix0"; depends=[mapdata rgl fields maps]; }; - ETC = derive { name="ETC"; version="1.3"; sha256="1nvb9n0my7h1kq996mk91canxi6vxy3mzhrshrvm13ixvl48lkkh"; depends=[mvtnorm]; }; - ETLUtils = derive { name="ETLUtils"; version="1.2"; sha256="0mlfq23v7nl6lslscknk9mdx4dxk8xyc5imnvzlhzhag0k50mqj2"; depends=[ff]; }; - etm = derive { name="etm"; version="0.6-1"; sha256="00sm4cib1r4wcn71v1ry3asszshks4f6br7s5xzm8d5ngxdlsxda"; depends=[survival lattice]; }; - eulerian = derive { name="eulerian"; version="1.0"; sha256="0yhpnx9vnfly14vn1c2z009m7yipv0j59j3s826vgpczax6b48m0"; depends=[]; }; - EvalEst = derive { name="EvalEst"; version="2012.4-1"; sha256="19yn4haxkny9kij0jhkwdbp34c9h2cc5l2n2b14khjhv1msqcfmi"; depends=[setRNG tframe tfplot dse]; }; - evaluate = derive { name="evaluate"; version="0.5.5"; sha256="15i6bkzrzkgsdlgf2pcx8b3gcjh1rplzhimy310845pfgkldcq9b"; depends=[stringr]; }; - Evapotranspiration = derive { name="Evapotranspiration"; version="1.4"; sha256="1x12z44y78lcibf4wpc7l3ll7zwf1c1fkavwfm79q7sdlhwi1x9h"; depends=[zoo]; }; - EvCombR = derive { name="EvCombR"; version="0.1-2"; sha256="1f5idjaza91npf64hvcnpgnr72mpb7y6kf91dp57xy9m14k7jx5g"; depends=[]; }; - evd = derive { name="evd"; version="2.3-0"; sha256="1h3dkssgw2x7pblvknfr0l8k7q25nikxyl7kl9x95ganjpi2452v"; depends=[]; }; - evdbayes = derive { name="evdbayes"; version="1.1-1"; sha256="0lfjfkvswnw3mqcjsamxnl8hpvz08rba05xcg0r47h5vkgpw5lgd"; depends=[]; }; - eVenn = derive { name="eVenn"; version="2.1.6"; sha256="1kxxaj2ia1v5p0d0yi3vq7rkiajsdsg97k3yg0iqb9v4vbj8mc1y"; depends=[]; }; - eventInterval = derive { name="eventInterval"; version="1.0-1"; sha256="0vcp40rsb2pazn4p44dsaxjai7qhjwzrh9lf0q84fcayrnk51dqv"; depends=[MASS]; }; - events = derive { name="events"; version="0.5"; sha256="1zka4ygymifs8snd7cabl11b5lg3f8g8370dkm9ybl40bn8vvqq2"; depends=[]; }; - eventstudies = derive { name="eventstudies"; version="1.1"; sha256="13l2yhmlpiid9r3njnmvja231l00ym7gvwfbv0m9fk2k5j6gm5id"; depends=[zoo xts boot]; }; - EVER = derive { name="EVER"; version="1.2"; sha256="1yk6ln4shp53jvph6jy1d5m4cq080p6f03qwigdw4f0al9qzja2s"; depends=[]; }; - evir = derive { name="evir"; version="1.7-3"; sha256="1kn139vvzdrx5r9jayjb4b0803b0bbppxk68z00gdb50mxgvi593"; depends=[]; }; - evmix = derive { name="evmix"; version="2.1"; sha256="1fg3pz1l3qk37qbp02c81rfsvpfm0zjh8q83cvkir1ap5k6xzfwl"; depends=[MASS gsl]; }; - evobiR = derive { name="evobiR"; version="1.0"; sha256="12j01qzc4yrjpxbj39bl29f5ypxwk33c6qf0mjjbgpwn5g6fgsi4"; depends=[seqinr ape stringr geiger taxize]; }; - evolvability = derive { name="evolvability"; version="1.0"; sha256="17vkmb5208q4lx6jslx96nbhsl9m2c4ra6264bparbgrg34byg9x"; depends=[coda]; }; - evora = derive { name="evora"; version="1.0"; sha256="0blq28ldynbq3v6rh0yk89wy1sjp4621h6iwnyyiipqwzihwrhz2"; depends=[Hmisc]; }; - EvoRAG = derive { name="EvoRAG"; version="2.0"; sha256="0gb269mpl2hbx1cqakv3qicpyrlfb4k8a3a7whhg90masbgmh8f6"; depends=[]; }; - evt0 = derive { name="evt0"; version="1.1-3"; sha256="08sbyvx49kp3jsyki60gbbnci26d6yk0yj2zcl4bhfac8c3mm6ya"; depends=[evd]; }; - evtree = derive { name="evtree"; version="0.1-5"; sha256="09byr935z4bzc3yk0l51lnm99k2ac2z44pwx2p35w4080gpsa10r"; depends=[partykit]; }; - EWGoF = derive { name="EWGoF"; version="2.0"; sha256="07kpzaqfd7ihpmh2y5806mz5h64dcajia5v36pp9myl04fvpjapp"; depends=[Rcpp maxLik miscTools]; }; - Exact = derive { name="Exact"; version="1.4"; sha256="1l4cq6kslnl8x8c53m2w8w1vijmbxaxzr1fpdzrm2hfra0p5z90s"; depends=[]; }; - exact2x2 = derive { name="exact2x2"; version="1.3.0"; sha256="0gp6b04bd6pf1a01d6d99p8mbjcqsayrdbm58wky2pg8s445523q"; depends=[exactci ssanv]; }; - exactci = derive { name="exactci"; version="1.2-1"; sha256="1vnaggb38px2z8fhav0s8hnqz0x2y0ivfzxhyfqn2rlm1v2zxmn0"; depends=[]; }; - ExactCIdiff = derive { name="ExactCIdiff"; version="1.3"; sha256="1vayq8x7gk1fnr1jrlscg6rb58wncriybw4m1z0glfgzr259103y"; depends=[]; }; - exactLoglinTest = derive { name="exactLoglinTest"; version="1.4.2"; sha256="0j146ih9szzks9r45vq1jf47hrwjq081q1nsja5h1gpllks8217h"; depends=[]; }; - exactmeta = derive { name="exactmeta"; version="1.0-1"; sha256="1alva8ls4l56j3bdxgd1mh9isqk198iyrycc88vgpmj30gjpwncn"; depends=[]; }; - ExactPath = derive { name="ExactPath"; version="1.0"; sha256="0ngvalmgdswf73q0jr4psg0ihnb7qwkamm6h64l01k5rmgd5nm16"; depends=[ncvreg lars]; }; - exactRankTests = derive { name="exactRankTests"; version="0.8-27"; sha256="0ygy3ygdnrrcggps5zh5r7kqfa9vj6gfgdyli63n8cwdimfyndhn"; depends=[]; }; - exams = derive { name="exams"; version="2.0-0"; sha256="0w3hnwnwcvl2i0y08qw96fkhfy31hx3pvw2qjxi95vhna5987k0h"; depends=[]; }; - ExceedanceTools = derive { name="ExceedanceTools"; version="1.2.2"; sha256="084sc6pggfbcyavhfnd5whyigw7dyjhb4cxmxi0kh2jiam5k8v5b"; depends=[splancs SpatialTools]; }; - excursions = derive { name="excursions"; version="1.1-20140610"; sha256="0x7rk00abf7fw9h2qqp6s2snkm1snkl35mgmxvgwv0a0jm3q56ls"; depends=[Matrix]; }; - ExomeDepth = derive { name="ExomeDepth"; version="1.0.7"; sha256="02jsbnpyb8y4qnid084z6x1w22pdhnjq6729ixjiw715vavn4p27"; depends=[aod VGAM]; }; - expands = derive { name="expands"; version="1.4"; sha256="1k9rr13vbppmaq8i0s4q7szp42b444hx5fka9q9vwskhv3d9azwi"; depends=[rJava flexmix matlab mclust moments ape permute]; }; - ExpDes = derive { name="ExpDes"; version="1.1.2"; sha256="0qfigbx06b3p04x5v7wban139mp8hg8x77x6nzwa4v6dr226qbkv"; depends=[]; }; - ExpDes_pt = derive { name="ExpDes.pt"; version="1.1.2"; sha256="0khw2jhg2vxcivgr20ybvrsqhd8l8bir5xjmr4m44za9nhap43bz"; depends=[]; }; - expectreg = derive { name="expectreg"; version="0.39"; sha256="1mxhv6phc3lgp0zz20wszx4nr3by9p6492wcb0x8wn8p8p1sy1b3"; depends=[mboost BayesX quadprog]; }; - experiment = derive { name="experiment"; version="1.1-1"; sha256="07yaf5k5fpymz2yvr52zbbi60g0v84qryvqqjq3sjq2mb1fjfz1p"; depends=[boot MASS]; }; - expert = derive { name="expert"; version="1.0-0"; sha256="0y9vcigvzhymalpv31b9nvmr86z1dz7x29yj838vks0dsv23rgrf"; depends=[]; }; - expm = derive { name="expm"; version="0.99-1.1"; sha256="0kcanqaqn51f437fxriw4qkpxbhzpjzlkp95wn89ip4jhy6076qn"; depends=[Matrix]; }; - expoRkit = derive { name="expoRkit"; version="0.9"; sha256="0raf0m2nfbdbd1pc4lincyp8y8lgn3bfi4hn0p04plc5p40l1gvc"; depends=[Matrix SparseM]; }; - ExPosition = derive { name="ExPosition"; version="2.8.19"; sha256="04s9kk8x6khvnryg6lqdwnyn79860dzrjk8a9jyxgzp94rgalnnz"; depends=[prettyGraphs]; }; - expoTree = derive { name="expoTree"; version="1.0.1"; sha256="0hj1x4niqp0ghqik3mz733nc3zpnhyknrdpzpj6y2rfia2ysdiz8"; depends=[ape deSolve]; }; - expp = derive { name="expp"; version="1.1"; sha256="13zbhkkcshqrpln5gsa051d390q9ij97lawsdbd5j7fj9hxm9pwh"; depends=[sp spdep rgeos deldir]; }; - expsmooth = derive { name="expsmooth"; version="2.02"; sha256="1l9k4llzkqwzmrr1l68qr58ngzs3ql67hxrr5fcrcwwnaa1zinyj"; depends=[tseries forecast]; }; - exptest = derive { name="exptest"; version="1.2"; sha256="0wgjg62rjhnr206hkg5h2923q8dq151wyv54pi369hzy3lp8qrvq"; depends=[]; }; - exsic = derive { name="exsic"; version="1.0"; sha256="01gvqpy72vs7hn5hcxazzqjb44crh0j31khc11m99ig1ynkbvkms"; depends=[stringr markdown]; }; - ExtDist = derive { name="ExtDist"; version="0.3.3"; sha256="1igdjyadjvm26n3y08gckblxnndrly8d8cgr23hrjww7khdn6ng2"; depends=[numDeriv optimx matrixcalc]; }; - extfunnel = derive { name="extfunnel"; version="1.3"; sha256="162w5b2wjs3yqy8jisamsapav6swa8sskf1b6x5hglnrv3i4qyyy"; depends=[rmeta]; }; - extlasso = derive { name="extlasso"; version="0.1"; sha256="1yb7pfvpchpx81ffa8hjl5h0qf7714zasllf7w4znk3i9dadbyd1"; depends=[]; }; - extraBinomial = derive { name="extraBinomial"; version="2.1"; sha256="0qmvl35f7n78kghszwyaz4wzbswqy4p98c3b6alzrc2ldsq6pq5z"; depends=[]; }; - extracat = derive { name="extracat"; version="1.7-0"; sha256="1m0rfz6vma8rw8rgmadagw26ysq4jmwwysdy9kb5vk8d06la3hag"; depends=[colorspace hexbin scales ggplot2 reshape2 plyr TSP]; }; - extrafont = derive { name="extrafont"; version="0.16"; sha256="0ml1a7m28cdx1a6qcmg8840v95lmhl39ad51q1k3bnqzbxfgqncl"; depends=[extrafontdb Rttf2pt1]; }; - extrafontdb = derive { name="extrafontdb"; version="1.0"; sha256="115n42hfvv5h4nn4cfkfmkmn968py4lpy8zd0d6w5yylwpzbm8gs"; depends=[]; }; - extraTrees = derive { name="extraTrees"; version="1.0.1"; sha256="0kq59aw05cjvry4sbwb4mrnrhggibjnf0ga9kwbipkkdgzzj5wsz"; depends=[rJava]; }; - ExtremeBounds = derive { name="ExtremeBounds"; version="0.1.4.1"; sha256="00k7s5dpia9hajdsb70vd0bx01spaz4m6cjk00gzwndia54cb1dp"; depends=[Formula]; }; - extRemes = derive { name="extRemes"; version="2.0-1"; sha256="0rp2khgrq3wpyxvhyrgrx5b5af33jzfcgmmqlvkx0rr6ql4fqywq"; depends=[Lmoments distillery car]; }; - extremevalues = derive { name="extremevalues"; version="2.2"; sha256="162j6kqnd1ak2w2m6y5dbxcya1ap4648hvc83ibq33bxk98rh7sb"; depends=[]; }; - extWeibQuant = derive { name="extWeibQuant"; version="1.0"; sha256="0l20x33nh50jfrkwm8d0n824d400lnjia8ymdwr10sgj3v1x7vp1"; depends=[]; }; - eyetracking = derive { name="eyetracking"; version="1.1"; sha256="0ajas96s25hjp3yrg42hp78qjhl1aih04mjirkskx32qsyq5hfpv"; depends=[]; }; - ez = derive { name="ez"; version="4.2-2"; sha256="1dk4ig137ridr4pw4afp3flm22s8l38yrgxabld1zv46slndc8mm"; depends=[car ggplot2 lme4 MASS Matrix mgcv plyr reshape2 scales stringr]; }; - ezglm = derive { name="ezglm"; version="1.0"; sha256="0x7ffk3ipzbdr9ddqzv0skmpj5zwazkabibhs74faxnld7pcxhps"; depends=[]; }; - ezsim = derive { name="ezsim"; version="0.5.5"; sha256="03x75vmf75qsmk4zb09j7xrb11w31rpfwd3dvv12nwjgndh9bnld"; depends=[foreach ggplot2 digest plyr reshape Jmisc]; }; - FacPad = derive { name="FacPad"; version="3.0"; sha256="0h7knzin0rfk25li127zwjsyz223w7nx959cs328p6b2azhgn59b"; depends=[Rlab MASS]; }; - factas = derive { name="factas"; version="2.3"; sha256="015lpxf37z8vx4h7a8lavksd7i0gc4x7a7ja63wi9h1czdjsc28k"; depends=[plotrix FactoMineR Matrix]; }; - FactMixtAnalysis = derive { name="FactMixtAnalysis"; version="1.0"; sha256="1l4wfp39b7g38vdk6jpd5zq08sjhsg0s71f662aca2rj6l3a2x3r"; depends=[MASS mvtnorm]; }; - FactoClass = derive { name="FactoClass"; version="1.1.0"; sha256="0y7yd2i79j1m5yl6vnvma47xhr3rl7i37h9sadyrpfm4s486b3kc"; depends=[ade4 xtable]; }; - FactoMineR = derive { name="FactoMineR"; version="1.26"; sha256="0a5kxygybsk2y7nyzl3hnvpspimx3c77j7n8syhs817zw3d6sg6i"; depends=[car ellipse lattice cluster scatterplot3d leaps]; }; - factorplot = derive { name="factorplot"; version="1.1-1"; sha256="1l8pabf32dr12l7b4dgv5jaxpsjymgdxc51miv72zczrx8adc7da"; depends=[multcomp nnet]; }; - factorQR = derive { name="factorQR"; version="0.1-4"; sha256="1vl01fm5qfyhnqbl5y86vkr50b8cv07vzlqs3v6smqaqq6yp4lv4"; depends=[lattice]; }; - factualR = derive { name="factualR"; version="0.5"; sha256="1wz8ibcmilcx62yy29nd2i1pdmjf7fm0g9i5s58gdn8cjlhnw1jl"; depends=[RJSONIO RCurl]; }; - FADA = derive { name="FADA"; version="1.0"; sha256="1qqxzlmwybajyjfvmlvkq6bfd8vm7lgvgs49vh3x8fdbk6annaj6"; depends=[MASS elasticnet sparseLDA sda glmnet mnormt]; }; - FAdist = derive { name="FAdist"; version="2.0"; sha256="0qkbliz25xlsng7fi9hk1vshpd3535yrv5rc43m3g2mj024a9wxg"; depends=[]; }; - Fahrmeir = derive { name="Fahrmeir"; version="2012.04-0"; sha256="1axx6r4g6gj1inih41i2az4y0d3jq9x1a6nyj8k7wp51z4z2nbmk"; depends=[]; }; - fail = derive { name="fail"; version="1.2"; sha256="0xzvb71iq20ah1x1zlb9kbx0r47jhqlzxx0sxwhkibglpzskg84z"; depends=[BBmisc]; }; - FAiR = derive { name="FAiR"; version="0.4-15"; sha256="18nj95fiy3j7kf4nzf692dxja3msnaaj5csg745bnajb48l606wz"; depends=[rgenoud gWidgetsRGtk2 rrcov Matrix]; }; - faisalconjoint = derive { name="faisalconjoint"; version="1.10"; sha256="0z1d241s05jpcih6kh8dhs3k506mwls4xms5zszsmdbzri6sa34x"; depends=[]; }; - falcon = derive { name="falcon"; version="0.1"; sha256="0yas8a8nqdp03s77k5z1xlyz59gapyx68pz0mf6i2snjwpgai59v"; depends=[]; }; - fame = derive { name="fame"; version="2.18"; sha256="132wb59d15bs94fga5hwxxr9pklyp2rjn448nl8lx5spjrvycwf4"; depends=[tis]; }; - Familias = derive { name="Familias"; version="2.1"; sha256="1ccm2hm8vlm450yqx3r45qklgwa6wb54i39ybfh9g2fl544spzn8"; depends=[paramlink]; }; - FAMT = derive { name="FAMT"; version="2.5"; sha256="0mn85yy9zmiklfwqjbhbhzbawwp2yqrm9pvm8jhasn9c3kw1pcp2"; depends=[mnormt]; }; - fanc = derive { name="fanc"; version="1.13"; sha256="08qw4vhms8q2jyqqp2vlq8xdg7y7m0mcwb1pibm7wn938rgablq3"; depends=[Matrix]; }; - fANCOVA = derive { name="fANCOVA"; version="0.5-1"; sha256="034m2mmm6wmsjd41sg82m9ppqjf4b1kgw5vl2w7kzqfx0lypaiwv"; depends=[]; }; - fanovaGraph = derive { name="fanovaGraph"; version="1.4.7"; sha256="19bzl6yrmi5lgyx6nq3f7i0rdaz2ig580h8116axrsxpx8c4d52x"; depends=[sensitivity igraph DiceKriging]; }; - fanplot = derive { name="fanplot"; version="3.3"; sha256="0bv7x3xrsg0pmp9gmck30jypv8cwc03bv753m49dfpgs2p9srcmc"; depends=[]; }; - FAOSTAT = derive { name="FAOSTAT"; version="1.6"; sha256="18wx691hclbf7fvfk3swsz6ripv9w70nlqhsk3lgr4il8bjsr3cy"; depends=[RJSONIO plyr data_table MASS classInt ggplot2 labeling scales]; }; - faoutlier = derive { name="faoutlier"; version="0.4"; sha256="113qpwil669jr89kpqs6c6xzh0z3vp2hzfy98mh1dr2dvaznd06f"; depends=[sem lattice lavaan MASS]; }; - far = derive { name="far"; version="0.6-3"; sha256="0i7c0zrz33abwkml1zdjf5m61bxpfndwziqjbh6wyhdz8msp2kmf"; depends=[nlme]; }; - faraway = derive { name="faraway"; version="1.0.6"; sha256="10vj38chfnlz595pdi16v8gcwsbmn8a7p4gb0mm98dncyin5p2a3"; depends=[]; }; - fArma = derive { name="fArma"; version="3010.79"; sha256="1byxyy4afl1gq58r1cmc5p6frdr9rljr1x3pdnc8nj8rr65lkg72"; depends=[timeDate timeSeries fBasics]; }; - farsi = derive { name="farsi"; version="1.0"; sha256="0y14f86bccwjirdx33383wa605y7l7lr0w7ygvg8r7f7izkv7r3n"; depends=[]; }; - fAsianOptions = derive { name="fAsianOptions"; version="3010.79"; sha256="1w9ph3rz6cd7g275flzsnqxwd3r5xin6pkini8pbsi9s8hbqv3vl"; depends=[timeDate timeSeries fBasics fOptions]; }; - fast = derive { name="fast"; version="0.63"; sha256="00ag9d0dwn9al104y93m8dclbjqabr9liif8gr19v3gv6k2k6p2c"; depends=[zoo]; }; - fastclime = derive { name="fastclime"; version="1.2.4"; sha256="0z91khjzffwy4mbqgkfw4l9mw32sg4p5pvcg4v24z1q44pgnwn4y"; depends=[lattice igraph MASS Matrix]; }; - fastcluster = derive { name="fastcluster"; version="1.1.13"; sha256="0hkml8ggmq5gqw9indqh6rb5x922qq8chd9s35fkxdcgzw58253a"; depends=[]; }; - fastcox = derive { name="fastcox"; version="1.1.1"; sha256="1a5i0ragl0r6p29iamkn04igakiwyysykfbs2p6ybgy8pfdq69sv"; depends=[Matrix]; }; - fastGHQuad = derive { name="fastGHQuad"; version="0.1-1"; sha256="0qnffhplfl2kb4dd90as298ays19k4f18slhj063f01gywqqrahn"; depends=[Rcpp]; }; - FastHCS = derive { name="FastHCS"; version="0.0.2"; sha256="0vc7wmsgk731br0y1vrv50vx5sp7jjjbavd4my6y72rsl9iajv3q"; depends=[matrixStats]; }; - fastHICA = derive { name="fastHICA"; version="1.0"; sha256="02lqqni7j2sp3ndb3kq785d7jf08p2s3ch30di8ffhwn57indald"; depends=[fastICA energy]; }; - fastICA = derive { name="fastICA"; version="1.2-0"; sha256="0ykk78fsk5da2g16i4wji85bvji7nayjvkfp07hyaxq9d15jmf0r"; depends=[]; }; - FastImputation = derive { name="FastImputation"; version="1.2"; sha256="04bz623kcanxcl9z8zl6m7m47pk0szcjrjlgs5v1yl3jnq9m2n7g"; depends=[]; }; - fastM = derive { name="fastM"; version="0.0-2"; sha256="0q5dz47sqj6d4r3k6l6q34l5ajb8fjbf7xam75scp0mg3czswnfn"; depends=[Rcpp]; }; - fastmatch = derive { name="fastmatch"; version="1.0-4"; sha256="16gfizfb1p7rjybrfm57nb6hdm30iirbppva8p8xf8pndz35fjbs"; depends=[]; }; - FastPCS = derive { name="FastPCS"; version="0.0.9"; sha256="12hzp8vk2qb847xy42r0dhab21c0xn23vvakb4qa1jwz6ykji1zk"; depends=[matrixStats]; }; - fastR = derive { name="fastR"; version="0.4-2"; sha256="19vg2dpbq4d7c3zyp18ygx91f0i0n37xwywbj87l7va82l55flyx"; depends=[lattice mosaic]; }; - FastRCS = derive { name="FastRCS"; version="0.0.3"; sha256="0v69hgl0lwasj6xhzmd9sqv3ipax8d0gz6svhmcvnf47rzr8wc7z"; depends=[matrixStats]; }; - FastRWeb = derive { name="FastRWeb"; version="1.1-0"; sha256="1hiabi7ibp69n5wi5x4kwznxhc2i7dxdrqf1fm6ppv7ix0wkjs07"; depends=[Cairo]; }; - fastSOM = derive { name="fastSOM"; version="0.9"; sha256="03501d5289lrlr4qcgxciz160hqc6nhqb9ab266fr132fkbiv4id"; depends=[]; }; - fat2Lpoly = derive { name="fat2Lpoly"; version="1.0.2"; sha256="1v5lrs2jksqiaavyhrsa2kjcw84wzg98g3v0kyx7jhmq8686027g"; depends=[kinship2 multgee]; }; - FatTailsR = derive { name="FatTailsR"; version="1.0-3"; sha256="0r9n18qlr70p6y4v1xv1lxi1lzm9qp29qy4w51chllqjn15kmv7l"; depends=[minpack_lm]; }; - FAwR = derive { name="FAwR"; version="1.0.1"; sha256="1j97hdhaamg6xqkaxb04xzsd60hd69n9y84frkqi9swvhr565waj"; depends=[MASS lattice]; }; - fBasics = derive { name="fBasics"; version="3010.86"; sha256="1ij7f030r12g7s4jfykyfbnfwxwy777smccf9aw0imrz5ik6qjaj"; depends=[MASS timeDate timeSeries stabledist gss]; }; - fbati = derive { name="fbati"; version="1.0-1"; sha256="1ia67dg9b61kc14mjg7065v0c6n6agdp8cjdviasyzga00wzsyxj"; depends=[pbatR fgui rootSolve]; }; - FBFsearch = derive { name="FBFsearch"; version="1.0"; sha256="1nxfhll9gx9l6hzpcihlz880qxr0fyv5rjghk0xgp8xn4r5wxw11"; depends=[Rcpp RcppArmadillo]; }; - FBN = derive { name="FBN"; version="1.5.1"; sha256="0723krsddfi4cy2i3vd6pi483qjxniychnsi9r8nw7dm052nb4sf"; depends=[]; }; - fBonds = derive { name="fBonds"; version="3010.77"; sha256="00rc3i0iyqcpsqvc036csa1c8gxwcnniwj3l2irmcalx4p8650w0"; depends=[timeDate timeSeries fBasics]; }; - fbRanks = derive { name="fbRanks"; version="2.0"; sha256="17kbmdpgqkj2n951c6mdsrgfga6kiij1gqiw1wpi0q3fq4dlfrzx"; depends=[igraph stringr]; }; - fcd = derive { name="fcd"; version="0.1"; sha256="091wbf5iskcgyr7jv58wrf590qijb0qcpninmvm3xrwxi34r37xr"; depends=[glmnet MASS combinat]; }; - fCertificates = derive { name="fCertificates"; version="0.5-3"; sha256="1m0kglsr6g0f7m8r9ls95zj3hmjqq83whyk6svar39p13vabadw6"; depends=[fBasics fOptions fExoticOptions]; }; - fclust = derive { name="fclust"; version="1.0.1"; sha256="1xl8mw4wfwp9n9fmfmzxz8k8qyrk62qr77j085b3kgp7a85dp8ma"; depends=[]; }; - fcros = derive { name="fcros"; version="1.1"; sha256="1wnsjghcs0gfqzl6v95zf0cxm3apnii92b2gxg3hkbgmc6xjm5bf"; depends=[]; }; - FD = derive { name="FD"; version="1.0-11"; sha256="18g2fn6s60hxnasrj58450bjsf4kz62mypyby9avs5anlwihj8gm"; depends=[ade4 ape geometry vegan]; }; - fda = derive { name="fda"; version="2.4.3"; sha256="19a7jylpr8sh1yz9ljyk889ksfd0xwagbvg83vy6vfsi82q1910g"; depends=[Matrix]; }; - fdakma = derive { name="fdakma"; version="1.1.1"; sha256="0y70ckgxkns6p45gv9w02krrr96vzs8f838s5vk02c2m6ynp4prs"; depends=[]; }; - fdaMixed = derive { name="fdaMixed"; version="0.4"; sha256="15m13v71kqxd9gqiymgfkq0dvcpzp05576m8zkg08m0k067ga9bd"; depends=[Formula Rcpp]; }; - fdasrvf = derive { name="fdasrvf"; version="1.4.2"; sha256="12x04fi0sxs9yh1mf9iykk69zlz6m31j7s01in28p5hgk6wqf8fi"; depends=[foreach mvtnorm matrixcalc numDeriv]; }; - fdatest = derive { name="fdatest"; version="1.0"; sha256="0m17abycfczkhwmrmjg43ra3fcaqicr15v2frwfgr5p1wj9x0gwq"; depends=[fda]; }; - fda_usc = derive { name="fda.usc"; version="1.2.0"; sha256="1ifp94i0px3683ph90f7c3z1gh92c33nlfk1f2drr4s0fyb1kzy3"; depends=[fda MASS mgcv rpart]; }; - FDboost = derive { name="FDboost"; version="0.0-5"; sha256="1xra0g46kicq74cpjby6y1va2bxvx8b9fiy76mdg1s6n8m6r1pxn"; depends=[mboost Matrix mgcv zoo nnls]; }; - fdrci = derive { name="fdrci"; version="2.0"; sha256="0smyl9phl02wghimawvff3h267w3h213jbqpka155i6cfzig9qjy"; depends=[]; }; - FDRreg = derive { name="FDRreg"; version="0.1"; sha256="17hppvyncbmyqpi7sin9qsrgffrnx8xjcla2ra6y0sqzam1145y4"; depends=[fda Rcpp mosaic]; }; - fdrtool = derive { name="fdrtool"; version="1.2.12"; sha256="15c1ikddwzzl3mq2dcwjicjg46k436m315dhmkxmbwilrdqlcrn6"; depends=[]; }; - fds = derive { name="fds"; version="1.7"; sha256="164f2cbywph7kyn712lfq4d86v22j4y3fg5i9zyz956hipqv0qvw"; depends=[rainbow RCurl]; }; - fdth = derive { name="fdth"; version="1.1-8"; sha256="195219rndjcccd3b1gn3xc9iky8f3w5ig8x9822d4a2xajr78jnv"; depends=[]; }; - FeaLect = derive { name="FeaLect"; version="1.3"; sha256="0an548y067g2n7xbg6slxnlaxzn71nwq28cdf9788w4zs98gh9c9"; depends=[lars rms]; }; - feature = derive { name="feature"; version="1.2.10"; sha256="0jsqa2mv4kxzx3jh1lakg62f15776yzc8clj7wyijnx4jbkx8k8j"; depends=[ks]; }; - features = derive { name="features"; version="2011.8-2"; sha256="0yshwqv2mzl5jj323jwxscpz2ygb4ywxh6q0zwphb24bhv7h9lwd"; depends=[lokern]; }; - fechner = derive { name="fechner"; version="1.0-2"; sha256="0yhiqr0wlka3wq0nhwy9n02ax3x5b0y803iadbsr3xb54pxbfbqd"; depends=[]; }; - federalregister = derive { name="federalregister"; version="0.1.2"; sha256="0f73jhzhqi3a97iyfx5c5i09vxwnyypgw6668z7nch8lvq337s8x"; depends=[RCurl RJSONIO]; }; - FeedbackTS = derive { name="FeedbackTS"; version="1.1"; sha256="1vp9kxfk1p9hcdl9qg0f5bggh7h2ly9ag70w7dbmkgsika4c0r03"; depends=[maps mapdata proj4 geoR]; }; - fExoticOptions = derive { name="fExoticOptions"; version="2152.78"; sha256="0h58prj8nh340b0fxxkgg4bk25yxvb4f8ppq677hr12x8sysf1a8"; depends=[timeDate timeSeries fBasics fOptions]; }; - fExpressCertificates = derive { name="fExpressCertificates"; version="1.2"; sha256="1r4qkhf7alasbwjz910b0x4dlzm72af06kv7v2vwyzvf3byn21c5"; depends=[mvtnorm tmvtnorm fCertificates Matrix]; }; - fExtremes = derive { name="fExtremes"; version="3010.81"; sha256="0bzgnn0wf7lqhj7b2dbbhi61s8fi2kmi87gg9hzqqi6p7krnz1n5"; depends=[timeDate timeSeries fBasics fGarch fTrading]; }; - ff = derive { name="ff"; version="2.2-13"; sha256="1nvd6kx46xzyc99a44mgynd94pvd2h495m5a7b1g67k5w2phiywb"; depends=[bit]; }; - ffbase = derive { name="ffbase"; version="0.11.3"; sha256="0n65i2a91jjjpzfw3placf6j6sbf8azzd1sck4adha6iiwpi8b1n"; depends=[ff bit fastmatch]; }; - FFD = derive { name="FFD"; version="1.0-2"; sha256="0s6j4rq7ryypq63cq1cfa7n993bwx9pxp6pscdhyh79rhk28xxda"; depends=[tkrplot R2HTML]; }; - FField = derive { name="FField"; version="0.1.0"; sha256="05q16v2vv64qhbnf2l66dwzmvgzyaq8vxwwdabp534bw7z7zpi8q"; depends=[]; }; - ffmanova = derive { name="ffmanova"; version="0.2-2"; sha256="0sw8br73mx552m4b5zi4qgjcrwxflmgsnvs4mlnxh8g2gaf5bx4j"; depends=[]; }; - fftw = derive { name="fftw"; version="1.0-3"; sha256="01nncrf2p0yq49lhd5aq4hvhp87f25r0x7siqnaldv5zq24krl30"; depends=[]; }; - fftwtools = derive { name="fftwtools"; version="0.9-6"; sha256="00m4yapdkwfi4vrpg0yhakq2chma46mmbwhd9a15y61w97yzz7vb"; depends=[]; }; - fgac = derive { name="fgac"; version="0.6-1"; sha256="0paddf5a4w0g2i0ay7my0bppwh534d8ghy6csfxl5jj034xjgwkk"; depends=[]; }; - FGalgorithm = derive { name="FGalgorithm"; version="1.0"; sha256="1dq6yyb3l6c9fzvk9gs6pb240xb5hvc6fh8p3qd3c91b3m289mcc"; depends=[]; }; - fGarch = derive { name="fGarch"; version="3010.82"; sha256="08q452pasvjhsg2ks6c52lqg276hlbdwk0vh25xya2bw2bgbqy99"; depends=[timeDate timeSeries fBasics]; }; - FGN = derive { name="FGN"; version="2.0-12"; sha256="0jxawb4wm1vcp0131mdnc0r24dw8sd29ih0fc2wh6ahy7mxzajqn"; depends=[akima ltsa]; }; - fgof = derive { name="fgof"; version="0.2-1"; sha256="0bclkb3as0fl2gyggqxczndfyj9pfnni5pa3inpn5msrnjg4g2j2"; depends=[mvtnorm numDeriv]; }; - FGSG = derive { name="FGSG"; version="1.0"; sha256="01v0jbj09r1c4anbs3xa8y8by9ffwbbc36vsh0bv62blrisp7a03"; depends=[]; }; - fgui = derive { name="fgui"; version="1.0-5"; sha256="0gzwxzvf2y9p5rlfk862d7l1dm2sdwjhjpcb8p494cj4g1xshazg"; depends=[]; }; - FHtest = derive { name="FHtest"; version="1.1"; sha256="0yqy3lvxjhk7biqfikxqlgs9zsy1vlld9pqxhgxmq04gbnjn2jfk"; depends=[interval MLEcens MASS KMsurv]; }; - FI = derive { name="FI"; version="1.0"; sha256="17qzl8qvxklpqrzsmvw4wq3lyqz3zkidr7ihxc4vdzmmz69pyh2f"; depends=[]; }; - fICA = derive { name="fICA"; version="1.0-0"; sha256="054dg6ikps0ynfy06y95an5mi2wwqx88ylk5qcifxhjiylw36v5v"; depends=[JADE]; }; - fields = derive { name="fields"; version="7.1"; sha256="0wxm8pq4j5clz1hcgdlajasg5cbq8x35i82wrw3gsy27kslyadkd"; depends=[spam maps]; }; - FieldSim = derive { name="FieldSim"; version="3.1.3"; sha256="0ap1mfsjj3bflpryn0y8h9kg5mzfrnqj6h9f3m5ja32yjv19ql60"; depends=[rgl RColorBrewer]; }; - 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]; }; - fImport = derive { name="fImport"; version="3000.82"; sha256="07yqppl8sbfa0x9k4n7hh6hcgyxpcvlk74hhylib4nzqm70bn0sq"; depends=[timeDate timeSeries]; }; - financial = derive { name="financial"; version="0.2"; sha256="1v6jgs3rq57byin5mynslfjk3zrx91qz36558nn17mv6z0qsf10v"; depends=[]; }; - FinancialInstrument = derive { name="FinancialInstrument"; version="1.1"; sha256="19sszdrqipy9i8g2bda9v8i9g5c9w584si4va35fq3i929yv7hrl"; depends=[quantmod xts zoo]; }; - FinAsym = derive { name="FinAsym"; version="1.0"; sha256="0v15ydz4sq9djwcdcfp90mk8l951rry7h91d7asgg53mddbxjj6f"; depends=[]; }; - FinCal = derive { name="FinCal"; version="0.6"; sha256="0slw5s7gilmv0j8iwhz27lss2gbrj2l8zqv7bqywr1yf0hw2nxn7"; depends=[ggplot2 reshape2 scales RCurl]; }; - FindAllRoots = derive { name="FindAllRoots"; version="1.0"; sha256="0n4wfm21qj5zn06jqnzxa0w9mfn18dqi6hk1jjqa56dxqw1k7vw0"; depends=[]; }; - FindIt = derive { name="FindIt"; version="0.3"; sha256="0bnyfv9xc5c9bzc34qpbnk6s9mvnzkx9zswjr3j210f518y8z45f"; depends=[glmnet lars glmnet lars]; }; - FindMinIC = derive { name="FindMinIC"; version="1.6"; sha256="0vlr56nw32msvz8bljrw82nzrnazncs6nz7zisidffm2v3najkar"; depends=[nlme sets]; }; - findpython = derive { name="findpython"; version="1.0.1"; sha256="0fa01znc9cckj4ay4zmwmssm2lkhmsw6h07y1pwgd6z1b2pj7bns"; depends=[]; }; - fingerprint = derive { name="fingerprint"; version="3.5.2"; sha256="042aycxs00rglqh2y27bjlwkk6z312gavli7g8xvqfx1lisijrjk"; depends=[]; }; - finiteruinprob = derive { name="finiteruinprob"; version="0.4"; sha256="0wcllbqkryll3v3fjb6k210pcgkskzrpa78gg8nda0jvkij11zb7"; depends=[sdprisk numDeriv]; }; - FinTS = derive { name="FinTS"; version="0.4-5"; sha256="16m57h6rk4344aalfwaz7hsyis30c1dirsyx8ih661ihgqn1ai1r"; depends=[zoo]; }; - FisherEM = derive { name="FisherEM"; version="1.4"; sha256="1lhkyyk82i6alxyiqrvy5fx60f8vab0y62zmw5fjaq6h0vczqn3s"; depends=[MASS elasticnet]; }; - fisheyeR = derive { name="fisheyeR"; version="0.9"; sha256="1w6va7gakqq2q8hsvdszpn8s2ysdfc648bk5p5v3wbl5s403bci8"; depends=[tkrplot]; }; - FisHiCal = derive { name="FisHiCal"; version="1.1"; sha256="1dds629jlja3vw2l010n1334yh3z10nijqksr0q98ckd2yrwg2rf"; depends=[igraph RcppArmadillo]; }; - fishmethods = derive { name="fishmethods"; version="1.6-0"; sha256="1vp125sg3fy02zj5rbvgq4aymg1dj8g54kq5ss78c7rzwww7a560"; depends=[MASS boot bootstrap]; }; - fishMod = derive { name="fishMod"; version="0.25"; sha256="0mg1bziz2ia406m4ilc7hw1bghrgdibm537hnlf9ffhfayjc4kid"; depends=[]; }; - fishmove = derive { name="fishmove"; version="0.2-1"; sha256="1b8drjvslmpqnq5v3axrshrl2xq87h3x5cgfnibbhn4slrxw55v9"; depends=[ggplot2 plyr]; }; - fit4NM = derive { name="fit4NM"; version="3.3.3"; sha256="1xy334svv7cc3xh2j33q6icnibxl46yvnxw8bd4xrpclg4xchc1g"; depends=[gWidgets tkrplot RGtk2 gWidgetsRGtk2 cairoDevice]; }; - 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]; }; - fitdistrplus = derive { name="fitdistrplus"; version="1.0-2"; sha256="1m35zicxm5gfc9wgp7lx7ymy06nr4s9fcwc07iky40xh65kps0s5"; depends=[survival]; }; - fitDRC = derive { name="fitDRC"; version="1.1"; sha256="1f6avw8ia9ks17zdagpmh6yvcmi53h5cvm0wwv9hsb92x5zfhxn9"; depends=[]; }; - fit_models = derive { name="fit.models"; version="0.5-10"; sha256="06pj26dbnq6mf9wxinvjzwyn36656f66a4bmky36r7fzi92gf3d8"; depends=[lattice]; }; - FITSio = derive { name="FITSio"; version="2.0-0"; sha256="1gf3i1q9g81gydag2gj1wsy6wi5jj2v4j3lyrnh1n2g4kxd6s3cp"; depends=[]; }; - fitTetra = derive { name="fitTetra"; version="1.0"; sha256="0ia6wk4gicpmn6kclsd28p7v1npwfv2blagiz0cxzwfw3njv103g"; depends=[]; }; - FKF = derive { name="FKF"; version="0.1.3"; sha256="01ibihca39zng4wrvhq8h28bmb2rnsjm21xy22b85kpn3mbnh7f1"; depends=[RUnit]; }; - flare = derive { name="flare"; version="1.4.0"; sha256="19hygxsz0sr1cvqyr6snxgrd9cfi25h1zyk8xhg35jffpbs97d7p"; depends=[lattice MASS Matrix]; }; - flashClust = derive { name="flashClust"; version="1.01-2"; sha256="0l4lpz451ll7f7lfxmb7ds24ppzhfg1c3ypvydglcc35p2dq99s8"; depends=[]; }; - flexclust = derive { name="flexclust"; version="1.3-4"; sha256="1x9gyg69kb3wn02w885kl6hcwpf2ki66gzfayvc83jisrwxvdfvv"; depends=[lattice modeltools]; }; - flexCWM = derive { name="flexCWM"; version="1.1"; sha256="0vxzf3ifmpg7l13bvbmv6h5a3gmn2h1xvkq354lvy4s8znk643c4"; depends=[numDeriv mnormt mclust ellipse mixture Flury]; }; - flexmix = derive { name="flexmix"; version="2.3-11"; sha256="14nv6dxpgm9nr01rcz32x42agr4xi2anyss2fiywjidwbdgj50iy"; depends=[lattice modeltools nnet]; }; - FlexParamCurve = derive { name="FlexParamCurve"; version="1.4-3"; sha256="1056lxs9c2bbh2i2gv1bv2sy8gq6k6p0jpl1d3axqd1xk5pipm2x"; depends=[nlme]; }; - flexsurv = derive { name="flexsurv"; version="0.3"; sha256="0ig0151843qfc4pvk9mh80kly1n9mq9aphwkwligm9llspiwbcja"; depends=[survival muhaz mvtnorm]; }; - FLIM = derive { name="FLIM"; version="1.1"; sha256="1gghzmj3mvih4gglk27rx1v18q72xnvymgzjwa84m5vlc8840jpa"; depends=[zoo MASS]; }; - flip = derive { name="flip"; version="2.4.3"; sha256="04zf2gnk5w57gxnlnh26pn1ir1wfrzxhfhchr33ghk7prhc7k4b8"; depends=[e1071 someMTP cherry Rcpp]; }; - FLLat = derive { name="FLLat"; version="1.1"; sha256="1h2nfx7gb66hjdfkdm6im6n8c1fjdz9csg39pckb47c0khl3g9r0"; depends=[gplots]; }; - flora = derive { name="flora"; version="0.2.3"; sha256="03n2as362fcz7jbkprwqr2rs86njbkywczsf8cjfa2akwh93gj7s"; depends=[shiny]; }; - flowfield = derive { name="flowfield"; version="1.0"; sha256="1cx3i0w3xq781mmms4x20fshlf1i9bwxw9bxx562crix3fq3m50j"; depends=[]; }; - FLR = derive { name="FLR"; version="1.0"; sha256="0k50vi73qj7sjps0s6b2hq1cmpa4qr2vwkpd2wv2w1hhhrj8lm0n"; depends=[combinat]; }; - flsa = derive { name="flsa"; version="1.05"; sha256="07z2b1pnpnimgbzkjgjl2b074pl9mml7nac2p8qvdgv7aj070cmh"; depends=[]; }; - FLSSS = derive { name="FLSSS"; version="1.0"; sha256="1plpq4m7fh1g3hrbby1v93pnp1kn7ickb2vd6fa3zs7r9dkglikn"; depends=[Rcpp]; }; - FluOMatic = derive { name="FluOMatic"; version="1.0"; sha256="06hww6viynisnfiphvghv4iqf1gk2snb8aksignaw8pnlkixnsg7"; depends=[]; }; - Flury = derive { name="Flury"; version="0.1-3"; sha256="105fv9azjkd8bsb9b8ba3gpy3pjnyyyp753qhrd11byp3d0bbxy0"; depends=[]; }; - flux = derive { name="flux"; version="0.3-0"; sha256="0pc9cab2pwrfl0fnz29wp7a398r49hvbi50jp8i2fk2rfvck21a7"; depends=[caTools]; }; - fma = derive { name="fma"; version="2.01"; sha256="1j5mvhbrdnkyj4svibpahnz7d4221nkhja5b7fnh68mbmil607fc"; depends=[tseries forecast]; }; - FME = derive { name="FME"; version="1.3.1"; sha256="1wylpxr9m65ksizjhn97082kfkf9m451qraw93cgn5660skxw7d8"; depends=[deSolve rootSolve minpack_lm MASS coda]; }; - fmri = derive { name="fmri"; version="1.5-1"; sha256="0dla5w8x4njw2njryb35nqh4r31wdps9bl5wzab2grzl546wwmwm"; depends=[]; }; - fmsb = derive { name="fmsb"; version="0.5.0"; sha256="1aynq4d2nrx11irrbhvjavvd86ffgrw5jv6pwnk97lw6qjfk5kc3"; depends=[]; }; - FMStable = derive { name="FMStable"; version="0.1-2"; sha256="00viigpqfbqc4hyl9cwicbwqf2ksjak28qrqaa16jhbqz93j4fck"; depends=[]; }; - fmt = derive { name="fmt"; version="1.0"; sha256="13gsywnyvf9zy5n644g2xyd60f92w2dp7vil2dncjvjcqsib22a0"; depends=[]; }; - FNN = derive { name="FNN"; version="1.1"; sha256="1kncmiaraq1mrykb9fj3fsxswabk3l71fnp1vks0x9aay5xfk8mj"; depends=[]; }; - fNonlinear = derive { name="fNonlinear"; version="3010.78"; sha256="0pmz16b606i3mx05zjln4nyl53ks7rlwgm45ldr9qgmw51pflwz9"; depends=[timeDate timeSeries fBasics fGarch]; }; - foba = derive { name="foba"; version="0.1"; sha256="1af8whgl66v0vwzdf03b6141k3dysdc0svymlgifcga5gqkwzsl0"; depends=[]; }; - fontcm = derive { name="fontcm"; version="1.1"; sha256="1z6b4qdgj5vhvjqj90sm1hp0fffi1vxzvq71p0flxybzyb7d15la"; depends=[]; }; - foodweb = derive { name="foodweb"; version="1-0"; sha256="1zm2a87g9bkpz90j9lax28s5hq1w7ia28qqb6vnvr1d7a47g9zi9"; depends=[rgl]; }; - fOptions = derive { name="fOptions"; version="3010.83"; sha256="01yr3hrfiq4hjhidl5pl1gcqg0myg4acmnipjhq70l3q50cfjm8l"; depends=[timeDate timeSeries fBasics]; }; - 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]; }; - ForeCA = derive { name="ForeCA"; version="0.1"; sha256="1nbflawx8h4lpb9ixbp0zcyl0bqykqlqail31i00ywkak2ic3pm3"; depends=[ifultools splus2R nlme R_utils sapa mgcv astsa]; }; - forecast = derive { name="forecast"; version="5.5"; sha256="040sjs26jdpcvn1mipbvy81ygr1ck1z69jhx375l76hbswyq801c"; depends=[zoo timeDate tseries fracdiff Rcpp nnet colorspace]; }; - foreign = derive { name="foreign"; version="0.8-61"; sha256="0r994z3ihvrbfhzpvp2dkxbfgkbmccgrryfaxmy1vi56v59n73w8"; depends=[]; }; - forensic = derive { name="forensic"; version="0.2"; sha256="0kn8wn6p3fm67w88fbarg467vfnb42pc2cdgibs0vlgzw8l2dmig"; depends=[genetics combinat]; }; - forensim = derive { name="forensim"; version="4.3"; sha256="1j92imykw48cciay0r6n1aq1jrdb2b1grrz6lpc4kgbnbd7mk0qm"; depends=[tcltk2 tkrplot]; }; - ForImp = derive { name="ForImp"; version="1.0.2"; sha256="1qplsg3cxs95b3ax71a3wyjfk4q207k72ggba2sl0zc7mjqhv1f4"; depends=[homals sampling mvtnorm]; }; - ForIT = derive { name="ForIT"; version="1.0"; sha256="0mi2cw09mbc54s8qwcwxin2na1gfyi60cdssy2ncynma7alq3733"; depends=[]; }; - fork = derive { name="fork"; version="1.2.4"; sha256="1sb4xypirmrknhrc872ky845kym58dmakn6c2crsbp67wpg63m4l"; depends=[]; }; - FormalSeries = derive { name="FormalSeries"; version="1.0"; sha256="09m4ifinasww0xfprs29xsrqhxxkw9zffb3919xnkkjkwp0nax4v"; depends=[]; }; - formatR = derive { name="formatR"; version="0.10"; sha256="0rxm4c896rcmalmq1hsjg053dqb3m2vf9jqap5w5bsllaiakwh4a"; depends=[]; }; - Formula = derive { name="Formula"; version="1.1-2"; sha256="1axjcmy4x2175nrfjc7vwkijcyr86ws6nbs08990wq8gcal15a10"; depends=[]; }; - formula_tools = derive { name="formula.tools"; version="1.3.4"; sha256="1xxl45x88fpskwvfj6sbcbfng84plpf8sjrkwawzki9a41ydhwaq"; depends=[operator_tools]; }; - fortunes = derive { name="fortunes"; version="1.5-2"; sha256="1wv1x055v388ay4gnd1l8y6dgvamyfvmsd0ik9fziygwsaljb049"; depends=[]; }; - forward = derive { name="forward"; version="1.0.3"; sha256="0swn5ysp3f660kl9jpmkck9324j1g3yhj2hl238rfrcr5wihxifc"; depends=[MASS]; }; - fossil = derive { name="fossil"; version="0.3.7"; sha256="188hyb3r1dnxkmqf2czh1kdzmk4mjc0v1kn1zml2yvxaxk7adsrz"; depends=[sp maps shapefiles]; }; - FourScores = derive { name="FourScores"; version="1.0"; sha256="0d21mrl9bzsvhljv7ymiyck508smp66w9qivrb2rp0p803h9yibm"; depends=[]; }; - fpc = derive { name="fpc"; version="2.1-7"; sha256="1zymk2v7s8jyn4jm3qaxzd5rlx748ap4ad2dd56w195q5j1xn4bh"; depends=[MASS cluster mclust flexmix]; }; - fpca = derive { name="fpca"; version="0.2-1"; sha256="13b102026xlfb7c2rb3xsqsymm7xpmaxppaafjkb5dx0b1lz0jrc"; depends=[sm]; }; - FPDC = derive { name="FPDC"; version="1.0"; sha256="0f6f5bjh1dqv9n6hpbgj922ymbd1zdb0b4ad5h9nk1c6c9ysai7y"; depends=[ThreeWay]; }; - fpow = derive { name="fpow"; version="0.0-2"; sha256="0am3nczimcfrm9hi02vl2xxsh703qjmr2j11y014mll3f2v1l8cy"; depends=[]; }; - fpp = derive { name="fpp"; version="0.5"; sha256="1jqnx6bgpvnbbj2fa2b6m6aj8jd5cb9kz877r8kp7a5qj62xv1ww"; depends=[forecast fma expsmooth lmtest tseries]; }; - fptdApprox = derive { name="fptdApprox"; version="2.0"; sha256="152bajs76wrapp0zdbkckff6kdkkm6sqqlqd2w220hsi96l2p9dh"; depends=[]; }; - fracdiff = derive { name="fracdiff"; version="1.4-2"; sha256="03l5dqpqwwi5c8fwc2vissfawcsignai60h2zalknkibvk782dwq"; depends=[]; }; - fracprolif = derive { name="fracprolif"; version="1.0.5"; sha256="0d028dkiwv8jlsnvdv3wqgx6vsl2ai0icpdadl66sjj45yxv1z7g"; depends=[emg numDeriv]; }; - fractal = derive { name="fractal"; version="2.0-0"; sha256="17wz3c9f1l1rphzdn7j27j5nb1ll6j84f9ihk0z6fni41050szv7"; depends=[splus2R ifultools sapa wmtsa scatterplot3d]; }; - 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]; }; - FRACTION = derive { name="FRACTION"; version="1.0"; sha256="0g25dzsbharsq8bzfka96zccaqppdclax24mz5m080ddg4y8zj49"; depends=[]; }; - frailtyHL = derive { name="frailtyHL"; version="1.1"; sha256="1xjdph0ixanf9w4b6hx6igfhkcp8h93sclrg0pgqgmbvm41lhb1x"; depends=[Matrix numDeriv survival]; }; - frailtypack = derive { name="frailtypack"; version="2.6.1"; sha256="0xzf7qffp9ybxdd9x2s30k23lcss8wf6rbljp3x5xbyg87nfawyd"; depends=[survival boot MASS survC1]; }; - frair = derive { name="frair"; version="0.4"; sha256="1g52ykj1m9znpp0pvry7dnmhg4m73nbkw0bp31zl6pcsdgmxxqjr"; depends=[bbmle emdbook boot]; }; - FRAPO = derive { name="FRAPO"; version="0.3-8"; sha256="1wqayyai8pdm1vq6qvpd10qpd882cyjb0y0jl582fxd3a2ic7n14"; depends=[quadprog Rglpk timeSeries]; }; - FRB = derive { name="FRB"; version="1.8"; sha256="13rp4gqldx84mngrdv5fa9xamkng7b3kgy30ywykcx46gmrym6ps"; depends=[corpcor rrcov]; }; - frbs = derive { name="frbs"; version="2.2-0"; sha256="13m8hm2925h1mz2wgbsxiqls5gy7sgvp0rsdcsy2sm7czjnl2z7n"; depends=[]; }; - FRCC = derive { name="FRCC"; version="1.0"; sha256="1g1rsdqsvwf7wc16dj16y6r0347j8jsv5l1pxvj1h0579zinaf2b"; depends=[CCP MASS calibrate corpcor]; }; - freeknotsplines = derive { name="freeknotsplines"; version="1.0"; sha256="19zs42q9njknirdbrbnp8bv4vr32kd8wxmkqj0a0nh06i5fcx67r"; depends=[]; }; - FreeSortR = derive { name="FreeSortR"; version="1.0"; sha256="1zrff48abf42md6y2x2s8sd23807dx78fjgbfzzxswg3hz34g5sa"; depends=[smacof vegan ellipse]; }; - freestats = derive { name="freestats"; version="0.0.3"; sha256="0b18n8idap089gkmjknzzb94dvs2drpdqs0mrw7dqnacxgbbqwfj"; depends=[MASS mvtnorm]; }; - FREQ = derive { name="FREQ"; version="1.0"; sha256="01nra30pbnqdd63pa87lcws3hnhhzybcjvx2jqyxjghn6khz47j0"; depends=[]; }; - freqMAP = derive { name="freqMAP"; version="0.2"; sha256="02hpkqqrxifrr1cxn5brp166jwa8lgl1mcgmq7s8csrbbd900ziv"; depends=[]; }; - freqparcoord = derive { name="freqparcoord"; version="1.0.0"; sha256="0hn5y10yp3j76lqrmj6dsaafamgy4pfxx1p4y92z17s79x29j59q"; depends=[ggplot2 GGally FNN mvtnorm]; }; - freqweights = derive { name="freqweights"; version="0.1.0"; sha256="1ckhr0d21gd193lkwv4723n4q72phg93ymi00810f1h5677mghby"; depends=[plyr dplyr data_table biglm fastcluster FactoMineR]; }; - FrF2 = derive { name="FrF2"; version="1.7-1"; sha256="0i9hfx7n0g866imdsmalqzs8v95vx08cz97hi8311v1wc3pqsn1j"; depends=[DoE_base sfsmisc BsMD scatterplot3d igraph]; }; - FrF2_catlg128 = derive { name="FrF2.catlg128"; version="1.2-1"; sha256="0i4m5zb9dazpvmnp8wh3k51bm0vykh4gncnhdg71mfk4hzrfpdac"; depends=[FrF2]; }; - frm = derive { name="frm"; version="1.2"; sha256="128ya5gx27hywkhf9mivscxsk8rgf07c0y65fh15hp1c8m6dx0nz"; depends=[]; }; - frmqa = derive { name="frmqa"; version="0.1-5"; sha256="0vd5jnjzhkc0vd4cqn4cs6a3limd4fxwyb5i7845rwmkzk1944aj"; depends=[partitions Rmpfr]; }; - 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.8.5.6"; sha256="060i64q65ra2npxvrd6ihzqqqv3s4xyisvgrskkyybswhqzvhxvr"; depends=[caret gsubfn]; }; - FSelector = derive { name="FSelector"; version="0.19"; sha256="1b9jj8lqly31v393mx9dmr437sw0pk7m693ah4xnr2c9vjry6fav"; depends=[randomForest RWeka digest]; }; - fslr = derive { name="fslr"; version="1.1"; sha256="0m2bhmbkf4594k6l8xmqlrgv2z6pmhwm3an0ll5qvl6giy1q70vc"; depends=[stringr oro_nifti matrixStats]; }; - fso = derive { name="fso"; version="2.0-1"; sha256="02dr12bssiwn8s1aa1941hfpa4007gd65f3l4s74gs2vgjzdxf8s"; depends=[labdsv rgl]; }; - fSRM = derive { name="fSRM"; version="0.3.5"; sha256="1dprw19ssw4v892b6iqsz5i7dmicjhgr6v1fkhnwd988nqv6h01s"; depends=[lavaan plyr reshape2]; }; - FTICRMS = derive { name="FTICRMS"; version="0.8"; sha256="0kv02mdmwflhqdrkhzb55si5qnqqgdadgyabqc2hwr6iccn7aq8c"; depends=[Matrix lattice]; }; - ftnonpar = derive { name="ftnonpar"; version="0.1-88"; sha256="0df9zxwjpfc939ccnm1iipwhpf76b34v0x74nsi1mm1g927dfl0i"; depends=[]; }; - fTrading = derive { name="fTrading"; version="3010.78"; sha256="0qakjxnr5nslw06ywlj65m3w7pjgn5hixxc2rnqhvvvmjpdxybz7"; depends=[timeDate timeSeries fBasics]; }; - fts = derive { name="fts"; version="0.9.9"; sha256="1qgp8xdwr5pp2b7nd8r717a6p8b6izwqrindx2d1d0lhhnqlcwhv"; depends=[zoo]; }; - ftsa = derive { name="ftsa"; version="4.0"; sha256="0phqsw3zq0bq6sdqdacyajk1xk7ns66nd3rpszl96gi7jw5m5bf8"; depends=[forecast rainbow colorspace]; }; - fueleconomy = derive { name="fueleconomy"; version="0.1"; sha256="1svy5naqfwdvmz98l80j38v06563vknajisnk596yq5rwapl71vj"; depends=[]; }; - fugeR = derive { name="fugeR"; version="0.1.2"; sha256="0kd90s91vzv0g3v9ii733h10d8y6i05lk21p5npb3csizqbdx94l"; depends=[snowfall Rcpp]; }; - fume = derive { name="fume"; version="1.0"; sha256="0g9ygyjxsk0m3ad25h3bcgxs9g29blqn8p27s9g47kxvh4v1nq4y"; depends=[chron]; }; - fun = derive { name="fun"; version="0.1-0"; sha256="0z4nq2w1wz1clc7cf87pf870hayxq5mpzhllfgwj4mmh2xpphnrf"; depends=[]; }; - FunChisq = derive { name="FunChisq"; version="1.0"; sha256="1wrj483w6fjwwqjbymdj229nismmwaxw6v6fpba9mylqbyhs69gc"; depends=[]; }; - FunCluster = derive { name="FunCluster"; version="1.09"; sha256="0i73asn1w4s6ydf2ddn5wpr0mwbbxzgmaly1pslarzkx71wk03fz"; depends=[Hmisc cluster]; }; - Funclustering = derive { name="Funclustering"; version="1.0.1"; sha256="0i6g98mfgdyc9hdzvviynrgqhkzicp8y6s0scqy3ifgk9h1k79dw"; depends=[fda Rcpp]; }; - FuncMap = derive { name="FuncMap"; version="1.0-2"; sha256="0psz2bsmq22ghgr3dijsw094b9ams15dvknigcgi5sq1invafx4a"; depends=[mvbutils]; }; - functional = derive { name="functional"; version="0.6"; sha256="120qq9apg6bf39n9vnp68db5rdhwvnj2vi12a8j8243vq8kqxdqr"; depends=[]; }; - FunctionalNetworks = derive { name="FunctionalNetworks"; version="1.0.0"; sha256="071hjgiccbrf1gxrh7niw2w1p6vgc77qvrildi59xhk53qcwzqdp"; depends=[]; }; - fUnitRoots = derive { name="fUnitRoots"; version="3010.78"; sha256="04nwwazd8jvzds6p4njzq4wpcsrvvvs0y9z8v8r402myd4856ssm"; depends=[urca timeDate timeSeries fBasics]; }; - funreg = derive { name="funreg"; version="1.1"; sha256="1sxr4mylcpbya197d55yi6d7g5pfspaf59xxbwjgmwgjw06rl76r"; depends=[MASS mgcv mvtnorm]; }; - FusedLasso = derive { name="FusedLasso"; version="1.0.6"; sha256="1m2l7ihd55viy5a543gg2rhzkcmf5myxxbc5gqf1icrwjg6bny41"; depends=[Matrix]; }; - FusedPCA = derive { name="FusedPCA"; version="0.2"; sha256="0z4kvm6mn11fmc8w62aky2binjdcgrw4ij5vg65sb55da9s8d2kd"; depends=[genlasso]; }; - futile_any = derive { name="futile.any"; version="1.3.0"; sha256="1c7pj64kz09qzwrxvkp1w1w8mvxwq36zkj6w4b7yyi8v7x3daq2a"; depends=[lambda_r]; }; - futile_logger = derive { name="futile.logger"; version="1.3.7"; sha256="0mcca1d70a173f2c54g05fp6174z3265bc4z73k8hs16sfb3s7zf"; depends=[lambda_r futile_options]; }; - futile_matrix = derive { name="futile.matrix"; version="1.2.2"; sha256="1cb975n93ck5fma0gvvbzainp7hv3nr8fc6b3qi8gnxy0d2i029m"; depends=[lambda_r lambda_tools futile_logger RMTstat]; }; - futile_options = derive { name="futile.options"; version="1.0.0"; sha256="1hp82h6xqq5cck67h7lpf22n3j7mg3v1mla5y5ivnzrrb7iyr17f"; depends=[]; }; - futile_paradigm = derive { name="futile.paradigm"; version="2.0.4"; sha256="14xsp1mgwhsawwmswqq81bv6jfz2z6ilr6pmnkx8cblyrl2nwh0v"; depends=[futile_options RUnit]; }; - fuzzyFDR = derive { name="fuzzyFDR"; version="1.0"; sha256="0zd8i9did0d9gp42xjmwrccm32glabvvy08kl8phhwb1yaq53h7w"; depends=[]; }; - fuzzyMM = derive { name="fuzzyMM"; version="1.0.1"; sha256="1pqfc9b9l2xx5pl45hfildikqjsdgqfhqzi2nbb34026nla5m8vk"; depends=[osmar frbs igraph rgeos rgdal]; }; - FuzzyNumbers = derive { name="FuzzyNumbers"; version="0.3-3"; sha256="1vbfkr8r1n8d564ws8dqfbd49f33vd7drg3chg2vr9bxh292wsl3"; depends=[]; }; - fuzzyRankTests = derive { name="fuzzyRankTests"; version="0.3-5"; sha256="1g09506bbpk05a2r2wxjynjs8dmjd2q7x74d83vjscg1kdk4kazq"; depends=[]; }; - FuzzyStatProb = derive { name="FuzzyStatProb"; version="1.0"; sha256="0dkxix2blb403a72a9n13hyx31rknfxfq0cbkvvk7dvgis2w6k14"; depends=[MultinomialCI FuzzyNumbers DEoptim]; }; - FuzzyToolkitUoN = derive { name="FuzzyToolkitUoN"; version="1.0"; sha256="104s45mmlam67vwpshhpns2mgwvmhnbj8w1918jyk2r5mqibwz06"; depends=[]; }; - fwdmsa = derive { name="fwdmsa"; version="0.2"; sha256="0p0kh8am6gajfaixkvq61f12hfbm6chl9372yzn1yilhiyvqdxgp"; depends=[]; }; - FWDselect = derive { name="FWDselect"; version="1.1"; sha256="1snamrzf0cqcm6sc5vr1b0scgy83jgr5hgsf2cjb3vi3j01hz9wd"; depends=[mgcv]; }; - fwi_fbp = derive { name="fwi.fbp"; version="1.5"; sha256="08ngg70vi2fca5yblm2gf1lkjjmb6m39d8q6429n7i3jn6ca5nzf"; depends=[]; }; - fwsim = derive { name="fwsim"; version="0.3.1"; sha256="0l9qsysi0v8q58ik0pk7jxs2m57q2n82apc0rb0d0czm7dmib6b6"; depends=[Rcpp]; }; - fxregime = derive { name="fxregime"; version="1.0-3"; sha256="15fh8yhcba2gw2xfd0yiw5ssvbgb62l6vb28bxz71ckdyv9nsahk"; depends=[zoo strucchange car sandwich]; }; - G1DBN = derive { name="G1DBN"; version="3.1.1"; sha256="015rw3bpz32a8254janddgg1ip947qgcvmiwx5r3v7g8n854bwxn"; depends=[MASS igraph]; }; - G2Sd = derive { name="G2Sd"; version="2.1-1"; sha256="01b7bpvnl51dms7bp076v0mbz8bk2vrlkqji9fk6nyqfpxg5zn6a"; depends=[shiny xlsx rJava xlsxjars]; }; - GA = derive { name="GA"; version="2.1"; sha256="06adi6kdav5c9kzn4y6gq73p496y73hvcdv6nf7d0by8hx5ncyc4"; depends=[]; }; - GA4Stratification = derive { name="GA4Stratification"; version="1.0"; sha256="0li23mrxjx72fir16j3q06fa32cicck4pfc30n0dy2lysf81m9gs"; depends=[]; }; - GABi = derive { name="GABi"; version="0.1"; sha256="1zmiaqbd1jrpiz9hk16s8rggcpl3xyyhjkkdliymx2p42vy5b5mf"; depends=[hash]; }; - GAD = derive { name="GAD"; version="1.1.1"; sha256="0lyrw0d7i7yn1wkqlbf3rg3dnijfwsjn3kdbsg19hmvwq6qpsak2"; depends=[matrixStats R_methodsS3]; }; - gains = derive { name="gains"; version="1.1"; sha256="1mn8db8yxgkf8z6nm6k76g5l3i3vnw750ksg3w9ysd2pcabb65g1"; depends=[]; }; - GAIPE = derive { name="GAIPE"; version="1.0"; sha256="04iarbwxrhn48bk329wxis7ifzndi67kpjx6dcakawkh3g2mzsfz"; depends=[]; }; - galts = derive { name="galts"; version="1.3"; sha256="0b18hsdcsx43rn8l4x9nhy9hgggjr5b8kvjnbxrf6r23qsdk43mn"; depends=[genalg DEoptim]; }; - gam = derive { name="gam"; version="1.09.1"; sha256="09p83ki821x57kc74klh6i1h8bz3acsrvibz3mzzcgq6sa8gzr5i"; depends=[]; }; - gamair = derive { name="gamair"; version="0.0-8"; sha256="11qwmhrzks8gi9is2n9xcy6cviy7a8mwh2v78fw78x7g7ccd8i9x"; depends=[]; }; - gambin = derive { name="gambin"; version="1.1"; sha256="197k8j6mvf8236gwg8vvfnskf4hic9y075chsd8214n1nk7i6jmz"; depends=[]; }; - GAMBoost = derive { name="GAMBoost"; version="1.2-3"; sha256="0450h9zf12r524lxk1lrv9imvvkk6fmyd3chnxp18nnvys7215pv"; depends=[Matrix]; }; - gamboostLSS = derive { name="gamboostLSS"; version="1.1-2"; sha256="1my718gp5wnzrpy50r9cjcjy4kbxvy0q1867n21dll6rhbxz0yil"; depends=[mboost]; }; - gamboostMSM = derive { name="gamboostMSM"; version="1.1.5"; sha256="1n6ngbxx9f3p98jfiq4x21y0rqmhy18zyv13y8mkrz7hrchh835f"; depends=[mboost]; }; - gamclass = derive { name="gamclass"; version="0.52"; sha256="0ypdsjmzj5vj6z5iimx1xva6pqh75s1dlaar2hkyn8zx08d0q2kh"; depends=[car mgcv DAAG MASS rpart randomForest lattice latticeExtra ape KernSmooth]; }; - games = derive { name="games"; version="1.1-1"; sha256="05x27vivz2acp7darja0x21l29ddlav6ch6l89a9s60v52zqflik"; depends=[maxLik Formula MASS stringr]; }; - gamlr = derive { name="gamlr"; version="1.11-3"; sha256="01mwgmmyp132d792darjrfbcihw04sy3fyw2xchshjqry616j82i"; depends=[Matrix]; }; - gamlss = derive { name="gamlss"; version="4.3-0"; sha256="0hsywaf3ng7c8b7xcq16q1cnld7g224gwdkf7s07zlfv23v6kxs8"; depends=[gamlss_data gamlss_dist nlme MASS survival]; }; - gamlss_add = derive { name="gamlss.add"; version="4.3-0"; sha256="0kafvrh5b60pd7vs7swd6xq9c2py6ixjrdnhq2y4w112fp86jnbp"; depends=[gamlss mgcv nnet rpart]; }; - gamlss_cens = derive { name="gamlss.cens"; version="4.2.7"; sha256="1dy8myravipsa3cmkdwy3m46s419fhck0f0yz1kf6qlvxxr7a4m4"; depends=[gamlss gamlss_dist survival]; }; - gamlss_data = derive { name="gamlss.data"; version="4.2-7"; sha256="0g3fmqrwxmj14r0p0ai1adq6cs3bd3ys47gjcja035xjiajg6cs2"; depends=[]; }; - gamlss_demo = derive { name="gamlss.demo"; version="4.2-7"; sha256="1mlfkm290dk8fvfahmrr7adhw0bj4923zjs2xn0fvbj739rgv6b7"; depends=[rpanel gamlss gamlss_tr gamlss_util]; }; - gamlss_dist = derive { name="gamlss.dist"; version="4.3-0"; sha256="1cnv7f7qwaw4fhaciw3s7xgyqa9h6v12frix6arb9nkciknb8hv5"; depends=[MASS]; }; - gamlss_mx = derive { name="gamlss.mx"; version="4.2-7"; sha256="0k1isn2mavmwm15jk4gp9r3ks6z9pwd7k3xdsc29b9p8v8iapj4q"; depends=[gamlss nnet MASS]; }; - gamlss_nl = derive { name="gamlss.nl"; version="4.1-0"; sha256="083l5lsb0csxcp4vffvdv2nr7jk3s2gkcavx66m8inzw16j7xilz"; depends=[gamlss survival]; }; - gamlss_spatial = derive { name="gamlss.spatial"; version="0.1"; sha256="0lsq3lfv9gxjvnbnib551sfvcn6g9amwg51q5ipwwzh12hdl0m98"; depends=[gamlss spam mgcv]; }; - gamlss_tr = derive { name="gamlss.tr"; version="4.2-7"; sha256="0f0vmspknkg8039dnrxkjqwjqbl34vjb5sgkcdvy5g8x8dlb5h3w"; depends=[gamlss]; }; - gamlss_util = derive { name="gamlss.util"; version="4.2-7"; sha256="1c8xc0qf387cd9d6k9fzlwvj9735y7v6njsb5fls2fimpnd5vsik"; depends=[gamlss colorspace Matrix MASS rgenoud zoo gamlss_add spam]; }; - gamm4 = derive { name="gamm4"; version="0.2-3"; sha256="19vy5wik9nh77cm25gp3j3j8w8vinwzx5pv90nzdzvx84yvvf0y3"; depends=[Matrix lme4 mgcv]; }; - Gammareg = derive { name="Gammareg"; version="1.0"; sha256="1a5wibnbd8jg0v8577n1x9kc358qpd4jz7l8h7r541sdpprm6wb0"; depends=[]; }; - gammSlice = derive { name="gammSlice"; version="1.2-6"; sha256="19443rfpk9ivv42zy5vdfhs4pcrbcn4d984xnchfbznmddilavg8"; depends=[KernSmooth lattice mgcv]; }; - GANPA = derive { name="GANPA"; version="1.0"; sha256="0ia8djv46jm397nxjrm9yc5gacf1r4z0ckiliz57cbrqwh7z2wpa"; depends=[GANPAdata]; }; - GANPAdata = derive { name="GANPAdata"; version="1.0"; sha256="0mhdadl7zgsacn59ym42magg3214k1xhabwn78fv7kgccszcgc86"; depends=[]; }; - gaoptim = derive { name="gaoptim"; version="1.1"; sha256="04igpn73k6f6652y496igwypfxmz4igg4jgxx6swqyi37182rqhm"; depends=[]; }; - gap = derive { name="gap"; version="1.1-10"; sha256="02as90x8r93mynwpa1dirp0lplc7i27ya3q7fq6zbq2xn16j4vj5"; depends=[]; }; - gaussDiff = derive { name="gaussDiff"; version="1.1"; sha256="0fqjdxp2ibbami75ba16d02dz4rz5sk8mni45di9anydx44g9d45"; depends=[]; }; - gaussquad = derive { name="gaussquad"; version="1.0-2"; sha256="0bcvkssmwwngcd4cnv924n9h3c8z1w3x9c9bkwn5jbz9zyv1lfms"; depends=[polynom orthopolynom]; }; - gb = derive { name="gb"; version="1.1.8-8"; sha256="18n9wqz82mjxjgzk8vc68kyz3b6lk21d2f16551d6fikjla03adf"; depends=[boot]; }; - GB2 = derive { name="GB2"; version="1.2"; sha256="1b5mkgn8c26bmi9ndzsqqp22vxqssy4nya1yysrl5wssjgicpdzs"; depends=[cubature hypergeo laeken numDeriv]; }; - gbm = derive { name="gbm"; version="2.1"; sha256="1a150ksvdbdv8b5f4j62q7v68sbgjvvq0izm4d877izp6d8qd99g"; depends=[survival lattice]; }; - gbRd = derive { name="gbRd"; version="0.4-11"; sha256="06x97rw5i6v6cgjxkfhxnw4dn7lghn5q6ra7ri5ag1x9dkfzcl82"; depends=[]; }; - gbs = derive { name="gbs"; version="1.0"; sha256="19zcsvd258ibrj356zlwgryjqylcs56agg3z6d44xbnf8prg05ig"; depends=[nlme]; }; - GCAI_bias = derive { name="GCAI.bias"; version="1.0"; sha256="10092mwpmfbcga0n39a0i6g8xxch8xiwg15cckipw6yxjyx0sivc"; depends=[]; }; - gcbd = derive { name="gcbd"; version="0.2.5"; sha256="0fkg6vk0jkl6680n1hljyv783j4hd84mql0k4pfblvqafwv4nhm3"; depends=[RSQLite plyr reshape lattice]; }; - GCD = derive { name="GCD"; version="3.0.4"; sha256="1mrgscbrljfyzxprclyw9rcwlkcnifm15kkkapkv56c5ms2ic2i5"; depends=[sp raster ggplot2]; }; - gcdnet = derive { name="gcdnet"; version="1.0.4"; sha256="0fmy0li06rahch4ir0xa81yilvrd0zqyhmpl4hfxjahhl3npw370"; depends=[Matrix]; }; - gcExplorer = derive { name="gcExplorer"; version="0.9-4"; sha256="1ig5m278n8mp93z1c8z39mf1zwwlkl38csn6d6ykpnrfpa3kk65a"; depends=[flexclust flexclust modeltools]; }; - gclus = derive { name="gclus"; version="1.3.1"; sha256="02ba6zj9bjwrzykamjp40ajynx9xjx9h2i85n0ym0r5lcki4x6fn"; depends=[cluster]; }; - gcmr = derive { name="gcmr"; version="0.6.1"; sha256="0a47xpgi6bfsc0nn7vkid1q9r29h01q0vjkysaxh1i4zbmxnx5dl"; depends=[nlme sandwich geoR betareg Formula]; }; - gconcord = derive { name="gconcord"; version="0.41"; sha256="1n3pfwk6vip19q1zhbz1n164f9vi7mig8pcd07c4wxnm5ir9dagy"; depends=[]; }; - gcookbook = derive { name="gcookbook"; version="1.0"; sha256="0hb52zfi5bl2j0h8lazz4gzhhcvpicb4ld6xm2vkvi4cj47piyy8"; depends=[]; }; - gdalUtils = derive { name="gdalUtils"; version="0.3.1"; sha256="1a6sg3x5yfffa9xrkvc98i2hm3lvna4jw7p89gn2bf74kzphqpmy"; depends=[sp foreach R_utils]; }; - gdata = derive { name="gdata"; version="2.13.3"; sha256="05k5l4gz0381z89sp64xhngcsykazzznwmankwsnimx5alwrfk2m"; depends=[gtools]; }; - g_data = derive { name="g.data"; version="2.4"; sha256="14a4m0v38p3j1k1kymkxwydlgm8b73hlx9m80sg1l4aj38fvflzl"; depends=[]; }; - GDAtools = derive { name="GDAtools"; version="1.1"; sha256="0r1d98wavzwg3icr3czfzmcf1d86nwzq2s6avqkh4h0sank220wn"; depends=[FactoMineR]; }; - GDELTtools = derive { name="GDELTtools"; version="1.2"; sha256="1rx6kjh7kmyycqapvbizcxkcfp09qvqv7k8f25v333sxkacpz6p5"; depends=[plyr TimeWarp]; }; - gdimap = derive { name="gdimap"; version="0.1-6"; sha256="0bz7h8wxkwp8yb2qzfj1932m4b28rxlhr8939cqbzfma0zb2ywzx"; depends=[rgl oro_nifti movMF gridExtra colorspace geometry gsl abind]; }; - gdistance = derive { name="gdistance"; version="1.1-5"; sha256="12877mg0ih346h62xa087xwbrqrjvdh0fs8avrvyy4qpqls2s7qn"; depends=[raster igraph Matrix sp]; }; - gee = derive { name="gee"; version="4.13-18"; sha256="0zfxmjajbgr7999gbnqppq43zzk901kqra7b1d5fa2qn8js6h1ng"; depends=[]; }; - geeM = derive { name="geeM"; version="0.7.1"; sha256="0pzvy0ga17g5v5dd2q4q7fmcwj3nws0p1cg5s0dz3azmrj7n4s31"; depends=[Matrix]; }; - geepack = derive { name="geepack"; version="1.1-6"; sha256="0ixwrr2jjrqzh23zg9cibayinjxzgdpia9znsv7qwhc7hx23a2zm"; depends=[]; }; - geigen = derive { name="geigen"; version="1.3"; sha256="16zz3k4j75hn1dkzydsxnk0jblka22fbww7ak9lgg1znkfws6dhk"; depends=[]; }; - geiger = derive { name="geiger"; version="2.0.3"; sha256="1wqihvscmq44i34205fzv79wk7j2a72qd8y6ycgrv74plql0316c"; depends=[ape MASS mvtnorm subplex deSolve digest Rcpp coda]; }; - gems = derive { name="gems"; version="0.9.5"; sha256="15n3xfhifcxmhsmc2p4ijgfd9l1pmzqj0zmh0xxi8y10ax68f524"; depends=[MASS msm mstate plyr data_table]; }; - gemtc = derive { name="gemtc"; version="0.6"; sha256="03aw5r62577fizvbl7wpl7k3m8bxji21h8a41gl8yr4fpj0353yj"; depends=[coda igraph meta XML]; }; - gemtc_jar = derive { name="gemtc.jar"; version="0.14.3"; sha256="18hbiygpsv67flc4v6z6mir0rfq41v1vsh11dg9phmdr8bx4kcl1"; depends=[rJava]; }; - 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=[]; }; - genalg = derive { name="genalg"; version="0.1.1.1"; sha256="0f6j3zj9frnjhs4rrcn05z2bmp6c7d1blpwjqg7ckfwk46x61app"; depends=[]; }; - genasis = derive { name="genasis"; version="1.0"; sha256="1r0733cc2hss3f8dp19s1ji55yp72mds7p3x1zvvpiks2r7w712p"; depends=[Kendall fitdistrplus]; }; - GenBinomApps = derive { name="GenBinomApps"; version="1.0-2"; sha256="1ps1rq8cjlwh658mysdh3xbn5fihanzcwxb38xvg4031vnwv80in"; depends=[]; }; - gendata = derive { name="gendata"; version="1.0"; sha256="1hyyf9kpf8f0xxwwvirxlz6nw6wf2wqq5vvjnyikq5dwa7a3ngmw"; depends=[]; }; - GENEAread = derive { name="GENEAread"; version="1.1.1"; sha256="0c3d76yl8dqclk8zhhgrd6bv6b599vkpbyg3hjspb6npdw6zs6k8"; depends=[bitops]; }; - GeneCycle = derive { name="GeneCycle"; version="1.1.2"; sha256="1ghdzdddbv6cnxqd08amy4c4s5jsxa637r828ygffk6z76xjr6b6"; depends=[MASS longitudinal fdrtool]; }; - GeneF = derive { name="GeneF"; version="1.0"; sha256="0bizf47944b2zv9ayxb9rhrqx0ilz2xlvkw7x5vbg7l67y2g2l4d"; depends=[]; }; - GeneFeST = derive { name="GeneFeST"; version="1.0.1"; sha256="0qgzjzhwf3nigfi09maywg9zkjxiicwiwiyqfcdk9gsvmp6mr4qn"; depends=[BASIX]; }; - Geneland = derive { name="Geneland"; version="4.0.4"; sha256="14crcj71i4vc48a132k024jrkwlwbrqi6jd9w3d1qsy6dn7inc0k"; depends=[RandomFields fields]; }; - geneListPie = derive { name="geneListPie"; version="1.0"; sha256="0z2gawfzhm05dafj4zlj6ifmf0dy7p1hrpa59lzxrnrc0wr6laji"; depends=[]; }; - GeneNet = derive { name="GeneNet"; version="1.2.10"; sha256="0gk1ndibnxyqdbd0zyrf88qd7b4wf9441d4bq2hf6fgg95sxmk5s"; depends=[corpcor longitudinal fdrtool igraph]; }; - genepi = derive { name="genepi"; version="1.0.1"; sha256="1whhdlq9p8gmygv7464hvfz6dhm65gqq1dqls6hgpmw822zxgbd5"; depends=[]; }; - GeneralizedHyperbolic = derive { name="GeneralizedHyperbolic"; version="0.8-1"; sha256="1q7bagq6c4an5jprypab5121ymich55xgyxfxnj5izihssmcwssp"; depends=[DistributionUtils RUnit]; }; - GeneReg = derive { name="GeneReg"; version="1.1.2"; sha256="081qc66mb17dwk886x9l2z4imklxnfs02yqql0ri9c47bpsga7wp"; depends=[igraph]; }; - geneSignatureFinder = derive { name="geneSignatureFinder"; version="2014.02.17"; sha256="1s9jj87wnzzgm9hnws09yhrxdlb6jw56i3ddwznvmh8vpzrspv4h"; depends=[survival cluster class]; }; - genetics = derive { name="genetics"; version="1.3.8.1"; sha256="0gfbrpz0zp5bgw3s21wrhjfy70laif47wcrjrm6mjgs6xapiw790"; depends=[combinat gdata gtools MASS mvtnorm]; }; - GeneticTools = derive { name="GeneticTools"; version="0.3"; sha256="16jqi98nvdmfbmx6z10d2kxfc9mp4zhpg22rschiy6ysp4lczs3c"; depends=[gMWT Rcpp RcppArmadillo plotrix]; }; - GenKern = derive { name="GenKern"; version="1.2-60"; sha256="12qmd9ydizl7h178ndn25i4xscjnrssl5k7bifwv94m0wrgj4x6c"; depends=[KernSmooth]; }; - genlasso = derive { name="genlasso"; version="1.2"; sha256="0ahkml10nvx1sfikl0ai3yfs5gzps7ss9aymsg1wy494p95riwz5"; depends=[MASS Matrix igraph]; }; - genMOSS = derive { name="genMOSS"; version="1.1"; sha256="08d6j0iwfah1ianqdr884hh6bg04vfk4kml3clmf7vzx8wfmliy5"; depends=[]; }; - genMOSSplus = derive { name="genMOSSplus"; version="1.0"; sha256="1n3ngx1piy3l14k5k95wrgvrjw9238jkygfqanl3xg2na2mmkr26"; depends=[]; }; - genomicper = derive { name="genomicper"; version="1.3"; sha256="0fpvf286x0rf2mg9x82668kg5fx90arz5vf3731qinmdnnvrpziv"; depends=[]; }; - genoPlotR = derive { name="genoPlotR"; version="0.8.2"; sha256="0q12sg13yn5f3j5gk0qzszp81x52lpwpk3z4cg0bgxi9zbwmw467"; depends=[ade4]; }; - GenOrd = derive { name="GenOrd"; version="1.2.0"; sha256="1aypz879r2fc8zd7lnd1d2ic3zgx9gpz4gxmfqyhb5gfkg50xhlg"; depends=[mvtnorm Matrix MASS]; }; - genridge = derive { name="genridge"; version="0.6-3"; sha256="01rjvfjmdn0hxgydvrinl4md74n0ndvqcib4m59q6f67m3qnylfr"; depends=[car]; }; - GenSA = derive { name="GenSA"; version="1.1.4"; sha256="0ph3n0hv7p8i03by42hl0f2b1kmhpvyvd7rfgay2wl9lknfsq0vv"; depends=[]; }; - gensemble = derive { name="gensemble"; version="1.0"; sha256="0yyi7djzqx4yhxp6yy1rjgvzidjlna79ds89bgj6m6zj3aav6yw2"; depends=[]; }; - genSurv = derive { name="genSurv"; version="1.0.2"; sha256="0hvkrlcl8jrj0x0ixrl34484p9kxlwxfaa64ynz6jf3dcyghp9l0"; depends=[]; }; - geoCount = derive { name="geoCount"; version="1.131209"; sha256="0v9nsqhwf58czq4vh9f2yim2r7w9sfx9g9hp4jdbfy4q7jc5m02a"; depends=[Rcpp RcppArmadillo]; }; - GeoDE = derive { name="GeoDE"; version="1.0"; sha256="0wawkzj0344pprm8g884d7by8v74iw96b109rgm7anal48fl30im"; depends=[Matrix MASS]; }; - GeoGenetix = derive { name="GeoGenetix"; version="0.0.2"; sha256="0rrc8rdf6whpd830s2g9ybz82jcd0il9kkfrjh3xza3b86fasdvg"; depends=[RandomFields]; }; - GeoLight = derive { name="GeoLight"; version="1.03"; sha256="0l2p4rcmk33dj31xy06652mn05d2dhnny3xpzcf12kxyflpipdgr"; depends=[maps changepoint]; }; - GEOmap = derive { name="GEOmap"; version="2.2-2"; sha256="1kp9sdp51zcz98bk03pknya9g5fhz2i677wgacabq402yjhfgn80"; depends=[RPMG splancs MBA]; }; - geomapdata = derive { name="geomapdata"; version="1.0-4"; sha256="1g89msnav87kim32xxbayqcx1v4439x4fsmc8xhlvq4jwlhd5xxw"; depends=[]; }; - geometry = derive { name="geometry"; version="0.3-4"; sha256="1rplvy7528v270c4pdxxb34h7mfdd6141dnb9aw59xc0sd9cx0lv"; depends=[magic]; }; - geomorph = derive { name="geomorph"; version="2.1.1"; sha256="12w5d7m6kg1pl42g21zfgk9by77wak82z8k0xh4zlbwiy8zv30z6"; depends=[rgl jpeg vegan ape geiger phytools]; }; - geonames = derive { name="geonames"; version="0.996"; sha256="14fgwhg8c7aagrp1c1yc80hjr06z8ldr85v27gn1nnikvz71idgy"; depends=[rjson]; }; - geophys = derive { name="geophys"; version="1.3-6"; sha256="1yfhilgc2nv5jfp0n7iah0wl041an2850c2qnzrvx0vv9fywgw9g"; depends=[RPMG RSEIS RFOC GEOmap cluster]; }; - geoR = derive { name="geoR"; version="1.7-4"; sha256="00868h4rvw923n2b7v191rcr10vyyljxzg3dl7hgc7al1c98gjwq"; depends=[sp MASS splancs RandomFields]; }; - geoRglm = derive { name="geoRglm"; version="0.9-4"; sha256="1wzq8p4xi40j4cagg7ji8qz9kynrwlyrlcvv0358pbl19nvg7hxb"; depends=[geoR]; }; - georob = derive { name="georob"; version="0.1-4"; sha256="0a68r63adya3syf8fc1ha90x8587r2hp5w44na4gvnr9rs883f1i"; depends=[sp constrainedKriging lmtest nlme nleqslv quantreg RandomFields robustbase]; }; - geoscale = derive { name="geoscale"; version="1.1"; sha256="1xmn8y33jz1f16sjbzrld20gy7w54awrr79lhs9s4r8k1gmn0zqg"; depends=[]; }; - geospacom = derive { name="geospacom"; version="0.5-7"; sha256="00yi2wwnjh2z8xhzfbp1jhh5fhq2z885s0gv937xsin4a63m76fd"; depends=[rgeos classInt sp maptools geosphere]; }; - geosphere = derive { name="geosphere"; version="1.3-8"; sha256="1ldg3lrz9plhr5b1dgnc2nj5srpv23xxma83kcd7aicll4x1jmbw"; depends=[sp]; }; - geospt = derive { name="geospt"; version="0.5-0"; sha256="0bpflmj1kx2fph5b9dfy57bxdqjhpwnn8050k8afky5fmiwzm708"; depends=[geoR gstat genalg limSolve MASS plyr TeachingDemos gsl]; }; - geostatsp = derive { name="geostatsp"; version="0.9.999"; sha256="0qrcfgyv4g6vmz3623mlh2ad31hw6k82xjlsmcgab3d4mzk0q7qx"; depends=[Matrix raster sp]; }; - geotools = derive { name="geotools"; version="0.1"; sha256="0d0vf9dvrrv68ivssp58qzaj8vra26ms33my097jmzmgagwy1spd"; depends=[]; }; - geotopbricks = derive { name="geotopbricks"; version="1.3.5.4"; sha256="065h5dd7qxjydblgkgj2amz8krscgf7ds61b923w3b4biin4s4q4"; depends=[raster stringr zoo]; }; - GeoXp = derive { name="GeoXp"; version="1.6.2"; sha256="18wdmdwb79ipdjdii068dz9f55b5ldxn95g5q6jcxsqwp0wldvw8"; depends=[quantreg rgl spdep KernSmooth rgeos robustbase splancs]; }; - geozoo = derive { name="geozoo"; version="0.4.3"; sha256="0nmmmyk0ih5aqpsn7ip4dhgfm7jhcnca8pigyr9794b110icq1rv"; depends=[bitops]; }; - GESTr = derive { name="GESTr"; version="0.1"; sha256="1q12l2vcq6bcyybnknrmfbm6rpzcmxgq2vyj33xwhkmm9g2ii9k6"; depends=[mclust gtools]; }; - getopt = derive { name="getopt"; version="1.20.0"; sha256="00f57vgnzmg7cz80rjmjz1556xqcmx8nhrlbbhaq4w7gl2ibl87r"; depends=[]; }; - GetoptLong = derive { name="GetoptLong"; version="0.0.5"; sha256="1aygm6h4mqac6h4scss3c2p3snyl2lmd8lnw034rakz2azj8j0by"; depends=[rjson]; }; - GetR = derive { name="GetR"; version="0.1"; sha256="1b2wirhz4nhvmf863czwb8z8b42ilsyjjrg9rc4nd9b7nz50bmjg"; depends=[party]; }; - gettingtothebottom = derive { name="gettingtothebottom"; version="3.0"; sha256="0n3d8xx4pwh4bps6jkfj4g8mpknj0lsfk03bayhvil744r5jnrn7"; depends=[ggplot2 Matrix lpSolve reshape2]; }; - GEVcdn = derive { name="GEVcdn"; version="1.1.3"; sha256="13p6hkdybs8s2i363z2a65yijqarwj9swvy22ljk61shf2nzbk80"; depends=[VGAM]; }; - GEVStableGarch = derive { name="GEVStableGarch"; version="1.0"; sha256="007s7lbfpp1bqnyg08rwarsmkxlx16p4is1k3736fmnri9sfp7z6"; depends=[fGarch fExtremes stabledist skewt Rsolnp]; }; - GExMap = derive { name="GExMap"; version="1.1.3"; sha256="1a6i2z9ndgia4v96nkr77cjqnbgxigqbqlibg82gwa0a6pl7r7nz"; depends=[]; }; - gfcanalysis = derive { name="gfcanalysis"; version="1.1"; sha256="1z29y6gx0b9b9h6939vb9pqplcjhi0xb5l3bgjybjad01p2dnqas"; depends=[raster rgdal geosphere RCurl rgeos plyr ggplot2 sp stringr animation rasterVis]; }; - GGally = derive { name="GGally"; version="0.4.7"; sha256="1wbpl47ha6q6si4xyfx0i019wagn2ka1zyfhblvjcj9hhcvzz6m9"; depends=[ggplot2 gtable plyr reshape stringr]; }; - ggdendro = derive { name="ggdendro"; version="0.1-14"; sha256="0x6bl0v2lkiybc5pdrcak5cslhaw7cxhh6imsrvdhcrzdr4cc45s"; depends=[MASS ggplot2]; }; - GGEBiplotGUI = derive { name="GGEBiplotGUI"; version="1.0-8"; sha256="0bkagsm9mkcghc2q46cc86kjajzgjbq9588v0v2bp71qw8m97mbh"; depends=[rgl tkrplot]; }; - ggHorizon = derive { name="ggHorizon"; version="0.1"; sha256="0k617qnfqdl9w2hdwppkrgl51krnwpdf0gahzvivcwzynbmywc37"; depends=[ggplot2 plyr RColorBrewer proto]; }; - GGIR = derive { name="GGIR"; version="1.0-4"; sha256="09fqw4al4bn87h9543ais634crk9mzvfzdgp25gwy7lhpwzdl2y0"; depends=[GENEAread matlab]; }; - gglasso = derive { name="gglasso"; version="1.2"; sha256="0bn56axyr741qdj5pxzbwaqjb7mp727ph67ng5d6ibsz1z2bh7pk"; depends=[]; }; - ggm = derive { name="ggm"; version="2.1"; sha256="1m2p5cn7lfy4757rspp3d3jnphjp5vh3lvrim1lxlda577kpdmnf"; depends=[igraph]; }; - ggmap = derive { name="ggmap"; version="2.3"; sha256="0sl3jkifba3q0khl5sg2nf08kgn1pirw5a1xag07za51sqda5b5q"; depends=[ggplot2 proto scales RgoogleMaps png plyr reshape2 rjson mapproj]; }; - ggmcmc = derive { name="ggmcmc"; version="0.5.1"; sha256="17pmb2kfrjc2s538my8finr029vy1npzk44626xvznf6bf6bv895"; depends=[plyr reshape2 ggplot2]; }; - GGMselect = derive { name="GGMselect"; version="0.1-8"; sha256="1chmyzbn85c5z5b8lvgqpr7knwg25dm7qbb4nhivcdr6ipd1dqr0"; depends=[mvtnorm lars gtools]; }; - 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]; }; - ggROC = derive { name="ggROC"; version="1.0"; sha256="0p9gdy7ia59d5m84z9flz5b03ri7nbigb3fav2v2wrml300d24vn"; depends=[ggplot2]; }; - ggsubplot = derive { name="ggsubplot"; version="0.3.2"; sha256="1rrq47rf95hnwz8c33sbnpvc37sb6v2w37863hyjl6gc0bhyrvzb"; depends=[ggplot2 plyr proto scales stringr]; }; - 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="1.7.0"; sha256="1wfqh3mq4hyyfgvw99bq1s8qxvl3qasa8qcikfhbp2ky898w5npb"; depends=[ggplot2 colorspace proto scales]; }; - ggvis = derive { name="ggvis"; version="0.3.0.1"; sha256="0fx39j7vg9r4a7ni9nnq7x7s93lfzbbsg4zsbb6x429hyawvcj8x"; depends=[assertthat RJSONIO shiny magrittr dplyr htmltools]; }; - GhcnDaily = derive { name="GhcnDaily"; version="1.5"; sha256="1gln1giid5n5b9mxidh90l8ahvcgx968zak2lxr2f9c32pnrpmnp"; depends=[R_utils R_oo R_methodsS3 abind ncdf]; }; - GHQp = derive { name="GHQp"; version="1.0"; sha256="0qpcpwv7rz67qhz1p5k2im02jvs7l8z9sa6ypz13hig5fzm8j9bp"; depends=[statmod]; }; - ghyp = derive { name="ghyp"; version="1.5.6"; sha256="0y3915jxb2rf01f7r6111p88ijhmzyz4qsmy7vfijlilkz0ynn20"; depends=[numDeriv gplots]; }; - GibbsACOV = derive { name="GibbsACOV"; version="1.1"; sha256="1ikcdsf72sn1zgk527zmxw3zjhx0yvkal6dv001cgkv202842kll"; depends=[MASS]; }; - gibbs_met = derive { name="gibbs.met"; version="1.1-3"; sha256="1yb5n8rkphsnxqn8rv8i54pgycv9p7x1xhinx4l5wzrds3xhf2dc"; depends=[]; }; - GIGrvg = derive { name="GIGrvg"; version="0.3"; sha256="014srgh79g8y9fcj979v3md9qqx9i6b6fx6lw0r0qdrg4v6bvr76"; depends=[]; }; - GillespieSSA = derive { name="GillespieSSA"; version="0.5-4"; sha256="0bs16g8vm9yrv74g94lj8fdfmf1rjj0f04lcnaya7gyak3jhk36q"; depends=[]; }; - gIPFrm = derive { name="gIPFrm"; version="2.0"; sha256="1syjsnna7b7y27yf7zsxjwq8z5f4wxf2hfadhgjaw898gvfcnrbc"; depends=[]; }; - giRaph = derive { name="giRaph"; version="0.1.2"; sha256="137c39fz4vz37lpws3nqhrsf4qsyf2l0mr1ml3rq49zz4146i0rz"; depends=[]; }; - GISTools = derive { name="GISTools"; version="0.7-2"; sha256="1n1zzi25xx320gwmsn5rj8c3m1wqwmjbzf32krdzmaqiwvhf7c1b"; depends=[maptools RColorBrewer MASS rgeos]; }; - gitter = derive { name="gitter"; version="1.0.4"; sha256="1pvl8k8mb15mcfz1074y246s9basmi5vbpw2n1ca0d8wm5wdidap"; depends=[jpeg tiff logging PET ggplot2]; }; - Giza = derive { name="Giza"; version="1.0"; sha256="13nkm8mk1v7s85kmp6psvnr1v97vi0gid8rsqyq3x6046pyl5z6v"; depends=[reshape lattice lattice]; }; - glarma = derive { name="glarma"; version="1.2-0"; sha256="1zci132hz11y8j2jvakzqsxddihqr88y09bd7fx5xzipm7iaa7yq"; depends=[MASS]; }; - glasso = derive { name="glasso"; version="1.8"; sha256="0gcapw7kyxb19wvdyxq1vsmc5j7yyd0rvqxs2i71k31q352sg6zw"; depends=[]; }; - glassomix = derive { name="glassomix"; version="1.2"; sha256="13a2ly0by58z8djq8nbakpyacgb6nkdsqxjq44yw4v2fy3s22z3n"; depends=[mvtnorm glasso huge]; }; - glcm = derive { name="glcm"; version="0.3.2"; sha256="1kipm2z1q47ban6yah6hxkaa9fvkw990hn9c02bywf80wg16770n"; depends=[Rcpp]; }; - gld = derive { name="gld"; version="2.2.1"; sha256="1x9xlqj87xmk90hn20k1yvnvyndxdbi67yrxrfdhr3lhxabq5msw"; depends=[]; }; - GLDEX = derive { name="GLDEX"; version="2.0.0.0"; sha256="0pskh9wa32im6wrjkqkxczfsds71mx2435yhn7vrna4vzyc2xdvb"; depends=[cluster]; }; - gldist = derive { name="gldist"; version="2160.2"; sha256="1dcf3pb4xqvhqj4m3xc3ihzjbzxjspjrnc8819hmlnmdd0csghmx"; depends=[]; }; - glinternet = derive { name="glinternet"; version="0.9.0"; sha256="0qihlzdb9ifqlyx5l34vkwi6z59xd7wbl72a3pj725n9kkk7bmig"; depends=[]; }; - gllm = derive { name="gllm"; version="0.35"; sha256="1m9asamh2yha9q8mrllvvc9qj2im6cspvfpafzc8krmh17zq4ins"; depends=[]; }; - glm2 = derive { name="glm2"; version="1.1.2"; sha256="1x9pq2ddsz9al8w044qch34s3fahca63dz85lvm5qn16945ccw1s"; depends=[]; }; - glmc = derive { name="glmc"; version="0.2-4"; sha256="03m1ym9w0b0gqib13pnh1yrjijlcwsn5lijg0nsr4hd6gxw29cla"; depends=[emplik]; }; - glmdm = derive { name="glmdm"; version="2.60"; sha256="09vljki24fccqkvxkmg2i6a8pxqhfwm155b41m2q51lqaq29bfw7"; depends=[]; }; - glmlep = derive { name="glmlep"; version="0.1"; sha256="0jnm3cf2r9fyncxzpk87g4pnxbryqcxxrc5y2a80pv48al3sxlzk"; depends=[]; }; - glmmBUGS = derive { name="glmmBUGS"; version="2.3"; sha256="1j96c1c2lqplhjvyigpj494yxj85bpmc7cnd1hl1rc8b552jr192"; depends=[MASS abind]; }; - glmmGS = derive { name="glmmGS"; version="0.5-1"; sha256="1aqyxw3nrjri8k8wlwvddy25dj7mjqndssd5p5arax8vaqgrdnjz"; depends=[]; }; - glmmLasso = derive { name="glmmLasso"; version="1.3.1"; sha256="07i5bnaj3is8ag8gqzpma4kzfk33f11k9r30cdwzx8sp2xfh16gr"; depends=[minqa]; }; - glmmML = derive { name="glmmML"; version="1.0"; sha256="0b1q5mj325xga3lfks28r03363bjfa31rlgjzwk4s0a6g21bdl4a"; depends=[]; }; - glmnet = derive { name="glmnet"; version="1.9-8"; sha256="1ndaq6qbn8vxs7ha4x9k0qcblr1byixvrhh572794xzgdn548prm"; depends=[Matrix]; }; - glmnetcr = derive { name="glmnetcr"; version="1.0.2"; sha256="1pyg23hdqksiaqdcrsaqz9vb7mgclm41hh0vb7ndkdv284bzzlbz"; depends=[glmnet]; }; - glmpath = derive { name="glmpath"; version="0.97"; sha256="054v188ffjl6x11cld5s9py22kxcs0iq58x4yhxb0ny7mbma5hkn"; depends=[survival]; }; - glmpathcr = derive { name="glmpathcr"; version="1.0.3"; sha256="0qa63c7kwpxf6smczgzf4fmvczw1ynqq5vgcw3bxdbs37q4ypj8n"; depends=[glmpath mvtnorm]; }; - glmperm = derive { name="glmperm"; version="1.0-5"; sha256="1m6nxk9k5qjmq4kvv1nv7n51hagwxi97pd5a3wgiky3wml4aa2nw"; depends=[survival]; }; - glmulti = derive { name="glmulti"; version="1.0.7"; sha256="154s72sjp6pz7ki7s4mgn5v62j7h0lfz9mngf40wvmy31da2s8ix"; depends=[rJava]; }; - glmx = derive { name="glmx"; version="0.1-0"; sha256="0i0p1xk5yk1l274gfr4ijmqnnbq7yyzmi577pb7igwvi3hjn7g7k"; depends=[MASS Formula lmtest sandwich]; }; - globalboosttest = derive { name="globalboosttest"; version="1.1-0"; sha256="1k7kgnday27sn6s1agzlj94asww81655d2zprx6qg7liv677bxvf"; depends=[mboost survival]; }; - GlobalDeviance = derive { name="GlobalDeviance"; version="0.4"; sha256="0s318arq2kmn8fh0rd5hd1h9wmadr9q8yw8ramsjzvdc41bxqq1a"; depends=[snowfall]; }; - globalGSA = derive { name="globalGSA"; version="1.0"; sha256="1f3xv03m6g2p725ff0xjhvn2xcfm7r7flyrba080i4ldy6fd8jg8"; depends=[]; }; - globalOptTests = derive { name="globalOptTests"; version="1.0"; sha256="0vmly1mh8k5aihlwxfp30gj0qdrwfx2b9bcbs8ccrpfhgcvacnr9"; depends=[]; }; - glogis = derive { name="glogis"; version="0.1-1"; sha256="02wdncycmnsvj09d1032cns3xbrh92ki5zn9sa3gscw1xzz0yzh6"; depends=[zoo sandwich]; }; - glpkAPI = derive { name="glpkAPI"; version="1.2.10"; sha256="0xlgccb77xgscfg46pxxcz5k9gm8a913xgp48dfmxw31n7ynckml"; depends=[]; }; - GLSME = derive { name="GLSME"; version="1.0.1"; sha256="0v1d8jpjg0gpsvscx6gna4hi9pxr762bjf77hnla30hwfc0a95a2"; depends=[mvtnorm corpcor]; }; - gmailr = derive { name="gmailr"; version="0.0.1"; sha256="0i87bgjzfd69s2cihvpilvl8nvw993cfsya3bz14fyvplvzf41lx"; depends=[httr base64enc jsonlite]; }; - gmatrix = derive { name="gmatrix"; version="0.1"; sha256="06fbqixjbpxm4k6l132krbmk2jvh4r2s64nlbi9gb3whq55pf4ih"; depends=[]; }; - GMCM = derive { name="GMCM"; version="1.0.1"; sha256="0vy4givxvppjc2r6s4q8yz86xzaw059fl1vjv0ni0hlbxz4dbb96"; depends=[mvtnorm Rcpp]; }; - gMCP = derive { name="gMCP"; version="0.8-6"; sha256="1pr40k4qj4yy9hcp2zx8x4dys9vav7gk4164999wg4psp7f06va0"; depends=[rJava JavaGD MASS PolynomF multcomp mvtnorm Matrix CommonJavaJars]; }; - GMD = derive { name="GMD"; version="0.3.1.1"; sha256="1vpapfnkn5gfqy033qirblx7xkbh52nw95sxw10v4aajddy0dyx9"; depends=[gplots]; }; - Gmisc = derive { name="Gmisc"; version="0.6.7"; sha256="15bgkgxqmgg81ry3ssx1darspmyhpzfcnkhkprqf495c07sh94jb"; depends=[Hmisc stringr lattice sp]; }; - gmm = derive { name="gmm"; version="1.5-0"; sha256="071i2bk73z606yb6a3vrv4cfyvgfwkrirm09i7bg2l3y2is1dfgj"; depends=[sandwich]; }; - GMMBoost = derive { name="GMMBoost"; version="1.1.2"; sha256="01q165vkdiv4qh96lha0g2g94jpnzdclbby6q43ghh9j1yrd4qzj"; depends=[minqa magic]; }; - gmodels = derive { name="gmodels"; version="2.15.4.1"; sha256="1yizjw181bg0ml6j96calflz3k3wpvpxh61hfd3pdba013ixjib5"; depends=[MASS gdata]; }; - gmp = derive { name="gmp"; version="0.5-12"; sha256="10fpvcli526a8j6jaryn0mwk78c24xy7whdpcvqzzvb41l6nnkma"; depends=[]; }; - gmt = derive { name="gmt"; version="1.2-0"; sha256="09az2iwwhyrls4mr619vwzhzmaks6klm67lnir48bh40hynsvibp"; depends=[]; }; - gMWT = derive { name="gMWT"; version="0.9"; sha256="0c91bwwfm0qyqrrd3n9g6l8kackqm58hmamypn1awzpz1p13axyv"; depends=[clinfun Rcpp RcppArmadillo]; }; - GNE = derive { name="GNE"; version="0.99-0"; sha256="1iwlh1mx8z24hgry78i5sqfrbqqp4946x1jxh6h7z1vxs7qfpq0v"; depends=[alabama nleqslv BB SQUAREM]; }; - gnm = derive { name="gnm"; version="1.0-7"; sha256="1jnh39i4462ky9vwnrlwq30d8qbp0jg73p8mwm6hnl8sdh53nkr1"; depends=[MASS Matrix nnet qvcalc relimp]; }; - gnmf = derive { name="gnmf"; version="0.7"; sha256="00y1dx1c66gv769yiwnb91xbr77wpidf36x0n0dzaqfn7s9yh6xq"; depends=[]; }; - gnumeric = derive { name="gnumeric"; version="0.7-2"; sha256="14c7a8aiqvqfbrjb1akpfjwidrzdhrw8a07ask083krki6vbi7hh"; depends=[XML]; }; - goalprog = derive { name="goalprog"; version="1.0-2"; sha256="1h3nd3d53hbz5hl3494lpfjnp1ddklc17nhgw18362jd1nk14awy"; depends=[lpSolve]; }; - gof = derive { name="gof"; version="0.9.1"; sha256="1s12gga9d6yizn2y7lzql4jd80lp5jpyml8ybn7xqswp8am82vpg"; depends=[]; }; - GoFKernel = derive { name="GoFKernel"; version="2.0-3"; sha256="1ddnm7r48ya9rgna9jvf9mpk3bkn6954rr4rwsimybcp758b4ilv"; depends=[KernSmooth]; }; - goft = derive { name="goft"; version="1.0"; sha256="061x6mnzidmnza9q7z2ikik9zrn434yjx1690bxbh41ckvb92hnx"; depends=[gPdtest mvShapiroTest]; }; - goftest = derive { name="goftest"; version="1.0-2"; sha256="11xw0cfj71z5smywsds9ijbhf3glxkqnhxmwwdqkv4gjrrr2y1bv"; depends=[]; }; - GOGANPA = derive { name="GOGANPA"; version="1.0"; sha256="1xbir21zvr5hv2y6nndzpsrpmnr7glrc7y6xgcyb856wx46ajan9"; depends=[GANPA WGCNA]; }; - gogarch = derive { name="gogarch"; version="0.7-2"; sha256="03gpl73zc6kx4gni59xbg7b38dkpd7p4c7kvlqm46f58j257viik"; depends=[fGarch fastICA]; }; - googlePublicData = derive { name="googlePublicData"; version="0.12.05"; sha256="01wilag2h55zdxxim2h06k0l93csi2nl7iqjnmk4yf9ayz226bc8"; depends=[XML XLConnect]; }; - googleVis = derive { name="googleVis"; version="0.5.4"; sha256="0182bspqyg91ckczlq3p48basak12vcsj6nzgv7yljzzan0yx2sr"; depends=[RJSONIO]; }; - gooJSON = derive { name="gooJSON"; version="1.0.01"; sha256="02sldh5lsrjprc9mbf99jyid7ij62db5f1h60z719gxl4pk6fjms"; depends=[rjson]; }; - goric = derive { name="goric"; version="0.0-7"; sha256="199scq0ii2l2jgxm634n9vs4w4zxq5scyc4ssab8m6yg4z8v45xp"; depends=[mvtnorm quadprog Matrix nlme MASS]; }; - GOsummaries = derive { name="GOsummaries"; version="1.1"; sha256="1lkaid88lrm2xyz62xx32xnpch9qlhb3lif9jmk2zaym1d53558a"; depends=[ggplot2 Rcpp plyr gProfileR reshape2 gtable]; }; - govStatJPN = derive { name="govStatJPN"; version="0.1"; sha256="03sywa7rl5rblvv370mfszz5ngp850qf32yydy1fdx10lv5amrfl"; depends=[]; }; - gpairs = derive { name="gpairs"; version="1.2"; sha256="09mkdbs9hklxnmqcsnf65s3dfsfcr7kppp6zxj08v5hxym1gpz3l"; depends=[barcode lattice vcd MASS colorspace]; }; - GPArotation = derive { name="GPArotation"; version="2012.3-1"; sha256="1kvd6djsr6vdjd228i03d914n77sd5sym7dl5lbaq76bgmqfhr77"; depends=[]; }; - gPCA = derive { name="gPCA"; version="1.0"; sha256="1ylb1d24dxnzpws9bbanwhyizjr3ljky2bhrph4c5yaq0zwwbrkw"; depends=[]; }; - gpclib = derive { name="gpclib"; version="1.5-5"; sha256="08j81b8wymsgin20n54gvm6m54rmdic51p6qzs9cz4pmgl7dkkjv"; depends=[]; }; - GPCSIV = derive { name="GPCSIV"; version="0.1.0"; sha256="118l792mwd54xsi3g8afg3vc6wds8j6fyaz3mwmq04mlcyblym4l"; depends=[scatterplot3d sqldf]; }; - gPdtest = derive { name="gPdtest"; version="0.4"; sha256="00dlhnklfg2yp4hp7yjgr2nfswv22c007xq1mxdbkll62zgd94mq"; depends=[]; }; - GPFDA = derive { name="GPFDA"; version="2.1"; sha256="05al7s49zcxhww8zirh2p2bk7yl262sl3sb2zzyisn8fnwn46iyk"; depends=[fda_usc spam MASS]; }; - GPfit = derive { name="GPfit"; version="0.2-0"; sha256="16r3lqgkqb90w2hcf4ha3jczmrycagw3vmqknq32ly2a025n9gv9"; depends=[lhs lattice]; }; - gpk = derive { name="gpk"; version="1.0"; sha256="1zfhkqyypb24mhbj2zi9qy3gw0kqxvlp8j5ni3zm7k5rz1bnrygg"; depends=[]; }; - gplm = derive { name="gplm"; version="0.7-2"; sha256="0pr39fbkv61iwd110lq76p2fi4dvx9qz6mjsvg6bpja9pfbb6wc0"; depends=[AER]; }; - gplots = derive { name="gplots"; version="2.14.1"; sha256="1xmn29jsmkzbz5lazaxqq79kb58n2rlicns4ifsg45x8ypj1mqjn"; depends=[gtools gdata caTools KernSmooth]; }; - GPLTR = derive { name="GPLTR"; version="0.95"; sha256="0fm260pwg66j91hddyql95lvvcpzvvbi3hddwzrk1bhyrgd8kj55"; depends=[rpart]; }; - gpmap = derive { name="gpmap"; version="0.1.1"; sha256="00jhslbxbp6dgq7bw346hfpw0gans048vsn7chyzjhyr7ah5xrfg"; depends=[isotone plyr ggplot2 foreach]; }; - gpr = derive { name="gpr"; version="1.1"; sha256="03ywik11kc6cnaqrzzzi94jkrdbd378m3sf26f2vpb7d834nl728"; depends=[]; }; - gProfileR = derive { name="gProfileR"; version="0.5"; sha256="0jadfj2hcn3zx4ph61685p5iz16330jccp5ipi8183dkcybvimw4"; depends=[RCurl plyr]; }; - GPseq = derive { name="GPseq"; version="0.5"; sha256="0k5xif44qk2ppvcyja16xshmfciq1h84l1w6d8dfkyryfajbc8ai"; depends=[]; }; - gptk = derive { name="gptk"; version="1.08"; sha256="0fk6c8f8fni4y2n2cbfwywlfyz74xlb8lx25wajsxr2v4x74pa7l"; depends=[Matrix fields]; }; - gputools = derive { name="gputools"; version="0.28"; sha256="0ria03ggcfqgn93gjv2anhvkd3k73c6vfwgka16kf66g1nfzxs4l"; depends=[]; }; - GPvam = derive { name="GPvam"; version="3.0-2"; sha256="160j0zwbcmvzvia1b5p5midf395xfv1frk2w6w3v2zpbn8h6pdz5"; depends=[Rcpp RcppArmadillo Matrix numDeriv]; }; - grade = derive { name="grade"; version="0.2-1"; sha256="085hfvqn880yk19axdjv3z9jr33kls212vs172a8mzhnkallph1r"; depends=[]; }; - GRaF = derive { name="GRaF"; version="0.1-12"; sha256="1d7mr2z49v6ch4jbzh0dj2yjy2c5p51ws38xfz233sjz475snajr"; depends=[dismo]; }; - gRain = derive { name="gRain"; version="1.2-3"; sha256="0cxlni9b4p4g02zhhsbbpkwhx9y3x83vm7qd6lsca02yi96palsi"; depends=[gRbase igraph]; }; - gramEvol = derive { name="gramEvol"; version="1.1-1"; sha256="026sy3p1b6hy5xkg70zw6bb56i7qpadqs2ndym9ddznh09mk1fsj"; depends=[]; }; - GrammR = derive { name="GrammR"; version="1.0.0"; sha256="1j1k891cn9fyyp1nfyj6hjcz87qflipfwd9f9zg5s8y4jf0i9a7g"; depends=[gWidgets RGtk2 gWidgetsRGtk2 MASS cluster rgl GUniFrac ape]; }; - granova = derive { name="granova"; version="2.0"; sha256="02jk6p0y29z09l2d35flyrx1g0b4vjpwv99v46pi4kdkiv50508x"; depends=[car]; }; - granovaGG = derive { name="granovaGG"; version="1.2"; sha256="0gy8ba1zlm62f458sxrph3cyz4c6nqkaddm6nwj54nyicxqah32h"; depends=[ggplot2 RColorBrewer plyr gridExtra reshape2]; }; - gRapfa = derive { name="gRapfa"; version="1.0"; sha256="07yzwzna9pdyzndxk6wwyl6v3gkfc7dvy1ixmdl3d38mcl1ahwyq"; depends=[igraph]; }; - gRapHD = derive { name="gRapHD"; version="0.2.4"; sha256="0fxd04s6zh23chks4k6nwb5w408xjy89b44pa42kv6qnqj86ylvm"; depends=[]; }; - GrapheR = derive { name="GrapheR"; version="1.9-84"; sha256="1wwks2a4vzhj1rcspizp1vadl6kvrqr8s4zd6pghj02nd266znk9"; depends=[]; }; - graphicsQC = derive { name="graphicsQC"; version="1.0-5"; sha256="1h0qrf47r16np1ysymvlvvb95a8w86brh440kk20ajhbr5njp6kz"; depends=[XML]; }; - GraphPCA = derive { name="GraphPCA"; version="1.0"; sha256="17ipcp7nh47lfs9jy1aybpz4r172zj5yyrdrgmd6wa7hax8yv8gg"; depends=[ggplot2 FactoMineR scatterplot3d scales]; }; - GrassmannOptim = derive { name="GrassmannOptim"; version="2.0"; sha256="05r5zg4kf3xd6pp56bl8ldchdxvspxkdfd33b623hndjhn4lj2lq"; depends=[Matrix]; }; - gRbase = derive { name="gRbase"; version="1.7-0.1"; sha256="1x52i4c5jbry17y1pfnjq03kz4xxnk3anidva41z5alp7c73zlqv"; depends=[Matrix igraph Rcpp]; }; - gRc = derive { name="gRc"; version="0.4-1"; sha256="1a6q24yj7js1sk0lfqbm7kdv605cby6i711w4dlygsxdvwxbrsdr"; depends=[gRbase]; }; - greport = derive { name="greport"; version="0.5-1"; sha256="0l88w78djgyzd8ma3b61xkjsr76xlxzc3ibhzh6xz389knn3vfl5"; depends=[Hmisc data_table rms lattice latticeExtra Formula survival]; }; - Grid2Polygons = derive { name="Grid2Polygons"; version="0.1-4"; sha256="00qnvi5f5mywknir67rbn36hz8s1x71y1jkkj4nrp60d15vh6hk7"; depends=[sp rgeos]; }; - gridBase = derive { name="gridBase"; version="0.4-7"; sha256="09jzw4rzwf2y5lcz7b16mb68pn0fqigv34ff7lr6w3yi9k91i1xy"; depends=[]; }; - gridDebug = derive { name="gridDebug"; version="0.4-0"; sha256="1nbcdjip6ghnlv0j7cf45bpqdpirwn636pg324f0hgiqj4rifn09"; depends=[gridGraphviz gridSVG]; }; - gridExtra = derive { name="gridExtra"; version="0.9.1"; sha256="15pj5w5wlrf8gw4z01i9j88gk6bm4kni64fpip9icmxkn887y3hx"; depends=[]; }; - gridGraphviz = derive { name="gridGraphviz"; version="0.1"; sha256="14zcr0w2c9cgdw6ij93w52k3bkmgdmx809snh9jjf2amy08p2gbg"; depends=[]; }; - gridSVG = derive { name="gridSVG"; version="1.4-0"; sha256="0ch1waz2z60a7ivn63nf1418kgypr0nv8vr3ak3my0i7gdgny2pc"; depends=[RJSONIO XML]; }; - GriegSmith = derive { name="GriegSmith"; version="1.0"; sha256="1a7gnaig1wvxpph7d8c37kx51dznzk0457fzf7alw95iwpyb4z7j"; depends=[spatstat]; }; - gRim = derive { name="gRim"; version="0.1-17"; sha256="0vn031r318kp78cx00n43fc42bv6sjyb8dm6q0l08s0g9n2w17dp"; depends=[gRbase gRain igraph]; }; - grImport = derive { name="grImport"; version="0.9-0"; sha256="1d8fd7502qj7cirjqdkr1qj51rylw2fz5hs06avfvc2dxs2xwfw1"; depends=[XML]; }; - grnn = derive { name="grnn"; version="0.1.0"; sha256="1dxcmar42g9hz4zlyszlmmnnsnja0gxfggav5jxv0gkp32rkd0wh"; depends=[]; }; - groc = derive { name="groc"; version="1.0.4"; sha256="1v32gwr8ghv47dmzp1x02n3aaqv3cfywh7xzx2486v4p960s42gc"; depends=[rrcov pls mgcv robust robustbase MASS]; }; - grofit = derive { name="grofit"; version="1.1.1"; sha256="0m0phd5irk007k2kpxlsg03g7939nndf363fmkcxffykvp0023hz"; depends=[]; }; - grouped = derive { name="grouped"; version="0.6-0"; sha256="1glxgacpwk7yjbkwg5ci6bmb2il6hf5zhydwi5bbq6hc032m9976"; depends=[MASS]; }; - GroupSeq = derive { name="GroupSeq"; version="1.3.2"; sha256="16n06jw7f97jhafgl9sfvd163v1walhlpmai1hmhiwjvv341sp13"; depends=[]; }; - growcurves = derive { name="growcurves"; version="0.2.3.9"; sha256="1f8hh8ppp6bgrb8crm46xrria3vdnz62aya9lhwcdaggfmy7j25l"; depends=[Rcpp RcppArmadillo reshape2 scales ggplot2 Formula testthat]; }; - growfunctions = derive { name="growfunctions"; version="0.1"; sha256="0r11grbxbmdx2yg2jh22rf0frg7jz0w7n5d7mbhn16fwnkm3y9mw"; depends=[Rcpp Matrix spam mvtnorm ggplot2 reshape2 scales]; }; - growthmodels = derive { name="growthmodels"; version="1.2.0"; sha256="1wy5z77819s3daa0mifafcjfkggsq0ac522yagj86ml3vf7yqppj"; depends=[]; }; - growthrate = derive { name="growthrate"; version="1.2"; sha256="05a2g3lcw4c0r3hykk5lsxmx2s1lp1fsjjxmip75dhid969sagcs"; depends=[Matrix clime mvtnorm]; }; - grplasso = derive { name="grplasso"; version="0.4-3"; sha256="1v15x0kbzfvl3ygbrsxqgj3mz6a107bfvanbymh0hs7668b1zkab"; depends=[]; }; - grppenalty = derive { name="grppenalty"; version="2.1-0"; sha256="12hbghmg96dwlscjy6nspgkmqqj4vwq2qcwcz1gp50a08qbmdcrk"; depends=[]; }; - grpreg = derive { name="grpreg"; version="2.6-0"; sha256="1j112c96milqnd34dmznm1x7i02ydh484msd6vm98daghb42dzsg"; depends=[Matrix]; }; - grt = derive { name="grt"; version="0.2"; sha256="0cqjk7yqk2ryx1pgvjd3x8l25hqv92p8rvdr7xw4jkzillllwmhz"; depends=[MASS rgl misc3d]; }; - GRTo = derive { name="GRTo"; version="1.2"; sha256="0x65g8a39vrb8m3hqajxi0ksmdavz0p6mlamqprkdn9p6ikf5c73"; depends=[bootstrap]; }; - GSA = derive { name="GSA"; version="1.03"; sha256="1h1sbpn1rrdh44w4fx2avc7x24ba40mvpd8b2x5wfrc7a294zf6z"; depends=[]; }; - GSAgm = derive { name="GSAgm"; version="1.0"; sha256="18bhk67rpss6gg1ncaj0nrz0wbfxv7kvy1cxria083vi60z0vwbb"; depends=[survival]; }; - gsalib = derive { name="gsalib"; version="2.0"; sha256="0yk39ca7yrsksga73ma2pdqfy3s1xpp07y8622x44b9cazv6rdy4"; depends=[]; }; - gsarima = derive { name="gsarima"; version="0.1-4"; sha256="0q5i5szyqvj1sgyg17khqx5rgdpn3wxp22ddr9m9rb653y03xzz0"; depends=[MASS]; }; - gsbDesign = derive { name="gsbDesign"; version="0.96-2"; sha256="0sk4a66z9bqi3aa2ky9472p9znfm93kc9p5igdmvii4dr0syyfxd"; depends=[gsDesign lattice]; }; - gsDesign = derive { name="gsDesign"; version="2.8-8"; sha256="0czr2xyh3nd8kgvw71wvqakvmfbdbysiyyfnh2az7l4j33xyhfc9"; depends=[ggplot2 xtable stringr RUnit plyr]; }; - GSE = derive { name="GSE"; version="3.0"; sha256="1b1nrnvgly7zpyw9z9ddgmx7qfz0mllwm8k7czs17x3l5gkmw8ir"; depends=[Rcpp RcppArmadillo MASS ggplot2]; }; - gSeg = derive { name="gSeg"; version="0.1"; sha256="0qnv3c0rla0g2fb4s4x1i0zdp3dlvi98qf80wlr54gnn7s9vpjf1"; depends=[]; }; - gset = derive { name="gset"; version="1.0"; sha256="10qiwp94z8zm2gvklnz23qmypdwh72jz0v7rdcni38pv2hcky637"; depends=[Hmisc mvtnorm MCMCpack]; }; - gsg = derive { name="gsg"; version="1.0"; sha256="0j2h1i94vr0mvj4rl328n666b9nn2xnakid8k1r2lh88vk3dv9ma"; depends=[mgcv mvtnorm boot numDeriv]; }; - GSIF = derive { name="GSIF"; version="0.4-1"; sha256="0ry2lq9cncd68wnrfgfw53mqi1jiijggdz3ib37xpkcqh754101x"; depends=[sp RSAGA dismo rgdal raster aqp plotKML gstat boot rpart quantregForest randomForest nlme]; }; - gskat = derive { name="gskat"; version="1.0"; sha256="19mbif7wr88vk5wlc7m2l4xghjmfj2qd3s8yvjlkawbnjk8x6ib0"; depends=[CompQuadForm e1071 gee geepack Matrix]; }; - gsl = derive { name="gsl"; version="1.9-10"; sha256="06n21p0k2ki6nb725a6sxwlb4p7xc5jhg11nq9c3z3dj39r0qgbd"; depends=[]; }; - GSM = derive { name="GSM"; version="1.3.1"; sha256="1ay6znw31qnhz5k6fa0aiccr2xxmnj7v3vzrvlk6y5v5smlvybd0"; depends=[gtools]; }; - gsmaRt = derive { name="gsmaRt"; version="1.0"; sha256="0hpf0vgmhill3w8cqpsgvxjgwk2ka154vm9klidckm05qcqlwdn6"; depends=[R2HTML rgl scatterplot3d xtable]; }; - gsmoothr = derive { name="gsmoothr"; version="0.1.7"; sha256="00z9852vn5pj04dhl3w36yk0xjawniay6iifw1i7fd8g98mgspxp"; depends=[]; }; - gss = derive { name="gss"; version="2.1-3"; sha256="07bp60fhax8v4nyzcgadadi1kfwgwk5r08y6ifsgim500jbw7apk"; depends=[]; }; - gsscopu = derive { name="gsscopu"; version="0.9-1"; sha256="0qg4ra7zvp0j6wjbb14sqajfq745bza3v50s0c5xxnddblqi4hcc"; depends=[gss]; }; - gstat = derive { name="gstat"; version="1.0-19"; sha256="1yhrp1dgkl11hr8jy1kmsiaf8avf02m85wcnvf34vlbil24hy7py"; depends=[lattice sp zoo spacetime FNN]; }; - gstudio = derive { name="gstudio"; version="1.3"; sha256="1ddifizswm41y4sxnnfw8j90clba6zf022x0z4xipccaznim2gy9"; depends=[ggplot2 raster sp reshape2 ggmap popgraph]; }; - gsubfn = derive { name="gsubfn"; version="0.6-5"; sha256="1glpq5ghzgarqg8wfl7pblblm31d4dsxrlrkhsgckldbdap52yws"; depends=[proto]; }; - 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]; }; - gtools = derive { name="gtools"; version="3.4.1"; sha256="0d5v864v3qnmmxas8xf74aarli9nr3l16bwj9qzs2s9k498q6azs"; depends=[]; }; - gtx = derive { name="gtx"; version="0.0.8"; sha256="0x71jji2yldi9wpx8d3nldbjfj4930j7zcasayzbylf9094gmg26"; depends=[survival]; }; - GuardianR = derive { name="GuardianR"; version="0.4"; sha256="0jk97x106srswp28r68713ky707cx957hvbkjggfppcglic5dc1n"; depends=[RCurl RJSONIO]; }; - Guerry = derive { name="Guerry"; version="1.5-0"; sha256="18pgmsqd6ign5g4lwpd35gxaypm3zjf1i82w63ss11dsqddnfyvh"; depends=[sp shapefiles]; }; - GUIDE = derive { name="GUIDE"; version="1.0.9"; sha256="1y0y6rwv1khd9bdaz5rl9nmxiangx0jckgihg16wb6hx6kf8kzc1"; depends=[rpanel tkrplot]; }; - gumbel = derive { name="gumbel"; version="1.04"; sha256="0fl44i4kz9wbba1iv4fy1b74nf25axdkifhczgrgpy5d81ky43v6"; depends=[]; }; - GUniFrac = derive { name="GUniFrac"; version="1.0"; sha256="0w08b22xkx0llmwk1kj4ibapvg3fxkgkmjz6z6acr4nwqfwmjzzx"; depends=[vegan ape]; }; - GUTS = derive { name="GUTS"; version="0.3.5"; sha256="10yi18yv3vbm7pn11bbj3baxqga5yymilabf56bc18prpirnw51b"; depends=[Rcpp]; }; - gvcm_cat = derive { name="gvcm.cat"; version="1.6"; sha256="0v5q97gjninxrjdclxj1bn362h0j93pm71k9gp79aa3sdy4ay6s4"; depends=[Matrix MASS]; }; - gvlma = derive { name="gvlma"; version="1.0.0.2"; sha256="0gj52hg665nmlwgbjh9yvz7a3sbzlbj41ksxchnnlxaxipdf6sl8"; depends=[]; }; - GWAF = derive { name="GWAF"; version="2.1"; sha256="1s56d3b6p5fpaxi32ks2mmhsa5sgi746hf159wk0z99099gli8g3"; depends=[geepack coxme lme4]; }; - GWASExactHW = derive { name="GWASExactHW"; version="1.01"; sha256="19qmk8h7kxmn9kzw0x4xns5p3qqz27xkqq4q6zmh4jzizd0fsl78"; depends=[]; }; - GWAtoolbox = derive { name="GWAtoolbox"; version="2.2.4"; sha256="0adpixlfh0j1py79b0636921kmz2zvhv8p07m6ism6h3xva0i4ck"; depends=[]; }; - gwerAM = derive { name="gwerAM"; version="1.0"; sha256="1c3rzd1jf52a4dn63hh43m9s9xnjvqn67amlm9z1ndrnn6fwfg1b"; depends=[MASS Matrix]; }; - GWG = derive { name="GWG"; version="1.0"; sha256="1va0cd229dhhi1lmrkpwapcm96hrdmxilrmba02xnl7ikhisw0my"; depends=[]; }; - gWidgets = derive { name="gWidgets"; version="0.0-53"; sha256="06imjabf9fqghaszqq77x6vxq864cn36n6534bkg23m9fwzqzf23"; depends=[]; }; - gWidgets2 = derive { name="gWidgets2"; version="1.0-5"; sha256="1y6vm6ds77yr1qiqlcaixbsarbwx5w53ba343svla7wva80ajbpl"; depends=[digest]; }; - gWidgets2RGtk2 = derive { name="gWidgets2RGtk2"; version="1.0-2"; sha256="1pzcpjz5cdizvj0ih2r4i3ll6flm45q8ym6sz0wqbg4j3ir0l5kh"; depends=[memoise RGtk2 gWidgets2]; }; - gWidgets2tcltk = derive { name="gWidgets2tcltk"; version="1.0-2"; sha256="1dzrc8yry4l2afpijr35irnqmvfpd22vlb3lih4pk14n52690y0h"; depends=[digest memoise gWidgets2]; }; - gWidgetsRGtk2 = derive { name="gWidgetsRGtk2"; version="0.0-82"; sha256="0b1imvy2094s2ixar7z4kxs047855ssijx8l22a1hlwdg7zp7sng"; depends=[RGtk2 gWidgets]; }; - gWidgetstcltk = derive { name="gWidgetstcltk"; version="0.0-55"; sha256="06991rqh4927bal7j718bn2ziy6rws8yq682lmp5vbqhdd36afv2"; depends=[gWidgets digest]; }; - gWidgetsWWW = derive { name="gWidgetsWWW"; version="0.0-23"; sha256="14yw04kgfqfwl44zkyqy075rjd5vafbzig6x5py25ypbdk3hwn7a"; depends=[proto filehash digest rjson]; }; - GWmodel = derive { name="GWmodel"; version="1.2-3"; sha256="04sks9rnqxgxyj9q3nyrnknp4cdfck2p52svxfdrgvxqr48kf6ff"; depends=[maptools robustbase]; }; - GWRM = derive { name="GWRM"; version="1.1"; sha256="1l8rw2nksd1vskjb7kjn93vgrs39bcrr8zz1j66rmkcc399pf6nf"; depends=[]; }; - gwrr = derive { name="gwrr"; version="0.2-1"; sha256="1fjk217pimnmxsimqp9sn02nr1mwy3hw3vsr95skbfsd6vdda14d"; depends=[fields lars]; }; - GWsignif = derive { name="GWsignif"; version="1.0"; sha256="04663qgy3xmijrx8m1s5ql7zj70mgsd58dl08ci742l1fzmfya5f"; depends=[]; }; - GxM = derive { name="GxM"; version="1.0"; sha256="1vaq0fkx3bf2kdmn2iqgad8haprg9i3a9101nrvyh2pv2g894761"; depends=[Rcpp minqa nlme]; }; - h2o = derive { name="h2o"; version="2.4.3.11"; sha256="0mlyzvylqqi3w85riyp2mhyzdqf6yvmxibdjj41glaqc5vj37dlx"; depends=[RCurl rjson statmod]; }; - haarfisz = derive { name="haarfisz"; version="4.5"; sha256="1qmh4glwzqwqx3pvxc71rlcimp1l0plgdf380v9hk0b4gj7g3pkf"; depends=[wavethresh]; }; - HAC = derive { name="HAC"; version="1.0-0"; sha256="00va1q17a1vijhb557kh6scqakllqlblcv2hfisi7fq0h2ainni1"; depends=[copula]; }; - HadoopStreaming = derive { name="HadoopStreaming"; version="0.2"; sha256="1l9msaizjvnsj1jrpghj4g057qifdgg6vbqhfxhn1fiqdqi2056q"; depends=[getopt]; }; - hamlet = derive { name="hamlet"; version="0.7"; sha256="0f3gl5xvgdksaxk76dyv46hahc41f2j3pf9wp0rc0q7wpp5nfsjl"; depends=[]; }; - HandTill2001 = derive { name="HandTill2001"; version="0.2-9"; sha256="1j4ivxarm3k9sj05824lv6b03apyabpciv4mp253vv0yzjcp2bzf"; depends=[]; }; - Hankel = derive { name="Hankel"; version="0.0-1"; sha256="0g3b0ji8hw29k0wxxvlnbcm0z91p4vbajbrhm6cqbccjq85lg4si"; depends=[]; }; - hapassoc = derive { name="hapassoc"; version="1.2-6"; sha256="14ddh7wiyks0wcw0iy1af9njg4wsn5flv59r463z2b3pbj5zp1qc"; depends=[]; }; - HapEstXXR = derive { name="HapEstXXR"; version="0.1-6"; sha256="0ldmfa9729sf9r1kaldsskq8w6kvjac778bzjyi0a1pfz2walzjb"; depends=[survival]; }; - HAPim = derive { name="HAPim"; version="1.3"; sha256="03qy0pxazv3gdq3fck7171ixilb9zi1dwnvc4v7d726g0lvn80pg"; depends=[]; }; - Haplin = derive { name="Haplin"; version="5.3"; sha256="1gfg9dhgw42yjd1i8knnjvc2y2fbdc2ypa396g48hmsnislqffsd"; depends=[MASS mgcv GenABEL DatABEL filehash]; }; - haplo_ccs = derive { name="haplo.ccs"; version="1.3.1"; sha256="0cs90zxxbvglz1af0lh37dw1gxa04k0kawzxamz2was3dbh19lbz"; depends=[haplo_stats survival]; }; - HaploSim = derive { name="HaploSim"; version="1.8.4"; sha256="0794f76hc9qvjmay7c61cmzycqafljs0g0hliq9xfrw4f23gq3sa"; depends=[]; }; - haplo_stats = derive { name="haplo.stats"; version="1.6.8"; sha256="1zz8hi37zwc6wkn5q7zhz1l29vlklhnj8gzp1pmz4ys496c2lwxh"; depends=[]; }; - HAP_ROR = derive { name="HAP.ROR"; version="1.0"; sha256="1id9amz1cc2l2vnpp0ikbhf8ghbgzqd1b9dfivnyglg7996c3gbg"; depends=[hash ape]; }; - hapsim = derive { name="hapsim"; version="0.3"; sha256="18r0cq15psjwxprml84ihj5gw4pk6agd7x0qicj899awa21f2qb3"; depends=[MASS]; }; - HardyWeinberg = derive { name="HardyWeinberg"; version="1.5.4"; sha256="0098n5m3svcc3z5cvmqygazlvm1dzd4zfbpj1q9zqs5wr3407wcv"; depends=[mice]; }; - harvestr = derive { name="harvestr"; version="0.6.0"; sha256="1jg4d98bwx2cm3hliayqrazq43sa9kd9ynpaid6x4ld3mz5y8mlq"; depends=[plyr digest]; }; - 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=[]; }; - hawkes = derive { name="hawkes"; version="0.0-4"; sha256="1ghwq3icxwmrai3xn9r8cnvlh3z3j18lznhw1bm31h9mkkp2dk0a"; depends=[Rcpp]; }; - hazus = derive { name="hazus"; version="0.1"; sha256="1c0ahjdy9di1683nk5k4rmr6rhb66523ny039nyv842rgqdy625j"; depends=[reshape2]; }; - hbim = derive { name="hbim"; version="1.0.3"; sha256="1480nydsi2xj7zbfk4zw24mhsjadf83d827kpqzbmn0yh6srp3ps"; depends=[mvtnorm]; }; - hbmem = derive { name="hbmem"; version="0.3"; sha256="0ylxp77ack874sadwfnry84a6bg8gdl9xbw821lp5q05nnyg0dcj"; depends=[]; }; - hbsae = derive { name="hbsae"; version="1.0"; sha256="1iwmpi0pn5fxyxkwqkbmy6w1f1wcx0p809jnviim0ypwib32mhh7"; depends=[Matrix arm]; }; - HBSTM = derive { name="HBSTM"; version="1.0.1"; sha256="0bx7dxcfj46k4kqpqb39w4qkm4hvr1ka8d8rws445vkyl31kr0q6"; depends=[MASS fBasics maps]; }; - hcc = derive { name="hcc"; version="0.54"; sha256="14b3pamkywb0wsjpbm0wpflcds0b5mfymvgk92rmf6ngz1bkpdbq"; depends=[]; }; - hcci = derive { name="hcci"; version="1.0.0"; sha256="11piy1ajg3j3dbh66szzf7lhc3x28fz75ai39vlx0gl5nc2v5zs5"; depends=[]; }; - hda = derive { name="hda"; version="0.2-12"; sha256="11z9p35dvhi7bdw09d2yawh46nxk8axw76b51vk089g12nr2b9x7"; depends=[e1071]; }; - HDclassif = derive { name="HDclassif"; version="1.2.2"; sha256="0j32nhl2v0bipflidwfk6q8a0pvn7qjs7ks1al2izsr772dwfcvq"; depends=[MASS]; }; - hddplot = derive { name="hddplot"; version="0.56"; sha256="0s9iijwq8zfvavqq2bkqm2884sg0957ppkggsv6mmm3cbdi2xrlc"; depends=[MASS]; }; - hdeco = derive { name="hdeco"; version="0.4.1"; sha256="04nggwckvn1kwi238qd33l4pryzn4aq5bmi30bvfi99gwnrlgfgq"; depends=[]; }; - hdi = derive { name="hdi"; version="0.1-2"; sha256="19lc2h34jlj198gchnhbfbb8igwlan2b977a47j8p3q6haj5bcv1"; depends=[glmnet linprog MASS scalreg]; }; - hdlm = derive { name="hdlm"; version="1.2"; sha256="0s4lzg3s2k7f7byygb11s7f78l3rkkb0zn03kh3d7h8250wg9fax"; depends=[glmnet foreach MASS iterators]; }; - HDMD = derive { name="HDMD"; version="1.2"; sha256="0na0z08fdf47ghfl2r3fp9qg5pi99kvp7liymwxym2wglkwl4chq"; depends=[psych MASS]; }; - HDPenReg = derive { name="HDPenReg"; version="0.89.8"; sha256="1w1p3ivqw5snp9c08qss08radcv32h9pd5av0gj8kachcf4b6x0l"; depends=[Rcpp]; }; - hdrcde = derive { name="hdrcde"; version="3.1"; sha256="027nxpzk1g0yx8rns7npdz30afs5hwpdqjiamc7yjrsi0rzm71lw"; depends=[mvtnorm locfit ash ks KernSmooth]; }; - HDtweedie = derive { name="HDtweedie"; version="1.1"; sha256="14awd7sws0464f68f5xwnv1xvr0xflvx2z2zzcfj1csvk3af0zzj"; depends=[]; }; - HEAT = derive { name="HEAT"; version="1.2"; sha256="1qifqd06ifl0f5l44mkxapnkwhpm0b82yq6dhfw4f8yhb27wd0z2"; depends=[]; }; - heatex = derive { name="heatex"; version="1.0"; sha256="0c7bxblq24m80yi24gmrqqlcw8jh0lb749adsh51yr6nzpap6i9n"; depends=[]; }; - heatmap3 = derive { name="heatmap3"; version="1.0.4"; sha256="0yrqq97r05xypqgd2dz5cyb54kjdhdzi59rclppcibwhjzpvgdka"; depends=[fastcluster]; }; - heatmapFit = derive { name="heatmapFit"; version="2.0.2"; sha256="00p39y6x13yxrxfqx6gzmb80fk1hsyi8wa6brx40hj37pyyfis0p"; depends=[]; }; - heatmap_plus = derive { name="heatmap.plus"; version="1.3"; sha256="0rzffm15a51b7l55k0krk6w7v8czy3vpwz1qmbybr7av0pln7wn3"; depends=[]; }; - heavy = derive { name="heavy"; version="0.2-3"; sha256="17mr2i629hw38dadbl75rmkz9y3brc2yz3hap1vp607ya420cmv8"; depends=[]; }; - helloJavaWorld = derive { name="helloJavaWorld"; version="0.0-7"; sha256="0x0f64w5783mh0ryv0krpdzhicbv912y36h74h1qapcy5225fxh5"; depends=[rJava]; }; - helsinki = derive { name="helsinki"; version="0.9.20"; sha256="0jlyvj8cyzb0si2gqwik4jzbmwfawwnap9k6jl1z2nw2rz5w1k3c"; depends=[maptools rjson RCurl]; }; - heplots = derive { name="heplots"; version="1.0-12"; sha256="064kanmqm4b0sbyw60wfb19adclpdagm23l6p86vi0hyx0dr0ykz"; depends=[car MASS]; }; - hergm = derive { name="hergm"; version="1.3-11"; sha256="1kfh7ry84smxf3d0ykjr7d0ckh2dk9y63761f4pmskfxqx12w98a"; depends=[ergm]; }; - hett = derive { name="hett"; version="0.3-1"; sha256="1y0hr9g2pjwzc5azh095h33qidxhhmlvd1csamjnhwdphj5drzz0"; depends=[MASS lattice]; }; - het_test = derive { name="het.test"; version="0.1"; sha256="08kxp81dx32anh0k5b65x7w7madwnn9hiabdrk6ck6b6mx37x26v"; depends=[vars]; }; - hexbin = derive { name="hexbin"; version="1.27.0"; sha256="0fs5nsaalic6fj7b347yjczws310y3q2v37yr8sg74yq8wqzsdj8"; depends=[lattice]; }; - hexView = derive { name="hexView"; version="0.3-2"; sha256="19s87qxz9rjvzr64pv51wfd26jy5f00i8lwv39hhr6rh0jwngdly"; depends=[]; }; - hflights = derive { name="hflights"; version="0.1"; sha256="1rb6finck13i6949i6hsgfk90q4ybxh1m3is2mlw2m6087bpzfbd"; depends=[]; }; - hgam = derive { name="hgam"; version="0.1-2"; sha256="1flcc67n8kbh9m5phdfl587xg1x935zbp305y0gdmkc8vpkiwpcf"; depends=[grplasso lattice rgl]; }; - hglasso = derive { name="hglasso"; version="1.2"; sha256="1qq41ma33wz7qjs5zx72yvngpsiq62z9sd6d5hvvl83brq0fcr4b"; depends=[glasso mvtnorm igraph fields]; }; - hglm = derive { name="hglm"; version="2.0-8"; sha256="14md1d54zbhc2cnrvim5l8rwg556ln0ssamxj5354nrvr6sxv8gs"; depends=[Matrix MASS hglm_data]; }; - hglm_data = derive { name="hglm.data"; version="1.0-0"; sha256="1hrq1jac658z5xjsg03nfkb4kwm9z44bhciv5chk74ww8gjr9j9q"; depends=[Matrix MASS]; }; - HGNChelper = derive { name="HGNChelper"; version="0.3.0"; sha256="1w1x8fkvwlm4xqfx3afg42hhsa459sxqacsiph088sr77lhd3acz"; depends=[]; }; - HH = derive { name="HH"; version="3.0-4"; sha256="11b1qvhdl1waskvvcdkdkljh5d3ql6ajsq0vg4fapprfkq4jamv1"; depends=[lattice latticeExtra multcomp reshape2 leaps vcd colorspace RColorBrewer]; }; - HHG = derive { name="HHG"; version="1.4"; sha256="048jbwhrbgp1pv2j6sw234ykdn7bgpa49slwh3p5547nl2cwjysg"; depends=[]; }; - hht = derive { name="hht"; version="2.0.2"; sha256="1hah6f8svvp63nzdfrnri8bi6dzx1qn372dmiz6x2jpp77mw2mkc"; depends=[EMD fields]; }; - HI = derive { name="HI"; version="0.4"; sha256="0i7y4zcdr6wcjy43lz9h8glzpdv0pz7livr95xb1j4p8zafykday"; depends=[]; }; - HIBAG = derive { name="HIBAG"; version="1.2.3"; sha256="08hg9l5il2zicbpg04biiqm99lj51ny6ias8hwxj2s4gyr1qd5ny"; depends=[]; }; - HiClimR = derive { name="HiClimR"; version="1.1.2"; sha256="1vq8gln5888aa9835phixniijf1madxgsx895ld6nxxrwd9jhwpl"; depends=[]; }; - HiCseg = derive { name="HiCseg"; version="1.1"; sha256="19581k3g71wrznyqrp4hmspqyzcbcfbc48xgjlq13zmqii45hcn6"; depends=[]; }; - hiddenf = derive { name="hiddenf"; version="1.0"; sha256="00r27dyfg4mjsp4s3hjk19alqc4jbfvy8pk5zjvz7gdgq68fxaza"; depends=[]; }; - HiddenMarkov = derive { name="HiddenMarkov"; version="1.7-0"; sha256="0223yw1ga2c2y1fqjgr3m4yw7w8cp5r0z5cz766qvbc5wv65bh59"; depends=[]; }; - hierarchicalDS = derive { name="hierarchicalDS"; version="2.01"; sha256="0qdpdr8wk27zm1gf50awnmy8sghqq7mcdq30ahcyphmxmkm5cn1l"; depends=[truncnorm MASS mvtnorm Matrix coda spsurvey MCMCpack xtable mc2d]; }; - hierfstat = derive { name="hierfstat"; version="0.04-10"; sha256="1n0nn5liwvf3xc743vdxpfqsbr40n599f981gk49d9nq8qk0kggl"; depends=[gtools ade4]; }; - hierNet = derive { name="hierNet"; version="1.6"; sha256="08lifk92caa4l9nfb89rl6vby8sd1ba3ay7z29ffirsg7cx07qiw"; depends=[]; }; - hier_part = derive { name="hier.part"; version="1.0-4"; sha256="03acdgzkhbk4p0wxw2g1hzklmq9hzmdkkvfj742vzfswdd803yg9"; depends=[gtools]; }; - HIest = derive { name="HIest"; version="2.0"; sha256="0ik55kxhzjyg6z6072iz9nfaj7x1nvf91l1kysgvkjccr6jf3y86"; depends=[nnet]; }; - highfrequency = derive { name="highfrequency"; version="0.2"; sha256="0gq1szwqal792n1k14m51flbjz72vfym14wkxl3q48mwv2i4s772"; depends=[xts zoo]; }; - highlight = derive { name="highlight"; version="0.4.4"; sha256="03mch5waqkzb9pb4llgalbxdfn3h6adh05f3i43kscssc67bs30l"; depends=[]; }; - highr = derive { name="highr"; version="0.3"; sha256="1y0amfvdpqwq0n60fykbsir4jd1ynkwfcgadjnn1997amk9qja5x"; depends=[]; }; - highriskzone = derive { name="highriskzone"; version="1.1"; sha256="1qpk63jh44075b6fnhqx1iqjywzzwhvr6lry3vjlx0sfv1nqad6k"; depends=[spatstat ks]; }; - hillmakeR = derive { name="hillmakeR"; version="0.2"; sha256="1baynibgn4xqmpsxna8irggxvdc484mq5nza00rwg58vh1bc7wzq"; depends=[]; }; - HiLMM = derive { name="HiLMM"; version="1.0"; sha256="1x3my51vzxlk9q7vj2ljpqinxw777953mhgzvbqildph4szh4xh4"; depends=[]; }; - hint = derive { name="hint"; version="0.1-1"; sha256="1n18j2hcb1qynhsln10nzryi20l5aqhr7i1aanww10y5dz573zi3"; depends=[]; }; - HiPLARM = derive { name="HiPLARM"; version="0.1"; sha256="0af68gfmc89nn1chmqay6ix0zygcp1hmylj02i7l6rx6vb06qw6w"; depends=[Matrix]; }; - hiPOD = derive { name="hiPOD"; version="1.0"; sha256="1i15ickz2s0kffh99qq30pl5hsl0lbj0kp55jnbv4x72hndzhmla"; depends=[rgl]; }; - hisemi = derive { name="hisemi"; version="1.0-319"; sha256="0pm7dsaaqrdhkvxsk2cjvk6qd2rqqmddmv012smnrivi7mpnvd4w"; depends=[Matrix Iso fda]; }; - HistData = derive { name="HistData"; version="0.7-5"; sha256="17s64hfs7r77p0wjzpbgz9wp3gjzbly2d0v784f9m2bka8gj6xhr"; depends=[]; }; - histogram = derive { name="histogram"; version="0.0-23"; sha256="0hrhk423wdybqbvgsjn7dxgb95bkvmbh573q1696634hvzfdm68c"; depends=[]; }; - HistogramTools = derive { name="HistogramTools"; version="0.3"; sha256="1wfvrznr578s2hc8ccs849pz4kjlyi4brdxhw919cvk758ahy9rv"; depends=[Hmisc ash stringr]; }; - hitandrun = derive { name="hitandrun"; version="0.4-2"; sha256="143aj926mx0v26f8dsagr90ggzk23lfms57agzrnqfvddla7ng9c"; depends=[rcdd]; }; - hive = derive { name="hive"; version="0.1-16"; sha256="1xaxnr8nfkji2b5f5dq2h01pkl20rm24wxnf1y1xv695v3j58ibd"; depends=[rJava XML]; }; - HiveR = derive { name="HiveR"; version="0.2-27"; sha256="1c0isfiq8xw68qi3mk6m5dilsvbib7hy0ill9wga6kf6qndlfc49"; depends=[RColorBrewer plyr tkrgl jpeg png]; }; - HIV_LifeTables = derive { name="HIV.LifeTables"; version="0.1"; sha256="0qa5n9w5d5l1kr4827a34581q380xmpyzmmhhl300z1jwr0j94df"; depends=[]; }; - HK80 = derive { name="HK80"; version="0.0.1"; sha256="1qhknrqpspxrdxzf5kakans94db58bbhgpblvpwcyw4jrjmm0ng7"; depends=[]; }; - HLMdiag = derive { name="HLMdiag"; version="0.2.5"; sha256="1yim9m5q1m112aj7zhsw345l32bdj7lbw2mqpcxhjzv1lcknm5lq"; depends=[lme4 ggplot2 plyr reshape2 MASS Matrix Rcpp]; }; - hlr = derive { name="hlr"; version="0.0-4"; sha256="04w1hzjfg2ly9vm9ynh676fy74d9ncy3a1mak209z2ddgr3m7r2y"; depends=[MASS]; }; - HLSM = derive { name="HLSM"; version="0.2"; sha256="052qsdbfamlpwmxz7bwbnd956kibgvw3w6r7gvvp2s08g58arvy7"; depends=[MASS coda]; }; - hmeasure = derive { name="hmeasure"; version="1.0"; sha256="0wr0xq956glmhvy4yis3qq7cfqv9x82ci9fzx3wjvaykd16h0sx9"; depends=[]; }; - Hmisc = derive { name="Hmisc"; version="3.14-4"; sha256="1jpz1sxvcip1k7yc8wkxf68fplr6dv24pavblxmi823xq1pjq21y"; depends=[lattice survival Formula latticeExtra cluster]; }; - HMM = derive { name="HMM"; version="1.0"; sha256="0z0hcqfixx1l2a6d3lpy5hmh0n4gjgs0jnck441akpp3vh37glzw"; depends=[]; }; - HMMCont = derive { name="HMMCont"; version="1.0"; sha256="1drni4f72x83sprn65wnhw0pv1q8lfkgmxdr9h4rwv1accril85x"; depends=[]; }; - hmm_discnp = derive { name="hmm.discnp"; version="0.2-3"; sha256="1r9xxgsqh5pw9incldaxnsqhyanhd4jwm6w0ix1k43i53dw4diyr"; depends=[]; }; - hmmm = derive { name="hmmm"; version="1.0-2"; sha256="057yfp1sgp1wvhdq0sfvs598zcq8dhrbqfc02lih5pnwacf96vpc"; depends=[quadprog MASS mvtnorm]; }; - HMMpa = derive { name="HMMpa"; version="1.0"; sha256="14r2axg42by49qm6avgv7g3xnc29bxlrni5fhc5vdz0wygkcrqhn"; depends=[]; }; - HMP = derive { name="HMP"; version="1.3.1"; sha256="1r39mq8j071khza37ck7w4kvk1di71hhn5m4wnx9dak7nlcq2nwx"; depends=[MCMCpack dirmult]; }; - HMPTrees = derive { name="HMPTrees"; version="1.2"; sha256="0agp8w7rzr1byj01di89r3qy1vb9inb2zgys78mg8jnk7axi925l"; depends=[ape]; }; - HMR = derive { name="HMR"; version="0.3.1"; sha256="1lmxp46r5jr0r37sk9y080irbrf89rkzhv0943xv0f0l2dyyk415"; depends=[]; }; - hoardeR = derive { name="hoardeR"; version="0.0-2"; sha256="1k9a469h6fmr1br93dsk4q14h2bw8225l0v5sfp2wyr8sfpwm1dg"; depends=[httr XML stringr]; }; - holdem = derive { name="holdem"; version="1.1"; sha256="07h4cbg7hx91hc6ypi6hbalzdd9qz9rfhjgk5sq1srnangwwnxlw"; depends=[]; }; - Holidays = derive { name="Holidays"; version="1.0-0"; sha256="1p7rwph50i0dwl7a6n394dq7sl9nb2y8p5ip5y6ql48ixjh4d078"; depends=[TimeWarp]; }; - 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=[]; }; - HotDeckImputation = derive { name="HotDeckImputation"; version="0.1.0"; sha256="1zj09fa5bqfw27zzard9a9a2aglg7ff8z2zzfyjcdz187l6g9gql"; depends=[]; }; - Hotelling = derive { name="Hotelling"; version="1.0-2"; sha256="0dzsqnn4c4av23qjnmacwc78i0xg355p1xwfmgipr04ivym0mqn0"; depends=[corpcor]; }; - hotspots = derive { name="hotspots"; version="1.0.2"; sha256="1cwcwin86y7afjhs8jwlz1m63hh70dcjag0msds4ngksvjh9gj2q"; depends=[lattice ineq]; }; - howmany = derive { name="howmany"; version="0.3-1"; sha256="045ck8qahfg2swbgyf7dpl32ryq1m4sbalhr7m5qdgpm62vz8h7f"; depends=[]; }; - HPbayes = derive { name="HPbayes"; version="0.1"; sha256="1kpqnv7ymf95sgb0ik7npc4qfkzc1zb483vwnjpba4f42jhf508y"; depends=[MASS mvtnorm corpcor numDeriv boot]; }; - hpcwld = derive { name="hpcwld"; version="0.4"; sha256="1vh5jvq9nbghsl59fi6v3nmsh0jmxq7pzbs3fgasz8c3jmjw50kp"; depends=[]; }; - HPO_db = derive { name="HPO.db"; version="1.2"; sha256="04mys72qajp7cn0vhzr9mv388d5a69kjvkwxjjskz24k91xwn4vz"; depends=[]; }; - hpoPlot = derive { name="hpoPlot"; version="1.0"; sha256="0jd0imbhsw74gziafkzn7hrxz79llmpksspbnxnslm1mifl81www"; depends=[functional plotrix Hmisc]; }; - HPOSim = derive { name="HPOSim"; version="1.2"; sha256="1bgakx9y1cqc54adm6d4zlqvd2smxq895bf68njsgj3ygrlglc2v"; depends=[HPO_db igraph]; }; - hqmisc = derive { name="hqmisc"; version="0.1-1"; sha256="0jcy2hb3dmzf9j4n92aq7247mx9w7n30wpsx0dkchqnjwlqwwncw"; depends=[]; }; - hrr = derive { name="hrr"; version="1.1.1"; sha256="17jzsgh2784y7jdwpa50v7qz99dw6k2n25sisnam6h1a39b96byn"; depends=[]; }; - HSAUR = derive { name="HSAUR"; version="1.3-3"; sha256="0lf6z9fgmbdhpvz2dyni5wi1ri6y6fikkf1px03pirlswm1mbchj"; depends=[]; }; - HSAUR2 = derive { name="HSAUR2"; version="1.1-10"; sha256="0r06abgiiwj3b9cd652hics2rzkslk1gplxv751501nn7k2qid7i"; depends=[]; }; - HSAUR3 = derive { name="HSAUR3"; version="1.0-1"; sha256="1w1c3ypyvlfi95qg3xxdjfgxlykrcn3rly7z2mvpzkdx4dhi3kls"; depends=[]; }; - hSDM = derive { name="hSDM"; version="1.4"; sha256="1jq6hdnyv446ng62srip0b48kccf0qw3xqym3fprg74mjdy3inqr"; depends=[coda]; }; - 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.0"; sha256="04zhqnrrzhg1kqxf251q7iglazsj28dqqvhvch472925xf7dnap3"; depends=[snowfall Rcpp]; }; - HSROC = derive { name="HSROC"; version="2.1.7"; sha256="05gixmzmgdply9zhjpss54b50ch4b8586cik6c49naxcqxr0y5vd"; depends=[lattice coda MASS MCMCpack]; }; - HSSVD = derive { name="HSSVD"; version="1.1"; sha256="0kpfcb9ibwhdanc56ysbvx3zirhbrxqyrgpbmi9yvnc5m2c8377d"; depends=[bcv]; }; - htmltools = derive { name="htmltools"; version="0.2.4"; sha256="0957n22dfbhy0fc1hnf65jghdfiv1zj0kd6x5byafv54aby0bzqy"; depends=[digest]; }; - HTMLUtils = derive { name="HTMLUtils"; version="0.1.5"; sha256="12r8x7b944lbzz3f4j6w88szq6j9gscbss3f5bzpisw33sr4wgx3"; depends=[R2HTML]; }; - hts = derive { name="hts"; version="4.4"; sha256="1dpm669lc4khjkcs49m1nh7i61sclsqy7xbcn4mqqjhfgs7sg7sk"; depends=[forecast SparseM]; }; - HTSCluster = derive { name="HTSCluster"; version="2.0.3"; sha256="1c3gk6q87fl7yfikpr7q6h9mp8mjm9qmzm1vxxilfl5qm9d8f92p"; depends=[plotrix ggplot2 RColorBrewer poisson_glm_mix]; }; - HTSDiff = derive { name="HTSDiff"; version="1.0.2"; sha256="0l1shki2jkbx22l3rksdk1np9rgv40594ldn2rwhrzz6k2vz15by"; depends=[plotrix HTSCluster poisson_glm_mix]; }; - httpRequest = derive { name="httpRequest"; version="0.0.9"; sha256="1s71lpxv5n1syffckxnnxm5470b2lb2l7pikcm1r2j21j08g807f"; depends=[]; }; - httpuv = derive { name="httpuv"; version="1.3.0"; sha256="0fs2saz9g17069hkrh6r3wlzsbljv2dvq6sdlwh54dlm6skp7jm6"; depends=[Rcpp]; }; - httr = derive { name="httr"; version="0.4"; sha256="18ikpbjczjci8di9mwcjkm10fcl9jn40kp4i33kidrmamyryq4zq"; depends=[RCurl stringr digest jsonlite]; }; - huge = derive { name="huge"; version="1.2.6"; sha256="11njfd4i8q950apga6sdk84p4wk4qvp8bpg6yz9lgjrgj2hn14n2"; depends=[Matrix lattice igraph MASS]; }; - HUM = derive { name="HUM"; version="1.0"; sha256="1bq74l88jvscmq9ihv5wn06w2wng073ybvqb2bdx2dmiqlpv6jw2"; depends=[gtools Rcpp rgl]; }; - humanFormat = derive { name="humanFormat"; version="1.0"; sha256="0zwjbl8s5dx5d57sfmq6myc6snximc56zl88h8y1s1jqphyn9sir"; depends=[testthat]; }; - hwde = derive { name="hwde"; version="0.64"; sha256="1is39zknssqm98577sdjg8gn3h9wsraih19a9nd6n8mxdcsqivh4"; depends=[]; }; - HWEBayes = derive { name="HWEBayes"; version="1.4"; sha256="1rbffx6pn031a278ps9aqxcaq8yi73s5kf60za143ysbfxv9dphw"; depends=[MCMCpack mvtnorm]; }; - HWEintrinsic = derive { name="HWEintrinsic"; version="1.2.1"; sha256="1sg5lrc6kl5rr6f5awp100qpd1679745kixasiddiggzd8fhgb7q"; depends=[]; }; - HW_pval = derive { name="HW.pval"; version="1.0"; sha256="14nmyqw2d9cmn64789yc54fmiqanh6n1dizp7vj94h7b0jwq63yy"; depends=[]; }; - hwriter = derive { name="hwriter"; version="1.3"; sha256="12hs78m2pzjhjpv43qdc3lazf5qi5w1vpzqign6qpdrhm85xgvhi"; depends=[]; }; - hwriterPlus = derive { name="hwriterPlus"; version="1.0-3"; sha256="06hq493v702hy2mv73glav4az2wphzy3lqqkxjkpjpab00xc42d5"; depends=[hwriter TeachingDemos]; }; - HWxtest = derive { name="HWxtest"; version="1.0.3"; sha256="0qw632djkfx94d8rxgpwmbb4zwwlhgzakjj657wcd6gfi90i72ix"; depends=[]; }; - hybridEnsemble = derive { name="hybridEnsemble"; version="0.1.1"; sha256="1hn6zfz22mgxv5qpwdgmn7a9snha7hdkbbqq3xicy37j8xypsab5"; depends=[kernelFactory ada rpart ROCR nnet e1071 NMOF GenSA Rmalschains pso AUC soma genalg reportr nnls quadprog tabuSearch glmnet]; }; - hybridHclust = derive { name="hybridHclust"; version="1.0-4"; sha256="1967p6crkrbnlfghd9x1alr2x57nqjl1zh58hhyshgla3xmdmhx5"; depends=[cluster]; }; - HybridMC = derive { name="HybridMC"; version="0.2"; sha256="1wgzfyk0scwq9s2sdmc91fj7r4d7zlgwgnj6mdiia8w88ja8kzqy"; depends=[coda]; }; - hydroApps = derive { name="hydroApps"; version="0.1-1"; sha256="1ycv7l2ywwnx2mgklg6rry7n24jyhi4spvp1xl345yvyn9kf15dz"; depends=[nsRFA]; }; - hydrogeo = derive { name="hydrogeo"; version="0.2-3"; sha256="1kvzpdjrzbxy4rbfhjqmxdipaamd2rjdyxjv6vfxv1ixs1bm8cwm"; depends=[]; }; - hydroGOF = derive { name="hydroGOF"; version="0.3-8"; sha256="1ljk2dk5ydsg7qdizyzkbw0b2zdhnb3x9h965d94ygzg8nw5kbak"; depends=[zoo hydroTSM xts]; }; - HydroMe = derive { name="HydroMe"; version="2.0"; sha256="1a1d3lay94mzwk8n22l650h3p133npdf4aj63zgrdw4760p54rqf"; depends=[nlme minpack_lm]; }; - hydroPSO = derive { name="hydroPSO"; version="0.3-4"; sha256="12md94g78m7m1np36sadx0wxpb149pn5gd8yj2kw7fphb8g6a218"; depends=[Hmisc sp lattice zoo lhs]; }; - hydrostats = derive { name="hydrostats"; version="0.2"; sha256="1sp8lp4rqkq5ivlfdg26k6azmxvr8ma0ggkcj10zdl0q85j7ldj2"; depends=[]; }; - hydroTSM = derive { name="hydroTSM"; version="0.4-2-1"; sha256="0z5xw25w2fn67x2dw61msfdnp2dr2s2yi525fcjxn77339x9ksfr"; depends=[zoo xts e1071 gstat automap sp]; }; - HyperbolicDist = derive { name="HyperbolicDist"; version="0.6-2"; sha256="1wgqbx9ascyk6gw1dmvfz6hljvbh49gb9shr9qgf22qbq83waiva"; depends=[]; }; - hyperdirichlet = derive { name="hyperdirichlet"; version="1.4-9"; sha256="03c2xgfhfbpn1za84ajhvm0i5cpmfnz1makidrr2222addgyp9zx"; depends=[aylmer abind mvtnorm cubature]; }; - hypergea = derive { name="hypergea"; version="1.0.1"; sha256="17fi0sjgyjydd327wghicpys09bpkil4840d9zv779dj9zk2slj9"; depends=[]; }; - hypergeo = derive { name="hypergeo"; version="1.2-5"; sha256="00rqyw7xc4q6lqg0vy1jkb4rc1xbdgvqsmx58n6w2006zni54ss1"; depends=[elliptic contfrac]; }; - hyperSpec = derive { name="hyperSpec"; version="0.98-20140523"; sha256="1ypmq5xgcjqrq9i8f08csjqffv9qfpfkvrbawlf1ds7i49h6jq28"; depends=[lattice mvtnorm]; }; - hypervolume = derive { name="hypervolume"; version="1.0.1"; sha256="1ja3wx8k1hbcgwinbbs5m2amayj2wdmkk2kqaywrvgpm2k1f40i5"; depends=[Rcpp rgl MASS geometry igraph]; }; - HyPhy = derive { name="HyPhy"; version="1.0"; sha256="0994ymv7sswbp8qw3pay34s926cflw2hq2gnchw7rknybvlsrinq"; depends=[ape R_utils]; }; - hypothesestest = derive { name="hypothesestest"; version="1.0"; sha256="0g8sm386m1zm9i3900r62x83wb600cy8hqk7dlvbx6wcgrxg82sm"; depends=[]; }; - hypred = derive { name="hypred"; version="0.4"; sha256="08nqgw0h3zh4vyhfd1cngr6snz5n7skj3d9rg2qccz9pnjp7j1ab"; depends=[]; }; - hysteresis = derive { name="hysteresis"; version="2.0"; sha256="1g9d91djwi9k2q10zqak8fpmywnwmha1pm18g2hmwzrqrwnr6dh9"; depends=[car msm nlrwr]; }; - hzar = derive { name="hzar"; version="0.2-5"; sha256="000l4ki3hvznnhkxc5j422h5ifnsfqalv666j48yby1hsf1lc3kg"; depends=[MCMCpack foreach coda]; }; - IASD = derive { name="IASD"; version="1.0.7"; sha256="0a25sd82fxnmz3f4iaxhc69cdfb7xmh7wi79wv11sbw9cv2pl7kr"; depends=[]; }; - IAT = derive { name="IAT"; version="0.2"; sha256="0byivq2298sjvpsz5z1w7r31h6z2jqpip40z8r2alygbgwwa48pd"; depends=[data_table ggplot2]; }; - ibd = derive { name="ibd"; version="1.1"; sha256="1p7dw74qpbdalb8vq8jixjhizjl2zc8wrl28mzavw89lbragvi6k"; depends=[lpSolve MASS]; }; - IBDhaploRtools = derive { name="IBDhaploRtools"; version="1.7"; sha256="1jg2vrs9ly7l8yidw8ppa41v657jhjcj7n27zi1f2vsh3vmjri0m"; depends=[]; }; - ibdreg = derive { name="ibdreg"; version="0.2.5"; sha256="1kaa5q1byi30wzr0mw4w2cv1ssxprzcwf91wrpqwkgcsdy7dkh2g"; depends=[]; }; - IBDsim = derive { name="IBDsim"; version="0.9-4"; sha256="0cpabz7mnhsrmjrgb23zs5anjrkhwc2005b2inl6p93l47i81fps"; depends=[paramlink]; }; - ibeemd = derive { name="ibeemd"; version="1.0.1"; sha256="115z13q02gzixziknix2l53mi12zzg30ra9h35pv6qzrr11ra1ic"; depends=[fields deldir rgeos sp spdep]; }; - IBHM = derive { name="IBHM"; version="1.1-11"; sha256="1m0zxlybcak2v5c4spgaa39ngb2hryak4xd875jryk1dcnk9c702"; depends=[DEoptim cmaes Rcpp]; }; - Iboot = derive { name="Iboot"; version="0.1-1"; sha256="1fahh86kgv2axj2qg14n87v888sc0kb567s6zr3fh5zv361phwkq"; depends=[]; }; - ibr = derive { name="ibr"; version="1.4.5"; sha256="0nw2j232br06l30v3cn4qcr25vbh911v2mz7nfail40sqxc6wwc4"; depends=[]; }; - IBrokers = derive { name="IBrokers"; version="0.9-10"; sha256="1kpmmiar5762byy6pl8x8drpsw8as9ilbqzgqhfrvj5rd31mylz6"; depends=[xts]; }; - iBUGS = derive { name="iBUGS"; version="0.1.4"; sha256="0vsxy8pnbix0rg7ksgywx7kypqb5ngkxhldh3cisjkvdv638ybps"; depends=[R2WinBUGS gWidgetsRGtk2]; }; - iC10 = derive { name="iC10"; version="1.0.2"; sha256="17pgm3k1zh502bvdcc86wl8fsd1mbcl6hw2rqhpy0c3bhabrixki"; depends=[pamr CONOR iC10TrainingData]; }; - iC10TrainingData = derive { name="iC10TrainingData"; version="1.0.0"; sha256="0il8caxwinjpcf4gfimi07b7ccv5v916s2968vy2vdx6439y1rss"; depends=[]; }; - IC2 = derive { name="IC2"; version="1.0-1"; sha256="03jjb62msxjxdg9l3zd1ns0d2w37hkxy5pnjgaywxw3vfk4zwfj9"; depends=[]; }; - ic50 = derive { name="ic50"; version="1.4.2"; sha256="1a5ddmbdfr3ls132fvalbkh4yaawv9k58rgpy54s5qddrm6aas2s"; depends=[]; }; - icamix = derive { name="icamix"; version="1.0"; sha256="1ain8fnyy4bj306zcli1c3d50sqckg88wnm0ppni0crwxvqcvvkm"; depends=[Rcpp]; }; - icaOcularCorrection = derive { name="icaOcularCorrection"; version="3.0.0"; sha256="1vmvarc2apipd0vlhprc5wpgh8i38m5myj1gqdymjrnky0azq17f"; depends=[fastICA mgcv]; }; - icapca = derive { name="icapca"; version="1.0"; sha256="1m8z5444y06wadc63zlb1x3qfgam81j78nvzzxlpxijydzh8xla8"; depends=[]; }; - ICC = derive { name="ICC"; version="2.2.1"; sha256="1xl8x8ddbrk8ma57mybmmv9m096wlpbas7hsmd2c6qzcrlz6i7wa"; depends=[]; }; - icd9 = derive { name="icd9"; version="0.5"; sha256="128gv2yxylncmbr6b1qz82ys7aanqxf35psrmrh2i4l84w3w5l8g"; depends=[memoise]; }; - ICE = derive { name="ICE"; version="0.69"; sha256="04p8lakaha28mdh965w0ppyxfrz5ssi1n9xifvsbn3ihdra67rip"; depends=[KernSmooth]; }; - ICEbox = derive { name="ICEbox"; version="1.0"; sha256="1m3p0b93ksrcsp45m4gszcz01cwbfpj4ldar6l0q3c9lmyqsznx8"; depends=[sfsmisc]; }; - ICEinfer = derive { name="ICEinfer"; version="1.0-1"; sha256="0gjgr1r33w6d5ra0njh15lj46lw6v751yl8iqrdf4a5pazs7w3lm"; depends=[lattice]; }; - icensmis = derive { name="icensmis"; version="1.2.1"; sha256="1h4l9irip4hv34hr92j8756qgmy455mfdblr7ypgsgvr27cgax8h"; depends=[Rcpp]; }; - ICGE = derive { name="ICGE"; version="0.3"; sha256="0xin7zml1nbygyi08hhg3wwr2jr1zcsvrlgia89zp4xanxlzgaqa"; depends=[MASS cluster]; }; - ic_infer = derive { name="ic.infer"; version="1.1-5"; sha256="0nmx7ijczzvrv1j4321g5g5nawzll8srf302grc39npvv1q17jyz"; depends=[quadprog mvtnorm boot kappalab]; }; - iCluster = derive { name="iCluster"; version="2.1.0"; sha256="09j36xv87d382m5ijkhmp2mxaajc4k97cf9k1hb11ksk7fxdqz6r"; depends=[lattice caTools gdata gtools gplots]; }; - icomp = derive { name="icomp"; version="0.1"; sha256="0xpjbfb9lxgsby9fj5lbb4nkl6zy8k4whqpgdqq5ndzy7zgq1lvm"; depends=[]; }; - ICS = derive { name="ICS"; version="1.2-4"; sha256="1sfm9ymrrl72jzg8gsdw6v4q20i4s2w4syyr7brlvan136khpqyn"; depends=[mvtnorm survey]; }; - ICSNP = derive { name="ICSNP"; version="1.0-9"; sha256="0kisk7wk0zjsr47hgrmz5c8f2ljsl7x4549a1rwzsfkjz8901qka"; depends=[mvtnorm ICS]; }; - ICsurv = derive { name="ICsurv"; version="1.0"; sha256="1mbndpy3x5731c9y955wscy76jrxlgv33bf6ldqp65cwyvdgxl86"; depends=[MASS matrixcalc]; }; - idbg = derive { name="idbg"; version="1.0"; sha256="1rxmj04hswxybrg7dfib3mjy8v8mdiv13zwbscp2q55z55hhf1m5"; depends=[]; }; - identity = derive { name="identity"; version="0.2-1"; sha256="1j5wb5cj5j49in2g6r1shdm4ri4cfzj22hpqazvcmq4dm291sdi9"; depends=[]; }; - IDPmisc = derive { name="IDPmisc"; version="1.1.17"; sha256="0nbwdyg9javjjfvljwbp2jl0c6414c11zb2pirmm5pmimaq9vv0q"; depends=[lattice]; }; - IDPSurvival = derive { name="IDPSurvival"; version="1.0"; sha256="1v1w0i74b065b4qc302xbdl5df7qx9z8jmbc9cn46fqm1hh2b6d7"; depends=[Rsolnp gtools survival]; }; - idr = derive { name="idr"; version="1.1.1"; sha256="0shwwyvc4j32grxanhyqk66aykzy5bzic2004krvzbmcb5cr1sgb"; depends=[]; }; - iDynoR = derive { name="iDynoR"; version="1.0"; sha256="01702vl10191mbq2wby1m0y6h8i6y6ic4pa83d27cg3yccsrhziz"; depends=[XML vegan]; }; - ieeeround = derive { name="ieeeround"; version="0.2-0"; sha256="0xaxrlalyn8w0w4fva8fd86306nvw3iyz44r0hvay3gsrmgn3fjh"; depends=[]; }; - ifa = derive { name="ifa"; version="7.0"; sha256="1cxafd7iwvyidzy27lyk1b9m27vk785ipj9ydkyx9z1v0zna2wnl"; depends=[mvtnorm]; }; - iFad = derive { name="iFad"; version="3.0"; sha256="0jrl9bayihp3wb4k5w9kc71qlsdxk7vl83ydfibx2bg79c4hf3cs"; depends=[Rlab MASS coda ROCR]; }; - ifs = derive { name="ifs"; version="0.1.4"; sha256="0fzani8rnn4rdwlghq967hhi4zfjnk3gwpk3v6wys738xj7yfwp1"; depends=[]; }; - ifultools = derive { name="ifultools"; version="2.0-0"; sha256="0xgd4j09kixsv653cj5h1kyf9jfzz8nhc85xixbcpz3yn0fqbn00"; depends=[splus2R MASS]; }; - iGasso = derive { name="iGasso"; version="1.2"; sha256="123487slizsmw5b0imwqll8n03navx30kvawr6jfibbjfdd8vfn7"; depends=[lattice CompQuadForm]; }; - IgorR = derive { name="IgorR"; version="0.7.1"; sha256="1ahj1ckzjffsskicdy2b70pzx5cn2r0s22yg1ajwiyy4ykwcg4pk"; depends=[bitops]; }; - igraph = derive { name="igraph"; version="0.7.1"; sha256="1nvb30zjjw861idbd8zap9qqg22k87zdi6qqvjf1s29v7hkx7kq7"; depends=[Matrix]; }; - igraphdata = derive { name="igraphdata"; version="0.2"; sha256="0hm757fc2snqlav3wx1vdmwy2gr5cskig97c2zlvk88sfwgx4i2m"; depends=[]; }; - igraphtosonia = derive { name="igraphtosonia"; version="1.0"; sha256="0vy9jnpjp68l8s0hi1l57j9p41c543h3iqv16pwl550f38zqp8j6"; depends=[igraph]; }; - IM = derive { name="IM"; version="1.0"; sha256="1f1vr5zfqnanc5xmmlfkjkvxwbyyysi3mcvkg95p8r687a7zl0cx"; depends=[png jpeg bmp]; }; - Imap = derive { name="Imap"; version="1.32"; sha256="0b4w0mw9ljw6zxwvi0qzb08yq9n169lzgkdcwizrd07x9k9xjxs7"; depends=[]; }; - imguR = derive { name="imguR"; version="1.0.0"; sha256="0yhlir0qxi6hjmqlmmklwd4vkymc5bzv9id9dlis1fr1f8a64vwp"; depends=[RCurl httr png jpeg]; }; - IMIS = derive { name="IMIS"; version="0.1"; sha256="09zb48vdj0i3vf8vxrs07xwb9ji27vp2fyvmg6jfq631licsryc2"; depends=[mvtnorm]; }; - ImpactIV = derive { name="ImpactIV"; version="1.0"; sha256="1bb6gw1h15hscr71hy779k2x5ywzx63ylim3hby02d7fnnj46p58"; depends=[nnet]; }; - imprProbEst = derive { name="imprProbEst"; version="1.0.1"; sha256="09y8yd9sw0b79ca45ryi7p82vy5s8cx0gg603rlc39lgwcdv45i3"; depends=[inline lpSolve]; }; - imputeLCMD = derive { name="imputeLCMD"; version="1.0"; sha256="0avgl8wwwsz27z439y415lv4h33af58db084mjr236y1z9sfhdyw"; depends=[tmvtnorm norm]; }; - imputeMDR = derive { name="imputeMDR"; version="1.1.2"; sha256="0ds5a4wav9vb9z5nji8hv5l76310rd970xf702fd0ckx1sh6rgd7"; depends=[]; }; - imputeR = derive { name="imputeR"; version="1.0.0"; sha256="18rx70w7xb33m84ifxl3p599js78pa748c9lmlkic6yqrgsabcip"; depends=[caret reshape2 glmnet pls rda Cubist ridge gbm mboost rpart]; }; - imputeYn = derive { name="imputeYn"; version="1.1"; sha256="12hdx7bwpm4jickpbj7cswjsl6f772ibzaf3d79q24n24ymw576h"; depends=[quadprog emplik mvtnorm]; }; - in2extRemes = derive { name="in2extRemes"; version="1.0-1"; sha256="0k5qczs54b7bl71my8xmnqly91g7c5skj0lm2g8dk4hgrx6wwsrf"; depends=[extRemes]; }; - inarmix = derive { name="inarmix"; version="0.4"; sha256="11a1vaxq22d5lab07jp5pw0znkaqj6bmkn6vsx62y6m4mmqk04yr"; depends=[Matrix Rcpp]; }; - incReg = derive { name="incReg"; version="1.0"; sha256="1kckx64hn8g9wvjg7g9xild5hclim1rs7z2m7rgmbdwlbayxpwgv"; depends=[car]; }; - IndependenceTests = derive { name="IndependenceTests"; version="0.2"; sha256="04qfh2mg9xkfnvp6k7w1ip4rb663p3pzww9lyprcjvr3hcac7gqa"; depends=[xtable]; }; - indicspecies = derive { name="indicspecies"; version="1.7.2"; sha256="1spf70a42kc5yg62zi9a2dvdyh5npc67bcln4zqcg7dyachw3f2n"; depends=[permute sp rgeos]; }; - ineq = derive { name="ineq"; version="0.2-13"; sha256="09fsxyrh0j7mwmb5hkhmrzgcy7kf85jxkh7zlwpgqgcsyl1n91z0"; depends=[]; }; - InfDim = derive { name="InfDim"; version="1.0"; sha256="0rh3ch0m015xjkxy08vf9pc6q7azjc6sgicd2j6cwh611pqq39wq"; depends=[]; }; - inference = derive { name="inference"; version="0.1.0"; sha256="0j92isfkbhk13yx2hd3a5dd7ikcbgjc04zisd1n5kmg6ajw2aj6r"; depends=[sandwich]; }; - InferenceSMR = derive { name="InferenceSMR"; version="1.0"; sha256="13d3v8kyk6br33659jgql6j1nqmnd8zszqrwfw2x3khkiqzgdmhk"; depends=[survival]; }; - inflection = derive { name="inflection"; version="1.1"; sha256="1nb1pf07c371vwgplfyjs3q1iqgb5hyk9czxqrjiy18g8p7zdln2"; depends=[]; }; - influence_ME = derive { name="influence.ME"; version="0.9-4"; sha256="1smvhr72vnds20x71986idk6rak69g28dddlf9g2ivg0ajkji5q9"; depends=[lme4 Matrix lattice]; }; - influence_SEM = derive { name="influence.SEM"; version="1.4"; sha256="1grsnp8xwmhh9qx0yc5fy8b3g4i4cfqbg6sfzbmn39si2z34wrxw"; depends=[lavaan]; }; - infoDecompuTE = derive { name="infoDecompuTE"; version="0.5.1"; sha256="1aigd1fvpdqjplq1s1js0sy8px68q73lbp5q591rn52c77smdhaj"; depends=[MASS]; }; - informR = derive { name="informR"; version="1.0.04"; sha256="0s40hlilk8fjld2m43f2m50a3764qgnv07y5jwv60a8d0nf4gpa2"; depends=[abind relevent]; }; - infotheo = derive { name="infotheo"; version="1.2.0"; sha256="18xacczfq3z3xpy434js4nf3l19lczngzd0lq26wh22pvg1yniwv"; depends=[]; }; - infutil = derive { name="infutil"; version="1.0"; sha256="02d0hfbkdqjj0lm1fzwwxy60831kbcjn2m4rfblpib0krkbpz72n"; depends=[ltm]; }; - INLABMA = derive { name="INLABMA"; version="0.1-5"; sha256="1z5mwibgrc0hrwjq70pm49l5ppcwwm5z4slc1madr291w37awi51"; depends=[Matrix spdep]; }; - inline = derive { name="inline"; version="0.3.13"; sha256="1dijlcnm7wfd6jgy6wsj6imwg43f91cl7iiz5j2jhhavw2pczr62"; depends=[]; }; - inlinedocs = derive { name="inlinedocs"; version="2013.9.3"; sha256="13vk6v9723wlfv1z5fxmvxfqhaj68h0x3s2qq9j6ickr4wakb4ar"; depends=[]; }; - InPosition = derive { name="InPosition"; version="0.12.7"; sha256="1f7xb2kxikmja4cq7s1aiwhdq27zc6hghjbliqqpm8ci8860lb8p"; depends=[prettyGraphs ExPosition]; }; - insideRODE = derive { name="insideRODE"; version="2.0"; sha256="1ffndk8761cpkririb3g1qsq9nwmh82lcrpql9i5fksdprvdjzcw"; depends=[deSolve nlme lattice]; }; - insol = derive { name="insol"; version="1.1.1"; sha256="0zbawkp4qb0kqb7y9ibiyy8sa9rfgbzwmcdswx6s87p0h7brrqn6"; depends=[]; }; - intamap = derive { name="intamap"; version="1.3-37"; sha256="17l1bifks0vsk0a3bj2g4w8qrvhmdh0p145kmd09223x9yc4mc9v"; depends=[sp gstat automap mvtnorm MASS evd]; }; - intamapInteractive = derive { name="intamapInteractive"; version="1.1-10"; sha256="073k6sdds40fmlbw1xnp3x5sc9qdyq2s1bhp7av4jjm930hsvsrn"; depends=[intamap spcosa spatstat automap gstat]; }; - intcox = derive { name="intcox"; version="0.9.3"; sha256="1m1lzmymh2pk570k6nxq3nj7wxkvs1s3nvz8cb456fnv72ng8fap"; depends=[survival]; }; - integrOmics = derive { name="integrOmics"; version="2.55"; sha256="1c9vkhvnndhs3h9qzcg3pvizjk9rhgk8gccaxh33spgr4rql8vcw"; depends=[]; }; - Interact = derive { name="Interact"; version="1.1"; sha256="1g9zhafdpr7j410bi8p03d8x9f8m3n329x8v01yk15f65fp7pl1d"; depends=[]; }; - InteractiveIGraph = derive { name="InteractiveIGraph"; version="1.0.6.1"; sha256="0srxlp77xqq0vw2phfv7zcnqswi2i5nzkpqbpa5limqx00jd12zy"; depends=[igraph]; }; - interAdapt = derive { name="interAdapt"; version="0.1"; sha256="06ki36l1mrnd9lbm696a6gapr488dz8na4wvl9y1fif9hfv4zk25"; depends=[shiny knitcitations RCurl mvtnorm knitr]; }; - intergraph = derive { name="intergraph"; version="2.0-0"; sha256="0y5cd7y08p86fxm4zqraj81sj5a5h7725wvzcyxd8p1q3ky2sj9f"; depends=[network igraph]; }; - Interpol = derive { name="Interpol"; version="1.3.1"; sha256="1598lnnrcxihxysdljphqxig15fd8z7linw9byjmqypwcpk6r5jn"; depends=[]; }; - Interpol_T = derive { name="Interpol.T"; version="2.1.1"; sha256="1fbsl1ypkc65y6c0p32gpi2a2aal8jg02mclz7ri57hf4c1k09gz"; depends=[date chron]; }; - InterVA4 = derive { name="InterVA4"; version="1.4"; sha256="06yq0zfpakw4ifg8i5jazsbh6k62ksnpw7b02kyc2phi67gvj84k"; depends=[]; }; - interval = derive { name="interval"; version="1.1-0.1"; sha256="1lln9jkli28i4wivwzqrsxvv2n15560f7msjy5gssrm45vxrxms8"; depends=[survival perm MLEcens]; }; - intervals = derive { name="intervals"; version="0.14.0"; sha256="0hqifkb8pbx0v42z3s78nm38b3ixi0vycq8kba4mv3w8v7zcfbxb"; depends=[]; }; - interventionalDBN = derive { name="interventionalDBN"; version="1.2.2"; sha256="0wpp4bfi22ncvl0vdivniwwvcqgnpifpgxb4g5jbyvr0z735cd9w"; depends=[]; }; - IntLik = derive { name="IntLik"; version="1.0"; sha256="13ww5bsbf1vnpaip0w53rw99a8hxzziibj7j66cm31jmi8l6fznf"; depends=[maxLik]; }; - intpoint = derive { name="intpoint"; version="1.0"; sha256="0zcv64a0clgf1k3ylh97q1w5ddrv227846gy9a68h6sgwc0ps88b"; depends=[]; }; - inTrees = derive { name="inTrees"; version="1.1"; sha256="1b88zy4rarcx1qxzv3089gzdz1smga6ssj8cxxccyyzci6px85j1"; depends=[RRF arules gbm xtable]; }; - intReg = derive { name="intReg"; version="0.1-2"; sha256="1sm7v4fnfsdhyqr3q8dms0ifwb00hzf3x1g0fpm7xldlqc3wf6pr"; depends=[maxLik sets sets]; }; - intRegGOF = derive { name="intRegGOF"; version="0.85-1"; sha256="0fyvhl6jmi6krfbimsq61dhixlz9h9jxk4yjvwbx2vl8d9fnnr54"; depends=[]; }; - introgress = derive { name="introgress"; version="1.2.3"; sha256="1j527gf7pmfy5365p2j2jbxq0fb0xh2992hj4d7dxapn4psgmvsk"; depends=[nnet genetics RColorBrewer]; }; - intsvy = derive { name="intsvy"; version="1.3"; sha256="0743kn95njgv31yhl21h35k9fv78czdw3w669wsvzf35gasxak3y"; depends=[memisc foreign plyr]; }; - InventorymodelPackage = derive { name="InventorymodelPackage"; version="1.0.2"; sha256="1w35idsagl9v93ci3qmal3xbf11sy6h1k7xnv25c59ivfnpjpkva"; depends=[e1071]; }; - investr = derive { name="investr"; version="1.1.0"; sha256="1r01dk2xkg2j56xig7yrczbks2kllcszwdj9ih3xxxk16hgb1cgd"; depends=[]; }; - invGauss = derive { name="invGauss"; version="1.1"; sha256="0l93pk2sh74dd6a6f3970nval5p29sz47ynzqnphx0wl3yfmmg9c"; depends=[survival optimx]; }; - io = derive { name="io"; version="0.1"; sha256="1yvyxp45y1v1lrksga5gfjqb2w509l3v817830ya5f740h517l74"; depends=[]; }; - ipdmeta = derive { name="ipdmeta"; version="2.4"; sha256="0k9wqpmrvqdh73brmdzv86a2dbyddjyyyqzqgp1vqb3k48k009s2"; depends=[nlme]; }; - ipdw = derive { name="ipdw"; version="0.2-1"; sha256="18qvw635dy9ddz16nn0j4s0n97nbyw7yb4a8v1m0f5v9prggj7py"; depends=[gdistance raster]; }; - ipfp = derive { name="ipfp"; version="1.0"; sha256="1hpfbgygnpnl3fpx7zl728jyw00y3kbbc5f0d407phm56sfqmqwi"; depends=[]; }; - iplots = derive { name="iplots"; version="1.1-7"; sha256="052n8jdhj8gy72xlr23dwd5gqycqnph7s1djg1cdx2f05iy693y6"; depends=[rJava png]; }; - IPMpack = derive { name="IPMpack"; version="2.1"; sha256="08b79g5a9maxnxladvc2x2dgcmm427i8p6hhgda3mw2h5qmch2q3"; depends=[Matrix MASS nlme]; }; - ipred = derive { name="ipred"; version="0.9-3"; sha256="07mw1mdlczlpy232n2sacwncdjcsn6mv7rrzk9xvl2g85pn3bhjl"; depends=[rpart MASS survival nnet class prodlim]; }; - IPSUR = derive { name="IPSUR"; version="1.5"; sha256="0brh3dx7m1rilvr1ig6vbi7p13bfbblgvs8fc114f08d90fczwnq"; depends=[]; }; - IQCC = derive { name="IQCC"; version="0.6"; sha256="0gsnkdl4cfxzq6pm9g4i1g23mxg108j3is4x69id1xn2plf92m04"; depends=[qcc MASS micEcon miscTools]; }; - iqLearn = derive { name="iqLearn"; version="1.2"; sha256="160nl63bxr9ira7v89ags9fm7zd5v09h1820i8bq5wxxfcyjarja"; depends=[]; }; - irace = derive { name="irace"; version="1.05"; sha256="0192i7mv9yibvjv140iapa4qjqyv87kdw76csmwsjlgs3yrr228h"; depends=[]; }; - iRefR = derive { name="iRefR"; version="1.13"; sha256="17kjfga62xc4s1kii5clxszbag2dr1dyxfm7jasr20prx28ya6pp"; depends=[igraph]; }; - iRegression = derive { name="iRegression"; version="1.2"; sha256="1fn25xnrvgx2ayhss136rxn1h3c9pvq2gmb5kbp92vsf07klvh6v"; depends=[mgcv]; }; - iRepro = derive { name="iRepro"; version="1.0"; sha256="1knncn47pl411r31z1r5ipsiyagcpjbc2gb972n7l3539pcpf0zy"; depends=[]; }; - irlba = derive { name="irlba"; version="1.0.3"; sha256="1h2ymk9hg9xj2075w715742j23jl7kqa4cgzl1jvr48gcysq5byy"; depends=[Matrix]; }; - irr = derive { name="irr"; version="0.84"; sha256="0njxackqj8hyf9j1yszwxbnaxgp27fc2bwyyf7dip72wc12f81n5"; depends=[lpSolve]; }; - irtoys = derive { name="irtoys"; version="0.1.7"; sha256="11nz675haigs6vg08qjibs8yccy2pbz0b9r8761fs8gw3n7bpfz4"; depends=[sm ltm]; }; - irtProb = derive { name="irtProb"; version="1.2"; sha256="12wnvbzkh0mx9i3iyh1v2n2f2wjsjj7ad3dgv9xj949x4nbz16j0"; depends=[lattice moments]; }; - irtrees = derive { name="irtrees"; version="0.1.0"; sha256="03jmfyx1ia987zhi74fmmcdz70wnm8c7z5z30rwzd1cs11dijjwv"; depends=[]; }; - isa2 = derive { name="isa2"; version="0.3.3"; sha256="0czviglmbb7hmhghrg4hla4xhbjr98a5ivqkbq70rnfmqzffcxcz"; depends=[]; }; - ISBF = derive { name="ISBF"; version="0.2"; sha256="0vhxazbm56pli8m931l1kkica4spf50yclr3yhbwx3539775421a"; depends=[]; }; - iScreen = derive { name="iScreen"; version="1.0"; sha256="09iyimzrx7510xamhl6w1f7p6j096wh5yck9zgwbk87mvabqynmg"; depends=[maptree]; }; - isdals = derive { name="isdals"; version="2.0-1"; sha256="0r4dwfz18aai38wg213pn3gny9sh42nm19p6swxmzrkrigiwy4qa"; depends=[]; }; - ISDA_R = derive { name="ISDA.R"; version="1.0"; sha256="0w6p2iy6s7fy8pw2cf4b5zhqcgjjwd5bkax1aqflaaj4ppmfx64v"; depends=[scatterplot3d]; }; - IsingFit = derive { name="IsingFit"; version="0.2.0"; sha256="03858wnz9si8r9qlwg5hx0xai4kfn6nnh0mfmias6f5wkgjj0niv"; depends=[qgraph Matrix glmnet]; }; - isingLenzMC = derive { name="isingLenzMC"; version="0.2.1"; sha256="1g1rz8p9vw2jnx6qw9mb614fpkv5bd7cndwcz0mva33y5shhnibl"; depends=[]; }; - IsingSampler = derive { name="IsingSampler"; version="0.1.1"; sha256="068fy16fw2ja25mllyw4z3bn17pxdq17zg75zwlwmljds6psa1gk"; depends=[Rcpp plyr]; }; - ISLR = derive { name="ISLR"; version="1.0"; sha256="0gmhvsivhpq3x8a240lgcbv1qzdgf6wxms4svak1501clc87xc6x"; depends=[]; }; - ismev = derive { name="ismev"; version="1.39"; sha256="0z5pam5lq72jv13gy40l35nvpk5hfcg3sq14mwhjqd129670gjbv"; depends=[mgcv]; }; - Iso = derive { name="Iso"; version="0.0-15"; sha256="18ig772xxsbj1vhrv7b20hrglnnz742s1mjzhwx02bpjhica4a46"; depends=[]; }; - IsoCI = derive { name="IsoCI"; version="1.1"; sha256="0r7ksfic6p2v95c953s4gbzzclk4ldxysm8szb8xba1w0nx2izil"; depends=[KernSmooth]; }; - isocir = derive { name="isocir"; version="1.1-3"; sha256="1bx68n9wyfs2dcgph66rsy0jw8hjkl5kw212l0563kz3m1nik9sr"; depends=[circular combinat]; }; - ISOcodes = derive { name="ISOcodes"; version="2014.03.24"; sha256="0a6ap9a5h88c6iqzlqfalcg1fwm9x7rm3c8z9vwxfw6jrjs6v2cp"; depends=[]; }; - IsoGene = derive { name="IsoGene"; version="1.0-22"; sha256="097xxgqdk2j7y22qflrgss9pgbyg01rcw5088b43pbv3sc85fqcs"; depends=[Iso xtable ff]; }; - isopam = derive { name="isopam"; version="0.9-12"; sha256="16zkw6y57i46w6v6z8zh0p2mapqry35ibl54vpb5mwp6six2hklk"; depends=[vegan cluster]; }; - isopat = derive { name="isopat"; version="1.0"; sha256="0fznvgycyd35dh7pbq1xhp667gsficlmycn5pcrqcbs89069xr1s"; depends=[]; }; - isotone = derive { name="isotone"; version="1.0-1"; sha256="1miq1d35kl5br8jl0lv2jjn8nbhjzy92lqd4jzgi374g7cxyclp1"; depends=[]; }; - isotonic_pen = derive { name="isotonic.pen"; version="1.0"; sha256="1lgw15df08f4dhrjjfr0jqkcvxwad92kflj2px526pcxwkj7cj3i"; depends=[coneproj Matrix]; }; - IsotopeR = derive { name="IsotopeR"; version="0.4.7"; sha256="18gwmh4nprj4z0ar1w8npj2ymxihw5ydwa33g25mimjk8y2cs0x5"; depends=[coda fgui runjags]; }; - ISOweek = derive { name="ISOweek"; version="0.6-2"; sha256="1f1h8pgjaa14cvaj8ldl87b4vslxwvyfj46m0hkylwp73sv3g2mm"; depends=[stringr]; }; - isva = derive { name="isva"; version="1.8"; sha256="09mrvvk09j460dzi45z8hwdpmibfshsii5dcp38g13czr40d48na"; depends=[fastICA]; }; - ISwR = derive { name="ISwR"; version="2.0-6"; sha256="1ms4lm1skfqaq4mnm03kvjb7kaxdzv72s6i77zp7z17gzfa40c9h"; depends=[]; }; - iteRates = derive { name="iteRates"; version="3.1"; sha256="1dycmlm3vldc60wz2jjdfbla14383911zfahgal5mx8whxwq95c5"; depends=[partitions VGAM MASS ape apTreeshape geiger gtools]; }; - iterators = derive { name="iterators"; version="1.0.7"; sha256="1zwqawhcpi95fx4qqj4cy31v5qln2z503f7cvv9v5ch3ard4xxqv"; depends=[]; }; - iterLap = derive { name="iterLap"; version="1.1-2"; sha256="0ixh9aw115496ib0iswfsj97rjcd2f02z116dg57vl9hhzh28f13"; depends=[quadprog randtoolbox]; }; - iterpc = derive { name="iterpc"; version="0.2.5"; sha256="1sqb4d3whljmvbik9a0xc1chna8jbshpidzb2xjxsm0h66lavxki"; depends=[Rcpp polynom]; }; - itertools = derive { name="itertools"; version="0.1-3"; sha256="1ls5biiva10pb1dj3ph4griykb9vam02hkrdmlr5a5wf660hg6xn"; depends=[iterators]; }; - 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]; }; - itsmr = derive { name="itsmr"; version="1.5"; sha256="0l9m5is6d6pkpfkihx0jir5iv8zmqqav8vh9bkkpqv5iz61p4kxb"; depends=[]; }; - IUPS = derive { name="IUPS"; version="1.0"; sha256="01pv03ink668fi2vxqybli0kgva13gxhqfdxkwz6qk5rnpzwvf5w"; depends=[R2jags Matching boot]; }; - ivbma = derive { name="ivbma"; version="1.02"; sha256="0ay7ghrygllpgh7cagrk1f56hxw1s1wfv4bap78javiyj6jgwfzy"; depends=[]; }; - ivfixed = derive { name="ivfixed"; version="1.0"; sha256="0a26zrkvz0ffq4zxdx5vhr1nvsi9c15s6gvc1zy2pddjz31x2xi5"; depends=[Formula]; }; - ivivc = derive { name="ivivc"; version="0.2.0"; sha256="0dsmdhy8iv96xvlm734vh16gva10gh9dij9vqlnj6l782cffs04w"; depends=[reshape sciplot png deSolve minpack_lm]; }; - ivlewbel = derive { name="ivlewbel"; version="1.1"; sha256="0ykcfikm2i28s3fm6zzx8cjvpwhksg8an0rfr0b35gf7p69brgag"; depends=[gmm plyr lmtest]; }; - ivpack = derive { name="ivpack"; version="1.1"; sha256="058g73n3gbpwdav4n78n1wfskfp518wkk220a55x5h82i77a5n6a"; depends=[AER sandwich lmtest]; }; - iWeigReg = derive { name="iWeigReg"; version="1.0"; sha256="09ajbqllr4ajmpk8qs6qw019fx8a7vsabm37867zycssn77z9nc8"; depends=[MASS trust]; }; - iwtp = derive { name="iwtp"; version="1.0.0"; sha256="1q3nrp526kzkz74vjxvzm6dgdwlsmx7n034a06sqw210z9mqw3dr"; depends=[survival]; }; - jaatha = derive { name="jaatha"; version="2.5"; sha256="06p04lbxkxg3lbs5idg27iknhkz5j6mcv1mjd4bnxpfcmhhcl4k3"; depends=[phyclust Rcpp reshape2]; }; - jackknifeKME = derive { name="jackknifeKME"; version="1.0"; sha256="1vkxp6z4fb73azndk6iis2ckv3ch5c5lrpf5x4ah56z3wd785v9v"; depends=[imputeYn survival]; }; - jackstraw = derive { name="jackstraw"; version="1.0"; sha256="1irfzivy7c9fb2pr98flx05s5hkk6sid1hkd5b3k9m9mgs6ixbfy"; depends=[corpcor]; }; - JADE = derive { name="JADE"; version="1.9-91"; sha256="142a7cq2rpl746m1lcsr5da50zhc0zddxzc8dxddc87qszf920jw"; depends=[clue]; }; - JASPAR = derive { name="JASPAR"; version="0.0.1"; sha256="0wiyn7cz45hwy9zkvacx28zdrg78q6715cg4r9xgcb39q25s0dcy"; depends=[gtools]; }; - JavaGD = derive { name="JavaGD"; version="0.6-1"; sha256="13n6xzbbjgd0bpwv2xgm3dlscg87wh32q6fcq50kk6byp6yv05sc"; depends=[]; }; - 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]; }; - JGR = derive { name="JGR"; version="1.7-16"; sha256="0iv659mjsv7apzpzvmq23w514h6yq50hi70ym7jrv948qrzh64pg"; depends=[rJava JavaGD iplots]; }; - JM = derive { name="JM"; version="1.3-0"; sha256="0yn33dvy9kp7xaxlqk11f86qaichdcxpmq04gpnbcs8w8cdjjz3m"; depends=[MASS nlme survival]; }; - JMbayes = derive { name="JMbayes"; version="0.6-1"; sha256="1zshy4v7jj3r1vcp9yrw1jj5abmc8wkglsxdb5v6rpmk4xwhvvcq"; depends=[MASS nlme survival]; }; - Jmisc = derive { name="Jmisc"; version="0.3.1"; sha256="1szn29dng54l2xmrm6pg3d5rmwdc1ks23vsnsmplnr5rx7yj002s"; depends=[]; }; - Johnson = derive { name="Johnson"; version="1.4"; sha256="12ajcfz5mwxvimv8nq683a2x3590gz0gnyviviyzf5x066a4q0lj"; depends=[]; }; - JohnsonDistribution = derive { name="JohnsonDistribution"; version="0.24"; sha256="00211pa2wn4bsfj6wfl9q9g123cp8iz3kxc17pw9q65j9an4sr0m"; depends=[]; }; - joineR = derive { name="joineR"; version="1.0-3"; sha256="0q98nswbxk5dz8sazzd66jhlg7hv5x7wyzcvjc6zkr6ffvrl8xj7"; depends=[nlme MASS boot survival lattice statmod gdata]; }; - jointDiag = derive { name="jointDiag"; version="0.2"; sha256="0y1gzrc79vahfhn4jrj5xys8pmkzxj4by7361730gi347f0frs0a"; depends=[]; }; - jointPm = derive { name="jointPm"; version="2.3.1"; sha256="1c2cn9sqwfyv9ksd63w8rrz0kh18jm2wv2sfdkgncjb7vfs4hbv9"; depends=[]; }; - JointRegBC = derive { name="JointRegBC"; version="0.1.1"; sha256="0w7ygs3pvlqkkb2x20kv20kda3gz7cn6zgrkg30nhjxp318d76ab"; depends=[nlme MASS survival]; }; - JOP = derive { name="JOP"; version="3.6"; sha256="1kpb1dy2vm4jgzd3h0qgdw53nfp2qi74hgq5l5inxx4aayncclk7"; depends=[Rsolnp dglm]; }; - JoSAE = derive { name="JoSAE"; version="0.2.2"; sha256="1ag4qg9cfcg8i2xz79bza2qlw3azw33h7k2ip5nlfkfpd33l9w05"; depends=[nlme]; }; - jpeg = derive { name="jpeg"; version="0.1-8"; sha256="05hawv5qcb82ljc1l2nchx1wah8mq2k2kfkhpzyww554ngzbwcnh"; depends=[]; }; - JPSurv = derive { name="JPSurv"; version="1.0.1"; sha256="11hfji0nyfmw1d7y2cijpp7ivlv5s9k8g771kmgwy14wflkyf7g2"; depends=[]; }; - jSonarR = derive { name="jSonarR"; version="1.0"; sha256="1369v79y2679p1c1s6pfi0zdj21zbbln3a4gqsxivx82m0lwqprp"; depends=[RCurl]; }; - jsonlite = derive { name="jsonlite"; version="0.9.11"; sha256="4e6d86dfd1584ed2b96b1eb6c067b07847df5fff673d07ffacca6399c330552e"; depends=[]; }; - jtrans = derive { name="jtrans"; version="0.1"; sha256="1wcrjyifsnpk9jfmwc1cx30qp5vavwl87i0avbbls8cmji7z0nay"; depends=[]; }; - JudgeIt = derive { name="JudgeIt"; version="1.5.1"; sha256="1jssz1x9gw9hjpqlqbvlxa99icl8gffzl6qya0cnaxr50p82hdag"; depends=[]; }; - Julia = derive { name="Julia"; version="1.0"; sha256="0df72mjkfsaz7wbrg3l6fcypwm59hdxxndjv1b833xa4qpq5301g"; depends=[]; }; - jvmr = derive { name="jvmr"; version="2.11.1.1"; sha256="18hb0pwyrgnrs16w4hl44i401604qfj0hwv2fggm8s21qxb35x9x"; depends=[rJava]; }; - KANT = derive { name="KANT"; version="1.0"; sha256="0k5i1fwbmc1cg9p2zi94npkdn12lm92d7y8ncqnn64dr8ypxh2h5"; depends=[]; }; - KappaGUI = derive { name="KappaGUI"; version="1.1"; sha256="1fyx23i6j18q6swazwy2l70lg2933akh4d0k6dzvfjxrai7fvi7y"; depends=[irr]; }; - kappalab = derive { name="kappalab"; version="0.4-6"; sha256="0dmzy0d7azzfpnzbf8b7a6zgmmfwzfiybz8610asajyfsj36gszl"; depends=[lpSolve quadprog kernlab]; }; - kappaSize = derive { name="kappaSize"; version="1.1"; sha256="0jrjal8cvy2yg0qiyilmv3jl3ib5k9jg8gp2533kdsx4m0sack04"; depends=[]; }; - KappaV = derive { name="KappaV"; version="0.3"; sha256="13mmfb8ijpgvzfj20andqb662950lp9g25k5b26r5ba65p7nhva7"; depends=[PresenceAbsence maptools rgeos sp]; }; - kaps = derive { name="kaps"; version="1.0-0"; sha256="19dwvlvpm8naisch2c8265rm178jixc6klqf7ilsrz6wi5r119x5"; depends=[survival Formula coin]; }; - KATforDCEMRI = derive { name="KATforDCEMRI"; version="0.740"; sha256="1k8fihd9m26k14rvc5d5x0d9xc3mh8d49hs64p55np1acqfhg2sy"; depends=[locfit R_matlab matlab]; }; - kcirt = derive { name="kcirt"; version="0.6.0"; sha256="1gm3c89i5dq7lj8khc12v30j1c0l1gwb4kv24cyy1yw6wg40sjig"; depends=[mvtnorm snowfall corpcor]; }; - kdetrees = derive { name="kdetrees"; version="0.1.5"; sha256="1plf2yp2vl3r5znp5j92l6hx1kgj0pzs7ffqgvz2nap5nf1c6rdg"; depends=[ape distory ggplot2]; }; - kedd = derive { name="kedd"; version="1.0.0"; sha256="1llc8hqbrp1r75b28z889nik047y400g2h05a7cjaq0r2qxbcqx1"; depends=[]; }; - kelvin = derive { name="kelvin"; version="1.2-2"; sha256="0fl2yxc0dpmkhq3f7711gd08i7jlzlfncin1d6q251dfnmwd7rzf"; depends=[Bessel]; }; - Kendall = derive { name="Kendall"; version="2.2"; sha256="0z2yr3x2nvdm81w2imb61hxwcbmg14kfb2bxgh3wmkmv3wfjwkwn"; depends=[boot]; }; - kequate = derive { name="kequate"; version="1.4.0"; sha256="0vr45y4f6x3080pf3k53nifavf8mfhikz54nis66c53fs9rp0jwf"; depends=[ltm equateIRT]; }; - kerdiest = derive { name="kerdiest"; version="1.2"; sha256="16xj2br520ls8vw5qksxq9hqlpxlwmxccfk5balwgk5n2yhjs6r3"; depends=[date chron evir]; }; - kernelFactory = derive { name="kernelFactory"; version="0.2.0"; sha256="1ihghqrrndgif6kh6n0f4g3bfy5miskn3mk5ynxfcnnrfvp9h3xj"; depends=[randomForest AUC genalg kernlab]; }; - kernlab = derive { name="kernlab"; version="0.9-19"; sha256="0caqp5dp1irhwpq8lyram35r8x16qlfp6f5wzqyi5rzcz27d03sg"; depends=[]; }; - KernSmooth = derive { name="KernSmooth"; version="2.23-12"; sha256="0jlpfaf8wqa9hq7scdmgfhkvr5hi61di54slkzskg0pr7c28rlqh"; depends=[]; }; - KernSmoothIRT = derive { name="KernSmoothIRT"; version="6.1"; sha256="1hq4sykddh9sg24qrnccii89nqxmq7hnldhn8wl6y62aj0h1nrqm"; depends=[Rcpp plotrix rgl]; }; - KFAS = derive { name="KFAS"; version="1.0.4-1"; sha256="0s9mrqb1mvs77z57hx734kajbyqddcc9j20wrsmrbf8g97in61s7"; depends=[]; }; - KFKSDS = derive { name="KFKSDS"; version="1.5"; sha256="0wahqli7j851kdqi29b059gb2zm0x00fq08sixvlrcbdf3irlv3m"; depends=[]; }; - kimisc = derive { name="kimisc"; version="0.2-1"; sha256="1nbhw1q0p87w4z326wj5b4k0xdv0ybkgcc59b3cqbqhrdx8zsvql"; depends=[plyr]; }; - kin_cohort = derive { name="kin.cohort"; version="0.6"; sha256="13gnjk58m5kya9wj87klwm6h7cdqi61ba6y0cg9k1hgbc1ajy3s8"; depends=[survival]; }; - kinfit = derive { name="kinfit"; version="1.1.12"; sha256="1vh64k244lk8x7223dr29ds0qnhw7c7xdmrk86vhwshlzb8x712y"; depends=[]; }; - kinship2 = derive { name="kinship2"; version="1.6.0"; sha256="06f544yk61i1xq0rm0r5gpzwfl6rvzyg7gz8z86bjyxg0z44h3vy"; depends=[Matrix quadprog]; }; - kintone = derive { name="kintone"; version="0.1.1"; sha256="13c82vkapks9j2crrb4awnhl60ld8b1r7xmy9yv4zzch868kcl5g"; depends=[RCurl rjson]; }; - kitagawa = derive { name="kitagawa"; version="2.1-0"; sha256="1ddyd0rwwmdpbq823qass5dlp2lvi9d64wpl61ik6fghms2p9ryr"; depends=[kelvin]; }; - kknn = derive { name="kknn"; version="1.2-5"; sha256="0c1qnn1lnypjybk2p0dpfrg6hzxflzbwmjb5biq45r57bzji7im7"; depends=[igraph Matrix]; }; - klaR = derive { name="klaR"; version="0.6-12"; sha256="10nkqb1zradbvifgv1fm373mhyydgdjjgmnw2442a2lark59z3vs"; depends=[MASS combinat]; }; - klausuR = derive { name="klausuR"; version="0.12-5"; sha256="1agd432ihljww3bhm73lqdvgkd8w99jqr7fp5xwwav7mawwsirfj"; depends=[xtable psychometric]; }; - klin = derive { name="klin"; version="2007-02-05"; sha256="0j0hr4bppzk754a66q5z42h7jzfavqpxgl7y266804aginfqm1ax"; depends=[Matrix]; }; - kmc = derive { name="kmc"; version="0.1-2"; sha256="16lv8wk24cp91qg5202zhfmdhg83qw8bwiycknaml5ki820ffdlx"; depends=[rootSolve emplik Rcpp]; }; - km_ci = derive { name="km.ci"; version="0.5-2"; sha256="1l6kw8jppaa1802yc5pbfwwgac56nhwc9p076ivylhms4w7cdf8v"; depends=[survival]; }; - kmconfband = derive { name="kmconfband"; version="0.1"; sha256="10n5w8k57faqcclwshs4m66i2i5b70i6f3xq5nqlgsi2ldkysbc9"; depends=[survival]; }; - kmi = derive { name="kmi"; version="0.5"; sha256="13m9kxbyph24njp28r122gry03rpkp26ldilhjc4rnixczvnhzwi"; depends=[survival mitools]; }; - Kmisc = derive { name="Kmisc"; version="0.5.0"; sha256="0pbj3gf0bxkzczl6k4vgnxdss2wmsffqvcf73zjwvzvr8ibi5d95"; depends=[Rcpp data_table lattice knitr markdown]; }; - kml = derive { name="kml"; version="2.2"; sha256="1g8wgmvs31r3hp7y8n9pkxc9qy5fxvb3nicmzgacmghaiwbwc8g3"; depends=[clv longitudinalData]; }; - kml3d = derive { name="kml3d"; version="2.2"; sha256="1n94kfi49rgb9149bgc9043f0y5xpaclmfjr8fkwairqz5nnmgbv"; depends=[clv rgl misc3d longitudinalData kml]; }; - kmlcov = derive { name="kmlcov"; version="1.0.1"; sha256="09s9ganfsnwp22msha78g6pjr45ppyfyqjf6ci64w3w15q5qlcd9"; depends=[]; }; - KMsurv = derive { name="KMsurv"; version="0.1-5"; sha256="0hi5vvk584rl70gbrr75w9hc775xmbxnaig0dd6hlpi4071pnqjm"; depends=[]; }; - knitcitations = derive { name="knitcitations"; version="1.0-1"; sha256="0zlgia03r7am1ahbkraxqzsl649x1iidxq5s1jf1c8jkgfdjgicm"; depends=[RefManageR digest httr]; }; - knitr = derive { name="knitr"; version="1.6"; sha256="0r34ras0csvm73z6j4f606pi387mjn4dz91djkx1j6fpk5rx1f68"; depends=[evaluate digest formatR highr markdown stringr]; }; - knitrBootstrap = derive { name="knitrBootstrap"; version="0.9.0"; sha256="1cw5dvhjiypk6847qypxphfl9an54qjvd6qv029znhwijsg56mmg"; depends=[knitr markdown]; }; - knnGarden = derive { name="knnGarden"; version="1.0.1"; sha256="1gmhgr42l6pvc6pzlq5khrlh080795b0v1l5xf956g2ckgk5r8m1"; depends=[cluster]; }; - knnIndep = derive { name="knnIndep"; version="1.0"; sha256="13iav0db8qmbmnf7hxmbvcyb0d76wyd05ib8mfzmgsdcpdkn4f72"; depends=[]; }; - kobe = derive { name="kobe"; version="1.3.2"; sha256="1z64jwrq6ddpm22cvk2swmxl1j7qyz0ddk3880c7zfq6gk7f9bxl"; depends=[plyr reshape ggplot2 MASS emdbook coda]; }; - kohonen = derive { name="kohonen"; version="2.0.15"; sha256="1mamn6lwnd54jw7bbxgrxj511abn9wg5rxrm9fac7jndf00kjaim"; depends=[class MASS]; }; - kolmim = derive { name="kolmim"; version="0.2"; sha256="1cq1miny83shxas4zijcbzcnxv29vjyxj3pip8brf52sjvrj4max"; depends=[]; }; - KoNLP = derive { name="KoNLP"; version="0.76.9"; sha256="1q72irl4izb7f5bb99plpqnmpfdq4x4ymp4wm2bsyfjcxm649ya8"; depends=[rJava stringr hash tau Sejong]; }; - koRpus = derive { name="koRpus"; version="0.05-5"; sha256="03rw0yb67y652j8hcr5m4c0py0rr3gp87y0hdxpypd81rkikwhfm"; depends=[]; }; - Kpart = derive { name="Kpart"; version="1.1"; sha256="1cyml48i1jvwy4xzymijwraqpnssnkrd81q3m7nyjd5m2czjvihv"; depends=[leaps]; }; - kriging = derive { name="kriging"; version="1.0.1"; sha256="0ppkhjrz09x4b8syp6j2xjdv5gi4mjkvnqdfxv3pqcm3c7zqfdrs"; depends=[]; }; - KrigInv = derive { name="KrigInv"; version="1.3"; sha256="1zgrx0rmcaf3j3igqhvnbzjwh2dm2x5s5l027c7cbrl1rn20im0r"; depends=[DiceKriging rgenoud MASS lhs pbivnorm randtoolbox DiceView]; }; - KRLS = derive { name="KRLS"; version="0.3-7"; sha256="0dx4b68xx3saqlkbpvvrhxjscl7jr5phwqvjywxsp4qxlr3ysl79"; depends=[]; }; - krm = derive { name="krm"; version="13.11-03"; sha256="05yy06ib879j1gcgqgljkfw79a3vg2ij71w7zah4ixl7di0301la"; depends=[]; }; - ks = derive { name="ks"; version="1.9.2"; sha256="05h13g4nla3gvawsb9zf7w8cdylpf7rc6ly6lp5dbsgc9qxha5py"; depends=[KernSmooth misc3d mvtnorm rgl multicool]; }; - kSamples = derive { name="kSamples"; version="1.0"; sha256="0a4kl6508isjsbv8g7b8g9c2kmai90lwdjn0576i7l4hnqvi532b"; depends=[SuppDists]; }; - KsPlot = derive { name="KsPlot"; version="1.3"; sha256="1mzpsgzscpv888ipfh9nakhqrgw7rdinb5lwhkjk9yk7ap5lfvs0"; depends=[e1071 caret nnet MASS caTools mda glmnet randomForest mvpart]; }; - 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.4-1"; sha256="1cqbrn860lfh0bsfglmqa3vqv1jfblicfaz2albk31p9hh14hm20"; 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]; }; - l2boost = derive { name="l2boost"; version="1.0"; sha256="1p0sbvlnax4ba4wjkh3r0bmjs601k590g7bdfk6wxvlj42jxcnkl"; depends=[MASS]; }; - labdsv = derive { name="labdsv"; version="1.6-1"; sha256="0bcsjznq9w1arv503895060hkri0447fnc49nj4ynry7fi35ci22"; depends=[mgcv MASS]; }; - labeledLoop = derive { name="labeledLoop"; version="0.1"; sha256="0gq392h0sab8k7k8bzx6m7z5xpdsflldhwbpdf92zbmkbzxsz00m"; depends=[]; }; - labeling = derive { name="labeling"; version="0.2"; sha256="194awd2j33hk7p368q2npkrggkxd1xi45bj79vd8hc4jj65pzala"; depends=[]; }; - label_switching = derive { name="label.switching"; version="1.2"; sha256="149np2jqr4vffj1mb7wvnlpj4fhb3gijrdn7qx1m946pf3h13wvv"; depends=[lpSolve combinat]; }; - labeltodendro = derive { name="labeltodendro"; version="1.3"; sha256="13kpmv26zzjf5iwpr4vs797irplmaixp1agx5v80wr4lvd2hirvg"; depends=[]; }; - labstatR = derive { name="labstatR"; version="1.0.7"; sha256="1p6xav9cb7yx3n8rkh8xm1jkykf3xw974id49j558hmayq47ad4f"; depends=[]; }; - laeken = derive { name="laeken"; version="0.4.5"; sha256="1wbdj7wnyapj4wbzsclm1vyyaxid4ww72dv5v2nk64q7fbc56py0"; depends=[boot MASS]; }; - laercio = derive { name="laercio"; version="1.0-1"; sha256="0la6fxv5k9zq4pyn8dxjiayx3vs9ksm9c6qg4mnyr9vs12z53imm"; depends=[]; }; - LaF = derive { name="LaF"; version="0.6.1"; sha256="1yg498qzxzx4qpp27rwh854x7vkz8iqmny1pvcy2rvnnb8g0wk24"; depends=[Rcpp]; }; - laGP = derive { name="laGP"; version="1.1"; sha256="03xpgmab61m160vbcach218njwdkpfqvs19fvcvixvgy3hpa0prc"; depends=[]; }; - Lahman = derive { name="Lahman"; version="2.0-3"; sha256="0rsjm81yda7z73dvafhbplkp1ly5diwwmls2fgpz3pvr2hc72v1f"; depends=[]; }; - LakeMetabolizer = derive { name="LakeMetabolizer"; version="1.1"; sha256="0l2l9l2c75cmxpqi2w9cgsad2ffnx6b7wvx6xdx6mkb52kkp9sqy"; depends=[rLakeAnalyzer plyr]; }; - Lambda4 = derive { name="Lambda4"; version="3.0"; sha256="04ikkflfr0nmy1gr3gfldlh2v8mpl82k1wwnzp57d2kn75m9vbxz"; depends=[]; }; - 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]; }; - LambertW = derive { name="LambertW"; version="0.2.9.9.5"; sha256="06330zdpp2h973j841axd9nqgmy5z8gns1w2anmjw298k164mr6g"; depends=[moments gsl MASS nortest maxLik]; }; - lancet_iraqmortality = derive { name="lancet.iraqmortality"; version="0.2-0"; sha256="00f467j9lw30r6han9d3gdkyqmkqsr3hq4cvp2mc93qhpprf81cq"; depends=[foreign]; }; - landsat = derive { name="landsat"; version="1.0.8"; sha256="07zvj1yyryxk7rwgcrf1kl32p2karkkqz6xrnwy1096dg9iw2js7"; depends=[rgdal sp lmodel2 mgcv]; }; - languageR = derive { name="languageR"; version="1.4.1"; sha256="0grkhdjz9dcrgq6qwv7wpwmckn3mfv022c5wrx29b1dxafd0qzm0"; depends=[]; }; - lar = derive { name="lar"; version="0.1-2"; sha256="0qda0y4ag10kg83wxs3z754kc8c1dg2rwciy64klk7an4ln43i5b"; depends=[data_table treemap xlsx]; }; - LARF = derive { name="LARF"; version="1.1"; sha256="0mlmfd748flxf3cxj3y668azhx9v7wd2cf3c6qj56llmk5fygfbg"; depends=[]; }; - LargeRegression = derive { name="LargeRegression"; version="1.0"; sha256="05vkd6skqg19bs54vsjf3i4rwz1j3g1gmp9jj8fsnmkds46yr91y"; depends=[Matrix]; }; - lars = derive { name="lars"; version="1.2"; sha256="0blj44wqrx6lmym1m9v6wkz8zxzbjax2zl6swgdczci0ixb5nx34"; depends=[]; }; - laser = derive { name="laser"; version="2.4-1"; sha256="1f6j3xdks0w63fqjj9q8ng2m6ss90kcnsrigwal0bqskpvrpiqyz"; depends=[ape geiger]; }; - lasso2 = derive { name="lasso2"; version="1.2-19"; sha256="0zkwjsd42a6z4gylq9xbs4z8n1v7ncwvssjnn3h4yz1icjfzzlvk"; depends=[]; }; - lassoscore = derive { name="lassoscore"; version="0.5"; sha256="1nnaxy0h48p8ribg4s6sxvqmnwjvr7d9yjxxcn2j4g8pwvfpiirg"; depends=[glasso glmnet]; }; - lassoshooting = derive { name="lassoshooting"; version="0.1.5-1"; sha256="0ixjw8akplcfbzwyry9p4bhbcm128yghz2bjf9yr8np6qrn5ym22"; depends=[]; }; - latdiag = derive { name="latdiag"; version="0.2"; sha256="11fahajwky3cfbd8y5xfaiz24qf7bkifbzcnvhv7daan4gsha04z"; depends=[]; }; - latentnet = derive { name="latentnet"; version="2.5.1"; sha256="0jzdgsw3i0s0rn8199m7g4x2gwbbrc5nd7fzimhxmib99pyzvrjf"; depends=[statnet_common network ergm sna mvtnorm abind coda]; }; - Laterality = derive { name="Laterality"; version="0.9.2"; sha256="13b1mpjcq7a14dwscnfs07hahd9is2fbn4wxwh31732vv3hr7kwm"; depends=[ade4]; }; - lattice = derive { name="lattice"; version="0.20-29"; sha256="0ip6qw1kry68dqj97bh8ddpq6gfsxf3n3axc6pn3zv2n1mfv6s9s"; depends=[]; }; - latticeDensity = derive { name="latticeDensity"; version="1.0.7"; sha256="1y33p8hfmpzn8zl4a6zxg1q3zx912nhqlilca6kl5q156zi0sv3d"; depends=[splancs spdep spatstat spam]; }; - latticeExtra = derive { name="latticeExtra"; version="0.6-26"; sha256="16x00sg76mga8p5q5ybaxs34q0ibml8wq91822faj5fmg7r1050d"; depends=[RColorBrewer lattice]; }; - LatticeKrig = derive { name="LatticeKrig"; version="3.3"; sha256="1l8rw63ljc54zsmnan8z7ipgdhzy3fjqrgywspn7g1120pfl59a4"; depends=[spam fields]; }; - latticist = derive { name="latticist"; version="0.9-44"; sha256="0kx2dyyr3zn3p63r5ypaw22hdrqyjibkws3hgyc3d560shjyfafv"; depends=[lattice latticeExtra vcd gWidgets]; }; - lava = derive { name="lava"; version="1.2.6"; sha256="16vdc1j3py4jszcldprlsxjc2pzbprpj7mdj53164adiw7vfah78"; depends=[numDeriv]; }; - lavaan = derive { name="lavaan"; version="0.5-16"; sha256="1ifzhbzb57smzj22hc19d0hl1v6qg1jvilgrjy9fp0kixk1qmf80"; depends=[MASS mnormt pbivnorm quadprog]; }; - lavaan_survey = derive { name="lavaan.survey"; version="1.1"; sha256="1vscv165kilkc00pgs2s9qn404l3rv45zc9kzmrghxz42jsy04zc"; depends=[lavaan survey MASS Matrix]; }; - lava_tobit = derive { name="lava.tobit"; version="0.4-7"; sha256="1da98d5pndlbbw37k64fmr2mi1hvkhjxsmm3y9p4b772pz9i1pvj"; depends=[lava mvtnorm survival]; }; - lawstat = derive { name="lawstat"; version="2.4.1"; sha256="142plbzpvi5xy7j5m5wizhz3w1n9im9hs8byhs6kfjpdw710qn7h"; depends=[mvtnorm VGAM]; }; - lazy = derive { name="lazy"; version="1.2-15"; sha256="1pdqgvn0qpfg5hcg5159ccf5qj2nd1ibai9p85rwjpddfynk6jks"; depends=[]; }; - lazyData = derive { name="lazyData"; version="1.0.3"; sha256="1i4jry54id8hhfla77pwk3rj2cci6na36hxj7k35k8lx666fdam2"; depends=[]; }; - lazyWeave = derive { name="lazyWeave"; version="2.2.5"; sha256="18j31lbbplxvrz4wnq7hfw9qcx1s0y4c34lbxwly2wyrvzjhxybl"; depends=[Hmisc survival]; }; - lbiassurv = derive { name="lbiassurv"; version="1.1"; sha256="1i6l3y4rasqpqka7j39qjx22wjbilgc9pkp05an52aysfvfxy193"; depends=[actuar]; }; - LCA = derive { name="LCA"; version="0.1"; sha256="14nhx2fs18558zljnw56mdz3qx30v394llhzswxhznjfiiqc9z5h"; depends=[]; }; - LCAextend = derive { name="LCAextend"; version="1.2"; sha256="1y9azq9v42a3z5fq6gj8js89qblb2z93k4mg4jmw0wgkyv6mysfc"; depends=[boot mvtnorm rms kinship2]; }; - 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]; }; - LCFdata = derive { name="LCFdata"; version="2.0"; sha256="1x3vbr6hdviqvd6dxn1kb449g0q5zkfmjsmr5nxd2g82p69lv3xm"; depends=[]; }; - lcmm = derive { name="lcmm"; version="1.6.4"; sha256="1qk821q7abq7w2iyyd2yyjj1cr943ycjb4174m3zdxj3qxlq1v0z"; 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]; }; - LDcorSV = derive { name="LDcorSV"; version="1.3.1"; sha256="0i4npl90mkj8vry6ckq8bc4ydbl44vxichgsxyn80r6k9i71yl67"; depends=[MASS]; }; - LDExplorer = derive { name="LDExplorer"; version="1.0.3"; sha256="1hkhbhclm1bvxzq7z663i583f94cvkklaq0z5qkswrpi406md7mi"; depends=[]; }; - LDheatmap = derive { name="LDheatmap"; version="0.99-1"; sha256="1bj42chw1xyf8yg6cfv9p4yzsggng7zy6wrw6q22559pwm6c6vr0"; depends=[genetics]; }; - ldlasso = derive { name="ldlasso"; version="3.2"; sha256="0ij68zvgm8dfd2qwx6h6ygndac29qa0ddpf11z959v06n8jsnk11"; depends=[GenABEL quadprog]; }; - LDOD = derive { name="LDOD"; version="1.0"; sha256="0mf2sy01yv57mqicrz08a17m6crigklx6fmw9zpxv7g85qw1iq4v"; depends=[Rsolnp Rmpfr]; }; - ldr = derive { name="ldr"; version="1.3.2"; sha256="1fjgj3g5qgc0sx6xwp48agvm2f59s55qjsxn332cgnfyxaz5pazz"; depends=[GrassmannOptim Matrix]; }; - LDRTools = derive { name="LDRTools"; version="0.1"; sha256="1cr0v6qsdldy89p44lhr6hisqaz99qzab32kd1srdnnwnwl1q2y4"; depends=[]; }; - LDtests = derive { name="LDtests"; version="1.0"; sha256="1jwqr7zlp9hv7vw8xp80xvrwbdv796wjgr914v393wfa07j5wbd1"; depends=[]; }; - LeafAngle = derive { name="LeafAngle"; version="1.2"; sha256="18b3gncn18jvsjprjmaays67iwjdcpszy5z711rb71h1vyi0fdfs"; depends=[]; }; - leafletR = derive { name="leafletR"; version="0.2-1"; sha256="0l2xqi8b5j1qrfrahk06r7b3vx0lrgihfaiv0psxj6d81xv2x72y"; depends=[]; }; - LEAPFrOG = derive { name="LEAPFrOG"; version="1.0.6"; sha256="0zsvf22ir8r4ld67ir4m9ziqwrxfnjs44yjayicpm6sg4bdfdfa5"; depends=[alabama MASS]; }; - leapp = derive { name="leapp"; version="1.2"; sha256="1yiqzmhgl5f3zwpcc5sz3yqrvp8p6r4w2ffdfyirirayqc96ar17"; depends=[MASS corpcor]; }; - leaps = derive { name="leaps"; version="2.9"; sha256="1ax9v983401hvb6cdswkc1k7j62j8yk6ds22qdj24vdidhdz5979"; depends=[]; }; - LearnBayes = derive { name="LearnBayes"; version="2.15"; sha256="0cz2rgqy1cmdz2h1qbdvfqxmmdzmg2z1scdlxr7k385anha13ja5"; depends=[]; }; - learningr = derive { name="learningr"; version="0.29"; sha256="1nr4ydcq2mskv4c0pmf0kxv5wm8pvjqmv19xz5yaq0j834b0n5q7"; depends=[plyr]; }; - leiv = derive { name="leiv"; version="2.0-6"; sha256="18cf050653qrwyma23r50i66irjpdbp03nc96pirji5sl4dr9q7x"; depends=[]; }; - LeLogicielR = derive { name="LeLogicielR"; version="1.2"; sha256="0h52pzrksi1mn55mnxbfi61hl7x61cnkhp450slfrk68f6kp30x6"; depends=[xtable RColorBrewer gdata IndependenceTests]; }; - lessR = derive { name="lessR"; version="3.1"; sha256="1hnjzh8chh08hgmsfc3gqgzcvs5rqycxdp0kjv660mbmrmi0g270"; depends=[car leaps MBESS foreign gdata triangle]; }; - lestat = derive { name="lestat"; version="1.8"; sha256="12w3s5yr9lsnjkr3nsay5sm4p241y4xz0s3ir56kxjqw23g6m80v"; depends=[MASS]; }; - letsR = derive { name="letsR"; version="1.0"; sha256="1far1vil7g4ymvmhzb0dgfng5d1nkcb4rr1sp7yi72lz60h3g9hk"; depends=[maps raster XML geosphere maptools sp]; }; - lfe = derive { name="lfe"; version="1.7-1289"; sha256="1k64llwsjk6lpfyvzwq5plickds15r42p0x5ppr57xzjqfyhyy61"; depends=[Matrix Formula xtable]; }; - 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]; }; - lgarch = derive { name="lgarch"; version="0.4"; sha256="0pf66p8nvrzjkayjj4y38lbyhz389q3q7ffd3kzsa3a1z9h2156x"; depends=[zoo]; }; - lgcp = derive { name="lgcp"; version="1.3-6"; sha256="04khs0knax3g20hgi5ykny1ck4jxz1aivaa19bb24fljvhn88prv"; depends=[spatstat sp raster RandomFields iterators ncdf rpanel fields maptools Matrix rgeos]; }; - LGS = derive { name="LGS"; version="0.91"; sha256="0rzj1shapyg7hyzsb9v81dirwihd7bz9s861l75g3yl3p4qm8sg7"; depends=[]; }; - lgtdl = derive { name="lgtdl"; version="1.1.3"; sha256="00lffc60aq1qjyy66nygaypdky9rypy607mr8brwimjn8k1f0gx4"; depends=[]; }; - lhs = derive { name="lhs"; version="0.10"; sha256="1hc23g04b6nsg8xffkscwsq2mr725r6s296iqll887b3mnm3xaqz"; depends=[]; }; - libamtrack = derive { name="libamtrack"; version="0.5.5"; sha256="0v2h4ficf87ai3h2liw8j7428k0bzzb59zini2vskwhcqb7ky7yw"; depends=[]; }; - LiblineaR = derive { name="LiblineaR"; version="1.80-7"; sha256="1gg4x0x94qq7h3nf5z3k7zy3iknydz3cfpnb8syhpgv5a462i84v"; depends=[]; }; - LICORS = derive { name="LICORS"; version="0.2.0"; sha256="0p9y21k1mj1v397jpb5g6jiw7rpzbyfwr4kv2rp3lyxyasy2ykf0"; depends=[RColorBrewer mvtnorm zoo FNN fields locfit Matrix]; }; - LICurvature = derive { name="LICurvature"; version="0.1.1"; sha256="09hqar4kvksd816ya6jg349r0v6z2m2109hq6j4k1d2vchab4lni"; depends=[MASS]; }; - lifecontingencies = derive { name="lifecontingencies"; version="1.1"; sha256="0rjiqmhqiliy8zbprxnr63r0wvwzs825gd6rrz4skwxcwpl4d0sh"; depends=[]; }; - LifeTables = derive { name="LifeTables"; version="0.2"; sha256="1n4mqypxm0rbi77ykpr6bpzxfxvq8mm9bmfvcqz7k3ajb78cdr0d"; depends=[mclust]; }; - LIHNPSD = derive { name="LIHNPSD"; version="0.2.1"; sha256="08ils29vvaq6abkgxbh028vwjw6l6h10cirbnwr65s458zvh4xqv"; depends=[sn moments BB Bolstad2 optimx Rmpfr]; }; - likelihood = derive { name="likelihood"; version="1.6"; sha256="11p7k6wpr7ypas414qir0hracy0960j8g3nwlhjbmynwmfzpkq1r"; depends=[nlme]; }; - likeLTD = derive { name="likeLTD"; version="5.4.0"; sha256="09h1a4pn1i3vm3116yxvx07b62cbqmq84svpkbxykl4jmlqmwg8x"; depends=[DEoptim ggplot2 gtools rtf gdata]; }; - likert = derive { name="likert"; version="1.1"; sha256="1jmzxqav5hqvafb53k4mk8a2zfbzvlynqxkphndnbngq7z5915ah"; depends=[ggplot2 gridExtra xtable reshape psych]; }; - LIM = derive { name="LIM"; version="1.4.5"; sha256="1dir9dqrpns77n5ydm3fpj2k0pl7q15z8vqbi5704vsfv94mgmas"; depends=[limSolve diagram]; }; - limitplot = derive { name="limitplot"; version="1.2"; sha256="0wj1xalm80fa5pvjwh2zf5hpvxa3r1hnkh2z9z285wkbrcl0qfl2"; depends=[]; }; - limSolve = derive { name="limSolve"; version="1.5.5"; sha256="1wcw4f95alsn1x1x98hlivc65p28ykq9njgjs561yl2zn4dyfqxf"; depends=[quadprog lpSolve MASS]; }; - LinearizedSVR = derive { name="LinearizedSVR"; version="1.3"; sha256="0h3xmlnd5x37r5hdhcz90z5n1hsbr2ci3m939i89p1x9644i2l5g"; depends=[kernlab LiblineaR expectreg]; }; - lineup = derive { name="lineup"; version="0.34-1"; sha256="0p6gxbv8xdrhgk8zdlnqrybald9vqz717czb49b123h84rjr2f19"; depends=[qtl class]; }; - linkcomm = derive { name="linkcomm"; version="1.0-10"; sha256="1xs22cskrbk1yvsaa5dmnr62468z4baw6hy5m2jjcm854b42mkp9"; depends=[igraph RColorBrewer dynamicTreeCut]; }; - linkim = derive { name="linkim"; version="0.1"; sha256="0yvyid9x59ias8h436a202hd2kmqvn8k1zcrgja2l4z2pzcvfn91"; depends=[]; }; - linLIR = derive { name="linLIR"; version="1.1"; sha256="1v5bwki5j567x2kndfd5nli5i093a33in31025h9hsvkbal1dxgp"; depends=[]; }; - linprog = derive { name="linprog"; version="0.9-2"; sha256="1ki14an0pmhs2mnmfjjvdzd76pshiyvi659zf7hqvqwj0viv4dw9"; depends=[lpSolve]; }; - LINselect = derive { name="LINselect"; version="0.0-1"; sha256="1n6nsspdp1ig8v9bclyga072hxqj2hb9n1smrqia8jrma07yaydl"; depends=[]; }; - lint = derive { name="lint"; version="0.3"; sha256="0lkrn5nsizyixhdp5njxgrgwmygwr663jxv5k9a22a63x1qbwpiq"; depends=[plyr harvestr stringr dostats foreach]; }; - liso = derive { name="liso"; version="0.2"; sha256="072l7ac1fbkh8baiiwx2psiv1sd7h8ggmgk5xkzml069ihhldj5i"; depends=[MASS Iso]; }; - lisp = derive { name="lisp"; version="0.1"; sha256="025sq46277q9i21189cbmx5dnrh5wfshc5k6la1wjilhr1iqf6nj"; depends=[]; }; - lisrelToR = derive { name="lisrelToR"; version="0.1.4"; sha256="0zicq0z3hhixan1p1apybnf3v5s6v6ysll4pcz8ivygwr2swv3p5"; depends=[]; }; - list = derive { name="list"; version="6.1"; sha256="18yclnj71yknw46wy2f2hjhrg38fyklirgr0x5aibk7yywpry0qq"; depends=[sandwich VGAM magic gamlss_dist MASS quadprog arm corpcor mvtnorm coda]; }; - LIStest = derive { name="LIStest"; version="2.1"; sha256="1gk253v3f1jcr4z5ps8nrqf1n7isjhbynxsi9jq729w7h725806a"; depends=[]; }; - llama = derive { name="llama"; version="0.7"; sha256="01hxphrii5lydg3yivrl0yg45ilma9a3g0r6rh44vak79zc6gxz7"; depends=[mlr plyr rJava parallelMap]; }; - lle = derive { name="lle"; version="1.1"; sha256="09wq7mzw48czp5k0b4ij399cflc1jz876fqv0mfvlrydc9igmjhk"; depends=[scatterplot3d MASS snowfall]; }; - lllcrc = derive { name="lllcrc"; version="1.1"; sha256="0m4dqg774d0pzpwvr4hj50xdz93y83w0yjcial8b14wy8zcdsmmz"; depends=[data_table combinat VGAM plyr]; }; - lmbc = derive { name="lmbc"; version="0.9.1"; sha256="0pxm29n8rhcy7g8kia0bgz78w5nr851dhhrb7nn13szw6j13ji8x"; depends=[mseq lars]; }; - lm_beta = derive { name="lm.beta"; version="1.0"; sha256="13n9y9q4igqswvf4yfjk15gqa81z3kc7l0hizr3ssxpa8x9igpc5"; depends=[]; }; - lm_br = derive { name="lm.br"; version="2.5"; sha256="0v4gam24gny4g5618kakamryw0aq62wb9k7w6n3wq397mysnkd15"; depends=[Rcpp]; }; - lme4 = derive { name="lme4"; version="1.1-7"; sha256="0v9vl9rspakyw2dmcl5lbhv1nlg10yhgdvi3gpfnizln7xw9ksyp"; depends=[Matrix Rcpp MASS nlme lattice minqa nloptr]; }; - lmec = derive { name="lmec"; version="1.0"; sha256="09shj01h2dl5lh7ch0wayr7qyhlmk0prv3p1vfgy91sn0wpbqlxr"; depends=[mvtnorm]; }; - lmeNB = derive { name="lmeNB"; version="1.2"; sha256="0xgw1kmq3krz8z0ickjg6qkj3bq2bkbwcd79c5fkl6fa3hp035mh"; depends=[numDeriv statmod lmeNBBayes]; }; - lmeNBBayes = derive { name="lmeNBBayes"; version="1.2"; sha256="0zpxdgqv5yhpwl2jfrxx37b126pgrflynmw9i4vmcvzx830d084l"; depends=[]; }; - LMERConvenienceFunctions = derive { name="LMERConvenienceFunctions"; version="2.5"; sha256="1kq0ww8h43rsygjz5pmb3ym027klgi4sw1csdr9apwgd3ydbnr7n"; depends=[Matrix lme4]; }; - lmerTest = derive { name="lmerTest"; version="2.0-11"; sha256="151zgpqabvq1m58632caw9q298y7zh4aw059hdfzx9p8z7104ris"; depends=[Matrix lme4 numDeriv MASS Hmisc gplots pbkrtest]; }; - lmeSplines = derive { name="lmeSplines"; version="1.1-10"; sha256="0fy6hspk7rqqkzv0czvvs8r4ishvs7zsf4ykvia65nj26w7yhyia"; depends=[nlme]; }; - LMest = derive { name="LMest"; version="1.0"; sha256="0i76wkj8a95pa5spxsaxbkk2nyrjdlnzri9739n3h08sagwc0y67"; depends=[MASS Matrix]; }; - lmf = derive { name="lmf"; version="1.2"; sha256="1xqlqmjl7wf5b2s2a1k1ara21v74b3wvwl4mhbj9dkdb0jcrgfva"; depends=[]; }; - lmm = derive { name="lmm"; version="0.9"; sha256="0gs68iwk9gajb5af5ibgg9k5280ixqki8vxyp3cq5lrk96gcmqpr"; depends=[]; }; - lmmfit = derive { name="lmmfit"; version="1.0"; sha256="06mzmx7md7qw5mfhgdljc7i40sx9yrx7j57xbbp3fhl2zs1dpb4g"; depends=[nlme MASS]; }; - lmmlasso = derive { name="lmmlasso"; version="0.1-2"; sha256="1mvd38k9npyc05a2x7z0908qz9x4srqgzq9yjyyggplqfrl4dgsz"; depends=[emulator miscTools penalized]; }; - lmms = derive { name="lmms"; version="1.0"; sha256="1qisic9ha764nl8xscf17r2chhx1jp8s2hv189ksc6wl34dcxvqq"; depends=[nlme lmeSplines reshape gdata]; }; - lmodel2 = derive { name="lmodel2"; version="1.7-2"; sha256="0dyzxflr82k7ns824zlycj502jx3qmgrck125im2k2da34ir3m3q"; depends=[]; }; - lmom = derive { name="lmom"; version="2.4"; sha256="04mfp7fcw1696qn34pxdffspwy0xalig3p7mqcj49v6kdxclpx1p"; depends=[]; }; - lmomco = derive { name="lmomco"; version="2.1.1"; sha256="0q58g13j7h8pag3yj96qpnsa2m77hrrjkc24f6x847vlsn39md80"; depends=[]; }; - Lmoments = derive { name="Lmoments"; version="1.1-5"; sha256="13s9lbmfbjfam6xg0q9jl2p3q3db3pimcmnx47vx82qdm43xa4an"; depends=[]; }; - lmomRFA = derive { name="lmomRFA"; version="3.0"; sha256="188i2fk2csqwdmw3x1wwigaajbvwfd9dwd8q3pmx7ha4smp49amk"; depends=[lmom]; }; - lmSupport = derive { name="lmSupport"; version="1.07.1"; sha256="1smv1ag12373981qqhlrdf4xj73j2h0jblb74gd2w70zrbx0s2qb"; depends=[car psych gplots gvlma MASS]; }; - lmtest = derive { name="lmtest"; version="0.9-33"; sha256="1ycmxjrxf41mnbgakdmn4y2kmgp4rkj7v3nqwqnlc6gdfdmac73s"; depends=[zoo]; }; - loa = derive { name="loa"; version="0.2.15"; sha256="137l90qz87xrid28knbj8997pjqgqf6769cwfj82cm57m98bda91"; depends=[lattice MASS png RgoogleMaps RColorBrewer]; }; - localdepth = derive { name="localdepth"; version="0.5-7"; sha256="0h0y74xnhdqa7y51ljmpz7ayznppvy2ll06wfds6200lb9cxgr7k"; depends=[circular]; }; - localgauss = derive { name="localgauss"; version="0.33"; sha256="1xgcwlgkzkxws771zig4x6v0m6flf9vlcgpa80ajr0vmjhlplbly"; depends=[ggplot2 MASS foreach matrixStats]; }; - localsolver = derive { name="localsolver"; version="2.3"; sha256="1d18rihzqf1f5j9agfp8jysll7lqk1ai23hkdqkn6wwxj442llv4"; depends=[]; }; - locfdr = derive { name="locfdr"; version="1.1-7"; sha256="1ix64nf0lymvqfks399871ynyph32x4yhymdw0nw59jh3c3ldhxx"; depends=[]; }; - locfit = derive { name="locfit"; version="1.5-9.1"; sha256="0lafrmq1q7x026m92h01hc9cjjiximqqi3v1g2hw7ai9vf7i897m"; depends=[lattice]; }; - locits = derive { name="locits"; version="1.4"; sha256="1q9vsf5h4n7r4gy1dwdhfyq3n0rn33akb3nx6yzinncj4w4cqq0h"; depends=[wavethresh igraph]; }; - Lock5Data = derive { name="Lock5Data"; version="2.6"; sha256="0ckaac00ck5vyv0gv25l1zhgkm3char6ks1p4fl3vdl5gdyrc1pp"; depends=[]; }; - locpol = derive { name="locpol"; version="0.6-0"; sha256="1zpdh3g7yx3rcn3rhlc3dm19c4b9kx2k8wy8vkwh744a1kysvdga"; depends=[]; }; - loe = derive { name="loe"; version="1.0"; sha256="11wjzq4h7qjrnrj1zg3msg1ksld9c3r3n3biamf2hz8zvi1asvqv"; depends=[igraph MASS vegan Matrix]; }; - log4r = derive { name="log4r"; version="0.1-4"; sha256="1wgn9gywkldfzxgpdfj84l05zw6y84bwzjr7q6fjddfdvxmdwa5n"; depends=[]; }; - LogConcDEAD = derive { name="LogConcDEAD"; version="1.5-9"; sha256="135vkp70q6gn75ds43aq08y13vrsgsgykssmnhrh6545i86vmhhi"; depends=[MASS mvtnorm]; }; - logconcens = derive { name="logconcens"; version="0.16-4"; sha256="11bk03kjlb747g54axmb0nayz226g41xvanbw79aij76vjbglv7y"; depends=[]; }; - logcondens = derive { name="logcondens"; version="2.1.1"; sha256="1anawy47g2bmpi5x4s9dqw82c51mv98wfy39sikb1jixbs40mqgp"; depends=[]; }; - logcondens_mode = derive { name="logcondens.mode"; version="1.0.1"; sha256="1i2c2prk5j863p3a3q3xnsv684igfi5czz3dib7zfjldpf0qyaq7"; depends=[logcondens distr]; }; - logcondiscr = derive { name="logcondiscr"; version="1.0.5"; sha256="170rg4rqch0mlhmc1zc59h271b57y3xfxrc3gh9pwvc9r11gw7k5"; depends=[Matrix mvtnorm cobs]; }; - logging = derive { name="logging"; version="0.7-103"; sha256="1sp7q217awizb6l8c9p5dix6skpq8j7w8i088x4mm0fc0qr1ba5c"; depends=[]; }; - LOGICOIL = derive { name="LOGICOIL"; version="0.99.0"; sha256="1wgg7kigzzk5ghjn3hkjf1bb8d6mvjfmkwq64phri5jpxd742ps9"; depends=[nnet]; }; - LogicReg = derive { name="LogicReg"; version="1.5.5"; sha256="1lccxiafi2g2jmzaklcgman5zgax2rvfh61qzwz1w0p57460m581"; depends=[survival]; }; - logistf = derive { name="logistf"; version="1.21"; sha256="0cwbmd0mvj4wywpx7p4lhs70nhab7bfl6fzz2c4snn3ma6sy7x8c"; depends=[mice mgcv]; }; - LogisticDx = derive { name="LogisticDx"; version="0.1"; sha256="1w530panmbwf4qplzzj02q9g2lfzrkawxy66ibwdd14z9bwjdclj"; depends=[multcomp data_table pROC car gRbase rms statmod speedglm]; }; - logistiX = derive { name="logistiX"; version="1.0-1"; sha256="0k2658hph4h9v0f1c4nd0zi72xzf7l4ivhy063y01zx61q8dbi8q"; depends=[]; }; - logitchoice = derive { name="logitchoice"; version="0.9.1"; sha256="16019836wf1vhs49qmw9z53px4l20ggg4k6lhlll8l91q0mkisk3"; depends=[]; }; - LogitNet = derive { name="LogitNet"; version="0.1-1"; sha256="08xi5rpbqkc1b3qj24blv3l0r68wcqbsbjcqxiypm75f3c2irc4i"; depends=[]; }; - logitnorm = derive { name="logitnorm"; version="0.8.29"; sha256="0wbdxh3n44nzb6c0ahyd8gndfql1y56fns2bkmzqi3nxy9blhx18"; depends=[]; }; - loglognorm = derive { name="loglognorm"; version="1.0.1"; sha256="0rhx769a5nmidpbpngs2vglsbkpgw9badz3kj3jfmpj873jfnbln"; depends=[]; }; - logmult = derive { name="logmult"; version="0.6"; sha256="1r8i2zgmgm44dhg2z2k7cqy10hldp1p91idjiyg9pmi8dfch8xki"; depends=[gnm qvcalc]; }; - LogrankA = derive { name="LogrankA"; version="1.0"; sha256="005zkpzi8h03qvqlpkygrf9xv4q77klafkfxw47x04jvkhklwigb"; depends=[]; }; - logregperm = derive { name="logregperm"; version="1.0"; sha256="002s5a71m3ykyypq8gw4xa642xnbp2rjwd1cxnf0rkgmshngqaik"; depends=[]; }; - logspline = derive { name="logspline"; version="2.1.5"; sha256="18hpzcg71v3zjzp92whgxgn7w87cadgxr65pp7nv6m5pvj130i3p"; depends=[]; }; - lokern = derive { name="lokern"; version="1.1-5"; sha256="0fgpkmz8jy77sb0m862j7v32lj9d3x373na1102wvq164jjhyqg2"; depends=[sfsmisc]; }; - lomb = derive { name="lomb"; version="1.0"; sha256="06lbk7s1ilqx6xsgj628wzdwmnvbs0p03hdpx8665fhddcxh3ryy"; depends=[]; }; - longCatEDA = derive { name="longCatEDA"; version="0.17"; sha256="1yb0117ycj4079590mrx3lg9m5k7xd1dhb779r3rmnww94pmvja9"; depends=[]; }; - longitudinal = derive { name="longitudinal"; version="1.1.9"; sha256="048z9n7ca655mjj4gdfj1hlpddkn8jikmh5igv76l5zj9iccw5xy"; depends=[corpcor]; }; - longitudinalData = derive { name="longitudinalData"; version="2.2"; sha256="1kdgnkhk39a9r4fq6zmrvzcvs7qjd21knpzfjglxyx723r9p3fs7"; depends=[clv class rgl misc3d]; }; - longmemo = derive { name="longmemo"; version="1.0-0"; sha256="1jnck5nfwxywj74awl4s9i9jn431655mmi85g0nfbg4y71aprzdc"; depends=[]; }; - longpower = derive { name="longpower"; version="1.0-10"; sha256="0907s9807c1vcxac8xf6aqbw2fi7pdqfjs14nxl7wf0r0wi9jgw2"; depends=[Matrix lme4 nlme]; }; - loop = derive { name="loop"; version="1.1"; sha256="1gr257fm92rfh1sdhsb4hy0fzwjkwvwm3v85302gzn02f86qr5dm"; depends=[MASS]; }; - LoopAnalyst = derive { name="LoopAnalyst"; version="1.2-3"; sha256="0xbiy1xa2c6acfrzh6p9pa6wrds8ipskxq0f86ia9g5zkp1rjk2j"; depends=[nlme]; }; - lordif = derive { name="lordif"; version="0.2-2"; sha256="0898k5w9wky318k8x0zknjqdzdify0yyrnb1506j341l4n1bm04s"; depends=[MASS msm mvtnorm polycor sfsmisc ltm Hmisc rms]; }; - lorec = derive { name="lorec"; version="0.6.1"; sha256="0mgypd8awixh1lzbh5559br4k7vi3pfmwniqhgh68wc06sc6bn65"; depends=[]; }; - LOST = derive { name="LOST"; version="1.1"; sha256="19ar85dykbz0jlzbhlm3pcpffj4cizc6sj3gn93qdvpxkp64jfq9"; depends=[gdata shapes e1071 MASS miscTools]; }; - LowRankQP = derive { name="LowRankQP"; version="1.0.2"; sha256="0is7v4cy4w1g3wn4wa32iqv4awd1nwvfcb71b3yk5wj59lpm8gs3"; depends=[]; }; - lpc = derive { name="lpc"; version="1.0.2"; sha256="1r6ynkhqjic1m7fqrqsp7f8rpxqih5idn4j96fqrdj8nj01znv29"; depends=[]; }; - LPCM = derive { name="LPCM"; version="0.44-8"; sha256="14627wk5azxm3y3a0qfy4qz57nxbdcasnv7djpqhk2gxf5smq19k"; depends=[]; }; - lpint = derive { name="lpint"; version="2.0"; sha256="0p1np8wlfbax0c7ysc5fs9dai8s00h1v0gan89dbd6bx06307w2r"; depends=[]; }; - LPmerge = derive { name="LPmerge"; version="1.5"; sha256="0qy3j6xnsk5h2lmx3mx2q4b5g4vip54nh2f85zg5ncg0x5qqrizb"; depends=[Rglpk Matrix]; }; - lpmodeler = derive { name="lpmodeler"; version="0.2-1"; sha256="17k67l03dkjx61p4hwswghjm6awk0zx173x9xafxrfd8jrgsf6kf"; depends=[slam]; }; - lpridge = derive { name="lpridge"; version="1.0-7"; sha256="0nkl70fwzra308bzlhjfpkxr8hpd8v1xdnah7nscxa10qlisgr2k"; depends=[]; }; - LPS = derive { name="LPS"; version="1.0.4"; sha256="0dy45nn1bmzd17y2dsh4pf4jmh9qvifigvpg2lv2zrmvlx53cli5"; depends=[]; }; - lpSolve = derive { name="lpSolve"; version="5.6.10"; sha256="0hrgac5gfihhk4spy5smwgnawgn5nbv7aydb1w28lgd46a4zldvc"; depends=[]; }; - lpSolveAPI = derive { name="lpSolveAPI"; version="5.5.2.0-11"; sha256="1d7g840aa392i310y4886haa8dvb881p6py74gmqi14rsajchzgs"; depends=[]; }; - LPStimeSeries = derive { name="LPStimeSeries"; version="1.0-3"; sha256="06w4gcz3h4gi05zzb37adxj4kl6pxpmlbzl4xaf03vqyabnvv9s0"; depends=[]; }; - lqa = derive { name="lqa"; version="1.0-3"; sha256="141r2cd9kybi6n9jbdsvhza8jdxxqch4z3qizvpazjy8qifng29q"; depends=[]; }; - lqmm = derive { name="lqmm"; version="1.5"; sha256="12fggqka00y2hwknxwfa2326r2r17mdn2qd213n7xs3pn7v0rg18"; depends=[SparseGrid nlme]; }; - lrmest = derive { name="lrmest"; version="1.0"; sha256="1gdj8pmmzvs1li05pwhad63blhibq45xd1acajxsx06k7k21ajs7"; depends=[MASS]; }; - 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]; }; - lsa = derive { name="lsa"; version="0.73"; sha256="041wa1i85i90qvm5sxvd9nidis8s069cvf9nw1r68ajkvds65y91"; depends=[SnowballC]; }; - LSAfun = derive { name="LSAfun"; version="0.3.1"; sha256="15sa3hq2x6wna8bv9mry06k80kvhf1kkl6zfybwzc953vxp6yijp"; depends=[lsa rgl]; }; - LSC = derive { name="LSC"; version="0.1.5"; sha256="1nlnwqb24sbgvl96azh8a833ij5xknjr2wr8shs59lm2n63a3ql9"; depends=[LICORS RColorBrewer fields gam Matrix]; }; - LSD = derive { name="LSD"; version="2.5"; sha256="0j7lmsz93q2zv9y05aan5pwhpzh8m1i45mh4p386g7bvfrwlmxbx"; depends=[MASS gtools RColorBrewer colorRamps schoolmath ellipse]; }; - lsdv = derive { name="lsdv"; version="1.1"; sha256="0rl1xszr9r8v71j98gjpav30n2ncsci19hjlc9flzs1s20sb1xpr"; depends=[]; }; - lsgl = derive { name="lsgl"; version="1.0.123.0"; sha256="15chgzds2vb4jgw7vzday6km7i92g6ifpj0a2x9s4nvrdzh9y8di"; depends=[sglOptim Matrix]; }; - lshorth = derive { name="lshorth"; version="0.1-6"; sha256="0nbjakx0zx4fg09fv26pr9dlrbvb7ybi6swg84m2kwjky8399vvx"; depends=[]; }; - lsmeans = derive { name="lsmeans"; version="2.11"; sha256="15cvdc4mzk9qr9zq5adkabzs1bkpnl2cf8mhsdc1jgm521ff4w26"; depends=[multcomp plyr Matrix]; }; - LSMonteCarlo = derive { name="LSMonteCarlo"; version="1.0"; sha256="0w5042phkba5dw92r67ppp2s4khjpw5mm701dh9dya9lhj88bz6s"; depends=[mvtnorm fBasics]; }; - lspls = derive { name="lspls"; version="0.2-1"; sha256="1g27fqhnx9db0zrxbhqr76agvxy8a5fx1bfy58j2ni76pki1y4rl"; depends=[pls]; }; - lsr = derive { name="lsr"; version="0.3.2"; sha256="1ahcj3ja5hj7pc7hvzlvhmh62mql3a0awli8szsyld0fpn50wprz"; 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]; }; - ltmle = derive { name="ltmle"; version="0.9.3-1"; sha256="0nvcxl55nmcabsz79vkjxmnifzm2vxg0lgwcjqiwsj242vhnfjhh"; depends=[]; }; - LTPDvar = derive { name="LTPDvar"; version="1.1"; sha256="0zb3ffz5vw1zabgzhpcw1mzfqh4g7r0sq4iy31nzyv8smdwddqzw"; depends=[]; }; - LTR = derive { name="LTR"; version="1.0.0"; sha256="15g5hbrwhab80sarbjgwzvsn6c4fl18h014kz5fpzf0n1rijybik"; depends=[]; }; - ltsa = derive { name="ltsa"; version="1.4.4"; sha256="06db0d4j0kqp4q6rpa3sawcsm5rfgdhzl8fl7cxivjbbyrfnszqp"; depends=[]; }; - ltsbase = derive { name="ltsbase"; version="1.0.1"; sha256="16p5ln9ak3h7h0icv5jfi0a3fbw5wdqs3si69sjbn8f5qs2hz7yp"; depends=[MASS robustbase]; }; - ltsk = derive { name="ltsk"; version="1.0.1"; sha256="1ym9h6af1aq46b6yxhdwnp6kqgx3zw08sal67y8rqd9z68432lx4"; depends=[fields]; }; - lubridate = derive { name="lubridate"; version="1.3.3"; sha256="1f07z3f90vbghsarwjzn2nj6qz8qyfkqalszx8cb5kliijdkwy8z"; depends=[plyr stringr memoise]; }; - luca = derive { name="luca"; version="1.0-5"; sha256="1jiqwibkrgga4ahz0qgpfkvrsxjqc55i2nwnm60xddb8hpb6a6qx"; depends=[survival genetics]; }; - Luminescence = derive { name="Luminescence"; version="0.3.4"; sha256="036kib458qwr1l1pl1nb4hip43rchmx7qwf32y8z7b8nf9b8sbvy"; depends=[Rserve XML shape rgl matrixStats]; }; - lvm4net = derive { name="lvm4net"; version="0.1"; sha256="0b140jybn6jpr1qh3s84vg0ba34356vc8pa4v2zfp9ggipfl073b"; depends=[ergm ellipse igraph]; }; - LVMMCOR = derive { name="LVMMCOR"; version="0.01.1"; sha256="1lq4hqcg0qkywdr4a22m1fr3m97749mm6n2jzdj9i7jrf0agc1fs"; depends=[nlme MASS]; }; - LVQTools = derive { name="LVQTools"; version="1.2"; sha256="06mninrrr49xsh00gfsp0vc418r6pdvq3m6sbnj0ywdyki106mni"; depends=[]; }; - lxb = derive { name="lxb"; version="1.3"; sha256="0mvjk0s9bzvznjy0cxjsqv28f6jjzvr713b2346ym4cm0y4l3mir"; depends=[]; }; - lymphclon = derive { name="lymphclon"; version="1.2.3"; sha256="0dvyihghjamqmhn9lvh1qblqh946b9ldnxyhb6z1gi57pyfgq00w"; depends=[VGAM MASS expm corpcor]; }; - M3 = derive { name="M3"; version="0.3"; sha256="1l40alk166lshckqp72k5zmsgm7s5mgyzxlp11l64mgncjwkw2r3"; depends=[ncdf4 rgdal maps mapdata]; }; - MAc = derive { name="MAc"; version="1.1"; sha256="1lshi5rb8l2mpd302wskhlk5vz1wjidvbss9y69l63zjqdwjs7ch"; depends=[]; }; - MAclinical = derive { name="MAclinical"; version="1.0-5"; sha256="1g0ka1kqww2xim8rp5rznkzn0a541zvf841s3lbphfh9k3y3ixs3"; depends=[party plsgenomics st e1071]; }; - MAd = derive { name="MAd"; version="0.8-1"; sha256="16lis6q61d11z0kn3svd77yr0k3jm0zhqpwacl86jdjlmn67l92i"; depends=[]; }; - mada = derive { name="mada"; version="0.5.6"; sha256="10vw138ykfz0s8c2q39fd4vipran85w04jmr1fni4z8x0i67iak2"; depends=[mvtnorm ellipse mvmeta]; }; - MADAM = derive { name="MADAM"; version="1.2.2"; sha256="09w5liqa3mpkbyvkwlabcgyg2b4316qpzq7pbpl0wxl74bsh76vq"; depends=[]; }; - madsim = derive { name="madsim"; version="1.1"; sha256="1d9mv769zia43krdfl43hp22cp5mdi3ycwj3kxyfcjrg23bjnyc0"; depends=[]; }; - Maeswrap = derive { name="Maeswrap"; version="1.4.11"; sha256="15i36xj2bdzhly78614077s8k2z75a1gmzl2crsfgvhyyjdax8r7"; depends=[rgl lattice geometry]; }; - magic = derive { name="magic"; version="1.5-6"; sha256="1399w1zhz79nj8cdhslybncd9h6rylfhb548nv22ip0dxxdkyv0v"; depends=[abind]; }; - magicaxis = derive { name="magicaxis"; version="1.9"; sha256="0v851arnpc15h7ccqwjlz52jv83ij96r4b44qkm45ipr9dfm84zf"; depends=[MASS plotrix sm]; }; - magma = derive { name="magma"; version="1.3.0-2"; sha256="0hgwjq30ksx2qg4q9fj57m27i96sci8hrfrqc2lw4hz18b6kkph4"; depends=[]; }; - magrittr = derive { name="magrittr"; version="1.0.1"; sha256="0syb8dpcqag392any8s7shgqv4s33q3ppwnpmih31yhz875k3aaw"; depends=[]; }; - mail = derive { name="mail"; version="1.0"; sha256="1m89cvw5ba4d87kp2dj3f8bvd6sgj9k56prqmw761q919xwprgw6"; depends=[]; }; - mailR = derive { name="mailR"; version="0.3"; sha256="0m23npg5zsdwflw4744v30ypnpa6f8ddflwh3mpabxrxw4scb547"; depends=[rJava stringr]; }; - MAINT_Data = derive { name="MAINT.Data"; version="0.2"; sha256="0kmvz3s6ci9zi9k3vvrkl7jwqfjgdfk7b6xv7dskjh6mbgpcqcf4"; depends=[MASS sn miscTools]; }; - makeProject = derive { name="makeProject"; version="1.0"; sha256="09q8xa5j4s5spgzzr3y06l3xis93lqxlx0q66s2nczrhd8nrz3ca"; depends=[]; }; - malaria_em = derive { name="malaria.em"; version="2.0"; sha256="1n34ahifggpdlpmigy010zysana0fg9c8ji0khk8g3il2gmzmgim"; depends=[]; }; - 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]; }; - mallet = derive { name="mallet"; version="1.0"; sha256="06rksf5nvxp4sizgya7h4sb6fgw3yz212a01dqmc9p5a5wqi76x0"; depends=[rJava]; }; - 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]; }; - MAMSE = derive { name="MAMSE"; version="0.1-3"; sha256="06q6raqbyi9zwg3wzaygqmfs3di55fh4bln3vscdw95kma4hz9km"; depends=[]; }; - Mangrove = derive { name="Mangrove"; version="1.1"; sha256="15dzxsm982v7sskqh31fdiiqyac37l00i51z3f4nk3zpz6gq2nw5"; depends=[]; }; - ManyTests = derive { name="ManyTests"; version="1.1"; sha256="11xk3j2q7w6b6ljmp7b8gni0khpmpvcvzwxypy0w8ihi2gaczsxj"; depends=[]; }; - Map2NCBI = derive { name="Map2NCBI"; version="1.0"; sha256="02cgmayrhkyji0cwr6n0f439njq29mzna7sgzkq6ml45njm9m5nh"; depends=[]; }; - MAPA = derive { name="MAPA"; version="1.7"; sha256="1xw9slmhn6r0cczp37m75l944vggnjwinx2p4jkkya445mvgyhjy"; depends=[forecast]; }; - mapdata = derive { name="mapdata"; version="2.2-3"; sha256="1fhj34cgq6rniy0339qv2ghbs0aiq38h9jfwx7szb83yj37v7wm6"; depends=[maps]; }; - MapGAM = derive { name="MapGAM"; version="0.7-0"; sha256="00ggr7wrkz13n1f9gsp3qxxjwb01kq47aqv2mj4pa6p253iw19i7"; depends=[gam maptools]; }; - MAPLES = derive { name="MAPLES"; version="1.0"; sha256="0hzsh7z1k7qazpxjqbm9842zgdpl51irg7yfd119a7b2sd3a8li9"; depends=[mgcv]; }; - mapmisc = derive { name="mapmisc"; version="0.9.4"; sha256="0qsv36sk6fd3ix85yagl86y2r1kkl3qry0g0k6d0rb87aaxmk86i"; depends=[sp raster]; }; - mapplots = derive { name="mapplots"; version="1.4"; sha256="0wwz52hjhp2xzw38zsvbk5cgdfr58rakjnmficjr305x88kisz20"; depends=[]; }; - mapproj = derive { name="mapproj"; version="1.2-2"; sha256="1fdb72hvcp6jm7rhvs8zdkya6ifs92lfqnmq5vj5amwckkxfidc6"; depends=[maps]; }; - maps = derive { name="maps"; version="2.3-7"; sha256="01bzy9xqa5fhqjhvwrxygkk5ym3rl9kz86frpby735bx5qy6ij4b"; depends=[]; }; - mapStats = derive { name="mapStats"; version="1.17"; sha256="1jnqchrrn2v1smzk1c3laycr2fs8x59c9mb8lhs4bxqbhhwgmi8p"; depends=[survey lattice maptools RColorBrewer Hmisc quantreg classInt sp colorspace reshape2]; }; - maptools = derive { name="maptools"; version="0.8-30"; sha256="0vbpgxdz6xl8a2bkhcw6rfs15nvmppka0ad7i2v2pi18350riwpq"; depends=[sp foreign lattice]; }; - maptpx = derive { name="maptpx"; version="1.9-1"; sha256="1yrlgz5bkjjs3m59dqp60n95lax0fp7xw00v59kymmw5hr3sis6f"; depends=[slam]; }; - maptree = derive { name="maptree"; version="1.4-7"; sha256="1k7v84wvy6wz6g0dyiwvd3lvf78rlfidk60ll4fz7chvr2nrqdp4"; depends=[cluster rpart]; }; - mAr = derive { name="mAr"; version="1.1-2"; sha256="0i9zp8n8i3fxldgvwj045scss533zsv8p476lsla294gp174njr7"; depends=[MASS]; }; - MAR1 = derive { name="MAR1"; version="1.0"; sha256="1r6j890icl5h3m2876sakmwr3c65513xnsj68sy0y0q7xj3a039l"; depends=[leaps bestglm]; }; - mar1s = derive { name="mar1s"; version="2.1"; sha256="0psjva7nsgar5sj03adjx44pw0sdqnsd96m4g6k8d76pv30m1g7l"; depends=[cmrutils fda zoo]; }; - marelac = derive { name="marelac"; version="2.1.3"; sha256="155a8ijl2y8l4r980ml0p23jrwnf36xqsa8s1q6n7arhxwaknhxv"; depends=[shape seacarb]; }; - marg = derive { name="marg"; version="1.2-2"; sha256="0j08zzcrj8nqsargi6xi50gy9pl4smmsp4b7ywlga7r1ga38g82r"; depends=[statmod survival]; }; - margie = derive { name="margie"; version="1.0"; sha256="1jkhg15xdiqjvpzbbc39l8jlfw0yrbarnd3zbgb3p0rh733x5g4j"; depends=[]; }; - marginalmodelplots = derive { name="marginalmodelplots"; version="0.4.2"; sha256="0d7m7sddz9rp1mkvirhcmk7hlbxsag3nm3vqfampnr7l2h158baa"; depends=[locfit]; }; - markdown = derive { name="markdown"; version="0.7.2"; sha256="02dgi2q5gs359affvx0w2pvfcr25wqpzfvyc6labyfxmiw0gax13"; depends=[mime]; }; - marked = derive { name="marked"; version="1.1.6"; sha256="0f9sa4mdkiq1fn99sczb0glf5xfm17a3x8dq9ycf0l39fyg582d0"; depends=[lme4 R2admb truncnorm coda optimx ggplot2 Matrix numDeriv Rcpp plyr]; }; - MarkedPointProcess = derive { name="MarkedPointProcess"; version="0.2.21"; sha256="06bypa124raa4vbcvi082vpd8bndnar4p1v18dq261z6j3ixk44k"; depends=[RandomFields R2Cuba]; }; - maRketSim = derive { name="maRketSim"; version="0.9.2"; sha256="1cq17zjwyf4i5lcqgxqkw805s4mr6qp89blgpmpxy8gdrbfj93m4"; depends=[]; }; - markovchain = derive { name="markovchain"; version="0.0.9.5"; sha256="06fsfrfm7xyba97yfxcp85vqamavbinvm8wr2darafn20ggahrck"; depends=[igraph Matrix matlab expm]; }; - MarkowitzR = derive { name="MarkowitzR"; version="0.1402"; sha256="1fbn6l8z76ak8z2nyzmizcjm7h54y58773nsy03x1pwykcwpzw9f"; depends=[matrixcalc sandwich gtools]; }; - marmap = derive { name="marmap"; version="0.8"; sha256="0141vz2bwwzyhfxvy5w0f0idp8amq89633acfy3r1al50razispp"; depends=[RSQLite gdistance geosphere sp raster ncdf plotrix shape]; }; - marqLevAlg = derive { name="marqLevAlg"; version="1.1"; sha256="1wmqi68g0flrlmj87vwgvyxap0miss0n42qiiw7ypyj4jw9kwm8j"; depends=[]; }; - MARSS = derive { name="MARSS"; version="3.9"; sha256="0vn8axzz0nqdcl3w00waghz68z8pvfm764w11kxxigvjpw2plj31"; depends=[nlme mvtnorm KFAS]; }; - maSAE = derive { name="maSAE"; version="0.1-2"; sha256="18a1zbfmjhrmi3fgqd7vaicpsca59kp8r1003pwl7l4032p32fxk"; depends=[]; }; - MASS = derive { name="MASS"; version="7.3-33"; sha256="1bq005zxyc7842z4cz5ilhh917clfdmhg5czfq6plkdgwq8nfhlk"; depends=[]; }; - MASSI = derive { name="MASSI"; version="1.1"; sha256="13kavfsm48qq9zyp10scfjcgrk0x2n4my7cz2xy78s14knlrks5y"; depends=[fpc gplots]; }; - MASSTIMATE = derive { name="MASSTIMATE"; version="1.2"; sha256="1j9l8b5d518ag9ivzr1z4dd2m23y2ia1wdshx1krmshn8xsd6lwp"; depends=[]; }; - MasterBayes = derive { name="MasterBayes"; version="2.51"; sha256="0mbvhn6yspralmlajimdin14hszh78m0bxb3zdxd73xhjqxl4ixk"; depends=[coda genetics gtools kinship2]; }; - MAT = derive { name="MAT"; version="0.1-3"; sha256="0z9kiji0kar286dcirsgrszd2kn6hcrfq8jhnn5pa2rfscgccdmj"; depends=[MASS]; }; - Matching = derive { name="Matching"; version="4.8-3.4"; sha256="04m647342j4yi74ds7ddwnyrf58qdy7k3mc067k3p779qavq2ka1"; depends=[MASS]; }; - MatchIt = derive { name="MatchIt"; version="2.4-21"; sha256="02kii2143i8zywxlf049l841b1y4hqjwkr1cnyv6b8b7y7lz2m5v"; depends=[MASS]; }; - mathgraph = derive { name="mathgraph"; version="0.9-11"; sha256="0xikgzn24p0qqlrmaydmjk5yz5pq2rilsvpx86n3p2k2fc3wpwjy"; depends=[]; }; - maticce = derive { name="maticce"; version="1.0-3"; sha256="0nir60jbai0fisccrpkrnjm5z9lvhimhwfiqnmzxw4mjiifj41c2"; depends=[ouch ape]; }; - matie = derive { name="matie"; version="1.2"; sha256="1ymx49cyvz63imqw5n48grilphiqvvdirwsrv82p7jgxdyav2xv0"; depends=[dfoptim mvtnorm seriation igraph gplots cba]; }; - matlab = derive { name="matlab"; version="1.0.2"; sha256="0m21k2vzbc5d3c93p2hk4208xyd2av2slg55q5j1ibjidiryqgd2"; depends=[]; }; - Matrix = derive { name="Matrix"; version="1.1-4"; sha256="1pxkyfa09gf5rwk1x9hdxrgr1hjs4390h73z3f8h2224rszr3hqh"; depends=[lattice]; }; - matrixcalc = derive { name="matrixcalc"; version="1.0-3"; sha256="1c4w9dhi5w98qj1wwh9bbpnfk39rhiwjbanalr8bi5nmxkpcmrhp"; depends=[]; }; - MatrixEQTL = derive { name="MatrixEQTL"; version="2.1.0"; sha256="03ccawgrkv0r3y8smpym27p5bsxy8y9rhn7pqs9ybb385951azy9"; depends=[]; }; - MatrixModels = derive { name="MatrixModels"; version="0.3-1.1"; sha256="0b44gyvpfvhbkl1vymni7pplidz9a5jrcalswx19hnh5x14qw168"; depends=[Matrix]; }; - matrixpls = derive { name="matrixpls"; version="0.3.0"; sha256="12qa1isj9609xj8qrr8ra8l711zagckim3nwvp7crrv4i6jm4299"; depends=[assertive matrixcalc psych lavaan MASS]; }; - matrixStats = derive { name="matrixStats"; version="0.10.0"; sha256="15pgp50jyycp9hqrf6g9yz0gfv9a0w5yd9amw3vwn3mr202fab5f"; depends=[R_methodsS3]; }; - MATTOOLS = derive { name="MATTOOLS"; version="1.1"; sha256="1nzrkm3a08rpsd9vplyf33rrkadlrd0ln70k95qxj98ndh2v97px"; depends=[]; }; - MAVTgsa = derive { name="MAVTgsa"; version="1.3"; sha256="0rzal9nsi8y873cbf6hrdyzyxnpd4r1yr9fj66cn0s1c8g93ls0y"; depends=[corpcor foreach multcomp randomForest MASS]; }; - MaXact = derive { name="MaXact"; version="0.2.1"; sha256="1n7af7kg54jbr09qk2a8gb9cjh25cnxzj2snscpn8sr8cmcrij0i"; depends=[mnormt]; }; - maxent = derive { name="maxent"; version="1.3.3.1"; sha256="1skc7d0p6kg0gi1bpgaqn2dmxjzbvcphx5x3idpscxfbplm5v96p"; depends=[SparseM tm Rcpp]; }; - maxLik = derive { name="maxLik"; version="1.2-0"; sha256="1vgq2pjy8244ccdjcrrgri4sn2kcwqyfwskh885ci5aw01121d36"; depends=[miscTools sandwich]; }; - maxlike = derive { name="maxlike"; version="0.1-5"; sha256="0h544wr7qsyb70vmbk648hfyb6arrsb41gw39svcin412rhw9k9j"; depends=[raster]; }; - maxstat = derive { name="maxstat"; version="0.7-20"; sha256="171xsq96qdclb7ndpmv8652gh372ncxfkn5yfngvjv1fb12dq8jx"; depends=[exactRankTests mvtnorm]; }; - MBA = derive { name="MBA"; version="0.0-8"; sha256="09rs1861fz41dgicgh4f95v4zafh1jfxhqar1plpqqdx8z1gpxfl"; depends=[sp]; }; - mbbefd = derive { name="mbbefd"; version="0.1"; sha256="0m24q679b7a27hw7v370p21w9bq18zc225q2df319hdrya3aygf2"; depends=[]; }; - MBCluster_Seq = derive { name="MBCluster.Seq"; version="1.0"; sha256="0xbi2r0g0gzsy05qrq1ljr5f5s3glwxj204vk2f1lgwdx3fd116m"; depends=[]; }; - MBESS = derive { name="MBESS"; version="3.3.3"; sha256="12jsrxwdprrahqbk0i0js7lja81ydy385xmijlqk0slppd72dd9c"; depends=[]; }; - mbest = derive { name="mbest"; version="0.1"; sha256="0dz54rgbl40cbrv6670qd441ymz43lj16dvd9fnq3znfafc1790n"; depends=[lme4]; }; - MBI = derive { name="MBI"; version="1.0"; sha256="1lb0sjwa6x360n9a9pagz6yhxh37gxq1fk0f5c3i2sd56ny9jpns"; depends=[]; }; - mblm = derive { name="mblm"; version="0.12"; sha256="17h65bapvz89g5in3gkxq541bxgpj9pciz6i5hzhqn0bdbsb3k6r"; depends=[]; }; - MBmca = derive { name="MBmca"; version="0.0.3-3"; sha256="04v1xbkmrb196pm6a1ql8jdw2h126zzq5qni0mv3vh9wwnlnqlcs"; depends=[robustbase chipPCR]; }; - mbmdr = derive { name="mbmdr"; version="2.6"; sha256="0ss5w66hcgd8v8j9bbbp12a720sblhr2hy9kidqfr8hgjaqlch86"; depends=[logistf]; }; - mboost = derive { name="mboost"; version="2.3-0"; sha256="1p4jqmnsp37jx52cw3k86zkbxr8qch710nszk173mqxcf77w28ip"; depends=[Matrix survival lattice nnls quadprog]; }; - mc2d = derive { name="mc2d"; version="0.1-14"; sha256="1djnvwlq1qvvwhnmj3ijwyaqyp1k778i1yv6qmlj053lc38b54j7"; depends=[mvtnorm]; }; - MC2toPath = derive { name="MC2toPath"; version="0.0.16"; sha256="0jdn9wpxavn2wrml907v23mfxr62wwjdh7487ihjj59g434ry7wh"; depends=[RNetCDF]; }; - MCAPS = derive { name="MCAPS"; version="0.3-2"; sha256="1jvxl9xi102pcs3swxlx4jk76i7i4fll88c92k7m379ik3r36alb"; depends=[stashR]; }; - MCAvariants = derive { name="MCAvariants"; version="1.0"; sha256="08c5qpklilj41agi5nzm4f5w41pdxk98i1wc1ahhnawc3n2cdbjz"; depends=[]; }; - mcbiopi = derive { name="mcbiopi"; version="1.1.2"; sha256="12h4bv3hx1m6bsqdxj5n3b5gh98ms508am8pigz7ckmv0xkyhx85"; depends=[]; }; - mcc = derive { name="mcc"; version="1.0"; sha256="0p661a870bvh3xhcahqqq85azn9rjl3vacjy96jsdn86irj4s0vi"; depends=[]; }; - mcclust = derive { name="mcclust"; version="1.0"; sha256="00qprmsjwbn2d0jl7p9mz8pv7k8ld3mzk862pr1grigk0lqwhx06"; depends=[lpSolve]; }; - MCDA = derive { name="MCDA"; version="0.0.3"; sha256="0nfj5wlsjhj3z20jvdwl12r18rxnpk343r49j5awkh41qa0qyjr8"; depends=[Rglpk Kendall glpkAPI]; }; - mcga = derive { name="mcga"; version="2.0.9"; sha256="197yldx03c634f3x0mpxxvqrys93n7z7n3x0alvqa42z3vdkrz7b"; depends=[]; }; - mcgibbsit = derive { name="mcgibbsit"; version="1.1.0"; sha256="09ydcbjz3abmh46966v01dh26fy79dfklk3zjf262zp3c62ld9yf"; depends=[coda]; }; - mcGlobaloptim = derive { name="mcGlobaloptim"; version="0.1"; sha256="1p8841y9a4yq51prv6iirgw9ln8jznx8nk547sc5xlznksjy1g9n"; depends=[randtoolbox snow]; }; - mcheatmaps = derive { name="mcheatmaps"; version="1.0.0"; sha256="1gglm32xpmim38m7fziczgqfbpcq2899lxardsrzg6j1vhmf765y"; depends=[gridBase]; }; - MChtest = derive { name="MChtest"; version="1.0-2"; sha256="01lflilrp42m236cznn6qgzvv5v9fzpx6wcfxp3q545bw2xmbdvj"; depends=[]; }; - mcIRT = derive { name="mcIRT"; version="0.40"; sha256="1mqyivxgg0mzhlvl3swgicb78ikk998yab0ssmbagbk24amr1q7h"; depends=[Rcpp RcppArmadillo]; }; - mcll = derive { name="mcll"; version="1.2"; sha256="0i9zqbh0l9a9mv4558gbdq9mh52chanykyfwmiymmxygxhp809sz"; depends=[statmod locfit]; }; - mclogit = derive { name="mclogit"; version="0.2-7"; sha256="1ykkrbbnha7npmxr79qc7x77xa3847rjcax6gxrala5s07yg7sww"; depends=[memisc Matrix]; }; - mclust = derive { name="mclust"; version="4.3"; sha256="0ii3w4d66p47i0xmjl9gz4g36piqz3b2kny876qdfjj7wh9m7hpl"; depends=[]; }; - mcmc = derive { name="mcmc"; version="0.9-3"; sha256="148l28nb1qv82x2hj46c26yhn0lw8x5jsrp2dav9sbysv1bdj2f8"; depends=[]; }; - MCMCglmm = derive { name="MCMCglmm"; version="2.21"; sha256="1mjjp65w7pg2kxrx2qf0lh1kdi9d21xxj7s39zhi3q8ixw35h95r"; depends=[Matrix coda ape corpcor tensorA]; }; - MCMChybridGP = derive { name="MCMChybridGP"; version="4.3"; sha256="1a2mhhscjf7s2qczc4zz2pvb9kichdqr1lnkjsyiy61snbhkvp3n"; depends=[MASS]; }; - MCMC_OTU = derive { name="MCMC.OTU"; version="1.0.8"; sha256="1bdmvwxkm162m3237bgf42dm5kp3q0giwf0avrkla8qd834gqch0"; depends=[MCMCglmm ggplot2]; }; - MCMCpack = derive { name="MCMCpack"; version="1.3-3"; sha256="0s1j3047qp2fkwdix9galm05lp7jk7qxyic6lwpbd70hmj8ggs76"; depends=[coda MASS]; }; - mcmcplots = derive { name="mcmcplots"; version="0.4.1"; sha256="0japi78j1a9q6mb7j74d81lj45j8878mdby7765yz8xnjzwjpslb"; depends=[coda sfsmisc colorspace denstrip]; }; - MCMC_qpcr = derive { name="MCMC.qpcr"; version="1.1.3"; sha256="101pbg08p594ilcrrig9sqkddprpl6cd6g9y9rrk1rq6cy5cmrvr"; depends=[MCMCglmm ggplot2]; }; - mcmcse = derive { name="mcmcse"; version="1.0-1"; sha256="1jn5hl6aw83qmwccyfmcsvcymx9cp4d3qnfzzqvlw22x26rx88r6"; depends=[]; }; - mco = derive { name="mco"; version="1.0.12"; sha256="1zfk01l9hza810f0kw8i4d3ayvn6l115c7i31a9ai1c33yralj0d"; depends=[]; }; - Mcomp = derive { name="Mcomp"; version="2.05"; sha256="0wggj0h0qxjwym1vz1gk9iwnwia4lpjlk6n46l6hinsdax3g221y"; depends=[tseries forecast]; }; - MConjoint = derive { name="MConjoint"; version="0.1"; sha256="02yik28mhvd4rfqwrprdbdjx9c49ds55fh042bsjajs2ip467w5c"; depends=[]; }; - MCPAN = derive { name="MCPAN"; version="1.1-15"; sha256="0811wrbp0nf4nj8kvq62ks8yksabib8r1a0gx3nr3v6avfnv08w1"; depends=[mvtnorm multcomp]; }; - McParre = derive { name="McParre"; version="1.0.1"; sha256="16bfca867drbknzc6bylg8paa8p72l23wgjpyvy4pd9z6lpgmhdy"; depends=[MASS]; }; - MCPerm = derive { name="MCPerm"; version="1.1.4"; sha256="0g65vzn43k6qrsglxd2kz245f662gl3c2gdz6qvvxa96v6q9lhh1"; depends=[metafor]; }; - MCPMod = derive { name="MCPMod"; version="1.0-7"; sha256="1iv4c3hsi69yhwch5mf88l27pni07yjnkjqr53kkq167axs7zklx"; depends=[mvtnorm lattice]; }; - mcprofile = derive { name="mcprofile"; version="0.2-0"; sha256="1vcrszx0fzvvgn8fjja5ncsdvbkikxf2ri52c09xyqnq97r5hx68"; depends=[ggplot2 quadprog mvtnorm]; }; - mcr = derive { name="mcr"; version="1.2.1"; sha256="0237w41xichd418ax9xviq4wxbcc6c0cgr5gvzkca67nnqgc4jaz"; depends=[]; }; - mcsm = derive { name="mcsm"; version="1.0"; sha256="13sx7s3ywis5n4a70ld2szld9fb8jkfsc82dy6iskhy17vy8pml0"; depends=[MASS coda]; }; - McSpatial = derive { name="McSpatial"; version="2.0"; sha256="18nmdzhszqcb5z9g8r9whxgsa0w3g7fk7852sgbahzyw750k95n4"; depends=[lattice locfit maptools quantreg RANN SparseM]; }; - mda = derive { name="mda"; version="0.4-4"; sha256="18a12fnhcx911ii8wfqkyi8yxrhbiw2pi6mhywgxzsl3a09g8ghh"; depends=[class]; }; - mdatools = derive { name="mdatools"; version="0.5.3"; sha256="00zv97asyxp6m4fckkrzba2v1b24a3qzdh4f03nbv5nxdkmbpv4a"; depends=[]; }; - mded = derive { name="mded"; version="0.1-1"; sha256="1r2sjg661abzsbqdyq2mlyacnv5rd60jfg2156cq5qyknxkin01m"; depends=[]; }; - MDM = derive { name="MDM"; version="1.3"; sha256="1bvjhl243rf19829ly1qc20ik937hb82lq23aiysj7ya55z8hdpf"; depends=[nnet]; }; - MDPtoolbox = derive { name="MDPtoolbox"; version="4.0.2"; sha256="04w0y5ib23l7nhj1947hwvfk6lpwwc11amqpyw1w53yj794g97wz"; depends=[Matrix linprog]; }; - MDR = derive { name="MDR"; version="1.2"; sha256="0g2fvvcwagml6635va87nc0ijzy0pypx5aqzz7mf5w13j0wpm24y"; depends=[lattice]; }; - meboot = derive { name="meboot"; version="1.4-3"; sha256="0n01g1mjm07pii1las7l2003kg705fqdi941l9lyvdkglnx0dkc6"; depends=[dynlm nlme]; }; - mederrRank = derive { name="mederrRank"; version="0.0.7"; sha256="08jbqmb418qb7v2x6lm4wig1pfzzfx6fhb49mbfhlkbmssbqsjfq"; depends=[BB numDeriv]; }; - mediation = derive { name="mediation"; version="4.4"; sha256="1vgx0i9gk7lqpvyyci0d5s9ls0ydhvhrqw9041ikb4b6h2y2aln3"; depends=[MASS Matrix lpSolve sandwich]; }; - MedOr = derive { name="MedOr"; version="0.1"; sha256="1rwc14s16lnzgb78ac2017hv9pss7zw7nw3y7vrvq1qx4fgiw6f8"; depends=[]; }; - medSTC = derive { name="medSTC"; version="1.0.0"; sha256="1f7w6jbxairqvghr5b7vgdllg3ian16a1fgi7vqlq0mhy2j6phan"; depends=[]; }; - MEET = derive { name="MEET"; version="5.1.1"; sha256="02xz2zkwqaf1wck9a3h1j6z8dasw4j0zqa88jg6h10wqzcrlp9ba"; depends=[seqinr Matrix ROCR Hmisc KernSmooth]; }; - mefa = derive { name="mefa"; version="3.2-5"; sha256="037vpnwclyj6xgycznh6g6qlirlgy3sjnkjqb1046q80b5ywv2ni"; depends=[]; }; - mefa4 = derive { name="mefa4"; version="0.3-1"; sha256="0zyjhq80krnb11wh8p8006qz0znrps3qsd2qnhkw7zwl5282i1zp"; depends=[Matrix]; }; - 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-9"; sha256="0nra47086z4cxwx2hj0w3rdc7zi7k05z9fm6mxw2gi19jgamwcma"; depends=[lattice MASS]; }; - memoise = derive { name="memoise"; version="0.2.1"; sha256="19wm4b3kq6xva43kga3xydnl7ybl5mq7b4y2fczgzzjz63jd75y4"; depends=[digest]; }; - MEMSS = derive { name="MEMSS"; version="0.9-2"; sha256="0wyw8yjs4miwgwdfcnfbzvkxrgv5r3jlg3cg8q2vy7s69wvhksmy"; depends=[lme4]; }; - memuse = derive { name="memuse"; version="1.1"; sha256="1i6l3d885b4v01hlkl50m401bwi7akydhh52gf4kya5khanb8n2b"; depends=[]; }; - MergeGUI = derive { name="MergeGUI"; version="0.2-1"; sha256="1hx03qv5jyjjmqdvylc3kz5dl5qsdqwlirjbrnxrw7grkgkhygap"; depends=[gWidgetsRGtk2 ggplot2 cairoDevice rpart]; }; - merror = derive { name="merror"; version="2.0.1"; sha256="09v62f7ycywasid3b7x52dhidplwdbx9fd0855b40jklfy469bkn"; depends=[]; }; - MESS = derive { name="MESS"; version="0.2-1"; sha256="1hqq615643iqhw6kvcxnxqlpzirdvq0hjm7j2n9x5zkr62syaql3"; depends=[geepack kinship2 mvtnorm]; }; - meta = derive { name="meta"; version="3.7-1"; sha256="0v8pi7lv645vkw6l13r251hh1rzvsklpx98kx6y3d0kwkbcj3p23"; depends=[]; }; - MetABEL = derive { name="MetABEL"; version="0.2-0"; sha256="0rqjv85mgswrbbp8b8ip6cdmz0cvfy9lm5mcr8a7h38rzgx3g3i3"; depends=[]; }; - MetabolAnalyze = derive { name="MetabolAnalyze"; version="1.3"; sha256="0cl76x6imx4a95wd74xx5s8i2vg8wq3inqgakvgzmkwxad6qhrqp"; depends=[mclust mvtnorm ellipse gtools gplots]; }; - metabolomics = derive { name="metabolomics"; version="0.1.3"; sha256="1i5wqpjqbl5rhmys6l3iqkrnni7hw7ihq6c5l49ibi7mfyhzq5j9"; depends=[crmn]; }; - metacom = derive { name="metacom"; version="1.3"; sha256="12asmqwaihm9j6p6qp79m1j93gfcj6rkwmpywhi6nv4g85c1shll"; depends=[vegan lattice]; }; - metacor = derive { name="metacor"; version="1.0-2"; sha256="04k3ph0yg3jp8x4g6l1h4m0qwl51mx0626xmm0fzr1pv4b4a1ypw"; depends=[rmeta gsl]; }; - MetaDE = derive { name="MetaDE"; version="1.0.5"; sha256="1ijg64bri5jn2d3d13q1gvvfyqmbh6gn0lk6dkihixf0jwvjdyqi"; depends=[survival combinat]; }; - metafolio = derive { name="metafolio"; version="0.1.0"; sha256="18s78lljwnn3j0l3mqc0svszcb3c8yzyzlpnimndbiq9yxagxnnf"; depends=[Rcpp plyr colorspace MASS]; }; - metafor = derive { name="metafor"; version="1.9-4"; sha256="1kfj59jdns1b9m40xdpqyxjq592mkdr2f4i6nswkqga28ss8nk8w"; depends=[Formula Matrix]; }; - metagen = derive { name="metagen"; version="1.0"; sha256="0jvbm22976aqvmfnjzs51n2w099yj5hpx6hd0pgvbia80jk7b9vk"; depends=[MASS lhs plyr BBmisc ParamHelpers BatchJobs BatchExperiments ggplot2 metafor]; }; - metaLik = derive { name="metaLik"; version="0.41.0"; sha256="08wiriq6cm02d0b0q34056y5249daidpjzkwzgjq6dh55v5fp2s4"; depends=[]; }; - metaMA = derive { name="metaMA"; version="2.1"; sha256="1hwhj3m4n48qb9vqix2qazsy1xnmwk8x37zm826xx9j0n5j2ilac"; depends=[SMVar]; }; - metamisc = derive { name="metamisc"; version="0.1.1"; sha256="1cvlsix3b857xdw6anqhqsrfwxpnf4rbzg4ybf6aw7vcdc05zgwd"; depends=[mvtnorm ellipse bbmle rjags coda]; }; - metap = derive { name="metap"; version="0.6"; sha256="1iy5cmwrlsr70z0qnqn30n15knsfclg383815a2a8yqpg5gs4953"; depends=[]; }; - MetaPCA = derive { name="MetaPCA"; version="0.1.4"; sha256="14g4v3hyxnds4l2q36mpz282yqg8ahgdw3b0qmj0xg17krrf5l2s"; depends=[foreach]; }; - MetaQC = derive { name="MetaQC"; version="0.1.13"; sha256="11595ggjr46z6xiwmhiyx1sydaq68l18y7mgdwxsg81g03ck9x1r"; depends=[proto foreach iterators]; }; - metaRNASeq = derive { name="metaRNASeq"; version="0.4"; sha256="14xqgxvlip6il1gx9xvv37683qm7zmyswklbcgqw9rgqifi0plal"; depends=[]; }; - metasens = derive { name="metasens"; version="0.1-0"; sha256="0hrrzn6p14p2vs7bllkh9yxg0a3x87dmniglhq05p23g4lymcmbl"; depends=[meta]; }; - MetaSKAT = derive { name="MetaSKAT"; version="0.40"; sha256="1jxs32hvsw6wzci9f1rc7sw1dfyazdm2d57wcmhkggfg3hkdn1vv"; depends=[SKAT]; }; - metatest = derive { name="metatest"; version="1.0-4"; sha256="0bz6gg2n4ffkr144jxk27y24xpqhp8awr09wkaijmv8902qx6qah"; depends=[]; }; - Metatron = derive { name="Metatron"; version="0.1-0"; sha256="0pfkb8wh1gbygbi7m9c5zi630clkn2bd1y9yrdxjlqifzvwx4dbi"; depends=[lme4 mpt Matrix]; }; - meteoForecast = derive { name="meteoForecast"; version="0.31"; sha256="02rbl05i70ss65946w1aa2bg01l8hspqmmqz4w8j2jhs6dhgd429"; depends=[raster sp zoo ncdf rjson]; }; - meteogRam = derive { name="meteogRam"; version="1.0"; sha256="167gyxjnl4dyfqs3znv8sdpkvpqdxzdqi1g730s30gycrm9snap9"; depends=[ggplot2 RadioSonde]; }; - Meth27QC = derive { name="Meth27QC"; version="1.1"; sha256="0ad30svs2kjzmmyvcm0jmv64iyq7slp1x1xl35h2rv1b6zbd4658"; depends=[gplots]; }; - MethComp = derive { name="MethComp"; version="1.22"; sha256="0wp2v8z5y9nl3jalcl2a42z2fpkwkzkvl407farws0yih0hj8b8l"; 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=[]; }; - metRology = derive { name="metRology"; version="0.9-17"; sha256="1g4gv3mpii71i6imfwqg9d5iwfx03bq4lizzhx7dy39b2mj7jd4q"; depends=[MASS numDeriv]; }; - metrumrg = derive { name="metrumrg"; version="5.55"; sha256="1y95j8chnm34svf4q7ijqm19778pnap8734a40v3zb17zbjvs3aj"; depends=[reshape lattice XML MASS]; }; - mets = derive { name="mets"; version="0.2.8"; sha256="11mvd8bjd2h106d7kr60axp24pp38z21jkabgbpcigzc14mrd8y9"; depends=[timereg lava numDeriv Rcpp]; }; - MetSizeR = derive { name="MetSizeR"; version="0.99"; sha256="1msq0la89fvg9vfz5k8rzsnhpqa9b8cjyhggp7mp10rzh696sdap"; depends=[gWidgets cairoDevice pscl gtools MetabolAnalyze]; }; - MetStaT = derive { name="MetStaT"; version="1.0"; sha256="0400gx6i8xlkm51da98ap91c3hgrkgfgxswn0plaxfry3625khkp"; depends=[MASS abind pls]; }; - mewAvg = derive { name="mewAvg"; version="0.3.0"; sha256="16gc78ccjffp9qgc7rs622jql54ij83ygvph3hz19wpk22m96glm"; depends=[]; }; - MExPosition = derive { name="MExPosition"; version="2.0.3"; sha256="1l27wp0psfvlkk79fhb8ypf8awardjljg1f37yj42friy9pdfksz"; depends=[prettyGraphs ExPosition]; }; - MF = derive { name="MF"; version="4.3.2"; sha256="1arnhyqf1cjvngygcpqk2g4d52949rhkjmclbaskyxcrvp62qln0"; depends=[]; }; - 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]; }; - mFilter = derive { name="mFilter"; version="0.1-3"; sha256="1cz9d8447iiy7sq47civ1lcjafqdqs40lzxm2a4alw4wy57hc2h6"; depends=[]; }; - mfp = derive { name="mfp"; version="1.4.9"; sha256="1xnx4jgkxccli1y852kvf26q04mdidczpic3ms916a8mkby7kg3k"; depends=[survival]; }; - MFSAS = derive { name="MFSAS"; version="1.0-0"; sha256="1vnhkr4bgwdn6ffzqfp8w7z45m0ghrfr6ib4agv23frk36ypmxxr"; depends=[]; }; - mfx = derive { name="mfx"; version="1.1"; sha256="1zhpk38k7vdq0pyqi1s858ns19qycs3nznpa00yv8sz9n798wnn5"; depends=[sandwich lmtest MASS betareg]; }; - mgcv = derive { name="mgcv"; version="1.8-2"; sha256="01ml3lwwisg96mb9xs5z5igy4hl480zwbf3s4kpwzzg375ksn49v"; depends=[nlme Matrix]; }; - MGLM = derive { name="MGLM"; version="0.0.6"; sha256="00kz2l7xn9df8n0035i2rkgj6rlb99y9z68935q8px70njs8rl87"; depends=[ggplot2 plyr reshape2]; }; - 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]; }; - MGRASTer = derive { name="MGRASTer"; version="0.9"; sha256="0jmf2900r56v60981sabflkhid3yrqd9xd7crb56vgfl1qkva9zp"; depends=[]; }; - MGSDA = derive { name="MGSDA"; version="1.0"; sha256="1h4sz9csc5cvkr0jnwas28233yx4v0lwxsgl6vh4gxk8w81md25y"; depends=[glmnet]; }; - mGSZ = derive { name="mGSZ"; version="1.0"; sha256="08l98i75h2h8kx9ksvzp5qr8jhf0l6n4j7rg8fcn7hk8chn8v5zh"; depends=[GSA MASS ismev]; }; - MHadaptive = derive { name="MHadaptive"; version="1.1-8"; sha256="1w3bm82v8ahxrf0vqn0pznv7dqn212drinkz8y5kr1flx423l9ws"; depends=[MASS]; }; - mhsmm = derive { name="mhsmm"; version="0.4.12"; sha256="0k8qm447fcgfc5fmqn478dszr76jmin85k51ccqmhgk14jiz64bf"; depends=[mvtnorm]; }; - mht = derive { name="mht"; version="3.00"; sha256="143gmipx6v9nvg2lq1kbl7ns6qmvwpxf3gzmq4b6cfgamcljl05l"; depends=[glmnet]; }; - mhurdle = derive { name="mhurdle"; version="1.0-1"; sha256="1x631fgbq3ika05svyavzadyjd7vi9bcmsgb58wfhpf9xq6j5rcr"; depends=[Formula truncreg maxLik pbivnorm]; }; - mi = derive { name="mi"; version="0.09-18.03"; sha256="01cxkqy5g0i7bqr9rb86075p5gmwgcs7cvs4nfs00r5vjw1hgq61"; depends=[arm abind car foreign lme4 MASS Matrix nnet R2WinBUGS]; }; - mice = derive { name="mice"; version="2.22"; sha256="1b7ivpa21ipzbmmwjn1ch968zpw6wydg30f7jdk95m40lrk2xs68"; depends=[Rcpp lattice MASS nnet randomForest rpart]; }; - miceadds = derive { name="miceadds"; version="0.14-9"; sha256="0zfqs52kaj9sxdzc7j0zxbnaqnkz9a8pwgn2p0pz46qf7kgx6y16"; depends=[MASS mice mvtnorm pan sirt lme4 MBESS pls mitools bayesm Rcpp inline car foreign]; }; - micEcon = derive { name="micEcon"; version="0.6-12"; sha256="1kxhr3qqgswq8glrjfcjz0hyb163lwf303yhwlgrwjciqgp5dq17"; depends=[miscTools]; }; - micEconAids = derive { name="micEconAids"; version="0.6-16"; sha256="07hsabrlkwpdaalh0b7izraz2q5dlxn373ccijc5c4zsrkgk7kij"; depends=[lmtest micEcon systemfit miscTools]; }; - micEconCES = derive { name="micEconCES"; version="0.9-8"; sha256="06g6z8hf7y9d942w6gya0fd5aidzfjkx3280gjygdlwpv7nlpqzv"; depends=[minpack_lm DEoptim systemfit car micEcon miscTools]; }; - micEconSNQP = derive { name="micEconSNQP"; version="0.6-6"; sha256="1n3pxapc90iz1w3plaqflayd0b1jqd65yw5nbbm9xz0ih132dby9"; depends=[miscTools systemfit MASS]; }; - MiClip = derive { name="MiClip"; version="1.2"; sha256="0cszylg7sk88gs1f4dfshw74kdifjr4q069ssxzgss9k90rszp30"; depends=[moments VGAM]; }; - microbenchmark = derive { name="microbenchmark"; version="1.3-0"; sha256="1j0pif46bymmkgr61yf2xv2ymm0xwx52lyc46pgas4i9czygdc9v"; depends=[]; }; - MicroDatosEs = derive { name="MicroDatosEs"; version="0.6.3.1"; sha256="17ka9bdic8vdr0aabmgm216zm9a8jppxll042b5ric4vzplah17d"; depends=[memisc Hmisc]; }; - micromap = derive { name="micromap"; version="1.9"; sha256="0scb79rrj11vy7qgq27hy8222ar22yagk31bq8b5z268zwfbw4fs"; depends=[ggplot2 maptools RColorBrewer rgdal]; }; - micromapST = derive { name="micromapST"; version="1.0.3"; sha256="182zhpsps8cx3wflc5j62njzsv108d5a30v9sb1wpxpcrnsyr343"; depends=[RColorBrewer]; }; - MicroStrategyR = derive { name="MicroStrategyR"; version="1.0-1"; sha256="0a6bk0wnwx8zy9081n7wb12lidgckrhn350r0q5m6aa82l6l8ihi"; depends=[gWidgetsRGtk2]; }; - MicSim = derive { name="MicSim"; version="1.0.6"; sha256="01w9x3ld8b64m3d9qjbja6gbmgnsj2bna9l7lisa17add0i11744"; depends=[chron snowfall rlecuyer]; }; - midasr = derive { name="midasr"; version="0.3"; sha256="1gdfrf8p4wxz03bzdqrvj4ss14zy7dh5ac04ncvg4db2wcdxq6z5"; depends=[sandwich optimx MASS numDeriv Matrix]; }; - MIfuns = derive { name="MIfuns"; version="5.1"; sha256="1jhiaf9wrwgrlsl8s81qh0m8x1vpa01gnw2nxcfpshi7i9il3lw7"; depends=[reshape lattice XML MASS]; }; - MigClim = derive { name="MigClim"; version="1.6"; sha256="171pnalidyw0v2fcjdc3kyrq5kg035kwj5xl8zwgn3hlanpaljvp"; depends=[SDMTools raster]; }; - migest = derive { name="migest"; version="1.6"; sha256="1mjjcba74nk10kdbsaphih3zdyaqmf02hrv13s34klwdwkp3nv0m"; depends=[]; }; - migration_indices = derive { name="migration.indices"; version="0.3.0"; sha256="0h0yjcj70wzpgrv3wl1f2h2wangh1klsllq0i0935plgzw736mwd"; depends=[calibrate]; }; - migui = derive { name="migui"; version="0.00-09"; sha256="0mrvsls9q039pay0vf59xwg6bbr7ahwl4x3iwvar6sbfg8606as8"; depends=[tkrplot mi foreign]; }; - MIICD = derive { name="MIICD"; version="1.1"; sha256="0d697mggax1yp7b4dfxdi25rqmwrq25gmmjqsag6sa5raqr96gc9"; depends=[mstate prodlim cmprsk riskRegression MASS survival]; }; - MILC = derive { name="MILC"; version="1.0"; sha256="14xsiw5al6kixwvf3ph0dlm8s13gsbqvzb92da6ng3x4iiyb1g0w"; depends=[]; }; - mime = derive { name="mime"; version="0.1.2"; sha256="0afndhp8sxvx689b0i9mx52ws9wynd41z8ij3kqnqcz0sa1n4ifb"; depends=[]; }; - MImix = derive { name="MImix"; version="1.0"; sha256="033gxr0z2xba0pgckiigblb1xa94wrfmpgv3j122cdynjch44j4r"; depends=[]; }; - MindOnStats = derive { name="MindOnStats"; version="0.8"; sha256="1fsswkbrxd3f0hz3nd25xvp36si292s4q2r52hw6rsps2mx6bgqi"; depends=[]; }; - minerva = derive { name="minerva"; version="1.3"; sha256="0ph65jfm05wck3zz0lh3bmaj0p4c9309nzkrjpjxqkcnrfdbw6wf"; depends=[]; }; - Miney = derive { name="Miney"; version="0.1"; sha256="0sgln0653rgglinr8rns5s2az0lgyp9slmynyhhhs265grkhrfj0"; depends=[]; }; - miniCRAN = derive { name="miniCRAN"; version="0.0-16"; sha256="01f8cgvnzji56qd7d8cnhm5cp9mx45kyxfkqf46l10c8rhll6h3c"; depends=[XML]; }; - miniGUI = derive { name="miniGUI"; version="0.8.0"; sha256="1iq52x7wbcin7ya207jj3k9vym7mavm5z61vggyabdmr768pci39"; depends=[]; }; - minimax = derive { name="minimax"; version="1.0"; sha256="1g0d9q5h1avbb0yg7ajw5330820i3n5cgkpsif754l4j3ikya8p3"; depends=[]; }; - minpack_lm = derive { name="minpack.lm"; version="1.1-8"; sha256="0nvsxqwg3k9k3dqjzkz1vq2z0xla317011zm9ms8y1qvf75raz83"; depends=[]; }; - minPtest = derive { name="minPtest"; version="1.7"; sha256="088kckpbfy2yp0pk3zrixrimywrvkaib5ywa7fkr5phnzlsl80sv"; depends=[scrime Epi]; }; - minqa = derive { name="minqa"; version="1.2.3"; sha256="06w8in7kpsv8c7frpsgjb40x4vsc8y0ashb0il1yyr157gqdgyhn"; depends=[Rcpp]; }; - minque = derive { name="minque"; version="1.0"; sha256="1ympfyf24883n7178s7jspq18bq5j2kb87hz2yq9i99ds6liqr6b"; depends=[klaR agridat Matrix]; }; - minxent = derive { name="minxent"; version="0.01"; sha256="1a0kak4ff1mnpvc9arr3sihp4adialnxxyaacdgmwpw61wgcir7h"; depends=[]; }; - miP = derive { name="miP"; version="1.1"; sha256="17y2badm76iwidjp45flm9ln098lk9r5m6lgx3skzcq3hp075967"; depends=[VIM mi mice Amelia lattice vcd]; }; - MIPHENO = derive { name="MIPHENO"; version="1.2"; sha256="0hcaq66biv4izszdhqkgxgz91mgkjk1yrwq27fx07a2zmzj44sfv"; depends=[doBy gdata]; }; - miRada = derive { name="miRada"; version="1.13.8-8"; sha256="1m6rm65pv4r16r0s5ih69nr3v2rnpsvpdpk07pi7k4f7v9wck71v"; depends=[]; }; - mirt = derive { name="mirt"; version="1.4"; sha256="0ngm22lhwfv2l68nn7qrvjpyz49kcasdaj2jx46fcb4851xxahyw"; depends=[lattice GPArotation Rcpp numDeriv]; }; - miRtest = derive { name="miRtest"; version="1.7"; sha256="0nqn3xrwlw2z9wjhf6rv0n9frqqviiv54syxyn1nkcn2d5lygwn3"; depends=[corpcor MASS RepeatedHighDim]; }; - misc3d = derive { name="misc3d"; version="0.8-4"; sha256="0qjzpw3h09qi2gfz52b7nhzd95p7yyxsd03fldc9wzzn6wi3vpkm"; depends=[]; }; - miscF = derive { name="miscF"; version="0.1-2"; sha256="195rb9acdirfhap0z35yvcci5xn4j84mlbafki4l1vfgqgnh0ajj"; depends=[MCMCpack mvtnorm Rcpp RcppArmadillo]; }; - miscFuncs = derive { name="miscFuncs"; version="1.2-6"; sha256="1302k6pvf74a0b9bkdjdr2j1xl98842rbq7137h8hwldl50g48i7"; depends=[roxygen2 mvtnorm]; }; - MiscPsycho = derive { name="MiscPsycho"; version="1.6"; sha256="1zs6apivzzii7nln3jmhxggnhxk3j54cw84wbsc8hb279rv943il"; depends=[statmod]; }; - miscset = derive { name="miscset"; version="0.3.1"; sha256="1x1948cwxjqkz23p14ilv5x381xbfkzg328n51fw3sqz11lb2h8g"; depends=[Rcpp xtable]; }; - miscTools = derive { name="miscTools"; version="0.6-16"; sha256="19mslb64lm8srrmml1v40rfkxhqw02bplw0yjv7qnkqj44hcqfw1"; depends=[]; }; - missForest = derive { name="missForest"; version="1.4"; sha256="0y02dhrbcx10hfkakg5ysr3kpyrsh2d9i5b0qzhj9x5x0d5q11gp"; depends=[randomForest foreach itertools]; }; - MissingDataGUI = derive { name="MissingDataGUI"; version="0.2-0"; sha256="18z25wjq4mcd7vv7wg1xz0hmac2dvd1ap91p22yxvpk1qjllzaq3"; depends=[gWidgetsRGtk2 ggplot2 GGally cairoDevice reshape]; }; - missMDA = derive { name="missMDA"; version="1.7.2"; sha256="07m8vih9bbzsx47g59dz9m8m23r8rrvnwddm29gx0cv24snh97lv"; depends=[FactoMineR]; }; - MissMech = derive { name="MissMech"; version="1.0.1"; sha256="0xcxzgjv9p9w8rdq07vanfrw0b49acdikr8brm78hshy0dsnas32"; depends=[]; }; - MiST = derive { name="MiST"; version="1.0"; sha256="0gqln792gixqfh201xciaygmxbafa0wyv5gpbg9w5zkbbv44wrfk"; depends=[CompQuadForm]; }; - mistat = derive { name="mistat"; version="1.0-2"; sha256="1n5wdn5pl6mflzxpdwjj0x44c8a3cxxpwhmyw1jkx5r8yk95mh3p"; depends=[]; }; - mistral = derive { name="mistral"; version="1.1-0"; sha256="08gnichjihhl8dnyh7612x9m2b8vbj81jcya8bh1aaxql26zq9w1"; depends=[DiceKriging e1071 kernlab Matrix mvtnorm rgenoud]; }; - MitISEM = derive { name="MitISEM"; version="1.0"; sha256="03305ds3rgr29z4idaxzsm83igiygna2sqd5vpixklngsrp8w341"; depends=[mvtnorm]; }; - mitools = derive { name="mitools"; version="2.2"; sha256="08sbm17sw549ljid93x64lxg79f860as6j3vv0f8nh1zb9rabqh8"; depends=[foreign]; }; - mix = derive { name="mix"; version="1.0-8"; sha256="0zdbxrslj39cl272ggzvlc41gysj1inbcbmsa4ch7ss5xvk5vfbf"; depends=[]; }; - mixAK = derive { name="mixAK"; version="3.6-1"; sha256="1khnxvmnd7qwk3lxld70dwxfdya2rq4ybdal89v0p7mxcv9abzdh"; depends=[colorspace lme4 fastGHQuad mnormt]; }; - mixcat = derive { name="mixcat"; version="1.0-3"; sha256="0xszngygd3yj61pvv6jrrb5j0sxgpxzhlic69xrd5mv5iyw0cmxd"; depends=[statmod]; }; - mixdist = derive { name="mixdist"; version="0.5-4"; sha256="100i9mb930mzvdha31m1srylmpa64wxyjv6pkw1g5lhm1hsclwm3"; depends=[]; }; - mixedQF = derive { name="mixedQF"; version="0.3"; sha256="037376k13qh0c5nw1nxx3fvffisl9kcdyjz5d4i6vn3gfj0yqccc"; depends=[nnet MASS]; }; - MixedTS = derive { name="MixedTS"; version="1.0.1"; sha256="0ljal2jxscwrv439blavf5gjxbi3k3jfqqmwblzfvc05dqgvdk0b"; depends=[MASS]; }; - mixer = derive { name="mixer"; version="1.7"; sha256="0as9l0s646snli5pykh0i6zpz168f8i5wmxk07l5rhxnb74m0id2"; depends=[]; }; - mixexp = derive { name="mixexp"; version="1.1.2"; sha256="11gzjmg0nifr18nikga1fx8bdgqn2kj1jsyk8q6vi9q9k952f746"; depends=[gdata lattice]; }; - MixGHD = derive { name="MixGHD"; version="1.0"; sha256="008xbbvyc8lm1375yvbk7zvqz2hbf87jq7q9xv75zn65gxm8j93m"; depends=[Bessel MASS mvtnorm ghyp numDeriv]; }; - mixlm = derive { name="mixlm"; version="1.0.5"; sha256="104rh4g7ik1ry0xb53n5b5fv1spvck6s2k2h4xjlp1ykazph073y"; depends=[multcomp pls leaps lme4 car]; }; - mixlow = derive { name="mixlow"; version="1.0.1"; sha256="12vnp3gl3ykxzgvc4bwhi4flmc1sl2y77yi0zi4by17q93a49akm"; depends=[nlme]; }; - MixMAP = derive { name="MixMAP"; version="1.3.1"; sha256="0m6m9wi0ain7z96s6z6kmwjisfqm3al6m459y5zr2l1cdbdpxfpv"; depends=[lme4]; }; - mixOmics = derive { name="mixOmics"; version="5.0-2"; sha256="01xcmm9g80cn8bmq761h3v5az5pj0qldnbszgqx6b2bcrxkc0wg9"; depends=[MASS lattice RGCCA igraph rgl pheatmap]; }; - mixPHM = derive { name="mixPHM"; version="0.7.0"; sha256="0gyvccz205wwnmggh5zw90r6kmr5lv4s4zrdazi2ghjjrvv0gv6b"; depends=[survival lattice]; }; - mixRasch = derive { name="mixRasch"; version="1.1"; sha256="1r067pv7b54y1bz8p496wxv4by96dxfi2n1c99gziqf5ramx3qzp"; depends=[]; }; - mixreg = derive { name="mixreg"; version="0.0-5"; sha256="0wsb1z98ymhshw9nhsvlszsanflxv3alwpdsw8lr3v62bkwka8zr"; depends=[]; }; - mixsep = derive { name="mixsep"; version="0.2.1-2"; sha256="1ywwag02wbx3pkd7h0j9aab44bdmwsaaz0p2pcqn1fs3cpw35wa2"; depends=[tcltk2 MASS RODBC]; }; - MixSim = derive { name="MixSim"; version="1.0-9"; sha256="16kg12784z82x8f1vscv9d5yakmki2m8gqr4hy9417c31xfkk3zy"; depends=[MASS]; }; - mixsmsn = derive { name="mixsmsn"; version="1.0-9"; sha256="0pgip1xfgfrdy3g3197d7visn164zi7xnp6wlsgjwxdylvjsxkji"; depends=[mvtnorm]; }; - mixstock = derive { name="mixstock"; version="0.9.5.1"; sha256="05bnxz7xkr5j96r85r7pc47svc60nwfmfax76naplzbvn751mhkg"; depends=[coda plotrix abind lattice]; }; - mixtools = derive { name="mixtools"; version="1.0.2"; sha256="0x809m6lbzprd5kq6wqk528x9apaj5df3sidzk9jiw06qklngwg8"; depends=[boot MASS segmented]; }; - mixture = derive { name="mixture"; version="1.1"; sha256="09hp28fh1y2kllny6l0zciwbhhnjjgyipsx1vs55rq7rr0s94pkn"; depends=[]; }; - MixtureInf = derive { name="MixtureInf"; version="1.0-1"; sha256="1cq8zzhhb6vg545n9aw1b9fhx025zy75dd6pw161svsb5776py5d"; depends=[]; }; - mizer = derive { name="mizer"; version="0.2"; sha256="0cpal9lrjbvc923h499hbv4pqw3yjd4jvvhgayxgkak2lz2jzmcz"; depends=[plyr reshape2 ggplot2]; }; - mkin = derive { name="mkin"; version="0.9-32"; sha256="1b1s1px4zcbpk2wl49qricxgjw4pvffhvf3ccyrjhxdrdpmcknyr"; depends=[minpack_lm rootSolve FME deSolve]; }; - MKLE = derive { name="MKLE"; version="0.05"; sha256="00hcihjn3xfkzy0lvb70hl2acjkwk6s3y7l4gprix24shnblvxzi"; depends=[]; }; - MKmisc = derive { name="MKmisc"; version="0.96"; sha256="1lcnmswvix290s63cqqlq4ls6wyzzb3f5ykcn4sch6nv71bn8x5x"; depends=[RColorBrewer robustbase]; }; - mkssd = derive { name="mkssd"; version="1.1"; sha256="1qqzy6fn6sc3lxahc19hzzf1hzxsyvxqi7npynw0vkknlrvh2ijp"; depends=[]; }; - mlbench = derive { name="mlbench"; version="2.1-1"; sha256="1rp035qxfgh5ail92zjh9jh57dj0b8babw3wsg29v8ricpal30bl"; depends=[]; }; - MLCM = derive { name="MLCM"; version="0.4.1"; sha256="1g6lmw75qdiq0fshxr3sqwm1a3y4928chxkggnfwwxp8hqw4r6px"; depends=[]; }; - mlDNA = derive { name="mlDNA"; version="1.1"; sha256="0d9lydiwar98hin26slnym4svn0g1xmyn212vvzsx9lzlvs5a9k4"; depends=[snowfall igraph rsgcc e1071 randomForest pROC ROCR]; }; - MLDS = derive { name="MLDS"; version="0.4.3"; sha256="1vql92y2dy1ba5l5xdysqzkzvkrr4bhclmjabn49c8qb2xc2rl40"; depends=[MASS]; }; - mlearning = derive { name="mlearning"; version="1.0-0"; sha256="0r8xfaxw83s2r27b8x5qd0k4r5ayxpkafzn9b1a0jvsr87i6520r"; depends=[class nnet MASS e1071 randomForest ipred]; }; - MLEcens = derive { name="MLEcens"; version="0.1-4"; sha256="0zlmrcjraypscgs2v0w4s4hm7qccsmaz4hjsgqpn0058vx622945"; depends=[]; }; - mlegp = derive { name="mlegp"; version="3.1.4"; sha256="1932544irhzhf6a8rjyh66j57h9awlhwd6xam603bamfg106cmg2"; depends=[]; }; - MLEP = derive { name="MLEP"; version="0.0-3"; sha256="1v3jiqy9lr3p30bpiibbq5cypy46c7vnsl40z0miyviiv4s1c3vz"; depends=[]; }; - mleur = derive { name="mleur"; version="1.0-6"; sha256="0mddphq3b6y2jaafaa9y41842kcaqdl3dh7j4pva55q2vcjcclj7"; depends=[urca stabledist fGarch lattice]; }; - mlgt = derive { name="mlgt"; version="0.16"; sha256="1nvdq6mvgr39ikkf73aggsb6pmbw132injj8fdkr8hgcmwm6lgd9"; depends=[seqinr]; }; - mlica2 = derive { name="mlica2"; version="2.1"; sha256="0c3m1zd9x99n6lw12hfzmd59355z51xa8rhg1h7qwfn9p86r826f"; depends=[]; }; - mlmmm = derive { name="mlmmm"; version="0.3-1.2"; sha256="1m5ziiqs3ll1xjm1yf7x4sdc910jypn3kjnbadf95xxkvqmfrsqq"; depends=[]; }; - mlmRev = derive { name="mlmRev"; version="1.0-6"; sha256="0mvmahnbbp478xwldj4wlsjib4v4afhs07643gxgcqpi56zbd5h7"; depends=[lme4]; }; - mlogit = derive { name="mlogit"; version="0.2-4"; sha256="15ndly7i56k8blgvpn15ixxnqx9yvbci7n3mb3hm9mnrxwh5v7sx"; depends=[Formula maxLik statmod zoo MASS lmtest]; }; - mlogitBMA = derive { name="mlogitBMA"; version="0.1-6"; sha256="1wl8ljh6rr1wx7dxmd1rq5wjbpz3426z8dpg7pkf1x9wr94a2q25"; depends=[BMA abind maxLik]; }; - MLPAstats = derive { name="MLPAstats"; version="0.5-9"; sha256="0cy315kj2ivqwrdhg85ncp634mwx2bbwzs86w1pcjwf03v217wk9"; depends=[nlme boot tkrplot pixmap]; }; - mlPhaser = derive { name="mlPhaser"; version="0.01"; sha256="1s2mqlnbcjdkx0ghvr2sw9rzggqa4jy2vzi9vbyqkh6795lgck6n"; depends=[]; }; - mlr = derive { name="mlr"; version="2.1"; sha256="15czq70hgfbfr1j9lhbsrmmf2d5mqvy1zj9xkmnycfvk0zsh996j"; depends=[ParamHelpers BBmisc parallelMap codetools survival checkmate]; }; - MLRMPA = derive { name="MLRMPA"; version="1.0"; sha256="0gfbi70b15ivv76l3i0zlm14cq398nlny40aci3vqxxd0m2lyyx5"; depends=[ClustOfVar]; }; - MM = derive { name="MM"; version="1.6-2"; sha256="1z7i8ggd54qjmlxw9ks686hqgm272lwwhgw2s00d9946rxhb3ffi"; depends=[magic partitions emulator Oarray]; }; - mmand = derive { name="mmand"; version="1.0.0"; sha256="10dqg99iaq5mfdz0x35z7f8xsf5fhw3jis0zgqxia8vzrw68q70v"; depends=[reportr Rcpp]; }; - mmap = derive { name="mmap"; version="0.6-12"; sha256="12ql03wzwj23h8lwd07rln6id44mfrgf9wcxn58y09wn3ky1rm6a"; depends=[]; }; - mmcm = derive { name="mmcm"; version="1.2-4"; sha256="16lh9ivnj3l01y28lgb5gykkxwa56cssadnh516qwhnv63c586sv"; depends=[mvtnorm]; }; - mmds = derive { name="mmds"; version="1.1"; sha256="0f5qzkfhi7vg8vsd8r41idmbwrrgc7qzfnp81adms2yzrza17wrw"; depends=[]; }; - mme = derive { name="mme"; version="0.1-4"; sha256="1k9l86q8bahkp0g6g6k963j3n2pzz4jb2xljw31r8xxlxpiv11n5"; depends=[mixstock MASS Matrix]; }; - mmeln = derive { name="mmeln"; version="1.1"; sha256="06bxp157cdab6ghx3yrsn8l2gixh9cyv6fv4pqyq0yxqwbjf9bmi"; depends=[]; }; - mmeta = derive { name="mmeta"; version="2.2"; sha256="06zkazi97f3il2vlx4f8c7zz4kxs9ylhscd06j31h504c1w96ddf"; depends=[aod HI]; }; - MMIX = derive { name="MMIX"; version="1.2"; sha256="02c74qp48ixqh5cjp2006zgg4xz4bgxxq3csyhjl219if19kmj5m"; depends=[]; }; - mmm = derive { name="mmm"; version="1.4"; sha256="1nydian004nldqhyw3x15w6qfml2gkjc0x8ii54faz563byjv3d8"; depends=[gee]; }; - mmm2 = derive { name="mmm2"; version="1.2"; sha256="1h9pn5s3jjs4bydrr1qysjb4hv7vs4h3m7mvi22ggs2dzyz3b298"; depends=[gee]; }; - MMMS = derive { name="MMMS"; version="0.1"; sha256="1a71vs3k16j14zgqfd4v92dq9swrb44n9zww8na6di82nla8afck"; depends=[survival glmnet]; }; - mmod = derive { name="mmod"; version="1.2.1"; sha256="0c2ijg5116hacq0f18xhkbxankjp0k34zfnw8q02ahzwd26ds0z7"; depends=[adegenet pegas]; }; - MMS = derive { name="MMS"; version="3.00"; sha256="06909912v2hr52s8k0a0830lbmdh05dcd7k47vydhbwq3rzf3ahg"; depends=[glmnet Matrix mht]; }; - MMST = derive { name="MMST"; version="0.6-1.1"; sha256="1gd7v34xi3wn2rjhk0ih0q2i2hb7c5x8kvv90g90ln803b5wvbhs"; depends=[]; }; - mnlogit = derive { name="mnlogit"; version="1.1.1"; sha256="0n6b5c14dcqv8pldrdgpjq8r2q956whwz2bxalphcf5da9r9jlc7"; depends=[]; }; - MNM = derive { name="MNM"; version="1.0-0"; sha256="0qab0qqhfjmaiji5yqdvd1lqz8f90q40sdwpcah923yi3g6alh2q"; depends=[ellipse ICS ICSNP SpatialNP mvtnorm survey]; }; - mnormt = derive { name="mnormt"; version="1.5-1"; sha256="1msxbdlg4wb45lsg0m4hqf41qglnmbqw55815v8qvyfjkwrgns8b"; depends=[]; }; - MNP = derive { name="MNP"; version="2.6-4"; sha256="068lssg565dw673dm8f5k6dbxl2vblnszg8wibzy3ijf96hp03cw"; depends=[MASS]; }; - mobForest = derive { name="mobForest"; version="1.2"; sha256="198air7fplgiw86vs7m4dn4kai0gpnnmv14bykbw3lnaxk4fk8fd"; depends=[party lattice modeltools]; }; - Mobilize = derive { name="Mobilize"; version="2.16-2"; sha256="077s56cfb6cp2fiyrvva130c63nqr7nczfyfkykmkdsjsgs3ksp8"; depends=[Ohmage ggplot2 wordcloud reshape2]; }; - MOCCA = derive { name="MOCCA"; version="1.2"; sha256="04smpzn9x64w1vpw4szqa7dwnaak1ls6gpg7fgajs68mv5zivffa"; depends=[cclust clv]; }; - Modalclust = derive { name="Modalclust"; version="0.6"; sha256="16h90d30jwdrla5627rva0yf69n0zib9z5fl3k5awlqfscz4fw26"; depends=[mvtnorm zoo class]; }; - modeest = derive { name="modeest"; version="2.1"; sha256="0l4y7yhkgsxycdd2lck0g8g6k2r059hwlrrcpl46md3rva4jgbnp"; depends=[]; }; - modehunt = derive { name="modehunt"; version="1.0.6"; sha256="15rq1yyrjhsn2rlkyiqj36jvji635hy6jsih845mfxdpn4vnssa3"; depends=[]; }; - modelfree = derive { name="modelfree"; version="1.1-1"; sha256="0ammka2wxx90z31zfzypw9dk5n118l0vxhykxbx6srfig2vdyn82"; depends=[PolynomF SparseM]; }; - ModelGood = derive { name="ModelGood"; version="1.0.8"; sha256="1s86l7kcvfqm1lkpgp74b1bxj14a9r134waszw0da231zdsxfh3c"; depends=[prodlim]; }; - ModelMap = derive { name="ModelMap"; version="3.0.15"; sha256="1d7qn1p4fv94bdlr6if64vxl9yknavix4gzmpg3kxwlrxaz2g8a2"; depends=[randomForest raster gbm rgdal fields HandTill2001 PresenceAbsence]; }; - modeltools = derive { name="modeltools"; version="0.2-21"; sha256="0ynds453xprxv0jqqzi3blnv5w6vrdww9pvd1sq4lrr5ar3k3cq7"; depends=[]; }; - modiscloud = derive { name="modiscloud"; version="0.14"; sha256="0vwhfp50yb21xkanvzk983vk0laflv60kj1ybx3fydfljwqx0rwj"; depends=[date sp sfsmisc raster rgdal]; }; - MODISTools = derive { name="MODISTools"; version="0.93.9"; sha256="086i965gxmcqz7n0a1wg4jhplb3ivpfpwl1w32vzr0wql5yyp85i"; depends=[RCurl XML]; }; - modTempEff = derive { name="modTempEff"; version="1.5.1"; sha256="1xny818gnr5fphxvpc343mcc6xcacr0asi36m7q0bxmzy3lhs8r6"; depends=[mgcv]; }; - moduleColor = derive { name="moduleColor"; version="1.08-1"; sha256="16z0iyy517j1kbsbcpdppy0gyac7vyfz13yznzhs42fwj7k0iwxl"; depends=[dynamicTreeCut]; }; - MOJOV = derive { name="MOJOV"; version="1.0.1"; sha256="11mcqxw83z4xx29s34v4rsbb3zvyhlb2lmvf97b77n455gsy5hab"; depends=[aod survey saws lattice]; }; - mokken = derive { name="mokken"; version="2.7.5"; sha256="0wrf5xlhvb3lcjdxkrf8pfsq8k159l5zvcwni653vrxl1rfwh69m"; depends=[]; }; - mombf = derive { name="mombf"; version="1.5.7"; sha256="0kmxzdkjwlbw3sjinjcxsi1fjylib232agvq0bx58i7bzcad8bv9"; depends=[mvtnorm ncvreg actuar mgcv]; }; - moments = derive { name="moments"; version="0.13"; sha256="05pa4gkmpmp744a5rsr2arqh7y5bgalwrwdn731jg6waqiniy024"; depends=[]; }; - Momocs = derive { name="Momocs"; version="0.2-6"; sha256="187w6xyswlg5nac6lbprcwvj63gka832n33vlj2ix810vqyxd0fk"; depends=[ade4 sp shapes jpeg spdep ape]; }; - mondate = derive { name="mondate"; version="0.10.01.02"; sha256="18v15y7fkll47q6kg7xzmj5777bz0yw4c7qfiw2bjp0f3b11qrd2"; depends=[]; }; - MonetDB_R = derive { name="MonetDB.R"; version="0.9.4"; sha256="0ivymfng1959xw5wwmfl8l72dz4skarsb791ij54xcfn4v7c18np"; depends=[DBI digest]; }; - 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]; }; - MonoPoly = derive { name="MonoPoly"; version="0.2-8"; sha256="0lpqqpahpss4q9iddh2p4h6klsrjhg3v6h1wfb70vy0miyhqb93h"; depends=[quadprog]; }; - monreg = derive { name="monreg"; version="0.1.2"; sha256="0qah7yw1xwk3pig413r7l8hhh645d45706mndv614fir738bv9pk"; depends=[]; }; - moonsun = derive { name="moonsun"; version="0.1.3"; sha256="1y8mwxmcy4iz444c2fayyi4i0jk1k561dp6cbjg2b3lmdml0whmi"; depends=[]; }; - mopsocd = derive { name="mopsocd"; version="0.5.1"; sha256="10hssnm1afqmxa9kw6ifqnz3p3yyjrmxgi98zlj31a5g4nis8wb1"; depends=[]; }; - morgenstemning = derive { name="morgenstemning"; version="1.0"; sha256="17y90cf8ajmkfwla0hm4jgkbkd1mxnym63ph2468sfxkhn0r3v88"; depends=[]; }; - Morpho = derive { name="Morpho"; version="2.0.3-1"; sha256="0j2wfjxrk0myxk1j4g0jh68npg8wwia2i3a02dn9mxnmx90nbvaa"; depends=[Rvcg rgl colorRamps foreach Matrix yaImpute doParallel Rcpp]; }; - morse = derive { name="morse"; version="1.0.2"; sha256="044aljv48mfq6yj9i77yqf03qa4qqkncaalzhph3wr9w4jvxpxn5"; depends=[plyr]; }; - MorseGen = derive { name="MorseGen"; version="1.2"; sha256="1kq35n00ky70zmxb20g4mwx0hn8c5g1hw3csmd5n6892mbrri8s9"; depends=[]; }; - MortalitySmooth = derive { name="MortalitySmooth"; version="2.3.2"; sha256="0r24v94nslavxjxvyc8a1f6dar3vm2lysg6qpxcgw6zgx8k0vk00"; depends=[svcm lattice]; }; - mosaic = derive { name="mosaic"; version="0.9-0"; sha256="0zmzx1mh6nhp6jz68abdl44hb918cyrpa1qj25m41c0x83rnwi0s"; depends=[car dplyr lattice ggplot2 reshape2 plyr Hmisc latticeExtra gridExtra ggdendro]; }; - moult = derive { name="moult"; version="1.3"; sha256="0mvzyildng2qs4jgws37wa2b8ms8bv7mmzs0dxbc1wcq56vfs9yj"; depends=[Formula]; }; - move = derive { name="move"; version="1.2.475"; sha256="0d542554bamgnc5qd7z497ssk885mz4m1wbaiqpi5cyxd24kwgii"; depends=[geosphere sp raster rgdal]; }; - movMF = derive { name="movMF"; version="0.2-0"; sha256="1p9ay7w93gyx4janw23iwg2j0wkvnvzalaa20n1rlahhmh327g7i"; depends=[skmeans clue slam]; }; - mp = derive { name="mp"; version="0.1"; sha256="13wsfhvxwpvz5qx95a720vp2l7807whvrv7dabqfajmnc45bdlj4"; depends=[]; }; - mpa = derive { name="mpa"; version="0.7.3"; sha256="0mhnsbgr77fkn957zfiw8skyvgd084rja1y4wk5zf08q5xjs2zvn"; depends=[network]; }; - MPAgenomics = derive { name="MPAgenomics"; version="1.1.0"; sha256="0kf6vsxp6dcmqkl7yjyfjch9ms33pf9w7qrk76q05man5hn7y4fz"; depends=[R_utils changepoint glmnet cghseg]; }; - MPCI = derive { name="MPCI"; version="1.0.6"; sha256="1ngxx5363cm2cid3dl9amva016xy914sz49nfdkh88hjsxv3svjc"; depends=[]; }; - MPDiR = derive { name="MPDiR"; version="0.1-15"; sha256="1ga3dk9ncycsq30w6na4g7aik43v8q2kcrg7x6lpmiaa9qa2wn16"; depends=[]; }; - mph = derive { name="mph"; version="0.9"; sha256="11wcy23sv8x7aq6ky8wi0cq55yhjkkm9hn672qy803dwzzxv5y61"; depends=[]; }; - MPINet = derive { name="MPINet"; version="1.0"; sha256="1zw3piqhhpagg5qahc2xahxxfdwdk8w94aass1virlpl0f52ik8s"; depends=[BiasedUrn mgcv]; }; - MplusAutomation = derive { name="MplusAutomation"; version="0.6-2"; sha256="0b85hnxxd46xr240k0vswwh81n57a2azmmz9wyc6x8qidiagqzxg"; depends=[plyr boot gsubfn coda xtable lattice]; }; - mpm = derive { name="mpm"; version="1.0-22"; sha256="0wijw8v0wmbfrda5564cmnp788qmlkk21yn5cp5qk8aprm9l1fnk"; depends=[MASS KernSmooth]; }; - mpMap = derive { name="mpMap"; version="1.14"; sha256="0gmhg5ps8yli8699a5aw26skfbjxx4zpp0paqxxdc0zl28l0pdff"; depends=[gdata seriation qtl wgaim]; }; - mpmcorrelogram = derive { name="mpmcorrelogram"; version="0.1-3"; sha256="0qgzsh744002whh3v1hrxs1i0xnk9zgfgkdgx2f0ffj00vvnwr97"; depends=[vegan]; }; - mpmi = derive { name="mpmi"; version="0.4"; sha256="0lfzw1bncp9nhsng5j5avvwi02grx8pmf39v5zav63s0lzmrj8a3"; depends=[KernSmooth]; }; - mpoly = derive { name="mpoly"; version="0.0.5"; sha256="1zhmd3lsa0n56yr3bdhg3r668zrmf35phm8g69c18a3rr5qmcdqg"; depends=[stringr rSymPy rJython rJava rjson partitions plyr]; }; - Mposterior = derive { name="Mposterior"; version="0.1.2"; sha256="16a7wvg41ld2bhbss480js5h12r41nl7jmc3y4jsbv1lr5py4ymy"; depends=[Rcpp]; }; - MPSEM = derive { name="MPSEM"; version="0.2-5"; sha256="1jy459rg7i7x24ygdnlibwlh8rx7arpajjycqw414w5p9yy9ns1f"; depends=[ape MASS]; }; - mpt = derive { name="mpt"; version="0.4-1"; sha256="08drh66056pnvs43gc7dxhb62ajkdijbc9ca2y1hjrgvkssqk5xg"; depends=[]; }; - MPTinR = derive { name="MPTinR"; version="1.5.1"; sha256="0gy0jdzrkwcn1yvnrdb5dqrk1z96qa2ga41zhg63kz1b2m16q7i5"; depends=[numDeriv Brobdingnag Rcpp]; }; - MPV = derive { name="MPV"; version="1.29"; sha256="165sbayrp8p3aqwqrmf1g10agm0kdjksr6mr6p929j22kkf3k8gx"; depends=[]; }; - mQTL = derive { name="mQTL"; version="1.0"; sha256="0k80xvkr0b0mp3bj2s558fjxi2zf4k7ggnw6hsjm8lr84i108dks"; depends=[qtl MASS outliers]; }; - mra = derive { name="mra"; version="2.13"; sha256="1x282nzdz5bd3yji26mnzlvrkxszx15cra079k07rgdxqnixg2c8"; depends=[]; }; - mratios = derive { name="mratios"; version="1.3.17"; sha256="0a2pn4234ri5likaqbxgkw8xqmwchr6fak3nninral0yzd4rcal5"; depends=[mvtnorm]; }; - MRCE = derive { name="MRCE"; version="2.0"; sha256="0fnd7ykcxi04pv1af5zbmavsp577vkw6pcrh011na5pzy2xrc49z"; depends=[QUIC]; }; - MRCV = derive { name="MRCV"; version="0.3-2"; sha256="061x9bnngm2f16bf6i0v00lf0g41wfg90ha0bjbphipcychzn3a3"; depends=[tables]; }; - mrdrc = derive { name="mrdrc"; version="1.0-6"; sha256="0kk6837hx4c7ixsrmib46ycvimv90ka8sj3w0310s4d7bzxvw1sc"; depends=[drc locfit]; }; - mrds = derive { name="mrds"; version="2.1.6"; sha256="14ab9pay3daqi2pcrcx98w8fzg1l5j0vr7vfybvrsjy5xd0c8f2q"; depends=[optimx mgcv Rsolnp]; }; - mreg = derive { name="mreg"; version="1.1"; sha256="06la0yy2yys161jhlzlcm5lcv0664wm6sa8gjdnpd1s1nx52jkqf"; depends=[]; }; - mritc = derive { name="mritc"; version="0.4-0"; sha256="02a8h1x3pk406zpn89gl5wkcd74qm5gqz8gqpckk3nv881pkayaz"; depends=[lattice misc3d fmri AnalyzeFMRI]; }; - mRm = derive { name="mRm"; version="1.1.5"; sha256="0sbpk7z4ij917nw8wyvnm87iav95ybqrzvmsjy3r8nyq55bjzyn7"; depends=[]; }; - MRMR = derive { name="MRMR"; version="0.1.3"; sha256="1b3a4bkpcncl4sh7d81nk6b2dzhzqn9zhqdxv31jgippsqm2s3k2"; depends=[reshape2 ggplot2 lubridate lmtest plyr]; }; - mRMRe = derive { name="mRMRe"; version="2.0.4"; sha256="1ig78szk20s0cdj4pzrxxqa2hlx7126fh0jah8ym0563ps8hwill"; depends=[survival igraph]; }; - MRsurv = derive { name="MRsurv"; version="0.2"; sha256="148myzk6r8whkpv1yv59dmdlr2n8vdwmaww165aw696xfjxwq550"; depends=[survival mvtnorm]; }; - MRwarping = derive { name="MRwarping"; version="1.0"; sha256="13bcs7rlm4irx7yzdnib558w9014a4chh9xwc010m6pxvxv36qnv"; depends=[boa SemiPar]; }; - msap = derive { name="msap"; version="1.1.8"; sha256="0z5lm782jjb9w1h5vgz8bmxjdcrq9zb3xp1w5cb479jjc7krlgg3"; depends=[ade4 ape]; }; - msarc = derive { name="msarc"; version="1.3.4"; sha256="0rgbrgdwjsybqcbfpf71b9z6qwwn8ph87z4hp0c1gmjrv8b9byld"; depends=[gplots]; }; - MsatAllele = derive { name="MsatAllele"; version="1.05"; sha256="1w489xjc7vxanam6hr4ym692j6a2skkmyzgqsmccy3101pzn522h"; depends=[]; }; - MSBVAR = derive { name="MSBVAR"; version="0.9-1"; sha256="1qd8v3n9nvyp1j1byb8dkmvkbmk5p2kgx7wjmsa9sh4siqbxzn4w"; depends=[KernSmooth xtable coda bit mvtnorm lattice]; }; - mseapca = derive { name="mseapca"; version="1.0"; sha256="115njdk8cv55zxd38hq9qaca686ykckni0f3xl8w3bn32gb5g9a7"; depends=[XML]; }; - MSeasy = derive { name="MSeasy"; version="5.3.3"; sha256="191mvg1imxfjlnd808ypn4lsjx7n6ydf16flax79hv01z7rcjylh"; depends=[amap clValid cluster fpc]; }; - MSeasyTkGUI = derive { name="MSeasyTkGUI"; version="5.3.3"; sha256="0ihz8vr2wbgy88bzssilgvlhkbr13jznfjvnqy73wpchqgwy0wy6"; depends=[MSeasy]; }; - mseq = derive { name="mseq"; version="1.2"; sha256="0h1wdnmlw7raqyy7844zl5k942d6glhv0lihd4h3gcv5is0if66w"; depends=[gbm]; }; - MSG = derive { name="MSG"; version="0.2.2"; sha256="18siw81pa02yg0zs40pavwm88yz7kfi60fislmjpwnl2207a6fhf"; depends=[RColorBrewer]; }; - msgl = derive { name="msgl"; version="2.0.125.0"; sha256="0jpyzn6pp3fh22qxmbgapdbjkxrvjl0mkk5cms0cldawbds3p4sj"; depends=[Matrix sglOptim]; }; - msgpackR = derive { name="msgpackR"; version="1.1"; sha256="0a6vm4q1zfy8wlvhl9wfy09ig1iag9fvjasz5w9bll7idky4ldx5"; depends=[]; }; - msgps = derive { name="msgps"; version="1.3"; sha256="0nvxy9a41z5d111gqr1gh521imm795l1li70g1mzrag1gpg810c5"; depends=[]; }; - msir = derive { name="msir"; version="1.3"; sha256="0d7zxjmhr1ri3qz3fdkf56fi5dz2p9lb2vyqccrpn7js2ibkqhpl"; depends=[mclust]; }; - msm = derive { name="msm"; version="1.4"; sha256="1x7ys6695jarwfkh3xv607mwm5l2y2gzq2mczjfdcs9mla2l96a5"; depends=[survival mvtnorm expm]; }; - msme = derive { name="msme"; version="0.5.1"; sha256="1bkj10pgmv9q61384fwd2pxccclclc3knc5x212p42w4w49hnm1q"; depends=[MASS lattice]; }; - msos = derive { name="msos"; version="1.0.1"; sha256="0fbxi8x83sj8a6bahc7q28vql00pxqdia2vxb6ilsc459xaph6vc"; depends=[mclust tree]; }; - MSQC = derive { name="MSQC"; version="1.0.1"; sha256="1vs9kygjg9f4sr1m80hdn03gdhbdqfjamqxhbs9zha8smjrsgisw"; depends=[rgl]; }; - msr = derive { name="msr"; version="0.4.1"; sha256="1kfj6xq7l32ligc53akiym3s9if87087gan8nqz4w7d8nxp693s7"; depends=[Matrix class glmnet e1071 rgl RColorBrewer colorspace]; }; - msSurv = derive { name="msSurv"; version="1.1-2"; sha256="1nyadgzwdyf48qhqdx8sszvgkhxafacnccacg39ghm6gqv8b5j60"; depends=[class lattice]; }; - mstate = derive { name="mstate"; version="0.2.7"; sha256="0rys25cwr814k8z65206s12yv18dala66b3nlfq882dw5cfpaybl"; depends=[survival RColorBrewer]; }; - MSwM = derive { name="MSwM"; version="1.2"; sha256="01l23ia20y3nchykha4vz6sa757zmbvgx2315cacxfcqk9rgs08c"; depends=[nlme]; }; - mtk = derive { name="mtk"; version="1.0"; sha256="0vq2xlxf86l92fl91qm8m4yfjyz1h8szmwxiics7sc9f0as0dkmy"; depends=[stringr XML sensitivity lhs rgl]; }; - MTS = derive { name="MTS"; version="0.32"; sha256="0jxa0madik1d317wsl1svb2bndi6mw125brbxpyf019lknh6yajy"; depends=[Rcpp fGarch mvtnorm]; }; - mtsdi = derive { name="mtsdi"; version="0.3.3"; sha256="1hx4m1jnfhkycxizxaklnd9illajqvv1nml8ajfn3kjmrb5z7qlp"; depends=[gam]; }; - MTurkR = derive { name="MTurkR"; version="0.4"; sha256="19hk6jgkj7rr4syad3chmyacn0q2m9lq0z3hdrfavcwqa203zgp9"; depends=[RCurl digest XML]; }; - MUCflights = derive { name="MUCflights"; version="0.0-3"; sha256="03ksvv5nyzlqiml1nz405r3yqb2cl35kpm1h61zcv2nqq8cxqshs"; depends=[XML geosphere sp RSQLite NightDay]; }; - MuFiCokriging = derive { name="MuFiCokriging"; version="1.2"; sha256="09p8wdmlsf21ibqyjigwdipcin3ij0naxcd035hqgfj76v20wiyv"; depends=[DiceKriging]; }; - muhaz = derive { name="muhaz"; version="1.2.6"; sha256="1b7gzygbb5qss0sf9kdwp7rnj8iz58yq9267n9ffqsl9gwiwa1b7"; depends=[survival]; }; - multcomp = derive { name="multcomp"; version="1.3-5"; sha256="0zi3vxp0yfmf5qvp38l16d9lr12b86av0h4i6qzwaxbmnv14vzjd"; depends=[mvtnorm survival TH_data sandwich]; }; - multcompView = derive { name="multcompView"; version="0.1-5"; sha256="0vfgvqxqgxyifkqs3r5xxj7rfn8lfmby6wyyiqa5jv01073xchib"; depends=[]; }; - MultEq = derive { name="MultEq"; version="2.3"; sha256="0fshv7i97q8j7vzkxrv6f20kpqr1kp9v6pbw50g86h37l0jghj7r"; depends=[]; }; - multgee = derive { name="multgee"; version="1.4"; sha256="02h8zl79a8ad0q3inpb3aqjr9icjxjiph2b4rxnwa6kq8p3aagwn"; depends=[gnm VGAM]; }; - multibiplotGUI = derive { name="multibiplotGUI"; version="0.0-1"; sha256="0klslbj1v0j10hv8xgyxgp4d2rkm3l4gr0gyrr1g8lyj0gf43sb3"; depends=[rgl tkrplot RODBC]; }; - multic = derive { name="multic"; version="0.3.8.1"; sha256="06lc9kn0z3s7x00hz8vj903q0c6cncnj4v3ygvd2yvkgcbhfvjd0"; depends=[]; }; - Multiclasstesting = derive { name="Multiclasstesting"; version="1.3.9"; sha256="09y3gnarqv15wgmk545qrwpjwb2ilv2b2kc74cxzcb2p1lflfjzm"; depends=[]; }; - MultiCNVDetect = derive { name="MultiCNVDetect"; version="0.1-1"; sha256="0mfisblw3skm4y8phfg4wa0rdchl01wccarsq79hv63y78pfhh13"; depends=[]; }; - multicon = derive { name="multicon"; version="1.2"; sha256="0cjmh4q2yvv9pqmmnilzhzvmds2nzbipy4vd009zjfq4c925c7m0"; depends=[psych abind foreach mvtnorm sciplot]; }; - multicool = derive { name="multicool"; version="0.1-2"; sha256="1rs7q93lcr1crrx433zgil2db1rb3n4qw62r52nvpllqfwfx98dc"; depends=[]; }; - multicore = derive { name="multicore"; version="0.2"; sha256="10ypgs6nzi9bv8xy97cprs3ffss8jdlba5nj2gwglqggb8ch9i9r"; depends=[]; }; - multiDimBio = derive { name="multiDimBio"; version="0.3.3"; sha256="1aj6yam31mr0abjb6m5m85r1w71snha4s7h4ikyw66sc73xkmb9m"; depends=[ggplot2 lme4 misc3d MASS RColorBrewer]; }; - multigroup = derive { name="multigroup"; version="0.4"; sha256="13811j3g6wg11yrsz3pskis2n8d7svhq9vg95d7r3fi5bbivinh5"; depends=[]; }; - MultiLCIRT = derive { name="MultiLCIRT"; version="2.7"; sha256="0i9ydhqw8a6rvds708vn1ypmfw5nrnpnfzjmg4s01gcm2xswvli0"; depends=[MASS limSolve]; }; - multilevel = derive { name="multilevel"; version="2.5"; sha256="0pzv5xc8p6cpzzv9iq3a3ib1dcan445mm12whf3d6qkz2k4778g6"; depends=[nlme MASS]; }; - multilevelPSA = derive { name="multilevelPSA"; version="1.2"; sha256="1wkywcnlvmf5li3ii7vhjsj390ay88gz9ll5agiyaj15gfd3mjls"; depends=[ggplot2 plyr psych reshape proto xtable xtable]; }; - multinbmod = derive { name="multinbmod"; version="1.0"; sha256="1c4jyzlcjkqdafj9b6hrqp6zs33q6qnp3wb3d7ldlij7ns9fhg71"; depends=[]; }; - MultinomialCI = derive { name="MultinomialCI"; version="1.0"; sha256="0ryi14d102kvxawls04hcw50n79jkcn29ill77lkfvj6nlzj8i5q"; depends=[]; }; - multinomRob = derive { name="multinomRob"; version="1.8-6.1"; sha256="1fdjfk77a79fy7jczhpd2jlbyj6dyscl1w95g64jwxiq4hsix9s6"; depends=[rgenoud MASS mvtnorm]; }; - MultiOrd = derive { name="MultiOrd"; version="2.1"; sha256="12y5cg06qyaz72gk3bi5pqkd55n72rz056y9va49znlsqph09x2x"; depends=[mvtnorm corpcor Matrix psych]; }; - MultiPhen = derive { name="MultiPhen"; version="2.0.0"; sha256="05w7khzyxswlsz4sxhaakbz828zrdya1y8qcsdfc6w7wgl8qpmj9"; depends=[MASS abind epitools meta HardyWeinberg RColorBrewer gplots]; }; - multiPIM = derive { name="multiPIM"; version="1.4-1"; sha256="0r69gkl8k6dd2rafrwvrdkpz4jlffz1g6czspsi908jf9dyw8y72"; depends=[lars penalized polspline rpart]; }; - multiplex = derive { name="multiplex"; version="1.2"; sha256="06wrzglgrvahavlcknf80cp0j4k840dhmclw9g6wqv51pq9brj2f"; depends=[]; }; - multipol = derive { name="multipol"; version="1.0-6"; sha256="1yjz0p4mcgzs98s61i8315wyhh986jxp8b0lq66375ckpr2ddcss"; depends=[abind]; }; - multisensi = derive { name="multisensi"; version="1.0-7"; sha256="1sq0jxkp33wsv6id27nka0764mr1jskqzsr2nhmqc4c8l312bkp6"; depends=[]; }; - MultiSV = derive { name="MultiSV"; version="0.0-62"; sha256="05klka4y60q7d4yi47q784y64irgic6cwcj330zm96j1hf2dli16"; depends=[nlme reshape]; }; - multitable = derive { name="multitable"; version="1.6"; sha256="067bgl793wwvb1rhan70ih0ga3dxja2c6zx7fwzml5rqi6p728pr"; depends=[]; }; - multitaper = derive { name="multitaper"; version="1.0-8"; sha256="1x0a4nrngh1hs44h4gnmjfhx57kgxmkyzm431i5k288ydv57vvx0"; depends=[]; }; - multivator = derive { name="multivator"; version="1.1-4"; sha256="125ifkpm1pny4rjpzirnwpmpjfg0y8w0rygj0way0p1qwm0l207n"; depends=[emulator mvtnorm]; }; - multiwayvcov = derive { name="multiwayvcov"; version="1.0.4"; sha256="1cn906qsffjnvi7ycbrvd91jawyxlph6gzf74yb4dpbbkyk4n8p1"; depends=[sandwich]; }; - multxpert = derive { name="multxpert"; version="0.1"; sha256="03mvf4m0kabm22vy4zkj1cfh884larpj8cbgg3p9l3pag20snf1l"; depends=[mvtnorm]; }; - muma = derive { name="muma"; version="1.4"; sha256="0midx3wzyvcz8rk9kvsfll3xg41pkz40si4jw2ps54ykkf9rkm99"; depends=[car pdist pls gplots mvtnorm robustbase gtools bitops caTools pcaPP rrcov]; }; - MuMIn = derive { name="MuMIn"; version="1.10.5"; sha256="1pza894h6mjjv2i4ifx2z410bz7lw2a9b986z6x30sr2al4xvfkn"; depends=[]; }; - munfold = derive { name="munfold"; version="0.3-1"; sha256="0rjicbyhxp0xr375ryg7kb2a4rvh3giw62ypws63nc3l8iwsig2m"; depends=[memisc MASS]; }; - munsell = derive { name="munsell"; version="0.4.2"; sha256="1bi5yi0i80778bbzx2rm4f0glpc34kvh24pwwfhm4v32izsqgrw4"; depends=[colorspace]; }; - munsellinterpol = derive { name="munsellinterpol"; version="1.0.1"; sha256="0q3n4z1z8sbqslzp97jw9xmdnypi66073g64ppk65r1aiq41hvac"; depends=[geometry]; }; - muRL = derive { name="muRL"; version="0.1-9"; sha256="0711hxq8l0zc8w8k3aj4f9sq8xl5mqqx70dvq0m66kahkh2pnhgb"; depends=[maps]; }; - muscle = derive { name="muscle"; version="3.8.31-4"; sha256="0pijc8x6pwsb6z4061v1r7iwq5lsnia5qn1bikwpxy8ir19nic72"; depends=[]; }; - muStat = derive { name="muStat"; version="1.7.0"; sha256="18727xj9i9hcnpdfnl1b9wd6cp7wl1g74byqpda2gsrcardl57wz"; depends=[]; }; - mutoss = derive { name="mutoss"; version="0.1-8"; sha256="13x49dk1xyn697yindg6m00nqbn2cb12544v2k14ckmnw07mp1gq"; depends=[mvtnorm plotrix multcomp]; }; - mutossGUI = derive { name="mutossGUI"; version="0.1-8"; sha256="1lpfz5d36v0szfg7vn7gdad27rvzxbx4w3651dmi2y1ff0d8j5z3"; depends=[rJava JavaGD CommonJavaJars plotrix mutoss multcomp]; }; - MVA = derive { name="MVA"; version="1.0-5"; sha256="18x075hjqhrjwxivvrixgs6yc67il3n5p1m7v2wymcf8h2mkki91"; depends=[HSAUR2]; }; - mvabund = derive { name="mvabund"; version="3.9.1"; sha256="0v9chsc08a9gsj026kv99jv0d3ww5gxblbliscqghl4b36hzkx6r"; depends=[Rcpp MASS tweedie statmod]; }; - MVB = derive { name="MVB"; version="1.1"; sha256="0an8b594rknlcz6zxjva6br8f34sgwdi2jil3xh1xzb5fa55dw0f"; depends=[Rcpp RcppArmadillo]; }; - mvbutils = derive { name="mvbutils"; version="2.7.4.1"; sha256="1vs97yia78xh35sdfv5pj3ddqmy83qgamvyyh9gjg0vdznqhffzg"; depends=[]; }; - mvc = derive { name="mvc"; version="1.3"; sha256="0kmh6vp7c2y9jf71f4a29b0fxcl0h7m4p8wig4dk3fi7alhjf7ym"; depends=[rattle]; }; - mvctm = derive { name="mvctm"; version="1.0"; sha256="1naxjh2k3vv4wlpzzx0y2zwvbn4kdqyls8a8qx6bz609ynzay5r9"; depends=[Formula nlme MNM quantreg Rfit]; }; - mvcwt = derive { name="mvcwt"; version="1.3"; sha256="0fqdyypmszm00rpl04z8kiiw6jd416a0b2rap3dqq3kchnz8h4s2"; depends=[foreach RColorBrewer]; }; - mvglmmRank = derive { name="mvglmmRank"; version="1.0-2"; sha256="0gpp0ibgji86pxscqzcws0d1qn1ciqqvyfb0x2v18580r4cx8jv7"; depends=[Matrix numDeriv]; }; - mvinfluence = derive { name="mvinfluence"; version="0.6"; sha256="1cd5p6cl2zln8madjf3vsbmqlg4nsklzzy6ngdd5glj1a9qapd6c"; depends=[car heplots]; }; - mvmeta = derive { name="mvmeta"; version="0.4.5"; sha256="0faczanbz6i7794sqxm21a6v52cs5hrjjzdypdvi23bkl4mkxjrb"; depends=[]; }; - mvMORPH = derive { name="mvMORPH"; version="1.0.2"; sha256="1zzh2vmm3l6zvzg8b39ivkx2jmbw2g6n00jj4icp46w8jb26rlwa"; depends=[phytools ape corpcor subplex]; }; - MVN = derive { name="MVN"; version="3.4"; sha256="13cmb4xls3j366lcjl6a7vimx457q1a531sy23nrddmyw1g918l2"; depends=[nortest moments MASS]; }; - mvna = derive { name="mvna"; version="1.2-3"; sha256="1gwv17j6w9c38bqvnasv9kfigbdxiqkzwj89gqmkxgw715f9nnpp"; depends=[lattice]; }; - mvnfast = derive { name="mvnfast"; version="0.1.2"; sha256="1pa0l6krk44pa3ndnh7wm77cg79x7m7n8r3ffz0w8jmzh59s9nr2"; depends=[Rcpp]; }; - mvngGrAd = derive { name="mvngGrAd"; version="0.1.3"; sha256="1c0rwywsa2dzhhphwc9prdxv6jyk1qdc655zvzyxif6ay3wnganf"; depends=[]; }; - mvnmle = derive { name="mvnmle"; version="0.1-11"; sha256="02mpmrr22cqb3v8x7kydgg715yl3lrdgzgdqpchmp0xrl2db8gq4"; depends=[]; }; - mvnormtest = derive { name="mvnormtest"; version="0.1-9"; sha256="1iaxjwp7bgxhaa4xqvgqb61316mq2fb0452d0pabhmbxkvmvdnj6"; depends=[]; }; - mvoutlier = derive { name="mvoutlier"; version="2.0.5"; sha256="1n12wy2i9jkb6brrqc0ibw3wiyd25dm5jhyapf05cj8wi06jfrsf"; depends=[sgeostat robCompositions robustbase]; }; - mvpart = derive { name="mvpart"; version="1.6-2"; sha256="1ddamzkv3j3a1niwqrrdpajn10v48s4li69n63mwlanrw9gdyzhn"; depends=[]; }; - MVPARTwrap = derive { name="MVPARTwrap"; version="0.1-9.2"; sha256="0kj89nlndfcddsx2i9isfd7lqzj8rlsd47anhca5cmj1nyjsb4w5"; depends=[mvpart Hmisc labdsv vegan fBasics ade4]; }; - MVpower = derive { name="MVpower"; version="2.0"; sha256="176g8jfn8gbbhyxcny9prvkn7gk23lmcr4pnxlf0a0pacxczsldr"; depends=[randomForest pamr kernlab class]; }; - mvProbit = derive { name="mvProbit"; version="0.1-0"; sha256="0fnrlralydlsf9iphq385f8hpqigfmi8rafvgp443gygvpq5b6g0"; depends=[mvtnorm maxLik abind bayesm miscTools]; }; - MVR = derive { name="MVR"; version="1.20.0"; sha256="1wwzws9116ck14g6xd1svmwc9wkr8piwb24bddnzri388p8qkgb4"; depends=[statmod]; }; - mvsf = derive { name="mvsf"; version="1.0"; sha256="1krvsxvj38c5ndvnsd1m18fkqld748kn5j2jbgdr3ca9m3i5nlwf"; depends=[nortest mvnormtest]; }; - mvShapiroTest = derive { name="mvShapiroTest"; version="1.0"; sha256="0zcv5l28gwipkmymk12l4wcj9v047pr8k8q5avljdrs2a37f74v1"; depends=[]; }; - mvSLOUCH = derive { name="mvSLOUCH"; version="1.1.3"; sha256="1vkyhy6a12hdlkwsf64lgimpigri6r6l02vvy1b5r05j002baxgr"; depends=[ouch ape numDeriv mvtnorm corpcor]; }; - mvtmeta = derive { name="mvtmeta"; version="1.0"; sha256="0g0d4lrz854wkd0dz5aiad54i46aqkfhsq6cpbsfv0w5l2kwiqqz"; depends=[gtools]; }; - mvtnorm = derive { name="mvtnorm"; version="1.0-0"; sha256="0cm0dwqga7nnb2016jzacmaa233whr7vx75fffhmjzivrfg5vhy8"; depends=[]; }; - mvtsplot = derive { name="mvtsplot"; version="1.0-1"; sha256="0g5grrha77rsnkfasw5pxnpmkl7vgb728ms8apyg8xnbmgilg9vv"; depends=[RColorBrewer]; }; - mwa = derive { name="mwa"; version="0.3.2"; sha256="123xvm4vrwl7vfc9sas4jj7fn38m37c6h38j0aczpmygmx54bbmr"; depends=[cem rJava MASS]; }; - mwaved = derive { name="mwaved"; version="1.0.1"; sha256="0c9hiwf7ldvgm3vh5s7wgvgl304cc2sbsyczbk1wqybcy17cs7s5"; depends=[Rcpp shiny]; }; - mxkssd = derive { name="mxkssd"; version="1.1"; sha256="0m9763dqrk8qkrvp18bsv96jv0xhc2m8sbxdk6x3w6kdjcl663p2"; depends=[]; }; - MXM = derive { name="MXM"; version="0.2.1"; sha256="047whr0fly89i5vlyd4z8lj2nxyfkk9vvniasncnwls8vmmpf1jk"; depends=[]; }; - mycobacrvR = derive { name="mycobacrvR"; version="1.0"; sha256="1xd9ackzdd8db6bayza0bg4n256mi9rdqih0cdc0nl212c3iz75g"; depends=[]; }; - myepisodes = derive { name="myepisodes"; version="1.1.1"; sha256="0xk9bwgpl630nhc8qa2pc0rwqbqk3haxnp78gfxq6sn6z7i44k1p"; depends=[XML]; }; - Myrrix = derive { name="Myrrix"; version="1.1"; sha256="15w1dic6p983g2gajbm4pws743z68y0k2hxrdwx6ppnzn9rk07rs"; depends=[Myrrixjars rJava]; }; - Myrrixjars = derive { name="Myrrixjars"; version="1.0-1"; sha256="0dy82l0903pl4c31hbllscfmxrv3bd5my5b2kv5d3x5zq0x99df0"; depends=[rJava]; }; - nacopula = derive { name="nacopula"; version="0.8-1"; sha256="1g1kcs6vqagq0nisyc43040ri3a9iy3fv4bnjjjc5zrla52a20w5"; depends=[copula copula]; }; - NADA = derive { name="NADA"; version="1.5-6"; sha256="0y7njsvaypcarzygsqpqla20h5xmidzjmya4rbq39gg6gkc0ky27"; depends=[survival]; }; - nadiv = derive { name="nadiv"; version="2.13.2"; sha256="1r63z08k46b6hryxracicsw1hr91x4pgk2x58c9nijdni4my7kkc"; depends=[Matrix]; }; - namespace = derive { name="namespace"; version="0.9.1"; sha256="1bsx5q19l7m3q2qys87izvq06zgb22b7hqblx0spkvzgiiwlq236"; depends=[]; }; - nanop = derive { name="nanop"; version="2.0-3"; sha256="1dz06j292n7ppibmlp7pzjywcglv86hp7lsh07dz7j7p8gbbsza8"; depends=[distrEx rgl]; }; - NanoStringNorm = derive { name="NanoStringNorm"; version="1.1.17"; sha256="02jvrrz4cmr7l35s7xh0mmwmr5l5lga1vnph2rij2lb8124ardf5"; depends=[gdata]; }; - NAPPA = derive { name="NAPPA"; version="2.0"; sha256="18yipic8xkf13jaaxnn388m49r5q2g7q7gb0mmw3gh7226lmz987"; depends=[plyr NanoStringNorm]; }; - nasaweather = derive { name="nasaweather"; version="0.1"; sha256="05pqrsf2vmkzc7l4jvvqbi8wf9f46854y73q2gilag62s85vm9xb"; depends=[]; }; - nat = derive { name="nat"; version="1.4.10"; sha256="1200qxsrhlxassi8jyrcwfpknyck2p092sxv2gkc74vp62w2b0lp"; depends=[rgl RANN igraph filehash digest nat_utils]; }; - naturalsort = derive { name="naturalsort"; version="0.1.2"; sha256="0m8a8z0n5zmmgpmpn5w87j2jfsz1igz3x133z3q25h8jlyaxy750"; depends=[]; }; - nat_utils = derive { name="nat.utils"; version="0.4.2"; sha256="0k5bdqwrbq82bb9ld90ia7b4vjaczba20h231a129rkszsy6sz9v"; depends=[]; }; - NbClust = derive { name="NbClust"; version="2.0.1"; sha256="00b4h17pnvqsk0hvaz6dbrrys3dshy6zf0s371z7rr1n52xyy8ga"; depends=[]; }; - NBDdirichlet = derive { name="NBDdirichlet"; version="1.01"; sha256="07j9pcha6clrji8p4iw466hscgs6w43q0f7278xykqcdnk39gkyv"; depends=[]; }; - nbpMatching = derive { name="nbpMatching"; version="1.4.0"; sha256="0ncw8xihdh24cfz0rhcvvp2l5mhm2z7hllnkf45bhdhpams6yryp"; depends=[Hmisc MASS]; }; - NBPSeq = derive { name="NBPSeq"; version="0.3.0"; sha256="0l4ylxhs2k9ww21jjqs67fygk92avdchhx2y1ixzl7yr2yh1y9by"; depends=[]; }; - nCal = derive { name="nCal"; version="13.12-01"; sha256="06grlb7ac9vy3ncnqz5h63iarsh94z4mcb29bigkdvnbv9whj7mn"; depends=[drc gdata gWidgets xtable]; }; - NCBI2R = derive { name="NCBI2R"; version="1.4.6"; sha256="1gsvc9v9005hf71nsqgybnfhlmdr3wwzm5ab7h8c8ly5waq2w9i7"; depends=[]; }; - ncbit = derive { name="ncbit"; version="2013.03.29"; sha256="0f07h8v68119rjvgm84b75j0j7dvcrl6dq62vp41adlm2hgjg024"; depends=[]; }; - ncdf = derive { name="ncdf"; version="1.6.7"; sha256="14jqbr6xjq58zawc14j85advbafspfrn40al26zg0v3warwlfwfy"; depends=[]; }; - ncdf4 = derive { name="ncdf4"; version="1.12"; sha256="110h4s0qg6rp0k1s3fl464g409mq5ajyhfb0cxvwbgz2dp32p8aj"; depends=[]; }; - ncdf4_helpers = derive { name="ncdf4.helpers"; version="0.3-3"; sha256="051akd7r6zx805a0xwcs95q5sd8alag0f1gzqjk3n188q8r3ji5j"; depends=[ncdf4 PCICt abind]; }; - ncdf_tools = derive { name="ncdf.tools"; version="0.7.1.291"; sha256="149d89kim67q77w17afc5x7hkvmk05gfkaw6cpl583j2zxingify"; depends=[RNetCDF chron abind plotrix raster RColorBrewer JBTools]; }; - nCDunnett = derive { name="nCDunnett"; version="1.0.0"; sha256="0n5zzsdrhra5xql110wrxbfdjm3fwa6qhvnpj89w9ph9nr4ad8gf"; depends=[]; }; - ncf = derive { name="ncf"; version="1.1-5"; sha256="03nbmg9swxhpwrmfjsanp6fj5l2nw160sys70mj10a0ljlaf904z"; depends=[]; }; - ncg = derive { name="ncg"; version="0.1.1"; sha256="1jzkzp61cc5jxmdnl867lcrjjm7y2iw9imzprbd098p1j3w8fvj7"; depends=[]; }; - NCmisc = derive { name="NCmisc"; version="1.1"; sha256="13nx9p6yq46lf2q92ximi33wynxfxah8ns18227xxm99d6fpb05v"; depends=[proftools]; }; - ncvreg = derive { name="ncvreg"; version="3.2-0"; sha256="0j53aj71lxz3pxh6a4vlgw0f9zk4gjh4xf5c7qsm5cp8nfpkplm5"; depends=[]; }; - ndl = derive { name="ndl"; version="0.2.16"; sha256="1l56kg3x4579hzr4sig3iwrd81rhm8nmmrqfs54zxqv5yxpk3hp4"; depends=[Rcpp MASS]; }; - ndtv = derive { name="ndtv"; version="0.5.1"; sha256="0cvqpr74als10zhdravbc7ykacy3ll7y5fx4n5jik0avwcaclgkc"; depends=[network networkDynamic animation sna MASS statnet_common]; }; - neariso = derive { name="neariso"; version="1.0"; sha256="1npfd5g5xqjpsm5hvhwy7y84sj5lqw9yzbnxk6aqi80gfxhfml4c"; depends=[]; }; - NeatMap = derive { name="NeatMap"; version="0.3.6.2"; sha256="186y06zrh87q6vixl2da2d6apvcj1zkk79c95k081zj5awmryr9b"; depends=[ggplot2 rgl]; }; - needy = derive { name="needy"; version="0.2"; sha256="1ixgpnwrg6ph1n5vy91qhl1mqirli9586nzkmfvzjrhdvrm0j5l0"; depends=[]; }; - NEff = derive { name="NEff"; version="1.0"; sha256="0ksnmxjy2ms2z7rq4rddnykydwlb4f9c13nak5f8m65pfjcgv3sk"; depends=[msm bit]; }; - negenes = derive { name="negenes"; version="1.0-1"; sha256="0g8m3idjm24cf9b1wngw2pv1axgnv9mk5wqs78zgwvn0m67ypsiz"; depends=[]; }; - neldermead = derive { name="neldermead"; version="1.0-9"; sha256="144liymq0cnd80cp2vn2d1j22g0izipnchc90r526gfpm2gklh7n"; depends=[optimbase optimsimplex]; }; - Nemenyi = derive { name="Nemenyi"; version="1.1"; sha256="1hcliwbzy1ckyy49kh8qn0830s1ari40mqkvx9vj4hsdys9wjhnl"; depends=[]; }; - nephro = derive { name="nephro"; version="1.0"; sha256="0dv6gj1q6qrg9y6cpf230q1mksqk3nvzj3afavhrwz1fcz2w22f4"; depends=[]; }; - NestedCohort = derive { name="NestedCohort"; version="1.1-3"; sha256="10hsc6zik8sz2mp6ig3xr6z3bq0c6rlvqkn11pxny17a4n02wapp"; depends=[survival MASS]; }; - netClass = derive { name="netClass"; version="1.2.1"; sha256="04yrj71l5p83rpwd0iaxdkhm49z9qp3h6b7rp9cgav244q060m9y"; depends=[kernlab Matrix ROCR igraph samr]; }; - NetCluster = derive { name="NetCluster"; version="0.2"; sha256="0aby8kfniw07jap795cwk69z83p45q5rap73zp1qbmkm3qcb31g4"; depends=[sna]; }; - NetComp = derive { name="NetComp"; version="1.6"; sha256="11rxpdihn575diqfvc7yvxhlr2c19fig4v4a5c6jhqyfdsd60fsv"; depends=[gdata]; }; - NetData = derive { name="NetData"; version="0.3"; sha256="1jf05zwy0c6gmm7kvxlwvai61bz4wpsw7cl0h4i21ipzn1rqxmqj"; depends=[]; }; - NetIndices = derive { name="NetIndices"; version="1.4.3"; sha256="0ff57f5b12lccqbfin530ra373rn1wz6n42b0jnkyi2ra8hcm88f"; depends=[MASS]; }; - netmeta = derive { name="netmeta"; version="0.6-0"; sha256="0cwlwd4bms0kf6nicx7crjjighzrzjgfgmx5yl5v7am4v7kwhz2g"; depends=[meta magic]; }; - NetPreProc = derive { name="NetPreProc"; version="1.0"; sha256="1w0iih6pz8ci1y09xlzm2x3082s57znp1cxq44ckwh45hvzbxbmi"; depends=[]; }; - nets = derive { name="nets"; version="0.1"; sha256="0zshiavdi1z8mq6q93vsyb5wx5nq37qln9gcyvamvi2pgy5xg4k2"; depends=[igraph]; }; - NetSim = derive { name="NetSim"; version="0.9"; sha256="07h4qwz64k8zj8c2mx23cbnhg4rqrb4nfh20xw98kspz7cisdg6d"; depends=[Rcpp]; }; - netweavers = derive { name="netweavers"; version="1.0"; sha256="1k0i31h1wg3hk6m0w56jq14hqc4xpdmw7xy4mydars2nzfj41kzj"; depends=[igraph]; }; - network = derive { name="network"; version="1.10.2"; sha256="1qdlwdhqyv1z4vhcbyqfx4iw207m76gly87pgyb85wqif4fifk0x"; depends=[]; }; - networkDynamic = derive { name="networkDynamic"; version="0.6.3"; sha256="0yb536q7v16wx491c5dmw7sf7h4f2rxs39bsdi0sknizgnmsqlv0"; depends=[network statnet_common]; }; - networkDynamicData = derive { name="networkDynamicData"; version="0.1.0"; sha256="1vln4n8jldqi1a6qb9j9aaxyjb8pfgwd8brnsqr8hp9lm3axd24b"; depends=[networkDynamic network]; }; - networkreporting = derive { name="networkreporting"; version="0.0.1"; sha256="1vfvx5gf90p31gy6kcv7l2ibzbfl382gffa79dl8gascbsg6s8z8"; depends=[functional ggplot2 plyr reshape2 stringr]; }; - networksis = derive { name="networksis"; version="2.1-2"; sha256="05x0mp9ig7nff1js0zv7hq8p7jr7dqscs46zlbrxrrcy1waydb0s"; depends=[ergm network]; }; - networkTomography = derive { name="networkTomography"; version="0.3"; sha256="1hd7av231zz0d2f9ql5p6c95k7dj62hp0shdfshmyfjh8900amw7"; depends=[coda igraph KFAS limSolve plyr Rglpk]; }; - neuralnet = derive { name="neuralnet"; version="1.32"; sha256="0p9r5j8q0flv15wn5s6qi9if7npna107l1ffv37nzx1b4vgswnl9"; depends=[MASS]; }; - neuroblastoma = derive { name="neuroblastoma"; version="1.0"; sha256="0hs87fvwaq53xxbh2dw3hjsmf1zkyqli9qyacxf72fnkyhhl8b45"; depends=[]; }; - neuroim = derive { name="neuroim"; version="0.0.3"; sha256="0n5jkyvdaiigv51s5bb508w5xkh0qkd1zbs67nnms14s1664fhiz"; depends=[stringr hash iterators abind Matrix yaImpute]; }; - neuRosim = derive { name="neuRosim"; version="0.2-10"; sha256="1h6hhzf3rl8fnvdv8vw3lzzd23pbnv1shd9d8gpk41fgigjnxp1v"; depends=[deSolve]; }; - Newdistns = derive { name="Newdistns"; version="1.0"; sha256="1agg5v05x9qlg1w439aycfjfd5yap6ivn1kqgsc3ck148ar11wb2"; depends=[]; }; - nFactors = derive { name="nFactors"; version="2.3.3"; sha256="016d76yfxz7gx7zz5dgwjmj2c5m6kxdmqj0lln5w6d70r9g1kxg7"; depends=[MASS psych boot lattice]; }; - ngram = derive { name="ngram"; version="1.1"; sha256="0p5wm55anch1i0y3478f5d4sivs7q8j3kwlg89nk3337win06499"; depends=[]; }; - ngramr = derive { name="ngramr"; version="1.4.3"; sha256="0j66v841xkb1yw2n4pa7p8kz574np2yj2ic71z6aq71npdbxgh9a"; depends=[httr RCurl plyr rjson stringr reshape2 ggplot2 scales]; }; - ngspatial = derive { name="ngspatial"; version="1.0-3"; sha256="1ph3yg8vcvij3ymw41dczjpzs68icm5lr0pxybmmfgggpmw5cjyb"; depends=[Rcpp batchmeans]; }; - NHEMOtree = derive { name="NHEMOtree"; version="1.0"; sha256="0ycprj2rz2fy6a7ps0bsr27iphmbfxi9pbvl8rcr6p8yagfb84mb"; depends=[partykit emoa sets rpart]; }; - nhlscrapr = derive { name="nhlscrapr"; version="1.5.1"; sha256="0gyg7yvjf9r6q4br17rnlm6c8hsxlm6raym1y3rrl05ss1a63jwx"; depends=[RCurl rjson biglm bitops]; }; - NHMMfdr = derive { name="NHMMfdr"; version="1.0.6"; sha256="10xwvmzqkx90zh88yjmf6d8gsbqil4vxp53d914080b3aygsvxm8"; depends=[MASS locfdr]; }; - NHPoisson = derive { name="NHPoisson"; version="3.0"; sha256="11gdfqfly3cvr6ndxvp06kbdd7aw6k25kz8kyxxybjpzszxbpmq8"; depends=[car]; }; - nice = derive { name="nice"; version="0.4"; sha256="1alq8n8pchn9v0fvwrifdisazkh519x109bqgnpgnwf79wblmnhy"; depends=[]; }; - nicheROVER = derive { name="nicheROVER"; version="1.0"; sha256="0sa7wfpzkin78vz48vwa5iac82v5l1s3zczdxz8sc2kyg22fj0aw"; depends=[mvtnorm]; }; - NightDay = derive { name="NightDay"; version="1.0.1"; sha256="0vkpr2jwhgghiiiaiglaj1b9pz25fcsl628c9nsp9zyl67982wz1"; depends=[maps]; }; - Nippon = derive { name="Nippon"; version="0.5.3"; sha256="02m591aljlaxn95k7sl8gfsviv4ywqv9mrkjf6g19kfrc9pbgjqg"; depends=[maptools]; }; - NISTnls = derive { name="NISTnls"; version="0.9-13"; sha256="03a1c8a5dr5l5x4wbclnsh3vmx3dy7migfdzdx7d7p3s7hj3ibif"; depends=[]; }; - nlADG = derive { name="nlADG"; version="0.1-0"; sha256="0nvd5hzd1p81jwx5p7js86wblgg615vdnpbvy5rhmhf1ig583z1b"; depends=[ggm]; }; - nleqslv = derive { name="nleqslv"; version="2.4"; sha256="114h883rvfz48f2mx88cz1mirz15hbx3c4c4n1jvddk93dmz45j4"; depends=[]; }; - nlme = derive { name="nlme"; version="3.1-117"; sha256="105zrprpgd4snwcy80qfnjzvd5m7g4cx8njji83gg7ynskhrhxj9"; 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]; }; - nlmrt = derive { name="nlmrt"; version="2013-9.24"; sha256="1nqcxfgl5iplmar58015ixir2c7agdw91i0ndn2imdx0il1x2hra"; depends=[]; }; - nloptr = derive { name="nloptr"; version="1.0.4"; sha256="1cypz91z28vhvwq2rzqjrbdc6a2lvfr2g16vid2sax618q6ai089"; depends=[]; }; - NLP = derive { name="NLP"; version="0.1-3"; sha256="0mg2sa1f9i2rfhzggd55mi3gmsb9xz6y51ygrk8i27vgyr7x0h7w"; depends=[]; }; - NLPutils = derive { name="NLPutils"; version="0.0-1"; sha256="036pafnjcbz7ihdgsjss4jq8fb420j8fmxyymv7kr4pr78wjysbx"; depends=[NLP SnowballC qdap]; }; - nlreg = derive { name="nlreg"; version="1.2-2"; sha256="1pi7057ldiqb12kw334iavb4i92ziy1kv4amcc4d1nfsjam03jxv"; depends=[statmod survival]; }; - NLRoot = derive { name="NLRoot"; version="1.0"; sha256="1x8mcdgqqrhyykr12bv4hl4wbh1zw2qgpnd2yrm68kb92iy95rh4"; depends=[]; }; - nlrwr = derive { name="nlrwr"; version="1.1-0"; sha256="1j9wfcjimvfhxiwxsxcp5dni70i7bj5iizd8dq3kamzp7319mryv"; depends=[alr3 car drc HydroMe lattice lmtest MASS NISTnls nlme nls2 nlstools NRAIA sandwich]; }; - nls2 = derive { name="nls2"; version="0.2"; sha256="0k46i865p6jk0jchy03jiq131pc20h9crn3hygzy305rdnqvaccq"; depends=[proto]; }; - nlsMicrobio = derive { name="nlsMicrobio"; version="0.0-1"; sha256="0676n78265z00dacmq593c9l2239ii574djm9s7i7w8jk1kdhzx2"; depends=[nlstools]; }; - nlsmsn = derive { name="nlsmsn"; version="0.0-4"; sha256="1gvpy8rq020l64bdw6n7kv354l7gwa2rgxarm6k0mqq7z21fxf58"; depends=[]; }; - nlstools = derive { name="nlstools"; version="1.0-0"; sha256="04y3yzpipr82fgafppp09fbi6invmwyalljirmmh01qnrzfimwna"; depends=[]; }; - NlsyLinks = derive { name="NlsyLinks"; version="1.302"; sha256="0m1qvrpdfwql4jdk3nbn80llq83wavimifw630gnazwmkgkcncai"; depends=[lavaan]; }; - 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]; }; - NMF = derive { name="NMF"; version="0.20.5"; sha256="1j91vklzi4qjlix5sn9qh86dwx6vxnla2p4ag81apkr441jkvynr"; depends=[pkgmaker registry rngtools cluster stringr digest gridBase colorspace RColorBrewer foreach doParallel ggplot2 reshape2]; }; - NMFN = derive { name="NMFN"; version="2.0"; sha256="0n5fxqwyvy4c1lr0glilcz1nmwqdc9krkqgqh3nlyv23djby9np5"; depends=[]; }; - NMOF = derive { name="NMOF"; version="0.28-2"; sha256="0c22fpzg8qg6asd0glq5cz32mhw7607bcsl7cmrkfzwm8p4yarns"; depends=[]; }; - nnclust = derive { name="nnclust"; version="2.2"; sha256="1mr506ddvw4lslylpmm43wmd6mwv055zjzgb427nj3jl142dfyz2"; depends=[]; }; - nnet = derive { name="nnet"; version="7.3-8"; sha256="0nhbprhwkpnhzw6jls8y76xskfh9gq491kg8q8wnamjv3gnngfa5"; depends=[]; }; - nnls = derive { name="nnls"; version="1.4"; sha256="07vcrrxvswrvfiha6f3ikn640yg0m2b4yd9lkmim1g0jmsmpfp8f"; depends=[]; }; - nodeHarvest = derive { name="nodeHarvest"; version="0.6"; sha256="16151rwmqkf5vlyrlxlirz8s0nimxppx1f7f4pwfxi9vipwph125"; depends=[quadprog randomForest]; }; - noia = derive { name="noia"; version="0.96"; sha256="0f5gfb78vaj9iklj7gq3g85v78xh5izghjc7v3827jr1irfjivap"; depends=[]; }; - NominalLogisticBiplot = derive { name="NominalLogisticBiplot"; version="0.2"; sha256="0m9442d9i78x57gdwyl3ckwp1m6j27cam774zkb358dw5nmwxbmz"; depends=[mirt gmodels MASS]; }; - 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]; }; - nonparaeff = derive { name="nonparaeff"; version="0.5-8"; sha256="1kkn68m7cqlzx3v539cjxw3x5a2y86lvmyv2k98s87m3yvqg0gdk"; depends=[lpSolve gdata Hmisc rms geometry psych pwt]; }; - NonpModelCheck = derive { name="NonpModelCheck"; version="1.0"; sha256="0mgbyp651jfqyfavpv12i9kwqf0cpk2mzh9m0b5k4n759710qv8f"; depends=[dr MASS]; }; - nonrandom = derive { name="nonrandom"; version="1.42"; sha256="0icm23hw593322z41wmjkwxqknh2pa9kpzbrch7xw1mhp93sd5ll"; depends=[lme4]; }; - nontarget = derive { name="nontarget"; version="1.3"; sha256="0kg3b1xs7sfgkjj5wf536r4k9b9hgi2hlkymsw0spskvjg2sd3q0"; depends=[enviPat nontargetData mgcv]; }; - nontargetData = derive { name="nontargetData"; version="1.1"; sha256="07cdbpmn64sg4jfhljdcx503d55azyz58x7nkji044z3jmdryzqw"; depends=[]; }; - nopp = derive { name="nopp"; version="1.0.3"; sha256="128c441l5fgapxwl143yhciz8jcak8fisypp6wq6csdxpbs8w21f"; depends=[mlogit MASS]; }; - nor1mix = derive { name="nor1mix"; version="1.1-4"; sha256="11ym6av7zykynkqvhkbnl7rwxgzrjhgjnbq7whxhkb6qbf6khfsx"; depends=[]; }; - nordklimdata1 = derive { name="nordklimdata1"; version="1.0"; sha256="0l50g09c102r8fz8ks42dfywg2vh2ad8lhqi7n3gc8nhad8rapqr"; depends=[]; }; - norm = derive { name="norm"; version="1.0-9.5"; sha256="01j1h412yfjx5r4dd0w8rhlf55997spgb6zd6pawy19rgw0byp1h"; depends=[]; }; - NormalGamma = derive { name="NormalGamma"; version="1.1"; sha256="0r3hhfscif0sx9v8f450yf119gpvf3ilpb8n3ziy4v4qf2jlcfnk"; depends=[optimx histogram]; }; - NormalLaplace = derive { name="NormalLaplace"; version="0.2-0"; sha256="1yrqfqhxkavczascwpq7z77jwpa1s2dn2cfi15vxfjyayhdxq4aa"; depends=[DistributionUtils GeneralizedHyperbolic]; }; - normalp = derive { name="normalp"; version="0.6.9"; sha256="1a2m7agcnqmf69mgbkjmmp7mvpx9r4gk13x98yfkg1dyh3b48rri"; depends=[]; }; - NormPsy = derive { name="NormPsy"; version="1.0.1"; sha256="050cb4i3pb1jbi1scxnnnf1rwxwvr472m284gcjlzrcr5xzbx0gr"; depends=[lcmm]; }; - NORMT3 = derive { name="NORMT3"; version="1.0-3"; sha256="041s0qwmksy3c7j45n4hhqhq3rv2hncm2fi5srjpwf9fcj5wxypg"; 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=[]; }; - 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=[]; }; - Nozzle_R1 = derive { name="Nozzle.R1"; version="1.1-1"; sha256="05sjip4sz12mwd3jcbvk342p83kdmrd4l2jrh17p18w4l7w4nn0z"; depends=[]; }; - np = derive { name="np"; version="0.60-2"; sha256="0zs1d4mmgns7s26qcplf9mlz9rkp6f9mv7abb0b9b2an23y6gmi5"; depends=[boot cubature]; }; - nparcomp = derive { name="nparcomp"; version="2.0"; sha256="154689lk1sd1smc3fyslrgz4rzg166n2d8nz7bhbjcrq2fhj8pj0"; depends=[multcomp mvtnorm]; }; - nparLD = derive { name="nparLD"; version="2.1"; sha256="1asq00lv1rz3rkz1gqpi7f83p5vhzfib3m7ka1ywpf2wfbfng27n"; depends=[MASS]; }; - npbr = derive { name="npbr"; version="1.0"; sha256="12s25vn4f0373y2ijmpam0an4p64xr3m71xgf20g5przmr77bm0a"; depends=[Rglpk Benchmarking]; }; - NPCD = derive { name="NPCD"; version="1.0-6"; sha256="1lnj55f73rpjy6amg1n5x7b0jsrmharp0fhcjcn0dflcrjwianxj"; depends=[BB R_oo R_methodsS3]; }; - NPCirc = derive { name="NPCirc"; version="2.0.0"; sha256="03b4lx7rkpjlxy9854dy16qw15x1cjwzyyvxn778n5xsva0c498b"; depends=[circular misc3d movMF plotrix rgl shape]; }; - npcp = derive { name="npcp"; version="0.1-0"; sha256="1kkz7qnvmbbl2yfar8s23cn2jh2cqjwnrgjqw5a0wzli5ky613nl"; depends=[]; }; - npde = derive { name="npde"; version="2.0"; sha256="1cp4k7jvsw9rc6rrck902nqqjaf2c1nxjic7i9r3fd6yca1lgqb9"; depends=[mclust]; }; - NPHMC = derive { name="NPHMC"; version="2.2"; sha256="000x9y00gfkaj5lf00a55b9qx15x05yp3g3nmp8slyzsnfv66p5d"; depends=[survival smcure]; }; - nplplot = derive { name="nplplot"; version="4.5"; sha256="1dpbs0jb34gv0zj528357z1j2pwahjbp04rm7jir6qk0jhyaxxgh"; depends=[]; }; - nplr = derive { name="nplr"; version="0.1-1"; sha256="0br7flriqbig8frq0j4lxiv6i8bwgsj422faln85ga93hnlky0a1"; depends=[]; }; - NPMLEcmprsk = derive { name="NPMLEcmprsk"; version="1.0"; sha256="0yakcjkxqlbpzs8jdaahdl4lv5l2ffq7l7v00sl77sn9gflgprk3"; depends=[]; }; - npmlreg = derive { name="npmlreg"; version="0.45-5"; sha256="0jkj3wi435bgb1swll56bcwc1vzq00l503miy171232avy8qrpaf"; depends=[statmod]; }; - NPMPM = derive { name="NPMPM"; version="1.0"; sha256="14rjj48vfj4wv1na5v181jby016afx4ak1fs0f3g1fif4kbgbdx0"; depends=[]; }; - npmv = derive { name="npmv"; version="2.1"; sha256="0ivd3wm1fmmaq8i2h0kdd11z9k1czb61ms8fj0xb5xmfy0g1rphy"; depends=[Formula ggplot2]; }; - NPMVCP = derive { name="NPMVCP"; version="1.1"; sha256="13jpm46abwziq8859jhl6hg1znk3ws1q7g4vlr2jyri3qa6h22dd"; depends=[]; }; - nppbib = derive { name="nppbib"; version="1.0-0"; sha256="075jb13zckkh66jwdmdlq4d2drjcc3lkj26px3w79b91223yymf2"; depends=[]; }; - npRmpi = derive { name="npRmpi"; version="0.60-2"; sha256="10gify91m9jsbghdgkwjz57qn6ybj4i239caflm9vkrfxsg6yx2d"; depends=[boot cubature]; }; - NPS = derive { name="NPS"; version="1.0"; sha256="1acg3367rd53dgwzqr8pnfr8z72s3699h2nhrhh2w9zdqipid89g"; depends=[]; }; - NPsimex = derive { name="NPsimex"; version="0.2-1"; sha256="1k9i1f5ckvzdns8f5qnm2zq7qs3wsgzsnfwdz21zmhmi6d0pwchm"; depends=[]; }; - npsm = derive { name="npsm"; version="0.01"; sha256="1bx3l3sh5jvwngq05006mjyy5rs136wlg6wgshqy4d104zqwqjxk"; depends=[Rfit]; }; - npsp = derive { name="npsp"; version="0.2-4"; sha256="1lzdr958m00dxwzgd46x5fs07sx0gnzbyjrllfa6s7r9klg4i707"; depends=[quadprog]; }; - npst = derive { name="npst"; version="2.0"; sha256="1y5ij3nmh9pj6p97jpx75g26sk508mznr0l67cwj381zfb77hj1n"; depends=[]; }; - NRAIA = derive { name="NRAIA"; version="0.9-8"; sha256="16v8s9mqvr6sbiwwj93n3nyrm996wyw4f9l569mw2ykqpdkbp7hm"; depends=[lattice]; }; - nricens = derive { name="nricens"; version="1.2"; sha256="17h0vckchqlvcsa604cgbcw1akaxl30yx24x1d8201svyz9n0hhb"; depends=[survival]; }; - NSA = derive { name="NSA"; version="0.0.32"; sha256="0lnimyx3fpnw9zfhqm7y3ssvbpmvbmhcqy6fp83862imiwpl8i5r"; depends=[R_methodsS3 MASS matrixStats R_oo R_utils aroma_core aroma_affymetrix]; }; - nscancor = derive { name="nscancor"; version="0.6"; sha256="1wkk08h8yz2mzgvmq0vr30iiczpbp0304vjwxqgsa3h240m4awsm"; depends=[]; }; - NScluster = derive { name="NScluster"; version="1.0.2"; sha256="1bvr44qx3bzbgsdpj70dfq9azkrsywkbvwvm3lwwgpn0spk8apld"; depends=[]; }; - nsga2R = derive { name="nsga2R"; version="1.0"; sha256="04jj0a3isfc348vg46il5x9l33cr7xawz5w0mm4pwr6djhd8nfhx"; depends=[mco]; }; - 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]; }; - nsprcomp = derive { name="nsprcomp"; version="0.5"; sha256="1rrjiwkpiaqlp27s5xfd6jwmmpzgxm5d7874gp33511wa0vrhnnf"; depends=[]; }; - nsRFA = derive { name="nsRFA"; version="0.7-11"; sha256="1mlm8fygzr8b03rflays78l63ld0nagprc8xbwny5f87vi00wwq4"; depends=[]; }; - nullabor = derive { name="nullabor"; version="0.2.1"; sha256="1pxxynfjjyqmgqvfb4fcs6jy63cf9bcbi9x1kz4f5b454q2g1raq"; depends=[MASS ggplot2 plyr]; }; - numbers = derive { name="numbers"; version="0.4-5"; sha256="0z69samkj7fvbk0wj2nbnkcw17y1sdha7hghkc7yhgkwx2z1pana"; depends=[gmp]; }; - numDeriv = derive { name="numDeriv"; version="2012.9-1"; sha256="09s00a1wddpq5556mz87vdmx045rhjrx1w8f2a37m8hljghy86k9"; depends=[]; }; - numOSL = derive { name="numOSL"; version="1.5"; sha256="06lfy4jkk3myzlwivgh9j6ig1l0q9mgaa1zh3vxv2vdkzjd0l56b"; depends=[]; }; - nutshell = derive { name="nutshell"; version="2.0"; sha256="1v11g5wqyxnj29b7akl0cwa34hcqs79ijbiv735pg3df4ggyrzvm"; depends=[nutshell_bbdb nutshell_audioscrobbler]; }; - nutshell_audioscrobbler = derive { name="nutshell.audioscrobbler"; version="1.0"; sha256="10fvc5d22gnfb0bkgbww48f0vvcaja96g5gfv85kap939j11172j"; depends=[]; }; - nutshell_bbdb = derive { name="nutshell.bbdb"; version="1.0"; sha256="19c4047rjahyh6wa6kcf82pj09smskskvhka9lnpchj13br8rizw"; depends=[]; }; - nws = derive { name="nws"; version="1.7.0.1"; sha256="1fn92n6brjhh8hpvhax7211cphx2cn0rl99kjqksig6z7242c316"; depends=[]; }; - nycflights13 = derive { name="nycflights13"; version="0.1"; sha256="15bqaphxwqpdzr4bkn6qgbjb3knja5hk34qxjd6xhpjzkgfs5c0b"; depends=[]; }; - OAIHarvester = derive { name="OAIHarvester"; version="0.1-7"; sha256="0wcl71y8i4s4fxpb90xg71sj6819kgl3d4gff66dan8i6y8sxmyk"; depends=[XML RCurl]; }; - Oarray = derive { name="Oarray"; version="1.4-5"; sha256="1w66vqxvqyrp2h6acnbg3xy7cp6j2dgvzmqqk564kvivbn40vyy4"; depends=[]; }; - objectProperties = derive { name="objectProperties"; version="0.6.5"; sha256="0wn19byb1ia5gsfmdi6cj05pnlxbr3zcrjabjg3g1d7b58nz7wlh"; depends=[objectSignals objectSignals]; }; - objectSignals = derive { name="objectSignals"; version="0.10.2"; sha256="1rcgfq1i3nz2q93vv4l069f3mli1c6fd5dhhhw1p7cc4sy81008w"; depends=[]; }; - obliclus = derive { name="obliclus"; version="0.9"; sha256="000r1dx4zbgjxrfs66c1yazm0w6q2z0z1scf45g2qj5ykcm9ylma"; depends=[]; }; - obliqueRF = derive { name="obliqueRF"; version="0.3"; sha256="1bwlgv820mmpc6vg26bsdlfy2p78586i3y42hkzbw3z1fmwq3pz5"; depends=[ROCR pls mda e1071]; }; - oblique_tree = derive { name="oblique.tree"; version="1.1.1"; sha256="01vyc46gz7qx8fc5bg3zbhjyhnmfgjii120a915vmr38cs51qhqh"; depends=[tree glmnet nnet]; }; - obs_agree = derive { name="obs.agree"; version="1.0"; sha256="191xshnrncjqzwd2rdq334vsx0338q3y3k1nbm04hdaysbnla9jv"; depends=[]; }; - obsSens = derive { name="obsSens"; version="1.3"; sha256="1vfm1mzsycwkqa39vf3fcdv1s6adps9hw1rxlvl8v9kq746hcabw"; depends=[]; }; - oc = derive { name="oc"; version="0.93"; sha256="1nw594wrlnb0kkhkqfa14wxahh1yshpa2hz25nlnb42mi9pbrzg4"; depends=[pscl]; }; - occ = derive { name="occ"; version="1.0"; sha256="1gn8rg6k5lwwb6axfby7hiss5m64j2rh3hsmwwij58j5xda3jlbx"; depends=[]; }; - oce = derive { name="oce"; version="0.9-14"; sha256="03vp83504pwjk6wbx5l4s31qvxfyd3g38snvfvp8b0pvnlv8f2fh"; depends=[mapproj]; }; - ocean = derive { name="ocean"; version="0.2-4"; sha256="1554iixfbw3k6w9xh3hgbiygszqvj5ci431cfmnx48jm27h2alqg"; depends=[ncdf4 proj4]; }; - OceanView = derive { name="OceanView"; version="1.0"; sha256="1x94zrvz45vval4qiim6755ispj23zp0d6qvzg3xd65y30gprni1"; depends=[plot3D plot3Drgl shape]; }; - ocedata = derive { name="ocedata"; version="0.1.2"; sha256="0kic6m09a66zc5fxh9fkqk7rp3mnpf0p6i1qy2irh3bj9ccmdkvk"; depends=[]; }; - ODB = derive { name="ODB"; version="1.1.1"; sha256="1hha4rkbc2zh3karkqa0vn4v0nmcd7sljcymy1nh28bx1gx2ffgs"; depends=[DBI RJDBC]; }; - odfWeave = derive { name="odfWeave"; version="0.8.4"; sha256="1rp9j3snkkp0fqmkr6h6pxqd4cxkdfajgh4vlhpz56gr2l9j48q5"; depends=[lattice XML]; }; - odfWeave_survey = derive { name="odfWeave.survey"; version="1.0"; sha256="0cz7dxh1x4aflvfrdzhi5j64ma5s19ma8fk9q2m086j11a1dw3jn"; depends=[odfWeave survey]; }; - ODMconverter = derive { name="ODMconverter"; version="2.0"; sha256="1691fmkdjhk7rih8qk3rp6bykplz8hxsl7in8gjrc5ll0fkygm98"; depends=[XML xlsx]; }; - oem = derive { name="oem"; version="1.02.1"; sha256="0z9k0jhpp5dayyin6v8p26rgl8s983hnpsk195c9z458i7nbmrpd"; depends=[Rcpp]; }; - Ohmage = derive { name="Ohmage"; version="2.11-3"; sha256="16mm58yzh1r8s8x3jhdjwb01a1a8yjiay4v7gcj7j4r7z4mqr75c"; depends=[RCurl RJSONIO]; }; - OIdata = derive { name="OIdata"; version="1.0"; sha256="078khxrszwnrww2h0ag153bf59fnyhirxy4m56ssgr2gmfahaymf"; depends=[RCurl maps RCurl maps]; }; - OIsurv = derive { name="OIsurv"; version="0.2"; sha256="148mpjj5navc1vrl72y87krn4lf3awnd32z3g4qqaia404w5w7p7"; depends=[survival KMsurv]; }; - OjaNP = derive { name="OjaNP"; version="0.9-7"; sha256="1sf23q4qwvx1n8ny9rk4jcrjsb4hifn4ry12p5k29x4baaxmn3xg"; depends=[ICS ICSNP]; }; - okmesonet = derive { name="okmesonet"; version="0.1.4"; sha256="1fq17v1wx8hxvlk489vp6nlsx8ifs4491099zhikhn1fj7b1m346"; depends=[plyr]; }; - OligoSpecificitySystem = derive { name="OligoSpecificitySystem"; version="1.3"; sha256="0s76fxai1kgq0hcr5m18yz7i14algld97rjrax75cxm1ccylah71"; depends=[tkrplot]; }; - OLScurve = derive { name="OLScurve"; version="0.2.0"; sha256="1zqapfwgwy9rxnbhmlgplkphw1bdia4cyi9q6iwcppw3rjw75f1n"; depends=[lattice]; }; - omd = derive { name="omd"; version="1.0"; sha256="0s1wcgivqapbkzjammga8m12gqgw113729kzfzgn02nsfzmsxspv"; depends=[]; }; - OmicKriging = derive { name="OmicKriging"; version="1.3"; sha256="1fj131684faj75jdipmsvb8s684x72is6zz79hwb5wszklk00ind"; depends=[doParallel ROCR irlba]; }; - oncomodel = derive { name="oncomodel"; version="1.0"; sha256="1jyyq9znffiv7rg26mjldbwc5yi2f4f8npsd2ykhxyacb3g96fp1"; depends=[ade4]; }; - Oncotree = derive { name="Oncotree"; version="0.3.3"; sha256="147rc9ci66lxbb91ys2ig40sgmldi15p604yysrd4ccbxpbk2zwf"; depends=[boot]; }; - OneHandClapping = derive { name="OneHandClapping"; version="1.5"; sha256="1j45qy4nwnmiqmjqnhzs4f6zspckzhr1rx56i9ddis4iahffqd19"; depends=[]; }; - onemap = derive { name="onemap"; version="2.0-4"; sha256="00xmhm5qy0ycw0mnlyl20vfw0wxmpb36f07k0jj92c4zbpwjiygx"; depends=[tkrplot]; }; - ONETr = derive { name="ONETr"; version="0.1-1"; sha256="0jaxz8104xfdn2ys6lgg16vrbin73b5qfnrr81bgmdcpsk9ggix5"; depends=[XML RCurl]; }; - OneTwoSamples = derive { name="OneTwoSamples"; version="1.0-3"; sha256="0019rc2f4jmbm6sinkvalvjqwi822x78aiin88kg8qbbb5ml8l89"; depends=[]; }; - onion = derive { name="onion"; version="1.2-4"; sha256="0x3n9mwknxjwhpdg8an0ilix5cb8dyy5fqnb6nxx7ww885k0381a"; depends=[]; }; - OOmisc = derive { name="OOmisc"; version="1.2"; sha256="09vaxn5czsgn6wpr27lka40kzd76jzqgqxavf26ms3m9kkdf83g4"; depends=[]; }; - OpasnetUtils = derive { name="OpasnetUtils"; version="1.0.0"; sha256="04w6jvrjwiyva8lblx7i3ynywhis7d45nzhc1gls9yqxq0p426i1"; depends=[rjson RCurl reshape2 triangle httpRequest digest xtable]; }; - OPDOE = derive { name="OPDOE"; version="1.0-9"; sha256="0pf8rv5wydc8pl4x57g7bk2swjabaxdgijgsigjy5wihfcb48654"; depends=[gmp mvtnorm orthopolynom nlme crossdes polynom]; }; - OPE = derive { name="OPE"; version="0.7"; sha256="0ld3pr94ii1pmfk99qfwgria6ki2iz2hwmn7pj3cjwprv8jkcjji"; depends=[]; }; - opefimor = derive { name="opefimor"; version="1.1"; sha256="0xv57l38wx3w67h312g5xcpi9m7ggd6crqvqjh5gddq0g1g93bjq"; depends=[]; }; - openair = derive { name="openair"; version="1.0"; sha256="04swl74189ccbak0qw55gyw66v07ia0wg8xwiak81233wc0ins42"; depends=[plyr reshape2 mgcv lattice latticeExtra cluster RColorBrewer Rcpp]; }; - OpenCL = derive { name="OpenCL"; version="0.1-3"; sha256="0f7vis0jcp0nh808xbzc73vj7kdcjb0qqzzsh3gvgamzbjfslch8"; depends=[]; }; - opencpu = derive { name="opencpu"; version="1.4.3"; sha256="0515x95rvrp9hpxmc65hz6r35g8ql2hvlqhj94zapaa55ycw95jb"; depends=[evaluate httpuv knitr jsonlite devtools httr brew pander]; }; - openintro = derive { name="openintro"; version="1.4"; sha256="1k6pzlsrqikbri795vic9h191nf2j7v7hjybjfkrx6847c1r4iam"; depends=[]; }; - OpenMPController = derive { name="OpenMPController"; version="0.1-2"; sha256="1cpsbjmqql0fsjc1xv323pfkhfr9vrcv5g4j3p1qc5zn4z9pq7r6"; depends=[]; }; - openNLP = derive { name="openNLP"; version="0.2-3"; sha256="1d609hv24sxjppxpkgfvsl7p8vsajj0ivczcjixlnrly09j9ajrh"; depends=[NLP openNLPdata rJava]; }; - openNLPdata = derive { name="openNLPdata"; version="1.5.3-1"; sha256="1a048irgv56yi2lvhpqh8vh4dl7g7zfg934qypjxg8mcdcqi820y"; depends=[rJava]; }; - OpenRepGrid = derive { name="OpenRepGrid"; version="0.1.8"; sha256="1m71wb9i30vggbxpcv9ywbdi21ki8qivqw70i3rsrk8r1nx3zxq1"; depends=[colorspace plyr abind rgl GPArotation psych XML xlsx pvclust]; }; - OpenStreetMap = derive { name="OpenStreetMap"; version="0.3.1"; sha256="009xiqsbgqb3lba6msyzq7ncripmvpymxynkga8pqc8npv8g7fzb"; depends=[rJava raster rgdal rJava]; }; - openxlsx = derive { name="openxlsx"; version="2.0.15"; sha256="0wnczn3bnmcp3z8qx1al9is903y2iv532kb2sxz45ld3313n2y5z"; depends=[Rcpp]; }; - operators = derive { name="operators"; version="0.1-6"; sha256="13lqxifbw8h4xn5gjf96bnzq9fzrncrj1g5lib8gvbpcbwn2smsl"; depends=[]; }; - operator_tools = derive { name="operator.tools"; version="1.3.0"; sha256="0y5f0ifj4gaq03gm44vdvslcs7lglk1p8kq47mdc0gc1yfa6l00c"; depends=[]; }; - OPI = derive { name="OPI"; version="1.6"; sha256="0d9863zs54chmdc74g508xpclj7gjk7q36amdnqq0bffp87bj9nq"; depends=[rJava]; }; - opm = derive { name="opm"; version="1.1.0"; sha256="14sj0frjfd4a7j30zyk1fbhkpry45bjcn2k0l9jf7xc8415rbc3v"; depends=[lattice boot hwriter plotrix Ckmeans_1d_dp pkgutils yaml mgcv grofit rjson nlme DBI]; }; - opmdata = derive { name="opmdata"; version="0.7.0"; sha256="043zzp2p4cvda5rshi9s990lm5qyi6ydkmy84xanwaqvysi1cpyy"; depends=[opm]; }; - oposSOM = derive { name="oposSOM"; version="0.2-3"; sha256="0s6sq9ij8swgpljpk0jbzl0a1qw2y122zgxazy54q16xdf5a5vgy"; depends=[som fastICA pixmap igraph]; }; - ops = derive { name="ops"; version="1.0"; sha256="0cvwyn5sz5lx8sin8w4k8ymslfl4nfaa012a9vcl2hvp4850rk25"; depends=[]; }; - optAUC = derive { name="optAUC"; version="1.0"; sha256="0j1llzqa3n7kqw3i5bb7284z0hi6s5jbjfl9zap0l7xf6hg4x1dn"; depends=[MASS]; }; - optBiomarker = derive { name="optBiomarker"; version="1.0-27"; sha256="1kkj602d4klwyd8kylawgfysg8dlp2g6j7afkppzv5x8mbhs5ji4"; depends=[rpanel rgl MASS randomForest e1071 ipred msm Matrix]; }; - optextras = derive { name="optextras"; version="2013-10.27"; sha256="0898dgl8div4hdhb4wyj39vak94nm2311x550b8k8ljbx0nmp9gh"; depends=[numDeriv]; }; - OptHedging = derive { name="OptHedging"; version="1.0"; sha256="0g7qaf5abvbcqv2h1dciwn3gwpz084ryqjjk0yabdm4ym0y38ddm"; depends=[]; }; - OptimalCutpoints = derive { name="OptimalCutpoints"; version="1.1-2"; sha256="14qz1clckmgjqhcfmxknxb3vwplf107g8y4pd5bb3n7ska2p9g58"; depends=[]; }; - optimbase = derive { name="optimbase"; version="1.0-9"; sha256="0ivz24kf3yacgq5bl3s3az1pcyhsz0cza5f8vdksy5gchwqplm8n"; depends=[Matrix]; }; - optimsimplex = derive { name="optimsimplex"; version="1.0-5"; sha256="1aiq0w2zlra3k6x4hf2rglb6bj8w25yc8djnpgm508kkrbv3cc17"; depends=[optimbase]; }; - optimx = derive { name="optimx"; version="2013.8.6"; sha256="04jzfb4y1g3lds9qybhb8ykkwcwy1585v3mqpa3mshgdz332wx95"; depends=[numDeriv]; }; - OptInterim = derive { name="OptInterim"; version="3.0.1"; sha256="1ks24yv5jjhlvscwjppad27iass59da1mls99hlif0li9mvkbvyk"; depends=[mvtnorm clinfun]; }; - optiRum = derive { name="optiRum"; version="0.33"; sha256="1324wmi6b2y9whacf9883k1f86bs9gvxp46gksiga1dwab53nlhv"; depends=[data_table]; }; - optiscale = derive { name="optiscale"; version="1.1"; sha256="1c263w9df66m7lgvzpdfm2zwx9nj8wcdpgh5gijachr2dzffmrp2"; depends=[lattice]; }; - optmatch = derive { name="optmatch"; version="0.9-3"; sha256="143rkqajs9vc2idg7vs043njh3jgbl3v5x2jnnbxj6g3qlgzd5cb"; depends=[digest]; }; - optparse = derive { name="optparse"; version="1.2.0"; sha256="064grlajnmbcbyhmfgx58mbbmv94sxdkxdqqww0cbi7dg441sli2"; depends=[getopt]; }; - optpart = derive { name="optpart"; version="2.1-1"; sha256="0m2nsrynqbw9sj7cp7c37grx9g20dld2f26g0xzbj16wz7whgp02"; depends=[cluster labdsv MASS plotrix]; }; - optR = derive { name="optR"; version="1.1.1"; sha256="1lr5n0g21jayb27b2j8zh16f1k28avzg7k2mwyc7rjhhxv8k9w1j"; depends=[]; }; - ora = derive { name="ora"; version="2.0-1"; sha256="0albxqma220rnrpfdq3z9cawr83q1a0zzczbbcy4nijjm4mswphy"; depends=[DBI ROracle]; }; - orca = derive { name="orca"; version="1.0"; sha256="0cqz1zmlzwdprhbxs4arjv2gx868dx47xg8jmjvzk7g2xc9prj62"; depends=[]; }; - ORCI = derive { name="ORCI"; version="1.1"; sha256="0xy5lvz2scz06fphjyhqbdhp4bizmv87a8xykp9dbgx8b4ssnqgz"; depends=[BiasedUrn BlakerCI PropCIs]; }; - orclus = derive { name="orclus"; version="0.2-5"; sha256="0kkxhyqjxib862npinzf3mipqg5imgscdmb5wqm8wf2j2mbislsx"; depends=[]; }; - ORCME = derive { name="ORCME"; version="2.0.1"; sha256="0wr4z19alyp2cvlpg4bs8sni6nrwnhk11bbr00ycqym39alr2wjw"; depends=[Iso]; }; - orcutt = derive { name="orcutt"; version="1.1"; sha256="0hz7aw4jpf4l7ihj4bjnjv1m8ynr71n4l12x046qj8y7mrnl9p4k"; depends=[]; }; - ordBTL = derive { name="ordBTL"; version="0.8"; sha256="09x3zfmss4fsh3rjghgmpv8y34dnkz4mw696b3k3nvlgk55a1423"; depends=[caret VGAM wikibooks gtools]; }; - orddom = derive { name="orddom"; version="3.1"; sha256="165axs15fvwhrp89xd87l81q3h2qjll1vrwcsap645cwvb85nwsh"; depends=[psych]; }; - ORDER2PARENT = derive { name="ORDER2PARENT"; version="1.0"; sha256="04c80vk6z227w6qsnfls89ig4vqyiiymdarhq1pxa0gpr8j2ssx5"; depends=[Matrix]; }; - orderbook = derive { name="orderbook"; version="1.03"; sha256="0dlvjrzdhhh8js4g1lvxs46q7fdxfxavxnb4nj6xlwca75i51675"; depends=[lattice hash]; }; - OrdFacReg = derive { name="OrdFacReg"; version="1.0.4"; sha256="00zw5zqbn2v5r4mqgs4m7gz278bnb53jf5x6c50yv47643m0nxfy"; depends=[eha MASS]; }; - ordinal = derive { name="ordinal"; version="2013.9-30"; sha256="07a226ccd05a3w0i5j6f3mwbmnc3xpl7myq33zl6r4gpvcc8d7c3"; depends=[ucminf MASS Matrix]; }; - OrdinalLogisticBiplot = derive { name="OrdinalLogisticBiplot"; version="0.3"; sha256="0z03dpargdkay99gci5kpxr2i8cgiw3gfras65f83bjr2pkmsdla"; depends=[mirt MASS NominalLogisticBiplot]; }; - OrdMonReg = derive { name="OrdMonReg"; version="1.0.3"; sha256="1xca8pvvq79j484l2rmn4nva8ncx8z51g5diljikck231y8qjqaz"; depends=[]; }; - OrdNor = derive { name="OrdNor"; version="1.0"; sha256="1n6c0d4r1w3n016lzk2i5yyvawk9pgmsbzymbbyq7gx8a80iv32h"; depends=[mvtnorm corpcor Matrix GenOrd]; }; - ordPens = derive { name="ordPens"; version="0.2-1"; sha256="1kcxjfr2ncnqg293ph509hpgzzn5s4ih2kd8agl335zlxcksz3fp"; depends=[grplasso mgcv RLRsim]; }; - OrgMassSpecR = derive { name="OrgMassSpecR"; version="0.4-4"; sha256="046lr0piiy5w5lxjvyw7iqqclkghmc6zqymfypkw374gk73yrm76"; depends=[]; }; - ORIClust = derive { name="ORIClust"; version="1.0-1"; sha256="1biddddyls2zsg71w4innxl0ckfb80q2j9pmd56wvbc0qnbm0w3q"; depends=[]; }; - orientlib = derive { name="orientlib"; version="0.10.3"; sha256="1qi46hkz73b8722zc3w6wvsq1ydlk37yxn9rd1dqygqbs1svkmvv"; depends=[]; }; - orloca = derive { name="orloca"; version="4.2"; sha256="14accc5kcvvin5qav6g3rx10by00r0b8970nd09w4c09nhwyblcd"; depends=[]; }; - orloca_es = derive { name="orloca.es"; version="4.1"; sha256="0nzhg7vzfxlmryw5ijww8z2b1g9cmgcgzi3gsgigsgn4shnc2hni"; depends=[orloca]; }; - ORMDR = derive { name="ORMDR"; version="1.3-2"; sha256="0y7b2aja3zvsd6lm7jal9pabcfxv16r2wh0kyzjkdfanvvgk3wmm"; depends=[]; }; - oro_dicom = derive { name="oro.dicom"; version="0.4.1"; sha256="0mxjqk7b0k4srkk5yqm21b2x67c5hyd7nwf3b1qlb9rvnfjhqyhk"; depends=[oro_nifti]; }; - oro_nifti = derive { name="oro.nifti"; version="0.4.0"; sha256="1pragzjdldzgiaj4rbx37ki0930wfxj3kvan43vijd11a8ij1g5l"; depends=[bitops]; }; - oro_pet = derive { name="oro.pet"; version="0.2.1"; sha256="1ysi7jxx1jalx78vqpbq1rd8q85nrz23zrz3vbj5ar3l265kwd5q"; depends=[oro_nifti]; }; - orQA = derive { name="orQA"; version="0.2.1"; sha256="0vivjrpcbql42y078gi91kfpfdpv73j23jkiv8fpazzwzdi8ydqq"; depends=[Rcpp gtools nlme]; }; - orsk = derive { name="orsk"; version="1.0-1"; sha256="155wc9sfla3717b6xmhmsmvsnh2qbzzkffhibmj4xc0pd9lwwz2v"; depends=[BB BHH2]; }; - orthogonalsplinebasis = derive { name="orthogonalsplinebasis"; version="0.1.5"; sha256="060g2z8zx5gkk8v31cs0c6v5jzkd7hc9l2syx6hmvj6przr2cxi4"; depends=[]; }; - orthopolynom = derive { name="orthopolynom"; version="1.0-5"; sha256="1gvhqx6jlh06hjmkmbsl83gri0gncrm3rkliyzyzmj75m8vz993d"; depends=[polynom]; }; - osDesign = derive { name="osDesign"; version="1.7"; sha256="0y68pnsmq4nlmfsn28306q2kxab200pirr6ha0w4himzpnw1sil3"; depends=[]; }; - osmar = derive { name="osmar"; version="1.1-7"; sha256="0q6d8nw7d580bnx66mjc282dx45zw9srczz90b520hjcli4w3i3r"; depends=[XML RCurl geosphere]; }; - ouch = derive { name="ouch"; version="2.8-4"; sha256="1kx6qjvc8zlcxihqfxs288hwwh9m05s5544w4c6m1wc02083b735"; depends=[subplex]; }; - outbreaker = derive { name="outbreaker"; version="1.1-3"; sha256="0ahkzcgicdlk6g8fd7rnni0n333wrixlfpck5wpznp4a1ny44zn4"; depends=[ape igraph adegenet]; }; - OutbreakTools = derive { name="OutbreakTools"; version="0.1-11"; sha256="0m39wppck75mpcgdhwvw0nc0cgidzn80zl58hhs6x3svpnbssn0v"; depends=[ggplot2 network knitr RColorBrewer ape reshape2 sna plyr ggmap scales rjson networkDynamic]; }; - OutlierDC = derive { name="OutlierDC"; version="0.3-0"; sha256="1vm3zx4qmj9l0ddfqbksm1qyqzzqrxf93gh4kj52h68zlsfxwv41"; depends=[survival quantreg Formula]; }; - OutlierDM = derive { name="OutlierDM"; version="1.0-0"; sha256="1yphr47nswcaqa5pfamc3ksqcxwhxl388sdml2aqjjfd9w29lf2g"; depends=[quantreg MatrixModels outliers pcaPP]; }; - outliers = derive { name="outliers"; version="0.14"; sha256="0vcqfqmmv4yblyp3s6bd25r49pxb7hjzipiic5a82924nqfqzkmn"; depends=[]; }; - OUwie = derive { name="OUwie"; version="1.43"; sha256="1ixyws6q9p8kms3smzj8rkmsry2y4s9al4vhxpqfmbgypigq7n9k"; depends=[ape nloptr numDeriv corpcor lattice phytools phangorn]; }; - overlap = derive { name="overlap"; version="0.2.3"; sha256="0d41fhdbm009j53hq4cm2dz04wlh955c4q80dw1d1wcyjz627n49"; depends=[]; }; - oz = derive { name="oz"; version="1.0-20"; sha256="1d420606ldyw2rhl8dh5hpscvjx6vanbq0hrg81m7b6v0q5rkfri"; depends=[]; }; - p2distance = derive { name="p2distance"; version="1.0.1"; sha256="1ims8i5z5k97kjpdysgx8g7lgvnvf7amahcrssw7bk38bvbxawni"; depends=[]; }; - p3state_msm = derive { name="p3state.msm"; version="1.3"; sha256="0gbrka62ylxx64r3abpk60y92k2lk5smlf8na68qazph8llsl2rv"; depends=[survival]; }; - pa = derive { name="pa"; version="1.2-1"; sha256="1pfgzxirkb0p8f6smjlrbp1qpsh0vsvqf306cvldaj9zx8cw0q9f"; depends=[ggplot2]; }; - pacbpred = derive { name="pacbpred"; version="0.92.2"; sha256="13p405vh9rf1r5idxl5payc85vwlzcd87wm15163vc9gmil1ncsf"; depends=[]; }; - pack = derive { name="pack"; version="0.1-1"; sha256="0x4p8clwp49s2y67y7in530xwhjngnqwagf9xnyb1jp0z3myd3r7"; depends=[]; }; - packClassic = derive { name="packClassic"; version="0.5.2"; sha256="04a1sg9vx3r0sq54q9kj0kpahp6my246jy3bivgy09g5fjk0dmkj"; depends=[]; }; - packdep = derive { name="packdep"; version="0.3.1"; sha256="1827h9xcvgdad9nwz9k3hi79jc33yr7dnxy4xn2frp3fdh4q81ll"; depends=[igraph]; }; - packHV = derive { name="packHV"; version="1.8"; sha256="0dr2picjd7mm633vw29524f3n4jpyillpzi9cg7yc2cymxnrgvyg"; depends=[survival WriteXLS]; }; - packS4 = derive { name="packS4"; version="0.9.1"; sha256="01kkw5g3xcn9hhfglmfvwsryid0w4vw9azh6as8l8d5i1xjyp9k7"; depends=[]; }; - pacose = derive { name="pacose"; version="1.4"; sha256="10dpqafbq5iwfhx9xf6l902y23p2w4mvaclkhrcz2d89njakcnaz"; depends=[ggm igraph ppls MASS corpcor glmnet mvtnorm lcd]; }; - paf = derive { name="paf"; version="1.0"; sha256="0wrqn67jfrjjxwcrkka6dljgi3mdk00vfjkzzcv2v7c97gx1zvwn"; depends=[survival]; }; - PAGI = derive { name="PAGI"; version="1.0"; sha256="01j1dz5ihqslpwp9yidmhw86l112l7rfkswmf03vss872mpvyp3f"; depends=[igraph]; }; - PAGWAS = derive { name="PAGWAS"; version="1.0"; sha256="1zwq4b0bgsskzvlapffh30ys9y4wlcfwpjqw8m2i9zabib5knx9i"; depends=[lars doMC mnormt]; }; - pairedCI = derive { name="pairedCI"; version="0.5-4"; sha256="03wf526n3bbr2ai44zwrdhbfx99pxq1nbng9wsbndrdg2ji4dar2"; depends=[]; }; - PairedData = derive { name="PairedData"; version="1.0.1"; sha256="025h5wjsh9c78bg6gmg6p6kvv2s6d5x7fzn3mp42mlybq0ry78p0"; depends=[MASS gld mvtnorm lattice ggplot2]; }; - pairheatmap = derive { name="pairheatmap"; version="1.0.1"; sha256="1awmqr5n9gbqxadkblpxwcjl9hm73019bwwfwy1f006jpn050d6l"; depends=[]; }; - PairViz = derive { name="PairViz"; version="1.2.1"; sha256="0mjp5p6n5azbhrm2hvb9xyqjfhd49pw9ia8k70749yc96ws1qqc7"; depends=[TSP gtools]; }; - pairwise = derive { name="pairwise"; version="0.2.5"; sha256="0r08v95f6f2safi6c0x84v5gib5qnkv46dmi97rdb9l2xzly249b"; depends=[]; }; - pairwiseCI = derive { name="pairwiseCI"; version="0.1-22"; sha256="1lgir9gcikx8c9pd2wdsqnik9rwr4qkymcf4ndp8s491vj6cm6sa"; depends=[MCPAN coin boot mratios binMto MASS]; }; - palaeoSig = derive { name="palaeoSig"; version="1.1-2"; sha256="0f5y69zzb32zi3kdy8jpcvz3i38nmmi0d9ajs44jrq4rkhhhwq3v"; depends=[rioja vegan TeachingDemos gstat fields mapproj]; }; - paleobioDB = derive { name="paleobioDB"; version="0.1"; sha256="0ax5mzfvrxwg82brc4589bkd7cl8iy254iq6sjs9cr3d7x0zyahz"; depends=[maps raster rjson gtools RCurl plyr scales]; }; - paleofire = derive { name="paleofire"; version="1.1.3"; sha256="0k46pq16chrp5gcp5gd5vph9zj17ci4yb1lgyrwrm8qnvydi1nkp"; depends=[GCD rworldmap locfit gtools caTools pscl Imap RCurl devtools raster sp rgdal ggplot2 lattice RColorBrewer agricolae plyr]; }; - paleoMAS = derive { name="paleoMAS"; version="2.0-1"; sha256="1hhb5wbj4m3ch8wnvd1zkl5bk6wa9nl6jl1dhm4z6yqkh29yn9z6"; depends=[MASS vegan lattice]; }; - paleotree = derive { name="paleotree"; version="2.0"; sha256="06bi9wikgb9szlhf747ijnqikv87svlf579w4hx9yplc8m44br1s"; depends=[ape phangorn]; }; - paleoTS = derive { name="paleoTS"; version="0.4-4"; sha256="19acfq5z42blk6ya7sj3sprddlgvhrzb9zqpvpy4q8siqkxxrjah"; depends=[mvtnorm]; }; - palinsol = derive { name="palinsol"; version="0.92"; sha256="1jxy3qx8w1r8jwgdavf37gqjjqpizdqk218xcc7b77xi8w52vxpg"; depends=[gsl]; }; - PamGeneMixed = derive { name="PamGeneMixed"; version="1.03"; sha256="0pg19nnn8d23mqw7aw1wqijcgfavvixr42p51iz0m931ig3sg4ki"; depends=[mgcv gplots nlme]; }; - pamm = derive { name="pamm"; version="0.7"; sha256="02py4zcymmwnlpsvha5cgc4ik8fp0gbsg86s5q7z5fl3ma3g669j"; depends=[lme4 mvtnorm gmodels]; }; - pamr = derive { name="pamr"; version="1.54.1"; sha256="05jm67y329z4qcsacd9mc7hcq7g6icf2mi53nranmkgcnhwvr78k"; depends=[cluster survival]; }; - pan = derive { name="pan"; version="0.9"; sha256="1payx5bzs0hp3f176ia56y4a9pym8p4h7ap5wag2symlvprzppah"; depends=[]; }; - pander = derive { name="pander"; version="0.3.8"; sha256="0ka9cjwmvr79rbymww9m36l7z0rdf8xkxvc6r2y5lm6mpzx1s13i"; depends=[digest]; }; - panelAR = derive { name="panelAR"; version="0.1"; sha256="1ka2rbl9gs65xh2y2m4aqwh5qj4szibjy101hqfmza9wmdh25gpq"; depends=[car]; }; - Paneldata = derive { name="Paneldata"; version="1.0"; sha256="00hk340x5d4mnpl3k0hy1nypgj55as2j7y2pgzfk3fpn3zls5zib"; depends=[]; }; - papeR = derive { name="papeR"; version="0.4-0"; sha256="0w1pqmgaa15x4vxr4msw5fwmd42kgrhniy2h7wvpyyvgzxfvb0s3"; depends=[car nlme lme4 survival gmodels]; }; - ParallelForest = derive { name="ParallelForest"; version="1.1.0"; sha256="1xa9lfgrvzv7bvv1aaabcfk4372p8x5gxgj463h5ggf9x177lj5j"; depends=[]; }; - parallelize_dynamic = derive { name="parallelize.dynamic"; version="0.9-1"; sha256="03zypcvk1iwkgy6dmd5bxg3h2bqvjikxrbzw676804zi6y49mhln"; depends=[]; }; - parallelMap = derive { name="parallelMap"; version="1.1"; sha256="1h3im52ia29m1qv4dcvw1zxciv3v9b9fq2difg6cs9apdn0fvlz8"; depends=[BBmisc checkmate fail]; }; - parallelMCMCcombine = derive { name="parallelMCMCcombine"; version="1.0"; sha256="05krkd643awqhfrylq9lxr2cmgvnm1msn2x8p1l1483n2gzyklz7"; depends=[mvtnorm]; }; - ParamHelpers = derive { name="ParamHelpers"; version="1.3"; sha256="15dbqsr5sp16wq0nqi07gkkqc1drb87s5yw54s3dv1mg6bn4az7k"; depends=[BBmisc checkmate]; }; - paramlink = derive { name="paramlink"; version="0.9-6"; sha256="0pazllkjbqzvl9vmpvr67lkcsd960mipcd1p1nf00y8hknrwh7qp"; depends=[kinship2 maxLik]; }; - 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-4"; sha256="0zz1i3cm1gy2bx77hpydk0wlsr60nanjx57g0zr5wm01imkk99wa"; depends=[MASS glmnet ppls Epi GeneNet]; }; - ParDNAcopy = derive { name="ParDNAcopy"; version="1.3"; sha256="1y0fl5gj3d3xj6krfyg48fs9vz3s4jb61js0b7yfzgv6a3289g5a"; depends=[]; }; - ParentOffspring = derive { name="ParentOffspring"; version="1.0"; sha256="117g8h0k65f2cjffigl8n4x37y41rr2kz33qn2awyi876nd3mh93"; depends=[]; }; - ParetoPosStable = derive { name="ParetoPosStable"; version="1.0.2"; sha256="1a42s9lhzzimvlxdpbd8dfqc5a936f1s31d040fwgs8i3qfpfjwp"; depends=[ADGofTest lmom]; }; - 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=[]; }; - parspatstat = derive { name="parspatstat"; version="0.1-4"; sha256="14rcw2lzqwdjg4avjw3d6ivgdglkkagdh6pnd7bprkkdv8i5a9h2"; depends=[Rmpi spatstat]; }; - partDSA = derive { name="partDSA"; version="0.9.5"; sha256="0zblwjzwhalcnbmgwnqxpq7ixf4xhgx9lpf0lk3krry3di537s0q"; depends=[survival]; }; - partialOR = derive { name="partialOR"; version="0.9"; sha256="02vbvln8lswysaafpxq5rxb6crp7yhlc13i42kybv8fr10jaagjj"; depends=[nnet]; }; - partitionMap = derive { name="partitionMap"; version="0.5"; sha256="0pi066xaaq0iqr0d7cncdzjd7bacmgrivc4qvhqx0y7q1vifrdjm"; depends=[randomForest]; }; - partitionMetric = derive { name="partitionMetric"; version="1.1"; sha256="1wry9d3s814yp79ayab7rzf8z5l2mwpgnrc5j7d2sac24vp4pd48"; depends=[]; }; - partitions = derive { name="partitions"; version="1.9-15"; sha256="0jgpknm4zah50w9i3fbq2f1whm4hywm2j72vxc3ignx1snx2z0gs"; depends=[gmp polynom]; }; - partsm = derive { name="partsm"; version="1.1-2"; sha256="0cv3lgkdkn97bc85iwlv9w5pmqwwwsgb717zxnbgb5mzf4xn3f3g"; depends=[]; }; - party = derive { name="party"; version="1.0-15"; sha256="159k6pq5in9608m6y007vhlvlhd98z1m75i727c7k1vjj0rxsdf1"; depends=[zoo sandwich strucchange modeltools survival coin]; }; - partykit = derive { name="partykit"; version="0.8-0"; sha256="083lwaz38d40qdhlhf33vplykx1m3ham0q8r7pmwivj09nbfkmya"; depends=[survival]; }; - parviol = derive { name="parviol"; version="1.1"; sha256="1sfgic86ssd5wjf9ydss9kjd3m4jmm2d1v896sjsv8bydwymbpx3"; depends=[vioplot]; }; - PAS = derive { name="PAS"; version="1.2"; sha256="0q5g9j8xb9fl7r8f1w5gk5h83ll5w1r6m2gq9ilw8w8s96pm4xd8"; depends=[glmnet]; }; - pass = derive { name="pass"; version="1.0"; sha256="00dzwg2lnzmrrmzq3fyrs4axswgnsn7f62l2f2a8d8gyf8qzz3nf"; depends=[MASS lars ncvreg]; }; - pastecs = derive { name="pastecs"; version="1.3-18"; sha256="0ixlnc1psgqgm71bsf5z5j65lvr92ghpsk9f1ifm94dzjhi6d22i"; depends=[boot]; }; - pastis = derive { name="pastis"; version="0.1-2"; sha256="0211pzj3xrmqgxjpspij95kmlpa2klpicw49n6pnz2g1fapjy2bd"; depends=[caper ape]; }; - PASWR = derive { name="PASWR"; version="1.1"; sha256="1rxymnqvflypc6m62f5vw65l8x1m2yah7r11hhpmzdq2l2sg8fci"; depends=[e1071 MASS lattice]; }; - patchDVI = derive { name="patchDVI"; version="1.9.1601"; sha256="0vv1rmmd78n2r14dsl9fx25v6ym9mav557ya0aagr548wqcajf0m"; depends=[]; }; - patchPlot = derive { name="patchPlot"; version="0.1.5"; sha256="1b4k0dvvj6qwyxbqb36knyrawvy5qq8hl45pz896c9rkqhlg02bx"; depends=[datautils]; }; - pathClass = derive { name="pathClass"; version="0.9.4"; sha256="1vzmz3bml37wfxsjhkw9fip90sr1iv521ccr7nlf6xd30wavqywk"; depends=[svmpath kernlab ROCR igraph lpSolve]; }; - pathdiagram = derive { name="pathdiagram"; version="0.1.9"; sha256="1j2h9mmwfi95nwhk9214kcfpb1qrmw249mjaza7i9gijmlicraxz"; depends=[shape]; }; - pathmox = derive { name="pathmox"; version="0.2.0"; sha256="0hcllnpjjays35yngz309f1gcx9qg5z9h302kg9mhxs90470x4w0"; depends=[plspm tester]; }; - PatternClass = derive { name="PatternClass"; version="1.5"; sha256="1paw39xm2rqjnc7pnbya7gyl160kzl56nys9g0y1sa6cqycy3y5x"; depends=[SDMTools]; }; - pavo = derive { name="pavo"; version="0.5-1"; sha256="189kshc5dm02qv0rm1dlcxrhvga4yhlkn3yyj3rjhmrags4rmwcb"; depends=[rgl rcdd mapproj geometry]; }; - pawacc = derive { name="pawacc"; version="1.2"; sha256="1a9dzym02rfymjqw1rnp0hri50ysdnax171x5whi5j7fmvmc9rk5"; depends=[SparseM]; }; - PAWL = derive { name="PAWL"; version="0.5"; sha256="1sx4g4qycba2j1fm0bvhz3hk6ghhdc37rz5zi1njqxrpmbnkqg04"; depends=[mvtnorm foreach reshape ggplot2]; }; - pbapply = derive { name="pbapply"; version="1.1-1"; sha256="1dshpnnmq1g2v223qy7pgbxydy9sqj04zwqxvzylm4mqc91ks4n2"; depends=[]; }; - pbatR = derive { name="pbatR"; version="2.2-9"; sha256="1p8rj0lzm4pp1svgy7xia2sclkngzfjbgbikq94s6v92d582wncw"; depends=[survival rootSolve]; }; - PBC = derive { name="PBC"; version="1.2"; sha256="1z08y5sn6i439811c9mq3bs78zqlzzkz0srmv4wld68bywhmwqj4"; depends=[igraph Rcpp copula]; }; - PBD = derive { name="PBD"; version="1.0"; sha256="1q8ijjmcwxi8f3wgggpj4y522wmxady7f60frhlvvixhzfn2iml1"; depends=[deSolve ade4 ape DDD]; }; - pbdBASE = derive { name="pbdBASE"; version="0.2-3"; sha256="1zfz45fnjmp8yz4nlac9q1d49gpczkl2b0rz2s33jbv5i32z3yvs"; depends=[rlecuyer pbdMPI pbdSLAP]; }; - pbdDEMO = derive { name="pbdDEMO"; version="0.2-0"; sha256="0vilri4d25mb339zsgh1zypyqxv1vzfdc8b8ivqi5yz1nrzm05gz"; depends=[rlecuyer pbdMPI pbdSLAP pbdBASE pbdDMAT]; }; - pbdDMAT = derive { name="pbdDMAT"; version="0.2-3"; sha256="18x607r0gx1nnw9p305ci5sfcxbi5zdr2b6yf9y6vqjsckicnw62"; depends=[rlecuyer pbdMPI pbdSLAP pbdBASE]; }; - pbdMPI = derive { name="pbdMPI"; version="0.2-4"; sha256="035b1wg7an1sjfbk6giv4n8znhxg8l0rnqf14c982d9fbcfbxf47"; depends=[rlecuyer]; }; - pbdNCDF4 = derive { name="pbdNCDF4"; version="0.1-4"; sha256="0fd29mnbns30ck09kkh53dgj24ddrqzks4xrrk2hh1wiy7ap1h95"; depends=[]; }; - pbdPROF = derive { name="pbdPROF"; version="0.2-3"; sha256="0vk29vgsv7fhw240sagz0szg0wb649sqc05j1aj027zvz931vfl8"; depends=[ggplot2 gridExtra reshape2]; }; - pbdSLAP = derive { name="pbdSLAP"; version="0.1-9"; sha256="118fy8316p3ahshq0wcwqj20v019dgbgx9wlz7vq35zg5i2fwccw"; depends=[rlecuyer pbdMPI]; }; - PBImisc = derive { name="PBImisc"; version="0.999"; sha256="0igwl78wj8w6jzmk5m8y9rf4j72qrcjyhb83kz44is72ddzsyss6"; depends=[MASS lme4 Matrix]; }; - pbivnorm = derive { name="pbivnorm"; version="0.5-1"; sha256="18ry0qz0ryazplv5iwdvbfngn0zv7frqp16nc2x70s0wf3izxkwr"; depends=[]; }; - pbkrtest = derive { name="pbkrtest"; version="0.4-0"; sha256="1mpcqciqgljjw60yccpb368a0h1casxijqjdwp3s1wi03ixp8iqz"; depends=[MASS lme4 Matrix]; }; - pbo = derive { name="pbo"; version="1.3.4"; sha256="0v522z36q48k4mx5gym564kgvhmf08fsadp8qs6amzbgkdx40yc4"; depends=[lattice]; }; - pbs = derive { name="pbs"; version="1.1"; sha256="0cpgs6k5h8y2cia01zs1p4ri8r7ljg2z4x8xcbx73s680dvnxa2w"; depends=[]; }; - PBSadmb = derive { name="PBSadmb"; version="0.68.104"; sha256="01akimdsp0bkvz3a5d75yyy3ph0mff85n8qsnr59fla5b5cm4qlj"; depends=[PBSmodelling]; }; - PBSddesolve = derive { name="PBSddesolve"; version="1.11.29"; sha256="13vprr66hh5d19xambpyw7k7fvqxb8mj5s9ba19ls7xgypw22cmm"; depends=[]; }; - PBSmapping = derive { name="PBSmapping"; version="2.67.60"; sha256="1n9c9fglsnch5jw248yyvy2vrq3wgca0wdkdwwhfc3n7yw83mwkr"; depends=[]; }; - PBSmodelling = derive { name="PBSmodelling"; version="2.66.264"; sha256="08plp74cjzmgv3dkaxgryqq1yqp0z7pdlz9jqgai8w89vwi0il35"; depends=[]; }; - pca3d = derive { name="pca3d"; version="0.2"; sha256="1x7fi9c4gijv34hr2bgsp872v5hknwidrh4q4blvvqknfl1w3clr"; depends=[rgl]; }; - pcaL1 = derive { name="pcaL1"; version="1.2.1"; sha256="00jfsbhnpq5mvnmpv066w1nhz2lhv55imgbl2z7dza9b8gxb88ry"; depends=[]; }; - pcalg = derive { name="pcalg"; version="2.0-3"; sha256="1vfrqm8hjdprsdqpik6a4zhv4yxyqyqa3dr2226qkm5ijblrcmwx"; depends=[abind igraph ggm corpcor robustbase vcd Rcpp]; }; - PCAmixdata = derive { name="PCAmixdata"; version="2.1"; sha256="12g6pkp9yffp1arqdvnx721cn34h0a7m3bm2ayd9fsrvbaqb7ci8"; depends=[]; }; - pcaPA = derive { name="pcaPA"; version="1.2"; sha256="1acfhv6225r0d8m45z7dlx78lmypdlh1cg4irvf8b3av0qv12g5x"; depends=[polycor ltm ggplot2 mc2d]; }; - pcaPP = derive { name="pcaPP"; version="1.9-49"; sha256="0yk97r0rwkppnzp0kc1j3hcp4n2dr8765mbmvlaikjgwhlhbby4q"; depends=[mvtnorm]; }; - PCDSpline = derive { name="PCDSpline"; version="1.0"; sha256="15kmvcwvwlsr1107n7mfajvf9b1kcslnhsdx0drjjhsvq193qrqa"; depends=[nleqslv matrixcalc]; }; - pcenum = derive { name="pcenum"; version="1.0.1"; sha256="0jcwggxcnlbx75lwwpaldv28sgmhxa46rny94sji37hq3zil8yhw"; depends=[]; }; - pcg = derive { name="pcg"; version="1.1"; sha256="194j72hcp7ywq1q3dd493pwkn1fmdg647gmhxcd1jm6xgijhvv87"; depends=[]; }; - PCGSE = derive { name="PCGSE"; version="0.2"; sha256="19bpnn1b8ihmf52zh9g9pc38130np1ki8l7wf0j5myw2cnw6fna8"; depends=[RMTstat MASS]; }; - PCICt = derive { name="PCICt"; version="0.5-4"; sha256="1g17hxs00dlnb6p0av6l7j99qy00555f80nk1i1i1x87fszp3axa"; depends=[]; }; - pcIRT = derive { name="pcIRT"; version="0.1"; sha256="0vfbbmnp4jyrbi5d9gz1krh707aazbrqfcgc3rjrwwyjld11wyzn"; depends=[combinat]; }; - PCIT = derive { name="PCIT"; version="1.04-5"; sha256="10fnkad09y7vh8j3c5kgkh64lwqn2nsl5818rzl9b8d51f951qjg"; depends=[]; }; - pcnetmeta = derive { name="pcnetmeta"; version="1.2"; sha256="18ha74i6azgkb8wzjgs8c55fi386a1z9n5bm1llb8mk089h2gx8j"; depends=[R2jags network runjags]; }; - PCovR = derive { name="PCovR"; version="2.5"; sha256="1as3qd2gqznfy95mil8k31nkqrf36sgpja5s9zdwvk0vpaxv1fr7"; depends=[GPArotation ThreeWay MASS Matrix]; }; - PCPS = derive { name="PCPS"; version="1.0.1"; sha256="1av0mfv54ig1blq0228nlzgvjndrg711ip6xfq2886qhypcapgd5"; depends=[SYNCSA vegan ape picante phylobase plotrix]; }; - pcrcoal = derive { name="pcrcoal"; version="1.1"; sha256="17mm13xpmghachiqr7v2691jk39mbfsadpg028gs3iiwmh0pksa0"; depends=[ape ggplot2 phylosim]; }; - PCS = derive { name="PCS"; version="1.2"; sha256="0488h6s1yz6fwiqf88z2vgckn6i0kwls8cazmpw3wspnaqvl2n4s"; depends=[statmod]; }; - pcse = derive { name="pcse"; version="1.9"; sha256="04vprsvcmv1ivxqrrvd1f8ifg493byncqvmr84fmc0jw5m9jrk3j"; depends=[]; }; - pdc = derive { name="pdc"; version="0.5"; sha256="1fx8y2irhklpkhxljy6vkg28i2xhprnhzrfrmxvmggpfk8xca8by"; depends=[]; }; - pdfCluster = derive { name="pdfCluster"; version="1.0-2"; sha256="0kbci54dlzn736835fh18xnf2pmzqrdmwa3jim29xcnwa1r2gklb"; depends=[geometry]; }; - pdfetch = derive { name="pdfetch"; version="0.1.5"; sha256="16al3db30nv25b0559n1mia3ragc494pn96sqc8hw99p50mrqgab"; depends=[zoo xts RCurl XML lubridate jsonlite reshape2]; }; - pdist = derive { name="pdist"; version="1.2"; sha256="18nd3mgad11f2zmwcp0w3sxlch4a9y6wp8dfdyzvjn7y4b4bq0dd"; depends=[]; }; - pdmod = derive { name="pdmod"; version="1.0"; sha256="1czpaghp2lcad4j6wxswdfw0n9m0phngy966zr4fr3ciqpx3q129"; depends=[mco]; }; - PDSCE = derive { name="PDSCE"; version="1.2"; sha256="17lc6d8ly6jbvjijpzg45dvqrzrh5s1sp415nycazgpbg9ypwr2h"; depends=[]; }; - peacots = derive { name="peacots"; version="1.0"; sha256="1wc2651n34jn88711g295hzyd04ay4gabigh1xcw3m9gpvqnag1k"; depends=[]; }; - Peaks = derive { name="Peaks"; version="0.2"; sha256="0a173p5cdm1jnm7bwsvjpxh4dccy593g02c4qjwky1cgzy5rvin2"; depends=[]; }; - pear = derive { name="pear"; version="1.2"; sha256="1ixmyzm72s18qrfv2m8xzh5503k1q90lhddq4sp46m0q7qyxb192"; depends=[]; }; - pearson7 = derive { name="pearson7"; version="1.0"; sha256="0dz5zf3k6bwj460gna6ak7hwdrsjinhv2ckkgqrycilfsx1w5h44"; depends=[]; }; - PearsonDS = derive { name="PearsonDS"; version="0.97"; sha256="0bsdj4zir12zkv8yhq1z6dqjzhkb9l0f88jrr4iyclns1pcqvrvi"; depends=[]; }; - PearsonICA = derive { name="PearsonICA"; version="1.2-4"; sha256="0jkbqha1nb9pf72ffki47wymsdmd50smkdhvpzvanv4y2rmqfhvg"; depends=[]; }; - pec = derive { name="pec"; version="2.2.9"; sha256="0qvkmm8k2bg6sg42csrk6sn5qa1bvnmn8q485sxc11lqgxvic2jx"; depends=[prodlim survival rms foreach]; }; - pedantics = derive { name="pedantics"; version="1.5"; sha256="0m5jxzkf1pf657q2klv6idnywg18ki962666nj7sfyl4rq06xhsi"; depends=[MasterBayes MCMCglmm kinship2]; }; - PedCNV = derive { name="PedCNV"; version="0.1"; sha256="09qxcjzwdgzdkbj28rzmfv7k3q2qsiapnvx3m45a835r57h5gynp"; depends=[Rcpp RcppArmadillo ggplot2]; }; - pedgene = derive { name="pedgene"; version="2.1"; sha256="0nmp1s0i5b4h45p3f4rvvixjz8sgv56as3c85rvv3a8xwfd1gcxq"; depends=[Matrix CompQuadForm survey kinship2]; }; - 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.1-9"; sha256="1szp3mp24y32kz24p1c8mzdljqdl61fwnd3q1d5kqwg85amifa12"; depends=[spsurvey xtable XML stringr sp car pbapply MASS plyr lattice latticeExtra VecStatGraphs2D mvtsplot]; }; - pegas = derive { name="pegas"; version="0.5-1"; sha256="0imn9n0y9nxp8vv1nz3qg9vmb5bdzxm596fxxg4hcgw7am6ap2sq"; depends=[ape adegenet]; }; - PEIP = derive { name="PEIP"; version="1.7"; sha256="1bagi1kr8vd3b3r524vrk747bqmd9insny1nxj8bdvdk0a9yr949"; depends=[bvls Matrix RSEIS pracma]; }; - PEMM = derive { name="PEMM"; version="1.0"; sha256="18dd9hsbdrnhrrff7gpdqrw2jv44j8lg0v3lkcdpbd4pppcaq84h"; depends=[]; }; - penalized = derive { name="penalized"; version="0.9-42"; sha256="160ypgfcbdxcrgrhq99rgxl1wgn7854y64820nkvmfpc0ady7s4q"; depends=[survival survival]; }; - penalizedLDA = derive { name="penalizedLDA"; version="1.0"; sha256="1ib33l5nqmvi6qn9ykybkdpc0pp55k1b6x4vqpklzp3dgckg0lp6"; depends=[flsa]; }; - penalizedSVM = derive { name="penalizedSVM"; version="1.1"; sha256="0zc36cgcrdy4rwhg4hhhahymqfalvc5v2zmqq56ikz5blln82qvq"; depends=[e1071 MASS corpcor statmod tgp mlegp lhs]; }; - pencopula = derive { name="pencopula"; version="0.3.5"; sha256="1cy36pprbrfabk9n3x4d1xbj1vd2dda7xq3ihj2hzniwn77j63wi"; depends=[lattice fda quadprog latticeExtra]; }; - pendensity = derive { name="pendensity"; version="0.2.7"; sha256="1f7v0dqcip6mvza9h6j1ajkc6awjs0g8i07v529xn7fhygzwwccr"; depends=[lattice fda]; }; - penDvine = derive { name="penDvine"; version="0.2.2"; sha256="054vw99z68pk0bi4yzdmvx13x8n75sj2371l8w2yady1lqjj4qi7"; depends=[lattice quadprog TSP fda Matrix]; }; - PenLNM = derive { name="PenLNM"; version="1.0"; sha256="1xkz39cdp9dr8iq1cjiv862sda4zy737gvbwxxsykw15256lklmf"; depends=[remMap MASS Matrix]; }; - penMSM = derive { name="penMSM"; version="0.97"; sha256="0jpmsc950mgnjwlbzy00zsw0xihmmml56nmlgmrxpfzaxq0657ay"; depends=[]; }; - pensim = derive { name="pensim"; version="1.2.9"; sha256="10nrnxwfs41bhybs7j6xgnx0pq3c802n9k8irngmh8iy4w3wbhrq"; depends=[penalized MASS]; }; - peperr = derive { name="peperr"; version="1.1-7"; sha256="01a6sxcmb8v2iz2xdwhdnr92k3w2vn3hr0hg9b6mkpzjf4n45q3k"; depends=[snowfall survival]; }; - peplib = derive { name="peplib"; version="1.5.1"; sha256="1bdgmwbk76ryl5gxcgf3slds92yilg9p1x1lx0hnzzwcgx99wif3"; depends=[]; }; - PepPrep = derive { name="PepPrep"; version="1.0.0"; sha256="1nrf0q1w9xsv7yp8zm9gbbbn9wg8brbix45m64gvrb9izrx3p09k"; depends=[stringr]; }; - peptider = derive { name="peptider"; version="0.1.5"; sha256="1jlvzfm1i7yyplwgsp08x3sx07gmkv24ri8jrlkz6jspj9w90dwq"; depends=[discreteRV plyr dplyr]; }; - Peptides = derive { name="Peptides"; version="0.4"; sha256="1841cfx6i2yc5142j1160aandvlrljvfxx79clylj5k9yavpj8rc"; depends=[seqinr]; }; - pequod = derive { name="pequod"; version="0.0-3"; sha256="14nag0bd2icg294y7n47c6xlw54rrdia887d2ni6achjqgwvffzh"; depends=[ggplot2 car]; }; - perARMA = derive { name="perARMA"; version="1.5"; sha256="1d9vrxv8r6qgxhaz3pv8n34c526gi5cd8w7wxy9qc914y8kplmzr"; depends=[corpcor gnm matlab Matrix signal]; }; - PerfMeas = derive { name="PerfMeas"; version="1.1"; sha256="1b49p5lvnshrinf08v9c6nriycrspy569v5akjpffyqi2badr82b"; depends=[]; }; - PerformanceAnalytics = derive { name="PerformanceAnalytics"; version="1.1.0"; sha256="082lh4g9lngbj1chmd23ax1603apnpwh7blml6vq6z3lic59qqgy"; depends=[zoo xts]; }; - performanceEstimation = derive { name="performanceEstimation"; version="0.1.1"; sha256="1km2ljsy8hj9x6xr9am0f4wzihlhbyxhcss7kcxbimxvcv0a479n"; depends=[ggplot2]; }; - perm = derive { name="perm"; version="1.0-0.0"; sha256="0075awl66ynv10vypg63fcxk33qzvxddrp8mi4w08ysvimcyxijk"; depends=[]; }; - PermAlgo = derive { name="PermAlgo"; version="1.0"; sha256="1dc4b5pn77av80k6pgh9k0ksvv9lnjqiwdb2jv55nm0ndycw0qr4"; depends=[]; }; - PerMallows = derive { name="PerMallows"; version="1.3"; sha256="08bgy8k2xcb61kyqxdskz8x0cfw27cypp1r470lvld544r4x0hp1"; depends=[Rcpp]; }; - permGPU = derive { name="permGPU"; version="0.14.6"; sha256="1h01nfq8hn7i29xanma70q6s5mj83znbb2lg9x7bjgdrgj38vy2m"; depends=[RUnit foreach survival]; }; - permtest = derive { name="permtest"; version="1.2"; sha256="1sciyjs840h004zg8bwclq0j0n22anvjvx3fz62y4dzblrynhrci"; depends=[]; }; - permute = derive { name="permute"; version="0.8-3"; sha256="0zc3b3cl7q7y9pglc690ldg6p7bl7d1h7xkwnqqmvrpn7cq29rdb"; depends=[]; }; - PERregress = derive { name="PERregress"; version="1.0-8"; sha256="1rhridhfgvrz14h61psfyr5ll13fvxj4b9fwrnlnc6lyqi01wjlc"; depends=[]; }; - perry = derive { name="perry"; version="0.2.0"; sha256="1lfmcq2xsxmfs7cxvhgxcsggslgjicbaks4wcjw1yjh67n559j46"; depends=[ggplot2 robustbase]; }; - persiandictionary = derive { name="persiandictionary"; version="1.0"; sha256="0rgi36ngpiax3p5zk4cdgf3463vgx7zg5wxscs2j7834yh37jwax"; depends=[]; }; - perturb = derive { name="perturb"; version="2.05"; sha256="18ydmmp8aq4rf9834dmsr4fr9r07zyn97v8a1jqz3g9njza983la"; depends=[]; }; - pesticides = derive { name="pesticides"; version="0.1"; sha256="1w180hqqav0mh9sr9djj94sf55fzh4r373a7h08a2nz9nyjpq09w"; depends=[]; }; - PET = derive { name="PET"; version="0.4.9"; sha256="1ijg6mfh3xrc1gjh6a4nq64psk9yh16yc8nfp7c9837xbjigqq7f"; depends=[adimpro]; }; - PF = derive { name="PF"; version="9.5"; sha256="1y99brdabj78s5kxyv0136s40kaaj3zya9lk4qd0kqk83z2gdawp"; depends=[xtable RColorBrewer gdata]; }; - pfa = derive { name="pfa"; version="1.0"; sha256="116mpfdmfyd0p5j33rjw1xwxyyaccagbrpw7jbh4x996s057mql4"; depends=[lars POET quantreg]; }; - pgam = derive { name="pgam"; version="0.4.12"; sha256="0vhac2mysd053bswy3xwpiz0q0qh260hziw6bygpf83vkj94qf2v"; depends=[]; }; - pgirmess = derive { name="pgirmess"; version="1.5.9"; sha256="1n58r5ghd2ppnid6787gd1n18f23pf0fk7yr3vagcqpzv4pk0wic"; depends=[boot nlme rgdal sp spdep splancs]; }; - pglm = derive { name="pglm"; version="0.1-2"; sha256="1arn2gf0bkg0s59a96hyhrm7adw66d33qs2al2s0ghln6fyk8674"; depends=[maxLik plm statmod]; }; - pGLS = derive { name="pGLS"; version="0.0-1"; sha256="1rlk8q09sikf4vpzsx0c7s6qqh2hxf8dy2bgcm4nnkbv2nfjz438"; depends=[MASS]; }; - PGM2 = derive { name="PGM2"; version="1.0"; sha256="18azh6k271p9dvc23q402pv7wrilr1yk02vqqy6qjppnvq6jxahg"; depends=[]; }; - pgmm = derive { name="pgmm"; version="1.1"; sha256="0ajdcnxxy18ifidid4xnq9a03bsrvcbh3dh2vhviggkhq8gji1dn"; depends=[]; }; - pgnorm = derive { name="pgnorm"; version="1.1"; sha256="0fxx9wvzinh17cxy74xms6dbabifav0wsi2cl0wdfykpbwalmszk"; depends=[]; }; - pgs = derive { name="pgs"; version="0.4-0"; sha256="1zf5sjn662sds3h06zk5p4g71qnpwp5yhw1dkjzs1rs48pxmagrx"; depends=[gsl R2Cuba]; }; - phalen = derive { name="phalen"; version="1.0"; sha256="0awj9a48dy0azkhqkkzf82q75hrsb2yw6dgbsvlsb0a71g4wyhlr"; depends=[sqldf]; }; - phangorn = derive { name="phangorn"; version="1.99-7"; sha256="1q6a6md52d2f9xlrs5wv9crncwxh9a4x6zfxmdbsvrlwmgsbzvcx"; depends=[ape quadprog igraph Matrix fastmatch]; }; - PharmPow = derive { name="PharmPow"; version="1.0"; sha256="0gabkd8p4zsig9p697lyk8m2jxb5abjk81rpzd5ih1yk1qanhsn5"; depends=[scatterplot3d]; }; - phaseR = derive { name="phaseR"; version="1.3"; sha256="1hwclb7lys00vc260y3z9428b5dgm7zq474i8yg0w07rxqriaq2h"; depends=[deSolve]; }; - PhaseType = derive { name="PhaseType"; version="0.1.3"; sha256="092dqyqfaxj8qpwxcjb5cayhnq597rfjz1xb93ps4nrczycqs0l6"; depends=[coda ggplot2 reshape]; }; - phcfM = derive { name="phcfM"; version="1.2"; sha256="0i1vr8rmq5zs34syz2vvy8c9603ifzr9s5v2izh1fh8xhzg7655x"; depends=[coda]; }; - pheatmap = derive { name="pheatmap"; version="0.7.7"; sha256="0zj6n6cjkim20apihl943rhzxlmkmpqwh00l6h2c8z04m3pv186v"; depends=[RColorBrewer]; }; - phenability = derive { name="phenability"; version="1.0"; sha256="19vxknc0v8vz5cd748fhsndsrpggzlsiims9j7p2s6jlankkgsz9"; depends=[calibrate]; }; - phenex = derive { name="phenex"; version="1.0-7"; sha256="0q563cv9lskikf3ls0idp56lirw9gxn71rgxp9xn8an05gwdg0xr"; depends=[]; }; - phenmod = derive { name="phenmod"; version="1.2-3"; sha256="0dxwx8c7zka29fq7svrvn8bghj8jh8grbrgsw4pvavx2439cldak"; depends=[gstat RColorBrewer lattice pheno]; }; - pheno = derive { name="pheno"; version="1.6"; sha256="0xdya1g1ap7h12c6zn3apbkxr725rjhcp4gbdchkvcnwz4y9vw8c"; depends=[nlme SparseM quantreg]; }; - pheno2geno = derive { name="pheno2geno"; version="1.2.1"; sha256="0rh4fzka453i5djsyv4c0z3x6d5r7fvyvxi6x1a1806nzy7w43hj"; depends=[qtl VGAM mixtools]; }; - phenology = derive { name="phenology"; version="3.69"; sha256="0xyd53w162b9f2k4wkrkhi2m7fwj30ii4xjlp7l5px352x1nhylv"; depends=[fields zoo coda shiny]; }; - PHeval = derive { name="PHeval"; version="0.5.1"; sha256="12vlfg2w27hc19f8dwvhl8r0xfwapp1r9bihq7ax3d9j7aayv217"; depends=[survival]; }; - phia = derive { name="phia"; version="0.1-5"; sha256="0vkl4ccsdx72dwis2959f6w9zg584wfkn58fh2slybdyg9p8886a"; depends=[car]; }; - 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]; }; - phonR = derive { name="phonR"; version="0.4-2"; sha256="15hi15minbd756vplmcyf0987ppanr44kds13nny0v1h5yyv8kyx"; depends=[]; }; - phonTools = derive { name="phonTools"; version="0.2-2.0"; sha256="1wd1a5506p3ny6vi9pq6yg9gbz082fxw4l3cxsplkdpqgkhryrww"; depends=[]; }; - phreeqc = derive { name="phreeqc"; version="1.0-8877"; sha256="0w529qpqrjcn619bqinkdd8f02vigiwy799h7i33p7iwbf15jvzj"; depends=[]; }; - phtt = derive { name="phtt"; version="3.1.1"; sha256="02fqg2djpvbm6id1dg8c8w1qccd2axxrhlfi4vrm8d1qcrbjkjm1"; depends=[pspline]; }; - PhViD = derive { name="PhViD"; version="1.0.6"; sha256="17mr8gj6ic4p0xvxiva046r1gmy9azvm1s95rinxqsdd7hiak72w"; depends=[MCMCpack]; }; - phyclust = derive { name="phyclust"; version="0.1-15"; sha256="1j643k0mjmswsvp9jyiawkjf2qhfrw6xf4s2viqv987zxif2kd7z"; depends=[ape]; }; - phyext = derive { name="phyext"; version="0.0.1"; sha256="07hmjgp4qb3x95rbgm83sh9zwhsxjl1v5rvs39m565sc0fax1qdi"; depends=[phylobase ape]; }; - phylin = derive { name="phylin"; version="1.0"; sha256="10pbs4adsyp43i89jb3xi0m55sl1w7ifmc98v74iq9p8xa15sdci"; depends=[]; }; - phylobase = derive { name="phylobase"; version="0.6.8"; sha256="0xj7x4cdfp0yadvjhdkw1ai3yd081ri4gpdg0n5g0z13cjaa6mjh"; depends=[ade4 ape Rcpp]; }; - phyloclim = derive { name="phyloclim"; version="0.9-4"; sha256="0ngg8x192lrhd75rr6qbh72pqijbrhrpizl27q0vr6hp7n9ch3zx"; depends=[ape raster]; }; - phyloland = derive { name="phyloland"; version="1.0"; sha256="0r6rpwcq13bxa6289bfj0a0is67a49nj5npi5381090iarkwfvs7"; depends=[ape gsubfn]; }; - phylolm = derive { name="phylolm"; version="2.1"; sha256="0g0s9n0899gbh5hhk469b3c1z8zhp9il50srnbvmfhql0cf1v22c"; depends=[ape]; }; - phylosim = derive { name="phylosim"; version="2.1.1"; sha256="0rrz5c7zl2hjalwm6m8pydikiwmiq2dybx2yhzp0ps2bcsn02lhn"; depends=[R_oo ape compoisson ggplot2 R_methodsS3]; }; - phylotools = derive { name="phylotools"; version="0.1.2"; sha256="19w7xzk6sk1g9br7vwv338nvszzh0lk5rdzf0khiywka31bbsjyb"; depends=[seqRFLP ape picante spaa fields]; }; - phyloTop = derive { name="phyloTop"; version="1.1.1"; sha256="046myyr01c4zc6sfy7r6p2vswkqqqd3w4k173gjbjazl1ims1sjs"; depends=[phylobase NHPoisson ape igraph]; }; - phyreg = derive { name="phyreg"; version="0.7"; sha256="0saynhq4yvd4x2xaljcsfmqk7da2jq3jqk26fm9qivg900z4kf35"; depends=[]; }; - PhysicalActivity = derive { name="PhysicalActivity"; version="0.1-1"; sha256="1aqyip7psf3pdrxkpidfldkk9naihvnc7s3n6w6vvr9h1l5mpmvc"; depends=[]; }; - phytools = derive { name="phytools"; version="0.4-21"; sha256="1mvksa62hanbnn7ndgpsgipl8ckdhnzvfsarpidpxzgsc7vwagz8"; depends=[ape maps animation clusterGeneration mnormt msm numDeriv phangorn plotrix scatterplot3d]; }; - pi0 = derive { name="pi0"; version="1.3-250"; sha256="1561zvf1hcd05iqy245c0z23mi8ypk6q3lkfldcr55cs67w4lmz6"; depends=[LowRankQP Matrix numDeriv limSolve rgl scatterplot3d Iso quadprog kernlab]; }; - picante = derive { name="picante"; version="1.6-2"; sha256="1zxpd8kh3ay6f3gdqkij1a6vnkr98dc1jib2r6br2kjyzshabcsd"; depends=[ape vegan nlme]; }; - PIGE = derive { name="PIGE"; version="0.9"; sha256="1x8ml25mm69dvlszm9p2ycph92nxcsgd52ydj7ha0dwrrpcv2law"; depends=[snowfall ARTP xtable survival]; }; - PIGShift = derive { name="PIGShift"; version="1.0.0"; sha256="15cgpi7j5cs4aqdq5cy7535x8ar916d9hd109kc01njrwxp1xr96"; depends=[ape mvtnorm]; }; - PIN = derive { name="PIN"; version="0.8"; sha256="1hymf5106zxgbg8dki9jb7gy4vh2mjwbvzh0n2d7qkr6rm8lpmag"; depends=[]; }; - pipeR = derive { name="pipeR"; version="0.4"; sha256="1lvi2pxb5jl874hgqp7f4vbkr306slg0lrsmbicvwg569dz5262f"; depends=[]; }; - PIPS = derive { name="PIPS"; version="1.0.1"; sha256="1c5v3s6xys9p1q32k6mpsffhi9gwsq951rh12hs76dmak862yspc"; depends=[]; }; - pitchRx = derive { name="pitchRx"; version="1.5"; sha256="17g7kx6gjaknb14h3l76zr128s6skgvj2i1pg83sqj5ipj55qzhr"; depends=[ggplot2 XML2R plyr MASS hexbin mgcv]; }; - PivotalR = derive { name="PivotalR"; version="0.1.16.17"; sha256="079s4cs6awc8rbr82b1fm0096j34lbmzgnczrfclxnb2rwmn8biv"; depends=[Matrix]; }; - pixmap = derive { name="pixmap"; version="0.4-11"; sha256="04klxp6jndw1bp6z40v20fbmdmdpfca2g0czmmmgbkark9s1183g"; depends=[]; }; - PK = derive { name="PK"; version="1.3-2"; sha256="0162ri9wlm9inryljal48av8yxb326na94kckkigsrklfxb3wkp2"; depends=[]; }; - PKfit = derive { name="PKfit"; version="1.2.2"; sha256="04gix9yyzfsam2zql5q9rr45zzpdz5y7i6w1lf6rqf4fgnjwfjqs"; depends=[deSolve minpack_lm]; }; - pkgKitten = derive { name="pkgKitten"; version="0.1.0"; sha256="17gf3yiy7hq6f53sjxajnf87cg6c7ialiyfw61bj4fjbhskw92ij"; depends=[]; }; - pkgmaker = derive { name="pkgmaker"; version="0.22"; sha256="0vrqnd3kg6liqvpbd969jjsdx0f0rvmmxgdbwwrp6xfmdg0pib8r"; depends=[registry codetools digest stringr xtable]; }; - PKgraph = derive { name="PKgraph"; version="1.7"; sha256="0g36cdv5cblqx69j48irxjc5nlw2cl3p714mlsblnd3362z1brwn"; depends=[RGtk2 gWidgetsRGtk2 cairoDevice lattice rggobi ggplot2 proto RGtk2 gWidgetsRGtk2]; }; - pkgutils = derive { name="pkgutils"; version="0.6.0"; sha256="0pi1xaamirsv1bwlwcvyd1hvdgbjbdmw3vg3krawsb34mynbrcff"; depends=[]; }; - PKI = derive { name="PKI"; version="0.1-1"; sha256="1m4q43yq8ddig15k0j9yg9hq4yz3yplqp68zl3p9g2shkam60p6w"; depends=[base64enc]; }; - PKmodelFinder = derive { name="PKmodelFinder"; version="1.1"; sha256="0v5l8j4yq6fv4cgx5psld6klwy6kjwcqg1vhf9r4i8qa12vpa1yh"; depends=[gWidgets tkrplot RGtk2 gWidgetsRGtk2 cairoDevice numDeriv]; }; - PKPDmodels = derive { name="PKPDmodels"; version="0.3.2"; sha256="1h893civ77ahbgjnc6kq3l7rszmqmx9dlxwavldigpq3r79vd86k"; depends=[]; }; - PKreport = derive { name="PKreport"; version="1.5"; sha256="16hss9migbxpnw5f9gcw1nlvb81iyji00ylx5wd6kdwhz0ids9wj"; depends=[lattice ggplot2]; }; - pks = derive { name="pks"; version="0.3-0"; sha256="0lvj5kfjf8wikszz1dipwr1fw9xbhy3nx0ksqz4ln240k7fn5kcj"; depends=[sets]; }; - PKtools = derive { name="PKtools"; version="1.5-0"; sha256="0za6qgl9q9y4j87kfhvanpc9mfckzww6q2kjz7divbv8ygn5cd1m"; depends=[lattice nlme R2HTML xtable]; }; - plan = derive { name="plan"; version="0.4-2"; sha256="0vwiv8gcjdbnsxd8zqf0j1yh6gvbzm0b5kr7m47ha9z64d7wxch6"; depends=[]; }; - planar = derive { name="planar"; version="1.5"; sha256="1ph3q985xw1sg9cs5k1cqpr46f0svycdc1dg3pqmdrzqdi8a3gyx"; depends=[dielectric Rcpp RcppArmadillo statmod cubature reshape2 plyr]; }; - planor = derive { name="planor"; version="0.2-0"; sha256="0mvlkrggwgrc9fmp935kihj2v7gfnghw7smpkbb3pbrrv9zhjlgi"; depends=[conf_design]; }; - PlayerRatings = derive { name="PlayerRatings"; version="1.0-0"; sha256="0hjb05bdha00ggcpp3n4f86dxjlhzmlpwgsbbx3mhyv3qq1g32ky"; depends=[]; }; - playitbyr = derive { name="playitbyr"; version="0.2-1"; sha256="0pi0kji32ha6csff5w2xl8f76clrxlkwws60lzqzc83avrb0930n"; depends=[csound]; }; - playwith = derive { name="playwith"; version="0.9-54"; sha256="1zmm8sskchim3ba3l0zqfvxnrqfmiv94a8l6slcf3if3cf9kkzal"; depends=[lattice cairoDevice gWidgetsRGtk2 RGtk2 gWidgets gridBase]; }; - plfm = derive { name="plfm"; version="1.1.1"; sha256="0vsbva2clkjn8ddinmihq1gzd8g8yjiwd11rl7xzbyabjxkp95n1"; depends=[sfsmisc abind]; }; - plgp = derive { name="plgp"; version="1.1-5"; sha256="04kxiixm6p9s42fs775lrh8112v2m7akjp78r46l0rd8fzp3zyiq"; depends=[mvtnorm tgp]; }; - plink = derive { name="plink"; version="1.3-1"; sha256="1g8n4fy7yx3386kgvc0kgh8gd390yl4fxs09whdl1mzz5q9sx4wp"; depends=[lattice MASS statmod]; }; - PLIS = derive { name="PLIS"; version="1.1"; sha256="0b81s7677wglqvv1b5lx8k2iaks09kz0wrl07245a7j2pk9nxv7p"; depends=[]; }; - plm = derive { name="plm"; version="1.4-0"; sha256="13y9s7gyrgqmnzafhn4c1zkz6gdawc8nr5nbrx0pn2mbw3fqfrjh"; depends=[Formula MASS bdsmatrix zoo nlme sandwich]; }; - plmDE = derive { name="plmDE"; version="1.0"; sha256="19xxi0zzpxcrsdrbs0hiwqgnv2aaw1q3mi586wv27zz6lfqcr9lr"; depends=[MASS R_oo]; }; - plmm = derive { name="plmm"; version="0.1-1"; sha256="1dfxd1mqqjy2mf7qc6mh4wx5ya9q8fkqgrf01apisb66xxx5zya7"; depends=[sm Formula nlme]; }; - pln = derive { name="pln"; version="0.2-1"; sha256="09zg7zwmmqpjr1j59lqsjf4blrkya9wfwddgzfm9rr5jxrzvqcv8"; depends=[]; }; - plot2groups = derive { name="plot2groups"; version="0.10"; sha256="00mp82vvx6inlc2zj2cqqnzyglrm9x9im2vrqqk8j2jn0hbgfymy"; depends=[ggplot2]; }; - plot3D = derive { name="plot3D"; version="1.0-1"; sha256="1zvvsl94azz3252c8f485zhzd4x23wfj08x85vq873fj36p82aaf"; depends=[misc3d]; }; - plot3Drgl = derive { name="plot3Drgl"; version="1.0"; sha256="109vsivif4hmw2hk3hi4y703d3snzxbr9pzhn1846imdclkl12yg"; depends=[rgl plot3D]; }; - plotGoogleMaps = derive { name="plotGoogleMaps"; version="2.1"; sha256="1hymq35va75grxsjhd8sk7x4xfqsyfk5r5i1l3drwrajl1sx8b1a"; depends=[sp spacetime rgdal maptools lattice raster]; }; - plotKML = derive { name="plotKML"; version="0.4-5"; sha256="1w8dxwx57a9lis775xis44c0s1qfzc0h9b43wygcbzndkcn1dsh7"; depends=[XML sp raster rgdal spacetime colorspace plotrix dismo aqp pixmap plyr stringr colorRamps scales gstat zoo RColorBrewer RSAGA classInt]; }; - plotMCMC = derive { name="plotMCMC"; version="2.0-0"; sha256="0i4kcx6cpqjd6i16w3i8s34siw44qigca2jbk98b9ligbi65qnqb"; depends=[coda gplots lattice]; }; - plotmo = derive { name="plotmo"; version="1.3-3"; sha256="0xr70di5dfxwy69y60vr88wbrhbxkm55z04qxbvbdf5b04l9lw77"; depends=[]; }; - plotpc = derive { name="plotpc"; version="1.0-2"; sha256="0z73wyhdnz5qv2jy8c0sby6sbjr1q9026h0bk2ykjkjvckggnabc"; depends=[]; }; - PlotRegionHighlighter = derive { name="PlotRegionHighlighter"; version="1.0"; sha256="0n1nkfr3sdaq6f5p9kgx4slrsvhpdbax3rinrkfkb1vnjj4swj77"; depends=[]; }; - plotrix = derive { name="plotrix"; version="3.5-7"; sha256="0c9airkyf7qj1bmjdkwjk0k1qwspsaw4rkd4bf2lfb8m67jvzk6n"; depends=[]; }; - plotSEMM = derive { name="plotSEMM"; version="2.0"; sha256="0n30m1nz9fnilbgxg5jcmx2bsscdvz5mkjkyrgx7yr3alazkaimd"; depends=[plyr shiny MplusAutomation Rcpp plotrix]; }; - plRasch = derive { name="plRasch"; version="1.0"; sha256="1rnpvxw6pzl5f6zp4xl2wfndgvqz5l3kiv9sh4cpvhga0gl8zjaw"; depends=[survival]; }; - PLRModels = derive { name="PLRModels"; version="1.1"; sha256="0dwnzfw7a1cxz9s00kxf19jmjsc8cy6cc9q2mjqf8z7690wrg7hb"; depends=[]; }; - pls = derive { name="pls"; version="2.4-3"; sha256="114ka4766x8fx0zvvr7cylky1jsy542nj6s7sb2dwv8zjhbclkhn"; depends=[]; }; - plsdepot = derive { name="plsdepot"; version="0.1.17"; sha256="1i00wxr451xpfy6dnvcm11aqf9106jsh5hj7gpds22ysgm4iq5w4"; depends=[]; }; - plsdof = derive { name="plsdof"; version="0.2-6"; sha256="1gdc6ck2l8k4i275lj1kvpqbzgm5a5db21zc828hz56aqfj28fm9"; depends=[MASS]; }; - plsgenomics = derive { name="plsgenomics"; version="1.2-6"; sha256="0f0pns20hd8hfc3v9m9vb8sng8qib6cry1k49nqs9gn09hhh26w9"; depends=[MASS]; }; - plspm = derive { name="plspm"; version="0.4.1"; sha256="00ibz69vhf0x3c73khkg57mzw49c3vq20yiqdqm9cpkdr9fczn2n"; depends=[amap diagram tester turner]; }; - plsRbeta = derive { name="plsRbeta"; version="0.1.8"; sha256="1gfwl659pmwjkif8n1vz7ljij3r8akzrlf389qwmhy57d6lhyb6w"; depends=[mvtnorm boot Formula plsdof MASS plsRglm betareg]; }; - plsRcox = derive { name="plsRcox"; version="1.7.0"; sha256="08cnxbqgxwmvbyhp8hwa7b30bznxvj7qcpq9p8jgcfnrxwslv2k6"; depends=[survival plsRglm lars pls kernlab mixOmics risksetROC survAUC rms]; }; - plsRglm = derive { name="plsRglm"; version="1.1.0"; sha256="0bh88rdlk09hh2zaiqgpv05d5kn656ckn3g0wfzhkb445xb84pqq"; depends=[mvtnorm boot bipartite]; }; - plugdensity = derive { name="plugdensity"; version="0.8-3"; sha256="1jdmq4kbs8yzgkf9f5dc7c8c52ia68fgavw7nsnc2hnz5ylw1qy9"; depends=[]; }; - plumbr = derive { name="plumbr"; version="0.6.9"; sha256="1avbclblqfy57pd72ximvj3zq92q1w8vszvyf6fw75j5rfwdaibk"; depends=[objectSignals]; }; - plus = derive { name="plus"; version="1.0"; sha256="1l7lvnq7vahj8m7knmr4q3wj00ar7iq89j45a2dqn2bh0qyj68ls"; depends=[]; }; - plusser = derive { name="plusser"; version="0.4-0"; sha256="1g100dh8cvn9q09j0jbkw4xmwjdp1lm4651369975fm99nrlp1j9"; depends=[RCurl RJSONIO lubridate plyr]; }; - plyr = derive { name="plyr"; version="1.8.1"; sha256="0f2an3pr7flpng9y9mmrmyh08g3nivi6gdkfnw54arn0wxhkqfcm"; depends=[Rcpp]; }; - PMA = derive { name="PMA"; version="1.0.9"; sha256="11qwgw4sgzl3xhrm468bsza83h3mfn89157nfwnrassl7qr42xkq"; depends=[plyr]; }; - pmcgd = derive { name="pmcgd"; version="1.1"; sha256="1pybzvyjmzpcnxrjsas06diy3x83i1r5491s6ccyr63l56hs55d5"; depends=[mixture mnormt]; }; - pmclust = derive { name="pmclust"; version="0.1-6"; sha256="05zjx4psvk5zjmr0iwwwig990g6h04ajn5wi0xi8bqv046r47q3h"; depends=[rlecuyer pbdMPI MASS]; }; - PMCMR = derive { name="PMCMR"; version="1.0"; sha256="07k98zp4s65vx7ybj75b0i1jhlnvfspwjqh10nxdn0zmixw9nywj"; depends=[]; }; - pmg = derive { name="pmg"; version="0.9-42"; sha256="16jkkhpjiwpk5gszr7fc133l3y50dfwqxb45flzihxvp1x42d70y"; depends=[lattice MASS proto foreign gWidgets gWidgetsRGtk2]; }; - pmlr = derive { name="pmlr"; version="1.0"; sha256="1z3hbw4wabpai1q8kbn77nzxqziag8y04cidlfiw7z969s4pkmgl"; depends=[]; }; - pmml = derive { name="pmml"; version="1.4.2"; sha256="0588sph67zs58knf4g3fd7c84i2yag81igr882jgbaxhfhxrpk6n"; depends=[XML survival]; }; - pmmlTransformations = derive { name="pmmlTransformations"; version="1.2.2"; sha256="1p31lakhqwk0qhb565j2sjcfsjsx0i5v8kj8779ryjyvy7717m6m"; depends=[]; }; - pmr = derive { name="pmr"; version="1.2.4"; sha256="15yrh533rj5i728nvcpjj3m5wa3jbspnfj941px3mf11h14npxpp"; depends=[]; }; - pnmtrem = derive { name="pnmtrem"; version="1.3"; sha256="0053gg368sdpcw2qzydpq0c5v2cxdlwgf5k68cbw0yx41csjgvz0"; depends=[MASS]; }; - pnn = derive { name="pnn"; version="1.0.1"; sha256="1s6ib60sbdas4720hrsr5lsszsa474kfblqcalsb56c84gkl42ka"; depends=[]; }; - pocrm = derive { name="pocrm"; version="0.8"; sha256="04i9slfb9hmhhhq6m2iz7p3cm3v1v6nsvnr117dp55cxanfymd6f"; depends=[dfcrm nnet]; }; - POET = derive { name="POET"; version="1.0"; sha256="0drn9530b14hindim8si1828yabyqc85b0qi900ahi5rv1p38v82"; depends=[]; }; - poibin = derive { name="poibin"; version="1.2"; sha256="12dm1kdalbqy8k7dfldf89v6zw6nd0f73gcdx32xbmry2l2976sa"; depends=[]; }; - PoiClaClu = derive { name="PoiClaClu"; version="1.0.2"; sha256="1j593sc344h9iy7if1ppihx2qd73dv32d77d8ckac43i7b2lig24"; depends=[]; }; - poilog = derive { name="poilog"; version="0.4"; sha256="0bg03rd5rn4rbdpiv87i8lamhs5m7n7cj8qf48wpnirg6jpdxggs"; depends=[]; }; - PoisNor = derive { name="PoisNor"; version="1.0"; sha256="147ma6qg6nwxzp022jm5mpijhg3jz489qclr9g2mli5mhgm31f8j"; depends=[mvtnorm corpcor Matrix]; }; - poisson_glm_mix = derive { name="poisson.glm.mix"; version="1.2"; sha256="0328m279jfa1fasi9ha304k4wcybzr7hldww7wn0cl7anfxykbv8"; depends=[]; }; - PoissonSeq = derive { name="PoissonSeq"; version="1.1.2"; sha256="1hhx0gv06cp6hm6h36mqy411qn9x15y45crpzbyf8crfs85c6gbg"; depends=[combinat]; }; - poistweedie = derive { name="poistweedie"; version="1.0"; sha256="18992fafypds3qsb52c09fasm3hzlyh5zya6cw32wnhipmda643m"; depends=[]; }; - poLCA = derive { name="poLCA"; version="1.4.1"; sha256="0bknnndcxsnlq6z9k1vbhqiib1mlzlx4badz85kc7a3xbrdrfs9f"; depends=[scatterplot3d MASS]; }; - pollstR = derive { name="pollstR"; version="1.0.2"; sha256="1nnd62m0241ig725dx27f6msbj0nhgh149rij4rjy79w5w1zsa02"; depends=[httr plyr jsonlite]; }; - polspline = derive { name="polspline"; version="1.1.9"; sha256="1n08dhwpf53slk1zib491kii54x9h16g3jgr2kxxpyc5xfv4yj26"; depends=[]; }; - polyaAeppli = derive { name="polyaAeppli"; version="2.0"; sha256="0kyz3ap92xz7aqyviyrpggfmicy1gybrx7y19djsmixcwz53zqch"; depends=[]; }; - polyapost = derive { name="polyapost"; version="1.1-6"; sha256="1wk85nl2p9plnaavjdr4bqxxhjc84ynv53bh2v1rmq87jymw40b1"; depends=[boot]; }; - polyclip = derive { name="polyclip"; version="1.3-0"; sha256="05bbj4hy4h1hcb4pzg1mjp8k7k91kqq5rg2x0ns4hcs1h4zrspds"; depends=[]; }; - polycor = derive { name="polycor"; version="0.7-8"; sha256="0hvww5grl68dff23069smfk3isysyi5n2jm4qmaynrk0m3yvhxwn"; depends=[mvtnorm sfsmisc]; }; - polyCub = derive { name="polyCub"; version="0.5-0"; sha256="0ry7kfy99nzwpbs8ac138b05rs36n1whdc0gcvgdb1x76xsa36lr"; depends=[sp spatstat]; }; - polynom = derive { name="polynom"; version="1.3-8"; sha256="05lng88c8cwj65cav31hsrca9nbrqn5rmcz79b17issyk2j0g86p"; depends=[]; }; - PolynomF = derive { name="PolynomF"; version="0.94"; sha256="006ds50ivq91v2jyhgpm5rfaipxbzsnljrki6fjplcw07g0frz71"; depends=[]; }; - PolyPatEx = derive { name="PolyPatEx"; version="0.9"; sha256="1y3jsy095kfp9ycjnj467s1y5abba7jkm83x2cajp5g2jdgp7cf6"; depends=[gtools]; }; - polysat = derive { name="polysat"; version="1.3-2"; sha256="1h1ixxa4z6qr3ixpphy70axd3kf4gnwiw1i22qzm4m06h4bdchva"; depends=[combinat]; }; - 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]; }; - polytomous = derive { name="polytomous"; version="0.1.6"; sha256="137qcnncih1lm2wshwrznlcr0k552n0sqhiy73iwis59lg854caa"; depends=[MASS Hmisc lme4]; }; - polywog = derive { name="polywog"; version="0.4-0"; sha256="0wl9br0g4kgi3nz2fq28nsk6fw0ll0y715v4vz8lv3pvfwc7518j"; depends=[miscTools foreach Formula glmnet iterators Matrix ncvreg Rcpp stringr]; }; - pom = derive { name="pom"; version="1.1"; sha256="02jv19apn0kmp1ric2cxajlaad2fmsz4nm4izd2c3691vzas7l83"; depends=[matrixcalc]; }; - Pomic = derive { name="Pomic"; version="1.0.2"; sha256="1i3zsz7gc4n4vid3yi3srrv04qk1678wqyyw303pfibiyfd4m80q"; depends=[]; }; - PoMoS = derive { name="PoMoS"; version="1.1.1"; sha256="0j3iw6bcsr3rzwh15afcw3rglddq9bj7470xpnlpfpmd9nk0s18d"; depends=[RGtk2 cairoDevice igraph]; }; - pomp = derive { name="pomp"; version="0.53-5"; sha256="1bfb2b1fdj673b43jnq9pzh36h1hfb8dsarf1dq6pwain7dnqjyp"; depends=[subplex nloptr mvtnorm deSolve coda]; }; - pooh = derive { name="pooh"; version="0.2-1"; sha256="1h8b5zwawhvq6h29dfznnhdb33al06hkvy05dphsmycd1lsha0jm"; depends=[]; }; - popbio = derive { name="popbio"; version="2.4"; sha256="12hvxkgbr6snypplxv404sj0ass6ab9i969bb00ipy10gny1w4ww"; depends=[quadprog]; }; - popdemo = derive { name="popdemo"; version="0.1-4"; sha256="0syhmm8fnxbsdzj75y7dpahmpf453a6gwp3yljkvmfl0bfv1g1ng"; depends=[expm]; }; - PopED = derive { name="PopED"; version="0.1.1"; sha256="0p5wiwl1d7ywjpq3zj5mkk12hqhi0xgcwf9sr3pdqyrczhl825d3"; depends=[ggplot2 MASS mvtnorm nlme]; }; - popgen = derive { name="popgen"; version="1.0-3"; sha256="00rgfwmmiharfxqlpy21n3jbxwr5whzdg8psqylkjf83ls2myqzm"; depends=[cluster]; }; - PopGenKit = derive { name="PopGenKit"; version="1.0"; sha256="0l4mbm0cyppgvcw2cbimrv29aiciyj00k8wfwcj5zr8sh7fgfhs4"; depends=[]; }; - PopGenome = derive { name="PopGenome"; version="2.0.8"; sha256="07s4b8v00m2fsja0ynri67ns240kskw7f0snzfcs94p1kaalj4jx"; depends=[ff]; }; - PopGenReport = derive { name="PopGenReport"; version="2.0"; sha256="1bi7a2dbqr73andgzmq00x5hkbi06ylmhyfn12b4h2260v6w5mwk"; depends=[knitr adegenet raster lattice RgoogleMaps gap calibrate xtable plyr dismo reshape ggplot2 R_utils ade4 pegas genetics rgdal gdistance vegan sp mmod]; }; - popgraph = derive { name="popgraph"; version="1.4"; sha256="1z6w6vj3vl2w10hvzwmkw4d475bqcd6ys92xnn445ag6vpq0cvxq"; depends=[ggplot2 igraph MASS sp Matrix sampling]; }; - popKorn = derive { name="popKorn"; version="0.3-0"; sha256="1zcl6ms7ghbcjyjgfg35h37ma8nspg15rk2ik82yalqlzxjf7kxw"; depends=[boot]; }; - poppr = derive { name="poppr"; version="1.1.2"; sha256="0qzqyrx8jqz9xhwq6v2ic2jm82g3csg6cs31g7hailx559axxi8i"; depends=[adegenet vegan ggplot2 phangorn ape igraph ade4 pegas reshape2]; }; - popRange = derive { name="popRange"; version="1.1.1"; sha256="1n8swfhnxk757n6nxsmn8dzx2h01xdr2s64wy2m4xq7wpdp9lajq"; depends=[]; }; - popReconstruct = derive { name="popReconstruct"; version="1.0-3"; sha256="1m4gj43bzsz8y4jay0bc5mvdfwqx5agha4l2r0svm6qg8cfl4lza"; depends=[coda]; }; - popsom = derive { name="popsom"; version="2.3"; sha256="0hdg1nx8mlpqw9aj2q08sb20frsc5jnbvqpfalf5kyvlygnhxdlc"; depends=[som fields]; }; - portes = derive { name="portes"; version="2.1-3"; sha256="0nqh6aync5igmvg7nr5inkv2cwgzd0zi6ky0vvrc3abchqsjm2ck"; depends=[]; }; - portfolio = derive { name="portfolio"; version="0.4-6"; sha256="0kaaincyzc2f4dm7n08y3vs1yd1r7pd997gf2wvfjydw7wkc5pin"; depends=[lattice nlme]; }; - portfolioSim = derive { name="portfolioSim"; version="0.2-7"; sha256="1vf46882ys06ia6gfiibxx1b1g81xrg0zzman9hvsj4iky3pwbar"; depends=[lattice portfolio]; }; - PortRisk = derive { name="PortRisk"; version="1.0"; sha256="0vyzvi56lmdlhxpbxcxcfqa8271jv2l45w7x1kzzwl6q0wm4bjln"; depends=[zoo]; }; - postCP = derive { name="postCP"; version="1.7.2"; sha256="1zi3ns202rsfbjkblsmk3vzlygixgm81cp9kga64q1xgk40vq657"; depends=[MASS Segmentor3IsBack]; }; - potts = derive { name="potts"; version="0.5-2"; sha256="1q4kvknxkrd8qbv8l3vmwrppgzq5bsysnqgm029lx7iys73x4fck"; depends=[]; }; - PottsUtils = derive { name="PottsUtils"; version="0.3-2"; sha256="05ds0a7jq63zxr3jh66a0df0idzhis76qv6inydsjk2majadj3zv"; depends=[miscF]; }; - powell = derive { name="powell"; version="1.0-0"; sha256="160i4ki3ymvq08szaxshqlz7w063493j5zqvnw6cgjmxs7y0vj8y"; depends=[]; }; - PoweR = derive { name="PoweR"; version="1.0.1"; sha256="1m6y7f89kjhdmrdw1xb59cly0xjz79b1krhywkg9m7z73k1yx9h9"; depends=[]; }; - Power2Stage = derive { name="Power2Stage"; version="0.1-4"; sha256="1gdkrvmrss5x6m33y6lk8d397q64jj4d72hxvs9yj1wwngd635ah"; depends=[PowerTOST]; }; - powerAnalysis = derive { name="powerAnalysis"; version="0.2"; sha256="15ff3wnn37sjkiyycgh16g7gwl3l321fbw12kv621dad5bki14jl"; depends=[]; }; - powerGWASinteraction = derive { name="powerGWASinteraction"; version="1.0.0"; sha256="0ij843g95ypxc7cfhvi3pm57b5ry1xr2x0f944l9ncyy8d15jxc4"; depends=[]; }; - poweRlaw = derive { name="poweRlaw"; version="0.20.5"; sha256="03s4kn01q4v2wx2y5pglqycjr37076g9alp9kz915h0ckfv1i42f"; depends=[VGAM]; }; - powerMediation = derive { name="powerMediation"; version="0.1.7"; sha256="1nysqyz5rbpn25k1pi9g7gwiarm8ncyw5xxal972wv8c70lsn4ir"; depends=[]; }; - powerpkg = derive { name="powerpkg"; version="1.5"; sha256="0mbk2fda2fvyp1h5lk5b1fg398xybbjv0z6kdx7w7xj345misf7l"; depends=[]; }; - powerSurvEpi = derive { name="powerSurvEpi"; version="0.0.6"; sha256="1jsbrj35m296mkk47zcpb2haain6bf23k0xzphnb4sq8f06cmq1p"; depends=[survival]; }; - PowerTOST = derive { name="PowerTOST"; version="1.1-13"; sha256="0w535rnwsdjad7fhrm0bxqkbci4y5qdgdy8rif3y5s5qkjhlqxnc"; depends=[mvtnorm]; }; - PP = derive { name="PP"; version="0.2-1"; sha256="0qrmlfjfsaj1jxbpzzbh1lnsw5c9b631b7q5jxrzvg675m0wy2mr"; depends=[]; }; - ppcor = derive { name="ppcor"; version="1.0"; sha256="18l5adjysack86ws61xh89z5xfr83v932a0pn6ad8i8py3nd85fj"; depends=[]; }; - ppiPre = derive { name="ppiPre"; version="1.5"; sha256="1d1567h2j0y4f8jkaiszxkq13xkxq9jb3bf0rmjmy1z263nnl4a1"; depends=[igraph e1071]; }; - ppls = derive { name="ppls"; version="1.6-0"; sha256="0jd80sfsg7j2540sz5v9n43pni9713sb1nvb5h1azbr3mnwqsri5"; depends=[MASS]; }; - ppmlasso = derive { name="ppmlasso"; version="1.0"; sha256="0f5wld45r874rmi5bvhiqhpi5jqgrg5lwqazfhkv1md0ac2klkqj"; depends=[spatstat]; }; - pps = derive { name="pps"; version="0.94"; sha256="0sirxpagqc2ghc01zc6q4dk691six9wkgknfbwaqxbxvda3hcmyq"; depends=[]; }; - ppstat = derive { name="ppstat"; version="0.9"; sha256="1mnlvdzvayz30sbiq95wm0ywmzc168lqx0l33397jadiq5zbsbkn"; depends=[processdata reshape2 ggplot2 Matrix]; }; - PPtree = derive { name="PPtree"; version="2.3.0"; sha256="002qjdx52r2h90wzrf2r3kz8fv3nwx08qbp909whn6r4pbdl532v"; depends=[MASS penalizedLDA]; }; - pqantimalarials = derive { name="pqantimalarials"; version="0.1"; sha256="0q7knygxcv9s7lnpzn165dqvgff6zsz25ld44rh4fddgfzlwynn8"; depends=[shiny rms reshape2 RColorBrewer plyr]; }; - prabclus = derive { name="prabclus"; version="2.2-4"; sha256="1p4hhs002cyrmnmfc2s11zia2jcnafidmy41dl3bd8mqyq3d193z"; depends=[MASS mclust]; }; - pracma = derive { name="pracma"; version="1.7.0"; sha256="1hi71m4hkyj8pvl01xl9675pza983ikigxp13i6i08bbpxsaclsm"; depends=[]; }; - PracTools = derive { name="PracTools"; version="0.0-2"; sha256="1bigir9fv6qrj3r8bfff6zyvxi10c0qh56kvhqsclvwyg3hfk5yz"; depends=[]; }; - pragma = derive { name="pragma"; version="0.1.3"; sha256="1n30a346pph4d8cj4p4qx2l6fnwhkxa8yxdisx47pix376ljpjfx"; depends=[]; }; - praktikum = derive { name="praktikum"; version="0.1"; sha256="0kkydgglvqw371fxh46fi86fmdndhwq1n8qj0ynbh2gz1cn86aw1"; depends=[]; }; - predfinitepop = derive { name="predfinitepop"; version="1.0"; sha256="1x5ri1kvd1rd9bjp2ygqwl68yp6hyb6aly22bs5kdwv2vn9nlq9w"; depends=[]; }; - PredictABEL = derive { name="PredictABEL"; version="1.2-1"; sha256="18fmafl1d4nwf7mya9gh1rlv5936zzr2jm3fwn5r2m5fc034qqjx"; depends=[Hmisc ROCR epitools PBSmodelling]; }; - PredictiveRegression = derive { name="PredictiveRegression"; version="0.1-4"; sha256="15vkisj3q4hinc3d537s8inhj3wk62q67qhy050xmp9j563ainmd"; depends=[]; }; - predictmeans = derive { name="predictmeans"; version="0.97"; sha256="1l5b85rw96mh3xvcv5iiiy7zh8s0hx0bw037a3p49vbsw3k9p5vb"; depends=[lme4 nlme ggplot2 lattice pbkrtest plyr]; }; - predmixcor = derive { name="predmixcor"; version="1.1-1"; sha256="0v99as0dzn0lqnbbzycq9j885rgsa1cy4qgbya37bbjd01b3pykd"; depends=[]; }; - prefmod = derive { name="prefmod"; version="0.8-32"; sha256="0v5r195gzbfi6jbqz8r1x2fzj3anqxf4hxaxb9krm9rkwgphrwpi"; depends=[gnm colorspace]; }; - PReMiuM = derive { name="PReMiuM"; version="3.0.28"; sha256="0cs18ig3ykd1s1hll7bq8ii1pbw4lr9ij8qyg7jh359k9vb6m5gy"; depends=[Rcpp ggplot2 cluster plotrix]; }; - PresenceAbsence = derive { name="PresenceAbsence"; version="1.1.9"; sha256="17qn4ggkr5aqml45nkihj1j35y479ywkm1xcfkb2g8ky66jb0c0s"; depends=[]; }; - PResiduals = derive { name="PResiduals"; version="0.1-0"; sha256="0g3div2i5sr4fbc7l6zzvaw72nbs80lkc1yv7p32w6g2cmyjhy7c"; depends=[Formula]; }; - prettyGraphs = derive { name="prettyGraphs"; version="2.1.5"; sha256="19jag5cymancxy5lvkj5mkhdbxr37pciqj4vdvmxr82mvw3d75m4"; depends=[]; }; - prettyR = derive { name="prettyR"; version="2.0-8"; sha256="1wz802mmsbm4011jskdvifm9p5vqjiq7x2cmxyvc6fi2g8s224rw"; depends=[]; }; - prevalence = derive { name="prevalence"; version="0.2.0"; sha256="0yab4ig0hwyr10fgcw50hs63hbdpch83500xws05h1srsd2kiq8f"; depends=[rjags coda]; }; - prevR = derive { name="prevR"; version="2.9"; sha256="1h0v52pwhrb9ib61wjqdcand5prc1h205nd2rl5qiiqcnq4xn582"; depends=[sp gstat GenKern rgdal fields]; }; - prim = derive { name="prim"; version="1.0.14"; sha256="0ndzp2dj2rz6wffnc1a4bdn45vb5r6hf0niiixh0chrlakd5d4w7"; depends=[]; }; - primer = derive { name="primer"; version="1.0"; sha256="0vkq794a9qmz9klgzz7xz35msnmhdaq3f91lcix762wlchz6v7sg"; depends=[deSolve lattice]; }; - primerTree = derive { name="primerTree"; version="1.0.1"; sha256="068j5a2rh8f1h1y7rv2xacnvkn2darzvp1adhi3hqkmwsb3znhjk"; depends=[directlabels gridExtra ggplot2 XML ape httr lubridate plyr scales stringr foreach]; }; - princurve = derive { name="princurve"; version="1.1-12"; sha256="19fprwpfhgv6n6ann978ilwhh58qi443q25z01qzxml4b5jzsd7w"; depends=[]; }; - prinsimp = derive { name="prinsimp"; version="0.8-8"; sha256="074a27ml0x0m23hlznv6qz6wvfqkv08qxh3v1sbkl9nxrc7ak4vn"; depends=[]; }; - PRISMA = derive { name="PRISMA"; version="0.2-2"; sha256="0r4dhnp0f6q43iklmwjim20hy9wjijkh8q4gljx8sph47njc0xqd"; depends=[Matrix gplots ggplot2]; }; - PrivateLR = derive { name="PrivateLR"; version="1.1-69"; sha256="0harlkccxa51k75if5z1h29lnis1dinh2zsk2liicwyjxcnmx0ml"; depends=[]; }; - prLogistic = derive { name="prLogistic"; version="1.2"; sha256="1abwz7nqkz2qbyqyr603kl9a3rkad3f4vxhck6a9kl80xrmfrj9s"; depends=[boot lme4 Hmisc]; }; - prob = derive { name="prob"; version="0.9-5"; sha256="05skjqimzhnk99z864466dc8qx58pavrky320il91yqyr8b98j8b"; depends=[combinat fAsianOptions hypergeo VGAM]; }; - ProbForecastGOP = derive { name="ProbForecastGOP"; version="1.3.2"; sha256="0fnw3g19lx4vs8vmn4qdirvybkiy2cxkhwkn9qa3phz45iixnvx4"; depends=[RandomFields fields]; }; - probsvm = derive { name="probsvm"; version="1.00"; sha256="1k0zysym7ncmjy9h7whwi49qsfkpxfk7chfdjrydl6hn6pscis37"; depends=[kernlab]; }; - pROC = derive { name="pROC"; version="1.7.3"; sha256="1xbz50phi2ygrgvcv36vnbc2icga8abjiha2ap35bwffg5d2zmvi"; depends=[plyr Rcpp]; }; - processdata = derive { name="processdata"; version="0.8.2"; sha256="1rdb3chpm7c2acx5r262gcg5w02mplh6xgxlld070kb91i7drahj"; depends=[ggplot2 reshape2]; }; - ProDenICA = derive { name="ProDenICA"; version="1.0"; sha256="04gnsnd0xzw3bfbssdp06bar0lk305ry2c97pmwxgiz3ay88dfsj"; depends=[gam]; }; - prodlim = derive { name="prodlim"; version="1.4.3"; sha256="0y18ngb1gy8zdk4dfakb57pyjll8937acbaz2lynwhbabd6kg66l"; depends=[survival KernSmooth lava]; }; - PROFANCY = derive { name="PROFANCY"; version="1.0"; sha256="11a0fpsv1hy0djv36x2i2hv2j50ryy0x7g7nn7vv76m1sl6q6r4b"; depends=[Matrix lattice igraph]; }; - profdpm = derive { name="profdpm"; version="3.3"; sha256="07lhjavrx4fa5950w928mfpddmmnmvdapl5n6mv49m8h3bxs4nmy"; depends=[]; }; - ProfessR = derive { name="ProfessR"; version="2.3"; sha256="1y88as4xjvdm2v2ms5l7c6ziq7sll6qkrpgzdd4xnbcjx7c0g9w8"; depends=[RPMG]; }; - ProfileLikelihood = derive { name="ProfileLikelihood"; version="1.1"; sha256="16cdp1nimhg1sd2x0qbffm7clgk54p0838y688z8lnsrjaggmb0x"; depends=[nlme MASS]; }; - profileModel = derive { name="profileModel"; version="0.5-9"; sha256="1p9b9jr5842im195d60ja82pp7vbk85vs8b0r3fnf62j4b92aky9"; depends=[]; }; - profileR = derive { name="profileR"; version="0.2-1"; sha256="1hcydy7hqjac9mvbaim2g75ab1ziyvpbrkb4k21966m54zjk9kka"; depends=[ggplot2 MASS RColorBrewer reshape plyr]; }; - profr = derive { name="profr"; version="0.3.1"; sha256="1w06mm89apggy6wc273b2nsp95smajr8sf3dwshykivv7mhkxs5d"; depends=[stringr plyr]; }; - proftools = derive { name="proftools"; version="0.1-0"; sha256="1wzkrz7zr2pjw5id2sp6jdqm5pgrrh35zfwjrkr6mac22lniq4bv"; depends=[]; }; - ProgGUIinR = derive { name="ProgGUIinR"; version="0.0-4"; sha256="0srhk42ssx4i096sbs4jacqjsc1ffqjxjgvpplzshlqaby1h3795"; depends=[ggplot2 svMisc MASS]; }; - prognosticROC = derive { name="prognosticROC"; version="0.7"; sha256="0lscsyll41hpfzihdavygdzqw9xxjp48dmy4i17qsx5h01jl1h4i"; depends=[survival]; }; - proj4 = derive { name="proj4"; version="1.0-8"; sha256="06r3lavgixrsa52d1v31laqcbw6fb9xn23akv39hvaib78diglv9"; depends=[]; }; - ProjectTemplate = derive { name="ProjectTemplate"; version="0.5-1"; sha256="0fi5i9icac2rjrpmgvb9glqr6z5fr880bn8hz6djgi1n1bn2v1g8"; depends=[]; }; - propagate = derive { name="propagate"; version="1.0-3"; sha256="1kg29c72r6yz8asm6zdjxiwkrkz8dh92iybcxmiwzifhshv4gg34"; depends=[MASS tmvtnorm Rcpp ff minpack_lm]; }; - PropCIs = derive { name="PropCIs"; version="0.2-5"; sha256="0wnc5h4390w4rglr7gjh6827f5r7gdhajx1iwp5fggdlm808hgq7"; depends=[]; }; - PropClust = derive { name="PropClust"; version="1.4-2"; sha256="13ac895i7ljayyqcjjmwvwar6wf1j0qssazcb5nlz8rw155qwavs"; depends=[flashClust dynamicTreeCut]; }; - PropScrRand = derive { name="PropScrRand"; version="1.1"; sha256="0cj62dzg4zm8d1g8h7qmviiwm93cwplppbi0p674fmmf1wy84v9s"; depends=[]; }; - prospectr = derive { name="prospectr"; version="0.1.3"; sha256="18lh03xg6bgzsdsl56bjd63xdp16sqgr3s326sgifkkak8ffbv7q"; depends=[RcppArmadillo foreach iterators Rcpp]; }; - proteomicdesign = derive { name="proteomicdesign"; version="2.0"; sha256="01s47pgwxy4xx10f3qmbfv59gbaj0qw017kpkpsn33s8w7ad63r0"; depends=[MASS]; }; - protiq = derive { name="protiq"; version="1.2"; sha256="00hv6hmfba4is2q1s9h5csx42s7ry2qdmi7vasgcafp8s4fc999l"; depends=[mvtnorm]; }; - proto = derive { name="proto"; version="0.3-10"; sha256="03mvzi529y6kjcp9bkpk7zlgpcakb3iz73hca6rpjy14pyzl3nfh"; depends=[]; }; - protoclass = derive { name="protoclass"; version="1.0"; sha256="17d2m6r1shgb47v8mwdg1a7f5h29m5l7f5m0nsmv0xc90s9cpvk8"; depends=[class]; }; - PROTOLIDAR = derive { name="PROTOLIDAR"; version="0.1"; sha256="0bz3071b0wlcvh40vl3dyiiixk5avsj6kjjnvlvx264i5g08rij4"; depends=[]; }; - protr = derive { name="protr"; version="0.2-1"; sha256="0kjvq7w2pg8vdv0f7lsc6f1ksbv9f9x7p61aqfzqignz9nh792dd"; depends=[]; }; - protViz = derive { name="protViz"; version="0.1.98"; sha256="1lw9whid25pkprhw1ivb9fjaa5vx1w5mvj3dx299bp4dqg75dns6"; depends=[Rcpp]; }; - proxy = derive { name="proxy"; version="0.4-12"; sha256="1hjbx94c4m2v22fswdd2jkb43ixfv6qivx8qiyzm23g1965ynvii"; depends=[]; }; - pRSR = derive { name="pRSR"; version="3.0.2"; sha256="1s81mi172mwxhp786c1fl579cg87valppr0z958ssvxsvg5hbfxy"; depends=[]; }; - pryr = derive { name="pryr"; version="0.1"; sha256="1vp63v1l4myahmmbphc043x1kpmvvdhs6dr640dxi0napvkdqlq6"; depends=[stringr codetools Rcpp]; }; - 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]; }; - psbcGroup = derive { name="psbcGroup"; version="1.0"; sha256="1l28sy0jys1g3nyfls9nl9vx9b6qh405a2nhx0qgxwb24l67x56n"; depends=[bayesm LearnBayes SuppDists mvtnorm]; }; - PSCBS = derive { name="PSCBS"; version="0.43.0"; sha256="1pv61ha8c2hx91hik9n6fz2gxdhijgcsdjhznaml5v1d5ba3vzjj"; depends=[R_methodsS3 R_oo R_utils R_cache matrixStats]; }; - pscl = derive { name="pscl"; version="1.04.4"; sha256="0mm8qak7cq8qks60wx6lslii79wnkh58a31izgns35wwlflg8g6n"; depends=[MASS mvtnorm coda gam vcd lattice]; }; - psd = derive { name="psd"; version="0.4-1"; sha256="1knfpgvmhrispfvlv94rnpbrjkyggqrmng65bjdjjigq83hhzywm"; depends=[fftw RColorBrewer signal zoo]; }; - psData = derive { name="psData"; version="0.1.2"; sha256="0w8kzivqrh1b6gq803rfd10drxdwgy0cxb5sff273m6jxzak52f2"; depends=[countrycode DataCombine foreign xlsx]; }; - pse = derive { name="pse"; version="0.3.4"; sha256="1ni4rwskcr326x5z81hsh36nkcrpq5d7pkqh6xyh4fjm57wjwzbp"; depends=[Hmisc boot]; }; - pseudo = derive { name="pseudo"; version="1.1"; sha256="0dcx6b892cic47rwzazsbnsicpgyrbdcndr3q5s6z0j1b41lzknd"; depends=[KMsurv geepack]; }; - psgp = derive { name="psgp"; version="0.3-6"; sha256="0h9gyadfy0djj32pgwhg8vy2gfn7i7yj5nnsm6pvfypc3k71s2wf"; depends=[intamap automap gstat]; }; - pSI = derive { name="pSI"; version="1.1"; sha256="0cvw38dqqlyx7cpl27hq33f5xns2d0019lyr98pwndcnbp09mx0b"; depends=[gdata]; }; - psidR = derive { name="psidR"; version="1.2"; sha256="14cpxk7z0inrpvhsdb3z6r5nrpyb4v8bv77mygxcf51rxihigzvj"; depends=[data_table RCurl foreign SAScii]; }; - PSM = derive { name="PSM"; version="0.8-10"; sha256="1s60fr85xn3ynpvsbc3nw7vgz6h6jxy3yii1w6jpkw3iwl4bgn84"; depends=[MASS numDeriv deSolve ucminf]; }; - PSMix = derive { name="PSMix"; version="1.1.1"; sha256="0g9s7v05jjc7vq08fj5bb2wg03isnyr1ql1rciiihqi5w4dwx6w7"; depends=[]; }; - pso = derive { name="pso"; version="1.0.3"; sha256="0alar695c6kc1rsvwipsrvlxc93f3sy9l0yhp0mggyqgxkkvy406"; depends=[]; }; - pspearman = derive { name="pspearman"; version="0.3-0"; sha256="1l5mqga7b5nvm6v9gbl1xsspdqsjqyhhdn4gc4qlz6ld7fqfq6cx"; depends=[]; }; - pspline = derive { name="pspline"; version="1.0-16"; sha256="170apwfv2lbf2rggzzynrf9vi2mr0y15sm4zy8djxxpzv217iaf7"; depends=[]; }; - PST = derive { name="PST"; version="0.84.1"; sha256="10cwlj8957sj5dag43v01fbq9lmcasfxp0lgllj0iv0lbfzd4g02"; depends=[TraMineR]; }; - PsumtSim = derive { name="PsumtSim"; version="0.4"; sha256="0079kb1bgsxs4cwmn33rbbk2jgq39rdjfgz9k9hc64iyzz0i6na3"; depends=[EffectsRelBaseline boot]; }; - psy = derive { name="psy"; version="1.1"; sha256="027whr670w65pf8f7x0vfk9wmadl6nn2idyi6z971069lf01wdlk"; depends=[]; }; - psych = derive { name="psych"; version="1.4.8.11"; sha256="110j5d7xdaviklf3mv9jlnli3l4n5g4mxasgxdj6kw7f66fqh634"; depends=[]; }; - psychometric = derive { name="psychometric"; version="2.2"; sha256="1b7cx6icixh8k3bv60fqxjjks23qn09vlcimqfv2x3m3nkf8p1s9"; depends=[multilevel nlme multilevel nlme]; }; - psychomix = derive { name="psychomix"; version="1.1-1"; sha256="0p3kidbsmfm09s7c3p8nlj069wcyln1cxmjmj5nj7f618c407zyf"; depends=[flexmix psychotools lattice Formula modeltools]; }; - psychotools = derive { name="psychotools"; version="0.2-0"; sha256="13zpg4xi5hmr8yzjsri4kn0dy39ns5razdmchh4nwfr9gjn0h29b"; depends=[]; }; - psychotree = derive { name="psychotree"; version="0.13-0"; sha256="1jwya7glgaz4zb81i37bvxnm712b1y34dh5s3y64lms2bd98wc4b"; depends=[party psychotools modeltools sandwich strucchange]; }; - psyphy = derive { name="psyphy"; version="0.1-9"; sha256="1ndc6sy662wj2qfx7r97crlqjd8fdkfvfy59qmf34bcbzbg33riz"; depends=[]; }; - psytabs = derive { name="psytabs"; version="0.5"; sha256="0jcsv771ndf0fv76982rbv099ii4l55a8bj1mhgr54838ins0gg7"; depends=[psych plyr rtf R2HTML mokken lavaan semTools]; }; - pt = derive { name="pt"; version="1.0"; sha256="0hjijfmc9dip3ys8xg44w0fwvyzyjyjl9hpwm7j2nzg3plv6i1fz"; depends=[]; }; - PTAk = derive { name="PTAk"; version="1.2-6"; sha256="06b59qmlz7n6nydb7d2nbv2ggfam0092qzavshgfa6p8r5vzxcj6"; depends=[tensor]; }; - PTE = derive { name="PTE"; version="1.0"; sha256="10if2hh69yysi2y82m7is74hmzw2xpxijgb8bhy1d4g9n9lqidfs"; depends=[doParallel]; }; - ptinpoly = derive { name="ptinpoly"; version="2.1"; sha256="0l16hvg3b7km0kh2wqzcvnn6jydvvh5mm089j15in4s1wsjn173k"; depends=[misc3d]; }; - PtProcess = derive { name="PtProcess"; version="3.3-1"; sha256="0qh673i00z8x07zjhwazambz1myw5q342zfqfgm2f5z59v1j7m48"; depends=[]; }; - ptw = derive { name="ptw"; version="1.0-7"; sha256="195pa6hj3y9spyc7yxfgr8alkp48a7ccnyp64r6fyjwj6ds08b64"; depends=[]; }; - PubBias = derive { name="PubBias"; version="1.0"; sha256="0dr5dhfx57knrs05pbx9ngg4k2937n8gjzsgd0jfqd8dfxhy051k"; depends=[rmeta R_utils]; }; - pubmed_mineR = derive { name="pubmed.mineR"; version="1.0.1"; sha256="0d288hx98j5k4nmzj1vc3sfjwh9i4cljfgi6vklrsvgn5sx39x91"; depends=[RCurl XML NCBI2R boot R2HTML]; }; - PubMedWordcloud = derive { name="PubMedWordcloud"; version="0.3.1"; sha256="1bq2jswhc3vr84x6a9fspygirl54z7b1pdlcpnd7g4374ypvlrrz"; depends=[XML stringr RCurl wordcloud tm GOsummaries RColorBrewer]; }; - pumilioR = derive { name="pumilioR"; version="1.3"; sha256="1zmcdp978p73bh9fdshxlrzgfg18j007xgxgr439rq90bwiwva6j"; depends=[XML RCurl]; }; - PurBayes = derive { name="PurBayes"; version="1.3"; sha256="0nbm4cyrwfbwwbjbjkylr86cshaqbvbif6dkp4fag8kbcgyyx5qh"; depends=[rjags]; }; - pushoverr = derive { name="pushoverr"; version="0.1.3"; sha256="18bxipbrcv8anrvdmgff1674b735x0zp6bwf319cgxsgbs9nlwqi"; depends=[httr]; }; - PVAClone = derive { name="PVAClone"; version="0.1-2"; sha256="0afl2il5wdcwzpyhjkgq8iz16q1086c3ndr4cjlyspgbss9h5l24"; depends=[dcmle dclone]; }; - pvar = derive { name="pvar"; version="1.0.9"; sha256="01bkva4kna1vfjlsss16s6501l8x2s95a5wh7wsmwq3spdgp1i2r"; depends=[]; }; - pvclass = derive { name="pvclass"; version="1.1"; sha256="0qaj71qrcj0kgwb1xravylqfc2b1ww5h8l4pdd2m0x33aygrm0kk"; depends=[Matrix]; }; - pvclust = derive { name="pvclust"; version="1.2-2"; sha256="152qwvk4lpdsrv96148bc3z51jqdaa7p95ql2zhpb7a2fvzs5ad5"; depends=[]; }; - PVR = derive { name="PVR"; version="0.2.1"; sha256="1p87pj9g0qlc8ja6xdj2amny9pbkaqb34x2y9nkl1nj1pkwjq2s5"; depends=[ape splancs]; }; - pvsR = derive { name="pvsR"; version="0.2"; sha256="1liykrh05k4qlfh1b61rafvgzx99fl9nh75a6mr5z5zczn8i00mv"; depends=[XML nnet httr]; }; - pwr = derive { name="pwr"; version="1.1.1"; sha256="1is6kqqjf3bzsddj4advj8qcp30rz2zlqc0g98072m96nmq5ywgn"; depends=[]; }; - PwrGSD = derive { name="PwrGSD"; version="2.000"; sha256="0qxvws9mfrnqw5s24qhqk6cbffjm13z7awyxdmnilazghpiq1p7s"; depends=[survival]; }; - 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]; }; - pyramid = derive { name="pyramid"; version="1.3"; sha256="1jmcqzgxqwvfa9aidayjx6j1s9f3kwqvivwldwpkf780i9wkdig9"; depends=[]; }; - qat = derive { name="qat"; version="0.72"; sha256="0vs7xc32h9s5p7486cafzzll7xaby7lbqmmpnshkn8mq021xlxkg"; depends=[ncdf gplots XML gdata moments boot fields]; }; - QCA = derive { name="QCA"; version="1.1-3"; sha256="083hc00d7srvxfkfax51ffngidbdhjqaxga3lln5gw53m2831v35"; depends=[lpSolve]; }; - QCA3 = derive { name="QCA3"; version="0.0-7"; sha256="0i9i2i633sjnzsywq51r2l7fkbd4ip217hp0vnkj78sfl7zf1270"; depends=[lpSolveAPI]; }; - QCAGUI = derive { name="QCAGUI"; version="1.9-6"; sha256="020ngni02j2w2ylhyidimm51d426pym2g1hg7gnpb7aplxx67n6x"; depends=[abind QCA]; }; - qcc = derive { name="qcc"; version="2.5"; sha256="1j2l4i1vy8wqsl64r0qmc8dflyn1abbmzhpqqsmhwldifcdbdsb9"; depends=[MASS]; }; - QCGWAS = derive { name="QCGWAS"; version="1.0-8"; sha256="1wn1kddgfmqv326pihnavbgsbd2yxrlq5s2xgi6kbprssxvj8bk1"; depends=[]; }; - qcr = derive { name="qcr"; version="0.1-18"; sha256="16dfda3rwivsdhp7j5izzbk2rzwfabfmxgpq4kjc4h7r90n2vly2"; depends=[qcc]; }; - qdap = derive { name="qdap"; version="2.1.1"; sha256="1in345544gspj7wki82gdaiaxzn5qcp5jz73n522gjnybymllv2b"; depends=[ggplot2 qdapDictionaries qdapTools RColorBrewer chron dplyr gdata gridExtra igraph NLP openNLP plotrix RCurl reports reshape2 scales stringdist tm venneuler wordcloud xlsx XML]; }; - qdapDictionaries = derive { name="qdapDictionaries"; version="1.0.2"; sha256="0s1dqp3hjllkvq638hvggcbfsdwks91r0ymynl7cdh7dr5pg91bc"; depends=[]; }; - qdapTools = derive { name="qdapTools"; version="1.0.2"; sha256="1vvgcj0cymfc8yqw3i8jzr199hq04z7y86qgljdl86v4xvl44ggv"; depends=[chron data_table RCurl]; }; - qfa = derive { name="qfa"; version="0.0-10"; sha256="1c6yh5fa45fk3g9hi905b2cjswn6gmn53f0gb5v5byb9gr9bjf7s"; depends=[sp DEoptim]; }; - qgraph = derive { name="qgraph"; version="1.2.5"; sha256="1jgjxfds28kk03qrk01r8dla4xjpbqcqdwa1ifay2vqahwlkpz65"; depends=[psych ellipse lavaan sem plyr Hmisc igraph jpeg png colorspace Matrix sna corpcor reshape2 ggplot2 glasso huge]; }; - qiimer = derive { name="qiimer"; version="0.9.2"; sha256="08625hz2n7yk9zk1k9sa46n2ggbw5qs0mlqkmzyjjh3qlnb1354a"; depends=[pheatmap]; }; - qlcMatrix = derive { name="qlcMatrix"; version="0.9.2"; sha256="1d8953bj69d0nia3qh3s1djf9m7wkvfdxqd234026gh1d3qchkr2"; depends=[Matrix]; }; - qLearn = derive { name="qLearn"; version="1.0"; sha256="1ilxmgazm8gjz8c1hhbp4fccibnvnalxrag8b0rn081zsqmhf094"; depends=[]; }; - qlspack = derive { name="qlspack"; version="2.2"; sha256="0b9sqvnvldhd8vymajrbql0vn70rml13jgsq5ihm6skzq5qms7y6"; depends=[geepack]; }; - qmap = derive { name="qmap"; version="1.0-3"; sha256="1c7qvmd5whi446nzssqvhz1j2mpx22nlzzdrcql84v18ry0dr18m"; depends=[fitdistrplus]; }; - qmethod = derive { name="qmethod"; version="1.1"; sha256="0ygmprfjwx1bi3pi9iqq15m243vy9f90znyf4qwp0zwbbpxyaqi5"; depends=[psych GPArotation]; }; - qmrparser = derive { name="qmrparser"; version="0.1.4"; sha256="1lw8sn4qsdv4bxf5p7gnkm0vmiymyj03svbl232zyyb0fh97i7nk"; depends=[]; }; - QoLR = derive { name="QoLR"; version="1.0"; sha256="1ah6x1fcs4l571jvgm0c257cgxhhpkzfhqimwbb9j7xbz3h55lp3"; depends=[survival zoo]; }; - qp = derive { name="qp"; version="0.3-2"; sha256="1964bj2ggmpaqz0rnmc2zx5hyrzawlmawz3mh046cx1pdzlsqfwh"; depends=[]; }; - qpcR = derive { name="qpcR"; version="1.3-9"; sha256="1dbxy7al75d7zjwg8kgvmmddfklj13hq9nb1vyblmzcsa59rx91s"; depends=[MASS minpack_lm rgl robustbase Matrix]; }; - qPCR_CT = derive { name="qPCR.CT"; version="1.1"; sha256="19j41fsd2m7p2nxi2h2mj43rjxx6sz2jpf4sk0bfvl1gyj0iz3hi"; depends=[RColorBrewer]; }; - qqman = derive { name="qqman"; version="0.1.1"; sha256="1j77i2lz2rp2kgsfsfv6zf9ai8ffylmkrfiq2rv53vmrq92h407c"; depends=[]; }; - qrfactor = derive { name="qrfactor"; version="1.4"; sha256="0f02lh8zrc36slwqy11x03yzfdy94p1lk5jar9h5cwa1dvi5k8gm"; depends=[mvoutlier mgraph pvclust cluster maptools]; }; - QRM = derive { name="QRM"; version="0.4-10"; sha256="1fkxjqyb9yqki4qwk393ra66wg5dnbr5b5sgypm8wk973crbhcj0"; depends=[gsl Matrix mvtnorm numDeriv timeSeries Rcpp mgcv]; }; - qrnn = derive { name="qrnn"; version="1.1.2"; sha256="01wsz9qcdiayi7gsyy2y09jyyapanyhlc4pdyman2f7z5nl9yv9i"; depends=[]; }; - QSARdata = derive { name="QSARdata"; version="1.3"; sha256="0dhldnh0jzzb4assycc0l14s45ymvha48w04jbnr34lrwgr9krh4"; depends=[]; }; - qtbase = derive { name="qtbase"; version="1.0.4"; sha256="02yilvywkcqn3y9ayix18cgkwhi0gh69fl3fcw28fs2zxf1hqy75"; depends=[]; }; - qtl = derive { name="qtl"; version="1.32-10"; sha256="0ywgsjfyjvnfisd2hnh2f5rqjhy0znnf2c1qjdqfx6g7vh3hblr1"; 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]; }; - qtlDesign = derive { name="qtlDesign"; version="0.941"; sha256="138yi85i5xiaqrns4v2hw46b731bdgnb301wg2h4cfrxvrw4l0d5"; depends=[]; }; - qtlhot = derive { name="qtlhot"; version="0.9.0"; sha256="1043rksqqzgmr7q03j18wxgm706prqxq9ki9b9p2dxvc62vfcfih"; depends=[qtl lattice corpcor mnormt]; }; - qtlmt = derive { name="qtlmt"; version="0.1-3"; sha256="01ql0fr2mxl8a8nd6lpig5j8vznv594ygn6bj6d31gj15r5rs8fs"; depends=[]; }; - qtlnet = derive { name="qtlnet"; version="1.3.6"; sha256="044a2p3mpp203kb85s2fr3qiyypm461lrzxkfi0hnzq44qqba169"; depends=[qtl igraph sem pcalg]; }; - QTLRel = derive { name="QTLRel"; version="0.2-14"; sha256="05x56a8fjr6xk38dphdzh77y520cr6zykjp3qlx27drk9s5z06cs"; depends=[gdata]; }; - qtpaint = derive { name="qtpaint"; version="0.9.0"; sha256="06yqakg134mks8q7a40f5knjpcm1k2wdzchs0ywvfpwvpwgwig01"; depends=[qtbase qtbase]; }; - qtutils = derive { name="qtutils"; version="0.1-3"; sha256="018k9v3mab1mfcjh4mv1a1iish50fwdhb51mqn17k6fyrrrv7vs5"; depends=[qtbase qtbase]; }; - QuACN = derive { name="QuACN"; version="1.7.4"; sha256="1bcvnzycw7xvnms41rqsnfvggvcmpaw6byrsdzqmg7z0q754b1j4"; depends=[combinat Rmpfr igraph]; }; - quad = derive { name="quad"; version="1.0"; sha256="0fak12l19f260k0ygh6zimx8dabzsv7a9i2njw8hnfcs3ndffhv5"; depends=[PearsonDS]; }; - quadprog = derive { name="quadprog"; version="1.5-5"; sha256="0jg3r6abmhp8r9vkbhpx9ldjfw6vyl1m4c5vwlyjhk1mi03656fr"; depends=[]; }; - quadrupen = derive { name="quadrupen"; version="0.2-4"; sha256="0gs565zi5qkccr9f65smvzgq2d97p7i5inksp2492bjvqhsbagxj"; depends=[Rcpp ggplot2 Matrix reshape2 scales]; }; - qualCI = derive { name="qualCI"; version="0.1"; sha256="09mzsy5ryyrn1gz9ahrh95cpfk7g09pmjjy0m82fh4xc7j5w6kpf"; depends=[combinat]; }; - qualityTools = derive { name="qualityTools"; version="1.54"; sha256="0qrxf47fv56c86p0mmg3l3qvx8p3rvapffwhaw4yn4kbp7yiap5d"; depends=[]; }; - qualV = derive { name="qualV"; version="0.3"; sha256="0cr3jlp0y83nk6i965bd6v86sl8pjx47z1y20lcygrf5cb6m4ifw"; depends=[KernSmooth]; }; - Quandl = derive { name="Quandl"; version="2.3.2"; sha256="0dx6myf5gw7dvhglsc60hwq8nsj73zz3gcqcad1z3d27acv2q7m0"; depends=[RCurl RJSONIO zoo xts]; }; - quantchem = derive { name="quantchem"; version="0.13"; sha256="1ga5xa7lsk04flfp1syjzpnvj3i2ypzh1m49vq1xkdwpm6axdy8n"; depends=[MASS outliers]; }; - QuantifQuantile = derive { name="QuantifQuantile"; version="0.2"; sha256="0h0bc81y21zag0kgfr5i9rk74m32qg0x5a8n9pvm2f6c0126q7vi"; depends=[rgl]; }; - quantmod = derive { name="quantmod"; version="0.4-0"; sha256="12411ykj1f1ni5y00ma3kr5h5fsi0rqkshz7501wykj926js9v5j"; depends=[Defaults xts zoo TTR]; }; - QuantPsyc = derive { name="QuantPsyc"; version="1.5"; sha256="1i9bh88r8zxndzjqsj14qw64gnvm5a9kvhjhzk3qsrvl3qzjgh93"; depends=[boot MASS]; }; - quantreg = derive { name="quantreg"; version="5.05"; sha256="07djmdlmij9add2sgdsb1p6521hlnsfmll8lqs3x0z9gmr2wyx4f"; 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]; }; - quantspec = derive { name="quantspec"; version="1.0-1"; sha256="1jfqga1kwdhfqmkgcdin84mddggi65x2s5w6krj5n5yafak21m87"; depends=[quantreg testthat abind zoo rje snowfall]; }; - QuasiSeq = derive { name="QuasiSeq"; version="1.0-4"; sha256="1vpk1l7dhbfdywncdfg1c29qpj3x0m5ddpyh13d0d3ic8rzhdivf"; depends=[Matrix mgcv]; }; - questionr = derive { name="questionr"; version="0.4.1"; sha256="1hiy1a7ijg2zs4zz9r4p4yqjxm66jhv4xsh29lhv10dlvhh4r4km"; depends=[shiny highr classInt]; }; - queueing = derive { name="queueing"; version="0.2.2"; sha256="1db8w9pzy4krgcc4xahfs9aw45gvvyl6kqm1hkklw21pfc0ka09f"; depends=[]; }; - QUIC = derive { name="QUIC"; version="1.1"; sha256="021bp9xbaih60qmss015ycblbv6d1dvb1z89y93zpqqnc2qhpv3c"; depends=[]; }; - quint = derive { name="quint"; version="1.0"; sha256="19dxrssy4dw7v3s4hhhy6yilbc7zb6pvcnh3mm1z6vv5a1wfr245"; depends=[partykit Formula rpart]; }; - quipu = derive { name="quipu"; version="1.9.0"; sha256="1py1qpbwp2smr5di8b3zmzxxhchfmr5qfhqkdiqig28mcnqcmp5n"; depends=[agricolae stringr pixmap shiny xtable]; }; - qVarSel = derive { name="qVarSel"; version="1.0"; sha256="13x2hnqjsm0ifzmqkkl9ilhykrh80q04lhlkkp06hkysmh5w9rkx"; depends=[lpSolveAPI Rcpp]; }; - qvcalc = derive { name="qvcalc"; version="0.8-8"; sha256="0xmbn6p7ryr43yf978pqpdnlxdq84v965hxbff8dviqhxwgqv4aq"; depends=[]; }; - QZ = derive { name="QZ"; version="0.1-4"; sha256="1k657i1rf6ayavn0lgfvlh8am3kzypgb1jhf2by147gv103izkrz"; depends=[]; }; - R0 = derive { name="R0"; version="1.2-4"; sha256="1gg5jlmb20lqa4nismchffc65b02n0qmbsk8nwzkkl2zxkm9kx3k"; depends=[MASS]; }; - R1magic = derive { name="R1magic"; version="0.2"; sha256="07kqpdpf2grmgkv609l79f3w6ljkldfsyrn9l1yg6birzp3p69v1"; depends=[]; }; - R2admb = derive { name="R2admb"; version="0.7.10"; sha256="0rjrd1wpr1f4l800mccnwsa121g93rrr7q9dq0xxvkl3lsbn6f2s"; depends=[]; }; - R2BayesX = derive { name="R2BayesX"; version="0.3-1"; sha256="1qsg4lvzxpbn2jli58kncn5kjlv7ccmmkrj1m9jakbbzx51qc1rj"; depends=[BayesXsrc colorspace mgcv]; }; - R2Cuba = derive { name="R2Cuba"; version="1.0-11"; sha256="1kgcxqn83yskh0dv6vyz66d0z32qy55par36jj987qglpl25zmax"; depends=[]; }; - r2d2 = derive { name="r2d2"; version="1.0-0"; sha256="1zl0b36kx49ymfks8rm33hh0z460y3cz6189zqaf0kblg3a32nsi"; depends=[KernSmooth MASS sp]; }; - r2dRue = derive { name="r2dRue"; version="1.0.4"; sha256="1apdq7zj5fhs349wm9g6y06nn33x24pg3gdp4z1frd18qlacf8z5"; depends=[rgdal sp matrixStats]; }; - R2G2 = derive { name="R2G2"; version="1.0-2"; sha256="05d5vybvsi4pyr099916nk1l8sqszs9gaj2vhsx1jxxks8981na7"; depends=[]; }; - R2GUESS = derive { name="R2GUESS"; version="1.3"; sha256="1jqzh2f9qwwmcf16hjgnl3rgp49zx6m090r750p3n4ds3qr96zx7"; depends=[fields MCMCpack mixOmics mvtnorm snowfall]; }; - R2HTML = derive { name="R2HTML"; version="2.2.1"; sha256="11p0mg6b39z2w7k76j21hy09r8fm3rwkiby2lmhx5cgvnvxgrqf1"; depends=[]; }; - R2jags = derive { name="R2jags"; version="0.04-03"; sha256="0wygsz5zzng8fh82pzhqly3d532ljz0jj34h9nz7g3v5asv0kcqm"; depends=[rjags abind coda R2WinBUGS]; }; - r2lh = derive { name="r2lh"; version="0.7"; sha256="1kkyjv9x2klrjnaaw4a16sxdfqmpp9s5mlclzlczlqjypbf2aa6d"; depends=[]; }; - 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]; }; - r2stl = derive { name="r2stl"; version="1.0.0"; sha256="18lvnxr40cm450s8qh09c3cnkl1hg83jhmv1gzsv6nkjrq4mj5wh"; depends=[]; }; - R2SWF = derive { name="R2SWF"; version="0.8"; sha256="125r4drgl79cwda00g42m0l0dzqmi2n8p5cikx70jz67giq5blw2"; depends=[sysfonts]; }; - R2WinBUGS = derive { name="R2WinBUGS"; version="2.1-19"; sha256="03bvxv46lhhnbfjq3w5ig50icncwn1bdq7lsh6w1szdk90ah2zgh"; depends=[coda boot]; }; - R330 = derive { name="R330"; version="1.0"; sha256="01sprsg7kph62abhymm8zfqr9bd6dhihrfxzgr4pzi5wj3h80bjm"; depends=[s20x leaps rgl lattice]; }; - R4CDISC = derive { name="R4CDISC"; version="0.2"; sha256="1g8n89y1l5jy3168qz9j0kz3dvyadhn5mhilpzlpn3pijvv2vndf"; depends=[XML]; }; - R4CouchDB = derive { name="R4CouchDB"; version="0.4"; sha256="15177dwwnhl6mfvb78knhmjqi34pb74dcgb9rf9j0rvy85vznzzm"; depends=[bitops RCurl RJSONIO]; }; - R4dfp = derive { name="R4dfp"; version="0.2-4"; sha256="02crzjphlq4hi2crh9lh8l0acmc1rgb3wr1x8sn56cwhq4xzqzcb"; depends=[]; }; - r4ss = derive { name="r4ss"; version="1.22.1"; sha256="1rjnglwa3i8rlzyqqr5h8yh7vglrh8zpd3829qcc1vfi4swcwwqw"; depends=[coda corpcor gplots gtools maps pso RCurl]; }; - R6 = derive { name="R6"; version="1.0.1"; sha256="0q1ni6g0i3h2l7dj8fip1614likdki8apmrjs7ggma77qfc5jsaf"; depends=[]; }; - race = derive { name="race"; version="0.1.59"; sha256="13jprlnngribgvyr7fbg9d36i8qf3cax85n71dl71iv0y24al1cy"; depends=[]; }; - RAD = derive { name="RAD"; version="0.3"; sha256="0nmgsaykxavq2bskq5x0jvsxzsf4w2gqc0z80a59376li4vs9lpj"; depends=[mvtnorm MASS]; }; - RADami = derive { name="RADami"; version="1.0-3"; sha256="0rg07dsh2rlldajcj0gq5sgsl1i3qa28bsrmq88xcljg5hnr4iqn"; depends=[ape geiger phangorn]; }; - RadioSonde = derive { name="RadioSonde"; version="1.3"; sha256="1bvy281v278dni7ms4mq963463mwsj1bys9n2lvn6y8p7jhqvhdj"; depends=[]; }; - RadOnc = derive { name="RadOnc"; version="1.0.8"; sha256="1p74fbihbzfn6irc8khp4kvmsxd7scg3c2nkr7w0p7c75f76d9an"; depends=[rgl geometry oro_dicom ptinpoly]; }; - rags2ridges = derive { name="rags2ridges"; version="1.3"; sha256="1dzpaxvlrbpj2hw2p2gfhqvrlg5jdpd5z6q0dzxjdxh8z7xjsklb"; depends=[GeneNet expm reshape ggplot2 igraph Hmisc]; }; - RAHRS = derive { name="RAHRS"; version="1.0.1"; sha256="068alq0mrfgcmpa5gfrrqgixpdadva11s9ammg7p6g9lfrjx6gcc"; depends=[pracma RSpincalc]; }; - rainbow = derive { name="rainbow"; version="3.2"; sha256="043qbbyb1i7b8n3vspr6rdwlpqg3wdn31rsq3hmlahvwrfqma70n"; depends=[MASS pcaPP hdrcde cluster colorspace ks]; }; - raincpc = derive { name="raincpc"; version="0.2"; sha256="02551m1rjws8h7shdms5q4rmskqdwijfx7306wp1cl7x0gjc800q"; depends=[SDMTools]; }; - rainfreq = derive { name="rainfreq"; version="0.1"; sha256="1km77iks570w48xkad5giirw8yphlnnpv5j2fkh1nd9bqarwjxyb"; depends=[RCurl SDMTools]; }; - rAltmetric = derive { name="rAltmetric"; version="0.3"; sha256="0jq5w5yd1cps4npbm9wmrjb5vc36y89ib986ggqycd9jalmshxjd"; depends=[plyr RCurl reshape2 png ggplot2 RJSONIO]; }; - Rambo = derive { name="Rambo"; version="1.1"; sha256="1yc04xsfkc54y19g5iwambgnlc49ixjjvfrafsgis2zh5w6rjwv8"; depends=[sna]; }; - RAMpath = derive { name="RAMpath"; version="0.3.8"; sha256="1p1l6iirb314n5246kyyz0r3ja4v05xb5a6aq9k26wsb5m42x85k"; depends=[lavaan ellipse]; }; - ramps = derive { name="ramps"; version="0.6-12"; sha256="128lqfkgmcbcfvs210j14h54spqjcr4jdhk2rqgrwcjp5wjv209w"; depends=[coda maps Matrix nlme fields]; }; - randaes = derive { name="randaes"; version="0.3"; sha256="14803argy0xdd8mpn4v67gbp90qi2is4x6na9zw7i9pm504xji1x"; depends=[]; }; - random = derive { name="random"; version="0.2.2"; sha256="0h3vmd581i0srf9lfdgjv8kkinxf1kjg8aia0dhr5adghqvf5dck"; depends=[]; }; - RandomFields = derive { name="RandomFields"; version="3.0.35"; sha256="0m3hv7rmipc36059iv8igy3r783by8zi854c4gm8awzdav3wdv4a"; depends=[sp]; }; - randomForest = derive { name="randomForest"; version="4.6-10"; sha256="0glj08w6sbabr3n71kzd5w3jb7vhrys8rq904j27a4xk0qp4s5lv"; depends=[]; }; - randomForestSRC = derive { name="randomForestSRC"; version="1.5.4"; sha256="0bk7xg1lhi2mhqjnmgls4c0jf5d463pzzp1x4wkf0jal3yjgl4y3"; depends=[]; }; - randomGLM = derive { name="randomGLM"; version="1.02-1"; sha256="031338zxy6vqak8ibl2as0l37pa6qndln0g3i9gi4s6cvbdw3xrv"; depends=[MASS foreach doParallel]; }; - randomizationInference = derive { name="randomizationInference"; version="1.0.1"; sha256="1l4h9d0r199z775da0la30qijm8xikmbfnl7av7h1ar305ph6r2v"; depends=[permute matrixStats]; }; - randomizeBE = derive { name="randomizeBE"; version="0.3-1"; sha256="06hj614wp9lb348qwyqgw5zk2vn0m81bkwz4jprgjd72kpy8kv1h"; depends=[]; }; - randomLCA = derive { name="randomLCA"; version="0.8-7"; sha256="1xs2jh0parvqjm88cs2w2yb8r4ld6643fn84w35v8jsffbs98522"; depends=[lattice nlme boot]; }; - randomNames = derive { name="randomNames"; version="0.0-6"; sha256="18fyxpqj6xv933nyv4s59wv7pgl4wra123qmf0fa68gk1zj9l153"; depends=[data_table]; }; - random_polychor_pa = derive { name="random.polychor.pa"; version="1.1.4-1"; sha256="1051v7krrawdqnhz9q01rsknp2i7iv82d370q7m9i9d9i8wfnpk5"; depends=[psych nFactors boot MASS mvtnorm sfsmisc]; }; - randomSurvivalForest = derive { name="randomSurvivalForest"; version="3.6.4"; sha256="1k08q43rxlz822rqzz3nvy40646764c8ds25ylsvg6daan2qzzmv"; depends=[]; }; - randomUniformForest = derive { name="randomUniformForest"; version="1.0.6"; sha256="0qmkg8nbz3pv11yvwp45kkl3vl7mn1bgqhp5j13vr9c1gc732pgh"; depends=[Rcpp doParallel foreach ggplot2 pROC gtools]; }; - randtests = derive { name="randtests"; version="0.3"; sha256="0v5hbbmx7cl1q8bfgk9141hqbimch5fkhcbr9xfxidydxyl9jqln"; depends=[]; }; - randtoolbox = derive { name="randtoolbox"; version="1.15"; sha256="02knvk0ln6x0hlpbvvpll0dnb5d7s3n6zn5kdxih792y5yihiwbh"; depends=[rngWELL]; }; - RandVar = derive { name="RandVar"; version="0.9.2"; sha256="04hw4v2d9aa8z9f8wvwbzhbfy8zjl5q8mpl9b91q86fhh1yq5cz4"; depends=[distr distrEx]; }; - rangeMapper = derive { name="rangeMapper"; version="0.2-6"; sha256="1p4i677s7hc74snsk0vwswxp493ijwynsfmzjkrslzk819ng7zii"; depends=[RSQLite rgdal sp raster maptools RSQLite_extfuns lattice RColorBrewer classInt]; }; - RankAggreg = derive { name="RankAggreg"; version="0.4-3"; sha256="0m9wndpfgiy9cf2ss1vk7f09yl0qiqhx48kn1qid69vhv73nsyf3"; depends=[gtools clValid]; }; - Rankcluster = derive { name="Rankcluster"; version="0.92.9"; sha256="172jjsyc6a5y32s2fb8z6lgcq6rcwjbk3xnc5vvkhj64amlyxla6"; depends=[Rcpp]; }; - rankhazard = derive { name="rankhazard"; version="1.0"; sha256="1kylg8yjrixbv86i2ffhhn8f5shsj8kvi66k202ari0li92y7dsg"; depends=[survival]; }; - RankResponse = derive { name="RankResponse"; version="3.0.3"; sha256="0bl0w8dzwn73psiln4bkilq1l1bn1jnh4mmvblvb3wnms8srhrpv"; depends=[]; }; - RANN = derive { name="RANN"; version="2.4.1"; sha256="13d2wi3r4b190f6s6y4zipqf43gy9c1h71b9j7qmc3lqca4nvzmd"; depends=[]; }; - RAP = derive { name="RAP"; version="1.1"; sha256="18dclijs72p6gxawpg8hk7n512ah4by5jfg2jnrp8mz79ajmdgir"; depends=[]; }; - RapidPolygonLookup = derive { name="RapidPolygonLookup"; version="0.1"; sha256="0m6r11ksryzcfcm265wr9fhwb867j9ppfhalvvygzig5j85sg92k"; depends=[sp RANN PBSmapping RgoogleMaps]; }; - RAPIDR = derive { name="RAPIDR"; version="0.1"; sha256="06lhsjy7s71p5bcpln999smvr6n1fp5qfbr7i8wjcn4p1ddcfdcm"; depends=[data_table PropCIs]; }; - RApiSerialize = derive { name="RApiSerialize"; version="0.1.0"; sha256="0gm2j8kh40imhncwwx1sx9kmraaxcxycvgwls53lcyy2ap344k9j"; depends=[]; }; - RAppArmor = derive { name="RAppArmor"; version="1.0.1"; sha256="06j7ghmzw2rrlk8nsarmpk1ab2gg88qs52zpw37rhqchpyzwwkfb"; depends=[]; }; - rapport = derive { name="rapport"; version="0.51"; sha256="1qn45nrcawr8d9pkdnpmm37dg31l28gfbnwjl62fs7y691187cqp"; depends=[lattice plyr pander yaml reshape]; }; - rapportools = derive { name="rapportools"; version="1.0"; sha256="1sgv4sc737i12arh5dc3263kjsz3dzg06qihfmrqyax94mv2d01b"; depends=[reshape plyr pander]; }; - RArcInfo = derive { name="RArcInfo"; version="0.4-12"; sha256="1j1c27g2gmnxwslff4l0zivi48qxvpshmi7s9wd21cf5id0y4za4"; depends=[RColorBrewer]; }; - rareGE = derive { name="rareGE"; version="0.1"; sha256="0v3a2wns77q923ilddicqzg0108f8kmfdnsff1n65icin7cfzsny"; depends=[MASS nlme survey]; }; - rareNMtests = derive { name="rareNMtests"; version="1.0"; sha256="0axmxn4arw2iwsj64zsvy99hwcmkl2jy9vqnbwshl8hpaypbdxz9"; depends=[vegan]; }; - Rarity = derive { name="Rarity"; version="1.2-1"; sha256="16ds0s396f42qqmn4xrnmfk1j6v917p27dgi9iji976hn2q463hh"; depends=[]; }; - rARPACK = derive { name="rARPACK"; version="0.5-0"; sha256="0d4kd4fi6rvdamj5kvyba6zm0250ldm7nqrgnmapnc2q0wv0hik8"; depends=[Rcpp Matrix]; }; - RaschSampler = derive { name="RaschSampler"; version="0.8-6"; sha256="1ap5r8k4ydnsxqz5hvnnp9cbp0mdnx5bn8pn2wh0rp42897mfm4i"; depends=[]; }; - rasclass = derive { name="rasclass"; version="0.2.1"; sha256="04g2sirxrf16xjmyn4zcci757k7sgvsjbg0qjfr5phbr1rssy9qf"; depends=[car nnet RSNNS e1071 randomForest]; }; - raster = derive { name="raster"; version="2.2-31"; sha256="0i0a6d8g3qxxlmp897q80lw2k3ccidrfm236l0pd9nwydy0bqpl1"; depends=[sp]; }; - rasterVis = derive { name="rasterVis"; version="0.28"; sha256="0pq47ldjnihi1mgy5g9ymgvfm5hkpivhcz8qk3kn24cp7j06n0xh"; depends=[raster lattice latticeExtra hexbin sp zoo RColorBrewer]; }; - rateratio_test = derive { name="rateratio.test"; version="1.0-2"; sha256="1a2v12z2dr893ha80fhada1820z5ih53w4pnsss9r9xw3hi0m6k5"; depends=[]; }; - raters = derive { name="raters"; version="1.1"; sha256="0djpax59qvvqklph847wh4m2231y3zrzv2i7maq43pr8pyw9f2md"; depends=[]; }; - rationalfun = derive { name="rationalfun"; version="0.1-0"; sha256="15949vs9pdjz7426zhgqn7y87xzn79ikrpa2vyjnsid1igpyh0mp"; depends=[polynom]; }; - RAtmosphere = derive { name="RAtmosphere"; version="1.1"; sha256="0mk43bq28hlrjwaycsxca458k8xf00q58czgc17d8yx3kz17a5i0"; depends=[]; }; - rattle = derive { name="rattle"; version="3.1.0"; sha256="01kknaxg2is1isl9yjgdqvsilgrv9z4awnnd99bavpwarrb0cvg0"; depends=[]; }; - rAverage = derive { name="rAverage"; version="0.3-6"; sha256="005gjk8bifvncl1yfazj4bs8l4k2pgygwdyfrkkd4xvcywar0p73"; depends=[foreign]; }; - rAvis = derive { name="rAvis"; version="0.1.1"; sha256="0iyhc24xm2655wc1dhg8vhd5yr7zx6hywpxczkfs0a7pifckfy4g"; depends=[stringr XML RCurl scrapeR gdata scales rgdal maptools raster sp]; }; - rawFasta = derive { name="rawFasta"; version="1.0.0"; sha256="0krvs8d1r8hggjg84n7g3ncdkifa3hipbma98f49kf81fzn2npip"; depends=[]; }; - rbamtools = derive { name="rbamtools"; version="2.9.14"; sha256="0kdbgl7yivhdf6xi2xp9rdvfmpb6d090ja10lj1385qzv3ym0zln"; depends=[]; }; - rbefdata = derive { name="rbefdata"; version="0.3.5"; sha256="12mcqz0pqgwfw5fmma0gwddj4zk0hpwmrsb74dvzqvgcvpfjnv98"; depends=[XML RCurl rjson wordcloud rtematres RColorBrewer]; }; - rbenchmark = derive { name="rbenchmark"; version="1.0.0"; sha256="010fn3qwnk2k411cbqyvra1d12c3bhhl3spzm8kxffmirj4p2al9"; depends=[]; }; - RBerkeley = derive { name="RBerkeley"; version="0.7-4"; sha256="0jslac7d0dyqxpy4lcg1i7kz9hdidnlxhf982lnsl5kx5fl0nmxi"; depends=[]; }; - rBeta2009 = derive { name="rBeta2009"; version="1.0"; sha256="0ljzxlndn9ba36lh7s3k4biim2qkh2mw9c0kj22a507qbzw1vgnq"; depends=[]; }; - rbhl = derive { name="rbhl"; version="0.1.0"; sha256="1m2n1qczhhdlv9pkmw9dlqi2wmdw8wac8d557c4rk0vnzwzgpgpi"; depends=[httr XML RJSONIO plyr]; }; - RbioRXN = derive { name="RbioRXN"; version="1.3.1"; sha256="122h6pghpb8dfrqvdkvp25bp7dl8kc1aka13h6hp88vaj32pf4ij"; depends=[plyr RCurl gdata data_table stringr]; }; - rbiouml = derive { name="rbiouml"; version="1.4"; sha256="03zpchcwq4sn8cymcrzw6r6fkxh85b8mivy42jkd0knm6i7f9aa6"; depends=[RCurl RJSONIO]; }; - rbison = derive { name="rbison"; version="0.3.2"; sha256="04j0cq56b46d2nvvdl2sg49ffydbqv0bdzf9ccbh21y9z05s195a"; depends=[plyr httr mapproj ggplot2 gridExtra maptools sp data_table rjson]; }; - Rbitcoin = derive { name="Rbitcoin"; version="0.9"; sha256="1l9k0pkxsdfm7aay47755zgx6k2b3pwnwxbzn80q5q27s1062pjv"; depends=[data_table RJSONIO RCurl digest]; }; - rbitcoinchartsapi = derive { name="rbitcoinchartsapi"; version="1.0.4"; sha256="0r272jvjh3rzch8dmn4s0a5n5k6dsir7pr4qswzfvafqjdiwjajz"; depends=[RJSONIO RCurl]; }; - rbmn = derive { name="rbmn"; version="0.9-2"; sha256="1zy832y399cmfmhpyfh7vfd293fylf1ylmp8w8krkmzkmyfa80f2"; depends=[MASS]; }; - rbounds = derive { name="rbounds"; version="2.0"; sha256="19xxz5dzzh706pp9391fq4v0g1fsd442x6mqqdvhkm51a9x0ih3p"; depends=[Matching]; }; - rbugs = derive { name="rbugs"; version="0.5-9"; sha256="1kvn7x931gjpxymrz0bv50k69s1x1x9mv34vkz54sdkmi08rgb3y"; depends=[]; }; - rbundler = derive { name="rbundler"; version="0.3.7"; sha256="0wmahn59h9vqm6bq1gwnf6mvfkyhqh6xvdc5hraszn1419asy26f"; depends=[devtools]; }; - RC = derive { name="RC"; version="1.0.2.13"; sha256="0rhbmmihsk09k1nhxkbq0kgxnynl4wfz4lq2jc9cvq8afirxi7wx"; depends=[igraph bitops]; }; - RCA = derive { name="RCA"; version="1.4.5"; sha256="0s200s28a6gh3dggad52dgqnf0k2jsfrqv1hbg8w2529v4s3dc5i"; depends=[igraph]; }; - R_cache = derive { name="R.cache"; version="0.10.0"; sha256="0y8q3w9z9cyzsg60x95kkc81ksc2d5vpdaqg5njq5bgjyw7yjqvs"; depends=[R_methodsS3 R_oo R_utils]; }; - RCALI = derive { name="RCALI"; version="0.2-6"; sha256="01zaks9mdgi9hcwsfvg3dwkihmb5ay5ilgg10fqcz2cssldj9x7x"; depends=[splancs]; }; - Rcapture = derive { name="Rcapture"; version="1.3-1"; sha256="1k6w5pyml5y2sdfjc1xpl2d5p6d8zj98kwndgir56hyrrrm7nxgx"; depends=[]; }; - rCarto = derive { name="rCarto"; version="0.8"; sha256="08813l4xfahjyn0jv48q8f6sy402n78dqsg01192pxl2dfc2i9ry"; depends=[RColorBrewer maptools classInt]; }; - RCassandra = derive { name="RCassandra"; version="0.1-3"; sha256="0xa241s81cyw6lfjb522f2mlyrd0gav9yz3z5jab9hpdpgg9ri38"; depends=[]; }; - rcdd = derive { name="rcdd"; version="1.1-8"; sha256="09bb92rp44palx9dvc9pb0gdmb1g22289xjk8p9s918lalc6i9aw"; depends=[]; }; - rcdk = derive { name="rcdk"; version="3.2.3.2"; sha256="0av5g1yhixx4px8xadg0645a31rgzbpfk2gpf8szxjlb16yvb7cs"; depends=[fingerprint rJava rcdklibs png iterators]; }; - rcdklibs = derive { name="rcdklibs"; version="1.5.4"; sha256="0ffqvyrawr3n7y6yfag3lpqaz4z2v8ng3kr9h4qfmmab317njwwn"; depends=[rJava]; }; - RCEIM = derive { name="RCEIM"; version="0.1"; sha256="1z9vp5x4zsc2rg6b080aw88p57gg5xl88psmk0dvy30l39wm4qx5"; depends=[]; }; - Rcell = derive { name="Rcell"; version="1.2-6"; sha256="0wly2wgm7506a9f26jbq2b0v9wlh2wyp086r2vi6bia9j8sxhi0c"; depends=[proto plyr reshape ggplot2 digest]; }; - Rcgmin = derive { name="Rcgmin"; version="2013-02.20"; sha256="1y6095vapb3r8p9i5hqa14gfpl4q3g2n82nb64429kl6w3mlfk8f"; depends=[numDeriv]; }; - Rchoice = derive { name="Rchoice"; version="0.1"; sha256="030x42jq6dd25g7isk5m9s0v9rfqkkj7i7286i9as1mpn73nlyz5"; depends=[maxLik Formula sandwich ggplot2 plotrix car lmtest]; }; - rChoiceDialogs = derive { name="rChoiceDialogs"; version="1.0.4"; sha256="12gzfw0r1ljk81j7hglgsmdm7xwa2n2w2f56sg684l26jyqsaw1z"; depends=[rJava]; }; - rcicr = derive { name="rcicr"; version="0.2.1"; sha256="0676h5n4r7ymfjq4z0y9rxx842w2byn73335k6wqxxf9sy29lsgc"; depends=[matlab aspace jpeg]; }; - RCircos = derive { name="RCircos"; version="1.1.2"; sha256="0j7ww2djnhpra13vjr6y772sg64ikdmw1z68lpp9i7d0shlc3qx9"; depends=[]; }; - RClimMAWGEN = derive { name="RClimMAWGEN"; version="1.1"; sha256="0icy560llfd10mxlq0xmc6lbg6a030za9sygw1rpz8sk5j0lvb84"; depends=[climdex_pcic RMAWGEN]; }; - rClinicalCodes = derive { name="rClinicalCodes"; version="1.0.1"; sha256="1p4p8r2n0k8h9xdzbngb95rshjp3376f5lsx228biqmswhpkhvlf"; depends=[stringr RCurl XML rjson tm]; }; - Rclusterpp = derive { name="Rclusterpp"; version="0.2.3"; sha256="02s5gmmmd0l98wd1y884pjl3h289dyd9p9s7dh7yl2zaslqs2094"; depends=[Rcpp RcppEigen]; }; - rCMA = derive { name="rCMA"; version="1.0.0"; sha256="16d3cdxiaq65lwbvq8wjcp89vrfdp9kwrdl2jy9fynsg0v2lasvp"; depends=[rJava]; }; - Rcmdr = derive { name="Rcmdr"; version="2.0-4"; sha256="0py5qfr1zk83hgp06xvypz5b9nml5km5xwp2hzy3cf4fd2xjkl3q"; depends=[tcltk2]; }; - RcmdrMisc = derive { name="RcmdrMisc"; version="1.0-0"; sha256="09798qhx6qcmwpqcmn3fmaww861i5lsbqbmsbq3kx58lmablxs53"; depends=[abind Hmisc MASS e1071 car]; }; - RcmdrPlugin_BCA = derive { name="RcmdrPlugin.BCA"; version="0.9-7"; sha256="1r4mib6r6qdhkbysxjs7s49j2l1qivlksaixzyz321jwsilpl411"; depends=[BCA car Rcmdr]; }; - RcmdrPlugin_coin = derive { name="RcmdrPlugin.coin"; version="1.0-21"; sha256="10fapjk74fpknym3pf2c0g25c4sk0pkfkakfy2c5fw9nw4a1j71f"; depends=[Rcmdr coin survival multcomp]; }; - RcmdrPlugin_depthTools = derive { name="RcmdrPlugin.depthTools"; version="1.3"; sha256="09mjn5jn4rdj1lh515vr3xlnk615flg13kcwbpk0an2si4xkgm9h"; depends=[Rcmdr depthTools]; }; - RcmdrPlugin_doBy = derive { name="RcmdrPlugin.doBy"; version="0.1-3"; sha256="0nza4y8px90fbhqs9wyjy9302cjavvk72kr1553ljcyh16hjwmmr"; depends=[Rcmdr doBy]; }; - RcmdrPlugin_DoE = derive { name="RcmdrPlugin.DoE"; version="0.12-2"; sha256="19axgapk8scqi1ky3r3m2dn942z1q6licsaym6ky7a6lygs52k4z"; depends=[DoE_base FrF2 DoE_wrapper relimp Rcmdr]; }; - RcmdrPlugin_doex = derive { name="RcmdrPlugin.doex"; version="0.2.0"; sha256="0l3c8vwifyl8a7qkfaqxm7cws2cg1g501qa93w5svcgp03yf98mj"; depends=[Rcmdr multcomp]; }; - RcmdrPlugin_EACSPIR = derive { name="RcmdrPlugin.EACSPIR"; version="0.2-1"; sha256="0fn12acbjh0n402hn9whhhyij3jlwmvlawyfi9myimnb4wyaqgwb"; depends=[R2HTML abind ez nortest reshape Rcmdr]; }; - RcmdrPlugin_EBM = derive { name="RcmdrPlugin.EBM"; version="1.0-3"; sha256="189q5k7lr9laq4s10hhjnd4mfdrdjqxf7sn2q1gq9nfglcpkwql6"; depends=[Rcmdr epiR abind]; }; - RcmdrPlugin_epack = derive { name="RcmdrPlugin.epack"; version="1.2.5"; sha256="1577qhac4rldifax5x3l39cddan6dhq2dv4iv2n64nadgrl0259w"; depends=[Rcmdr TeachingDemos tseries abind MASS xts forecast]; }; - RcmdrPlugin_EZR = derive { name="RcmdrPlugin.EZR"; version="1.24"; sha256="1zcpj1xcbmcyrbsr0gsndm5p6qls57zrkjcidk8y27pyd6gim2zj"; depends=[Rcmdr]; }; - RcmdrPlugin_HH = derive { name="RcmdrPlugin.HH"; version="1.1-40"; sha256="0i85bbzy46jk8568d7mx1fwq9zk51iq1jjwr2mnik4zh6914f9h5"; depends=[HH lattice latticeExtra rgl Rcmdr multcomp leaps]; }; - RcmdrPlugin_IPSUR = derive { name="RcmdrPlugin.IPSUR"; version="0.1-8"; sha256="1xgirbwcc2jz16da9fw553phxd2i4ky5jqzspdccj1i7fd4l625m"; depends=[Rcmdr]; }; - RcmdrPlugin_KMggplot2 = derive { name="RcmdrPlugin.KMggplot2"; version="0.2-0"; sha256="1w4n7r3sp6h87wxhrzg500w90p8dzr43j28p8p1r2y0v0i0v6mk5"; depends=[ggplot2 ggthemes gtable plyr Rcmdr RColorBrewer scales survival tcltk2]; }; - RcmdrPlugin_lfstat = derive { name="RcmdrPlugin.lfstat"; version="0.7"; sha256="009yj9c5cr34k8qa16q19sp7c5iwv95g9swbm004nr18mfah8x9w"; depends=[lfstat Rcmdr]; }; - RcmdrPlugin_MA = derive { name="RcmdrPlugin.MA"; version="0.0-1"; sha256="1l4nvwa0gq83ndkc190l7lba76d9gnf52k4p1z5jfpc9p9s6c20k"; depends=[MAd metafor Rcmdr]; }; - RcmdrPlugin_mosaic = derive { name="RcmdrPlugin.mosaic"; version="1.0-7"; sha256="0k6xaz2dfm9ch9lxqsh19jm8d4bbyjj2ffmjjxl57kanb3pvrrwv"; depends=[ENmisc vcd Hmisc Rcmdr]; }; - RcmdrPlugin_MPAStats = derive { name="RcmdrPlugin.MPAStats"; version="1.1.5"; sha256="0km6yglhn0128kk1xm2mnrkr2lkv3r9zndhlv7h1dkd16aph3vm3"; depends=[Rcmdr ordinal]; }; - RcmdrPlugin_NMBU = derive { name="RcmdrPlugin.NMBU"; version="1.7.3"; sha256="07xghjyzpvlgav716fmm3xjk617h84m48qrjpj2nin1hkgbaab31"; depends=[mixlm MASS pls Rcmdr]; }; - RcmdrPlugin_orloca = derive { name="RcmdrPlugin.orloca"; version="4.1"; sha256="19qj6llr5sfw267dgbn2jvrsisb54qbjhgaiigfzymk6px33wwmg"; depends=[orloca orloca_es Rcmdr]; }; - RcmdrPlugin_plotByGroup = derive { name="RcmdrPlugin.plotByGroup"; version="0.1-0"; sha256="10wc7lnihsrldsynq2s0syr1aqmvfnj9rhgwh1nkk7jlrwcgj0z6"; depends=[Rcmdr lattice]; }; - RcmdrPlugin_pointG = derive { name="RcmdrPlugin.pointG"; version="0.6.6"; sha256="0sc3akbpdys353va05b40g3rq8qihw0pmhvv0kckkhsgrbr8mc07"; depends=[Rcmdr RColorBrewer]; }; - RcmdrPlugin_qual = derive { name="RcmdrPlugin.qual"; version="2.2.6"; sha256="00wznh0k909cd9vwdj1ag3224xkqnwjsad1bfkgxbszsx0w6xvy9"; depends=[Rcmdr]; }; - RcmdrPlugin_sampling = derive { name="RcmdrPlugin.sampling"; version="1.1"; sha256="0fx0s63wq0si1jydl9xyj9ny7iglg91zpvkyrnc05i5pan9l3xd9"; depends=[lpSolve sampling MASS Rcmdr]; }; - RcmdrPlugin_SCDA = derive { name="RcmdrPlugin.SCDA"; version="1.0"; sha256="0z43hhp798kga70xmiq4wzp5iad553rndn17g3va3dh6lz1k3y3h"; depends=[SCVA SCRT SCMA Rcmdr]; }; - RcmdrPlugin_seeg = derive { name="RcmdrPlugin.seeg"; version="1.0"; sha256="105c2rl3mrcv7r3iqa9d2zs6cys7vfpyydylkg2cggfqkghxgr95"; depends=[Rcmdr seeg spatstat sgeostat]; }; - 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]; }; - RcmdrPlugin_sos = derive { name="RcmdrPlugin.sos"; version="0.3-0"; sha256="1r9jxzmf5ks62b5jbw0pkf388i1lnld6i27xhfzysjqdxcnzdsdz"; depends=[sos Rcmdr tcltk2]; }; - RcmdrPlugin_StatisticalURV = derive { name="RcmdrPlugin.StatisticalURV"; version="1.0-1"; sha256="04pqqgy12rnhwm8l0752hb9p5h4l11mm7flm6n9kkcvbkvagsbrz"; depends=[agricolae multcomp car Rcmdr]; }; - RcmdrPlugin_survival = derive { name="RcmdrPlugin.survival"; version="1.0-4"; sha256="03rgr9klf2d1ml8i2avf9lncjr3bfcb4v7mcwg800wwdjzkwqkql"; depends=[survival date Rcmdr]; }; - RcmdrPlugin_TeachingDemos = derive { name="RcmdrPlugin.TeachingDemos"; version="1.0-7"; sha256="0d473p0df99x9a3jfwb49gxsrcvslcw9yandramwq82cwy3sdcxw"; depends=[rgl TeachingDemos Rcmdr]; }; - RcmdrPlugin_temis = derive { name="RcmdrPlugin.temis"; version="0.7"; sha256="1h1s2r2vz4sjnw25hvm13laflhlva28shlkg5kq6qk98p802gr19"; depends=[tm NLP slam zoo lattice Rcmdr tcltk2 ca R2HTML RColorBrewer latticeExtra stringi]; }; - RcmdrPlugin_UCA = derive { name="RcmdrPlugin.UCA"; version="1.0-2"; sha256="11a8jaz5vycq8hnpxzrbv1g8vyh0ic1y48952ah633b2j1m1ay8i"; depends=[Rcmdr]; }; - Rcolombos = derive { name="Rcolombos"; version="1.5.0"; sha256="139ayyc94m6srbcccw1j8p4by5nxy7s52ahvdq2ag183hk91gjq4"; depends=[httr]; }; - RColorBrewer = derive { name="RColorBrewer"; version="1.0-5"; sha256="0y4ficfdjzrd7lkcaafjrdqr5r3jiha7rvg76h8m5yak396c9has"; depends=[]; }; - Rcplex = derive { name="Rcplex"; version="0.3-2"; sha256="1hx9s327af7yawzyq5isvx8n6pvr0481lrfajgh8nihj7g69nmk7"; depends=[slam]; }; - RCPmod = derive { name="RCPmod"; version="1.4"; sha256="1psn1w8ws0n96jqvd98l0wl0l46w0691c5vm9aarql2pqnc73lw9"; depends=[numDeriv gtools]; }; - Rcpp = derive { name="Rcpp"; version="0.11.2"; sha256="1b42kmm314xzcjldcqaljsqfxczh8czjzl9afds372vh7asjmjm1"; depends=[]; }; - Rcpp11 = derive { name="Rcpp11"; version="3.1.1"; sha256="03a28n1nk9xrl055xnnzvla8qdq8k856bj7vim2fyws5kw9b8sbp"; depends=[]; }; - RcppBDT = derive { name="RcppBDT"; version="0.2.3"; sha256="0gnj4gz754l80df7w3d5qn7a57z9kq494n00wp6f7vr8aqgq8wi1"; depends=[Rcpp]; }; - rcppbugs = derive { name="rcppbugs"; version="0.1.4.1"; sha256="0wb5mzw1sdrr7lc6izilv60k5v0wcvy8q31a863b63a9jvh16g8d"; depends=[Rcpp]; }; - RcppClassic = derive { name="RcppClassic"; version="0.9.5"; sha256="193nsplyqd1fb7hwxsk0s7dz6rm6rw7lp04jff08mswcjdkh69g4"; depends=[Rcpp]; }; - RcppClassicExamples = derive { name="RcppClassicExamples"; version="0.1.1"; sha256="0shs12y3gj5p7gharjik48dqk0fy4k2jx7h22ppvgbs8z85qjrb8"; depends=[Rcpp RcppClassic]; }; - RcppCNPy = derive { name="RcppCNPy"; version="0.2.3"; sha256="1baz9272vwc44yab7xb6ig0gd2gj8idrhywir2zq77q8bfhqc9gh"; depends=[Rcpp]; }; - RcppDE = derive { name="RcppDE"; version="0.1.2"; sha256="0ji5csfygqvrcahgx5gxy7dddpykckzw8hmqslsdl7l68wj60qkc"; depends=[Rcpp RcppArmadillo]; }; - RcppEigen = derive { name="RcppEigen"; version="0.3.2.1.2"; sha256="010a27jby8c61mgw2qb47zkln1v33gj0xcn8lf7sw0kb2mdh58yl"; depends=[Matrix Rcpp]; }; - RcppExamples = derive { name="RcppExamples"; version="0.1.6"; sha256="1jnqh9nii5nncsah0lrkls8dqqcka9fnbvfg8ikl4cqjri17rpbv"; depends=[Rcpp]; }; - RcppGSL = derive { name="RcppGSL"; version="0.2.2"; sha256="0f47bs3ll42wxday2bg7w5fnv8a4280yvmzkjzn3b36v8wvm44g8"; depends=[Rcpp]; }; - RcppMLPACK = derive { name="RcppMLPACK"; version="1.0.9"; sha256="042pznzd9b43k8n57xlbl1k4w6pzn4miv44qv3cf7w5br2rk1ks7"; depends=[Rcpp]; }; - RcppOctave = derive { name="RcppOctave"; version="0.14.1"; sha256="0fdljr0jdnardcm2qm29ibz16xymal8xac3p4grscipa44vm1w0b"; depends=[Rcpp pkgmaker digest stringr]; }; - RcppProgress = derive { name="RcppProgress"; version="0.1"; sha256="1gvj51gadljaakm1nxdwgxzh723vv3ypzpzsgacsppxpj4rivxq4"; depends=[Rcpp]; }; - RcppRedis = derive { name="RcppRedis"; version="0.1.1"; sha256="0q05m4vssvk9xyxskdvpgwm3mhif2xbwggpwkyxdn7frsfz2fpvm"; depends=[Rcpp RApiSerialize]; }; - RcppRoll = derive { name="RcppRoll"; version="0.1.0"; sha256="0xwm64z7pr2cjmq4kri7zzhy7wvq7aj9lq3xm2g830fn71qvj8x3"; depends=[Rcpp RcppArmadillo]; }; - RcppSMC = derive { name="RcppSMC"; version="0.1.4"; sha256="1gcqffb6rkw029cpzv7bzsxaq0a5b032zjvriw6yjzyrpi944ip7"; depends=[Rcpp]; }; - RcppXts = derive { name="RcppXts"; version="0.0.4"; sha256="143rhz97qh8sbr6p2fqzxz4cgigwprbqrizxpkjxyhq8347g8p4i"; depends=[Rcpp xts]; }; - RcppZiggurat = derive { name="RcppZiggurat"; version="0.1.2"; sha256="05ai6s2j025fvr4znpmsvhxj4x7xyw2wsb9j3c5sv7aw1byfs0bb"; depends=[Rcpp]; }; - rcqp = derive { name="rcqp"; version="0.3"; sha256="0vxcgchnxdsdamclcshjbkn00ysmfmqp586a36wsyv3zqrd6rg7p"; depends=[plyr]; }; - Rcsdp = derive { name="Rcsdp"; version="0.1.53"; sha256="0x91hyx6z9f4zd7djxlq7dnznmr9skyzwbbcbjyid9hxbcfyvhcp"; depends=[]; }; - rCUR = derive { name="rCUR"; version="1.3"; sha256="1f38xbc5n91k2y88cg0sv1z2p4g5vl7v2k1024f42f7526g2p2lx"; depends=[MASS Matrix lattice]; }; - RCurl = derive { name="RCurl"; version="1.95-4.3"; sha256="1gyjarnxwz3ldpm1vwq9ls6al66rvs7yshzhrl1fv9lbm1qi8yfg"; depends=[bitops pkgs.curl]; }; - Rd2roxygen = derive { name="Rd2roxygen"; version="1.4"; sha256="09dxgp65zac5b9mxbjrvy3ihdwski98xva5afq659b8yfvkviq4g"; depends=[roxygen2 formatR]; }; - rda = derive { name="rda"; version="1.0.2-2"; sha256="1g2q7c0y138i9r7jgjrlpqznvwpqsj6f7vljqqfzh2l6kcj43vjj"; depends=[]; }; - rdatamarket = derive { name="rdatamarket"; version="0.6.4"; sha256="16a1yxvf841505a8gh7jf09fx6ipysymrpvsd4b07xdg5hvbzx25"; depends=[zoo RCurl RJSONIO]; }; - rdd = derive { name="rdd"; version="0.56"; sha256="1x61ik606mwn46x3qzgq8wk2f6d5qqr95h30bz6hfbjlpcxw3700"; depends=[sandwich lmtest AER Formula]; }; - rdetools = derive { name="rdetools"; version="1.0"; sha256="0pkl990viv7ifr7ihgdcsww93sk2wlzp2cg931wywagfp8dijd02"; depends=[]; }; - R_devices = derive { name="R.devices"; version="2.9.2"; sha256="14nr2alx59xm2cagpqrzviw7lxwxdrv9y42wb60230439nh3gpla"; depends=[R_methodsS3 R_oo R_utils base64enc]; }; - RDIDQ = derive { name="RDIDQ"; version="1.0"; sha256="09gincmxv20srh4h82ld1ifwncaibic9b30i56zhy0w35353pxm2"; depends=[]; }; - RDieHarder = derive { name="RDieHarder"; version="0.1.3"; sha256="0wls7b0qfbi6hsq9xdywi4mdhim5b6mrzhvyrm9dxp9z1k7imz6m"; depends=[]; }; - Rdistance = derive { name="Rdistance"; version="1.1"; sha256="1rgjiks4s5l0vdj4svik9zz6kwwxsh9nj6q2ng7iblny6iqm6kbd"; depends=[]; }; - rDNA = derive { name="rDNA"; version="1.30.1"; sha256="12h83zirv55sryc1zww97ws8kvsym1z7p7y5d4w43nam8mi3fpcd"; depends=[rJava]; }; - Rdpack = derive { name="Rdpack"; version="0.4-14"; sha256="19vscr9l63c074n76b6a6jbl956sphjhz0d50yiwp3cvqf28yssf"; depends=[gbRd bibtex]; }; - rdrobust = derive { name="rdrobust"; version="0.6"; sha256="074lj2nz0rqxdx6cyd5cf3c073b0ra6d3pxpvp5dhx6iqzmpwcdp"; depends=[]; }; - rdryad = derive { name="rdryad"; version="0.1.1"; sha256="0mqpkmwkznyxj0nn1v389p741dlc66dixcvljsn2rvg0q6p75fkj"; depends=[XML RCurl OAIHarvester ape gdata plyr stringr RJSONIO]; }; - RDS = derive { name="RDS"; version="0.6"; sha256="14zk511agqckriqjiaargglzsw14mch8q7zh97qd38xg0568mh73"; depends=[ggplot2 gridExtra rgexf igraph scales locfit Hmisc reshape2]; }; - Rdsm = derive { name="Rdsm"; version="2.0.2"; sha256="1wzfc72zjvqdffkyp19zflab88r9yb3qrd0d96k8453dgmz8aygp"; depends=[bigmemory]; }; - RDSTK = derive { name="RDSTK"; version="1.1"; sha256="07vfhsyah8vpvgfxfnmp5py1pxf4vvfzy8jk7zp1x2gl6dz2g7hq"; depends=[plyr rjson RCurl]; }; - rDVR = derive { name="rDVR"; version="0.1.1"; sha256="19a4f9k65bd49vkn3sxkjdmcpwyawk7gwmvancvqr745gfgs0wzg"; depends=[RCurl]; }; - rdyncall = derive { name="rdyncall"; version="0.7.5"; sha256="0w7dwjswf8dx2w1piyrqr1wixmmlkgzlfwnnxvbiy2mfy1lwd04r"; depends=[]; }; - ReacTran = derive { name="ReacTran"; version="1.4.1"; sha256="01k3w6iffql198na968dmqgzsqgd1kwrjb34yw7mzppyisjcyv0k"; depends=[rootSolve deSolve shape]; }; - readbitmap = derive { name="readbitmap"; version="0.1-2"; sha256="11cha65hl5r8h143pnf54mxa0lpqphzi9l0n4bg24bjpdz15cppi"; depends=[bmp jpeg png]; }; - readBrukerFlexData = derive { name="readBrukerFlexData"; version="1.7"; sha256="0ajahma356aicl0jpwpdynf35yrh74z8zwjhav4h7v57zlvwhh1f"; depends=[]; }; - reader = derive { name="reader"; version="1.0.1"; sha256="1320kmysri660p54l86n260nrxskpfrwn4zbbwvp7w9fcqa09zyn"; depends=[NCmisc]; }; - readMLData = derive { name="readMLData"; version="0.9-6"; sha256="15rb8hm60fc30xgxjwxl7v5blzf02s6cb8pk0p26cgn9liiavjhb"; depends=[XML]; }; - readMzXmlData = derive { name="readMzXmlData"; version="2.7"; sha256="1c4q2ghp7mr1i3547vdq3mhvhqz0y2il5za5milrwb72wpq1cdfi"; depends=[base64enc digest XML]; }; - readODS = derive { name="readODS"; version="1.4"; sha256="00xcas8y0cq3scgi9vlfkrjalphmd7bsynlzpy7izxa5w9b7x79f"; depends=[XML]; }; - reams = derive { name="reams"; version="0.1"; sha256="07hqi0y59kv5lg0nl75xy8n48zw03y5m71zx58aiig94bf3yl95c"; depends=[leaps mgcv]; }; - Rearrangement = derive { name="Rearrangement"; version="1.0"; sha256="0biyg2m0ip2x4fwfw7c1ynidzb5cvdlr0gycx90w319jlz3rxqz0"; depends=[quantreg]; }; - REBayes = derive { name="REBayes"; version="0.45"; sha256="0r3adc98x84ynqh682ngr7ghf0bzqhqbjay7lq842iny2wqwi6yz"; depends=[Rmosek Matrix SparseM]; }; - rebird = derive { name="rebird"; version="0.1.1"; sha256="0s8wmp2sghs56ppca57fjfab7wngszmy1g8rd3hiwx6br0sjidcg"; depends=[RJSONIO httr RCurl plyr]; }; - rebmix = derive { name="rebmix"; version="2.6.1"; sha256="0yh284z0mfa24m27r5sm1qlaagz5vvd83wq7jyc42ahnfm7cm8gv"; 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=[]; }; - ReCiPa = derive { name="ReCiPa"; version="3.0"; sha256="019vlvgxnqqlwghxygfqggzp2b4x2pqzdrbhaa703zdhm58k0n1g"; depends=[]; }; - recluster = derive { name="recluster"; version="2.5"; sha256="1hyq3nxbkah9jmly9a7ykzrf72r8yyd5ra5hf6d8fcprg15h8gg2"; depends=[vegan ape picante phangorn phytools cluster]; }; - recommenderlab = derive { name="recommenderlab"; version="0.1-4"; sha256="0ays9y3l7nj4vcbdraqv627lv0vf3wiqfszcqrh74h8jz9nnx78d"; 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]; }; - Records = derive { name="Records"; version="1.0"; sha256="08y1g2m6bdrvv4rpkhd5v2lh7vprxy9bcx9ahp1f7p062bn2lwji"; depends=[]; }; - RECSO = derive { name="RECSO"; version="1.0"; sha256="1ipjfxk58wkrq6a0nqrg9b734xj1qa8xnr44xigbpjrpdqd5j3lm"; depends=[]; }; - REdaS = derive { name="REdaS"; version="0.9.1"; sha256="0nd0d6cnx43k73cygbw0r6hdxpwkzwrlm4vr60s6hk227am15z68"; depends=[]; }; - REEMtree = derive { name="REEMtree"; version="0.90.3"; sha256="01sp36p12ky8vgsz6aik80w4abs70idr9sn4627lf94r92wwwsbc"; depends=[nlme rpart]; }; - ref = derive { name="ref"; version="0.99"; sha256="0f0yz08pqpg57mcm7rh4g0rbvlcvs5fbpjkfrq7fmj850z1ixvw0"; depends=[]; }; - referenceIntervals = derive { name="referenceIntervals"; version="1.1"; sha256="0lw233rsyii3bjzj262qq85sf3sgj3nq7r8siwfn115amjbi6r6r"; depends=[boot extremevalues car outliers]; }; - RefFreeEWAS = derive { name="RefFreeEWAS"; version="1.3"; sha256="1cb1q2nki0d18ia4cmi1sp7qih9hv7g1jk1kyp7vya5gp572z3cd"; depends=[isva]; }; - refGenome = derive { name="refGenome"; version="1.2.0"; sha256="038v9pwh8fra31l14bwb2kyilmc9kqbvb9s1c0d79yxkx6znjc49"; depends=[RSQLite doBy]; }; - RefManageR = derive { name="RefManageR"; version="0.8.3"; sha256="0ik85hgf1v347kypb7k97nhr0dm2nqz156k9lkf8dcjml3f00sk0"; depends=[XML RCurl RJSONIO plyr bibtex lubridate stringr]; }; - refund = derive { name="refund"; version="0.1-11"; sha256="1afsxab1jivs4vj6diqh7352v98divna6az1dxsdn7lvw6cmph6y"; depends=[fda lattice boot mgcv MASS glmnet magic nlme wavethresh Matrix gamm4 matrixStats lme4 RLRsim]; }; - refund_wave = derive { name="refund.wave"; version="0.1"; sha256="1vnhg7gi5r8scwivqjwhrv72sq8asnm4whx3jk39saphdxpk5hxv"; depends=[glmnet wavethresh]; }; - RegClust = derive { name="RegClust"; version="1.0"; sha256="1d9w74phw4fgafglc18j7dpmln96fvxnf1kdc9zddgj90p8yfx63"; depends=[]; }; - REGENT = derive { name="REGENT"; version="1.0.5"; sha256="1id1bkrr0q1nwja8y7glb5wsq1hkx6gf1d09vbmfl62hslqblqn8"; depends=[]; }; - registry = derive { name="registry"; version="0.2"; sha256="1ifv9sql70kylfj12cdb1j1zpk3ix728m8qj46sf1zyc5mhll01s"; depends=[]; }; - reglogit = derive { name="reglogit"; version="1.2-2"; sha256="0nq60s8l860z6nd52l6c77vamis7hl2j667gkxry0jir2pxsk4jp"; depends=[mvtnorm boot Matrix]; }; - regpro = derive { name="regpro"; version="0.1.0"; sha256="0d47ffsqx1633pmf3abi7wksyng2g71mz2z9nb2zqdak794l1n44"; depends=[denpro]; }; - regress = derive { name="regress"; version="1.3-14"; sha256="0qnks28fr8siq95iiiqyvz82cbdg14i18rj7g9rqyjhiam12fshl"; depends=[]; }; - regRSM = derive { name="regRSM"; version="0.4"; sha256="1rg74jqj8rw69q6my0n4alflx7mgfwng35ff72bxwjhn9ghhj347"; depends=[]; }; - regsubseq = derive { name="regsubseq"; version="0.12"; sha256="0879r4r8kpr8jd6a3fa9cifm7cv0sqzz8z1alkm1b2fr1625md3g"; depends=[]; }; - regtest = derive { name="regtest"; version="0.05"; sha256="1wrrpp2hvkas0yc512gya3pvd0v97pn4v51k5jxkwyd1pp68zd1q"; depends=[]; }; - rehh = derive { name="rehh"; version="1.11"; sha256="1fvcwi9ijj886aswphblkxzgivmk76gr1m3s6zqblcbybxypm5cg"; depends=[gplots]; }; - rela = derive { name="rela"; version="4.1"; sha256="00ksm7zh1mpd2d5c5d823id3sxj0h3x0ccg6a40fadibvr1ay3ny"; depends=[]; }; - relaimpo = derive { name="relaimpo"; version="2.2-2"; sha256="1rxjg2yw2gyshaij98w83cshxwscnq3ql7bg13n7v4nbjsi1l6zh"; depends=[MASS boot survey mitools corpcor]; }; - relations = derive { name="relations"; version="0.6-3"; sha256="1hw6g297h2az5f97q2rr3f6mb9d681wrgl9p8f2q1z3ww39b5vgw"; depends=[cluster slam sets]; }; - relax = derive { name="relax"; version="1.3.15"; sha256="0cgvxw3pmy9kx8p81bb5n5nnbn6l9hm07k6hdy7p2j2gl15xxnpq"; depends=[]; }; - relaxnet = derive { name="relaxnet"; version="0.3-2"; sha256="1l83rk7r4vkcxbfljmibzm8lzpx0vf406hv4h5cy9x0k3rz2bfh0"; depends=[glmnet]; }; - relaxo = derive { name="relaxo"; version="0.1-2"; sha256="1rzmq7q3j271s6qwwrmwidv0vxcjpgjhyiqgr6fkczkai2lbnd8x"; depends=[lars]; }; - reldist = derive { name="reldist"; version="1.6-2"; sha256="0f5l74jmk8jxi43jyjxjv9cklk8359drjkjipz7972dm3a7i4rmw"; depends=[]; }; - relevent = derive { name="relevent"; version="1.0-3"; sha256="054x4kmc0h0s6a4svjqawy52sllzmaca46q6abnr5qhdzzmfh21n"; depends=[trust sna]; }; - Reliability = derive { name="Reliability"; version="0.0-2"; sha256="12zsicgbjqih3grbs62pw37x8wlkmnyc7g0yz6bqnfb4ym2yb7fg"; depends=[]; }; - ReliabilityTheory = derive { name="ReliabilityTheory"; version="0.1.4"; sha256="1faab4z3rp0xqc0s0rrkw4kxgyc332xz3sjaz1wd4p6kiydds2hi"; depends=[igraph sfsmisc combinat FRACTION mcmc PhaseType actuar HI]; }; - reliaR = derive { name="reliaR"; version="0.01"; sha256="000nafjp386nzd0n57hshmjzippiha6s6c4nfrcwl059dzmi088i"; depends=[]; }; - relimp = derive { name="relimp"; version="1.0-3"; sha256="1isn2ns3qiz985wrg7992dmmqxwdq75a9yhfqnb64xhnzzpcpszq"; depends=[]; }; - relSim = derive { name="relSim"; version="0.1-47"; sha256="13asl14f3547nl50jwrk72pbm2vx140k27gz3b38j28cpmvi03mz"; depends=[DNAtools]; }; - relsurv = derive { name="relsurv"; version="2.0-4"; sha256="1da3sj7hks5azm18m23fh8r2g02p0nivgilayndxwwvd1i70ycrx"; depends=[survival date MASS]; }; - RelValAnalysis = derive { name="RelValAnalysis"; version="1.0"; sha256="1jl1gfj44gfkmc1yp6g5wwn4miydwpvxwrg76rnkv9454zrc5pvp"; depends=[zoo]; }; - remix = derive { name="remix"; version="2.1"; sha256="0s1gaf7vj08xd4m7lc9qpwvk0mpamabbxk71970mfazx6hk24dr0"; depends=[plyr survival Hmisc ascii]; }; - rEMM = derive { name="rEMM"; version="1.0-8"; sha256="1d8nwranqfvr9c0g2ny7akawgqk5hjnr1mclk87gmbmwn9iwik34"; depends=[proxy MASS clusterGeneration igraph]; }; - remMap = derive { name="remMap"; version="0.1-0"; sha256="03jbrnk8nbaj6l8g428il5h6p2sszndd2bl4rvg8347pw7cp4kk1"; depends=[]; }; - Renext = derive { name="Renext"; version="2.1-0"; sha256="19920kb3qd97vm285zbxqarpq8dyyrx1k6sks990xjbgpy7vyj3y"; depends=[evd numDeriv]; }; - RenextGUI = derive { name="RenextGUI"; version="1.0-2"; sha256="0ghs8bwb6qdyvhghxvdy51cibylgm7bdbzgqsn1nbxam39yhvfv9"; depends=[gWidgets gWidgetstcltk Renext]; }; - rentrez = derive { name="rentrez"; version="0.2.4"; sha256="00ixhzwk9s802n4msd63aika2g315cw8kppr0rq02wkch7a2nl3w"; depends=[RCurl XML]; }; - 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]; }; - Reot = derive { name="Reot"; version="0.1.0"; sha256="0kpp5mg7dpfas77mw95ryfknjvdx7vwah42dip1kgyy7sxqqhn3h"; depends=[Rcpp raster foreach]; }; - RepeatedHighDim = derive { name="RepeatedHighDim"; version="2.0.0"; sha256="1n9w4jb25pm0mmsahlfhkp9jmhgp5b21l1g85gm2wbxqkjsg7g0g"; depends=[MASS nlme]; }; - repfdr = derive { name="repfdr"; version="1.0"; sha256="1rscfbnq739al5pac1y9szjw2g6f9z6qimkvhrkn9xfchjw3jvky"; depends=[locfdr]; }; - repmis = derive { name="repmis"; version="0.2.9"; sha256="0ivk7sfnjia6xqsk7z0sqjdyhkrr894zpjfgm3l1sqnxam001rm2"; depends=[digest httr plyr R_cache xlsx]; }; - repolr = derive { name="repolr"; version="2.0"; sha256="10wg07sfxcxzswf3zh5sx2cm9dxjx11zymy82a4q9awnacb5gp9b"; depends=[gee]; }; - ReporteRs = derive { name="ReporteRs"; version="0.5.5"; sha256="1g6dsdjzzc144z992cp9cd65naj4ll2b616562wlqz9983jzaap4"; depends=[ReporteRsjars rJava base64]; }; - ReporteRsjars = derive { name="ReporteRsjars"; version="0.0.1"; sha256="0y2kzlyw2yf65jvawrvwwqhwwp0yw3ssx8y4jwkcyqn66b6gzh8j"; depends=[rJava]; }; - reportr = derive { name="reportr"; version="1.1.2"; sha256="0lxnmay9vgg7dsa3scszx3v4lb6m3bv6kjl0dk7hrl7bd67azdrk"; depends=[]; }; - reportRx = derive { name="reportRx"; version="1.0"; sha256="0npiflql0lq8sqp6xgydxbw7xdr0zdxj1s2h4bnpmn4clc05r7m4"; depends=[reshape survival xtable aod cmprsk geoR stringr]; }; - reports = derive { name="reports"; version="0.1.2"; sha256="14w9dlhvk4080sq03ad3dhcww7c213f8ygbnxm7kxcpk36j71yjn"; depends=[knitr knitcitations]; }; - reporttools = derive { name="reporttools"; version="1.1.1"; sha256="0cnxzq679f860z063j3pbm2c5qcaz45g73khj9rdp3if0cci8ikj"; depends=[xtable]; }; - REPPlab = derive { name="REPPlab"; version="0.2"; sha256="1d3mb4mi17xlvyw9dgrcad6gfnyk0v1s0safxqyarm4xmh1bppzw"; depends=[rJava lattice]; }; - represent = derive { name="represent"; version="1.0"; sha256="0jvb40i6r1bh9ysfqwsj7s1g933d7z5fq9d618yjrqr6hbbqsvac"; depends=[]; }; - REQS = derive { name="REQS"; version="0.8-12"; sha256="049glqhc8h8gf425kmj92jv70917dsigpm37diby0c6hb4jrg8ka"; depends=[gtools]; }; - resample = derive { name="resample"; version="0.2"; sha256="1p6hyd0wi037bsz0xd9gkw28sp4nkj1zmqs9h0lzkxbspn6h0q7j"; depends=[]; }; - resemble = derive { name="resemble"; version="1.1.1"; sha256="0mz5mxm6p1drfx2s9dx35m2bnvirr8lkjjh5b4vdk9p2cdv1qkkv"; depends=[RcppArmadillo foreach iterators pls Rcpp]; }; - reshape = derive { name="reshape"; version="0.8.5"; sha256="08jm9fb02g1fp9vmiqmc0yki6n3rnnp2ph1rk8n9lb5c1s390f4k"; depends=[plyr]; }; - reshape2 = derive { name="reshape2"; version="1.4"; sha256="0i3bim4clwyfdwwrmszsn9ga5gm4a2sh1i0jmpji3afbxc151yjp"; depends=[plyr stringr Rcpp]; }; - reshapeGUI = derive { name="reshapeGUI"; version="0.1.0"; sha256="0kb57isws8gw0nlr6v9lg06c8000hqw0fvhfjsjyf8w6zwbbq3zs"; depends=[reshape2 plyr gWidgets gWidgetsRGtk2]; }; - ResistorArray = derive { name="ResistorArray"; version="1.0-28"; sha256="055zr4rybgrvg3wsgd9vhyjpvzdskrlss68r0g7rnj4yxkix0kxz"; depends=[]; }; - ResourceSelection = derive { name="ResourceSelection"; version="0.2-4"; sha256="01r1w03paazyix5jjxww89falba1qfiqcznx79a6fmsiv8gm2x5w"; depends=[]; }; - restlos = derive { name="restlos"; version="0.1-2"; sha256="14nbi8xqjs9plkzamg0ja1mx7klpbnnglk7p2nipz551b0nmzn7i"; depends=[som rgl ade4 geometry nnclust]; }; - restorepoint = derive { name="restorepoint"; version="0.1.5"; sha256="0xmpxprirnd1yavwk3vkc0cp715d187mn0amppya7kd47iw10wsy"; depends=[]; }; - retimes = derive { name="retimes"; version="0.1-2"; sha256="019sllyfahlqnqry2gqw4w5cy4cavrqnwpwrbb25cgjpdb19raja"; depends=[]; }; - reutils = derive { name="reutils"; version="0.1.2"; sha256="0f2c6zxk6x2plq649b1ml6b112j6y8ys074pn30yw35ncg3h86fa"; depends=[assertthat RCurl XML]; }; - revealedPrefs = derive { name="revealedPrefs"; version="0.1"; sha256="1akinhrvw3rmsxircnj2ymfphsca50j2jda5v4kqcprpigf1i8j1"; depends=[Rcpp]; }; - review = derive { name="review"; version="2.5"; sha256="0qk4n6g0hp49rjqhpipgja777namdafk6yf4kcxdld1cghdikw31"; depends=[XML Hmisc]; }; - reweight = derive { name="reweight"; version="1.2.1"; sha256="0fv7q1zb3f4vplg3b5ykb1ydwbzmiajgd1ihrxl732ll8rkkfa4v"; depends=[]; }; - rexpokit = derive { name="rexpokit"; version="0.24.1"; sha256="143zi6qb0l8vbx87jf58v1zfxqmvv6x4im1knd6q4dpp9gffqs22"; depends=[SparseM Rcpp]; }; - Rfacebook = derive { name="Rfacebook"; version="0.4"; sha256="0f5wbd16a7wsw1fpficz6i2vrwyw3n75a1qm4dv5181jr6ik492p"; depends=[httr rjson]; }; - rFerns = derive { name="rFerns"; version="0.3.3"; sha256="0d0zkqqqv9l71a5bjps1m69mrpqxkzs77zlf6kbg70b053dzhiph"; depends=[]; }; - RFGLS = derive { name="RFGLS"; version="1.1"; sha256="13ggxj74h5b2hfhjyc50ndxznkvlg18j80m78hkzwh25d3948fsk"; depends=[bdsmatrix Matrix]; }; - rfigshare = derive { name="rfigshare"; version="0.3.6"; sha256="1n6i5ppn3v93126gvva8sn85v1h4f7hgc43pxja9bwr1ypmzgr45"; depends=[RJSONIO httr httpuv plyr yaml ggplot2 XML]; }; - R_filesets = derive { name="R.filesets"; version="2.4.0"; sha256="1970x41g7wxspslfijmx021z06s3lfw5wz0mr8h5bk1y8sj0gsvk"; depends=[R_oo R_methodsS3 R_utils R_cache digest]; }; - RFinanceYJ = derive { name="RFinanceYJ"; version="0.3.1"; sha256="0qhmzsch7c2p0zckjkspsajzh8m10cf75ixjlgd0nj8rm41fngm3"; depends=[XML xts]; }; - rfishbase = derive { name="rfishbase"; version="0.2-2"; sha256="09pa5zpw9rclf5pqj1wjjhdcblca9sm9xcs9ka3xfa7azj7n9ljd"; depends=[XML RCurl]; }; - rfisheries = derive { name="rfisheries"; version="0.1"; sha256="1g0h3icj7cikfkh76yff84hil23rfshlnnqmgvnfbhykyr2zmk61"; depends=[httr data_table assertthat ggplot2 rjson]; }; - Rfit = derive { name="Rfit"; version="0.18"; sha256="06zpk4nyhqcq9py5i8c4zvz02csax39r09ays97w5k24zrnwk0q9"; depends=[quantreg]; }; - RFLPtools = derive { name="RFLPtools"; version="1.5"; sha256="0j3cdjibmdhg1qsmbpw7zbw9jz6gy662z28849xsr7gppzm08xbw"; depends=[RColorBrewer]; }; - RfmriVC = derive { name="RfmriVC"; version="1.0.4"; sha256="15bzpwi01gb580wl0flvp7pwqf1sgk6fsdmfq4cqaprb979js79f"; depends=[mvtnorm mgcv Rniftilib]; }; - RFOC = derive { name="RFOC"; version="3.3-3"; sha256="101d7nf4zjni5kdk54w3afdaqnjzl7y90zygybkqpd0vi82q602b"; depends=[RPMG GEOmap RSEIS MASS splancs]; }; - RForcecom = derive { name="RForcecom"; version="0.7"; sha256="0rjav2rwanzqgi1yasbm9lj18f0mfxwd8w8x41skf656gfcpi0i4"; depends=[XML RCurl plyr]; }; - rforensicbatwing = derive { name="rforensicbatwing"; version="1.3"; sha256="0ff4v7px4wm5rd4f4z8s4arh48hgayqjfpnni2997c92wlsq3d12"; depends=[Rcpp]; }; - rfPermute = derive { name="rfPermute"; version="1.6.1"; sha256="1fpj0wjaxfqcp6z0azkmgqjsysgpm0vgg81pi6w9xs6a5nwa6wd1"; depends=[randomForest ggplot2 gridExtra]; }; - RFreak = derive { name="RFreak"; version="0.3-0"; sha256="1dmllxb6yjkfkn34f07j2g7w5m63b5d10lh9xsmxyfk23b8l3x0x"; depends=[rJava]; }; - rgabriel = derive { name="rgabriel"; version="0.7"; sha256="1c6awfppm1gqg7rm3551k6wyhqvjpyidqikjisg2p2kkhmyfkyzx"; depends=[]; }; - rgam = derive { name="rgam"; version="0.6.3"; sha256="0mbyyhhyr7ijv2sq9n7g0vaxivngwf4nbb5398xpsh7fxvgw5zdw"; depends=[Rcpp]; }; - rGammaGamma = derive { name="rGammaGamma"; version="1.0.12"; sha256="1051ah6q11qkxj1my4xybbzc8xcqkxfmps8mv2his5cyfllwidbs"; depends=[gsl]; }; - rgauges = derive { name="rgauges"; version="0.2.0"; sha256="0p42hh32wcjcchsalpsan52kvz6nd1gw28xnydqgfzkzcqkl22dd"; depends=[ggplot2 lubridate plyr httr reshape2 gridExtra scales data_table]; }; - rgbif = derive { name="rgbif"; version="0.7.0"; sha256="123kcwpc6n7av5waf225cc98qrdzswf5nq0fb9g9zydfs5d2qn89"; depends=[XML RCurl plyr ggplot2 maps httr maptools rgdal rgeos sp RJSONIO data_table stringr assertthat whisker]; }; - Rgbp = derive { name="Rgbp"; version="1.0.6"; sha256="1j4j7g9z7p592f82k0yvibrydynkd9v1ldil2vf3ikc650bn2l02"; depends=[sn]; }; - RGCCA = derive { name="RGCCA"; version="2.0"; sha256="0mcp51z5jkn7yxmspp5cvmmvq0cwh7hj66g7wjmxsi74dwxcinvg"; depends=[MASS]; }; - rgcvpack = derive { name="rgcvpack"; version="0.1-4"; sha256="1vlvw9slrra18qaizqk2xglzky0i6z3bsan85x908wrg8drss4h5"; depends=[]; }; - rgdal = derive { name="rgdal"; version="0.8-16"; sha256="17qk7kd0l0l52nyf6drr0gv4b0ibkggyn6g3ky9flsjy05b3wg8j"; depends=[sp pkgs.gdal pkgs.proj]; }; - RGENERATE = derive { name="RGENERATE"; version="1.1"; sha256="1da3b50cfv5jb63ijzbnr226jadbww2bapcxzx8am7zydm6gqnss"; depends=[RMAWGEN]; }; - RGenetics = derive { name="RGenetics"; version="0.1"; sha256="0x5sspd67hh08qm62whlnnd838m0np29q3bfzgwp6j85lhil3jrx"; depends=[]; }; - rgenoud = derive { name="rgenoud"; version="5.7-12"; sha256="17gzkn4laylnksy8h2w8c0whcxpchsx7bwjzk1q5sfqxswclqq0g"; depends=[]; }; - rgeos = derive { name="rgeos"; version="0.3-6"; sha256="134cppgg5349i5qs9k2161fakd15l1fx1x6mgv28c5vic2xdm4wl"; depends=[sp pkgs.geos]; }; - rgexf = derive { name="rgexf"; version="0.14.3.11"; sha256="16mil1csyzkaywcdrjzz5r60n4xhhinxawg30skc7d9awkf26qfa"; depends=[XML Rook igraph]; }; - rggobi = derive { name="rggobi"; version="2.1.20"; sha256="1a7l68h3m9cq14k7y96ijgh0iz3d6j4j2anxg50pykz20lnykr9g"; depends=[RGtk2]; }; - RGIFT = derive { name="RGIFT"; version="0.1-5"; sha256="1745fs4bq0ss39fiwljspvrmnkgbbpc1fjvhvcrsmp2iizq12sgn"; depends=[]; }; - rgl = derive { name="rgl"; version="0.93.1098"; sha256="1nc4s8a2zihd7vg8mfyfah02mickgyqxscbpd7njzv9xycvr7jv5"; depends=[]; }; - Rglpk = derive { name="Rglpk"; version="0.6-0"; sha256="0g0s63skabr0yqk5s9p66p77z8v3pr3hbnirbgdddlvkpphi08xx"; depends=[slam]; }; - Rgnuplot = derive { name="Rgnuplot"; version="1.0.1"; sha256="1yag6ip2ppclhnpfc3mn6bsaylv2lk2k3jr8wgrgzrb7z22p7dk8"; depends=[]; }; - RgoogleMaps = derive { name="RgoogleMaps"; version="1.2.0.6"; sha256="1kd77617j2dz3dqjskv71vj8xv0yjgcysrpw7a615s0ys2hs91wp"; depends=[png RJSONIO]; }; - rgp = derive { name="rgp"; version="0.4-1"; sha256="1p5qa46v0sli7ccyp39iysn04yvq80dy2w1hk4c80pfwrxc6n03g"; depends=[emoa]; }; - rgpui = derive { name="rgpui"; version="0.1-1"; sha256="0hp1z00n6jzi45j61hlp5qj26wpjvbzjz3nvpxvmcjdmkk3vjfyp"; depends=[rgp shiny emoa]; }; - rgr = derive { name="rgr"; version="1.1.9"; sha256="1fs8f0g1wm6virwjzlgabp1i89n8jpdiwnkvk5w1lggs36xc8q59"; depends=[MASS fastICA]; }; - RGraphics = derive { name="RGraphics"; version="2.0-9"; sha256="1y0rrhvpn92l8mb0m8ny8ddpwgv6wkd3a10zhbing541f3y754nn"; depends=[lattice ggplot2]; }; - rgrs = derive { name="rgrs"; version="0.3"; sha256="19whlp3i0jps4pdif03h6z79zliw4shiqh7ackhk2gwq5c28jsql"; depends=[questionr]; }; - RGtk2 = derive { name="RGtk2"; version="2.20.31"; sha256="1ilnlmsk9fis61pc5bn9sf7z4b7vc7f0a0zcy77kk4bns6iqjvyp"; depends=[]; }; - RGtk2Extras = derive { name="RGtk2Extras"; version="0.6.1"; sha256="19gjz2bk9dix06wrmlnq02yj1ly8pzhvr0riz9b08vbzlsv9gnk2"; depends=[RGtk2]; }; - RH2 = derive { name="RH2"; version="0.1-2.12"; sha256="1ig9yxpaza7lm0b20sp7jr024hp284c0zs3k06k3k1vw1dyw60fj"; depends=[chron RJDBC]; }; - rHealthDataGov = derive { name="rHealthDataGov"; version="1.0.1"; sha256="0lkjprss15yl6n9wgh79r4clip3jndly2ab1lv4iijzxnxay099d"; depends=[bit64 httr jsonlite]; }; - Rhh = derive { name="Rhh"; version="1.0.2"; sha256="0blxim8yrb0qnbkc1z2q24q6ryakggq2zhaa223swla99ahmsny3"; depends=[]; }; - RHive = derive { name="RHive"; version="2.0-0.0"; sha256="0r49irdwigxxqniidx7i3j7si8bw7zklw3n4zvhcmzfkvx0al91n"; depends=[rJava]; }; - RHmm = derive { name="RHmm"; version="2.0.3"; sha256="1mnsqkg419d1z0kyxpjj9md3aammvw0xfrd7dwymii2ql050v47b"; depends=[MASS nlme]; }; - rhosp = derive { name="rhosp"; version="1.05"; sha256="1d1a4dc8hgvjmfb21s7j19yadbi1a9qp06prd80izbhvj2hni573"; depends=[]; }; - Rhpc = derive { name="Rhpc"; version="0.14-78"; sha256="136xld0k99nlgmg6p5dcr882f2r11b0bahh57swwcfi9nfqw3zaz"; depends=[]; }; - RhpcBLASctl = derive { name="RhpcBLASctl"; version="0.14-72"; sha256="0417d8lvwhnfniq41wlcl642z01nv3mhzj9fyb5hlg5vafqpmp8n"; depends=[]; }; - rHpcc = derive { name="rHpcc"; version="1.0"; sha256="0096z90mmf1j2xpb9034a5ph52m8z6n6xjh3km2vrhw63g3cpwap"; depends=[RCurl XML]; }; - RHRV = derive { name="RHRV"; version="4.0"; sha256="16xmmmw8gsqalbqf59xwpkd2bkfwxrdx8bwdn875bizx7mn0bql7"; depends=[tkrplot waveslim nonlinearTseries]; }; - RHT = derive { name="RHT"; version="1.0"; sha256="1gxf8nhj3y92h8al7l3fxa45wc568kb3cykrbdjlsy2zjacf7fcc"; depends=[]; }; - R_huge = derive { name="R.huge"; version="0.8.0"; sha256="00iiz1q6a5ywsidiwy6lnxjw0ig75ri914dqr7cbfccdf66fb840"; depends=[R_methodsS3 R_oo R_utils]; }; - ri = derive { name="ri"; version="0.9"; sha256="00y01n9cx95bjhdpnh7vi0xd5p6al3sxbjszbyxafn7m9mygmnhv"; depends=[]; }; - RI2by2 = derive { name="RI2by2"; version="1.2"; sha256="0387ncq1nhpz8521nwsjybsdpncm56nrwkz68apgihmrbjlmp6m7"; depends=[gtools]; }; - rich = derive { name="rich"; version="0.3"; sha256="122xb729xlm8gyb7b3glw4sdvrh98wh89528kcbibpx83bp3frc0"; depends=[boot vegan permute]; }; - ridge = derive { name="ridge"; version="2.1-3"; sha256="0pdmybygf730dw73a5ncl9fw3kjnnpqqkanqxi97aj9n4cfcjn7z"; depends=[]; }; - RidgeFusion = derive { name="RidgeFusion"; version="1.0-2"; sha256="1izhq9vqj9kca3ddk91f5h8351qr3cnwig9i7d76rhlzawrl7ch9"; depends=[mvtnorm]; }; - Ridit = derive { name="Ridit"; version="1.1"; sha256="02cni6hzf1bsns7vi8vklnhc0pfb5vwqhjnnfnjnnaxpzpsbvdfn"; depends=[]; }; - RIFS = derive { name="RIFS"; version="0.1-5"; sha256="0705dhirh7bhy2yf3b1mpk3m7lggg4pwy640lvaspwaxkd6zac5w"; depends=[]; }; - RIGHT = derive { name="RIGHT"; version="0.1.2"; sha256="047g6gymrfzccnp56pvvk3s2r19p1czm9pjmpdn3fnx13d8lalaz"; depends=[shiny]; }; - RImageJROI = derive { name="RImageJROI"; version="0.1"; sha256="06x8p8wpzmsc6f2330m74x4dmh21dn0gqicand2l198knahp3kf7"; depends=[spatstat]; }; - RImpala = derive { name="RImpala"; version="0.1.3"; sha256="108ykv3g17ymglcisawihlns0gzmzhx1xcbfwpa5pni4x9hxw0g9"; depends=[rJava]; }; - rinat = derive { name="rinat"; version="0.1.4"; sha256="1m5k1wcinm6is3mf86314scgy3xfifz7ly7il5zgqyg9jkkpywbz"; depends=[httr plyr jsonlite ggplot2 maps]; }; - rindex = derive { name="rindex"; version="0.12"; sha256="1k9zihvrp955c4lh70zjlsssviy2app8w6mv5ln4nawackbz0six"; depends=[regtest]; }; - ringbuffer = derive { name="ringbuffer"; version="1.1"; sha256="1jj6zdvqlkc30bnxapg0sjl5ci5kq76611smqc4jc8adzhzwrh3f"; depends=[]; }; - ringscale = derive { name="ringscale"; version="0.1.2"; sha256="1gnnapkvxmkfws8dw41gj9h3svy3h6mi4zv413aykg9vrmy7d3rp"; depends=[FITSio]; }; - RInside = derive { name="RInside"; version="0.2.11"; sha256="09j4dpv30pp0q3h129ig15xxlp8yzxnk122iica4nv88niabjcaa"; depends=[Rcpp]; }; - RInSp = derive { name="RInSp"; version="1.0"; sha256="154ibjx5xyibaw8hhdh4hw5rbmwp340bplvz1174n6svg2dpl542"; depends=[]; }; - rio = derive { name="rio"; version="0.1.2"; sha256="0h80msbj1qcc9m4408qcckw238ydqdzzgr9frlmmc7qi4dyba4i4"; depends=[stringr foreign testthat]; }; - rioja = derive { name="rioja"; version="0.8-7"; sha256="1164sxwv9wafqmprnkr9sdsd109ss8w2l1j8ir7kq8ya071k3zbl"; depends=[vegan]; }; - ripa = derive { name="ripa"; version="2.0-2"; sha256="0n1gaga0d4bb9qdlm7gksa1nwi4y28kbgwr3icwqgihf1bfb9m81"; depends=[Rcpp]; }; - risaac = derive { name="risaac"; version="0.1"; sha256="1ndqxlq4l48iiaghx897bhr7q56csbia7y1a98fic8hzfp03811r"; depends=[]; }; - riskRegression = derive { name="riskRegression"; version="0.0.8"; sha256="0bjxwj4wrlcqkm1zf25p39h3jwf0f11zspzsk4b41axr3adlvmdw"; depends=[prodlim rms pec rms cmprsk survival]; }; - risksetROC = derive { name="risksetROC"; version="1.0.4"; sha256="1fh0jf8v536qzf1v3awx3f73wykzicli4r54yg1z926ccqb4h80l"; depends=[survival MASS]; }; - RISmed = derive { name="RISmed"; version="2.1.2"; sha256="1hi22sf6g047m2bq9yh6bwvi1x8bjw12vslfp6iyrim0w2pk96m1"; depends=[]; }; - Ritc = derive { name="Ritc"; version="1.0.1"; sha256="1h41s4jihzj0yj8xyan0zhhyyiq8m5567vw4gvmmr81p1qfzvva8"; depends=[minpack_lm]; }; - rite = derive { name="rite"; version="0.3.1"; sha256="0z12jxbmis9l82y0l98gf8hyxfwasj5lpznkmi8kwvvya3jw5ypf"; depends=[tcltk2 RCurl]; }; - RItools = derive { name="RItools"; version="0.1-12"; sha256="0zdwj5y355d8jnwmjic3djwn6zy7h1iyl58j9hmnmc3m369cir0s"; depends=[lattice SparseM xtable svd abind]; }; - riv = derive { name="riv"; version="2.0-4"; sha256="1c9k62plqgxcgcm2j1s26hqvgww96n6bfjz2yk7m3p2wf8gkkyam"; depends=[MASS rrcov quantreg]; }; - riverplot = derive { name="riverplot"; version="0.2"; sha256="160xy3q7a7qfabambhq0h3mrx8wbiv88xvcfzkya3fkq5nac22c5"; depends=[]; }; - rivervis = derive { name="rivervis"; version="0.39.4"; sha256="1al0ylmpvkxfhkv9i4j6pvrlqn13pdwmzs7s6vazmgmkl3iggav4"; depends=[]; }; - Rivivc = derive { name="Rivivc"; version="0.9"; sha256="0gl3040pp9nqm4g2ympnx80z64zfnn1hfsxka8ynd2cqhjn3b5i1"; depends=[signal]; }; - RJaCGH = derive { name="RJaCGH"; version="2.0.2"; sha256="1fy8wsnv7diwg2w7j61scm6vd35a5jb36i9pzh5m7jz6yqsank50"; depends=[]; }; - rjags = derive { name="rjags"; version="3-13"; sha256="0npfyphi8z25h7w4frplbyjgib1gawz7ib9gz5w6h2i0pricm53r"; depends=[coda]; }; - rJava = buildRPackage { - name = "rJava-0.9-6"; - src = fetchurl { - url = "mirror://cran/src/contrib/rJava_0.9-6.tar.gz"; - sha256 ="008g6s6rcb5lnz5y2a2rs4iq85a4nl522g714s1w1r153qcc0jz0"; - }; - propagatedBuildInputs = [pkgs.jdk pkgs.lzma pkgs.bzip2 pkgs.pcre pkgs.icu pkgs.libzip]; - preConfigure = '' - export JAVA_CPPFLAGS=-I${pkgs.jdk}/include/ - export JAVA_HOME=${pkgs.jdk} - ''; - meta.hydraPlatforms = R.meta.hydraPlatforms; - }; - rJavax = derive { name="rJavax"; version="0.3"; sha256="0sv2fjinp4wmdfvcpgm4hv8v3fkiiv84ywqyr4hz86j50ncd79km"; depends=[rJava]; }; - RJDBC = derive { name="RJDBC"; version="0.2-4"; sha256="14nqz4gx24gcjmnd3hrhvfs5f68c3nqhb6nypv9gvk19dx1jayg0"; depends=[DBI rJava]; }; - rje = derive { name="rje"; version="1.9"; sha256="1dyd34z6lb0p6zmyax5dpzflgc9a4saka33mvdfcxi5pj0rnygaz"; depends=[]; }; - Rjms = derive { name="Rjms"; version="0.0.5"; sha256="0bb07wynvk07p8i5x87hlxfavjs5wf5gasfggyjxycr54sphlg6z"; depends=[rJava Rjmsjars rJava Rjmsjars]; }; - Rjmsjars = derive { name="Rjmsjars"; version="0.0.1"; sha256="0xi42p1wgp7f15j3b74zisf0xrz86kgyn5anq3x5ahyb9cfrnmqx"; depends=[rJava rJava]; }; - rJPSGCS = derive { name="rJPSGCS"; version="0.2-6"; sha256="1x6mwy6232kjl8ssvkbamhfvxsc3rqbjsrlrprj0bprssm3pcr2g"; depends=[rJava]; }; - Rjpstatdb = derive { name="Rjpstatdb"; version="0.1"; sha256="0iwgsp3mblp7bsx88wfpqn09y1xrkingfkm3z9jsi2bwrnrjc2iv"; depends=[RCurl XML]; }; - rjson = derive { name="rjson"; version="0.2.14"; sha256="0mrk2ahgb6pn7aq5lgixrxjkkpjmn4sbkazvg7bbfvyvxps1gm4k"; depends=[]; }; - RJSONIO = derive { name="RJSONIO"; version="1.3-0"; sha256="1dwgyiy19sixhy6yclqcaaxswbmpq7digyjjxhy1qv0wfsvk94qi"; depends=[]; }; - RJSONLD = derive { name="RJSONLD"; version="1.0.3"; sha256="17myzigzmn6hd0fbzm7h4n65aiighklrzfr3irg1520aa35s6214"; depends=[RJSONIO formula_tools stringr lmtest]; }; - rJython = derive { name="rJython"; version="0.0-4"; sha256="13fpcw37cca738v9idqgi3gv9avfkfwfacxj54p2c4wyg46ghnah"; depends=[rJava rjson]; }; - RKEA = derive { name="RKEA"; version="0.0-4"; sha256="0qkjnyy4b6vzdiapadx9hmw3h4gfgmbi4g5078rr6kq5kmwqlwgh"; depends=[rJava tm]; }; - rknn = derive { name="rknn"; version="1.2"; sha256="1c92cv3462f00p237fkh06hl66j912ssiav4hpc4jphvs01g30kz"; depends=[gmp]; }; - Rknots = derive { name="Rknots"; version="1.2.1"; sha256="1qv7l4c3n3zyz2s5whl5chi5yfb1j67kihk1c8gpjl291axmmi8w"; depends=[rgl rSymPy]; }; - rkt = derive { name="rkt"; version="1.3"; sha256="0d82id22xac84l5iqls0mlg1g9yn4hhkmf4ln7xlp0zinmmhym9m"; depends=[]; }; - rkvo = derive { name="rkvo"; version="0.1"; sha256="0ci8jqf9nc8hb063nckxdnp0nlyr4ghby356lxm00anw44jlmw8v"; depends=[Rcpp]; }; - Rlab = derive { name="Rlab"; version="2.15.1"; sha256="1pb0pj84i1s4ckdmcglqxa8brhjha4y4rfm9x0na15n7d9lzi9ag"; depends=[]; }; - Rlabkey = derive { name="Rlabkey"; version="2.1.123"; sha256="0jz8x3n6byxmb10jcrcyznyj3zwab3bkp2g52n707w2jv0xvn8l5"; depends=[RCurl rjson]; }; - rLakeAnalyzer = derive { name="rLakeAnalyzer"; version="1.4"; sha256="1qs8f4sv044bxrf45wzfj444plkcq3i61353881x8shn13h3awas"; depends=[plyr]; }; - rlecuyer = derive { name="rlecuyer"; version="0.3-3"; sha256="1n0vny3k5s5152y0ggz9vfn4bqay9ncbdzkw9g4703pszrbwq7xh"; depends=[]; }; - rLindo = derive { name="rLindo"; version="8.0.1"; sha256="05qyc4wvpjgw8jxmwn2nwybi695fjn0cdilkprwmjg07c82f0q5n"; depends=[]; }; - rlist = derive { name="rlist"; version="0.3"; sha256="1l9iypqzdj8j6zg9a55xc6l31sp2lznyx17a1jsl6717bbh5bpmg"; depends=[stringdist data_table yaml jsonlite]; }; - rlme = derive { name="rlme"; version="0.4"; sha256="02683sklihj3726a90jryybf855rvbz9v3dm9z9yhb32q9bfmy34"; depends=[MASS quantreg nlme mgcv stringr magic robustbase Rcpp]; }; - RLRsim = derive { name="RLRsim"; version="3.0"; sha256="16bqsp15b8ikgix18p63k6sf81d1al4djbb51r08imjs4z9jppg4"; depends=[Rcpp mgcv]; }; - RM2 = derive { name="RM2"; version="0.0"; sha256="1v57nhwg8jrpv4zi22fhrphw0p0haynq13pg9k992sb0c72dx70a"; depends=[msm]; }; - rmaf = derive { name="rmaf"; version="2.0"; sha256="00qhdfzbjvmz83nicl73yhx7w8sv6j7x928j4vd6ll79098x4y84"; depends=[]; }; - RMallow = derive { name="RMallow"; version="1.0"; sha256="0prd5fc98mlxnwjhscmghw62jhq9rj5jk8qf4fnaa2a718yxf9b5"; depends=[combinat]; }; - Rmalschains = derive { name="Rmalschains"; version="0.2-2"; sha256="1ki3igj78sk4kk1cvbzrgzjdvw6kbdb7dmqglh6ws2nmr5b6a7fx"; depends=[Rcpp]; }; - RMark = derive { name="RMark"; version="2.1.8"; sha256="1g8zp1c6wdpi7rr0g4sfzxnvc56svl6qb2i971rvjh03ja3wzvi1"; depends=[snowfall matrixcalc msm coda]; }; - rmatio = derive { name="rmatio"; version="0.10.0"; sha256="1p1gsv7fj14hynna4a7nnxbchd0i1db03yxah4pcz3sd3a9hqw0f"; depends=[Matrix lattice]; }; - R_matlab = derive { name="R.matlab"; version="3.0.1"; sha256="0r8427bqr7kwrf1bp3chphpavpbaaq5yj3ad4jc40b75zg9dmi91"; depends=[R_methodsS3 R_oo R_utils]; }; - RMAWGEN = derive { name="RMAWGEN"; version="1.2.6.1"; sha256="1j8yb37sv2ycg3zgdj6hlxvlrsgvb9rh4yxd40bah2j1xgibr36z"; depends=[chron date vars]; }; - RMC = derive { name="RMC"; version="0.2"; sha256="1sc4nsjmaw2ajm8bka7r4mf73zxqhnvx23kl4v20pfpy9rhgd0h6"; depends=[]; }; - RMediation = derive { name="RMediation"; version="1.1.3"; sha256="07ck74dl1wwb88229fhkh2czlynddff7zvjyhisxk53qmdb0wvmw"; depends=[MASS lavaan e1071]; }; - RMessenger = derive { name="RMessenger"; version="0.1.5"; sha256="1xsfvygf9bbfzbldpkmg399qhfai5s5fmc60xjpkjmxhjqh4vry1"; depends=[Rcpp]; }; - rmeta = derive { name="rmeta"; version="2.16"; sha256="1s3n185kk0ddv8v6c7mbc7cpj6yg532r7is6pjf9vda7317rxywy"; depends=[]; }; - rmetasim = derive { name="rmetasim"; version="2.0.4"; sha256="1a3bhiybzdvgqnnyh3d31d6vdsp4mi33sv8ks9b9xd9r369npk86"; depends=[ape ade4 gtools]; }; - R_methodsS3 = derive { name="R.methodsS3"; version="1.6.1"; sha256="1c3f64bvnpxfb3k2g7z3a6qms36z0n2hflw5w5952c82jx10cl0x"; depends=[]; }; - rmgarch = derive { name="rmgarch"; version="1.2-8"; sha256="19q35kzyzzs19b4xgslrnl8ihlx1wlmrwfdimnq8racfx0y46lm5"; depends=[rugarch Rsolnp MASS Matrix zoo xts Bessel ff shape pcaPP spd Rcpp]; }; - rminer = derive { name="rminer"; version="1.3.1"; sha256="0rwjv5i4lr9611lyq55ps2yna7zzarakdnbj83xfs0kva63xn7fh"; depends=[nnet kknn kernlab rpart plotrix lattice]; }; - Rmisc = derive { name="Rmisc"; version="1.5"; sha256="1ijjhfy3v91fspid77rrkc5dkcb2lav37wc3f4k5lwrn24wzy5y8"; depends=[lattice plyr]; }; - Rmixmod = derive { name="Rmixmod"; version="2.0.2"; sha256="1qv6zymkgsbplrq4aa87lvcsv75dssj8qqq2h9665v31jsgx84lr"; depends=[Rcpp]; }; - RmixmodCombi = derive { name="RmixmodCombi"; version="1.0"; sha256="0cwcyclq143938wby0aj265xyib6gbca1br3x09ijliaj3pjgdqi"; depends=[Rmixmod Rcpp]; }; - rmmseg4j = derive { name="rmmseg4j"; version="0.2-0"; sha256="1icc6a04hbqszzrs7sqp120v44g33rqgz2x926jvxvcishadnd90"; depends=[rJava]; }; - rmngb = derive { name="rmngb"; version="0.4-1"; sha256="06ky3snnvg3rwz0cwi4j06w8spkl488rizn5ppph7ai5a92ydhx9"; depends=[]; }; - RMongo = derive { name="RMongo"; version="0.0.25"; sha256="1anybw64bcipwsjc880ywzj0mxkgcj6q0aszdad6zd4zlbm444pc"; depends=[rJava]; }; - rmongodb = derive { name="rmongodb"; version="1.6.5"; sha256="0y7vj1ci5k19qdh7jznm4izsqj2v6hfjarxq31xdmymajwi171rs"; depends=[jsonlite plyr]; }; - Rmosek = derive { name="Rmosek"; version="1.2.5.1"; sha256="1ki28357ijwzzxyb820lsf8l5x2i46shar0v71k15hvf9jn0h7zm"; depends=[Matrix]; }; - rmp = derive { name="rmp"; version="1.0"; sha256="1g0785fwjbwbj82sir3n7sg3idsjzdhrpxc7z88339cv9g4rl7ry"; depends=[]; }; - Rmpfr = derive { name="Rmpfr"; version="0.5-5"; sha256="1ddyck28wb64gk3w0fph8aqsm021zv3z98jsbcdj0by77jaigmxj"; depends=[gmp]; }; - Rmpi = derive { name="Rmpi"; version="0.6-5"; sha256="0i9z3c45jyxy86yh3f2nja5miv5dbnipm7fpm751i7qh630acykc"; depends=[]; }; - RMRAINGEN = derive { name="RMRAINGEN"; version="1.0"; sha256="175kd803a44yblq2jw5mrn2qv4piiy249577lf684bmmajf4ird4"; depends=[copula RGENERATE RMAWGEN blockmatrix Matrix]; }; - rms = derive { name="rms"; version="4.2-0"; sha256="1kxifrypn6a0v2rbzhn3lch821d5w9qzj9rzvrsgac4fwskis65j"; depends=[Hmisc survival SparseM]; }; - rms_gof = derive { name="rms.gof"; version="1.0"; sha256="1n0h3nrp11f2x70mfjxpk2f3g4vwjaf4476pjjwy49smxxlxwz82"; depends=[]; }; - RMTstat = derive { name="RMTstat"; version="0.2"; sha256="1qp4msw8ikv6zr1j1ahxgwka7878v4av6zfqvj4j9w570v8afxvf"; depends=[]; }; - RMySQL = derive { name="RMySQL"; version="0.9-3"; sha256="1kmsrphzrk7a6f3i0pmpxlpj7w7yb5s2psx72lfv4zyd0aji83n1"; depends=[DBI]; }; - rnaseqWrapper = derive { name="rnaseqWrapper"; version="1.0-1"; sha256="1fa3hmwrpccf09dlpginl31lcxpj5ypxspa0mlraynlfl5jrivch"; depends=[ecodist gplots gtools]; }; - RnavGraph = derive { name="RnavGraph"; version="0.1.6"; sha256="15f4az5wcmg1fv1sl34523lwcqpz6dv63z6yvnhx8hdac5ry9biw"; depends=[]; }; - RnavGraphImageData = derive { name="RnavGraphImageData"; version="0.0.3"; sha256="1mrh0p2ckczw4xr1kfmcf0ri2h2fhp7fmf8sn2h1capmm12i1q8f"; depends=[]; }; - rnbn = derive { name="rnbn"; version="1.0.0"; sha256="1f3yv8cvrwlnzyk8g5b5sg5pvp6f15mi6bhfff44d0v1m6nwnp01"; depends=[RCurl RJSONIO]; }; - RNCBI = derive { name="RNCBI"; version="0.9.1"; sha256="1gvaizcm7ajblnxkqxvdalg5kws5kfa8186hw5rr7q3dc51gxm0i"; depends=[rJava XML RNCBIEUtilsLibs RNCBIAxis2Libs]; }; - RNCBIAxis2Libs = derive { name="RNCBIAxis2Libs"; version="0.9"; sha256="0lrvpka3bj6x6sqbjqwg8wlfgcjqq53ks4b48afqfzvqg9z8jk4d"; depends=[rJava]; }; - RNCBIEUtilsLibs = derive { name="RNCBIEUtilsLibs"; version="0.9"; sha256="1h1ywx8wxy6n2rbpmjbqw4c0djz29pbncisd0mlbshj1fw226jba"; depends=[rJava]; }; - RNCEP = derive { name="RNCEP"; version="1.0.6"; sha256="0z8fa7hgd6ss2yzpjn3d1ybqakgn76c7hp3h87ma0k03ilawxi09"; depends=[abind maps fields tgp fossil RColorBrewer]; }; - RND = derive { name="RND"; version="1.1"; sha256="1rbnjkfrsvm68xp90l4awixbvpid9nxnhg6i6fndpdmqwly2fwdp"; depends=[]; }; - rneos = derive { name="rneos"; version="0.2-7"; sha256="0vsifj6zfrdij1gjdp1dlh41cckwd04h41q30m7ard4pgyl9n7za"; depends=[RCurl XML]; }; - RNetCDF = derive { name="RNetCDF"; version="1.6.2-3"; sha256="0drylsg3nnlb060zg7vn3n24f908mhwqf7bbw8ys32chflrdvwl2"; depends=[]; }; - RNetLogo = derive { name="RNetLogo"; version="1.0-0"; sha256="1378v70bdk69mri6n0770q2qlch1lzi7zr2i7s9vgpnc27hxxjcx"; depends=[rJava]; }; - RNeXML = derive { name="RNeXML"; version="1.1.3"; sha256="1fcs1fwq66fb04zi2pwgn7xfljp8053s2vb0g4j5vzv0dq7nxy98"; depends=[ape XML plyr taxize reshape2 httr uuid]; }; - rngtools = derive { name="rngtools"; version="1.2.4"; sha256="1fcgfqrrb48z37xgy8sffx91p9irp39yqzxv7nqp1x2hnwsrh097"; depends=[pkgmaker stringr digest]; }; - rngWELL = derive { name="rngWELL"; version="0.10-3"; sha256="1wijscc0s6h1ipc1r8h179y94s1bzf409xlpiyr1njaxvvvpwvw1"; depends=[]; }; - rngwell19937 = derive { name="rngwell19937"; version="0.5-4"; sha256="1c6p0v673n328sdynvv780911yqxk2ayimb93k1f1h3ci915pixy"; depends=[]; }; - Rniftilib = derive { name="Rniftilib"; version="0.0-32"; sha256="1ck7ddhm759zha1iazg5razchq3gsfq3rzvfb8ichnl5l15z9ry2"; depends=[]; }; - RNiftyReg = derive { name="RNiftyReg"; version="1.1.2"; sha256="1g74qdx71wzyl0k7liwvl33rzhz7srmn15x55md5gyljxb5rqm6c"; depends=[reportr oro_nifti]; }; - rnoaa = derive { name="rnoaa"; version="0.2.0"; sha256="1v1yiwzsaqk95yxxla277bfdxs397p99y17yzh8z2m2xz54pn6sh"; depends=[httr lubridate plyr ggplot2 scales sp rgdal rgeos maptools stringr XML data_table assertthat jsonlite]; }; - rNOMADS = derive { name="rNOMADS"; version="2.0.1"; sha256="1clycf5h7gf2dcs2x4k0nqn2qbhm94a38nwvk7v89zkwzbjiy083"; depends=[scrapeR stringr fields XML GEOmap MBA RCurl]; }; - ROAuth = derive { name="ROAuth"; version="0.9.3"; sha256="13h0q7dx4xx7fngi3zfm92ws5x4c6cfa2svq7smmci7c0z4kirb2"; depends=[RCurl digest]; }; - RobAStBase = derive { name="RobAStBase"; version="0.9"; sha256="1428xaplcjq6r0migbaqncfj0iz8hzzfabmabm167p44wa2bwbwh"; depends=[rrcov distr distrEx distrMod RandVar]; }; - robCompositions = derive { name="robCompositions"; version="1.8.0"; sha256="19j9x14kganramig349n5680r86f9dc83iz1h6n3626bp9da1j33"; depends=[robustbase rrcov car MASS pls]; }; - robcor = derive { name="robcor"; version="0.1-6"; sha256="1hw8simv93jq8a5y79hblhqz157wr8q9dzgm0xhvvv5nkzyqkpzf"; depends=[]; }; - robeth = derive { name="robeth"; version="2.7"; sha256="03pnwd3xjb9yv8jfav0s4l9k5pgpampp15ak7z0yvkjs20rvfq3d"; depends=[]; }; - robfilter = derive { name="robfilter"; version="4.0"; sha256="1mj50531xjncg9lfidxzlyqrzwjm7pdsky88s3syspf70cjq6mg8"; depends=[robustbase MASS lattice]; }; - 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.1"; sha256="00299p918xkrh8ifgblj98gbkfj5c0qygjh842j715kbqfg7zbfz"; depends=[robustbase quantreg BB rgenoud]; }; - RobRex = derive { name="RobRex"; version="0.9"; sha256="0ii539mjq462n1lbnyv3whl8b1agvhvlz31wwyz911gb40isl639"; depends=[ROptRegTS]; }; - RobRSVD = derive { name="RobRSVD"; version="1.0"; sha256="07z5fw8j5lq7nyxgkvb9i4iwb5inddz2ib4m2bjx6q4c1ricpqz9"; depends=[]; }; - RObsDat = derive { name="RObsDat"; version="14.04"; sha256="06454axywp5264cczhz8k31n7qmg95c2rnxv08frfgzwgm3cfzhr"; depends=[xts zoo DBI vwr e1071]; }; - robumeta = derive { name="robumeta"; version="1.1"; sha256="1b1pms0jmyfw1hmw2gllhxica4sds427y92by3w99kf3472im3d5"; depends=[]; }; - robust = derive { name="robust"; version="0.4-16"; sha256="0psai9d6w7yi0wfm57cc7b2jd5i7wbk2xagrhnvhxknw0dwzf2jh"; depends=[fit_models MASS lattice robustbase rrcov]; }; - RobustAFT = derive { name="RobustAFT"; version="1.2"; sha256="156p5ic91f8qhc2g6zyrbipa58bvwq8xkpbbhnvx9kvrw8k62ibs"; depends=[robustbase survival]; }; - robustbase = derive { name="robustbase"; version="0.91-1"; sha256="1sf6dx2xjhp8ydxgv9hajjp064plr88ykg7fbglcqbl8apx9pr9h"; depends=[DEoptimR]; }; - robustfa = derive { name="robustfa"; version="1.0-5"; sha256="04nk5ipml54snsmiqf5sbhx490i46gnhs7yibf4wscrsj1bh2mqy"; depends=[rrcov]; }; - robustgam = derive { name="robustgam"; version="0.1.7"; sha256="0s1z7jylj757g91najbyi1aiqnssd207jfm9yhias746540qp3kw"; depends=[Rcpp RcppArmadillo mgcv robustbase]; }; - robustHD = derive { name="robustHD"; version="0.5.0"; sha256="14ql2k5880lbwkv1acydrli6jyh6dls32jjhimbz82zzkzfk2cxr"; depends=[ggplot2 perry robustbase MASS]; }; - robustlmm = derive { name="robustlmm"; version="1.6"; sha256="18lhbnmcd6nc0qr23a19mhw9k9r30li6z92g600dil6ll8s5m54z"; depends=[lme4 Matrix ggplot2 lattice nlme robustbase xtable]; }; - robustloggamma = derive { name="robustloggamma"; version="0.4-28"; sha256="0wwa7i2qw0fd5fiy45h7qiw7526zyyxx379ll4ha2n593dwhybx3"; depends=[robustbase]; }; - RobustRankAggreg = derive { name="RobustRankAggreg"; version="1.1"; sha256="1pslqyr1lji1zvcrwyax4zg2s81p1jnhfldz8mdfhsp5y7v8iar3"; depends=[]; }; - robustreg = derive { name="robustreg"; version="0.1-3"; sha256="0llnd6yzg0kg3049pcfwjzz4hnd40w06w59kvnh01q47p4c75bkj"; depends=[]; }; - robustvarComp = derive { name="robustvarComp"; version="0.1-2"; sha256="187mcpih509hx15wjjr7z2h6h76mz2v0d8xgsxjd8wz7l3dnlp2f"; depends=[robustbase GSE numDeriv robust plyr]; }; - robustX = derive { name="robustX"; version="1.1-4"; sha256="1s2aav2jr22dgrl7xzk09yn9909k76kpiz271w5r1id6hpfprjwc"; depends=[robustbase]; }; - ROC632 = derive { name="ROC632"; version="0.6"; sha256="0vgv4rclvb79mfj1phs2hmxhwchpc5rj43hvsj6bp7wv8cahfg5g"; depends=[survival penalized survivalROC]; }; - rocc = derive { name="rocc"; version="1.2"; sha256="00yxbbphhwkg4sj2h7pd9vw86yavl711nk8yylwmjd3qv39qjml0"; depends=[ROCR]; }; - rockchalk = derive { name="rockchalk"; version="1.8.0"; sha256="17lmvdqk23jrhl8i3ygl7k49p7ckm3j5phvnxrivbnqysbz84pky"; depends=[MASS car]; }; - RockFab = derive { name="RockFab"; version="1.2"; sha256="1b5mhfll5vmqwl4pblmclyx9604vn07jyza02rm0jcsx915ms8sc"; depends=[rgl]; }; - rococo = derive { name="rococo"; version="1.1.2"; sha256="08204y3g3xd2srpcpnbkq1laqfr3wrhy73whlxf83gffw8j0iyv8"; depends=[Rcpp]; }; - ROCR = derive { name="ROCR"; version="1.0-5"; sha256="1zinan5hfvgg24imn0210m2lwqk5jxmmw8gz08l44j988lw8c2iw"; 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="0zjvyg522xwd7957vg2gy6hb8bjagn5457250aqh8f1qnpp57c48"; 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]; }; - ROI_plugin_glpk = derive { name="ROI.plugin.glpk"; version="0.0-2"; sha256="10p3cq59app3xdv8dvqr24m937a36lzd274mdl2a9r4fwny2rssa"; depends=[ROI Rglpk]; }; - 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]; }; - R_oo = derive { name="R.oo"; version="1.18.0"; sha256="0difa5258i59vb538xp9p1jkzzrbmm8l35gqhpchfxk5dhn2cq9a"; depends=[R_methodsS3]; }; - Rook = derive { name="Rook"; version="1.0-9"; sha256="013d95f2ddp0yngw7fs267k5lyksffqz61g7ngrx5faddbd6y0ym"; depends=[brew]; }; - rootSolve = derive { name="rootSolve"; version="1.6.5"; sha256="0xr6krw9f9cjc38894x4c172vhxdpy3sp6f8sc25mwvmjwidcwrn"; depends=[]; }; - 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]; }; - ror = derive { name="ror"; version="1.2"; sha256="0n8mk35rm3rp0c7a3i961kij21a177znh9hkq4snqqlw9vf50hdg"; depends=[rJava ROI ROI_plugin_glpk igraph]; }; - ROracle = derive { name="ROracle"; version="1.1-11"; sha256="0q0sk5xl96s0d9c8jkd9rng0h03vyg98h7yq8x87r279pp1cp5y0"; depends=[DBI]; }; - rorutadis = derive { name="rorutadis"; version="0.1.3"; sha256="0ik0dpmsyb4g9wl1fb7mm0dry9s26nfvv1v91cslss82phhf16wd"; depends=[Rglpk ggplot2 gridExtra]; }; - ROSE = derive { name="ROSE"; version="0.0-3"; sha256="12b9grh3rgaa07blbnxy8nvy5gvpd45m43bfqb3m4k3d0655jpk2"; depends=[]; }; - rotations = derive { name="rotations"; version="1.2"; sha256="13z5ysjqz3qkiw4nrp9dgy55kbmff5j7m3hfp2h0sj8x1saglf66"; depends=[ggplot2 Rcpp]; }; - Rothermel = derive { name="Rothermel"; version="1.1"; sha256="1bfmqw2f0dd4dlvd1v8wr2iq5cd0a48cyrakxl1hy5461gkxvxls"; depends=[GA ftsa]; }; - RoughSets = derive { name="RoughSets"; version="1.1-0"; sha256="0v6cb0xidx2rbkgb92fahrjyy974xiaizxqryzzj1z0nnqb5zadp"; depends=[]; }; - rowr = derive { name="rowr"; version="1.0"; sha256="0ga955991ycs9sf5za1qrrf9yggnxy1yzh2mw900h124n23pj5rv"; depends=[]; }; - roxygen = derive { name="roxygen"; version="0.1-3"; sha256="0w2n4p4skwqr0yw49l06fxmncsplfj2q4gapdbc9wpm9w1g267fw"; depends=[digest gsubfn]; }; - roxygen2 = derive { name="roxygen2"; version="4.0.1"; sha256="116zy31qbsqc0234g1f6n3w40awd4i8255ksyvisgk0nvmwjjs80"; depends=[stringr brew digest Rcpp]; }; - royston = derive { name="royston"; version="1.0"; sha256="1hhb1v1aqvvlzirxiyhv6zahz82w2pq4d6yp3rcakq0sw7dhawn6"; depends=[nortest moments]; }; - rpanel = derive { name="rpanel"; version="1.1-3"; sha256="1wm0dcbyvxz4ily8skz2yda44n74x2nmc4pg11ja0yvk038gjfns"; depends=[]; }; - rpart = derive { name="rpart"; version="4.1-8"; sha256="1vhmwvb7hsh75lvmsjmkab2zl136irca1dhr6p57s1yhmpw4cys0"; depends=[]; }; - rpartitions = derive { name="rpartitions"; version="0.1"; sha256="1gklsi4pqhk16xp9s49n1lr9ldm1vx61pvphjqsqkzrlxwcpx3j8"; depends=[hash]; }; - rpart_plot = derive { name="rpart.plot"; version="1.4-4"; sha256="0m7qngc9117yq69jj106svihy6s3f1byqg9qdls0bimj24insyxf"; depends=[rpart]; }; - rpartScore = derive { name="rpartScore"; version="1.0-1"; sha256="15zamlzbf6avir8zfw88531zg5c0a6sc5r9v5cy9h08ypf34xf4y"; depends=[rpart]; }; - rpart_utils = derive { name="rpart.utils"; version="0.5"; sha256="00ahvmly6cdf7qhhcic0dbjlljqq8kbhx15rc7vrkd3hzd55c0im"; depends=[rpart]; }; - RPCLR = derive { name="RPCLR"; version="1.0"; sha256="03kpyszsjb656lfwx2yszv0a9ygxs1x1dla6mpkhcnqw00684fab"; depends=[MASS survival]; }; - Rpdb = derive { name="Rpdb"; version="2.2"; sha256="0gf6qab05a3ky8skbbjiadizi1gs4pcw3zp25qj5gn82lb6382pd"; depends=[rgl]; }; - rpf = derive { name="rpf"; version="0.36"; sha256="13b6nakpbr8y4i52m8jmgavmqml99qyca8bs22s178jc72ndqyhq"; depends=[mvtnorm]; }; - rpg = derive { name="rpg"; version="1.1"; sha256="17wfx0dfixdkw0lqh7xcq115ksj640av2jbqbpvd0l2xnpnk9sag"; depends=[Rcpp uuid RApiSerialize]; }; - rphast = derive { name="rphast"; version="1.5"; sha256="0r6bk0lbqpv60byhiv847ij5bxrflrs0nsla1zrn8ww7371czsgj"; depends=[]; }; - Rphylip = derive { name="Rphylip"; version="0.1-23"; sha256="0kpqmik4bhr74ib8yvaavr10z4v4w3li5vibdhz7lvz35jfirg9r"; depends=[ape]; }; - rPlant = derive { name="rPlant"; version="2.7"; sha256="0gqxb49d6qzkd533s9qp75byvz66v1csdlnmh3m2zg96aw32178r"; depends=[rjson RCurl seqinr knitcitations]; }; - rplexos = derive { name="rplexos"; version="0.8"; sha256="0fgb878s68fmhdkgk8v9f3rrb1v1nd1w580vwa5bv0ix9kh7dfqq"; depends=[dplyr RSQLite RSQLite_extfuns Rcpp DBI lubridate plyr reshape2 assertthat]; }; - rplos = derive { name="rplos"; version="0.4.1"; sha256="1v757v0b09mggdrgfzqmhvmf7yhqm3k42ml8sg8v4j74lscy653l"; depends=[ggplot2 RCurl RJSONIO XML plyr stringr googleVis httr lubridate reshape2 data_table whisker solr assertthat]; }; - rplotengine = derive { name="rplotengine"; version="1.0-5"; sha256="1wwpfnr5vi8z26alm8y5gply0y4iniagimldzy2z696djzz8p8p8"; depends=[xtable]; }; - RPMG = derive { name="RPMG"; version="2.1-5"; sha256="1ck6bz72h1kwi7gg8vd0zw1q61pqv23rish84zri2p18z7nd9kvh"; depends=[]; }; - RPMM = derive { name="RPMM"; version="1.10"; sha256="0xhcf0a28zdxd6x495k9xddirkd37bzs8n99jbmsdxza19a7f0vz"; depends=[cluster]; }; - Rpoppler = derive { name="Rpoppler"; version="0.0-1"; sha256="01zsbm538yhwm1cyz5j6x2ngz05yqj16yxyvyxqhn6jp8d0885jh"; depends=[]; }; - rportfolios = derive { name="rportfolios"; version="1.0"; sha256="1zcv5ddmk15l0p03nlffimlhhpcc7l1c05xl2d1xlfk58rkvqns6"; depends=[]; }; - RPostgreSQL = derive { name="RPostgreSQL"; version="0.4"; sha256="0gpmbpiaiqvjzyl84l2l8v2jnz3h41v8jl99sp1qvvyrjrickra2"; depends=[DBI]; }; - RPPanalyzer = derive { name="RPPanalyzer"; version="1.3"; sha256="1jrij862nhwd1va54pis8shbcprjjzz22hlivzh3ifrkdf6rz4pg"; depends=[quantreg lattice gam gplots ggplot2 Hmisc]; }; - rPref = derive { name="rPref"; version="0.1"; sha256="1mgal96qq907xj3nmzm00c9l1b1382i4p594c70wj690c4dknffp"; depends=[Rcpp dplyr igraph]; }; - rprintf = derive { name="rprintf"; version="0.1-1"; sha256="0zdzxb3psdy51fy492rr4wnv1cw0qhyw1525aaz0lwbids1cxvwf"; depends=[stringr]; }; - RProtoBuf = derive { name="RProtoBuf"; version="0.4.1"; sha256="1992nz0dz4h802gakcri1c9dgacxc5nvg3h5lm2zv6yg748ha6nh"; depends=[Rcpp RCurl]; }; - rpsychi = derive { name="rpsychi"; version="0.8"; sha256="1h40kbqvvwwjkz5hrclj6j22zhav3yyfbbhqahs1whwjkksnam4w"; depends=[gtools]; }; - rpubchem = derive { name="rpubchem"; version="1.5.0.2"; sha256="0lvi7m8jb2izsfia3c0qigsd1k1x9r02gymlwfg29pb8k10lwcjf"; depends=[XML car RCurl RJSONIO]; }; - RPublica = derive { name="RPublica"; version="0.1.1"; sha256="0m0wib0nijya228jmcl98l2hsx8l28dg6lvpwmx67jyhpvpplpkl"; depends=[XML RJSONIO RCurl]; }; - rpud = derive { name="rpud"; version="0.0.2"; sha256="03xddc6kh39wlcv8dvpnv4h0f5qx5cv327xip26zk7gg7pgrn05x"; depends=[]; }; - RPushbullet = derive { name="RPushbullet"; version="0.0.2"; sha256="1234p26zrlvsniwaibj4795ds7j30aqkljlq9l06ivnz00rm8a5s"; depends=[RJSONIO]; }; - rPython = derive { name="rPython"; version="0.0-5"; sha256="0d608v1x8walwnx7aa3m0n7999jlbiymhl7605z4n7ps6l1140mv"; depends=[RJSONIO]; }; - RQDA = derive { name="RQDA"; version="0.2-6"; sha256="0d3jqr8bhphyi1ch9x5y0s14z86n9zspn748m9xxa15nhnyfmx3l"; depends=[RSQLite gWidgetsRGtk2 RGtk2 DBI igraph gWidgets]; }; - Rquake = derive { name="Rquake"; version="2.2"; sha256="0gkarqqhmiakc968ffwywkwy7npm1ly5gd6bbhr8fjfwdnhjam5n"; depends=[RPMG RSEIS GEOmap MBA minpack_lm rgl]; }; - RQuantLib = derive { name="RQuantLib"; version="0.3.12"; sha256="1ih7lkpa3p0ipgc8hs9miv500rk285ddc7pmn2qv03ibpsdlvjmq"; depends=[Rcpp]; }; - Rramas = derive { name="Rramas"; version="0.1-4"; sha256="191rm2ylvf3ffc9i4wpjvfbsinmw7s1m0wcq24j4qs4fxg8qqzyq"; depends=[diagram]; }; - rrBLUP = derive { name="rrBLUP"; version="4.3"; sha256="0wydh4sx7b6rcrgb3qvqh0z46pixx63711q2nf8s3c32090a5g81"; depends=[]; }; - rrBlupMethod6 = derive { name="rrBlupMethod6"; version="1.3"; sha256="1qwv954mhry46ff2ax48xcmnasygi5alv8d413g3qbk2da6i0d8l"; depends=[]; }; - rrcov = derive { name="rrcov"; version="1.3-4"; sha256="0k2lqwsfb9ir053m4dbz8z57xq6mlfj63i1k64p1h5jdzbpyw1ks"; depends=[robustbase pcaPP mvtnorm]; }; - rrcovHD = derive { name="rrcovHD"; version="0.2-2"; sha256="03b1mpqqhfjxjzz9agx575mcgalb7jrsv843zjqv9jp4wszprs6z"; depends=[rrcov robustbase pcaPP pls spls]; }; - rrcovNA = derive { name="rrcovNA"; version="0.4-4"; sha256="0zrzgnl83wfsaz0rma07hgb5jlmhvqwv06q7zkm65xd6mfsalqv0"; depends=[rrcov robustbase norm]; }; - rrdf = derive { name="rrdf"; version="2.0.2"; sha256="1m1dfxi720c0xyj1x41zc4vc3dhxs9flysm4xri8b7cibx44piyk"; depends=[rJava rrdflibs]; }; - rrdflibs = derive { name="rrdflibs"; version="1.3.0"; sha256="1qhi0diwvlw5icbym0nlg2yy8gibajycw55szsiipdxkjxj5r85l"; depends=[rJava]; }; - Rrdrand = derive { name="Rrdrand"; version="0.1-9"; sha256="11j3zi27469nckh1irrhkm3386yagfqny7s6rh5gb7y0988194yy"; depends=[]; }; - rredis = derive { name="rredis"; version="1.6.8"; sha256="01kksak1hdlcc2q32rzs8i45flxb7shzyq785yr0kanr54pd874z"; depends=[]; }; - RRF = derive { name="RRF"; version="1.6"; sha256="1gp224mracrz53vnxwfvd7bln18v8x7w130wslhfgcdl0n4f2d28"; depends=[]; }; - rriskDistributions = derive { name="rriskDistributions"; version="2.0"; sha256="0278426m4v7b8qb9ydzxqncayq8z25b36n4livqg40zpazp3hy85"; depends=[mc2d eha msm tkrplot]; }; - rrlda = derive { name="rrlda"; version="1.1"; sha256="06n9jah190cz25n93jlb5zb0xrx91bjvxgswwdx9hdf0fmwrpkvz"; depends=[pcaPP mvoutlier glasso matrixcalc]; }; - R_rsp = derive { name="R.rsp"; version="0.19.0"; sha256="0qh9nd6zpiw4c86qlwys8g7rqvay20m1yfp2zrvah5bz51hixbd1"; depends=[R_methodsS3 R_oo R_utils R_cache]; }; - rrules = derive { name="rrules"; version="0.1-0"; sha256="0f9msp289akzricjrm8dvfbh2dihfbszr7ms4fld1cr30zssajin"; depends=[]; }; - RSA = derive { name="RSA"; version="0.9.3"; sha256="132fqsr6zzv0q5maxgdh8amg6g0if3wdbhml0p0r668yy1wiq5l8"; depends=[lavaan ggplot2 lattice gridExtra plyr RColorBrewer]; }; - RSADBE = derive { name="RSADBE"; version="1.0"; sha256="1nzpm88rrzavk0n8iflsx8r3s1xcry15n80zqdw6jijjycz10w1q"; depends=[]; }; - rsae = derive { name="rsae"; version="0.1-5"; sha256="1f3ry3jwa6vg2vq2npx2pzzvfwadz8m48hjrqjk860nfjrymwgx5"; depends=[]; }; - RSAGA = derive { name="RSAGA"; version="0.93-6"; sha256="0wqiww0rx5fz4rbsb1x6pr2q0wz5dacj5fc0asj70igxwmh5x0p8"; depends=[gstat shapefiles plyr]; }; - RSAP = derive { name="RSAP"; version="0.9"; sha256="1sxirfabhpmfm0yiiazc9h1db70hqwva2is1dql6sjfanpl8qanl"; depends=[yaml reshape]; }; - rSCA = derive { name="rSCA"; version="2.1"; sha256="1lpix8xsjzyhgksmigvqxpv2bvaka0b1q2kcvdyfrfcw713n19rw"; depends=[]; }; - RSclient = derive { name="RSclient"; version="0.7-2"; sha256="04ml4pynjl97295wrclvb61mpwacrkzc9x5pbwyfg1qr3l8hss93"; depends=[]; }; - rscproxy = derive { name="rscproxy"; version="2.0-5"; sha256="1bjdv7drlnffcnyc0j8r22j7v60k1xj58bw8nk9l8wvnmngrjz86"; depends=[]; }; - RSDA = derive { name="RSDA"; version="1.2"; sha256="06sa3x0abm2gnf4i4y3d5mlqj1wl7mzzal27sa1x65awzi6rs2kz"; depends=[sqldf XML scales FactoMineR ggplot2 glmnet abind scatterplot3d]; }; - rsdepth = derive { name="rsdepth"; version="0.1-5"; sha256="064jbb6gnx0sm41w3sbi6mvsbzsfkjqfici6frk8sfm9ybvm591j"; depends=[]; }; - RSeed = derive { name="RSeed"; version="0.1.31"; sha256="0wljchzkp8800v9zcgjapkbildkb3p2xnkh1m6m7q6qqc9aw8mws"; depends=[sybil]; }; - rseedcalc = derive { name="rseedcalc"; version="1.2"; sha256="1di9bzwxyxm9gs14ks9z6sixi656hz9xwmq3aaqh53cjjr1ka0rc"; depends=[]; }; - RSEIS = derive { name="RSEIS"; version="3.3-3"; sha256="13fb4mx3sgnbrcn1kkxy0a490kikjrq49ii3x14xw2s8ci030wlr"; depends=[RPMG Rwave]; }; - RSelenium = derive { name="RSelenium"; version="1.3.1"; sha256="0cp48ga35v82y34r362ghkargkhr0nqfn0p15yifmfmd65l9j5q5"; depends=[RCurl RJSONIO caTools XML]; }; - rsem = derive { name="rsem"; version="0.4.5"; sha256="02vccj03bxisi2jwl31rwi4gw9i26g70aagdgg5gk8z0bys78v4d"; depends=[MASS lavaan]; }; - Rserve = derive { name="Rserve"; version="1.7-3"; sha256="09rha4p86vak7ss721mwp5bm5ig09xam8zlqv63n9wf36v3kdmpn"; depends=[]; }; - rSFA = derive { name="rSFA"; version="1.03"; sha256="0bgapvlx5n0984ryyh1is0w88lhxj49gcar8gkwiw455jbzx7isp"; depends=[MASS]; }; - rsgcc = derive { name="rsgcc"; version="1.0.6"; sha256="12f8xsg6abmhdgkrrc8sfzmv4i1pycq1g0jfad664d17yciw7rhh"; depends=[biwt cairoDevice fBasics gplots gWidgets gWidgetsRGtk2 minerva parmigene stringr snowfall]; }; - RSGHB = derive { name="RSGHB"; version="1.0.2"; sha256="0ffdx9lscbgknfqhvjdh3rwnlhiqxbpqa55jkn111a1vfv726v3d"; depends=[]; }; - RSiena = derive { name="RSiena"; version="1.1-232"; sha256="0qp3bqq5p19bg47m37s2dw8m4q91hnkc2zxwhsgb076q0xvvv9xq"; depends=[Matrix]; }; - rsig = derive { name="rsig"; version="1.0"; sha256="129k78i8kc30bzlphdb68vv3sw2k6xyiwrhw08vhzz6mf3jxlqsh"; depends=[survival BBmisc glmnet superpc Matrix]; }; - RsimMosaic = derive { name="RsimMosaic"; version="1.0.1"; sha256="10xlmzsrc4m6lsinrvl4kw0zdrqmidqi2a9s87sx1rfilvzv0ri4"; depends=[jpeg fields RANN]; }; - RSiteCatalyst = derive { name="RSiteCatalyst"; version="1.3.3"; sha256="0z6yg403qg2b18261s3v406ji18wpsjmd7i8v7ilr94pwgx0xhcl"; depends=[digest httr rjson plyr stringr base64enc]; }; - RSKC = derive { name="RSKC"; version="2.4.1"; sha256="1dvzxf001a9dg71l4bh8z3aia7mymqy800268qf7qzy9n6552g59"; depends=[flexclust]; }; - rsm = derive { name="rsm"; version="2.06"; sha256="0pjkqdhzmnzfc400z5xpdb17v6qckpnx2qpia2hm51m7xjfhks5b"; depends=[]; }; - RSNNS = derive { name="RSNNS"; version="0.4-5"; sha256="1wk91vjgf7q65n9q8hciv08bgzawpljnhaqgy9qdwpr82v8959i7"; depends=[Rcpp]; }; - rsnps = derive { name="rsnps"; version="0.1.0"; sha256="1wpbr2sjcw6hh9sq8h2jzgvc4xlygf0kcd91sqg89nmprfw73j6c"; depends=[plyr stringr httr RCurl XML]; }; - RSNPset = derive { name="RSNPset"; version="0.2"; sha256="0ivym4ysadvlfr9k4ikpw2diil9xd3hqx6xj8jcz482d3h8qcgq6"; depends=[fastmatch foreach doRNG Rcpp]; }; - RSocrata = derive { name="RSocrata"; version="1.5"; sha256="0hbazn4c3bmx9kc030l19ciz9m0r5p6760ggyxl8f7sh8g3bqw32"; depends=[httr jsonlite]; }; - RSofia = derive { name="RSofia"; version="1.1"; sha256="0q931y9rcf6slb0s2lsxhgqrzy4yqwh8hb1124nxg0bjbxvjbihn"; depends=[Rcpp]; }; - Rsolnp = derive { name="Rsolnp"; version="1.14"; sha256="0i5d8133vg0939j5772nbw1wd4cyp6q4684iqnl12qkk30hnh94s"; depends=[truncnorm]; }; - Rsomoclu = derive { name="Rsomoclu"; version="1.3.1"; sha256="106cbp8vm5sx8h6k0ddlp51r65jl0d6c0bz29vp8z4adx8ikacsm"; depends=[Rcpp]; }; - rspa = derive { name="rspa"; version="0.1-5"; sha256="18p2q2q372vbf90dfilcah07w1ivb34mv7rm5882z2s1jlixa5dk"; depends=[editrules]; }; - rspear = derive { name="rspear"; version="0.1-2"; sha256="1rjg84plnvlcp3p2929f1afl43lb92d3bfsvlhsaw92z7iva1vad"; depends=[plyr]; }; - RSpincalc = derive { name="RSpincalc"; version="1.0.1"; sha256="0n751l329j9pgpdnqrdnf93i9l1qxfp2bl4v4ray3nrnjx8g5mc9"; depends=[]; }; - rsprng = derive { name="rsprng"; version="1.0"; sha256="1sfjwfm03pn73mcq4f2chsldjlhmpjxhqkpmaqf71jbmb7ph41ip"; depends=[]; }; - RSQLite = derive { name="RSQLite"; version="0.11.4"; sha256="0300q901bc0zypvapq8kp0ixpm4vbg5a27bkg9k0s4m3l7rcp85v"; depends=[DBI DBI]; }; - RSQLite_extfuns = derive { name="RSQLite.extfuns"; version="0.0.1"; sha256="03ixy1q5dv4fnp4m1h75c7rvgfgfyxk5hgzd7fl7pqa1q13pjp6a"; depends=[RSQLite]; }; - Rssa = derive { name="Rssa"; version="0.11"; sha256="06mg1fdviayvhc50p9l5imh431b7cb3f3x3pl513phwhsv0qc0lk"; depends=[svd forecast lattice]; }; - rstiefel = derive { name="rstiefel"; version="0.9"; sha256="1l80bx07swalh5dbx34zwjza3xf3nk1kp1832v6hzk60i5xycdxd"; depends=[]; }; - RStorm = derive { name="RStorm"; version="0.902"; sha256="1apk358jwzg5hkrcq8h39rax1prgz9bhkz9z51glmci88qrw1frv"; depends=[plyr]; }; - rstream = derive { name="rstream"; version="1.3.2"; sha256="1habswhdlx7l92s9p9554px4kf9f9mhk5vkdq2fv4wk3381c0fgi"; depends=[]; }; - rstudioapi = derive { name="rstudioapi"; version="0.1"; sha256="027482pbdxnfhcpdw2ns2qhpa18zri71nz8fk0svq6900m2237h8"; depends=[]; }; - rsubgroup = derive { name="rsubgroup"; version="0.5"; sha256="1hrsp920gv0fr7s3w07vxish6wk3wnhd1rj04zvndd563fxvnl0l"; depends=[rJava foreign]; }; - Rsundials = derive { name="Rsundials"; version="1.6"; sha256="0vrvxsznbclgls4jljc59lyli6cw9k1a3wapfrs6xbkqi8865iif"; depends=[]; }; - RSurvey = derive { name="RSurvey"; version="0.8-0"; sha256="1kc07hvvpyk83ci0x6g0lmnxksd91y2ilfalbhlbp69jid111k1v"; depends=[sp rgeos MBA]; }; - RSvgDevice = derive { name="RSvgDevice"; version="0.6.4.4"; sha256="0vplac5jzg6bmvbpmj4nhiiimsr9jlbk8mzyifnnndk9iyf2lcmz"; depends=[]; }; - RSVGTipsDevice = derive { name="RSVGTipsDevice"; version="1.0-4"; sha256="1ybk5q4dhskrh7h1sy86ilchdwi6rivy3vv3lph6pms2virgm854"; depends=[]; }; - Rsymphony = derive { name="Rsymphony"; version="0.1-17"; sha256="1wg1l4535xmrqvyhf23b9kw3ggqxlcrig0x0dnhx0m2qr9v3ijni"; depends=[]; }; - rSymPy = derive { name="rSymPy"; version="0.2-1.1"; sha256="1mrfpyalrq8b6yicy28jsj0xy7hlawa72imsfhabwd3hrx6ld150"; depends=[rJython]; }; - rtape = derive { name="rtape"; version="2.2"; sha256="0q7rs7pc1k1kayr734lvh367j5qig2nnq5mgak1wbpimhl7z3wm7"; depends=[]; }; - RTConnect = derive { name="RTConnect"; version="0.1.4"; sha256="1000jmmqzyhl6vh1ii75jdh88s9inaz52gvfwcin2k2zr7bi91ba"; depends=[]; }; - RTDE = derive { name="RTDE"; version="0.1-0"; sha256="00hh1axipp2blrhjwl9mc4fkqv3l132gxlhi9hdy52w20yhwigin"; depends=[]; }; - rtematres = derive { name="rtematres"; version="0.2"; sha256="1d0vrprvnlk4hl2dbc6px9xn9kx9d1qvlqxd798hzda6qg5wwvf2"; depends=[XML RCurl plyr gdata]; }; - rTensor = derive { name="rTensor"; version="1.1"; sha256="0350cpafvdrjz5ibgk6bfw8j0kc3vr8vw84hw8jlbi96ia7p6w00"; depends=[]; }; - RTextTools = derive { name="RTextTools"; version="1.4.2"; sha256="1j3zfywq8xgax51mbizxz704i3ys4vzp8hyi5kkjzq6g2lw7ywq2"; depends=[SparseM randomForest tree nnet tm e1071 ipred caTools maxent glmnet tau]; }; - RTextureMetrics = derive { name="RTextureMetrics"; version="1.1"; sha256="0d0mvpmcpd62cvqlajrqp32lnvpflyf9bqvdzly2v8v1kb8274fc"; depends=[]; }; - rtf = derive { name="rtf"; version="0.4-11"; sha256="04z0s5l9qjlbqahmqdaqv7mkqavsz4yz25swahh99xfwp9plknfl"; depends=[R_oo R_methodsS3]; }; - rtfbs = derive { name="rtfbs"; version="0.3.2"; sha256="1v26znlispc8304xid0dsflphiwzil6nrxlsgj8dkp4prh6hdb34"; depends=[rphast]; }; - rtiff = derive { name="rtiff"; version="1.4.4"; sha256="13cz35dfz735yk2lci8cmjmsg4ddm31lv98lpx8ymy3bwmzdmc3c"; depends=[pixmap]; }; - RTOMO = derive { name="RTOMO"; version="1.1-2"; sha256="15swp7jx5xmj87hjcfdar3r5sqnnb795qclf8b7l4bvx80h9nh2i"; depends=[RPMG GEOmap RSEIS splancs]; }; - rtop = derive { name="rtop"; version="0.3-45"; sha256="0dh7jlnakk1hd27swspa0fj6pq6yddxhz32w3d7xq8jgr7xm8d70"; depends=[sp gstat]; }; - RTriangle = derive { name="RTriangle"; version="1.6-0.6"; sha256="1g4dp792awbvsl35nvyd8gkx99p2njdcafin16qysfrjl43f5i4s"; depends=[]; }; - rts = derive { name="rts"; version="1.0-3"; sha256="0jqk0p2q1vx9l6zf9pbc5k3lsw4hg5x1r6p0f7wjiks50x55pbl4"; depends=[raster xts zoo]; }; - Rtsne = derive { name="Rtsne"; version="0.8"; sha256="153f02f6iizd9986d6hxvpdddrwhnjy9a9yyrch2zcmcbh63hfba"; depends=[Rcpp]; }; - Rttf2pt1 = derive { name="Rttf2pt1"; version="1.3.1"; sha256="0hz7fgj2p410m19r88qqdm9cc5m729sgacinazfsi93qz9rp1r51"; depends=[]; }; - rtype = derive { name="rtype"; version="0.1"; sha256="14x86lhy5fmh2k1463p4v0lhsy51q0fkyg0jgnh7g65sry41bd68"; depends=[]; }; - Ruchardet = derive { name="Ruchardet"; version="0.0-3"; sha256="0dgldi6fgp949c3455m9b4q6crqv530jph210xzph41vgw8a2q2v"; depends=[Rcpp]; }; - rugarch = derive { name="rugarch"; version="1.3-3"; sha256="16vjk4vmsp35dgyb17c43q29z2laq320x6g73p5jc7l6xdjd3v5b"; depends=[Rsolnp nloptr ks numDeriv spd xts zoo chron SkewHyperbolic expm Rcpp]; }; - RUnit = derive { name="RUnit"; version="0.4.26"; sha256="0glz0ag2za5g4k8fjnsr97504bfk9d6khly1rqrrngg4qxz5wlf0"; depends=[]; }; - Runiversal = derive { name="Runiversal"; version="1.0.2"; sha256="0667mspsjydmxi848c6wsf14gz72bmdj9b3lilma92b7fhqnv7ai"; depends=[]; }; - runjags = derive { name="runjags"; version="1.2.1-0"; sha256="0rsqyrk9vzrnhw66c7hdqnbnvk6qsl882fshh2njzivaqxk2ibqq"; depends=[lattice coda]; }; - Runuran = derive { name="Runuran"; version="0.20.0"; sha256="1syzrmkw96gsw7vf10f1515zdqm9hdmq1v6yf1nbmipil1nkgsqs"; depends=[]; }; - RunuranGUI = derive { name="RunuranGUI"; version="0.1"; sha256="0wm91mzgd01qjinj94fr53m0gkxjvx7yjhmwbkrxsjn6mjklq72l"; depends=[Runuran rvgtest gWidgets gWidgetsRGtk2 cairoDevice]; }; - R_utils = derive { name="R.utils"; version="1.32.4"; sha256="12ypy8sxk5w1a3mpg4hi6k5db7ydrlj7qmp2lzh1rzcpbdg3wgka"; depends=[R_oo R_methodsS3]; }; - rv = derive { name="rv"; version="2.3.1"; sha256="0bjqwk7djl625fws3jlzr1naanwmrfb37hzkyy5szai52nqr2xij"; depends=[]; }; - RVAideMemoire = derive { name="RVAideMemoire"; version="0.9-38"; sha256="02683sklihj3726a90jryybf855rvbz9v3dm9z9yhb32q9bfmy34"; depends=[ade4 boot car lme4 lsmeans MASS mixOmics multcomp statmod]; }; - rvalues = derive { name="rvalues"; version="0.2"; sha256="1zc4irq0s9mm7yz8pc3n9il0z508wwf2a2j741wyyw90f35fasi0"; depends=[]; }; - Rvcg = derive { name="Rvcg"; version="0.8"; sha256="086r4vvqidwzikdmvij52nqgb1ka5z5f0k9c9qi6izn450lpf34y"; depends=[Rcpp]; }; - rvertnet = derive { name="rvertnet"; version="0.0-5"; sha256="1rj6csx2qb094wgkablrpzlbqb0hpzg5d29xrar2cy39gjmz40cj"; depends=[RCurl plyr RJSONIO httr ggplot2 maps]; }; - rvgtest = derive { name="rvgtest"; version="0.7.4"; sha256="1lhha5nh8fk42pckg4ziha8sa6g20m0l4p078pjj51kz0k8929ng"; depends=[]; }; - rvHPDT = derive { name="rvHPDT"; version="3.0"; sha256="05nrfnyvb8ar7k2bmn227rn20w1yzkp1smwi4sysc00hyjrlyg8s"; depends=[gtools]; }; - RVideoPoker = derive { name="RVideoPoker"; version="0.3"; sha256="06s4dlw0pw8rcq5b31xxqdpdk396rf27mai2vpvmn585vbm1ib7a"; depends=[pixmap tkrplot rpanel]; }; - Rvmmin = derive { name="Rvmmin"; version="2013-11.11"; sha256="14gsdvw7qxcffwkh0ayj0vlm0cqyavqgl4rqn5ybjr0pkbsmz955"; depends=[optextras]; }; - RVowpalWabbit = derive { name="RVowpalWabbit"; version="0.0.6"; sha256="06f2lmls92qkbscss00c99xkzpx83mgjah6ds0sixv1b2qi216ap"; depends=[Rcpp]; }; - RVsharing = derive { name="RVsharing"; version="1.1.0"; sha256="0gcas4rb8pms470dhbm2c2x87an0j594xsziglgd84nqn4gq095d"; depends=[kinship2]; }; - rvTDT = derive { name="rvTDT"; version="1.0"; sha256="09c2fbqnlwkhaxfmgpsdprl0bb447ajk9xl7qdlda201fvxkdc8v"; depends=[CompQuadForm]; }; - RVtests = derive { name="RVtests"; version="1.2"; sha256="0k7w6ml981zvr5bix197qw4kaf7rz5jqnwqlxf7aryxbm39gk16c"; depends=[glmnet spls pls]; }; - Rwave = derive { name="Rwave"; version="2.2"; sha256="1aqscnq7cr53nnddbjdqfjyrj8l76h9wcqr43i7fpa7g6hamvbwd"; depends=[]; }; - rWBclimate = derive { name="rWBclimate"; version="0.1.3"; sha256="0vs56hx7a85pw4jx8nb8bdlr9dbkl4zdhzhqsm0505xc3qz18vxh"; depends=[ggplot2 httr plyr rgdal jsonlite reshape2 sp]; }; - RWBP = derive { name="RWBP"; version="1.0"; sha256="104vr2cdk185hh4zn3vmqvb14p1q8ifk11wdgvk7fli1m1zxxwdd"; depends=[RANN igraph lsa SnowballC]; }; - RWeather = derive { name="RWeather"; version="0.4"; sha256="1vm8w07gsxwxvg1gpdzn6mpnh8g9kp0ln9fxjw5rl2f1zz80bxpy"; depends=[XML]; }; - RWebLogo = derive { name="RWebLogo"; version="1.0.3"; sha256="1n65mlnr163ywjnyyngnigbj0wpgkr38c3nx8hw5r8mwjnf3d617"; depends=[findpython]; }; - RWeka = derive { name="RWeka"; version="0.4-23"; sha256="1p1kz6if5yhmjvjzvr0ig5i0l6g7bzp6z8q4jssrp2g07g576084"; depends=[RWekajars rJava]; }; - RWekajars = derive { name="RWekajars"; version="3.7.11-1"; sha256="1w8y8xxsmm9b7hnnwknsbivkgbarnfqmv9666b7c5db9yra1hf7f"; depends=[rJava]; }; - RWiener = derive { name="RWiener"; version="1.2-0"; sha256="1ssh4xcyr4whgyd91p6bjsm9mq1ajqjqva0yyk13dnf5jfpsr0gs"; depends=[]; }; - Rwinsteps = derive { name="Rwinsteps"; version="1.0-1"; sha256="0kzngkan9vydibnr3xm4pyz4v6kz0r4h19f0ngqpri07fkhdsxzd"; depends=[]; }; - rwm = derive { name="rwm"; version="1.53"; sha256="0x19502xzc3x90iwvhvj24w36qab79v4y7mb37ax8a0n3pw6rah8"; depends=[]; }; - rworldmap = derive { name="rworldmap"; version="1.3-1"; sha256="0wrg6ap39bq88sv5axxd90yyqafn77amk5429pxd9v5a2hdm3g8w"; depends=[sp maptools fields]; }; - rworldxtra = derive { name="rworldxtra"; version="1.01"; sha256="183z01h316wf1r4vjvjhbj7cg4xarn4b8qbmnn5y7nrrdndzi163"; depends=[sp]; }; - rwt = derive { name="rwt"; version="1.0.0"; sha256="112wp682z4gkxsd3bqnlkdrh42bfzwnnhzyangxi2dh0qw63bgcr"; depends=[matlab]; }; - RxCEcolInf = derive { name="RxCEcolInf"; version="0.1-3"; sha256="04d6ffl4qs2vjbk0ibvyq17i2l26qnvxr72s6p3f8q4px33rh4kh"; depends=[MASS MCMCpack mvtnorm lattice]; }; - RXKCD = derive { name="RXKCD"; version="1.7-5"; sha256="0dsds1bv2vfq61gfppar2ai23dryh09ric5i6zaccms6q64z23md"; depends=[RJSONIO png jpeg plyr]; }; - RXMCDA = derive { name="RXMCDA"; version="1.5.3"; sha256="1pc52kvihxzq12p95r4srmnawxcsvd4r7252dajby338p56d1lw8"; depends=[XML kappalab]; }; - RXshrink = derive { name="RXshrink"; version="1.0-8"; sha256="0l4aknr1vxrkxqsgkjcffs0731jskyzvl055a01vd8h4a0826n5s"; depends=[lars]; }; - Ryacas = derive { name="Ryacas"; version="0.2-11"; sha256="116ncg48ih1v3ra095k63ccqchfbvzixh3cfjb2bbc47a9zh8phc"; depends=[XML]; }; - RYoudaoTranslate = derive { name="RYoudaoTranslate"; version="1.0"; sha256="1i3iyqh97vpn02bm66kkmw52ni29js30v18n2aw8pvr88jpdgxm4"; depends=[RCurl rjson]; }; - ryouready = derive { name="ryouready"; version="0.3"; sha256="0nms3zfkis2fsxkyj3dr95vz3kk6pkm7l5ga7iz8pxy1ywrawj2i"; depends=[stringr car]; }; - rYoutheria = derive { name="rYoutheria"; version="1.0.0"; sha256="1yj66ars5a8mbv2axl6l5g7wflwz3j4mhwk3iz5w33rfhixixm9l"; depends=[plyr RJSONIO reshape2 RCurl]; }; - rysgran = derive { name="rysgran"; version="2.1.0"; sha256="1l2mx297iyipap8cw2wcw5gm7jq4076bf4gvgvij4q35vp62m85z"; depends=[soiltexture lattice]; }; - Rz = derive { name="Rz"; version="0.9-1"; sha256="1cpsmfxijrfx06ydpjzbaak7gkad4jjk1ph9453l9zly1cwzgspj"; depends=[foreign memisc psych ggplot2 RGtk2 formatR]; }; - rzmq = derive { name="rzmq"; version="0.6.8"; sha256="0likcj1xivr0y42krnm5zynkr6slfc3yqq2nd90x79ldvbfdqxc6"; depends=[]; }; - s20x = derive { name="s20x"; version="3.1-10"; sha256="0hxi8d1pl0jgg66jxzz0z973sg3f4s1jf75smmizy99kd76rdnh0"; depends=[]; }; - s2dverification = derive { name="s2dverification"; version="2.1.1"; sha256="1m3m5sbq96fhnl4slxgb2j0009kqfdivdn3nbb203pc0knjpflnq"; depends=[GEOmap geomapdata maps mapproj]; }; - s4vd = derive { name="s4vd"; version="1.0"; sha256="07pnkhyqf9iymj913813d93dmb3iqbdlcl0gsgacihyyinb4id5s"; depends=[biclust]; }; - sac = derive { name="sac"; version="1.0.1"; sha256="1rl5ayhg5y84fw9w3zf43dijjlw9x0g0w2z4haw5xmxfni72ms8w"; depends=[]; }; - 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]; }; - saemix = derive { name="saemix"; version="1.2"; sha256="1whwn54iiapdfig6qpzji3z3skir6jrs34dq78zlynibgrg95hx6"; depends=[]; }; - SAFD = derive { name="SAFD"; version="0.4"; sha256="1zbja8bgva2j24ks4m14hbf4s0n674lj89nfxkkmwrljzsmjrjhv"; depends=[]; }; - safeBinaryRegression = derive { name="safeBinaryRegression"; version="0.1-3"; sha256="1g68r6pp5l41rbgyfqgcha1gpsisnl0ybdmdqr4ylr43f61dpgvd"; depends=[lpSolveAPI]; }; - SAM = derive { name="SAM"; version="1.0.5"; sha256="1fki43bp6kan6ls2rd6vrp1mcwvz92wzcr7x6sjirbmr03smcypr"; depends=[]; }; - SamplerCompare = derive { name="SamplerCompare"; version="1.2.5"; sha256="1p05fb6g0rwkzz0qp8hx88skxvfq265ndv9g694gc2h8vzwpan1y"; depends=[mvtnorm]; }; - sampleSelection = derive { name="sampleSelection"; version="1.0-2"; sha256="1hzvvwvqp6v9d6ldm17kx3g8pbgngw2pxklny0b3man47zh5jshc"; depends=[maxLik miscTools systemfit Formula]; }; - samplesize = derive { name="samplesize"; version="0.1-8"; sha256="0w4aa6p0j7l9xykhgqv7yps2nxx11q1mrgivdnv4si8fbkqx148n"; depends=[]; }; - Sample_Size = derive { name="Sample.Size"; version="1.0"; sha256="1vfnb2gg3rax4sxd81xqznfvh300nv45nn7zjsyrdjyg1n3ym7nw"; depends=[]; }; - samplesize4surveys = derive { name="samplesize4surveys"; version="0.5.1"; sha256="0qinzr55ldg7ngsa9lzwwwysjfk3230xs7kcqkvimnrn5z4n898v"; depends=[TeachingSampling]; }; - SampleSizeMeans = derive { name="SampleSizeMeans"; version="1.1"; sha256="1wbc46n8b8wbcxl21blbzs5728dr8r0l8d3jpzbha8pcav0xrh1m"; depends=[]; }; - SampleSizeProportions = derive { name="SampleSizeProportions"; version="1.0"; sha256="0mvkvx3nni0l8ys68sq3h2zlbjvksdcdzxqlf03k0ca5bbcmdf9l"; depends=[]; }; - sampling = derive { name="sampling"; version="2.6"; sha256="11r8p29kwc0ggycbv7sm1zmazmfm4p5207l764ad4znjib0cab6p"; depends=[MASS lpSolve]; }; - samplingbook = derive { name="samplingbook"; version="1.2.0"; sha256="1vynz6hsnz5d0vg66f8k67h24rb809k9chb4waymk6vwnp8lksz9"; depends=[pps sampling survey]; }; - samplingEstimates = derive { name="samplingEstimates"; version="0.1-3"; sha256="1srdchlpxksfdqhf5qdvl7nz0qsxkxww7hzqj0q71asbzlq3am3p"; depends=[samplingVarEst]; }; - SamplingStrata = derive { name="SamplingStrata"; version="1.0-2"; sha256="04mb14hb328s4smpfidxf448mpa1cij9lbsfii7j0a0qx9nwapy2"; depends=[]; }; - samplingVarEst = derive { name="samplingVarEst"; version="0.9-9"; sha256="04wgsq3sh69iy8p07ch210p22n5mds7cxp5s6zggzamqpf0hpnw7"; depends=[]; }; - sampSurf = derive { name="sampSurf"; version="0.7-2"; sha256="1bj1m5c8bx8i4jyk6kdgcfmgfj15iirxwg259r0c4fk7whcnfz59"; depends=[sp raster rasterVis boot]; }; - samr = derive { name="samr"; version="2.0"; sha256="0rsfca07pvmhfn7b49yk2ycw00wsq6dmrpv9haxz8q0xv7n5n2q9"; depends=[matrixStats]; }; - SAMURAI = derive { name="SAMURAI"; version="1.2.1"; sha256="02fipbjcsbp2b2957x6183z20icv1yly2pd1747nyww9bmpa7ycm"; depends=[metafor]; }; - sand = derive { name="sand"; version="1.0.2"; sha256="1y371ds86gcq2id996vp56h5dax2wm0mlk1ks2mp1k81n63l7wmf"; depends=[igraph igraphdata]; }; - sandwich = derive { name="sandwich"; version="2.3-1"; sha256="1yjbqzsv742m74gz57bnj1jmjw5n5qqp057fkz490l7b65kj9nqn"; depends=[zoo]; }; - sanitizers = derive { name="sanitizers"; version="0.1.0"; sha256="1c1831fnv1nzpq8nw9krgf9fm8v54w0gvcn4443b6jghnnbhn2n6"; depends=[]; }; - sanon = derive { name="sanon"; version="1.3"; sha256="0kh2gvcd7nxcgfswhspw9xw68sk0kcrcv86h8ysfrwxi35ln6a75"; depends=[]; }; - sapa = derive { name="sapa"; version="2.0-0"; sha256="04zf1xs4w7s28mvc272la8z3r1slnf50pw0k8zj335j3i56x6b9y"; depends=[ifultools splus2R]; }; - SAPP = derive { name="SAPP"; version="1.0.4"; sha256="0a86vz390v2g5lz1r33qrmhgvak4rpfmpxy39shnivhagnrsarkl"; depends=[]; }; - sas7bdat = derive { name="sas7bdat"; version="0.5"; sha256="0qxlapb6wdhzpwlmzlhscy3av7va3h6gkzsppn4sx5q960310an3"; depends=[]; }; - SAScii = derive { name="SAScii"; version="1.0"; sha256="0nq859xmrvpbifk8q1kbx3svg61rqdg8p8gr1pn85fr0j3w7h666"; depends=[]; }; - SASmixed = derive { name="SASmixed"; version="1.0-4"; sha256="0491x4a3fwiy26whclrc19alcdxccn40ghpsgwjkn9sxi8vj5wvm"; depends=[]; }; - SASPECT = derive { name="SASPECT"; version="0.1-1"; sha256="1d3yqxg76h9y485pl5mvlx6ls1076f80b320yvx4zxmqq9yxmaba"; depends=[]; }; - SASxport = derive { name="SASxport"; version="1.5.0"; sha256="0sgxpjv9ilz2zb13kkb0fqjfbamrczxpy9rwvfhh46bmx4i038iq"; depends=[chron Hmisc]; }; - SAVE = derive { name="SAVE"; version="0.9.3.9.2"; sha256="1faky3155vh54r450r4dndn5749kp09bilyq8n7n7rls0dl5k34m"; depends=[coda DiceKriging]; }; - saves = derive { name="saves"; version="0.5"; sha256="1b4mfi2851bwcp0frx079h5yl6y1bhc2s8ziigmr8kwy1y1cxw10"; depends=[]; }; - saws = derive { name="saws"; version="0.9-6.1"; sha256="0w40j6xczqs74z1z3na4510w06px7yn55s2mw9mddd6736l56fv1"; depends=[gee]; }; - sBF = derive { name="sBF"; version="1.1"; sha256="11yjw6y1k0fi95p68bc4481gac25lympmmdykh71ljg0hnrm0s53"; depends=[]; }; - sbgcop = derive { name="sbgcop"; version="0.975"; sha256="0f47mvwbsym4khwgl0ic3pqkw3jwdah9a48qi3q93d46p2xich61"; depends=[]; }; - sbioPN = derive { name="sbioPN"; version="1.1.0"; sha256="0yvg55xnkhm35hfl7rldy2grb26hm4a68jr4x9n45fs7hhdylxri"; depends=[]; }; - SBRect = derive { name="SBRect"; version="0.26"; sha256="16g0ciy9q9irypsl8x36i0lavl41j3af13r2si0by8q6wj56pxi4"; depends=[rJava]; }; - SBSA = derive { name="SBSA"; version="0.2.3"; sha256="1v23lzzziyjlvgn5p2n1qcq2zv9hsyz2w15lbnfi5wvinxhlg8sc"; depends=[Rcpp]; }; - sca = derive { name="sca"; version="0.8-9"; sha256="024yxm1rlyz3hx9viv2nb6rapy938diaknc3nzkgq0ffky2gf0s3"; depends=[]; }; - scagnostics = derive { name="scagnostics"; version="0.2-4"; sha256="0fhc7d2nfhm8w6s6z1ls6i8d7c90h4q7rb92rz8pgq3xh031hpcf"; depends=[rJava]; }; - scaleboot = derive { name="scaleboot"; version="0.3-3"; sha256="0w3gwqxshiypbixrdjg3p5z3qfp0nf9gv838z9hlbf0xpzgk11xa"; depends=[]; }; - scales = derive { name="scales"; version="0.2.4"; sha256="08dryii8ibh16wxs61pam07b24rwhqvdcdhk09mij289l309192v"; depends=[RColorBrewer dichromat munsell plyr labeling]; }; - scalreg = derive { name="scalreg"; version="1.0"; sha256="06iqij1cyiw55ijzk2byrwh3m5iwsra7clx8l4v69rc236q8zbdi"; depends=[lars MASS]; }; - scam = derive { name="scam"; version="1.1-7"; sha256="0wjpc5fcr4409gnanq7xnmlai51my86zndsxh5lw418ywdgcbyn4"; depends=[mgcv Matrix]; }; - scape = derive { name="scape"; version="2.2-0"; sha256="0dgbh65fg6i5x4lpfkshn382zcc4jk1wp62pwd2l2f59pyfb92a3"; depends=[coda Hmisc lattice]; }; - scar = derive { name="scar"; version="0.2-1"; sha256="04x42414qxrz8c7xrnmpr00r46png2jy5giwicdx6gx8jwrkzhzs"; depends=[]; }; - scaRabee = derive { name="scaRabee"; version="1.1-3"; sha256="1fdxmk2mbrynxh6zy0xjmcwa384n5bppl1vzmfj5rjw840f7hbrk"; depends=[neldermead lattice deSolve]; }; - scatterplot3d = derive { name="scatterplot3d"; version="0.3-35"; sha256="1w0r7cyz01rzmgcf2x7wa4xs88ga6fd67wksyjyzrh2pdcbc56yx"; depends=[]; }; - SCBmeanfd = derive { name="SCBmeanfd"; version="1.1"; sha256="0pcyrnzlnlyn4v3lyv7pv01v2lh4vig1x4x8g98lpccpi1bimd4z"; depends=[boot KernSmooth]; }; - SCEPtER = derive { name="SCEPtER"; version="0.1-0"; sha256="13jnqcgsz3rz5dis8jmbma1m6z72qphdjyjf3984c66clhazxnh9"; depends=[MASS]; }; - SCEPtERextras = derive { name="SCEPtERextras"; version="0.1-0"; sha256="1vv231h744c7j7rvcb2xaffmwdd9ms76yvvw2l3xcb72iwhl5dbw"; depends=[]; }; - SCGLR = derive { name="SCGLR"; version="2.0"; sha256="0pgix9i520yj7gpby3fcykvk9nnq1pl8b0akyhdv5l6vax9d5bg4"; depends=[Matrix Formula expm ggplot2 ROCR]; }; - scholar = derive { name="scholar"; version="0.1.1"; sha256="1wlhxw5k28qypfl6dm07cjrpvpmvcbwn1fc7205xpj20f41jchra"; depends=[stringr plyr R_cache XML]; }; - schoolmath = derive { name="schoolmath"; version="0.4"; sha256="06gcmm294d0bs5whvknrq48sk7li961lzy4bcncjg052zbbpn67x"; depends=[]; }; - schoRsch = derive { name="schoRsch"; version="1.0"; sha256="15kjab5cpss2kkf3pd2nyszdsfn77840zx7yrbkry6n7xb4x8icn"; depends=[]; }; - schwartz97 = derive { name="schwartz97"; version="0.0.6"; sha256="0l34f30l75zrg3n377jp0cw7m88cqkgzy6ql78mrx8ra88aspfzn"; depends=[FKF mvtnorm RUnit]; }; - SCI = derive { name="SCI"; version="1.0-1"; sha256="1m5a15a4n0zjqykq38pyw9133g2ih4ykbgak8c8khq8p0isnl8qb"; depends=[fitdistrplus lmomco]; }; - scidb = derive { name="scidb"; version="1.1-2"; sha256="1nkyzvjpacm4imv778nc6gc468419shkyhxb59hsaw9840wcs1na"; depends=[Matrix iterators RCurl zoo]; }; - SciencesPo = derive { name="SciencesPo"; version="0.05.21"; sha256="1x1b1fyy961nm5i54drkakn2qzlja17haa66dz9135h1lgj83y4s"; depends=[data_table xtable]; }; - scio = derive { name="scio"; version="0.6.1"; sha256="0h15sscv7k3j7qyr70h00n58i5f44k96qg263mxcdjk9mwqr0y65"; depends=[]; }; - sciplot = derive { name="sciplot"; version="1.1-0"; sha256="0na4qkslg3lns439q1124y4fl68dgqjck60a7yvgxc76p355spl4"; depends=[]; }; - SciViews = derive { name="SciViews"; version="0.9-5"; sha256="199waafpn0ndg7szwfhw2jlgcx1f0pv7j0vix2vzz60knwm698xb"; depends=[MASS ellipse]; }; - SCMA = derive { name="SCMA"; version="1.1"; sha256="0bims9l047xvbwp2r5ly5cgpd7fc0p2cik48gg42abwdqvppf542"; depends=[]; }; - SCORER2 = derive { name="SCORER2"; version="0.99.0"; sha256="1a28wga69ip9s98ch2dqgl0qkwa3w6frmaqcvhclc360ik813mxq"; depends=[]; }; - scoring = derive { name="scoring"; version="0.5-1"; sha256="0vxjcbp43h2ipc428qc0gx7nh6my7202hixwhnmspl4f3kai3wkp"; depends=[]; }; - ScottKnott = derive { name="ScottKnott"; version="1.2-4"; sha256="0s2b74isklmjjz5qzb0sg2lzqxv3bka2wxcja1lg49npmv70kly7"; depends=[]; }; - scout = derive { name="scout"; version="1.0.3"; sha256="0wmjmk0ckd211cq5ykd0yzjschs7fkg04w67arl4pwma0z5z56lq"; depends=[glasso lars]; }; - SCperf = derive { name="SCperf"; version="1.0"; sha256="1v9l7d9lil2gy5bw6i7bzc24808m063xaw2spl005j0a9rh4ag41"; depends=[]; }; - ScrabbleScore = derive { name="ScrabbleScore"; version="1.0"; sha256="19vgaxnhvqsbllqxfbnhnar2j4g0fkxi7rfsmkks2bd2py81x04m"; depends=[]; }; - scrapeR = derive { name="scrapeR"; version="0.1.6"; sha256="1rqgqpn9rc43rh356z9gb51pjhdczr9a9mgv0i078nniq156rmlb"; depends=[XML RCurl]; }; - ScreenClean = derive { name="ScreenClean"; version="1.0.1"; sha256="0haanr05g4vwp5apncyzv8i3r61g4xf9ihm8ilcabcgpri56gpjk"; depends=[MASS Matrix quadprog]; }; - scrime = derive { name="scrime"; version="1.3.3"; sha256="1vp7ai10m0f3s0hywyqh0yllxj6z6p795zqpr6vp58fh6yq20x73"; depends=[]; }; - scriptests = derive { name="scriptests"; version="1.0-9"; sha256="03jv5hgzs4hvkpvjr9073nncmwj20cwispzwrbvxjdnvm5hnjg3y"; depends=[]; }; - SCRT = derive { name="SCRT"; version="1.0"; sha256="1yk3ialhsn5qgjsi7zl7m61bkkwiw90xa4fl1vwncbgpzhrfzgkj"; depends=[]; }; - scrypt = derive { name="scrypt"; version="0.1.0"; sha256="1hc1rziigwggdx2pvklldkw88mdzbwa8b8a2a0ip4cm1w6flsl9n"; depends=[Rcpp]; }; - scuba = derive { name="scuba"; version="1.7-0"; sha256="11mdc8pj552ag36ib4sfbjv8r0psa6wnb13spz0v3rbaslz25hpw"; depends=[]; }; - SCVA = derive { name="SCVA"; version="1.0"; sha256="0dphdrc069d9nggpipl97wj1vqwnnjlv3fs68pqygzb5kbd70nx3"; depends=[]; }; - sda = derive { name="sda"; version="1.3.4"; sha256="0fbbiyh6sp23mg6lmzk9fm9sprqwvrv0fxxjykl5ww0pbl63rrmj"; depends=[entropy corpcor fdrtool]; }; - SDaA = derive { name="SDaA"; version="0.1-2"; sha256="03ijiqwvvqs79ql9p016hpn5dwxnys820k00aza29npm9k2bciww"; depends=[survey ggplot2]; }; - SDBP = derive { name="SDBP"; version="1.0"; sha256="18yk5zasxga58ny8n8kz3b8j0j8xznb9wqf5642xzfvcb9dd1kz2"; depends=[]; }; - sdcMicro = derive { name="sdcMicro"; version="4.4.0"; sha256="0ig43sdzn940mpv2d8v1v0k77nb5mwwsy8amkb6vdxs0rql7qvyy"; depends=[brew knitr data_table xtable car robustbase cluster MASS e1071 Rcpp sets]; }; - sdcMicroGUI = derive { name="sdcMicroGUI"; version="1.1.1"; sha256="0icxxbfxl65da07bpi7l2jzk85y990ndhl60lwyp077sjq5rd20q"; depends=[sdcMicro gWidgetsRGtk2 cairoDevice vcd foreign Hmisc]; }; - sdcTable = derive { name="sdcTable"; version="0.17.1"; sha256="0wljdpggf8mhsjg0xrgb3xqd346zb4f8pk0jfgv38krhkfxz1ss5"; depends=[stringr Rcpp Rglpk lpSolveAPI data_table]; }; - SDD = derive { name="SDD"; version="1.1"; sha256="1bl9xlns6np26pgiiza25c54k4989knksdkkk653g8s8gmr4y34x"; depends=[Hmisc sm tseries rpanel rgl]; }; - SDDA = derive { name="SDDA"; version="1.0-5"; sha256="1lwp36bwx13cyiqyzh5jp2c0f0g2hvppqxnpjcflmcz7s23h5dp7"; depends=[MASS]; }; - sddpack = derive { name="sddpack"; version="0.9"; sha256="1963l8jbfwrqhqcpif73di9i5mb996r4f8smjyil6l7sdir7cg9l"; depends=[]; }; - sde = derive { name="sde"; version="2.0.10"; sha256="1wkgam394190zg1m0b9hg81h9mkqhqw8isk7xf5vdqxymjzsaxjm"; depends=[MASS fda zoo]; }; - sdef = derive { name="sdef"; version="1.5"; sha256="1xmx3nfjjfh6zw1vq7iip4rnshh40azja83xyvnz04jcv574vhxm"; depends=[]; }; - SDMTools = derive { name="SDMTools"; version="1.1-221"; sha256="1kacrpamshv7wz83yn45sfbw4m9c44xrrngzcklnwx8gcxx2knm6"; depends=[R_utils]; }; - sdmvspecies = derive { name="sdmvspecies"; version="0.3"; sha256="0xcgwj600a3r3v8hcy2xf1bkc60p44g2cjyq8qs2g3wqd7zyqj1b"; depends=[GPArotation ggplot2 psych raster]; }; - sdnet = derive { name="sdnet"; version="2.01.3"; sha256="1sr60ca2dn182nacsi1ix02cdjygf45jv51dcfz5744hj7afcvws"; depends=[]; }; - sdprisk = derive { name="sdprisk"; version="1.0-3"; sha256="0v490zz2c1qa0w9nfd0xs5xbbvd9g8vp39fp8x7k7cy598vby4yx"; depends=[numDeriv PolynomF rootSolve]; }; - sdtoolkit = derive { name="sdtoolkit"; version="2.33-1"; sha256="0pirgzcn8b87hjb35bmg082qp14idc5pfvm6dikpgkswag23hwh8"; depends=[]; }; - seacarb = derive { name="seacarb"; version="3.0"; sha256="1rjpf83f19rbp4mb7imnxlnlv8s0d6p6jqsarp6kksvr6yx5cdap"; depends=[]; }; - sealasso = derive { name="sealasso"; version="0.1-2"; sha256="0cjy3fj170p5wa41c2hwscmhqxwkjq22vhg9kbajnq7df2s20jcp"; depends=[lars]; }; - SearchTrees = derive { name="SearchTrees"; version="0.5.2"; sha256="11p81x1klkmxarypxpbisf78dlrmhzzg9y9hxpwz75pks1y56gqg"; depends=[]; }; - seas = derive { name="seas"; version="0.4-3"; sha256="1n0acg6fvaym4nx1ihw0vmb79csds0k4x9427qmcyxbl9hxxmllp"; depends=[]; }; - season = derive { name="season"; version="0.3-3"; sha256="0562qxc5bz9yjkz0zzighlp52ysv0gjn8xfycbxckmjxy3wrk9cz"; depends=[ggplot2 MASS mgcv survival coda]; }; - seasonal = derive { name="seasonal"; version="0.60.0"; sha256="0cs987gsh2brgwv30ildrzq2phj6pfrksl8dq3rdlx0a7411ll5i"; depends=[]; }; - seawaveQ = derive { name="seawaveQ"; version="1.0.0"; sha256="19vm1f0qkmkkbnfy1hkqnfz6x2a7g9902ka76bhpcscynl69iy56"; depends=[survival NADA lubridate]; }; - SEchart = derive { name="SEchart"; version="0.1"; sha256="19gqcd6xzwg37nzc67p88ip4i0v2f59ds85xfw9qq8lybvdm76k2"; depends=[JM]; }; - SECP = derive { name="SECP"; version="0.1-4"; sha256="0a4j0ggrbs0jzcph70hc4f5alln4kdn2mrkp3jbh321a6494kwl1"; depends=[SPSL]; }; - secr = derive { name="secr"; version="2.8.2"; sha256="0p885q2r8wy4n8j1dvmmd59p5nfds8f4l1mwiw4z3xwck3bwi776"; depends=[abind MASS nlme sp]; }; - secrdesign = derive { name="secrdesign"; version="2.1.3"; sha256="1gfkc5cdk9jg3db5yiq06k9li226m1sxd5r59283ci96sd6fh02s"; depends=[secr abind]; }; - seedy = derive { name="seedy"; version="0.1"; sha256="16rg2i2g3ri882jsiyvqk4yw7xmg7f1hiirb77w1pqa30007gl7v"; depends=[]; }; - seeg = derive { name="seeg"; version="1.0"; sha256="1d45vl075p4qbd74gpaa8aw1h82p9n633fym10yp9bmcv4gwksg6"; depends=[car spatstat sgeostat]; }; - seem = derive { name="seem"; version="1.0"; sha256="0cjdi9c89bqvrx9gzxph958cfqicc1qfnzsair0gvsk3cxsrw6bf"; depends=[]; }; - SEER2R = derive { name="SEER2R"; version="1.0"; sha256="0lk0kkp8sv3nl19zwqd7449mmjxsj3pqpzdmqf70qf8xh2pqyvzd"; depends=[]; }; - SEERaBomb = derive { name="SEERaBomb"; version="2014.4.1"; sha256="1vlk6hcn05vdjfc7c8dhvsd1hc2yq1pdmhb7i48b689lkxg82igz"; depends=[RSQLite LaF]; }; - seewave = derive { name="seewave"; version="1.7.3"; sha256="1bgv90x1rc7xyril6qarbx5mza131admd75s9704s8l7n4zfy64k"; depends=[fftw tuneR]; }; - seg = derive { name="seg"; version="0.5-1"; sha256="0gsdbq7b5wpknhlilrw771japr63snvx4vpirvzph4fjyby1c7rg"; depends=[sp splancs]; }; - segmented = derive { name="segmented"; version="0.4-0.0"; sha256="0dcr3s33j68ficbjgvi9hv5z2ihplljwp5zrqp82bc43qhbwsr6i"; depends=[]; }; - Segmentor3IsBack = derive { name="Segmentor3IsBack"; version="1.8"; sha256="00m6fvx6s8mz477c8b4dmgdh52jf6jx1lcqzf84l90b1xw93qnv7"; depends=[]; }; - SE_IGE = derive { name="SE.IGE"; version="1.0"; sha256="0gx3kdsdl3rjms6fxabxz51z84r9mcy4934l2g43ifrxbyphnias"; depends=[]; }; - Sejong = derive { name="Sejong"; version="0.01"; sha256="1d9gw42dbs74w7xi8r9bs6dhl23y16yxqzyhqqayvcm98q3l77nf"; depends=[]; }; - SEL = derive { name="SEL"; version="1.0-2"; sha256="1nrk0fx6ff330abq8askvp0790xnfv00m3sraqcr32hciw6ks421"; depends=[quadprog lattice]; }; - selectiongain = derive { name="selectiongain"; version="2.0.29"; sha256="0l0av8dw14yfnc5a17nknjimhbi0nw30h7m8la346kibcsmszyvr"; depends=[mvtnorm]; }; - selectMeta = derive { name="selectMeta"; version="1.0.6"; sha256="0qv06x6q6p2lwr13fw8xc6mkpb23h41sqnc9wyq8xx37d2jgpcif"; depends=[DEoptim]; }; - selectr = derive { name="selectr"; version="0.2-2"; sha256="0hzj8ccs2jcfaqlpgrf59y6z7hrxsb2c85kkxflp6180rpqjrwq4"; depends=[XML stringr]; }; - SeleMix = derive { name="SeleMix"; version="0.9.1"; sha256="04gxgja35qs4k66iil014dzgl5bkx0qhr9w4v7qpmwv2bb07jwz3"; depends=[mvtnorm Ecdat xtable]; }; - sem = derive { name="sem"; version="3.1-5"; sha256="093kklhl9fnawpwj3km1q0px6fm40kc3vg7kw93y3yb6hniwla35"; depends=[matrixcalc]; }; - semdiag = derive { name="semdiag"; version="0.1.2"; sha256="0kjcflw7dn907zx6790w7hnf5db6bf549whfsc0c2r173kf13irp"; depends=[sem]; }; - semGOF = derive { name="semGOF"; version="0.2-0"; sha256="1lsv72yaza80jqadmah7v2cpfqfay57y12hcz6brvia6bmr5qagb"; depends=[sem MASS matrixcalc]; }; - semiArtificial = derive { name="semiArtificial"; version="1.2.0"; sha256="11pwdqpsf5d5g74s2b8ixmrh2khkha3d4akzlkn652s98qr55dpc"; depends=[CORElearn MASS nnet cluster mclust fpc timeSeries timeDate]; }; - SemiCompRisks = derive { name="SemiCompRisks"; version="1.0"; sha256="1q10bqws152vk7fpd9m8w16m0ns2i10q07wnmmbjladvfq4ja9il"; depends=[]; }; - SEMID = derive { name="SEMID"; version="0.1"; sha256="1bxdjdyqlvxz339jdgw90qi6kvfhjdmga38vhfl3ldlxfv2s9gfk"; depends=[igraph]; }; - SemiMarkov = derive { name="SemiMarkov"; version="1.3.1"; sha256="0cqrwpg26m8paa1rnz5yd6min00kwvl9ifgf4x71y2ldzr2n52b8"; depends=[numDeriv MASS Rsolnp]; }; - SemiPar = derive { name="SemiPar"; version="1.0-4"; sha256="1gg80wpqa006qahpaxb5y7vnf4w0x9mhjwh6w3271j0b9znr1gs5"; depends=[MASS cluster nlme]; }; - SemiParBIVProbit = derive { name="SemiParBIVProbit"; version="3.2-11"; sha256="1b1ywyax76893vp6s4ldjvk035vky4pbiagl8blzcwp7vhvy4ys7"; depends=[CDVine mgcv mvtnorm MASS magic polycor VineCopula VGAM survey trust matrixStats Matrix sn]; }; - SemiParSampleSel = derive { name="SemiParSampleSel"; version="1.1"; sha256="0b2vdrqi4mw4bp6r82b3c329cddjxwc39rcramq5nr8awv9ib0cf"; depends=[copula mgcv mvtnorm magic trust Matrix]; }; - semisupKernelPCA = derive { name="semisupKernelPCA"; version="0.1.5"; sha256="1v8wdq63b1gqicj8c9a24k0w7cc0bkg0mnc9z5mklsfcl7g0g6k9"; depends=[datautils irlba]; }; - SEMModComp = derive { name="SEMModComp"; version="1.0"; sha256="1za67470f13z8jsy3z588c7iiiz993d3vjqrb8v9fann2r6sf1md"; depends=[mvtnorm]; }; - semPlot = derive { name="semPlot"; version="1.0.0"; sha256="0ih94pwhkgd8jni3wkv1xmjr4c00q94dq4n8mxdwvixwi1l0gzjq"; depends=[qgraph lavaan sem plyr XML igraph lisrelToR rockchalk colorspace corpcor]; }; - semPLS = derive { name="semPLS"; version="1.0-10"; sha256="0q5linjyv5npkw4grx3vq58iq2q1grf06ikivhkg8w7rvb7pqn6b"; depends=[lattice]; }; - semTools = derive { name="semTools"; version="0.4-0"; sha256="1s6js0wqipfvn8hdmsmxjg3h8j4n6v00jisiwg4rfljvis9wx27l"; depends=[MASS lavaan]; }; - sendmailR = derive { name="sendmailR"; version="1.1-2"; sha256="1d3rzcckrfqsilpzmpacwibhz858b8sw029vfz6mjh6q0ijswi2q"; depends=[base64enc]; }; - sendplot = derive { name="sendplot"; version="4.0.0"; sha256="0ia2xck94nwirwxi38nv0viz5wb8291yiak6f0wgwh84irsrfp1h"; depends=[rtiff]; }; - sensitivity = derive { name="sensitivity"; version="1.8-2"; sha256="1q30xpb1w5dnkivxh1ck53jz2m9kpjmzvr2yd739zxxlir5kx8gr"; depends=[boot]; }; - SensitivityCaseControl = derive { name="SensitivityCaseControl"; version="2.1"; sha256="00jqzqx7g0av9lw13is723gph486gb8ga0wgcmmzpmb24s5nya9z"; depends=[]; }; - sensitivitymv = derive { name="sensitivitymv"; version="1.2"; sha256="0h8lbl5yhxgzdrajjydb2ap9q3dnm1abxdk8gdhp84m1bv8pznkj"; depends=[]; }; - sensitivitymw = derive { name="sensitivitymw"; version="1.1"; sha256="1bknnfkkqgmchabcjdfikm37sn5k41ar8lpnjw58i8qh7yzq237i"; depends=[]; }; - SensoMineR = derive { name="SensoMineR"; version="1.20"; sha256="1qw97cixndg2h29bbpssl0rqag3w8im4nm9964lr7r012y5wdqhx"; depends=[FactoMineR cluster KernSmooth]; }; - sensR = derive { name="sensR"; version="1.4-0"; sha256="19yddfcql1w154v81fsdm50wl15vl3vcx44iz3ss7in4gj1g884m"; depends=[multcomp MASS numDeriv]; }; - SenSrivastava = derive { name="SenSrivastava"; version="2012-04-0"; sha256="0ki0kl18cj8lkad6q48piyvslkirs8y5rnfa8bvgjxsisxg2ahhp"; depends=[]; }; - separationplot = derive { name="separationplot"; version="1.0"; sha256="1m8s531dsmzdam5s2yn0qyvm89zfxrzj8sh8r2gpcf31qrai7m26"; depends=[MASS RColorBrewer]; }; - seqCBS = derive { name="seqCBS"; version="1.2"; sha256="1kywi3kvvl9y6nm7cwf6fj8gz9gzznp5va336g1akzgy77k82d8v"; depends=[clue]; }; - seqDesign = derive { name="seqDesign"; version="1.0.1"; sha256="17zb8l5kasjvrsrgs2k0ih25ydlz7hpr9dcr1rm1akvscmk8np3d"; depends=[survival xtable]; }; - SeqFeatR = derive { name="SeqFeatR"; version="0.1.5"; sha256="1cpb64h3pcp18zrly0hxy2wfn68x4pgyj0ywl4z2kadi6y3r0gyh"; depends=[tcltk2 plotrix ape plyr phangorn]; }; - SeqGrapheR = derive { name="SeqGrapheR"; version="0.4.8.3"; sha256="03plwa3sc1pg34p1szbz3d0z8y53w7iqm7qn9q6fj72rsnk5spxc"; depends=[igraph rggobi gWidgets gWidgetsRGtk2 cairoDevice]; }; - seqinr = derive { name="seqinr"; version="3.0-7"; sha256="0r54kvvwlp5i1fbk4vgbinj3zwzjppiyh7f5dy4kmja8m5lslc4x"; depends=[]; }; - seqMeta = derive { name="seqMeta"; version="1.4"; sha256="0wmwvw09fskwpvy727lc974aw9gvd495wgxf8k1ybi16bq2h080j"; depends=[survival Matrix coxme CompQuadForm]; }; - seqminer = derive { name="seqminer"; version="3.1"; sha256="15b63j15bgqzix4vp57q1vi9jnqn5an2p8kmvacg95ahrv8w0a0m"; depends=[stringr]; }; - seqmon = derive { name="seqmon"; version="0.2"; sha256="075hc6vgl1w3nisrihf5w6mkkg9q601jsqxm9hk9yagyvvd7d78w"; depends=[]; }; - seqPERM = derive { name="seqPERM"; version="1.0"; sha256="1i8ai4gxybh08wxjh96m6xlqxhh7ch0xihjs879snmy4zqfi0pap"; depends=[]; }; - seqRFLP = derive { name="seqRFLP"; version="1.0.1"; sha256="1i98hm8wgwr8b6hd237y2i9i0xgn35w4n2rxy4lqc5zq71gkwkvk"; depends=[]; }; - sequences = derive { name="sequences"; version="0.5.8"; sha256="1872737x77mknn2ay7qh8brd28hzsqzjqkx4shwkp0w7lk2p0rp0"; depends=[Rcpp]; }; - Sequential = derive { name="Sequential"; version="1.1"; sha256="1fr4n6qbxwj6hs01h07wdj5v4c7af5q8ccnm33yzcrx845qf8fiv"; depends=[]; }; - sequenza = derive { name="sequenza"; version="2.0.0"; sha256="04kva5bvflpzq53qgif8sw49npcx1hwlqvrypgb6ynajyg28hd6p"; depends=[squash]; }; - seriation = derive { name="seriation"; version="1.0-13"; sha256="0k3m4x0msdynblcy1ign4p5qlsqmxk2p4vfjkv0fz3qjsbxfw61n"; depends=[TSP cluster gclus colorspace MASS]; }; - servr = derive { name="servr"; version="0.1"; sha256="035pf1xg0jgjrba39wxwlrh7n43kp29ymagfv7yskxj31dh3b34i"; depends=[httpuv]; }; - sesem = derive { name="sesem"; version="1.0.1"; sha256="0s4xkv6bc5nxhj09mk9agnj11b9h7swccs9jrn4lg3fy12vqhf5a"; depends=[lavaan mgcv gplots]; }; - SesIndexCreatoR = derive { name="SesIndexCreatoR"; version="1.0-2"; sha256="14xq2niqa6ml2dlyamv4w8appll7n0nplzvx9r7bnm289m4d6wwm"; depends=[FactoMineR class]; }; - session = derive { name="session"; version="1.0.3"; sha256="04mcy1ac75fd33bg70c47nxqxrmqh665m9r8b1zsz5jij1sbl8q5"; depends=[]; }; - SetMethods = derive { name="SetMethods"; version="1.0"; sha256="0zizvrzyk01w4ncazvifmjm4h5zrpsf6n68n11sc8f5kzny9ia48"; depends=[lattice betareg lattice betareg]; }; - setRNG = derive { name="setRNG"; version="2011.11-2"; sha256="1gp577yy3wzszpzgdhfpas7hrk658rb2vz0dxm111s5xnc5wcp74"; depends=[]; }; - sets = derive { name="sets"; version="1.0-13"; sha256="1ys17iy2gjkfnp3914g6sfx3ilgm18pdfak59cqrwalwwnhc3zaz"; depends=[]; }; - setwidth = derive { name="setwidth"; version="1.0-3"; sha256="1s6m24kmkafscgibgfldm70m57bv4gs0m7fdki18nwdi1rvwpkbf"; depends=[]; }; - severity = derive { name="severity"; version="2.0"; sha256="1mp19y2pn7nl9m8xfljc515kk5dirv0r2kypazpmd956lcivziqq"; depends=[]; }; - sExtinct = derive { name="sExtinct"; version="1.1"; sha256="1l6232z6c4z3cfl1da94wa6hlv9hj5mcb85fj1y0yparkvvl8249"; depends=[lattice]; }; - sfa = derive { name="sfa"; version="1.0-1"; sha256="1acqxgydf8j5csdkx0yf169x3yaa31r0ccdrqarh6vj1hacm89ad"; depends=[]; }; - sfsmisc = derive { name="sfsmisc"; version="1.0-26"; sha256="0claxq1s1hkwwymx8iva650v51fjf4ly10zm17d42qhnn4b2whgd"; depends=[]; }; - sft = derive { name="sft"; version="1.0-1"; sha256="0pi6x66mcywc1lbkwnwldnfg64h5vpp65vlis6b9cqd8iyx8msp4"; depends=[fda]; }; - SGCS = derive { name="SGCS"; version="2.0"; sha256="1d7abq07f0702k33j334va7kc4swz7rdqqb4sw1wq6a671r7k5v6"; depends=[spatstat]; }; - sgeostat = derive { name="sgeostat"; version="1.0-25"; sha256="04zl932s6zb26r42h2l8qf3d43bmrq67281mrkh4spn4vcddv5da"; depends=[]; }; - SGL = derive { name="SGL"; version="1.1"; sha256="1wc430jqn3li102zpfmyyavfbab7x7ww9p89clxsndyigrrbjdr7"; depends=[]; }; - sglasso = derive { name="sglasso"; version="1.0-1"; sha256="19f8qjhmv3jpx9p9wcnbzsifla0rccypxgwjykszr4gi7jl1s4z5"; depends=[Matrix]; }; - sglOptim = derive { name="sglOptim"; version="1.0.122.0"; sha256="07anc9ixbc82807ixr4k779src72gvbx0wsy3mr0mvzg9xq2fi1v"; depends=[Matrix]; }; - sglr = derive { name="sglr"; version="0.7"; sha256="11gjbvq51xq7xbmpziyzwqfzf4avyxj2wpiz0kp4vfdj3v7p4fp9"; depends=[ggplot2 shiny]; }; - sgof = derive { name="sgof"; version="2.1"; sha256="1nipm2lf02g0j4f8kas99wi4wmwp5vx2a97jj5mg8mclkwpifnhr"; depends=[poibin discreteMTP]; }; - 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]; }; - sGPCA = derive { name="sGPCA"; version="1.0"; sha256="16aa5jgvkabrlxaf1p7ngrls79mksarh6di3vp26kb3d3wx087dx"; depends=[Matrix fields]; }; - SGPdata = derive { name="SGPdata"; version="8.0-0.0"; sha256="0g25s2wcj47394fm16maygafnynizma3mgb3r65b5p9c27swk4v8"; depends=[]; }; - sgr = derive { name="sgr"; version="1.1"; sha256="1wbpxjv4g4jccih5xn2m7fqq4w1b4p05j56iwldkjp2r6paj5af1"; depends=[]; }; - shape = derive { name="shape"; version="1.4.1"; sha256="1s1yj7cqc9svqliv9f9k3fimkakblri9vwr785ihav58x5cn90qj"; depends=[]; }; - shapefiles = derive { name="shapefiles"; version="0.7"; sha256="08ghndihs45kylbzd9wnxffn8ixvxjhjnjldjyd526ai2sj8xcgf"; depends=[foreign]; }; - shapes = derive { name="shapes"; version="1.1-9"; sha256="044d4ci9lv6g9vbh8zn85f08d9n8f91vn8gn1wqv1lp0qjycpmjv"; depends=[scatterplot3d rgl MASS]; }; - SharpeR = derive { name="SharpeR"; version="0.1401"; sha256="1l55llafs81gl1mdhyyi6m02w7mx8g46y65jf1kw5mbrljgri8az"; depends=[matrixcalc xtable]; }; - sharpshootR = derive { name="sharpshootR"; version="0.6-3"; sha256="1dpcyd1wi022zcs9s48xg3wzy17dqcd0622ak0phvbwxgpwmz9j2"; depends=[aqp ape igraph cluster lattice latticeExtra vegan sp reshape2 Hmisc scales circular RColorBrewer plyr]; }; - sharx = derive { name="sharx"; version="1.0-4"; sha256="1flcflx6w93s8bk4lcwcscwx8vacdl8900ikwkz358jbgywskd5n"; depends=[Formula dcmle dclone]; }; - shiny = derive { name="shiny"; version="0.10.1"; sha256="1hd26n0mx62vsnvfvypkihj89hnbmvdwyw33h45x4vyiz5h1kd17"; depends=[httpuv caTools RJSONIO xtable digest htmltools]; }; - shinyAce = derive { name="shinyAce"; version="0.1.0"; sha256="1031hzh647ys0d5hkw7cqxj0wgry3rxgq95fgs7slbm0rgx9g6f7"; depends=[shiny]; }; - shinyBS = derive { name="shinyBS"; version="0.20"; sha256="1l95g2rzv53vwx5zcaqiqz8jirncwh1yb14y62x9phg4n5jfk9f8"; depends=[shiny]; }; - shinyFiles = derive { name="shinyFiles"; version="0.3.2"; sha256="19qzsvk5pqq59hfmzw4fg5fds26y1hqwhgjqf1pkxbmbd337qdik"; depends=[shiny]; }; - shinyRGL = derive { name="shinyRGL"; version="0.1.0"; sha256="07llg1yg5vmsp89jk60ly695zvxky6n06ar77mjxzlyc294akwmy"; depends=[rgl shiny]; }; - SHIP = derive { name="SHIP"; version="1.0.2"; sha256="0b83cclibdz1r7sz968nmca4najwgps9wrdlsh4gxrl7fq40k4ln"; depends=[]; }; - shotGroups = derive { name="shotGroups"; version="0.5"; sha256="02v785p5lqjpdp5vn7snpg1wgr7whpp4s4vbiwyaxmfp6kwqk81q"; depends=[boot coin CompQuadForm energy KernSmooth mvoutlier robustbase]; }; - showtext = derive { name="showtext"; version="0.2"; sha256="18pr03n0v2dg93pnp3saar3664dpina33wzmhw13hqcx6nfjgzw7"; depends=[sysfonts]; }; - shp2graph = derive { name="shp2graph"; version="0-2"; sha256="09gbb7f9h3q2p56dwb2813mr36115ah70szq47jimpymzkd2x08m"; depends=[maptools igraph]; }; - shrink = derive { name="shrink"; version="1.1"; sha256="0avf3502mjz2apy1nnz8a6xp5n77vva5v1n84sn1qimjnz40g58d"; depends=[]; }; - ShrinkCovMat = derive { name="ShrinkCovMat"; version="1.0.1"; sha256="08cb4r94vywpi5g6gbmjb197694553hyy0lb68wa11k6p3qnsh06"; depends=[]; }; - shuffle = derive { name="shuffle"; version="1.0"; sha256="037i45mfys1nr9sqmmsfb2yd3ba3aa22hc701f5j2zp8jx57qn3k"; depends=[]; }; - 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="2.3"; sha256="08w6xsncs4nbjgmfh1irfjrc7iflg7w4dx3shr9fh0vbsd35g8wl"; depends=[ape network igraph]; }; - sievetest = derive { name="sievetest"; version="1.2.2"; sha256="0mbgkf014m6bc7qg60vf065i6mvl5n4a0bvg8vb7dw531vsw2771"; depends=[]; }; - sig = derive { name="sig"; version="0.0-4"; sha256="0q5bwaj15jlmcg4qqcdkkwbnqphwgwzcnfzga12xzr912rwjybjr"; depends=[]; }; - sigclust = derive { name="sigclust"; version="1.1.0"; sha256="0151v7lr4n4yyn93j0s06gzc9jh9xhdgvfw6kvpfy24jl6wdii7g"; depends=[]; }; - SightabilityModel = derive { name="SightabilityModel"; version="1.2"; sha256="1piw8i6c3bdwjj20329431is3b7mxij7f1g49g7qw00s197n8qha"; depends=[]; }; - signal = derive { name="signal"; version="0.7-4"; sha256="0sz8im7i46qy5wjpm34a2nqvrc1vipmqlw8ns3i2s1vhcvp7fjs1"; depends=[MASS]; }; - signalextraction = derive { name="signalextraction"; version="2.0.3"; sha256="0kxk32jfkcgkdcq4xfzdf24qr6wkkhl4yf2v4sjqxhviwml2g2aq"; depends=[]; }; - signal_hsmm = derive { name="signal.hsmm"; version="1.0"; sha256="12v6frrhbaa8y9l3zy41fz8xkzalhp6afw33jad57c8hym4985nz"; depends=[seqinr shiny]; }; - sigora = derive { name="sigora"; version="0.9.2"; sha256="1s3c0xwxabr3n8sb6rjhzkkzbpvcczbgqq6b263yypwasqbg4mlb"; depends=[]; }; - SigTree = derive { name="SigTree"; version="1.6"; sha256="1z6z3s6gay3pcjazibb0schipc9qqpp3ahf0f56fq9mhk545125z"; depends=[ape phyext RColorBrewer]; }; - SII = derive { name="SII"; version="1.0.3"; sha256="1k9mvz6g25qs351c0vx7n5h77kb6k833jrcww14ni59yc9jgvsyg"; depends=[]; }; - 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]; }; - SimComp = derive { name="SimComp"; version="1.9.0"; sha256="1qw1bm0pahmvjxwa15q42vifq71lg7rw3dij7vba14sy88746m3g"; depends=[mvtnorm multcomp mratios]; }; - SimCorMultRes = derive { name="SimCorMultRes"; version="1.2"; sha256="0wgi36sdpsippdbawdl7b9bvip0l8gp8xd1v85vznd1dibkfjr1r"; depends=[evd]; }; - simctest = derive { name="simctest"; version="2.4"; sha256="12qxav3qy1s6g8yr6ygbjp3jlrf2p0h3zvl8bnqpk6mx95zw5gh3"; depends=[]; }; - Sim_DiffProc = derive { name="Sim.DiffProc"; version="2.7"; sha256="03g70f5rpj1695abbkk0n73bj1hniw6gzckzg3g5zrjczg96xxs8"; 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]; }; - simFrame = derive { name="simFrame"; version="0.5.3"; sha256="154d4k6x074ib813dp42l5l8v81x9bq2c8q0p5mwm63pj0rgf5f3"; depends=[Rcpp lattice]; }; - SimHap = derive { name="SimHap"; version="1.2.0"; sha256="1mnvqfqfgkhnh3glvr0xamw7si29jg1ri0nbb437a7wf023siy9z"; depends=[survival nlme]; }; - Simile = derive { name="Simile"; version="1.3"; sha256="0jf0ispjv8izrxggp6y3a3scd8qlbqfgppqz8m1q9n3gy8jhbsli"; depends=[]; }; - SIMMS = derive { name="SIMMS"; version="0.0.1"; sha256="0s53kc95jbav28kj35isc7j09qpjsk49za8p766z9yfaiw0higp7"; depends=[survival MASS]; }; - simMSM = derive { name="simMSM"; version="1.0.1"; sha256="0lway32vjajlsnkvi7j9hcsaz7bmhzmi1w3r2gr28y5mbkpfkgb2"; depends=[]; }; - simone = derive { name="simone"; version="1.0-2"; sha256="071krim64s7fjwvwq7bjr0pw33mw9am9wpyypcy4gs7g1hj8wcir"; depends=[mixer]; }; - simPH = derive { name="simPH"; version="1.2.2"; sha256="0bhycpip0f06ddgvydr19pdw8hl1yw3rvl781yqpc1zid657wir9"; depends=[car DataCombine data_table dplyr ggplot2 gridExtra MASS mgcv plyr reshape2 stringr survival quadprog]; }; - simpleboot = derive { name="simpleboot"; version="1.1-3"; sha256="1qprjisfflhzg8ll12p3q1zcfdiyc45glic2j9cw9nhx5rb065fk"; depends=[boot]; }; - SimpleTable = derive { name="SimpleTable"; version="0.1-2"; sha256="1rkybrp7zlb7cj37799npss1ldic0yf519q5l7a6ikal4yl1afyb"; depends=[hdrcde locfit MCMCpack]; }; - simplexreg = derive { name="simplexreg"; version="1.0"; sha256="144kljh968i7n2d21r4204i4h952mfrkfc8b5r6x760msgjphxvh"; depends=[Formula plotrix]; }; - Simpsons = derive { name="Simpsons"; version="0.1.0"; sha256="1pm6wga1yxc35zgz72plzq23d3l4bbzfdvhszdxmkn1pkk64h8ms"; depends=[mclust]; }; - SimRAD = derive { name="SimRAD"; version="0.94"; sha256="0jlq1bmq1xl5inh4s722jjxp54dh3dcpcvdncnzma6yb0inw8sj5"; depends=[]; }; - simsalapar = derive { name="simsalapar"; version="1.0-3"; sha256="0svfa8xnc5r6xqkwxvlnhml4l708ksgaq8fmnqbr1hwvzc6shypl"; depends=[sfsmisc gridBase colorspace]; }; - simsem = derive { name="simsem"; version="0.5-3"; sha256="12y2jlyys3aq8k7wi13iarzlgiqisp7731vcnd5rvla3cn0bnzrw"; depends=[lavaan]; }; - SimSeq = derive { name="SimSeq"; version="1.0.0"; sha256="142qjkfz53q3g9k37nqhilsw1mcklsa9q05yqvyn9dvj9l06y11i"; depends=[fdrtool]; }; - simSummary = derive { name="simSummary"; version="0.1.0"; sha256="1ay2aq6ajf1rf6d0ag3qghxpwj0f8b3fhpr2k0imzmpbyag1i3gj"; depends=[abind svUnit gdata]; }; - simTool = derive { name="simTool"; version="1.0"; sha256="005sq9pgmg80k67rn8y1qh88g1qh3hdi7adsrkf5hcbqzs6pzg30"; depends=[plyr reshape]; }; - SimuChemPC = derive { name="SimuChemPC"; version="1.3"; sha256="0ff454rvplr1ad5c9nmq4jbdbgfy5gzlvxfwhnyv2wzvdcyca6rk"; depends=[rcdk]; }; - SimultAnR = derive { name="SimultAnR"; version="1.1"; sha256="0jvmxwmbnx14h27b576dg9mw3c2z0w3m82f51f25zd1darcl06bj"; depends=[]; }; - SIN = derive { name="SIN"; version="0.6"; sha256="0vq80m3vl8spdnlkwvwy0gk3ziyybqzjp3scnfdcpn942ds7sgg9"; depends=[]; }; - SINGLE = derive { name="SINGLE"; version="1.3"; sha256="0wd7jzys51rnwr5rhf2llpygqxydjrv0dill19v8sz9w0madkil4"; depends=[flsa igraph dse Matrix]; }; - 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]; }; - siRSM = derive { name="siRSM"; version="1.1"; sha256="0fx6bfb5c8hdlgjxddwhhzr09ls53kfgn36hjk9zi5z8m14a7wbn"; depends=[rsm MASS foreach doSNOW]; }; - sirt = derive { name="sirt"; version="0.46-15"; sha256="0r6qhv1mcxms231s7s1xscdjadj87qvbi0mkdf8krb7285x69k2y"; depends=[sfsmisc TAM CDM combinat ic_infer sm psych pbivnorm gtools Rcpp qgraph lavaan semPlot igraph coda mvtnorm MASS]; }; - SIS = derive { name="SIS"; version="0.7-4"; sha256="0a8apfjzfwd5a2cvkviwvqlp26hqr34lba65cq5hxf9n05x2s7rx"; depends=[glmnet ncvreg survival]; }; - sitar = derive { name="sitar"; version="1.0.1"; sha256="1ji8742f518fzg8xz0dy5irwdz7a0nymajh69zd2l53yvcsnlwdp"; depends=[nlme]; }; - sitools = derive { name="sitools"; version="1.4"; sha256="0c0qnvsv06g6v7hxad96fkp9j641v8472mbphvaxa60k3xc7ackb"; depends=[]; }; - SixSigma = derive { name="SixSigma"; version="0.8-1"; sha256="15jdr10a7a6wv50vz9y6qcrbhnddl8zh4j4d48xrarrqbjy6l4p7"; depends=[qcc lattice ggplot2 reshape2 nortest testthat]; }; - SiZer = derive { name="SiZer"; version="0.1-4"; sha256="0kiwvxrfa2b49r2iab5v2aysc2yzk5ck3h41f2hr0vq5pdnz0qy5"; depends=[boot]; }; - sjdbc = derive { name="sjdbc"; version="1.5.0-71"; sha256="0i9wdfadfcabayq78ilcn6x6y5csazbsgd60vssa2hdff0ncgvk1"; depends=[rJava]; }; - sjPlot = derive { name="sjPlot"; version="1.4.2"; sha256="1vw66yz6j7inyb17krb0q830i9ik6wk3a1a1mn8gv1nhm48j8qlq"; depends=[ggplot2 MASS car foreign lmtest plyr psych reshape2 scales]; }; - SKAT = derive { name="SKAT"; version="0.95"; sha256="0jvcwckx7m5jc929ip2fqppgl1c9cx7bpybx986fs25gg7m808d4"; depends=[]; }; - skatMeta = derive { name="skatMeta"; version="1.4.3"; sha256="0bknv066ya4yl4hl4y02d9lglq2wkl9c2j1shzg3d64dg4sjvbak"; depends=[Matrix coxme survival CompQuadForm]; }; - skda = derive { name="skda"; version="0.1"; sha256="0a6mksr1d0j3pd0kz4jb6yh466gvl4fkrvgvnlmvivpv6b2gqs3q"; depends=[]; }; - SkewHyperbolic = derive { name="SkewHyperbolic"; version="0.3-2"; sha256="00l1bz3wxvs7qwl4sy814w6nrh0k79ldck5zd6c5alvg50hjwwk3"; depends=[DistributionUtils GeneralizedHyperbolic RUnit]; }; - skewt = derive { name="skewt"; version="0.1"; sha256="1xm00zfzjv53cq9drfcx7w2ri5dwsq7kajrk2hc1mvw0b6s4x2ix"; depends=[]; }; - Skillings_Mack = derive { name="Skillings.Mack"; version="1.0-2"; sha256="1spf77ix9d264r126hnrjm7z8fw19v1bk5pqhqcf6lm93zlcgh8i"; depends=[MASS matrixcalc gtools]; }; - skmeans = derive { name="skmeans"; version="0.2-6"; sha256="1ncas6mx9w5saz28vvwni8g0wbm6m7gfv8a7azw4305pc64bawam"; depends=[slam clue cluster]; }; - slam = derive { name="slam"; version="0.1-32"; sha256="000636dwj4kmj5w1w5s6bqixh78m7262y3fgizj7rfhcnc2gz7ad"; depends=[]; }; - SLC = derive { name="SLC"; version="0.3"; sha256="0l0y1sjj0glsb7vwla99ijclcgaq2y85bgz1wqm348n4shsmm2rs"; depends=[]; }; - Sleuth2 = derive { name="Sleuth2"; version="1.0-7"; sha256="1zav2g1yqc6bvzap4r5xwy9abkdj8iswivj5y2lylc25nkxwcswg"; depends=[]; }; - Sleuth3 = derive { name="Sleuth3"; version="0.1-6"; sha256="0q8sgh2szqnxc289vgi5v0sljzz8yb803ijx9w5mswdxw87z2dq3"; depends=[]; }; - slfm = derive { name="slfm"; version="0.1"; sha256="0s5q6ank6075sls9pkqhf7jlvi6gyvsbxa99c34d6ccrv88skyzq"; depends=[Rcpp coda]; }; - SLHD = derive { name="SLHD"; version="1.2-1"; sha256="0n5j20hp7kgi23gjprcwcaji8wdz5wwqqyc7i8dv0058fz2b5gzc"; depends=[]; }; - slp = derive { name="slp"; version="1.0-3"; sha256="09jyrp6y3rigy043d8s5i7nh89pgpvn3cv51mr729c9ccr6jdjb1"; depends=[mgcv]; }; - sltl = derive { name="sltl"; version="1.0"; sha256="08bh76qs4if17iw51wic1r9v17wldyqgmbyfpccqp49x7ajxnwhq"; depends=[FitAR timeSeries lubridate]; }; - sm = derive { name="sm"; version="2.2-5.4"; sha256="0hnq5s2fv94gaj0nyqc1vjdjd64vsp9z23nqa8hxvjcaf996rwj9"; depends=[]; }; - smaa = derive { name="smaa"; version="0.2-2"; sha256="1xd5yd63j67w9kb3sl3jbxkvd76270c1wlg9r3k85dm2mjd0l38v"; depends=[]; }; - smacof = derive { name="smacof"; version="1.5-0"; sha256="06csyz9fvdicxm11wh9mp6i4mvlgxyiclhlyg45grag0kqjgg6ha"; depends=[rgl polynom scatterplot3d Hmisc colorspace nnls]; }; - smam = derive { name="smam"; version="0.2-2"; sha256="1p6bzk4b9kpmfs4nxmcgc46hgdpldqg0pzpc0zhvs187z2nrfw75"; depends=[Matrix]; }; - smart = derive { name="smart"; version="1.0.1"; sha256="0ki3qn71zrw0nyv395qijcwahnxyv1p21j8x6cxr9spah2wzz8lb"; depends=[Matrix gplots gtools PMA elasticnet pcaPP igraph]; }; - SmarterPoland = derive { name="SmarterPoland"; version="1.2"; sha256="1ga2m9kbn269dx21k5q1drlw9hph99fsfdx2mfnajwlgpycgf6m9"; depends=[reshape rjson]; }; - smatr = derive { name="smatr"; version="3.4-3"; sha256="0iiazln4albj7k5w67slvyn98cqg4f6k409mml0n1pvlkki0h7gy"; depends=[plyr]; }; - SMC = derive { name="SMC"; version="1.1"; sha256="1r4ajgi785lmpnlxrba0n6phmk1f0mb6b5yqk6hx8gng2w8ggclz"; depends=[]; }; - smco = derive { name="smco"; version="0.1"; sha256="1sj3y1x6pc32cwzyhn9gaxs964xh5xl4vw08hsa8kfcxhh2r0s99"; depends=[]; }; - SMCP = derive { name="SMCP"; version="1.1.3"; sha256="0ksx2ibz849vhrz2px9p7z8hlgvspz7kxhadvhk5mhkfbhrnpdf0"; depends=[]; }; - SMCRM = derive { name="SMCRM"; version="0.0-3"; sha256="1x06w00sdijhg5h1s61q4ym5wgk97pw9md6api7if2cxjv7h5zcy"; depends=[]; }; - smcure = derive { name="smcure"; version="2.0"; sha256="1j7fxnb0sx57a0l929c3haz4f1y829ymlq0cvdh0cia4qp6ydv60"; depends=[survival]; }; - smcUtils = derive { name="smcUtils"; version="0.2.2"; sha256="0d1kmg386j0zrpp8vgxjwvpf1i25l86xrh82767xkp0n9qj8srwq"; depends=[]; }; - smdata = derive { name="smdata"; version="1.1"; sha256="1hcr093xfkp88fn75imjkmfnp9cfsng5ndxpa8m2g0l29qhpxfvk"; depends=[]; }; - smdc = derive { name="smdc"; version="0.0.2"; sha256="1j6xnzjbmmakbmk3lyjck3bsy8w8hyd9d8h04s4gbddhci283mqm"; depends=[proxy tm]; }; - sme = derive { name="sme"; version="0.8"; sha256="1djrs3z699p6q2y1hfywh27csqc9cp1cfm3lxkigmmvxqjhyshz6"; depends=[lattice]; }; - SMFI5 = derive { name="SMFI5"; version="1.0"; sha256="10qp33l0dig00y9gfhpzqig6dbkjw76ch9pfq64dn4xrdkpq1kx5"; depends=[ggplot2 reshape corpcor]; }; - smfsb = derive { name="smfsb"; version="1.1"; sha256="0khd23b6k9zgxz2x6g6c6k2g32mbpli32izdq6fgk1a990kdsp6j"; depends=[]; }; - SMIR = derive { name="SMIR"; version="0.02"; sha256="02q8m5m8lcfrpi78p3kajkps8wiir3jwyqc54j9vfx8aj6mk1v71"; depends=[]; }; - smirnov = derive { name="smirnov"; version="1.0-1"; sha256="09mpb45wj8rfi6n6822h4c335xp2pl0xsyxgin1bkfw97yjcvrgk"; depends=[]; }; - SmithWilsonYieldCurve = derive { name="SmithWilsonYieldCurve"; version="1.0.1"; sha256="0qvhd1dn2wm9gzyp6k7iq057xqpkngkb4cfmvmjqmf0vhysp371w"; depends=[]; }; - SML = derive { name="SML"; version="0.1"; sha256="0pdj7321wy50v5l23hknlm30kp8cfgn072pbbifyp8qzmk0hyd8h"; depends=[glmnet Matrix lattice]; }; - SMNCensReg = derive { name="SMNCensReg"; version="2.4"; sha256="1q5yjc1njlm3hd33fdjv9d46jawr5l7r1zzj4m22spd2q5cpv04i"; depends=[Matrix PerformanceAnalytics]; }; - SmoothHazard = derive { name="SmoothHazard"; version="1.0.9"; sha256="01ipdkb51zwrwb1gj344y4gl0934y8j54738rdzffl2lq6r3w7kv"; depends=[prodlim mvtnorm]; }; - smoothHR = derive { name="smoothHR"; version="1.0.1"; sha256="02kjqkgnhjwhq1vmva9nmy36a7bc6zjj6g81dw9m4zd3y9nbb005"; depends=[survival]; }; - smoothie = derive { name="smoothie"; version="1.0-1"; sha256="12p4ig8fbmlsby5jjd3d27njv8j7aiwx0m2n1nmgvjj0n330s1kj"; depends=[]; }; - smoothmest = derive { name="smoothmest"; version="0.1-2"; sha256="14cri1b6ha8w4h8m26b3d7qip211wfv1sywgdxw3a6vqgc65hmk5"; depends=[MASS]; }; - smoothSurv = derive { name="smoothSurv"; version="1.3-2"; sha256="11aq3yb7q4pilp00l7q8r3ywbmwnka63kkjpvakp27mvaqyr02qr"; depends=[survival]; }; - smoothtail = derive { name="smoothtail"; version="2.0.3"; sha256="0yr3j5mq1h9pd72kyi9z6wzly9cqkscim814yi710y79l03gp0fd"; depends=[logcondens]; }; - SMPracticals = derive { name="SMPracticals"; version="1.4-2"; sha256="0apmkmsv2fqmxpgq08n9k9dvcknj74s4cpp0myjcd6kibb7g9slq"; depends=[ellipse MASS nlme survival]; }; - SMR = derive { name="SMR"; version="1.0.0"; sha256="1479rkzwciw6h2r43wip52fmv5im33jrdphahcg38rfdqbx5ayrr"; depends=[]; }; - sms = derive { name="sms"; version="2.3"; sha256="0grxyp590hj2rvw1fw3yidzkl8nqqp5a14bp9xfpdph2nyas61qq"; depends=[doParallel foreach]; }; - smss = derive { name="smss"; version="1.0-1"; sha256="17a0x92hxzn212yiz87n7ssyi3bdhnyawxk1kkmk46q1ss22a1pm"; depends=[]; }; - SMVar = derive { name="SMVar"; version="1.3.3"; sha256="17wr4lixy3p32gr4jq02d7zsr88yrbddjsvynzdsdrwbxf4mwqhp"; depends=[]; }; - sn = derive { name="sn"; version="1.1-0"; sha256="0agilvhrg3x8xqysa098qjj0nzvfx6yps6v85jiwllhd1dp70fnl"; depends=[mnormt numDeriv]; }; - sna = derive { name="sna"; version="2.3-2"; sha256="1dmdv1bi22gg4qdrjkdzdc51qsbb2bg4hn47b50lxnrywdj1b5jy"; depends=[]; }; - snapshot = derive { name="snapshot"; version="0.1.2"; sha256="0cif1ybxxjpyp3spnh98qpyw1i5sgi1jlafcbcldbqhsdzfz4q10"; depends=[]; }; - SNFtool = derive { name="SNFtool"; version="2.1"; sha256="12kjxgjazb0qivcyg0lkqlvkdk7algpw3s1ir8p5if5c8cpicjyy"; depends=[]; }; - snow = derive { name="snow"; version="0.3-13"; sha256="1habq43ncac9609xky3nqfkbq52cz36dg8jbdihag269z1kazdnf"; depends=[]; }; - SnowballC = derive { name="SnowballC"; version="0.5.1"; sha256="0kbg33hy6m2hv9jspyx6naqmk2q6h2zmvvczjmkwqvlhzlj0c5s4"; depends=[]; }; - snowfall = derive { name="snowfall"; version="1.84-6"; sha256="1n9v9m4c02pspgkxfmq7zdk41s2vjcsk06b0kz9km4xy1x7k0hsg"; depends=[snow]; }; - snowFT = derive { name="snowFT"; version="1.3-0"; sha256="10hhhzzzyz1ph7c8k08s79h4pdwq4jk8bh47y37ww0yjq0fd6gik"; depends=[snow]; }; - SNPassoc = derive { name="SNPassoc"; version="1.9-2"; sha256="113byj8zbg6xyxb1qzm76sqfyk3fap0sd90691zzm1x2pbfnb3mh"; depends=[haplo_stats survival mvtnorm]; }; - snpEnrichment = derive { name="snpEnrichment"; version="1.4-0"; sha256="0fdr27d7hk3vzvhrvgnypwcrk4y0sncrrg4kk730ynsv0ig7dswl"; depends=[]; }; - snplist = derive { name="snplist"; version="0.12"; sha256="0jsf080pbpnsx2jygyqg0l14lsr4fvjzahgchdrawjhl2rky4nwl"; depends=[RSQLite Rcpp R_utils]; }; - SNPmaxsel = derive { name="SNPmaxsel"; version="1.0-3"; sha256="0pjvixwqzjd3jwccc8yqq9c76afvbmfq0z1w0cwyj8bblrjpx13z"; depends=[mvtnorm combinat]; }; - SNPMClust = derive { name="SNPMClust"; version="1.0"; sha256="1vyag8axrl888qhjsbv7g84hzfsnvxh5ccdcdriamy50c2chkji8"; depends=[MASS mclust]; }; - snp_plotter = derive { name="snp.plotter"; version="0.5.1"; sha256="16apsqvkah5l0d5qcwp3lq2jspkb6n62wzr0wskmj84jblx483vv"; depends=[genetics]; }; - snpStatsWriter = derive { name="snpStatsWriter"; version="1.5-6"; sha256="04qhng888yih8gc7yd6rrxvvqf98x3c2xxz22gkwqx59waqd4jlq"; depends=[colorspace]; }; - SNPtools = derive { name="SNPtools"; version="1.1"; sha256="0l29kiqz4048x7amxx1qzkaw2xnd6lpdsdp5nq3rck9amx2hw64a"; depends=[]; }; - SNSequate = derive { name="SNSequate"; version="1.1-1"; sha256="1jgpjws5apysp55pwy3x8mbzy4zjvv39anp6j2x4lgczh5nf49b6"; depends=[magic]; }; - SOAR = derive { name="SOAR"; version="0.99-11"; sha256="1n38gx5sxpkqfkk4y6vpp6g19b8bs5bisni9wn6311s0csizp86m"; depends=[]; }; - soc_ca = derive { name="soc.ca"; version="0.7.1"; sha256="0lg1bpbd0crywa29xc79cn3kr614wq4hr09xpwk17nv7q8qw8cnh"; depends=[ggplot2 gridExtra ellipse scales]; }; - SocialMediaMineR = derive { name="SocialMediaMineR"; version="0.1"; sha256="113nyjncl5yi61hz8i7k60b3f0f9a5vyrd3s72nbmc44cnvr8fci"; depends=[RCurl jsonlite httr]; }; - SocialNetworks = derive { name="SocialNetworks"; version="1.0"; sha256="0g6l1rf08qz0332fglc2gvkba55fjq9fiwf25rjqanh6spgk60fn"; depends=[Rcpp]; }; - SOD = derive { name="SOD"; version="1.0"; sha256="0f0rh1qsjzxb3zzr440kvl6fnnj7dvc5apdzs5hpf6xrlfg863pk"; depends=[Rcpp]; }; - SoDA = derive { name="SoDA"; version="1.0-6"; sha256="0sh2dan4ga2k14rirnkvgzsvbksx1k4ika5gkf5cy247rjkqnpj0"; depends=[]; }; - SODC = derive { name="SODC"; version="1.0"; sha256="18s4rcp5dzchvwrzzbfhbs3x91zlg1rymjarxjk5i429mfrn0krx"; depends=[magic ppls psych MASS]; }; - softclassval = derive { name="softclassval"; version="1.0-20130317"; sha256="1ifqm4a3xxi9wd4l1q4l5h4q5f8hp0k28mqpszzj8k1czbph88ql"; depends=[arrayhelpers]; }; - SoftClustering = derive { name="SoftClustering"; version="0.14.02"; sha256="15j79h1ccvzfpi55prbv2d7bms1grgry0ka58cr757cvwavrnbb8"; depends=[]; }; - softImpute = derive { name="softImpute"; version="1.0"; sha256="0pkpr8pxvrrw4p95907bnhl3k54dxz5r2fk8zi56kilrarhzchqr"; depends=[Matrix]; }; - soilDB = derive { name="soilDB"; version="1.3-2"; sha256="0rpkj9rjk75nz4dp0hkp4xjmd5s4lwppabbdqppwc5xs0565rdb6"; depends=[RODBC aqp plyr Hmisc]; }; - soilphysics = derive { name="soilphysics"; version="1.1"; sha256="1a7dcdhqm4dfdyicbpwc1wlj13y1pwkicyqkam1pizd5wblhr97b"; depends=[rpanel MASS]; }; - soilprofile = derive { name="soilprofile"; version="1.0"; sha256="0sdfg6m2m6rb11hj017jx2lzcgk6llb01994x749s0qhzxmvx9mb"; depends=[aqp lattice munsell splancs]; }; - SoilR = derive { name="SoilR"; version="1.1-23"; sha256="1cryypgnbck5hvkc2izrd8r10q2b97f2p1s46x4dk8p099gck5wg"; depends=[deSolve RUnit]; }; - soil_spec = derive { name="soil.spec"; version="2.1.3"; sha256="17fm4hyx8g6pj7qv11xlnx459x1s41fapz6ck4my9br734gcm4ns"; depends=[KernSmooth wavelets hexView pls]; }; - soiltexture = derive { name="soiltexture"; version="1.2.13"; sha256="10f4fdvicm7gj5zizpw197avzsbzj9x1g92y1ibh6lpdx3qz0ba1"; depends=[sp MASS]; }; - soilwater = derive { name="soilwater"; version="1.0.1"; sha256="08rz1i5dsgwfvfd4sl5x9j970v82v3kny0rqg1zbdnr53vp2xc7j"; depends=[]; }; - solaR = derive { name="solaR"; version="0.38"; sha256="0cvza0d4kd47kr6749ysvw664kjja87ppn4jvan4hrklczbpdc9z"; depends=[lattice latticeExtra zoo]; }; - SOLOMON = derive { name="SOLOMON"; version="1.0-1"; sha256="0z91wsrgdir25ks4dnirzsg4f1ngal7n40235m3w43j6y6dhkqrc"; depends=[]; }; - solr = derive { name="solr"; version="0.1.4"; sha256="0b1f6mf8fi2ql8j06b0mkk7nyy5wj1zsg46lfxi6bp8n4ywbym9n"; depends=[plyr httr XML assertthat rjson]; }; - som = derive { name="som"; version="0.3-5"; sha256="01xsysmqj0zhzifqpwcrs0mflh56ndv4q3nm5n5imx7wmzx2lrzp"; depends=[]; }; - soma = derive { name="soma"; version="1.1.0"; sha256="0x1wnn22mf14kix3rpkshf585vnddappd8w035pdv8qfsh5zzw6f"; depends=[reportr]; }; - somebm = derive { name="somebm"; version="0.1"; sha256="1iwwc94k6znh4d3bbjnvwp4chc4wg0iy4v2f99cs4jasrsimb4p8"; depends=[]; }; - someKfwer = derive { name="someKfwer"; version="1.1"; sha256="023lrf62z3ik3g6qljmyjkg1lxs21q93ajj3hyjri14431ccc2pg"; depends=[]; }; - someMTP = derive { name="someMTP"; version="1.4.1"; sha256="19bsn8rny1vv9343bvk8xzhh82sskl0zg0f5r59g9k812q5llchn"; depends=[]; }; - somplot = derive { name="somplot"; version="1.6.4"; sha256="06c8p2lqz3yxmxdl7ji8a3czvxnsbl7bwyiig76pkwc3a5qqfbb9"; depends=[hexbin]; }; - soobench = derive { name="soobench"; version="1.0-73"; sha256="1y2r061pd4kr0kdgp8db3qy2aj07jdiyvy2py4fmwg6b8pcf9y0l"; depends=[]; }; - SortableHTMLTables = derive { name="SortableHTMLTables"; version="0.1-3"; sha256="1jgrqsm0cj8qlk0s4qn3b83w96mgpp5gmhgcg9q2glc72v8c4ljh"; depends=[testthat brew]; }; - sortinghat = derive { name="sortinghat"; version="0.1"; sha256="1wrxwhdp3gj1ra0rgldnmc0w019bnjb6z9j20c5p1ab09x4dmlny"; depends=[MASS bdsmatrix mvtnorm]; }; - sorvi = derive { name="sorvi"; version="0.6.23"; sha256="070g6kxnacqwzl4djhbb5zjvp71997xl2l53cfni05yf7mkm17as"; depends=[reshape pxR ggplot2 plyr RColorBrewer XML]; }; - sos = derive { name="sos"; version="1.3-8"; sha256="0vcgq8hpgdnlmkxc7qh1jqigr0gvm9x3w4ijbhma7x4i5fx3c2il"; depends=[brew]; }; - sos4R = derive { name="sos4R"; version="0.2-11"; sha256="0r4lficx8wr0bsd510z4cp6la32xf928rsiznbywpxghnypsrcgg"; depends=[XML RCurl sp]; }; - sotkanet = derive { name="sotkanet"; version="0.9.03"; sha256="1h8jmwv99hcrl5hkd99ypphvl8hx6k765vb8aphzp8a0vh42pkl1"; depends=[ggplot2 rjson]; }; - soundecology = derive { name="soundecology"; version="1.1.1"; sha256="0md33ipcqcsbl361s242c4wk9szsl8sywks6ikzljabrfpjy3bkp"; depends=[pracma oce ineq vegan tuneR seewave]; }; - source_gist = derive { name="source.gist"; version="1.0.0"; sha256="03bv0l4ccz9p41cjw18wlz081vbjxzfgq3imlhq3pgy9jdwcd8fp"; depends=[RCurl rjson]; }; - sp = derive { name="sp"; version="1.0-15"; sha256="1pzkh1zzp61x9qg7k466syip1bcmp8m2j9vr964nv0fha9cfq6aj"; depends=[lattice]; }; - sp23design = derive { name="sp23design"; version="0.9"; sha256="1ihvcld19cxflq2h93m9k9yaidhwixvbn46fqqc1p3wxzplmh8bs"; depends=[mvtnorm survival]; }; - spa = derive { name="spa"; version="2.0"; sha256="1np50qiiy3481xs8w0xfmyfl3aypikl1i1w8aa5n2qr16ksxrnq3"; depends=[cluster MASS]; }; - SPA3G = derive { name="SPA3G"; version="1.0"; sha256="0fcbrg43c5r2n5p7bb8wslqzhl5h31paxr9rla583lkm0baxnmym"; depends=[]; }; - spaa = derive { name="spaa"; version="0.2.1"; sha256="0qlfbfvv97avbnixm5dz9il3dmd40wnpvv33jh7fa0mh740bircy"; depends=[]; }; - space = derive { name="space"; version="0.1-1"; sha256="1qigfz62xz47hqi43aii3yr4h7ddvaf11a5nil7rqprgkd0k6mv3"; depends=[]; }; - SPACECAP = derive { name="SPACECAP"; version="1.1.0"; sha256="1m5x2rydppib6fj7wlc6pq4gyvyvhw49yx9qgy4c2rk648wxnhrj"; depends=[coda]; }; - spaceExt = derive { name="spaceExt"; version="1.0"; sha256="0lp8qmb7vcgxqqpsi89zjy7kxpibg3x2mq205pjmsrbbh7saqzr4"; depends=[limSolve glasso]; }; - spacejam = derive { name="spacejam"; version="1.1"; sha256="1mdxmfa1aifh3h279cklm4inin0cx3h0z2lm738bai34j6hpvar7"; depends=[igraph Matrix]; }; - spacetime = derive { name="spacetime"; version="1.1-0"; sha256="0hmwlvam57i58lhfy9328ld1w4c5ilif6s1wvz6l9zvh036169zi"; depends=[sp zoo xts intervals lattice rgeos]; }; - spacodiR = derive { name="spacodiR"; version="0.13.0115"; sha256="0c0grrvillpwjzv6fixviizq9l33y7486ypxniwg7i5j6k36nkpl"; depends=[picante colorspace Rcpp]; }; - spacom = derive { name="spacom"; version="1.0-4"; sha256="1jfsbgy7b0mwl4n2pgrkkghx9p8b0wipvg4c5jar6v8ydby6qg94"; depends=[spdep foreach iterators lme4 nlme Matrix]; }; - spam = derive { name="spam"; version="0.41-0"; sha256="0pky172hycis2idq4274f9i4vhvj3lz7fpr869vm4qklb91j81sp"; depends=[]; }; - spaMM = derive { name="spaMM"; version="1.2.0"; sha256="0q8gfy9f0hrf82yp4rnwmjpyh97dz4yx1bhxiww8lh3dsbaagjns"; depends=[Matrix MASS lpSolveAPI proxy geometry Rcpp]; }; - SPAr = derive { name="SPAr"; version="0.1"; sha256="068jlsvaxx80ih6n86286m2r75cvy6w0m51vpj4gfclhh38py4p4"; depends=[]; }; - sparc = derive { name="sparc"; version="0.9.0"; sha256="0jsirrkmvrfxav9sphk8a4n52fg0d1vnk3i8m804i4xl0s7lrg8s"; depends=[]; }; - sparcl = derive { name="sparcl"; version="1.0.3"; sha256="1348pi8akx1k6b7cf4bhpm4jqr5v8l5k086c7s6rbi5p6qlpsrvz"; depends=[]; }; - sparkTable = derive { name="sparkTable"; version="0.11.0"; sha256="1293w8xyav7fqrsicx61g4hfq4v4pcd00msi2rm9y5y51b313pm1"; depends=[Cairo gridExtra ggplot2 shiny xtable StatMatch Rglpk pixmap RGraphics]; }; - sparktex = derive { name="sparktex"; version="0.1"; sha256="0r6jnn9fj166pdhnjbsaqmfmnkq0qr1cjprihlnln9jad05mrkjx"; depends=[]; }; - SPARQL = derive { name="SPARQL"; version="1.16"; sha256="0gak1q06yyhdmcxb2n3v0h9gr1vqd0viqji52wpw211qp6r6dcrc"; depends=[XML RCurl]; }; - sparr = derive { name="sparr"; version="0.3-5"; sha256="0vyy4zvvmkdr285wmmd3c84mvkwsz367k44b2i1j0sfj62m9w7q2"; depends=[spatstat rgl MASS]; }; - sparseBC = derive { name="sparseBC"; version="1.0"; sha256="16x581pm9fkbb4kp8lvz95mnckgrjbiwj9zin8hzyxdl1nrg4c3m"; depends=[glasso]; }; - sparsediscrim = derive { name="sparsediscrim"; version="0.2"; sha256="0m8ccmqpg1np738njavf736qh917hd3blywyzc3vwa1xl59wqccl"; depends=[corpcor bdsmatrix mvtnorm]; }; - SparseGrid = derive { name="SparseGrid"; version="0.8.2"; sha256="057xbj2bhjm9i32kn39iscnqqdsvsmq0b8c92l8hnf9avf1sx10x"; depends=[]; }; - sparseHessianFD = derive { name="sparseHessianFD"; version="0.1.1"; sha256="15x9v7b40mxl1z9ncazxzfzz7igvzmck22wlgj2y7c2ja8jxi6n2"; depends=[Rcpp RcppEigen Matrix]; }; - sparseLDA = derive { name="sparseLDA"; version="0.1-6"; sha256="0k9v2pjx4q4nhvpjhv496v4gfr5h19w0h2h7za7j6zqfn6aygvz6"; depends=[lars elasticnet MASS mda]; }; - sparseLTSEigen = derive { name="sparseLTSEigen"; version="0.2.0"; sha256="11llmrkq0pnrdphgjvhmg269bq3xbbn4s7kd7xhvk62sigvspkcj"; depends=[robustHD Rcpp RcppEigen]; }; - SparseM = derive { name="SparseM"; version="1.05"; sha256="041mkl0dlydlar0v0a66n9s1n0klayr08hwzpmwr2hsr05z0z380"; depends=[]; }; - sparseMVN = derive { name="sparseMVN"; version="0.1.0"; sha256="1xcq1w80ypqdz4zxwhnnzc50lhja6qxfxxnrg5xkgzpmy1zvjbzq"; depends=[Matrix]; }; - sparsenet = derive { name="sparsenet"; version="1.2"; sha256="106a2q4syrcnmicrx92gnbsf2i5ml7pidwghrpl6926glj59j248"; depends=[glmnet shape]; }; - spartan = derive { name="spartan"; version="2.0"; sha256="05xzhmyfx6krdsrqy2x8rsybvh3pc88nrggk955lqy7vwrdpf1j7"; depends=[]; }; - spatcounts = derive { name="spatcounts"; version="1.1"; sha256="0rp8054aiwc62r1m3l4v5dh3cavbs5h2yb01453bw9rwis1pj2qm"; depends=[]; }; - spate = derive { name="spate"; version="1.3"; sha256="17aiqi5cd17y9kaqx9yssk772ghcldk9i4s8nyafq8zp8d4r85i1"; depends=[mvtnorm truncnorm]; }; - spatgraphs = derive { name="spatgraphs"; version="2.62"; sha256="1h7sv6qc5zhaiaqlrzagrlc2mxlasdzilmi5q9nrd1vsdzsqxvb4"; depends=[]; }; - spatial = derive { name="spatial"; version="7.3-8"; sha256="1vc6pc5i7nbazbh5y3hhr9kgaq0gd9xi89xc8ah4n0lrivjbxfa8"; depends=[]; }; - spatialCovariance = derive { name="spatialCovariance"; version="0.6-8"; sha256="06z6jz9sadqc382w07ysnnlhqc96hxaasz9wncbhipd4cd1y4daa"; depends=[]; }; - SpatialEpi = derive { name="SpatialEpi"; version="1.2.1"; sha256="02mvahpbrlcnxmf272fk46wykv9s2lcjqd5yhd80dfs78qjwly77"; depends=[sp Rcpp MASS maptools spdep]; }; - SpatialExtremes = derive { name="SpatialExtremes"; version="2.0-0"; sha256="0fjh4cjzljwzxk4bhcrff9wnkskaiawbj7z6swrj1xl35mq4dljx"; depends=[]; }; - spatial_gev_bma = derive { name="spatial.gev.bma"; version="1.0"; sha256="1rjn0gsbgiv69brhnm0zj25ya3nyfh4yf6jizng85mvss3viv3hj"; depends=[SpatialExtremes msm coda]; }; - spatialkernel = derive { name="spatialkernel"; version="0.4-19"; sha256="0gbl6lrbaxzv2f975k0vd6ghrljgf1kjazld3hm7781kv1f87lji"; depends=[]; }; - SpatialNP = derive { name="SpatialNP"; version="1.1-1"; sha256="108gxk0gbbjck9bgxvqb9h216ww21lmh2by0hrhzwx5r63hhcbmd"; depends=[]; }; - SpatialPack = derive { name="SpatialPack"; version="0.2-3"; sha256="1gs0x3wj3hj663m6kszwhy3ibcx0lrslr127miy1rhz8683ij71c"; depends=[]; }; - 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]; }; - spatialTailDep = derive { name="spatialTailDep"; version="1.0"; sha256="070jsz86jc4qvwa8j9gfksy23hf0wgj307w7jd5107ng1f42047v"; depends=[cubature mvtnorm SpatialExtremes]; }; - spatial_tools = derive { name="spatial.tools"; version="1.4.8"; sha256="0qnsjfx974na87p3n7sp711sc13v6dmpvb2kjpvscixs8rsy03y1"; depends=[iterators foreach rgdal raster mmap abind doParallel]; }; - SpatialTools = derive { name="SpatialTools"; version="0.5.8"; sha256="18zchr8bfjqdr9j6vh6365mhrj2n0ns1ixvmas5s0ppiim59jl7j"; depends=[spBayes Rcpp]; }; - SpatialVx = derive { name="SpatialVx"; version="0.2-1"; sha256="0j6m698nyd9nq0qx1s2ykk05q2scj9jb0m813r0xyymf0sl0l90a"; depends=[spatstat fields smoothie smatr turboEM distillery maps boot CircStats fastcluster waveslim]; }; - SpatioTemporal = derive { name="SpatioTemporal"; version="1.1.7"; sha256="0rc5zf8cnjw59azgqmslfz2dl5i17dfmb7ls5c849qybp2gn2zdv"; depends=[Matrix MASS]; }; - spatstat = derive { name="spatstat"; version="1.37-0"; sha256="1vz22y6k79xqbcl5qdbjn36qwlc7sh7jlcvrdq9v1sbmqvdj2j23"; depends=[mgcv deldir abind tensor polyclip]; }; - spatsurv = derive { name="spatsurv"; version="0.9-6"; sha256="0gq0m27i96v3pasq8b4d6dyi6x3irxm648f3l2sw693dm12gcqrx"; depends=[survival sp iterators RandomFields fields rgl Matrix stringr]; }; - spBayes = derive { name="spBayes"; version="0.3-8"; sha256="0pmriffqnblqyd1332a2pqrjr7y3wllb17swb403h7c9dph6mzzv"; depends=[coda magic abind Formula]; }; - spBayesSurv = derive { name="spBayesSurv"; version="1.0.0"; sha256="17di7irh9sad3jviw8adp3z0v1qi8j6rsh2wv0y6k59milflsdn9"; depends=[Rcpp survival]; }; - spc = derive { name="spc"; version="0.5.0"; sha256="0bh4a3dpavczckhpwqax1h5w73ai3mkf0nwq9nhlvkdrh6k6j6cy"; depends=[]; }; - spcadjust = derive { name="spcadjust"; version="0.1-2"; sha256="1i64hbslsmnap6ljwpzygrbcb2q1zp0jsm02x2a29nyxq05wwrrv"; depends=[]; }; - spcosa = derive { name="spcosa"; version="0.3-5"; sha256="15q0f2sfhm1b13zs5a50yfvqhgcn4fyncf0h5ivin2k9g5xvq4k4"; depends=[rJava ggplot2 sp]; }; - spcov = derive { name="spcov"; version="1.01"; sha256="1brmy64wbk56bwz9va7mc86a0ajbfy09qpjafyq2jv7gm7a35ph5"; depends=[]; }; - spcr = derive { name="spcr"; version="1.2"; sha256="0xixl6b4h3iawpbfgdni6z2v7ch3ydn7s9fyr8g0sjr4svzqbyiv"; depends=[]; }; - spd = derive { name="spd"; version="2.0-0"; sha256="0aznzj68gynhx295gdb4sb7xxjiya4vbdg3gshfs0mwg1qzrhxy9"; depends=[KernSmooth]; }; - spdep = derive { name="spdep"; version="0.5-74"; sha256="0f9ahp57dfincwjazx0fgqzk4i2nc6fxra7dlfa8xvzwrp1yll05"; depends=[sp Matrix LearnBayes deldir boot coda nlme MASS]; }; - spdynmod = derive { name="spdynmod"; version="1.0"; sha256="0az4y95j1x0kid6smc0k20w1q2bnjnr267rw8fk0j41rrm7njcai"; depends=[deSolve raster animation]; }; - spe = derive { name="spe"; version="1.1.2"; sha256="0xyx42n3gcsgqmy80nc9la6p6gq07anpzx0afwffyx9fv20fvys0"; depends=[]; }; - speccalt = derive { name="speccalt"; version="0.1.1"; sha256="0j7rbidmmx78vgwsqvqjbjjh92fnkf2sdx0q79xlpjl2dph7d6l6"; depends=[]; }; - SPECIES = derive { name="SPECIES"; version="1.0"; sha256="0p45llf2wjr467bqr4pbljfank9zz3fm42yl3i0r3jbkxgz0rjf0"; depends=[]; }; - SpeciesMix = derive { name="SpeciesMix"; version="0.3.1"; sha256="0wl15k00d7n9pmnp1kr28p05z4vrziprcdndw77kwkcgv51cvllk"; depends=[MASS numDeriv]; }; - specificity = derive { name="specificity"; version="0.1.1"; sha256="1gvlyx9crkzm3yyp1ln5j9czcg83k7grm6ijabhl919gjjr1p60n"; depends=[car]; }; - SpecsVerification = derive { name="SpecsVerification"; version="0.1-1"; sha256="0bym4r2bz02v7cw0sn5bpsrnyvrm9jq2s9hz621x10d37iymc7m0"; depends=[]; }; - spectralGP = derive { name="spectralGP"; version="1.3.1"; sha256="1bc8y4wk09spsvbv8cn1iqq2y9qdlvrcnpqh2s0b8j4nxx262gyb"; depends=[]; }; - 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]; }; - speedglm = derive { name="speedglm"; version="0.2"; sha256="1vl3q67qhrvg01m2yaxrjz4rc3wh1mrmr3hdh0bbdg8rjq1khbl0"; depends=[Matrix]; }; - speedRlibs = derive { name="speedRlibs"; version="1.1-36"; sha256="1q0kv07wgirfmvaqrnyfr6csz8yycjnpqlvxq9w2k5agsn86pbr8"; depends=[]; }; - speedRlibTF = derive { name="speedRlibTF"; version="0.3-39"; sha256="061cnc9qy1zpfr0k9a57jfy3xf25gkl67f22sniykmk31v0vr60r"; depends=[]; }; - speff2trial = derive { name="speff2trial"; version="1.0.4"; sha256="0dj5mh2sdp6j4ijgv14hjr39rasab8g83lx1d9y50av11yhbf2pw"; depends=[leaps survival]; }; - SPEI = derive { name="SPEI"; version="1.6"; sha256="0mbz4nydnzwypfbi1d9fjy09x6133q096qbfrc913dbidzkvfpqv"; depends=[lmomco]; }; - sperich = derive { name="sperich"; version="1.5-5"; sha256="0xwzyfx3z06lapvhzdzrfr9hw2hm8d0cyfmc29p5fcplmjm24idh"; depends=[]; }; - sperrorest = derive { name="sperrorest"; version="0.2-1"; sha256="17jq8r98pq3hsyiinxg30lddxwpwi696srsvm3lfxrzk11076j6v"; depends=[ROCR rpart]; }; - spfrontier = derive { name="spfrontier"; version="0.1.10"; sha256="0x1f8g8lg1f5kp9m2pnj8qbv5pjk40kh40yd3s6iwgny4hjsmg60"; depends=[moments ezsim tmvtnorm mvtnorm Matrix]; }; - spgrass6 = derive { name="spgrass6"; version="0.8-3"; sha256="0syrm4fgyzslvl9k8szlha01iqkz02nla08whys3pvf4s9zjd4xl"; depends=[sp XML]; }; - spgwr = derive { name="spgwr"; version="0.6-24"; sha256="10yiyq704gs51h7i2nrd5r8730np7hvkcfnn3mly5wgaanrcb6n4"; depends=[sp]; }; - sphereplot = derive { name="sphereplot"; version="1.5"; sha256="1i1p20h95cgw5wqp9bwfs9nygm4dxzsggz08ncjs1xrsvhhq9air"; depends=[rgl]; }; - SphericalCubature = derive { name="SphericalCubature"; version="1.0.1"; sha256="0j592zvs07yc6amahlxgdw0k1vqr89gvcq22vcwzkx62igvlf6pv"; depends=[cubature]; }; - SpherWave = derive { name="SpherWave"; version="1.2.2"; sha256="1wd9pql97m1zl0axzpkfq9sxadrm5cfax0gxh0ncqadaq7w7lml4"; depends=[fields]; }; - sphet = derive { name="sphet"; version="1.5"; sha256="00hgzashw5qdv7j2q0cz433k595d8dzlxr89kvz1z2cpb87pfv54"; depends=[nlme spdep Matrix sp]; }; - spi = derive { name="spi"; version="1.1"; sha256="0gc504f7sji5x0kmsidnwfm7l5g4b1asl3jkn2jzsf2nvjnplx1z"; depends=[]; }; - SPIAssay = derive { name="SPIAssay"; version="1.0.0"; sha256="1rwa2iicwdm7z8khlnly0ybrqiisw420anr2pcdd5chxa48h8apg"; depends=[]; }; - spider = derive { name="spider"; version="1.3-0"; sha256="1p6f8mlm055xq3qwa4bqn9kvq60p8fn2w0cc6qcr22cblm5ww7jp"; depends=[ape pegas]; }; - spikeslab = derive { name="spikeslab"; version="1.1.5"; sha256="0dzkipbrpwki6fyk4hqlql3yhadwmclgbrx00bxahrmlaz1vjzh2"; depends=[lars randomForest]; }; - spikeSlabGAM = derive { name="spikeSlabGAM"; version="1.1-7"; sha256="1hdclj3fq31n9hvyggj2rvz2m95kjszbcswa46vfi2vyiwbb2bia"; depends=[ggplot2 akima coda cluster gridExtra MASS MCMCpack mvtnorm R2WinBUGS reshape scales]; }; - SPIn = derive { name="SPIn"; version="1.1"; sha256="109xxrg7bsmmfd6ik85kxrw2qclxbh5ipsh5mmrdl4hki3hnyp2s"; depends=[quadprog]; }; - splancs = derive { name="splancs"; version="2.01-34"; sha256="0r7kn16mkpzyj52i28w40k0hngkf4i3si4qvkb8m5s641lw2jmpk"; depends=[sp]; }; - splitstackshape = derive { name="splitstackshape"; version="1.2.0"; sha256="0p9av1zzzl6h5d3fprwcd8ng1g2s8wq7bzid7lqig3k8mcgzwm20"; depends=[data_table]; }; - splm = derive { name="splm"; version="1.1-0"; sha256="1dhfasan5abr9gf6lfdl83cr47ckkj5sqjqgclnc6f6a2125q1fi"; depends=[MASS nlme spdep plm Matrix bdsmatrix spam ibdreg car lmtest Ecdat maxLik]; }; - spls = derive { name="spls"; version="2.2-1"; sha256="0zgk9qd825zqgikpkg13jm8hi6ncg48qw5f985bi145nwy9j19xs"; depends=[MASS nnet pls]; }; - splus2R = derive { name="splus2R"; version="1.2-0"; sha256="0kmyr1azyh0m518kzwvvgz7hv1x5myj37xn7w2gfn0vbn5xl8pv1"; depends=[]; }; - splusTimeDate = derive { name="splusTimeDate"; version="2.5.0-135"; sha256="0hghggdcr70vfjx4npj37nmd96qvgrp1gpwa9bznvjkvyfawwy6i"; depends=[]; }; - splusTimeSeries = derive { name="splusTimeSeries"; version="1.5.0-73"; sha256="1csk0ffgg1bi2k1m2bbxl6aqqqxf6i8sc8d4azip8ck7rn8vya46"; depends=[splusTimeDate]; }; - spMC = derive { name="spMC"; version="0.3.1"; sha256="12ymyyy77y7azbg983y091dfqcv68c7lpz2rcnnn384jqp7b2c4v"; depends=[]; }; - SPmlficmcm = derive { name="SPmlficmcm"; version="1.1"; sha256="02hg9dzfnxa8cz31kkq52707f7y5471cq78asfbrf397mfz82wbl"; depends=[numDeriv nleqslv boot]; }; - SPMS = derive { name="SPMS"; version="2.0"; sha256="150kb4gjiksp3kc7p9j5zqc4955rq4fb27as71z89h23mkswz5r5"; depends=[Matrix]; }; - spnet = derive { name="spnet"; version="0.9.0.1"; sha256="0fy19y155m1fmifdnsyb8y71xgnk3hyril28x68bwvn2v9d737k5"; depends=[sp shape]; }; - spocc = derive { name="spocc"; version="0.2.0"; sha256="069yfksdk10779pb6xyg8cgq83ipbigi2zs9dymqyk8q6w1y8xhf"; depends=[ggplot2 rinat rbison rgbif ecoengine rebird AntWeb plyr ggmap maptools rworldmap sp rgeos lubridate RColorBrewer httr XML rgdal RJSONIO leafletR data_table assertthat whisker]; }; - SPODT = derive { name="SPODT"; version="0.9"; sha256="0r5zr0h5dgbkpn6dlvpj58s2wp3ngb7zb1xdapq1j25msmhwn5yy"; depends=[rgdal sp tree]; }; - sporm = derive { name="sporm"; version="1.1"; sha256="07sxz62h4jb7xlqg08sj4wpx121n9jfk65196mnxdvb36lqmb4hp"; depends=[]; }; - SportsAnalytics = derive { name="SportsAnalytics"; version="0.2"; sha256="1vb080ak1mfvr6d0q9i3r8hd547ba80bavjdcri0gclqqcjf1ach"; depends=[]; }; - SPOT = derive { name="SPOT"; version="1.0.4184"; sha256="0rikfs2rha7q2xbycvky8si2ccgmamcn662g8ni105cr6m9hvvpc"; depends=[rpart emoa]; }; - sprsmdl = derive { name="sprsmdl"; version="0.1-0"; sha256="09klwsjp5w6p7dkn5ddmqp7m9a3zcmpr9vhcf00ynwyp1w7d26gi"; depends=[]; }; - SPSL = derive { name="SPSL"; version="0.1-8"; sha256="1jg1nfhz8qml1wwqa4d0w7vkdmbgdy5xlfqx0h2pdw2z8iij3xxc"; depends=[]; }; - spsmooth = derive { name="spsmooth"; version="1.1-3"; sha256="09b740586zyi8npq0bmy8qifs9rq0rzhs9c300fr6pjpc7134xn4"; depends=[mgcv]; }; - spsurvey = derive { name="spsurvey"; version="2.6"; sha256="1s48acqi502mdabhymhn0jjsghnlh2w6wnrfaa9gv0a7xjvjkydq"; depends=[sp deldir foreign MASS rgeos]; }; - spt = derive { name="spt"; version="1.13-8-8"; sha256="18s74pxfmsjaj92z2a34nq90caf61s84c616yv33a0xvfvp32qr5"; depends=[]; }; - spTimer = derive { name="spTimer"; version="1.0-2"; sha256="1f0y0bzipk0j272w8d31rw8l0xvw5hj64d5j9cfvjzgbp9kzp56h"; depends=[coda forecast spacetime]; }; - spuRs = derive { name="spuRs"; version="2.0.0"; sha256="0lbc3nny6idijdaxrxfkfrn40bxfyp9z3yl9mwb1k6cyd10v5mfj"; depends=[MASS lattice]; }; - sqldf = derive { name="sqldf"; version="0.4-7.1"; sha256="03pg1wrkbhh6yi794rf5a96kls0zixqz50ralznvgd0zyvmd3cz2"; depends=[gsubfn proto RSQLite RSQLite_extfuns DBI chron]; }; - sqliter = derive { name="sqliter"; version="0.1.0"; sha256="17jjljq60szz0m8p2wc5l56659aap7an5gknc848dp89ycjgj3zx"; depends=[stringr functional DBI RSQLite]; }; - sqlshare = derive { name="sqlshare"; version="1.0.3"; sha256="1qy8vlzi6i4wsr53i71jlsv1b7ww254mbk2qzsvmcrranf42zbp8"; depends=[RCurl]; }; - sqlutils = derive { name="sqlutils"; version="1.1.2"; sha256="1d3x4wid7f9h2y36avsajjvshzcszr2nby71ixfdq3iv8z01z4j3"; depends=[roxygen2 stringr DBI]; }; - SQN = derive { name="SQN"; version="1.0.5"; sha256="0kb8kf6g482zqdp4avwvhs3pqghfny757dbzfl1abaigmvwvx4qj"; depends=[mclust nor1mix]; }; - SQUAREM = derive { name="SQUAREM"; version="2012.7-1"; sha256="17d5b9h7h8ayasi4zg790b3a11rka8dkfcmvhrjg4rvlggwjda5j"; depends=[]; }; - squash = derive { name="squash"; version="1.0.6"; sha256="16iplngzzlif999z821a9bwx9jlmikdvwnk6p6d9w75b1fsbc0pz"; depends=[]; }; - sra = derive { name="sra"; version="0.1"; sha256="165r1aiv17gdhln2374724nx04wjcdpillxwwkxgshz3kjyvajvj"; depends=[]; }; - sROC = derive { name="sROC"; version="0.1-2"; sha256="0cp6frhk9ndffb454dqp8fzjrla76dbz0mn4y8zz1nbq1jzmz0d3"; depends=[]; }; - SRPM = derive { name="SRPM"; version="0.1-7"; sha256="1c7mca1p0z48w5jbywqqfbdwzcimy24fm23h5n930mxbxgh51shk"; depends=[stashR filehash cacheSweave]; }; - SRRS = derive { name="SRRS"; version="0.1.1"; sha256="0jv545a97q4pyl89lmhn3y0jhdzyq033mvx144x8lcgx59s7cyi3"; depends=[tcltk2 gtools]; }; - ss3sim = derive { name="ss3sim"; version="0.8.2"; sha256="1gj3kf4ccd5n2jr4sm50gny5x1zq4brkhqgw0nww41spnimascfr"; depends=[plyr r4ss gtools lubridate reshape2]; }; - ssanv = derive { name="ssanv"; version="1.0-2"; sha256="18ib0djqxjpp4xgvsffwqgxqljpwc24ysxj26phpr6p8kdl3hr2f"; depends=[]; }; - SSDforR = derive { name="SSDforR"; version="1.4.6"; sha256="1ab4z7zm08wgy9vm1bbfgrxhizly5wpwzk8ikqzkfpvy43fgv80m"; depends=[psych]; }; - sse = derive { name="sse"; version="0.5-1"; sha256="0g0bwmgc585haqbb13366s3pv1vdh793hwwibz7im0avjs2ldsjq"; depends=[lattice]; }; - ssfit = derive { name="ssfit"; version="1.1"; sha256="1fais0msi2ppgfp0vbx3qri7s9zs51i7n90w36xkwwac4f46bq5y"; depends=[survey]; }; - ssh_utils = derive { name="ssh.utils"; version="1.0"; sha256="08313zzzgcyvzkrkq0w0yf748ya1a9shx5xnan5891v0lah9v0b1"; depends=[stringr]; }; - ssize_fdr = derive { name="ssize.fdr"; version="1.1"; sha256="00y00cb0bhsk0qcq9f96dcmmzmy88k1qyhx9ampws34n133cl509"; depends=[]; }; - ssmrob = derive { name="ssmrob"; version="0.4"; sha256="1inndspir7571f54kalbj0h599v9k6dxdmp0n1l5r3a62vn45hd3"; depends=[sampleSelection robustbase mvtnorm MASS]; }; - SSN = derive { name="SSN"; version="1.1.3"; sha256="0qn3yd5xg0irflh8dsifan455x4k7s63zva94843ihib12zf22cq"; depends=[RSQLite sp MASS igraph maptools lattice]; }; - sspline = derive { name="sspline"; version="0.1-6"; sha256="0d6ms8szyn39c7v0397d5ar2hrl8v1l2b7m8hlj37hgp70b9s55h"; depends=[]; }; - sss = derive { name="sss"; version="0.0-11"; sha256="0k7p1ws0w7wg9wyxcg1zpk8q6kr32l3jl6yd9r4qmzq04dwqrdgz"; depends=[plyr XML]; }; - SSsimple = derive { name="SSsimple"; version="0.6.4"; sha256="0p7d4hx7mhn5myq8ajcij6hhg79rjxigk5v8z93yfdw4gjcb5wad"; depends=[mvtnorm]; }; - ssvd = derive { name="ssvd"; version="1.0"; sha256="1fdpr38qi59ijrz16jixn6ii1hvmxfjirjqfcp7dxrqz9nx8x0sk"; depends=[]; }; - ssym = derive { name="ssym"; version="1.3"; sha256="00bgqcf7l6mfjqxsvarh4g78hq21k4dq883c5yd7xkw609dp94pw"; depends=[GIGrvg numDeriv gsl normalp]; }; - st = derive { name="st"; version="1.2.2"; sha256="0dbs95iaac3zvcgrndqic6rwchyvkbda641pv0dvj7h64c3k8w24"; depends=[sda fdrtool]; }; - stab = derive { name="stab"; version="0.1.8"; sha256="1rbwfxdbdqb1l91xmnnz5z5m353z4rjihr0c1f7r77a0zl7sa3zj"; depends=[MASS reshape]; }; - stabledist = derive { name="stabledist"; version="0.6-6"; sha256="0s59jp3y5ks4rfj7x76vb9g3slbbn98lvki54lv96yxdfr8i7ry5"; depends=[]; }; - StableEstim = derive { name="StableEstim"; version="2.0"; sha256="080khfix88j4656hmdy9l0xpbk9zzw7z7d7f6yvwsbalk3ag18i5"; depends=[Matrix stabledist testthat numDeriv xtable fBasics MASS]; }; - Stack = derive { name="Stack"; version="2.0-1"; sha256="09fgfhw9grxnpl5yg05p9gvlz38iw4prns1jn14nj3qx01k5rnxb"; depends=[plyr stringr ff ffbase bit]; }; - stacomirtools = derive { name="stacomirtools"; version="0.3"; sha256="1lbbnvmilf3j3hyhvpkyjd4b4sf3zwygilb8x0kjn2jfhkxnx4c1"; depends=[RODBC xtable]; }; - stam = derive { name="stam"; version="0.0-1"; sha256="1x1j45fir64kffny0nssb2hwn4rcp8gd2cjv6fw4yy0l4d0xi5iv"; depends=[np sp]; }; - StAMPP = derive { name="StAMPP"; version="1.2"; sha256="0fd328byrcq11rpq4dvk65vs8gswaw0d9jb8di9hx5r7cdpka1g3"; depends=[pegas doParallel foreach adegenet]; }; - StandardizeText = derive { name="StandardizeText"; version="1.0"; sha256="0s267k2b109pcdiyd26gm4ag5afikrnnb55d3cs6g2fvzp744hfp"; depends=[]; }; - standGL = derive { name="standGL"; version="1.1"; sha256="1ffskpba30ih1sb1gscy4njgr4vv0642311hj1m7x7n5slisnysm"; depends=[]; }; - STAR = derive { name="STAR"; version="0.3-7"; sha256="1g78j4iyh78li1jaa3zz5qv4p41cg0imhmvbfakd34l32ppih4ll"; depends=[survival mgcv R2HTML gss codetools]; }; - stargazer = derive { name="stargazer"; version="5.1"; sha256="0ar0qm289ncsns2pqkabpyjc90ws0il1q7fp5206wqghgsvqjcc0"; depends=[]; }; - STARSEQ = derive { name="STARSEQ"; version="1.02"; sha256="1gb763bb7z871hb443d29r0vvyl2inr0df0q0xxxg16scl4p4yvb"; depends=[CompQuadForm numDeriv vcf2geno]; }; - startupmsg = derive { name="startupmsg"; version="0.9"; sha256="1l75w4v1cf4kkb05akhgzk5n77zsj6h20ds8y0aa6kd2208zxd9f"; depends=[]; }; - stashR = derive { name="stashR"; version="0.3-5"; sha256="1lnpi1vb043aj4b9vmmy56anj4344709986b27hqaqk5ajzq9c3w"; depends=[filehash digest]; }; - Stat2Data = derive { name="Stat2Data"; version="1.6"; sha256="0pk68ffc6ffpddfpf9wi8ch39h6k3r80kldld3z5pnql18rc8nvx"; depends=[]; }; - StatDA = derive { name="StatDA"; version="1.6.7"; sha256="140hqg56axwg5ckfr4n4rr453ppsgf5bmmd7kg4mai1xnj4wmg8b"; depends=[geoR sgeostat cluster e1071 MASS MBA mgcv rgl robustbase xtable]; }; - StatDataML = derive { name="StatDataML"; version="1.0-25"; sha256="05s9kbrjl2wsfccgav34b02m06q62r3iyjd0ndr6xcqlw9x2w2ya"; depends=[XML]; }; - StateTrace = derive { name="StateTrace"; version="1.0-4"; sha256="1nmdqmg4az1afhprjyqb9qqcvd0xa6xdb8gzar5jrcdldxxbsw35"; depends=[KernSmooth coda fgui]; }; - statfi = derive { name="statfi"; version="0.9.8"; sha256="0kg9bj2mmd95ysg604rcg4szqx3whbqm14fwivnd110jgfy20gk2"; depends=[pxR]; }; - StatMatch = derive { name="StatMatch"; version="1.2.2"; sha256="1ml88ssd2xrnxh6xbg25bbskqv9jrn5vczaq3a3v4bccimv65prh"; depends=[proxy clue survey RANN]; }; - StatMethRank = derive { name="StatMethRank"; version="1.0"; sha256="0mcvwn1f3hylvyg46vigc5wnvhhig5v01ag3y9rap32v85f308zh"; depends=[MASS rjags pmr]; }; - statmod = derive { name="statmod"; version="1.4.20"; sha256="11986yjry1lg28s09q6vv2671x51nnfin6j0mpscq2ygyi615jwz"; depends=[]; }; - statnet = derive { name="statnet"; version="2014.2.0"; sha256="0xp8xnqb32wzkxfm7f34z6mnsd9id8an5829n16czwldj9vv6s10"; depends=[network ergm sna networkDynamic tergm ergm_count latentnet statnet_common]; }; - statnet_common = derive { name="statnet.common"; version="3.1.1"; sha256="1fs38f4dxrvgm60xvn04jr2wwyrjg25h3rbdwrx7dx24fj7sx6wl"; depends=[]; }; - StatRank = derive { name="StatRank"; version="0.0.4"; sha256="0s0jc4hvrry9a884fqfk3gp1w4ww5wif2kh3m0f22nn7qb49if9p"; depends=[truncdist plyr]; }; - stellaR = derive { name="stellaR"; version="0.3-3"; sha256="098sz6b8pl3fyca3g6myp97nna368xhxf8krmibadnnsr49q5zs9"; depends=[]; }; - Stem = derive { name="Stem"; version="1.0"; sha256="1fr02mi5qyxbqavdh2hg8ggw4nfjh3vs7g0vh834h6y0v53l71r5"; depends=[mvtnorm MASS]; }; - STEPCAM = derive { name="STEPCAM"; version="1.0"; sha256="0lgikdj0mghz5hjm3rlrnnddjhvf9cmm0hwklbdyl3h816gq1jci"; depends=[vcd FD gtools MASS]; }; - stepp = derive { name="stepp"; version="2.3-2"; sha256="1x7vbniwk83x9wn6a5ya053nkg9jmzqprqbg87zpp0fsn9z7qhyq"; depends=[cmprsk survival]; }; - stepPlr = derive { name="stepPlr"; version="0.92"; sha256="16j32sk7ri4jdgss7vw5zz7s42rxk7rs376iyxzzpy1zcc9b64rv"; depends=[]; }; - stepwise = derive { name="stepwise"; version="0.3"; sha256="1lbx1bxwkf9dw6q46w40pp7h5nkxgghmx8rkpaymm6iybc7gyir2"; depends=[]; }; - StereoMorph = derive { name="StereoMorph"; version="1.1"; sha256="0yin0x6lwjzc04497p6xv4hckp1s4mvzq5jhplrc13xyv5121vwv"; depends=[bezier rjson shiny]; }; - 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="0.6.24"; sha256="0hifw7m50sa2r82mj4zc65pfb0hcqr7wcqmps9a0q8y57k077y4a"; depends=[matrixStats slam lda stringr]; }; - StMoSim = derive { name="StMoSim"; version="2.2"; sha256="127nr488a9xx3pjzrncbzw58ims87jifnzhpvqrr74px6wv0yisc"; depends=[]; }; - stocc = derive { name="stocc"; version="1.23"; sha256="183rv1l1hpa691f3xf455bv8dzdw6ac79zg3v99zksli6i7c8jdz"; depends=[truncnorm coda Matrix fields]; }; - stochprofML = derive { name="stochprofML"; version="1.1"; sha256="0pxx0ws4zklf38kjvp68rkk5qfzrxhk38f8d1ib8dd0chb7avb01"; depends=[MASS numDeriv]; }; - stochvol = derive { name="stochvol"; version="0.8-4"; sha256="1s79anyiczci9jhwqc3nslvc2k4gqzbwijhinbr9703qhhnm5qx0"; depends=[coda Rcpp]; }; - stockPortfolio = derive { name="stockPortfolio"; version="1.2"; sha256="0k5ss6lf9yhcvc4hwqmcfpdn6qkbq5kaw0arldkl46391kac3bd1"; depends=[]; }; - stoichcalc = derive { name="stoichcalc"; version="1.1-3"; sha256="0z9fnapibfp070jxg27k74fdxpgszl07xiqfj448dkydpg8ydkrb"; depends=[]; }; - Storm = derive { name="Storm"; version="1.1"; sha256="118l03d6las9cvhh4d845r7z6mlqff6ixxdfrdf025jsiqagm395"; depends=[rjson]; }; - stosim = derive { name="stosim"; version="0.0.12"; sha256="0c4sj5iirm542hx782izfdmy2m3kl5q28l10xjj0ib4xn5y6yx3c"; depends=[tcltk2 Rcpp]; }; - STPGA = derive { name="STPGA"; version="1.0"; sha256="1kqxzjrxf194n006dr3h5kprb4l7qy8bgm2n6251p0sswpvr70j1"; depends=[]; }; - stpp = derive { name="stpp"; version="1.0-4"; sha256="04xl2745xr5r7yirbdmxaxqvl4gp73wr6xl08w21mcccsnpc3d1s"; depends=[splancs KernSmooth spatstat]; }; - stppResid = derive { name="stppResid"; version="1.1"; sha256="0hgzsyy5y0sqd4d2agdr7p2kq0w51vs8f63dvj6j49h8cvgiws2x"; depends=[deldir splancs cubature]; }; - StrainRanking = derive { name="StrainRanking"; version="1.1"; sha256="0q6k90if74320mrs2ccq2izynylr8zakciwbc2c6ms0v57aalwic"; depends=[]; }; - strap = derive { name="strap"; version="1.3"; sha256="1f9whr9cg73q4lfqdygqd88f2lc08bb7qcalrr4dc00jjgy1r8rw"; depends=[ape geoscale]; }; - stratification = derive { name="stratification"; version="2.2-3"; sha256="0mjv5x47rc7ci4ca949pg6ixmv6bfdfph6yz31syqk5xrgm8zmxq"; depends=[]; }; - stratigraph = derive { name="stratigraph"; version="0.64"; sha256="1mi4s3wxbrmcxb7k18z02dy5dnvg7kka1dbg2hgyi4nm9y8casdl"; depends=[]; }; - StratSel = derive { name="StratSel"; version="1.0"; sha256="1kr7bl2qrj2ra3szvw5z5y6ra6zz5q3v9vx81p8r5618zffa8q3b"; depends=[mnormt memisc Formula]; }; - straweib = derive { name="straweib"; version="1.0"; sha256="0bh2f4n4i7fiki52sa57v96757qw1gn1lcn7vgxmc5hk5rzp2mi8"; depends=[]; }; - stream = derive { name="stream"; version="1.0-3"; sha256="14l1fdqzbvy8vxq0rmrwm2afwd4h85khc0a22r6vk488355wn9ps"; depends=[hash proxy animation clue cluster clusterGeneration fpc MASS mlbench]; }; - StreamingLm = derive { name="StreamingLm"; version="0.1"; sha256="079ks5gj6ydj2fqq8pwhkb24a0zbz2j400777fm6a39wjgbgdx1n"; depends=[biglm]; }; - StreamMetabolism = derive { name="StreamMetabolism"; version="1.0"; sha256="03pr7i1c3qddqwibfc2x08d2nh8fih02k7a1xhqs1awfs43x56is"; depends=[zoo chron maptools]; }; - streamMOA = derive { name="streamMOA"; version="0.1-1"; sha256="12x9i0cr56s54b2z3wfblrv6f36z8k2pgrr5gaqyshl8rgvyvrzz"; depends=[stream rJava]; }; - streamR = derive { name="streamR"; version="0.2.1"; sha256="1ml33mj7zqlzfyyam23xk5d25jkm3qr7rfj2kc5j5vgsih6kr0gl"; depends=[RCurl rjson]; }; - stremo = derive { name="stremo"; version="0.2"; sha256="13b9xnd8ykxrm8gnakh0ixbsb7yppqv3isga8dsz473wzy82y6h1"; depends=[lavaan numDeriv MASS]; }; - stressr = derive { name="stressr"; version="1.0.0"; sha256="00b93gfh1jd5r7i3dhsfqjidrczf693kyqlsa1krdndg8f0jkyj7"; depends=[xts XML lattice latticeExtra]; }; - StressStrength = derive { name="StressStrength"; version="1.0"; sha256="0m67rawgn6w49zh4mw951i3pk4ckp4bxz9yphw0klllazjxyd6qp"; depends=[]; }; - stringdist = derive { name="stringdist"; version="0.8.0"; sha256="16bmf81dv8xbvy1b5c8rrj6vja00m00cb14v2zl9syxs923dq94i"; depends=[]; }; - stringi = derive { name="stringi"; version="0.2-5"; sha256="0yyqdapn0gqrwynv0sikq42b5vv166qq96w099rm3fispc037yb8"; depends=[]; }; - 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.0.5"; sha256="0i832k8jf317m47kzzfhgla4qm8bqmj3azjm4iqndkym2ry3jiy4"; depends=[igraph Matrix RColorBrewer classInt]; }; - strum = derive { name="strum"; version="0.4"; sha256="06y4bf2z55zl5k9snd7mgbrfx85irnbk316g9169m5mij4lca4g7"; depends=[pedigree MASS Rcpp]; }; - strvalidator = derive { name="strvalidator"; version="1.3.0"; sha256="1sddiclnhdl935l27863617h8s2kgny68d80hnqw9a3ga0iri486"; depends=[gtable ggplot2 gWidgets plyr scales gridExtra]; }; - stsm = derive { name="stsm"; version="1.4"; sha256="0j6kvsij6rsvkjc4q1m9vi9afvsib8x6zwjka1xwbp8g6fzamjq4"; depends=[KFKSDS stsm_class]; }; - stsm_class = derive { name="stsm.class"; version="1.3"; sha256="19jrja5ff31gh5k2zqhqsyd7w2ivr4s6bkliash6x8fmd22h5zs8"; depends=[]; }; - stylo = derive { name="stylo"; version="0.5.6"; sha256="0ga6kv4i0zsapnbiqinz4wy34c0kracxrd2cgyqp0dkhshsiw2jf"; depends=[tcltk2 ape pamr e1071 class lattice tsne]; }; - SubCultCon = derive { name="SubCultCon"; version="1.0"; sha256="08q6k4nsv3gl5qk87s87smdg047yc2a4i7kg0fp08i7q7h62jkvz"; depends=[]; }; - subgroup = derive { name="subgroup"; version="1.1"; sha256="1n3qw7vih1rngmp4fwjbs050ngby840frj28i8x7d7aa52ha2syf"; depends=[]; }; - SubLasso = derive { name="SubLasso"; version="1.0"; sha256="12m7ynlqhikjhavd12bhsd04s9cpv8aq5xgm875i10mb3ldpd1bd"; depends=[glmnet psych gplots]; }; - subplex = derive { name="subplex"; version="1.1-4"; sha256="0c6y5ibyxh0mpn77f7kwrmkpb3mah10hbqhwqmz4i1lfv58mb4zk"; depends=[]; }; - subselect = derive { name="subselect"; version="0.12-3"; sha256="1m1vk8jgmw0cb9gmzvvpzdpjaqp56kwhalb2b2il20kc57czmymr"; depends=[]; }; - subsemble = derive { name="subsemble"; version="0.0.9"; sha256="0vzjmxpdwagqb9p2r4f2xyghmrprx3nk58bd6zfskdgj0ymfgz5z"; depends=[SuperLearner]; }; - subtype = derive { name="subtype"; version="1.0"; sha256="1094q46j0njkkqv09slliclp3jf8hkg4147hmisggy433xwd19xh"; depends=[penalized ROCR]; }; - sudoku = derive { name="sudoku"; version="2.6"; sha256="13j7m06m38s654wn75kbbrin5nqda4faiawlsharxgrljcibcbrk"; depends=[]; }; - SUE = derive { name="SUE"; version="1.0"; sha256="0akv724s84v2zixvwywj1ydfnfvcjnaabv6gm0601nsrh6ij1mi6"; depends=[]; }; - sugaR = derive { name="sugaR"; version="0.0-5"; sha256="0lg0wm4fbf4f4vlsy2cnfwm18vnc3i6bd51pixpdb9m512pw761c"; depends=[]; }; - summarytools = derive { name="summarytools"; version="0.1"; sha256="1qrn47z21ijgpp8kj20wviin2zldj8fpf4d759b05v3k0y3q27zr"; depends=[Hmisc pander timeDate]; }; - Sunder = derive { name="Sunder"; version="0.0.2"; sha256="0fnxj4fi99f1jvlbir0wkqvf48msnz1rspzg17jsd1kp2ha5kq35"; depends=[RandomFields]; }; - SunterSampling = derive { name="SunterSampling"; version="1.0"; sha256="07s5sd6kf2jg276b5q1ns3h7849b1h0rx77kb3vs4j1svn8k9wxy"; depends=[]; }; - supclust = derive { name="supclust"; version="1.0-7"; sha256="0437pccagvqv6ikdsgzpif9yyiv6p24lhn5frk6yqby2asj09727"; depends=[rpart class]; }; - superbiclust = derive { name="superbiclust"; version="0.1"; sha256="0hzihmjjwk3axgy1y95ckq6m5gmb7ybjj7zscplgsnihi5256jnk"; depends=[biclust Matrix]; }; - superdiag = derive { name="superdiag"; version="1.1"; sha256="0pa3mv74riabpm7j4587zww2364fszzlw48ijj1apcgz8y6pyqbw"; depends=[coda boa]; }; - SuperLearner = derive { name="SuperLearner"; version="2.0-15"; sha256="1sk45419awk8aahylmqbardx8lglx0d7hrwc0k2prnksk5r3549l"; depends=[nnls]; }; - superMDS = derive { name="superMDS"; version="1.0.2"; sha256="0jxbwm3izk7bc3bd01ygisn6ihnapg9k5lr6nbkr96d3blpikk04"; depends=[]; }; - superpc = derive { name="superpc"; version="1.09"; sha256="1p3xlg2n7p57n54g2w4frfrng5vjh97kp6ax4mrgvj3pqmd1m69z"; depends=[survival]; }; - SuppDists = derive { name="SuppDists"; version="1.1-9.1"; sha256="1jqsv1lzjblc7sdb4gh8pkww9ar174bpbjl7mmdi59fixymwz87s"; depends=[]; }; - support_BWS = derive { name="support.BWS"; version="0.1-2"; sha256="14p5b4b84x66lzn7qz1xy7sbb5i3wqwcsf6r6ap612nj83srjmqa"; depends=[]; }; - support_CEs = derive { name="support.CEs"; version="0.3-2"; sha256="0q8n4w3p682165lv20m30m8p9mhd3wzrzg8aqizf9zc2m5w9ffyd"; depends=[DoE_base MASS simex]; }; - surface = derive { name="surface"; version="0.4-1"; sha256="0z7fh09hjmxfmqzi588gjwqqlpj1a475aixrnvy911lkx3zfk146"; depends=[ape ouch MASS geiger]; }; - Surrogate = derive { name="Surrogate"; version="0.1-2"; sha256="07imwp725qwnxj4437qc2420n624vchnlaisd20ck8ygyvkb2mn0"; depends=[MASS nlme msm lme4]; }; - suRtex = derive { name="suRtex"; version="0.9"; sha256="0xcy3x1079v10bn3n3y6lxignb9n3h57w4hhrvzi5y14x05jjyda"; depends=[]; }; - surv2sampleComp = derive { name="surv2sampleComp"; version="1.0-4"; sha256="1ihz71vzrkd5ksy7421myrgkbww0z5k0ywcb2bfalxx2bd2cs2wf"; depends=[survival plotrix flexsurv survC1]; }; - survAUC = derive { name="survAUC"; version="1.0-5"; sha256="0bcj982ib1h0sjql09zbvx3h1m96jy9q37krmk6kfzw25ms6bzzr"; depends=[survival]; }; - survBayes = derive { name="survBayes"; version="0.2.2"; sha256="08fbb2kyy7gcqlbzbliy4njkyk6jhr4nlfb4nbmh2kfdfcb6q62v"; depends=[survival coda]; }; - survC1 = derive { name="survC1"; version="1.0-2"; sha256="1bidjhq3k5ab7gqj1b2afngip7pp6c9c7q0m6ww7h7i2vg505l7v"; depends=[survival]; }; - surveillance = derive { name="surveillance"; version="1.8-0"; sha256="043hdz4rfk5a50lzcb3q5sccn93r9r6ll79p1jxr0xhxlahgrp6i"; depends=[Rcpp sp xtable polyCub MASS Matrix spatstat]; }; - survexp_fr = derive { name="survexp.fr"; version="1.0"; sha256="12rjpnih0xld4dg5gl7gwxdxmrdmyzsymm7j05v98ynldd1jkjl8"; depends=[survival]; }; - survey = derive { name="survey"; version="3.29-5"; sha256="0qzg6h3m27d9v6iyh88pk7iq2glfnn8364jjl7z5d5cbw3ga3j81"; depends=[]; }; - surveydata = derive { name="surveydata"; version="0.1-14"; sha256="1zcp3wb7yhsa59cl4bdw7p08vpviypvfa9hggwc60w7ashpky73i"; depends=[stringr plyr]; }; - Survgini = derive { name="Survgini"; version="1.0"; sha256="1gxkdv2j1njbgnwb52vyhz7p2lrcg3hp6sry3kyhp4wkvf6gnhxi"; depends=[survival]; }; - survIDINRI = derive { name="survIDINRI"; version="1.1-1"; sha256="03lsypx189zm28gv764gdq24a18jj3kpdk91ssa501qxj5jv7v29"; depends=[survival survC1]; }; - survival = derive { name="survival"; version="2.37-7"; sha256="1ihs42gjbw06aj5hz128964lshpi934cyc8npv9c8ann4mc2r3b5"; depends=[]; }; - survivalMPL = derive { name="survivalMPL"; version="0.1.0"; sha256="1nq316w88j7dg48683ka326b2y3f9jl73mig47n3y31z2x9hc8h0"; depends=[survival]; }; - survivalROC = derive { name="survivalROC"; version="1.0.3"; sha256="0wnd65ff5w679hxa1zrpfrx9qg47q21pjxppsga6m3h4iq1yfj8l"; depends=[]; }; - survJamda = derive { name="survJamda"; version="1.1.2"; sha256="172mryz19n4nb9w20xh7yhn4pqaw9m98na2x235lps5rwcjk6x7b"; depends=[survival survivalROC ecodist survJamda_data]; }; - survJamda_data = derive { name="survJamda.data"; version="1.0.1"; sha256="1b8vy59hawgvpjds96q5wscggv8hffkbjw7zwfwf5g3firhb4gnq"; depends=[]; }; - survMisc = derive { name="survMisc"; version="0.4.2"; sha256="1mv503lrgjfbggasgsls2pqlxz3kj4hrw9qslgzxh3dizfqkb02c"; depends=[survival ggplot2 data_table rpart gridExtra combinat Hmisc zoo km_ci KMsurv gam]; }; - survPresmooth = derive { name="survPresmooth"; version="1.1-8"; sha256="1qva7yx4vv99mgh3wqxdnbasa1gy0ixxyxpqrfbn6827whjzf91m"; depends=[]; }; - survrec = derive { name="survrec"; version="1.2-2"; sha256="0b77ncr1wg2xqqg1bv1bvb48kmd9h3ja2dysiggvprzjrj7hdlmx"; depends=[boot]; }; - SurvRegCensCov = derive { name="SurvRegCensCov"; version="1.3"; sha256="1sl17x984ww07aakz6dambn5kznw4hvj4b8ahy2r4mr6wf2dpg5a"; depends=[survival numDeriv]; }; - survsim = derive { name="survsim"; version="1.1.2"; sha256="1pnzkw0hr0gpwh0v26k4fh7qjl0c6ps9y8gmfd46h8wz2fb25vqx"; depends=[eha statmod]; }; - survSNP = derive { name="survSNP"; version="0.21-7"; sha256="0fanya7ghd61pw7a21xkaxz4mgzdwjwkh1wm41h40wq1c529dzph"; depends=[survival Rcpp lattice foreach xtable]; }; - svapls = derive { name="svapls"; version="1.4"; sha256="12gk8wrgp556phdv89jqza22zmsnachsydr5vlz38s664d2lplbg"; depends=[class pls]; }; - svcm = derive { name="svcm"; version="0.1.2"; sha256="1lkik65md8xdxzkmi990dvmbkc6zwkyxv8maypv2vbi2x534jkhl"; depends=[Matrix]; }; - svd = derive { name="svd"; version="0.3.3-2"; sha256="064y4iq4rj2h35fhi6749wkffg37ppj29g9aw7h156c2rqvhxcln"; depends=[]; }; - svDialogs = derive { name="svDialogs"; version="0.9-55"; sha256="0x1wzqypxir0322mr3zsax1v64y9jdz5sya98y20hc3619mpynwj"; depends=[svGUI]; }; - svDialogstcltk = derive { name="svDialogstcltk"; version="0.9-4"; sha256="16166f8i6nsg7palqmnlp5b9s91d6ja9n0zm6rcvd2fwnw2ljkr4"; depends=[svDialogs svGUI]; }; - svdvisual = derive { name="svdvisual"; version="1.1"; sha256="02mzh2cy4jzb62fd4m1iyq499fzwar99p12pyanbdnmqlx206mc2"; depends=[lattice]; }; - svGUI = derive { name="svGUI"; version="0.9-55"; sha256="1fkkc12mhcbn3s2wzk0xdsp8jl2xmn48ys2an8jhxbww3gplk1rq"; depends=[]; }; - svHttp = derive { name="svHttp"; version="0.9-55"; sha256="0qxsh6ifk3fszgzz497qwia4pxzplwraf2qnn5cqlv5l79nja5yq"; depends=[svMisc]; }; - svIDE = derive { name="svIDE"; version="0.9-52"; sha256="19wsmi1i7nlnqdah1h2pxzsy8m50bnb282fdbj4219p86bb92a86"; depends=[svMisc XML]; }; - svKomodo = derive { name="svKomodo"; version="0.9-62"; sha256="1af22nfbhmx5b3n45k5xfwq667w4cd7m0g5hx5dvv2vfikr613nx"; depends=[svMisc]; }; - svMisc = derive { name="svMisc"; version="0.9-70"; sha256="1xprymz5hblbc929kmbaz0lj633xvgz6mm4snhhjib47cz5anl1w"; depends=[]; }; - SVMMaj = derive { name="SVMMaj"; version="0.2-2"; sha256="01njc7drq01r3364081dv9gn37vrql52zbrb60gd559f3jshqx3m"; depends=[kernlab MASS]; }; - svmpath = derive { name="svmpath"; version="0.953"; sha256="0hqga4cwy1az8cckh3nkknbq1ag67f4m5xdg271f2jxvnmhdv6wv"; depends=[]; }; - svSocket = derive { name="svSocket"; version="0.9-57"; sha256="0id93b500iybza6sbn60ybm91mkh5cjpvhypqs4f3dv13m6blb9j"; depends=[svMisc]; }; - svSweave = derive { name="svSweave"; version="0.9-8"; sha256="0zkng8lwdpjdbic9f6jnk2ndxbch2kjyz71ds1bksvd3kmk03lks"; depends=[knitr]; }; - svTools = derive { name="svTools"; version="0.9-4"; sha256="0szr5dcxjsh5p1nkszvmj0vmi9x70d656hfvhmqf0wyjwv63vp90"; depends=[codetools svMisc]; }; - svUnit = derive { name="svUnit"; version="0.7-12"; sha256="16iiryj3v34zbnk1x05g30paza7al1frqx52fkw8ka61icizsrf5"; depends=[]; }; - svWidgets = derive { name="svWidgets"; version="0.9-44"; sha256="18k06wldcg6xpyf8nz9rdbig5nhvghn7zgf1316413kq3v90vz7b"; depends=[svMisc]; }; - SvyNom = derive { name="SvyNom"; version="1.0"; sha256="07cgg97s2kpq7vak9l1a57gwmp1gsm864m4b9q42s2fbiid8jg83"; depends=[]; }; - svyPVpack = derive { name="svyPVpack"; version="0.1-1"; sha256="15k5ziy2ng853jxl66wjr27lzc90l6i5qr08q8xgcs359vn02pmp"; depends=[survey]; }; - swamp = derive { name="swamp"; version="1.2.3"; sha256="1xpnq5yrmmsx3d48x411p7nx6zmwmfc9hz6m3v9avvpjkbc3glkg"; depends=[amap gplots MASS]; }; - SWATmodel = derive { name="SWATmodel"; version="0.5.9"; sha256="1i48g9nbjfn30ppwyzyz3k181nscv4wx773l8mzfdwhx0nlv4kyj"; depends=[EcoHydRology]; }; - SweaveListingUtils = derive { name="SweaveListingUtils"; version="0.6.1"; sha256="04xl7sw14x3ia5nsmkj1fhxvycl9wpim3frx83dd6kh8i0hpip54"; depends=[startupmsg]; }; - sweSCB = derive { name="sweSCB"; version="0.3.5"; sha256="1g6c73kqrnssycf4k239dpgkv8bvllbrxjwxga6fqdzb7jsnwh4y"; depends=[data_table stringr RJSONIO httr]; }; - swfscMisc = derive { name="swfscMisc"; version="1.0.1"; sha256="0ya0ng6973mix9i0k817mgvfqwshpfqjlnn5xbs6vz2cw2xm8g6g"; depends=[mapdata maps]; }; - swirl = derive { name="swirl"; version="2.2.15"; sha256="1r2hpkhcs040z3dmhc90cpznjjb1r4nnah27yz4vp58dx0aidcjl"; depends=[stringr testthat httr yaml RCurl digest]; }; - SwissAir = derive { name="SwissAir"; version="1.1.4"; sha256="1avc32q7nbwjkcbml7z05car6khv1ghcz3miw0krm8i53w032c6f"; depends=[]; }; - switchnpreg = derive { name="switchnpreg"; version="0.8-0"; sha256="1vaanz01vd62ds2g2xv4kjlnvp13h59n8yqikwx07293ixd4qhpw"; depends=[MASS fda expm HiddenMarkov]; }; - sybil = derive { name="sybil"; version="1.2.6"; sha256="1d7q0dvpqxay86dy4zbllv78dsh0amr8n7wl0vkrb8jbakq4afip"; depends=[Matrix lattice]; }; - sybilccFBA = derive { name="sybilccFBA"; version="1.0.0"; sha256="1fmhgyqzipddcqx2srms9bgigjmijasxhsmivv6c45ln23qjvgf5"; depends=[sybil Matrix]; }; - sybilcycleFreeFlux = derive { name="sybilcycleFreeFlux"; version="1.0.1"; sha256="0ffmgnr239xz8864vmrqlhwwc97fqzzib6kwrsm7bszdnw1kkv3r"; depends=[sybil Matrix MASS]; }; - sybilDynFBA = derive { name="sybilDynFBA"; version="0.0.2"; sha256="1sqk6dwwfrwvgkwk6mra0i1dszhhvcwm58ax6m89sxk8n0nbmr4b"; depends=[sybil]; }; - sybilEFBA = derive { name="sybilEFBA"; version="1.0.1"; sha256="1advbbsyig49av7sbpbvs47xzg6f8czjb1938ynd0n2yq1bgq5xm"; depends=[sybil Matrix]; }; - sybilSBML = derive { name="sybilSBML"; version="2.0.8"; sha256="1sxp0naws7d1ak0xna1sy87zzjrravwax0qvcd6vy4p0f39z06ci"; depends=[Matrix sybil]; }; - symbolicDA = derive { name="symbolicDA"; version="0.4-1"; sha256="14lcxgbsizw0l1xcjrmz3jvfsbwlirkd0shp293hg3qi7gbzcms8"; depends=[clusterSim XML rgl shapes e1071 ade4]; }; - symbols = derive { name="symbols"; version="1.1"; sha256="1234rx3divhg60p0h0zn11viqn51fm6b8876m6rip2i6z8vrg319"; depends=[shape]; }; - symmoments = derive { name="symmoments"; version="1.2"; sha256="074k0285c0yri39zags420kjls6kjlvlhymg3r7y24h42zdy82d4"; depends=[mvtnorm cubature combinat multipol]; }; - synbreed = derive { name="synbreed"; version="0.9-7"; sha256="0v81q18dqr7zrh7830xfk30jq6kzgn0kcrp9zq6swk5laalkkqg4"; depends=[doBy BLR regress abind lattice igraph MASS LDheatmap qtl synbreedData]; }; - synbreedData = derive { name="synbreedData"; version="1.4"; sha256="0pfpvg4wvxfwpvxq8f93z1amfss98as66kwpj5mnvvlr33ffmka9"; depends=[]; }; - synchronicity = derive { name="synchronicity"; version="1.1.4"; sha256="0hcxwgf1irswwabgl0b6vb9q09nhxc1ljsm195lc8ql49sfj9mfz"; depends=[bigmemory_sri]; }; - synchrony = derive { name="synchrony"; version="0.2.3"; sha256="0fi9a3j8dfslf1nqx8d53fi635y3aq8isxw0dbjbpgk7rc71nzby"; depends=[]; }; - SynchWave = derive { name="SynchWave"; version="1.1.1"; sha256="127hllvig8kcs9gr2q14crswzhacv6v2s4zrgj50qdyprj14is18"; depends=[fields]; }; - SYNCSA = derive { name="SYNCSA"; version="1.3.2"; sha256="1m057lhfaf0n35rs3sipia04qgkp04hv7wf7rvnr7bhzic9f4vg3"; depends=[vegan mice FD]; }; - SynergizeR = derive { name="SynergizeR"; version="0.2"; sha256="0z32ylrjjvp8kr6lghhg57yq1laf9r0h8l3adysvis8bbpz2q2sj"; depends=[RJSONIO RCurl]; }; - SyNet = derive { name="SyNet"; version="2.0"; sha256="0mb9dscddkvmkf7l3bbcy4dlfmrvvy588vxdqy5dr783bpa5dkiw"; depends=[tkrplot]; }; - synlik = derive { name="synlik"; version="0.1.1"; sha256="0g4n78amydihsq4jg2i9barjm9g40zczasb31fj10yn6wir1dhv7"; depends=[Rcpp Matrix]; }; - Synth = derive { name="Synth"; version="1.1-5"; sha256="1cfvh91nz6skjk8jv04fhwv3ga9kcsfgq3mdy8lx75jkx16zr0pk"; depends=[kernlab optimx]; }; - sysfonts = derive { name="sysfonts"; version="0.2"; sha256="15wzb7c89645xxbhn29bh0djys73iklq05228qnhd5gx5sr43dd0"; depends=[]; }; - systemfit = derive { name="systemfit"; version="1.1-14"; sha256="0f33v96awyhxw3i6zr6whdz91hbfi7vwnfs0bz7xsrjcinqhm6h5"; depends=[Matrix car lmtest sandwich]; }; - tab = derive { name="tab"; version="2.1.2"; sha256="0g3wjl83k61xshbp813zvkapqiwjf9lr7i1bpxrjify2lqwis8k7"; depends=[survey survival gee]; }; - Table1Heatmap = derive { name="Table1Heatmap"; version="1.1"; sha256="1nrabjivfsdhaqmlq365pskkrp99jqsxn8vy03mdnqn5h5zv7wvx"; depends=[colorRamps]; }; - table1xls = derive { name="table1xls"; version="0.3.1"; sha256="0zd93wrdj4q0ph375qlgdhpqm3n8s941vks5h07ks9gc8id1bnx5"; depends=[XLConnect]; }; - TableMonster = derive { name="TableMonster"; version="1.1"; sha256="1xflw719isy5hxvm0z67bip01cpafylnj76zssb3c174j912f7y3"; depends=[xtable]; }; - tableone = derive { name="tableone"; version="0.6.2"; sha256="0jmii05kqd01bllc4wi9r38qa0dpxqlcpk572d3m7c009izsz8zl"; depends=[e1071 gmodels]; }; - tableplot = derive { name="tableplot"; version="0.3-5"; sha256="1jkkl2jw7lwm5zkx2yaiwnq1s3li81vidjkyl393g1aqm9jf129l"; depends=[]; }; - tables = derive { name="tables"; version="0.7.79"; sha256="05f23y5ff961ksx4fnmwpf6zvc9573if8s2cmz9bwki66h2g9xb7"; depends=[Hmisc]; }; - TableToLongForm = derive { name="TableToLongForm"; version="1.3.0"; sha256="1dxis6gx0misvl18jzsaqxjajclc98xppgxil5xsz1lcq0fkn383"; depends=[]; }; - tabplot = derive { name="tabplot"; version="1.1"; sha256="0vyc6b6h540sqwhrza2ijg7ghw2x8rla827b8qy2sh0ckm0ybjrx"; depends=[ffbase]; }; - tabplotd3 = derive { name="tabplotd3"; version="0.3.3"; sha256="0mbj45vb17wlnndpkhvq7xaawsb814x7zxa4rqbfgidvbm1p3abv"; depends=[tabplot httpuv Rook brew RJSONIO]; }; - tabuSearch = derive { name="tabuSearch"; version="1.1"; sha256="0bri03jksm314xy537dldbdvgyq6sywfmpmj2g2acdcli31kkpq0"; depends=[]; }; - TAM = derive { name="TAM"; version="1.0-3"; sha256="122wn95hbi7w41k1dbmwbr1q4rsrcskcy39ff64dclak70ackblm"; depends=[MASS mvtnorm tensor sfsmisc GPArotation psych Rcpp]; }; - TANOVA = derive { name="TANOVA"; version="1.0.0"; sha256="0c2mrahchwagisrkjl5l1s0mv0ny80kngq8dz0fjj9lwxwqwvwa5"; depends=[MASS]; }; - TaoTeProgramming = derive { name="TaoTeProgramming"; version="1.0"; sha256="1b36s5mpm5vbhzcwmvm8g5pl7vpn6rsl5cnglfy8kgm1q9nnr7ff"; depends=[]; }; - TapeR = derive { name="TapeR"; version="0.3.2"; sha256="070zl7hqv5zprhs464gy1kmz0am58l0vig8xvdq6pbz94nrhvpj0"; depends=[nlme pracma]; }; - TAQMNGR = derive { name="TAQMNGR"; version="2014.01-2"; sha256="1szds8yyk3ldap785jxi8lj86rf4zlpzhd7rk2y8xwcq2fhs9h62"; depends=[]; }; - taRifx = derive { name="taRifx"; version="1.0.6"; sha256="10kp06hkdx1qrzh2zs9mkrgcnn6d31cldjczmk5h9n98r34hmirx"; depends=[reshape2 plyr]; }; - taRifx_geo = derive { name="taRifx.geo"; version="1.0.6"; sha256="0w7nwp3kvidqhwaxaiq267h99akkrj6xgkviwj0w01511m2lzghs"; depends=[taRifx sp rgdal RJSONIO rgeos RCurl]; }; - tau = derive { name="tau"; version="0.0-18"; sha256="10akzwf0fi05vplgy4njzrb4jdqa079zhycri4014w8sihb5msan"; depends=[]; }; - TauP_R = derive { name="TauP.R"; version="1.1"; sha256="10sjvcv70fjrsl5nnk9gm4sy7nhwm6aaq57gr37cb10v079ykmk1"; depends=[]; }; - tawny = derive { name="tawny"; version="2.1.2"; sha256="0ihg3qlng8swak1dfpbnlx5xc45d1i9rgqawmqa97v5m91smfa71"; depends=[lambda_r lambda_tools futile_logger futile_matrix tawny_types zoo xts PerformanceAnalytics quantmod]; }; - tawny_types = derive { name="tawny.types"; version="1.1.3"; sha256="1v0k6nn45rdczjn5ymsp2fqq0ijnlniyf3bc08ibd8yd1jcdyjnj"; depends=[lambda_r lambda_tools futile_logger futile_options zoo xts quantmod]; }; - taxize = derive { name="taxize"; version="0.3.0"; sha256="1qixhiz92s0ys5sk61gjhq21855p739zih0sdxmhhah6x1m46agm"; depends=[XML RCurl stringr plyr httr RJSONIO foreach ape Taxonstand reshape2 data_table vegan assertthat]; }; - Taxonstand = derive { name="Taxonstand"; version="1.3"; sha256="0qfvsl2ywkagqn18iyjs3208szs0wm3xi39mssaw2l6rwyrx3kvd"; depends=[]; }; - tbart = derive { name="tbart"; version="0.9"; sha256="1iim4qshbazrb58ydhaxzp9xpy9w1ji2h4nh74scnmsxjdj3gfkg"; depends=[Rcpp sp]; }; - tbdiag = derive { name="tbdiag"; version="0.1"; sha256="1wr2whgdk84426hb2pf8iiyradh9c61gyazvcrnbkgx2injkz65q"; depends=[]; }; - TBEST = derive { name="TBEST"; version="3.0"; sha256="1c4zbp4jsl8qsbx7bnqm7z7njm60qcc1yhxdbg75mw326brfvw1z"; depends=[signal fdrtool]; }; - TBSSurvival = derive { name="TBSSurvival"; version="1.1"; sha256="0hh0zpvwbkix8g9slf6bh4qzwmig5qif80q1ph6m5i496ywjcc80"; depends=[mcmc coda survival normalp R_utils BMS]; }; - TcGSA = derive { name="TcGSA"; version="0.9.8"; sha256="19gp3pj4p2svrfyviccvv13q82qj7584nck8zbba90hzv9g4xy86"; depends=[lme4 ggplot2 GSA reshape2 gtools gplots cluster stringr]; }; - tcltk2 = derive { name="tcltk2"; version="1.2-10"; sha256="0m648n028xc6gi3ypih0nyswczh787pwfq7ky2hsxabp958faflb"; depends=[]; }; - TDD = derive { name="TDD"; version="0.4"; sha256="193y8brybkjsajrbnlx1sdnw1wyyn9rhlm5wvp4aamqhvi8z13vn"; depends=[signal RSEIS pracma]; }; - tdm = derive { name="tdm"; version="3.0.2"; sha256="06k2dp5gf2k9q23mpswn2yh0525xaz0zznx6r7gn0gim2l7msbqj"; depends=[rjags coda png deSolve]; }; - TDMR = derive { name="TDMR"; version="1.1"; sha256="15s1569435h7mlpvwg9k2584nk352sc4l6nqq2mk2hhj4brpa30l"; depends=[SPOT e1071]; }; - tdthap = derive { name="tdthap"; version="1.1-7"; sha256="0lqcw4bzjd995pwn2yrmzay82gnkxnmxxsqplpbn5gg8p6sf5qqk"; depends=[]; }; - TeachingDemos = derive { name="TeachingDemos"; version="2.9"; sha256="160xch4812darv77qk2xjblm6nfnna5x2rxy335bwdsdjzcx4x9m"; depends=[]; }; - TeachingSampling = derive { name="TeachingSampling"; version="3.2.1"; sha256="1diw8qz6yi3g7d1ysklrvxwbzda9ybi039yr6agzw0w0b2b59jj4"; depends=[]; }; - TeachNet = derive { name="TeachNet"; version="0.7"; sha256="1p39bsf846r7zwz4lrrv2bpyx9yrkqzrnacajwrz3jjqj6qpp6cn"; depends=[]; }; - TED = derive { name="TED"; version="1.0"; sha256="0fzjfm9fjyn6h89vwgc912q8hx7ly4mqpacbz05iykhz3xdzfb9p"; depends=[foreach zoo fields animation geoR RcppArmadillo]; }; - teigen = derive { name="teigen"; version="2.0.1"; sha256="1lsx7cb6frfi0i2pg1w228kydfymrbxqd535hnrhhq9j1shhykk4"; depends=[]; }; - tempdisagg = derive { name="tempdisagg"; version="0.23"; sha256="1ym0cbvm8f1wvnkpdm34d5yzgbn3hig1kc3zv8b24pnx11ywv751"; depends=[]; }; - tensor = derive { name="tensor"; version="1.5"; sha256="19mfsgr6vz4lgwidm80i4yw0y1dr3n8i6qz7g4n2xa0k74zc5pp1"; depends=[]; }; - tensorA = derive { name="tensorA"; version="0.36"; sha256="1xpczn94a6vfkfibfvr71a7wccksg16pc22h0inpafna4qpygcwp"; depends=[]; }; - TEQR = derive { name="TEQR"; version="5.0-0"; sha256="04r26qzps7nnvs4s2xpvjf6q456wa29alhsds07xvyqhi972xhs6"; depends=[]; }; - TERAplusB = derive { name="TERAplusB"; version="1.0"; sha256="0mshx615awcf2arm39mgw2gzgpyn7a3f767484g7z4nqqlikwpgc"; depends=[]; }; - tergm = derive { name="tergm"; version="3.1.4"; sha256="0w5s4ziacxp9zdylmb8f7xrwvql58c6c9jvv27wjxdxpaf9iyp8h"; depends=[statnet_common ergm network networkDynamic robustbase coda nlme]; }; - termstrc = derive { name="termstrc"; version="1.3.7"; sha256="12bycwhjrhkadafcckc30jr0md0ssj21n4v75yjhy21yvqjx1d7a"; depends=[lmtest Rcpp rgl sandwich urca zoo]; }; - ternvis = derive { name="ternvis"; version="1.1"; sha256="16q1a1ns7q0d46js2m1hr6zm8msg3ncgp8w7yrwch11xq0759sb4"; depends=[quadprog maps maptools mapdata dichromat]; }; - TESS = derive { name="TESS"; version="1.2.1"; sha256="15wrbbhrzj66j0z6xhnbf560qg0dzm1yqfbpmx070n3lsa2rdyij"; depends=[ape coda deSolve]; }; - tester = derive { name="tester"; version="0.1.7"; sha256="1x5m43abk3x3fvb2yrb1xwa7rb4jxl8wjrnkyd899ii1kh8lbimr"; depends=[]; }; - testit = derive { name="testit"; version="0.3"; sha256="142q0zwlzx3w69j0fsd06s3pihr76kw9yg21596aalazh7c2yfgi"; depends=[]; }; - TestScorer = derive { name="TestScorer"; version="1.6"; sha256="11125i0dwh961q5xbg57lli5bzzls3y482iw5f0qwalwkppk7sv0"; depends=[]; }; - TestSurvRec = derive { name="TestSurvRec"; version="1.2.1"; sha256="05f5gc8hvz09hx015jzis6ikki9c1brdq7l7a9bxm9bqbcc9f2f9"; depends=[survrec boot]; }; - testthat = derive { name="testthat"; version="0.8.1"; sha256="1nja6yfcqyxi6nfs8mcwasslfw8mzlacjwj3kr65zmg58pm82ga4"; depends=[digest]; }; - texmex = derive { name="texmex"; version="2.1"; sha256="17x4xw2h4g9a10zk4mvi3jz3gf4rf81b29hg2g3gq6a6nrxsj8sy"; depends=[mvtnorm]; }; - TExPosition = derive { name="TExPosition"; version="2.6.10"; sha256="12rgijlclaipwjjiyng7nwilzixdy6lsvncigcg0vjydhgk97jn1"; depends=[prettyGraphs ExPosition]; }; - texreg = derive { name="texreg"; version="1.33"; sha256="14x8q35w0w6p2zkqycqkpkan1637r9z6dl68d1dn4n5im7f2n4kw"; depends=[]; }; - textcat = derive { name="textcat"; version="1.0-2"; sha256="0m8jbw8k8h6m9q9x25gvx0glzwhhpy73pjv4zivivna5zxapgi23"; depends=[tau slam]; }; - textir = derive { name="textir"; version="2.0-2"; sha256="19n14nqx7gcp5ypfqwmk80lxxwqc0dklm09z3f9czg68j6qv181i"; depends=[distrom gamlr Matrix]; }; - textometry = derive { name="textometry"; version="0.1.3"; sha256="1a0dp1flx3yh7wqn0cmb5pq83qqnz94ynkqkmj4kw9ha5j8kcnwx"; depends=[]; }; - TFDEA = derive { name="TFDEA"; version="0.9.4"; sha256="0376mzlfzf2ff6pnfsh4lf6gx9c1xdnl59pwm31zc73li4npy61h"; depends=[lpSolveAPI]; }; - tfer = derive { name="tfer"; version="1.1"; sha256="19d31hkxs6dc4hvj5495a3kmydm29mhp9b2wp65mmig5c82cl9ck"; depends=[]; }; - TFMPvalue = derive { name="TFMPvalue"; version="0.0.5"; sha256="13bfcwfiyl61cv2ma23fcmv2cvbsyzdbg2pl6l6zg39l6scxf9na"; depends=[Rcpp]; }; - tfplot = derive { name="tfplot"; version="2014.2-2"; sha256="1jrkzccvqmwghp6nhxay0m1qx8r5wa96zb9r8v6qihryi9m3amhs"; depends=[tframe]; }; - tframe = derive { name="tframe"; version="2012.8-1"; sha256="0m6kwwn7y4n0vkk9zvwixn2jg67rsv9f9s2xma2mxdxl1f5lnfvh"; depends=[]; }; - tframePlus = derive { name="tframePlus"; version="2013.9-1"; sha256="070ad1g7yv1d5by6xrvshgn43jjxpq8waa339xhzc1am2qzb6mqr"; depends=[tframe timeSeries]; }; - TFX = derive { name="TFX"; version="0.1.0"; sha256="0xrjdbvg0ng4i0s8ql1pfyma10x4n045spilkb05750677r5j44p"; depends=[XML]; }; - tgp = derive { name="tgp"; version="2.4-9"; sha256="0ghn7pmwipwmq6lch7jvzghks9mbj9jrdv5140550vq4w6mnf57q"; depends=[]; }; - tgram = derive { name="tgram"; version="0.2-2"; sha256="091g6j5ry1gmjff1kprk5vi2lirl8zbynqxkkywaqpifz302p39q"; depends=[zoo]; }; - TH_data = derive { name="TH.data"; version="1.0-3"; sha256="0f52x4ill5d4wpb1iyz0blj62jqzrzr6gl74bmy5hxh3f4f4kwq1"; depends=[]; }; - thgenetics = derive { name="thgenetics"; version="0.3-4"; sha256="1316nx0s52y12j9499mvi050p3qvp6b8i01v82na01vidl54b9c2"; depends=[]; }; - Thinknum = derive { name="Thinknum"; version="1.3.0"; sha256="0j48vgr4wsc2chm95aprq0xm0dk720xk5zmiijxasg92sfp0va6n"; depends=[RCurl RJSONIO]; }; - threeboost = derive { name="threeboost"; version="1.1"; sha256="033vwn42ys81w6z90w5ii41xfihjilk61vdnsgap269l9l0c8gmn"; depends=[Matrix]; }; - ThreeWay = derive { name="ThreeWay"; version="1.1.2"; sha256="1vf71im3bs2b2v05j12l8qn181kah0mch4h13n71zqik1ykly6jf"; depends=[]; }; - threg = derive { name="threg"; version="1.0.2"; sha256="0wb9waj0j83zrj763d3fdnp3lp52gfdyzv23yrvxvd6zmk5clgi2"; depends=[survival Formula]; }; - ThresholdROC = derive { name="ThresholdROC"; version="1.0"; sha256="1w7bjw1w09skxyc5w3d72wivljlvnck6vbchihjx7m5k6djn7pxi"; depends=[]; }; - tibbrConnector = derive { name="tibbrConnector"; version="1.5.0-71"; sha256="0d8gy126hzzardcwr9ydagdb0dy9bdw30l8s2wwi7zaxx2lpii6q"; depends=[RCurl rjson]; }; - tictoc = derive { name="tictoc"; version="1.0"; sha256="1zp2n8k2ax2jjw89dsri268asmm5ry3ijf32wbca5ji231y0knj7"; depends=[]; }; - TiddlyWikiR = derive { name="TiddlyWikiR"; version="1.0.1"; sha256="0vwwjdmfc8c0y2gfa8gls1mzvp29y39c9sxryrgpk253jj9px1kr"; depends=[]; }; - Tides = derive { name="Tides"; version="1.0"; sha256="10k8cmpfj9jjpzayyklslgazgl96078vfbn71ncgrn9bb98ahyqs"; depends=[]; }; - tidyr = derive { name="tidyr"; version="0.1"; sha256="1rcf2cmd0zbjkvazkdfiv4sy50rxzj0fs4ldgmkz89vlffy5kdgc"; depends=[reshape2 dplyr]; }; - tiff = derive { name="tiff"; version="0.1-5"; sha256="0asf2bws3x3yd3g3ixvk0f86b0mdf882pl8xrqlxrkbgjalyc54m"; depends=[]; }; - tiger = derive { name="tiger"; version="0.2.3.1"; sha256="0xr56c46b956yiwkili6vp8rhk885pcmfyd3j0rr4h8sz085md6n"; depends=[e1071 hexbin qualV klaR som lattice]; }; - tigerstats = derive { name="tigerstats"; version="0.1.6"; sha256="18gvmc4gfwi2x5nqj6jm7lddzlqmjvj0bf4h6r0yzvrp07wayvan"; depends=[lattice MASS]; }; - tightClust = derive { name="tightClust"; version="1.0"; sha256="0psyzk6d33qkql8v6hzkp8mfwb678r95vfycz2gh6fky7m5k3yyz"; depends=[]; }; - tikzDevice = derive { name="tikzDevice"; version="0.7.0"; sha256="12r6qk5qp4yvi3vqvdxp02799y6fhmg21qv6abp1s620n8hgva6d"; depends=[filehash]; }; - tileHMM = derive { name="tileHMM"; version="1.0-6"; sha256="18vqj7fdh4knnjk9s7yk2bgn3qwqz92fmm5fdny21gi0wl4qgdsd"; depends=[]; }; - TilePlot = derive { name="TilePlot"; version="1.3.1"; sha256="0yfzjyzc743rv5piw9mb7y0rr558hkxszgz49lya2w3i1mqvxbzy"; depends=[]; }; - tilting = derive { name="tilting"; version="1.0"; sha256="0s0lac39wnczjy6kb2a1an55fyndh61ya5cx4ic3799cgqvn8ba0"; depends=[mvtnorm]; }; - timeDate = derive { name="timeDate"; version="3010.98"; sha256="12f4bdb9lv724p4p1490iznhnwznnn69c5b6wbljdvscl1yvys9a"; depends=[]; }; - timeit = derive { name="timeit"; version="0.2.1"; sha256="0fsa67jyk4yizyd079265jg6fvjsifkb60y3fkkxsqm7ffqi6568"; depends=[microbenchmark]; }; - timeline = derive { name="timeline"; version="0.9"; sha256="0zkanz3ac6cgsfl80sydgwnjrj9rm7pcfph7wzl3xkh4k0inyjq3"; depends=[ggplot2]; }; - TimeMachine = derive { name="TimeMachine"; version="1.2"; sha256="1dz0j777wmd8mpkm2ryiahpcw6w88w429zjcw6m67pi20r1992cb"; depends=[]; }; - timeordered = derive { name="timeordered"; version="0.9.6"; sha256="0h6y3asq1y788571c423bqkgdcx6k5i9jp6hp59x99g9l77y71sn"; depends=[igraph plyr]; }; - TimeProjection = derive { name="TimeProjection"; version="0.2.0"; sha256="04yr4cg2khkw9n3y3qk0ni1327k4pxm09zz2xg8mpjdvgi4p9yi3"; depends=[lubridate timeDate Matrix]; }; - timereg = derive { name="timereg"; version="1.8.5"; sha256="1ppmhx86cf276fl1nwmlpbjhh6ddvrcw2gc53ncqcyff0jg6r4c1"; depends=[survival prodlim]; }; - timeROC = derive { name="timeROC"; version="0.2"; sha256="1ikd2wr5cja784hihqdyk7mwky18czz58sl0xrvmzhc67153a4jz"; depends=[pec mvtnorm timereg]; }; - timesboot = derive { name="timesboot"; version="1.0"; sha256="1ixmcigi1bf42np93md8d3w464papg9hp85v0c3hg3vl4nsm2bji"; depends=[boot]; }; - timeSeries = derive { name="timeSeries"; version="3010.97"; sha256="0iv1jkh1h2qamsi22m7l3pdx0mgz96lafwjdxc99i558l2gdp2s3"; depends=[timeDate]; }; - timetools = derive { name="timetools"; version="1.6.0"; sha256="1ynapbzbnxyyqs1lkb482jp3yfjmnbqqv80ksc6vasi6gm0fmx7h"; depends=[]; }; - TimeWarp = derive { name="TimeWarp"; version="1.0-7"; sha256="1qjr3kfdd1ym0fi4hgjqm32gigchbchxy4xyxmsyl8y7jh2jk9qj"; depends=[]; }; - TIMP = derive { name="TIMP"; version="1.11.0"; sha256="0l8n3xg5ds1lbndd993nijny26s9p36n3j128527y53fs4915lxn"; depends=[fields vcd gplots colorspace gclus nnls deSolve minpack_lm MASS]; }; - timsac = derive { name="timsac"; version="1.3.3"; sha256="0jg9mjzzfl94z4dqb2kz0aiccpclnbyf9p08x3a3cw1y6wqmzrmy"; depends=[]; }; - Tinflex = derive { name="Tinflex"; version="1.0"; sha256="0zvh2nfx4kqf90mmrpdm2fzlzn7s7gs09i8zin604hqxjir6p3ny"; depends=[]; }; - TInPosition = derive { name="TInPosition"; version="0.13.6"; sha256="1cxxrfpbiyknaivv6gyp79lz0rxwhrndcd054smksxq8zcfz0v7c"; depends=[prettyGraphs TExPosition ExPosition InPosition]; }; - tipom = derive { name="tipom"; version="1.0.2-1"; sha256="1gdfv0g5dw742j6ycmi0baqh6xcchp3yf2n1g8vn7jmqgz5mlhdr"; depends=[]; }; - tis = derive { name="tis"; version="1.23"; sha256="0k8g9r0ngiw5dnmg0vddcmfw2w7g69lamrpczabrd2jmvvy67npn"; depends=[]; }; - titan = derive { name="titan"; version="1.0-16"; sha256="0x30a877vj99z3fh3cw9762j5ci56964j2466xfbwcywhn9njz5r"; depends=[MASS boot lattice]; }; - tkrgl = derive { name="tkrgl"; version="0.7"; sha256="1kpq5p6izqrn1zr53firis3rmifq9lf6326lf3z7l1p82nf2yps5"; depends=[rgl]; }; - tkrplot = derive { name="tkrplot"; version="0.0-23"; sha256="1cnyszn3rmr1kwvi5a178dr3074skdijfixf5ln8av5wwcy35947"; depends=[]; }; - tlemix = derive { name="tlemix"; version="0.1.3"; sha256="0c4mvdxlhbmyxj070xyipx4c27hwxlb3c5ps65ipm6gi8v8r6spj"; depends=[]; }; - tlmec = derive { name="tlmec"; version="0.0-2"; sha256="1gak8vxmfjf05bhaj6lych7bm8hgav1x3h14k2ra7236v82rqbw7"; depends=[mvtnorm]; }; - tlnise = derive { name="tlnise"; version="2.0"; sha256="1vh998vqj359249n9zmw04rsivb7nlbdfgzf20pgh2sndm3rh8qz"; depends=[]; }; - tm = derive { name="tm"; version="0.6"; sha256="004hswgswz3gdrpa6j61hl4rls843bxnsp5qac5kyxvfmwalsgr8"; depends=[NLP slam]; }; - tmap = derive { name="tmap"; version="0.6"; sha256="10aw79k3vdi3f20i4clsbvdlfylg34z02ah36wz5yj7y68fm5ijh"; depends=[rgeos gridBase sp rgdal classInt RColorBrewer igraph fields vegan]; }; - tmle = derive { name="tmle"; version="1.2.0-4"; sha256="11hjp2vak1zv73326yzzv99wg8a2xyvfgvbyvx3jfxkgk33mybbm"; depends=[SuperLearner]; }; - tmle_npvi = derive { name="tmle.npvi"; version="0.8.1"; sha256="1vxkhf17x3zsf4fvx458qyqn0xi460db6kw6zmaw6jhagjk5yaj0"; depends=[R_utils MASS sgeostat]; }; - tm_plugin_alceste = derive { name="tm.plugin.alceste"; version="1.1"; sha256="0wid51bbbx01mjfhnaiv50vfyxxmjxw8alb73c1hq9wlsh3x3vjf"; depends=[NLP tm]; }; - 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_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"; sha256="1qwzglv40vry2nsqnvpz2pr2bqyb3iibh3dx2yn51xshgqs3p2d8"; depends=[NLP tm boilerpipeR RCurl XML RJSONIO]; }; - 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="0.5.3"; sha256="058gl3vsqq4ylxrafj6fd70xsw4jbxjlxl30h8pd2dyv1h70b5zf"; depends=[rgl]; }; - topicmodels = derive { name="topicmodels"; version="0.2-1"; sha256="1if1pdx4jnfx3xi37xs411qv3h449vkwxzzqd7krxaxbj3gqq7n9"; depends=[modeltools slam tm]; }; - TopKLists = derive { name="TopKLists"; version="1.0.2"; sha256="0hsfa465rw7mjwgp9nk2aa9gqrwc61r867n4kfix6fbngqr11m5k"; depends=[Hmisc gplots]; }; - topmodel = derive { name="topmodel"; version="0.7.2-2"; sha256="1nqa8fnpxcn373v6qcd9ma8qzcqwl2md347yql3c8bpqlm9ggz16"; depends=[]; }; - topologyGSA = derive { name="topologyGSA"; version="1.4.4"; sha256="092f57gpm8jlb2y4j74a6dx1lwqjdgcm3yrm1yzy4511j6vg0axh"; depends=[gRbase fields]; }; - topsis = derive { name="topsis"; version="1.0"; sha256="056cgi684qy2chh1rvhgkxwhfv9nnfd7dfzc05m24gy2wyypgxj3"; depends=[]; }; - tosls = derive { name="tosls"; version="1.0"; sha256="03nqwahap504yvcksvxdhykplbzmf5wdwgpzm7svn8bymdc472v2"; depends=[Formula]; }; - tourr = derive { name="tourr"; version="0.5.3"; sha256="0jsj2r9lhy0pa4kxnfb1cpf28c8q26rcprssax765n5ip1w9ycra"; depends=[]; }; - tourrGui = derive { name="tourrGui"; version="0.4"; sha256="1g9928q3x9rrd9k3k84r201wss3vjd2pngvbaflk5dqh9yf75jpq"; depends=[tourr colorspace RGtk2 gWidgets Cairo]; }; - tpe = derive { name="tpe"; version="1.0.1"; sha256="0zsa8vb4qmln3sb4lplv43lh50yys9vfd3rxfp6qxqqjxivd0xsh"; depends=[]; }; - TPmsm = derive { name="TPmsm"; version="1.1.1"; sha256="0fd4l1rzclq32l97g7rdvhdvfdylgwaf079y24arfvkyphs2xga4"; depends=[KernSmooth]; }; - tpr = derive { name="tpr"; version="0.3-1"; sha256="0nxl0m39zaii6rwm35hxcdk6iy2f729jjmhc2cpr8h0mgvgqf19d"; depends=[lgtdl]; }; - track = derive { name="track"; version="1.0-15"; sha256="05v6p2mfms59p3cs4vwpzvi9gaadrin50fc39l5kjqwqa9vhmkz7"; depends=[]; }; - trackObjs = derive { name="trackObjs"; version="1.0-18"; sha256="0wwm9yx5wnmgvyd7zczkv8mdzixazb3kps112w19rdbnkiq1db3d"; depends=[]; }; - TrackReconstruction = derive { name="TrackReconstruction"; version="1.1"; sha256="1f2l3nshb6qrhyczw5rxqqzmsjxf0rvv3y78j8d9lv1nnd9kxzq5"; depends=[fields RColorBrewer]; }; - tractor_base = derive { name="tractor.base"; version="2.5.0"; sha256="17s4iyp67w7m8gslm87p3ic5r9iq7x1ifpxqrmnin3y5a3d04f5v"; depends=[reportr]; }; - traitr = derive { name="traitr"; version="0.13"; sha256="0xn2w83w9mh2aal375snzv9r7yv7adly3axf8kchlcxs2kgrrn8f"; depends=[digest proto gWidgets]; }; - TraMineR = derive { name="TraMineR"; version="1.8-8"; sha256="12zbk7bq4ff4dzq86zbh9pspl1b9a69k0rw9lg8sh3mmc0f09m8j"; depends=[RColorBrewer boot]; }; - TraMineRextras = derive { name="TraMineRextras"; version="0.2.2"; sha256="0sb072ssg5q3kncb3b1a0nrnapjq8rly0ibh3gdrld9fdbdbjx68"; depends=[TraMineR RColorBrewer combinat survival]; }; - TRAMPR = derive { name="TRAMPR"; version="1.0-7"; sha256="135ylhijhpdxpznfdbdzwfsvy8bhw1yx28c3520a3lyrqvinpawg"; depends=[]; }; - translate = derive { name="translate"; version="0.1.2"; sha256="1w0xrg1xxwfdanlammmixf06hwq700ssbjlc3cfigl50p87dbc5x"; depends=[RCurl RJSONIO functional lisp]; }; - translateR = derive { name="translateR"; version="1.0"; sha256="11kh9hjpsj5rfmzybnh345n1gzb0pdksrjp04nzlv948yc0mg5gm"; depends=[RJSONIO RCurl textcat httr]; }; - transmission = derive { name="transmission"; version="0.2.0"; sha256="0cp3fb05kj3zj1x3i7icisaswdqbn9mhx5vi778x44r68h2lap17"; depends=[Rcpp ggplot2 reshape2 plyr]; }; - transnet = derive { name="transnet"; version="0.1"; sha256="0apsb67dxcnnsjnldr1vsjpc7xwy4cipybk9d86rf86l6cmirci6"; depends=[rJava plyr reshape2]; }; - transport = derive { name="transport"; version="0.6-2"; sha256="038p40jp654w0jbgzxy1sj4258g9lzdfzija1mfz6nc6ibycviyj"; depends=[]; }; - trapezoid = derive { name="trapezoid"; version="2.0-0"; sha256="0f6rwmnn61bj97xxdgbydi94jizv1dbq0qycl60jb4dsxvif8l3n"; depends=[]; }; - TreatmentSelection = derive { name="TreatmentSelection"; version="1.1.2"; sha256="1mvrb72yz51gmwqlfg5gsjbi65lqk5j24agddw1br53ymdvjgzq4"; depends=[ggplot2]; }; - tree = derive { name="tree"; version="1.0-35"; sha256="1k8c2kjk53gix68frprlyx5ww7cm373vz1xg2r2jxbzxg1y4v691"; depends=[]; }; - treebase = derive { name="treebase"; version="0.0-7.1"; sha256="0kj1cyk14j4qzm31f47a8g7qh4842rqkzr0fqh9i5c8kzrqxbc0g"; depends=[ape XML RCurl reshape2 data_table]; }; - treeclim = derive { name="treeclim"; version="1.0.7"; sha256="1l2m4pq5wcb3wkxy9mkay87vzdcn8rxgsknsb72ahdb3zim0yg0v"; depends=[Rcpp abind plyr ggplot2 lmtest lmodel2 np boot]; }; - treecm = derive { name="treecm"; version="1.2.1"; sha256="02al6iz25pay7y1qmbpy04nw8dj9c5r7km6q5k3v3jdkfal6cm6k"; depends=[plyr]; }; - treelet = derive { name="treelet"; version="1.0"; sha256="16g4lmp4yrfg328d0qwrp101y1qnwcrff7kna60cjmqdpvg3wm15"; depends=[]; }; - treemap = derive { name="treemap"; version="2.2"; sha256="0h4wkjw12n9awqsvrs72nmsxq3d5as3zjy8kyhw7715h1cvry769"; depends=[colorspace data_table ggplot2 gridBase igraph RColorBrewer shiny]; }; - TreePar = derive { name="TreePar"; version="3.0"; sha256="12i3y2wmja0xrq3h43fi4r8991q328l1p51q5nbz17crd44pds31"; depends=[ape Matrix subplex TreeSim deSolve]; }; - TreeSim = derive { name="TreeSim"; version="2.0"; sha256="0kzmvay0ai0acjhcr4w7674gvln9sgg7n4qc3rg5kfcdqj4q8whp"; depends=[ape geiger laser]; }; - TreeSimGM = derive { name="TreeSimGM"; version="1.2"; sha256="0y6hadwx3apw11jy5d4al3dav3his8b4xvkv7s5d5rd92l7yrw0r"; depends=[TreeSim]; }; - treethresh = derive { name="treethresh"; version="0.1-7"; sha256="0757w8y7hqki9znn726h7ry1hdrhnfj9ps179jmh5cl0gb5p2qin"; depends=[EbayesThresh wavethresh]; }; - TrialSize = derive { name="TrialSize"; version="1.3"; sha256="1hikhw2l7d3c7cg4p7zzrgdwhy9g4rv06znpw5mc6kwinyakp75q"; depends=[]; }; - TRIANG = derive { name="TRIANG"; version="1.2"; sha256="09hfvfmqrmx8dphlk46ga0y9s986kb32qdhgiq95faqfhpirf0qa"; depends=[]; }; - TRIANGG = derive { name="TRIANGG"; version="1.0"; sha256="1ycqyaijxmgi7v9rzdsq3gxx1wll51yfpdyxbjiyp9gpgmcs7h48"; depends=[]; }; - triangle = derive { name="triangle"; version="0.8"; sha256="0jdphz1rf4cx4y28syfffaz7fbl41g3rw3mrv9dywycdznhxdnrp"; depends=[]; }; - trifield = derive { name="trifield"; version="1.1"; sha256="0xk48fkd5xa3mfn3pwdya0ihpkwnh20sgj3rc7fmzjil47kqscvy"; depends=[]; }; - TriMatch = derive { name="TriMatch"; version="0.9.1"; sha256="1207lnysdjd347m1lsbxy19lq73bjs1irqwk94y8idp1pcj4pfpd"; depends=[ggplot2 scales reshape2 ez psych PSAgraphics]; }; - trimcluster = derive { name="trimcluster"; version="0.1-2"; sha256="0lsgbg93hm0w1rdb813ry0ks2l0jfpyqzqkf3h3bj6fch0avcbv2"; depends=[]; }; - trioGxE = derive { name="trioGxE"; version="0.1-1"; sha256="1ra86l3i7fhb6nsy8izixyvm6z23shv7fcjmnnpil54995j15ax4"; depends=[msm mgcv gtools]; }; - trip = derive { name="trip"; version="1.1-17"; sha256="1i1hc89bdws4k10w6yz0wqnkkk2mgbhkv0kdnx2q8ljir9p4gbyx"; depends=[sp maptools MASS spatstat]; }; - tripack = derive { name="tripack"; version="1.3-6"; sha256="1dknz1arzfyknip04a9fxdhqmrkb0r0lr8hgria9s0d57hr1ay12"; depends=[]; }; - tripEstimation = derive { name="tripEstimation"; version="0.0-41"; sha256="11cn9lz4vdcx8wb46cm5sj0rfjl9cs50z7zxfxrn79nz0pga4gwn"; depends=[lattice mgcv rgdal sp zoo]; }; - TripleR = derive { name="TripleR"; version="1.2.1"; sha256="0ab0mb044594rixira088l2dr5r9jrbphiigi8nv8ggm6536sqf0"; depends=[reshape plyr]; }; - trueskill = derive { name="trueskill"; version="0.1"; sha256="0mqvm64fcsxjlh789lqdk6l28q31yhh6jjirwjlgbpxxb90c5107"; depends=[]; }; - truncdist = derive { name="truncdist"; version="1.0-1"; sha256="0aszs6rz8nydyf2dw1m4fj9fclb0r4vpgqywyaqjkdnhzmyn593g"; depends=[evd]; }; - truncgof = derive { name="truncgof"; version="0.6-0"; sha256="0b499i9zjwvva5jfl9fj02jjrgy8myxqfjwa0cjg0jrpgxczgwg8"; depends=[MASS]; }; - truncnorm = derive { name="truncnorm"; version="1.0-7"; sha256="1qac05z50618y4bw1d7yznsli1bv82s0g8h37iacrjrdkv87bmy7"; depends=[]; }; - truncreg = derive { name="truncreg"; version="0.2-1"; sha256="0qvdfj93phk1s2p4n0rmpf8x9gj5n1j75h4z424mrg10r24699rd"; depends=[maxLik]; }; - truncSP = derive { name="truncSP"; version="1.2.2"; sha256="1hdi518j3sg9273g01l1jqlmqya3ppim82ma7zakwqpmsjmzw18q"; depends=[truncreg boot]; }; - trust = derive { name="trust"; version="0.1-6"; sha256="1jghgwnazhqgyn2k0b3x4n8swncyy6dzlkv86chv98zw4s3bnlak"; depends=[]; }; - trustOptim = derive { name="trustOptim"; version="0.8.3"; sha256="04pkni5053r9czmf81jaq3y1kvw902g237pa6d3jgkvlqaznqwg3"; depends=[Rcpp RcppEigen Matrix]; }; - TSA = derive { name="TSA"; version="1.01"; sha256="0cm97hwxm6vfgy9mc3kgwq6dnmn86p8a4avnfjbai048qnwrn6hx"; depends=[leaps locfit mgcv tseries]; }; - TSAgg = derive { name="TSAgg"; version="1.0.1"; sha256="01s0grwfbhhfipqdnc0932rjsz4k52rln2bs8dsvrk6f8wps7h1k"; depends=[lubridate]; }; - tsbridge = derive { name="tsbridge"; version="1.1"; sha256="0mry3ia54cdfydpzm8asrq1ldj70gnpb5dqzj51w0jiyps2zlw6f"; depends=[mvtnorm tsbugs]; }; - tsbugs = derive { name="tsbugs"; version="1.2"; sha256="130v4x6cfy7ddvhijsnvipm4ycrispkj1j0z5f326yb4v5lrk91x"; depends=[]; }; - TSclust = derive { name="TSclust"; version="1.2.1"; sha256="1ixawrs686p5g8kdaiqpf4y8ndpz0vgz9ji1ahja8i6nscfzasd9"; depends=[wmtsa pdc cluster locpol KernSmooth dtw longitudinalData]; }; - TScompare = derive { name="TScompare"; version="2013.9-1"; sha256="1gghr7xsg524sc9lhy1ymlhigaz6pi69fnccgn784ff2hl3w6d8w"; depends=[TSdbi tframe tfplot]; }; - TSdata = derive { name="TSdata"; version="2013.9-1"; sha256="1r3x6w17517if2jpcz2mr8jk5i080dkx4nlffblrcsxjhfvlz0xh"; depends=[]; }; - TSdbi = derive { name="TSdbi"; version="2013.9-1"; sha256="12v9dv7hrq626q44v3lws950m241fq5fsfsnmgvfbbyya5ixis86"; depends=[DBI tframe]; }; - TSdist = derive { name="TSdist"; version="1.2"; sha256="103wv6wy5gjim2cf14d6afinyla85p6dncchi17fr0s4vqkmx3m5"; depends=[proxy zoo xts]; }; - tsDyn = derive { name="tsDyn"; version="0.9-33"; sha256="080bzbxvjfwayq9j7r1ghalvjcql9sk7ryzj880k2by4179fhnkk"; depends=[mnormt mgcv nnet tseriesChaos tseries vars urca forecast MASS Matrix foreach]; }; - TSEN = derive { name="TSEN"; version="1.0"; sha256="1pn313g2ylbjc37rqcakd797vffnh7v0rgg1xl5wjyvcgmm5mxix"; depends=[ncdf]; }; - tseries = derive { name="tseries"; version="0.10-32"; sha256="0jz8a3z3hx2ps7krmpg6m10jvz5ddgmcrmnd38jpxb6ndnhh3pzw"; depends=[quadprog zoo]; }; - tseriesChaos = derive { name="tseriesChaos"; version="0.1-13"; sha256="0f2hycxyvcaj3s1lmva1qy46xr6qi43k8fvnm4md5qj8jp2zkazg"; depends=[deSolve]; }; - tsfa = derive { name="tsfa"; version="2014.2-2"; sha256="07g9qfdrhccl5dlsbpxn1ihavxljd9nq21hzbyn225cfi4bkx42h"; depends=[GPArotation dse EvalEst setRNG tframe tfplot]; }; - TSfame = derive { name="TSfame"; version="2013.8-2"; sha256="19awl7jrx97y93wsms3h87w8qdgpdrkbbpsjsa2aqsnyq5vgy82l"; depends=[TSdbi DBI tframe tframePlus fame tis]; }; - TSgetSymbol = derive { name="TSgetSymbol"; version="2013.9-1"; sha256="1hn78xrfdnwhjrgcnn71ihvdgv4qwdxhpjwcqp0pbkgbxj3q5w3k"; depends=[TSdbi quantmod DBI zoo tframe tframePlus]; }; - TShistQuote = derive { name="TShistQuote"; version="2013.9-1"; sha256="06din7frxmbk4qxkpv0z5srh8nh0wkmrfl9lz17y7cwsmldl4hvr"; depends=[TSdbi DBI tframe tframePlus zoo tseries]; }; - TSHRC = derive { name="TSHRC"; version="0.1-3"; sha256="18ygg7bqwg1pdqi52l1lf33gcd277895rlf5853yzh7ln2ivssmi"; depends=[]; }; - tsintermittent = derive { name="tsintermittent"; version="1.3"; sha256="10ch3ssfgdxhxg0l5m4jp2mryj7s23crwnj0nwnc9w3yarl9mxjy"; depends=[MAPA]; }; - TSjson = derive { name="TSjson"; version="2014.4-1"; sha256="1rkxc4dm7hdva0hiqbka8isfszjy26if9hnarsm51cflk8b60zhk"; depends=[TSdbi findpython DBI tframe tframePlus rjson]; }; - tslars = derive { name="tslars"; version="1.0"; sha256="0ylpn4jxmrck7hna3j420kw2yhsrklrq2664w85z30xij3zrrrci"; depends=[]; }; - tsModel = derive { name="tsModel"; version="0.6"; sha256="0mkmhzj4g38ngzfcfx0zsiqpxs2qpw82kgmm1b8gl671s4rz00zs"; depends=[]; }; - TSMySQL = derive { name="TSMySQL"; version="2013.9-1"; sha256="1ls3mpp5xq707vgv8l14cfbw1vn4ygy4d9n19nw5mnl3izz4p0pk"; depends=[TSdbi RMySQL DBI tframe TSsql]; }; - tsne = derive { name="tsne"; version="0.1-2"; sha256="12q5s79r2949zhm61byd4dbgw6sz3bmxzcwr8b0wlp8g1xg4bhy6"; depends=[]; }; - TSodbc = derive { name="TSodbc"; version="2013.9-1"; sha256="0s0bgid5slvyqlsrc0jvybqd73qjbs7qb0klws4ynk51rw6rilml"; depends=[TSdbi RODBC DBI tframe tframePlus TSsql]; }; - tsoutliers = derive { name="tsoutliers"; version="0.4"; sha256="08b8ssd8ha2n96la1kc64w2r1616c2d417vr6292g8m60fvlcq48"; depends=[forecast polynom stsm stsm_class KFKSDS]; }; - TSP = derive { name="TSP"; version="1.0-9"; sha256="122y008gy7b2yscl9n2nwdb81fzjnpimipy3cvbnmk4i6v8nibjx"; depends=[]; }; - Tsphere = derive { name="Tsphere"; version="1.0"; sha256="0xgxw2hfj40k5s0b54dcmz7savl8wy4midmmgc7lq4pyb8vd58xx"; depends=[glasso rms]; }; - tspmeta = derive { name="tspmeta"; version="1.1"; sha256="11kr5avf67v2cxy3k1yrpv9lcbmiprd0w43w7zvizhsij58h13vm"; depends=[ggplot2 TSP MASS BBmisc fpc vegan stringr splancs]; }; - TSPostgreSQL = derive { name="TSPostgreSQL"; version="2013.9-1"; sha256="0ihfz0q1faxb7mk4jm10czfb9fz168x4z8890vql98djsxzjxpz4"; depends=[TSdbi RPostgreSQL DBI tframe tframePlus TSsql]; }; - TSsql = derive { name="TSsql"; version="2014.4-1"; sha256="10h83z0d9xjc1g0pnjvr4idz5c2vwf36x6qx1lpa48ybap50s215"; depends=[DBI tframe TSdbi]; }; - TSSQLite = derive { name="TSSQLite"; version="2013.9-1"; sha256="0yw5whn95dvv3wbwmlhfgkapwp66nk94fjfl1r8irbqvrscmjin0"; depends=[TSdbi RSQLite DBI tframe tframePlus TSsql]; }; - TSTutorial = derive { name="TSTutorial"; version="1.2.3"; sha256="0hpk6k3lc72p8pdz5aad04lcjsz9k443h5gs09dc3i10wqw3yhxs"; depends=[MASS]; }; - TSxls = derive { name="TSxls"; version="2013.8-2"; sha256="1a0cmw41jf9jqibg25s4s04lawdb86c5r4bkxp8bznzkkhihpxn1"; depends=[TSdbi DBI tframe tframePlus gdata]; }; - TSzip = derive { name="TSzip"; version="2013.9-1"; sha256="09fqjsppj7qmbiiy19s64j77kf6drqfiphk5dfz25w5df1lzdw0f"; depends=[TSdbi DBI tframe tframePlus gdata]; }; - TTAinterfaceTrendAnalysis = derive { name="TTAinterfaceTrendAnalysis"; version="1.5.1"; sha256="1i9p5s7xj3py8465yjjaqs2m7krjxzzqd86lkpbgzxnxjdnxcx5i"; depends=[Hmisc pastecs reshape wq e1071 timeSeries fBasics relimp multcomp nlme lubridate tcltk2]; }; - tth = derive { name="tth"; version="4.3-2"; sha256="1gs8xjljklvs0pavvn9f59y09hw7x2da58a46b5x01g08i0j8h1d"; depends=[]; }; - TTR = derive { name="TTR"; version="0.22-0"; sha256="0aackwmmakjcynpq4nxi8xw1x3688rkg6kypgd5jiprzzdhsz5rq"; depends=[xts]; }; - ttScreening = derive { name="ttScreening"; version="1.3"; sha256="1ixy3s0a1vwr5qf1w24n8bhbq6qbwraal8xb8ypbvpjkrl0d14z2"; depends=[matrixStats corpcor]; }; - ttutils = derive { name="ttutils"; version="1.0-1"; sha256="18mk30070mcplybg320vjbk9v5flxnbqi5gx0yyr1z6ymjmnrxbc"; depends=[]; }; - ttwa = derive { name="ttwa"; version="0.8.5.1"; sha256="1lhypcwssq0dspizvln3w4dg16ad6mz8cj4w34c5vsrayqid7fyn"; depends=[data_table]; }; - TukeyC = derive { name="TukeyC"; version="1.1-4"; sha256="0p6wiyk6k2jabbf1s8fgzd547f3c0paf8d9hfa9aan5vwfcfyld6"; depends=[]; }; - TunePareto = derive { name="TunePareto"; version="2.4"; sha256="0pljl3q5s9yqc4ph70y66ff9ci9w8gwj8jsy8srxqkgqvahc8arf"; depends=[]; }; - tuneR = derive { name="tuneR"; version="1.2.1"; sha256="1f6mdkfwfy6r62sbwq37sylvcji6f3mj9w13sgicxjn6swbszf57"; depends=[signal]; }; - tuple = derive { name="tuple"; version="0.3-06"; sha256="025fkyiv5gn5gajk0fdknp00vc6z2b9f7j9p025cl8jyxgpyv4xy"; depends=[]; }; - turboEM = derive { name="turboEM"; version="2012.2-1"; sha256="1vv7bjkkqm96qkqqz6gzhz7ii4yzr252r8wf37dgv5qfh1jlbvp2"; depends=[numDeriv quantreg foreach]; }; - turfR = derive { name="turfR"; version="0.8-4"; sha256="0fqzwnrwxlighxbapmnarxzh91s6khjbb26xs8gqzz3f8xwmj9dy"; depends=[dplyr]; }; - turner = derive { name="turner"; version="0.1.7"; sha256="1xckb750hbfmzhvabj0lzrsscib7g187b44ag831z58zvawwh772"; depends=[tester]; }; - TurtleGraphics = derive { name="TurtleGraphics"; version="1.0-4"; sha256="10zdwpfd2a0w995v4w2rvbvcczg53cb2kpm6bcyvrj8j5nqzmgqf"; depends=[]; }; - TUWmodel = derive { name="TUWmodel"; version="0.1-2"; sha256="1k3gdsl8rv10ipa82rgyhjh4pqf4n2d2dj68s9r5pkv362kzk1ra"; depends=[]; }; - tvm = derive { name="tvm"; version="0.2"; sha256="1fwa37xnp3idal8v1xxlc9gr25595f644i7a3h8xpd0k086sp1dg"; depends=[ggplot2 reshape2]; }; - twang = derive { name="twang"; version="1.4-0"; sha256="0r9n0s421dhvsr3ppzhdxsq4viz18mbi9mglhyyl5r6slzyb4m0x"; depends=[gbm survey xtable latticeExtra]; }; - tweedie = derive { name="tweedie"; version="2.2.1"; sha256="1fsi0qf901bvvwa8bb6qvp90fkx1svzswljlvw4zirdavy65w0iq"; depends=[]; }; - twiddler = derive { name="twiddler"; version="0.5-0"; sha256="0r16nfk2afcw7w0j0n3g0sjs07dnafrp88abwcqg3jyvldp3kxnx"; depends=[]; }; - twitteR = derive { name="twitteR"; version="1.1.7"; sha256="0zkz44brvkrsp1g7i90j2lvnj462vav706vqyxv0jfkp52f0s1z4"; depends=[ROAuth RCurl rjson]; }; - TwoCop = derive { name="TwoCop"; version="1.0"; sha256="1ycxq8vbp68z82r2dfg2wkc9zk3bn33d94xay20g2p55lnzl2ifd"; depends=[]; }; - twoStageGwasPower = derive { name="twoStageGwasPower"; version="0.99.0"; sha256="1xvy6v444v47i29aw54y29xiizkmryv8p3mjha93xr3xq9bx2mq7"; depends=[]; }; - twostageTE = derive { name="twostageTE"; version="1.2"; sha256="05k9lvkailv06cah71p71hnx8in045nxz6waplsccznplhgqg5ar"; depends=[isotone]; }; - TwoStepCLogit = derive { name="TwoStepCLogit"; version="1.2.2"; sha256="0z3jg0hl7v2g1bral94gn3b1d11dzrlnzc912yh52vrcawbkmckq"; depends=[survival]; }; - txtplot = derive { name="txtplot"; version="1.0-3"; sha256="1949ab1bzvysdb79g8x1gaknj0ih3d6g63pv9512h5m5l3a6c31h"; depends=[]; }; - UBCRM = derive { name="UBCRM"; version="1.0"; sha256="1lkj0pg3pmj91s8i9xzs3bpizpmvjn85bs89wl54whjjhfnnfynk"; depends=[]; }; - ucbthesis = derive { name="ucbthesis"; version="1.0"; sha256="0l855if3a7862lxlnkbx52qa617mby634sbb2gkprj21rwd7lcbp"; depends=[knitr stringr]; }; - ucminf = derive { name="ucminf"; version="1.1-3"; sha256="19gmbz32rhrdagvhf2s901lvi1r6273wzznry5daryq6w1jx5z3v"; depends=[]; }; - udunits2 = derive { name="udunits2"; version="0.6"; sha256="1dlxcx7yw7yqpimnfikdraqcmjsjz7js0j24li0879dzwrqa27ja"; depends=[]; }; - ump = derive { name="ump"; version="0.5-4"; sha256="05nd9bnysp8gaw916h7hk425banffcm0xfygalbp7brl71q0zby6"; depends=[]; }; - unbalanced = derive { name="unbalanced"; version="1.1"; sha256="0crkykmyxbag4ri2zikz4r22bf92r3v6q1lfdcvwdvv27slhyfn2"; depends=[FNN RANN]; }; - unbalhaar = derive { name="unbalhaar"; version="2.0"; sha256="0v6bkin1cakwl9lmv49s0jnccl9d6vdslbi1a7kfvmr5dgy760hs"; depends=[]; }; - Unicode = derive { name="Unicode"; version="0.1-4"; sha256="0ja0l8b95r2wgybbrpbdbbfjzdq2ns0kcvffv47sq29m516dasyh"; depends=[]; }; - uniCox = derive { name="uniCox"; version="1.0"; sha256="1glgk6k8gwxk3haqaswd2gmr7a2hgwjkwk2i1qc5ya7gg8svyavv"; depends=[survival]; }; - uniReg = derive { name="uniReg"; version="1.0"; sha256="1xl19dqnxxibgiiny9ysll2z8j1i70qrszf4xbacq1a6z31vm840"; depends=[DoseFinding MASS mvtnorm quadprog SEL]; }; - unmarked = derive { name="unmarked"; version="0.10-4"; sha256="1mb9c6h51y476y50q4bh9v6wx6d91b2npf18a66gjs406nra3yck"; depends=[reshape lattice Rcpp plyr]; }; - untb = derive { name="untb"; version="1.7-2"; sha256="1ha0xj94sz1r325qb4sb5hla9hw1gbqr76703vk792x9696skhji"; depends=[Brobdingnag partitions polynom]; }; - upclass = derive { name="upclass"; version="1.0"; sha256="0ga49pcxib4lp0pq1ljj1fjbrg7jz4vpjp5hq0c1v1hw2p7a3giy"; depends=[mclust classifly gclus]; }; - uplift = derive { name="uplift"; version="0.3.5"; sha256="11xikfmg6dg8mhwqq6wq9j9aw4ljh84vywpm9v0fk8r5a1wyy2f6"; depends=[RItools MASS coin tables penalized]; }; - urca = derive { name="urca"; version="1.2-8"; sha256="0gyjb99m6w6h701vmsav16jpfl5276vlyaagizax8k20ns9ddl4b"; depends=[nlme]; }; - UScancer = derive { name="UScancer"; version="0.1-2"; sha256="0p1kxw1phqq598ljk3njznc9kmgscc8gmwdrvx1scba9rr6n61kl"; depends=[rgdal]; }; - UScensus2000blkgrp = derive { name="UScensus2000blkgrp"; version="0.03"; sha256="196hpqrc3rq0m6ra6qinlhz1yknplx08pfp57l6yalni26c8pia0"; depends=[maptools sp foreign]; }; - UScensus2000cdp = derive { name="UScensus2000cdp"; version="0.03"; sha256="143hqnzdla3p31n422ddzaaa34wc6xnnhil4y53m4qydyg407700"; depends=[maptools sp foreign]; }; - UScensus2000tract = derive { name="UScensus2000tract"; version="0.03"; sha256="11ppw75k8zghj7xphx5xyl3azsdsyd142avp0la2g941w6f8l2n1"; depends=[maptools sp foreign]; }; - UScensus2010 = derive { name="UScensus2010"; version="0.11"; sha256="1q06spkh8f4ijvfg557rl3176ki4i8a1y39cyqm3v7mnzwckyj3l"; depends=[maptools sp foreign]; }; - 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]; }; - UsingR = derive { name="UsingR"; version="2.0-1"; sha256="1z6kiprivam0apdw5qfxyixjwcqpjlap6adccn35cwilgz7ab55i"; depends=[MASS HistData Hmisc aplpack quantreg]; }; - usl = derive { name="usl"; version="1.3.1"; sha256="1d5xq0iwjp9zdn7xc6vjh74gb0w7fym50qyfd0fn362q5g3jsyk0"; depends=[nlmrt]; }; - ustyc = derive { name="ustyc"; version="1.0.0"; sha256="1267bng2dz3229cbbq47w22i2yq2ydpw26ngqa1nbi3ma6hwqsv4"; depends=[XML plyr]; }; - utility = derive { name="utility"; version="1.2"; sha256="10dwmf4gcz0jbakwnvgm475sjjilqj1gf3zisil22pk0rcm51kgj"; depends=[]; }; - uuid = derive { name="uuid"; version="0.1-1"; sha256="1b35h2n86233zb6dwkgxxlvnlld8kmv0j6j3m31xjbpmc3ppr7w3"; depends=[]; }; - UWHAM = derive { name="UWHAM"; version="1.0"; sha256="1qaj8anaxqnx4nc6vvzda9hhhzqk9qp8q7bxm26qgia4hgascnrv"; depends=[trust]; }; - vacem = derive { name="vacem"; version="0.1-1"; sha256="0lh32hj4g1hsa45v6pmfyj1hw0klk8gr1k451lvs4hzpkkcwkqbn"; depends=[foreach]; }; - varbvs = derive { name="varbvs"; version="1.0"; sha256="0ywgb6ibijffjjzqqb5lvh1lk5qznwwiq7kbsyzkwcxbp8xkabjw"; depends=[]; }; - varComp = derive { name="varComp"; version="0.1-317"; sha256="16nmhipi0nlh0igc3g9jbv1pqvigmgxy8f395xx6hbzyg87x2ha9"; depends=[quadprog Matrix MASS CompQuadForm RLRsim SPA3G mvtnorm nlme]; }; - varcompci = derive { name="varcompci"; version="1.0.1"; sha256="11fxb63479cha4apakfd1rs89ngrpfhy0h1412wxyn4k8kbibkk4"; depends=[]; }; - vardiag = derive { name="vardiag"; version="0.2-0"; sha256="0avj900zx4nr67dk08n0n6arxx2cb2ymm0kd5xxnzsmyrmwm40mm"; depends=[]; }; - vardpoor = derive { name="vardpoor"; version="0.2.0.9.2"; sha256="0snc0fcmkppca4rcgdyac0mzg235gm7zira5691mnmamrn4f7ikm"; depends=[data_table laeken reshape2 foreach lpSolve plyr gdata]; }; - VarEff = derive { name="VarEff"; version="1.0"; sha256="0zp024z5xl43z2z67fq5ryfiamfvdbbbv1iaaiyw3shjbg2bp8dp"; depends=[mcmc]; }; - VaRES = derive { name="VaRES"; version="1.0"; sha256="0gw05jiqgirhz3c8skbb07y4h44r6vi68gnd5y7ql455v0c2raza"; depends=[]; }; - VAR_etp = derive { name="VAR.etp"; version="0.4"; sha256="0pzxmm41l6sci2jcsnlljymb2vb9b6n9lmj3kjs177cfsd6lp9z1"; depends=[]; }; - VariABEL = derive { name="VariABEL"; version="0.9-2"; sha256="0vlr6zxl75i49p35jxrc5fwfrb55n91hqdan2ikcix3r2k4qs5k0"; depends=[]; }; - VarianceGamma = derive { name="VarianceGamma"; version="0.3-1"; sha256="01jv5qrfw8y8yyd3jy3058bpnfyzz7d0m4rx0iibs79gv2rvq5sn"; depends=[DistributionUtils GeneralizedHyperbolic RUnit]; }; - vars = derive { name="vars"; version="1.5-2"; sha256="1q45z5b07ww4nafrvjl48z0w1zpck3cd8fssgwgh4pw84id3dyjh"; depends=[MASS strucchange urca lmtest sandwich]; }; - varSelectIP = derive { name="varSelectIP"; version="0.2-1"; sha256="180lzsg48hnlcmhpk0a5yzmy2syw8yr7f5npnyspx3897hjag1vp"; depends=[MASS mvtnorm]; }; - varSelRF = derive { name="varSelRF"; version="0.7-3"; sha256="11am1hdcaxh58mqa1v16siip6adg61pjxhdyl8mlgnnmffslnpq9"; depends=[randomForest]; }; - VarSwapPrice = derive { name="VarSwapPrice"; version="1.0"; sha256="12q2wp2cqi9q47mzbb7sc250zkjqkhs9z0h93ik0h63dv339abgj"; depends=[]; }; - vartors = derive { name="vartors"; version="0.2.6"; sha256="04dynqs903clllk9nyynh3dr7msxn5rr5jmw6ql86ppd5w3da0rl"; depends=[]; }; - vbdm = derive { name="vbdm"; version="0.0.4"; sha256="1rbff0whhbfcf6q5wpr3ws1n4n2kcr79yifcni12vxg69a3v6dd3"; depends=[]; }; - 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]; }; - vbsr = derive { name="vbsr"; version="0.0.5"; sha256="1avskbxxyinjjdga4rnghcfvd4sypv4m39ysfaij5avvmi89bx3b"; depends=[]; }; - vcd = derive { name="vcd"; version="1.3-2"; sha256="1ww69sgg178aqcs90mm599nlr6hnxn54d2wzyhddgx1z3qxhzwjd"; depends=[MASS colorspace]; }; - vcdExtra = derive { name="vcdExtra"; version="0.6-1"; sha256="11f7my59v4wkj1hbpx4vg1bim93i3ajix24iic5jsrk0gi0431x4"; depends=[vcd gnm MASS]; }; - vcf2geno = derive { name="vcf2geno"; version="2.3"; sha256="1ib9g3162d4mlwrk77fhzsgkcbrbvygav0ycl8527nxbdiyb77f1"; depends=[]; }; - VDA = derive { name="VDA"; version="1.3"; sha256="063mpwbyykx4f46wzfvrgnlq73ar7i06gxr4mjzbhqcfrsybi72b"; depends=[rgl]; }; - vdg = derive { name="vdg"; version="1.0"; sha256="1agikw9w9rnn3b2q8lp9y3bxjrf8vx24j624wf19bvx5s3ghqc36"; depends=[ggplot2 quantreg proxy]; }; - Vdgraph = derive { name="Vdgraph"; version="2.1-3"; sha256="1vyx6q7h2xj9qipyh7pdnd0mh6cs379irxqaylnn2m9rcrmj191q"; depends=[]; }; - VdgRsm = derive { name="VdgRsm"; version="1.01"; sha256="01hywwjmyvl9ls6gn2vl5z5cv2zlnxl2rfr3k1pachz3gq0yhdc1"; depends=[DoE_wrapper AlgDesign permute]; }; - vec2dtransf = derive { name="vec2dtransf"; version="1.0"; sha256="0hi7x38f3lyxqgwzjz86ld4snva4ci5rinbqhap04d5hcr2sdpzi"; depends=[sp]; }; - vecsets = derive { name="vecsets"; version="1.0"; sha256="0jj02fri400pzdqvydcdm3z70wzcwi9zgh45g3rwz3rh5lg15778"; depends=[]; }; - VecStatGraphs2D = derive { name="VecStatGraphs2D"; version="1.7"; sha256="08f9ixpiq8s5h8h608wrs9l16xk3c1xcrvwgvm5wqm6xfkj9gpfd"; depends=[MASS]; }; - VecStatGraphs3D = derive { name="VecStatGraphs3D"; version="1.5"; sha256="04x2xqnbgkbi626y9ihs3nlxzf84jz44zlapsdlrxqlswiw4n0mw"; depends=[rgl misc3d MASS]; }; - vectoptim = derive { name="vectoptim"; version="0.2"; sha256="1n19sipx5r0qy08jmrbsrf0kgwgl31np88wc1zyc2bkx8h1zkmf2"; depends=[foreach doParallel]; }; - vegan = derive { name="vegan"; version="2.0-10"; sha256="06anm8q82qziqhc3x8cll2xshhjiqkdbwnq1cyn98mshmxlg8i4z"; depends=[permute lattice]; }; - vegclust = derive { name="vegclust"; version="1.6.3"; sha256="0l6j4sgzfqvcypx2dszpnsd1sivk33pixlgf9abqifp45skpkwfg"; depends=[vegan sp]; }; - vegdata = derive { name="vegdata"; version="0.6-6"; sha256="0fwilqdzfhmdp8v0i6swmd6600g7mf5pdmz7r5076k0qzapalb3r"; depends=[foreign XML]; }; - vegetarian = derive { name="vegetarian"; version="1.2"; sha256="15ys1m8p3067dfsjwz6ds837n6rqd19my23yj8vw78xli3qmn445"; depends=[]; }; - VennDiagram = derive { name="VennDiagram"; version="1.6.7"; sha256="0n291hg4qfjx9z5bhna6blzp7zwi6il2s3vg6600nd2rd7nfx98h"; depends=[]; }; - venneuler = derive { name="venneuler"; version="1.1-0"; sha256="10fviqv9vr7zkmqm6iy2l9bjxglf2ljb7sx423vi4s9vffcxjp17"; depends=[rJava]; }; - verification = derive { name="verification"; version="1.40"; sha256="19nhpv41s024cqd3qzx0d2sc9234x73s6k8nfj6wf5jvbc5z0xv4"; depends=[fields boot CircStats MASS dtw]; }; - VGAM = derive { name="VGAM"; version="0.9-4"; sha256="1mpi73vxz6dzmr1g7d1mnybb18zpn7klaqb7x3cq8j2c37b9ywq4"; depends=[]; }; - VGAMdata = derive { name="VGAMdata"; version="0.9-4"; sha256="0swmq2pi987pln24pyxrrqr8smqk2290j06wfj1ldpa5g4yjzqmr"; depends=[]; }; - VHDClassification = derive { name="VHDClassification"; version="0.3"; sha256="1ij4h3gzxb9mm9q743kc3sg2q609mnqz6mhlrbim1wcjji2b7bv4"; depends=[e1071 lattice]; }; - VideoComparison = derive { name="VideoComparison"; version="0.11"; sha256="04jc9br4ddck2sh9bhy02jx34cqxvh904lr46sid6dnmaqfn80l7"; depends=[RJSONIO RCurl zoo pracma Rcpp]; }; - VIF = derive { name="VIF"; version="1.0"; sha256="0yvg6ikrcs7mhg0pavhcywrfysv7ylvnhxpc5sam86dbp69flx9x"; depends=[]; }; - VIM = derive { name="VIM"; version="4.0.0"; sha256="1w62x5vvbpn3h1zwh0jvvy3lpwai1d708jq18zq99bh1qn8n6bfg"; depends=[colorspace car robustbase sp vcd MASS nnet e1071 Rcpp glmnet]; }; - VIMGUI = derive { name="VIMGUI"; version="0.9.0"; sha256="195lakyik597sjkq6c5v3881p35111gzmj2r5f5nr53vi6bn4pzm"; depends=[tkrplot VIM survey gWidgetsRGtk2 foreign RGtk2 Cairo Hmisc]; }; - VineCopula = derive { name="VineCopula"; version="1.3"; sha256="1vxm7bk7p452p4kbm5q3ricxcd4f74zzlibxx13wj0cbza5p49nl"; depends=[MASS mvtnorm igraph copula]; }; - vines = derive { name="vines"; version="1.1.0"; sha256="1cf06i2vci0hwszdlpcig90klxgd7l2k79dln71lc9y0xrzxz9lf"; depends=[copula ADGofTest cubature TSP]; }; - violinmplot = derive { name="violinmplot"; version="0.2.1"; sha256="1j3hb03y988xa704kp25v1z1pmpxw5k1502zfqjaf8cy4lr3kzsc"; depends=[lattice]; }; - vioplot = derive { name="vioplot"; version="0.2"; sha256="16wkb26kv6qr34hv5zgqmgq6zzgysg9i78pvy2c097lr60v087v0"; depends=[sm]; }; - viopoints = derive { name="viopoints"; version="0.2-1"; sha256="0cpbkkzm1rxch8gnvlmmzy8g521f5ang3nhlcnin419gha0w6avf"; depends=[]; }; - visova = derive { name="visova"; version="1.0"; sha256="1w547nbhd69k6y5k0wv51crykwnlzhms2v6xjwp62n8idjlg81ai"; depends=[RJSONIO]; }; - visreg = derive { name="visreg"; version="2.0-5"; sha256="0pnq8irvsmcb0v77s0vhfldv7myg202fm3wdgssnpsihbz747gcc"; depends=[lattice]; }; - visualFields = derive { name="visualFields"; version="0.4"; sha256="07pkaccnk8c9zzizpcdw82vcbqdng2bi9aczpa68i7fz24bvcfan"; depends=[gridBase flip matrixStats Hmisc]; }; - visualizationTools = derive { name="visualizationTools"; version="0.2.05"; sha256="08ry8bz2278ncjx0sdrg19mv448i0n497l5abpv9f8xhsfsqyrpf"; depends=[]; }; - visualize = derive { name="visualize"; version="4.2"; sha256="1jgk7j0f3p72wbqnmplrgpy7hlh7k2cmvx83gr2zfnbhygdi22mk"; depends=[]; }; - VisuClust = derive { name="VisuClust"; version="1.1"; sha256="02jb8kg7bxakcn76zyl68z5ab2c9s2cdz3prrgzh95rf9k893sbc"; depends=[aplpack]; }; - vitality = derive { name="vitality"; version="1.0"; sha256="0di72khz1mwqlirx78a86lwqhjmbbgmxm6vmlwq546dwvs6q071g"; depends=[IMIS]; }; - VizOR = derive { name="VizOR"; version="0.7-9"; sha256="1xw06y86nsrwpri6asrwh8kccjsqzzidgbpld6d6l7vrglp8m6sr"; depends=[lattice rms]; }; - VLF = derive { name="VLF"; version="1.0"; sha256="1il8zhm80mc22zj16dpsy4s6s9arj21l9ik0vccyrpnlr8ws3d3l"; depends=[]; }; - VLMC = derive { name="VLMC"; version="1.3-14"; sha256="073v7wvcfksc224994vp4xswpl5yl37mgrr2gl95566ncbgdm29q"; depends=[MASS]; }; - VNM = derive { name="VNM"; version="1.0"; sha256="0wng71bxgi1z70cjrkn8dixg86bxhvbhimlrnqjxbwds6z3ds4pz"; depends=[]; }; - Voss = derive { name="Voss"; version="0.1-4"; sha256="056izh1j26vqjhjh01fr7nwiz1l6vwr5z4fll87w99nc5wc4a467"; depends=[fields]; }; - vowels = derive { name="vowels"; version="1.2"; sha256="07w2jv5sswwwzrsc9hdnjh5kj5lqqmpmjn5ihrdj0xpmnhcm4vhp"; depends=[]; }; - vows = derive { name="vows"; version="0.2-1"; sha256="0aqk09y45l4p814x83l07smy1m2aypsf0c341j56di5bsc55vl2m"; depends=[fda gamm4 RLRsim Rniftilib rpanel shape stringr tkrplot]; }; - VoxR = derive { name="VoxR"; version="0.5.1"; sha256="07lsp6lrkq0gv55m84dl9w7gz5246d9avypqnkz96n3rbbgd0w5z"; depends=[]; }; - VPdtw = derive { name="VPdtw"; version="2.1-10"; sha256="1sipiqbk766czd1jxam3bc2hfq7wsn72x51j5ssn2s2q0gvpl7m1"; depends=[]; }; - vrmlgen = derive { name="vrmlgen"; version="1.4.9"; sha256="0lifhhf41yml4k83wpkssl14jgn8jaw1lcknwbci1sd8s1c4478l"; depends=[]; }; - vrtest = derive { name="vrtest"; version="0.97"; sha256="00hdgb0r18nwv3qay97b09kqqw9xqsbya06rrjyddqh9r6ggx1y0"; depends=[]; }; - vscc = derive { name="vscc"; version="0.2"; sha256="1p14v8vd8kckd44g4dvzh51gdkd8jvsc4bkd2i4csx8vjiwrni5w"; depends=[teigen mclust]; }; - VSURF = derive { name="VSURF"; version="0.8.2"; sha256="1d9irh8s49i8i9q8psmfl41jnr95wvm3libxin0ir8r297rq82z3"; depends=[randomForest rpart doParallel]; }; - vwr = derive { name="vwr"; version="0.3.0"; sha256="1h790vjcdfngs1siwldvqz8jrxpkajl3266lzadfnmchfan1x7xv"; depends=[stringdist lattice latticeExtra]; }; - W2CWM2C = derive { name="W2CWM2C"; version="1.0"; sha256="14q1y4vpmrx8qz5nav8bbjkxqsqk646zcwr8h7yzi7cfa85b4cxz"; depends=[waveslim wavemulcor]; }; - W3CMarkupValidator = derive { name="W3CMarkupValidator"; version="0.1-0"; sha256="1p2i45clmkygf8yxg3kmb4qbad2dnmbbldcxm8i6hhsc87mfb18g"; depends=[XML RCurl]; }; - waffect = derive { name="waffect"; version="1.2"; sha256="0r5dvm0ggyxyv81hxdr1an658wkqkhqq2xaqzqpnh4sh4wbak35a"; depends=[Rcpp]; }; - waldwolf = derive { name="waldwolf"; version="0.1"; sha256="0gig3dqs8f44kdzr3abmm4wcnby2ifgqs72ck5wvny6gkwyfdvys"; depends=[]; }; - walkscoreAPI = derive { name="walkscoreAPI"; version="1.2"; sha256="1c2gfkl5yl3mkviah8s8zjnqk6lnzma1yilxgfxckdh5wywi39fx"; depends=[]; }; - WARN = derive { name="WARN"; version="1.0"; sha256="14gqcxvfh4z77z4qzk12mg0yhwg8gc06y7cn54az46vh4vmhg32y"; depends=[MASS]; }; - wasim = derive { name="wasim"; version="1.1.2"; sha256="1zydzw7cihhdwv0474fnc4lgaq5fwrv8jinz79vkbidbgcy7i2fd"; depends=[MASS qualV tiger fast]; }; - waterData = derive { name="waterData"; version="1.0.3"; sha256="1vwawyn1hzfd9mknpfnysf2whskyg88hl70sgny0zbd2fy1287q5"; depends=[lattice latticeExtra XML]; }; - waterfall = derive { name="waterfall"; version="0.9.9.20121030"; sha256="140s5639ayd9qgn4i1s1qk541vi34ndzdcqpaps7q53g42n8akfw"; depends=[lattice]; }; - Wats = derive { name="Wats"; version="0.2-16"; sha256="1wbyyllmjsmh8wb8npzizlfn3hsvfpqp9p3b5wx3zpsavqw839wy"; depends=[colorspace ggplot2 lubridate plyr RColorBrewer testit zoo]; }; - waveband = derive { name="waveband"; version="4.6"; sha256="1y2qi2zb8l2ap6f8ihnpq2yavic464bl5mp5yv1dscbk0nmfn966"; depends=[wavethresh]; }; - WaveCD = derive { name="WaveCD"; version="1.0"; sha256="0gracn8lknw96nnir1m8fg5va3f45vvbiy69rxx8vibnfdg1q3l9"; depends=[waveslim lattice]; }; - waved = derive { name="waved"; version="1.1-2"; sha256="17pr9qhz0dbbcr78vwm964d9zd7yrfrqvadr1lwf756bsrscmlg3"; depends=[]; }; - wavelets = derive { name="wavelets"; version="0.3-0"; sha256="141s7z7wxl5plxp7xp7wczswlcvb18a4h3n881l9qc4ny9p7gfpa"; depends=[]; }; - wavemulcor = derive { name="wavemulcor"; version="1.2"; sha256="1039y5rakjkx2mvfmykg2z4jpkpbcj7rclyg7ab19wnxmdm8ls81"; depends=[waveslim]; }; - waveslim = derive { name="waveslim"; version="1.7.3"; sha256="0lkq8lcg8cd4iw95jb0r5iwl2habngzzzwcxfic05gbpj5gfmapk"; depends=[]; }; - wavethresh = derive { name="wavethresh"; version="4.6.6"; sha256="1ykhfw1bdibvq2b3rrgqszvwqmzkd3fgxqg7p36ms1cxph68g2r9"; depends=[MASS]; }; - wbs = derive { name="wbs"; version="1.2"; sha256="1mnbx0ik4bakf818nbpgi4zgb8y4ljvz5yq602h3crsc4b32kq1k"; depends=[]; }; - wccsom = derive { name="wccsom"; version="1.2.8"; sha256="0dnqcmrrnzqys4mr1md7f0k0h434x25mdc576j00s3pmjjjh873a"; depends=[class MASS]; }; - WCQ = derive { name="WCQ"; version="0.2"; sha256="1yhkr2iazd7lh9r68xz1lh32z6r1sdnmqrjshcrm4rbwai0j3lkr"; depends=[]; }; - WDI = derive { name="WDI"; version="2.4"; sha256="0ih6d9znq6b2prb4nvq5ypyjv1kpi1vylm3zvmkdjvx95z1qsinf"; depends=[RJSONIO]; }; - weatherData = derive { name="weatherData"; version="0.4.1"; sha256="19ynb9w52ay15awaf4bqm9lj2w6pk70lyaipn46jrspwxqsvfhlc"; depends=[plyr]; }; - weathermetrics = derive { name="weathermetrics"; version="1.0"; sha256="1ay4gcxpblqnn6zqkdnr0mgnm9r42wlmpb6k3smhbz4zca4kjfzy"; depends=[]; }; - WebDevelopR = derive { name="WebDevelopR"; version="1.0"; sha256="0q4plv5nh6xp35j53xl207d7x0l8041ipi7k7rjrspv9vx7ncgvl"; depends=[]; }; - webvis = derive { name="webvis"; version="0.0.2"; sha256="1cdn9jrpg2sbx4dsj0xf7m0daqr7fqiw3xy1lg0i0qn9cpvi348f"; depends=[]; }; - WeightedCluster = derive { name="WeightedCluster"; version="1.2"; sha256="1d0df284fzfa34fi7b3d7f4zzm9ppyah46rj865446l5pjvl9np3"; depends=[TraMineR cluster RColorBrewer]; }; - weightedKmeans = derive { name="weightedKmeans"; version="1.2.0"; sha256="140cvl1jwwqyvcsf7pbsxh9k4bynd7c1q159pp7ia1f1sgimxafb"; depends=[lattice latticeExtra clv]; }; - WeightedPortTest = derive { name="WeightedPortTest"; version="1.0"; sha256="007v3w9ssiv2sds7sikpal27g6pxwxhs7bvcyw6kr0vg8gvlbi8h"; depends=[]; }; - weightedScores = derive { name="weightedScores"; version="0.9"; sha256="0rmfikdpc0m1rsflq2cdhl3bwk8w1wmwyhwc7di8dqf5vlqyh6ws"; depends=[mvtnorm rootSolve]; }; - weights = derive { name="weights"; version="0.80"; sha256="147fgs99sg1agq081ikj2fhb4b2vzsppdg1h1w036bb92vsjb0g5"; depends=[Hmisc gdata]; }; - weirs = derive { name="weirs"; version="0.23"; sha256="1kp49r5ba7ii1mr1nszbssx3fn0c2hcfpawm3a1kbh4rmhvy3frs"; depends=[]; }; - wesanderson = derive { name="wesanderson"; version="0.3"; sha256="169phanzwz3mgzqncwxc5kdshhmj922nzlbq8gz6grvh51bc7aaa"; depends=[]; }; - wfe = derive { name="wfe"; version="1.3"; sha256="16b39i60x10kw6yz44ff19h638s9lsgnz8azc76zl9b8s64jliya"; depends=[arm Matrix MASS]; }; - wgaim = derive { name="wgaim"; version="1.4-0"; sha256="0rm9p7c7kxzzpakcm6wc7viisn2y6rwayc0r0hgpiv8fkv3n1sai"; depends=[qtl lattice]; }; - WGCNA = derive { name="WGCNA"; version="1.41-1"; sha256="0ljqlxrkfxqb7fjdapfx9wrr7115z9rh7lms07vc94z3k1y2qdlw"; depends=[dynamicTreeCut flashClust matrixStats Hmisc foreach doParallel reshape]; }; - wgsea = derive { name="wgsea"; version="1.8"; sha256="1114wik011sm2n12bwm2bhqvdxagbhbscif45k4pgxdkahy2abpi"; depends=[]; }; - WhatIf = derive { name="WhatIf"; version="1.5-6"; sha256="02lqvirnf24jn8b2s08z5fjmpilp2z08lww1s793n3pn783adbky"; depends=[lpSolve]; }; - whisker = derive { name="whisker"; version="0.3-2"; sha256="0z4cn115gxcl086d6bnqr8afi67b6a7xqg6ivmk3l4ng1x8kcj28"; depends=[]; }; - WhopGenome = derive { name="WhopGenome"; version="0.8.2"; sha256="145sn2ikjv1xykx5xv0djj4vainqj0v9c3lqnd1r7bygjl4n4v7c"; depends=[]; }; - widals = derive { name="widals"; version="0.5.4"; sha256="1bl59s1r4gkvq4nkf94fk7m0zvhbrszkgmig66lfxhyvk9r84fvb"; depends=[snowfall]; }; - WideLM = derive { name="WideLM"; version="0.1-1"; sha256="0spxl960pgzh0cn1gkw2ayixpi982rr85qajcdqahmn9msk877h8"; depends=[Rcpp]; }; - widenet = derive { name="widenet"; version="0.1-2"; sha256="1nimm8szbg82vg00f5c7b3f3sk0gplssbl4ggasjnh7dl621vfny"; depends=[glmnet relaxnet]; }; - wikibooks = derive { name="wikibooks"; version="0.2"; sha256="178lhri1b8if2j7y7l9kqgyvmkn4z0bxp5l4dmm97x3pav98c7ks"; depends=[]; }; - WikipediR = derive { name="WikipediR"; version="1.0.0"; sha256="01w9km1g0cynsgsq3bv6d8ggizym211c1ksyz7w3nkq25288fcds"; depends=[httr jsonlite]; }; - WilcoxCV = derive { name="WilcoxCV"; version="1.0-2"; sha256="1kbb7ikgnlxybmvqrbn4cd8xnqrkwipk4xd6yja1xsi39a109xzl"; depends=[]; }; - wild1 = derive { name="wild1"; version="1.09"; sha256="1ydjz3f4z6fdw4wynyd64bwwm68vh0xqxvg6zw8z7pdg8y2h89zl"; depends=[chron survival sp maptools spatstat ICSNP ks]; }; - witness = derive { name="witness"; version="1.2"; sha256="1pccn7czm1q0w31zpmky5arkcbnfl94gh1nnkf8kmcccdrr3lxph"; depends=[]; }; - wle = derive { name="wle"; version="0.9-9"; sha256="032zqfqg6ghg56zgr005g8q94zskmbzv1p08lxv227ikkbmnwn53"; depends=[circular]; }; - WMCapacity = derive { name="WMCapacity"; version="0.9.6.6"; sha256="19x6l06srh59q1cnixisa5fgm5hkpq35h9zfmdnfaj3xl8pxhzyn"; depends=[gtools gWidgets gWidgetsRGtk2 coda cairoDevice RGtk2 XML]; }; - WMDB = derive { name="WMDB"; version="1.0"; sha256="10wdjy3g2qg975yf1dhy09w9b8rs3w6iszhbzqx9igfqvi8isrr1"; depends=[]; }; - wmtsa = derive { name="wmtsa"; version="2.0-0"; sha256="0y2bv166xwwpb1wf6897qybyf84f34qjsmygdbv90r637c050yk5"; depends=[splus2R ifultools MASS]; }; - wnominate = derive { name="wnominate"; version="0.98"; sha256="1c3g89f7xl781m8lqy730vlb6p5dxq16vgll80jmsx8p7fsy6pb4"; depends=[pscl]; }; - wombsoft = derive { name="wombsoft"; version="2.0"; sha256="11ri29vj1yg2lpr6vf1i45w20hqh8dswj04ylbq0vy27cwmxqljd"; depends=[]; }; - wordcloud = derive { name="wordcloud"; version="2.5"; sha256="1ajqdkm8h1wid3d41zd8v7xzf2swid998w31zrghd45a5lcp7qcm"; depends=[RColorBrewer slam Rcpp]; }; - wordmatch = derive { name="wordmatch"; version="1.0"; sha256="0zscp361qf79y1zsliga18hc7wj36cnydshrqb9pv67b65njrznz"; depends=[plyr reshape2]; }; - wordnet = derive { name="wordnet"; version="0.1-9"; sha256="1cwrdfdv1ma429na9y2yci9vrms8vfqqwj9qkcq8hzkm02yzkdsf"; depends=[rJava]; }; - WordPools = derive { name="WordPools"; version="1.0-2"; sha256="1izs4cymf2xy1lax85rvsgsgi05ygf0ibi9gzxc96sbgvy4m78kf"; depends=[]; }; - wpp2008 = derive { name="wpp2008"; version="1.0-1"; sha256="0gd3vjw1fpzhp3qlf1jpc24f76i0pxsjs5pb1v3k2si6df7q4msd"; depends=[]; }; - wpp2010 = derive { name="wpp2010"; version="1.2-0"; sha256="1h87r1cn4lnx80dprvawsyzfkriscqjgr27gvv7n19wvsx8qd57k"; depends=[]; }; - wpp2012 = derive { name="wpp2012"; version="2.2-0"; sha256="1wsdx1vywydbwd53fai4sapisln10qxi6jj9yvyy92gg14hcx3ff"; depends=[]; }; - wppExplorer = derive { name="wppExplorer"; version="1.3-0"; sha256="0bki4s6ihl752d7y4ckvb056jlvcpqmp8fc7a7rvdbxw0d66sfh4"; depends=[shiny plyr reshape2 googleVis wpp2012 Hmisc ggplot2]; }; - wq = derive { name="wq"; version="0.4-1"; sha256="0a46islpzpbkx6c7mbn6q787mh9mb6sy4k46lz8s63fh2h7p0szk"; depends=[zoo]; }; - WrightMap = derive { name="WrightMap"; version="1.1"; sha256="0dmximp549gr37ps56vz8mnlii7753dc5v0wl3s78cymjmnmyr0z"; depends=[]; }; - write_snns = derive { name="write.snns"; version="0.0-4.2"; sha256="0sxg7z8rnh4lssbivkrfxldv4ivy37wkndzzndpbvq2gbvbjnp4l"; depends=[]; }; - WriteXLS = derive { name="WriteXLS"; version="3.5.0"; sha256="0b5md3jy18wrigadqjzfnrpvm35nn0aa62zsq5d72k5fr7lbh3gr"; depends=[]; }; - wrspathrow = derive { name="wrspathrow"; version="0.1"; sha256="1xkh12aal85qhk8d0pdj2qbi6pp4jnr6zbxkhdw2zwav57ly3f4i"; depends=[wrspathrowData sp raster rgeos rgdal]; }; - wrspathrowData = derive { name="wrspathrowData"; version="1.0"; sha256="0a1aggcll0fmkwfg4h7rs4j5h3v1bh95dkbriwrb0bx0cikg63x3"; depends=[]; }; - wskm = derive { name="wskm"; version="1.4.11"; sha256="1pmsir4msy95x080k463f34ms4vm8nayr21g2cd50mmzffbm5mwl"; depends=[lattice latticeExtra clv]; }; - wsrf = derive { name="wsrf"; version="1.4.0"; sha256="1b9ifswv0civaavmpzi2r3fdbccxg4akzvklqri0hj49kr4cw5pa"; depends=[Rcpp]; }; - wSVM = derive { name="wSVM"; version="0.1-7"; sha256="0c7rblzgagwfb8mmddkc0nd0f9rv6kapw8znpwapv3fv0j2qzq7h"; depends=[MASS quadprog]; }; - wtcrsk = derive { name="wtcrsk"; version="1.3"; sha256="1viddyms2d9q2hb9z788fcs8vp7gp6vzlsszcnyxgganfjsd85zy"; depends=[]; }; - WWGbook = derive { name="WWGbook"; version="1.0.1"; sha256="0q8lnd1fp4rmz715x0lf61py3xw8wg55yq3gvswaqwy68dlqrzjc"; depends=[]; }; - x12 = derive { name="x12"; version="1.5.0"; sha256="0z5hsq0rv71jl9102fqci2wyklmqxly0nc4h7ky845dpvqfrg9yv"; depends=[stringr]; }; - x12GUI = derive { name="x12GUI"; version="0.12.0"; sha256="0vks6m0jck6sl17z9qcw1p1wv5iqdblnmssmfrfjqv626sb9jsn6"; depends=[x12 Hmisc RGtk2 cairoDevice lattice stringr]; }; - XBRL = derive { name="XBRL"; version="0.99.12"; sha256="0n51hmhzgx2j1xff5v57p3n30sab580hwdjsqr0vaghqaa6xwpwg"; depends=[Rcpp]; }; - xergm = derive { name="xergm"; version="1.1"; sha256="132g3gyzfasiv58dxni893ikj5dy1pzbff2rnjyqijd10zngw9rg"; depends=[ergm statnet statnet_common network sna texreg Matrix boot coda ROCR igraph vegan lme4]; }; - xgobi = derive { name="xgobi"; version="1.2-15"; sha256="03ym5mm16rb1bdwrymr393r3xgprp0ign45ryym3g0x2zi8dy557"; depends=[]; }; - xgrid = derive { name="xgrid"; version="1.0-1"; sha256="1xg3frzybck2lmqsxnw448rw4si55k3ygwdkn88d1zfc6llswz9p"; depends=[]; }; - xhmmScripts = derive { name="xhmmScripts"; version="1.1"; sha256="1qryyb34jx9c64l8bnwp40b08y81agdj5w0icj8dk052x50ip1hl"; depends=[gplots plotrix]; }; - XiMpLe = derive { name="XiMpLe"; version="0.03-21"; sha256="1j387jzxh0z9dmhvc0kpjjjzf781sgrw57nwzdqwx6bn09bw509d"; depends=[]; }; - xkcd = derive { name="xkcd"; version="0.0.3"; sha256="086kdy4dp7312pxv7zpx3qf8rk91lv0snrhipzcmcn1m4q77q9z2"; depends=[Hmisc ggplot2]; }; - XLConnect = derive { name="XLConnect"; version="0.2-8"; sha256="026ilqji5kck0azxi9zxry5032kakinjgqsmzxd8z0cwhgmfgq1k"; depends=[XLConnectJars rJava]; }; - XLConnectJars = derive { name="XLConnectJars"; version="0.2-8"; sha256="1ak0wi07hk8bwi418jy43x5pq57a709xqg6njkc4f394jf8rr60s"; depends=[rJava]; }; - xlsx = derive { name="xlsx"; version="0.5.7"; sha256="0qxkdpf1dvi0x7fy65abjx2j60rdx7fv5yi8l2wdm0f2631pnwin"; depends=[rJava xlsxjars]; }; - xlsxjars = derive { name="xlsxjars"; version="0.6.0"; sha256="0mjfvd433iz742gn3avaq48172yi5hhd0ajc3v22y1j4k9w82pr7"; depends=[rJava]; }; - Xmisc = derive { name="Xmisc"; version="0.1.0"; sha256="1iyv9gp7fw3r7s3v9srd799nhwgpn5851v3n2xfwpcvj9kczrd5r"; depends=[]; }; - XML = derive { name="XML"; version="3.98-1.1"; sha256="0n9i6746211wihglbpsgalj2cyvggn4rv6a4fbavqwnjw3h1hwwl"; depends=[pkgs.libxml2]; }; - XML2R = derive { name="XML2R"; version="0.0.6"; sha256="0azfh950r2b7ck3n1vzk3mdll7zy844nx3mbk676jxnj8gg7nxk5"; depends=[XML RCurl plyr]; }; - XNomial = derive { name="XNomial"; version="1.0.1"; sha256="134bwglqhgah7v3w6ir65dch2dwp5h4vldw521ba74l5v9b2j2h4"; depends=[]; }; - xoi = derive { name="xoi"; version="0.61-1"; sha256="0ypy0rb0f0bns41vjzyln04k3hypgr3wysqbdi0b0r14ip5rb47k"; depends=[qtl]; }; - xpose4 = derive { name="xpose4"; version="4.5.0"; sha256="136a1lq9raba731rxy55dy9mw8rs1rha0940b85ljr70mvpmzmqd"; depends=[lattice gam Hmisc survival]; }; - xtable = derive { name="xtable"; version="1.7-3"; sha256="1rsfq0acf1pvpci3jq9fbhsv6ws4d46yap8m2xjk1cr463m9gdcc"; depends=[]; }; - xtermStyle = derive { name="xtermStyle"; version="2.2-4"; sha256="0m1lwr7smym7aczcqqgqj5bx46j38ymmljilxl54bby188qhfcyz"; depends=[]; }; - xts = derive { name="xts"; version="0.9-7"; sha256="163hzcnxrdb4lbsnwwv7qa00h4qlg4jm289acgvbg4jbiywpq7zi"; depends=[zoo]; }; - yacca = derive { name="yacca"; version="1.1"; sha256="0wg2wgvh1najmccmgzyigj11mshrdb8w4r2pqq360dracpn0ak6x"; depends=[]; }; - yaImpute = derive { name="yaImpute"; version="1.0-22"; sha256="1yg26f1q1i6vl1jvdff126025rimkvpj8dhr12d8ld8ryl1qghr3"; depends=[]; }; - YaleToolkit = derive { name="YaleToolkit"; version="4.1"; sha256="1r1vf0gldvcfqa7ln87q5d4sc75d8b99v6zaynvbq02rggzzynmy"; depends=[lattice vcd MASS colorspace barcode gpairs]; }; - 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.12.1"; sha256="1rps8y7i5fg0xrkjigjx0xa5cwj5b4xf9186dv8valzhbqkvvba1"; depends=[httr RCurl rjson plyr jsonlite stringr]; }; - YieldCurve = derive { name="YieldCurve"; version="4.1"; sha256="0w47j8v2lvarrclnixwzaq98nv1xh2m48q5xvnmk7j9nsv2l3p68"; depends=[xts]; }; - ykmeans = derive { name="ykmeans"; version="1.0"; sha256="0xfji2fmslvc059kk3rwkv575ffzl787sa9d4vw5hxnsmkn8lq50"; depends=[plyr foreach]; }; - YourCast = derive { name="YourCast"; version="1.6.1"; sha256="03aq01amg4cxnxcxnsd1hxkx63w323f8ldkibl1f826gd7lbcqf1"; depends=[ggplot2 gridExtra lattice foreign reshape2]; }; - YplantQMC = derive { name="YplantQMC"; version="0.5"; sha256="0x3ndpamj1ayy1svh9q8pwmfnar9zyw5i6h1k1hqwc92h0k6jsmz"; depends=[rgl geometry LeafAngle devtools]; }; - YPmodel = derive { name="YPmodel"; version="1.1"; sha256="036f5y8qrcxglblgnaa15xzlz9pxbhbysrbr2gl66h9dvcd6kavr"; depends=[]; }; - YuGene = derive { name="YuGene"; version="1.1.2"; sha256="0sy0bh49l0fajh1z88mpb4f0k3hsf3kd1vxv731qhpxcrc3pz09b"; depends=[mixOmics]; }; - yuima = derive { name="yuima"; version="1.0.24"; sha256="1lr43man9cv8xknwbmaqkz54p3g5znwqyvxjwd75hyj82fa63j60"; depends=[zoo expm]; }; - zCompositions = derive { name="zCompositions"; version="1.0.1"; sha256="1kjg03cgpi6xjqg0hnjqragyn7yy56pzf2wfwpkrxb5vy92kyjpq"; depends=[MASS NADA truncnorm]; }; - ZeBook = derive { name="ZeBook"; version="0.5"; sha256="1djwda6hzx6kpf4dbmw0fkfq39fqh80aa3q9c6p41qxzcpim27dw"; depends=[triangle deSolve]; }; - Zelig = derive { name="Zelig"; version="4.2-1"; sha256="1hhr9jx25fdnkqwyj2bkgrvqlah4z2drphmb5mdn1an2p2g23v9z"; depends=[boot MASS sandwich]; }; - ZeligChoice = derive { name="ZeligChoice"; version="0.8-1"; sha256="1ql9yq83ipf0vpv63fpckylwq4jrcbfjgjm77f5ndkd83gqjzrmg"; depends=[Zelig VGAM]; }; - ZeligGAM = derive { name="ZeligGAM"; version="0.7-1"; sha256="1643ycx51mnlxwiarfkrwm8gr8clx00xi2llcaqsd3wsrr4z5j97"; depends=[Zelig mgcv]; }; - ZeligMultilevel = derive { name="ZeligMultilevel"; version="0.7-1"; sha256="00zlambykds4z1c5kx3rpla1kllyp96cxwvbc5lalwdb9i48pp3s"; depends=[Zelig lme4]; }; - zendeskR = derive { name="zendeskR"; version="0.4"; sha256="06cjwk08w3x6dx717123psinid5bx6c563jnfn890373jw6xnfrk"; depends=[RCurl rjson]; }; - zic = derive { name="zic"; version="0.8.1"; sha256="05mn894qdx6k7158dbsjy2b49n0gz5xnmlixr2dhkxc12ydj6zs5"; depends=[Rcpp RcppArmadillo coda]; }; - ZIM = derive { name="ZIM"; version="1.0.1"; sha256="1y3vlxw4ybl2s269r3sbi156y4ffg83kfs152fsxc8q4caygc379"; depends=[MASS]; }; - zipcode = derive { name="zipcode"; version="1.0"; sha256="1lvlf1h5fv412idpdssjfh4fki933dm5nhr41ppl1mf45b9j7azn"; depends=[]; }; - zipfR = derive { name="zipfR"; version="0.6-6"; sha256="1y3nqfjg5m89mdvcmqwjmwlc8p3hpcqnwv4ji1a7ggg4n63lwl3j"; depends=[]; }; - zoeppritz = derive { name="zoeppritz"; version="1.0-4"; sha256="0mjg55jc5b8h2jj6cy8b34a4q7jhhx73xns0v2dpfkq4kmilsv5p"; depends=[]; }; - zoib = derive { name="zoib"; version="1.0"; sha256="0mxd9j5sbwyv3bhhrly2ikbfqgk3cgkl6jzai9q6lq3lbg55mh9a"; depends=[rjags coda matrixcalc Formula]; }; - zoo = derive { name="zoo"; version="1.7-11"; sha256="0fp726rp9mqsfmm391bmckk76lqsvzwd39ffvb355wf2spl8nzvf"; depends=[lattice]; }; - 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=[]; }; - zyp = derive { name="zyp"; version="0.10-1"; sha256="0f1fqqxysf3psnvn08s5qly2c958h1hhznjjj8mvpjr5g6hqlr1k"; depends=[Kendall]; }; - -}; in self +{ self, derive }: with self; { +A3 = derive { name="A3"; version="0.9.2"; sha256="01s7znhph2mr3snpscci3y7nbcisa6kg6hy7im3742r6ah0z3jv7"; depends=[xtable pbapply]; }; +ABCExtremes = derive { name="ABCExtremes"; version="1.0"; sha256="032bc9a6cxy4war95n8v4vaax3q96k2wryjbcipi3z55b2l8hdny"; depends=[SpatialExtremes combinat]; }; +ABCoptim = derive { name="ABCoptim"; version="0.13.11"; sha256="1j2pbfl5g9x71gq9f7vg6wznsds8sn8dj3q2h5fhjcv58di3gjhl"; depends=[]; }; +ABCp2 = derive { name="ABCp2"; version="1.1"; sha256="0s0lbwlc8nycm7b8vx0v01f8dmy91r1zqcj9zgrlj7dnpg4cpkml"; depends=[MASS]; }; +ACCLMA = derive { name="ACCLMA"; version="1.0"; sha256="1na27sp18fq12gp6vxgqw1ffsz2yi1d8xvrxbrzx5g1kqxrayy0v"; depends=[]; }; +ACD = derive { name="ACD"; version="1.5.3"; sha256="1a67bi3hklq8nlc50r0qnyr4k7m9kpvijy8sqqpm54by5hsysfd6"; depends=[]; }; +ACNE = derive { name="ACNE"; version="0.7.0"; sha256="137xp69adhggz1wxzm5r95vcphrlrqpxsrz0gny59isx4xr28aal"; depends=[aroma_affymetrix MASS R_methodsS3 R_oo R_utils matrixStats R_filesets]; }; +ACTCD = derive { name="ACTCD"; version="1.0-0"; sha256="0zn8f6l5vmn4w1lqjnpcxvfbr2fhwbhdjx4144h3bk71bk9raavl"; depends=[R_methodsS3]; }; +ADDT = derive { name="ADDT"; version="1.0"; sha256="1jx7rxi0yfn34pf3cf9zpf434rapgn5qn2mn5rkq5lysr3kwdw91"; depends=[]; }; +ADGofTest = derive { name="ADGofTest"; version="0.3"; sha256="0ik817qzqp6kfbckjp1z7srlma0w6z2zcwykh0jdiv7nahwk3ncw"; depends=[]; }; +ADM3 = derive { name="ADM3"; version="1.3"; sha256="1hg9wjdhckilqd13dr4cim4j6jsh2sdwm18i3pfmfdj8cyswm3h0"; depends=[]; }; +AER = derive { name="AER"; version="1.2-2"; sha256="0ny9khzqxzx4npaqmknhpi3aldz11ipg71zw4skxphclamlsgp86"; depends=[car lmtest sandwich survival zoo Formula]; }; +AFLPsim = derive { name="AFLPsim"; version="0.3-3"; sha256="1vknmd98v65118c093gqpfckcggnk4c8rn6bblsaclwmx0jdi78s"; depends=[adegenet introgress]; }; +AGD = derive { name="AGD"; version="0.30"; sha256="175hsii3g8vx5ms552wnh1hcn3p6hgfggv1zi5gpwlsc0i875iag"; depends=[gamlss]; }; +AGSDest = derive { name="AGSDest"; version="2.1"; sha256="1l36x3sjb0732aic2y4yrvx64phii1xjfzr4nc3x9b2crr988n0g"; depends=[ldbounds]; }; +AICcmodavg = derive { name="AICcmodavg"; version="2.0-1"; sha256="1rraxdmzhjwfi4sdcagksrbprszdbxswczb0s5glgmbh2kfd3654"; depends=[lattice MASS Matrix nlme unmarked VGAM]; }; +AID = derive { name="AID"; version="1.4"; sha256="1wj2jmqla0b2y9hrvl5i69bncdx1xjdd7if69j6dy1dnxv6clx1z"; depends=[MASS tseries nortest]; }; +AIM = derive { name="AIM"; version="1.01"; sha256="11lkfilxk265a7jkc1wq5xlgxa56xhg302f1q9xb7gmjnzdigb21"; depends=[survival survival]; }; +ALDqr = derive { name="ALDqr"; version="0.5"; sha256="0294d6cjfl5m63jhrv4rbh7npwrbmmw5101jz5bbwihhj94qcxp9"; depends=[HyperbolicDist]; }; +ALKr = derive { name="ALKr"; version="0.5.3.1"; sha256="09df3vx2q0sn8fwz2cc9lckzwrf2hgbglzyn376d6nkrm6gq792a"; depends=[MASS Rcpp Rcpp]; }; +ALS = derive { name="ALS"; version="0.0.5"; sha256="1ryviknpf7c0v20bmc40khhmx51b83hbh9q9iwz9d694by51xryc"; depends=[nnls Iso]; }; +ALSCPC = derive { name="ALSCPC"; version="1.0"; sha256="0ippxzq5qwb9dnpvm1kxhc0fxh83rs9ny5rcvd30w2bp632q9qdx"; depends=[]; }; +AMAP_Seq = derive { name="AMAP.Seq"; version="1.0"; sha256="0z0rrzps6rm58k4m1ybg77s3w05m5zfya4x8ril78ksxsjwi3636"; depends=[]; }; +AMGET = derive { name="AMGET"; version="1.0"; sha256="18wdzzg5wr7akbd1iasa4mvmy44fb2n5gpghwcrx80knnicy3dxq"; depends=[]; }; +AMOEBA = derive { name="AMOEBA"; version="1.1"; sha256="1npzh3rpfnxd4r1pj1hm214sfgbw4wmq4ws093lnl7pvsl0q37xn"; depends=[snowfall rlecuyer spdep]; }; +AMORE = derive { name="AMORE"; version="0.2-15"; sha256="00zfqcsah2353mrhqkv8bbh24l8gaxk4y78icr9kxy4pqb2988yz"; depends=[]; }; +AOfamilies = derive { name="AOfamilies"; version="1.01"; sha256="0v3b83k12lsrdcrkjl2ff38d0g8sbrnm5pmm9xphyrk3lfgap76k"; depends=[lqmm quantreg]; }; +APSIMBatch = derive { name="APSIMBatch"; version="0.1.0.2374"; sha256="0j44ijq1v1k60lka9nmw8m1jfjw7pidny9bvswqy5v82gzmwl29d"; depends=[]; }; +AR1seg = derive { name="AR1seg"; version="1.0"; sha256="0v9adx5wj9r4jwl3bqqmj0byiqfp585jz013qfqrq601wj8v4zi3"; depends=[Segmentor3IsBack]; }; +ARPobservation = derive { name="ARPobservation"; version="1.0"; sha256="0m9sr0pgwzndia2286fmhlw7xsyn3pvy0044xlp5sw3i3gqhv39f"; depends=[]; }; +ARTP = derive { name="ARTP"; version="2.0.4"; sha256="1f6ay9lyaqsc33b0larb8v6imp5adaycya84wif2sg32rv4gx3yl"; depends=[]; }; +ASMap = derive { name="ASMap"; version="0.3-2"; sha256="0rmf12lhzgi301mnf7iy98zq6ggdalwr45lgrw09n9qzb3jf4dp5"; depends=[qtl gtools fields lattice]; }; +ATmet = derive { name="ATmet"; version="1.2"; sha256="047ibxxf5si45zw22zy8a1kpj36q0pd3bsmxwvn0dhf4h65ah0zz"; depends=[DiceDesign lhs metRology msm sensitivity]; }; +AUC = derive { name="AUC"; version="0.3.0"; sha256="0ripcib2qz0m7rgr1kiz68nx8f6p408l1ww7j78ljqik7p3g41g7"; depends=[]; }; +AUCRF = derive { name="AUCRF"; version="1.1"; sha256="00d7jcg2dyvf7sc9w7vxxd85m7nsbcmfqsavrv236vxfpfc9yn7i"; depends=[randomForest]; }; +AWS_tools = derive { name="AWS.tools"; version="0.0.5"; sha256="0z0mh8pdrqvsg49dbhds8aj0lmxmvhfi05im0gg01vdidxpmabyn"; depends=[XML]; }; +AcceptanceSampling = derive { name="AcceptanceSampling"; version="1.0-3"; sha256="1camxmvz8prkvpf3d3rc07bnfphakwdlickqlr4sgzrs4k27rr4f"; depends=[]; }; +Actigraphy = derive { name="Actigraphy"; version="1.2"; sha256="02xxmzjqym46q0fzddmy29i8la9knrna3b46y8849nmbpqvmp3qn"; depends=[fda lattice SDMTools]; }; +ActuDistns = derive { name="ActuDistns"; version="3.0"; sha256="04rff9czcgac80clpv32a1dl0jbyvfsa7wqxyywgk99w672x50i2"; depends=[reliaR actuar hypergeo]; }; +AdMit = derive { name="AdMit"; version="2.0.1"; sha256="0bqzq2pf5449qyr8ff5d3sq0lbsph29ppv6zzf1rbjz06sc5d6ff"; depends=[mvtnorm]; }; +AdapEnetClass = derive { name="AdapEnetClass"; version="1.1"; sha256="0xx1528s1kl20ka8asjm91sawfnj0z2sw8gw9z7grc94ssfd80zc"; depends=[imputeYn glmnet lars quadprog]; }; +AdaptFit = derive { name="AdaptFit"; version="0.2-2"; sha256="124lj1sq5cbp35z4ybkc7ci3fi6pgf8pc5k9mpqmyb6dj870q836"; depends=[SemiPar MASS nlme cluster]; }; +AdaptFitOS = derive { name="AdaptFitOS"; version="0.54"; sha256="0h9jfq9mk5wd6v6an40l3sk2adn6fcaks22bi8d9s7zr2ldpzrjq"; depends=[SemiPar nlme MASS mgcv]; }; +AdaptiveSparsity = derive { name="AdaptiveSparsity"; version="1.4"; sha256="1az7isvalf3kmdiycrfl6s9k9xqk22k1mc6rh8v0jmcz402qyq8z"; depends=[Rcpp Rcpp RcppArmadillo]; }; +AdequacyModel = derive { name="AdequacyModel"; version="1.0.8"; sha256="1bpb6lwgkh5g82h4yaf5dh2jbl6f0vz36k22538rhb3kdld6w0i3"; depends=[]; }; +Agreement = derive { name="Agreement"; version="0.8-1"; sha256="1g29rxr8xsr0dh2r6c6j2bqs0q6snz9wz0hrnb92cxj27ili55yq"; depends=[R2HTML]; }; +AlgDesign = derive { name="AlgDesign"; version="1.1-7.3"; sha256="0bl7mx4dnmkgs2x1fj7cqnrp7jx18mqwxyga0rzlniq12h8mc3fz"; depends=[]; }; +AllPossibleSpellings = derive { name="AllPossibleSpellings"; version="1.1"; sha256="0ksfm2pfjka3yjgcd257v7sns1niaylsfxvhhh2jwdi016cpdw10"; depends=[]; }; +AlleleRetain = derive { name="AlleleRetain"; version="1.3.1"; sha256="1k2iwns1wk5n02cii6p9prgdb6asys3vwiq5dq2i26fk2xr6j4gq"; depends=[]; }; +Amelia = derive { name="Amelia"; version="1.7.3"; sha256="07agkgg4jdjk4kxf87nck7dyihpf2l4pmpf20a7ld9c83is14ib1"; depends=[Rcpp foreign Rcpp RcppArmadillo]; }; +AmericanCallOpt = derive { name="AmericanCallOpt"; version="0.95"; sha256="1nhy44j5bmmjsp6g79nrn741rzzxikhdnxk4wwbdj9igcc1bs573"; depends=[]; }; +AmpliconDuo = derive { name="AmpliconDuo"; version="1.0"; sha256="0l6p5c2802a1f3b77cdrrk3wdf41926mh34630p462fb3wqipps0"; depends=[ggplot2 xtable]; }; +AnDE = derive { name="AnDE"; version="1.0"; sha256="1yil8ab50wvlqmdla9kmfba8vfgy5r694r6igb58s6vnmld78yf2"; depends=[discretization functional foreign stringr]; }; +AnalyzeFMRI = derive { name="AnalyzeFMRI"; version="1.1-16"; sha256="1mbjb682ns5230jd3vcvd6x4gnn9hpbmjd7r8120y4sp2g733b0f"; depends=[R_matlab fastICA]; }; +AnnotLists = derive { name="AnnotLists"; version="1.2"; sha256="1g2khb2ggniwg2zcjamsm3bxyrl2zabvk540b5vyy9am9k83m1g9"; depends=[]; }; +AntWeb = derive { name="AntWeb"; version="0.7"; sha256="1ykfg3zzjdvjppr2l4f26lx00cn5vaqhhz1j1b5yh113ggyl40qw"; depends=[rjson plyr assertthat httr leafletR]; }; +AnthropMMD = derive { name="AnthropMMD"; version="0.9.9"; sha256="10wn0fkcli5yz3fhngsz8sg1mfllqkvjrpjggd9qynay2zrpiw1n"; depends=[tcltk2]; }; +Anthropometry = derive { name="Anthropometry"; version="1.1"; sha256="1yqdps5n07jl05nv7136jwhfndn01vim2kx9s76mk4alvsw7s8ls"; depends=[shapes rgl archetypes nnls depth FNN ICGE cluster biclust]; }; +AppliedPredictiveModeling = derive { name="AppliedPredictiveModeling"; version="1.1-6"; sha256="004d2k3mhl45inb7kx1ph8xc8h9bgm7f7l3prmvqrl5792400cn4"; depends=[CORElearn MASS plyr reshape2]; }; +AquaEnv = derive { name="AquaEnv"; version="1.0-3"; sha256="1hkygw09w70im9f6l6q5yxk86mdl5pkczqfqrwc4wl1yhz7z1gjb"; depends=[minpack_lm deSolve]; }; +ArDec = derive { name="ArDec"; version="2.0"; sha256="14niggcq7xlvpdhxhy8j870gb11cpk4rwn9gwsfmcfvh49g58i80"; depends=[]; }; +ArrayBin = derive { name="ArrayBin"; version="0.2"; sha256="0jlhcv2d7pmqi32w71nz063ri1yj4i4isr3msnw7ckzvi9r42jwm"; depends=[]; }; +AssetPricing = derive { name="AssetPricing"; version="1.0-0"; sha256="12v8hmmknkp472x406zgzwjp7x8sc90byc3s3dvmwd5qhryxkkix"; depends=[polynom deSolve]; }; +AssotesteR = derive { name="AssotesteR"; version="0.1-10"; sha256="0aysilg79vprcyjirqz6c5s1ry1ia92xik3l38qrw1gf3vfli9cw"; depends=[mvtnorm]; }; +AtelieR = derive { name="AtelieR"; version="0.24"; sha256="0yialpmbsbx70gvps4r58xg9wvqcril8j8yd61lkkmz4b3195zai"; depends=[proto cairoDevice gWidgetsRGtk2 partitions]; }; +AtmRay = derive { name="AtmRay"; version="1.31"; sha256="162078jd032i72sgaar9hqcnn1lh60ajcqpsz4l5ysxfkghcxlh8"; depends=[]; }; +AutoSEARCH = derive { name="AutoSEARCH"; version="1.3"; sha256="1wwrki8gshz4sn22a62pv5rzl1ziva930ci1ygb77bzc9wd65ka1"; depends=[zoo gets lgarch]; }; +B2Z = derive { name="B2Z"; version="1.4"; sha256="0w7394vs883vb32gs6yhrc1kh5406rs851yb2gs8hqzxad1alvpn"; depends=[numDeriv coda mvtnorm]; }; +BACCO = derive { name="BACCO"; version="2.0-9"; sha256="0i1dnk0g3miyv3b60rzgjjm60180wxzv6v2q477r71q74b0v0r1y"; depends=[emulator calibrator approximator]; }; +BACprior = derive { name="BACprior"; version="2.0"; sha256="1z9dvjq4lr99yp6c99bcv6n5jiiwfddfz4izcpfnnyvagfgizr8p"; depends=[mvtnorm leaps boot]; }; +BAEssd = derive { name="BAEssd"; version="1.0.1"; sha256="04wkhcj4wm93hvmfnnzryswaylnxz5qsgnqky9lsx4jqhvg340l6"; depends=[mvtnorm]; }; +BAMMtools = derive { name="BAMMtools"; version="2.0.2"; sha256="10z638f79j3jksb69sqrnkzs5nzxi9srsxww4ky3bk21zb66ikhd"; depends=[ape]; }; +BANOVA = derive { name="BANOVA"; version="0.2"; sha256="1zgn9wxh4c89rris58hhj5fh37mmy8wjvligr02id7a1pcw177m3"; depends=[rjags runjags coda]; }; +BAS = derive { name="BAS"; version="1.0"; sha256="1j5crafky3jb25kim3b7gxg9azn3ya357ckq1v7wryzi3zi674sg"; depends=[MASS]; }; +BASIX = derive { name="BASIX"; version="1.1"; sha256="18dkvv1iwskfnlpl6xridcgqpalbbpm2616mvc3hfrc0b26v01id"; depends=[]; }; +BAT = derive { name="BAT"; version="1.0.1"; sha256="1kljrw2nc6xnqz4ryv4w8zfy17l3r7bsql921ixqa2rlp3jczyl4"; depends=[vegan]; }; +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-0"; sha256="0f833h8zbxgxabgmmcyi4ycys82dplmgzmi3l0fp735h2l3gy8a7"; depends=[DEoptim aws ggplot2 reshape2 shiny]; }; +BBMM = derive { name="BBMM"; version="3.0"; sha256="1cvv786wf1rr5906qg1di2krrv5jgw3dnyl8z2pvs8jyn0kb3fkj"; depends=[]; }; +BBRecapture = derive { name="BBRecapture"; version="0.1"; sha256="05xzp5zjmkh0cyl47qfsz0l8drg8mimssybhycc4q69aif9scqxb"; depends=[HI locfit lme4 secr]; }; +BBmisc = derive { name="BBmisc"; version="1.8"; sha256="1h48p45pcnda095w77yqc7vfbkwzkcsn36ms0mm7lcmyjbl503m9"; depends=[checkmate]; }; +BCA = derive { name="BCA"; version="0.9-3"; sha256="0ksd6b0ykydgdn33x29bwwqkrp23cvdj3imps0l6qs1p4465j5nf"; depends=[RcmdrMisc Rcmdr car rpart flexclust clv]; }; +BCBCSF = derive { name="BCBCSF"; version="1.0-0"; sha256="1ag8wz8a9vh1x4jgppimgchfs53rr6hbg5xzzr6k2h4bfsg7pmn3"; depends=[abind]; }; +BCDating = derive { name="BCDating"; version="0.9.3"; sha256="1ibm34wab1dpigrhifkyr1nylgbprbh22fdw9zpmg8bawb7zgbsl"; depends=[]; }; +BCE = derive { name="BCE"; version="2.1"; sha256="0dqp08pbq7r88yhvlwgzzk9dcdln7awlliy5mfq18j5jhiy7axiz"; depends=[FME limSolve Matrix]; }; +BCEA = derive { name="BCEA"; version="2.0-2"; sha256="1n0fp6na2y4n7p6ncwgi6hwx97mfrga3fkp3i0z06bh1p1jh8m88"; depends=[]; }; +BCEs0 = derive { name="BCEs0"; version="1.1"; sha256="0q63bkmk0kk9p5d3xb0f5srzfrbr743isyw4v2h9ch5yyxizcizb"; depends=[]; }; +BDgraph = derive { name="BDgraph"; version="2.13"; sha256="15sw2b6f30z235vpn5an0ggkphl7w9cwdzb5gbq197blb4f228vf"; depends=[Matrix igraph]; }; +BEANSP = derive { name="BEANSP"; version="1.0"; sha256="0xcb81pk3iidb3dz9l4hm6cwx8hrbg5qz0sfi59yx2f7nsazr4xk"; depends=[]; }; +BEDASSLE = derive { name="BEDASSLE"; version="1.4"; sha256="02638v89rcqky6npfckr1h7g563lbhs51bsprfr10jk44aj527np"; depends=[MASS matrixcalc emdbook]; }; +BEQI2 = derive { name="BEQI2"; version="1.0-1"; sha256="0afp8f6kfmpa8qi952qnyxl2nn6kszc8fgvplvbl13v572261m7s"; depends=[knitr markdown RJSONIO xtable plyr reshape2]; }; +BEST = derive { name="BEST"; version="0.2.2"; sha256="160lvrd0zjm1lr8llra6lyz3qsmqhn3bpdlmwingwfimbpb754rz"; depends=[rjags coda]; }; +BGLR = derive { name="BGLR"; version="1.0.3"; sha256="02aw71r8khnkahqplycwziz7fh8hmnniq5bqnsk4fijv7z9gkbkg"; depends=[]; }; +BGPhazard = derive { name="BGPhazard"; version="1.1"; sha256="0wfwc97fakhv63wgjln5fdz558z1890zmi0m5ai46bjhda1rbx3f"; depends=[survival]; }; +BGSIMD = derive { name="BGSIMD"; version="1.0"; sha256="0xkr56z8l72wps7faqi5pna1nzalc3qj09jvd3v9zy8s7zf5r7w4"; depends=[]; }; +BH = derive { name="BH"; version="1.54.0-5"; sha256="02468l7cczchn71gg22mbgn4b96m73lk2h302j8az1kryfmbl87j"; depends=[]; }; +BHH2 = derive { name="BHH2"; version="2012.04-0"; sha256="10ixvjpkqamlddrndpnw5gsdm4gdhp693jdvc0f774ngmf32rbaa"; depends=[]; }; +BHMSMAfMRI = derive { name="BHMSMAfMRI"; version="1.0"; sha256="0j5ivknsr441clgm0b95f2rz4pr29ixvw3dgsi8nb0ffh52dgz7q"; depends=[fmri AnalyzeFMRI wavethresh]; }; +BIFIEsurvey = derive { name="BIFIEsurvey"; version="1.1"; sha256="1iwaw2nvs6qgmgqxlc3a7zvda6r8mkyalb6ianc643i3az8cnnxf"; depends=[Rcpp miceadds Rcpp RcppArmadillo]; }; +BIOM_utils = derive { name="BIOM.utils"; version="0.9"; sha256="0xckhdvf15a62awfk9rjyqbi6rm7p4awxz7vg2m7bqiqzdll80p7"; depends=[]; }; +BIPOD = derive { name="BIPOD"; version="0.2.1"; sha256="04r58gzk3hldbn115j9ik4bclzz5xb2i3x6b90m2w9sq7ymn3zg1"; depends=[Rcpp Rcpp RcppArmadillo]; }; +BLR = derive { name="BLR"; version="1.3"; sha256="02p29p06vhh8gxkfnqdf9niq09bygshmiipvd3q19k92g0a10l69"; depends=[SuppDists]; }; +BMA = derive { name="BMA"; version="3.18.1"; sha256="0ppcjjcrjrs18lp55hrs0ad7x052v57wd0zdfmvyydlsjbgnsx1p"; depends=[survival leaps robustbase inline]; }; +BMN = derive { name="BMN"; version="1.02"; sha256="12gyq01cn6a9ixqgki1ihx5jrp2gw6jdj7q210rb12xlvj3p6x7w"; depends=[]; }; +BMS = derive { name="BMS"; version="0.3.3"; sha256="1yj9vi8jvhkwpcjkclf0zbah0dayridklpj65ay6r18fyf4crnd2"; depends=[]; }; +BMhyd = derive { name="BMhyd"; version="1.2-2"; sha256="09gb1pq9y3gq9avpaqrlxdsm9iqsxpbnr0bg2mw1vkhc0d5z8zv7"; depends=[corpcor numDeriv]; }; +BNPdensity = derive { name="BNPdensity"; version="2013.8"; sha256="1qlhav764ji289kcibbmqjj62mmxiw3zsiwjz1gkifzgpmzyar85"; depends=[]; }; +BNSP = derive { name="BNSP"; version="1.0.1"; sha256="1l9zm28ild3x9x90nrrg0jj210yzqncdbxkfqwfy3pb23ygw01nn"; depends=[]; }; +BOIN = derive { name="BOIN"; version="1.0"; sha256="14rh2sz4h79vxrskc10idd6mb3dyy8ngdxrac134yxna7507ly0s"; 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]; }; +BSGW = derive { name="BSGW"; version="0.9"; sha256="0df5d0d0kfvwavxbxra36jjs9044q1szq1xm37dvh4wfvvv6igmb"; depends=[survival]; }; +BSSasymp = derive { name="BSSasymp"; version="1.1-0"; sha256="0z3abgvbpmwgzb6b6r5ys3msy97lfdg81p8d19c83aaa6hrngggn"; depends=[fICA JADE]; }; +BSagri = derive { name="BSagri"; version="0.1-8"; sha256="148pr4lkgdi4bwc9lavgj356nh240iazz28xklq14rw4gzhmz2k4"; depends=[gamlss multcomp MCPAN mvtnorm boot mratios]; }; +BSquare = derive { name="BSquare"; version="1.1"; sha256="1s16307m5gj60nv4m652iisyqi3jw5pmnvar6f52rw1sypfp5n49"; depends=[quadprog quantreg VGAM]; }; +BTSPAS = derive { name="BTSPAS"; version="2014.0901"; sha256="0ankkhm38rvq06g0jnbvjbja4jv8lg21dsc0rxsy174b1i6vjhwi"; depends=[coda actuar rjags R2OpenBUGS ggplot2 plyr]; }; +BTYD = derive { name="BTYD"; version="2.4"; sha256="13szcsgsrd7mwc4f47xrfrmsm2sg5sf7pfm21ly4cbvqcz8m0147"; depends=[hypergeo Matrix]; }; +BVS = derive { name="BVS"; version="4.12.1"; sha256="111g61bpwh80v6gy44q087swcrnnnzdcibm22pzzi9jsfphy6l0c"; depends=[MASS msm haplo_stats]; }; +BaBooN = derive { name="BaBooN"; version="0.1-6"; sha256="1splid5mvyd04d1lxkq45md910ry6n516cph20j6vqfhla0arxjg"; depends=[MASS nnet]; }; +BaM = derive { name="BaM"; version="0.99"; sha256="1q04va2s876ydlmaalx63r520pfx1qzpjg6hbnl9pvn86b5grnf4"; depends=[bayesm coda MASS mice survival foreign nnet]; }; +BaSTA = derive { name="BaSTA"; version="1.9.3"; sha256="1jfki5lnsvd6fjrld2qp179lyzli61pi2308lkkl1h6vgp11zp2v"; depends=[msm]; }; +BalancedSampling = derive { name="BalancedSampling"; version="1.4"; sha256="0l8jxszd0j27kb58xrn7lvf52mhifqjd1w42cp4kdiax8c6s7421"; depends=[Rcpp Rcpp]; }; +BatchExperiments = derive { name="BatchExperiments"; version="1.4"; sha256="1px1id2jd34vknlygljqd3cwq6bwch8jfb2npq59cvvwlxxx4qpc"; depends=[BatchJobs checkmate BBmisc DBI RSQLite plyr]; }; +BatchJobs = derive { name="BatchJobs"; version="1.5"; sha256="1aa41rlj0n0mw03kb5n645shfrm18y5snpmlm5hm6fmlvrykqn4p"; depends=[BBmisc brew checkmate DBI digest fail RSQLite sendmailR stringr]; }; +BayHap = derive { name="BayHap"; version="1.0.1"; sha256="0xqnl2cbf0pyjlpywyy0j4mwknfn8msz4s719dsri3r7hvn9m6kd"; depends=[boa]; }; +BayHaz = derive { name="BayHaz"; version="0.1-3"; sha256="08ilghlkgyma5758yw7mdgqycqcillqmx73knzzdlg2kzc77dvg6"; depends=[]; }; +BaySIC = derive { name="BaySIC"; version="1.0"; sha256="023ji6q1nvksmhp3ny8ad39xxccc0a1rv9iaiaagwavgzzc0pjd9"; depends=[rjags fields poibin]; }; +BayesBridge = derive { name="BayesBridge"; version="0.5"; sha256="1czyna2mrznlr5swvm9i7x99yfwjvwbzy42avh6xb0342q5glnhw"; depends=[]; }; +BayesCR = derive { name="BayesCR"; version="1.0"; sha256="0cq1ii01j0nprnyvfxml1nrajrbb9yanr4fa5fcwn764cq5s30n9"; depends=[MCMCpack mvtnorm Rlab truncdist truncnorm]; }; +BayesComm = derive { name="BayesComm"; version="0.1-0"; sha256="17hnq4z451g2j3p73awllihhwsdy3grh6ki3qy9bkr064wvzbvcj"; depends=[Rcpp RcppArmadillo coda Rcpp RcppArmadillo]; }; +BayesDA = derive { name="BayesDA"; version="2012.04-1"; sha256="0fp27cmhw8dsxr4mc1flm6qh907476kph8ch2889g9p31xm1psjc"; depends=[]; }; +BayesFactor = derive { name="BayesFactor"; version="0.9.9"; sha256="1a34caxsmixvriw7hwqsqxbkjg70lv0s81m2i5w5kybfk81xdvnh"; depends=[coda pbapply mvtnorm stringr Rcpp gtools Rcpp]; }; +BayesGESM = derive { name="BayesGESM"; version="1.0"; sha256="1ssg4l86jfriq4izlgzypz37c7xzcfsr6ngh8ksak8ka1lmidsig"; depends=[truncdist GIGrvg normalp gsl]; }; +BayesLCA = derive { name="BayesLCA"; version="1.6"; sha256="1f7xmq3pni68s112k0hvdhag7nqgmm84hhycbm88cyvkdjd0kfba"; depends=[e1071 coda fields nlme MCMCpack]; }; +BayesLogit = derive { name="BayesLogit"; version="0.5.1"; sha256="0nr215wzhqlfi32617mmqb6i3w5x1kh5fiy68k0xzdqjsyjr65m0"; depends=[]; }; +BayesMed = derive { name="BayesMed"; version="1.0"; sha256="1ppl5g8c5yy8jzhm34wvvprn9dj697ihcg8jb5111qmjybzzp0dh"; depends=[R2jags QRM polspline MCMCpack]; }; +BayesMixSurv = derive { name="BayesMixSurv"; version="0.9"; sha256="0hqkqpzk21d2zh7pyn042w1s51wyszkmam0rwzgy0i9i51zjxwvz"; depends=[survival]; }; +BayesNI = derive { name="BayesNI"; version="0.1"; sha256="0zvr6rkb5zxgl53xby69d0j3yrfnlcmac6kwkxz77q5616w9dwq0"; depends=[]; }; +BayesPen = derive { name="BayesPen"; version="1.0"; sha256="1c31n0mrx07j9mw4afdh1qznkiq2jrig3ldpsnhkv2nd2apgjbbp"; depends=[lars MCMCpack SuppDists]; }; +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]; }; +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.5.1"; sha256="0r2al4d74dbra7va88fcazq5h19f0i4wymd39apsz3a3hsb8vdvv"; depends=[MASS]; }; +BayesX = derive { name="BayesX"; version="0.2-9"; sha256="0p170m8zkaspiah1fdyql9lj9yqg6sl525blzq7wwgx5wx4rvncs"; depends=[shapefiles sp maptools colorspace coda]; }; +BayesXsrc = derive { name="BayesXsrc"; version="2.1-2"; sha256="114804f6maak5dmwzw4cbigjcdw7c6sgx48af35yrvkspi1gsz3b"; depends=[]; }; +BayesianAnimalTracker = derive { name="BayesianAnimalTracker"; version="1.0"; sha256="0y710frcw1z6pnqp17g578nvj8hlh32b2iy5c8acil6dzd0fpf2d"; depends=[]; }; +Bayesianbetareg = derive { name="Bayesianbetareg"; version="1.2"; sha256="0imsz2761ngbnap0vnxks9527la51m5g8gkkn1vrgwis43i6qcgs"; depends=[mvtnorm betareg]; }; +Bayesthresh = derive { name="Bayesthresh"; version="2.0.1"; sha256="0w26h1ragqcg1i4h7c2y6vd8fig2jb2zrnvvchgg5z2hg9qdplsf"; depends=[lme4 MASS VGAM mvtnorm matrixcalc coda]; }; +BaylorEdPsych = derive { name="BaylorEdPsych"; version="0.5"; sha256="1kq6nvzdqwawygp7k62lw5hyccsj81jg82hq60yidgxnmmnnf7y2"; depends=[]; }; +BcDiag = derive { name="BcDiag"; version="1.0.5"; sha256="18wryszrpmc2c4pdyvacns7r90l6n2x63cwsa6xjkgq3qwyz6nlj"; depends=[]; }; +Bchron = derive { name="Bchron"; version="4.1.1"; sha256="0dnfz7xpmbygyarh9ai9x3xfsqiizi0zhnxm8bmkvqyb8h7zpghb"; depends=[inline hdrcde MASS ellipse coda mclust]; }; +Bclim = derive { name="Bclim"; version="2.3.1"; sha256="160c9v83bpik73yjj45lr8sdgl8v4ymlkqw424ncc3lficyhvfjg"; depends=[MASS mclust hdrcde statmod]; }; +Benchmarking = derive { name="Benchmarking"; version="0.24"; sha256="18gx8cwip1c03p37apyr9z89p117bz439vfgx91gxbbg1scc8bfp"; depends=[lpSolveAPI ucminf]; }; +BenfordTests = derive { name="BenfordTests"; version="1.1.1"; sha256="12xzc4gq4h7p18ypbkybrzjj2qh71rgd7nzznij36yv7n6h21mlw"; depends=[]; }; +Bergm = derive { name="Bergm"; version="3.0.1"; sha256="1ngxqpagf8snnwdm82bg8yxbf1zpzd99g32fhw9l4gjx77kpkhl2"; depends=[ergm network coda mvtnorm]; }; +BerlinData = derive { name="BerlinData"; version="1.0.0"; sha256="1i4vb1gs3ffb2lxdhl8hzqwcr9nm8ya484glds3bdvj10ypncrya"; depends=[XML stringr]; }; +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]; }; +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]; }; +BinNor = derive { name="BinNor"; version="2.0"; sha256="0c1qy93ccgzg8g25wm1j4ninsa0ck4y3jjh25za92w070cqhkd8m"; depends=[mvtnorm corpcor psych Matrix]; }; +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]; }; +BioStatR = derive { name="BioStatR"; version="2.0.0"; sha256="1k3z337lj8r06xgrqgi5h67hhkz2s5hggj6dhcciq26i1nzafsw6"; depends=[ggplot2]; }; +Biodem = derive { name="Biodem"; version="0.3"; sha256="0wfyypr46awki2nrvhcjwacmaxrr2wvhdv9hddnf10msssflvshc"; depends=[]; }; +BiodiversityR = derive { name="BiodiversityR"; version="2.5-1"; sha256="0nyss1apsgskg291dq66nv6a1q31vkl7w29aq7l2a13s2kqc0ikq"; depends=[vegan Rcmdr]; }; +Biograph = derive { name="Biograph"; version="2.0.4"; sha256="1mik5yvbi28xnyzha8p3xjaa064x29wgn18yx766wha7djxxr353"; depends=[etm msm Epi lubridate reshape plyr survival mstate ggplot2]; }; +BlakerCI = derive { name="BlakerCI"; version="1.0-4"; sha256="1sa9qq5frjjcw46p3ankn7v3gj0gwn9lww6jacz8flf5qpplhn4l"; depends=[]; }; +BlandAltmanLeh = derive { name="BlandAltmanLeh"; version="0.1.0"; sha256="0y35zkxiallp4x09646qb8wj9bayh7mpnjg43qmzhxkm7l95b78r"; depends=[]; }; +Blaunet = derive { name="Blaunet"; version="1.0.1"; sha256="1qcp5wag4081pcjg5paryxz3hk3rqql15v891ppqc1injni7rljz"; depends=[network]; }; +BlockMessage = derive { name="BlockMessage"; version="1.0"; sha256="1jrcb9j1ikbpw098gqbcj29yhffa15xav90y6vpginmhbfpwlbf4"; depends=[]; }; +Bmix = derive { name="Bmix"; version="0.3"; sha256="0p3ks3miniz356spmdikynwa7yrdk1mwlpz081fnkjnwxa3kdsw7"; depends=[mvtnorm]; }; +BoSSA = derive { name="BoSSA"; version="1.2"; sha256="191hq0np9iadks4sflg360k64xnz8j956y30pqzwciinb4hgq1nr"; depends=[ape SoDA]; }; +Bolstad = derive { name="Bolstad"; version="0.2-25"; sha256="1dj0ib3jndnsdx2cqsy0dz54szdx1xq3r2xqnxzk4ysng6svdym8"; depends=[]; }; +Bolstad2 = derive { name="Bolstad2"; version="1.0-28"; sha256="08cfadvl9jl9278ilsf8cm2i2a3i8zsa2f3vjzw2nlv85fwi2c7v"; depends=[]; }; +BoolNet = derive { name="BoolNet"; version="2.0.1"; sha256="0g6pq39hcpfjxvij9x0j7x4xjfkynqnzn4ydkbcrjxhsrkp8h5z5"; depends=[igraph XML]; }; +Boom = derive { name="Boom"; version="0.1"; sha256="03xsfzfl1wvhbd6d1blhwx4dd0vpf7kaha2f50p6q17q6c1ph2vv"; depends=[MASS BH]; }; +BoomSpikeSlab = derive { name="BoomSpikeSlab"; version="0.4.1"; sha256="0s0pbb5dmry736x19li5g364kirvhkhpyjm5q0kp5nvq83bi1hq0"; depends=[Boom BH]; }; +BootPR = derive { name="BootPR"; version="0.60"; sha256="03zw7hz4gyhp6iq3sb03pc5k2fhvrpkspzi22zks25s1l7mq51bi"; depends=[]; }; +Boruta = derive { name="Boruta"; version="3.1.0"; sha256="0dmg8yyx6bb5s6glqsajk0qqf6xwb8qzwi6gbi5agd3i57xm8nak"; depends=[randomForest rFerns]; }; +BradleyTerry2 = derive { name="BradleyTerry2"; version="1.0-5"; sha256="131z9ccfh55inlczy5wnzni2pch4brs6nzjrg8f5xnvkpyy6jqsp"; depends=[lme4 brglm gtools]; }; +BrailleR = derive { name="BrailleR"; version="0.11"; sha256="0vrgk89in5r13434r2p13shckl2b916dj8xn7kpmyngylp91r3a2"; depends=[nortest xtable moments knitr]; }; +Brobdingnag = derive { name="Brobdingnag"; version="1.2-4"; sha256="1saxa492f32f511vw0ys55z3kgyzhswxkylw9k9ccl87zgbszf3a"; depends=[]; }; +Brq = derive { name="Brq"; version="1.0"; sha256="0m01qw0mh9za1gx1vkbyvwny4k5fvmvs9dbp0504q8jqfqf4l1vj"; depends=[quantreg truncnorm]; }; +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=[]; }; +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=[]; }; +CAMAN = derive { name="CAMAN"; version="0.72"; sha256="10qikirv73d03ssg3sb6w3ih92ms5726b5lqw3x7r5rpbl9179rh"; depends=[sp mvtnorm]; }; +CARBayes = derive { name="CARBayes"; version="3.0"; sha256="0wflay6k159cw8149qb4ib1mlpsbgddlbkiyfxd4qz3vwl06dg3q"; depends=[MASS Rcpp truncdist spam coda Rcpp]; }; +CARBayesST = derive { name="CARBayesST"; version="1.1"; sha256="03vp6qajag0ak4lcn0ddyxri3ndiwsc4yxi6ym5lr2v6kv674wl6"; depends=[Rcpp spam truncdist coda Rcpp]; }; +CARE1 = derive { name="CARE1"; version="1.1.0"; sha256="1zwl4zv60mrzlzfgd7n37jjlr0j918a8ji36n94s5xw8wwipiznw"; depends=[]; }; +CARramps = derive { name="CARramps"; version="0.1.2"; sha256="097xxvql6qglk6x4yi7xsvr15n0yj21613zv003z0mhgvqr1n5vf"; depends=[]; }; +CARrampsOcl = derive { name="CARrampsOcl"; version="0.1.4"; sha256="1sdrir7h7xl1imipm9b71vca062dxqsqd8mg3w9f3s80x2aghxl8"; depends=[OpenCL fields]; }; +CAvariants = derive { name="CAvariants"; version="2.1"; sha256="105bj6r6i7xz95lr5g4ld9xfgyq1dn15lw117jivx76z3k2zpi59"; depends=[]; }; +CBPS = derive { name="CBPS"; version="0.9"; sha256="08pc50fndpx6xvxkvqdklrp6v98w2j387frq08nlglcbfjk22i6x"; depends=[MASS MatchIt nnet numDeriv]; }; +CCA = derive { name="CCA"; version="1.2"; sha256="00zy6bln22qshhlll0y0adnvb8wa1f7famqyws71b6pcnwxki5ha"; depends=[fda fields]; }; +CCAGFA = derive { name="CCAGFA"; version="1.0.4"; sha256="159gh0mx4da1gpqf5swyhg8ksclpi59p4zmzsiq5ywfpy5cjr71z"; depends=[]; }; +CCM = derive { name="CCM"; version="1.1"; sha256="0gya1109w61ia6cq3jg2z5gmvjkv9xg71l2rxhrrf6bx1c2nsrq6"; depends=[]; }; +CCMnet = derive { name="CCMnet"; version="0.0-2"; sha256="1x5xjnnyr31yq9cgqfrvg71x7mmc2c54r59fv0az49njh3yg3vja"; depends=[sna network ergm]; }; +CCP = derive { name="CCP"; version="1.1"; sha256="07jxh33pb8llk1gx4rc80ppi35z8y1gwsf19zrca9w91aahcs8cx"; depends=[]; }; +CCTpack = derive { name="CCTpack"; version="1.4"; sha256="09s2ysqsz158lrah44rwvs3nlhyqlvwcj6aar2p79flf4xxdwsvk"; depends=[R2jags rjags psych mvtnorm polycor MASS]; }; +CCpop = derive { name="CCpop"; version="1.0"; sha256="10kgw3b98r0kn74w89znq6skgk8b3ldil6yb0hn5rlcf6lazjzca"; depends=[nloptr]; }; +CDFt = derive { name="CDFt"; version="1.0.1"; sha256="0sc8ga48l3vvqfjq3ak5j1y27hgr5dw61wp0w5jpwzjz22jzqbap"; depends=[]; }; +CDLasso = derive { name="CDLasso"; version="1.1"; sha256="0n699y18ia2yqpk78mszgggy7jz5dybwsi2y56kdyblddcmz1yv7"; depends=[]; }; +CDM = derive { name="CDM"; version="4.0"; sha256="1qdgz4pmq1gn41ib13jbr01lsd1cvn9mcyxdih8wzpajvmb1jvhd"; depends=[mvtnorm Rcpp psych MASS polycor sfsmisc Rcpp RcppArmadillo]; }; +CDNmoney = derive { name="CDNmoney"; version="2012.4-1"; sha256="1bnfsygbzdd70m5s9qq7524b1fybdws46axxjbw9dhwqpr8w85id"; depends=[]; }; +CDVine = derive { name="CDVine"; version="1.2"; sha256="1qfjbzdfz2dydkfw3b0jjma4csn62177j5sgzh6rszf0nifsi97g"; depends=[MASS mvtnorm igraph]; }; +CEC = derive { name="CEC"; version="0.9.2"; sha256="1g5w280zsm8bj9iqw07mkqhdv38vx2n745byyvfbzhx27x3brc28"; depends=[]; }; +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]; }; +CHNOSZ = derive { name="CHNOSZ"; version="1.0.3.1"; sha256="0cmirnb8jkaxnscpkwm2a8yyzl9zaf3q323avpgg7fwwhr6c1l19"; depends=[]; }; +CHsharp = derive { name="CHsharp"; version="0.3"; sha256="0aa9v6yih6qmqsmc8zsl8k1wqsp3sp2bfwri3d37k06vfj7gwbh0"; depends=[scatterplot3d KernSmooth]; }; +CIDnetworks = derive { name="CIDnetworks"; version="0.6.0"; sha256="0bx1wgcsbkg6zqza435fd11kaqkdspl4mlnjjjca8j0gcfvdjxgc"; depends=[mvtnorm msm Rcpp igraph numDeriv pbivnorm Rcpp]; }; +CIFsmry = derive { name="CIFsmry"; version="1.0.1"; sha256="118vyiiy4iqn86n9xf84n5hrwrhzhr1mdsmyg9sm6qq6dm7zg6la"; depends=[]; }; +CINID = derive { name="CINID"; version="1.2"; sha256="0pkgzi2j0045p10kjvnq8f4j1agzrqfw0czvvfrzj9yjfpj8xc99"; depends=[]; }; +CINOEDV = derive { name="CINOEDV"; version="2.0"; sha256="0fjpxahc55zd972p3hlw9fk4dq8hpq715xff8p98kfh29dvw9mnz"; depends=[R_matlab igraph ggplot2 reshape2]; }; +CITAN = derive { name="CITAN"; version="2011.08-1"; sha256="1viv2iha6hcghh4iy4ndnbrnhcdrjixk837v78w43mdcmrkjh3rb"; depends=[DBI RSQLite RGtk2 hash ADGofTest]; }; +CLAG = derive { name="CLAG"; version="2.18.1"; sha256="0y8m6m01vw3rxwrmxvwhpiy6dd2snr0lhb026l1494y43hhqi3wy"; depends=[]; }; +CLME = derive { name="CLME"; version="1.0-1"; sha256="13j5qgyy6naicc5jc3vavas0bqzc69wggpyy3xxq9as6w2zjj5bj"; depends=[MASS quadprog shiny Iso]; }; +CLSOCP = derive { name="CLSOCP"; version="1.0"; sha256="0rkwq9rl2ph4h5zwb2i3yphjyzxmh6b6k23a8gcczycx6xdq4yhw"; depends=[Matrix]; }; +CMC = derive { name="CMC"; version="1.0"; sha256="1r9a5k79fyw01yiwxq02327hpn4l1v2lp0958jj9217wxmhn3pr5"; depends=[]; }; +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.0"; sha256="02vqnjsz0402xdqsxrxicgdsyi3nqc3cfrbabfkywn3q102gzq0f"; depends=[seqinr]; }; +CNVassoc = derive { name="CNVassoc"; version="2.0.1"; sha256="0xf5rrcv7pl158fbz0yjibmrigpqgzwvdyl1gw0fkn5jjsm62hsm"; depends=[CNVassocData mixdist mclust survival]; }; +CNVassocData = derive { name="CNVassocData"; version="1.0"; sha256="17r3b1w9i9v6llawnjnrjns6jkd82m2cn9c90aif8j0bf4dmgdli"; depends=[]; }; +CNprep = derive { name="CNprep"; version="1.0"; sha256="1i8iz0ir14g56zjsj8z4kmds5rybg8jjra33v0qcjwp489s6475a"; depends=[mclust rlecuyer]; }; +COBRA = derive { name="COBRA"; version="0.99.4"; sha256="1r1cw12d7c148pcgcg08bfsr1q1s736kfpyyss6b4d7ny7wgmqy4"; depends=[]; }; +COMPoissonReg = derive { name="COMPoissonReg"; version="0.3.4"; sha256="1mf2q7phc2bn700yp7i2i6ccj6lrvh8b2dmibqihh76a85j1ycrq"; depends=[]; }; +COP = derive { name="COP"; version="1.0-2"; sha256="1gynknplvx97hjhi7adsgq9r9lqismch1q1pqvgmz0x1wkg4jj40"; depends=[dr MASS]; }; +COPASutils = derive { name="COPASutils"; version="0.1.4"; sha256="0273530jis6plw1gg5mp4xbcw7x8k6bhqwdss5n3fypmi2vkb880"; depends=[ggplot2 reshape2 dplyr kernlab stringr knitr]; }; +CORE = derive { name="CORE"; version="2.0"; sha256="18vnqfasrn0bkplr3qj21wrksnj8wbsfhg7r0aimaa9c9nz9l7kg"; depends=[]; }; +CORElearn = derive { name="CORElearn"; version="0.9.43"; sha256="0qzj2fx8if157dplxcsss5s0gllwf183vhiqmapbkdix2h9l9jk5"; depends=[cluster rpart]; }; +CORM = derive { name="CORM"; version="1.0.2"; sha256="0g5plafx2h1ija8jd6rxvy8qsrqprfbwbi1kq1p4jdr9miha20nv"; depends=[cluster]; }; +COSINE = derive { name="COSINE"; version="2.1"; sha256="10ypj849pmvhx117ph3k1jqa62nc4sdmv8665yahds7mh0ymhpjj"; depends=[MASS genalg]; }; +COUNT = derive { name="COUNT"; version="1.3.2"; sha256="1lb67gwznva5p046f4gjjisip5a12icp7d2g1ipizixw99c5lll8"; depends=[msme sandwich MASS]; }; +CP = derive { name="CP"; version="1.5"; sha256="0hzp4h7bhhxn336kkq27phplk7idwk27jjsp6zimwl8fq3ylh0dr"; depends=[survival]; }; +CPE = derive { name="CPE"; version="1.4.4"; sha256="09sqp2a0j43jr9ya9piv8575rwd5fdvwmiz4chv75r3mw8p128mn"; depends=[survival rms]; }; +CPHshape = derive { name="CPHshape"; version="1.0.1"; sha256="05krqcd4spgghp3ihv1zfql6ikd64vkqnrjghjvfki3hi3zi5k7h"; depends=[]; }; +CPMCGLM = derive { name="CPMCGLM"; version="1.1"; sha256="1w8yp37vxz2cl0yqdzpyxdfq2scz2h9i4crjzjmjzpzffi45f06s"; depends=[mvtnorm plyr]; }; +CR = derive { name="CR"; version="1.0"; sha256="0smb2i560dwbxg3mp1svfxmaiw193pd3klwqq0i27czf07k1xfvj"; depends=[]; }; +CRAC = derive { name="CRAC"; version="1.0"; sha256="0vnqmmmwakx5jnzqp20dng35p7rvmz3ypm2m7bs41m8nhh2wq1xa"; depends=[]; }; +CRF = derive { name="CRF"; version="0.3-8"; sha256="0w9wfjlx6hvd07k0iszfyip0vn0ca5ax2d5g7hsg6pm2isnzap8a"; depends=[Rglpk Matrix]; }; +CRM = derive { name="CRM"; version="1.1.1"; sha256="09h6xvqc2h2gxhdhc7592z93cnw16l549pn9i26ml0f0n20hljmf"; depends=[]; }; +CRTSize = derive { name="CRTSize"; version="0.3"; sha256="0m7dc29p2vdpcgji4k4yrpmhv29b7n9i2n6qz6fm19jb2byqsrr5"; depends=[]; }; +CSS = derive { name="CSS"; version="1.0.2"; sha256="0p0c3gfj6p58hd4398kkpjg7rhx6wh5z6qddpqnvbm24acq7nrvh"; depends=[XML stringr]; }; +CTT = derive { name="CTT"; version="2.1"; sha256="0v8k54x9pib6hq3nz3m80g1a3p003f7bn8wnj9swwvacc90d6n44"; depends=[]; }; +CUMP = derive { name="CUMP"; version="1.0"; sha256="0dbpgm75nbd4h8rf3ca5n4mgdn3qm4yyf2d48vlihakzw6rqbpka"; depends=[]; }; +CVD = derive { name="CVD"; version="1.0.0"; sha256="1lqx3rrq4abm7rxc6c9zlw0sc6flc6mll4xgfnasfrkai82kaf44"; depends=[]; }; +CVST = derive { name="CVST"; version="0.2-1"; sha256="17xacyi8cf37rr2xswx96qy7pwkaqq394awdlswykz3qlyzx4zx2"; depends=[kernlab Matrix]; }; +CVThresh = derive { name="CVThresh"; version="1.1.1"; sha256="19d7pslzj8r3z5gn3cplpz2h2ayz6k1nrfx3s2b7a8w1il3vmi69"; depends=[wavethresh EbayesThresh]; }; +CVTuningCov = derive { name="CVTuningCov"; version="1.0"; sha256="1bwzis82lqwcqp2djy4bnd3vvjr47krlv3pdc5msh12wcs0xhs7n"; depends=[]; }; +CVcalibration = derive { name="CVcalibration"; version="1.0-1"; sha256="0ca582fnysrldlzxc3pihsph9pvdgygdh7sfzgxvr5fc3z1jbjzb"; depends=[]; }; +CaDENCE = derive { name="CaDENCE"; version="1.2.1"; sha256="1l6mqra36syvpg9aqh4p6ndj3yj50rabx8hh788zpy4n57m5lpv7"; depends=[]; }; +Cairo = derive { name="Cairo"; version="1.5-6"; sha256="0x5xd2xq5q8a3kzmz7f9bawg3j131rhyb3s7w34acg7rd79l1935"; depends=[]; }; +CarletonStats = derive { name="CarletonStats"; version="1.1"; sha256="18pd1hi8bnbv0sdixw746xvdg9szvng422yj12mk0k50v60403xg"; depends=[]; }; +CatDyn = derive { name="CatDyn"; version="1.0-5"; sha256="1syc40256104nm8n7h5b7w3ia2iya0y47p1sdxk8g1dy4l5wnalm"; depends=[optimx BB]; }; +CateSelection = derive { name="CateSelection"; version="1.0"; sha256="194lk6anrb05gaarwdg8lj5wm6k61b4r702cja3nf3z91i8paqi7"; depends=[]; }; +CausalGAM = derive { name="CausalGAM"; version="0.1-3"; sha256="0g68m2kxixwr7rx65r57m1n0qa161igc428zh9rj91fg6h4pdq4w"; depends=[gam]; }; +Causata = derive { name="Causata"; version="4.2-0"; sha256="04lndjy4rdf063z75zv42b000z06ffnr91pv2sql1ks6w60zmh1m"; depends=[XML R_utils rjson RMySQL RCurl stringr yaml boot foreach data_table glmnet ggplot2]; }; +CePa = derive { name="CePa"; version="0.5"; sha256="1y2q72j8bqx509i62a2x9j40rj5bkpgx4z6fwj05ibazc1441asd"; depends=[igraph snow]; }; +CellularAutomaton = derive { name="CellularAutomaton"; version="1.1-1"; sha256="0kmw2ic161xwalqa63hznic4n4hdz20hsilf2awlcldg7m9si1zd"; depends=[R_oo R_methodsS3]; }; +CensRegMod = derive { name="CensRegMod"; version="0.0"; sha256="0vfkyj2mx5l1pmcah8zilxrjlb6iign1by4ydjq8ddk1zyi242sw"; 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.8"; sha256="0ih0wb82i8f7hz3qyxhqzn9b6v684f66cga5w07qzv92788nzh8g"; depends=[systemfit Matrix actuar Hmisc statmod 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="2.0-2"; sha256="01zng3nhsynj8kbnk7aisj1803q9svd9n6jnnl0vb82lsb29bfw7"; depends=[pls amap chemometrics robustbase RColorBrewer plyr pcaPP mvtnorm mvoutlier rgl R_utils mclust MASS baseline IDPmisc gsubfn lattice seriation]; }; +ChemometricsWithR = derive { name="ChemometricsWithR"; version="0.1.8"; sha256="084da2hx6agryw7bv6img10pqmsdz2mpihbrj6j081lammrik4fj"; depends=[ChemometricsWithRData MASS pls]; }; +ChemometricsWithRData = derive { name="ChemometricsWithRData"; version="0.1.3"; sha256="14l1y4md8hxq8gvip5vgg07vcr0d9yyhm5ckhzk8zwprdabn9a10"; depends=[]; }; +ChoiceModelR = derive { name="ChoiceModelR"; version="1.2"; sha256="0dkp3354gvrn44010s8fjbmkpgn1hpl4xbfs5xslql8sk8rw0n2c"; depends=[]; }; +CircE = derive { name="CircE"; version="1.1"; sha256="14bja3zv9wg389m6khmsy3q12hhnfcp49rvrmw47y6fh5m7ihrz2"; depends=[]; }; +CircNNTSR = derive { name="CircNNTSR"; version="2.1"; sha256="1rl17kw6bl5xf7pgsc4im12i2kqz4a3b11vzzlb6wfl5yck6iff5"; depends=[]; }; +CircStats = derive { name="CircStats"; version="0.2-4"; sha256="1f2pf1ppp843raa82s2qxm3xlcv6zpi578zc4pl0d7qyxqnh603s"; depends=[MASS boot]; }; +CityPlot = derive { name="CityPlot"; version="2.0"; sha256="0lskgxmagqjglvpq39hgbygkf4qp28i2bj6b4m2av1s3pzb4465g"; depends=[]; }; +Ckmeans_1d_dp = derive { name="Ckmeans.1d.dp"; version="3.02"; sha256="1r7zxvrcn8lg8i74fnjr7mqcnhc0y5lsxy1zch1bhbrnbr19sgq5"; depends=[]; }; +ClickClust = derive { name="ClickClust"; version="1.1.3"; sha256="03xcmz1php6hl5ic0ipda3lsdyk5aql23jbilril2h9kvwifbbsf"; depends=[]; }; +ClustOfVar = derive { name="ClustOfVar"; version="0.8"; sha256="17y8q2g4yjxs2jl1s8n5svxi021nlm0phs1g5hcnfxzpadq84wbs"; depends=[]; }; +ClustVarLV = derive { name="ClustVarLV"; version="1.3.1"; sha256="0ilfpiah8jw11n4bnr7chgycldjkqp3xgq3majisiqfqn2ankxl3"; depends=[Rcpp Rcpp]; }; +CoClust = derive { name="CoClust"; version="0.3-0"; sha256="0vcjy8mr8vfs5j1x0xz1zkjn6l08pg6r28ffbdvrqrbalnh87v3s"; depends=[copula gtools]; }; +CoImp = derive { name="CoImp"; version="0.2-3"; sha256="04n0drx98hi8hmlb5xwl87ylv03j1ld04vp9d8s5sphvm9bbx690"; depends=[copula nnet gtools locfit]; }; +CoinMinD = derive { name="CoinMinD"; version="1.1"; sha256="0invnbj5589wbs0k2w5aq9qak7axc3s0g9nw85c48lnl0v95s91i"; depends=[MCMCpack]; }; +CollocInfer = derive { name="CollocInfer"; version="1.0.1"; sha256="0wfk3qw28msz3wqm5xmivjgi18kqv1s6w76vh71zq777d6a7al6i"; depends=[fda deSolve MASS Matrix spam]; }; +CombMSC = derive { name="CombMSC"; version="1.4.2"; sha256="1wkawxisn9alpwrymja8dla8n25z2fhai3l2xhin0b914y2kai09"; depends=[]; }; +CombinS = derive { name="CombinS"; version="1.0"; sha256="0gi66hmj3jmr301r2ahrln4zjjjvl6gabdv3y5df7aqidxlbhqbb"; depends=[]; }; +CombinePValue = derive { name="CombinePValue"; version="1.0"; sha256="0mlngyz2nq7s39javnnjbb5db93c5sg9daw2szng83mbyfza4hv2"; depends=[]; }; +CommonJavaJars = derive { name="CommonJavaJars"; version="1.0-5"; sha256="0kwf504g1izyy7hxss21dgz26w0spxibdlacrjdh7q10z799hfhh"; depends=[]; }; +CommonTrend = derive { name="CommonTrend"; version="0.7-1"; sha256="088pg2hy2g2jgs84xawrnsf7gpvrpqjsimkx7g0i5r5fmkx169f9"; depends=[MASS urca]; }; +CommunityCorrelogram = derive { name="CommunityCorrelogram"; version="1.0"; sha256="1wkrm5lil595sc4ih3qsf4sgvfipzlav0n7339ixqw9zxm2pg4nj"; depends=[vegan]; }; +Comp2ROC = derive { name="Comp2ROC"; version="1.0"; sha256="0vymjbxdlvm5dvss4z4zjdc7y7040s3j972gh2138wfygji1szg7"; depends=[ROCR boot]; }; +CompGLM = derive { name="CompGLM"; version="1.0"; sha256="04bjal92r0m7is5ygqpd0mdz3fb3pwcr7rc3mbxg9sg57nff3kf5"; depends=[Rcpp Rcpp]; }; +CompLognormal = derive { name="CompLognormal"; version="3.0"; sha256="1dhgr9l713l2n889bpa47lbg2qab0fz0r15qa928c0b9nz688ddm"; depends=[numDeriv]; }; +CompQuadForm = derive { name="CompQuadForm"; version="1.4.1"; sha256="1kv4bdkwidkjw0hgn2krv42p9v1a03p47g0p03lja3flhfbmiifj"; depends=[]; }; +CompRandFld = derive { name="CompRandFld"; version="1.0.3-1"; sha256="0faazwmf9gr39m7bal0wb36cq4a36h9xrk6nj316sy57fd4w1aiw"; depends=[]; }; +CompareTests = derive { name="CompareTests"; version="1.0"; sha256="098axl20jid35pqvgiwk6h91waafigwks6n5f4pg7xxx1fifks4f"; depends=[]; }; +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]; }; +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=[]; }; +ConvCalendar = derive { name="ConvCalendar"; version="1.2"; sha256="0yq9a42gw3pxxwvpbj6zz5a5zl7g5vkswq3mjjv5r28zwa3v05vc"; depends=[]; }; +ConvergenceConcepts = derive { name="ConvergenceConcepts"; version="1.1"; sha256="0878fz33jxh5cf72lv0lga48wq2hqa4wz6m59111k59pzrsli344"; depends=[tkrplot lattice]; }; +CopulaRegression = derive { name="CopulaRegression"; version="0.1-5"; sha256="0dd1n7b23yww36718khi6a5kgy8qjpkrh0k433c265653mf1siq8"; depends=[MASS VineCopula]; }; +CopyDetect = derive { name="CopyDetect"; version="1.1"; sha256="0h9bf7ay5yr6dwk7q28b6xxfzy6smljkq6qwjkzfscy5hnmwxkpa"; depends=[irtoys]; }; +CorReg = derive { name="CorReg"; version="0.15.8"; sha256="0gx7gq9sd3zzm4qr9g2anb0wqsxq6czzvxbq8aayrn453skndvcz"; depends=[Rcpp lars elasticnet corrplot Matrix ridge rpart MASS mvtnorm Rcpp RcppEigen]; }; +CorrBin = derive { name="CorrBin"; version="1.4"; sha256="0xnj2rhm4ph9277v2wfrp15p8nbdxiqfpcj0shj0d9z8rasx7p8m"; depends=[boot combinat]; }; +Correlplot = derive { name="Correlplot"; version="1.0-2"; sha256="0prxnbi7ga5d23i0i4qpynfb3zrsgjxam47km6nsj1prakdkrq7w"; depends=[calibrate xtable]; }; +CosmoPhotoz = derive { name="CosmoPhotoz"; version="0.1"; sha256="04girid6wvgyrk8ha81mdqjx2mmzifz57l1hzcgrdnzmjmm3vlmp"; depends=[ggplot2 ggthemes arm COUNT gridExtra pcaPP mvtnorm shiny]; }; +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]; }; +CpGFilter = derive { name="CpGFilter"; version="1.0"; sha256="07426xlmx0ya3pi1y5c24zr58wr024m38y036h9gz26pw7bpawy2"; depends=[]; }; +CpGassoc = derive { name="CpGassoc"; version="2.11"; sha256="01hx9flf4mq1kgg77dah7s33kdkdgnmckppcl1y806xsnxqxmrxq"; depends=[nlme]; }; +Cprob = derive { name="Cprob"; version="1.2.3"; sha256="12kid241q0l28c77wfiqi1b7qj9scdz3ww6dcda5bkb8dcpr9sxv"; depends=[prodlim tpr geepack lgtdl lattice]; }; +CreditMetrics = derive { name="CreditMetrics"; version="0.0-2"; sha256="16g3xw8r6axqwqv2f0bbqmwicgyx7nwzff59dz967iqna1wh3spi"; depends=[]; }; +Crossover = derive { name="Crossover"; version="0.1-13"; sha256="0s3nlc6yzgnrhdxpjqfpw8qcnjbhs5y0ng3qqpmpm9d9br8kivri"; depends=[rJava CommonJavaJars JavaGD ggplot2 MASS crossdes xtable Matrix multcomp digest Rcpp RcppArmadillo]; }; +CrypticIBDcheck = derive { name="CrypticIBDcheck"; version="0.3-1"; sha256="1lrpwgvsif1wnp19agh8fs3nhlb7prr3hhqg28fi4ikdd1l2j3r4"; depends=[rJPSGCS car ellipse]; }; +Cubist = derive { name="Cubist"; version="0.0.18"; sha256="176k9l7vrxamahvw346aysj19j7il9a2v6ka6dzmk0qq7hf3w9ka"; depends=[lattice reshape2]; }; +D2C = derive { name="D2C"; version="1.0"; sha256="06g00da9mpzllar7c71kc4kgfbrqrdhh68lmlv761qxarfg1jf71"; depends=[randomForest gRbase lazy MASS corpcor infotheo]; }; +DAAG = derive { name="DAAG"; version="1.20"; sha256="05jlsrs0frk9ky20h17c5vj9d4j28c9n0a1jww5lssacimn1d4x5"; depends=[lattice latticeExtra]; }; +DAAGbio = derive { name="DAAGbio"; version="0.62"; sha256="18m4vq8vv0yi79na62nrm0cy1nlk7bg0xbddzxv5gpkmzi1i6m9s"; depends=[]; }; +DAAGxtras = derive { name="DAAGxtras"; version="0.8-4"; sha256="18lg13mbyharidj5j7ncx8s7d72v2hcnqr00vilhf3djk2mjq7xn"; depends=[]; }; +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]; }; +DAMisc = derive { name="DAMisc"; version="1.2"; sha256="1fkp21inpgfr5lfid8wmajlcsqbnrgl5c35j0863sywvz6gamgc2"; 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=[]; }; +DBGSA = derive { name="DBGSA"; version="1.2"; sha256="04zqh9y3nqcdzs5jn8aaq5idy9zl450ikvl788xs860wlg692qv2"; depends=[fdrtool]; }; +DBI = derive { name="DBI"; version="0.3.1"; sha256="0xj5baxwnhl23rd5nskhjvranrwrc68f3xlyrklglipi41bm69hw"; depends=[]; }; +DBKGrad = derive { name="DBKGrad"; version="1.6"; sha256="0207zx0v1x3zhfbs0h1ssxc1b683k111f90k8ybhknb147104knr"; depends=[minpack_lm SDD TSA lattice]; }; +DCGL = derive { name="DCGL"; version="2.1.1"; sha256="16jdlpl09q9pcymk5xxca2ba0vqv2l05wzi4ffb9ffydxpxy61j9"; depends=[igraph]; }; +DCL = derive { name="DCL"; version="0.1.0"; sha256="1ls3x3v0wmddfy7ii7509cglb28l1ix1zaicdc6mhwin0rpp2rx3"; depends=[lattice latticeExtra]; }; +DCluster = derive { name="DCluster"; version="0.2-6"; sha256="0g7d15kq3dbrjmd5fmiwwg2b6gakz1lpsgrpkg6q89pzwlqx8xr9"; depends=[boot spdep MASS]; }; +DDD = derive { name="DDD"; version="2.5"; sha256="1svm6l8ssnnf5g3hci46pvw6amisyy1dvfm0mvdryglgfc8vv6jd"; depends=[deSolve ape ade4]; }; +DDHFm = derive { name="DDHFm"; version="1.1.1"; sha256="03zs2zbrhjcb321baghva7b8y61c8p9z6bfj2vg9cvadpb0260nk"; depends=[]; }; +DDIwR = derive { name="DDIwR"; version="0.2-0"; sha256="0dqbldl5c6b8i5q3yk0hwd12lp8z9j4ilnmsqrkj69fv7mys9q3k"; depends=[XML foreign]; }; +DECIDE = derive { name="DECIDE"; version="1.2"; sha256="18kn2pm9r0ims2k1jfsfzh258wwxz0xg86rsbwgq6szh0azlq3qy"; depends=[]; }; +DEMEtics = derive { name="DEMEtics"; version="0.8-7"; sha256="1s59qim60d4gp5rxjacdbmxdbpdm7cy9samn088w8fs0q232vjjx"; depends=[]; }; +DESnowball = derive { name="DESnowball"; version="1.0"; sha256="012kdnxmzap6afc3ffkcvk1mazlkp286av6g9fwz2wcbf5mh9n1m"; depends=[clue combinat MASS cluster]; }; +DEoptim = derive { name="DEoptim"; version="2.2-2"; sha256="0yayp056knd7d6bvk07k7rnj79vibmkzflnk71dsfbkk5yx7vc77"; depends=[]; }; +DEoptimR = derive { name="DEoptimR"; version="1.0-2"; sha256="00viy7x3br3094az635lmjydm826d48vv2f14rwmdhqmv03066kq"; depends=[]; }; +DFIT = derive { name="DFIT"; version="1.0-1"; sha256="190k577qvbpbzgyys1r52fq1w642aq5syp2p9d7y6zp4g3xra1sr"; depends=[simex mvtnorm ggplot2]; }; +DIFlasso = derive { name="DIFlasso"; version="1.0-1"; sha256="048d5x9nzksphsdk9lwfagl165bb40r0pvjq2ihvhqvxspgpar4b"; depends=[grplasso penalized miscTools]; }; +DIME = derive { name="DIME"; version="1.2"; sha256="11l6mk6i3kqphrnq4iwk4b0ridbbpg2pr4pyqaqbsb06ng899xw0"; depends=[]; }; +DIRECT = derive { name="DIRECT"; version="1.0"; sha256="129bx45zmd6h7j6ilbzj2hjg4bcdc08dvm2igggi8ajndl1l5q9j"; depends=[]; }; +DLMtool = derive { name="DLMtool"; version="1.34"; sha256="0ir1131r408ya235k7syg854bfgsim39hh2k1498n5hrbaa99xfx"; depends=[snowfall boot MASS]; }; +DMR = derive { name="DMR"; version="2.0"; sha256="1kal3bvhwqs00b6p6kl0ja35pcz9v9y569148qfhy94m319fcpzm"; depends=[magic]; }; +DMwR = derive { name="DMwR"; version="0.4.1"; sha256="1qrykl9zdvgm4c801iix5rxmhk9vbwnrq9cnc58ms5jf34hnmbcf"; depends=[lattice xts quantmod zoo abind rpart class ROCR]; }; +DNAprofiles = derive { name="DNAprofiles"; version="0.2"; sha256="15la7csf45175g4hkfdz41jgbj5njad5d4jwfhpadxkb9v2mgaw4"; depends=[RcppProgress Rcpp bit Rcpp RcppProgress]; }; +DNAtools = derive { name="DNAtools"; version="0.1-21"; sha256="1ncx2rmxb0ip804x6xznfv8brjpp518fhnm1653mlrsl3hpzrh88"; depends=[Rsolnp multicool Rcpp Rcpp]; }; +DOBAD = derive { name="DOBAD"; version="1.0.3"; sha256="0q8sjcbfdg66jrhii98kls1l2gzx5s8nzv5xrbyl497cn6ysiww0"; depends=[numDeriv]; }; +DOvalidation = derive { name="DOvalidation"; version="0.1.0"; sha256="0vm4sxbchkj2hk91xnzj6lpj05jg2zcinlbcamy0x1lrbjffn9zk"; depends=[]; }; +DPpackage = derive { name="DPpackage"; version="1.1-6"; sha256="01qdl6cp6wkddl9fwwpxwvyhb7lpjxis6wnbm2s288y2n9wi4j24"; depends=[MASS nlme survival]; }; +DPw = derive { name="DPw"; version="1.1.2"; sha256="0waprp6xql67ijwwsy0z8f0fnazkzci0nzwiajwkvy7vbwcch5bx"; depends=[]; }; +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.5"; sha256="1njc9p2cxszcskdm21x00yvcs7gx71x18fdayih6l3g5l40c698a"; depends=[spatstat RandomFields mgcv rgeos]; }; +DSsim = derive { name="DSsim"; version="1.0.1"; sha256="0a62l8jfrnr2h9laxw27p8icvfa8f1gdhdiywwb33328barhzfrk"; 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=[]; }; +DTK = derive { name="DTK"; version="3.5"; sha256="0nxcvx25by2nfi47samzpfrd65qpgvcgd5hnq9psx83gv502g55l"; depends=[]; }; +DTMCPack = derive { name="DTMCPack"; version="0.1-2"; sha256="0bibas5cf06qq834x9q2l2fyh6q9wrg07k8cn6almcyirzax6811"; depends=[]; }; +DTR = derive { name="DTR"; version="1.5"; sha256="1c73ay0j6jkjm4iv32waz3wnn0qy399k1h72l7rwfzpyidnaprvi"; depends=[survival ggplot2 gridExtra aod proto]; }; +Daim = derive { name="Daim"; version="1.1.0"; sha256="19s0p3a4db89i169n2jz7lf8r7pdmrksw7m3cp9n275b5h8yjimx"; depends=[rms]; }; +DandEFA = derive { name="DandEFA"; version="1.5"; sha256="0d82rjkgqf4w7qg7irlqvzzav1f23i2gmygkbf8jycaa6xhli80d"; depends=[gplots polycor]; }; +DatABEL = derive { name="DatABEL"; version="0.9-5"; sha256="0az3p5a9i1bkx90ky1vldkschkcynzz3a422hpp9a3hayykzrl6g"; depends=[]; }; +DataCombine = derive { name="DataCombine"; version="0.2.7"; sha256="18wl48l9b5q1b4bv16rm0k0dkb8j21fz05p6grgmnmvbalv8rvr1"; depends=[data_table dplyr]; }; +Davies = derive { name="Davies"; version="1.1-8"; sha256="1wp7ifbs4vqfrn4vwh09lc53yiagpww91m5mxmcr62mjbw8q7zhr"; depends=[]; }; +Deducer = derive { name="Deducer"; version="0.7-7"; sha256="1x97rz92v1hx30fdmgd1lnzydgygjp6zh20v082qymvh997l1zzd"; depends=[ggplot2 JGR car MASS rJava e1071 scales plyr foreign multcomp effects]; }; +DeducerExtras = derive { name="DeducerExtras"; version="1.7"; sha256="0sngsq31469a74y7nhskl82fwy2i0ga68m9g6b1xyhxz1a8kgvlg"; depends=[Deducer irr rJava]; }; +DeducerPlugInExample = derive { name="DeducerPlugInExample"; version="0.2-0"; sha256="03aw7wr957xzw920ybyzxnck5kx0q2xpcrpq8jh2afyzszy6hzbi"; depends=[Deducer]; }; +DeducerPlugInScaling = derive { name="DeducerPlugInScaling"; version="0.1-0"; sha256="1qg11vi4szznchh54p9345jbmrfzfr9z5l3x5xz4m86myjkys1mb"; depends=[Deducer psych GPArotation mvnormtest irr klaR]; }; +DeducerSpatial = derive { name="DeducerSpatial"; version="0.7"; sha256="0133qk3yjcifyha7c4pqr5s0hmbci72bzgil2r0sxjmrljs3q727"; depends=[JavaGD Deducer sp maptools OpenStreetMap scales rgdal UScensus2010 Hmisc]; }; +DeducerSurvival = derive { name="DeducerSurvival"; version="0.1-0"; sha256="03qk3y4pibvrxbnxbm5rlksw807dvbilip1jbpn1r7k02ibzq676"; depends=[Deducer]; }; +DeducerText = derive { name="DeducerText"; version="0.1-2"; sha256="0if2p9j74wa5rva4iv0i8iax22grl9j7lqcqzqlywjgqwnlzxa05"; depends=[Deducer tm wordcloud RColorBrewer SnowballC]; }; +Delaporte = derive { name="Delaporte"; version="2.2-1"; sha256="09xs1gyz0wkjw0k4b5ahy7zb8xjrg610bbdvvyxkfbh9jaf8q90b"; depends=[Rcpp Rcpp]; }; +Demerelate = derive { name="Demerelate"; version="0.8-1"; sha256="1qngwlzzpd2cmij5ldrmhcn12s9yxd0rargc5vzvkrwcqpkgylkn"; depends=[Formula fts sfsmisc vegan mlogit]; }; +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]; }; +DescTools = derive { name="DescTools"; version="0.99.8.1"; sha256="1na2j0j7mkk0j2y3jac5hslmr3qp5924kv4z9zrwiymjb52jbwmr"; depends=[boot]; }; +DescribeDisplay = derive { name="DescribeDisplay"; version="0.2.4"; sha256="13npxq1314n4n08j6hbmij7qinl1xrxrgc5hxpbbpbd16d75c7iw"; depends=[proto reshape2 ggplot2 plyr scales GGally]; }; +DetMCD = derive { name="DetMCD"; version="0.0.1"; sha256="1bxj7yf98bg185ig2svpkhky6hw14ijb8hwc6g5a3xx6xa9hs57y"; depends=[matrixStats pcaPP robustbase MASS Rcpp RcppEigen]; }; +DetSel = derive { name="DetSel"; version="1.0.2"; sha256="0igkccclmjwzk7sl414zlhiykym0qwaz5p76wf4i7yrpjgk7mhl9"; depends=[ash]; }; +Devore7 = derive { name="Devore7"; version="0.7.6"; sha256="1m18p8h9vv4v0aq2fkjyj39vzb8a09azbbczhfiv4y88w540i8nw"; depends=[MASS lattice]; }; +DiagTest3Grp = derive { name="DiagTest3Grp"; version="1.6"; sha256="04dxyyqv333rkjf2vlfpal59m7klhw6y7qilym6nw78qb1kqqys7"; depends=[car KernSmooth gplots]; }; +DiceDesign = derive { name="DiceDesign"; version="1.6"; sha256="1djq7clga3cvpgfycs3zjj106213yhfj9909sqrni70nj1nwdpj9"; depends=[]; }; +DiceEval = derive { name="DiceEval"; version="1.3"; sha256="1vp9zwd09cwl3c8066jr9d3w4yic70fvd40r7hsj2y8d0bhiwl82"; depends=[DiceKriging]; }; +DiceKriging = derive { name="DiceKriging"; version="1.5.3"; sha256="14826fwsj6cifksyd605nbfxlfwnapr80inm4chjmm0f2xjc4r5n"; depends=[]; }; +DiceOptim = derive { name="DiceOptim"; version="1.4"; sha256="11k6gqw8bcfcnxhm6a039vnkdm7526h3aszjqwfp1s7m157w8kp2"; depends=[DiceKriging rgenoud MASS lhs]; }; +DiceView = derive { name="DiceView"; version="1.3-1"; sha256="0c7i1jy13d5bj822q1rp0d7gmmfjd00jaah34pnj8fzwyrq404z9"; depends=[DiceKriging DiceEval rgl]; }; +DierckxSpline = derive { name="DierckxSpline"; version="1.1-9"; sha256="07bp86zfbcp3d7jdhfap3z1sy15534qvdapdzscbyr2x82mmqpy3"; depends=[lattice PolynomF fda]; }; +Digiroo2 = derive { name="Digiroo2"; version="0.6"; sha256="1b1ahhqz5largjadlk5n6nw2183c05k28mksb1wm26y0lps0vdgr"; depends=[maptools spatstat spdep]; }; +DirichletReg = derive { name="DirichletReg"; version="0.5-2"; sha256="0x1s9x7dynykgbfdnsgpbnvq4dyc43wakmbv8r3gi9prn4af7a5k"; depends=[Formula rgl maxLik]; }; +Disake = derive { name="Disake"; version="1.0"; sha256="1i58q6dqk980mk8qj66hbqd64wmkvpa4v0z6c0q3lkirsvdm4cwv"; depends=[]; }; +DiscML = derive { name="DiscML"; version="1.0.1"; sha256="0qkh0yak1kmzxxx0cqb47zgrj8v2s1d5danpibwwg43j138sb73l"; depends=[ape]; }; +DiscreteInverseWeibull = derive { name="DiscreteInverseWeibull"; version="1.0.1"; sha256="0w0s2fixpcmcwids35xx91hll9rf9qbi7155sp90dxd3vr8c939v"; depends=[Rsolnp]; }; +DiscreteLaplace = derive { name="DiscreteLaplace"; version="1.0"; sha256="1mwqvlhgswqp697zjl6yjzqbgazycwwz6dfdvx8s72hdmnlqqr9r"; depends=[]; }; +DiscreteWeibull = derive { name="DiscreteWeibull"; version="1.0"; sha256="0v8za4arqarf20jrw38dzcjxdwfdpn0ss7p5yxbwhylnj7qz207w"; depends=[Rsolnp]; }; +DiscriMiner = derive { name="DiscriMiner"; version="0.1-29"; sha256="1ii8aa4dwfk991qdnpmkva20wvs5fqcna9030c799ybf11qpdass"; depends=[]; }; +Distance = derive { name="Distance"; version="0.9.2"; sha256="0mxwn9mwzfxnqpxvb4h8955c75hvnk09ji330924dfmi3fca8xjf"; depends=[mrds]; }; +DistatisR = derive { name="DistatisR"; version="1.0"; sha256="1il00v26q68h5dd5c9lm2jblgn8hs6n0457r13mlw6r7pcj0158j"; depends=[prettyGraphs car]; }; +DistributionUtils = derive { name="DistributionUtils"; version="0.5-1"; sha256="1in2k7xsaa0wadjgdh8m0v25v0dzx89pb20i5nsa19vx2iiysqbd"; depends=[RUnit]; }; +DivE = derive { name="DivE"; version="1.0"; sha256="1ixkk8kd3ri78ykq178izib0vwppnbiwbpc1139rcl8f5giiwcdh"; depends=[deSolve FME rgeos sp]; }; +DivMelt = derive { name="DivMelt"; version="1.0.3"; sha256="03vkz8d283l3zgqg7bh5dg3bss27pxv4qih7zwspwyjk81nw3xmr"; depends=[glmnet]; }; +DiversitySampler = derive { name="DiversitySampler"; version="2.1"; sha256="1sfx7craykb82ncphvdj19mzc0kwzafhxlk9jcxkskygrlwsxfgg"; depends=[]; }; +DnE = derive { name="DnE"; version="1.01"; sha256="04b2zz1b47nxpl8060ravybwq6y3s08fbkg5a4qiiaz9a84kvbhw"; depends=[]; }; +DoE_base = derive { name="DoE.base"; version="0.26-3"; sha256="0b0nkp85ryhy2r9xzmd0331v6a63bh2z2anzc7ra3k315c76ajq3"; depends=[conf_design vcd combinat MASS]; }; +DoE_wrapper = derive { name="DoE.wrapper"; version="0.8-10"; sha256="12q3arfm76x9j8qnrmw07jh904qdqz59ga1zk8m3n17prr11vrgb"; depends=[FrF2 DoE_base rsm lhs DiceDesign AlgDesign]; }; +Dodge = derive { name="Dodge"; version="0.8"; sha256="1vnvqb2qvl6c13s48pyfn1g6yfhc60ql3vn7yh2zymxcsr1gxgcw"; depends=[]; }; +Dominance = derive { name="Dominance"; version="1.0.0"; sha256="0xcmslzfdcy826vcnlybhdyym5kqkrdqidq6jn10s4jic7jk8nl3"; depends=[igraph chron gdata]; }; +DoseFinding = derive { name="DoseFinding"; version="0.9-12"; sha256="126xhq1ckry65g312cqvs9bdcl2ws34k6xnq7n9dcgi8jiizz46d"; depends=[lattice mvtnorm]; }; +DoubleCone = derive { name="DoubleCone"; version="1.0"; sha256="1pba9ypp0n3i2k3ji1x8j7h548pfam9z99hxylcjcxnnvc7xs2fw"; depends=[coneproj Matrix MASS]; }; +DoubleExpSeq = derive { name="DoubleExpSeq"; version="1.0"; sha256="0y797iqmxihrsp8lhy84p5hlyw3ckpklv0pgcqv4h39a6cpglbvd"; depends=[numDeriv]; }; +DunnettTests = derive { name="DunnettTests"; version="2.0"; sha256="1sf0bdxays10n8jh2qy85fv7p593x58d4pas9dwlvvah0bddhggg"; depends=[mvtnorm]; }; +DynClust = derive { name="DynClust"; version="3.13"; sha256="020zl2yljp47r03rcbzrbdmwk482xx27awwzv4kdrbchbzwhxqgm"; depends=[]; }; +DynNom = derive { name="DynNom"; version="1.0"; sha256="1lccwg3yvv2i5xhqaws0ja7xbi66g728s7p2s037r6i3dahi86w4"; depends=[ggplot2 stargazer shiny compare]; }; +DynamicDistribution = derive { name="DynamicDistribution"; version="1.1"; sha256="1s78hpj2pxjs4vixin1i816qjbn3wk7b8rd2zdjp4d4rbxifcqf5"; depends=[]; }; +EBEN = derive { name="EBEN"; version="1.1.1"; sha256="12nh96avcx4rrbmlr1q046i5ymrsnqvf0ra5ynh58akajfx7wy49"; depends=[]; }; +EBMAforecast = derive { name="EBMAforecast"; version="0.42"; sha256="161l6jxbzli2g5lcmlp74z320rsvsi80pxk1vc1ypa1hgwz3q80x"; depends=[separationplot ensembleBMA plyr Hmisc abind]; }; +EBS = derive { name="EBS"; version="3.0"; sha256="0nrqglbfr7wagd4xrk5jx0kficjgvk7wqwzqrbs589dkll24sn5b"; depends=[MASS]; }; +EBglmnet = derive { name="EBglmnet"; version="3.4"; sha256="14bkdga07844jc8hpxijp51dx280643i2pampgiz846vkz5vvl1j"; depends=[]; }; +EDISON = derive { name="EDISON"; version="1.1"; sha256="09xw4p4hwj8djq143wfdcqhr2mhwynj4ixj3ma7crhqidgal169p"; depends=[corpcor MASS]; }; +EDR = derive { name="EDR"; version="0.6-5.1"; sha256="10ldygd1ymc4s9gqhhnpipggsiv4rwbgajvdk4mykkg3zmz7cbpm"; depends=[]; }; +EGRET = derive { name="EGRET"; version="2.0.1"; sha256="0h7s3n4jcvxmhmdaf2zq8vk54lwf3h29bhz6y3p9ahm5vid7n1xv"; depends=[dataRetrieval survival fields lubridate]; }; +EIAdata = derive { name="EIAdata"; version="0.0.1"; sha256="0adgkjfymgsimlaalcgcqdsagfvycrnsx93bx2xsbvlbywjk9fhn"; depends=[XML plyr xts zoo]; }; +EILA = derive { name="EILA"; version="0.1-2"; sha256="0wxl9k4fa0f7jadw3lvn97iwy7n2d02m8wvm9slnhr2n8r8sx3hb"; depends=[class quantreg]; }; +EL = derive { name="EL"; version="1.0"; sha256="13r7vjy2608h8jph8kwy69rnkg98b2v69117nrl728r3ayc46a18"; depends=[]; }; +ELT = derive { name="ELT"; version="1.3"; sha256="0q6gc3npwxqq0hz1ardssv5wfxjnx93pi4l1viqsb0wp2kkfq3w6"; depends=[locfit lattice latticeExtra xlsx]; }; +EMA = derive { name="EMA"; version="1.4.4"; sha256="1hqkan9k6ps4qckjrhsgxzham106fm38m5rgayz8i2ji3spvbfca"; depends=[survival xtable heatmap_plus GSA MASS FactoMineR cluster]; }; +EMC = derive { name="EMC"; version="1.3"; sha256="0sdpxf229z3j67mr9s7z4adzvvphgvynna09xkkpdj21mpml23p6"; depends=[mvtnorm MASS]; }; +EMCC = derive { name="EMCC"; version="1.2"; sha256="1qff8yvw7iqdsrqkvwb7m14xh7gcnjcrf8gw00g4j6aq0h0cgk2z"; depends=[MASS mclust EMC]; }; +EMCluster = derive { name="EMCluster"; version="0.2-4"; sha256="0m5cl5mrg6q0ixfpjj1jwd7l5hcldc33lr7n6xgy7p9nlr52mimz"; depends=[MASS]; }; +EMD = derive { name="EMD"; version="1.5.7"; sha256="0m2g7akg9h964d6qr1mj20h9pcb2fcmala3skhl0qpy8qz01w5ck"; depends=[fields locfit]; }; +EMDomics = derive { name="EMDomics"; version="0.99.0"; sha256="0z72dgdlib9w21qhipasni5vymjf7zzq9bnvncz2fs6lpf87rf23"; depends=[emdist matrixStats ggplot2]; }; +EMJumpDiffusion = derive { name="EMJumpDiffusion"; version="1.4.1"; sha256="10lw6717yq9vlywn5ilsl0d99fpx3zvc87vf7s0zxswhs81h7x1w"; depends=[]; }; +EMMAgeo = derive { name="EMMAgeo"; version="0.9.1"; sha256="1rxbb666gh9g35m4jqa6y1zjp82s62ha6n92fkjvkk9wm25w6imr"; depends=[GPArotation limSolve shape]; }; +EMMIXcontrasts = derive { name="EMMIXcontrasts"; version="1.0.0"; sha256="1q7bwf7kkpraj38lz5s1lhhghp7a5lzyj5b9x8024g6rh2qlwp7v"; depends=[]; }; +EMMIXskew = derive { name="EMMIXskew"; version="1.0.1"; sha256="16jkq0a9k1gf6gia8r65nwa2lh8zny4jmnq51g2rcqm44s5ylqbh"; depends=[lattice mvtnorm KernSmooth]; }; +EMMIXuskew = derive { name="EMMIXuskew"; version="0.11-6"; sha256="0japf0l0sj84jna7b5kirp6pgqa4c923ldwphb16ch2xxrgk5n5k"; depends=[MASS]; }; +EMMREML = derive { name="EMMREML"; version="2.0"; sha256="0fyqwyym6d1adn5pvrfspmr933qhi30h58hxr2rbzwm5kwh6c8jr"; depends=[Matrix]; }; +EMP = derive { name="EMP"; version="1.0.2"; sha256="0kh0mirfvas0kyvx3igrwg265rqsfn2jpf2daa0swq9vvs97czis"; depends=[]; }; +EMT = derive { name="EMT"; version="1.1"; sha256="0m3av1x3jcp3hxnzrfb128kch9gy2zlr6wpy96c5c8kgbngndmph"; depends=[]; }; +EMVC = derive { name="EMVC"; version="0.1"; sha256="1725zrvq419yj0gd79h8bm56lv2mmk296wq3wapivcy6xn0j97jh"; depends=[]; }; +ENA = derive { name="ENA"; version="1.3-0"; sha256="02gsngkzc8vfpg2jvcabwp4kpfs14cajs9xv1rh76807l5ylqihz"; depends=[GeneNet space WGCNA parmigene]; }; +ENMeval = derive { name="ENMeval"; version="0.1.1"; sha256="0g1h8dklv6rv73wwpx3vhbpnwply5lpq8x9jvl7r018x9gcvvb9m"; depends=[dismo raster rJava]; }; +ENiRG = derive { name="ENiRG"; version="0.1"; sha256="1cnl1mjl5y1rc6fv7c9jw2lkm898l3flfrj3idx9v1brjzyx5xlf"; depends=[ade4 raster R_utils sp spgrass6 gdata fgui miniGUI]; }; +ENmisc = derive { name="ENmisc"; version="1.2-7"; sha256="07rix4nbwx3a4p2fif4wxbm0nh0qr7wbs7nfx2fblafxfzhh6jc7"; depends=[Hmisc vcd RColorBrewer]; }; +EQL = derive { name="EQL"; version="1.0-0"; sha256="0lxfiizkvsfls1km1zr9v980191af6qjrxwcqsa2n6ygzcb17dp5"; depends=[ttutils lattice]; }; +ERP = derive { name="ERP"; version="1.0.1"; sha256="0wy1p7pp9dvc3krylskb627rmfqaj11qvia97m88x05ydqx1fwmr"; depends=[fdrtool mnormt]; }; +ES = derive { name="ES"; version="1.0"; sha256="1rapwf6kryr6allzbjk6wmxpj9idd3xlnh87rwbh6196xb7rp8lv"; depends=[]; }; +ESG = derive { name="ESG"; version="0.1"; sha256="1jw6239asv6lwxrz5v0r5pzg6v500bqxg8361sh4jj67rsrc7g9m"; depends=[]; }; +ESGtoolkit = derive { name="ESGtoolkit"; version="0.1"; sha256="0r09arhsvamdyahini5yhgc43msdxwvn45l57xbfszahsnr3b3aq"; depends=[CDVine ggplot2 gridExtra reshape2 ycinterextra Rcpp Rcpp]; }; +ETAS = derive { name="ETAS"; version="0.0-1"; sha256="1p38ay3vnca8b8wszm66whxap8k58c004l1nlsk7zkynyia0im6c"; depends=[spatstat]; }; +ETC = derive { name="ETC"; version="1.3"; sha256="1nvb9n0my7h1kq996mk91canxi6vxy3mzhrshrvm13ixvl48lkkh"; depends=[mvtnorm]; }; +ETLUtils = derive { name="ETLUtils"; version="1.2"; sha256="0mlfq23v7nl6lslscknk9mdx4dxk8xyc5imnvzlhzhag0k50mqj2"; depends=[ff]; }; +EVER = derive { name="EVER"; version="1.2"; sha256="1yk6ln4shp53jvph6jy1d5m4cq080p6f03qwigdw4f0al9qzja2s"; depends=[]; }; +EWGoF = derive { name="EWGoF"; version="2.0"; sha256="07kpzaqfd7ihpmh2y5806mz5h64dcajia5v36pp9myl04fvpjapp"; depends=[Rcpp maxLik miscTools Rcpp]; }; +EasyABC = derive { name="EasyABC"; version="1.3.1"; sha256="1d1j7n6mhpmbbczg0yjs4kqjxlclc7pm5fl7pkxp9dmfic002y34"; depends=[abc pls mnormt MASS lhs]; }; +EasyHTMLReport = derive { name="EasyHTMLReport"; version="0.1.1"; sha256="1hgg8i7py7bx48cldyc7yydf0bggmbj3fx3kwiv9jh1x5wyh929z"; depends=[base64enc markdown knitr ggplot2 scales xtable reshape2]; }; +EasyMARK = derive { name="EasyMARK"; version="1.0"; sha256="10slkblbyxq98c3sxgs194dnkx996khfcpxj6jhz355dp35z7c9d"; depends=[MASS stringr rjags coda foreach doParallel random]; }; +EasyStrata = derive { name="EasyStrata"; version="8.6"; sha256="0agmap9lmqbpfw8ijwxmjkcqjvc1ng0jsadkqpfz71a963nkqdcl"; depends=[Cairo plotrix]; }; +EbayesThresh = derive { name="EbayesThresh"; version="1.3.2"; sha256="0n7cr917jrvmgwfqki7shvz9g9zpmbz9z8hm5ax7s8nnfzphrh4g"; depends=[]; }; +Ecdat = derive { name="Ecdat"; version="0.2-7"; sha256="1z9mxx3mvn3vi5drxlzss7gs7vpzg7shinl529bx4jpxqpci90jy"; depends=[Ecfun]; }; +Ecfun = derive { name="Ecfun"; version="0.1-3"; sha256="06i5q8pwlw9fgbpvf65mbnynbpyrmb0548y58a6yxfslz480vbis"; depends=[fda gdata RCurl XML tis jpeg MASS TeachingDemos]; }; +EcoHydRology = derive { name="EcoHydRology"; version="0.4.12"; sha256="03dzdw79s0cnnd7mv6wfxw374yf66dlcmj10xh6sh5i352697xp1"; depends=[operators topmodel DEoptim XML]; }; +EcoTroph = derive { name="EcoTroph"; version="1.6"; sha256="0zi6g0ra107s47r32mm9h6r1wll3avi0mpjmhcr0nj9y48nv14w3"; depends=[XML]; }; +EcoVirtual = derive { name="EcoVirtual"; version="0.1"; sha256="1c815kxljk4qhw0zs28w16ggasfyyyb6aggffx1m1q21s63h6c8h"; depends=[]; }; +EffectStars = derive { name="EffectStars"; version="1.5"; sha256="0j2jxxxpcsrsjzszz4mfk3892ain3qkswa1dkpsmfsk4zs06g0s4"; depends=[VGAM]; }; +EffectsRelBaseline = derive { name="EffectsRelBaseline"; version="0.5"; sha256="1dsnakcrgmlx44599ii92wvhxbxrh0hij59709wsskx1x1152zvh"; depends=[]; }; +ElemStatLearn = derive { name="ElemStatLearn"; version="2012.04-0"; sha256="107x2mybadqgw03j3yq8ibq3ljs4fpx90chvsirpylqhv77wsabl"; depends=[]; }; +EloRating = derive { name="EloRating"; version="0.43"; sha256="0gzpi4qjiqn0lzjwy37pkz6fg7dkp2hv2dfqgzfk32wsj0bswgab"; depends=[zoo]; }; +ElstonStewart = derive { name="ElstonStewart"; version="1.1"; sha256="1y2g4x3fhi78c2406bk8r8c3x9zhx8ya3qlbnypdm65j0minixsn"; depends=[kinship2 digest]; }; +EnQuireR = derive { name="EnQuireR"; version="0.10"; sha256="00kyclcr8da79lwpqa1vzkwn6pgf197h2biackwgphb0byhi8ssx"; depends=[FactoMineR SensoMineR Rcmdr MASS]; }; +EngrExpt = derive { name="EngrExpt"; version="0.1-8"; sha256="0zclvckj2i7j4kfs58hcjcl722vl2y6dcnjz238cjfgwv279gqhp"; depends=[lattice]; }; +EnsembleBase = derive { name="EnsembleBase"; version="0.7"; sha256="064ggky8a14d510qdy1g9wj5syy4yyflxx8zsqjiz9x0vwn17gs7"; depends=[kknn gbm nnet e1071 randomForest doParallel foreach]; }; +EnsembleCV = derive { name="EnsembleCV"; version="0.7"; sha256="169wwckl15y919cak34njj4yc1zhp05pygfw9f5b7dx8xsdplyxa"; depends=[EnsembleBase]; }; +EnsemblePCReg = derive { name="EnsemblePCReg"; version="0.6"; sha256="0amswx7x08hpfvsrkjyfz3adkfshl7d1knyvk9nrnrrpy65rilc3"; depends=[EnsembleBase]; }; +EntropyEstimation = derive { name="EntropyEstimation"; version="1.1"; sha256="1l49xwlkv87zrlc30ws7yxlrwl32ggzwipzs33smx3rig68dnnym"; depends=[]; }; +EnvNicheR = derive { name="EnvNicheR"; version="1.0"; sha256="1vw21gsdrx8gkf1rf8cnazv8l9ddcdmy2gckyf33fz7z2mbzgbkk"; depends=[]; }; +EnvStats = derive { name="EnvStats"; version="1.0.3"; sha256="03wcqv4v14wkrrfi68qinaza3fbspw2a1pv1rm5nshcp8hw38qga"; depends=[]; }; +EnviroStat = derive { name="EnviroStat"; version="0.4-0"; sha256="05sa63z6yzny2ncxpm5d3x0bx8snkn0x5pzpj2a7y6rwf6al5q4r"; depends=[MASS]; }; +Epi = derive { name="Epi"; version="1.1.67"; sha256="12wbzv21whjnzlyqacgqmsgrjbkgj2495y9fwvav5mr21yfrjds3"; depends=[]; }; +EpiContactTrace = derive { name="EpiContactTrace"; version="0.8.8"; sha256="1vlr2xxnyq1i6ky39g8j3pf3m5775bmhii7vpskb0x7nnq161yzb"; depends=[Rcpp plyr R2HTML Rcpp]; }; +EpiDynamics = derive { name="EpiDynamics"; version="0.2"; sha256="1hqbfysvw2ln8z3as6lfcjlhkzccksngwh2vm25zsgy93gxw3mcc"; depends=[deSolve reshape2 ggplot2]; }; +EpiEstim = derive { name="EpiEstim"; version="1.1-2"; sha256="0r56iglhkrqvlsf3gbahd544h944fmbyn6jdc113rhjscf6dl605"; depends=[]; }; +EpiModel = derive { name="EpiModel"; version="1.1.1"; sha256="1az2p033lvdb83hr6ipbky1iy8j3xh943w326kd0fpq1f3j2372g"; depends=[network networkDynamic tergm deSolve doParallel ergm foreach RColorBrewer statnet_common]; }; +Eplot = derive { name="Eplot"; version="1.0"; sha256="1glmkjjj432z9g4gi56pgvfrm5w86iplirnd5hm4s99qci2hgc64"; depends=[]; }; +EstCRM = derive { name="EstCRM"; version="1.3"; sha256="0fmnlh0pnprskq01iq3rfassyxq7fywiprvqw0xdlh8yxl3w2c9n"; depends=[Hmisc lattice]; }; +EstSimPDMP = derive { name="EstSimPDMP"; version="1.2"; sha256="05gp0gdix4d98111sky8y88p33qr5w4vffkp6mg9klggn37kdj8j"; depends=[]; }; +EvCombR = derive { name="EvCombR"; version="0.1-2"; sha256="1f5idjaza91npf64hvcnpgnr72mpb7y6kf91dp57xy9m14k7jx5g"; depends=[]; }; +EvalEst = derive { name="EvalEst"; version="2012.4-1"; sha256="19yn4haxkny9kij0jhkwdbp34c9h2cc5l2n2b14khjhv1msqcfmi"; depends=[setRNG tframe tfplot dse]; }; +Evapotranspiration = derive { name="Evapotranspiration"; version="1.4"; sha256="1x12z44y78lcibf4wpc7l3ll7zwf1c1fkavwfm79q7sdlhwi1x9h"; depends=[zoo]; }; +EvoRAG = derive { name="EvoRAG"; version="2.0"; sha256="0gb269mpl2hbx1cqakv3qicpyrlfb4k8a3a7whhg90masbgmh8f6"; depends=[]; }; +ExPosition = derive { name="ExPosition"; version="2.8.19"; sha256="04s9kk8x6khvnryg6lqdwnyn79860dzrjk8a9jyxgzp94rgalnnz"; depends=[prettyGraphs]; }; +Exact = derive { name="Exact"; version="1.4"; sha256="1l4cq6kslnl8x8c53m2w8w1vijmbxaxzr1fpdzrm2hfra0p5z90s"; depends=[]; }; +ExactCIdiff = derive { name="ExactCIdiff"; version="1.3"; sha256="1vayq8x7gk1fnr1jrlscg6rb58wncriybw4m1z0glfgzr259103y"; depends=[]; }; +ExactPath = derive { name="ExactPath"; version="1.0"; sha256="0ngvalmgdswf73q0jr4psg0ihnb7qwkamm6h64l01k5rmgd5nm16"; depends=[ncvreg lars]; }; +ExceedanceTools = derive { name="ExceedanceTools"; version="1.2.2"; sha256="084sc6pggfbcyavhfnd5whyigw7dyjhb4cxmxi0kh2jiam5k8v5b"; depends=[splancs SpatialTools]; }; +ExomeDepth = derive { name="ExomeDepth"; version="1.0.7"; sha256="02jsbnpyb8y4qnid084z6x1w22pdhnjq6729ixjiw715vavn4p27"; 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]; }; +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]; }; +FAMT = derive { name="FAMT"; version="2.5"; sha256="0mn85yy9zmiklfwqjbhbhzbawwp2yqrm9pvm8jhasn9c3kw1pcp2"; depends=[mnormt]; }; +FAOSTAT = derive { name="FAOSTAT"; version="1.9"; sha256="0gff60vlv35m5sjmz7glbdrd6ijy6n32a9xd26z2ix839qgywvqj"; depends=[RJSONIO plyr data_table MASS classInt ggplot2 labeling scales]; }; +FAdist = derive { name="FAdist"; version="2.0"; sha256="0qkbliz25xlsng7fi9hk1vshpd3535yrv5rc43m3g2mj024a9wxg"; depends=[]; }; +FAiR = derive { name="FAiR"; version="0.4-15"; sha256="18nj95fiy3j7kf4nzf692dxja3msnaaj5csg745bnajb48l606wz"; depends=[rgenoud gWidgetsRGtk2 rrcov Matrix]; }; +FAwR = derive { name="FAwR"; version="1.0.1"; sha256="1j97hdhaamg6xqkaxb04xzsd60hd69n9y84frkqi9swvhr565waj"; depends=[MASS lattice]; }; +FBFsearch = derive { name="FBFsearch"; version="1.0"; sha256="1nxfhll9gx9l6hzpcihlz880qxr0fyv5rjghk0xgp8xn4r5wxw11"; depends=[Rcpp RcppArmadillo Rcpp RcppArmadillo]; }; +FBN = derive { name="FBN"; version="1.5.1"; sha256="0723krsddfi4cy2i3vd6pi483qjxniychnsi9r8nw7dm052nb4sf"; depends=[]; }; +FD = derive { name="FD"; version="1.0-12"; sha256="0xdpciq14i8rh7v6mw174hip64r7mrzhx7gwri3vp9y7a1380sbi"; depends=[ade4 ape geometry vegan]; }; +FDGcopulas = derive { name="FDGcopulas"; version="1.0"; sha256="1i86ns4hq74y0gnxfschshjlc6if3js0disjb4bwfizaclwbw3as"; depends=[Rcpp numDeriv randtoolbox Rcpp]; }; +FDRreg = derive { name="FDRreg"; version="0.1"; sha256="17hppvyncbmyqpi7sin9qsrgffrnx8xjcla2ra6y0sqzam1145y4"; depends=[fda Rcpp mosaic Rcpp RcppArmadillo]; }; +FDboost = derive { name="FDboost"; version="0.0-5"; sha256="1xra0g46kicq74cpjby6y1va2bxvx8b9fiy76mdg1s6n8m6r1pxn"; depends=[mboost Matrix mgcv zoo nnls]; }; +FFD = derive { name="FFD"; version="1.0-2"; sha256="0s6j4rq7ryypq63cq1cfa7n993bwx9pxp6pscdhyh79rhk28xxda"; depends=[tkrplot R2HTML]; }; +FField = derive { name="FField"; version="0.1.0"; sha256="05q16v2vv64qhbnf2l66dwzmvgzyaq8vxwwdabp534bw7z7zpi8q"; depends=[]; }; +FGN = derive { name="FGN"; version="2.0-12"; sha256="0jxawb4wm1vcp0131mdnc0r24dw8sd29ih0fc2wh6ahy7mxzajqn"; depends=[akima ltsa]; }; +FGSG = derive { name="FGSG"; version="1.0"; sha256="01v0jbj09r1c4anbs3xa8y8by9ffwbbc36vsh0bv62blrisp7a03"; depends=[]; }; +FGalgorithm = derive { name="FGalgorithm"; version="1.0"; sha256="1dq6yyb3l6c9fzvk9gs6pb240xb5hvc6fh8p3qd3c91b3m289mcc"; depends=[]; }; +FHtest = derive { name="FHtest"; version="1.1"; sha256="0yqy3lvxjhk7biqfikxqlgs9zsy1vlld9pqxhgxmq04gbnjn2jfk"; depends=[interval MLEcens MASS KMsurv]; }; +FI = derive { name="FI"; version="1.0"; sha256="17qzl8qvxklpqrzsmvw4wq3lyqz3zkidr7ihxc4vdzmmz69pyh2f"; depends=[]; }; +FITSio = derive { name="FITSio"; version="2.0-0"; sha256="1gf3i1q9g81gydag2gj1wsy6wi5jj2v4j3lyrnh1n2g4kxd6s3cp"; depends=[]; }; +FKF = derive { name="FKF"; version="0.1.3"; sha256="01ibihca39zng4wrvhq8h28bmb2rnsjm21xy22b85kpn3mbnh7f1"; depends=[RUnit]; }; +FLIM = derive { name="FLIM"; version="1.1"; sha256="1gghzmj3mvih4gglk27rx1v18q72xnvymgzjwa84m5vlc8840jpa"; depends=[zoo MASS]; }; +FLLat = derive { name="FLLat"; version="1.1"; sha256="1h2nfx7gb66hjdfkdm6im6n8c1fjdz9csg39pckb47c0khl3g9r0"; depends=[gplots]; }; +FLR = derive { name="FLR"; version="1.0"; sha256="0k50vi73qj7sjps0s6b2hq1cmpa4qr2vwkpd2wv2w1hhhrj8lm0n"; depends=[combinat]; }; +FLSSS = derive { name="FLSSS"; version="3.1"; sha256="0cyrjq1b0s7x0dz3x2kvd7pr8v4lyw1324ik4rnbj9hv9mf1g0af"; depends=[Rcpp Rcpp]; }; +FME = derive { name="FME"; version="1.3.2"; sha256="1sjnsc8jbylb2bln5ic24s5bany3clzn44lqnymhsy81x88396ff"; depends=[deSolve rootSolve coda minpack_lm MASS]; }; +FMStable = derive { name="FMStable"; version="0.1-2"; sha256="00viigpqfbqc4hyl9cwicbwqf2ksjak28qrqaa16jhbqz93j4fck"; depends=[]; }; +FNN = derive { name="FNN"; version="1.1"; sha256="1kncmiaraq1mrykb9fj3fsxswabk3l71fnp1vks0x9aay5xfk8mj"; depends=[]; }; +FPDC = derive { name="FPDC"; version="1.0"; sha256="0f6f5bjh1dqv9n6hpbgj922ymbd1zdb0b4ad5h9nk1c6c9ysai7y"; depends=[ThreeWay]; }; +FRACTION = derive { name="FRACTION"; version="1.0"; sha256="0g25dzsbharsq8bzfka96zccaqppdclax24mz5m080ddg4y8zj49"; depends=[]; }; +FRAPO = derive { name="FRAPO"; version="0.3-8"; sha256="1wqayyai8pdm1vq6qvpd10qpd882cyjb0y0jl582fxd3a2ic7n14"; depends=[quadprog Rglpk timeSeries]; }; +FRB = derive { name="FRB"; version="1.8"; sha256="13rp4gqldx84mngrdv5fa9xamkng7b3kgy30ywykcx46gmrym6ps"; depends=[corpcor rrcov]; }; +FRCC = derive { name="FRCC"; version="1.0"; sha256="1g1rsdqsvwf7wc16dj16y6r0347j8jsv5l1pxvj1h0579zinaf2b"; depends=[CCP MASS calibrate corpcor]; }; +FREQ = derive { name="FREQ"; version="1.0"; sha256="01nra30pbnqdd63pa87lcws3hnhhzybcjvx2jqyxjghn6khz47j0"; depends=[]; }; +FRESA_CAD = derive { name="FRESA.CAD"; version="1.0"; sha256="1i7l2rq3p2qwd186ippnxbis8dj2va6n67q61bakd3rflm0k5mn9"; depends=[Hmisc pROC stringr miscTools survival]; }; +FSelector = derive { name="FSelector"; version="0.20"; sha256="0gbnm48x5myhxxw8gz7ck9sl41nj5rxq4gwifqk3l4kiqphywlpi"; depends=[randomForest RWeka digest entropy]; }; +FTICRMS = derive { name="FTICRMS"; version="0.8"; sha256="0kv02mdmwflhqdrkhzb55si5qnqqgdadgyabqc2hwr6iccn7aq8c"; depends=[Matrix lattice]; }; +FWDselect = derive { name="FWDselect"; version="1.1"; sha256="1snamrzf0cqcm6sc5vr1b0scgy83jgr5hgsf2cjb3vi3j01hz9wd"; depends=[mgcv]; }; +FacPad = derive { name="FacPad"; version="3.0"; sha256="0h7knzin0rfk25li127zwjsyz223w7nx959cs328p6b2azhgn59b"; depends=[Rlab MASS]; }; +FactMixtAnalysis = derive { name="FactMixtAnalysis"; version="1.0"; sha256="1l4wfp39b7g38vdk6jpd5zq08sjhsg0s71f662aca2rj6l3a2x3r"; depends=[MASS mvtnorm]; }; +FactoClass = derive { name="FactoClass"; version="1.1.0"; sha256="0y7yd2i79j1m5yl6vnvma47xhr3rl7i37h9sadyrpfm4s486b3kc"; depends=[ade4 xtable]; }; +FactoMineR = derive { name="FactoMineR"; version="1.27"; sha256="1ai76v74ygn183ka3qz1yz9wz1yidbymgylh00lg6f2mjz0r937i"; depends=[car MASS ellipse lattice cluster scatterplot3d leaps]; }; +Fahrmeir = derive { name="Fahrmeir"; version="2012.04-0"; sha256="1axx6r4g6gj1inih41i2az4y0d3jq9x1a6nyj8k7wp51z4z2nbmk"; depends=[]; }; +Familias = derive { name="Familias"; version="2.1"; sha256="1ccm2hm8vlm450yqx3r45qklgwa6wb54i39ybfh9g2fl544spzn8"; depends=[paramlink]; }; +FastHCS = derive { name="FastHCS"; version="0.0.3"; sha256="0nkm5c7ifywzs1w9ggawh3aw8rr0w07f6g8glwph84xvp6ni3i0g"; depends=[matrixStats Rcpp RcppEigen]; }; +FastImputation = derive { name="FastImputation"; version="1.2"; sha256="04bz623kcanxcl9z8zl6m7m47pk0szcjrjlgs5v1yl3jnq9m2n7g"; depends=[]; }; +FastPCS = derive { name="FastPCS"; version="0.1.1"; sha256="0q6nywv1d55xvg2c39c9rqcf3kfqab095c5waps0hp6ylh76d2vx"; depends=[matrixStats Rcpp RcppEigen]; }; +FastRCS = derive { name="FastRCS"; version="0.0.5"; sha256="1dplf1xyw1vwrwknwrz4xxskl1j4sqf8smf5mpw472ainsm9b9iy"; 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]; }; +FeedbackTS = derive { name="FeedbackTS"; version="1.2"; sha256="0yg90b9fk8cq0kilhfr598x74hdnji42pny10jw43f70hdf9mkl1"; depends=[maps mapdata proj4 geoR sp]; }; +FieldSim = derive { name="FieldSim"; version="3.1.3"; sha256="0ap1mfsjj3bflpryn0y8h9kg5mzfrnqj6h9f3m5ja32yjv19ql60"; 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]; }; +FinTS = derive { name="FinTS"; version="0.4-5"; sha256="16m57h6rk4344aalfwaz7hsyis30c1dirsyx8ih661ihgqn1ai1r"; depends=[zoo]; }; +FinancialInstrument = derive { name="FinancialInstrument"; version="1.1"; sha256="19sszdrqipy9i8g2bda9v8i9g5c9w584si4va35fq3i929yv7hrl"; depends=[quantmod xts zoo]; }; +FindAllRoots = derive { name="FindAllRoots"; version="1.0"; sha256="0n4wfm21qj5zn06jqnzxa0w9mfn18dqi6hk1jjqa56dxqw1k7vw0"; depends=[]; }; +FindIt = derive { name="FindIt"; version="0.3"; sha256="0bnyfv9xc5c9bzc34qpbnk6s9mvnzkx9zswjr3j210f518y8z45f"; depends=[glmnet lars glmnet lars]; }; +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=[]; }; +ForImp = derive { name="ForImp"; version="1.0.2"; sha256="1qplsg3cxs95b3ax71a3wyjfk4q207k72ggba2sl0zc7mjqhv1f4"; depends=[homals sampling mvtnorm]; }; +ForeCA = derive { name="ForeCA"; version="0.1"; sha256="1nbflawx8h4lpb9ixbp0zcyl0bqykqlqail31i00ywkak2ic3pm3"; depends=[ifultools splus2R nlme R_utils sapa mgcv astsa]; }; +FormalSeries = derive { name="FormalSeries"; version="1.0"; sha256="09m4ifinasww0xfprs29xsrqhxxkw9zffb3919xnkkjkwp0nax4v"; depends=[]; }; +Formula = derive { name="Formula"; version="1.1-2"; sha256="1axjcmy4x2175nrfjc7vwkijcyr86ws6nbs08990wq8gcal15a10"; depends=[]; }; +ForwardSearch = derive { name="ForwardSearch"; version="1.0"; sha256="0yd47832piqxzjxgl7bc8pn0c8f7vbgsm9z6894rzyi615kjl70b"; depends=[robustbase]; }; +FourScores = derive { name="FourScores"; version="1.0"; sha256="0d21mrl9bzsvhljv7ymiyck508smp66w9qivrb2rp0p803h9yibm"; depends=[]; }; +FrF2 = derive { name="FrF2"; version="1.7-1"; sha256="0i9hfx7n0g866imdsmalqzs8v95vx08cz97hi8311v1wc3pqsn1j"; depends=[DoE_base sfsmisc BsMD scatterplot3d igraph]; }; +FrF2_catlg128 = derive { name="FrF2.catlg128"; version="1.2-1"; sha256="0i4m5zb9dazpvmnp8wh3k51bm0vykh4gncnhdg71mfk4hzrfpdac"; depends=[FrF2]; }; +Frames2 = derive { name="Frames2"; version="0.0.3"; sha256="0nsiff1lpxzhiv0ah5d116aldm4qmwqgx9vvk6q03p8lwj4mynsn"; depends=[sampling]; }; +FreeSortR = derive { name="FreeSortR"; version="1.1"; sha256="03z5wmr88gr6raa2cg7w4j6y5vgxr3g8b8axzhbd7jipswr5x1jf"; depends=[smacof vegan ellipse]; }; +FunChisq = derive { name="FunChisq"; version="1.0"; sha256="1wrj483w6fjwwqjbymdj229nismmwaxw6v6fpba9mylqbyhs69gc"; depends=[]; }; +FunCluster = derive { name="FunCluster"; version="1.09"; sha256="0i73asn1w4s6ydf2ddn5wpr0mwbbxzgmaly1pslarzkx71wk03fz"; depends=[Hmisc cluster]; }; +FuncMap = derive { name="FuncMap"; version="1.0-2"; sha256="0psz2bsmq22ghgr3dijsw094b9ams15dvknigcgi5sq1invafx4a"; 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=[]; }; +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]; }; +G2Sd = derive { name="G2Sd"; version="2.1.2"; sha256="16rivywmax264vvhfk1liid4g87k4b07y0imv4nz01rscxc7lv9h"; depends=[shiny xlsx rJava xlsxjars]; }; +GA = derive { name="GA"; version="2.2"; sha256="1pk80jwzvpmi61df0y331qvl8jkdizblg93s7gaspkbzy50wyfkp"; depends=[foreach iterators]; }; +GA4Stratification = derive { name="GA4Stratification"; version="1.0"; sha256="0li23mrxjx72fir16j3q06fa32cicck4pfc30n0dy2lysf81m9gs"; depends=[]; }; +GABi = derive { name="GABi"; version="0.1"; sha256="1zmiaqbd1jrpiz9hk16s8rggcpl3xyyhjkkdliymx2p42vy5b5mf"; depends=[hash]; }; +GAD = derive { name="GAD"; version="1.1.1"; sha256="0lyrw0d7i7yn1wkqlbf3rg3dnijfwsjn3kdbsg19hmvwq6qpsak2"; depends=[matrixStats R_methodsS3]; }; +GAIPE = derive { name="GAIPE"; version="1.0"; sha256="04iarbwxrhn48bk329wxis7ifzndi67kpjx6dcakawkh3g2mzsfz"; depends=[]; }; +GAMBoost = derive { name="GAMBoost"; version="1.2-3"; sha256="0450h9zf12r524lxk1lrv9imvvkk6fmyd3chnxp18nnvys7215pv"; depends=[Matrix]; }; +GANPA = derive { name="GANPA"; version="1.0"; sha256="0ia8djv46jm397nxjrm9yc5gacf1r4z0ckiliz57cbrqwh7z2wpa"; depends=[GANPAdata]; }; +GANPAdata = derive { name="GANPAdata"; version="1.0"; sha256="0mhdadl7zgsacn59ym42magg3214k1xhabwn78fv7kgccszcgc86"; depends=[]; }; +GB2 = derive { name="GB2"; version="1.2"; sha256="1b5mkgn8c26bmi9ndzsqqp22vxqssy4nya1yysrl5wssjgicpdzs"; depends=[cubature hypergeo laeken numDeriv]; }; +GCAI_bias = derive { name="GCAI.bias"; version="1.0"; sha256="10092mwpmfbcga0n39a0i6g8xxch8xiwg15cckipw6yxjyx0sivc"; depends=[]; }; +GCD = derive { name="GCD"; version="3.0.4"; sha256="1mrgscbrljfyzxprclyw9rcwlkcnifm15kkkapkv56c5ms2ic2i5"; depends=[sp raster ggplot2]; }; +GDAtools = derive { name="GDAtools"; version="1.3"; sha256="1av29mllix0az4n85vxh1344j6jmy103hd78ibjwxalm620rp7ns"; depends=[FactoMineR]; }; +GDELTtools = derive { name="GDELTtools"; version="1.2"; sha256="1rx6kjh7kmyycqapvbizcxkcfp09qvqv7k8f25v333sxkacpz6p5"; depends=[plyr TimeWarp]; }; +GENEAread = derive { name="GENEAread"; version="1.1.1"; sha256="0c3d76yl8dqclk8zhhgrd6bv6b599vkpbyg3hjspb6npdw6zs6k8"; depends=[bitops]; }; +GENLIB = derive { name="GENLIB"; version="1.0.1"; sha256="1vgm920bwb194mn78xp471hiln4iy430jfa8mxwx976bbcxkgpkh"; depends=[Rcpp kinship2 bootstrap Matrix lattice quadprog foreach doParallel Rcpp]; }; +GEOmap = derive { name="GEOmap"; version="2.2-2"; sha256="1kp9sdp51zcz98bk03pknya9g5fhz2i677wgacabq402yjhfgn80"; depends=[RPMG splancs MBA]; }; +GESTr = derive { name="GESTr"; version="0.1"; sha256="1q12l2vcq6bcyybnknrmfbm6rpzcmxgq2vyj33xwhkmm9g2ii9k6"; depends=[mclust gtools]; }; +GEVStableGarch = derive { name="GEVStableGarch"; version="1.0"; sha256="007s7lbfpp1bqnyg08rwarsmkxlx16p4is1k3736fmnri9sfp7z6"; depends=[fGarch fExtremes stabledist skewt Rsolnp]; }; +GEVcdn = derive { name="GEVcdn"; version="1.1.3"; sha256="13p6hkdybs8s2i363z2a65yijqarwj9swvy22ljk61shf2nzbk80"; depends=[VGAM]; }; +GExMap = derive { name="GExMap"; version="1.1.3"; sha256="1a6i2z9ndgia4v96nkr77cjqnbgxigqbqlibg82gwa0a6pl7r7nz"; depends=[]; }; +GGEBiplotGUI = derive { name="GGEBiplotGUI"; version="1.0-8"; sha256="0bkagsm9mkcghc2q46cc86kjajzgjbq9588v0v2bp71qw8m97mbh"; depends=[rgl tkrplot]; }; +GGIR = derive { name="GGIR"; version="1.1-4"; sha256="1z1dwnx8lpj3xk7fdfm6sidbxpfgxjw9righ1kdnjw9g1nnkp29x"; depends=[]; }; +GGMselect = derive { name="GGMselect"; version="0.1-9"; sha256="18l98v6hv0sjhany275lsbdjwclx3abqfi924n9qlcnap1rvsfwz"; depends=[mvtnorm lars gtools]; }; +GGally = derive { name="GGally"; version="0.4.8"; sha256="0wc91c4d8m2335rp0x6i193hw538fnwhbplq3lv0maljwsj8s2pn"; depends=[ggplot2 gtable plyr reshape stringr]; }; +GHQp = derive { name="GHQp"; version="1.0"; sha256="0qpcpwv7rz67qhz1p5k2im02jvs7l8z9sa6ypz13hig5fzm8j9bp"; depends=[statmod]; }; +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.1"; sha256="04y5x0cnifsr28a9razgvjk4nm3sl8drj1d62x5x3d3mks1y8n8a"; depends=[cluster]; }; +GLDreg = derive { name="GLDreg"; version="1.0"; sha256="12g9j30l3h2nk2vsw9j7gb2j9qvbklpbgy2grxa6nd5fr2lhlyfl"; 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]; }; +GMDH = derive { name="GMDH"; version="1.0"; sha256="194bx1gg0d50fq9002ga8lwx288csfk5vfr1qwkn886wiw97wl9n"; depends=[MASS]; }; +GMMBoost = derive { name="GMMBoost"; version="1.1.2"; sha256="01q165vkdiv4qh96lha0g2g94jpnzdclbby6q43ghh9j1yrd4qzj"; depends=[minqa magic]; }; +GNE = derive { name="GNE"; version="0.99-0"; sha256="1iwlh1mx8z24hgry78i5sqfrbqqp4946x1jxh6h7z1vxs7qfpq0v"; depends=[alabama nleqslv BB SQUAREM]; }; +GOGANPA = derive { name="GOGANPA"; version="1.0"; sha256="1xbir21zvr5hv2y6nndzpsrpmnr7glrc7y6xgcyb856wx46ajan9"; depends=[GANPA WGCNA]; }; +GPArotation = derive { name="GPArotation"; version="2014.11-1"; sha256="15jh5qqqwx47ara6glilzha87rnih0hs5fsz0jjqwv6wr1gw26rm"; depends=[]; }; +GPCSIV = derive { name="GPCSIV"; version="0.1.0"; sha256="118l792mwd54xsi3g8afg3vc6wds8j6fyaz3mwmq04mlcyblym4l"; depends=[scatterplot3d sqldf]; }; +GPFDA = derive { name="GPFDA"; version="2.2"; sha256="1xqk03g8b8hi1vdqh6a9wml8ln0ad6lmy14z8k8c4wdc5kbzdr0b"; depends=[fda_usc spam fda MASS]; }; +GPLTR = derive { name="GPLTR"; version="0.95"; sha256="0fm260pwg66j91hddyql95lvvcpzvvbi3hddwzrk1bhyrgd8kj55"; depends=[rpart]; }; +GPfit = derive { name="GPfit"; version="0.2-1"; sha256="1r7dmrjilnis4m8v0bibai0bkm3iwka4zxzrda8r49wmcpf99n2d"; depends=[lhs lattice]; }; +GPseq = derive { name="GPseq"; version="0.5"; sha256="0k5xif44qk2ppvcyja16xshmfciq1h84l1w6d8dfkyryfajbc8ai"; depends=[]; }; +GPvam = derive { name="GPvam"; version="3.0-2"; sha256="160j0zwbcmvzvia1b5p5midf395xfv1frk2w6w3v2zpbn8h6pdz5"; depends=[Rcpp RcppArmadillo Matrix numDeriv Rcpp RcppArmadillo]; }; +GRTo = derive { name="GRTo"; version="1.2"; sha256="0x65g8a39vrb8m3hqajxi0ksmdavz0p6mlamqprkdn9p6ikf5c73"; depends=[bootstrap]; }; +GRaF = derive { name="GRaF"; version="0.1-12"; sha256="1d7mr2z49v6ch4jbzh0dj2yjy2c5p51ws38xfz233sjz475snajr"; depends=[dismo]; }; +GSA = derive { name="GSA"; version="1.03"; sha256="1h1sbpn1rrdh44w4fx2avc7x24ba40mvpd8b2x5wfrc7a294zf6z"; depends=[]; }; +GSAgm = derive { name="GSAgm"; version="1.0"; sha256="18bhk67rpss6gg1ncaj0nrz0wbfxv7kvy1cxria083vi60z0vwbb"; depends=[survival]; }; +GSE = derive { name="GSE"; version="3.1"; sha256="08xr7w6dsmgs3l8ayihadcvwy0xdzn78fllxa42sk7nfz6waadr3"; depends=[Rcpp MASS ggplot2 Rcpp RcppArmadillo]; }; +GSIF = derive { name="GSIF"; version="0.4-2"; sha256="0v7bmqf96qsm2kxvi89whnvw0lmi7xgjb3icmmar7w31zh53am70"; depends=[sp RSAGA dismo rgdal raster aqp plotKML gstat boot rpart quantregForest randomForest nlme]; }; +GSM = derive { name="GSM"; version="1.3.1"; sha256="1ay6znw31qnhz5k6fa0aiccr2xxmnj7v3vzrvlk6y5v5smlvybd0"; depends=[gtools]; }; +GUIDE = derive { name="GUIDE"; version="1.0.9"; sha256="1y0y6rwv1khd9bdaz5rl9nmxiangx0jckgihg16wb6hx6kf8kzc1"; depends=[rpanel tkrplot]; }; +GUILDS = derive { name="GUILDS"; version="1.2"; sha256="0nirrbq8z7axnrgwbykv5886yf3akf64zynza8l2m96nvzlkzf4y"; depends=[Rcpp pracma subplex Rcpp]; }; +GUIProfiler = derive { name="GUIProfiler"; version="0.1.2"; sha256="1k56clda6xr649xfacnigi3c2s7ih1whchwcfqm7aa2d44vv3axz"; depends=[Nozzle_R1 MASS]; }; +GUTS = derive { name="GUTS"; version="0.3.5"; sha256="10yi18yv3vbm7pn11bbj3baxqga5yymilabf56bc18prpirnw51b"; depends=[Rcpp Rcpp BH]; }; +GUniFrac = derive { name="GUniFrac"; version="1.0"; sha256="0w08b22xkx0llmwk1kj4ibapvg3fxkgkmjz6z6acr4nwqfwmjzzx"; depends=[vegan ape]; }; +GWAF = derive { name="GWAF"; version="2.1"; sha256="1s56d3b6p5fpaxi32ks2mmhsa5sgi746hf159wk0z99099gli8g3"; depends=[geepack coxme lme4]; }; +GWASExactHW = derive { name="GWASExactHW"; version="1.01"; sha256="19qmk8h7kxmn9kzw0x4xns5p3qqz27xkqq4q6zmh4jzizd0fsl78"; depends=[]; }; +GWAtoolbox = derive { name="GWAtoolbox"; version="2.2.4"; sha256="0adpixlfh0j1py79b0636921kmz2zvhv8p07m6ism6h3xva0i4ck"; depends=[]; }; +GWG = derive { name="GWG"; version="1.0"; sha256="1va0cd229dhhi1lmrkpwapcm96hrdmxilrmba02xnl7ikhisw0my"; depends=[]; }; +GWRM = derive { name="GWRM"; version="1.1"; sha256="1l8rw2nksd1vskjb7kjn93vgrs39bcrr8zz1j66rmkcc399pf6nf"; depends=[]; }; +GWmodel = derive { name="GWmodel"; version="1.2-3"; sha256="04sks9rnqxgxyj9q3nyrnknp4cdfck2p52svxfdrgvxqr48kf6ff"; depends=[maptools robustbase]; }; +GWsignif = derive { name="GWsignif"; version="1.0"; sha256="04663qgy3xmijrx8m1s5ql7zj70mgsd58dl08ci742l1fzmfya5f"; depends=[]; }; +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=[]; }; +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=[]; }; +GenWin = derive { name="GenWin"; version="0.1"; sha256="0jm537i4jn3azdpvd50y9p0fssfx2ym2n36d3zgnfd32gqckz3s4"; depends=[pspline]; }; +GeneCycle = derive { name="GeneCycle"; version="1.1.2"; sha256="1ghdzdddbv6cnxqd08amy4c4s5jsxa637r828ygffk6z76xjr6b6"; depends=[MASS longitudinal fdrtool]; }; +GeneF = derive { name="GeneF"; version="1.0"; sha256="0bizf47944b2zv9ayxb9rhrqx0ilz2xlvkw7x5vbg7l67y2g2l4d"; depends=[]; }; +GeneFeST = derive { name="GeneFeST"; version="1.0.1"; sha256="0qgzjzhwf3nigfi09maywg9zkjxiicwiwiyqfcdk9gsvmp6mr4qn"; depends=[BASIX]; }; +GeneNet = derive { name="GeneNet"; version="1.2.11"; sha256="0c98qkwwwicxbax8afia1ximjs8gz30v9kqqkzafaijxxba7x83q"; depends=[corpcor longitudinal fdrtool igraph]; }; +GeneReg = derive { name="GeneReg"; version="1.1.2"; sha256="081qc66mb17dwk886x9l2z4imklxnfs02yqql0ri9c47bpsga7wp"; depends=[igraph]; }; +Geneland = derive { name="Geneland"; version="4.0.4"; sha256="14crcj71i4vc48a132k024jrkwlwbrqi6jd9w3d1qsy6dn7inc0k"; depends=[RandomFields fields]; }; +GeneralizedHyperbolic = derive { name="GeneralizedHyperbolic"; version="0.8-1"; sha256="1q7bagq6c4an5jprypab5121ymich55xgyxfxnj5izihssmcwssp"; depends=[DistributionUtils RUnit]; }; +GeneticTools = derive { name="GeneticTools"; version="0.3"; sha256="16jqi98nvdmfbmx6z10d2kxfc9mp4zhpg22rschiy6ysp4lczs3c"; depends=[gMWT Rcpp RcppArmadillo plotrix Rcpp RcppArmadillo]; }; +GeoDE = derive { name="GeoDE"; version="1.0"; sha256="0wawkzj0344pprm8g884d7by8v74iw96b109rgm7anal48fl30im"; depends=[Matrix MASS]; }; +GeoGenetix = derive { name="GeoGenetix"; version="0.0.2"; sha256="0rrc8rdf6whpd830s2g9ybz82jcd0il9kkfrjh3xza3b86fasdvg"; depends=[RandomFields]; }; +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.8"; sha256="1lnh65gs1p5k2cj7py0b9aqr56lm8ibgb3yqr0hwmr85ylj47iin"; 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.3"; sha256="0iih8fpwwrnq8jlr95ah0y18a36xswha2jwckldpsira0ara0qnc"; depends=[]; }; +Gmisc = derive { name="Gmisc"; version="0.6.7"; sha256="15bgkgxqmgg81ry3ssx1darspmyhpzfcnkhkprqf495c07sh94jb"; depends=[Hmisc stringr lattice sp]; }; +GoFKernel = derive { name="GoFKernel"; version="2.0-4"; sha256="12iashl0l8an1rdb9adjqbfvpv22rzf4y6vjdlg060r3qq7xr8kl"; depends=[KernSmooth]; }; +GrammR = derive { name="GrammR"; version="1.0.0"; sha256="1j1k891cn9fyyp1nfyj6hjcz87qflipfwd9f9zg5s8y4jf0i9a7g"; depends=[gWidgets RGtk2 gWidgetsRGtk2 MASS cluster rgl GUniFrac ape]; }; +GraphPCA = derive { name="GraphPCA"; version="1.0"; sha256="17ipcp7nh47lfs9jy1aybpz4r172zj5yyrdrgmd6wa7hax8yv8gg"; depends=[ggplot2 FactoMineR scatterplot3d scales]; }; +GrapheR = derive { name="GrapheR"; version="1.9-84"; sha256="1wwks2a4vzhj1rcspizp1vadl6kvrqr8s4zd6pghj02nd266znk9"; depends=[]; }; +GrassmannOptim = derive { name="GrassmannOptim"; version="2.0"; sha256="05r5zg4kf3xd6pp56bl8ldchdxvspxkdfd33b623hndjhn4lj2lq"; depends=[Matrix]; }; +Grid2Polygons = derive { name="Grid2Polygons"; version="0.1-4"; sha256="00qnvi5f5mywknir67rbn36hz8s1x71y1jkkj4nrp60d15vh6hk7"; depends=[sp rgeos]; }; +GriegSmith = derive { name="GriegSmith"; version="1.0"; sha256="1a7gnaig1wvxpph7d8c37kx51dznzk0457fzf7alw95iwpyb4z7j"; depends=[spatstat]; }; +GroupSeq = derive { name="GroupSeq"; version="1.3.2"; sha256="16n06jw7f97jhafgl9sfvd163v1walhlpmai1hmhiwjvv341sp13"; depends=[]; }; +GuardianR = derive { name="GuardianR"; version="0.5"; sha256="0m5arxz4ih84zg8sf2wy2kg38adraa098gb52vwz93dzdm1dhslw"; depends=[RCurl RJSONIO]; }; +Guerry = derive { name="Guerry"; version="1.6-1"; sha256="1hpp49w2kd1npsd709cwg125pw6mrqxfv2nn3lcs1mg2r49ki2bl"; depends=[]; }; +GxM = derive { name="GxM"; version="1.1"; sha256="02rv8qb46ylk22iqn9cgh63vkyrg9a8nr1d0d3j5hqhi0wyhc41r"; depends=[Rcpp minqa nlme]; }; +HAC = derive { name="HAC"; version="1.0-1"; sha256="11m3f3fmra4ic3kql5n34ssdwgd1db0avgw3rpmwmq99wgpsdvr5"; depends=[copula]; }; +HAP_ROR = derive { name="HAP.ROR"; version="1.0"; sha256="1id9amz1cc2l2vnpp0ikbhf8ghbgzqd1b9dfivnyglg7996c3gbg"; depends=[hash ape]; }; +HAPim = derive { name="HAPim"; version="1.3"; sha256="03qy0pxazv3gdq3fck7171ixilb9zi1dwnvc4v7d726g0lvn80pg"; depends=[]; }; +HBSTM = derive { name="HBSTM"; version="1.0.1"; sha256="0bx7dxcfj46k4kqpqb39w4qkm4hvr1ka8d8rws445vkyl31kr0q6"; depends=[MASS fBasics maps]; }; +HDMD = derive { name="HDMD"; version="1.2"; sha256="0na0z08fdf47ghfl2r3fp9qg5pi99kvp7liymwxym2wglkwl4chq"; depends=[psych MASS]; }; +HDPenReg = derive { name="HDPenReg"; version="0.90"; sha256="0hi1pd6lmb5w4px32sgs4zibl8j7zpav15hyayzwm6jh9gngp591"; depends=[Rcpp Rcpp]; }; +HDclassif = derive { name="HDclassif"; version="1.2.2"; sha256="0j32nhl2v0bipflidwfk6q8a0pvn7qjs7ks1al2izsr772dwfcvq"; depends=[MASS]; }; +HDtweedie = derive { name="HDtweedie"; version="1.1"; sha256="14awd7sws0464f68f5xwnv1xvr0xflvx2z2zzcfj1csvk3af0zzj"; depends=[]; }; +HEAT = derive { name="HEAT"; version="1.2"; sha256="1qifqd06ifl0f5l44mkxapnkwhpm0b82yq6dhfw4f8yhb27wd0z2"; depends=[]; }; +HGNChelper = derive { name="HGNChelper"; version="0.3.0"; sha256="1w1x8fkvwlm4xqfx3afg42hhsa459sxqacsiph088sr77lhd3acz"; depends=[]; }; +HH = derive { name="HH"; version="3.1-5"; sha256="0m7gydzqm7ih9ii9fcbs8l59r535l314daxdpdya661bmcgjd2ks"; depends=[lattice latticeExtra multcomp reshape2 leaps vcd colorspace RColorBrewer Rcmdr]; }; +HHG = derive { name="HHG"; version="1.4"; sha256="048jbwhrbgp1pv2j6sw234ykdn7bgpa49slwh3p5547nl2cwjysg"; depends=[]; }; +HI = derive { name="HI"; version="0.4"; sha256="0i7y4zcdr6wcjy43lz9h8glzpdv0pz7livr95xb1j4p8zafykday"; depends=[]; }; +HIBAG = derive { name="HIBAG"; version="1.2.4"; sha256="0mmy7yn9xl0gp3cgkv4zym2hbzbw1kvsdhv5mvl401v95qjy5z20"; depends=[]; }; +HIV_LifeTables = derive { name="HIV.LifeTables"; version="0.1"; sha256="0qa5n9w5d5l1kr4827a34581q380xmpyzmmhhl300z1jwr0j94df"; depends=[]; }; +HIest = derive { name="HIest"; version="2.0"; sha256="0ik55kxhzjyg6z6072iz9nfaj7x1nvf91l1kysgvkjccr6jf3y86"; depends=[nnet]; }; +HK80 = derive { name="HK80"; version="0.0.1"; sha256="1qhknrqpspxrdxzf5kakans94db58bbhgpblvpwcyw4jrjmm0ng7"; depends=[]; }; +HLMdiag = derive { name="HLMdiag"; version="0.2.5"; sha256="1yim9m5q1m112aj7zhsw345l32bdj7lbw2mqpcxhjzv1lcknm5lq"; depends=[lme4 ggplot2 plyr reshape2 MASS Matrix Rcpp Rcpp RcppArmadillo]; }; +HLSM = derive { name="HLSM"; version="0.4"; sha256="115215fiaib6ndvzb3gn80l636ddxp0dxrnph8pnh16b3b6q2jnk"; depends=[MASS coda]; }; +HMM = derive { name="HMM"; version="1.0"; sha256="0z0hcqfixx1l2a6d3lpy5hmh0n4gjgs0jnck441akpp3vh37glzw"; depends=[]; }; +HMMCont = derive { name="HMMCont"; version="1.0"; sha256="1drni4f72x83sprn65wnhw0pv1q8lfkgmxdr9h4rwv1accril85x"; depends=[]; }; +HMMpa = derive { name="HMMpa"; version="1.0"; sha256="14r2axg42by49qm6avgv7g3xnc29bxlrni5fhc5vdz0wygkcrqhn"; depends=[]; }; +HMP = derive { name="HMP"; version="1.3.1"; sha256="1r39mq8j071khza37ck7w4kvk1di71hhn5m4wnx9dak7nlcq2nwx"; depends=[MCMCpack dirmult]; }; +HMPTrees = derive { name="HMPTrees"; version="1.2"; sha256="0agp8w7rzr1byj01di89r3qy1vb9inb2zgys78mg8jnk7axi925l"; depends=[ape]; }; +HMR = derive { name="HMR"; version="0.3.1"; sha256="1lmxp46r5jr0r37sk9y080irbrf89rkzhv0943xv0f0l2dyyk415"; depends=[]; }; +HPbayes = derive { name="HPbayes"; version="0.1"; sha256="1kpqnv7ymf95sgb0ik7npc4qfkzc1zb483vwnjpba4f42jhf508y"; depends=[MASS mvtnorm corpcor numDeriv boot]; }; +HSAUR = derive { name="HSAUR"; version="1.3-4"; sha256="1y79ivzz7dy81q9vvsa55aldas1gfrz1in9c5v53gi40q6w9pkff"; depends=[]; }; +HSAUR2 = derive { name="HSAUR2"; version="1.1-11"; sha256="18j12kj42x3myzkyxm11m9y314icavdald9y424pwpyjx4p51v1v"; depends=[]; }; +HSAUR3 = derive { name="HSAUR3"; version="1.0-2"; sha256="0anip378k6zagk722m7fnx5lsms6pk7fs375pdywy3zcr7p9pm4z"; depends=[]; }; +HSROC = derive { name="HSROC"; version="2.1.7"; sha256="05gixmzmgdply9zhjpss54b50ch4b8586cik6c49naxcqxr0y5vd"; depends=[lattice coda MASS MCMCpack]; }; +HSSVD = derive { name="HSSVD"; version="1.1"; sha256="0kpfcb9ibwhdanc56ysbvx3zirhbrxqyrgpbmi9yvnc5m2c8377d"; depends=[bcv]; }; +HTMLUtils = derive { name="HTMLUtils"; version="0.1.5"; sha256="12r8x7b944lbzz3f4j6w88szq6j9gscbss3f5bzpisw33sr4wgx3"; depends=[R2HTML]; }; +HTSCluster = derive { name="HTSCluster"; version="2.0.4"; sha256="1kvq118hqxc81n88g4bq10lh84dydrqqhzig246wf3f97ajvq7y0"; depends=[capushe poisson_glm_mix plotrix]; }; +HTSDiff = derive { name="HTSDiff"; version="1.0.5"; sha256="03g5hwjgg7g79lskwrgd32gy34v0fn8yh95zndid0qm6i7vwip9w"; depends=[plotrix HTSCluster poisson_glm_mix]; }; +HUM = derive { name="HUM"; version="1.0"; sha256="1bq74l88jvscmq9ihv5wn06w2wng073ybvqb2bdx2dmiqlpv6jw2"; depends=[gtools Rcpp rgl Rcpp]; }; +HW_pval = derive { name="HW.pval"; version="1.0"; sha256="14nmyqw2d9cmn64789yc54fmiqanh6n1dizp7vj94h7b0jwq63yy"; depends=[]; }; +HWEBayes = derive { name="HWEBayes"; version="1.4"; sha256="1rbffx6pn031a278ps9aqxcaq8yi73s5kf60za143ysbfxv9dphw"; depends=[MCMCpack mvtnorm]; }; +HWEintrinsic = derive { name="HWEintrinsic"; version="1.2.1"; sha256="1sg5lrc6kl5rr6f5awp100qpd1679745kixasiddiggzd8fhgb7q"; depends=[]; }; +HWxtest = derive { name="HWxtest"; version="1.0.5"; sha256="01pvi87g5sfglbdv38ik9f47fah3gs7d75d6kgn5xkjb6b2af9d7"; depends=[]; }; +HadoopStreaming = derive { name="HadoopStreaming"; version="0.2"; sha256="1l9msaizjvnsj1jrpghj4g057qifdgg6vbqhfxhn1fiqdqi2056q"; depends=[getopt]; }; +HandTill2001 = derive { name="HandTill2001"; version="0.2-9"; sha256="1j4ivxarm3k9sj05824lv6b03apyabpciv4mp253vv0yzjcp2bzf"; depends=[]; }; +Hankel = derive { name="Hankel"; version="0.0-1"; sha256="0g3b0ji8hw29k0wxxvlnbcm0z91p4vbajbrhm6cqbccjq85lg4si"; depends=[]; }; +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=[]; }; +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"; sha256="1h2sqkqb24a0ywwxx4w2qi8w3f9xq41mipmcfnpph3aygdam61y1"; depends=[copula mnormt partitions maxLik mnormpow VGAM]; }; +HiLMM = derive { name="HiLMM"; version="1.0"; sha256="1x3my51vzxlk9q7vj2ljpqinxw777953mhgzvbqildph4szh4xh4"; depends=[]; }; +HiPLARM = derive { name="HiPLARM"; version="0.1"; sha256="0af68gfmc89nn1chmqay6ix0zygcp1hmylj02i7l6rx6vb06qw6w"; depends=[Matrix]; }; +HiddenMarkov = derive { name="HiddenMarkov"; version="1.8-1"; sha256="13c5g6wryzry1rvqcfpkjm9vibc6lv864fvcjmr2z8ianiqrrn6p"; depends=[]; }; +HierO = derive { name="HierO"; version="0.1"; sha256="009lf28k8grldapk3smcsjs14gxl1y58p39ksc3nv9i1hzkcd62z"; depends=[rneos RCurl bitops XML tcltk2]; }; +HistData = derive { name="HistData"; version="0.7-5"; sha256="17s64hfs7r77p0wjzpbgz9wp3gjzbly2d0v784f9m2bka8gj6xhr"; depends=[]; }; +HistogramTools = derive { name="HistogramTools"; version="0.3.1"; sha256="0cc3saly5q2kn1gr2mam7g901ddcipmlrn1m0amgrnbkakby2320"; depends=[Hmisc ash stringr]; }; +HiveR = derive { name="HiveR"; version="0.2-27"; sha256="1c0isfiq8xw68qi3mk6m5dilsvbib7hy0ill9wga6kf6qndlfc49"; depends=[RColorBrewer plyr tkrgl jpeg png]; }; +Hmisc = derive { name="Hmisc"; version="3.14-6"; sha256="0nr5m7izxm0kq64hjslvxrnpdm8szl7wmvg6ic4xqck86mxba9py"; depends=[lattice survival Formula latticeExtra cluster rpart nnet acepack foreign]; }; +Holidays = derive { name="Holidays"; version="1.0-0"; sha256="1p7rwph50i0dwl7a6n394dq7sl9nb2y8p5ip5y6ql48ixjh4d078"; depends=[TimeWarp]; }; +HotDeckImputation = derive { name="HotDeckImputation"; version="1.0.0"; sha256="0zb02wcpq09lr7lr4wcgrbw9x7jcvhi34g7f4s6h88zz7xg9daw5"; depends=[Rglpk]; }; +Hotelling = derive { name="Hotelling"; version="1.0-2"; sha256="0dzsqnn4c4av23qjnmacwc78i0xg355p1xwfmgipr04ivym0mqn0"; depends=[corpcor]; }; +HyPhy = derive { name="HyPhy"; version="1.0"; sha256="0994ymv7sswbp8qw3pay34s926cflw2hq2gnchw7rknybvlsrinq"; depends=[ape R_utils]; }; +HybridMC = derive { name="HybridMC"; version="0.2"; sha256="1wgzfyk0scwq9s2sdmc91fj7r4d7zlgwgnj6mdiia8w88ja8kzqy"; depends=[coda]; }; +HydroMe = derive { name="HydroMe"; version="2.0"; sha256="1a1d3lay94mzwk8n22l650h3p133npdf4aj63zgrdw4760p54rqf"; depends=[nlme minpack_lm]; }; +HyperbolicDist = derive { name="HyperbolicDist"; version="0.6-2"; sha256="1wgqbx9ascyk6gw1dmvfz6hljvbh49gb9shr9qgf22qbq83waiva"; depends=[]; }; +IASD = derive { name="IASD"; version="1.0.7"; sha256="0a25sd82fxnmz3f4iaxhc69cdfb7xmh7wi79wv11sbw9cv2pl7kr"; depends=[]; }; +IAT = derive { name="IAT"; version="0.2"; sha256="0byivq2298sjvpsz5z1w7r31h6z2jqpip40z8r2alygbgwwa48pd"; depends=[data_table ggplot2]; }; +IBDhaploRtools = derive { name="IBDhaploRtools"; version="1.7"; sha256="1jg2vrs9ly7l8yidw8ppa41v657jhjcj7n27zi1f2vsh3vmjri0m"; depends=[]; }; +IBDsim = derive { name="IBDsim"; version="0.9-4"; sha256="0cpabz7mnhsrmjrgb23zs5anjrkhwc2005b2inl6p93l47i81fps"; depends=[paramlink]; }; +IBHM = derive { name="IBHM"; version="1.1-11"; sha256="1m0zxlybcak2v5c4spgaa39ngb2hryak4xd875jryk1dcnk9c702"; depends=[DEoptim cmaes Rcpp Rcpp]; }; +IBrokers = derive { name="IBrokers"; version="0.9-12"; sha256="0mhh4kgwrncrcysvnvah6xc7fhx5ywjzn258cs9xj9kzns0jblk6"; depends=[xts zoo]; }; +IC2 = derive { name="IC2"; version="1.0-1"; sha256="03jjb62msxjxdg9l3zd1ns0d2w37hkxy5pnjgaywxw3vfk4zwfj9"; depends=[]; }; +ICC = derive { name="ICC"; version="2.2.1"; sha256="1xl8x8ddbrk8ma57mybmmv9m096wlpbas7hsmd2c6qzcrlz6i7wa"; depends=[]; }; +ICE = derive { name="ICE"; version="0.69"; sha256="04p8lakaha28mdh965w0ppyxfrz5ssi1n9xifvsbn3ihdra67rip"; depends=[KernSmooth]; }; +ICEbox = derive { name="ICEbox"; version="1.0"; sha256="1m3p0b93ksrcsp45m4gszcz01cwbfpj4ldar6l0q3c9lmyqsznx8"; depends=[sfsmisc]; }; +ICEinfer = derive { name="ICEinfer"; version="1.0-1"; sha256="0gjgr1r33w6d5ra0njh15lj46lw6v751yl8iqrdf4a5pazs7w3lm"; depends=[lattice]; }; +ICGE = derive { name="ICGE"; version="0.3"; sha256="0xin7zml1nbygyi08hhg3wwr2jr1zcsvrlgia89zp4xanxlzgaqa"; depends=[MASS cluster]; }; +ICS = derive { name="ICS"; version="1.2-4"; sha256="1sfm9ymrrl72jzg8gsdw6v4q20i4s2w4syyr7brlvan136khpqyn"; depends=[mvtnorm survey]; }; +ICSNP = derive { name="ICSNP"; version="1.0-9"; sha256="0kisk7wk0zjsr47hgrmz5c8f2ljsl7x4549a1rwzsfkjz8901qka"; depends=[mvtnorm ICS]; }; +ICsurv = derive { name="ICsurv"; version="1.0"; sha256="1mbndpy3x5731c9y955wscy76jrxlgv33bf6ldqp65cwyvdgxl86"; depends=[MASS matrixcalc]; }; +IDPSurvival = derive { name="IDPSurvival"; version="1.0"; sha256="1v1w0i74b065b4qc302xbdl5df7qx9z8jmbc9cn46fqm1hh2b6d7"; depends=[Rsolnp gtools survival]; }; +IDPmisc = derive { name="IDPmisc"; version="1.1.17"; sha256="0nbwdyg9javjjfvljwbp2jl0c6414c11zb2pirmm5pmimaq9vv0q"; depends=[lattice]; }; +IM = derive { name="IM"; version="1.0"; sha256="1f1vr5zfqnanc5xmmlfkjkvxwbyyysi3mcvkg95p8r687a7zl0cx"; depends=[png jpeg bmp]; }; +IMIS = derive { name="IMIS"; version="0.1"; sha256="09zb48vdj0i3vf8vxrs07xwb9ji27vp2fyvmg6jfq631licsryc2"; depends=[mvtnorm]; }; +INLABMA = derive { name="INLABMA"; version="0.1-5"; sha256="1z5mwibgrc0hrwjq70pm49l5ppcwwm5z4slc1madr291w37awi51"; depends=[Matrix spdep]; }; +IPMpack = derive { name="IPMpack"; version="2.1"; sha256="08b79g5a9maxnxladvc2x2dgcmm427i8p6hhgda3mw2h5qmch2q3"; depends=[Matrix MASS nlme]; }; +IPSUR = derive { name="IPSUR"; version="1.5"; sha256="0brh3dx7m1rilvr1ig6vbi7p13bfbblgvs8fc114f08d90fczwnq"; depends=[]; }; +IQCC = derive { name="IQCC"; version="0.6"; sha256="0gsnkdl4cfxzq6pm9g4i1g23mxg108j3is4x69id1xn2plf92m04"; depends=[qcc MASS micEcon miscTools]; }; +IRTShiny = derive { name="IRTShiny"; version="1.0"; sha256="1gjfqjqk7izl23b96g758dn6pb784ayb8yjjlryyrwga6mgsqdik"; depends=[shiny shinyAce beeswarm CTT ltm]; }; +ISBF = derive { name="ISBF"; version="0.2.1"; sha256="12mk4d0m5rk4m5bskkkng5j6a9dzh8l1d74wh8lnamq7kf9ai9if"; depends=[]; }; +ISDA_R = derive { name="ISDA.R"; version="1.0"; sha256="0w6p2iy6s7fy8pw2cf4b5zhqcgjjwd5bkax1aqflaaj4ppmfx64v"; depends=[scatterplot3d]; }; +ISLR = derive { name="ISLR"; version="1.0"; sha256="0gmhvsivhpq3x8a240lgcbv1qzdgf6wxms4svak1501clc87xc6x"; depends=[]; }; +ISOcodes = derive { name="ISOcodes"; version="2014.03.24"; sha256="0a6ap9a5h88c6iqzlqfalcg1fwm9x7rm3c8z9vwxfw6jrjs6v2cp"; depends=[]; }; +ISOpureR = derive { name="ISOpureR"; version="1.0.4"; sha256="1gs178knqzzlj1zdrv3vr3kx6ff377pky7q1z9rp4b7d1ickmg9q"; depends=[]; }; +ISOweek = derive { name="ISOweek"; version="0.6-2"; sha256="1f1h8pgjaa14cvaj8ldl87b4vslxwvyfj46m0hkylwp73sv3g2mm"; depends=[stringr]; }; +ISwR = derive { name="ISwR"; version="2.0-6"; sha256="1ms4lm1skfqaq4mnm03kvjb7kaxdzv72s6i77zp7z17gzfa40c9h"; depends=[]; }; +IUPS = derive { name="IUPS"; version="1.0"; sha256="01pv03ink668fi2vxqybli0kgva13gxhqfdxkwz6qk5rnpzwvf5w"; depends=[R2jags Matching boot]; }; +Iboot = derive { name="Iboot"; version="0.1-1"; sha256="1fahh86kgv2axj2qg14n87v888sc0kb567s6zr3fh5zv361phwkq"; depends=[]; }; +IgorR = derive { name="IgorR"; version="0.7.1"; sha256="1ahj1ckzjffsskicdy2b70pzx5cn2r0s22yg1ajwiyy4ykwcg4pk"; depends=[bitops]; }; +Imap = derive { name="Imap"; version="1.32"; sha256="0b4w0mw9ljw6zxwvi0qzb08yq9n169lzgkdcwizrd07x9k9xjxs7"; depends=[]; }; +ImpactIV = derive { name="ImpactIV"; version="1.0"; sha256="1bb6gw1h15hscr71hy779k2x5ywzx63ylim3hby02d7fnnj46p58"; depends=[nnet]; }; +InPosition = derive { name="InPosition"; version="0.12.7"; sha256="1f7xb2kxikmja4cq7s1aiwhdq27zc6hghjbliqqpm8ci8860lb8p"; depends=[prettyGraphs ExPosition]; }; +IndependenceTests = derive { name="IndependenceTests"; version="0.2"; sha256="04qfh2mg9xkfnvp6k7w1ip4rb663p3pzww9lyprcjvr3hcac7gqa"; depends=[xtable]; }; +InfDim = derive { name="InfDim"; version="1.0"; sha256="0rh3ch0m015xjkxy08vf9pc6q7azjc6sgicd2j6cwh611pqq39wq"; depends=[]; }; +InferenceSMR = derive { name="InferenceSMR"; version="1.0"; sha256="13d3v8kyk6br33659jgql6j1nqmnd8zszqrwfw2x3khkiqzgdmhk"; depends=[survival]; }; +IntLik = derive { name="IntLik"; version="1.0"; sha256="13ww5bsbf1vnpaip0w53rw99a8hxzziibj7j66cm31jmi8l6fznf"; depends=[maxLik]; }; +InterVA4 = derive { name="InterVA4"; version="1.5"; sha256="0w2klq9dara941d4xz85qrq8dcp7vpc6rrz2k9ry01rsnpdzzybh"; depends=[]; }; +Interact = derive { name="Interact"; version="1.1"; sha256="1g9zhafdpr7j410bi8p03d8x9f8m3n329x8v01yk15f65fp7pl1d"; depends=[]; }; +InteractiveIGraph = derive { name="InteractiveIGraph"; version="1.0.6.1"; sha256="0srxlp77xqq0vw2phfv7zcnqswi2i5nzkpqbpa5limqx00jd12zy"; depends=[igraph]; }; +Interpol = derive { name="Interpol"; version="1.3.1"; sha256="1598lnnrcxihxysdljphqxig15fd8z7linw9byjmqypwcpk6r5jn"; depends=[]; }; +Interpol_T = derive { name="Interpol.T"; version="2.1.1"; sha256="1fbsl1ypkc65y6c0p32gpi2a2aal8jg02mclz7ri57hf4c1k09gz"; depends=[date chron]; }; +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]; }; +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-22"; sha256="097xxgqdk2j7y22qflrgss9pgbyg01rcw5088b43pbv3sc85fqcs"; 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]; }; +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]; }; +JGR = derive { name="JGR"; version="1.7-16"; sha256="0iv659mjsv7apzpzvmq23w514h6yq50hi70ym7jrv948qrzh64pg"; depends=[rJava JavaGD iplots]; }; +JM = derive { name="JM"; version="1.3-0"; sha256="0yn33dvy9kp7xaxlqk11f86qaichdcxpmq04gpnbcs8w8cdjjz3m"; depends=[MASS nlme survival]; }; +JMbayes = derive { name="JMbayes"; version="0.6-1"; sha256="1zshy4v7jj3r1vcp9yrw1jj5abmc8wkglsxdb5v6rpmk4xwhvvcq"; depends=[MASS nlme survival]; }; +JMdesign = derive { name="JMdesign"; version="1.1"; sha256="0w5nzhp82g0k7j5704fif16sf95rpckd76jjz9fbd71pp2d80vlh"; depends=[]; }; +JOP = derive { name="JOP"; version="3.6"; sha256="1kpb1dy2vm4jgzd3h0qgdw53nfp2qi74hgq5l5inxx4aayncclk7"; depends=[Rsolnp dglm]; }; +JPSurv = derive { name="JPSurv"; version="1.0.1"; sha256="11hfji0nyfmw1d7y2cijpp7ivlv5s9k8g771kmgwy14wflkyf7g2"; depends=[]; }; +JavaGD = derive { name="JavaGD"; version="0.6-1"; sha256="13n6xzbbjgd0bpwv2xgm3dlscg87wh32q6fcq50kk6byp6yv05sc"; depends=[]; }; +Jmisc = derive { name="Jmisc"; version="0.3.1"; sha256="1szn29dng54l2xmrm6pg3d5rmwdc1ks23vsnsmplnr5rx7yj002s"; depends=[]; }; +JoSAE = derive { name="JoSAE"; version="0.2.2"; sha256="1ag4qg9cfcg8i2xz79bza2qlw3azw33h7k2ip5nlfkfpd33l9w05"; depends=[nlme]; }; +Johnson = derive { name="Johnson"; version="1.4"; sha256="12ajcfz5mwxvimv8nq683a2x3590gz0gnyviviyzf5x066a4q0lj"; depends=[]; }; +JohnsonDistribution = derive { name="JohnsonDistribution"; version="0.24"; sha256="00211pa2wn4bsfj6wfl9q9g123cp8iz3kxc17pw9q65j9an4sr0m"; depends=[]; }; +JointRegBC = derive { name="JointRegBC"; version="0.1.1"; sha256="0w7ygs3pvlqkkb2x20kv20kda3gz7cn6zgrkg30nhjxp318d76ab"; depends=[nlme MASS survival]; }; +JudgeIt = derive { name="JudgeIt"; version="1.5.1"; sha256="1jssz1x9gw9hjpqlqbvlxa99icl8gffzl6qya0cnaxr50p82hdag"; depends=[]; }; +Julia = derive { name="Julia"; version="1.1"; sha256="0i1n150d89pkds7qyr0xycz6h07zikb2y07d5fcpaqs4446a8prg"; depends=[]; }; +KANT = derive { name="KANT"; version="2.0"; sha256="169j72pmdkcj6hv8qgmc02aps0ppvvl1vnr1hzrb1gsf7zj7bs3y"; depends=[]; }; +KATforDCEMRI = derive { name="KATforDCEMRI"; version="0.740"; sha256="1k8fihd9m26k14rvc5d5x0d9xc3mh8d49hs64p55np1acqfhg2sy"; depends=[locfit R_matlab matlab]; }; +KFAS = derive { name="KFAS"; version="1.0.4-1"; sha256="0s9mrqb1mvs77z57hx734kajbyqddcc9j20wrsmrbf8g97in61s7"; depends=[]; }; +KFKSDS = derive { name="KFKSDS"; version="1.5"; sha256="0wahqli7j851kdqi29b059gb2zm0x00fq08sixvlrcbdf3irlv3m"; 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]; }; +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]; }; +Kendall = derive { name="Kendall"; version="2.2"; sha256="0z2yr3x2nvdm81w2imb61hxwcbmg14kfb2bxgh3wmkmv3wfjwkwn"; depends=[boot]; }; +KernSmooth = derive { name="KernSmooth"; version="2.23-13"; sha256="1r9zrr3cfiblr2nkyzn05x82kab0fj2qn2nknnsdm80y42lvsprz"; depends=[]; }; +KernSmoothIRT = derive { name="KernSmoothIRT"; version="6.1"; sha256="1hq4sykddh9sg24qrnccii89nqxmq7hnldhn8wl6y62aj0h1nrqm"; depends=[Rcpp plotrix rgl Rcpp]; }; +Kmisc = derive { name="Kmisc"; version="0.5.0"; sha256="0pbj3gf0bxkzczl6k4vgnxdss2wmsffqvcf73zjwvzvr8ibi5d95"; depends=[Rcpp data_table lattice knitr markdown Rcpp]; }; +KoNLP = derive { name="KoNLP"; version="0.76.9"; sha256="1q72irl4izb7f5bb99plpqnmpfdq4x4ymp4wm2bsyfjcxm649ya8"; depends=[rJava stringr hash tau Sejong]; }; +Kpart = derive { name="Kpart"; version="1.1"; sha256="1cyml48i1jvwy4xzymijwraqpnssnkrd81q3m7nyjd5m2czjvihv"; depends=[leaps]; }; +KrigInv = derive { name="KrigInv"; version="1.3"; sha256="1zgrx0rmcaf3j3igqhvnbzjwh2dm2x5s5l027c7cbrl1rn20im0r"; depends=[DiceKriging rgenoud MASS lhs pbivnorm randtoolbox DiceView]; }; +KsPlot = derive { name="KsPlot"; version="1.3"; sha256="1mzpsgzscpv888ipfh9nakhqrgw7rdinb5lwhkjk9yk7ap5lfvs0"; depends=[e1071 caret nnet MASS caTools mda glmnet randomForest mvpart]; }; +LARF = derive { name="LARF"; version="1.2"; sha256="1qhi5zkgk8qlgfvq0jas9dda6nlg94kcay1famm0s488ssg6sr3k"; depends=[]; }; +LCA = derive { name="LCA"; version="0.1"; sha256="14nhx2fs18558zljnw56mdz3qx30v394llhzswxhznjfiiqc9z5h"; depends=[]; }; +LCAextend = derive { name="LCAextend"; version="1.2"; sha256="1y9azq9v42a3z5fq6gj8js89qblb2z93k4mg4jmw0wgkyv6mysfc"; depends=[boot mvtnorm rms kinship2]; }; +LCFdata = derive { name="LCFdata"; version="2.0"; sha256="1x3vbr6hdviqvd6dxn1kb449g0q5zkfmjsmr5nxd2g82p69lv3xm"; depends=[]; }; +LDExplorer = derive { name="LDExplorer"; version="1.0.3"; sha256="1hkhbhclm1bvxzq7z663i583f94cvkklaq0z5qkswrpi406md7mi"; depends=[]; }; +LDOD = derive { name="LDOD"; version="1.0"; sha256="0mf2sy01yv57mqicrz08a17m6crigklx6fmw9zpxv7g85qw1iq4v"; depends=[Rsolnp Rmpfr]; }; +LDRTools = derive { name="LDRTools"; version="0.1"; sha256="1cr0v6qsdldy89p44lhr6hisqaz99qzab32kd1srdnnwnwl1q2y4"; depends=[]; }; +LDcorSV = derive { name="LDcorSV"; version="1.3.1"; sha256="0i4npl90mkj8vry6ckq8bc4ydbl44vxichgsxyn80r6k9i71yl67"; depends=[MASS]; }; +LDheatmap = derive { name="LDheatmap"; version="0.99-1"; sha256="1bj42chw1xyf8yg6cfv9p4yzsggng7zy6wrw6q22559pwm6c6vr0"; depends=[genetics]; }; +LDtests = derive { name="LDtests"; version="1.0"; sha256="1jwqr7zlp9hv7vw8xp80xvrwbdv796wjgr914v393wfa07j5wbd1"; depends=[]; }; +LEAPFrOG = derive { name="LEAPFrOG"; version="1.0.7"; sha256="0z9ahkk4qzc45h1r806frv9cd84vvshvn5mr84gx7qdxljfkfq6h"; depends=[alabama MASS]; }; +LGS = derive { name="LGS"; version="0.91"; sha256="0rzj1shapyg7hyzsb9v81dirwihd7bz9s861l75g3yl3p4qm8sg7"; depends=[]; }; +LICORS = derive { name="LICORS"; version="0.2.0"; sha256="0p9y21k1mj1v397jpb5g6jiw7rpzbyfwr4kv2rp3lyxyasy2ykf0"; depends=[RColorBrewer mvtnorm zoo FNN fields locfit Matrix]; }; +LICurvature = derive { name="LICurvature"; version="0.1.1"; sha256="09hqar4kvksd816ya6jg349r0v6z2m2109hq6j4k1d2vchab4lni"; depends=[MASS]; }; +LIHNPSD = derive { name="LIHNPSD"; version="0.2.1"; sha256="08ils29vvaq6abkgxbh028vwjw6l6h10cirbnwr65s458zvh4xqv"; depends=[sn moments BB Bolstad2 optimx Rmpfr]; }; +LIM = derive { name="LIM"; version="1.4.5"; sha256="1dir9dqrpns77n5ydm3fpj2k0pl7q15z8vqbi5704vsfv94mgmas"; depends=[limSolve diagram]; }; +LINselect = derive { name="LINselect"; version="0.0-1"; sha256="1n6nsspdp1ig8v9bclyga072hxqj2hb9n1smrqia8jrma07yaydl"; depends=[]; }; +LIStest = derive { name="LIStest"; version="2.1"; sha256="1gk253v3f1jcr4z5ps8nrqf1n7isjhbynxsi9jq729w7h725806a"; depends=[]; }; +LMERConvenienceFunctions = derive { name="LMERConvenienceFunctions"; version="2.5"; sha256="1kq0ww8h43rsygjz5pmb3ym027klgi4sw1csdr9apwgd3ydbnr7n"; depends=[Matrix lme4]; }; +LMest = derive { name="LMest"; version="2.0"; sha256="0fv38rb9hwlbay632hhb58vga48sq89chm5qn61l6mf3wfkx2rcg"; depends=[MASS MultiLCIRT]; }; +LOGICOIL = derive { name="LOGICOIL"; version="0.99.0"; sha256="1wgg7kigzzk5ghjn3hkjf1bb8d6mvjfmkwq64phri5jpxd742ps9"; depends=[nnet]; }; +LOST = derive { name="LOST"; version="1.1"; sha256="19ar85dykbz0jlzbhlm3pcpffj4cizc6sj3gn93qdvpxkp64jfq9"; depends=[gdata shapes e1071 MASS miscTools]; }; +LPCM = derive { name="LPCM"; version="0.44-8"; sha256="14627wk5azxm3y3a0qfy4qz57nxbdcasnv7djpqhk2gxf5smq19k"; depends=[]; }; +LPS = derive { name="LPS"; version="1.0.4"; sha256="0dy45nn1bmzd17y2dsh4pf4jmh9qvifigvpg2lv2zrmvlx53cli5"; depends=[]; }; +LPStimeSeries = derive { name="LPStimeSeries"; version="1.0-3"; sha256="06w4gcz3h4gi05zzb37adxj4kl6pxpmlbzl4xaf03vqyabnvv9s0"; depends=[]; }; +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]; }; +LSAfun = derive { name="LSAfun"; version="0.3.2"; sha256="1pxa3paq7kq07h3a14hdkx4s3g3dq4wn2q5nvp1083gg0zk0fpgh"; depends=[lsa rgl]; }; +LSC = derive { name="LSC"; version="0.1.5"; sha256="1nlnwqb24sbgvl96azh8a833ij5xknjr2wr8shs59lm2n63a3ql9"; depends=[LICORS RColorBrewer fields gam Matrix]; }; +LSD = derive { name="LSD"; version="2.5"; sha256="0j7lmsz93q2zv9y05aan5pwhpzh8m1i45mh4p386g7bvfrwlmxbx"; depends=[MASS gtools RColorBrewer colorRamps schoolmath ellipse]; }; +LSMonteCarlo = derive { name="LSMonteCarlo"; version="1.0"; sha256="0w5042phkba5dw92r67ppp2s4khjpw5mm701dh9dya9lhj88bz6s"; depends=[mvtnorm fBasics]; }; +LTPDvar = derive { name="LTPDvar"; version="1.1"; sha256="0zb3ffz5vw1zabgzhpcw1mzfqh4g7r0sq4iy31nzyv8smdwddqzw"; depends=[]; }; +LTR = derive { name="LTR"; version="1.0.0"; sha256="15g5hbrwhab80sarbjgwzvsn6c4fl18h014kz5fpzf0n1rijybik"; depends=[]; }; +LVMMCOR = derive { name="LVMMCOR"; version="0.01.1"; sha256="1lq4hqcg0qkywdr4a22m1fr3m97749mm6n2jzdj9i7jrf0agc1fs"; depends=[nlme MASS]; }; +LVQTools = derive { name="LVQTools"; version="1.2"; sha256="06mninrrr49xsh00gfsp0vc418r6pdvq3m6sbnj0ywdyki106mni"; depends=[]; }; +LaF = derive { name="LaF"; version="0.6.1"; sha256="1yg498qzxzx4qpp27rwh854x7vkz8iqmny1pvcy2rvnnb8g0wk24"; depends=[Rcpp Rcpp]; }; +Lahman = derive { name="Lahman"; version="3.0-1"; sha256="0w7vp3vjxhigyyqmmka4bw5v4pp5z3jzmf0krq8biwzrpx5qp86x"; depends=[]; }; +LakeMetabolizer = derive { name="LakeMetabolizer"; version="1.1"; sha256="0l2l9l2c75cmxpqi2w9cgsad2ffnx6b7wvx6xdx6mkb52kkp9sqy"; depends=[rLakeAnalyzer plyr]; }; +Lambda4 = derive { name="Lambda4"; version="3.0"; sha256="04ikkflfr0nmy1gr3gfldlh2v8mpl82k1wwnzp57d2kn75m9vbxz"; depends=[]; }; +LambertW = derive { name="LambertW"; version="0.5"; sha256="19xkm27015q552g1c1j9bsckg4z4jb0avzxs2vs6hscyf5vh41zr"; depends=[moments MASS gsl]; }; +Laterality = derive { name="Laterality"; version="0.9.2"; sha256="13b1mpjcq7a14dwscnfs07hahd9is2fbn4wxwh31732vv3hr7kwm"; depends=[ade4]; }; +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"; sha256="18b3gncn18jvsjprjmaays67iwjdcpszy5z711rb71h1vyi0fdfs"; depends=[]; }; +LearnBayes = derive { name="LearnBayes"; version="2.15"; sha256="0cz2rgqy1cmdz2h1qbdvfqxmmdzmg2z1scdlxr7k385anha13ja5"; depends=[]; }; +LiblineaR = derive { name="LiblineaR"; version="1.80-10"; sha256="0qhcrdazqn7zf3wq79rg0sr9bp9a7fw6p3gjrhyyn3b2klbrcz7k"; depends=[]; }; +LifeTables = derive { name="LifeTables"; version="0.2"; sha256="1n4mqypxm0rbi77ykpr6bpzxfxvq8mm9bmfvcqz7k3ajb78cdr0d"; depends=[mclust]; }; +LinCal = derive { name="LinCal"; version="1.0"; sha256="1xr9jnna20hh78dh9wjg70jm8fhaxvdwql894kdp0y5h4pchkdph"; depends=[]; }; +LinRegInteractive = derive { name="LinRegInteractive"; version="0.3-0"; sha256="0yk5ys8rc8ilxrbdkf1kmqpkny66lcm47fbip90m0n83v21f1jkk"; depends=[rpanel xtable]; }; +LindenmayeR = derive { name="LindenmayeR"; version="0.1-0"; sha256="0pkb6wgbn2iqszq4zr088x90k16jkk0r8pzmfpvzxv6k3m2lrv87"; depends=[stringr]; }; +LinearizedSVR = derive { name="LinearizedSVR"; version="1.3"; sha256="0h3xmlnd5x37r5hdhcz90z5n1hsbr2ci3m939i89p1x9644i2l5g"; depends=[kernlab LiblineaR expectreg]; }; +Lmoments = derive { name="Lmoments"; version="1.1-5"; sha256="13s9lbmfbjfam6xg0q9jl2p3q3db3pimcmnx47vx82qdm43xa4an"; depends=[]; }; +Lock5Data = derive { name="Lock5Data"; version="2.6"; sha256="0ckaac00ck5vyv0gv25l1zhgkm3char6ks1p4fl3vdl5gdyrc1pp"; depends=[]; }; +LogConcDEAD = derive { name="LogConcDEAD"; version="1.5-9"; sha256="135vkp70q6gn75ds43aq08y13vrsgsgykssmnhrh6545i86vmhhi"; depends=[MASS mvtnorm]; }; +LogicForest = derive { name="LogicForest"; version="2.1.0"; sha256="0zdyyi6wka0568414f1kw91rx04y76n1k11wxd4r8svb5wybjhp5"; depends=[LogicReg CircStats gtools plotrix]; }; +LogicReg = derive { name="LogicReg"; version="1.5.5"; sha256="1lccxiafi2g2jmzaklcgman5zgax2rvfh61qzwz1w0p57460m581"; depends=[survival]; }; +LogisticDx = derive { name="LogisticDx"; version="0.1"; sha256="1w530panmbwf4qplzzj02q9g2lfzrkawxy66ibwdd14z9bwjdclj"; depends=[multcomp data_table pROC car gRbase rms statmod speedglm]; }; +LogitNet = derive { name="LogitNet"; version="0.1-1"; sha256="08xi5rpbqkc1b3qj24blv3l0r68wcqbsbjcqxiypm75f3c2irc4i"; depends=[]; }; +LogrankA = derive { name="LogrankA"; version="1.0"; sha256="005zkpzi8h03qvqlpkygrf9xv4q77klafkfxw47x04jvkhklwigb"; depends=[]; }; +LoopAnalyst = derive { name="LoopAnalyst"; version="1.2-3"; sha256="0xbiy1xa2c6acfrzh6p9pa6wrds8ipskxq0f86ia9g5zkp1rjk2j"; depends=[nlme]; }; +LowRankQP = derive { name="LowRankQP"; version="1.0.2"; sha256="0is7v4cy4w1g3wn4wa32iqv4awd1nwvfcb71b3yk5wj59lpm8gs3"; depends=[]; }; +Luminescence = derive { name="Luminescence"; version="0.3.4"; sha256="036kib458qwr1l1pl1nb4hip43rchmx7qwf32y8z7b8nf9b8sbvy"; depends=[Rserve XML shape rgl matrixStats]; }; +M3 = derive { name="M3"; version="0.3"; sha256="1l40alk166lshckqp72k5zmsgm7s5mgyzxlp11l64mgncjwkw2r3"; depends=[ncdf4 rgdal maps mapdata]; }; +MADAM = derive { name="MADAM"; version="1.2.2"; sha256="09w5liqa3mpkbyvkwlabcgyg2b4316qpzq7pbpl0wxl74bsh76vq"; depends=[]; }; +MAINT_Data = derive { name="MAINT.Data"; version="0.3"; sha256="1qh7kdcnwfibzyhr53inqjz61srbpypcqjri60zdl32jpf109vng"; depends=[MASS miscTools]; }; +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]; }; +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]; }; +MAR1 = derive { name="MAR1"; version="1.0"; sha256="1r6j890icl5h3m2876sakmwr3c65513xnsj68sy0y0q7xj3a039l"; depends=[leaps bestglm]; }; +MARSS = derive { name="MARSS"; version="3.9"; sha256="0vn8axzz0nqdcl3w00waghz68z8pvfm764w11kxxigvjpw2plj31"; depends=[nlme mvtnorm KFAS]; }; +MASS = derive { name="MASS"; version="7.3-35"; sha256="0kcyl2c6nk39fy6kprcxf4mwq8lkrwysgq6hwcrf4hspz79bnmd2"; depends=[]; }; +MASSTIMATE = derive { name="MASSTIMATE"; version="1.2"; sha256="1j9l8b5d518ag9ivzr1z4dd2m23y2ia1wdshx1krmshn8xsd6lwp"; depends=[]; }; +MAT = derive { name="MAT"; version="2.2"; sha256="093axw2zp4i3f6s9621zwibcxrracp77xrc0q5q0m4yv3m35x908"; depends=[Rcpp Rcpp RcppArmadillo]; }; +MATA = derive { name="MATA"; version="0.1"; sha256="1wdlxdw270fgh4h4dyshrrjbdha8whqrncmfjxrs3rixkh03izhb"; depends=[]; }; +MATTOOLS = derive { name="MATTOOLS"; version="1.1"; sha256="1nzrkm3a08rpsd9vplyf33rrkadlrd0ln70k95qxj98ndh2v97px"; depends=[]; }; +MAVIS = derive { name="MAVIS"; version="0.2"; sha256="0d89li88rp4dl3b13ldjfsnjsrskkphqm9qd8sbqivzn1xr2ylgv"; depends=[shiny shinyAce metafor MAd MAc quantreg ggplot2]; }; +MAVTgsa = derive { name="MAVTgsa"; version="1.3"; sha256="0rzal9nsi8y873cbf6hrdyzyxnpd4r1yr9fj66cn0s1c8g93ls0y"; depends=[corpcor foreach multcomp randomForest MASS]; }; +MAc = derive { name="MAc"; version="1.1"; sha256="1lshi5rb8l2mpd302wskhlk5vz1wjidvbss9y69l63zjqdwjs7ch"; depends=[]; }; +MAclinical = derive { name="MAclinical"; version="1.0-5"; sha256="1g0ka1kqww2xim8rp5rznkzn0a541zvf841s3lbphfh9k3y3ixs3"; depends=[party plsgenomics st e1071]; }; +MAd = derive { name="MAd"; version="0.8-1"; sha256="16lis6q61d11z0kn3svd77yr0k3jm0zhqpwacl86jdjlmn67l92i"; depends=[]; }; +MBA = derive { name="MBA"; version="0.0-8"; sha256="09rs1861fz41dgicgh4f95v4zafh1jfxhqar1plpqqdx8z1gpxfl"; depends=[sp BH]; }; +MBCluster_Seq = derive { name="MBCluster.Seq"; version="1.0"; sha256="0xbi2r0g0gzsy05qrq1ljr5f5s3glwxj204vk2f1lgwdx3fd116m"; depends=[]; }; +MBESS = derive { name="MBESS"; version="3.3.3"; sha256="12jsrxwdprrahqbk0i0js7lja81ydy385xmijlqk0slppd72dd9c"; depends=[]; }; +MBI = derive { name="MBI"; version="1.0"; sha256="1lb0sjwa6x360n9a9pagz6yhxh37gxq1fk0f5c3i2sd56ny9jpns"; depends=[]; }; +MBmca = derive { name="MBmca"; version="0.0.3-4"; sha256="1vmzf7df3d5a9nilm4pvv31dyspazab2gm3i6ccqrffq0l93kdgi"; depends=[robustbase chipPCR]; }; +MC2toPath = derive { name="MC2toPath"; version="0.0.16"; sha256="0jdn9wpxavn2wrml907v23mfxr62wwjdh7487ihjj59g434ry7wh"; depends=[RNetCDF]; }; +MCAPS = derive { name="MCAPS"; version="0.3-2"; sha256="1jvxl9xi102pcs3swxlx4jk76i7i4fll88c92k7m379ik3r36alb"; depends=[stashR]; }; +MCAvariants = derive { name="MCAvariants"; version="1.0"; sha256="08c5qpklilj41agi5nzm4f5w41pdxk98i1wc1ahhnawc3n2cdbjz"; depends=[]; }; +MCDA = derive { name="MCDA"; version="0.0.6"; sha256="0mkcvf4nllm3i2rw5kmrlzfw7lgz0mblrk1yihgnbf6wlm4v109c"; depends=[Rglpk Kendall glpkAPI]; }; +MCMC_OTU = derive { name="MCMC.OTU"; version="1.0.8"; sha256="1bdmvwxkm162m3237bgf42dm5kp3q0giwf0avrkla8qd834gqch0"; depends=[MCMCglmm ggplot2]; }; +MCMC_qpcr = derive { name="MCMC.qpcr"; version="1.1.3"; sha256="101pbg08p594ilcrrig9sqkddprpl6cd6g9y9rrk1rq6cy5cmrvr"; depends=[MCMCglmm ggplot2]; }; +MCMCglmm = derive { name="MCMCglmm"; version="2.21"; sha256="1mjjp65w7pg2kxrx2qf0lh1kdi9d21xxj7s39zhi3q8ixw35h95r"; depends=[Matrix coda ape corpcor tensorA]; }; +MCMChybridGP = derive { name="MCMChybridGP"; version="4.3"; sha256="1a2mhhscjf7s2qczc4zz2pvb9kichdqr1lnkjsyiy61snbhkvp3n"; depends=[MASS]; }; +MCMCpack = derive { name="MCMCpack"; version="1.3-3"; sha256="0s1j3047qp2fkwdix9galm05lp7jk7qxyic6lwpbd70hmj8ggs76"; depends=[coda MASS]; }; +MCPAN = derive { name="MCPAN"; version="1.1-15"; sha256="0811wrbp0nf4nj8kvq62ks8yksabib8r1a0gx3nr3v6avfnv08w1"; depends=[mvtnorm multcomp]; }; +MCPMod = derive { name="MCPMod"; version="1.0-8"; sha256="1kkak9x66dmannhxfdp6cybbjh2g43p03kyp7a4x1az7h4bnc92f"; depends=[mvtnorm lattice]; }; +MCPerm = derive { name="MCPerm"; version="1.1.4"; sha256="0g65vzn43k6qrsglxd2kz245f662gl3c2gdz6qvvxa96v6q9lhh1"; depends=[metafor]; }; +MCS = derive { name="MCS"; version="0.1.0"; sha256="0wjw3h6hi7djxgysp6bnwh419k0i312bxf8adws3f19697agxr02"; depends=[]; }; +MChtest = derive { name="MChtest"; version="1.0-2"; sha256="01lflilrp42m236cznn6qgzvv5v9fzpx6wcfxp3q545bw2xmbdvj"; depends=[]; }; +MConjoint = derive { name="MConjoint"; version="0.1"; sha256="02yik28mhvd4rfqwrprdbdjx9c49ds55fh042bsjajs2ip467w5c"; depends=[]; }; +MDM = derive { name="MDM"; version="1.3"; sha256="1bvjhl243rf19829ly1qc20ik937hb82lq23aiysj7ya55z8hdpf"; depends=[nnet]; }; +MDPtoolbox = derive { name="MDPtoolbox"; version="4.0.2"; sha256="04w0y5ib23l7nhj1947hwvfk6lpwwc11amqpyw1w53yj794g97wz"; depends=[Matrix linprog]; }; +MDR = derive { name="MDR"; version="1.2"; sha256="0g2fvvcwagml6635va87nc0ijzy0pypx5aqzz7mf5w13j0wpm24y"; depends=[lattice]; }; +MEET = derive { name="MEET"; version="5.1.1"; sha256="02xz2zkwqaf1wck9a3h1j6z8dasw4j0zqa88jg6h10wqzcrlp9ba"; depends=[seqinr Matrix ROCR Hmisc KernSmooth]; }; +MEMSS = derive { name="MEMSS"; version="0.9-2"; sha256="0wyw8yjs4miwgwdfcnfbzvkxrgv5r3jlg3cg8q2vy7s69wvhksmy"; depends=[lme4]; }; +MESS = derive { name="MESS"; version="0.3-2"; sha256="0x518awi2mxjh3vq69n1jv4d4dxjxhqfx1py48dijgd6w674d3q8"; depends=[geepack glmnet Matrix kinship2 mvtnorm]; }; +MExPosition = derive { name="MExPosition"; version="2.0.3"; sha256="1l27wp0psfvlkk79fhb8ypf8awardjljg1f37yj42friy9pdfksz"; depends=[prettyGraphs ExPosition]; }; +MF = derive { name="MF"; version="4.3.2"; sha256="1arnhyqf1cjvngygcpqk2g4d52949rhkjmclbaskyxcrvp62qln0"; depends=[]; }; +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]; }; +MIICD = derive { name="MIICD"; version="1.1"; sha256="0d697mggax1yp7b4dfxdi25rqmwrq25gmmjqsag6sa5raqr96gc9"; depends=[mstate prodlim cmprsk riskRegression MASS survival]; }; +MILC = derive { name="MILC"; version="1.0"; sha256="14xsiw5al6kixwvf3ph0dlm8s13gsbqvzb92da6ng3x4iiyb1g0w"; depends=[]; }; +MIPHENO = derive { name="MIPHENO"; version="1.2"; sha256="0hcaq66biv4izszdhqkgxgz91mgkjk1yrwq27fx07a2zmzj44sfv"; depends=[doBy gdata]; }; +MImix = derive { name="MImix"; version="1.0"; sha256="033gxr0z2xba0pgckiigblb1xa94wrfmpgv3j122cdynjch44j4r"; depends=[]; }; +MKLE = derive { name="MKLE"; version="0.05"; sha256="00hcihjn3xfkzy0lvb70hl2acjkwk6s3y7l4gprix24shnblvxzi"; depends=[]; }; +MKmisc = derive { name="MKmisc"; version="0.96"; sha256="1lcnmswvix290s63cqqlq4ls6wyzzb3f5ykcn4sch6nv71bn8x5x"; depends=[RColorBrewer robustbase]; }; +MLCM = derive { name="MLCM"; version="0.4.1"; sha256="1g6lmw75qdiq0fshxr3sqwm1a3y4928chxkggnfwwxp8hqw4r6px"; depends=[]; }; +MLDS = derive { name="MLDS"; version="0.4.3"; sha256="1vql92y2dy1ba5l5xdysqzkzvkrr4bhclmjabn49c8qb2xc2rl40"; depends=[MASS]; }; +MLEP = derive { name="MLEP"; version="0.0-3"; sha256="1v3jiqy9lr3p30bpiibbq5cypy46c7vnsl40z0miyviiv4s1c3vz"; depends=[]; }; +MLEcens = derive { name="MLEcens"; version="0.1-4"; sha256="0zlmrcjraypscgs2v0w4s4hm7qccsmaz4hjsgqpn0058vx622945"; depends=[]; }; +MLRMPA = derive { name="MLRMPA"; version="1.0"; sha256="0gfbi70b15ivv76l3i0zlm14cq398nlny40aci3vqxxd0m2lyyx5"; depends=[ClustOfVar]; }; +MM = derive { name="MM"; version="1.6-2"; sha256="1z7i8ggd54qjmlxw9ks686hqgm272lwwhgw2s00d9946rxhb3ffi"; depends=[magic partitions emulator Oarray]; }; +MMIX = derive { name="MMIX"; version="1.2"; sha256="02c74qp48ixqh5cjp2006zgg4xz4bgxxq3csyhjl219if19kmj5m"; depends=[]; }; +MMMS = derive { name="MMMS"; version="0.1"; sha256="1a71vs3k16j14zgqfd4v92dq9swrb44n9zww8na6di82nla8afck"; depends=[survival glmnet]; }; +MMS = derive { name="MMS"; version="3.00"; sha256="06909912v2hr52s8k0a0830lbmdh05dcd7k47vydhbwq3rzf3ahg"; depends=[glmnet Matrix mht]; }; +MNM = derive { name="MNM"; version="1.0-0"; sha256="0qab0qqhfjmaiji5yqdvd1lqz8f90q40sdwpcah923yi3g6alh2q"; depends=[ellipse ICS ICSNP SpatialNP mvtnorm survey]; }; +MNP = derive { name="MNP"; version="2.6-4"; sha256="068lssg565dw673dm8f5k6dbxl2vblnszg8wibzy3ijf96hp03cw"; depends=[MASS]; }; +MOCCA = derive { name="MOCCA"; version="1.2"; sha256="04smpzn9x64w1vpw4szqa7dwnaak1ls6gpg7fgajs68mv5zivffa"; depends=[cclust clv]; }; +MODISTools = derive { name="MODISTools"; version="0.94.4"; sha256="177gmrzyfx13bznwx1pwfkixypi1x0r1wddxy3mzxf91qj4f335q"; depends=[RCurl XML]; }; +MOJOV = derive { name="MOJOV"; version="1.0.1"; sha256="11mcqxw83z4xx29s34v4rsbb3zvyhlb2lmvf97b77n455gsy5hab"; depends=[aod survey saws lattice]; }; +MPAgenomics = derive { name="MPAgenomics"; version="1.1.2"; sha256="1gwglzkip54si6i23y8s5hhkzrwmhvfyvsian9593ixy4kqlm2bz"; depends=[R_utils changepoint glmnet cghseg HDPenReg spikeslab]; }; +MPCI = derive { name="MPCI"; version="1.0.6"; sha256="1ngxx5363cm2cid3dl9amva016xy914sz49nfdkh88hjsxv3svjc"; depends=[]; }; +MPDiR = derive { name="MPDiR"; version="0.1-15"; sha256="1ga3dk9ncycsq30w6na4g7aik43v8q2kcrg7x6lpmiaa9qa2wn16"; depends=[]; }; +MPINet = derive { name="MPINet"; version="1.0"; sha256="1zw3piqhhpagg5qahc2xahxxfdwdk8w94aass1virlpl0f52ik8s"; depends=[BiasedUrn mgcv]; }; +MPSEM = derive { name="MPSEM"; version="0.2-5"; sha256="1jy459rg7i7x24ygdnlibwlh8rx7arpajjycqw414w5p9yy9ns1f"; depends=[ape MASS]; }; +MPTinR = derive { name="MPTinR"; version="1.6.3"; sha256="1rxh8pj6zc06zhs5rllm98br0bkmgmc9d7hk04m251ji54mj80b1"; depends=[numDeriv Brobdingnag Rcpp Rcpp RcppEigen]; }; +MPV = derive { name="MPV"; version="1.35"; sha256="0mfg05w7zx5my7g60yvbk2fiakrdskb82rcwzpncjdnn3pmc2axv"; depends=[]; }; +MRCE = derive { name="MRCE"; version="2.0"; sha256="0fnd7ykcxi04pv1af5zbmavsp577vkw6pcrh011na5pzy2xrc49z"; depends=[QUIC]; }; +MRCV = derive { name="MRCV"; version="0.3-3"; sha256="0m29mpsd3kackwrawvahi22j0aghfb12x9j18xk4x1w4bkpiscmf"; depends=[tables]; }; +MRH = derive { name="MRH"; version="1.1"; sha256="1qf0kx1b4nrgzx9g68yvnycjflrdhagvxav90q2nsbxk5w6ffnrq"; depends=[survival KMsurv coda]; }; +MRMR = derive { name="MRMR"; version="0.1.3"; sha256="1b3a4bkpcncl4sh7d81nk6b2dzhzqn9zhqdxv31jgippsqm2s3k2"; depends=[reshape2 ggplot2 lubridate lmtest plyr]; }; +MRsurv = derive { name="MRsurv"; version="0.2"; sha256="148myzk6r8whkpv1yv59dmdlr2n8vdwmaww165aw696xfjxwq550"; depends=[survival mvtnorm]; }; +MRwarping = derive { name="MRwarping"; version="1.0"; sha256="13bcs7rlm4irx7yzdnib558w9014a4chh9xwc010m6pxvxv36qnv"; depends=[boa SemiPar]; }; +MSBVAR = derive { name="MSBVAR"; version="0.9-1"; sha256="1qd8v3n9nvyp1j1byb8dkmvkbmk5p2kgx7wjmsa9sh4siqbxzn4w"; depends=[KernSmooth xtable coda bit mvtnorm lattice]; }; +MSG = derive { name="MSG"; version="0.2.2"; sha256="18siw81pa02yg0zs40pavwm88yz7kfi60fislmjpwnl2207a6fhf"; depends=[RColorBrewer]; }; +MSIseq = derive { name="MSIseq"; version="0.99.1"; sha256="1wg0j0qr2g2lhhw57cvlawd5hik0bmqb66ynxgn62sgx1nkj3g74"; depends=[RWeka rJava R_utils]; }; +MSQC = derive { name="MSQC"; version="1.0.1"; sha256="1vs9kygjg9f4sr1m80hdn03gdhbdqfjamqxhbs9zha8smjrsgisw"; depends=[rgl]; }; +MST = derive { name="MST"; version="1.0"; sha256="142xhg7fpf27ba9gi3dxbmpcpmz56dks0rp4ybqpcxiq3z7wacxp"; depends=[survival MASS]; }; +MSeasy = derive { name="MSeasy"; version="5.3.3"; sha256="191mvg1imxfjlnd808ypn4lsjx7n6ydf16flax79hv01z7rcjylh"; depends=[amap clValid cluster fpc]; }; +MSeasyTkGUI = derive { name="MSeasyTkGUI"; version="5.3.3"; sha256="0ihz8vr2wbgy88bzssilgvlhkbr13jznfjvnqy73wpchqgwy0wy6"; depends=[MSeasy]; }; +MSwM = derive { name="MSwM"; version="1.2"; sha256="01l23ia20y3nchykha4vz6sa757zmbvgx2315cacxfcqk9rgs08c"; depends=[nlme]; }; +MTS = derive { name="MTS"; version="0.32"; sha256="0jxa0madik1d317wsl1svb2bndi6mw125brbxpyf019lknh6yajy"; depends=[Rcpp fGarch mvtnorm Rcpp]; }; +MTurkR = derive { name="MTurkR"; version="0.5.51"; sha256="0x3qb8419a6nm5lvmk02lcw544jmbw6swcry20wjc7gzkrldq4zr"; depends=[RCurl digest XML]; }; +MUCflights = derive { name="MUCflights"; version="0.0-3"; sha256="03ksvv5nyzlqiml1nz405r3yqb2cl35kpm1h61zcv2nqq8cxqshs"; depends=[XML geosphere sp RSQLite NightDay]; }; +MVA = derive { name="MVA"; version="1.0-5"; sha256="18x075hjqhrjwxivvrixgs6yc67il3n5p1m7v2wymcf8h2mkki91"; depends=[HSAUR2]; }; +MVB = derive { name="MVB"; version="1.1"; sha256="0an8b594rknlcz6zxjva6br8f34sgwdi2jil3xh1xzb5fa55dw0f"; depends=[Rcpp RcppArmadillo Rcpp RcppArmadillo]; }; +MVN = derive { name="MVN"; version="3.7"; sha256="1rwm3wsgsrc51hil354bcgnpsmk86hbclyb37xr6nxyrkqzx0xi9"; depends=[nortest moments MASS robustbase mvoutlier plyr]; }; +MVPARTwrap = derive { name="MVPARTwrap"; version="0.1-9.2"; sha256="0kj89nlndfcddsx2i9isfd7lqzj8rlsd47anhca5cmj1nyjsb4w5"; depends=[mvpart Hmisc labdsv vegan fBasics ade4]; }; +MVR = derive { name="MVR"; version="1.20.0"; sha256="1wwzws9116ck14g6xd1svmwc9wkr8piwb24bddnzri388p8qkgb4"; depends=[statmod]; }; +MVpower = derive { name="MVpower"; version="2.0"; sha256="176g8jfn8gbbhyxcny9prvkn7gk23lmcr4pnxlf0a0pacxczsldr"; depends=[randomForest pamr kernlab class]; }; +MXM = derive { name="MXM"; version="0.2.1"; sha256="047whr0fly89i5vlyd4z8lj2nxyfkk9vvniasncnwls8vmmpf1jk"; depends=[]; }; +MaXact = derive { name="MaXact"; version="0.2.1"; sha256="1n7af7kg54jbr09qk2a8gb9cjh25cnxzj2snscpn8sr8cmcrij0i"; depends=[mnormt]; }; +Maeswrap = derive { name="Maeswrap"; version="1.4.11"; sha256="15i36xj2bdzhly78614077s8k2z75a1gmzl2crsfgvhyyjdax8r7"; depends=[rgl lattice geometry]; }; +ManyTests = derive { name="ManyTests"; version="1.1"; sha256="11xk3j2q7w6b6ljmp7b8gni0khpmpvcvzwxypy0w8ihi2gaczsxj"; depends=[]; }; +Map2NCBI = derive { name="Map2NCBI"; version="1.0"; sha256="02cgmayrhkyji0cwr6n0f439njq29mzna7sgzkq6ml45njm9m5nh"; depends=[]; }; +MapGAM = derive { name="MapGAM"; version="0.7-0"; sha256="00ggr7wrkz13n1f9gsp3qxxjwb01kq47aqv2mj4pa6p253iw19i7"; depends=[gam maptools]; }; +MareyMap = derive { name="MareyMap"; version="1.2"; sha256="1l7s1ffl9bg1zx5nyb1r3dba188mxiaprdda3gqm2cr1f33jmr51"; depends=[tkrplot]; }; +MarkowitzR = derive { name="MarkowitzR"; version="0.1402"; sha256="1fbn6l8z76ak8z2nyzmizcjm7h54y58773nsy03x1pwykcwpzw9f"; depends=[matrixcalc sandwich gtools]; }; +MasterBayes = derive { name="MasterBayes"; version="2.51"; sha256="0mbvhn6yspralmlajimdin14hszh78m0bxb3zdxd73xhjqxl4ixk"; depends=[coda genetics gtools kinship2]; }; +MatchIt = derive { name="MatchIt"; version="2.4-21"; sha256="02kii2143i8zywxlf049l841b1y4hqjwkr1cnyv6b8b7y7lz2m5v"; depends=[MASS]; }; +Matching = derive { name="Matching"; version="4.8-3.4"; sha256="04m647342j4yi74ds7ddwnyrf58qdy7k3mc067k3p779qavq2ka1"; depends=[MASS]; }; +MatchingFrontier = derive { name="MatchingFrontier"; version="0.3.17"; sha256="1z4sgvcivlnfhkgqi7jr7b6iwlwskwwnkw9hsaiy4apgki4m0ngn"; depends=[igraph MASS]; }; +Matrix = derive { name="Matrix"; version="1.1-4"; sha256="1pxkyfa09gf5rwk1x9hdxrgr1hjs4390h73z3f8h2224rszr3hqh"; depends=[lattice]; }; +MatrixEQTL = derive { name="MatrixEQTL"; version="2.1.0"; sha256="03ccawgrkv0r3y8smpym27p5bsxy8y9rhn7pqs9ybb385951azy9"; depends=[]; }; +MatrixModels = derive { name="MatrixModels"; version="0.3-1.1"; sha256="0b44gyvpfvhbkl1vymni7pplidz9a5jrcalswx19hnh5x14qw168"; depends=[Matrix]; }; +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]; }; +MedOr = derive { name="MedOr"; version="0.1"; sha256="1rwc14s16lnzgb78ac2017hv9pss7zw7nw3y7vrvq1qx4fgiw6f8"; depends=[]; }; +MergeGUI = derive { name="MergeGUI"; version="0.2-1"; sha256="1hx03qv5jyjjmqdvylc3kz5dl5qsdqwlirjbrnxrw7grkgkhygap"; depends=[gWidgetsRGtk2 ggplot2 cairoDevice rpart]; }; +MetABEL = derive { name="MetABEL"; version="0.2-0"; sha256="0rqjv85mgswrbbp8b8ip6cdmz0cvfy9lm5mcr8a7h38rzgx3g3i3"; depends=[]; }; +MetFns = derive { name="MetFns"; version="1.0"; sha256="03kx8cr4c6mgjincf87m305fhryh1c42hdzr1ljl63affnlp7nfp"; depends=[astroFns plotrix]; }; +MetStaT = derive { name="MetStaT"; version="1.0"; sha256="0400gx6i8xlkm51da98ap91c3hgrkgfgxswn0plaxfry3625khkp"; depends=[MASS abind pls]; }; +MetaDE = derive { name="MetaDE"; version="1.0.5"; sha256="1ijg64bri5jn2d3d13q1gvvfyqmbh6gn0lk6dkihixf0jwvjdyqi"; depends=[survival combinat]; }; +MetaLandSim = derive { name="MetaLandSim"; version="0.1"; sha256="0g1xcv8g8vws4pppdv9xa8lgf2ip2dq4vr7dpbdn2iqn9w3dmm41"; depends=[spatstat sp e1071 fgui googleVis maptools rgeos spgrass6 raster]; }; +MetaPCA = derive { name="MetaPCA"; version="0.1.4"; sha256="14g4v3hyxnds4l2q36mpz282yqg8ahgdw3b0qmj0xg17krrf5l2s"; depends=[foreach]; }; +MetaQC = derive { name="MetaQC"; version="0.1.13"; sha256="11595ggjr46z6xiwmhiyx1sydaq68l18y7mgdwxsg81g03ck9x1r"; depends=[proto foreach iterators]; }; +MetaSKAT = derive { name="MetaSKAT"; version="0.40"; sha256="1jxs32hvsw6wzci9f1rc7sw1dfyazdm2d57wcmhkggfg3hkdn1vv"; depends=[SKAT]; }; +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]; }; +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"; sha256="1j60skwcfzqg5fvvrflxk7qiqlla1w51xfbhwilzxrfv6ww9jq8j"; depends=[ars]; }; +MiClip = derive { name="MiClip"; version="1.3"; sha256="08chki18rxwr2mpzga0g5hbmvbr690bzvpydykkfwdaw8swqmhl8"; depends=[moments VGAM]; }; +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]; }; +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]; }; +MindOnStats = derive { name="MindOnStats"; version="0.8"; sha256="1fsswkbrxd3f0hz3nd25xvp36si292s4q2r52hw6rsps2mx6bgqi"; depends=[]; }; +Miney = derive { name="Miney"; version="0.1"; sha256="0sgln0653rgglinr8rns5s2az0lgyp9slmynyhhhs265grkhrfj0"; depends=[]; }; +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.1"; sha256="1im1621jg7cd2bc2b85anr1xihxpsrd0ii9qrcz9zsq3r3ilx43v"; 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]; }; +MixtureInf = derive { name="MixtureInf"; version="1.0-1"; sha256="1cq8zzhhb6vg545n9aw1b9fhx025zy75dd6pw161svsb5776py5d"; depends=[]; }; +Mobilize = derive { name="Mobilize"; version="2.16-4"; sha256="16vdvpwspa0igb52zvzyk0if9l4wq1hm8y42572i8sh1m82wyyfs"; depends=[Ohmage ggplot2 wordcloud reshape2]; }; +Modalclust = derive { name="Modalclust"; version="0.6"; sha256="16h90d30jwdrla5627rva0yf69n0zib9z5fl3k5awlqfscz4fw26"; depends=[mvtnorm zoo class]; }; +ModelGood = derive { name="ModelGood"; version="1.0.9"; sha256="1y99a7bgwx167pncxj00lbw3cdjj23fhhzl8r24hwnhxr984kvzl"; depends=[prodlim]; }; +ModelMap = derive { name="ModelMap"; version="3.0.15"; sha256="1d7qn1p4fv94bdlr6if64vxl9yknavix4gzmpg3kxwlrxaz2g8a2"; depends=[randomForest raster gbm rgdal fields HandTill2001 PresenceAbsence]; }; +Momocs = derive { name="Momocs"; version="0.2-6"; sha256="187w6xyswlg5nac6lbprcwvj63gka832n33vlj2ix810vqyxd0fk"; depends=[ade4 sp shapes jpeg spdep ape]; }; +MonetDB_R = derive { name="MonetDB.R"; version="0.9.5"; sha256="0j5b2i1yyk4d6mqm2i3fijmmgp1fzi37rilxcikbc517mzsk4f7p"; depends=[DBI digest]; }; +MonoPoly = derive { name="MonoPoly"; version="0.2-8"; sha256="0lpqqpahpss4q9iddh2p4h6klsrjhg3v6h1wfb70vy0miyhqb93h"; depends=[quadprog]; }; +Morpho = derive { name="Morpho"; version="2.1"; sha256="0l084myn49krm1j9d9rb4jb40yf9kd1v3m06arzi9bjy33id7bg2"; depends=[Rvcg rgl colorRamps foreach Matrix yaImpute doParallel Rcpp Rcpp RcppArmadillo]; }; +MorseGen = derive { name="MorseGen"; version="1.2"; sha256="1kq35n00ky70zmxb20g4mwx0hn8c5g1hw3csmd5n6892mbrri8s9"; depends=[]; }; +MortalitySmooth = derive { name="MortalitySmooth"; version="2.3.3"; sha256="1ms9f13n554n4y04rpsnlwwbplk225k467jrldhkigshvc721m9r"; 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.10.5"; sha256="1pza894h6mjjv2i4ifx2z410bz7lw2a9b986z6x30sr2al4xvfkn"; depends=[]; }; +MultEq = derive { name="MultEq"; version="2.3"; sha256="0fshv7i97q8j7vzkxrv6f20kpqr1kp9v6pbw50g86h37l0jghj7r"; depends=[]; }; +MultNonParam = derive { name="MultNonParam"; version="1.0"; sha256="0xff81wjmyw2d38r0v3n7vv0dasg9rlrc0zrdwsmfd83zpvxqj5m"; depends=[]; }; +MultiCNVDetect = derive { name="MultiCNVDetect"; version="0.1-1"; sha256="0mfisblw3skm4y8phfg4wa0rdchl01wccarsq79hv63y78pfhh13"; depends=[]; }; +MultiLCIRT = derive { name="MultiLCIRT"; version="2.7"; sha256="0i9ydhqw8a6rvds708vn1ypmfw5nrnpnfzjmg4s01gcm2xswvli0"; depends=[MASS limSolve]; }; +MultiOrd = derive { name="MultiOrd"; version="2.1"; sha256="12y5cg06qyaz72gk3bi5pqkd55n72rz056y9va49znlsqph09x2x"; depends=[mvtnorm corpcor Matrix psych]; }; +MultiPhen = derive { name="MultiPhen"; version="2.0.0"; sha256="05w7khzyxswlsz4sxhaakbz828zrdya1y8qcsdfc6w7wgl8qpmj9"; depends=[MASS abind epitools meta HardyWeinberg RColorBrewer gplots]; }; +MultiSV = derive { name="MultiSV"; version="0.0-67"; sha256="0924lvkx12aqjxxz8bwqdi4h9xc2acf8aynllx0m45ip5r4gh1g2"; depends=[nlme reshape]; }; +Multiclasstesting = derive { name="Multiclasstesting"; version="1.3.9"; sha256="09y3gnarqv15wgmk545qrwpjwb2ilv2b2kc74cxzcb2p1lflfjzm"; depends=[]; }; +MultinomialCI = derive { name="MultinomialCI"; version="1.0"; sha256="0ryi14d102kvxawls04hcw50n79jkcn29ill77lkfvj6nlzj8i5q"; depends=[]; }; +Myrrix = derive { name="Myrrix"; version="1.1"; sha256="15w1dic6p983g2gajbm4pws743z68y0k2hxrdwx6ppnzn9rk07rs"; depends=[Myrrixjars rJava]; }; +Myrrixjars = derive { name="Myrrixjars"; version="1.0-1"; sha256="0dy82l0903pl4c31hbllscfmxrv3bd5my5b2kv5d3x5zq0x99df0"; depends=[rJava]; }; +NADA = derive { name="NADA"; version="1.5-6"; sha256="0y7njsvaypcarzygsqpqla20h5xmidzjmya4rbq39gg6gkc0ky27"; depends=[survival]; }; +NAPPA = derive { name="NAPPA"; version="2.0"; sha256="18yipic8xkf13jaaxnn388m49r5q2g7q7gb0mmw3gh7226lmz987"; 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=[]; }; +NCBI2R = derive { name="NCBI2R"; version="1.4.6"; sha256="1gsvc9v9005hf71nsqgybnfhlmdr3wwzm5ab7h8c8ly5waq2w9i7"; depends=[]; }; +NCmisc = derive { name="NCmisc"; version="1.1.3"; sha256="051qbqsvqb5wivba8msdhswfg0cxyxnyp601zgb1zvzcnbrffimg"; depends=[proftools]; }; +NEff = derive { name="NEff"; version="1.0"; sha256="0ksnmxjy2ms2z7rq4rddnykydwlb4f9c13nak5f8m65pfjcgv3sk"; depends=[msm bit]; }; +NHANES = derive { name="NHANES"; version="1.0"; sha256="18sy2x61bnily3fz0rs61y44kn6y2ikgrzr6nhgm6fkqv02ffdg8"; depends=[]; }; +NHEMOtree = derive { name="NHEMOtree"; version="1.0"; sha256="0ycprj2rz2fy6a7ps0bsr27iphmbfxi9pbvl8rcr6p8yagfb84mb"; depends=[partykit emoa sets rpart]; }; +NHMM = derive { name="NHMM"; version="3.5"; sha256="03il5y6vz5zyadydhk3qg6sd6fmsw7md9if1igyy9643mxxm1g0f"; depends=[BayesLogit msm MCMCpack MASS Rcpp Rcpp]; }; +NHMSAR = derive { name="NHMSAR"; version="1.0"; sha256="10n7ifzv3hg7wicf4mb46xwvfjwgjr5df6b3fq84qjhr09y64h2q"; depends=[ucminf]; }; +NHPoisson = derive { name="NHPoisson"; version="3.0"; sha256="11gdfqfly3cvr6ndxvp06kbdd7aw6k25kz8kyxxybjpzszxbpmq8"; depends=[car]; }; +NISTnls = derive { name="NISTnls"; version="0.9-13"; sha256="03a1c8a5dr5l5x4wbclnsh3vmx3dy7migfdzdx7d7p3s7hj3ibif"; depends=[]; }; +NLP = derive { name="NLP"; version="0.1-5"; sha256="1l5c21bpbbnpspxi7nmjny1k3i9q5szyxnarndb3yx7aywkvjrkj"; depends=[]; }; +NLPutils = derive { name="NLPutils"; version="0.0-1"; sha256="036pafnjcbz7ihdgsjss4jq8fb420j8fmxyymv7kr4pr78wjysbx"; depends=[NLP SnowballC qdap]; }; +NLRoot = derive { name="NLRoot"; version="1.0"; sha256="1x8mcdgqqrhyykr12bv4hl4wbh1zw2qgpnd2yrm68kb92iy95rh4"; depends=[]; }; +NMF = derive { name="NMF"; version="0.20.5"; sha256="1j91vklzi4qjlix5sn9qh86dwx6vxnla2p4ag81apkr441jkvynr"; depends=[pkgmaker registry rngtools cluster stringr digest gridBase colorspace RColorBrewer foreach doParallel ggplot2 reshape2]; }; +NMFN = derive { name="NMFN"; version="2.0"; sha256="0n5fxqwyvy4c1lr0glilcz1nmwqdc9krkqgqh3nlyv23djby9np5"; depends=[]; }; +NMOF = derive { name="NMOF"; version="0.34-0"; sha256="05gg5hf8003yvzgh0rjsgymlsgjz9jray74cffssg4dl9d0f1jkz"; depends=[]; }; +NORMT3 = derive { name="NORMT3"; version="1.0-3"; sha256="041s0qwmksy3c7j45n4hhqhq3rv2hncm2fi5srjpwf9fcj5wxypg"; depends=[]; }; +NPBayesImpute = derive { name="NPBayesImpute"; version="0.4"; sha256="0r2b878xs2vjvskhz63cyizaa7qfw06sq120m8xnm5ra4r55c0fc"; depends=[Rcpp Rcpp]; }; +NPCD = derive { name="NPCD"; version="1.0-6"; sha256="1lnj55f73rpjy6amg1n5x7b0jsrmharp0fhcjcn0dflcrjwianxj"; depends=[BB R_oo R_methodsS3]; }; +NPCirc = derive { name="NPCirc"; version="2.0.1"; sha256="1pyckjvf4vzns9hxnhnk7cm4abllmdj3f142pvjhnilyqwndqgyc"; depends=[circular misc3d movMF plotrix rgl shape]; }; +NPHMC = derive { name="NPHMC"; version="2.2"; sha256="000x9y00gfkaj5lf00a55b9qx15x05yp3g3nmp8slyzsnfv66p5d"; depends=[survival smcure]; }; +NPMLEcmprsk = derive { name="NPMLEcmprsk"; version="1.0"; sha256="0yakcjkxqlbpzs8jdaahdl4lv5l2ffq7l7v00sl77sn9gflgprk3"; depends=[]; }; +NPMPM = derive { name="NPMPM"; version="1.0"; sha256="14rjj48vfj4wv1na5v181jby016afx4ak1fs0f3g1fif4kbgbdx0"; depends=[]; }; +NPMVCP = derive { name="NPMVCP"; version="1.1"; sha256="13jpm46abwziq8859jhl6hg1znk3ws1q7g4vlr2jyri3qa6h22dd"; depends=[]; }; +NPS = derive { name="NPS"; version="1.0"; sha256="1acg3367rd53dgwzqr8pnfr8z72s3699h2nhrhh2w9zdqipid89g"; depends=[]; }; +NPsimex = derive { name="NPsimex"; version="0.2-1"; sha256="1k9i1f5ckvzdns8f5qnm2zq7qs3wsgzsnfwdz21zmhmi6d0pwchm"; depends=[]; }; +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]; }; +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=[]; }; +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]; }; +NetComp = derive { name="NetComp"; version="1.6"; sha256="11rxpdihn575diqfvc7yvxhlr2c19fig4v4a5c6jhqyfdsd60fsv"; depends=[gdata]; }; +NetData = derive { name="NetData"; version="0.3"; sha256="1jf05zwy0c6gmm7kvxlwvai61bz4wpsw7cl0h4i21ipzn1rqxmqj"; depends=[]; }; +NetIndices = derive { name="NetIndices"; version="1.4.3"; sha256="0ff57f5b12lccqbfin530ra373rn1wz6n42b0jnkyi2ra8hcm88f"; depends=[MASS]; }; +NetSim = derive { name="NetSim"; version="0.9"; sha256="07h4qwz64k8zj8c2mx23cbnhg4rqrb4nfh20xw98kspz7cisdg6d"; depends=[Rcpp Rcpp]; }; +Newdistns = derive { name="Newdistns"; version="1.0"; sha256="1agg5v05x9qlg1w439aycfjfd5yap6ivn1kqgsc3ck148ar11wb2"; depends=[]; }; +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]; }; +NormalGamma = derive { name="NormalGamma"; version="1.1"; sha256="0r3hhfscif0sx9v8f450yf119gpvf3ilpb8n3ziy4v4qf2jlcfnk"; depends=[optimx histogram]; }; +NormalLaplace = derive { name="NormalLaplace"; version="0.2-0"; sha256="1yrqfqhxkavczascwpq7z77jwpa1s2dn2cfi15vxfjyayhdxq4aa"; depends=[DistributionUtils GeneralizedHyperbolic]; }; +Nozzle_R1 = derive { name="Nozzle.R1"; version="1.1-1"; sha256="05sjip4sz12mwd3jcbvk342p83kdmrd4l2jrh17p18w4l7w4nn0z"; depends=[]; }; +OAIHarvester = derive { name="OAIHarvester"; version="0.1-7"; sha256="0wcl71y8i4s4fxpb90xg71sj6819kgl3d4gff66dan8i6y8sxmyk"; depends=[XML RCurl]; }; +ODB = derive { name="ODB"; version="1.1.1"; sha256="1hha4rkbc2zh3karkqa0vn4v0nmcd7sljcymy1nh28bx1gx2ffgs"; depends=[DBI RJDBC]; }; +ODMconverter = derive { name="ODMconverter"; version="2.0"; sha256="1691fmkdjhk7rih8qk3rp6bykplz8hxsl7in8gjrc5ll0fkygm98"; depends=[XML xlsx]; }; +OIdata = derive { name="OIdata"; version="1.0"; sha256="078khxrszwnrww2h0ag153bf59fnyhirxy4m56ssgr2gmfahaymf"; depends=[RCurl maps RCurl maps]; }; +OIsurv = derive { name="OIsurv"; version="0.2"; sha256="148mpjj5navc1vrl72y87krn4lf3awnd32z3g4qqaia404w5w7p7"; depends=[survival KMsurv]; }; +OLScurve = derive { name="OLScurve"; version="0.2.0"; sha256="1zqapfwgwy9rxnbhmlgplkphw1bdia4cyi9q6iwcppw3rjw75f1n"; depends=[lattice]; }; +ONETr = derive { name="ONETr"; version="1.0.1"; sha256="05azlax5wc0qrr1aqfpdks38185szjlkiv9d3vrkcwmjlw6n109y"; depends=[XML RCurl]; }; +OOmisc = derive { name="OOmisc"; version="1.2"; sha256="09vaxn5czsgn6wpr27lka40kzd76jzqgqxavf26ms3m9kkdf83g4"; depends=[]; }; +OPDOE = derive { name="OPDOE"; version="1.0-9"; sha256="0pf8rv5wydc8pl4x57g7bk2swjabaxdgijgsigjy5wihfcb48654"; depends=[gmp mvtnorm orthopolynom nlme crossdes polynom]; }; +OPE = derive { name="OPE"; version="0.7"; sha256="0ld3pr94ii1pmfk99qfwgria6ki2iz2hwmn7pj3cjwprv8jkcjji"; depends=[]; }; +OPI = derive { name="OPI"; version="1.6"; sha256="0d9863zs54chmdc74g508xpclj7gjk7q36amdnqq0bffp87bj9nq"; depends=[rJava]; }; +ORCI = derive { name="ORCI"; version="1.1"; sha256="0xy5lvz2scz06fphjyhqbdhp4bizmv87a8xykp9dbgx8b4ssnqgz"; depends=[BiasedUrn BlakerCI PropCIs]; }; +ORCME = derive { name="ORCME"; version="2.0.1"; sha256="0wr4z19alyp2cvlpg4bs8sni6nrwnhk11bbr00ycqym39alr2wjw"; depends=[Iso]; }; +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.43"; sha256="1ixyws6q9p8kms3smzj8rkmsry2y4s9al4vhxpqfmbgypigq7n9k"; 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.1"; sha256="12jah913rfwin45rv4zhkd28l2fwg5ajz4ixl39gd8j78mni4xdx"; depends=[plot3D plot3Drgl 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="0s76fxai1kgq0hcr5m18yz7i14algld97rjrax75cxm1ccylah71"; depends=[tkrplot]; }; +OmicKriging = derive { name="OmicKriging"; version="1.3"; sha256="1fj131684faj75jdipmsvb8s684x72is6zz79hwb5wszklk00ind"; depends=[doParallel ROCR irlba]; }; +Oncotree = derive { name="Oncotree"; version="0.3.3"; sha256="147rc9ci66lxbb91ys2ig40sgmldi15p604yysrd4ccbxpbk2zwf"; depends=[boot]; }; +OneHandClapping = derive { name="OneHandClapping"; version="1.5"; sha256="1j45qy4nwnmiqmjqnhzs4f6zspckzhr1rx56i9ddis4iahffqd19"; depends=[]; }; +OneTwoSamples = derive { name="OneTwoSamples"; version="1.0-3"; sha256="0019rc2f4jmbm6sinkvalvjqwi822x78aiin88kg8qbbb5ml8l89"; depends=[]; }; +OpasnetUtils = derive { name="OpasnetUtils"; version="1.1.0"; sha256="1a7j96pg0v8j527m0w48k8lxwb2ynrqq1y7140bi1ciq0466azx3"; depends=[rjson RCurl reshape2 triangle httpRequest digest xtable ggplot2 rgdal sp]; }; +OpenCL = derive { name="OpenCL"; version="0.1-3"; sha256="0f7vis0jcp0nh808xbzc73vj7kdcjb0qqzzsh3gvgamzbjfslch8"; depends=[]; }; +OpenMPController = derive { name="OpenMPController"; version="0.1-2"; sha256="1cpsbjmqql0fsjc1xv323pfkhfr9vrcv5g4j3p1qc5zn4z9pq7r6"; depends=[]; }; +OpenRepGrid = derive { name="OpenRepGrid"; version="0.1.9"; sha256="1s40c2yfd4a4khs0ghlbzii94x8cidg851bivanplg2s51j5jrhk"; depends=[pvclust colorspace plyr stringr abind rgl GPArotation psych XML]; }; +OpenStreetMap = derive { name="OpenStreetMap"; version="0.3.1"; sha256="009xiqsbgqb3lba6msyzq7ncripmvpymxynkga8pqc8npv8g7fzb"; depends=[rJava raster rgdal rJava]; }; +OptHedging = derive { name="OptHedging"; version="1.0"; sha256="0g7qaf5abvbcqv2h1dciwn3gwpz084ryqjjk0yabdm4ym0y38ddm"; depends=[]; }; +OptInterim = derive { name="OptInterim"; version="3.0.1"; sha256="1ks24yv5jjhlvscwjppad27iass59da1mls99hlif0li9mvkbvyk"; depends=[mvtnorm clinfun]; }; +OptimalCutpoints = derive { name="OptimalCutpoints"; version="1.1-3"; sha256="1vrbx62080r9sgk9ipjvdrqvikp4gwidp5gi5j92hspk7cp10amg"; depends=[]; }; +OptionPricing = derive { name="OptionPricing"; version="0.1"; sha256="0j98h3fn29xfv7xyp7av459v56chw99pnvmsbqvrv4g77p60f5q2"; depends=[]; }; +OrdFacReg = derive { name="OrdFacReg"; version="1.0.5"; sha256="1if6ghagj2196pc73ankfrcms0snlpibgfca1c6lhj96m1waahg2"; depends=[survival eha MASS]; }; +OrdLogReg = derive { name="OrdLogReg"; version="1.1"; sha256="18s75pmz1g3yac2rfl41kj8sfflq298qkijnvqlybgxpq98ickxx"; depends=[LogicReg]; }; +OrdMonReg = derive { name="OrdMonReg"; version="1.0.3"; sha256="1xca8pvvq79j484l2rmn4nva8ncx8z51g5diljikck231y8qjqaz"; depends=[]; }; +OrdNor = derive { name="OrdNor"; version="1.0"; sha256="1n6c0d4r1w3n016lzk2i5yyvawk9pgmsbzymbbyq7gx8a80iv32h"; depends=[mvtnorm corpcor Matrix GenOrd]; }; +OrdinalLogisticBiplot = derive { name="OrdinalLogisticBiplot"; version="0.3"; sha256="0z03dpargdkay99gci5kpxr2i8cgiw3gfras65f83bjr2pkmsdla"; depends=[mirt MASS NominalLogisticBiplot]; }; +OrgMassSpecR = derive { name="OrgMassSpecR"; version="0.4-4"; sha256="046lr0piiy5w5lxjvyw7iqqclkghmc6zqymfypkw374gk73yrm76"; depends=[]; }; +OutbreakTools = derive { name="OutbreakTools"; version="0.1-11"; sha256="0m39wppck75mpcgdhwvw0nc0cgidzn80zl58hhs6x3svpnbssn0v"; depends=[ggplot2 network knitr RColorBrewer ape reshape2 sna plyr ggmap scales rjson networkDynamic]; }; +OutlierDC = derive { name="OutlierDC"; version="0.3-0"; sha256="1vm3zx4qmj9l0ddfqbksm1qyqzzqrxf93gh4kj52h68zlsfxwv41"; depends=[survival quantreg Formula]; }; +OutlierDM = derive { name="OutlierDM"; version="1.0-0"; sha256="1yphr47nswcaqa5pfamc3ksqcxwhxl388sdml2aqjjfd9w29lf2g"; depends=[quantreg MatrixModels outliers pcaPP]; }; +P2C2M = derive { name="P2C2M"; version="0.5"; sha256="1ii1jnzkcnm7ks3l3ka4gka7fh7r5x677dvndqcayg08fj5xw7wk"; depends=[ape apTreeshape ggplot2 rPython stringr]; }; +PAGI = derive { name="PAGI"; version="1.0"; sha256="01j1dz5ihqslpwp9yidmhw86l112l7rfkswmf03vss872mpvyp3f"; depends=[igraph]; }; +PAGWAS = derive { name="PAGWAS"; version="1.0"; sha256="1zwq4b0bgsskzvlapffh30ys9y4wlcfwpjqw8m2i9zabib5knx9i"; depends=[lars doMC mnormt]; }; +PANDA = derive { name="PANDA"; version="0.9.9"; sha256="1sf3c49v4mb3mz2imqlqdbh1iab7bc2pxpi8bmgj2jld133555ip"; depends=[cluster]; }; +PANICr = derive { name="PANICr"; version="0.0.0.2"; sha256="17r550wyp4nsjk3n1c786z0xfn0h1gpnas22dcq5bl0jn16mh40c"; depends=[MCMCpack]; }; +PAS = derive { name="PAS"; version="1.2"; sha256="0q5g9j8xb9fl7r8f1w5gk5h83ll5w1r6m2gq9ilw8w8s96pm4xd8"; depends=[glmnet]; }; +PASWR = derive { name="PASWR"; version="1.1"; sha256="1rxymnqvflypc6m62f5vw65l8x1m2yah7r11hhpmzdq2l2sg8fci"; depends=[e1071 MASS lattice]; }; +PASWR2 = derive { name="PASWR2"; version="1.0"; sha256="1bxczrfxj7nlx4r0b23a7sisinb4d5nd3pj68vigbgrhqyggk87x"; depends=[ggplot2 lattice e1071]; }; +PAWL = derive { name="PAWL"; version="0.5"; sha256="1sx4g4qycba2j1fm0bvhz3hk6ghhdc37rz5zi1njqxrpmbnkqg04"; depends=[mvtnorm foreach reshape ggplot2]; }; +PBC = derive { name="PBC"; version="1.2"; sha256="1z08y5sn6i439811c9mq3bs78zqlzzkz0srmv4wld68bywhmwqj4"; depends=[igraph Rcpp copula Rcpp]; }; +PBD = derive { name="PBD"; version="1.0"; sha256="1q8ijjmcwxi8f3wgggpj4y522wmxady7f60frhlvvixhzfn2iml1"; depends=[deSolve ade4 ape DDD]; }; +PBImisc = derive { name="PBImisc"; version="0.999"; sha256="0igwl78wj8w6jzmk5m8y9rf4j72qrcjyhb83kz44is72ddzsyss6"; depends=[MASS lme4 Matrix]; }; +PBSadmb = derive { name="PBSadmb"; version="0.68.104"; sha256="01akimdsp0bkvz3a5d75yyy3ph0mff85n8qsnr59fla5b5cm4qlj"; depends=[PBSmodelling]; }; +PBSddesolve = derive { name="PBSddesolve"; version="1.11.29"; sha256="13vprr66hh5d19xambpyw7k7fvqxb8mj5s9ba19ls7xgypw22cmm"; depends=[]; }; +PBSmapping = derive { name="PBSmapping"; version="2.67.60"; sha256="1n9c9fglsnch5jw248yyvy2vrq3wgca0wdkdwwhfc3n7yw83mwkr"; depends=[]; }; +PBSmodelling = derive { name="PBSmodelling"; version="2.66.264"; sha256="08plp74cjzmgv3dkaxgryqq1yqp0z7pdlz9jqgai8w89vwi0il35"; depends=[]; }; +PCAmixdata = derive { name="PCAmixdata"; version="2.1"; sha256="12g6pkp9yffp1arqdvnx721cn34h0a7m3bm2ayd9fsrvbaqb7ci8"; depends=[]; }; +PCDSpline = derive { name="PCDSpline"; version="1.0"; sha256="15kmvcwvwlsr1107n7mfajvf9b1kcslnhsdx0drjjhsvq193qrqa"; depends=[nleqslv matrixcalc]; }; +PCGSE = derive { name="PCGSE"; version="0.2"; sha256="19bpnn1b8ihmf52zh9g9pc38130np1ki8l7wf0j5myw2cnw6fna8"; depends=[RMTstat MASS]; }; +PCICt = derive { name="PCICt"; version="0.5-4"; sha256="1g17hxs00dlnb6p0av6l7j99qy00555f80nk1i1i1x87fszp3axa"; depends=[]; }; +PCIT = derive { name="PCIT"; version="1.04-5"; sha256="10fnkad09y7vh8j3c5kgkh64lwqn2nsl5818rzl9b8d51f951qjg"; depends=[]; }; +PCPS = derive { name="PCPS"; version="1.0.1"; sha256="1av0mfv54ig1blq0228nlzgvjndrg711ip6xfq2886qhypcapgd5"; 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]; }; +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=[]; }; +PERregress = derive { name="PERregress"; version="1.0-8"; sha256="1rhridhfgvrz14h61psfyr5ll13fvxj4b9fwrnlnc6lyqi01wjlc"; depends=[]; }; +PET = derive { name="PET"; version="0.4.9"; sha256="1ijg6mfh3xrc1gjh6a4nq64psk9yh16yc8nfp7c9837xbjigqq7f"; depends=[adimpro]; }; +PF = derive { name="PF"; version="9.5"; sha256="1y99brdabj78s5kxyv0136s40kaaj3zya9lk4qd0kqk83z2gdawp"; depends=[xtable RColorBrewer gdata]; }; +PGICA = derive { name="PGICA"; version="1.0"; sha256="0qxa5hw2s3mndjvk8lb82pcbyj1kbdclx4j4xa8jq0lcj180abi9"; depends=[fastICA]; }; +PGM2 = derive { name="PGM2"; version="1.0"; sha256="18azh6k271p9dvc23q402pv7wrilr1yk02vqqy6qjppnvq6jxahg"; depends=[]; }; +PHENIX = derive { name="PHENIX"; version="1.0"; sha256="1shkf77bq3lvkj6srcil3fqwp78hfkbjnhkz2v8kmfqf92h4z5pb"; depends=[ppcor]; }; +PHYLOGR = derive { name="PHYLOGR"; version="1.0.8"; sha256="17lmjfbwf8j68zzzhdvppyjacdsmy4zmcfj0pcjsw5j6m361hvh6"; depends=[]; }; +PHeval = derive { name="PHeval"; version="0.5.1"; sha256="12vlfg2w27hc19f8dwvhl8r0xfwapp1r9bihq7ax3d9j7aayv217"; depends=[survival]; }; +PIGE = derive { name="PIGE"; version="0.9"; sha256="1x8ml25mm69dvlszm9p2ycph92nxcsgd52ydj7ha0dwrrpcv2law"; depends=[snowfall ARTP xtable survival]; }; +PIGShift = derive { name="PIGShift"; version="1.0.0"; sha256="15cgpi7j5cs4aqdq5cy7535x8ar916d9hd109kc01njrwxp1xr96"; depends=[ape mvtnorm]; }; +PIPS = derive { name="PIPS"; version="1.0.1"; sha256="1c5v3s6xys9p1q32k6mpsffhi9gwsq951rh12hs76dmak862yspc"; depends=[]; }; +PK = derive { name="PK"; version="1.3-2"; sha256="0162ri9wlm9inryljal48av8yxb326na94kckkigsrklfxb3wkp2"; depends=[]; }; +PKI = derive { name="PKI"; version="0.1-1"; sha256="1m4q43yq8ddig15k0j9yg9hq4yz3yplqp68zl3p9g2shkam60p6w"; depends=[base64enc]; }; +PKPDmodels = derive { name="PKPDmodels"; version="0.3.2"; sha256="1h893civ77ahbgjnc6kq3l7rszmqmx9dlxwavldigpq3r79vd86k"; depends=[]; }; +PKfit = derive { name="PKfit"; version="1.2.4"; sha256="1vyf7w3d2wylj8hrgz7hpb2syvwsmf8bbdjh4w3kgcjdjivvnvxn"; depends=[optimx deSolve minpack_lm]; }; +PKgraph = derive { name="PKgraph"; version="1.7"; sha256="0g36cdv5cblqx69j48irxjc5nlw2cl3p714mlsblnd3362z1brwn"; depends=[RGtk2 gWidgetsRGtk2 cairoDevice lattice rggobi ggplot2 proto RGtk2 gWidgetsRGtk2]; }; +PKmodelFinder = derive { name="PKmodelFinder"; version="1.1"; sha256="0v5l8j4yq6fv4cgx5psld6klwy6kjwcqg1vhf9r4i8qa12vpa1yh"; depends=[gWidgets tkrplot RGtk2 gWidgetsRGtk2 cairoDevice numDeriv]; }; +PKreport = derive { name="PKreport"; version="1.5"; sha256="16hss9migbxpnw5f9gcw1nlvb81iyji00ylx5wd6kdwhz0ids9wj"; depends=[lattice ggplot2]; }; +PKtools = derive { name="PKtools"; version="1.5-0"; sha256="0za6qgl9q9y4j87kfhvanpc9mfckzww6q2kjz7divbv8ygn5cd1m"; depends=[lattice nlme R2HTML xtable]; }; +PLIS = derive { name="PLIS"; version="1.1"; sha256="0b81s7677wglqvv1b5lx8k2iaks09kz0wrl07245a7j2pk9nxv7p"; depends=[]; }; +PLRModels = derive { name="PLRModels"; version="1.1"; sha256="0dwnzfw7a1cxz9s00kxf19jmjsc8cy6cc9q2mjqf8z7690wrg7hb"; depends=[]; }; +PLSbiplot1 = derive { name="PLSbiplot1"; version="0.1"; sha256="1l8d1k913ic0qwxvrrd447p5ni3mzc6v9lv45b7vqrpzkxdci6gy"; depends=[]; }; +PLordprob = derive { name="PLordprob"; version="1.0"; sha256="156lvz6vfm68hm32l5nlhq15hfacdla627d6lf8l4g34lwzdh8k8"; depends=[mnormt]; }; +PMA = derive { name="PMA"; version="1.0.9"; sha256="11qwgw4sgzl3xhrm468bsza83h3mfn89157nfwnrassl7qr42xkq"; depends=[plyr]; }; +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]; }; +PROFANCY = derive { name="PROFANCY"; version="1.0"; sha256="11a0fpsv1hy0djv36x2i2hv2j50ryy0x7g7nn7vv76m1sl6q6r4b"; depends=[Matrix lattice igraph]; }; +PROTOLIDAR = derive { name="PROTOLIDAR"; version="0.1"; sha256="0bz3071b0wlcvh40vl3dyiiixk5avsj6kjjnvlvx264i5g08rij4"; depends=[]; }; +PReMiuM = derive { name="PReMiuM"; version="3.0.30"; sha256="1xzs50gnwdjr34lgg1nb9kp0aihicvaif3fqha3ymp2lz5whbz5c"; depends=[Rcpp ggplot2 cluster plotrix Rcpp RcppEigen BH]; }; +PResiduals = derive { name="PResiduals"; version="0.2-0"; sha256="0bjn600wq8h11spi20q3gdv9ajrvagjyw6a8pfmm3pvangasq2nl"; depends=[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.43.0"; sha256="1pv61ha8c2hx91hik9n6fz2gxdhijgcsdjhznaml5v1d5ba3vzjj"; depends=[R_methodsS3 R_oo R_utils R_cache matrixStats]; }; +PSM = derive { name="PSM"; version="0.8-10"; sha256="1s60fr85xn3ynpvsbc3nw7vgz6h6jxy3yii1w6jpkw3iwl4bgn84"; depends=[MASS numDeriv deSolve ucminf]; }; +PSMix = derive { name="PSMix"; version="1.1.1"; sha256="0g9s7v05jjc7vq08fj5bb2wg03isnyr1ql1rciiihqi5w4dwx6w7"; depends=[]; }; +PST = derive { name="PST"; version="0.84.1"; sha256="10cwlj8957sj5dag43v01fbq9lmcasfxp0lgllj0iv0lbfzd4g02"; depends=[TraMineR]; }; +PTAk = derive { name="PTAk"; version="1.2-9"; sha256="1wbjak8dp53601z39kkpa4ysm264x32371rbgbzmyzx89ap2c0cq"; depends=[tensor]; }; +PTE = derive { name="PTE"; version="1.0"; sha256="10if2hh69yysi2y82m7is74hmzw2xpxijgb8bhy1d4g9n9lqidfs"; depends=[doParallel]; }; +PVAClone = derive { name="PVAClone"; version="0.1-2"; sha256="0afl2il5wdcwzpyhjkgq8iz16q1086c3ndr4cjlyspgbss9h5l24"; depends=[dcmle dclone]; }; +PVR = derive { name="PVR"; version="0.2.1"; sha256="1p87pj9g0qlc8ja6xdj2amny9pbkaqb34x2y9nkl1nj1pkwjq2s5"; depends=[ape splancs]; }; +PairViz = derive { name="PairViz"; version="1.2.1"; sha256="0mjp5p6n5azbhrm2hvb9xyqjfhd49pw9ia8k70749yc96ws1qqc7"; depends=[TSP gtools]; }; +PairedData = derive { name="PairedData"; version="1.0.1"; sha256="025h5wjsh9c78bg6gmg6p6kvv2s6d5x7fzn3mp42mlybq0ry78p0"; depends=[MASS gld mvtnorm lattice ggplot2]; }; +Paneldata = derive { name="Paneldata"; version="1.0"; sha256="00hk340x5d4mnpl3k0hy1nypgj55as2j7y2pgzfk3fpn3zls5zib"; depends=[]; }; +ParDNAcopy = derive { name="ParDNAcopy"; version="1.3"; sha256="1y0fl5gj3d3xj6krfyg48fs9vz3s4jb61js0b7yfzgv6a3289g5a"; depends=[]; }; +ParallelForest = derive { name="ParallelForest"; version="1.1.0"; sha256="1xa9lfgrvzv7bvv1aaabcfk4372p8x5gxgj463h5ggf9x177lj5j"; depends=[]; }; +ParamHelpers = derive { name="ParamHelpers"; version="1.4"; sha256="1jbzn3r8i8avwg51nxp6940c4wvqfp8ficqzw2q1xyrm5rkkqgg5"; depends=[BBmisc checkmate]; }; +ParentOffspring = derive { name="ParentOffspring"; version="1.0"; sha256="117g8h0k65f2cjffigl8n4x37y41rr2kz33qn2awyi876nd3mh93"; depends=[]; }; +ParetoPosStable = derive { name="ParetoPosStable"; version="1.0.3"; sha256="0f3f4wn33vw1y3cjcvlk44g8z6hjkv4ws535pkcz3lgb95fl4q0n"; depends=[ADGofTest lmom]; }; +PatternClass = derive { name="PatternClass"; version="1.5"; sha256="1paw39xm2rqjnc7pnbya7gyl160kzl56nys9g0y1sa6cqycy3y5x"; depends=[SDMTools]; }; +Peaks = derive { name="Peaks"; version="0.2"; sha256="0a173p5cdm1jnm7bwsvjpxh4dccy593g02c4qjwky1cgzy5rvin2"; depends=[]; }; +PearsonDS = derive { name="PearsonDS"; version="0.97"; sha256="0bsdj4zir12zkv8yhq1z6dqjzhkb9l0f88jrr4iyclns1pcqvrvi"; depends=[]; }; +PearsonICA = derive { name="PearsonICA"; version="1.2-4"; sha256="0jkbqha1nb9pf72ffki47wymsdmd50smkdhvpzvanv4y2rmqfhvg"; depends=[]; }; +PedCNV = derive { name="PedCNV"; version="0.1"; sha256="09qxcjzwdgzdkbj28rzmfv7k3q2qsiapnvx3m45a835r57h5gynp"; depends=[Rcpp RcppArmadillo ggplot2 Rcpp RcppArmadillo]; }; +PenLNM = derive { name="PenLNM"; version="1.0"; sha256="1xkz39cdp9dr8iq1cjiv862sda4zy737gvbwxxsykw15256lklmf"; depends=[remMap MASS Matrix]; }; +PepPrep = derive { name="PepPrep"; version="1.1.0"; sha256="1s2xn05xry50l9kf1mj6yd1dpc7yp6g3d00960hswvhznb0a4l84"; depends=[stringr]; }; +Peptides = derive { name="Peptides"; version="1.0.2"; sha256="0lfkhw5h34g7sch3b1a61i5adsdzwxn53pbx3cak6nf0lmab6k18"; depends=[]; }; +PerFit = derive { name="PerFit"; version="1.2"; sha256="1m0s51k497ks4y5253sw1aq5cdkhfkr70mz31xk01c50v11mb268"; depends=[ltm irtoys]; }; +PerMallows = derive { name="PerMallows"; version="1.7"; sha256="15bn8qpwl5v7kq5jzls6fis6r11pxh2v7dhj4c9qmw2w9c3x1g7s"; depends=[Rcpp Rcpp]; }; +PerfMeas = derive { name="PerfMeas"; version="1.2.1"; sha256="1x7ancmb41zd1js24rx94plgbssyc71z2bvpic6mg34xjkwdjw93"; depends=[]; }; +PerformanceAnalytics = derive { name="PerformanceAnalytics"; version="1.4.3541"; sha256="1czchsccsbdfjw743j6rm101q2q01pggyl8zmlva213pwm86zb3v"; depends=[xts zoo]; }; +PermAlgo = derive { name="PermAlgo"; version="1.0"; sha256="1dc4b5pn77av80k6pgh9k0ksvv9lnjqiwdb2jv55nm0ndycw0qr4"; depends=[]; }; +PhViD = derive { name="PhViD"; version="1.0.6"; sha256="17mr8gj6ic4p0xvxiva046r1gmy9azvm1s95rinxqsdd7hiak72w"; depends=[MCMCpack]; }; +PharmPow = derive { name="PharmPow"; version="1.0"; sha256="0gabkd8p4zsig9p697lyk8m2jxb5abjk81rpzd5ih1yk1qanhsn5"; depends=[scatterplot3d]; }; +PhaseType = derive { name="PhaseType"; version="0.1.3"; sha256="092dqyqfaxj8qpwxcjb5cayhnq597rfjz1xb93ps4nrczycqs0l6"; depends=[coda ggplot2 reshape]; }; +PhyActBedRest = derive { name="PhyActBedRest"; version="1.0"; sha256="0fpg17fwap12da7xka8pnd1wk6rbmw3zl099588g2r05wq3425sx"; depends=[]; }; +PhysicalActivity = derive { name="PhysicalActivity"; version="0.1-1"; sha256="1aqyip7psf3pdrxkpidfldkk9naihvnc7s3n6w6vvr9h1l5mpmvc"; depends=[]; }; +PivotalR = derive { name="PivotalR"; version="0.1.17.8"; sha256="023qhinh61ix4s8jkp2kbxpfly77w05sgaiqidbrsxf7zxih3zcf"; depends=[Matrix]; }; +PlayerRatings = derive { name="PlayerRatings"; version="1.0-0"; sha256="0hjb05bdha00ggcpp3n4f86dxjlhzmlpwgsbbx3mhyv3qq1g32ky"; depends=[]; }; +PlotRegionHighlighter = derive { name="PlotRegionHighlighter"; version="1.0"; sha256="0n1nkfr3sdaq6f5p9kgx4slrsvhpdbax3rinrkfkb1vnjj4swj77"; depends=[]; }; +PoMoS = derive { name="PoMoS"; version="1.1.1"; sha256="0j3iw6bcsr3rzwh15afcw3rglddq9bj7470xpnlpfpmd9nk0s18d"; depends=[RGtk2 cairoDevice igraph]; }; +PoiClaClu = derive { name="PoiClaClu"; version="1.0.2"; sha256="1j593sc344h9iy7if1ppihx2qd73dv32d77d8ckac43i7b2lig24"; depends=[]; }; +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]; }; +PolyPatEx = derive { name="PolyPatEx"; version="0.9"; sha256="1y3jsy095kfp9ycjnj467s1y5abba7jkm83x2cajp5g2jdgp7cf6"; depends=[gtools]; }; +PolynomF = derive { name="PolynomF"; version="0.94"; sha256="006ds50ivq91v2jyhgpm5rfaipxbzsnljrki6fjplcw07g0frz71"; depends=[]; }; +Pomic = derive { name="Pomic"; version="1.0.2"; sha256="1i3zsz7gc4n4vid3yi3srrv04qk1678wqyyw303pfibiyfd4m80q"; depends=[]; }; +PopED = derive { name="PopED"; version="0.1.2"; sha256="1rwmpbs3zhkhhfg19n23i3821i2vdn1w4fqqvyqsfjdmnasxsg91"; depends=[ggplot2 MASS mvtnorm nlme dplyr codetools]; }; +PopGenKit = derive { name="PopGenKit"; version="1.0"; sha256="0l4mbm0cyppgvcw2cbimrv29aiciyj00k8wfwcj5zr8sh7fgfhs4"; depends=[]; }; +PopGenReport = derive { name="PopGenReport"; version="2.1"; sha256="040h7cvnh1xqlbsyg1lkfiz88421myr47r63v466bxidwb17bqg2"; depends=[knitr adegenet raster lattice RgoogleMaps gap calibrate xtable plyr dismo reshape ggplot2 R_utils ade4 pegas genetics rgdal gdistance vegan sp mmod GGally]; }; +PopGenome = derive { name="PopGenome"; version="2.1.0"; sha256="150n0fdi047nx4iyfdm7ql4gn98wcj1v99llcpaaba78ca7dm83n"; depends=[ff]; }; +PortRisk = derive { name="PortRisk"; version="1.0"; sha256="0vyzvi56lmdlhxpbxcxcfqa8271jv2l45w7x1kzzwl6q0wm4bjln"; depends=[zoo]; }; +PottsUtils = derive { name="PottsUtils"; version="0.3-2"; sha256="05ds0a7jq63zxr3jh66a0df0idzhis76qv6inydsjk2majadj3zv"; depends=[miscF]; }; +PoweR = derive { name="PoweR"; version="1.0.4"; sha256="00y0dvrsbvz8mr8mdw7fk17s5dfgm0f641qg96039y6g3hk2rn77"; depends=[Rcpp Rcpp RcppArmadillo]; }; +Power2Stage = derive { name="Power2Stage"; version="0.1-5"; sha256="1mpb1qx2iad4vqqxy1zxlsi0bx2cf4d98h6s7g1040hk9lpdl671"; depends=[PowerTOST]; }; +PowerTOST = derive { name="PowerTOST"; version="1.2-03"; sha256="1m3d70gmzhacdlb8vf1g0j5m2z2v8hc2yzh6h4lsc1p7a6h1478z"; depends=[mvtnorm]; }; +PracTools = derive { name="PracTools"; version="0.0-2"; sha256="1bigir9fv6qrj3r8bfff6zyvxi10c0qh56kvhqsclvwyg3hfk5yz"; depends=[]; }; +PredictABEL = derive { name="PredictABEL"; version="1.2-1"; sha256="18fmafl1d4nwf7mya9gh1rlv5936zzr2jm3fwn5r2m5fc034qqjx"; depends=[Hmisc ROCR epitools PBSmodelling]; }; +PredictiveRegression = derive { name="PredictiveRegression"; version="0.1-4"; sha256="15vkisj3q4hinc3d537s8inhj3wk62q67qhy050xmp9j563ainmd"; depends=[]; }; +PresenceAbsence = derive { name="PresenceAbsence"; version="1.1.9"; sha256="17qn4ggkr5aqml45nkihj1j35y479ywkm1xcfkb2g8ky66jb0c0s"; depends=[]; }; +PrevMap = derive { name="PrevMap"; version="1.1"; sha256="13bssx7w2y5c6jcnkb99k4a8gk39ixkzfqm2p9n7c7brc2szv1lh"; depends=[geoR maxLik raster pdist splancs]; }; +PrivateLR = derive { name="PrivateLR"; version="1.2-21"; sha256="1jwq8f0dnngj8sfbmcmxy34nkkq6yjw0mq3w1f8rasz67v3bwzp3"; depends=[]; }; +ProDenICA = derive { name="ProDenICA"; version="1.0"; sha256="04gnsnd0xzw3bfbssdp06bar0lk305ry2c97pmwxgiz3ay88dfsj"; depends=[gam]; }; +ProbForecastGOP = derive { name="ProbForecastGOP"; version="1.3.2"; sha256="0fnw3g19lx4vs8vmn4qdirvybkiy2cxkhwkn9qa3phz45iixnvx4"; depends=[RandomFields fields]; }; +ProfessR = derive { name="ProfessR"; version="2.3"; sha256="1y88as4xjvdm2v2ms5l7c6ziq7sll6qkrpgzdd4xnbcjx7c0g9w8"; depends=[RPMG]; }; +ProfileLikelihood = derive { name="ProfileLikelihood"; version="1.1"; sha256="16cdp1nimhg1sd2x0qbffm7clgk54p0838y688z8lnsrjaggmb0x"; depends=[nlme MASS]; }; +ProgGUIinR = derive { name="ProgGUIinR"; version="0.0-4"; sha256="0srhk42ssx4i096sbs4jacqjsc1ffqjxjgvpplzshlqaby1h3795"; depends=[ggplot2 svMisc MASS]; }; +ProjectTemplate = derive { name="ProjectTemplate"; version="0.6"; sha256="0ijsy49gghnki5l63vg5l2awy57kbxbih618j5i5lxs44g15sa5v"; depends=[]; }; +PropCIs = derive { name="PropCIs"; version="0.2-5"; sha256="0wnc5h4390w4rglr7gjh6827f5r7gdhajx1iwp5fggdlm808hgq7"; depends=[]; }; +PropClust = derive { name="PropClust"; version="1.4-2"; sha256="13ac895i7ljayyqcjjmwvwar6wf1j0qssazcb5nlz8rw155qwavs"; depends=[flashClust dynamicTreeCut]; }; +PropScrRand = derive { name="PropScrRand"; version="1.1"; sha256="0cj62dzg4zm8d1g8h7qmviiwm93cwplppbi0p674fmmf1wy84v9s"; depends=[]; }; +PsumtSim = derive { name="PsumtSim"; version="0.4"; sha256="0079kb1bgsxs4cwmn33rbbk2jgq39rdjfgz9k9hc64iyzz0i6na3"; depends=[EffectsRelBaseline boot]; }; +PtProcess = derive { name="PtProcess"; version="3.3-7"; sha256="0a180qdf1a7jhng4ihjhd2aq2d7pd9pahir6920xczxvdgp3lm0l"; depends=[]; }; +PubBias = derive { name="PubBias"; version="1.0"; sha256="0dr5dhfx57knrs05pbx9ngg4k2937n8gjzsgd0jfqd8dfxhy051k"; depends=[rmeta R_utils]; }; +PubMedWordcloud = derive { name="PubMedWordcloud"; version="0.3.2"; sha256="1xn4ygpvj6pm548yj5kjh2l8n59p2caihfpbkykvbkzgf7hq8p00"; depends=[XML stringr RCurl wordcloud tm RColorBrewer]; }; +PurBayes = derive { name="PurBayes"; version="1.3"; sha256="0nbm4cyrwfbwwbjbjkylr86cshaqbvbif6dkp4fag8kbcgyyx5qh"; depends=[rjags]; }; +PwrGSD = derive { name="PwrGSD"; version="2.000"; sha256="0qxvws9mfrnqw5s24qhqk6cbffjm13z7awyxdmnilazghpiq1p7s"; depends=[survival]; }; +QCA = derive { name="QCA"; version="1.1-3"; sha256="083hc00d7srvxfkfax51ffngidbdhjqaxga3lln5gw53m2831v35"; depends=[lpSolve]; }; +QCA3 = derive { name="QCA3"; version="0.0-7"; sha256="0i9i2i633sjnzsywq51r2l7fkbd4ip217hp0vnkj78sfl7zf1270"; depends=[lpSolveAPI]; }; +QCAGUI = derive { name="QCAGUI"; version="1.9-6"; sha256="020ngni02j2w2ylhyidimm51d426pym2g1hg7gnpb7aplxx67n6x"; depends=[abind QCA]; }; +QCGWAS = derive { name="QCGWAS"; version="1.0-8"; sha256="1wn1kddgfmqv326pihnavbgsbd2yxrlq5s2xgi6kbprssxvj8bk1"; depends=[]; }; +QRM = derive { name="QRM"; version="0.4-10"; sha256="1fkxjqyb9yqki4qwk393ra66wg5dnbr5b5sgypm8wk973crbhcj0"; depends=[gsl Matrix mvtnorm numDeriv timeSeries Rcpp mgcv Rcpp]; }; +QSARdata = derive { name="QSARdata"; version="1.3"; sha256="0dhldnh0jzzb4assycc0l14s45ymvha48w04jbnr34lrwgr9krh4"; depends=[]; }; +QTLRel = derive { name="QTLRel"; version="0.2-14"; sha256="05x56a8fjr6xk38dphdzh77y520cr6zykjp3qlx27drk9s5z06cs"; depends=[gdata]; }; +QUIC = derive { name="QUIC"; version="1.1"; sha256="021bp9xbaih60qmss015ycblbv6d1dvb1z89y93zpqqnc2qhpv3c"; depends=[]; }; +QZ = derive { name="QZ"; version="0.1-4"; sha256="1k657i1rf6ayavn0lgfvlh8am3kzypgb1jhf2by147gv103izkrz"; depends=[]; }; +QoLR = derive { name="QoLR"; version="1.0"; sha256="1ah6x1fcs4l571jvgm0c257cgxhhpkzfhqimwbb9j7xbz3h55lp3"; depends=[survival zoo]; }; +QuACN = derive { name="QuACN"; version="1.8.0"; sha256="1597blp8gqc5djvbgpfzi8wamvy0x50wh5amxj9cy99qa0jlglxi"; depends=[combinat igraph]; }; +QualInt = derive { name="QualInt"; version="1.0.0"; sha256="1ms96m3nz54848gm9kdcydnk5kn2i8p1rgl2dwn7cqcqblfvsr4j"; depends=[survival ggplot2]; }; +Quandl = derive { name="Quandl"; version="2.4.0"; sha256="0apgwc85ija33dl9qgb8nr2wj5rx0xv6wlmg427nkxnr8pnar8ih"; depends=[xts RCurl RJSONIO zoo]; }; +QuantPsyc = derive { name="QuantPsyc"; version="1.5"; sha256="1i9bh88r8zxndzjqsj14qw64gnvm5a9kvhjhzk3qsrvl3qzjgh93"; depends=[boot MASS]; }; +QuantifQuantile = derive { name="QuantifQuantile"; version="1.0"; sha256="0r3yz8k68z6c751r0ryxv744spch4aws50313miq498r5mvr4w1y"; depends=[rgl]; }; +QuasiSeq = derive { name="QuasiSeq"; version="1.0-4"; sha256="1vpk1l7dhbfdywncdfg1c29qpj3x0m5ddpyh13d0d3ic8rzhdivf"; depends=[Matrix mgcv]; }; +R_cache = derive { name="R.cache"; version="0.10.0"; sha256="0y8q3w9z9cyzsg60x95kkc81ksc2d5vpdaqg5njq5bgjyw7yjqvs"; depends=[R_methodsS3 R_oo R_utils]; }; +R_devices = derive { name="R.devices"; version="2.12.0"; sha256="0as90warygvcsa5cvicjykn7jz2d5cdw68ghqi9cj5lzqq982dkn"; depends=[R_methodsS3 R_oo R_utils base64enc]; }; +R_filesets = derive { name="R.filesets"; version="2.6.0"; sha256="0n99mxdajb6rk7cvgy4gihaifiw31llngrhx22mfn3zs7wbdk9d1"; depends=[R_oo R_methodsS3 R_utils R_cache digest]; }; +R_huge = derive { name="R.huge"; version="0.8.0"; sha256="00iiz1q6a5ywsidiwy6lnxjw0ig75ri914dqr7cbfccdf66fb840"; depends=[R_methodsS3 R_oo R_utils]; }; +R_matlab = derive { name="R.matlab"; version="3.1.1"; sha256="15j1mshzv1lpjlsdcjg45khdvl0w8mqwd387i1lc0zv1r29m6mn9"; depends=[R_methodsS3 R_oo R_utils]; }; +R_methodsS3 = derive { name="R.methodsS3"; version="1.6.1"; sha256="1c3f64bvnpxfb3k2g7z3a6qms36z0n2hflw5w5952c82jx10cl0x"; depends=[]; }; +R_oo = derive { name="R.oo"; version="1.18.0"; sha256="0difa5258i59vb538xp9p1jkzzrbmm8l35gqhpchfxk5dhn2cq9a"; depends=[R_methodsS3]; }; +R_rsp = derive { name="R.rsp"; version="0.19.0"; sha256="0qh9nd6zpiw4c86qlwys8g7rqvay20m1yfp2zrvah5bz51hixbd1"; 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]; }; +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="0.3-1"; sha256="1qsg4lvzxpbn2jli58kncn5kjlv7ccmmkrj1m9jakbbzx51qc1rj"; depends=[BayesXsrc colorspace mgcv]; }; +R2Cuba = derive { name="R2Cuba"; version="1.0-11"; sha256="1kgcxqn83yskh0dv6vyz66d0z32qy55par36jj987qglpl25zmax"; depends=[]; }; +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=[]; }; +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"; sha256="125r4drgl79cwda00g42m0l0dzqmi2n8p5cikx70jz67giq5blw2"; 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.04-03"; sha256="0wygsz5zzng8fh82pzhqly3d532ljz0jj34h9nz7g3v5asv0kcqm"; 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.2"; sha256="1g8n89y1l5jy3168qz9j0kz3dvyadhn5mhilpzlpn3pijvv2vndf"; depends=[XML]; }; +R4CouchDB = derive { name="R4CouchDB"; version="0.6"; sha256="0d32p5jl1fw2190dvn46hfw2j7v849ps5a00j18jky2gl4blvghs"; depends=[bitops RCurl RJSONIO]; }; +R4dfp = derive { name="R4dfp"; version="0.2-4"; sha256="02crzjphlq4hi2crh9lh8l0acmc1rgb3wr1x8sn56cwhq4xzqzcb"; depends=[]; }; +R6 = derive { name="R6"; version="2.0.1"; sha256="0ngm3hl0q3aj067q6q0iqh729z8jx3ydvasj1jw9qrr7bzjh1jn5"; depends=[]; }; +RAD = derive { name="RAD"; version="0.3"; sha256="0nmgsaykxavq2bskq5x0jvsxzsf4w2gqc0z80a59376li4vs9lpj"; depends=[mvtnorm MASS]; }; +RADami = derive { name="RADami"; version="1.0-3"; sha256="0rg07dsh2rlldajcj0gq5sgsl1i3qa28bsrmq88xcljg5hnr4iqn"; depends=[ape geiger phangorn]; }; +RAHRS = derive { name="RAHRS"; version="1.0.1"; sha256="068alq0mrfgcmpa5gfrrqgixpdadva11s9ammg7p6g9lfrjx6gcc"; depends=[pracma RSpincalc]; }; +RAM = derive { name="RAM"; version="1.1.0"; sha256="0l4daqrrcmj424k7x9jr8lpcqlhx000m71ayv3i3cchdq87xmzhf"; depends=[vegan ggplot2 gridExtra RColorBrewer gplots plyr reshape2 scales labdsv stringr ggmap permute]; }; +RAMpath = derive { name="RAMpath"; version="0.3.8"; sha256="1p1l6iirb314n5246kyyz0r3ja4v05xb5a6aq9k26wsb5m42x85k"; depends=[lavaan ellipse]; }; +RANN = derive { name="RANN"; version="2.4.1"; sha256="13d2wi3r4b190f6s6y4zipqf43gy9c1h71b9j7qmc3lqca4nvzmd"; depends=[]; }; +RAP = derive { name="RAP"; version="1.1"; sha256="18dclijs72p6gxawpg8hk7n512ah4by5jfg2jnrp8mz79ajmdgir"; depends=[]; }; +RAPIDR = derive { name="RAPIDR"; version="0.1.1"; sha256="14cnw4jjs5anb55zlg1yj6qc9yr51rsamigq2q7h8ypj2ggnna1d"; depends=[data_table PropCIs]; }; +RAdwords = derive { name="RAdwords"; version="0.1.1"; sha256="17srb2zlli19x6gq79ylx9psb92qq5z7hnmqa4n26zgdd3iaf9mk"; depends=[RCurl rjson]; }; +RApiSerialize = derive { name="RApiSerialize"; version="0.1.0"; sha256="0gm2j8kh40imhncwwx1sx9kmraaxcxycvgwls53lcyy2ap344k9j"; depends=[]; }; +RAppArmor = derive { name="RAppArmor"; version="1.0.1"; sha256="06j7ghmzw2rrlk8nsarmpk1ab2gg88qs52zpw37rhqchpyzwwkfb"; depends=[]; }; +RArcInfo = derive { name="RArcInfo"; version="0.4-12"; sha256="1j1c27g2gmnxwslff4l0zivi48qxvpshmi7s9wd21cf5id0y4za4"; depends=[RColorBrewer]; }; +RAtmosphere = derive { name="RAtmosphere"; version="1.1"; sha256="0mk43bq28hlrjwaycsxca458k8xf00q58czgc17d8yx3kz17a5i0"; depends=[]; }; +RCA = derive { name="RCA"; version="1.4.5"; sha256="0s200s28a6gh3dggad52dgqnf0k2jsfrqv1hbg8w2529v4s3dc5i"; depends=[igraph]; }; +RCALI = derive { name="RCALI"; version="0.2-6"; sha256="01zaks9mdgi9hcwsfvg3dwkihmb5ay5ilgg10fqcz2cssldj9x7x"; depends=[splancs]; }; +RCEIM = derive { name="RCEIM"; version="0.2"; sha256="0l3lfx3zqxf310rhvjkn977xchxzi7cbzij3ks0nqlx55x5ica9w"; depends=[]; }; +RCMIP5 = derive { name="RCMIP5"; version="1.1"; sha256="1aqcwxh2p4z7wn4p224xdiaharbr51rj51aa760rirs5s1ra7f6q"; depends=[abind dplyr reshape2 digest]; }; +RCPmod = derive { name="RCPmod"; version="1.4"; sha256="1psn1w8ws0n96jqvd98l0wl0l46w0691c5vm9aarql2pqnc73lw9"; depends=[numDeriv gtools]; }; +RCassandra = derive { name="RCassandra"; version="0.1-3"; sha256="0xa241s81cyw6lfjb522f2mlyrd0gav9yz3z5jab9hpdpgg9ri38"; depends=[]; }; +RCircos = derive { name="RCircos"; version="1.1.2"; sha256="0j7ww2djnhpra13vjr6y772sg64ikdmw1z68lpp9i7d0shlc3qx9"; depends=[]; }; +RClimMAWGEN = derive { name="RClimMAWGEN"; version="1.1"; sha256="0icy560llfd10mxlq0xmc6lbg6a030za9sygw1rpz8sk5j0lvb84"; depends=[climdex_pcic RMAWGEN]; }; +RColorBrewer = derive { name="RColorBrewer"; version="1.0-5"; sha256="0y4ficfdjzrd7lkcaafjrdqr5r3jiha7rvg76h8m5yak396c9has"; depends=[]; }; +RCryptsy = derive { name="RCryptsy"; version="0.2"; sha256="1sm6l2jbaxia53dqivii5g7pqbczvjk53c2v2vz65qz1qnrmrybj"; depends=[RJSONIO RCurl]; }; +RCurl = derive { name="RCurl"; version="1.95-4.3"; sha256="1gyjarnxwz3ldpm1vwq9ls6al66rvs7yshzhrl1fv9lbm1qi8yfg"; depends=[bitops]; }; +RDIDQ = derive { name="RDIDQ"; version="1.0"; sha256="09gincmxv20srh4h82ld1ifwncaibic9b30i56zhy0w35353pxm2"; depends=[]; }; +RDML = derive { name="RDML"; version="0.4-2"; sha256="0bx1n6x3yskpbgwwwjhs6hk43sfq7x55yffvnd7bz5qb3l49wsw2"; depends=[XML chipPCR]; }; +RDS = derive { name="RDS"; version="0.6"; sha256="14zk511agqckriqjiaargglzsw14mch8q7zh97qd38xg0568mh73"; depends=[ggplot2 gridExtra rgexf igraph scales locfit Hmisc reshape2]; }; +RDSTK = derive { name="RDSTK"; version="1.1"; sha256="07vfhsyah8vpvgfxfnmp5py1pxf4vvfzy8jk7zp1x2gl6dz2g7hq"; depends=[plyr rjson RCurl]; }; +RDieHarder = derive { name="RDieHarder"; version="0.1.3"; sha256="0wls7b0qfbi6hsq9xdywi4mdhim5b6mrzhvyrm9dxp9z1k7imz6m"; depends=[]; }; +REBayes = derive { name="REBayes"; version="0.50"; sha256="0p4kv709r0577xq3mdw2vwla1gsjm8b9mnbsbfwm8fx3n3wfrx0p"; depends=[Rmosek Matrix SparseM]; }; +RECA = derive { name="RECA"; version="1.0"; sha256="0ah67yr6sppm66bfayq8k3p63g8bcc61k6j3rzrj6qx8d72kq54d"; depends=[]; }; +RECSO = derive { name="RECSO"; version="1.0"; sha256="1ipjfxk58wkrq6a0nqrg9b734xj1qa8xnr44xigbpjrpdqd5j3lm"; depends=[]; }; +REDCapR = derive { name="REDCapR"; version="0.4-28"; sha256="08x3zwcm9yq27nia320lrfwq4vq8dhy73cqsxll2zsa8nl05mpaw"; depends=[httr plyr stringr]; }; +REEMtree = derive { name="REEMtree"; version="0.90.3"; sha256="01sp36p12ky8vgsz6aik80w4abs70idr9sn4627lf94r92wwwsbc"; depends=[nlme rpart]; }; +REPPlab = derive { name="REPPlab"; version="0.9"; sha256="0f3p9kjsn0x3sf4qx05rm1llad09w6dimvhdd7q8w3ggwqsh2w20"; depends=[rJava lattice]; }; +REQS = derive { name="REQS"; version="0.8-12"; sha256="049glqhc8h8gf425kmj92jv70917dsigpm37diby0c6hb4jrg8ka"; depends=[gtools]; }; +REdaS = derive { name="REdaS"; version="0.9.1"; sha256="0nd0d6cnx43k73cygbw0r6hdxpwkzwrlm4vr60s6hk227am15z68"; depends=[]; }; +RFGLS = derive { name="RFGLS"; version="1.1"; sha256="13ggxj74h5b2hfhjyc50ndxznkvlg18j80m78hkzwh25d3948fsk"; depends=[bdsmatrix Matrix]; }; +RFLPtools = derive { name="RFLPtools"; version="1.6"; sha256="1hl2crg7jl266zac41xvx151h7kl52346wnlvd8hba64s4s4apay"; depends=[RColorBrewer]; }; +RFOC = derive { name="RFOC"; version="3.3-3"; sha256="101d7nf4zjni5kdk54w3afdaqnjzl7y90zygybkqpd0vi82q602b"; depends=[RPMG GEOmap RSEIS MASS splancs]; }; +RFinanceYJ = derive { name="RFinanceYJ"; version="0.3.1"; sha256="0qhmzsch7c2p0zckjkspsajzh8m10cf75ixjlgd0nj8rm41fngm3"; depends=[XML xts]; }; +RForcecom = derive { name="RForcecom"; version="0.7"; sha256="0rjav2rwanzqgi1yasbm9lj18f0mfxwd8w8x41skf656gfcpi0i4"; depends=[XML RCurl plyr]; }; +RFreak = derive { name="RFreak"; version="0.3-0"; sha256="1dmllxb6yjkfkn34f07j2g7w5m63b5d10lh9xsmxyfk23b8l3x0x"; depends=[rJava]; }; +RGA = derive { name="RGA"; version="0.1.3"; sha256="0d7vwzz6yx17qskhc62v3cbia8cxj67f75wk96p78b7h8wza3zf9"; depends=[httr jsonlite httpuv shiny]; }; +RGCCA = derive { name="RGCCA"; version="2.0"; sha256="0mcp51z5jkn7yxmspp5cvmmvq0cwh7hj66g7wjmxsi74dwxcinvg"; depends=[MASS]; }; +RGENERATE = derive { name="RGENERATE"; version="1.1"; sha256="1da3b50cfv5jb63ijzbnr226jadbww2bapcxzx8am7zydm6gqnss"; depends=[RMAWGEN]; }; +RGIFT = derive { name="RGIFT"; version="0.1-5"; sha256="1745fs4bq0ss39fiwljspvrmnkgbbpc1fjvhvcrsmp2iizq12sgn"; depends=[]; }; +RGenetics = derive { name="RGenetics"; version="0.1"; sha256="0x5sspd67hh08qm62whlnnd838m0np29q3bfzgwp6j85lhil3jrx"; depends=[]; }; +RGoogleAnalytics = derive { name="RGoogleAnalytics"; version="0.1.1"; sha256="1049fyxl00izw92rm508p90asjp0agmv38b00yfbmasfzsp1r00s"; depends=[lubridate httr]; }; +RGraphics = derive { name="RGraphics"; version="2.0-12"; sha256="03f0rlckfkll3s30avglbf0524laf8n6plxlbmbx1qi1s18hcfai"; depends=[lattice ggplot2]; }; +RGtk2 = derive { name="RGtk2"; version="2.20.31"; sha256="1ilnlmsk9fis61pc5bn9sf7z4b7vc7f0a0zcy77kk4bns6iqjvyp"; depends=[]; }; +RGtk2Extras = derive { name="RGtk2Extras"; version="0.6.1"; sha256="19gjz2bk9dix06wrmlnq02yj1ly8pzhvr0riz9b08vbzlsv9gnk2"; depends=[RGtk2]; }; +RH2 = derive { name="RH2"; version="0.2.3"; sha256="1qbxy600fc8k2xl70liggdgg03ga6a8yad001banqzdmh508wcxl"; depends=[chron RJDBC rJava]; }; +RHRV = derive { name="RHRV"; version="4.0"; sha256="16xmmmw8gsqalbqf59xwpkd2bkfwxrdx8bwdn875bizx7mn0bql7"; depends=[tkrplot waveslim nonlinearTseries]; }; +RHT = derive { name="RHT"; version="1.0"; sha256="1gxf8nhj3y92h8al7l3fxa45wc568kb3cykrbdjlsy2zjacf7fcc"; depends=[]; }; +RHive = derive { name="RHive"; version="2.0-0.2"; sha256="0a1saqqwh6zvz264jkkd6c9abxpsg1j4yfivb5h773i76pzhvqc3"; depends=[rJava]; }; +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.2"; sha256="1hi22sf6g047m2bq9yh6bwvi1x8bjw12vslfp6iyrim0w2pk96m1"; 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.0"; sha256="154ibjx5xyibaw8hhdh4hw5rbmwp340bplvz1174n6svg2dpl542"; depends=[]; }; +RInside = derive { name="RInside"; version="0.2.11"; sha256="09j4dpv30pp0q3h129ig15xxlp8yzxnk122iica4nv88niabjcaa"; depends=[Rcpp Rcpp]; }; +RItools = derive { name="RItools"; version="0.1-12"; sha256="0zdwj5y355d8jnwmjic3djwn6zy7h1iyl58j9hmnmc3m369cir0s"; depends=[lattice SparseM xtable svd abind]; }; +RJDBC = derive { name="RJDBC"; version="0.2-4"; sha256="14nqz4gx24gcjmnd3hrhvfs5f68c3nqhb6nypv9gvk19dx1jayg0"; depends=[DBI rJava]; }; +RJSDMX = derive { name="RJSDMX"; version="1.2"; sha256="0b4w2qva19av76gjwbdccf6gwfc2fia31pvbhgv1a48p272kxzni"; depends=[rJava zoo]; }; +RJSONIO = derive { name="RJSONIO"; version="1.3-0"; sha256="1dwgyiy19sixhy6yclqcaaxswbmpq7digyjjxhy1qv0wfsvk94qi"; depends=[]; }; +RJaCGH = derive { name="RJaCGH"; version="2.0.2"; sha256="1fy8wsnv7diwg2w7j61scm6vd35a5jb36i9pzh5m7jz6yqsank50"; depends=[]; }; +RKEA = derive { name="RKEA"; version="0.0-4"; sha256="0qkjnyy4b6vzdiapadx9hmw3h4gfgmbi4g5078rr6kq5kmwqlwgh"; depends=[rJava tm]; }; +RLRsim = derive { name="RLRsim"; version="3.0"; sha256="16bqsp15b8ikgix18p63k6sf81d1al4djbb51r08imjs4z9jppg4"; depends=[Rcpp mgcv Rcpp]; }; +RM2 = derive { name="RM2"; version="0.0"; sha256="1v57nhwg8jrpv4zi22fhrphw0p0haynq13pg9k992sb0c72dx70a"; depends=[msm]; }; +RMAWGEN = derive { name="RMAWGEN"; version="1.2.6.1"; sha256="1j8yb37sv2ycg3zgdj6hlxvlrsgvb9rh4yxd40bah2j1xgibr36z"; depends=[chron date vars]; }; +RMC = derive { name="RMC"; version="0.2"; sha256="1sc4nsjmaw2ajm8bka7r4mf73zxqhnvx23kl4v20pfpy9rhgd0h6"; depends=[]; }; +RMKdiscrete = derive { name="RMKdiscrete"; version="0.1"; sha256="0b4adw46sn98qmy4nxv5l5svcjrp5532x7slfhhgsskqx408lzjf"; depends=[]; }; +RMOA = derive { name="RMOA"; version="1.0"; sha256="01mrl6544wv2jc8b8gk1whs865sbv4id5sywnf1hq3r7g8wgs8lp"; depends=[RMOAjars rJava]; }; +RMOAjars = derive { name="RMOAjars"; version="1.0"; sha256="0k3w37dwyyvfxh7a9l76cyjm27qq1clxppc5h16li2m8x68fvpjq"; depends=[rJava]; }; +RMRAINGEN = derive { name="RMRAINGEN"; version="1.0"; sha256="175kd803a44yblq2jw5mrn2qv4piiy249577lf684bmmajf4ird4"; depends=[copula RGENERATE RMAWGEN blockmatrix Matrix]; }; +RMTstat = derive { name="RMTstat"; version="0.3"; sha256="1nn25q4kmh9kj975sxkrpa97vh5irqrlqhwsfinbck6h6ia4rsw1"; depends=[]; }; +RMallow = derive { name="RMallow"; version="1.0"; sha256="0prd5fc98mlxnwjhscmghw62jhq9rj5jk8qf4fnaa2a718yxf9b5"; depends=[combinat]; }; +RMark = derive { name="RMark"; version="2.1.9"; sha256="1z7hh9fwaaiwa2s27vrc3yckqc0vhimazqj71601ibsqs3pljzh8"; depends=[snowfall matrixcalc msm coda]; }; +RMediation = derive { name="RMediation"; version="1.1.3"; sha256="07ck74dl1wwb88229fhkh2czlynddff7zvjyhisxk53qmdb0wvmw"; depends=[MASS lavaan e1071]; }; +RMongo = derive { name="RMongo"; version="0.0.25"; sha256="1anybw64bcipwsjc880ywzj0mxkgcj6q0aszdad6zd4zlbm444pc"; depends=[rJava]; }; +RMySQL = derive { name="RMySQL"; version="0.9-3"; sha256="1kmsrphzrk7a6f3i0pmpxlpj7w7yb5s2psx72lfv4zyd0aji83n1"; depends=[DBI]; }; +RNCBIEUtilsLibs = derive { name="RNCBIEUtilsLibs"; version="0.9"; sha256="1h1ywx8wxy6n2rbpmjbqw4c0djz29pbncisd0mlbshj1fw226jba"; depends=[rJava]; }; +RNCEP = derive { name="RNCEP"; version="1.0.7"; sha256="0yvddsdpdrsg2dafmba081q4a34q15d7g2z5zr4qnzqb8wjwh6q2"; depends=[maps RColorBrewer abind fields fossil tgp sp]; }; +RND = derive { name="RND"; version="1.1"; sha256="1rbnjkfrsvm68xp90l4awixbvpid9nxnhg6i6fndpdmqwly2fwdp"; depends=[]; }; +RNeXML = derive { name="RNeXML"; version="1.1.3"; sha256="1fcs1fwq66fb04zi2pwgn7xfljp8053s2vb0g4j5vzv0dq7nxy98"; depends=[ape XML plyr taxize reshape2 httr uuid]; }; +RNetCDF = derive { name="RNetCDF"; version="1.6.3-1"; sha256="0c112qwxzml3mbdss69607amxvhpkfgs7ihymxidgkv0s3ra7cp5"; depends=[]; }; +RNetLogo = derive { name="RNetLogo"; version="1.0-1"; sha256="051yx7l8qbnvb4gn67m00wnl6v0jrmavmp7n7zygjn7p1xi3w22c"; depends=[rJava igraph]; }; +RNiftyReg = derive { name="RNiftyReg"; version="1.1.2"; sha256="1g74qdx71wzyl0k7liwvl33rzhz7srmn15x55md5gyljxb5rqm6c"; depends=[reportr oro_nifti]; }; +ROAuth = derive { name="ROAuth"; version="0.9.3"; sha256="13h0q7dx4xx7fngi3zfm92ws5x4c6cfa2svq7smmci7c0z4kirb2"; depends=[RCurl digest]; }; +ROC632 = derive { name="ROC632"; version="0.6"; sha256="0vgv4rclvb79mfj1phs2hmxhwchpc5rj43hvsj6bp7wv8cahfg5g"; depends=[survival penalized survivalROC]; }; +ROCR = derive { name="ROCR"; version="1.0-5"; sha256="1zinan5hfvgg24imn0210m2lwqk5jxmmw8gz08l44j988lw8c2iw"; 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="1cswx1r0ycklqj2calhk1anmiaadx0kyazsvbsm3h5sm7wsqfw5b"; 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]; }; +ROI_plugin_glpk = derive { name="ROI.plugin.glpk"; version="0.0-2"; sha256="10p3cq59app3xdv8dvqr24m937a36lzd274mdl2a9r4fwny2rssa"; depends=[ROI Rglpk]; }; +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.04"; sha256="06454axywp5264cczhz8k31n7qmg95c2rnxv08frfgzwgm3cfzhr"; depends=[xts zoo DBI vwr e1071]; }; +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]; }; +ROracle = derive { name="ROracle"; version="1.1-12"; sha256="1ydmckr0wzjgvhhh410l4ih7idbr8140g6v11avh655wffk02q5p"; depends=[DBI]; }; +RPCLR = derive { name="RPCLR"; version="1.0"; sha256="03kpyszsjb656lfwx2yszv0a9ygxs1x1dla6mpkhcnqw00684fab"; depends=[MASS survival]; }; +RPMG = derive { name="RPMG"; version="2.1-5"; sha256="1ck6bz72h1kwi7gg8vd0zw1q61pqv23rish84zri2p18z7nd9kvh"; depends=[]; }; +RPMM = derive { name="RPMM"; version="1.20"; sha256="09rwrcd8jz0nii1vx0n3b4daidiq0kp0vf88bvi84y4i06743il7"; depends=[cluster]; }; +RPPanalyzer = derive { name="RPPanalyzer"; version="1.4"; sha256="1v795f8abn3ma1wbvqbbmb1sfzg5q66np7kkz05c23h2yyl486mc"; depends=[quantreg lattice gam gplots ggplot2 Hmisc]; }; +RPostgreSQL = derive { name="RPostgreSQL"; version="0.4"; sha256="0gpmbpiaiqvjzyl84l2l8v2jnz3h41v8jl99sp1qvvyrjrickra2"; depends=[DBI]; }; +RProtoBuf = derive { name="RProtoBuf"; version="0.4.1"; sha256="1992nz0dz4h802gakcri1c9dgacxc5nvg3h5lm2zv6yg748ha6nh"; depends=[Rcpp RCurl Rcpp]; }; +RPublica = derive { name="RPublica"; version="0.1.1"; sha256="0m0wib0nijya228jmcl98l2hsx8l28dg6lvpwmx67jyhpvpplpkl"; depends=[XML RJSONIO RCurl]; }; +RPushbullet = derive { name="RPushbullet"; version="0.1.1"; sha256="0kaz7jwhg31ycvkxyfb17669jdhsz8y7fsz8brd6kxszkyyl1cvv"; depends=[RJSONIO]; }; +RQDA = derive { name="RQDA"; version="0.2-7"; sha256="05h2f5sk0a14bhzqng5xp87li24b6n11p5lcxf9xpy7sbmh5ig6g"; depends=[RSQLite gWidgetsRGtk2 RGtk2 DBI igraph gWidgets]; }; +RQuantLib = derive { name="RQuantLib"; version="0.3.12"; sha256="1ih7lkpa3p0ipgc8hs9miv500rk285ddc7pmn2qv03ibpsdlvjmq"; depends=[Rcpp Rcpp]; }; +RRF = derive { name="RRF"; version="1.6"; sha256="1gp224mracrz53vnxwfvd7bln18v8x7w130wslhfgcdl0n4f2d28"; depends=[]; }; +RRreg = derive { name="RRreg"; version="0.2.0"; sha256="0pni738yc236p8aafzjha5589i8bll3b075k0fync2mkc1v4czln"; depends=[doParallel foreach]; }; +RSA = derive { name="RSA"; version="0.9.3"; sha256="132fqsr6zzv0q5maxgdh8amg6g0if3wdbhml0p0r668yy1wiq5l8"; depends=[lavaan ggplot2 lattice gridExtra plyr RColorBrewer]; }; +RSADBE = derive { name="RSADBE"; version="1.0"; sha256="1nzpm88rrzavk0n8iflsx8r3s1xcry15n80zqdw6jijjycz10w1q"; depends=[]; }; +RSAGA = derive { name="RSAGA"; version="0.93-6"; sha256="0wqiww0rx5fz4rbsb1x6pr2q0wz5dacj5fc0asj70igxwmh5x0p8"; depends=[gstat shapefiles plyr]; }; +RSAP = derive { name="RSAP"; version="0.9"; sha256="1sxirfabhpmfm0yiiazc9h1db70hqwva2is1dql6sjfanpl8qanl"; depends=[yaml reshape]; }; +RSDA = derive { name="RSDA"; version="1.2"; sha256="06sa3x0abm2gnf4i4y3d5mlqj1wl7mzzal27sa1x65awzi6rs2kz"; depends=[sqldf XML scales FactoMineR ggplot2 glmnet abind scatterplot3d]; }; +RSEIS = derive { name="RSEIS"; version="3.3-3"; sha256="13fb4mx3sgnbrcn1kkxy0a490kikjrq49ii3x14xw2s8ci030wlr"; depends=[RPMG Rwave]; }; +RSGHB = derive { name="RSGHB"; version="1.0.2"; sha256="0ffdx9lscbgknfqhvjdh3rwnlhiqxbpqa55jkn111a1vfv726v3d"; depends=[]; }; +RSKC = derive { name="RSKC"; version="2.4.1"; sha256="1dvzxf001a9dg71l4bh8z3aia7mymqy800268qf7qzy9n6552g59"; depends=[flexclust]; }; +RSNNS = derive { name="RSNNS"; version="0.4-5"; sha256="1wk91vjgf7q65n9q8hciv08bgzawpljnhaqgy9qdwpr82v8959i7"; depends=[Rcpp Rcpp]; }; +RSNPset = derive { name="RSNPset"; version="0.2"; sha256="0ivym4ysadvlfr9k4ikpw2diil9xd3hqx6xj8jcz482d3h8qcgq6"; depends=[fastmatch foreach doRNG Rcpp Rcpp RcppEigen]; }; +RSQLServer = derive { name="RSQLServer"; version="0.1.1"; sha256="0xaw8a06xgc78hjg4bndip0jpc7l4glk28pggm2l3j31ybx81kw7"; depends=[DBI rJava RJDBC]; }; +RSQLite = derive { name="RSQLite"; version="1.0.0"; sha256="08b1syv8z887gxiw8i09dpqh0zisfb6ihq6qqr01zipvkahzq34f"; depends=[DBI]; }; +RSVGTipsDevice = derive { name="RSVGTipsDevice"; version="1.0-4"; sha256="1ybk5q4dhskrh7h1sy86ilchdwi6rivy3vv3lph6pms2virgm854"; depends=[]; }; +RSclient = derive { name="RSclient"; version="0.7-2"; sha256="04ml4pynjl97295wrclvb61mpwacrkzc9x5pbwyfg1qr3l8hss93"; depends=[]; }; +RSeed = derive { name="RSeed"; version="0.1.31"; sha256="0wljchzkp8800v9zcgjapkbildkb3p2xnkh1m6m7q6qqc9aw8mws"; depends=[sybil]; }; +RSelenium = derive { name="RSelenium"; version="1.3.5"; sha256="15pnmnljl4dm9gbcgnad5j58k6cgs6qm34829kdgyb0ygs9q7ya0"; depends=[RCurl RJSONIO XML caTools]; }; +RSiena = derive { name="RSiena"; version="1.1-232"; sha256="0qp3bqq5p19bg47m37s2dw8m4q91hnkc2zxwhsgb076q0xvvv9xq"; depends=[Matrix]; }; +RSiteCatalyst = derive { name="RSiteCatalyst"; version="1.4.1"; sha256="0hpmrck12fdfns4dg1ksv02b7nqjpfscalrp4fgjqwzr0vbc7hgx"; depends=[jsonlite httr plyr base64enc digest stringr]; }; +RSocrata = derive { name="RSocrata"; version="1.5"; sha256="0hbazn4c3bmx9kc030l19ciz9m0r5p6760ggyxl8f7sh8g3bqw32"; depends=[httr jsonlite]; }; +RSofia = derive { name="RSofia"; version="1.1"; sha256="0q931y9rcf6slb0s2lsxhgqrzy4yqwh8hb1124nxg0bjbxvjbihn"; depends=[Rcpp Rcpp]; }; +RSpincalc = derive { name="RSpincalc"; version="1.0.1"; sha256="0n751l329j9pgpdnqrdnf93i9l1qxfp2bl4v4ray3nrnjx8g5mc9"; depends=[]; }; +RStorm = derive { name="RStorm"; version="0.902"; sha256="1apk358jwzg5hkrcq8h39rax1prgz9bhkz9z51glmci88qrw1frv"; depends=[plyr]; }; +RSurvey = derive { name="RSurvey"; version="0.8-2"; sha256="1fksjbzny0wl0k2sj3bxflzim7i8r5dfwz9ih4ssk5xaxfmjz2f5"; depends=[sp rgeos MBA]; }; +RSvgDevice = derive { name="RSvgDevice"; version="0.6.4.4"; sha256="0vplac5jzg6bmvbpmj4nhiiimsr9jlbk8mzyifnnndk9iyf2lcmz"; depends=[]; }; +RTConnect = derive { name="RTConnect"; version="0.1.4"; sha256="1000jmmqzyhl6vh1ii75jdh88s9inaz52gvfwcin2k2zr7bi91ba"; depends=[]; }; +RTDE = derive { name="RTDE"; version="0.1-0"; sha256="00hh1axipp2blrhjwl9mc4fkqv3l132gxlhi9hdy52w20yhwigin"; depends=[]; }; +RTOMO = derive { name="RTOMO"; version="1.1-2"; sha256="15swp7jx5xmj87hjcfdar3r5sqnnb795qclf8b7l4bvx80h9nh2i"; depends=[RPMG GEOmap RSEIS splancs]; }; +RTextTools = derive { name="RTextTools"; version="1.4.2"; sha256="1j3zfywq8xgax51mbizxz704i3ys4vzp8hyi5kkjzq6g2lw7ywq2"; depends=[SparseM randomForest tree nnet tm e1071 ipred caTools maxent glmnet tau]; }; +RTextureMetrics = derive { name="RTextureMetrics"; version="1.1"; sha256="0d0mvpmcpd62cvqlajrqp32lnvpflyf9bqvdzly2v8v1kb8274fc"; depends=[]; }; +RTriangle = derive { name="RTriangle"; version="1.6-0.6"; sha256="1g4dp792awbvsl35nvyd8gkx99p2njdcafin16qysfrjl43f5i4s"; depends=[]; }; +RUnit = derive { name="RUnit"; version="0.4.27"; sha256="11hxy1n2rds3yl0zr0lg3dj7cfjlhk9r2ig6r9jl57b53g802kf7"; depends=[]; }; +RVAideMemoire = derive { name="RVAideMemoire"; version="0.9-41"; sha256="039263c10wlj4xyb696mcidndm1vkxwrghramvvgyivd7ybk3flw"; depends=[ade4 boot car lme4 MASS mixOmics statmod]; }; +RVideoPoker = derive { name="RVideoPoker"; version="0.3"; sha256="06s4dlw0pw8rcq5b31xxqdpdk396rf27mai2vpvmn585vbm1ib7a"; depends=[pixmap tkrplot rpanel]; }; +RVowpalWabbit = derive { name="RVowpalWabbit"; version="0.0.6"; sha256="06f2lmls92qkbscss00c99xkzpx83mgjah6ds0sixv1b2qi216ap"; depends=[Rcpp Rcpp]; }; +RVsharing = derive { name="RVsharing"; version="1.1.0"; sha256="0gcas4rb8pms470dhbm2c2x87an0j594xsziglgd84nqn4gq095d"; depends=[kinship2]; }; +RVtests = derive { name="RVtests"; version="1.2"; sha256="0k7w6ml981zvr5bix197qw4kaf7rz5jqnwqlxf7aryxbm39gk16c"; depends=[glmnet spls pls]; }; +RWBP = derive { name="RWBP"; version="1.0"; sha256="104vr2cdk185hh4zn3vmqvb14p1q8ifk11wdgvk7fli1m1zxxwdd"; depends=[RANN igraph lsa SnowballC]; }; +RWeather = derive { name="RWeather"; version="0.4"; sha256="1vm8w07gsxwxvg1gpdzn6mpnh8g9kp0ln9fxjw5rl2f1zz80bxpy"; depends=[XML]; }; +RWebLogo = derive { name="RWebLogo"; version="1.0.3"; sha256="1n65mlnr163ywjnyyngnigbj0wpgkr38c3nx8hw5r8mwjnf3d617"; depends=[findpython]; }; +RWeka = derive { name="RWeka"; version="0.4-23"; sha256="1p1kz6if5yhmjvjzvr0ig5i0l6g7bzp6z8q4jssrp2g07g576084"; depends=[RWekajars rJava]; }; +RWekajars = derive { name="RWekajars"; version="3.7.11-1"; sha256="1w8y8xxsmm9b7hnnwknsbivkgbarnfqmv9666b7c5db9yra1hf7f"; depends=[rJava]; }; +RWiener = derive { name="RWiener"; version="1.2-0"; sha256="1ssh4xcyr4whgyd91p6bjsm9mq1ajqjqva0yyk13dnf5jfpsr0gs"; depends=[]; }; +RXKCD = derive { name="RXKCD"; version="1.7-5"; sha256="0dsds1bv2vfq61gfppar2ai23dryh09ric5i6zaccms6q64z23md"; depends=[RJSONIO png jpeg plyr]; }; +RXMCDA = derive { name="RXMCDA"; version="1.5.3"; sha256="1pc52kvihxzq12p95r4srmnawxcsvd4r7252dajby338p56d1lw8"; depends=[XML kappalab]; }; +RXshrink = derive { name="RXshrink"; version="1.0-8"; sha256="0l4aknr1vxrkxqsgkjcffs0731jskyzvl055a01vd8h4a0826n5s"; depends=[lars]; }; +RYoudaoTranslate = derive { name="RYoudaoTranslate"; version="1.0"; sha256="1i3iyqh97vpn02bm66kkmw52ni29js30v18n2aw8pvr88jpdgxm4"; depends=[RCurl rjson]; }; +RadOnc = derive { name="RadOnc"; version="1.0.9"; sha256="13fr838l38cvx84dx0k55p6riw5v86n7m51lg25is2fcyn17bq2r"; depends=[rgl geometry oro_dicom ptinpoly]; }; +RadioSonde = derive { name="RadioSonde"; version="1.4"; sha256="1v9jdpynmb01m3syhas1s08xxlvjawhlvjkyhils2iggi4xw4hiq"; depends=[]; }; +Rambo = derive { name="Rambo"; version="1.1"; sha256="1yc04xsfkc54y19g5iwambgnlc49ixjjvfrafsgis2zh5w6rjwv8"; depends=[sna]; }; +Ramd = derive { name="Ramd"; version="0.2"; sha256="0a64rp4dwhfr6vxsmya16x7wy7rxj4n98sdhhyy0ll850rdzlxd8"; depends=[]; }; +RandVar = derive { name="RandVar"; version="0.9.2"; sha256="04hw4v2d9aa8z9f8wvwbzhbfy8zjl5q8mpl9b91q86fhh1yq5cz4"; depends=[distr distrEx]; }; +RandomFields = derive { name="RandomFields"; version="3.0.44"; sha256="1id0n7b78s3s677vi4n49azhm6cqqnrihsxi86slvmm3mzdnzrby"; depends=[sp colorspace spam tcltk2 tkrplot]; }; +RankAggreg = derive { name="RankAggreg"; version="0.5"; sha256="1c5ckk2pfkdxs3l24wgai2xg817wv218fzp7w1r3rcshxf0dcz2i"; depends=[gtools]; }; +RankResponse = derive { name="RankResponse"; version="3.1.1"; sha256="04s588zbxcjgvpmbb2x46bbf5l15xm7pwiaxjgc1kn1pn6g1080c"; depends=[]; }; +Rankcluster = derive { name="Rankcluster"; version="0.92.9"; sha256="172jjsyc6a5y32s2fb8z6lgcq6rcwjbk3xnc5vvkhj64amlyxla6"; depends=[Rcpp Rcpp RcppEigen]; }; +RapidPolygonLookup = derive { name="RapidPolygonLookup"; version="0.1"; sha256="0m6r11ksryzcfcm265wr9fhwb867j9ppfhalvvygzig5j85sg92k"; depends=[sp RANN PBSmapping RgoogleMaps]; }; +Rarity = derive { name="Rarity"; version="1.2-1"; sha256="16ds0s396f42qqmn4xrnmfk1j6v917p27dgi9iji976hn2q463hh"; depends=[]; }; +RaschSampler = derive { name="RaschSampler"; version="0.8-7"; sha256="11vkb5gvr1r2a7fpxyygkixc62ms53dpik9jdg7vrb9k43v82ggj"; depends=[]; }; +RbioRXN = derive { name="RbioRXN"; version="1.3.1"; sha256="122h6pghpb8dfrqvdkvp25bp7dl8kc1aka13h6hp88vaj32pf4ij"; depends=[plyr RCurl gdata data_table stringr]; }; +Rbitcoin = derive { name="Rbitcoin"; version="0.9.2"; sha256="0ndq4kg1jq6h0jxwhpdp8sw1n5shg53lwa1x0bi7rifmy0gnh66f"; depends=[data_table RCurl digest RJSONIO]; }; +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-02.20"; sha256="1y6095vapb3r8p9i5hqa14gfpl4q3g2n82nb64429kl6w3mlfk8f"; depends=[numDeriv]; }; +Rchoice = derive { name="Rchoice"; version="0.1"; sha256="030x42jq6dd25g7isk5m9s0v9rfqkkj7i7286i9as1mpn73nlyz5"; depends=[maxLik Formula sandwich ggplot2 plotrix car lmtest]; }; +Rclusterpp = derive { name="Rclusterpp"; version="0.2.3"; sha256="02s5gmmmd0l98wd1y884pjl3h289dyd9p9s7dh7yl2zaslqs2094"; depends=[Rcpp RcppEigen Rcpp RcppEigen]; }; +Rcmdr = derive { name="Rcmdr"; version="2.1-4"; sha256="0ddlwmsqj7ycjfb7ggj9qk9rzzlhk4h1hc1xln0sqmjcc3m0axi4"; depends=[RcmdrMisc car tcltk2 abind]; }; +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_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]; }; +RcmdrPlugin_FactoMineR = derive { name="RcmdrPlugin.FactoMineR"; version="1.5-0"; sha256="1hfnn12l3jljqpczpxz4m9ywbmw5rc1c8dpfl4cabrxnh6ymnk1a"; depends=[FactoMineR Rcmdr]; }; +RcmdrPlugin_HH = derive { name="RcmdrPlugin.HH"; version="1.1-40"; sha256="0i85bbzy46jk8568d7mx1fwq9zk51iq1jjwr2mnik4zh6914f9h5"; depends=[HH lattice latticeExtra rgl Rcmdr multcomp leaps]; }; +RcmdrPlugin_IPSUR = derive { name="RcmdrPlugin.IPSUR"; version="0.2-1"; sha256="1lk7divj5va74prsnchq8yx9fbyym7xcsyqzkf72w448fgvvvwlv"; depends=[Rcmdr]; }; +RcmdrPlugin_KMggplot2 = derive { name="RcmdrPlugin.KMggplot2"; version="0.2-0"; sha256="1w4n7r3sp6h87wxhrzg500w90p8dzr43j28p8p1r2y0v0i0v6mk5"; depends=[ggplot2 ggthemes gtable plyr Rcmdr RColorBrewer scales survival tcltk2]; }; +RcmdrPlugin_MA = derive { name="RcmdrPlugin.MA"; version="0.0-2"; sha256="1zivlc0r2mkxpx23ba76njmb2wnnjijysvza4f24dg4l47d0sr2p"; depends=[Rcmdr MAd metafor]; }; +RcmdrPlugin_MPAStats = derive { name="RcmdrPlugin.MPAStats"; version="1.1.5"; sha256="0km6yglhn0128kk1xm2mnrkr2lkv3r9zndhlv7h1dkd16aph3vm3"; depends=[Rcmdr ordinal]; }; +RcmdrPlugin_NMBU = derive { name="RcmdrPlugin.NMBU"; version="1.7.6"; sha256="1haw1gf1cwjwkk19lhqhhigkz20grjifapbg6cd10lafppfk7pfa"; depends=[mixlm MASS pls xtable Rcmdr]; }; +RcmdrPlugin_ROC = derive { name="RcmdrPlugin.ROC"; version="1.0-16"; sha256="1pxv0izdkqjhvmbvln6n2lhr1mamfy4q20ld6dqkldxj9bivzckb"; depends=[Rcmdr pROC ROCR ResourceSelection PredictABEL]; }; +RcmdrPlugin_SCDA = derive { name="RcmdrPlugin.SCDA"; version="1.0"; sha256="0z43hhp798kga70xmiq4wzp5iad553rndn17g3va3dh6lz1k3y3h"; 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]; }; +RcmdrPlugin_StatisticalURV = derive { name="RcmdrPlugin.StatisticalURV"; version="1.0-1"; sha256="04pqqgy12rnhwm8l0752hb9p5h4l11mm7flm6n9kkcvbkvagsbrz"; depends=[agricolae multcomp car Rcmdr]; }; +RcmdrPlugin_TeachingDemos = derive { name="RcmdrPlugin.TeachingDemos"; version="1.0-7"; sha256="0d473p0df99x9a3jfwb49gxsrcvslcw9yandramwq82cwy3sdcxw"; depends=[rgl TeachingDemos Rcmdr]; }; +RcmdrPlugin_UCA = derive { name="RcmdrPlugin.UCA"; version="1.0-2"; sha256="11a8jaz5vycq8hnpxzrbv1g8vyh0ic1y48952ah633b2j1m1ay8i"; depends=[Rcmdr]; }; +RcmdrPlugin_coin = derive { name="RcmdrPlugin.coin"; version="1.0-22"; sha256="0qmdjnjmgq52wgl4llg69q9x7hvwd73mz3swv0sv88v8zqg7xj93"; depends=[Rcmdr coin survival multcomp]; }; +RcmdrPlugin_depthTools = derive { name="RcmdrPlugin.depthTools"; version="1.3"; sha256="09mjn5jn4rdj1lh515vr3xlnk615flg13kcwbpk0an2si4xkgm9h"; depends=[Rcmdr depthTools]; }; +RcmdrPlugin_doex = derive { name="RcmdrPlugin.doex"; version="0.2.0"; sha256="0l3c8vwifyl8a7qkfaqxm7cws2cg1g501qa93w5svcgp03yf98mj"; depends=[Rcmdr multcomp]; }; +RcmdrPlugin_epack = derive { name="RcmdrPlugin.epack"; version="1.2.5"; sha256="1577qhac4rldifax5x3l39cddan6dhq2dv4iv2n64nadgrl0259w"; depends=[Rcmdr TeachingDemos tseries abind MASS xts forecast]; }; +RcmdrPlugin_lfstat = derive { name="RcmdrPlugin.lfstat"; version="0.7"; sha256="009yj9c5cr34k8qa16q19sp7c5iwv95g9swbm004nr18mfah8x9w"; depends=[lfstat Rcmdr]; }; +RcmdrPlugin_mosaic = derive { name="RcmdrPlugin.mosaic"; version="1.0-7"; sha256="0k6xaz2dfm9ch9lxqsh19jm8d4bbyjj2ffmjjxl57kanb3pvrrwv"; depends=[ENmisc vcd Hmisc Rcmdr]; }; +RcmdrPlugin_orloca = derive { name="RcmdrPlugin.orloca"; version="4.1"; sha256="19qj6llr5sfw267dgbn2jvrsisb54qbjhgaiigfzymk6px33wwmg"; depends=[orloca orloca_es Rcmdr]; }; +RcmdrPlugin_plotByGroup = derive { name="RcmdrPlugin.plotByGroup"; version="0.1-0"; sha256="10wc7lnihsrldsynq2s0syr1aqmvfnj9rhgwh1nkk7jlrwcgj0z6"; depends=[Rcmdr lattice]; }; +RcmdrPlugin_pointG = derive { name="RcmdrPlugin.pointG"; version="0.6.6"; sha256="0sc3akbpdys353va05b40g3rq8qihw0pmhvv0kckkhsgrbr8mc07"; depends=[Rcmdr RColorBrewer]; }; +RcmdrPlugin_qual = derive { name="RcmdrPlugin.qual"; version="2.2.6"; sha256="00wznh0k909cd9vwdj1ag3224xkqnwjsad1bfkgxbszsx0w6xvy9"; depends=[Rcmdr]; }; +RcmdrPlugin_sampling = derive { name="RcmdrPlugin.sampling"; version="1.1"; sha256="0fx0s63wq0si1jydl9xyj9ny7iglg91zpvkyrnc05i5pan9l3xd9"; depends=[lpSolve sampling MASS Rcmdr]; }; +RcmdrPlugin_seeg = derive { name="RcmdrPlugin.seeg"; version="1.0"; sha256="105c2rl3mrcv7r3iqa9d2zs6cys7vfpyydylkg2cggfqkghxgr95"; depends=[Rcmdr seeg spatstat sgeostat]; }; +RcmdrPlugin_sos = derive { name="RcmdrPlugin.sos"; version="0.3-0"; sha256="1r9jxzmf5ks62b5jbw0pkf388i1lnld6i27xhfzysjqdxcnzdsdz"; depends=[sos Rcmdr tcltk2]; }; +RcmdrPlugin_steepness = derive { name="RcmdrPlugin.steepness"; version="0.3-2"; sha256="0f9b71mbj212l62mg7x5irzy7d3s11gyyi4gsjgkv1l4nbv5k6dm"; depends=[Rcmdr steepness]; }; +RcmdrPlugin_survival = derive { name="RcmdrPlugin.survival"; version="1.0-4"; sha256="03rgr9klf2d1ml8i2avf9lncjr3bfcb4v7mcwg800wwdjzkwqkql"; depends=[survival date Rcmdr]; }; +RcmdrPlugin_temis = derive { name="RcmdrPlugin.temis"; version="0.7.2"; sha256="0n5if3cip66pi0mh4xn06yq4w2nzmxgd3g56m4k1384zssrq66gn"; 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]; }; +Rcplex = derive { name="Rcplex"; version="0.3-2"; sha256="1hx9s327af7yawzyq5isvx8n6pvr0481lrfajgh8nihj7g69nmk7"; depends=[slam]; }; +Rcpp = derive { name="Rcpp"; version="0.11.3"; sha256="0k0j99m8qqm65gdng3lxxnpbbzrcyyk6k992iq4lz5pl16qsxgha"; depends=[]; }; +Rcpp11 = derive { name="Rcpp11"; version="3.1.2.0"; sha256="1x6n1z7kizagr5ymvbwqb7nyn3lca4d4m0ks33zhcn9gay6g0fac"; depends=[]; }; +RcppAnnoy = derive { name="RcppAnnoy"; version="0.0.3"; sha256="1vbk7cfghaw051n3wbag70aa04q4h7v84a2d9z899q3l564jsxdv"; depends=[Rcpp Rcpp BH]; }; +RcppArmadillo = derive { name="RcppArmadillo"; version="0.4.500.0"; sha256="1fi6wvs4f0sb1lxpimly1i3hl3pjzwgvh4izmb9v7wm12c068kka"; depends=[Rcpp Rcpp]; }; +RcppBDT = derive { name="RcppBDT"; version="0.2.3"; sha256="0gnj4gz754l80df7w3d5qn7a57z9kq494n00wp6f7vr8aqgq8wi1"; depends=[Rcpp Rcpp BH]; }; +RcppCNPy = derive { name="RcppCNPy"; version="0.2.3"; sha256="1baz9272vwc44yab7xb6ig0gd2gj8idrhywir2zq77q8bfhqc9gh"; depends=[Rcpp Rcpp]; }; +RcppClassic = derive { name="RcppClassic"; version="0.9.5"; sha256="193nsplyqd1fb7hwxsk0s7dz6rm6rw7lp04jff08mswcjdkh69g4"; 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]; }; +RcppEigen = derive { name="RcppEigen"; version="0.3.2.2.0"; sha256="1d3qb73d6b22pwar2mimynfm6z2c58cr36r6l1j34ysz00lyi1mk"; depends=[Matrix Rcpp Rcpp]; }; +RcppExamples = derive { name="RcppExamples"; version="0.1.6"; sha256="1jnqh9nii5nncsah0lrkls8dqqcka9fnbvfg8ikl4cqjri17rpbv"; depends=[Rcpp Rcpp]; }; +RcppGSL = derive { name="RcppGSL"; version="0.2.2"; sha256="0f47bs3ll42wxday2bg7w5fnv8a4280yvmzkjzn3b36v8wvm44g8"; depends=[Rcpp Rcpp]; }; +RcppMLPACK = derive { name="RcppMLPACK"; version="1.0.9-3"; sha256="1s5h5sad4c4pxxa7vx8j74x4qlsl4a23l6qpq51k5lwrxchcjklk"; 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=[]; }; +RcppProgress = derive { name="RcppProgress"; version="0.1"; sha256="1gvj51gadljaakm1nxdwgxzh723vv3ypzpzsgacsppxpj4rivxq4"; depends=[Rcpp Rcpp]; }; +RcppRedis = derive { name="RcppRedis"; version="0.1.2"; sha256="1bx6sl7amsnj2fq5xmv8bh31wlzfc62gkpyvw5nzh630fnphpf8a"; depends=[Rcpp RApiSerialize Rcpp RApiSerialize]; }; +RcppRoll = derive { name="RcppRoll"; version="0.1.0"; sha256="0xwm64z7pr2cjmq4kri7zzhy7wvq7aj9lq3xm2g830fn71qvj8x3"; depends=[Rcpp RcppArmadillo Rcpp RcppArmadillo]; }; +RcppSMC = derive { name="RcppSMC"; version="0.1.4"; sha256="1gcqffb6rkw029cpzv7bzsxaq0a5b032zjvriw6yjzyrpi944ip7"; depends=[Rcpp Rcpp]; }; +RcppXts = derive { name="RcppXts"; version="0.0.4"; sha256="143rhz97qh8sbr6p2fqzxz4cgigwprbqrizxpkjxyhq8347g8p4i"; depends=[Rcpp xts Rcpp xts]; }; +RcppZiggurat = derive { name="RcppZiggurat"; version="0.1.2"; sha256="05ai6s2j025fvr4znpmsvhxj4x7xyw2wsb9j3c5sv7aw1byfs0bb"; depends=[Rcpp Rcpp RcppGSL]; }; +Rcsdp = derive { name="Rcsdp"; version="0.1.53"; sha256="0x91hyx6z9f4zd7djxlq7dnznmr9skyzwbbcbjyid9hxbcfyvhcp"; depends=[]; }; +Rd2roxygen = derive { name="Rd2roxygen"; version="1.5"; sha256="0qh64bd323s3h44ypjxv98ndp332q31imf5prmaqvzcjs2j0r3gh"; depends=[roxygen2 formatR]; }; +Rdistance = derive { name="Rdistance"; version="1.1"; sha256="1rgjiks4s5l0vdj4svik9zz6kwwxsh9nj6q2ng7iblny6iqm6kbd"; depends=[]; }; +Rdpack = derive { name="Rdpack"; version="0.4-14"; sha256="19vscr9l63c074n76b6a6jbl956sphjhz0d50yiwp3cvqf28yssf"; depends=[gbRd bibtex]; }; +Rdsm = derive { name="Rdsm"; version="2.1.1"; sha256="07fc6c2hv0vvg15va552y54cla1mrqsd75w3zh02vc7yd226l4rj"; depends=[bigmemory]; }; +ReCiPa = derive { name="ReCiPa"; version="3.0"; sha256="019vlvgxnqqlwghxygfqggzp2b4x2pqzdrbhaa703zdhm58k0n1g"; depends=[]; }; +ReacTran = derive { name="ReacTran"; version="1.4.1"; sha256="01k3w6iffql198na968dmqgzsqgd1kwrjb34yw7mzppyisjcyv0k"; depends=[rootSolve deSolve shape]; }; +RealVAMS = derive { name="RealVAMS"; version="0.3-1"; sha256="04d4sc3lhlklx1y016rmh3x27m8caxlp53qn2ks5wz52w26pfdhn"; depends=[Matrix numDeriv Rcpp Rcpp RcppArmadillo]; }; +Records = derive { name="Records"; version="1.0"; sha256="08y1g2m6bdrvv4rpkhd5v2lh7vprxy9bcx9ahp1f7p062bn2lwji"; depends=[]; }; +RefFreeEWAS = derive { name="RefFreeEWAS"; version="1.3"; sha256="1cb1q2nki0d18ia4cmi1sp7qih9hv7g1jk1kyp7vya5gp572z3cd"; depends=[isva]; }; +RefManageR = derive { name="RefManageR"; version="0.8.40"; sha256="1d1r9whn37fv818brl98hy6hmihd6h6632xgf3n639m4km419v9r"; depends=[XML RCurl RJSONIO plyr bibtex lubridate stringr]; }; +RegClust = derive { name="RegClust"; version="1.0"; sha256="1d9w74phw4fgafglc18j7dpmln96fvxnf1kdc9zddgj90p8yfx63"; depends=[]; }; +RelValAnalysis = derive { name="RelValAnalysis"; version="1.0"; sha256="1jl1gfj44gfkmc1yp6g5wwn4miydwpvxwrg76rnkv9454zrc5pvp"; depends=[zoo]; }; +Reliability = derive { name="Reliability"; version="0.0-2"; sha256="12zsicgbjqih3grbs62pw37x8wlkmnyc7g0yz6bqnfb4ym2yb7fg"; depends=[]; }; +ReliabilityTheory = derive { name="ReliabilityTheory"; version="0.1.4"; sha256="1faab4z3rp0xqc0s0rrkw4kxgyc332xz3sjaz1wd4p6kiydds2hi"; depends=[igraph sfsmisc combinat FRACTION mcmc PhaseType actuar HI]; }; +Renext = derive { name="Renext"; version="2.1-0"; sha256="19920kb3qd97vm285zbxqarpq8dyyrx1k6sks990xjbgpy7vyj3y"; depends=[evd numDeriv]; }; +RenextGUI = derive { name="RenextGUI"; version="1.0-2"; sha256="0ghs8bwb6qdyvhghxvdy51cibylgm7bdbzgqsn1nbxam39yhvfv9"; depends=[gWidgets gWidgetstcltk Renext]; }; +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.0"; sha256="13pz2q4brsbbp3bl5fik5f5fx7961arw3plz911m07x102y5kak1"; 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=[]; }; +Rfacebook = derive { name="Rfacebook"; version="0.4"; sha256="0f5wbd16a7wsw1fpficz6i2vrwyw3n75a1qm4dv5181jr6ik492p"; depends=[httr rjson]; }; +Rfit = derive { name="Rfit"; version="0.21"; sha256="129z5ivwfxbh3rfwk98jnm6ibq5z9z3r9mhy9gv61jfr4ig78dcn"; depends=[quantreg]; }; +RfmriVC = derive { name="RfmriVC"; version="1.0.4"; sha256="15bzpwi01gb580wl0flvp7pwqf1sgk6fsdmfq4cqaprb979js79f"; depends=[mvtnorm mgcv Rniftilib]; }; +Rgbp = derive { name="Rgbp"; version="1.0.6"; sha256="1j4j7g9z7p592f82k0yvibrydynkd9v1ldil2vf3ikc650bn2l02"; depends=[sn]; }; +Rglpk = derive { name="Rglpk"; version="0.6-0"; sha256="0g0s63skabr0yqk5s9p66p77z8v3pr3hbnirbgdddlvkpphi08xx"; depends=[slam]; }; +Rgnuplot = derive { name="Rgnuplot"; version="1.0.1"; sha256="1yag6ip2ppclhnpfc3mn6bsaylv2lk2k3jr8wgrgzrb7z22p7dk8"; depends=[]; }; +RgoogleMaps = derive { name="RgoogleMaps"; version="1.2.0.6"; sha256="1kd77617j2dz3dqjskv71vj8xv0yjgcysrpw7a615s0ys2hs91wp"; depends=[png RJSONIO]; }; +Rhh = derive { name="Rhh"; version="1.0.2"; sha256="0blxim8yrb0qnbkc1z2q24q6ryakggq2zhaa223swla99ahmsny3"; depends=[]; }; +Rhpc = derive { name="Rhpc"; version="0.14-261"; sha256="09rb68dys283gqmgn00v5skz6y5mcychg7hjrmi59pcfl5i7sk71"; depends=[]; }; +RhpcBLASctl = derive { name="RhpcBLASctl"; version="0.14-256"; sha256="1s9mwwh269wwdqnb98jxsmpjm2bdf5dj4c3wkj5i81w2p1sm8qx3"; depends=[]; }; +RidgeFusion = derive { name="RidgeFusion"; version="1.0-3"; sha256="10llmrsfpcqrkcbw7zj44kvfy7ywn9rk49n7zplilz8h94zzcmjv"; depends=[mvtnorm]; }; +Ridit = derive { name="Ridit"; version="1.1"; sha256="02cni6hzf1bsns7vi8vklnhc0pfb5vwqhjnnfnjnnaxpzpsbvdfn"; depends=[]; }; +Ritc = derive { name="Ritc"; version="1.0.1"; sha256="1h41s4jihzj0yj8xyan0zhhyyiq8m5567vw4gvmmr81p1qfzvva8"; depends=[minpack_lm]; }; +Rivivc = derive { name="Rivivc"; version="0.9"; sha256="0gl3040pp9nqm4g2ympnx80z64zfnn1hfsxka8ynd2cqhjn3b5i1"; depends=[signal]; }; +Rjpstatdb = derive { name="Rjpstatdb"; version="0.1"; sha256="0iwgsp3mblp7bsx88wfpqn09y1xrkingfkm3z9jsi2bwrnrjc2iv"; depends=[RCurl XML]; }; +Rlab = derive { name="Rlab"; version="2.15.1"; sha256="1pb0pj84i1s4ckdmcglqxa8brhjha4y4rfm9x0na15n7d9lzi9ag"; depends=[]; }; +Rlabkey = derive { name="Rlabkey"; version="2.1.125"; sha256="18hwzbrrs39y6qbqn6r5fcpxqmvr62f12jqh3j98w0zgpa16vvcy"; depends=[RCurl rjson]; }; +Rmalschains = derive { name="Rmalschains"; version="0.2-2"; sha256="1ki3igj78sk4kk1cvbzrgzjdvw6kbdb7dmqglh6ws2nmr5b6a7fx"; depends=[Rcpp Rcpp]; }; +Rmisc = derive { name="Rmisc"; version="1.5"; sha256="1ijjhfy3v91fspid77rrkc5dkcb2lav37wc3f4k5lwrn24wzy5y8"; depends=[lattice plyr]; }; +Rmixmod = derive { name="Rmixmod"; version="2.0.2"; sha256="1qv6zymkgsbplrq4aa87lvcsv75dssj8qqq2h9665v31jsgx84lr"; depends=[Rcpp Rcpp]; }; +RmixmodCombi = derive { name="RmixmodCombi"; version="1.0"; sha256="0cwcyclq143938wby0aj265xyib6gbca1br3x09ijliaj3pjgdqi"; depends=[Rmixmod Rcpp]; }; +Rmosek = derive { name="Rmosek"; version="1.2.5.1"; sha256="1ki28357ijwzzxyb820lsf8l5x2i46shar0v71k15hvf9jn0h7zm"; depends=[Matrix Matrix]; }; +Rmpfr = derive { name="Rmpfr"; version="0.5-7"; sha256="0bqjs65wlnpq95smnnwpqjrqgwda412z2qbyafa8jw6972lmsyq9"; depends=[gmp]; }; +Rmpi = derive { name="Rmpi"; version="0.6-5"; sha256="0i9z3c45jyxy86yh3f2nja5miv5dbnipm7fpm751i7qh630acykc"; depends=[]; }; +RnavGraph = derive { name="RnavGraph"; version="0.1.7"; sha256="14sgllz3jj9padhiwkb731wcn9byhqm1ba2ivpyas3121y8c7yvx"; depends=[scagnostics rgl]; }; +RnavGraphImageData = derive { name="RnavGraphImageData"; version="0.0.3"; sha256="1mrh0p2ckczw4xr1kfmcf0ri2h2fhp7fmf8sn2h1capmm12i1q8f"; depends=[]; }; +Rniftilib = derive { name="Rniftilib"; version="0.0-32"; sha256="1ck7ddhm759zha1iazg5razchq3gsfq3rzvfb8ichnl5l15z9ry2"; depends=[]; }; +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]; }; +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]; }; +RobustRankAggreg = derive { name="RobustRankAggreg"; version="1.1"; sha256="1pslqyr1lji1zvcrwyax4zg2s81p1jnhfldz8mdfhsp5y7v8iar3"; depends=[]; }; +RockFab = derive { name="RockFab"; version="1.2"; sha256="1b5mhfll5vmqwl4pblmclyx9604vn07jyza02rm0jcsx915ms8sc"; depends=[rgl]; }; +Rook = derive { name="Rook"; version="1.1-1"; sha256="00s9a0kr9rwxvlq433daxjk4ji8m0w60hjdprf502msw9kxfrx00"; depends=[brew]; }; +RootsExtremaInflections = derive { name="RootsExtremaInflections"; version="1.0"; sha256="1vcbjxx1yfla71fmmf5w8dqp0vqw93dxsjsvz0vj28bfqmkmh554"; depends=[]; }; +Rothermel = derive { name="Rothermel"; version="1.2"; sha256="0zrz2ck3q0vg0wpa4528rjlrfnvlyiy0x1gr5z1aax1by7mdj82s"; depends=[GA ftsa]; }; +RoughSets = derive { name="RoughSets"; version="1.1-0"; sha256="0v6cb0xidx2rbkgb92fahrjyy974xiaizxqryzzj1z0nnqb5zadp"; depends=[]; }; +Rpdb = derive { name="Rpdb"; version="2.2"; sha256="0gf6qab05a3ky8skbbjiadizi1gs4pcw3zp25qj5gn82lb6382pd"; depends=[rgl]; }; +Rphylip = derive { name="Rphylip"; version="0.1-23"; sha256="0kpqmik4bhr74ib8yvaavr10z4v4w3li5vibdhz7lvz35jfirg9r"; depends=[ape]; }; +Rpoppler = derive { name="Rpoppler"; version="0.0-1"; sha256="01zsbm538yhwm1cyz5j6x2ngz05yqj16yxyvyxqhn6jp8d0885jh"; depends=[]; }; +Rquake = derive { name="Rquake"; version="2.2"; sha256="0gkarqqhmiakc968ffwywkwy7npm1ly5gd6bbhr8fjfwdnhjam5n"; depends=[RPMG RSEIS GEOmap MBA minpack_lm rgl]; }; +Rramas = derive { name="Rramas"; version="0.1-4"; sha256="191rm2ylvf3ffc9i4wpjvfbsinmw7s1m0wcq24j4qs4fxg8qqzyq"; depends=[diagram]; }; +Rrdrand = derive { name="Rrdrand"; version="0.1-10"; sha256="1j72v44scmghm29jxjdy0651qlkhsnrb3bb5qff82451mbd17bzb"; depends=[]; }; +Rserve = derive { name="Rserve"; version="1.7-3"; sha256="09rha4p86vak7ss721mwp5bm5ig09xam8zlqv63n9wf36v3kdmpn"; depends=[]; }; +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]; }; +Rsundials = derive { name="Rsundials"; version="1.6"; sha256="0vrvxsznbclgls4jljc59lyli6cw9k1a3wapfrs6xbkqi8865iif"; depends=[]; }; +Rsymphony = derive { name="Rsymphony"; version="0.1-17"; sha256="1wg1l4535xmrqvyhf23b9kw3ggqxlcrig0x0dnhx0m2qr9v3ijni"; depends=[]; }; +Rtsne = derive { name="Rtsne"; version="0.9"; sha256="1b3ilfirlhmbv1914rwnj9mamn6clzi86csp3szfwg93gk23yymn"; depends=[Rcpp Rcpp]; }; +Rttf2pt1 = derive { name="Rttf2pt1"; version="1.3.2"; sha256="1x8lfymbp5z8vkl13cdhzqlmz47an5cdxjjs75qrikbqvyqzjr5d"; depends=[]; }; +Ruchardet = derive { name="Ruchardet"; version="0.0-3"; sha256="0dgldi6fgp949c3455m9b4q6crqv530jph210xzph41vgw8a2q2v"; depends=[Rcpp Rcpp]; }; +Runiversal = derive { name="Runiversal"; version="1.0.2"; sha256="0667mspsjydmxi848c6wsf14gz72bmdj9b3lilma92b7fhqnv7ai"; depends=[]; }; +Runuran = derive { name="Runuran"; version="0.21.0"; sha256="1p33z9h2zj6fx42rlq6yajd6lwvzy4a1a5gs67dz5k1zbza8avw0"; depends=[]; }; +RunuranGUI = derive { name="RunuranGUI"; version="0.1"; sha256="0wm91mzgd01qjinj94fr53m0gkxjvx7yjhmwbkrxsjn6mjklq72l"; depends=[Runuran rvgtest gWidgets gWidgetsRGtk2 cairoDevice]; }; +Rvcg = derive { name="Rvcg"; version="0.9"; sha256="0p5qnw7jqq5ia36431ywp5mwcx09lsx0pnrw0n4fvc7zvgjjqs3c"; depends=[Rcpp Rcpp RcppEigen]; }; +Rvmmin = derive { name="Rvmmin"; version="2013-11.11"; sha256="14gsdvw7qxcffwkh0ayj0vlm0cqyavqgl4rqn5ybjr0pkbsmz955"; depends=[optextras]; }; +Rwave = derive { name="Rwave"; version="2.2"; sha256="1aqscnq7cr53nnddbjdqfjyrj8l76h9wcqr43i7fpa7g6hamvbwd"; depends=[]; }; +Rwinsteps = derive { name="Rwinsteps"; version="1.0-1"; sha256="0kzngkan9vydibnr3xm4pyz4v6kz0r4h19f0ngqpri07fkhdsxzd"; depends=[]; }; +RxCEcolInf = derive { name="RxCEcolInf"; version="0.1-3"; sha256="04d6ffl4qs2vjbk0ibvyq17i2l26qnvxr72s6p3f8q4px33rh4kh"; depends=[MASS MCMCpack mvtnorm lattice]; }; +Ryacas = derive { name="Ryacas"; version="0.2-12.1"; sha256="18dpnr6kj0a8f2jcbj9f6ahd0mg7bm1qm8dcs1wh8kmjl3klr1y8"; depends=[XML]; }; +Rz = derive { name="Rz"; version="0.9-1"; sha256="1cpsmfxijrfx06ydpjzbaak7gkad4jjk1ph9453l9zly1cwzgspj"; depends=[foreign memisc psych ggplot2 RGtk2 formatR]; }; +SAFD = derive { name="SAFD"; version="0.4"; sha256="1zbja8bgva2j24ks4m14hbf4s0n674lj89nfxkkmwrljzsmjrjhv"; depends=[]; }; +SAM = derive { name="SAM"; version="1.0.5"; sha256="1fki43bp6kan6ls2rd6vrp1mcwvz92wzcr7x6sjirbmr03smcypr"; depends=[]; }; +SAMURAI = derive { name="SAMURAI"; version="1.2.1"; sha256="02fipbjcsbp2b2957x6183z20icv1yly2pd1747nyww9bmpa7ycm"; depends=[metafor]; }; +SAPP = derive { name="SAPP"; version="1.0.4"; sha256="0a86vz390v2g5lz1r33qrmhgvak4rpfmpxy39shnivhagnrsarkl"; depends=[]; }; +SASPECT = derive { name="SASPECT"; version="0.1-1"; sha256="1d3yqxg76h9y485pl5mvlx6ls1076f80b320yvx4zxmqq9yxmaba"; depends=[]; }; +SAScii = derive { name="SAScii"; version="1.0"; sha256="0nq859xmrvpbifk8q1kbx3svg61rqdg8p8gr1pn85fr0j3w7h666"; depends=[]; }; +SASmixed = derive { name="SASmixed"; version="1.0-4"; sha256="0491x4a3fwiy26whclrc19alcdxccn40ghpsgwjkn9sxi8vj5wvm"; depends=[]; }; +SASxport = derive { name="SASxport"; version="1.5.0"; sha256="0sgxpjv9ilz2zb13kkb0fqjfbamrczxpy9rwvfhh46bmx4i038iq"; depends=[chron Hmisc]; }; +SAVE = derive { name="SAVE"; version="0.9.3.9.2"; sha256="1faky3155vh54r450r4dndn5749kp09bilyq8n7n7rls0dl5k34m"; depends=[coda DiceKriging]; }; +SBRect = derive { name="SBRect"; version="0.26"; sha256="16g0ciy9q9irypsl8x36i0lavl41j3af13r2si0by8q6wj56pxi4"; depends=[rJava]; }; +SBSA = derive { name="SBSA"; version="0.2.3"; sha256="1v23lzzziyjlvgn5p2n1qcq2zv9hsyz2w15lbnfi5wvinxhlg8sc"; depends=[Rcpp Rcpp RcppArmadillo]; }; +SCBmeanfd = derive { name="SCBmeanfd"; version="1.1"; sha256="0pcyrnzlnlyn4v3lyv7pv01v2lh4vig1x4x8g98lpccpi1bimd4z"; depends=[boot KernSmooth]; }; +SCEPtER = derive { name="SCEPtER"; version="0.1-0"; sha256="13jnqcgsz3rz5dis8jmbma1m6z72qphdjyjf3984c66clhazxnh9"; depends=[MASS]; }; +SCEPtERextras = derive { name="SCEPtERextras"; version="0.1-0"; sha256="1vv231h744c7j7rvcb2xaffmwdd9ms76yvvw2l3xcb72iwhl5dbw"; depends=[]; }; +SCGLR = derive { name="SCGLR"; version="2.0.1"; sha256="1xanlanxq3qwj7zad6zk1fy4cpbg2ns4dxvnfld209ra3y4jmbkx"; depends=[Matrix Formula expm ggplot2 ROCR]; }; +SCI = derive { name="SCI"; version="1.0-1"; sha256="1m5a15a4n0zjqykq38pyw9133g2ih4ykbgak8c8khq8p0isnl8qb"; depends=[fitdistrplus lmomco]; }; +SCMA = derive { name="SCMA"; version="1.1"; sha256="0bims9l047xvbwp2r5ly5cgpd7fc0p2cik48gg42abwdqvppf542"; depends=[]; }; +SCORER2 = derive { name="SCORER2"; version="0.99.0"; sha256="1a28wga69ip9s98ch2dqgl0qkwa3w6frmaqcvhclc360ik813mxq"; depends=[]; }; +SCRT = derive { name="SCRT"; version="1.1"; sha256="0c5pyxsqivhmdd0cbpnvc90pbyw24p3a5zalz85af5b6mkqmjn8y"; depends=[]; }; +SCVA = derive { name="SCVA"; version="1.1"; sha256="0fv0xvla7gmvvp9cg9jpb1p2k3bmib7yzrf3k17xav8zp0smq4y2"; depends=[]; }; +SCperf = derive { name="SCperf"; version="1.0"; sha256="1v9l7d9lil2gy5bw6i7bzc24808m063xaw2spl005j0a9rh4ag41"; depends=[]; }; +SDBP = derive { name="SDBP"; version="1.0"; sha256="18yk5zasxga58ny8n8kz3b8j0j8xznb9wqf5642xzfvcb9dd1kz2"; depends=[]; }; +SDD = derive { name="SDD"; version="1.1"; sha256="1bl9xlns6np26pgiiza25c54k4989knksdkkk653g8s8gmr4y34x"; depends=[Hmisc sm tseries rpanel rgl]; }; +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=[]; }; +SEAsic = derive { name="SEAsic"; version="0.1"; sha256="1mg01sag6n1qldjvmvbasac86s7sbhi4k99kdkav2hdh6n9jg467"; depends=[]; }; +SECP = derive { name="SECP"; version="0.1-4"; sha256="0a4j0ggrbs0jzcph70hc4f5alln4kdn2mrkp3jbh321a6494kwl1"; depends=[SPSL]; }; +SEER2R = derive { name="SEER2R"; version="1.0"; sha256="0lk0kkp8sv3nl19zwqd7449mmjxsj3pqpzdmqf70qf8xh2pqyvzd"; depends=[]; }; +SEERaBomb = derive { name="SEERaBomb"; version="2014.4.1"; sha256="1vlk6hcn05vdjfc7c8dhvsd1hc2yq1pdmhb7i48b689lkxg82igz"; depends=[RSQLite LaF]; }; +SEL = derive { name="SEL"; version="1.0-2"; sha256="1nrk0fx6ff330abq8askvp0790xnfv00m3sraqcr32hciw6ks421"; depends=[quadprog lattice]; }; +SEMID = derive { name="SEMID"; version="0.1"; sha256="1bxdjdyqlvxz339jdgw90qi6kvfhjdmga38vhfl3ldlxfv2s9gfk"; depends=[igraph]; }; +SEMModComp = derive { name="SEMModComp"; version="1.0"; sha256="1za67470f13z8jsy3z588c7iiiz993d3vjqrb8v9fann2r6sf1md"; depends=[mvtnorm]; }; +SEchart = derive { name="SEchart"; version="0.1"; sha256="19gqcd6xzwg37nzc67p88ip4i0v2f59ds85xfw9qq8lybvdm76k2"; depends=[JM]; }; +SGCS = derive { name="SGCS"; version="2.0"; sha256="1d7abq07f0702k33j334va7kc4swz7rdqqb4sw1wq6a671r7k5v6"; 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=[]; }; +SII = derive { name="SII"; version="1.0.3"; sha256="1k9mvz6g25qs351c0vx7n5h77kb6k833jrcww14ni59yc9jgvsyg"; depends=[]; }; +SIMMS = derive { name="SIMMS"; version="0.0.1"; sha256="0s53kc95jbav28kj35isc7j09qpjsk49za8p766z9yfaiw0higp7"; depends=[survival MASS]; }; +SIN = derive { name="SIN"; version="0.6"; sha256="0vq80m3vl8spdnlkwvwy0gk3ziyybqzjp3scnfdcpn942ds7sgg9"; depends=[]; }; +SINGLE = derive { name="SINGLE"; version="1.3"; sha256="0wd7jzys51rnwr5rhf2llpygqxydjrv0dill19v8sz9w0madkil4"; depends=[flsa igraph dse Matrix]; }; +SIS = derive { name="SIS"; version="0.7-4"; sha256="0a8apfjzfwd5a2cvkviwvqlp26hqr34lba65cq5hxf9n05x2s7rx"; depends=[glmnet ncvreg survival]; }; +SKAT = derive { name="SKAT"; version="1.0.1"; sha256="03kc9df36kg9q1qr5l5zvfq3i5h5gz5f2m0mh054m6x76s796k1z"; depends=[]; }; +SLC = derive { name="SLC"; version="0.3"; sha256="0l0y1sjj0glsb7vwla99ijclcgaq2y85bgz1wqm348n4shsmm2rs"; depends=[]; }; +SLHD = derive { name="SLHD"; version="1.2-1"; sha256="0n5j20hp7kgi23gjprcwcaji8wdz5wwqqyc7i8dv0058fz2b5gzc"; depends=[]; }; +SMC = derive { name="SMC"; version="1.1"; sha256="1r4ajgi785lmpnlxrba0n6phmk1f0mb6b5yqk6hx8gng2w8ggclz"; depends=[]; }; +SMCP = derive { name="SMCP"; version="1.1.3"; sha256="0ksx2ibz849vhrz2px9p7z8hlgvspz7kxhadvhk5mhkfbhrnpdf0"; depends=[]; }; +SMCRM = derive { name="SMCRM"; version="0.0-3"; sha256="1x06w00sdijhg5h1s61q4ym5wgk97pw9md6api7if2cxjv7h5zcy"; depends=[]; }; +SMFI5 = derive { name="SMFI5"; version="1.0"; sha256="10qp33l0dig00y9gfhpzqig6dbkjw76ch9pfq64dn4xrdkpq1kx5"; depends=[ggplot2 reshape corpcor]; }; +SMIR = derive { name="SMIR"; version="0.02"; sha256="02q8m5m8lcfrpi78p3kajkps8wiir3jwyqc54j9vfx8aj6mk1v71"; depends=[]; }; +SML = derive { name="SML"; version="0.1"; sha256="0pdj7321wy50v5l23hknlm30kp8cfgn072pbbifyp8qzmk0hyd8h"; depends=[glmnet Matrix lattice]; }; +SMNCensReg = derive { name="SMNCensReg"; version="2.4"; sha256="1q5yjc1njlm3hd33fdjv9d46jawr5l7r1zzj4m22spd2q5cpv04i"; depends=[Matrix PerformanceAnalytics]; }; +SMPracticals = derive { name="SMPracticals"; version="1.4-2"; sha256="0apmkmsv2fqmxpgq08n9k9dvcknj74s4cpp0myjcd6kibb7g9slq"; depends=[ellipse MASS nlme survival]; }; +SMR = derive { name="SMR"; version="2.0.1"; sha256="0qy56fmismcjklpf29ic2gi1g8ajdjpxsl0akb9cqzyisyf641ia"; depends=[]; }; +SMVar = derive { name="SMVar"; version="1.3.3"; sha256="17wr4lixy3p32gr4jq02d7zsr88yrbddjsvynzdsdrwbxf4mwqhp"; depends=[]; }; +SNFtool = derive { name="SNFtool"; version="2.2"; sha256="1d84ybsi91mr3ma4jzmr9606hg1q00yg0dn50vkjnyda50igcb1c"; depends=[heatmap_plus]; }; +SNPMClust = derive { name="SNPMClust"; version="1.0"; sha256="1vyag8axrl888qhjsbv7g84hzfsnvxh5ccdcdriamy50c2chkji8"; depends=[MASS mclust]; }; +SNPassoc = derive { name="SNPassoc"; version="1.9-2"; sha256="113byj8zbg6xyxb1qzm76sqfyk3fap0sd90691zzm1x2pbfnb3mh"; depends=[haplo_stats survival mvtnorm]; }; +SNPmaxsel = derive { name="SNPmaxsel"; version="1.0-3"; sha256="0pjvixwqzjd3jwccc8yqq9c76afvbmfq0z1w0cwyj8bblrjpx13z"; depends=[mvtnorm combinat]; }; +SNPtools = derive { name="SNPtools"; version="1.1"; sha256="0l29kiqz4048x7amxx1qzkaw2xnd6lpdsdp5nq3rck9amx2hw64a"; depends=[]; }; +SNSequate = derive { name="SNSequate"; version="1.1-1"; sha256="1jgpjws5apysp55pwy3x8mbzy4zjvv39anp6j2x4lgczh5nf49b6"; depends=[magic]; }; +SOAR = derive { name="SOAR"; version="0.99-11"; sha256="1n38gx5sxpkqfkk4y6vpp6g19b8bs5bisni9wn6311s0csizp86m"; depends=[]; }; +SOD = derive { name="SOD"; version="1.0"; sha256="0f0rh1qsjzxb3zzr440kvl6fnnj7dvc5apdzs5hpf6xrlfg863pk"; depends=[Rcpp Rcpp]; }; +SODC = derive { name="SODC"; version="1.0"; sha256="18s4rcp5dzchvwrzzbfhbs3x91zlg1rymjarxjk5i429mfrn0krx"; depends=[magic ppls psych MASS]; }; +SOLOMON = derive { name="SOLOMON"; version="1.0-1"; sha256="0z91wsrgdir25ks4dnirzsg4f1ngal7n40235m3w43j6y6dhkqrc"; depends=[]; }; +SOR = derive { name="SOR"; version="0.22"; sha256="1njwlsvdnwxidvwrx18h6h4dhrsdgy0fikkhn20pip42qqwd96gz"; depends=[Matrix]; }; +SPA3G = derive { name="SPA3G"; version="1.0"; sha256="0fcbrg43c5r2n5p7bb8wslqzhl5h31paxr9rla583lkm0baxnmym"; depends=[]; }; +SPACECAP = derive { name="SPACECAP"; version="1.1.0"; sha256="1m5x2rydppib6fj7wlc6pq4gyvyvhw49yx9qgy4c2rk648wxnhrj"; depends=[coda]; }; +SPARQL = derive { name="SPARQL"; version="1.16"; sha256="0gak1q06yyhdmcxb2n3v0h9gr1vqd0viqji52wpw211qp6r6dcrc"; depends=[XML RCurl]; }; +SPAr = derive { name="SPAr"; version="0.1"; sha256="068jlsvaxx80ih6n86286m2r75cvy6w0m51vpj4gfclhh38py4p4"; depends=[]; }; +SPECIES = derive { name="SPECIES"; version="1.0"; sha256="0p45llf2wjr467bqr4pbljfank9zz3fm42yl3i0r3jbkxgz0rjf0"; depends=[]; }; +SPEI = derive { name="SPEI"; version="1.6"; sha256="0mbz4nydnzwypfbi1d9fjy09x6133q096qbfrc913dbidzkvfpqv"; depends=[lmomco]; }; +SPIAssay = derive { name="SPIAssay"; version="1.0.0"; sha256="1rwa2iicwdm7z8khlnly0ybrqiisw420anr2pcdd5chxa48h8apg"; depends=[]; }; +SPIn = derive { name="SPIn"; version="1.1"; sha256="109xxrg7bsmmfd6ik85kxrw2qclxbh5ipsh5mmrdl4hki3hnyp2s"; depends=[quadprog]; }; +SPMS = derive { name="SPMS"; version="2.0"; sha256="150kb4gjiksp3kc7p9j5zqc4955rq4fb27as71z89h23mkswz5r5"; depends=[Matrix]; }; +SPODT = derive { name="SPODT"; version="0.9"; sha256="0r5zr0h5dgbkpn6dlvpj58s2wp3ngb7zb1xdapq1j25msmhwn5yy"; depends=[rgdal sp tree]; }; +SPOT = derive { name="SPOT"; version="1.0.4184"; sha256="0rikfs2rha7q2xbycvky8si2ccgmamcn662g8ni105cr6m9hvvpc"; depends=[rpart emoa]; }; +SPREDA = derive { name="SPREDA"; version="1.0"; sha256="1dyqsra899fd1nbk1b7vkw8gs455c6pbcvzw84q9iri77186xqhv"; depends=[survival nlme]; }; +SPSL = derive { name="SPSL"; version="0.1-8"; sha256="1jg1nfhz8qml1wwqa4d0w7vkdmbgdy5xlfqx0h2pdw2z8iij3xxc"; depends=[]; }; +SPmlficmcm = derive { name="SPmlficmcm"; version="1.1"; sha256="02hg9dzfnxa8cz31kkq52707f7y5471cq78asfbrf397mfz82wbl"; depends=[numDeriv nleqslv boot]; }; +SQDA = derive { name="SQDA"; version="1.0"; sha256="0nfimk625wb64010r5r7hzr64jfwgc6rbn13wvrpn0jgayji87h6"; depends=[PDSCE mvtnorm]; }; +SQN = derive { name="SQN"; version="1.0.5"; sha256="0kb8kf6g482zqdp4avwvhs3pqghfny757dbzfl1abaigmvwvx4qj"; depends=[mclust nor1mix]; }; +SQUAREM = derive { name="SQUAREM"; version="2014.8-1"; sha256="17fn37da4zslbfq5h4f3dfwyw1dxj5y2rgly3vjl2c4k5bnwxxqw"; depends=[]; }; +SRRS = derive { name="SRRS"; version="0.1.1"; sha256="0jv545a97q4pyl89lmhn3y0jhdzyq033mvx144x8lcgx59s7cyi3"; depends=[tcltk2 gtools]; }; +SSDforR = derive { name="SSDforR"; version="1.4.7"; sha256="0d2p8rszjk1zh5wlv0bxsf40829kdxg9264i08z3db0lvhlbmaz2"; depends=[psych TTR MASS TSA]; }; +SSN = derive { name="SSN"; version="1.1.4"; sha256="0n6xxbhvbqs15zn7w66vsr98adibfyr2qa0w7pfbw6vmrrmmn23z"; depends=[RSQLite sp MASS igraph maptools lattice BH]; }; +SSrat = derive { name="SSrat"; version="1.0"; sha256="1qpsdfdngsgxx3mqgn4avl65w4v5v4jwsh1nnxzfn9iqi9mg4bhi"; depends=[plyr sna]; }; +SSsimple = derive { name="SSsimple"; version="0.6.4"; sha256="0p7d4hx7mhn5myq8ajcij6hhg79rjxigk5v8z93yfdw4gjcb5wad"; depends=[mvtnorm]; }; +STAR = derive { name="STAR"; version="0.3-7"; sha256="1g78j4iyh78li1jaa3zz5qv4p41cg0imhmvbfakd34l32ppih4ll"; depends=[survival mgcv R2HTML gss codetools]; }; +STEPCAM = derive { name="STEPCAM"; version="1.0"; sha256="0lgikdj0mghz5hjm3rlrnnddjhvf9cmm0hwklbdyl3h816gq1jci"; depends=[vcd FD gtools MASS]; }; +STPGA = derive { name="STPGA"; version="1.0"; sha256="1kqxzjrxf194n006dr3h5kprb4l7qy8bgm2n6251p0sswpvr70j1"; depends=[]; }; +SUE = derive { name="SUE"; version="1.0"; sha256="0akv724s84v2zixvwywj1ydfnfvcjnaabv6gm0601nsrh6ij1mi6"; depends=[]; }; +SVMMaj = derive { name="SVMMaj"; version="0.2-2"; sha256="01njc7drq01r3364081dv9gn37vrql52zbrb60gd559f3jshqx3m"; depends=[kernlab MASS]; }; +SWATmodel = derive { name="SWATmodel"; version="0.5.9"; sha256="1i48g9nbjfn30ppwyzyz3k181nscv4wx773l8mzfdwhx0nlv4kyj"; depends=[EcoHydRology]; }; +SYNCSA = derive { name="SYNCSA"; version="1.3.2"; sha256="1m057lhfaf0n35rs3sipia04qgkp04hv7wf7rvnr7bhzic9f4vg3"; depends=[vegan mice FD]; }; +Sample_Size = derive { name="Sample.Size"; version="1.0"; sha256="1vfnb2gg3rax4sxd81xqznfvh300nv45nn7zjsyrdjyg1n3ym7nw"; depends=[]; }; +SampleSizeMeans = derive { name="SampleSizeMeans"; version="1.1"; sha256="1wbc46n8b8wbcxl21blbzs5728dr8r0l8d3jpzbha8pcav0xrh1m"; depends=[]; }; +SampleSizeProportions = derive { name="SampleSizeProportions"; version="1.0"; sha256="0mvkvx3nni0l8ys68sq3h2zlbjvksdcdzxqlf03k0ca5bbcmdf9l"; depends=[]; }; +SamplerCompare = derive { name="SamplerCompare"; version="1.2.5"; sha256="1p05fb6g0rwkzz0qp8hx88skxvfq265ndv9g694gc2h8vzwpan1y"; depends=[mvtnorm]; }; +SamplingStrata = derive { name="SamplingStrata"; version="1.0-3"; sha256="16nrcv5hbbvn4rgckzagi84i7h49bd878mnpknlzmzr5ykzywsay"; depends=[]; }; +SciViews = derive { name="SciViews"; version="0.9-5"; sha256="199waafpn0ndg7szwfhw2jlgcx1f0pv7j0vix2vzz60knwm698xb"; depends=[MASS ellipse]; }; +SciencesPo = derive { name="SciencesPo"; version="0.11.21"; sha256="1mia4gpk6bmdag3iv3227p5f9m6x74s60xsrk4xc9vgnfp5hrbw1"; depends=[ggplot2 foreign data_table dplyr gridExtra xtable]; }; +ScoreGGUM = derive { name="ScoreGGUM"; version="1.0"; sha256="0f7sjfr3a8b8y1n9lrwyiyyljls3rbz84d9s93psi2fnmjj0kvgw"; depends=[]; }; +ScottKnott = derive { name="ScottKnott"; version="1.2-5"; sha256="1ywwhdghcy30mp2nhsk2yhgb37nrdmb9yan5vvzsg66bchc3xgll"; depends=[]; }; +ScrabbleScore = derive { name="ScrabbleScore"; version="1.0"; sha256="19vgaxnhvqsbllqxfbnhnar2j4g0fkxi7rfsmkks2bd2py81x04m"; depends=[]; }; +ScreenClean = derive { name="ScreenClean"; version="1.0.1"; sha256="0haanr05g4vwp5apncyzv8i3r61g4xf9ihm8ilcabcgpri56gpjk"; depends=[MASS Matrix quadprog]; }; +SearchTrees = derive { name="SearchTrees"; version="0.5.2"; sha256="11p81x1klkmxarypxpbisf78dlrmhzzg9y9hxpwz75pks1y56gqg"; depends=[]; }; +Segmentor3IsBack = derive { name="Segmentor3IsBack"; version="1.8"; sha256="00m6fvx6s8mz477c8b4dmgdh52jf6jx1lcqzf84l90b1xw93qnv7"; depends=[]; }; +Sejong = derive { name="Sejong"; version="0.01"; sha256="1d9gw42dbs74w7xi8r9bs6dhl23y16yxqzyhqqayvcm98q3l77nf"; depends=[]; }; +SeleMix = derive { name="SeleMix"; version="0.9.1"; sha256="04gxgja35qs4k66iil014dzgl5bkx0qhr9w4v7qpmwv2bb07jwz3"; depends=[mvtnorm Ecdat xtable]; }; +SelvarMix = derive { name="SelvarMix"; version="1.0"; sha256="0yysmf854xz5l0lf2x0hw0qxbrdhgfrcx5ggw8n4pjfv553p38ni"; depends=[Rcpp glasso Rmixmod Rcpp RcppArmadillo]; }; +SemiCompRisks = derive { name="SemiCompRisks"; version="1.0"; sha256="1q10bqws152vk7fpd9m8w16m0ns2i10q07wnmmbjladvfq4ja9il"; depends=[]; }; +SemiMarkov = derive { name="SemiMarkov"; version="1.4"; sha256="0z43ynkd6wrxrfdbq01jiwyvw2shc3r3pmircnzkbwm2sffd3515"; depends=[numDeriv MASS Rsolnp]; }; +SemiPar = derive { name="SemiPar"; version="1.0-4.1"; sha256="05gnk4s0d6276rmnyyv6gy1wpkji3sw563n8l7hmi9qqa19ij22w"; depends=[MASS cluster nlme]; }; +SemiParBIVProbit = derive { name="SemiParBIVProbit"; version="3.2-12.1"; sha256="12nmj0i6r5k7m7d3vhkzx5rrqk1ql97v78vyx54vdv5m4wfgddd7"; depends=[mgcv mvtnorm magic CDVine VineCopula VGAM survey trust Matrix sn]; }; +SemiParSampleSel = derive { name="SemiParSampleSel"; version="1.1-1"; sha256="0a3kynh96gp0ngw25v05fmcapx3iiclcjbypq2nn8sybbv9991c4"; depends=[copula mgcv mvtnorm magic trust Matrix]; }; +SenSrivastava = derive { name="SenSrivastava"; version="2012-04-0"; sha256="0ki0kl18cj8lkad6q48piyvslkirs8y5rnfa8bvgjxsisxg2ahhp"; depends=[]; }; +SensitivityCaseControl = derive { name="SensitivityCaseControl"; version="2.1"; sha256="00jqzqx7g0av9lw13is723gph486gb8ga0wgcmmzpmb24s5nya9z"; depends=[]; }; +SensoMineR = derive { name="SensoMineR"; version="1.20"; sha256="1qw97cixndg2h29bbpssl0rqag3w8im4nm9964lr7r012y5wdqhx"; depends=[FactoMineR cluster KernSmooth]; }; +SeqFeatR = derive { name="SeqFeatR"; version="0.1.5"; sha256="1cpb64h3pcp18zrly0hxy2wfn68x4pgyj0ywl4z2kadi6y3r0gyh"; depends=[tcltk2 plotrix ape plyr phangorn]; }; +SeqGrapheR = derive { name="SeqGrapheR"; version="0.4.8.3"; sha256="03plwa3sc1pg34p1szbz3d0z8y53w7iqm7qn9q6fj72rsnk5spxc"; depends=[igraph rggobi gWidgets gWidgetsRGtk2 cairoDevice]; }; +Sequential = derive { name="Sequential"; version="1.1"; sha256="1fr4n6qbxwj6hs01h07wdj5v4c7af5q8ccnm33yzcrx845qf8fiv"; depends=[]; }; +SetMethods = derive { name="SetMethods"; version="1.0"; sha256="0zizvrzyk01w4ncazvifmjm4h5zrpsf6n68n11sc8f5kzny9ia48"; depends=[lattice betareg lattice betareg]; }; +SharpeR = derive { name="SharpeR"; version="0.1401"; sha256="1l55llafs81gl1mdhyyi6m02w7mx8g46y65jf1kw5mbrljgri8az"; depends=[matrixcalc xtable]; }; +ShrinkCovMat = derive { name="ShrinkCovMat"; version="1.0.3"; sha256="0smfi3sg9mkl2vshw2g9qf7vm7h4ccnj32q3mmjf9djbfs8r8zfv"; depends=[]; }; +SiZer = derive { name="SiZer"; version="0.1-4"; sha256="0kiwvxrfa2b49r2iab5v2aysc2yzk5ck3h41f2hr0vq5pdnz0qy5"; depends=[boot]; }; +SigTree = derive { name="SigTree"; version="1.6"; sha256="1z6z3s6gay3pcjazibb0schipc9qqpp3ahf0f56fq9mhk545125z"; depends=[ape phyext RColorBrewer]; }; +SightabilityModel = derive { name="SightabilityModel"; version="1.3"; sha256="0rgv5735y07yyv5y9c3flzha97ykn34ysmzy6as1z94hqfr4w746"; depends=[]; }; +Sim_DiffProc = derive { name="Sim.DiffProc"; version="2.9"; sha256="1cq168ga4p70hgx7rsm9rvam8b0wvjivqp2nsprk39i864j9sr91"; depends=[scatterplot3d rgl]; }; +SimComp = derive { name="SimComp"; version="2.2"; sha256="07gmlbwvv07kq3z7gq2jxlank011c0cqh8zwwp4pzf061d3gjdm6"; depends=[mvtnorm multcomp mratios]; }; +SimCorMultRes = derive { name="SimCorMultRes"; version="1.2"; sha256="0wgi36sdpsippdbawdl7b9bvip0l8gp8xd1v85vznd1dibkfjr1r"; depends=[evd]; }; +SimRAD = derive { name="SimRAD"; version="0.95"; sha256="1l4y39d05h5f2q609i73p07h093r9yca11dqw5iq1d7skwxcvf01"; depends=[]; }; +SimSeq = derive { name="SimSeq"; version="1.0.0"; sha256="142qjkfz53q3g9k37nqhilsw1mcklsa9q05yqvyn9dvj9l06y11i"; depends=[fdrtool]; }; +Simile = derive { name="Simile"; version="1.3"; sha256="0jf0ispjv8izrxggp6y3a3scd8qlbqfgppqz8m1q9n3gy8jhbsli"; depends=[]; }; +SimpleTable = derive { name="SimpleTable"; version="0.1-2"; sha256="1rkybrp7zlb7cj37799npss1ldic0yf519q5l7a6ikal4yl1afyb"; depends=[hdrcde locfit MCMCpack]; }; +SimplicialCubature = derive { name="SimplicialCubature"; version="1.0"; sha256="0da2krxsd3p7v2jm4fp2ksh0ak1y0cjxj7inwkdiwmmmgjyq033f"; depends=[]; }; +Simpsons = derive { name="Simpsons"; version="0.1.0"; sha256="1pm6wga1yxc35zgz72plzq23d3l4bbzfdvhszdxmkn1pkk64h8ms"; depends=[mclust]; }; +SimuChemPC = derive { name="SimuChemPC"; version="1.3"; sha256="06sxknaykikcgbw7qbbw1risg0sbaisb68vhfd7cl6sg0327dznk"; depends=[rcdk]; }; +SimultAnR = derive { name="SimultAnR"; version="1.1"; sha256="0jvmxwmbnx14h27b576dg9mw3c2z0w3m82f51f25zd1darcl06bj"; depends=[]; }; +SixSigma = derive { name="SixSigma"; version="0.8-1"; sha256="15jdr10a7a6wv50vz9y6qcrbhnddl8zh4j4d48xrarrqbjy6l4p7"; depends=[qcc lattice ggplot2 reshape2 nortest testthat]; }; +SkewHyperbolic = derive { name="SkewHyperbolic"; version="0.3-2"; sha256="00l1bz3wxvs7qwl4sy814w6nrh0k79ldck5zd6c5alvg50hjwwk3"; depends=[DistributionUtils GeneralizedHyperbolic RUnit]; }; +Skillings_Mack = derive { name="Skillings.Mack"; version="1.0-2"; sha256="1spf77ix9d264r126hnrjm7z8fw19v1bk5pqhqcf6lm93zlcgh8i"; depends=[MASS matrixcalc gtools]; }; +Sleuth2 = derive { name="Sleuth2"; version="1.0-7"; sha256="1zav2g1yqc6bvzap4r5xwy9abkdj8iswivj5y2lylc25nkxwcswg"; depends=[]; }; +Sleuth3 = derive { name="Sleuth3"; version="0.1-6"; sha256="0q8sgh2szqnxc289vgi5v0sljzz8yb803ijx9w5mswdxw87z2dq3"; depends=[]; }; +SmarterPoland = derive { name="SmarterPoland"; version="1.2"; sha256="1ga2m9kbn269dx21k5q1drlw9hph99fsfdx2mfnajwlgpycgf6m9"; depends=[reshape rjson]; }; +SmithWilsonYieldCurve = derive { name="SmithWilsonYieldCurve"; version="1.0.1"; sha256="0qvhd1dn2wm9gzyp6k7iq057xqpkngkb4cfmvmjqmf0vhysp371w"; depends=[]; }; +SmoothHazard = derive { name="SmoothHazard"; version="1.2.3"; sha256="0p6hnq782d5qwmq6ak2rmbzx84lrsy02lr303gg3y0vln5i2myyn"; depends=[lava mvtnorm prodlim]; }; +SnowballC = derive { name="SnowballC"; version="0.5.1"; sha256="0kbg33hy6m2hv9jspyx6naqmk2q6h2zmvvczjmkwqvlhzlj0c5s4"; depends=[]; }; +SoDA = derive { name="SoDA"; version="1.0-6"; sha256="0sh2dan4ga2k14rirnkvgzsvbksx1k4ika5gkf5cy247rjkqnpj0"; depends=[]; }; +SocialMediaMineR = derive { name="SocialMediaMineR"; version="0.1"; sha256="113nyjncl5yi61hz8i7k60b3f0f9a5vyrd3s72nbmc44cnvr8fci"; depends=[RCurl jsonlite httr]; }; +SocialNetworks = derive { name="SocialNetworks"; version="1.1"; sha256="0d868xka6d35i17r28cvm0ya971xk6y1kycsfff0279w27cjd9x0"; depends=[Rcpp Rcpp]; }; +SoftClustering = derive { name="SoftClustering"; version="0.14.02"; sha256="15j79h1ccvzfpi55prbv2d7bms1grgry0ka58cr757cvwavrnbb8"; depends=[]; }; +SoilR = derive { name="SoilR"; version="1.1-23"; sha256="1cryypgnbck5hvkc2izrd8r10q2b97f2p1s46x4dk8p099gck5wg"; depends=[deSolve RUnit]; }; +SortableHTMLTables = derive { name="SortableHTMLTables"; version="0.1-3"; sha256="1jgrqsm0cj8qlk0s4qn3b83w96mgpp5gmhgcg9q2glc72v8c4ljh"; depends=[testthat brew]; }; +SparseGrid = derive { name="SparseGrid"; version="0.8.2"; sha256="057xbj2bhjm9i32kn39iscnqqdsvsmq0b8c92l8hnf9avf1sx10x"; depends=[]; }; +SparseM = derive { name="SparseM"; version="1.05"; sha256="041mkl0dlydlar0v0a66n9s1n0klayr08hwzpmwr2hsr05z0z380"; depends=[]; }; +SparseTSCGM = derive { name="SparseTSCGM"; version="2.1.1"; sha256="0xr3l049kssi7k074wggvc96p2zlca076j2hwpwpmna42xl3dmqv"; depends=[glasso longitudinal flare MASS mvtnorm network abind]; }; +SpatialEpi = derive { name="SpatialEpi"; version="1.2.1"; sha256="02mvahpbrlcnxmf272fk46wykv9s2lcjqd5yhd80dfs78qjwly77"; depends=[sp Rcpp MASS maptools spdep Rcpp RcppArmadillo]; }; +SpatialExtremes = derive { name="SpatialExtremes"; version="2.0-0"; sha256="0fjh4cjzljwzxk4bhcrff9wnkskaiawbj7z6swrj1xl35mq4dljx"; depends=[]; }; +SpatialNP = derive { name="SpatialNP"; version="1.1-1"; sha256="108gxk0gbbjck9bgxvqb9h216ww21lmh2by0hrhzwx5r63hhcbmd"; depends=[]; }; +SpatialPack = derive { name="SpatialPack"; version="0.2-3"; sha256="1gs0x3wj3hj663m6kszwhy3ibcx0lrslr127miy1rhz8683ij71c"; depends=[]; }; +SpatialTools = derive { name="SpatialTools"; version="0.5.8"; sha256="18zchr8bfjqdr9j6vh6365mhrj2n0ns1ixvmas5s0ppiim59jl7j"; depends=[spBayes Rcpp Rcpp RcppArmadillo]; }; +SpatialVx = derive { name="SpatialVx"; version="0.2-1"; sha256="0j6m698nyd9nq0qx1s2ykk05q2scj9jb0m813r0xyymf0sl0l90a"; depends=[spatstat fields smoothie smatr turboEM distillery maps boot CircStats fastcluster waveslim]; }; +SpatioTemporal = derive { name="SpatioTemporal"; version="1.1.7"; sha256="0rc5zf8cnjw59azgqmslfz2dl5i17dfmb7ls5c849qybp2gn2zdv"; depends=[Matrix MASS]; }; +SpeciesMix = derive { name="SpeciesMix"; version="0.3.1"; sha256="0wl15k00d7n9pmnp1kr28p05z4vrziprcdndw77kwkcgv51cvllk"; depends=[MASS numDeriv]; }; +SpecsVerification = derive { name="SpecsVerification"; version="0.3-0"; sha256="19vr4xlx9gx0ph6k2kf59bpbhmzncm1mmzz7ld3pjc7k4jfba3np"; depends=[]; }; +SpherWave = derive { name="SpherWave"; version="1.2.2"; sha256="1wd9pql97m1zl0axzpkfq9sxadrm5cfax0gxh0ncqadaq7w7lml4"; depends=[fields]; }; +SphericalCubature = derive { name="SphericalCubature"; version="1.0.1"; sha256="0j592zvs07yc6amahlxgdw0k1vqr89gvcq22vcwzkx62igvlf6pv"; depends=[cubature]; }; +SphericalK = derive { name="SphericalK"; version="1.0"; sha256="09jgz7wm0i2gj9flvwv1g8z86n5ch3fmswpypzp76dcia88x5hhc"; depends=[]; }; +SportsAnalytics = derive { name="SportsAnalytics"; version="0.2"; sha256="1vb080ak1mfvr6d0q9i3r8hd547ba80bavjdcri0gclqqcjf1ach"; depends=[]; }; +StAMPP = derive { name="StAMPP"; version="1.3"; sha256="1igf6arp7glihkv60zc7c0zwfqaf5kcm2d1xr856fj194zxww9ad"; depends=[pegas doParallel foreach adegenet]; }; +StMoSim = derive { name="StMoSim"; version="3.0"; sha256="18mdgpn0x6338zzvc7nwccz6ypqmlpv7pzcy5fwx5y2wfkmdp4rm"; depends=[RcppParallel Rcpp RcppParallel Rcpp]; }; +StableEstim = derive { name="StableEstim"; version="2.0"; sha256="080khfix88j4656hmdy9l0xpbk9zzw7z7d7f6yvwsbalk3ag18i5"; depends=[Matrix stabledist testthat numDeriv xtable fBasics MASS]; }; +Stack = derive { name="Stack"; version="2.0-1"; sha256="09fgfhw9grxnpl5yg05p9gvlz38iw4prns1jn14nj3qx01k5rnxb"; depends=[plyr stringr ff ffbase bit]; }; +StandardizeText = derive { name="StandardizeText"; version="1.0"; sha256="0s267k2b109pcdiyd26gm4ag5afikrnnb55d3cs6g2fvzp744hfp"; depends=[]; }; +Stat2Data = derive { name="Stat2Data"; version="1.6"; sha256="0pk68ffc6ffpddfpf9wi8ch39h6k3r80kldld3z5pnql18rc8nvx"; depends=[]; }; +StatDA = derive { name="StatDA"; version="1.6.7"; sha256="140hqg56axwg5ckfr4n4rr453ppsgf5bmmd7kg4mai1xnj4wmg8b"; depends=[geoR sgeostat cluster e1071 MASS MBA mgcv rgl robustbase xtable]; }; +StatDataML = derive { name="StatDataML"; version="1.0-25"; sha256="05s9kbrjl2wsfccgav34b02m06q62r3iyjd0ndr6xcqlw9x2w2ya"; depends=[XML]; }; +StatMatch = derive { name="StatMatch"; version="1.2.2"; sha256="1ml88ssd2xrnxh6xbg25bbskqv9jrn5vczaq3a3v4bccimv65prh"; depends=[proxy clue survey RANN]; }; +StatMethRank = derive { name="StatMethRank"; version="1.0"; sha256="0mcvwn1f3hylvyg46vigc5wnvhhig5v01ag3y9rap32v85f308zh"; depends=[MASS rjags pmr]; }; +StatRank = derive { name="StatRank"; version="0.0.4"; sha256="0s0jc4hvrry9a884fqfk3gp1w4ww5wif2kh3m0f22nn7qb49if9p"; depends=[truncdist plyr]; }; +Stem = derive { name="Stem"; version="1.0"; sha256="1fr02mi5qyxbqavdh2hg8ggw4nfjh3vs7g0vh834h6y0v53l71r5"; depends=[mvtnorm MASS]; }; +StereoMorph = derive { name="StereoMorph"; version="1.2.1"; sha256="1wvkqrfghxcdiicr81hrl320zcpj6q9kqjddsrm24p98vs83hlpi"; depends=[bezier rjson shiny Rcpp jpeg Rcpp]; }; +Storm = derive { name="Storm"; version="1.1"; sha256="118l03d6las9cvhh4d845r7z6mlqff6ixxdfrdf025jsiqagm395"; depends=[rjson]; }; +StrainRanking = derive { name="StrainRanking"; version="1.1"; sha256="0q6k90if74320mrs2ccq2izynylr8zakciwbc2c6ms0v57aalwic"; depends=[]; }; +StratSel = derive { name="StratSel"; version="1.0"; sha256="1kr7bl2qrj2ra3szvw5z5y6ra6zz5q3v9vx81p8r5618zffa8q3b"; depends=[mnormt memisc Formula]; }; +StreamMetabolism = derive { name="StreamMetabolism"; version="1.0"; sha256="03pr7i1c3qddqwibfc2x08d2nh8fih02k7a1xhqs1awfs43x56is"; depends=[zoo chron maptools]; }; +StressStrength = derive { name="StressStrength"; version="1.0.1"; sha256="15sgdisgz8zcq4i9z4zm7isr5ckyd7bk6yl1g7a5kngams282ipx"; depends=[]; }; +SubCultCon = derive { name="SubCultCon"; version="1.0"; sha256="08q6k4nsv3gl5qk87s87smdg047yc2a4i7kg0fp08i7q7h62jkvz"; depends=[]; }; +SubLasso = derive { name="SubLasso"; version="1.0"; sha256="12m7ynlqhikjhavd12bhsd04s9cpv8aq5xgm875i10mb3ldpd1bd"; depends=[glmnet psych gplots]; }; +Sunder = derive { name="Sunder"; version="0.0.3"; sha256="0iyipvlz66l84b71cjyjmyirl43jcj4sfzfqk07dzycfgvvwkz3h"; depends=[mnormt]; }; +SunterSampling = derive { name="SunterSampling"; version="1.0.1"; sha256="0qfld3j8xlpgp7c58zqw6gzm38m4d740lvdj5vmcflfcc6ja98sf"; depends=[]; }; +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-3"; sha256="1z07zck27qsp64zpz7qrxdnabkffnxqh3bixg5zrd37zgki9ig1w"; depends=[MASS nlme msm lme4]; }; +SurvRegCensCov = derive { name="SurvRegCensCov"; version="1.3"; sha256="1sl17x984ww07aakz6dambn5kznw4hvj4b8ahy2r4mr6wf2dpg5a"; depends=[survival numDeriv]; }; +Survgini = derive { name="Survgini"; version="1.0"; sha256="1gxkdv2j1njbgnwb52vyhz7p2lrcg3hp6sry3kyhp4wkvf6gnhxi"; depends=[survival]; }; +SvyNom = derive { name="SvyNom"; version="1.0"; sha256="07cgg97s2kpq7vak9l1a57gwmp1gsm864m4b9q42s2fbiid8jg83"; depends=[]; }; +SweaveListingUtils = derive { name="SweaveListingUtils"; version="0.6.2"; sha256="0n15gkiil9rlb0dhnkfimhcs09av35b7qx79iba7bx3y7spvzaqy"; depends=[startupmsg]; }; +SwissAir = derive { name="SwissAir"; version="1.1.4"; sha256="1avc32q7nbwjkcbml7z05car6khv1ghcz3miw0krm8i53w032c6f"; depends=[]; }; +SyNet = derive { name="SyNet"; version="2.0"; sha256="0mb9dscddkvmkf7l3bbcy4dlfmrvvy588vxdqy5dr783bpa5dkiw"; depends=[tkrplot]; }; +SynchWave = derive { name="SynchWave"; version="1.1.1"; sha256="127hllvig8kcs9gr2q14crswzhacv6v2s4zrgj50qdyprj14is18"; depends=[fields]; }; +SynergizeR = derive { name="SynergizeR"; version="0.2"; sha256="0z32ylrjjvp8kr6lghhg57yq1laf9r0h8l3adysvis8bbpz2q2sj"; depends=[RJSONIO RCurl]; }; +Synth = derive { name="Synth"; version="1.1-5"; sha256="1cfvh91nz6skjk8jv04fhwv3ga9kcsfgq3mdy8lx75jkx16zr0pk"; depends=[kernlab optimx]; }; +TAM = derive { name="TAM"; version="1.2"; sha256="125zwpah09dy2y8ifwkvv194g0ns1hzgqpg3l1di65klj0ipnv99"; depends=[CDM MASS Rcpp mirt lavaan tensor sfsmisc GPArotation psych lattice mvtnorm Rcpp RcppArmadillo]; }; +TANOVA = derive { name="TANOVA"; version="1.0.0"; sha256="0c2mrahchwagisrkjl5l1s0mv0ny80kngq8dz0fjj9lwxwqwvwa5"; depends=[MASS]; }; +TAQMNGR = derive { name="TAQMNGR"; version="2014.01-2"; sha256="1szds8yyk3ldap785jxi8lj86rf4zlpzhd7rk2y8xwcq2fhs9h62"; depends=[Rcpp]; }; +TBEST = derive { name="TBEST"; version="3.0"; sha256="1c4zbp4jsl8qsbx7bnqm7z7njm60qcc1yhxdbg75mw326brfvw1z"; depends=[signal fdrtool]; }; +TBSSurvival = derive { name="TBSSurvival"; version="1.1"; sha256="0hh0zpvwbkix8g9slf6bh4qzwmig5qif80q1ph6m5i496ywjcc80"; depends=[mcmc coda survival normalp R_utils BMS]; }; +TDA = derive { name="TDA"; version="1.2"; sha256="02nfvrg428l6pq2vrsx5dj45k9gnsfvdbhvcwj86ab66z5cdjffk"; depends=[FNN igraph scales]; }; +TDD = derive { name="TDD"; version="0.4"; sha256="193y8brybkjsajrbnlx1sdnw1wyyn9rhlm5wvp4aamqhvi8z13vn"; depends=[signal RSEIS pracma]; }; +TDMR = derive { name="TDMR"; version="1.2"; sha256="0w056qxh7c56m3p6jlrp8fv2j2r1njxzgwzk3l1lhyxr94gff263"; depends=[testit SPOT]; }; +TDboost = derive { name="TDboost"; version="1.0"; sha256="1qiwz35i89lv95v3x5s28q0mkrvcfs1cfn4l0a5spvnyhy4kcacc"; depends=[lattice]; }; +TED = derive { name="TED"; version="1.1.1"; sha256="0nb2arx7c1m8ymnkmj3jwbcw23vhkr1f3vlym2hqs0pq0lnsl4g0"; depends=[foreach zoo fields animation geoR RcppArmadillo]; }; +TEEReg = derive { name="TEEReg"; version="1.0"; sha256="1xpr4m8yamifjx7njb7dyqv51rsbjym9c5avflf69r9sazf3n503"; depends=[]; }; +TEQR = derive { name="TEQR"; version="5.0-0"; sha256="04r26qzps7nnvs4s2xpvjf6q456wa29alhsds07xvyqhi972xhs6"; depends=[]; }; +TERAplusB = derive { name="TERAplusB"; version="1.0"; sha256="0mshx615awcf2arm39mgw2gzgpyn7a3f767484g7z4nqqlikwpgc"; depends=[]; }; +TESS = derive { name="TESS"; version="1.2.1"; sha256="15wrbbhrzj66j0z6xhnbf560qg0dzm1yqfbpmx070n3lsa2rdyij"; depends=[ape coda deSolve]; }; +TExPosition = derive { name="TExPosition"; version="2.6.10"; sha256="12rgijlclaipwjjiyng7nwilzixdy6lsvncigcg0vjydhgk97jn1"; depends=[prettyGraphs ExPosition]; }; +TFDEA = derive { name="TFDEA"; version="0.9.5"; sha256="12rr9inzr21vkfcmknxa8zd229vws3nyc4dfz44zsfxzzwi8sqk3"; depends=[lpSolveAPI]; }; +TFMPvalue = derive { name="TFMPvalue"; version="0.0.5"; sha256="13bfcwfiyl61cv2ma23fcmv2cvbsyzdbg2pl6l6zg39l6scxf9na"; depends=[Rcpp Rcpp]; }; +TFX = derive { name="TFX"; version="0.1.0"; sha256="0xrjdbvg0ng4i0s8ql1pfyma10x4n045spilkb05750677r5j44p"; depends=[XML]; }; +TH_data = derive { name="TH.data"; version="1.0-5"; sha256="09p5n2fr6p47q26gb7chs0s6vyvpvywmml3i0nrp7hrikvzqf4yv"; depends=[]; }; +TIMP = derive { name="TIMP"; version="1.11.0"; sha256="0l8n3xg5ds1lbndd993nijny26s9p36n3j128527y53fs4915lxn"; depends=[fields vcd gplots colorspace gclus nnls deSolve minpack_lm MASS]; }; +TInPosition = derive { name="TInPosition"; version="0.13.6"; sha256="1cxxrfpbiyknaivv6gyp79lz0rxwhrndcd054smksxq8zcfz0v7c"; depends=[prettyGraphs TExPosition ExPosition InPosition]; }; +TPmsm = derive { name="TPmsm"; version="1.1.1"; sha256="0fd4l1rzclq32l97g7rdvhdvfdylgwaf079y24arfvkyphs2xga4"; depends=[KernSmooth]; }; +TR8 = derive { name="TR8"; version="0.9.11"; sha256="164fd9g4vn4p51m5ygg65lkjapb9a42wkfcp4ngdqh542x313y2n"; depends=[RCurl XML taxize plyr rappdirs gWidgets gWidgetstcltk]; }; +TRAMPR = derive { name="TRAMPR"; version="1.0-7"; sha256="135ylhijhpdxpznfdbdzwfsvy8bhw1yx28c3520a3lyrqvinpawg"; depends=[]; }; +TRIANG = derive { name="TRIANG"; version="1.2"; sha256="09hfvfmqrmx8dphlk46ga0y9s986kb32qdhgiq95faqfhpirf0qa"; depends=[]; }; +TRIANGG = derive { name="TRIANGG"; version="1.0"; sha256="1ycqyaijxmgi7v9rzdsq3gxx1wll51yfpdyxbjiyp9gpgmcs7h48"; depends=[]; }; +TRSbook = derive { name="TRSbook"; version="1.0.1"; sha256="1w2yl5pchw2vn9l3qnm1ra9mjy946i5xsxh5n5xdvrcj2kak50x5"; depends=[xtable RColorBrewer gdata IndependenceTests]; }; +TSA = derive { name="TSA"; version="1.01"; sha256="0cm97hwxm6vfgy9mc3kgwq6dnmn86p8a4avnfjbai048qnwrn6hx"; depends=[leaps locfit mgcv tseries]; }; +TSAgg = derive { name="TSAgg"; version="1.0.1"; sha256="01s0grwfbhhfipqdnc0932rjsz4k52rln2bs8dsvrk6f8wps7h1k"; depends=[lubridate]; }; +TSEN = derive { name="TSEN"; version="1.0"; sha256="1pn313g2ylbjc37rqcakd797vffnh7v0rgg1xl5wjyvcgmm5mxix"; depends=[ncdf]; }; +TSHRC = derive { name="TSHRC"; version="0.1-3"; sha256="18ygg7bqwg1pdqi52l1lf33gcd277895rlf5853yzh7ln2ivssmi"; depends=[]; }; +TSMySQL = derive { name="TSMySQL"; version="2013.9-1"; sha256="1ls3mpp5xq707vgv8l14cfbw1vn4ygy4d9n19nw5mnl3izz4p0pk"; depends=[TSdbi RMySQL DBI tframe TSsql]; }; +TSP = derive { name="TSP"; version="1.0-9"; sha256="122y008gy7b2yscl9n2nwdb81fzjnpimipy3cvbnmk4i6v8nibjx"; depends=[]; }; +TSPostgreSQL = derive { name="TSPostgreSQL"; version="2013.9-1"; sha256="0ihfz0q1faxb7mk4jm10czfb9fz168x4z8890vql98djsxzjxpz4"; depends=[TSdbi RPostgreSQL DBI tframe tframePlus TSsql]; }; +TSSQLite = derive { name="TSSQLite"; version="2013.9-1"; sha256="0yw5whn95dvv3wbwmlhfgkapwp66nk94fjfl1r8irbqvrscmjin0"; depends=[TSdbi RSQLite DBI tframe tframePlus TSsql]; }; +TSTutorial = derive { name="TSTutorial"; version="1.2.3"; sha256="0hpk6k3lc72p8pdz5aad04lcjsz9k443h5gs09dc3i10wqw3yhxs"; depends=[MASS]; }; +TSclust = derive { name="TSclust"; version="1.2.3"; sha256="0m04svw4z2rhvzyckn8l4pg4rmwfn8xlzd9k839c47ldbzgb4z6l"; depends=[wmtsa pdc cluster locpol KernSmooth dtw longitudinalData]; }; +TScompare = derive { name="TScompare"; version="2013.9-1"; sha256="1gghr7xsg524sc9lhy1ymlhigaz6pi69fnccgn784ff2hl3w6d8w"; depends=[TSdbi tframe tfplot]; }; +TSdata = derive { name="TSdata"; version="2013.9-1"; sha256="1r3x6w17517if2jpcz2mr8jk5i080dkx4nlffblrcsxjhfvlz0xh"; depends=[]; }; +TSdbi = derive { name="TSdbi"; version="2013.9-1"; sha256="12v9dv7hrq626q44v3lws950m241fq5fsfsnmgvfbbyya5ixis86"; depends=[DBI tframe]; }; +TSdist = derive { name="TSdist"; version="1.2"; sha256="103wv6wy5gjim2cf14d6afinyla85p6dncchi17fr0s4vqkmx3m5"; depends=[proxy zoo xts]; }; +TSfame = derive { name="TSfame"; version="2013.8-2"; sha256="19awl7jrx97y93wsms3h87w8qdgpdrkbbpsjsa2aqsnyq5vgy82l"; depends=[TSdbi DBI tframe tframePlus fame tis]; }; +TSgetSymbol = derive { name="TSgetSymbol"; version="2013.9-1"; sha256="1hn78xrfdnwhjrgcnn71ihvdgv4qwdxhpjwcqp0pbkgbxj3q5w3k"; depends=[TSdbi quantmod DBI zoo tframe tframePlus]; }; +TShistQuote = derive { name="TShistQuote"; version="2013.9-1"; sha256="06din7frxmbk4qxkpv0z5srh8nh0wkmrfl9lz17y7cwsmldl4hvr"; depends=[TSdbi DBI tframe tframePlus zoo tseries]; }; +TSjson = derive { name="TSjson"; version="2014.4-1"; sha256="1rkxc4dm7hdva0hiqbka8isfszjy26if9hnarsm51cflk8b60zhk"; depends=[TSdbi findpython DBI tframe tframePlus rjson]; }; +TSodbc = derive { name="TSodbc"; version="2013.9-1"; sha256="0s0bgid5slvyqlsrc0jvybqd73qjbs7qb0klws4ynk51rw6rilml"; depends=[TSdbi RODBC DBI tframe tframePlus TSsql]; }; +TSsql = derive { name="TSsql"; version="2014.4-1"; sha256="10h83z0d9xjc1g0pnjvr4idz5c2vwf36x6qx1lpa48ybap50s215"; depends=[DBI tframe TSdbi]; }; +TSxls = derive { name="TSxls"; version="2013.8-2"; sha256="1a0cmw41jf9jqibg25s4s04lawdb86c5r4bkxp8bznzkkhihpxn1"; depends=[TSdbi DBI tframe tframePlus gdata]; }; +TSzip = derive { name="TSzip"; version="2013.9-1"; sha256="09fqjsppj7qmbiiy19s64j77kf6drqfiphk5dfz25w5df1lzdw0f"; depends=[TSdbi DBI tframe tframePlus gdata]; }; +TTAinterfaceTrendAnalysis = derive { name="TTAinterfaceTrendAnalysis"; version="1.5.1"; sha256="1i9p5s7xj3py8465yjjaqs2m7krjxzzqd86lkpbgzxnxjdnxcx5i"; depends=[Hmisc pastecs reshape wq e1071 timeSeries fBasics relimp multcomp nlme lubridate tcltk2]; }; +TTR = derive { name="TTR"; version="0.22-0"; sha256="0aackwmmakjcynpq4nxi8xw1x3688rkg6kypgd5jiprzzdhsz5rq"; depends=[xts xts]; }; +TUWmodel = derive { name="TUWmodel"; version="0.1-4"; sha256="1xxbrcs3dddzcya15pj4k86z05vnv06fnwblfvygx0zkw0m292av"; depends=[]; }; +Table1Heatmap = derive { name="Table1Heatmap"; version="1.1"; sha256="1nrabjivfsdhaqmlq365pskkrp99jqsxn8vy03mdnqn5h5zv7wvx"; depends=[colorRamps]; }; +TableMonster = derive { name="TableMonster"; version="1.1"; sha256="1xflw719isy5hxvm0z67bip01cpafylnj76zssb3c174j912f7y3"; depends=[xtable]; }; +TableToLongForm = derive { name="TableToLongForm"; version="1.3.1"; sha256="135q0bgsm2yndrg3vpwmihbqlyf3qkm97i0jvcw6bf06p6b2fk41"; depends=[]; }; +Tampo = derive { name="Tampo"; version="1.0"; sha256="10w9is8wskl5xvjfqmjhjpyppazrxw7fq1s58hi62rvcc4mpgz37"; depends=[mvpart]; }; +TaoTeProgramming = derive { name="TaoTeProgramming"; version="1.0"; sha256="1b36s5mpm5vbhzcwmvm8g5pl7vpn6rsl5cnglfy8kgm1q9nnr7ff"; depends=[]; }; +TapeR = derive { name="TapeR"; version="0.3.2"; sha256="070zl7hqv5zprhs464gy1kmz0am58l0vig8xvdq6pbz94nrhvpj0"; depends=[nlme pracma]; }; +TauP_R = derive { name="TauP.R"; version="1.1"; sha256="10sjvcv70fjrsl5nnk9gm4sy7nhwm6aaq57gr37cb10v079ykmk1"; depends=[]; }; +Taxonstand = derive { name="Taxonstand"; version="1.6"; sha256="04d6c84j0xdv2j7s69c64h7m5j63nw4ypsyp30r0sadjkdrvhm0q"; depends=[]; }; +TcGSA = derive { name="TcGSA"; version="0.9.8"; sha256="19gp3pj4p2svrfyviccvv13q82qj7584nck8zbba90hzv9g4xy86"; depends=[lme4 ggplot2 GSA reshape2 gtools gplots cluster stringr]; }; +TeachNet = derive { name="TeachNet"; version="0.7"; sha256="1p39bsf846r7zwz4lrrv2bpyx9yrkqzrnacajwrz3jjqj6qpp6cn"; depends=[]; }; +TeachingDemos = derive { name="TeachingDemos"; version="2.9"; sha256="160xch4812darv77qk2xjblm6nfnna5x2rxy335bwdsdjzcx4x9m"; depends=[]; }; +TeachingSampling = derive { name="TeachingSampling"; version="3.2.1"; sha256="1diw8qz6yi3g7d1ysklrvxwbzda9ybi039yr6agzw0w0b2b59jj4"; depends=[]; }; +TestScorer = derive { name="TestScorer"; version="1.6"; sha256="11125i0dwh961q5xbg57lli5bzzls3y482iw5f0qwalwkppk7sv0"; depends=[]; }; +TestSurvRec = derive { name="TestSurvRec"; version="1.2.1"; sha256="05f5gc8hvz09hx015jzis6ikki9c1brdq7l7a9bxm9bqbcc9f2f9"; depends=[survrec boot]; }; +Thinknum = derive { name="Thinknum"; version="1.3.0"; sha256="0j48vgr4wsc2chm95aprq0xm0dk720xk5zmiijxasg92sfp0va6n"; depends=[RCurl RJSONIO]; }; +ThreeWay = derive { name="ThreeWay"; version="1.1.2"; sha256="1vf71im3bs2b2v05j12l8qn181kah0mch4h13n71zqik1ykly6jf"; depends=[]; }; +ThresholdROC = derive { name="ThresholdROC"; version="1.0"; sha256="1w7bjw1w09skxyc5w3d72wivljlvnck6vbchihjx7m5k6djn7pxi"; depends=[]; }; +TiddlyWikiR = derive { name="TiddlyWikiR"; version="1.0.1"; sha256="0vwwjdmfc8c0y2gfa8gls1mzvp29y39c9sxryrgpk253jj9px1kr"; depends=[]; }; +Tides = derive { name="Tides"; version="1.0"; sha256="10k8cmpfj9jjpzayyklslgazgl96078vfbn71ncgrn9bb98ahyqs"; depends=[]; }; +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=[]; }; +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-8"; sha256="12zbk7bq4ff4dzq86zbh9pspl1b9a69k0rw9lg8sh3mmc0f09m8j"; depends=[RColorBrewer boot]; }; +TraMineRextras = derive { name="TraMineRextras"; version="0.2.2"; sha256="0sb072ssg5q3kncb3b1a0nrnapjq8rly0ibh3gdrld9fdbdbjx68"; depends=[TraMineR RColorBrewer combinat survival]; }; +TrackReconstruction = derive { name="TrackReconstruction"; version="1.1"; sha256="1f2l3nshb6qrhyczw5rxqqzmsjxf0rvv3y78j8d9lv1nnd9kxzq5"; depends=[fields RColorBrewer]; }; +TreatmentSelection = derive { name="TreatmentSelection"; version="1.1.2"; sha256="1mvrb72yz51gmwqlfg5gsjbi65lqk5j24agddw1br53ymdvjgzq4"; depends=[ggplot2]; }; +TreePar = derive { name="TreePar"; version="3.2"; sha256="0q0cp6bci5facawwi9xvmgbqq80cdmxhai3f0bs2q1s0gzsq91y7"; depends=[ape Matrix subplex TreeSim deSolve]; }; +TreeSim = derive { name="TreeSim"; version="2.1"; sha256="01izfzlvrak65mzwpz4bn5cansw10fvfjfvj164f5g0qghg9v84n"; depends=[ape geiger laser]; }; +TreeSimGM = derive { name="TreeSimGM"; version="1.2"; sha256="0y6hadwx3apw11jy5d4al3dav3his8b4xvkv7s5d5rd92l7yrw0r"; depends=[TreeSim]; }; +TriMatch = derive { name="TriMatch"; version="0.9.1"; sha256="1207lnysdjd347m1lsbxy19lq73bjs1irqwk94y8idp1pcj4pfpd"; depends=[ggplot2 scales reshape2 ez psych PSAgraphics]; }; +TrialSize = derive { name="TrialSize"; version="1.3"; sha256="1hikhw2l7d3c7cg4p7zzrgdwhy9g4rv06znpw5mc6kwinyakp75q"; depends=[]; }; +TripleR = derive { name="TripleR"; version="1.4"; sha256="1hzfdip9n390cizk329k6bdpz1vkxj76khc8lxm0yx9jbc50ng6d"; depends=[ggplot2 reshape2 plyr]; }; +Tsphere = derive { name="Tsphere"; version="1.0"; sha256="0xgxw2hfj40k5s0b54dcmz7savl8wy4midmmgc7lq4pyb8vd58xx"; depends=[glasso rms]; }; +TukeyC = derive { name="TukeyC"; version="1.1-5"; sha256="08s9scsd2l6wavc7qqlffjbf89vkd6xpb4iawvbqf7jh8jiyvw17"; depends=[]; }; +TunePareto = derive { name="TunePareto"; version="2.4"; sha256="0pljl3q5s9yqc4ph70y66ff9ci9w8gwj8jsy8srxqkgqvahc8arf"; depends=[]; }; +TurtleGraphics = derive { name="TurtleGraphics"; version="1.0-5"; sha256="18azwbvs3cv3arp6zhh5bklf7n04p13jpfjh44nxv5159jry7arr"; depends=[]; }; +TwoCop = derive { name="TwoCop"; version="1.0"; sha256="1ycxq8vbp68z82r2dfg2wkc9zk3bn33d94xay20g2p55lnzl2ifd"; depends=[]; }; +TwoStepCLogit = derive { name="TwoStepCLogit"; version="1.2.3"; sha256="0arqpfflflsydsgcrpq364vqf4sn019m03ygmpq810wa78v4r9s0"; depends=[survival]; }; +UPMASK = derive { name="UPMASK"; version="1.0"; sha256="19krsqkz2g5b6svqp29s6i92bhlk7liv8lf7d03za848w7y2jkhq"; depends=[MASS RSQLite DBI]; }; +USAboundaries = derive { name="USAboundaries"; version="0.1"; sha256="0q45j80gjinbmqihbs5b5y1hhm4hmjwd0sl47ib2pi4r0qlkyn7b"; depends=[assertthat dplyr ggplot2 lubridate maptools rgeos sp]; }; +UScancer = derive { name="UScancer"; version="0.1-2"; sha256="0p1kxw1phqq598ljk3njznc9kmgscc8gmwdrvx1scba9rr6n61kl"; depends=[rgdal]; }; +UScensus2000blkgrp = derive { name="UScensus2000blkgrp"; version="0.03"; sha256="196hpqrc3rq0m6ra6qinlhz1yknplx08pfp57l6yalni26c8pia0"; depends=[maptools sp foreign]; }; +UScensus2000cdp = derive { name="UScensus2000cdp"; version="0.03"; sha256="143hqnzdla3p31n422ddzaaa34wc6xnnhil4y53m4qydyg407700"; depends=[maptools sp foreign]; }; +UScensus2000tract = derive { name="UScensus2000tract"; version="0.03"; sha256="11ppw75k8zghj7xphx5xyl3azsdsyd142avp0la2g941w6f8l2n1"; depends=[maptools sp foreign]; }; +UScensus2010 = derive { name="UScensus2010"; version="0.11"; sha256="1q06spkh8f4ijvfg557rl3176ki4i8a1y39cyqm3v7mnzwckyj3l"; depends=[maptools sp foreign]; }; +UWHAM = derive { name="UWHAM"; version="1.0"; sha256="1qaj8anaxqnx4nc6vvzda9hhhzqk9qp8q7bxm26qgia4hgascnrv"; depends=[trust]; }; +Unicode = derive { name="Unicode"; version="0.1-4"; sha256="0ja0l8b95r2wgybbrpbdbbfjzdq2ns0kcvffv47sq29m516dasyh"; depends=[]; }; +UsingR = derive { name="UsingR"; version="2.0-2"; sha256="0qn993bb890ihgvq7kddac6xgfgfai30x62ip0048ymnvcmvjfhf"; depends=[MASS HistData Hmisc quantreg]; }; +VAR_etp = derive { name="VAR.etp"; version="0.6"; sha256="1qdv69f24n8ww2cnbxy62sqlgwlfxivbmsp6hxxfw8jcbzpc5qj7"; depends=[]; }; +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-5"; sha256="1xf0n34rljxyf2c1rvfvjb8nnq9b64792x9x6dyngkddx7jhk5ng"; 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=[]; }; +VIM = derive { name="VIM"; version="4.1.0"; sha256="15nmywg8mhknvivg9bfszif2allim5vf1hjfbfyl053jphjpax26"; depends=[colorspace data_table car robustbase sp vcd MASS nnet e1071 Rcpp Rcpp]; }; +VIMGUI = derive { name="VIMGUI"; version="0.9.0"; sha256="195lakyik597sjkq6c5v3881p35111gzmj2r5f5nr53vi6bn4pzm"; depends=[tkrplot VIM survey gWidgetsRGtk2 foreign RGtk2 Cairo Hmisc]; }; +VLF = derive { name="VLF"; version="1.0"; sha256="1il8zhm80mc22zj16dpsy4s6s9arj21l9ik0vccyrpnlr8ws3d3l"; depends=[]; }; +VLMC = derive { name="VLMC"; version="1.4-0"; sha256="0ifrmwq095xpmn3r303l3b9z31fri224nk3jn7aim6chcjmy1r71"; depends=[MASS]; }; +VNM = derive { name="VNM"; version="2.0"; sha256="0qgr8n7h938dlsirwgcisl79jk8qxbac8nbl0p38kckfgwfsj06c"; depends=[]; }; +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="01jv5qrfw8y8yyd3jy3058bpnfyzz7d0m4rx0iibs79gv2rvq5sn"; depends=[DistributionUtils GeneralizedHyperbolic RUnit]; }; +VdgRsm = derive { name="VdgRsm"; version="1.02"; sha256="1fbm7d4wkc4awn91vh1lf02bic9sk433fx7qmwxlmh3g05k9fvak"; depends=[permute AlgDesign]; }; +Vdgraph = derive { name="Vdgraph"; version="2.2-1"; sha256="1bbx6ab6868dn0pbhvixcvmk79h1pa6azqqr100cdljxgcnygi79"; depends=[]; }; +VecStatGraphs2D = derive { name="VecStatGraphs2D"; version="1.7"; sha256="08f9ixpiq8s5h8h608wrs9l16xk3c1xcrvwgvm5wqm6xfkj9gpfd"; depends=[MASS]; }; +VecStatGraphs3D = derive { name="VecStatGraphs3D"; version="1.6"; sha256="1pnpgnxdiis4kzwhh17k61aidyan5fp9rzqhvwf6gljb4csqsk54"; depends=[rgl misc3d MASS]; }; +VennDiagram = derive { name="VennDiagram"; version="1.6.9"; sha256="0sxgspqsn15y3pipd9wy4wh2n5rkb9bazqkfwkf88p483azpjxw9"; depends=[]; }; +VideoComparison = derive { name="VideoComparison"; version="0.11"; sha256="04jc9br4ddck2sh9bhy02jx34cqxvh904lr46sid6dnmaqfn80l7"; depends=[RJSONIO RCurl zoo pracma Rcpp Rcpp]; }; +VineCopula = derive { name="VineCopula"; version="1.3"; sha256="1vxm7bk7p452p4kbm5q3ricxcd4f74zzlibxx13wj0cbza5p49nl"; depends=[MASS mvtnorm igraph copula]; }; +VisuClust = derive { name="VisuClust"; version="1.1"; sha256="02jb8kg7bxakcn76zyl68z5ab2c9s2cdz3prrgzh95rf9k893sbc"; depends=[aplpack]; }; +VizOR = derive { name="VizOR"; version="0.7-9"; sha256="1xw06y86nsrwpri6asrwh8kccjsqzzidgbpld6d6l7vrglp8m6sr"; depends=[lattice rms]; }; +Voss = derive { name="Voss"; version="0.1-4"; sha256="056izh1j26vqjhjh01fr7nwiz1l6vwr5z4fll87w99nc5wc4a467"; depends=[fields]; }; +VoxR = derive { name="VoxR"; version="0.5.1"; sha256="07lsp6lrkq0gv55m84dl9w7gz5246d9avypqnkz96n3rbbgd0w5z"; depends=[]; }; +W2CWM2C = derive { name="W2CWM2C"; version="1.0"; sha256="14q1y4vpmrx8qz5nav8bbjkxqsqk646zcwr8h7yzi7cfa85b4cxz"; depends=[waveslim wavemulcor]; }; +W3CMarkupValidator = derive { name="W3CMarkupValidator"; version="0.1-1"; sha256="1bxgsm6yl62adp3apvkihvvw40130z5ki49gnriv3syaw2bgwa0r"; depends=[XML RCurl]; }; +WARN = derive { name="WARN"; version="1.1"; sha256="0rnzsc8vbm116g4cwdivmxqv1zyg4givjrrlahvbf4xl5pbryg6d"; depends=[MASS]; }; +WCQ = derive { name="WCQ"; version="0.2"; sha256="1yhkr2iazd7lh9r68xz1lh32z6r1sdnmqrjshcrm4rbwai0j3lkr"; depends=[]; }; +WDI = derive { name="WDI"; version="2.4"; sha256="0ih6d9znq6b2prb4nvq5ypyjv1kpi1vylm3zvmkdjvx95z1qsinf"; depends=[RJSONIO]; }; +WGCNA = derive { name="WGCNA"; version="1.41-1"; sha256="0ljqlxrkfxqb7fjdapfx9wrr7115z9rh7lms07vc94z3k1y2qdlw"; depends=[dynamicTreeCut flashClust matrixStats Hmisc foreach doParallel reshape]; }; +WMCapacity = derive { name="WMCapacity"; version="0.9.6.6"; sha256="19x6l06srh59q1cnixisa5fgm5hkpq35h9zfmdnfaj3xl8pxhzyn"; depends=[gtools gWidgets gWidgetsRGtk2 coda cairoDevice RGtk2 XML]; }; +WMDB = derive { name="WMDB"; version="1.0"; sha256="10wdjy3g2qg975yf1dhy09w9b8rs3w6iszhbzqx9igfqvi8isrr1"; depends=[]; }; +WRS2 = derive { name="WRS2"; version="0.2-0"; sha256="0ci1a93z25rymy9fs4by9qbbkx6nn3iwzvkwsap3bm7gg7g6dpb2"; depends=[MASS reshape]; }; +WWGbook = derive { name="WWGbook"; version="1.0.1"; sha256="0q8lnd1fp4rmz715x0lf61py3xw8wg55yq3gvswaqwy68dlqrzjc"; depends=[]; }; +Watersheds = derive { name="Watersheds"; version="1.0"; sha256="11hrprl8ldbgk1j1f8z4cb327c8d94x1fc29dpacqck48gdb4wmp"; depends=[sp maptools rgeos lattice splancs]; }; +Wats = derive { name="Wats"; version="0.2-16"; sha256="1wbyyllmjsmh8wb8npzizlfn3hsvfpqp9p3b5wx3zpsavqw839wy"; depends=[colorspace ggplot2 lubridate plyr RColorBrewer testit zoo]; }; +WaveCD = derive { name="WaveCD"; version="1.0"; sha256="0gracn8lknw96nnir1m8fg5va3f45vvbiy69rxx8vibnfdg1q3l9"; depends=[waveslim lattice]; }; +WeightedCluster = derive { name="WeightedCluster"; version="1.2"; sha256="1d0df284fzfa34fi7b3d7f4zzm9ppyah46rj865446l5pjvl9np3"; depends=[TraMineR cluster RColorBrewer]; }; +WeightedPortTest = derive { name="WeightedPortTest"; version="1.0"; sha256="007v3w9ssiv2sds7sikpal27g6pxwxhs7bvcyw6kr0vg8gvlbi8h"; depends=[]; }; +WhatIf = derive { name="WhatIf"; version="1.5-6"; sha256="02lqvirnf24jn8b2s08z5fjmpilp2z08lww1s793n3pn783adbky"; depends=[lpSolve]; }; +WhiteStripe = derive { name="WhiteStripe"; version="1.0"; sha256="0j8f10dwc14a0yfnjw73i6mrh0y9iyjbxmhklz2hlxv1k53pppbg"; depends=[oro_nifti mgcv fslr]; }; +WhopGenome = derive { name="WhopGenome"; version="0.9.0"; sha256="0h750i3zpy1jff1qnp3aqyaf7z2kqi8zbdd2jgn1vcsg5y07nywd"; depends=[]; }; +WideLM = derive { name="WideLM"; version="0.1-1"; sha256="0spxl960pgzh0cn1gkw2ayixpi982rr85qajcdqahmn9msk877h8"; depends=[Rcpp Rcpp]; }; +WikipediR = derive { name="WikipediR"; version="1.0.1"; sha256="154yj5syxgjlxbaxigj50w991if67hp1lbsa8mj322bvglhsgb5c"; depends=[httr jsonlite]; }; +WilcoxCV = derive { name="WilcoxCV"; version="1.0-2"; sha256="1kbb7ikgnlxybmvqrbn4cd8xnqrkwipk4xd6yja1xsi39a109xzl"; depends=[]; }; +WordPools = derive { name="WordPools"; version="1.0-2"; sha256="1izs4cymf2xy1lax85rvsgsgi05ygf0ibi9gzxc96sbgvy4m78kf"; depends=[]; }; +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.13"; sha256="0q124rpvnac1kf87s04mip2imlvjhz6m8bawssvabf7ypn71sqna"; depends=[Rcpp Rcpp]; }; +XLConnect = derive { name="XLConnect"; version="0.2-9"; sha256="1lbbvl4jx42cvc8paswc6p8vf8aqqhf3v52a9fhpv79lcizch558"; 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]; }; +XNomial = derive { name="XNomial"; version="1.0.1"; sha256="134bwglqhgah7v3w6ir65dch2dwp5h4vldw521ba74l5v9b2j2h4"; depends=[]; }; +XiMpLe = derive { name="XiMpLe"; version="0.03-21"; sha256="1j387jzxh0z9dmhvc0kpjjjzf781sgrw57nwzdqwx6bn09bw509d"; depends=[]; }; +Xmisc = derive { name="Xmisc"; version="0.2.1"; sha256="11gwlcyxhz1p50m68cnqrxmisdk99v8vrsbvyr7k67f0kvsznzs1"; depends=[]; }; +YPmodel = derive { name="YPmodel"; version="1.1"; sha256="036f5y8qrcxglblgnaa15xzlz9pxbhbysrbr2gl66h9dvcd6kavr"; depends=[]; }; +YaleToolkit = derive { name="YaleToolkit"; version="4.1"; sha256="1r1vf0gldvcfqa7ln87q5d4sc75d8b99v6zaynvbq02rggzzynmy"; depends=[lattice vcd MASS colorspace barcode gpairs]; }; +YieldCurve = derive { name="YieldCurve"; version="4.1"; sha256="0w47j8v2lvarrclnixwzaq98nv1xh2m48q5xvnmk7j9nsv2l3p68"; depends=[xts]; }; +YourCast = derive { name="YourCast"; version="1.6.2"; sha256="0vl37svwky6j1am235ac2wk1fdmh509w0h4m7y93lpjhzj6m8c1p"; depends=[ggplot2 gridExtra lattice foreign reshape2]; }; +YplantQMC = derive { name="YplantQMC"; version="0.5"; sha256="0x3ndpamj1ayy1svh9q8pwmfnar9zyw5i6h1k1hqwc92h0k6jsmz"; depends=[rgl geometry LeafAngle devtools]; }; +YuGene = derive { name="YuGene"; version="1.1.2"; sha256="0sy0bh49l0fajh1z88mpb4f0k3hsf3kd1vxv731qhpxcrc3pz09b"; depends=[mixOmics]; }; +ZIM = derive { name="ZIM"; version="1.0.2"; sha256="1n4dc0as011gzaac153zq1dfbg1axvmf9znlmhl7xjj4dz4966qm"; depends=[MASS]; }; +ZeBook = derive { name="ZeBook"; version="0.5"; sha256="1djwda6hzx6kpf4dbmw0fkfq39fqh80aa3q9c6p41qxzcpim27dw"; depends=[triangle deSolve]; }; +Zelig = derive { name="Zelig"; version="4.2-1"; sha256="1hhr9jx25fdnkqwyj2bkgrvqlah4z2drphmb5mdn1an2p2g23v9z"; depends=[boot MASS sandwich]; }; +ZeligChoice = derive { name="ZeligChoice"; version="0.8-1"; sha256="1ql9yq83ipf0vpv63fpckylwq4jrcbfjgjm77f5ndkd83gqjzrmg"; depends=[Zelig VGAM]; }; +ZeligGAM = derive { name="ZeligGAM"; version="0.7-1"; sha256="1643ycx51mnlxwiarfkrwm8gr8clx00xi2llcaqsd3wsrr4z5j97"; depends=[Zelig mgcv]; }; +ZeligMultilevel = derive { name="ZeligMultilevel"; version="0.7-1"; sha256="00zlambykds4z1c5kx3rpla1kllyp96cxwvbc5lalwdb9i48pp3s"; depends=[Zelig lme4]; }; +aCRM = derive { name="aCRM"; version="0.1.1"; sha256="0kzp568hd9c9a9qgniia5s5gv0q5f89xfvvwpzb197gqhs3x092v"; depends=[dummies randomForest kernelFactory ada]; }; +aLFQ = derive { name="aLFQ"; version="1.3.2"; sha256="1963np2b2x7gbpgwcx0rqxd2psfdfmh72ap1y4p7f37ibjm8g45m"; depends=[data_table plyr caret seqinr lattice randomForest ROCR reshape2 protiq]; }; +aRpsDCA = derive { name="aRpsDCA"; version="1.0.0"; sha256="035888scbl5333sz25f9n6xh1zis7l2752p4nhsbs2g44q38l9h6"; depends=[]; }; +aRxiv = derive { name="aRxiv"; version="0.5.5"; sha256="0szh69nllc12r0lfgx5g9jgb634cld223xzhfb8rnyk0rvx1bia2"; depends=[httr XML]; }; +abc = derive { name="abc"; version="2.0"; sha256="0fs6hxyk95c61mn3p642xs3ib9wfjii2v9a74pf488iaywc1kd7d"; depends=[nnet quantreg MASS locfit]; }; +abcdeFBA = derive { name="abcdeFBA"; version="0.4"; sha256="1rxjripy8v6bxi25vdfjnbk24zkmf752qbl73cin6nvnqflwxkx4"; depends=[Rglpk rgl corrplot lattice]; }; +abctools = derive { name="abctools"; version="0.3-2"; sha256="0l5gxrkxiq3ri9iqgy0swc8910c84zkskcr0lc57l3y0dmf90r7q"; depends=[abc abind pls plyr]; }; +abd = derive { name="abd"; version="0.2-6"; sha256="0nlqgjmzpn715kg7pb4zz3rcrf11zd4inj7gam8mr8faf4b5qq2w"; depends=[nlme lattice mosaic]; }; +abf2 = derive { name="abf2"; version="0.7-0"; sha256="0ybl7w8sjfghy8svbxj01q5ldfi05g1r24q9ah1nfca8xzby410n"; depends=[]; }; +abind = derive { name="abind"; version="1.4-0"; sha256="0s7m7wv23z485fc0nb61svcszx0skxl3m8kiilrj506ndazk95hv"; depends=[]; }; +abn = derive { name="abn"; version="0.83"; sha256="12nhk7hb26285pyyppl5289m7y8zvssnriyj84hlnz0ykar66mpi"; depends=[]; }; +abundant = derive { name="abundant"; version="1.0"; sha256="0n2yvq057vq5idi7mynnp15cbsijyyipgbl4p7rqfbbgpk5hy3qb"; depends=[QUIC]; }; +accelerometry = derive { name="accelerometry"; version="2.2.3"; sha256="0vjaf09vii7j5sw21mz59yj2z44x56xijibx2idk6ix0hclqj0lh"; depends=[Rcpp Rcpp]; }; +accrual = derive { name="accrual"; version="1.0"; sha256="0gw418i9nlrm7nkg6d4m2icd4a04a7avqfjj7nidhl6vy4nflg3k"; depends=[fgui SMPracticals]; }; +accrued = derive { name="accrued"; version="1.2"; sha256="0xkar6kpxf7sq36xqf6cvns2sp5qgqxqjb8hindp59gvlcd2r5a7"; depends=[]; }; +acepack = derive { name="acepack"; version="1.3-3.3"; sha256="13ry3vyys12iplb14jfhmkrl9g5fxg3iijiggq4s4zb5m5436b1y"; depends=[]; }; +acm4r = derive { name="acm4r"; version="1.0"; sha256="1wqzc35i1rshx0zlmas8y4qkkvy6h9r4i4apscjjv1xg2wjflzxa"; depends=[MASS]; }; +acnr = derive { name="acnr"; version="0.2.4"; sha256="1nry927zqhb34h9lcixr344n3sxvq1142zwgj8hadlw69dv8m59y"; depends=[R_utils xtable]; }; +acopula = derive { name="acopula"; version="0.9.2"; sha256="1z8bs4abbfsdxfpbczdrf1ma84bmh7akwx2ki9070zavrhbf00cf"; depends=[]; }; +acp = derive { name="acp"; version="1.0"; sha256="1i7ryk2scsvck5rg8gglfvqrkzbpn505g7cr7slxykp8wkyhwplm"; depends=[tseries]; }; +acs = derive { name="acs"; version="1.2"; sha256="1vw4ghqcz53m3qy7hy2j7nrdinbbqjpwvr1hsvglq31fq7wss3bd"; depends=[stringr plyr XML]; }; +acss = derive { name="acss"; version="0.2-5"; sha256="0cqa60544f58l5qd7h6xmsir40b9hqnq6pqgd5hfx2j2l5n7qhmk"; depends=[acss_data zoo]; }; +acss_data = derive { name="acss.data"; version="1.0"; sha256="09kl4179ipr8bq19g89xcdi1xxs397zcx5cvgp6viy8gn687ilgv"; depends=[]; }; +activity = derive { name="activity"; version="1.0"; sha256="1y1vy3kj9n21jvbyl3s5hllfkqp3z1rnn7701c5jxhay5dbdz3p2"; depends=[circular overlap pbapply]; }; +actuar = derive { name="actuar"; version="1.1-6"; sha256="0f0zvk4a3rni656jfml2nqb3h3amks3g4aczp8j2x01ywwmazqr9"; depends=[]; }; +ada = derive { name="ada"; version="2.0-3"; sha256="1c0nj9k628bcl4r8j0rmyp5f1igdjq6qhjxyif6575fvn2gdzmbw"; depends=[rpart]; }; +adabag = derive { name="adabag"; version="3.2"; sha256="1ijr5i5p8sf2cq7cgiwh0qk3c4wxagk6r06a2vrjy76d262m1060"; depends=[rpart mlbench caret]; }; +adagio = derive { name="adagio"; version="0.5.9"; sha256="1yp9w557advb7dzrdqwkffpdmhn6mk4879lrrjd0d6kv89fwz5yr"; depends=[]; }; +adaptDA = derive { name="adaptDA"; version="1.0"; sha256="0nk7n628d30jz03a2rmpgzrwwd79rlpqvr6lwhilmkg1gblvz7r1"; depends=[MASS]; }; +adaptMCMC = derive { name="adaptMCMC"; version="1.1"; sha256="1y1qxn3qm59nyy9ld5x30p452yam7b2fyl236b14xvpm8g3xx1fa"; depends=[coda Matrix]; }; +adaptTest = derive { name="adaptTest"; version="1.0"; sha256="08d7a5dlzhaj236jvaw3c91008l66vf5i4k5anhcs32a3j8yh2iv"; depends=[lattice]; }; +adaptivetau = derive { name="adaptivetau"; version="2.2"; sha256="1xqvbbdmn70fmycpn0680q1l9s34kcmkjl812d7yrfxwm1bjfif5"; depends=[]; }; +adaptsmoFMRI = derive { name="adaptsmoFMRI"; version="1.1"; sha256="1h79gh1bd6s2xhwf4whh72wf2cz4di2p8dnlf6192mfg108qc6nw"; depends=[Matrix coda mvtnorm MCMCpack spatstat]; }; +additivityTests = derive { name="additivityTests"; version="1.1-2"; sha256="0ijk91whhsb7nm1ax9wpfw9qgxfb1bvg2cq939m81gvk09kzrvgz"; depends=[]; }; +addreg = derive { name="addreg"; version="1.2"; sha256="1xgf9q0z3prvchyba1vaai6ij72nzvj2dqyr6y2wzb96jfqv19kl"; depends=[combinat glm2]; }; +ade4 = derive { name="ade4"; version="1.6-2"; sha256="0h136nhfqrapwscm3c7frlcynrfxb9x8gmd1s44gaa8m25rjgdqf"; depends=[]; }; +ade4TkGUI = derive { name="ade4TkGUI"; version="0.2-6"; sha256="010ggsxcmljh0cdba4lcfnsd9r49pwqs6kbw88syfn2qv65hh5kq"; depends=[ade4]; }; +adegenet = derive { name="adegenet"; version="1.4-2"; sha256="13fglxy40rnwi5hsmmvwlfcvfn8dybxyy3k5qhpml8jgpbl3fsdb"; depends=[ade4 MASS igraph ape shiny ggplot2]; }; +adehabitat = derive { name="adehabitat"; version="1.8.14"; sha256="048jp9408x80akfnxqpyhhlzl2f89axsc90vr8cgqkimlg6h6xjh"; depends=[ade4 tkrplot shapefiles sp]; }; +adehabitatHR = derive { name="adehabitatHR"; version="0.4.11"; sha256="1llpmpfax9846v3s2finyq9x97hyi87148jx83phzjl7daag3qn1"; depends=[sp deldir ade4 adehabitatMA adehabitatLT]; }; +adehabitatHS = derive { name="adehabitatHS"; version="0.3.9"; sha256="0jv7470z1m219q5paw8cglx3d5l99iagkpm24v6q0xgdffvcq94l"; depends=[sp ade4 adehabitatMA adehabitatHR]; }; +adehabitatLT = derive { name="adehabitatLT"; version="0.3.16"; sha256="1rav2q1n1ahrj2iik93rqc52c1gcxha5idrh7rfds0qb15jpmsvh"; depends=[sp ade4 adehabitatMA CircStats]; }; +adehabitatMA = derive { name="adehabitatMA"; version="0.3.8"; sha256="1j3ngry7qyhl4p5m02bgdynixb0v9hd5nbjs6ndfqw23layh8yig"; depends=[sp]; }; +adephylo = derive { name="adephylo"; version="1.1-6"; sha256="1sk639gmk3cs711xn68mx18r28kjd1pychcg89qlki03y1hnxg7j"; depends=[ade4 phylobase ape adegenet]; }; +adhoc = derive { name="adhoc"; version="1.0"; sha256="193adddarjkc2kk1xncfkm919s1lkmc1yzgyz9793p74nqmfsj0a"; depends=[spider ape polynom]; }; +adimpro = derive { name="adimpro"; version="0.7.8"; sha256="06zwdgl7g4azg2mn7p35may8hsjcvf2dz7dj86zqngjspda123s4"; depends=[]; }; +adlift = derive { name="adlift"; version="1.3-2"; sha256="0nzg16vhm5qg3xzczi3f6cynvp9ym2jsfrc4fdyxq7bwp9kry2i4"; depends=[EbayesThresh]; }; +ads = derive { name="ads"; version="1.5-2.1"; sha256="1jwgk48qypg36v53kj7wy5rcz059p1qg8awm3nf7xngrb2zff6h3"; depends=[ade4 spatstat]; }; +adwave = derive { name="adwave"; version="1.0"; sha256="10cz870n3az7brmf2658g0jrc1x39c69vw37n99m8x6wxxp6ypn8"; depends=[waveslim]; }; +aemo = derive { name="aemo"; version="0.1.0"; sha256="1iik0rrqkkx9n1qb1pvq5iwxqmvs6vnx8z80hdzb5vqq0lvi1bsx"; depends=[dplyr stringr assertthat lubridate]; }; +afex = derive { name="afex"; version="0.12-135"; sha256="04z5g9jdb913d64y1fdg9xb9znj4476zyj5vjzdg7j69ckmrq5ya"; depends=[car lme4 reshape2 stringr coin Matrix pbkrtest]; }; +aftgee = derive { name="aftgee"; version="1.0-0"; sha256="0gfp05r6xvn9fcysbqyzkz916axpsc2d3lb5wmb1v92z1zw3037b"; depends=[MASS BB survival geepack]; }; +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]; }; +agrmt = derive { name="agrmt"; version="1.35"; sha256="164wj1bnjasc6pscz29v478ap65hjm5whxs2g2x5adghcda698i5"; 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="2011.9-1"; sha256="05c1a8707akwy39n2gjg3ahdp9xdkl18a32wdchw60f0h4ixqfdi"; depends=[numDeriv]; }; +allan = derive { name="allan"; version="1.01"; sha256="02bv9d5ywbq67achfjifb3i7iiaaxa8r9x3qvpri2jl1cxnlf27m"; depends=[biglm]; }; +allanvar = derive { name="allanvar"; version="1.0"; sha256="0wpywdr15gb49m9kxrpjfsxlxrm4hwm46x42k8dgc6sihfsqbm22"; depends=[gplots]; }; +alleHap = derive { name="alleHap"; version="0.7.2"; sha256="1x10grrv732a0iidr2c96vbl46553njhvvlq249jxn3y11lfq2gv"; depends=[gtools]; }; +allelematch = derive { name="allelematch"; version="2.5"; sha256="1kws6y3igq6l85cfjrck2dzcfpgr56ridbc6w071h8kjw19mlzas"; depends=[dynamicTreeCut]; }; +allelic = derive { name="allelic"; version="0.1"; sha256="0xs4kd3vqb5ph8kqc3lcqgirrdkz8b627pvnczvci2g0sr3cl18j"; depends=[]; }; +alm = derive { name="alm"; version="0.3.1"; sha256="02k4jc1s7qc6l3h9s9w7714bh606593mvhsbqk5vm9ga3320m48k"; depends=[ggplot2 plyr stringr reshape reshape2 httr jsonlite lubridate]; }; +alphahull = derive { name="alphahull"; version="1.0"; sha256="0k3n9l4vbvpmdb4m37y1ynsiv27l8b5fmm6l35sazlfbbinhzwc1"; depends=[tripack sgeostat splancs]; }; +alphashape3d = derive { name="alphashape3d"; version="1.1"; sha256="1hfxvzqgirc587vxyggxdqii90nvypzi3wddvd2zdw2h95v9kfyg"; depends=[geometry rgl]; }; +alr3 = derive { name="alr3"; version="2.0.5"; sha256="0zrrsv2kjq3cky3bhk6gp32p1qpr1i5k2lx7c1w08bql0nb1x740"; depends=[car]; }; +alr4 = derive { name="alr4"; version="1.0.5"; sha256="0m8jgc4mfni17psf8m0avf0m364vcq5k3c9x807p98ch2z5nsygv"; depends=[car effects]; }; +amap = derive { name="amap"; version="0.8-12"; sha256="0z7c5lrwqvjcnjm48zq2ifyx089fabvwf1zz17qlxq44i8xzpx8j"; depends=[]; }; +amei = derive { name="amei"; version="1.0-7"; sha256="0dyx6a1y5i0abwka0y89d0mpj55rm5ywb4r9c2mqmy43djp181hn"; depends=[]; }; +amen = derive { name="amen"; version="0.999"; sha256="1p9ma31bzrxylcgi43nk44bq0cg4xgk9fzmxw2dpqz33x4xlrfiq"; 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]; }; +analogueExtra = derive { name="analogueExtra"; version="0.1-0"; sha256="0hyl0vn2i594r5czzha7y9a1n4dpznfpmh2j46mci2r57p2s3qr2"; depends=[vegan3d analogue rgl]; }; +anametrix = derive { name="anametrix"; version="1.6"; sha256="14xrrnvz7jn1jqds48l5pvzlx6hsaxrjc932lqnvv70sfypinjkm"; depends=[RCurl XML pastecs]; }; +anapuce = derive { name="anapuce"; version="2.2"; sha256="0qs27as628090k3sq5b14l90g7qdp23d0jz5lb1wxsgi3ji0f7qj"; depends=[]; }; +anchors = derive { name="anchors"; version="3.0-8"; sha256="12gd2526y7s2a8i6b9xma2c3sc6zxnwzl6sn8b50hbxizwr8d34j"; depends=[rgenoud MASS]; }; +andrews = derive { name="andrews"; version="1.0"; sha256="130i86qkdy1xpcf611jpzqgmd17iik7j7spdcfwzk48f31biyp8v"; depends=[]; }; +anesrake = derive { name="anesrake"; version="0.70"; sha256="17127rmjfrdwnr2m6205cci3b0kd9girp82qranxwac4mgb7p7ld"; depends=[Hmisc]; }; +anim_plots = derive { name="anim.plots"; version="0.1"; sha256="0qjwmxpkvjf27parh1fvhrkiczm4zlv9c034dp04yysbdz65r1by"; depends=[animation]; }; +animalTrack = derive { name="animalTrack"; version="1.0.0"; sha256="0jlvfflpaq64s48sblzh1n1vx8g3870iss97whigri29s6hn79ry"; depends=[rgl]; }; +animation = derive { name="animation"; version="2.3"; sha256="1hqgkaxmyyfrx7cfzv00010r9l2n8gxm35jd41p3kc208mhd7ssp"; depends=[]; }; +anominate = derive { name="anominate"; version="0.5"; sha256="0qhq3ngxi1d3yln6bafg3c36a7whnznnww0101da2y0i6dw79lg5"; depends=[coda wnominate oc pscl MCMCpack]; }; +antitrust = derive { name="antitrust"; version="0.94"; sha256="1k768lmx5vv069bd9fzly1205rxr9mkqi1p8jjx67kwmyhhw5sd2"; depends=[MASS evd BB numDeriv ggplot2]; }; +aod = derive { name="aod"; version="1.3"; sha256="1a6xs5d5289w69xd2salsxwikjjhjzvsnplqrq78b1sr6kzfyxz3"; depends=[]; }; +aods3 = derive { name="aods3"; version="0.4-1"; sha256="074c16wmgd1vc2yvwx1y84bg55hvmm5yi8zgpwh51jcsbqlhbpgn"; depends=[lme4 boot]; }; +aoos = derive { name="aoos"; version="0.0.3"; sha256="0fyvw05pq9l6n0ywmpr4a2hkf9zh8krchyxl2279ims8rz79432a"; depends=[]; }; +aoristic = derive { name="aoristic"; version="0.5"; sha256="0hvq6qf5ib7x7c7jg9qbsglhazvbr5rkhfi1r43h4i2fhdvymhrn"; depends=[ggplot2 spatstat GISTools lubridate classInt reshape2 rgdal plotKML]; }; +apTreeshape = derive { name="apTreeshape"; version="1.4-5"; sha256="0mvnjchhfbpbnrgnplb6qxa7r2kkvw29gqiprwggkf553wi6zl48"; depends=[ape quantreg]; }; +apc = derive { name="apc"; version="1.0"; sha256="1fhw6cjcqcjwsjswhgm7rgwn3m3d9lkb9mk6cxh04jk3x2j9l3az"; depends=[]; }; +apcluster = derive { name="apcluster"; version="1.3.5"; sha256="1hckvir43s0jshn9kiwqmpsnav04lxv060l6xlf60a8yk5zf1cqs"; depends=[Rcpp Rcpp]; }; +ape = derive { name="ape"; version="3.1-4"; sha256="04vkzbqjy89vs2n421ji2r4p60x5frjnlgpjp42k9n5x295hb89s"; depends=[nlme lattice]; }; +aplpack = derive { name="aplpack"; version="1.3.0"; sha256="0i6jy6aygkqk5gagngdw9h9l579lf0qkiy5v8scq5c015w000aaq"; depends=[]; }; +apmsWAPP = derive { name="apmsWAPP"; version="1.0"; sha256="1azgif06dsbadwlvv9nqs8vwixp6balrrbpj62khzmv1jvqr4072"; depends=[seqinr gtools]; }; +appell = derive { name="appell"; version="0.0-4"; sha256="0g7pzhxqgscnyf07xycbrpyimp1z1hljgcr3nqigpx09w7zi5wlw"; depends=[]; }; +apple = derive { name="apple"; version="0.3"; sha256="194z2f6hwdjjxdkjwlmfhpfp26p9yp3gparklhdbb6zlb4a9nnhz"; depends=[MASS]; }; +approximator = derive { name="approximator"; version="1.2-6"; sha256="165qvx5946wkv1qsgbmjhmwvik7m23r1vbpnp7claylflgj1ycnm"; depends=[emulator]; }; +aprof = derive { name="aprof"; version="0.2.4"; sha256="0gw5qj6c5ygjc6nwx2lb8biykkk73fv2x3j1xxabpgnsfq1whwyc"; depends=[]; }; +apsimr = derive { name="apsimr"; version="0.1"; sha256="03j1g16drch5xkxb86czxmihs9a96f0v2kxjp73k7vig9md625dy"; depends=[ggplot2 XML lubridate reshape2]; }; +apsrtable = derive { name="apsrtable"; version="0.8-8"; sha256="1qmm89npjgqij0bh6p393wywl837lfsshp2mv9b5izh1sg2qfwvw"; depends=[]; }; +apt = derive { name="apt"; version="2.3"; sha256="0yrgxdqzwa5zv6rv8d8nnlraxngq60i1f0yrkygwsj4kngv2yhyv"; depends=[erer gWidgets car urca copula]; }; +aqfig = derive { name="aqfig"; version="0.8"; sha256="0ha0jb5ag3zx6v7c63lsm81snslzb8y8g565mxjmf7vxpcmzzqsi"; depends=[geoR]; }; +aqp = derive { name="aqp"; version="1.7-7"; sha256="0gdaxxifcvr40j6y7db24dzla31linhh39w8830sj1k22y9sa4dp"; depends=[plyr reshape lattice cluster sp Hmisc stringr scales plotrix RColorBrewer MASS]; }; +aqr = derive { name="aqr"; version="0.4"; sha256="04frgil3nbxsww66r9x0c6f308pzqr1970prp20bdv9qm3ym5axw"; depends=[xts RCurl]; }; +archdata = derive { name="archdata"; version="0.1"; sha256="1k7cpqwgvkwfz25a9db0c8g6ii6xsbhkj3c9alghhaafs7x8n47w"; depends=[]; }; +archetypes = derive { name="archetypes"; version="2.2-0"; sha256="1djzlnl1pjb0ndgpfj905kf9kpgf9yizrcvh4i1p6f043qiy0axf"; depends=[modeltools nnls]; }; +archivist = derive { name="archivist"; version="1.1"; sha256="1vqfpb1g8877zmnj12a1ariglq7w03xpqs63bj429rd9agg66pw2"; depends=[RSQLite DBI lubridate jsonlite 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=[]; }; +argparse = derive { name="argparse"; version="1.0.1"; sha256="03p8dpwc26xz01lfbnmckcx6wzky43dyq71085b0anzsavgx0786"; depends=[proto findpython getopt rjson]; }; +argparser = derive { name="argparser"; version="0.1"; sha256="0x4wm8hjzb779pp39v8q210npg7kzh9m8wwqmd17aaqaa3l2al9f"; depends=[]; }; +arm = derive { name="arm"; version="1.7-07"; sha256="19xshr5r36g9jsyxdm0dihvga89fd080hbhmyhxv1rbv4496jwqa"; depends=[MASS Matrix lme4 abind coda nlme]; }; +arnie = derive { name="arnie"; version="0.1.2"; sha256="14xkgyfn9zvkbgram15w7qzqc5pl1a8ig66cif7a79najrgd914r"; depends=[]; }; +aroma_affymetrix = derive { name="aroma.affymetrix"; version="2.12.0"; sha256="1r3ywi97xqvk6dif7kkc3gqapiydd2sbq0ibxs1qf6s2v236d71r"; depends=[R_utils aroma_core R_methodsS3 R_oo R_cache R_filesets aroma_apd MASS matrixStats]; }; +aroma_apd = derive { name="aroma.apd"; version="0.5.0"; sha256="1pi4k7psrc120r8mn352vg60mjvbnm1f56dm9svfxfyl0qhcfd00"; depends=[R_methodsS3 R_oo R_utils R_huge]; }; +aroma_cn = derive { name="aroma.cn"; version="1.5.0"; sha256="1aih11r3gs969ci5gs7x7z5pia51y75iy559y23cz40q2qsq4ikc"; depends=[R_utils aroma_core R_methodsS3 R_oo R_filesets R_cache matrixStats PSCBS]; }; +aroma_core = derive { name="aroma.core"; version="2.12.1"; sha256="1rg7m9z2j9hn0adj407amyabyh6jhpgip51zd8fb8rplzgbkrm7s"; depends=[R_utils R_filesets R_devices R_methodsS3 R_oo R_cache R_rsp matrixStats RColorBrewer PSCBS]; }; +arrayhelpers = derive { name="arrayhelpers"; version="0.76-20120816"; sha256="1q80dykcbqbcigv2f9xg1brfm3835i0zvs0810q6kh682a3hpqbi"; depends=[]; }; +ars = derive { name="ars"; version="0.4"; sha256="0ynciw8n2jpqi40gsrj189419vgr1lgs9wridh09nj7n451b4kvg"; depends=[]; }; +arules = derive { name="arules"; version="1.1-5"; sha256="0hi3ni9qwrw8abvnvdd77xn9vr4gzfj4fabm2j60zi679zz84ck2"; depends=[Matrix]; }; +arulesNBMiner = derive { name="arulesNBMiner"; version="0.1-4"; sha256="05vj7pzzh84xr6d0m16dhzr7bw50hkiyq99vl46zinak648my338"; depends=[arules rJava]; }; +arulesSequences = derive { name="arulesSequences"; version="0.2-6"; sha256="1fvph6c8dy3hj0h63h85bzzzka8dx0cc0lcncz9svyahy1j4q3z0"; depends=[arules]; }; +arulesViz = derive { name="arulesViz"; version="0.1-9"; sha256="1s1hsf64fg32r3p1h8bvzbpr7a28szdh9hs7ck9qykh2s93xh12z"; depends=[arules scatterplot3d vcd seriation igraph]; }; +asbio = derive { name="asbio"; version="1.1-1"; sha256="13iz795jiplx677y24pwx5ggxbz0b8x7g8khmvvbl05h2rab3pw8"; depends=[scatterplot3d pixmap tkrplot plotrix mvtnorm deSolve lattice multcompView]; }; +ascii = derive { name="ascii"; version="2.1"; sha256="19dfbp7k4bjxjn8wdzhbmz7g3za6gn8vcnd5qkm4dz7gg1fg7b8p"; depends=[]; }; +ascrda = derive { name="ascrda"; version="1.15"; sha256="17anzlhcjmrk13s5gs752rsc735y5wvba6r3w1nbv0cnkpnyk8i7"; depends=[class nnet rda MASS sfsmisc e1071 pamr]; }; +asd = derive { name="asd"; version="2.0"; sha256="1nnsbh6g0bhvhp6644zf2l6frr3qnls0s7y7r0g211b5zagq20z3"; depends=[mvtnorm]; }; +ash = derive { name="ash"; version="1.0-14"; sha256="15x16ld25i160asqf4z4difa6zn2yfgl04j8y8nqb0djymdx7a1f"; depends=[]; }; +aspace = derive { name="aspace"; version="3.2"; sha256="1g51mrzb6amafky2kg2mx63g6n327f505ndhna6s488xlsr1sl49"; depends=[splancs Hmisc shapefiles]; }; +aspect = derive { name="aspect"; version="1.0-3"; sha256="12wyyr0ms8g3y96jz1x0y52dlma00j20h7hmm8m6y5p1lgk9kmcd"; depends=[]; }; +assertive = derive { name="assertive"; version="0.1-8"; sha256="0j1phpx2w34rdjaar3fqhp0rsvdlidvw2irfazbh9955mdn2cwq1"; depends=[]; }; +assertthat = derive { name="assertthat"; version="0.1"; sha256="0dwsqajyglfscqilj843qfqn1ndbqpswa7b4l1d633qjk9d68qqk"; depends=[]; }; +aster = derive { name="aster"; version="0.8-30"; sha256="0vdlimkkmd9ar5v3xrbi9gshvj980l7641brd7cqs78sqf0v71fn"; depends=[trust]; }; +aster2 = derive { name="aster2"; version="0.1"; sha256="1qbh1l2cnhvdfxaw1bv8cpj96nv03g155b1xh1vdigniwc04mssw"; depends=[]; }; +astro = derive { name="astro"; version="1.2"; sha256="1c7zrycgj2n8gz50m94ys1dspilds91s1b2pwaq6df1va17pznby"; depends=[MASS plotrix]; }; +astroFns = derive { name="astroFns"; version="4.1-0"; sha256="0g5q0y067xf1ah91b4lg8mr9imj0d6lgig7gbj3b69fn335k363g"; depends=[]; }; +astrochron = derive { name="astrochron"; version="0.3.1"; sha256="0anm8k31kgvbdkzid2f9mg7ivdrihwb6g1i82jqpljbwvmkp0fmw"; depends=[baseline multitaper fields]; }; +astrodatR = derive { name="astrodatR"; version="0.1"; sha256="00689px4znwmlp6qbj6z2a51b7ylx1yrrjpv6zjkvrwpv6lyj9fw"; depends=[]; }; +astrolibR = derive { name="astrolibR"; version="0.1"; sha256="0gkgry5aiz29grp9vdq9zgg6ss47ql08nwcmz1pfvd0g0h9h75l8"; depends=[]; }; +astsa = derive { name="astsa"; version="1.3"; sha256="01bslr6hww029097244r5l4bz4v7z46gpihw39har8h0xicl6ywk"; depends=[]; }; +asympTest = derive { name="asympTest"; version="0.1.3"; sha256="11nlkgws3y8xbz3yli55414a2rkk7367q9q5r2ssa61jaiimibhh"; depends=[]; }; +asypow = derive { name="asypow"; version="2013.9-1"; sha256="0zd42ha30kysjhd6rwxr91k1hhsimw3py2inymbpxgyq4s890whs"; depends=[]; }; +atmcmc = derive { name="atmcmc"; version="1.0"; sha256="05k69b5wlysz3kh0yiqvshgvr0nyz34zkvn6bjs30cwz7s9j21pn"; depends=[]; }; +attribrisk = derive { name="attribrisk"; version="0.1"; sha256="1zqx53mxz2hh9jyanf3jkadgpj44jbqrk4p13fas91zvhpw9pn5s"; depends=[survival boot]; }; +audio = derive { name="audio"; version="0.1-5"; sha256="1hv4052n2r6jkzkilhkfsk4dj1xhbgk4bhba2ca9nf8ag92jkqml"; depends=[]; }; +audiolyzR = derive { name="audiolyzR"; version="0.4-9"; sha256="09jsrjy15vcn6da0kgk06ghayyrf3s853gqv8qdawg745ky2hbgi"; depends=[hexbin RJSONIO plotrix]; }; +audit = derive { name="audit"; version="0.1-1"; sha256="0hrcdcwda5c0snskrychiyfjcbnymkcl2x43bapb6inw9y8989qv"; depends=[]; }; +autoencoder = derive { name="autoencoder"; version="1.0"; sha256="18i6b2vjhlq9f82syw3k88gm9bvklv827nflgzq0xzjnzh6z5nr8"; depends=[]; }; +automap = derive { name="automap"; version="1.0-14"; sha256="1190kbmp0x80x0hyifdbblb4ijq79kvrfn9rkp5k6diig4v30n0w"; depends=[sp gstat lattice reshape]; }; +autopls = derive { name="autopls"; version="1.2-7"; sha256="173i1g11waz72myclfdch9v3wsvdr9mdz2gxdqifq9wj50s4zrg4"; depends=[pls]; }; +avgrankoverlap = derive { name="avgrankoverlap"; version="1.0"; sha256="1wyafcygwdk754wp25283nd84lnn9qxha41xij55ylrn4nvg57l1"; depends=[]; }; +aws = derive { name="aws"; version="1.9-4"; sha256="11vbsg4yhnl4995m8gq5gykrlk61y3a618g2zxkc9wdf5z4xqdny"; depends=[awsMethods gsl]; }; +awsMethods = derive { name="awsMethods"; version="1.0-3"; sha256="1r6rbrlc5wbljp2x9aqhhnjblnb3gjm217x0cbmrw1pa0cf7q5jq"; depends=[]; }; +aylmer = derive { name="aylmer"; version="1.0-11"; sha256="1b6dryvfz9yp00nj8lv8j1isnshcgwn9fx41knah9pw7dn4pxkk2"; depends=[Brobdingnag]; }; +b6e6rl = derive { name="b6e6rl"; version="1.1"; sha256="17scdskn677vaxx1h2jypqaffvjgczryplg17nr3wigi1x0cxg7a"; depends=[]; }; +bPeaks = derive { name="bPeaks"; version="1.2"; sha256="1z6jghcmw0lwv17ms7gdp5zzimaawq3ahbwkxa4062g373592smd"; depends=[]; }; +bReeze = derive { name="bReeze"; version="0.4-0"; sha256="1znhmb2inbfv574adhwjwk3qf9kikrxrly4n6sfyim1z6sagnj0z"; depends=[]; }; +babel = derive { name="babel"; version="0.2-6"; sha256="1dsxjnhr0cky7wlzz8pr8rn3cldfcyrh8v6gn2ba4abr0df7i4dd"; depends=[]; }; +babynames = derive { name="babynames"; version="0.1"; sha256="0qq0303mmcnpfy5630d7rqmb8rl36p7hg2z842rzd4lkhy8c2l07"; depends=[]; }; +backtest = derive { name="backtest"; version="0.3-2"; sha256="06q488pynxgis1m6rxc8hgscpy8vimffpi4aamviwb089sjzilnn"; depends=[lattice]; }; +bagRboostR = derive { name="bagRboostR"; version="0.0.2"; sha256="1k9w98p3ad3myzyqhcrc4rsn7196qvhnmk5ddx3fpd1rdvy2dnby"; depends=[randomForest]; }; +bamboo = derive { name="bamboo"; version="0.9.5"; sha256="03aqrwgr77n2kzfnc5scv6n6d4401q9ddnzlki7d6rblilfb2w12"; depends=[rJava jvmr]; }; +bamdit = derive { name="bamdit"; version="1.1-1"; sha256="0f865yfwd2pvbkcx8jm4iyilldmprsgyqnscp1n28rp3sbdii4bl"; depends=[coda rjags]; }; +bams = derive { name="bams"; version="1.6"; sha256="1pplnpilpydxf7gcs87424cajss74q8cr9pyv2biy4pkvfql0nxl"; depends=[]; }; +bandit = derive { name="bandit"; version="0.5.0"; sha256="03mv4vbn9g4mqikd9map33gmw2fl9xvb62p7gpxs1240w5r4w3fp"; depends=[boot gam]; }; +barcode = derive { name="barcode"; version="1.1"; sha256="14zh714cwgq80zspvhw88cs5b82gvz4b6yfbshj9b7x0y2961nxd"; depends=[lattice]; }; +bark = derive { name="bark"; version="0.1-0"; sha256="00sgwr1sfbx0gb2ssbnmbz90mwb40sk3s24asj7lhadwgm150nly"; depends=[]; }; +bartMachine = derive { name="bartMachine"; version="1.0.4"; sha256="0j1yfwpxxins9hgmzbj5z24vbad62hmpbdz2gasfxdpdl78v1xav"; depends=[rJava car randomForest missForest]; }; +base64 = derive { name="base64"; version="1.1"; sha256="1wn3zj1qlgybzid4nr6hvlyqg1rp2dwfh88vxrfby2fy2ba1nl5x"; depends=[]; }; +base64enc = derive { name="base64enc"; version="0.1-2"; sha256="0d2b7vl08abssfwprfiqc0yscb1gz4xlzlwwbf7y9z19wbyxizh5"; depends=[]; }; +baseline = derive { name="baseline"; version="1.1-3"; sha256="1n3g1ads26nq3y31nniirac453pdshzkdfg774w46x83cc5pc0xj"; depends=[SparseM]; }; +basicspace = derive { name="basicspace"; version="0.15"; sha256="11aqrai26kdwszznlhrk52jr19syl549qdq3nspbxcn2mj65f5pw"; depends=[]; }; +batade = derive { name="batade"; version="0.1"; sha256="1lr0j20iydh15l6gbn471vzbwh29n58dlpv9bcx1mnsqqnsgpmal"; depends=[hwriter]; }; +batch = derive { name="batch"; version="1.1-4"; sha256="03v8a1hsjs6nfgmhdsv6fhy3af2vahc67wsk71wrvdxwslmn669q"; depends=[]; }; +batchmeans = derive { name="batchmeans"; version="1.0-1"; sha256="06p51ipc603zqkf7ifv495jxbnqqxzx5h8mnz5l5sz9rq5pixg13"; depends=[]; }; +bayesDem = derive { name="bayesDem"; version="2.4-1"; sha256="0s2dhy8c90smvaxcng6ixhjm7kvwwz2c4lgplynrggrm8rfb19ay"; depends=[gWidgets gWidgetsRGtk2 bayesTFR bayesLife bayesPop RGtk2 wpp2012]; }; +bayesGARCH = derive { name="bayesGARCH"; version="2.0.1"; sha256="1gz18wjikkg3yf71b1g21cx918dyz89f5m295iv8ah807cdx7vjk"; depends=[mvtnorm coda]; }; +bayesGDS = derive { name="bayesGDS"; version="0.6.0"; sha256="17ihpsh7lqjninprfwbx3v2415s27qybr5c2z4ls43slv8zrv8mz"; depends=[Matrix]; }; +bayesLife = derive { name="bayesLife"; version="2.1-3"; sha256="1ashgfzjjnvj8h4896y4maj3gfx9v4fginjli1wdkcgcgi1d6gkr"; depends=[bayesTFR wpp2012 hett car coda]; }; +bayesMCClust = derive { name="bayesMCClust"; version="1.0"; sha256="14cyvcyx3nmkbvsy7n4xjp7zvcgdhy013dv9d72y8j5dvlv82pb4"; depends=[gplots xtable mnormt MASS bayesm boa e1071 gtools]; }; +bayesPop = derive { name="bayesPop"; version="5.2-1"; sha256="15skh0fprvkhgydc320wba9nhb7hzmi7hnwr2iq73vd0by2ibfkb"; depends=[bayesTFR bayesLife abind plyr wpp2012]; }; +bayesQR = derive { name="bayesQR"; version="2.2"; sha256="0w5fg7hdwpgs2dg4vzcdsm60wkxgjxhcssw9jzig5qgdjdkm07nm"; depends=[]; }; +bayesSurv = derive { name="bayesSurv"; version="2.3-1"; sha256="1p3ppvz7qjd0yjnc3k1mrjqa6v00aind613wxg6xhgk5iz0590rg"; depends=[survival coda smoothSurv]; }; +bayesTFR = derive { name="bayesTFR"; version="4.0-11"; sha256="1zvg6jrhrw7smc6gz0nzc5g7jfd8ixb5cn4p9jf6l3wr0gj3hp45"; 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]; }; +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]; }; +bayess = derive { name="bayess"; version="1.4"; sha256="0axipk5hn2hw3g4dfh7y3xa0dxqmi8kqpbr77nl14y7ydpija6xm"; depends=[MASS mnormt gplots combinat]; }; +bayou = derive { name="bayou"; version="1.0.1"; sha256="0l342a4lsn6b18i2kyk2hr50k69bb7jcw8dlnbi96yf1i58qcdri"; depends=[ape geiger phytools coda Rcpp MASS mnormt fitdistrplus denstrip Rcpp RcppArmadillo]; }; +bbefkr = derive { name="bbefkr"; version="4.2"; sha256="1wjx652w3p41sq71a2zdzmb7frjxm6xvcgrc2ark2spwb0lbjjw6"; depends=[]; }; +bbemkr = derive { name="bbemkr"; version="2.0"; sha256="015c57s8mpimm82nddnh382wlkisxgdmc2hvp7k38pcnqxc5gb5q"; depends=[MASS]; }; +bbmle = derive { name="bbmle"; version="1.0.17"; sha256="1j3x2glnn0i0fc0mmafwkkqh1js90g8q7gix2vrhif0pmwinsrak"; depends=[numDeriv lattice MASS]; }; +bbo = derive { name="bbo"; version="0.2"; sha256="19xrbla3bb3csg3gjjrpkgyr379zfwyh293bcrcd6j8rnm6g4i01"; depends=[]; }; +bc3net = derive { name="bc3net"; version="1.0.2"; sha256="0iakqf4apscxb4mb5klj9qklbi25dmdd77la3ads2y882gm2nj0z"; depends=[c3net infotheo igraph Matrix lattice]; }; +bclust = derive { name="bclust"; version="1.4"; sha256="1s04fqff5bw6d5kk0smvach6yq492dv1w0ahh9mrm2jsi2q58h7p"; depends=[]; }; +bcool = derive { name="bcool"; version="1.1"; sha256="03z6wdqpk491gyysbzz1lgfavskmi0j65r3df7baz6lrvzkg30ji"; depends=[MCMCglmm doMPI seqinr]; }; +bcp = derive { name="bcp"; version="3.0.1"; sha256="08sa1az1ljsi00zmj3l7z8p1j5im1w79yjxy8k1p6ba90bck7l4h"; depends=[foreach iterators Rcpp Rcpp]; }; +bcpa = derive { name="bcpa"; version="1.1"; sha256="0rwbd39szp0ar9nli2rswhjiwil31zgl7lnwm9phd0qjv8q0ppar"; depends=[Rcpp plyr Rcpp]; }; +bcpmeta = derive { name="bcpmeta"; version="1.0"; sha256="02fw1qz9cvr7pvmcng7qg7p04wxxpmvb2s8p78f52w4bf694iqhl"; depends=[mvtnorm]; }; +bcrm = derive { name="bcrm"; version="0.4.4"; sha256="0gcigc7505fsk1m70df3n0dz553adkbs8yz2bhskb4qrw4gbmvr7"; depends=[mvtnorm ggplot2]; }; +bcv = derive { name="bcv"; version="1.0"; sha256="053if27miv46mbkni6pcpdpz0l336r5l95k7927dqalnri894xwz"; depends=[]; }; +bda = derive { name="bda"; version="3.2.0-3"; sha256="1725qdlkcf7hfklnksy7jslh66cfm7gsil1xgm2rw8hr6v2l0pmx"; depends=[]; }; +bde = derive { name="bde"; version="1.0"; sha256="19h3dzfa33r178m2q20p3l0ah1i6nrajv0lan0r036kjza3h978i"; depends=[shiny ggplot2]; }; +bdoc = derive { name="bdoc"; version="1.2"; sha256="15d7grc0a1hakkxhgbm2gp0awggzlmsp8zf8abj5bgfih63gcmj2"; depends=[]; }; +bdpv = derive { name="bdpv"; version="1.1"; sha256="0i6wdf27243ch8pn2chqriwxjg3g72wbvzlx52mz4ahw700xjc7n"; depends=[]; }; +bdscale = derive { name="bdscale"; version="1.2"; sha256="0j2h7ainfnh78szp355didbkmcl6d5vz1di8nznjarwxncrbgc6g"; depends=[ggplot2 scales]; }; +bdsmatrix = derive { name="bdsmatrix"; version="1.3-2"; sha256="16qhfwk0r1snm9hg32qwz7hizkpwc32m723hjm23m2026gvz2nwy"; depends=[]; }; +bdvis = derive { name="bdvis"; version="0.1.0"; sha256="1f837i48gmspx9xrnxzsgdbg6ykxmvkp8l20y19yd9iakhv7k3jy"; depends=[maps plotrix sqldf plyr taxize treemap ggplot2]; }; +bdynsys = derive { name="bdynsys"; version="1.2"; sha256="06n4n5yix6yd5180c5y7qdk2p5jpjqiw28147l8fp58zqxvwjrxb"; depends=[plm Formula MASS Hmisc deSolve pracma caTools matrixStats]; }; +beadarrayFilter = derive { name="beadarrayFilter"; version="1.1.0"; sha256="044dq5irc00v2f2gjz0vb69w7q7b84lppc55ganabdv4f0dxdblc"; depends=[RColorBrewer]; }; +beadarrayMSV = derive { name="beadarrayMSV"; version="1.1.0"; sha256="0785vmjsli37hjyppk7hlqmn0b683s1apysx9dghbw4h6rgvr8n9"; depends=[rggobi]; }; +beanplot = derive { name="beanplot"; version="1.2"; sha256="0wmkr704fl8kdxkjwmaxw2a2h5dwzfgsgpncnk2p2wd4768jknj9"; depends=[]; }; +bear = derive { name="bear"; version="2.6.3"; sha256="1w933rb1v4ixgmxpbjxrfwzhiddpr0vxwr3gryl6z6p4wvwdwvp7"; depends=[reshape nlme gdata ICSNP sciplot plotrix ggplot2 png]; }; +beepr = derive { name="beepr"; version="1.1"; sha256="187gww50yc8hzrzwz6j9ib101196g6ci9fx3dqyhg764ydn8if1n"; depends=[stringr audio]; }; +beeswarm = derive { name="beeswarm"; version="0.1.6"; sha256="05n2a1fqmh4m7d0b8vmcprss5ivgb0dlyly07jywj3vrf2z81yhy"; depends=[]; }; +benchden = derive { name="benchden"; version="1.0.5"; sha256="1cwcgcm660k8rc8cpd9sfpzz66r55b4f4hcjc0hznpml35015zla"; depends=[]; }; +benchmark = derive { name="benchmark"; version="0.3-6"; sha256="05rgrjhbvkdv06nzbh0v57b06vdikrqc1d29wirzficxxbjk1hih"; depends=[proto ggplot2 relations psychotools reshape scales plyr]; }; +benford_analysis = derive { name="benford.analysis"; version="0.1.1"; sha256="00ynk1af5nbq8bn8y77sckx4w32g5zxcp06pdpcxwvp38d7hxhvc"; depends=[data_table]; }; +bentcableAR = derive { name="bentcableAR"; version="0.2.3"; sha256="0d20cc3zis3pc3r86z12cwcz013w0mglbg6xgv90wq912jjpkxk9"; depends=[]; }; +ber = derive { name="ber"; version="4.0"; sha256="0gl7rms92qpa5ksn8h3ppykmxk5lzbcs13kf2sjiy0r2535n8ydi"; depends=[MASS]; }; +berryFunctions = derive { name="berryFunctions"; version="1.6"; sha256="0qar3mhplshxhlkci81hgsyfiprnpqmf011hkjvibsqm2s19w3qw"; depends=[]; }; +bestglm = derive { name="bestglm"; version="0.34"; sha256="0b6lj91v0vww0fy50sqdn99izkxqbhv83y3zkyrrpvdzwia4dg9w"; depends=[leaps]; }; +betafam = derive { name="betafam"; version="1.0"; sha256="1nf5509alqnr5qpva36f1wb7rdnc084p170h91jv89xvzsidqxca"; depends=[]; }; +betapart = derive { name="betapart"; version="1.3"; sha256="0h2y2c3q6njzh2rlxh8izgkrq9y7abkbb0b13f2iyj9pnalvdv52"; depends=[ape geometry picante rcdd]; }; +betaper = derive { name="betaper"; version="1.1-0"; sha256="1gr533iw71n2sq8gga9kzlah7k28cnlwxb2yh562gw6mh1axmidm"; depends=[vegan ellipse]; }; +betareg = derive { name="betareg"; version="3.0-5"; sha256="1zpj1x5jvkn7d8jln16vr4xziahng0f54vb4gc4vs03z7c853i4a"; depends=[flexmix Formula lmtest modeltools sandwich]; }; +betategarch = derive { name="betategarch"; version="3.2"; sha256="0x3l1zvdp8r7mam7fvdlh1w3dwpjwj86n0ysfk8g824p4mn2wsgv"; depends=[zoo]; }; +bethel = derive { name="bethel"; version="0.2"; sha256="1zlkw672k1c5px47bpa2vk3w2906vkhvifz20h6xm7s51gmm64i0"; depends=[]; }; +bezier = derive { name="bezier"; version="1.1"; sha256="1bhqf1zbshkf1x8mgqp4mkgdxk9jxi51xj6i47kqkyn9gbdzch0c"; depends=[]; }; +bfa = derive { name="bfa"; version="0.3.1"; sha256="02vnbm77blllb74kll8w1i91k0llk43vq60aqjwpc5kqmzy652pk"; depends=[coda Rcpp RcppArmadillo Rcpp RcppArmadillo]; }; +bfast = derive { name="bfast"; version="1.5.7"; sha256="0n75minka55rxpvs3qkj0c65ydn1gc3i8lkr2gdyn1adjkl5yn01"; depends=[strucchange zoo forecast sp raster]; }; +bfp = derive { name="bfp"; version="0.0-27"; sha256="08hlr33dwwjc4ag8vfsa3w4rcsc2093j8zwb05xkkl5nwqsq3mq0"; depends=[Rcpp Rcpp]; }; +bgeva = derive { name="bgeva"; version="0.2"; sha256="178c2jkg5578mh1yq37713lwfbz98nbsc2p1bmacgmbxbqnkba3x"; depends=[mgcv magic trust]; }; +bglm = derive { name="bglm"; version="1.0"; sha256="1ln5clsfhpzjkm6cjil0lfqg687b0xxbvw1hcvangc0c0s314mrz"; depends=[mvtnorm]; }; +bgmm = derive { name="bgmm"; version="1.6"; sha256="04d06rhb8ax1q4ayl03cw18j4wk4g4690kwdgiyym9yi0gh8hjij"; depends=[mvtnorm car lattice combinat]; }; +biasbetareg = derive { name="biasbetareg"; version="1.0"; sha256="1562zdin0y5mrp36ih11ir3h9cv49cx1l98chxd89fkj8x3c1fbg"; depends=[betareg]; }; +bibtex = derive { name="bibtex"; version="0.3-6"; sha256="06v6pzwpx5dh3h4cf382hf0mszxchvzjsjaw880gfbgc9yl931z7"; depends=[]; }; +biclust = derive { name="biclust"; version="1.0.2"; sha256="09w164zsnc48apf3r0yr6bfjxlpy4s2wqpzfhlg60c3c7bk1bf7v"; depends=[MASS colorspace lattice]; }; +bifactorial = derive { name="bifactorial"; version="1.4.7"; sha256="187zlsqph7m63wf6wajvs6a4a08aax9hiqssgvma6cpkpisfiz4k"; depends=[mvtnorm multcomp lattice Rcpp Rcpp]; }; +bigGP = derive { name="bigGP"; version="0.1-3"; sha256="1a81an1wkkvdv1jh6d41wl54ac8h4yal27v4m8zp9jmx3ch3y2wy"; depends=[Rmpi]; }; +bigRR = derive { name="bigRR"; version="1.3-10"; sha256="08m77r9br6wb9i21smaj4pwwpq3nxdirs542gnkrpakl7bvyp6s3"; depends=[hglm DatABEL]; }; +bigalgebra = derive { name="bigalgebra"; version="0.8.4"; sha256="19rv552ac0q9djc1yvpldkc0lipdf6q143m9dnndpsqs7ayqlr4g"; depends=[bigmemory bigmemory BH]; }; +biganalytics = derive { name="biganalytics"; version="1.1.1"; sha256="0g45b293c1z9n2z9ab66jsy8yaiqm7bbs2d6pglzwgmmdvwy03qd"; depends=[bigmemory BH bigmemory]; }; +bigdata = derive { name="bigdata"; version="0.1"; sha256="1n1zcjhvb2s87d7fkcm95x11ss4b8pczza0n55gxjv4przfiq0in"; depends=[glmnet Matrix lattice]; }; +biglars = derive { name="biglars"; version="1.0.2"; sha256="17zs25dvlja9ynx2fm5f4nmgkx4mnyqs5iscwsyahr6qigx1rz9x"; depends=[ff]; }; +biglm = derive { name="biglm"; version="0.9-1"; sha256="1z7h4by457z93k5i6qf5rq7xmd1y2kcd1rq4pv465cd32d4mb2g1"; depends=[DBI]; }; +bigmemory = derive { name="bigmemory"; version="4.4.6"; sha256="1pplnpxqg380l5mjgz0ak4ipsx7x54339n2wr3dd29xv3w2fb5rp"; depends=[bigmemory_sri BH BH]; }; +bigmemory_sri = derive { name="bigmemory.sri"; version="0.1.3"; sha256="0mg14ilwdkd64q2ri9jdwnk7mp55dqim7xfifrs65sdsv1934h2m"; depends=[]; }; +bigml = derive { name="bigml"; version="0.1-1"; sha256="0x0gn5pyffc8s0z2hp9iqgc63mmb3q7fb8lafzz2x67z2gghxi77"; depends=[RJSONIO RCurl plyr]; }; +bigpca = derive { name="bigpca"; version="1.0"; sha256="1s4qmg7xl8z0sv1b1vfqw0r5cvlbrxx1n0m03ira8fpykcck2clm"; depends=[reader NCmisc bigmemory biganalytics bigmemory_sri BH irlba]; }; +bigrf = derive { name="bigrf"; version="0.1-11"; sha256="0lazi8jk8aapdyyynd5yfcbn4jpjyxh8l64ayd0jj3nisl6hvmdh"; depends=[bigmemory foreach bigmemory BH]; }; +bigsplines = derive { name="bigsplines"; version="1.0-4"; sha256="10i8scp048s7mdxccqq2wz7ffqljnpgbhki5hkyjp7i5lbhbmcax"; depends=[]; }; +bigtabulate = derive { name="bigtabulate"; version="1.1.2"; sha256="0vp873r3gww6kfkjdm87qgcdi85362kq946lvs45ggvyv7iaw0wa"; depends=[bigmemory BH bigmemory]; }; +bild = derive { name="bild"; version="1.1-3"; sha256="02fi3h6mhg2m1ppkcpxpwzjfchkk9h7yv73j0365srr1jxki44pm"; depends=[]; }; +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]; }; +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]; }; +binhf = derive { name="binhf"; version="1.0-1"; sha256="0l8925bj6mjv2y7fn76zh2g8xjig3kbbdy4jl0ip3gd9kbrakl9k"; depends=[wavethresh adlift]; }; +binom = derive { name="binom"; version="1.1-1"; sha256="0mjj92dqf5q69jxzqya4izb1mly3mkydbnmlm4wb3zqqg82a324c"; depends=[]; }; +binomSamSize = derive { name="binomSamSize"; version="0.1-3"; sha256="0hryaf0y3yjxp84c0k80mhxj8zzlad697bv2yrvcjvllkzdvzbm7"; depends=[binom]; }; +binomTools = derive { name="binomTools"; version="1.0-1"; sha256="14594i7iapd6hy4j36yb88xmrbmczg8zgbs0b6k0adnmqf83bn4v"; depends=[]; }; +binomialcftp = derive { name="binomialcftp"; version="1.0"; sha256="00c7ymlxk1xnx3x1814x7bcyir7q5sy4rb82dcpzf2bdly4xa1qr"; depends=[]; }; +binomlogit = derive { name="binomlogit"; version="1.2"; sha256="1njz1g9sciwa8q6h0zd8iw45vg3i1fwcvicj5y8srpk8wqw3qp7k"; depends=[]; }; +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=[]; }; +bioPN = derive { name="bioPN"; version="1.2.0"; sha256="0mvqgsfc7d4h6npgg728chyp5jcsf49xhnq8cgjxfzmdayr1fwr8"; depends=[]; }; +biom = derive { name="biom"; version="0.3.12"; sha256="18fmzp2zqjk7wm39yjlln7mpw5vw01m5kmivjb26sd6725w7zlaa"; depends=[plyr RJSONIO Matrix]; }; +biomod2 = derive { name="biomod2"; version="3.1-48"; sha256="1qsxzgikzxvgfrvm3lqfbwk1fnd55z1jgi9d6nyjxxcmn65lgx5l"; depends=[sp raster reshape abind rasterVis pROC nnet gbm mda randomForest rpart MASS]; }; +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]; }; +biotools = derive { name="biotools"; version="1.2"; sha256="0wiv10qqah6yp5kwsndv48agnvrfl3j04pj0nsyiwyf9nvajxvic"; depends=[rpanel tkrplot MASS boot]; }; +bipartite = derive { name="bipartite"; version="2.05"; sha256="05w3ypdxy2lfygdlvg9xv88dpsf21i60rsbvvz058zwpfzr39hfh"; depends=[vegan sna fields igraph MASS permute]; }; +biplotbootGUI = derive { name="biplotbootGUI"; version="1.0"; sha256="0pgm31nhh1b78a8ciqjxw7gf3j7hh9wjc3myj29jpl92flbqmsw0"; depends=[rgl tkrplot vegan tcltk2]; }; +birdring = derive { name="birdring"; version="1.2"; sha256="1jhhvdipsx3kw8n6gw6amm1vq0m83l48dkark9vvi2hpd730ca1y"; depends=[geosphere ks lazyData raster rgdal rgeos rworldmap rworldxtra sp]; }; +birk = derive { name="birk"; version="1.2"; sha256="0lp3bvp0qlsggmq65208vm1hiprhr1c4pzay6xf4lhwprx47i5kw"; depends=[]; }; +bisectr = derive { name="bisectr"; version="0.1.0"; sha256="1vjsjshvzj66qqzg32rviklqswrb00jyq6vwrywg1hpqhf4kisv7"; depends=[devtools]; }; +bisoreg = derive { name="bisoreg"; version="1.1"; sha256="16d6nxbj18y6wv57nxbmwv0gypsgf7hw76hsyv0fhydrkf404igb"; depends=[bootstrap monreg R2WinBUGS coda]; }; +bit = derive { name="bit"; version="1.1-12"; sha256="0a6ig6nnjzq80r2ll4hc74za3xwzbzig6wlyb4dby0knzf3iqa6f"; depends=[]; }; +bit64 = derive { name="bit64"; version="0.9-4"; sha256="1w734l5ayr7w17a3gk2kmkqwz7v5jm830kfhyqmnd15i816lnjb9"; depends=[bit]; }; +bitops = derive { name="bitops"; version="1.0-6"; sha256="176nr5wpnkavn5z0yy9f7d47l37ndnn2w3gv854xav8nnybi6wwv"; depends=[]; }; +bivarRIpower = derive { name="bivarRIpower"; version="1.2"; sha256="0vgi0476rwali6k8bkp317jawzq5pf04v75xmycpmadb7drnpzy0"; depends=[]; }; +biwavelet = derive { name="biwavelet"; version="0.17.5"; sha256="01zhpwq1a3g1pjwbjqh3p1q9jhqqngrxcs9vp4r2zrj3rn9d5x38"; depends=[fields]; }; +biwt = derive { name="biwt"; version="1.0"; sha256="1mb3x8ky3x8j4n8d859i7byyjyfzq035i674b2dmdca6mn7paa14"; depends=[rrcov MASS]; }; +bizdays = derive { name="bizdays"; version="0.1.5"; sha256="0y25sm77chk77s4wdb5a4r583ks44mpny9w8c8azbx7nhcvfb4yq"; depends=[]; }; +blender = derive { name="blender"; version="0.1.2"; sha256="1qqkfgf7fzwcz88a43cqr8bw86qda33f18dg3rv1k77gpjqr999c"; depends=[vegan]; }; +blighty = derive { name="blighty"; version="3.1-4"; sha256="1fkz3vfcnciy6rfybddcp5j744dcsdpmf7cln2jky0krag8pjzpn"; depends=[]; }; +blkergm = derive { name="blkergm"; version="1.1"; sha256="0giknhcl14b4djn5k5v5n33b7bc3f8x6lx2h4jr25kpd89aynhq5"; depends=[network ergm statnet_common ergm]; }; +blm = derive { name="blm"; version="2013.2.4.4"; sha256="1w6c30cq38j4i1q4hjg12l70mhy5viw886l1lsnxyvniy113in4i"; depends=[]; }; +blme = derive { name="blme"; version="1.0-2"; sha256="11m98j9xr6w0hfcss4bbx2aa34gnc5p9if9r8ilw9ify18by77np"; depends=[lme4]; }; +blockTools = derive { name="blockTools"; version="0.6-1"; sha256="10f2rkailk0bvg5hj9hxy0p3snknbpvsydx3cpsy0n6y5srwhrfr"; depends=[MASS]; }; +blockcluster = derive { name="blockcluster"; version="3.0.1"; sha256="1lxm20f8dhxfnm13j08sj7h3sfwc8limyqn8n87c3kl87066gdaq"; depends=[Rcpp Rcpp RcppEigen]; }; +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.2"; sha256="16xpknm5aw8py8wsgfw2kn96rxzjhkp7sp9sl60s5lfn957mbsrb"; depends=[crossdes]; }; +blowtorch = derive { name="blowtorch"; version="1.0.1"; sha256="19z2z2alq5lr3f4nmjzpmyxssxalwfkm437bsjnzyf0r3zvycy9c"; depends=[ggplot2 foreach iterators]; }; +bmd = derive { name="bmd"; version="0.5"; sha256="0d4wxyymycb416sdn272292l70s1h2m5kv568vakx3rbvb8y6agy"; depends=[drc]; }; +bmem = derive { name="bmem"; version="1.5"; sha256="1miiki743rraralk9dp12dsjjajj3iizcrfwmplf6xas6pl8sfk6"; depends=[Amelia MASS lavaan sem snowfall]; }; +bmk = derive { name="bmk"; version="1.0"; sha256="1wxkrlrhmsxsiraj8nyiax9bqs834ln2swykmpf40wxspkykgfdq"; depends=[coda plyr functional]; }; +bmmix = derive { name="bmmix"; version="0.1-2"; sha256="00php2pgpnm9n0mnamchi6a3dgaa97kdz2ynivrf38s0vca7fqx8"; depends=[ggplot2 reshape2]; }; +bmp = derive { name="bmp"; version="0.2"; sha256="059ps1sy02b22xs138ba99fkxq92vzgfbyf2z5pyxwzszahgy869"; depends=[]; }; +bmrm = derive { name="bmrm"; version="1.8"; sha256="1kw9i84v5larzy79aghp08760krp29xlwrjg4mh9fsa9nl9wxqda"; depends=[clpAPI kernlab]; }; +bnlearn = derive { name="bnlearn"; version="3.6"; sha256="0q5w5lsjgr7lgfgb7yhybq5ixaps2p91gx19l6dg2xlxw2m5fnab"; depends=[]; }; +bnpmr = derive { name="bnpmr"; version="1.1"; sha256="0hvwkdbs2p2l0iw0425nca614qy3gsqfq4mifipy98yxxvgh8qgc"; depends=[]; }; +boa = derive { name="boa"; version="1.1.7-2"; sha256="1n7i0i8jq2sa1kzhbgyqzl9d53wja7fsxd7rligc8xjm0sdsb386"; depends=[]; }; +boilerpipeR = derive { name="boilerpipeR"; version="1.2.2"; sha256="0hcjlinzq2778zhwvsdyif099w8qjz5yidvpsyhphk4r6jyk4k2w"; depends=[rJava]; }; +bold = derive { name="bold"; version="0.2.0"; sha256="06dnhhf2bmiqxizarsqd6l2dcsldz4135srqa7yz90flsl9ihzwx"; depends=[XML httr stringr assertthat jsonlite reshape plyr]; }; +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-13"; sha256="0nkl3kbg23ch0jirrfm4033lhjwvay5j3gjd477kw0105zkalhcc"; 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]; }; +bootfs = derive { name="bootfs"; version="1.4.2"; sha256="1qac7v0yzhxzqbdhkpgb4z1gqr6v6hjyb2y5lsxlq5dg1ka1cnb0"; depends=[pROC igraph ROCR gbm colorRamps gplots gtools pamr randomForest Boruta caret tgp mlegp penalizedSVM]; }; +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="2014.4"; sha256="1kf5jml03yfqz2868jbnjvy839x09ml0niyq85va503pq8gmj5br"; depends=[]; }; +boral = derive { name="boral"; version="0.5"; sha256="0abxb22s4cqz2bx1ggy78jjyfjj0plv8zgccyj06jgzqqciw2fr2"; depends=[coda R2jags mvtnorm fishMod MASS]; }; +boss = derive { name="boss"; version="2.1"; sha256="1knsnf19b1xvvq20pjiv56anbnk0d51aq6z3ikhi8y92ijkzh0y8"; depends=[lme4 geepack Matrix ncdf]; }; +boussinesq = derive { name="boussinesq"; version="1.0.3"; sha256="1j1jarc3j5rby1wvj1raj779c1ka5w68z7v3q8xhzjcaccrjhzxk"; depends=[]; }; +boxplotdbl = derive { name="boxplotdbl"; version="1.2.2"; sha256="01bvp6vjnlhc4lndxwd705bzlsh7zq0i9v66mxszrcz6v8hb9rwi"; depends=[]; }; +bpca = derive { name="bpca"; version="1.2-2"; sha256="05ldz6b2s379mymj8jzvia9x6gj047gwsxvnv3zj9x8b1hvndnd6"; depends=[scatterplot3d rgl]; }; +bpcp = derive { name="bpcp"; version="1.2.4"; sha256="06q8zkf7z31ax3pb2xmww3l3axcmhvmgrfri1aikhi7ifgcfc979"; depends=[]; }; +bpkde = derive { name="bpkde"; version="1.0-7"; sha256="1ls6rwmbgb2vzsjn34r87ab8rnz3ls61g6f4x3jpglbk0j91f0h8"; depends=[]; }; +bqtl = derive { name="bqtl"; version="1.0-30"; sha256="1v1p3wvqm5hmwpnjqaz8vlpzm036gpzpxsvy7m0v4x7nc5vrq7g6"; depends=[]; }; +brainR = derive { name="brainR"; version="1.2"; sha256="1515v6kk73p4s3vrnkpkilfxfyqrf7b762sq6j364ygsyfybvh2z"; depends=[rgl misc3d oro_nifti]; }; +brainwaver = derive { name="brainwaver"; version="1.6"; sha256="0r79dpd9bbbn34rm29512srzj3m29qgvbryvrp1mwv8mmcsh6ij6"; depends=[waveslim]; }; +branchLars = derive { name="branchLars"; version="1.0"; sha256="1adk9j77ynv7y8q04nvb468ik4nq4ff3j2nbxw596kgg5bg1ymz0"; depends=[lars]; }; +breakage = derive { name="breakage"; version="1.0-1"; sha256="1zn0hxkz4zqhrfny75gkp2sgc0fs4v3y940aw32fmjh4j8kl3n4j"; depends=[Imap]; }; +breakaway = derive { name="breakaway"; version="1.0"; sha256="1agigb3b2ff1p9lx9ndz4hs1sgyv1g2zjb41l5p23370i5gk1nbn"; depends=[]; }; +breakpoint = derive { name="breakpoint"; version="1.0"; sha256="0clmrad4ycpi0rxrvkh4agwixdayypjdnk3lfyb5g2w2hngrxv73"; depends=[ggplot2 foreach]; }; +brew = derive { name="brew"; version="1.0-6"; sha256="1vghazbcha8gvkwwcdagjvzx6yl8zm7kgr0i9wxr4jng06d1l3fp"; depends=[]; }; +brglm = derive { name="brglm"; version="0.5-9"; sha256="14hxjamxyd0npak8wyfmmb17qclj5f86wz2y9qq3gbyi2s1bqw2v"; depends=[profileModel]; }; +bride = derive { name="bride"; version="1.3"; sha256="03k9jwklg1l8sqyjfh914570880ii0qb5dd9l0bg0d0qrghbj0rk"; depends=[]; }; +brnn = derive { name="brnn"; version="0.3"; sha256="0fpmjmxzcsxqv3vfy568r7js0zpydh2q70vw2s8yki2jzxl4gsl9"; depends=[Formula]; }; +broman = derive { name="broman"; version="0.48-2"; sha256="0w3fxs753ds2d4vzz7mck3cdjh4d1mjbwdbzqkb2rxdx5l4w2jp8"; depends=[assertthat]; }; +broom = derive { name="broom"; version="0.3.4"; sha256="0swmrd68p189pjl3kp7qmzsaqaq6w79wzigrgzdprlx4i5vk6ck4"; depends=[plyr dplyr tidyr psych]; }; +bshazard = derive { name="bshazard"; version="1.0"; sha256="151c63pyapddc4z77bgkhmd7rsa1jl47x8s2n2s8yc6alwmj6dvs"; depends=[survival Epi]; }; +bspec = derive { name="bspec"; version="1.4"; sha256="1iq66hx4d0f5pvsh6qcsd2kzm913aqil4w66bfshj192fwbfziix"; depends=[]; }; +bspmma = derive { name="bspmma"; version="0.1-1"; sha256="0bd6221rrbxjvabf1lqr9nl9s0qwav47gc56sxdw32pd99j9x5a9"; depends=[]; }; +bst = derive { name="bst"; version="0.3-4"; sha256="1s7qv2q9mcgg1c5mhblqg3nk9hary4pq6z0xgi3a6rs1929mgdyf"; depends=[rpart gbm]; }; +bsts = derive { name="bsts"; version="0.5.1"; sha256="0qzyrn8zbfxrplyw04yrcakig6lc1i8fpwl893vbzciyhwmrjlya"; depends=[BoomSpikeSlab zoo xts Boom Boom BH]; }; +btf = derive { name="btf"; version="1.1"; sha256="0n1h4hmjpvj97mpvannh3s5l08m4zfv0w64hrgdv4s5808miwfzc"; depends=[Matrix coda Rcpp RcppEigen]; }; +bujar = derive { name="bujar"; version="0.1-4"; sha256="0v48mkg78sy91z1z4xvy2r3xmay74615kzqxjqlclkk20999z56m"; depends=[mda ncvreg mboost gbm earth elasticnet rms]; }; +bursts = derive { name="bursts"; version="1.0-1"; sha256="172g09d1vmwl83xs6gr4gfblqmx3apvblpzdr5d7fcw1ybsx0kj6"; depends=[]; }; +bvarsv = derive { name="bvarsv"; version="1.0"; sha256="0ak4nsrcvhkg0145ax5ib9ljb5yc63zzfxlgvdbrdr4mlri4gsid"; depends=[Rcpp Rcpp RcppArmadillo]; }; +bvenn = derive { name="bvenn"; version="0.1"; sha256="1xrya49w5bd2b7plfxpqla60b2828rkm0rjmc4qnqzvrahsbal0y"; depends=[]; }; +bvls = derive { name="bvls"; version="1.4"; sha256="18aaf7kk5mks3a59wwqhm1ckpn6s704l9m5nzy0x5iw0s98ijbm2"; depends=[]; }; +bvpSolve = derive { name="bvpSolve"; version="1.2.4"; sha256="1ss25md3q59cm40rxw29x9421xjc7gd964hx9xwvx4h8dis34rgd"; depends=[rootSolve deSolve]; }; +c060 = derive { name="c060"; version="0.2-3"; sha256="1lynkmdlqi41szrpqqa79d5i65lindqgi0dwqpvvw94yjnbnm6b3"; 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]; }; +cSFM = derive { name="cSFM"; version="1.1"; sha256="1znxsqa8xdifmryg7jiqbpzm837n4n862kg5x1aki52crc4zyk3k"; depends=[sn mgcv mnormt MASS moments]; }; +ca = derive { name="ca"; version="0.55"; sha256="1mk6hias079ys4khlq0mb4z80mcqhml2n8fdiyfcxy61vj522yb8"; depends=[]; }; +caTools = derive { name="caTools"; version="1.17.1"; sha256="1x4szsn2qmbzpyjfdaiz2q7jwhap2gky9wq0riah74q0pzz76ank"; depends=[bitops]; }; +cabootcrs = derive { name="cabootcrs"; version="1.0"; sha256="0a6y04jq837k1pk8b9nhgz7rima7s8jid6vdjyfvrqshgaiabg1q"; depends=[]; }; +cacIRT = derive { name="cacIRT"; version="1.3"; sha256="1qd9qw47d9dmxhnva3ik62q5rfcw0pd1ha1y689345nl05wysjkh"; depends=[]; }; +cairoDevice = derive { name="cairoDevice"; version="2.20"; sha256="1v9sdv35a1sl42gsz1y9jw1p6fr19yny07cc2pwmcrb4vs5lhysf"; depends=[]; }; +calibrate = derive { name="calibrate"; version="1.7.2"; sha256="010nb1nb9y7zhw2k6d2i2drwy5brp7b83mjj2w7i3wjp9xb6l1kq"; depends=[MASS]; }; +calibrator = derive { name="calibrator"; version="1.2-6"; sha256="1arprrqmczbhc1gl85fh37cwpcky8vvqdh6zfza3hy21pn21i4kh"; depends=[emulator cubature]; }; +calmate = derive { name="calmate"; version="0.11.0"; sha256="1zy836nk607ra67q0x7yc4czkcn9ffzlipzhr4mhjk6l5d8sys2q"; depends=[R_utils aroma_core MASS R_methodsS3 R_oo matrixStats R_filesets]; }; +camel = derive { name="camel"; version="0.2.0"; sha256="0krilird8j69zbll96k46pcys4gfkcnkisww138wslwbicl52334"; depends=[lattice igraph MASS Matrix]; }; +cancerTiming = derive { name="cancerTiming"; version="2.0.0"; sha256="0p5hxzhql2rlyx334d8km676va50ql73kxsqjr15q80z7zffyq9d"; depends=[LearnBayes]; }; +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]; }; +capme = derive { name="capme"; version="1.3"; sha256="0d4acwp4y8djcry8gr34dx3h8bn8sj3z2di5zl9657czw5289zm8"; depends=[lpSolve]; }; +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-22"; sha256="0jffyz0gv0isc9ww3mv1y40b16lkmh2skvljc93aff5q84plam78"; depends=[MASS nnet]; }; +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]; }; +caret = derive { name="caret"; version="6.0-37"; sha256="0cifln20pa8wlwri7f67wrji8x1b4v7i3aygfmjiwxjp9gp55lyn"; depends=[lattice ggplot2 car reshape2 foreach plyr nlme BradleyTerry2]; }; +caribou = derive { name="caribou"; version="1.1"; sha256="0ibl3jhvsgjfcva0113z0di9n5n30bs90yz0scckfv1c0pjhn4xd"; depends=[]; }; +caroline = derive { name="caroline"; version="0.7.6"; sha256="1afxxbrd7w628l4pxdmvwbs7mbgxlhnfq3nxk2s93w47gn7r9fp7"; depends=[]; }; +caschrono = derive { name="caschrono"; version="1.4"; sha256="1l9hmsacynh73kh14jrp7a42385v78znn9ll1jchzgkyz2x4dibw"; depends=[forecast Hmisc its timeSeries]; }; +caseMatch = derive { name="caseMatch"; version="1.0.1"; sha256="0r8z0dfhaqc5wmcrd1mgq1bn71h41fhk5q3ihffg0s9qsix4pk7j"; depends=[]; }; +cat = derive { name="cat"; version="0.0-6.5"; sha256="1gv7chqp6kccipkrxjwhsa7yizizsmk4pj8672rgjmpfcc64pqfm"; depends=[]; }; +catIrt = derive { name="catIrt"; version="0.5-0"; sha256="09010z1q96nbnpys6mybspaqy57lvgd2cvwgnfijzgx3kl87pwnl"; depends=[numDeriv]; }; +catR = derive { name="catR"; version="3.3"; sha256="0gmdnavazswrvhj6cphpbbxbgfc9xhs4xr6ndljrjw2rqdp2pys3"; depends=[]; }; +catdata = derive { name="catdata"; version="1.2.1"; sha256="0fjylb55iw8w9sd3hbg895pzasliy68wcq95mgrh7af116ss637w"; depends=[MASS]; }; +catenary = derive { name="catenary"; version="1.1"; sha256="0khdk61fh8ngr70qf9i2655h5nblj98r8zl724ljv1cjb5x1vphv"; depends=[ggplot2 boot]; }; +cati = derive { name="cati"; version="0.8"; sha256="0kz58dyq5jacf2w2nvhyh3dvk0vgcrm7fjfirywykbrbh5srfw2a"; depends=[nlme ade4 ape e1071 mice rasterVis hypervolume]; }; +catnet = derive { name="catnet"; version="1.14.3"; sha256="099vxi3fy5y4w635mqmbzsyqiswsw76kz3l5vgg8ckrj1cqshh5z"; depends=[]; }; +catspec = derive { name="catspec"; version="0.97"; sha256="1crry0vg2ijahkq9msbkqknljx6vnx2m88bmy34p9vb170g9dbs1"; depends=[]; }; +causaleffect = derive { name="causaleffect"; version="1.0"; sha256="1xg0dczqk10nnybm3i9rcnsqr34y86dngb7p6vl1n7bhxrn580jf"; depends=[igraph XML]; }; +causalsens = derive { name="causalsens"; version="0.1"; sha256="1v72zjplsa073f92qdza1zvwa1fwxlpmh8f6w5z8qcyiwqcbmifr"; depends=[]; }; +cba = derive { name="cba"; version="0.2-14"; sha256="067rm1rfz0rrq8xkzibd81pwvc9rx7ki46bncim4j5ra6i9pn24n"; depends=[proxy]; }; +ccChooser = derive { name="ccChooser"; version="0.2.6"; sha256="1vgp4zhg46hcf9ma2cmwgnfrqkmq1arh0ahyzjpfk3817vh7disc"; depends=[cluster]; }; +ccaPP = derive { name="ccaPP"; version="0.3.0"; sha256="1wj5yij02372xarhvxsnh43v0l6xb2p8rflmskw6x86vpcdqd6zw"; depends=[Rcpp pcaPP robustbase RcppArmadillo Rcpp RcppArmadillo]; }; +cccd = derive { name="cccd"; version="1.04"; sha256="0mhqv9hzvw3w6wp23kvw4py54ij6x9r19b87i97wwgqr5rhhh1f3"; depends=[igraph plotrix proxy]; }; +cccrm = derive { name="cccrm"; version="1.1"; sha256="0q7vxzj3lblz5ddgzm8z99k0b0z194963hx96bbkqm4rv705dgb0"; depends=[nlme gdata]; }; +ccda = derive { name="ccda"; version="1.0"; sha256="13wxzwpld55rbpbslrgm2f7gamvkbmkaic7xrp1nn4l3lvg236dy"; depends=[MASS]; }; +ccgarch = derive { name="ccgarch"; version="0.2.3"; sha256="0angffla3sk9i86v6bbsav95fp3mz5yvq7qfv0fx2v0nd2cx116w"; depends=[]; }; +cclust = derive { name="cclust"; version="0.6-19"; sha256="11lzzpr65jw7s0419bdy3w7cq97ysvv52ijb1wgqpa48wh1qbqqd"; depends=[]; }; +cda = derive { name="cda"; version="1.5.1"; sha256="09a2jb25219hq6if3bx03lsp94rp2ll9g73dhkdi665y7rlhgqwh"; depends=[dielectric Rcpp statmod randtoolbox reshape2 plyr Rcpp RcppArmadillo]; }; +cdb = derive { name="cdb"; version="0.0.1"; sha256="1rdb4lacjcw67apdyiv7cl1xvv9d1mrzck1qk605n6794k7wf2ys"; depends=[bitops]; }; +cdcsis = derive { name="cdcsis"; version="1.0"; sha256="1fxdsaqpjhpffn2fxddfcrx8wxwyvfws6rxkpp57g25980xiyzkd"; depends=[ks]; }; +cec2005benchmark = derive { name="cec2005benchmark"; version="1.0.3"; sha256="1fc833ji557y2vb6snlxh90gz1n7fxjfkwjmdcmasj1sfzaalsjy"; depends=[]; }; +cec2013 = derive { name="cec2013"; version="0.1-4"; sha256="199r6b1gkay9a7v1x7v2w8xmxmafvizdyb1dkiq3qylsqvhq994d"; depends=[]; }; +celestial = derive { name="celestial"; version="1.1"; sha256="19yxaa63px9byn5k2k2qr89f5vy73cqb5l4zq4qj1v27g06k5dy7"; depends=[]; }; +cellVolumeDist = derive { name="cellVolumeDist"; version="1.3"; sha256="00hq3nbfbnmg2lhrqd0glkh5ld50fv54ll3q6v875d1lgs44sln1"; depends=[minpack_lm gplots]; }; +cem = derive { name="cem"; version="1.1.10"; sha256="0lykr7sksii30nk4z8pvn4bdmvhm5952grrsvb63qblazg3b84qc"; depends=[nlme lattice randomForest combinat]; }; +censNID = derive { name="censNID"; version="0-0-1"; sha256="1ij5ci6nkqf0rq51vyh4jw5sr3y46yndfkjmwl78ppdj66axxir5"; depends=[]; }; +censReg = derive { name="censReg"; version="0.5-20"; sha256="15k7iq4275dyah3r47vgxsx6g6mr7ma53lkv6d1n89bczzys72kx"; depends=[maxLik glmmML sandwich miscTools]; }; +cents = derive { name="cents"; version="0.1-41"; sha256="03ycbd0c8b7danbblaixg6sm7msr9ixkanqswczqa8n2frhjfgj0"; depends=[]; }; +cepp = derive { name="cepp"; version="1.0"; sha256="0lw3qr0vp0qbg2b62abhi1ady1dwig68m4nzqnjnk3lqxzp0fs8f"; depends=[trust randtoolbox]; }; +cfa = derive { name="cfa"; version="0.9-3"; sha256="0pl1mxv6jxn3mvlh75gr8as0daklyr7gkh37fcgmn2bwi973sspy"; depends=[]; }; +cg = derive { name="cg"; version="1.0-1"; sha256="0qi3xzjwx303b9m1sddyvz1raw78m5gy9bxqy08hyja2gqj8v855"; depends=[Hmisc VGAM MASS lattice survival multcomp nlme]; }; +cgAUC = derive { name="cgAUC"; version="1.2.1"; sha256="172f9rkfhv4xzwpw8izsnsdbcw9p3hvxhh0fd8hzlkil7vskr3k8"; depends=[Rcpp Rcpp]; }; +cgam = derive { name="cgam"; version="1.2"; sha256="14vl608bf223jclaxfb6i7irfn9g2dqp76fhw82j4h7w4l47i1c3"; depends=[coneproj]; }; +cgdsr = derive { name="cgdsr"; version="1.1.30"; sha256="0c8n2c6gqhk5klrxmmyf77czn2zwmm1f9cbp8n8yrhdcdqminznm"; depends=[R_oo R_methodsS3]; }; +cggd = derive { name="cggd"; version="0.8"; sha256="06z0mrxxc02parn9vkjv89qq4yqmsccsy319fi6c5iarssyvin1r"; depends=[]; }; +cgh = derive { name="cgh"; version="1.0-7.1"; sha256="1fgjz43bgnswlyvrm669x697lybq3jyzz4l8ppgxqwxp4p4d2yqn"; depends=[]; }; +cghFLasso = derive { name="cghFLasso"; version="0.2-1"; sha256="0b1hnjf9g0v47hbz0dy9m6jhcl1ky20yyhhmm8myng2sndcpjsbf"; depends=[]; }; +cghseg = derive { name="cghseg"; version="1.0.2"; sha256="0nz52wlgpl9r9pa41lz7nzk35fvcn3zr0gyliiw8q1nyxl2m0q1s"; depends=[]; }; +cgwtools = derive { name="cgwtools"; version="1.1"; sha256="11ryc20iqz0xwpq0cfjy37f6mnyrwvhf7kkf574j0v9fn6zg2jic"; depends=[]; }; +changeLOS = derive { name="changeLOS"; version="2.1"; sha256="1bld2phnvcwfpqbkg1ycjci4i4dc4di8gjckbqjp997zyr42nnay"; depends=[survival]; }; +changepoint = derive { name="changepoint"; version="1.1.5"; sha256="090rak3ydlh92w0mpp2sjjx4m9x33clcs77waj20gzxbq38mqdci"; depends=[zoo]; }; +cheb = derive { name="cheb"; version="0.3"; sha256="0vqkdx7i40w493vr7xywjypr398rjzdk5g410m1yi95cy1nk4mc7"; depends=[]; }; +chebpol = derive { name="chebpol"; version="1.3-1367"; sha256="0w1yfnag0sjqjn7g5yn3wd19kkwzcchb491335h70rm360m1kr0y"; depends=[]; }; +checkmate = derive { name="checkmate"; version="1.5.0"; sha256="0zvz2sy7ykx94dc7h8g67vmkphd6x6b133fqcm8xznfxq6kfd972"; depends=[]; }; +checkpoint = derive { name="checkpoint"; version="0.3.3"; sha256="1pxmaxbm6x1k3c82z2lng869jg9szxi3yn8kxni5w52whihb67xj"; depends=[knitr]; }; +cheddar = derive { name="cheddar"; version="0.1-626"; sha256="16dl267zbqnix739827mvdgchg5xzgz5q14hh8cw2fq089frjlz9"; depends=[]; }; +chemCal = derive { name="chemCal"; version="0.1-34"; sha256="0sn0mhp2d9a9rddfpkiv1pkrmvnv4sy18c1x2ks0lwpaklg78fbs"; depends=[]; }; +chemometrics = derive { name="chemometrics"; version="1.3.8"; sha256="0vd5p2qhd17hr9psk6pg4jvcadz2pjffkjaffva4spa7m7qpp5ss"; depends=[class e1071 gclus lars MASS mclust nnet pcaPP pls rpart robustbase som]; }; +chemosensors = derive { name="chemosensors"; version="0.7.8"; sha256="0zphfag0q6zskd301z1dldazzxr2fam6h41cpyivphaxpaljiv0m"; depends=[pls plyr reshape2 ggplot2 LearnBayes quadprog RColorBrewer]; }; +cherry = derive { name="cherry"; version="0.5-10"; sha256="0fs4p5k1lwwlin5fj9z91aw59ybp60phjk293imizg6vpai5h39p"; depends=[bitops lpSolve Matrix]; }; +childsds = derive { name="childsds"; version="0.5"; sha256="1fmisp6k375harjxsyzpwnd8zh3kd7vlhin18q1svfwdjyy9k3xh"; depends=[]; }; +chillR = derive { name="chillR"; version="0.54"; sha256="1qcwspww5nvp6nh26ly6ckqd0jzq4fkq5svjj5a55pvk04xk9frs"; depends=[pls Kendall spam fields]; }; +chipPCR = derive { name="chipPCR"; version="0.0.8-3"; sha256="1qslzbxirpbiqlfcvjrs7z6i4a86a04b9fgfm3ngmkv32ai0zajz"; depends=[lmtest MASS outliers ptw quantreg Rfit robustbase shiny signal]; }; +chngpt = derive { name="chngpt"; version="2014.5-29"; sha256="0i8hz8cixy3fx9cpprraqpadrs835zna8y64irp85xhckdrv9xzv"; depends=[kyotil MASS]; }; +choiceDes = derive { name="choiceDes"; version="0.9-1"; sha256="07nnqqczi9p3cffdijzx14sxhqv1imdakj7y94brlr5mbf5i4fl4"; depends=[AlgDesign]; }; +choplump = derive { name="choplump"; version="1.0-0.4"; sha256="0fn6m3n81jb7wjdji4v04m53gakjfsj3ksm546xxz5zm7prk237s"; depends=[]; }; +chords = derive { name="chords"; version="0.90"; sha256="0wz5glm15615xb3cicc0m34zg78qzng3lpmysswbrfhc8x4kkchh"; depends=[MASS]; }; +choroplethr = derive { name="choroplethr"; version="2.0.0"; sha256="14h07q2plw561dh7q20869yw7rvyhdv1vrcmficqcpy0xw0lhjix"; depends=[scales Hmisc stringr ggplot2 dplyr R6 acs WDI]; }; +choroplethrMaps = derive { name="choroplethrMaps"; version="1.0"; sha256="00dgwikfxm1p1dqz1ybsxj1j8jcmrwa08m2d3zsww2invd55pk7g"; depends=[]; }; +chromoR = derive { name="chromoR"; version="1.0"; sha256="1x11byr6i89sdk405h6jd2rbvgwrcvqvb112bndv2rh9jnrvcw4z"; depends=[haarfisz gdata]; }; +chron = derive { name="chron"; version="2.3-45"; sha256="0jkanbisi1bxh35rg0i6sl82f8r9v8va8mf8hknfvwv7p7n3ddpx"; depends=[]; }; +cin = derive { name="cin"; version="0.1"; sha256="1pwvy5nh5nrnysfqrzllb9fcrpddqg02c7iw3w9fij2h8s2v6kq5"; depends=[]; }; +circlize = derive { name="circlize"; version="0.1.3"; sha256="100jzq1r2m3h34vlpgkhdrvw5hkgb6prhpynda5mbzyan185ag2q"; depends=[GlobalOptions]; }; +circular = derive { name="circular"; version="0.4-7"; sha256="1kgis2515c931ir76kpxnjx0cscw4n09a5qz1rbrhf34gv81pzqw"; depends=[boot]; }; +cit = derive { name="cit"; version="1.2"; sha256="1mk3bgac8qhc48vm0z8fhygsrrd5mqznyblbfv03y4rjiyh7f2qs"; depends=[]; }; +citbcmst = derive { name="citbcmst"; version="1.0.4"; sha256="1zkd117h9nahwbg5z6byw2grg5n3l0kyvv2ifrkww7ar30a2yikl"; depends=[]; }; +citccmst = derive { name="citccmst"; version="1.0.2"; sha256="1b7awn1hjckxisfdi4ck697hwd4a5sqklwi7xzh6kgqhk9pv7vjn"; depends=[]; }; +cjoint = derive { name="cjoint"; version="1.0.2"; sha256="1zhgz5ckh45wrmiijdvhyrzic3x1ibm23nidci2a7wwvxzly8nbj"; depends=[sandwich lmtest ggplot2]; }; +clValid = derive { name="clValid"; version="0.6-6"; sha256="1l9q7684vv75jnbymaa10md13qri2wjjg7chr1z1m0rai8iq3xxw"; depends=[cluster class]; }; +cladoRcpp = derive { name="cladoRcpp"; version="0.14.4"; sha256="0d4vl7xrrwbhhx56ymw52rb5svw9nskxdya4dl04lw1qxc45p4jy"; depends=[Rcpp Rcpp RcppArmadillo]; }; +class = derive { name="class"; version="7.3-11"; sha256="1j6wqirih9x6q50vq21543np4i99ia6ih2ffriiw1gms8xmdfrsk"; depends=[MASS]; }; +classGraph = derive { name="classGraph"; version="0.7-4"; sha256="08cid5bdbciyijlzkx3684gx0cyzcj8myawf4dhcrz00jqrg8v60"; depends=[]; }; +classInt = derive { name="classInt"; version="0.1-21"; sha256="1sld7bw1x2i8qqj0fbavifl9ni8724fg2wrwjyg657ib8f2yqj5z"; depends=[e1071 class]; }; +classifly = derive { name="classifly"; version="0.4"; sha256="0mw1vcas0gr1r4yvh0j02zhk7kp5342r0bhhg776hqgqdczgh5zj"; depends=[class plyr]; }; +classify = derive { name="classify"; version="1.3"; sha256="0134h12h6v06d7ldj9qgqjhh5f5ap98pvr0v6d4k8dqndnn0pggy"; depends=[Rcpp plyr ggplot2 lattice R2jags reshape2 Rcpp]; }; +classyfire = derive { name="classyfire"; version="0.1-1"; sha256="19ps6ny2l8iawfgn9dnq4wrqkrmhg77y3jpxd1sjvffd0i5yhp31"; depends=[snowfall e1071 boot neldermead ggplot2 optimbase]; }; +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.2"; sha256="1l59411jsph6v4rkwanbjcgjcyknywl7ri0hh7z957v02h4m7as1"; depends=[igraph plyr reshape2 Rsolnp]; }; +climdex_pcic = derive { name="climdex.pcic"; version="1.1-4"; sha256="1jn4hzngmwag9jxhz6w45xzfn0cwiyiik6ylyns2zmil7avjplmr"; depends=[PCICt caTools Rcpp]; }; +clime = derive { name="clime"; version="0.4.1"; sha256="0qs9i7cprxddg1cmxhnmcfhl7v7g1r519ff2zfipxbs59m5xk9sf"; depends=[lpSolve]; }; +clinUtiDNA = derive { name="clinUtiDNA"; version="1.0"; sha256="0x3hb09073gkh60fc8ia0sfk948sm6z6j8sqkz275k4m8ryrabas"; depends=[]; }; +clinfun = derive { name="clinfun"; version="1.0.6"; sha256="00prrdm6qm5p2sjjlhi99msvqpxcm492z378wgl65iwf0jywdnpw"; depends=[mvtnorm]; }; +clinsig = derive { name="clinsig"; version="1.0-4"; sha256="0w2qb9k6fkw9lqi0ib6kzi6pvpb5hpq78w9x2jjs0yyqsj0rydwv"; depends=[]; }; +clogitL1 = derive { name="clogitL1"; version="1.4"; sha256="0m9yrg9mzzfv5qkdf6w55xyrjdghyrf27kk7b4x2gyvwvi5b7dkm"; depends=[Rcpp Rcpp]; }; +cloudUtil = derive { name="cloudUtil"; version="0.1.10"; sha256="1j86vpd4ngrdpfjk44wb1mp0l88dxia64pjd2idfcd276giplh6s"; depends=[]; }; +clpAPI = derive { name="clpAPI"; version="1.2.6"; sha256="1kgzmzf87b0j43ch21anmm2d73bj2d16slmyavpbkdwg72dg1sjb"; depends=[]; }; +clue = derive { name="clue"; version="0.3-48"; sha256="1lwfm5sk9d35khcrvjs91bixfnjc3zwyfzq5ma9ljsc6hs80y8ar"; depends=[cluster]; }; +clues = derive { name="clues"; version="0.5-4"; sha256="0pgd3vjfplvsfn3nw6sqlkfsv6lbpjlcai7z9qp31qcih3g71vgr"; depends=[]; }; +clustMD = derive { name="clustMD"; version="1.0"; sha256="1i3c790k300a7y5xhqanp8f1bid2q3a0ajwgf5qsr6dv3ld4h7vj"; depends=[tmvtnorm mvtnorm truncnorm MASS mclust msm]; }; +cluster = derive { name="cluster"; version="1.15.3"; sha256="014aycvxnw86rvzg8z6n9q2g7h5bzz6slz6l7vcaiiqpk9jxijj1"; depends=[]; }; +cluster_datasets = derive { name="cluster.datasets"; version="1.0-1"; sha256="0i68s9305q08fhynpq24qnlw03gg4hbk4184z3q3ycbi8njpr4il"; depends=[]; }; +clusterGeneration = derive { name="clusterGeneration"; version="1.3.1"; sha256="0lvkqqcshnaqk40s5y736r53y9yss3hlvgs6gs7p8ksk14vj7i2q"; depends=[MASS]; }; +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=[]; }; +clusterSim = derive { name="clusterSim"; version="0.43-5"; sha256="07vdvhlvk31srnw1vwgwqgj2dimgbagp7mnz7n1rwcm1qxnndsmy"; 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]; }; +clusteval = derive { name="clusteval"; version="0.1"; sha256="1ld0bdl4fy8dsfzm3k7a37cyxc6pfc9qs31x4pxd3z5rslghz7rj"; depends=[mvtnorm Rcpp Rcpp]; }; +clusthaplo = derive { name="clusthaplo"; version="1.2"; sha256="17vxk61bw99h34n9a6vp40nanigfai34s237ydb56jpamsq8sf2b"; depends=[ggplot2]; }; +clustrd = derive { name="clustrd"; version="0.1.2"; sha256="022lzp1wvbaa20d8hribgq9miy6i7jxm5m1p3p52h9b7bzga3q6g"; depends=[corpcor e1071 ggplot2 irlba]; }; +clustsig = derive { name="clustsig"; version="1.1"; sha256="0n5nf712vsa8zb0c2lv4gjqsgva62678vjngr9idgswb73shxm8v"; depends=[]; }; +clustvarsel = derive { name="clustvarsel"; version="2.1"; sha256="0sj9065s604sjzmlziak9xxl0xhplmp1g3d5dl9smwf2x8bb80mw"; depends=[mclust BMA foreach iterators]; }; +clv = derive { name="clv"; version="0.3-2.1"; sha256="1qgp2qhblg6ysyrlg0ad169ahwhcyn5pvsqzdlqj700y1k7wl7mc"; depends=[cluster class]; }; +cmaes = derive { name="cmaes"; version="1.0-11"; sha256="1hwf49d1m660jdngqak9pqasysmpc4jcgr8m04szwbyzyy6xrm5k"; depends=[]; }; +cmm = derive { name="cmm"; version="0.7"; sha256="16pw9namrc3crcqnsn4ckk8m4r3af908wm2siw6fzbk6hwac17i6"; depends=[]; }; +cmprsk = derive { name="cmprsk"; version="2.2-7"; sha256="1imr3wpnj4g57n2x4ryahl4lk8lvq9y2r7319zv3k82mznha8bcm"; depends=[survival]; }; +cmprskQR = derive { name="cmprskQR"; version="0.9.0"; sha256="1vnrfhlmmyamkpd8lsfznfpcq0mspkiwn3j23yj4sarfx5n32s9a"; depends=[survival quantreg]; }; +cmrutils = derive { name="cmrutils"; version="1.2-2"; sha256="0gc4sx8g9364sybmrqdjdvddqjd9ps6v205kaw0nqdx30xn96hmm"; depends=[chron]; }; +cmvnorm = derive { name="cmvnorm"; version="1.0"; sha256="18aqjxr2rm4v813w25bp0jjm3110b22r8yskmnpspcw44666829v"; depends=[emulator elliptic]; }; +cna = derive { name="cna"; version="1.0-0"; sha256="1pyglciid1q22mlkdm1r2wc2sbwcl98m26hzdgwrjmkvdn4r4166"; depends=[]; }; +cncaGUI = derive { name="cncaGUI"; version="0.0-2"; sha256="1rgs7446qb40b4qi1i4m5c3111kbqap4z1g7s01pnbylil0m80fd"; depends=[rgl tcltk2 tkrplot]; }; +coalescentMCMC = derive { name="coalescentMCMC"; version="0.4"; sha256="115kvrk46hzhr83vkk57jn90dw2fvj1pl56w6mlja16i93yaz10h"; depends=[ape coda Matrix phangorn]; }; +coarseDataTools = derive { name="coarseDataTools"; version="0.6-2"; sha256="1nnh61kfw294cxawz9i8yf37ddzsn5s532vvkaz0ychk0390wmi5"; depends=[MCMCpack]; }; +cobs = derive { name="cobs"; version="1.2-2"; sha256="1g8qwnda7fqrqknz7lnlq47kqs5k83pg9qq205alm12jgx3180a1"; depends=[SparseM quantreg]; }; +cobs99 = derive { name="cobs99"; version="0.9-12"; sha256="0zd0nyw8ma7k90i1k3ryn6qcb6yivrrajc6nmdh4f95ihvhc9ksm"; depends=[]; }; +cocor = derive { name="cocor"; version="1.0-0"; sha256="173kszv661hailav69khqh9c15y9m5n6l7crc9i6vf71yrig1vqs"; 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]; }; +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-9"; sha256="0d3kfkk8xngjin825ynlcxp9xgcr4z33n1zbj239j04rpicxmsvc"; depends=[]; }; +coefficientalpha = derive { name="coefficientalpha"; version="0.3.2"; sha256="1mlcgzkpxijflzwqx6iq411j0m17d76w0vpj0mb3p8yz007mcyrv"; depends=[rsem lavaan]; }; +coefplot = derive { name="coefplot"; version="1.2.0"; sha256="1v6c3fk2wrjgs3b31vajmig6dvmp5acfm72wh0iffpg0qgvf5hh7"; depends=[ggplot2 plyr reshape2 useful scales proto]; }; +coenocliner = derive { name="coenocliner"; version="0.1-0"; sha256="0hys1a4ai09pax5ydcaq39ll3rdjzyhgvz72z0iv9fwv4fbmwbr9"; depends=[]; }; +coexist = derive { name="coexist"; version="1.0"; sha256="15ydhrx996i6caa0360c2bgn2zvgwfg5wdhsqq1gvrggs15w7nml"; depends=[]; }; +coin = derive { name="coin"; version="1.0-24"; sha256="1h1d6pi957qkmlk2j8f280sc6jkg328wnyxjk43yxj2zwmdnmgpd"; depends=[survival modeltools mvtnorm]; }; +cold = derive { name="cold"; version="1.0-3"; sha256="17nlqhp5415m8wjkb2ykmk1q3lgw1aycf85b6byl8p06bfrvmw2p"; depends=[]; }; +coloc = derive { name="coloc"; version="2.3-1"; sha256="1j3m9afpkm0bzib38yqvk85b6s6l56s6j2ni96gii4a06r87ig60"; depends=[colorspace MASS BMA]; }; +colorRamps = derive { name="colorRamps"; version="2.3"; sha256="0shbjh83x1axv4drm5r3dwgbyv70idih8z4wlzjs4hiac2qfl41z"; depends=[]; }; +colorfulVennPlot = derive { name="colorfulVennPlot"; version="2.4"; sha256="01b3c060fbnap78h9kh21v3zav547ak2crdkvraynpd2096yk51w"; depends=[]; }; +colorscience = derive { name="colorscience"; version="1.0.0"; sha256="0429vlirc95nblmhs5lplh3lw9aay9qnkpib77rbmjzczv551m3d"; depends=[Hmisc munsellinterpol pracma]; }; +colorspace = derive { name="colorspace"; version="1.2-4"; sha256="1ppvkcclqjdj1b9j59sc2gda55kmwq9l00n5643ggjb15m2dm76h"; depends=[]; }; +colortools = derive { name="colortools"; version="0.1.5"; sha256="0z9sx0xzfyb5ii6bzhpii10vmmd2vy9vk4wr7cj9a3mkadlyjl63"; depends=[]; }; +colourlovers = derive { name="colourlovers"; version="0.1.3"; sha256="09hacmzcw6am8l6725wny2rrrzzn46vk2730ni7rgynk49b2wr9h"; depends=[XML RJSONIO png]; }; +comato = derive { name="comato"; version="1.0"; sha256="03jnvv0sczy13r81aljhj9kv09sl5hrs0n5bn3pdi7ba64zgbjiw"; depends=[igraph Matrix lattice gdata XML cluster clusterSim]; }; +combinat = derive { name="combinat"; version="0.0-8"; sha256="1h9hr88gigihc4na7lb5i7rn4az1xa7sb34zvnznaj6pdrmwy4qm"; depends=[]; }; +comclim = derive { name="comclim"; version="0.9.4"; sha256="0m6ynccscsrrq70p0drwrwxp4skc630kv1l5smh48pi8kagahj1g"; depends=[]; }; +commandr = derive { name="commandr"; version="1.0.1"; sha256="1d6cha5wc1nx6jm8jscl7kgvn33xv0yxwjf6h3ar3dfbvi4pp5fk"; depends=[]; }; +commentr = derive { name="commentr"; version="0.1"; sha256="0kyi7xd2f2b1avk78bmkbagyjqwwx21hca670n38k1a28kvnjpix"; depends=[stringr]; }; +comorbidities = derive { name="comorbidities"; version="1.0"; sha256="01aisxy4cx3jw37cg6mwvfj4nv10ndmwjxf8xsfv7s20hdb0gmqn"; depends=[]; }; +compHclust = derive { name="compHclust"; version="1.0-2"; sha256="1h39krvz516xwsvn5987i1zbzan8vx2411qz6dad112hpss0vyk9"; depends=[]; }; +compactr = derive { name="compactr"; version="0.1"; sha256="0f2yds6inmx0lixj08ibqyd2i61l2cbg1ckgpb8dl2q7kcyyd6mx"; depends=[]; }; +compare = derive { name="compare"; version="0.2-4"; sha256="0fhw7y7xwrv79wxvs9gy4xddjzc6hh97m81a10j64jssy4p291b6"; depends=[]; }; +compareGroups = derive { name="compareGroups"; version="2.0.5"; sha256="1r07g5l0x8bkgm13qzw992aw0wn2q2wcadidr9444nqhk2l8809b"; depends=[Hmisc xtable gdata SNPassoc survival epitools HardyWeinberg]; }; +compareODM = derive { name="compareODM"; version="1.2"; sha256="019hq8j56asjvh4x1p65785mf38xr05j3by0749gl9k9yl8645da"; depends=[XML]; }; +comparison = derive { name="comparison"; version="1.0-4"; sha256="0pc462rhk8gr8zrf08ksi315kmhydlp027q5gd40ap5mmhk7rd82"; depends=[isotone]; }; +compeir = derive { name="compeir"; version="1.0"; sha256="1bb5459wcqpjic2b9kjn0l0qdn7sqmmx34hdb2aqg80q22mhx5dv"; depends=[lattice etm]; }; +compendiumdb = derive { name="compendiumdb"; version="0.1.0"; sha256="1dvgkbrsj2fw3mr454mfqhjcz0lbhvz848hgj1ld76p10zhs2vyk"; depends=[RMySQL]; }; +complex_surv_dat_sim = derive { name="complex.surv.dat.sim"; version="2.0.0"; sha256="1x4whyq0bds0zblppcvv7lk6qy567c37x19n1r0xjgyl3id40f7c"; depends=[eha statmod]; }; +complmrob = derive { name="complmrob"; version="0.5.5"; sha256="1klabkx5q27h0na4987bbd3xs1v3nmy5nxc5izs7y0x2s8i324v1"; depends=[robustbase ggplot2 boot scales]; }; +compoisson = derive { name="compoisson"; version="0.3"; sha256="0v5dl7xydqi4p97nipn4hyhpq2gghmx81ygvl0vc8b65jhq89y0p"; depends=[MASS]; }; +compositions = derive { name="compositions"; version="1.40-1"; sha256="1hn139g86bc1q3dj6kj9f21042v4x0xgrp4ni1zvx1zx8xmy3h8b"; depends=[tensorA robustbase energy bayesm]; }; +compound_Cox = derive { name="compound.Cox"; version="1.4"; sha256="08sdkq040zk9mb1lcy4nm32gwab26vaig8brp2n3aizagx9fv3r9"; depends=[numDeriv survival]; }; +compute_es = derive { name="compute.es"; version="0.2-4"; sha256="1b5i8z66zbag0vdv98mmpwmizpm68vc3ajh0n3q94zdcmhcbx12d"; depends=[]; }; +concor = derive { name="concor"; version="1.0-0.1"; sha256="0hjyvi6p16cyrmq0bq7fph1r5f3adp7zpf123wkm5bkjnc5122k0"; depends=[]; }; +concreg = derive { name="concreg"; version="0.5"; sha256="0psvnirl5rqicyzxs9sivh23bzzwdgviqczdl2in2gnrvdiw7m6f"; depends=[survival]; }; +cond = derive { name="cond"; version="1.2-3"; sha256="0y7m7valk7zn40y62348czmdvfkx59il9sl6wy565lzqfiimd9ps"; depends=[statmod survival]; }; +condGEE = derive { name="condGEE"; version="0.1-4"; sha256="0mqj2pc91n8h3arpd4b9f7ndbcnai21c67is22qg22wj7vhhs87h"; depends=[numDeriv rootSolve]; }; +condmixt = derive { name="condmixt"; version="1.0"; sha256="05q1fj7akf6lsq9rbcqqkzlx82jvk6mlvmwx6jzk8j228fwqmg90"; depends=[evd]; }; +coneproj = derive { name="coneproj"; version="1.5"; sha256="1xk6v5hp5v5hcxnl8fhb9ccv343yjpswrgm65p4046sw0b764pny"; depends=[Rcpp RcppArmadillo Rcpp]; }; +conf_design = derive { name="conf.design"; version="2.0.0"; sha256="06vdxljkjq1x56xkg041l271an1xv9wq79swxvzzk64dqqnmay51"; depends=[]; }; +confidence = derive { name="confidence"; version="1.1-0"; sha256="11y2mjh9ykmsgf6km6f2w5rql1vqwick4jzmxg5gkfkiisvsq1cp"; depends=[knitr markdown plyr xtable ggplot2]; }; +confreq = derive { name="confreq"; version="1.3"; sha256="0dxd7zdcrgj95f4x19izysqjixgpwi1xx752bwdc28d7h1ds2ym5"; depends=[gmp]; }; +conicfit = derive { name="conicfit"; version="1.0.0"; sha256="032a9ajrv1xl2i4p3a32fyzg6s76vngdcmwqnh2lgk72srlhryzj"; depends=[pracma geigen]; }; +conics = derive { name="conics"; version="0.3"; sha256="06p6dj5dkkcy7hg1aa7spi9py45296dk0m6n8s2n3bzh3aal5nzq"; depends=[]; }; +conjoint = derive { name="conjoint"; version="1.39"; sha256="0f8fwf419js9c292i3ac89rlrwxs2idhwxml1qd8xd2ggwfh6w5m"; depends=[AlgDesign clusterSim]; }; +constrainedKriging = derive { name="constrainedKriging"; version="0.2.3"; sha256="1hppfc0pv0jphmj7pip1cn65sfrcwvnpymlvpyp7sbn3nmy2qqrb"; depends=[sp spatialCovariance rgeos RandomFields]; }; +contfrac = derive { name="contfrac"; version="1.1-9"; sha256="16yl96bmr16a18qfz6y5zf7p02ky1jy2iimcb1wp50g7imlcq840"; depends=[]; }; +conting = derive { name="conting"; version="1.3"; sha256="1aw3hp88xif5s94388g4805xqnv21dj47wshgkbg33dn11lf2hwf"; depends=[mvtnorm BMS gtools tseries coda]; }; +contrast = derive { name="contrast"; version="0.19"; sha256="1kc3scz3msa52lplc79mmn4z99kq1p2vlb18wqxa9q2ma133x6pl"; depends=[rms]; }; +convexHaz = derive { name="convexHaz"; version="0.2"; sha256="0lfksb01iilhyjbr9wj3w4s9nbkdcl649w86fp2mz6s6makmq84x"; depends=[]; }; +cooccur = derive { name="cooccur"; version="1.2"; sha256="0v26aa6j77dmm7pdij4qaz03mxn69aa71rw6n5yl3b9qb0w4k81z"; depends=[reshape2 gmp ggplot2]; }; +cooptrees = derive { name="cooptrees"; version="1.0"; sha256="0izvwna1jsqik3v5fz1r4c86irvma42clw0p4rdvwswv5pk698i1"; depends=[igraph optrees gtools]; }; +copBasic = derive { name="copBasic"; version="1.6.0"; sha256="1sqh61ln0ih731frdgisslll2qf8p3896abjap4f79fy1dn83p70"; depends=[lmomco]; }; +copCAR = derive { name="copCAR"; version="1.0"; sha256="0rq432w959p7drx73vsrdh5dhi2wy7dsjhhb4nh9wm36kkzki5ca"; depends=[numDeriv Rcpp spam Rcpp RcppArmadillo]; }; +copula = derive { name="copula"; version="0.999-12"; sha256="131wr6a7qxsdsl9f5amjkzj2wwgdwlg85a1pmd0bflzfi86dvrdf"; 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=[]; }; +corclass = derive { name="corclass"; version="0.1"; sha256="02mxypdrjwf8psk0j9ggbw14889a87c6lw11qki3s3biq52qsx3y"; depends=[igraph]; }; +corcounts = derive { name="corcounts"; version="1.4"; sha256="0irlx62ql5rp5s7nnjdy6jh723wl4039wn10zxri8ihxwqsyyz3f"; depends=[]; }; +coreTDT = derive { name="coreTDT"; version="1.0"; sha256="14rnh61gk3m6g8rq77hm9ybds0px15di2mxm3jiyfdfynx5ng58f"; depends=[]; }; +corpcor = derive { name="corpcor"; version="1.6.7"; sha256="1vfzi17vkvzbqgzhmpdhybb6lli0z9vm9p31cwb8bn8ddlkn5ll4"; depends=[]; }; +corpora = derive { name="corpora"; version="0.4-3"; sha256="0zh8mabfy9yqgx7asi4yqv4c0kj59yvyxxaxjgdjy5kkr17zd4g4"; depends=[]; }; +correlate = derive { name="correlate"; version="1.0"; sha256="0hv0i928f49p8n78hd3bcx923l2x0zcs4kwj71ph8gm7s8540fhc"; depends=[]; }; +corrgram = derive { name="corrgram"; version="1.6"; sha256="1y0963hqh909pqfjkjp2wwq1npmy7qp37gyfyy5vcspl2fic4afb"; depends=[seriation]; }; +corrplot = derive { name="corrplot"; version="0.73"; sha256="0xnlkb8lhdjcc10drym9ymqzvfwa3kvf955y0k66z5jvabzyjkck"; depends=[]; }; +corrsieve = derive { name="corrsieve"; version="1.6-8"; sha256="0ak3j9khcwv5rxbicck2sr260wpmd3xj254y7pdavx2fk0b72yxs"; depends=[]; }; +cosinor = derive { name="cosinor"; version="1.1"; sha256="02nnqg51vq48lzk667cyarnmhcf5mifnsdij7dlgqvz2k4fdq4pl"; depends=[ggplot2 shiny]; }; +cosmoFns = derive { name="cosmoFns"; version="1.0-1"; sha256="0a6xhbgxxnymlvicg99yhgny2lscxcbmvqmy17kxmahdi797dsg6"; depends=[]; }; +cosmosR = derive { name="cosmosR"; version="1.0"; sha256="0w4qywnkgcybgyyhnvvg33amqi2vnkry6iajakyqr1x2hzfpf9sv"; depends=[xlsx]; }; +cosso = derive { name="cosso"; version="2.1-1"; sha256="1wyq27qak0kz4bbzynm24r5ksvb6ddd43h2ykh6m935xck16blyb"; depends=[quadprog Rglpk glmnet]; }; +costat = derive { name="costat"; version="2.3"; sha256="1kqyl89lx1amap9zgrfy1bqnl93kahrksj6yms44yrxr1as2g4nk"; depends=[wavethresh]; }; +cotrend = derive { name="cotrend"; version="1.0"; sha256="0h0y502wqq83wlf9ab1b9rxg1wycvi3sp4lbqfpvy46vgljrjw87"; depends=[xts]; }; +couchDB = derive { name="couchDB"; version="1.3.0"; sha256="153zxi2liv932r7mphhzgxw4wyizh5iyk62ad6x64av31kd2qzsn"; depends=[RCurl bitops httr rjson]; }; +countrycode = derive { name="countrycode"; version="0.17"; sha256="0rmmqh0x34bdnyb19r719rsm46q8193lf7wcynd5s3c2i4vbkx8n"; depends=[]; }; +covLCA = derive { name="covLCA"; version="1.0"; sha256="15jsjrlaws1cqyrwvh4lzbhxkb11jmgpmddg98nfrzmjpczn2iw3"; depends=[Matrix mlogit poLCA]; }; +covRobust = derive { name="covRobust"; version="1.1-0"; sha256="1nvy5cqs4g565qj2hhgk5spr58ps2bhas3i752rf7wvrskb89fk7"; depends=[]; }; +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]; }; +coxphf = derive { name="coxphf"; version="1.10"; sha256="15bpy6vcn65pnknqbiqhpbpddhzyslgsc06g8rnamg60akg4p3v8"; 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]; }; +cpa = derive { name="cpa"; version="1.0"; sha256="14kcxayw4cdbjfa6bvfzqp8flwc0sr3hmh2dnr1dfax0hnccd71m"; depends=[]; }; +cpca = derive { name="cpca"; version="0.1.2"; sha256="1pccsjahb1qynnxa0akhfpcmhfmdg4rd1s6pfqrdl7bwbcmq4lqf"; depends=[]; }; +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]; }; +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]; }; +crank = derive { name="crank"; version="1.0-6"; sha256="1v3xi29hslggdglb8j7qjb631pjc52ljkz2qi1ivqim654skzhwd"; depends=[]; }; +crantastic = derive { name="crantastic"; version="0.1"; sha256="0y2w9g100llnyw2qwjrib17k2r2q9yws77mf6999c93r8ygzn4f5"; depends=[]; }; +crawl = derive { name="crawl"; version="1.4-1"; sha256="175w5933h5hhhjnrc0l1kg5q24b8pclnf5sf36gj1pmg8s58d1gp"; depends=[mvtnorm sp raster]; }; +crayon = derive { name="crayon"; version="1.1.0"; sha256="03l7sw6ilr4hmahk921kkq4hlvlscginrq3mw8aypc4wb6y32qhm"; depends=[memoise]; }; +crblocks = derive { name="crblocks"; version="0.9-1"; sha256="1m6yy6jb1dld7m9jaasms5ps8sn3v039jvlk8b0c08hmm7y0rm3z"; depends=[]; }; +crch = derive { name="crch"; version="0.1-0"; sha256="1f4y2dd6lxsryyjjv569bxh1b4ymcnma0m9k7j150anzvkbrgnjn"; depends=[Formula ordinal]; }; +crimCV = derive { name="crimCV"; version="0.9.3"; sha256="1p2cma78fb9a2ckmwdvpb6fc0818xw2mvq565dgiimgkdmmr0iid"; depends=[]; }; +crmn = derive { name="crmn"; version="0.0.20"; sha256="1kl1k1s2gm63f9768cg8w4j6y1gq4hws3i7hdfhj7k9015s0a25p"; depends=[]; }; +crn = derive { name="crn"; version="1.1"; sha256="1fw0cwx478bs6hxidisykz444jj5g136zld1i8cv859lf44fvx2d"; depends=[chron RCurl]; }; +crossReg = derive { name="crossReg"; version="1.0"; sha256="1866jhfnksv9rk89vw7w4gaxi76bxfjvqxx7cfa8nlrcsmaqd7rf"; depends=[]; }; +crossdes = derive { name="crossdes"; version="1.1-1"; sha256="1d7lv3ibq1rwxx8kc3ia6l9dbz2dxdd5pnf2vhhjmwm448iamcfd"; depends=[AlgDesign gtools]; }; +crossmatch = derive { name="crossmatch"; version="1.3-1"; sha256="082lrv2129mfhwlh99z3g8id3a29s8854skl152bl3ig8pk2gbjz"; depends=[survival nbpMatching]; }; +crossval = derive { name="crossval"; version="1.0.2"; sha256="1imqmrr86yr2ml9x8cycnlr7d8yymyyypi87kxqjc32s2r16s0cx"; depends=[]; }; +crp_CSFP = derive { name="crp.CSFP"; version="2.0"; sha256="0ji208hn3zimql0xhy8bl7w0vg40szw28fia7k1f7g9z0wbl9xqp"; depends=[MASS]; }; +crqa = derive { name="crqa"; version="1.0.4"; sha256="05sp7dbi89wanhjlrbqb3ms9gl7s1h1iww26s4iy84i0pr0wg7br"; depends=[Matrix tseriesChaos fields]; }; +crrSC = derive { name="crrSC"; version="1.1"; sha256="171cw56q2yv1vb4qd0va75i2q89jcw1126q8pcbv0235g7p2a86z"; depends=[survival]; }; +crrstep = derive { name="crrstep"; version="2014-07.16"; sha256="15di36j44wxvwl7zhnz3s16lf65rnpj1bvgxf0glkkm0pw94ibrl"; depends=[cmprsk]; }; +crs = derive { name="crs"; version="0.15-23"; sha256="0psb0qaj7xxpfsxylzyzsc4pzfybrrzjzgmr974znaqqwkngdkl4"; depends=[boot]; }; +csSAM = derive { name="csSAM"; version="1.2.4"; sha256="1ms8w4v5m9cxs9amqyljc2hr1178cz6pbhmv7iiq9yj1ijnl4r1x"; depends=[]; }; +csampling = derive { name="csampling"; version="1.2-2"; sha256="0gj85cgc3lgv7isqbkng4wgzg8gqcic89768q2p23k4jhhn6xm2w"; depends=[marg statmod survival]; }; +cshapes = derive { name="cshapes"; version="0.4-2"; sha256="015mkh0iwdbhpbk8gpnq48pp026mfidd69rj70arpmg3knd2jvff"; depends=[sp maptools plyr]; }; +cslogistic = derive { name="cslogistic"; version="0.1-3"; sha256="1s8p3qpz81nn6zr0pzw6h9ca3p6ahd8zj640vy5gcb5waqwj6bfj"; depends=[mvtnorm]; }; +csn = derive { name="csn"; version="1.1"; sha256="1cv5pv6g1b635c5bamq43339vh1rxadwjl4vxyrx56991wyr36sl"; depends=[mnormt]; }; +cstar = derive { name="cstar"; version="1.0"; sha256="1zws4cq5d37hqdxdk86g85p2wwihbqnkdsg48vx66sgffsf1fgxd"; depends=[]; }; +csvread = derive { name="csvread"; version="1.1"; sha256="0bk6jjjv88d7l511a5fa1530i8pnzr3brambchl69mv9h6si14bq"; depends=[]; }; +cts = derive { name="cts"; version="1.0-19"; sha256="16f6nah3w63bz8b9xlhi3a7mpkiywq6gqkxgm5am90g0bqg5j3py"; depends=[]; }; +ctv = derive { name="ctv"; version="0.8-0"; sha256="1rh38i872hmhj36lmpg7c2p0p7hcvy2kfr5bfl9w7mqn9d9n39qs"; depends=[]; }; +cubature = derive { name="cubature"; version="1.1-2"; sha256="1vgyvygg37b6yhy8nkly4w6p01jsqg2kyam4cn0vvml5vjdlc18a"; depends=[]; }; +cubfits = derive { name="cubfits"; version="0.1-0"; sha256="0iylwxzz2aa70q1xqk8r1rkfiiscj3blwq7dshkwshh91l2fgzfw"; depends=[]; }; +cudaBayesreg = derive { name="cudaBayesreg"; version="0.3-15"; sha256="02akp2ib06hqb1vfqj27vj4y5m0pimy6qg69argq6g0bz5msrgp8"; depends=[cudaBayesregData oro_nifti]; }; +cudaBayesregData = derive { name="cudaBayesregData"; version="0.3-11"; sha256="1cls9xqgps7icjpi1mllkrksdxwc1jfhxgffvrcrqx2l16vw6qfx"; depends=[]; }; +cudia = derive { name="cudia"; version="0.1"; sha256="1ms3bc8sp6l3bm75j418mmb707sy3gyvxznhfias3nd4sw7i074x"; depends=[MCMCpack mvtnorm]; }; +cumSeg = derive { name="cumSeg"; version="1.1"; sha256="01hn3j1i7bi2r9vsqwbgy1f1alcisxyf4316xx57bg82lb34d0s5"; depends=[lars]; }; +cumplyr = derive { name="cumplyr"; version="0.1-1"; sha256="07sz1wryl3kxbk67qyvnkrkdrp4virlsaia0y6rf9bqdw7rc6vi2"; depends=[]; }; +curl = derive { name="curl"; version="0.2"; sha256="014mmchzngb3pwxf35127w72dn7fi8jh4d9dqi51lan5yszbsrn3"; depends=[]; }; +currentSurvival = derive { name="currentSurvival"; version="1.0"; sha256="0bqpfwf4v4pb024a98qwg81m6zd7ljg1ps42ifhxpqx7b9gdyi6c"; depends=[survival cmprsk]; }; +curvHDR = derive { name="curvHDR"; version="1.0-3"; sha256="0rq72prxv2r5nicss9mh4wpkfjvlbb885w85ag4qrqijzq6y8q04"; depends=[feature geometry hdrcde ks misc3d ptinpoly rgl]; }; +curvetest = derive { name="curvetest"; version="2.2"; sha256="1lz6rx9fmgyrlci1dyanscp2a18ki9lhrwnrzhp062flysffimg6"; depends=[locfit R_oo R_methodsS3]; }; +cutoffR = derive { name="cutoffR"; version="1.0"; sha256="1801jylmpp4msyf07rhg4153kky1zvi4v0kkjb9d51dc7zkhh531"; depends=[ggplot2 reshape2]; }; +cuttlefish_model = derive { name="cuttlefish.model"; version="1.0"; sha256="1rmkfyfd1323g2ymd5gi1aksp160cwy5ha5cjqh5r6fzd8hhqjxs"; depends=[]; }; +cvAUC = derive { name="cvAUC"; version="1.0.2"; sha256="0472hy9pmkfbdqns5cha23qqxp236n5yfzapysi0gbwqqy0jk824"; depends=[ROCR]; }; +cvTools = derive { name="cvTools"; version="0.3.2"; sha256="0b7xb6dmhqbvz32zyfbdvm9zjyc59snic6wp1r21ina48hchn3sj"; depends=[lattice robustbase lattice robustbase]; }; +cvplogistic = derive { name="cvplogistic"; version="3.1-0"; sha256="1lm66nn0q7665r64rdslxp35b7drdss4mys42ks54xdydcminns9"; depends=[]; }; +cvq2 = derive { name="cvq2"; version="1.2.0"; sha256="19k95xg2y3wd4mx3wvbrc1invybd446g13vsp3dv05nw2kx4f6w8"; depends=[]; }; +cvxclustr = derive { name="cvxclustr"; version="1.1.1"; sha256="0idmx4wgz4d0b1xzmlq5bsk2f2q38lpf9c117hg97xsfndzn7vqj"; depends=[Matrix igraph]; }; +cwhmisc = derive { name="cwhmisc"; version="5.0"; sha256="0b70ssss48kpjyimwm8hwcx82whg77j40qxaaj4vhhqc8d2bzgd2"; depends=[lattice]; }; +cwm = derive { name="cwm"; version="0.0.3"; sha256="1ln2l12whjhc2gx38hkf3xx26w5vz7m377kv67irh6rrywqqsyxn"; depends=[MASS matlab permute]; }; +cxxfunplus = derive { name="cxxfunplus"; version="1.0"; sha256="0kyy5shgkn7wikjdqrxlbpfl3zkkv4v1p8a1vv0xkncwarjs4n8d"; depends=[inline]; }; +cycloids = derive { name="cycloids"; version="1.0"; sha256="00pdxny11mhfi8hf76bfyhd1d53557wcbl2bqwjzlpw5x3vdnsan"; depends=[]; }; +cyphid = derive { name="cyphid"; version="1.1"; sha256="0ya9w8aw27n0mvvjvni4hxsr4xc8dd08pjxx7zkfl1ynfn5b08am"; depends=[fda]; }; +cytoDiv = derive { name="cytoDiv"; version="0.5-3"; sha256="00c0gqgypywgbhavb15bvj6ijrk4b5zk86w85n9kwr4069b7jvwc"; depends=[GenKern plotrix]; }; +d3Network = derive { name="d3Network"; version="0.5.1"; sha256="1nc5gca9jsny5jj8m37081l3rwvmp1cxqpqaimzyr475j6cac40r"; depends=[plyr rjson whisker]; }; +dae = derive { name="dae"; version="2.1-7"; sha256="0wchpq8hg2s33nm86dj6vqqvajg2062gbrxg6z7n9i2r6s1hmdjv"; depends=[lattice]; }; +daewr = derive { name="daewr"; version="1.0-10"; sha256="09ra3zkmvxdxn0fvrbzixvvgddb066bba9q5zih5kifc8kd0a5xp"; depends=[FrF2 BsMD]; }; +dafs = derive { name="dafs"; version="1.0-37"; sha256="1vdi57qaqdn39yf1ih2gzry02l289q4bffpksglsl4shs6bg2206"; depends=[s20x]; }; +dagR = derive { name="dagR"; version="1.1.3"; sha256="13jyhwjvvrjjja18rqzfdcw9ck90qm5yjwd25nygxgdf1894y03b"; depends=[]; }; +dagbag = derive { name="dagbag"; version="1.1"; sha256="1hpg7fs1yhnycziahscymkr0s3a2lyasfpj0cg677va73nrpdz12"; depends=[]; }; +dams = derive { name="dams"; version="0.1"; sha256="0h0chh9ahsfvqhv1a0dfw88q7gdl1d0w11qcw0w4qmc2ipsl52i6"; depends=[RCurl]; }; +darch = derive { name="darch"; version="0.9.1"; sha256="0syrzmmz43msd51whkb4xy5n0kgcl50yw4w3i9sdd9k20glvwpsx"; depends=[futile_logger ff]; }; +darts = derive { name="darts"; version="1.0"; sha256="07i5349s335jaags352mdx8chf47ay41q7b0mh2xjwn2h9kzgqib"; depends=[]; }; +data_table = derive { name="data.table"; version="1.9.4"; sha256="0gsnjjly3mxwfs6q0kjr42vr234mprp8kcyzcsa4dqf2ya2gs1s6"; depends=[chron reshape2]; }; +dataQualityR = derive { name="dataQualityR"; version="1.0"; sha256="0f2410sd6kldv7zkqsmbz1js0p5iq7zwlnfwmmnlbrd303p35p3j"; depends=[]; }; +dataRetrieval = derive { name="dataRetrieval"; version="2.0.0"; sha256="11385x2yp6fv5mqa47q58ijxfb895himcjk1ac3pkhbqzkwqzphx"; depends=[XML RCurl reshape2 lubridate plyr httr]; }; +datacheck = derive { name="datacheck"; version="1.0.4"; sha256="1ns5cmsvmqswzpa33mqcmj92b4j3l32v29ki3crg0kayrpdmyrbw"; depends=[Hmisc shiny stringr]; }; +dataframes2xls = derive { name="dataframes2xls"; version="0.4.6"; sha256="18m4cbr3pxdn5ynxwd8klwwli3cyfjcn83pl17sn1rbavqlnkq5c"; depends=[]; }; +datalist = derive { name="datalist"; version="0.2"; sha256="0q82wira0sfi63cn66f5cfyd15f19ig7pbmpk56j38a3115l2fmn"; depends=[assertthat]; }; +datamap = derive { name="datamap"; version="0.1-1"; sha256="0qm4zb9ldg4wz1a7paj5ilr1dhyagq81rk9l2v43hmkv52sssgkv"; depends=[DBI]; }; +datamart = derive { name="datamart"; version="0.5.2"; sha256="0c0l157fzkcp30ch4ymaalcx18zhz6sa5srr50w9izhbx3pmldxp"; depends=[RJSONIO XML RCurl base64 gsubfn markdown]; }; +datamerge = derive { name="datamerge"; version="1.0-1"; sha256="03xb48igkh0f91iq6qc2j5xzqfy2n51ci5i850gn09mm9k4lxij1"; depends=[xtermStyle]; }; +datautils = derive { name="datautils"; version="0.1.4"; sha256="0adg87p9rzz62cm0s80x71mhsg3yfg93gskv1hs1l8gaj78zd1y1"; depends=[deldir gplots gtools]; }; +dataview = derive { name="dataview"; version="2.0-9"; sha256="0519h2c33v04vwdd8nz9xmqha15svhxdj761d68qmi52jrw6858d"; depends=[xtermStyle]; }; +date = derive { name="date"; version="1.2-34"; sha256="066zsddpw87x1bhl3479k6fd1wrl3x91n5rd454diwmwq2s8i5qb"; depends=[]; }; +dave = derive { name="dave"; version="1.5"; sha256="0sw9hc4y9wdfbnnk6isg7z7sky6ni68pkjxdlrph5m7jcyqphz96"; depends=[labdsv vegan]; }; +dawai = derive { name="dawai"; version="1.1"; sha256="0icf8iys980z0agyba94xa16400p2vdvg8hg52vvlgfc85ikqfkx"; depends=[mvtnorm ibdreg boot]; }; +db_r = derive { name="db.r"; version="0.1.0"; sha256="0mw7zi25wkdpq8xa59fk0xszvncychfz3k8n8bgp4sclz1m8j0m2"; depends=[DBI rjson stringr]; }; +dbConnect = derive { name="dbConnect"; version="1.0"; sha256="1vab5l4cah5vgq6a1b9ywx7abwlsk0kjx8vb3ha03hylcx546w42"; depends=[RMySQL gWidgets]; }; +dbEmpLikeGOF = derive { name="dbEmpLikeGOF"; version="1.2.4"; sha256="0vhpcxy702cp3lvlif2fzmvccys8iy7bv1fbg6ki2l8bvn2f7c5p"; depends=[]; }; +dbEmpLikeNorm = derive { name="dbEmpLikeNorm"; version="1.0.0"; sha256="0h5r2mqgallxf9hin64771qqn9ilgk1kpsjsdj2dqfl3m8zg967l"; depends=[dbEmpLikeGOF]; }; +dbarts = derive { name="dbarts"; version="0.8-5"; sha256="1w170mdfl5qz7dv1p2kqx0wnkmbz2gxh2a4p7vak1nckhz2sgpgn"; depends=[]; }; +dblcens = derive { name="dblcens"; version="1.1.7"; sha256="02639vyaqg7jpxih8cljc8snijb78bb084f4j3ns6byd09xbdwcw"; depends=[]; }; +dbmss = derive { name="dbmss"; version="2.1.2"; sha256="0rvmxlpy3745y4zfcf6wi6z2nb3vwd92cliyvh6k0ppgq6r7l2q0"; depends=[spatstat Rcpp cubature Rcpp]; }; +dbstats = derive { name="dbstats"; version="1.0.3"; sha256="1l7yy6m98pkkrzycxcajjjw2h0crbm0fazyq9xg8875ar29i291p"; depends=[cluster pls]; }; +dcGOR = derive { name="dcGOR"; version="1.0.3"; sha256="1qv4c9kqvm7rig573d4mb5iccz9wp6nmynd8kpf3d9ipijf9p365"; depends=[Matrix igraph dnet]; }; +dcemriS4 = derive { name="dcemriS4"; version="0.51"; sha256="14ir9g4jg8asim8f33wizmvj6vm96583h212yygsa6yc301bhad8"; depends=[oro_nifti]; }; +dclone = derive { name="dclone"; version="2.0-0"; sha256="1j8g955rvdgcmc9vnz3xizlkq8w1bslav5h72igvzzffcvqbj9hq"; depends=[coda]; }; +dcmle = derive { name="dcmle"; version="0.2-4"; sha256="0ddb0x0lwk8jgx05k747sa33d2rrj4g2p4aj0m5bw1c9d5gril0m"; depends=[dclone rjags coda lattice]; }; +dcmr = derive { name="dcmr"; version="1.0"; sha256="1a89wr1n8sykjbwa316zlmcffaysksrqnbd89anxqj8sgw9xv6jq"; depends=[ggplot2 KFAS plyr reshape2 tableplot]; }; +dcv = derive { name="dcv"; version="0.1.1"; sha256="12c716x8dnxnqksibpmyysqp2axggvy9dpd55s9bhnsvqvi6dshj"; depends=[lmtest]; }; +ddalpha = derive { name="ddalpha"; version="1.0.6"; sha256="1scfmq6zsbd15n6mnnplj0c4a0yl8bp7nqqh91cvvycggb5y0a1v"; depends=[MASS class robustbase BH]; }; +ddepn = derive { name="ddepn"; version="2.2"; sha256="1zwz664jq6qvf1lcwyfn6kyn6dwxhh2nnyirayx0vqs9c6xzpir7"; depends=[lattice coda igraph gam gplots]; }; +ddst = derive { name="ddst"; version="1.03"; sha256="0zbqw4qmrh80jjgn8jzbnq3kykj1v5bsg6k751vircc0x9vnig3j"; depends=[orthopolynom evd]; }; +deSolve = derive { name="deSolve"; version="1.11"; sha256="014fbrgzlarg2w27kq9qy7631hvhlf7ldrn5g8x2xibb260832s1"; depends=[]; }; +deTestSet = derive { name="deTestSet"; version="1.1.1"; sha256="1qc8sj44zlndyr9k5r179pmy8kyq0wawz7q2xgdmnx27j2rjls43"; depends=[ReacTran]; }; +deal = derive { name="deal"; version="1.2-37"; sha256="1nn2blmxz3j5yzpwfviarnmabbyivc25cbfhcf814avrhpysvpxa"; depends=[]; }; +deamer = derive { name="deamer"; version="1.0"; sha256="1xbxr78n6s1yhf192ab4syi1naqlwl9z4cxzchrkw80q7bxqfiz8"; depends=[]; }; +debug = derive { name="debug"; version="1.3.1"; sha256="0mpwi6sippxyr1l8xf48xqv6qw6pmfkxs13k1gjyd7bkzlbchgqd"; depends=[mvbutils]; }; +decctools = derive { name="decctools"; version="0.2.0"; sha256="0k5w49s9s51m7w1h5adk26nw1ypwv5g1mlal78qmx5a4jzaf5bw9"; depends=[XLConnect stringr XML reshape2 RCurl lubridate plyr]; }; +decompr = derive { name="decompr"; version="1.2"; sha256="0fklg2xv4xbd9bxvmgm2gz0gc3pb4g54xl5gb28r80cm29vg1js4"; depends=[]; }; +decon = derive { name="decon"; version="1.2-4"; sha256="1v4l0xq29rm8mks354g40g9jxn0didzlxg3g7z08m0gvj29zdj7s"; depends=[]; }; +deducorrect = derive { name="deducorrect"; version="1.3-5"; sha256="06lcqnay36fgkzvgbiq7b67r9lfgll3lxfr1pmx14vmivshb6mmm"; depends=[editrules]; }; +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=[]; }; +deltaPlotR = derive { name="deltaPlotR"; version="1.5"; sha256="0hbaibl4b50pg9ypyhz4700w6kir4jiyyl0230a8hjmb92aqn303"; depends=[MASS]; }; +demi = derive { name="demi"; version="1.1.1"; sha256="19zszmjcczmz9qjp1dhvf92w134266w4qwskdpz36q72m5455zdb"; depends=[plyr R_utils]; }; +deming = derive { name="deming"; version="1.0-1"; sha256="00v59qb6qwbwsvcwi59d0c0g3czfz1190ccj4dx6yarizr4g6cy8"; depends=[boot]; }; +demoKde = derive { name="demoKde"; version="0.9-3"; sha256="1nkvsjms1gfvjz5l7zza0cgx4yqmn2kgnax44pysn0zqmhfny8bw"; depends=[]; }; +demography = derive { name="demography"; version="1.18"; sha256="17r7sz5ikngc4qg495wmn99xawmllpx7rw2gpv8q8bypbc47wlfv"; depends=[forecast rainbow ftsa cobs mgcv strucchange RCurl]; }; +dendextend = derive { name="dendextend"; version="0.17.5"; sha256="0mjmxmkla4vhni0bgm6z9375pjcghccd10595bq1z84g1fxzqrjc"; depends=[magrittr whisker]; }; +dendextendRcpp = derive { name="dendextendRcpp"; version="0.5.1"; sha256="062f7yjsg196v8c09h6gvbhi0fzgwg40a8xhi751avkjc68z30cq"; depends=[Rcpp dendextend Rcpp]; }; +dendroextras = derive { name="dendroextras"; version="0.2.1"; sha256="0k1w374r4fvfcbzhrgcvklccjggyz755z7wc2vqfi3c5hvdb9ns4"; depends=[]; }; +dendsort = derive { name="dendsort"; version="0.3.2"; sha256="0qj65jraj6ksmsfsrc4f3y8m7x5lqg9bqc9yb5s3bav2r8qjyhv6"; depends=[]; }; +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]; }; +depmix = derive { name="depmix"; version="0.9.12"; sha256="0brs6cskrk52dn41zaqa59dxz377sl9lnh89457d3ykbj4jbc97c"; 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]; }; +depthTools = derive { name="depthTools"; version="0.4"; sha256="1699r0h1ksgrlz9xafw2jnqfsc7xs0yaw97fc6dv3r11x6gxk00y"; depends=[]; }; +descomponer = derive { name="descomponer"; version="1.1"; sha256="0yw3659lv3y187hwszf6vpqb3w2mvaxjn380xkxkbggdkcxhrb9r"; depends=[taRifx]; }; +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=[]; }; +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]; }; +devEMF = derive { name="devEMF"; version="1.2"; sha256="14nqx1gy6hlkmzrrayd7kgljla9flxx4xm329436znd66184sass"; depends=[]; }; +devtools = derive { name="devtools"; version="1.6.1"; sha256="0aza8y80bb9cv8i9vx1w2511qzf0anssig5xry0mnnpdipk7gjb5"; depends=[httr RCurl memoise whisker evaluate digest rstudioapi jsonlite]; }; +df2json = derive { name="df2json"; version="0.0.2"; sha256="10m7xn7rm4aql1bzpckjcx5kvdw44m1pxgzqkgkd40lzqb1cwk18"; depends=[rjson]; }; +dfcomb = derive { name="dfcomb"; version="1.0-1"; sha256="159lgcsanhxiip18f9cgsska1nij7yg9rrxfnyhyk3l7d8vf1liq"; depends=[BH RcppProgress Rcpp]; }; +dfcrm = derive { name="dfcrm"; version="0.2-2"; sha256="1kwgxfqnz2bcicyb27lp6bnvrj30lqjpn5fg7kaqshgkj53g0s4f"; depends=[]; }; +dfexplore = derive { name="dfexplore"; version="0.2.1"; sha256="04nbhn59l1kas26nwj4qflkjvvr33sj1mm7zg7fhvya85gvlhrbf"; depends=[ggplot2]; }; +dfmta = derive { name="dfmta"; version="1.0-3"; sha256="1nv9wdvj4lc3zs05v99fksdsjrjhx0b10p06ah8jbb76qh9p4v3r"; depends=[RcppArmadillo BH RcppProgress Rcpp]; }; +dfoptim = derive { name="dfoptim"; version="2011.8-1"; sha256="19j0h5xdrbmykz2nrjrwqwaw7466zvqaiwafrm1jc12mk5azfcqx"; depends=[]; }; +dglars = derive { name="dglars"; version="1.0.5"; sha256="02g8x4p98jv3cfwfxvh68aivb72651w4977g4xqksq0p4nqcs636"; depends=[]; }; +dglm = derive { name="dglm"; version="1.8.1"; sha256="12q49nf30ji4c7vysf2s48bif7crwlmqn8cx0wy23xlhj5x2p4b3"; depends=[statmod]; }; +dgmb = derive { name="dgmb"; version="1.1"; sha256="134ckgq7rsdypg3c586kkhr9rx5ya34smp38i9lzvbdanzrpf33w"; depends=[MASS abind]; }; +dgof = derive { name="dgof"; version="1.2"; sha256="02qnb3i131hx05k8l5n3xbl5sqmmc2fh19bsgcacgj8ixs4wyjvi"; depends=[]; }; +dhglm = derive { name="dhglm"; version="1.2"; sha256="14wa0xkwb1qvkynk95aw6y4rx3jjdki19wdydg3wv5nfagcc4vdz"; depends=[Matrix numDeriv boot]; }; +diagram = derive { name="diagram"; version="1.6.3"; sha256="1iga574r31hz7g50nmicbah4rj4l46w6lgw3sz1b69iv6hpp7sq1"; depends=[shape]; }; +diaplt = derive { name="diaplt"; version="1.2.1"; sha256="0pya6rqzsvc5nd3smhydvabarglc4nn04q605vbllmbhq9rv00pa"; depends=[]; }; +dice = derive { name="dice"; version="1.2"; sha256="0gic7lqnsdmwv3dbzwwmcwdfyfqlq8kpr2pciqphd1j2ligzwl3s"; depends=[gtools]; }; +dichromat = derive { name="dichromat"; version="2.0-0"; sha256="1l8db1nk29ccqg3mkbafvfiw0775iq4gapysf88xq2zp6spiw59i"; depends=[]; }; +dicionariosIBGE = derive { name="dicionariosIBGE"; version="1.6"; sha256="1rss1ydhcn6sma2lmlpq6s0h3dglwc20w499x1jzkcjnzc1rc7gl"; depends=[]; }; +dielectric = derive { name="dielectric"; version="0.2.3"; sha256="1p1c0w7a67zxp1cb99yinylk5r1v89mmpfybcy94ydydhydbhivk"; depends=[]; }; +difR = derive { name="difR"; version="4.5"; sha256="0qlaqpywyjggw74h5y5r2aivcyknc6b7l8b1p69g3lyx4d2hz8wp"; depends=[lme4 ltm]; }; +diffEq = derive { name="diffEq"; version="1.0"; sha256="17b6yw5xhlk70wvv58348hy1237sjwkxfrgkyw876piy50dxmnz8"; depends=[deSolve rootSolve bvpSolve ReacTran diagram deTestSet scatterplot3d]; }; +diffIRT = derive { name="diffIRT"; version="1.4"; sha256="13axwzsrlr1akj4viwsyaplh11krixg3l07qi58c81jrcrmqpgv1"; depends=[statmod]; }; +diffdepprop = derive { name="diffdepprop"; version="0.1-9"; sha256="0mgrm1isr26v2mcm6fkzc7443ji00vpnqmw4zngx81n7442b3cl2"; depends=[gee rootSolve PropCIs]; }; +diffractometry = derive { name="diffractometry"; version="0.1-8"; sha256="1m6cyf1kxm9xf1z4mn4iz0ggiy9wcyi8ysbgcsk7l78y7nqh1h99"; depends=[]; }; +diffusionMap = derive { name="diffusionMap"; version="1.1-0"; sha256="1l985q2hfc8ss5afajik4p25dx628yikvhdimz5s0pql800q2yv3"; depends=[scatterplot3d igraph Matrix]; }; +digest = derive { name="digest"; version="0.6.4"; sha256="06xbklq6laffv609hsfqyj04fhdnr9bgjh6ala7253h9vvkjch1k"; depends=[]; }; +dils = derive { name="dils"; version="0.8.1"; sha256="1q6ba9j14hzf7xy895mzxc6n9yjgind55jf350iqscwzxf7ynp33"; depends=[igraph Rcpp Rcpp]; }; +dinamic = derive { name="dinamic"; version="1.0"; sha256="0mx72q83bbwm10ayr3f1dzwr5wgz7gclw7rh39yyh95slg237nzr"; depends=[]; }; +diptest = derive { name="diptest"; version="0.75-6"; sha256="158azvdf76h5mp26lw2mjzwp4hwc2psqd9kn5989y4a1jmzxp2bg"; depends=[]; }; +directPA = derive { name="directPA"; version="1.0"; sha256="16bllp7afb83y73zr5wxfkad7vxzfqwdmhcxfa5jml4hlvkhgv1r"; depends=[]; }; +directlabels = derive { name="directlabels"; version="2013.6.15"; sha256="083cwahz320r4w4jbh62pxmzn1i1hixp398zm8f2fpzh4qp5y44g"; depends=[quadprog]; }; +dirmult = derive { name="dirmult"; version="0.1.3-4"; sha256="1r9bhw1z0c1cgfv7jc0pvdx3fpnwplkxwz8j8jjvw14zyx803rnz"; depends=[]; }; +disclap = derive { name="disclap"; version="1.5"; sha256="0piv9gxhxcd4pbh5qjn9c3199f32y3qiw5vy8cr77ki70dnmr66n"; depends=[]; }; +disclapmix = derive { name="disclapmix"; version="1.5"; sha256="03y1ajaz52kar5wj8csh66kdm8ywin9jpwnj40mkz6fjqi50lhb1"; depends=[Rcpp disclap cluster Rcpp]; }; +discreteMTP = derive { name="discreteMTP"; version="0.1-2"; sha256="13qsf1kc3rph0kkdkz31qj072www5dwjyk73lfpy141rzhcn1v1x"; depends=[]; }; +discreteRV = derive { name="discreteRV"; version="1.1.2"; sha256="1mq05an70m7k36ip22igbmb2i63gxxf7y9ivb5wn25yx0fynarpk"; depends=[]; }; +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.2"; sha256="0sl8cxd0iq0cb1qqkhqcxikzwq361k4891vig15n3z8aj39vn0dw"; 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]; }; +displayHTS = derive { name="displayHTS"; version="1.0"; sha256="0mqfdyvn2c5c3204ykyq29ydldsq0kb3a1d7mrzqr7cvrj1ahlqa"; depends=[]; }; +dispmod = derive { name="dispmod"; version="1.1"; sha256="141gzhnmxxl495cpjgd4wnvdrbz6715m6sd1pycrbaqrsdc1pv57"; depends=[]; }; +disposables = derive { name="disposables"; version="1.0.0"; sha256="0xd8war6vav8swpwgmyi9hd6xv0j6j72yrk4sdcwiwzgs4l8cbfj"; depends=[]; }; +dissUtils = derive { name="dissUtils"; version="1.0"; sha256="00fzlmkdfw2s3k824wp2pk3v7cvxnywi1hfp86g4mm95z2qlw9br"; depends=[]; }; +distfree_cr = derive { name="distfree.cr"; version="1.0"; sha256="13y714l6b3kkpp75fdrsbdclgj1vw1xsvbj9pxi4lkwf11wwmrqr"; depends=[]; }; +distillery = derive { name="distillery"; version="1.0-1"; sha256="0hfj4qbfb5219dm7yrgf2h4jrh2qsjhwrbv8gbrxcr0xf6gqbxmv"; depends=[]; }; +distory = derive { name="distory"; version="1.4.2"; sha256="12j19cb1b4prm8m43gya15kia1ii1k0yy7hkngpn2vsyk7n2z65m"; depends=[ape]; }; +distr = derive { name="distr"; version="2.5.3"; sha256="13ssdidbh4x534f0vvhfpi5cdrhlpmrz8s0y33q7ccf3dfmdsyan"; depends=[startupmsg sfsmisc SweaveListingUtils]; }; +distrDoc = derive { name="distrDoc"; version="2.5"; sha256="104y8q7p53pzwr5pgspa0zczmnhylac2k9aj9flqd75ka6icfqh8"; depends=[distr distrEx distrSim distrTEst distrTeach RandVar distrMod MASS SweaveListingUtils startupmsg]; }; +distrEllipse = derive { name="distrEllipse"; version="2.5"; sha256="1slzzmcf09mqqba287rpgpwbsq6j5lprjgxda5lrc21znvrgfxn3"; depends=[mvtnorm setRNG distr distrEx distrSim]; }; +distrEx = derive { name="distrEx"; version="2.5"; sha256="0mbccd53r9wl875i702j14wlrv7pjgrwzlnyc511cqa5pg3mn81i"; depends=[distr]; }; +distrMod = derive { name="distrMod"; version="2.5.3"; sha256="1xa6a8fxhb87z4bimvnrylm63q9m90kmm49w2dik79a9d5x5q29b"; depends=[distr distrEx RandVar MASS sfsmisc startupmsg]; }; +distrRmetrics = derive { name="distrRmetrics"; version="2.5"; sha256="0c7fhckw7hav68gag8ymgicywl2vbnvqpjxca0x24wpdi1gs4jf6"; depends=[distr fBasics fGarch]; }; +distrSim = derive { name="distrSim"; version="2.5.2"; sha256="0ipg4l2vyifaj1r9a4cc8kg32s65jpz5wxrlnrix95xk5wasdpbh"; depends=[setRNG distr]; }; +distrTEst = derive { name="distrTEst"; version="2.5"; sha256="1swl4v70gkkpidddsgqf0dqz9j0xz5j1wk44bhpi4ficim7hap3l"; depends=[setRNG distrSim startupmsg]; }; +distrTeach = derive { name="distrTeach"; version="2.5"; sha256="0a7qfqpirzcd94dvcvmprhhj2j1yl3lpizsi8mdqr19zcp6dw21k"; depends=[distr distrEx]; }; +distrom = derive { name="distrom"; version="0.3-1"; sha256="17x58lx411wlb153rv1nlmf1g528w1az8nsswvwscv15n7bvdkdf"; depends=[Matrix gamlr]; }; +divagis = derive { name="divagis"; version="1.0.0"; sha256="1kcz7i3h9xxpqhlq0rl08pgcwd16ygjjmm0jjv9knn2ggc3j1jzz"; depends=[rgdal sp]; }; +diveMove = derive { name="diveMove"; version="1.3.9"; sha256="0782b8fvh676g6fy05g1da52q398rxmgz46vk6yxwrmnvg78wcq5"; depends=[caTools KernSmooth quantreg geosphere]; }; +diveRsity = derive { name="diveRsity"; version="1.9.5"; sha256="0rybnjkkxsam0fhsfcxb2h00p65169iw8kb7xgzzgzdfi258zp9s"; depends=[ggplot2 shiny qgraph Rcpp Rcpp]; }; +diversitree = derive { name="diversitree"; version="0.9-7"; sha256="0hr3hzrrbmfqbzcwn18lnqmychs9f21j1x214zry0jmw9pnai0s0"; depends=[deSolve ape subplex Rcpp Rcpp]; }; +dixon = derive { name="dixon"; version="0.0-5"; sha256="0x7x0l7p8kmkfqqqah8hck2r96b3w8padd41skd3q35vq8kmnsqc"; depends=[splancs spatstat]; }; +dkDNA = derive { name="dkDNA"; version="0.1.0"; sha256="1waqj8l48yqlzi3rb3ilxyx79n5d4w0sp02flvynwaxck6jvh8gc"; depends=[]; }; +dlm = derive { name="dlm"; version="1.1-4"; sha256="0hyphl90bqc16j7in750pmiyq28hmc46kxgv7gj17c8xl9c9xqxm"; depends=[]; }; +dlmap = derive { name="dlmap"; version="1.13"; sha256="0s6wlkggkm3qndwyvw72xv1n0mcjb7ss3ajbq2ll6rv30splq0db"; depends=[qtl ibdreg wgaim nlme mgcv]; }; +dlmodeler = derive { name="dlmodeler"; version="1.4-2"; sha256="06gqvk2wrzz4kpsh4vyrbqwmxirsvg78qj7clvcxdac0sfqn4gl7"; depends=[KFAS]; }; +dlnm = derive { name="dlnm"; version="2.1.3"; sha256="044khdhk4dgd09cwmidsfa2rgd43h7wnd48bmmrnsvj3314bic0f"; depends=[nlme]; }; +dma = derive { name="dma"; version="1.2-2"; sha256="18v40rr4qx98ap38vr77xxvl7y3a6cqfky3z4s5zc87q6y1z5g2s"; depends=[MASS mnormt]; }; +dmt = derive { name="dmt"; version="0.8.20"; sha256="0rwc8l9k2y46hslsb3y8a1g2yjxalcvp1l3v7jix0c5kz2q7917w"; depends=[mvtnorm MASS Matrix]; }; +dna = derive { name="dna"; version="1.1-1"; sha256="0gw70h1j67h401hdvd38d6jz71x1a6xlz6ziba6961zy6m3k5xbm"; depends=[]; }; +dnet = derive { name="dnet"; version="1.0.6"; sha256="0zhv2yfrlhfwjbgbvjzmw3c5g5rj33n8l2npdf6b4nqz0c0hc1jn"; depends=[igraph Matrix]; }; +doBy = derive { name="doBy"; version="4.5-12"; sha256="0ivrkvpwvvfd3sfsqlw4hwvzg87bdx227xv0jyzs31j2z18bw1v3"; depends=[survival MASS Matrix]; }; +doMC = derive { name="doMC"; version="1.3.3"; sha256="0g5psgk92b2zk9fkap3a86haay2y0kfz75cyk3d1ila9m7cd2cn4"; depends=[foreach iterators]; }; +doMPI = derive { name="doMPI"; version="0.2"; sha256="0cvws4zwbjj9ji0s69qy1843404a221pyxg9y35ihfcrjknfjc0l"; depends=[foreach iterators Rmpi]; }; +doParallel = derive { name="doParallel"; version="1.0.8"; sha256="1z6cwqnjvqsbck44padqkv4r75cy32p5vrlkkan4mq84cc8062nx"; depends=[foreach iterators]; }; +doRNG = derive { name="doRNG"; version="1.6"; sha256="0yvg4052gfdh54drn6xnpiqyd77p8765yi525nag3ismw2yn9y58"; depends=[foreach rngtools iterators pkgmaker]; }; +doRedis = derive { name="doRedis"; version="1.1.1"; sha256="10ldfzq6m83b9w24az9bf5wbfm6y9gi233s8qgsk4dnr84n3nizx"; depends=[rredis foreach iterators]; }; +doSNOW = derive { name="doSNOW"; version="1.0.12"; sha256="0j71n0l9lbvwllw9iigvjgv0x8z2j57grl3yazkgcyzy0mcgf741"; depends=[foreach iterators snow]; }; +docopt = derive { name="docopt"; version="0.3"; sha256="1qiivvbqx9mirzqqg3wbj7mi5fdw5xjsq983pq4fpms6fpx4j9kq"; depends=[stringr]; }; +documair = derive { name="documair"; version="0.6-0"; sha256="1pphcbx90n9xn8a7gvfrwzfapwqgpbl3gg2grm7chfxgcp7i99i2"; depends=[]; }; +domino = derive { name="domino"; version="0.2-1"; sha256="1ix7m8khlxdn1axxc1jxvjmqd0np2h2z5nb9i188jk3zzpdw11ka"; depends=[]; }; +dosresmeta = derive { name="dosresmeta"; version="1.3.0"; sha256="0yfm8dkds8abdl6jrib5vvgkyrd5cl5a99qs27safxx0fcpdiz4k"; depends=[mvmeta aod Matrix]; }; +dostats = derive { name="dostats"; version="1.3.1"; sha256="0xcp9arpvqb7am6caiazlgllvd3hhk4gqjd2wizr2jc5dkwfl4qn"; depends=[]; }; +dotenv = derive { name="dotenv"; version="1.0"; sha256="1lxwvrhqcwj9q24x30xzrw8qqhxgyr88ja3fajm5hf3pwbw85yls"; depends=[magrittr falsy]; }; +downloader = derive { name="downloader"; version="0.3"; sha256="0jpq8z3i9fkgs8wwjrq5qd7qfi5w3rxmzmsi1c1dxlnxzzhg6kxq"; depends=[digest]; }; +dpa = derive { name="dpa"; version="1.0-3"; sha256="0chkbbqxpq5fmqzr74jvflls9h0i2y25jp8gvlg3pfam9j07w7i5"; depends=[sem igraph]; }; +dpcR = derive { name="dpcR"; version="0.1.3.1"; sha256="0nlzjq3b9i76l1ngvcd32c8jl3z6cwn2fhg75lrgrwl6fl2v46jb"; 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.0"; sha256="1rjb10adhycp16xav7z5c93jfcjwpcrp8cdiyab8skrijgzbp0vx"; depends=[gmp digest lattice stringr XML]; }; +dplyr = derive { name="dplyr"; version="0.3.0.2"; sha256="1b4bpr80qvi6k2m27qz4w78hp8hnh9395hcr38zyni5zj469fprw"; 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.8"; sha256="0plvdkk041giqx8cgph4vdcabq9nv5bvjwz0pvjmhvb3z7q15cgj"; depends=[MASS]; }; +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]; }; +drgee = derive { name="drgee"; version="1.0.1"; sha256="0vrmi3q6dhmk9z5168pdfhi18nkm4pgj4zx8d24r4k1jcqvgckl0"; depends=[nleqslv]; }; +drm = derive { name="drm"; version="0.5-8"; sha256="1p6ixd7hnv41gfmvan3rv9xzz1279hmrnvfrl6pxwzs9zcnbb53a"; depends=[]; }; +drmdel = derive { name="drmdel"; version="1.3"; sha256="0yflpja6r8cm4yv07ac1wic8w2iv0pwqpgh3ls2pjwv3vqzg7jrm"; depends=[]; }; +drsmooth = derive { name="drsmooth"; version="1.0"; sha256="1cxhj28dkll704kif040vqnp9grb61v891rswvyx7aa9216156px"; depends=[car clinfun mgcv multcomp pgirmess DTK segmented mvtnorm]; }; +ds = derive { name="ds"; version="3.0"; sha256="10xp575l0wh85wg32k3as02kgqm9ax9nx9i5kd5bkimfwg4qv745"; depends=[]; }; +dsample = derive { name="dsample"; version="0.91.1"; sha256="0nxx3x55zj089aq2shk7cg9bgh6xw7jnrr2qmlaq6bflwn58wn1q"; depends=[]; }; +dse = derive { name="dse"; version="2014.11-1"; sha256="0fl1av8zd0csbsk6fplcxgqsb50qr1baasw2jrqv6h83j2xwph2l"; depends=[tfplot tframe setRNG]; }; +dslice = derive { name="dslice"; version="1.1.4"; sha256="0srqw1kznbjl1v6dpgh7vsrpf9k3zj7j55zw9k50jsbw2z4xqzfw"; depends=[Rcpp ggplot2 scales Rcpp]; }; +dsm = derive { name="dsm"; version="2.2.5"; sha256="0sfsfzcsqnvjkc5l7h5xq8p2jsgwxfzds75sqs58a0kzagcm1b05"; depends=[mgcv mrds nlme ggplot2 statmod]; }; +dti = derive { name="dti"; version="1.2-0"; sha256="01z51x1fpsc79b298gsx5fq2y5w3pwiq58a13pm96a4mkyzzwhk7"; depends=[awsMethods adimpro rgl oro_nifti oro_dicom gsl]; }; +dtt = derive { name="dtt"; version="0.1-2"; sha256="0n8gj5iylfagdbaqirpykb01a9difsy4zl6qq55f0ghvazxqdvmn"; depends=[]; }; +dtw = derive { name="dtw"; version="1.17-1"; sha256="0kbf38a14k112vdi7yaql18w0sj694smlm6pmdw5q4sqpk7azhqg"; depends=[proxy]; }; +dualScale = derive { name="dualScale"; version="0.9.1"; sha256="11hqxprai0s5id6wk4n2q174r1sqx9fzw3fscvqd2cgw8cjn1iwl"; depends=[matrixcalc ff vcd lattice Matrix]; }; +dummies = derive { name="dummies"; version="1.5.6"; sha256="01f84crqx17xd6xy55qxlvsj3knm8lhw7jl26p2rh2w3y0nvqlbm"; depends=[]; }; +dummy = derive { name="dummy"; version="0.1.0"; sha256="004w6ymfah608c4rqjnzjy2kyxmcq6gxbh0zhqd82ljv7cah52my"; depends=[]; }; +dunn_test = derive { name="dunn.test"; version="1.2.0"; sha256="0r83x8qsazzkpnv6mbdzakhiacydd42sfgazzpx5536dwcvlb486"; depends=[]; }; +dupiR = derive { name="dupiR"; version="1.1"; sha256="01yhwgqm2y6znxds3p2admcyayvjj5xw7vvc9djd7b6ywsivb8sa"; 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]; }; +dyn = derive { name="dyn"; version="0.2-9"; sha256="16zd32567aj0gqv9chbcdgi6sj78pnnfy5k8si15v5pnfvkkwslp"; depends=[zoo]; }; +dynBiplotGUI = derive { name="dynBiplotGUI"; version="1.1.1"; sha256="1xngcr8r48yigm7gg5a06c9xl6zaj6s59izqrni1874x5ji39ql3"; depends=[tcltk2 tkrplot]; }; +dynCorr = derive { name="dynCorr"; version="0.1-2"; sha256="0qzhhfhkwpq6mwg7y6sxpqvcj8klvivnfv69g7x3ycha1kw2xk3w"; depends=[lpridge]; }; +dynaTree = derive { name="dynaTree"; version="1.2-7"; sha256="06pw78j6wwx7yc175bns1m2p5kg5400vg8x14v4hbrz3ydagx4dn"; depends=[]; }; +dynamicGraph = derive { name="dynamicGraph"; version="0.2.2.6"; sha256="1xnsp8mr3is4yyn0pyrvqhl893gdx2y1zv8d2d55aah2xbfk0fjj"; depends=[ggm]; }; +dynamicTreeCut = derive { name="dynamicTreeCut"; version="1.62"; sha256="1y11gg6k32wpsyb10kdv176ivczx2jlizs1xsrjrs6iwbncwzrkp"; depends=[]; }; +dynatopmodel = derive { name="dynatopmodel"; version="1.0"; sha256="1dq18wqbf7y597mbqv8fwwc5fm8l618mkqvb2l95bplq7n508hng"; depends=[raster xts shape fields rgeos maptools rgdal sp spam hydroGOF topmodel intervals]; }; +dynia = derive { name="dynia"; version="0.2"; sha256="1swip4kqjln3wsa9xl0g92zklqafarva923nw7s44g4pjdy73d5l"; depends=[]; }; +dynlm = derive { name="dynlm"; version="0.3-3"; sha256="0ym23gv2vkvvnxvzk5kh6xy4gb5wbnpdbgkb5s6zx24lh81whvcs"; depends=[zoo car lmtest]; }; +dynsim = derive { name="dynsim"; version="1.0"; sha256="0w4brs8kcps6gkamkic57nj61iz7zdxq972jwzs17i43wfcrw32c"; depends=[ggplot2 gridExtra MASS]; }; +dynsurv = derive { name="dynsurv"; version="0.2-2"; sha256="0418r7adki48pg3h7i1mgv3xpbryi520va3jpd03dx15zrq8zaqg"; depends=[survival reshape plyr nleqslv ggplot2 BH]; }; +e1071 = derive { name="e1071"; version="1.6-4"; sha256="0hakqawy8bz4hvjzz9dbc2pbqhaf1qjsgl0agz3qfg63974whw2i"; depends=[class]; }; +eHOF = derive { name="eHOF"; version="1.5.4"; sha256="0f4cf0zyln46kdzfnvz0i5rwmbvg1f79aqz0ci5b4q6kiaiiylcw"; depends=[mgcv lattice]; }; +eRm = derive { name="eRm"; version="0.15-4"; sha256="0x05vsf8kp0z422w1b1wqayada2vbl7jh4ifa52sqlq7ygsmnmi1"; depends=[MASS Matrix]; }; +eVenn = derive { name="eVenn"; version="2.1.6"; sha256="1kxxaj2ia1v5p0d0yi3vq7rkiajsdsg97k3yg0iqb9v4vbj8mc1y"; depends=[]; }; +eaf = derive { name="eaf"; version="1.06"; sha256="1v0sw52wsnhqfg9i2zhmkl0w5ikcd4zdmz4fy03scjx5impiww7a"; depends=[modeltools]; }; +earlywarnings = derive { name="earlywarnings"; version="1.0.59"; sha256="06j5g5lrzl4p5pb1pp79h00iqpbwralzhpzxmaiymv7j8kz87nr0"; depends=[ggplot2 moments tgp tseries fields nortest quadprog Kendall KernSmooth lmtest som spam]; }; +earth = derive { name="earth"; version="3.2-7"; sha256="1j9w03i4pvz8a6s9rkfssj7bqz5sql0g7rzwpmis33kvi0d7wihn"; depends=[plotmo plotrix]; }; +easingr = derive { name="easingr"; version="1.0.1"; sha256="0sisqryqlymkk9v1wq0v1db3g9sx5vaqxxkw1470c75ix5s2n5s3"; depends=[xts lattice latticeExtra]; }; +easyanova = derive { name="easyanova"; version="4.0"; sha256="1d8fkgyqzphipvla7x8ipcf0by07iqx8xran15d2q82yq9iik5g9"; depends=[car nlme]; }; +easynls = derive { name="easynls"; version="4.0"; sha256="1j2crqvgsf84bpwzf4qh5xkzn5mhxhfx9c0y3p8dbyn8bg7zc2rf"; depends=[]; }; +ebSNP = derive { name="ebSNP"; version="1.0"; sha256="0x3ijwg4yycsfy6jch1zvakzfvdgpiq8i7sqdp5assb8z1823w0b"; depends=[]; }; +eba = derive { name="eba"; version="1.7-1"; sha256="0kxdhl7bc4f570m9rbxxzg748zvq0q7a0slvfr4w1f45vfzhyh17"; depends=[nlme]; }; +ebal = derive { name="ebal"; version="0.1-6"; sha256="1cpinmbrgxxv0fzi9qi2inv4hw2lz7iq4b0ggp316rdqqb5bj9r0"; depends=[]; }; +ebdbNet = derive { name="ebdbNet"; version="1.2.3"; sha256="123iqp8rnm3pac5fvpzq5sqbf8nyfpf05g23nawanid6yv23ba9a"; depends=[igraph]; }; +ecespa = derive { name="ecespa"; version="1.1-7"; sha256="0ynyphc1jnk088041i0yk22bh4ga1v9xwrcghy70q1ipv0z279ph"; depends=[splancs spatstat]; }; +ecipex = derive { name="ecipex"; version="1.0"; sha256="0pzmrpnis52hvy80p3k60mg9xldq6fx8g9n3nnqi3z56wxmqpdv7"; depends=[CHNOSZ]; }; +ecodist = derive { name="ecodist"; version="1.2.9"; sha256="199f3lwwm8r2bnik595m540la1p4z6vbkwfqh9kimy9d0fjp8nps"; depends=[]; }; +ecoengine = derive { name="ecoengine"; version="1.6"; sha256="1dbg9y8hz7z385ml102y3akfffphg0llnyqg5iqblqann7nrzpsn"; depends=[httr plyr assertthat whisker dplyr jsonlite lubridate leafletR]; }; +ecolMod = derive { name="ecolMod"; version="1.2.5"; sha256="07dr3q17vd60569w34apylpsv81qcf31l7v0bqdycb5mlaifdahz"; depends=[rootSolve diagram deSolve]; }; +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]; }; +ecoval = derive { name="ecoval"; version="1.0"; sha256="1szvr2ipb7bd0cyslhwwwyx5kw7yx3kpqcyzxfd9pk263bny323g"; depends=[utility rivernet]; }; +ecp = derive { name="ecp"; version="1.6.0"; sha256="1xzawnqk8maxk9ha4cms5xvylwb4m1mkxps88p5xh7grgpcw6drn"; depends=[Rcpp Rcpp]; }; +edcc = derive { name="edcc"; version="1.0-0"; sha256="036fi6mnn9480hkb378xb5jilkfvdydjmkyw4mcc9s1lz195f62w"; depends=[spc]; }; +edeR = derive { name="edeR"; version="1.0.0"; sha256="1dg0aqm5c4zyf015hz1hhn3m4lfvybc4gc1s7sp8jcsk46rxz0cc"; depends=[rJava rjson rJython]; }; +edgeRun = derive { name="edgeRun"; version="1.0.9"; sha256="0d5nc8fwlm61dbi00dwszj1zqlij4gfds3w1mpcqnnfilr2g3di1"; depends=[data_table]; }; +editrules = derive { name="editrules"; version="2.7.2"; sha256="19g07caacwphvrqn900chrz3k6x4z8gmvlcvna5x2mqidcjkf25i"; depends=[igraph lpSolveAPI]; }; +edrGraphicalTools = derive { name="edrGraphicalTools"; version="2.1"; sha256="09y63xj3gqrz66mym20g4pmfwrb0wnc2n67692hnqq8dz31q7p3i"; depends=[rgl mvtnorm MASS lasso2]; }; +eegAnalysis = derive { name="eegAnalysis"; version="0.0"; sha256="1lrwjbhm5fnf5fhyyga2b21j2snnmj3zfvfxfkvgsbdnzr3qxaxb"; depends=[e1071 wmtsa fields splus2R]; }; +eegkit = derive { name="eegkit"; version="1.0-1"; sha256="171jfd4lq8xqqd1iajf9ljr3y77faidb0wpv6jasvwf4cb7lyasn"; depends=[bigsplines eegkitdata ica rgl]; }; +eegkitdata = derive { name="eegkitdata"; version="1.0"; sha256="1krsadhamv1m8im8sa1yfl7injvrc4vv3p88ps1mpn8hibk5g51m"; depends=[]; }; +eeptools = derive { name="eeptools"; version="0.3.1"; sha256="0m6i0hiw565wgziknlf19rh2fq8zvzq2v5a0ppnwcv8vhbhyph3g"; depends=[ggplot2 MASS stringr maptools arm data_table memisc]; }; +effects = derive { name="effects"; version="3.0-2"; sha256="1a5h3qjxwwwzzg5n3zxls6sl802vz25hs63x944nvmh8kb1zz3km"; depends=[pbkrtest lme4 nnet lattice colorspace]; }; +effsize = derive { name="effsize"; version="0.5.2"; sha256="0xhrq1a7vjcbipvmslmkw4widnp0scfcir80sr5npcx5pvxagsq3"; depends=[]; }; +ega = derive { name="ega"; version="1.0.0"; sha256="1825lwr9bii16nbaj1ryh82gwg2p1r5dhn41cp3l728cfpz5gvlz"; depends=[ggplot2]; }; +egcm = derive { name="egcm"; version="1.0.2"; sha256="17fzxl34vc38308wbvjp5xdv1q48k4lf6gsw7ax27zc4chqlmqfz"; depends=[ggplot2 tseries zoo MASS]; }; +eggCounts = derive { name="eggCounts"; version="0.3"; sha256="0rsw0610jppnxvw22dj33sn1xq5wf44nsgszwi0jxcd45n1n2k8x"; depends=[coda actuar boot]; }; +egonet = derive { name="egonet"; version="1.2"; sha256="1f0fbqyk2ilmhirxvf1iwgfappi5r7807ag77r89lbaf5jq8akl0"; depends=[sna]; }; +eha = derive { name="eha"; version="2.4-1"; sha256="1znxpcrwp8fllr3m14gbxwgp7yln55jwvkilmbsqldz00za6xn0w"; depends=[survival]; }; +eiPack = derive { name="eiPack"; version="0.1-7"; sha256="1cxk31bj012ijm85sf6l4rjrwayw94j2d6aav8p9g1f0raha2s6y"; depends=[MASS coda msm]; }; +eigeninv = derive { name="eigeninv"; version="2011.8-1"; sha256="18dh29js824d7mrvmq3a33gl05fyldzvgi8mmmr477573iy9r30g"; depends=[]; }; +eigenmodel = derive { name="eigenmodel"; version="1.01"; sha256="0p9n28x5gg46nszzd2z9ky5fhv6qa070673i1df6bhjh962aqgaf"; depends=[]; }; +eigenprcomp = derive { name="eigenprcomp"; version="1.0"; sha256="156qyv7sl8nng55n3ay6dnpayyfrqv27ndz40xf4w92is9zmymy0"; depends=[]; }; +eive = derive { name="eive"; version="2.1"; sha256="1vazl5dnrvljd07csy9rjs4302w09h94i411gffg9fvxn70km7qg"; depends=[Rcpp Rcpp]; }; +eiwild = derive { name="eiwild"; version="0.6.7"; sha256="1fp4kvlmcjjnzn2a5cmlzaf6y5q6cdbbi2nmvjyqc4y1bmwh3srf"; depends=[gtools coda lattice]; }; +elasticnet = derive { name="elasticnet"; version="1.1"; sha256="1x8rwqb275lz86vi044m1fy8xanmvs7f7irr1vczps1w45nsmqr2"; depends=[lars]; }; +elec = derive { name="elec"; version="0.1.2"; sha256="0f7ahrjb52w8a8l5v00xla6z9afpz2zrckl9v04xalp34snhdwan"; depends=[]; }; +elec_strat = derive { name="elec.strat"; version="0.1.1"; sha256="09196k5c3jsikh98d33bn70izwcbx0wb5ki9fv1ij0dw9mnv4c3p"; depends=[elec]; }; +elliplot = derive { name="elliplot"; version="1.1.1"; sha256="1sl85kyjpxiw0gs3syhlhfrci03fl054py7m24xln5vk07665vbp"; depends=[]; }; +ellipse = derive { name="ellipse"; version="0.3-8"; sha256="0ibz1qvf1qbb5sigyhpxb8hgip69z3wcimk3az1701rg2i64g3ah"; depends=[]; }; +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]; }; +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.6"; sha256="1ipy3v0pwarnfn4mhpiq7nbn6ab7fk1mb3k1afzfwnh3ji28yw1q"; depends=[MASS lattice plyr rgl coda bbmle]; }; +emdist = derive { name="emdist"; version="0.3-1"; sha256="1z14pb9z9nkd0f2c8pln4hzkfqa9dk9n3vg8czc8jiv0ndnqi7rq"; depends=[]; }; +emil = derive { name="emil"; version="1.1-6"; sha256="1qk655swpl8f492y9smzlfxf7aysbwashfs6whnsi7f9dbigw6cd"; depends=[]; }; +emma = derive { name="emma"; version="0.1-0"; sha256="0psd8lrbcqla8mkhp0wlassaaimgwlmqy5yv2wwcq59mc5k1v27f"; depends=[earth clusterSim]; }; +emme2 = derive { name="emme2"; version="0.9"; sha256="035s4h95ychqb14wib0dqbg4sjy9q01fsryr0ri25g1hsi5f8lpm"; depends=[reshape]; }; +emoa = derive { name="emoa"; version="0.5-0"; sha256="1wcnsnkdmpcn21dyql5dmj728n794bmfr6g9hgh9apzbhn4cri8p"; depends=[]; }; +empiricalFDR_DESeq2 = derive { name="empiricalFDR.DESeq2"; version="1.0"; sha256="0vv104jgdwp5bg72v29614j831ndbw3sv105hkj9z3hi4ax16b5f"; depends=[]; }; +emplik = derive { name="emplik"; version="0.9-9-6"; sha256="0qrrsws9hnb9f2zv50q4v9zx467n6hm83g841h3ba511iwjpp32r"; depends=[quantreg]; }; +emplik2 = derive { name="emplik2"; version="1.10"; sha256="19s19jhcaqnh6vjfgrsgjvjlrsm5fa1mgwc5v36hzdf2mv1xhr3q"; depends=[]; }; +emulator = derive { name="emulator"; version="1.2-15"; sha256="1rp7q7zs8b49jzdkbzm4s1g8554h41hcabf4d78k9jhhys2z28g2"; depends=[mvtnorm]; }; +enRich = derive { name="enRich"; version="2.0"; sha256="13ahwdifm33h4h5mvmc49v39fbhiy291rbdwm4c8kxjrqjq9ip66"; depends=[]; }; +enaR = derive { name="enaR"; version="2.8"; sha256="0gs6w43rfz89czpk83kdwxlap5lzhinhzwg3csjhwz4mqabpc9fy"; depends=[MASS stringr sna network gdata]; }; +endogMNP = derive { name="endogMNP"; version="0.2-1"; sha256="0maxcp321ngbxrg0i23nlwhj849v771xahh53367x928ss4f8v7i"; depends=[]; }; +endorse = derive { name="endorse"; version="1.4.1"; sha256="0xyi2cq4k4xa8kr717i4njl6rgjf5z99056jbhp2rbzfyy4sw61d"; depends=[coda]; }; +energy = derive { name="energy"; version="1.6.2"; sha256="008yf4r6546mzk9q515zliqxyjx6w0z19g5wlarg7f4lrzsmqiaw"; depends=[boot]; }; +english = derive { name="english"; version="1.0-1"; sha256="1413axjp2icj9wwnkz3vl4gvrwlgmjpc2djzv5bllbnc4a4dgj24"; depends=[]; }; +enigma = derive { name="enigma"; version="0.1.0"; sha256="0k7shqs8lvx2nxvfdnp56wfhvnxrdg64y3s3b8aj6871r00pasa8"; depends=[httr jsonlite plyr]; }; +enpls = derive { name="enpls"; version="1.0"; sha256="1grnabrb0kzjvjvwp9rx1xqfljla0jd5xrkcbwfzmy2ymmbvh6ma"; depends=[pls foreach doParallel]; }; +enrichvs = derive { name="enrichvs"; version="0.0.5"; sha256="0x91s03hz1yprddm6mqi75bm45ki3yapfrxmap7d4qc0hi06h22k"; depends=[]; }; +ensembleBMA = derive { name="ensembleBMA"; version="5.0.8"; sha256="1wv1g1iwpmxhcgxgx78jc4w5kcbbzjxljj7pbfykgq7hjpkb109f"; depends=[chron]; }; +ensembleMOS = derive { name="ensembleMOS"; version="0.7"; sha256="0g5qzdic5jvgn6wv7zh0jnz8malfgfxn26l7lg30y96vcmi4hk54"; depends=[ensembleBMA chron]; }; +ensurer = derive { name="ensurer"; version="1.0"; sha256="07bjiq9sk5njksb1dyi5kqx3k4a454x8jy0q5v6n1m5lpyqf0py7"; depends=[]; }; +entropart = derive { name="entropart"; version="1.2.1"; sha256="14cn0zkfk6w8qrbzis9nxhs0vmhpxn4ksa95j5zxr7lxn77piznz"; depends=[ade4]; }; +entropy = derive { name="entropy"; version="1.2.1"; sha256="10vg4818q5g54pv2nn9x5i7pvky5nsv96syy47pz2mgqp1273cpd"; depends=[]; }; +enviPat = derive { name="enviPat"; version="1.9"; sha256="0xm23gv4ixmsal9rf0cbq0lwvlpagpmapskz3c4d8qzvhr8qrl3b"; depends=[]; }; +enviPick = derive { name="enviPick"; version="1.2"; sha256="1ir8aqnbf470x0n5bqhb13aclkv13z8ha80dfhxx4ik5k65papcg"; depends=[shiny readMzXmlData]; }; +epade = derive { name="epade"; version="0.3.8"; sha256="1alvsifc6i71ilm1xxs1d7sqlapb48bqd6z2n4wi6pqcjvwp7bif"; depends=[plotrix]; }; +epi2loc = derive { name="epi2loc"; version="1.0-1"; sha256="16abk1v177sg7gmaw42ldf6hf20l7dvyq295zwbq76nxj467khdv"; depends=[pwr]; }; +epiR = derive { name="epiR"; version="0.9-59"; sha256="0x0k7s2kl9mj7x2vnrj1bc586jkvc6sb34jsgjhwk3gyh9prp57q"; depends=[survival]; }; +epibasix = derive { name="epibasix"; version="1.3"; sha256="0d0087sa8lqw35pn7gdg2qqzw3dvz57sgavymwl1ybcj5d4lsbyk"; depends=[]; }; +epicalc = derive { name="epicalc"; version="2.15.1.0"; sha256="11x9q990hc7rf5xfvba47axdy7vld76xcf3kd9lkr0c8nbl5ss9v"; depends=[foreign survival MASS nnet]; }; +epinet = derive { name="epinet"; version="2.0.8"; sha256="09vggvkj4yjhfiwy7mqyqn8n4sr9ar0wj5j680sy900sybvxpw25"; depends=[]; }; +episplineDensity = derive { name="episplineDensity"; version="0.0-1"; sha256="0nmh97xajnnh54i04yq8fdici4n5xvcbpdbjdbz79483gnils4vn"; depends=[nloptr pracma]; }; +epitools = derive { name="epitools"; version="0.5-7"; sha256="163sibnbihdsnkxf313fr8n8rh5d64dwjagv95vhhzr87f21sw22"; depends=[]; }; +epoc = derive { name="epoc"; version="0.2.5-1"; sha256="1r19cvcqf39yf09n3znbdy3dsr7z96yx6zib6031mqqdsxaav5qd"; depends=[lassoshooting Matrix irr elasticnet survival]; }; +epr = derive { name="epr"; version="2.0"; sha256="1xqc0jhgdwwvilqpljxzpzz3wx30kigy09sxvzcfvsjmxyyvflqy"; depends=[car]; }; +eqs2lavaan = derive { name="eqs2lavaan"; version="3.0"; sha256="1lj6jwkfd84h9ldb6l74lrx2pnsl1c0d7mnrcrjkska87djb2nzd"; depends=[lavaan stringr]; }; +eqtl = derive { name="eqtl"; version="1.1-7"; sha256="0xfr8344irhzyxs9flnqn4avk3iv1scqhzac5c2ppmzqhb398azr"; depends=[qtl]; }; +equate = derive { name="equate"; version="2.0-3"; sha256="0y37nxily7zjx00z7h4vmpn8cs7bl3aravhjkjz9l6y0fv0rc5vv"; depends=[]; }; +equateIRT = derive { name="equateIRT"; version="1.2"; sha256="07qh5awa12d1bcm504k0rpgyxyzhymg92131cl676kdlfp49aqk1"; depends=[statmod]; }; +equivalence = derive { name="equivalence"; version="0.6.0"; sha256="1q17c2bs36f46bmm6wzmp0g2lg7d0j9mlrfnkzxnlvmspwksc0zl"; depends=[lattice boot PairedData]; }; +erboost = derive { name="erboost"; version="1.2"; sha256="0afgh0zkl3h3ab4s7wl0cn24qdyhszssai9i390mi7w0p88wgba9"; depends=[lattice]; }; +erer = derive { name="erer"; version="2.3"; sha256="165hngfzbzn403gwdcjkhvlm7jygl57nbpwdmlya2rd43z09kp77"; depends=[lmtest systemfit tseries urca ggplot2]; }; +ergm = derive { name="ergm"; version="3.1.3"; sha256="0g4cap1gx0l57l0aix29wz9lspnxv2vqkkdlcghbdv41fdddvdlm"; depends=[statnet_common network robustbase coda trust Matrix]; }; +ergm_count = derive { name="ergm.count"; version="3.1.1"; sha256="0l66shy5p7h9j3h5gpkn48ps069mdaqbscnnkvmwjfvcc7k5vr8m"; depends=[statnet_common ergm network ergm]; }; +ergm_graphlets = derive { name="ergm.graphlets"; version="1.0.2"; sha256="1wfk8kh4rqw1f7dg4vsjq8nirgwyyk21r0x7x2hrd4v4ci0mcz6j"; depends=[statnet ergm]; }; +ergm_userterms = derive { name="ergm.userterms"; version="3.1.1"; sha256="0pvklvyxi7sjc5041zl8vcisni0jz1283gyjw5mhas9bl47g1cwc"; depends=[network ergm statnet_common ergm]; }; +ergmharris = derive { name="ergmharris"; version="1.0"; sha256="1bfijhsljlykb94wi25lbpv35zkmgqpmgzmxcq98gjvzbn5j9pdq"; depends=[]; }; +erpR = derive { name="erpR"; version="0.2.0"; sha256="1y6abc5fkcyyjh36maj1zbxppqzwd5wkvzvqahyvzsz5fqpjkcdx"; depends=[rpanel]; }; +esotericR = derive { name="esotericR"; version="1.0"; sha256="0kl9c2z2mpg3mk8jnl0ssgcf6y0i9jpczms746j8f07ydrcxpf41"; depends=[]; }; +estout = derive { name="estout"; version="1.2"; sha256="0whrwlh4kzyip45s4zifj64mgsbnrllpvphs6i5csb7hi3mdb3i5"; depends=[]; }; +etable = derive { name="etable"; version="1.2.0"; sha256="17xahaf2fz1qgqjaw8qbnss95il6g47m3w00yqc5nkvv37gs0q7c"; depends=[xtable Hmisc]; }; +etasFLP = derive { name="etasFLP"; version="1.1.1"; sha256="0p24f4ycf7vckcwcmn6rkrdvv96q7w94gjp3h2k2s3v1yawgn152"; depends=[mapdata rgl fields maps]; }; +etm = derive { name="etm"; version="0.6-1"; sha256="00sm4cib1r4wcn71v1ry3asszshks4f6br7s5xzm8d5ngxdlsxda"; depends=[survival lattice]; }; +eulerian = derive { name="eulerian"; version="1.0"; sha256="0yhpnx9vnfly14vn1c2z009m7yipv0j59j3s826vgpczax6b48m0"; depends=[]; }; +evaluate = derive { name="evaluate"; version="0.5.5"; sha256="15i6bkzrzkgsdlgf2pcx8b3gcjh1rplzhimy310845pfgkldcq9b"; depends=[stringr]; }; +evd = derive { name="evd"; version="2.3-0"; sha256="1h3dkssgw2x7pblvknfr0l8k7q25nikxyl7kl9x95ganjpi2452v"; depends=[]; }; +evdbayes = derive { name="evdbayes"; version="1.1-1"; sha256="0lfjfkvswnw3mqcjsamxnl8hpvz08rba05xcg0r47h5vkgpw5lgd"; depends=[]; }; +eventInterval = derive { name="eventInterval"; version="1.0-1"; sha256="0vcp40rsb2pazn4p44dsaxjai7qhjwzrh9lf0q84fcayrnk51dqv"; depends=[MASS]; }; +events = derive { name="events"; version="0.5"; sha256="1zka4ygymifs8snd7cabl11b5lg3f8g8370dkm9ybl40bn8vvqq2"; depends=[]; }; +eventstudies = derive { name="eventstudies"; version="1.1"; sha256="13l2yhmlpiid9r3njnmvja231l00ym7gvwfbv0m9fk2k5j6gm5id"; depends=[zoo xts boot]; }; +evir = derive { name="evir"; version="1.7-3"; sha256="1kn139vvzdrx5r9jayjb4b0803b0bbppxk68z00gdb50mxgvi593"; depends=[]; }; +evmix = derive { name="evmix"; version="2.3"; sha256="1lp0k0ccpjaxy0l1chhr37jr2120g4x1xncvqq0dd162ppw8wqg8"; depends=[MASS gsl]; }; +evobiR = derive { name="evobiR"; version="1.0"; sha256="12j01qzc4yrjpxbj39bl29f5ypxwk33c6qf0mjjbgpwn5g6fgsi4"; depends=[seqinr ape stringr geiger taxize]; }; +evolvability = derive { name="evolvability"; version="1.0"; sha256="17vkmb5208q4lx6jslx96nbhsl9m2c4ra6264bparbgrg34byg9x"; depends=[coda]; }; +evora = derive { name="evora"; version="1.0"; sha256="0blq28ldynbq3v6rh0yk89wy1sjp4621h6iwnyyiipqwzihwrhz2"; depends=[Hmisc]; }; +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-0"; sha256="02zanw79ix0gqks7svblm6bysf81yvxc4s49sq2cac4xc5hfpjj8"; depends=[jsonlite]; }; +exact2x2 = derive { name="exact2x2"; version="1.4.0"; sha256="1yzigyyvzs3aq3sl3birs9bzir1l8b30qfbhfg5aw80w6a5p0hb1"; depends=[exactci ssanv]; }; +exactLoglinTest = derive { name="exactLoglinTest"; version="1.4.2"; sha256="0j146ih9szzks9r45vq1jf47hrwjq081q1nsja5h1gpllks8217h"; depends=[]; }; +exactRankTests = derive { name="exactRankTests"; version="0.8-27"; sha256="0ygy3ygdnrrcggps5zh5r7kqfa9vj6gfgdyli63n8cwdimfyndhn"; depends=[]; }; +exactci = derive { name="exactci"; version="1.3-0"; sha256="03mhgpyrgm3cb0hw908wxhi6pxrvcsw4r1lmbx95xn44j1p9zpzk"; depends=[ssanv]; }; +exactmeta = derive { name="exactmeta"; version="1.0-2"; sha256="1v807ns799qajffky4k18iah0s3qh2ava6sz5i85hwx9dhkz19h4"; depends=[]; }; +exams = derive { name="exams"; version="2.0-0"; sha256="0w3hnwnwcvl2i0y08qw96fkhfy31hx3pvw2qjxi95vhna5987k0h"; depends=[]; }; +excursions = derive { name="excursions"; version="1.1-20140610"; sha256="0x7rk00abf7fw9h2qqp6s2snkm1snkl35mgmxvgwv0a0jm3q56ls"; depends=[Matrix]; }; +expands = derive { name="expands"; version="1.5"; sha256="14m5fzh302v0nchf875i4nwrr25wk7hych405psgfidq058pr985"; depends=[rJava flexmix matlab mclust moments ape permute]; }; +expectreg = derive { name="expectreg"; version="0.39"; sha256="1mxhv6phc3lgp0zz20wszx4nr3by9p6492wcb0x8wn8p8p1sy1b3"; depends=[mboost BayesX quadprog]; }; +experiment = derive { name="experiment"; version="1.1-1"; sha256="07yaf5k5fpymz2yvr52zbbi60g0v84qryvqqjq3sjq2mb1fjfz1p"; depends=[boot MASS]; }; +expert = derive { name="expert"; version="1.0-0"; sha256="0y9vcigvzhymalpv31b9nvmr86z1dz7x29yj838vks0dsv23rgrf"; depends=[]; }; +expm = derive { name="expm"; version="0.99-1.1"; sha256="0kcanqaqn51f437fxriw4qkpxbhzpjzlkp95wn89ip4jhy6076qn"; depends=[Matrix]; }; +expoRkit = derive { name="expoRkit"; version="0.9"; sha256="0raf0m2nfbdbd1pc4lincyp8y8lgn3bfi4hn0p04plc5p40l1gvc"; depends=[Matrix SparseM]; }; +expoTree = derive { name="expoTree"; version="1.0.1"; sha256="0hj1x4niqp0ghqik3mz733nc3zpnhyknrdpzpj6y2rfia2ysdiz8"; depends=[ape deSolve]; }; +expp = derive { name="expp"; version="1.1"; sha256="13zbhkkcshqrpln5gsa051d390q9ij97lawsdbd5j7fj9hxm9pwh"; depends=[sp spdep rgeos deldir]; }; +expsmooth = derive { name="expsmooth"; version="2.02"; sha256="1l9k4llzkqwzmrr1l68qr58ngzs3ql67hxrr5fcrcwwnaa1zinyj"; depends=[tseries forecast]; }; +exptest = derive { name="exptest"; version="1.2"; sha256="0wgjg62rjhnr206hkg5h2923q8dq151wyv54pi369hzy3lp8qrvq"; depends=[]; }; +exsic = derive { name="exsic"; version="1.1.1"; sha256="1k6nqs9i4iivxnk4nkimp6zvdly274wibkmx9n0wz01gnzxqil0p"; depends=[stringr markdown]; }; +extRemes = derive { name="extRemes"; version="2.0-3"; sha256="0aiigqyay3i4nlmmr1k7fs2nw6vqxf1q321p6s0ip8aq2awlgnjl"; depends=[Lmoments distillery car]; }; +extWeibQuant = derive { name="extWeibQuant"; version="1.0"; sha256="0l20x33nh50jfrkwm8d0n824d400lnjia8ymdwr10sgj3v1x7vp1"; depends=[]; }; +extfunnel = derive { name="extfunnel"; version="1.3"; sha256="162w5b2wjs3yqy8jisamsapav6swa8sskf1b6x5hglnrv3i4qyyy"; depends=[rmeta]; }; +extlasso = derive { name="extlasso"; version="0.2"; sha256="05774y0i01lrbyws6zx5ymhcglllv1wc7gzrnyx8i5d1lxdinsyd"; depends=[]; }; +extraBinomial = derive { name="extraBinomial"; version="2.1"; sha256="0qmvl35f7n78kghszwyaz4wzbswqy4p98c3b6alzrc2ldsq6pq5z"; depends=[]; }; +extraTrees = derive { name="extraTrees"; version="1.0.4"; sha256="0yv58azaqmla3mmqk7q6z1ijqk94s80jfqxb21mc6mi66kr6md1d"; depends=[rJava]; }; +extracat = derive { name="extracat"; version="1.7-1"; sha256="1vgxr9j812jjr0i188vv7c1l0d7b73aakvfgsm0agwv7vj8k0rhi"; depends=[colorspace hexbin scales ggplot2 reshape2 plyr TSP]; }; +extrafont = derive { name="extrafont"; version="0.16"; sha256="0ml1a7m28cdx1a6qcmg8840v95lmhl39ad51q1k3bnqzbxfgqncl"; depends=[extrafontdb Rttf2pt1]; }; +extrafontdb = derive { name="extrafontdb"; version="1.0"; sha256="115n42hfvv5h4nn4cfkfmkmn968py4lpy8zd0d6w5yylwpzbm8gs"; depends=[]; }; +extremevalues = derive { name="extremevalues"; version="2.2"; sha256="162j6kqnd1ak2w2m6y5dbxcya1ap4648hvc83ibq33bxk98rh7sb"; depends=[]; }; +eyetracking = derive { name="eyetracking"; version="1.1"; sha256="0ajas96s25hjp3yrg42hp78qjhl1aih04mjirkskx32qsyq5hfpv"; depends=[]; }; +ez = derive { name="ez"; version="4.2-2"; sha256="1dk4ig137ridr4pw4afp3flm22s8l38yrgxabld1zv46slndc8mm"; depends=[car ggplot2 lme4 MASS Matrix mgcv plyr reshape2 scales stringr]; }; +ezglm = derive { name="ezglm"; version="1.0"; sha256="0x7ffk3ipzbdr9ddqzv0skmpj5zwazkabibhs74faxnld7pcxhps"; depends=[]; }; +ezsim = derive { name="ezsim"; version="0.5.5"; sha256="03x75vmf75qsmk4zb09j7xrb11w31rpfwd3dvv12nwjgndh9bnld"; depends=[foreach ggplot2 digest plyr reshape Jmisc]; }; +fANCOVA = derive { name="fANCOVA"; version="0.5-1"; sha256="034m2mmm6wmsjd41sg82m9ppqjf4b1kgw5vl2w7kzqfx0lypaiwv"; depends=[]; }; +fArma = derive { name="fArma"; version="3010.79"; sha256="1byxyy4afl1gq58r1cmc5p6frdr9rljr1x3pdnc8nj8rr65lkg72"; depends=[timeDate timeSeries fBasics]; }; +fAsianOptions = derive { name="fAsianOptions"; version="3010.79"; sha256="1w9ph3rz6cd7g275flzsnqxwd3r5xin6pkini8pbsi9s8hbqv3vl"; depends=[timeDate timeSeries fBasics fOptions]; }; +fAssets = derive { name="fAssets"; version="3011.83"; sha256="0i3phc8kxwhzf6010bv5k2ff5zlv7aqrwavqmhly4wwby73i39yl"; depends=[timeDate timeSeries fBasics fMultivar robustbase MASS sn ecodist mvnormtest energy]; }; +fBasics = derive { name="fBasics"; version="3011.87"; sha256="1x4jv4db0nr2fig6hglk0kv6j27ngkc8qzclgiklbl8wjfrrp9zh"; depends=[timeDate timeSeries gss stabledist MASS]; }; +fBonds = derive { name="fBonds"; version="3010.77"; sha256="00rc3i0iyqcpsqvc036csa1c8gxwcnniwj3l2irmcalx4p8650w0"; depends=[timeDate timeSeries fBasics]; }; +fCertificates = derive { name="fCertificates"; version="0.5-3"; sha256="1m0kglsr6g0f7m8r9ls95zj3hmjqq83whyk6svar39p13vabadw6"; depends=[fBasics fOptions fExoticOptions]; }; +fCopulae = derive { name="fCopulae"; version="3011.81"; sha256="0r4g567icgiiz6cxi6ak3kzrav9qzsc6zvww5dj1pd8mkd4r1f0y"; depends=[timeDate timeSeries fBasics fMultivar]; }; +fExoticOptions = derive { name="fExoticOptions"; version="2152.78"; sha256="0h58prj8nh340b0fxxkgg4bk25yxvb4f8ppq677hr12x8sysf1a8"; depends=[timeDate timeSeries fBasics fOptions]; }; +fExpressCertificates = derive { name="fExpressCertificates"; version="1.2"; sha256="1r4qkhf7alasbwjz910b0x4dlzm72af06kv7v2vwyzvf3byn21c5"; depends=[mvtnorm tmvtnorm fCertificates Matrix]; }; +fExtremes = derive { name="fExtremes"; version="3010.81"; sha256="0bzgnn0wf7lqhj7b2dbbhi61s8fi2kmi87gg9hzqqi6p7krnz1n5"; depends=[timeDate timeSeries fBasics fGarch fTrading]; }; +fGarch = derive { name="fGarch"; version="3010.82"; sha256="08q452pasvjhsg2ks6c52lqg276hlbdwk0vh25xya2bw2bgbqy99"; depends=[timeDate timeSeries fBasics]; }; +fICA = derive { name="fICA"; version="1.0-2"; sha256="058kkhjksm0nrfaj0csi6dgzr83kq4cln04v9fja12cqvdij9k7k"; depends=[JADE Rcpp Rcpp RcppArmadillo]; }; +fImport = derive { name="fImport"; version="3000.82"; sha256="07yqppl8sbfa0x9k4n7hh6hcgyxpcvlk74hhylib4nzqm70bn0sq"; depends=[timeDate timeSeries]; }; +fMultivar = derive { name="fMultivar"; version="3011.78"; sha256="115hqbbxsdjs5v2rhalg8vz0m5lyg8ppjjqmbq1x21jdnbg6l0fl"; depends=[timeDate timeSeries fBasics cubature mvtnorm sn]; }; +fNonlinear = derive { name="fNonlinear"; version="3010.78"; sha256="0pmz16b606i3mx05zjln4nyl53ks7rlwgm45ldr9qgmw51pflwz9"; depends=[timeDate timeSeries fBasics fGarch]; }; +fOptions = derive { name="fOptions"; version="3010.83"; sha256="01yr3hrfiq4hjhidl5pl1gcqg0myg4acmnipjhq70l3q50cfjm8l"; depends=[timeDate timeSeries fBasics]; }; +fPortfolio = derive { name="fPortfolio"; version="3011.81"; sha256="1rmyp2dv1jgrfj76mnggvi98ffa0yr8d9dlxxmg5pc6pdy2g4q4c"; depends=[timeDate timeSeries fBasics fAssets fCopulae robustbase MASS Rglpk slam Rsymphony Rsolnp kernlab quadprog rneos]; }; +fRegression = derive { name="fRegression"; version="3011.81"; sha256="1qyacwwa2mjq9szwwwfdnny4np68bj1j4bvfkywl7q7x44p4n5b4"; depends=[timeDate timeSeries fBasics lmtest mgcv nnet polspline]; }; +fSRM = derive { name="fSRM"; version="0.6"; sha256="1f7kp35cy7r1z4anmab2x6h27laf001spc950qj7mi9ffal7v1r4"; depends=[lavaan plyr reshape2 ggplot2 scales foreign tcltk2 gridExtra]; }; +fTrading = derive { name="fTrading"; version="3010.78"; sha256="0qakjxnr5nslw06ywlj65m3w7pjgn5hixxc2rnqhvvvmjpdxybz7"; depends=[timeDate timeSeries fBasics]; }; +fUnitRoots = derive { name="fUnitRoots"; version="3010.78"; sha256="04nwwazd8jvzds6p4njzq4wpcsrvvvs0y9z8v8r402myd4856ssm"; depends=[urca timeDate timeSeries fBasics]; }; +factas = derive { name="factas"; version="2.3"; sha256="015lpxf37z8vx4h7a8lavksd7i0gc4x7a7ja63wi9h1czdjsc28k"; depends=[plotrix FactoMineR Matrix]; }; +factorQR = derive { name="factorQR"; version="0.1-4"; sha256="1vl01fm5qfyhnqbl5y86vkr50b8cv07vzlqs3v6smqaqq6yp4lv4"; depends=[lattice]; }; +factorplot = derive { name="factorplot"; version="1.1-1"; sha256="1l8pabf32dr12l7b4dgv5jaxpsjymgdxc51miv72zczrx8adc7da"; depends=[multcomp nnet]; }; +factualR = derive { name="factualR"; version="0.5"; sha256="1wz8ibcmilcx62yy29nd2i1pdmjf7fm0g9i5s58gdn8cjlhnw1jl"; depends=[RJSONIO RCurl]; }; +fail = derive { name="fail"; version="1.2"; sha256="0xzvb71iq20ah1x1zlb9kbx0r47jhqlzxx0sxwhkibglpzskg84z"; depends=[BBmisc]; }; +falcon = derive { name="falcon"; version="0.1"; sha256="0yas8a8nqdp03s77k5z1xlyz59gapyx68pz0mf6i2snjwpgai59v"; depends=[]; }; +falsy = derive { name="falsy"; version="1.0"; sha256="16j6j7kf5xlqg6m2sfdfgpcjf9grrcfh9ij0282hnirgl7a4cvjd"; depends=[]; }; +fame = derive { name="fame"; version="2.18"; sha256="132wb59d15bs94fga5hwxxr9pklyp2rjn448nl8lx5spjrvycwf4"; depends=[tis]; }; +fanc = derive { name="fanc"; version="1.13"; sha256="08qw4vhms8q2jyqqp2vlq8xdg7y7m0mcwb1pibm7wn938rgablq3"; depends=[Matrix]; }; +fanovaGraph = derive { name="fanovaGraph"; version="1.4.7"; sha256="19bzl6yrmi5lgyx6nq3f7i0rdaz2ig580h8116axrsxpx8c4d52x"; depends=[sensitivity igraph DiceKriging]; }; +fanplot = derive { name="fanplot"; version="3.3"; sha256="0bv7x3xrsg0pmp9gmck30jypv8cwc03bv753m49dfpgs2p9srcmc"; depends=[]; }; +faoutlier = derive { name="faoutlier"; version="0.4"; sha256="113qpwil669jr89kpqs6c6xzh0z3vp2hzfy98mh1dr2dvaznd06f"; depends=[sem lattice lavaan MASS]; }; +far = derive { name="far"; version="0.6-3"; sha256="0i7c0zrz33abwkml1zdjf5m61bxpfndwziqjbh6wyhdz8msp2kmf"; depends=[nlme]; }; +faraway = derive { name="faraway"; version="1.0.6"; sha256="10vj38chfnlz595pdi16v8gcwsbmn8a7p4gb0mm98dncyin5p2a3"; depends=[]; }; +farsi = derive { name="farsi"; version="1.0"; sha256="0y14f86bccwjirdx33383wa605y7l7lr0w7ygvg8r7f7izkv7r3n"; depends=[]; }; +fast = derive { name="fast"; version="0.63"; sha256="00ag9d0dwn9al104y93m8dclbjqabr9liif8gr19v3gv6k2k6p2c"; depends=[zoo]; }; +fastGHQuad = derive { name="fastGHQuad"; version="0.2"; sha256="0yv3wdyj7hs1gr3rq08k520v0ldmv5zzng709xjx2kchhwhmy8ah"; depends=[Rcpp Rcpp]; }; +fastHICA = derive { name="fastHICA"; version="1.0"; sha256="02lqqni7j2sp3ndb3kq785d7jf08p2s3ch30di8ffhwn57indald"; depends=[fastICA energy]; }; +fastICA = derive { name="fastICA"; version="1.2-0"; sha256="0ykk78fsk5da2g16i4wji85bvji7nayjvkfp07hyaxq9d15jmf0r"; depends=[]; }; +fastM = derive { name="fastM"; version="0.0-2"; sha256="0q5dz47sqj6d4r3k6l6q34l5ajb8fjbf7xam75scp0mg3czswnfn"; depends=[Rcpp Rcpp RcppArmadillo]; }; +fastR = derive { name="fastR"; version="0.8-1"; sha256="08p03i72zn0cbwjsxpnsknk0148dx3pfwkw740x7f52c3jgbb1gi"; depends=[mosaic lattice mosaicData]; }; +fastSOM = derive { name="fastSOM"; version="0.9"; sha256="03501d5289lrlr4qcgxciz160hqc6nhqb9ab266fr132fkbiv4id"; depends=[]; }; +fastclime = derive { name="fastclime"; version="1.2.4"; sha256="0z91khjzffwy4mbqgkfw4l9mw32sg4p5pvcg4v24z1q44pgnwn4y"; depends=[lattice igraph MASS Matrix]; }; +fastcluster = derive { name="fastcluster"; version="1.1.13"; sha256="0hkml8ggmq5gqw9indqh6rb5x922qq8chd9s35fkxdcgzw58253a"; depends=[]; }; +fastcox = derive { name="fastcox"; version="1.1.1"; sha256="1a5i0ragl0r6p29iamkn04igakiwyysykfbs2p6ybgy8pfdq69sv"; depends=[Matrix]; }; +fastmatch = derive { name="fastmatch"; version="1.0-4"; sha256="16gfizfb1p7rjybrfm57nb6hdm30iirbppva8p8xf8pndz35fjbs"; depends=[]; }; +fat2Lpoly = derive { name="fat2Lpoly"; version="1.1.1"; sha256="0xgxlx9m6lgcn784892g2xvnabyq8k45wi3xrszrbdxxa7zqd1i4"; depends=[kinship2 multgee]; }; +fbRanks = derive { name="fbRanks"; version="2.0"; sha256="17kbmdpgqkj2n951c6mdsrgfga6kiij1gqiw1wpi0q3fq4dlfrzx"; depends=[igraph stringr]; }; +fbati = derive { name="fbati"; version="1.0-1"; sha256="1ia67dg9b61kc14mjg7065v0c6n6agdp8cjdviasyzga00wzsyxj"; depends=[pbatR fgui rootSolve]; }; +fcd = derive { name="fcd"; version="0.1"; sha256="091wbf5iskcgyr7jv58wrf590qijb0qcpninmvm3xrwxi34r37xr"; depends=[glmnet MASS combinat]; }; +fclust = derive { name="fclust"; version="1.0.1"; sha256="1xl8mw4wfwp9n9fmfmzxz8k8qyrk62qr77j085b3kgp7a85dp8ma"; depends=[]; }; +fcros = derive { name="fcros"; version="1.3"; sha256="1ylkma69gfc5ij3vvf1axyasya31qm5bwj2bjlvj12byf52wsiy8"; depends=[]; }; +fda = derive { name="fda"; version="2.4.3"; sha256="19a7jylpr8sh1yz9ljyk889ksfd0xwagbvg83vy6vfsi82q1910g"; depends=[Matrix]; }; +fda_usc = derive { name="fda.usc"; version="1.2.0"; sha256="1ifp94i0px3683ph90f7c3z1gh92c33nlfk1f2drr4s0fyb1kzy3"; depends=[fda MASS mgcv rpart]; }; +fdaMixed = derive { name="fdaMixed"; version="0.4"; sha256="15m13v71kqxd9gqiymgfkq0dvcpzp05576m8zkg08m0k067ga9bd"; depends=[Formula Rcpp Rcpp RcppArmadillo]; }; +fdakma = derive { name="fdakma"; version="1.1.1"; sha256="0y70ckgxkns6p45gv9w02krrr96vzs8f838s5vk02c2m6ynp4prs"; depends=[]; }; +fdasrvf = derive { name="fdasrvf"; version="1.4.2"; sha256="12x04fi0sxs9yh1mf9iykk69zlz6m31j7s01in28p5hgk6wqf8fi"; depends=[foreach mvtnorm matrixcalc numDeriv]; }; +fdatest = derive { name="fdatest"; version="2.0"; sha256="1flnfcsmak8zbq79sv8ims2ywx62983226ly3lp2j7mwj6dxflhw"; depends=[fda]; }; +fdrci = derive { name="fdrci"; version="2.0"; sha256="0smyl9phl02wghimawvff3h267w3h213jbqpka155i6cfzig9qjy"; depends=[]; }; +fdrtool = derive { name="fdrtool"; version="1.2.13"; sha256="0308w4cycapddmv7cg6i65j6wbdckdgnl4n63v06bi4j9dcznksj"; depends=[]; }; +fds = derive { name="fds"; version="1.7"; sha256="164f2cbywph7kyn712lfq4d86v22j4y3fg5i9zyz956hipqv0qvw"; depends=[rainbow RCurl]; }; +fdth = derive { name="fdth"; version="1.1-8"; sha256="195219rndjcccd3b1gn3xc9iky8f3w5ig8x9822d4a2xajr78jnv"; depends=[]; }; +feature = derive { name="feature"; version="1.2.11"; sha256="0dgiv9gwyklnw8w0cpchakadc1vqcngjg39cha6gvl2i3csgxz4p"; depends=[ks rgl misc3d]; }; +features = derive { name="features"; version="2011.8-2"; sha256="0yshwqv2mzl5jj323jwxscpz2ygb4ywxh6q0zwphb24bhv7h9lwd"; depends=[lokern]; }; +fechner = derive { name="fechner"; version="1.0-2"; sha256="0yhiqr0wlka3wq0nhwy9n02ax3x5b0y803iadbsr3xb54pxbfbqd"; depends=[]; }; +federalregister = derive { name="federalregister"; version="0.1.2"; sha256="0f73jhzhqi3a97iyfx5c5i09vxwnyypgw6668z7nch8lvq337s8x"; depends=[RCurl RJSONIO]; }; +ff = derive { name="ff"; version="2.2-13"; sha256="1nvd6kx46xzyc99a44mgynd94pvd2h495m5a7b1g67k5w2phiywb"; depends=[bit]; }; +ffbase = derive { name="ffbase"; version="0.11.3"; sha256="0n65i2a91jjjpzfw3placf6j6sbf8azzd1sck4adha6iiwpi8b1n"; depends=[ff bit fastmatch]; }; +ffmanova = derive { name="ffmanova"; version="0.2-2"; sha256="0sw8br73mx552m4b5zi4qgjcrwxflmgsnvs4mlnxh8g2gaf5bx4j"; depends=[]; }; +fftw = derive { name="fftw"; version="1.0-3"; sha256="01nncrf2p0yq49lhd5aq4hvhp87f25r0x7siqnaldv5zq24krl30"; depends=[]; }; +fftwtools = derive { name="fftwtools"; version="0.9-6"; sha256="00m4yapdkwfi4vrpg0yhakq2chma46mmbwhd9a15y61w97yzz7vb"; depends=[]; }; +fgac = derive { name="fgac"; version="0.6-1"; sha256="0paddf5a4w0g2i0ay7my0bppwh534d8ghy6csfxl5jj034xjgwkk"; depends=[]; }; +fgof = derive { name="fgof"; version="0.2-1"; sha256="0bclkb3as0fl2gyggqxczndfyj9pfnni5pa3inpn5msrnjg4g2j2"; depends=[mvtnorm numDeriv]; }; +fgui = derive { name="fgui"; version="1.0-5"; sha256="0gzwxzvf2y9p5rlfk862d7l1dm2sdwjhjpcb8p494cj4g1xshazg"; depends=[]; }; +fields = derive { name="fields"; version="7.1"; sha256="0wxm8pq4j5clz1hcgdlajasg5cbq8x35i82wrw3gsy27kslyadkd"; 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]; }; +financial = derive { name="financial"; version="0.2"; sha256="1v6jgs3rq57byin5mynslfjk3zrx91qz36558nn17mv6z0qsf10v"; depends=[]; }; +findpython = derive { name="findpython"; version="1.0.1"; sha256="0fa01znc9cckj4ay4zmwmssm2lkhmsw6h07y1pwgd6z1b2pj7bns"; depends=[]; }; +fingerprint = derive { name="fingerprint"; version="3.5.2"; sha256="042aycxs00rglqh2y27bjlwkk6z312gavli7g8xvqfx1lisijrjk"; depends=[]; }; +finiteruinprob = derive { name="finiteruinprob"; version="0.4"; sha256="0wcllbqkryll3v3fjb6k210pcgkskzrpa78gg8nda0jvkij11zb7"; depends=[sdprisk numDeriv]; }; +fishMod = derive { name="fishMod"; version="0.25"; sha256="0mg1bziz2ia406m4ilc7hw1bghrgdibm537hnlf9ffhfayjc4kid"; depends=[]; }; +fisheyeR = derive { name="fisheyeR"; version="0.9"; sha256="1w6va7gakqq2q8hsvdszpn8s2ysdfc648bk5p5v3wbl5s403bci8"; depends=[tkrplot]; }; +fishmethods = derive { name="fishmethods"; version="1.7-0"; sha256="0kgfv78f8a460nfvpfrrqfiy3ipbl3775axydal3vm1zf4l6k2z3"; depends=[MASS boot bootstrap]; }; +fishmove = derive { name="fishmove"; version="0.2-1"; sha256="1b8drjvslmpqnq5v3axrshrl2xq87h3x5cgfnibbhn4slrxw55v9"; depends=[ggplot2 plyr]; }; +fit_models = derive { name="fit.models"; version="0.5-10"; sha256="06pj26dbnq6mf9wxinvjzwyn36656f66a4bmky36r7fzi92gf3d8"; depends=[lattice]; }; +fit4NM = derive { name="fit4NM"; version="3.3.3"; sha256="1xy334svv7cc3xh2j33q6icnibxl46yvnxw8bd4xrpclg4xchc1g"; depends=[gWidgets tkrplot RGtk2 gWidgetsRGtk2 cairoDevice]; }; +fitDRC = derive { name="fitDRC"; version="1.1"; sha256="1f6avw8ia9ks17zdagpmh6yvcmi53h5cvm0wwv9hsb92x5zfhxn9"; depends=[]; }; +fitTetra = derive { name="fitTetra"; version="1.0"; sha256="0ia6wk4gicpmn6kclsd28p7v1npwfv2blagiz0cxzwfw3njv103g"; depends=[]; }; +fitdistrplus = derive { name="fitdistrplus"; version="1.0-2"; sha256="1m35zicxm5gfc9wgp7lx7ymy06nr4s9fcwc07iky40xh65kps0s5"; depends=[survival]; }; +flam = derive { name="flam"; version="1.0"; sha256="0jyx0wff5zdpnhgxz74k6fxgwdnl7khanahv63af22y0mqpd066f"; depends=[MASS]; }; +flare = derive { name="flare"; version="1.5.0"; sha256="03bq40lwwq49vvbarf37y7c3smm29mxqfxsc66gkg8l5pak4l38i"; depends=[lattice MASS Matrix igraph]; }; +flashClust = derive { name="flashClust"; version="1.01-2"; sha256="0l4lpz451ll7f7lfxmb7ds24ppzhfg1c3ypvydglcc35p2dq99s8"; depends=[]; }; +flexCWM = derive { name="flexCWM"; version="1.1"; sha256="0vxzf3ifmpg7l13bvbmv6h5a3gmn2h1xvkq354lvy4s8znk643c4"; depends=[numDeriv mnormt mclust ellipse mixture Flury]; }; +flexclust = derive { name="flexclust"; version="1.3-4"; sha256="1x9gyg69kb3wn02w885kl6hcwpf2ki66gzfayvc83jisrwxvdfvv"; depends=[lattice modeltools]; }; +flexmix = derive { name="flexmix"; version="2.3-12"; sha256="1qp1q4cz5ixprqvm98i0w6rhlhlafm96qy2as7qcsah8vas5jdp1"; depends=[lattice modeltools nnet]; }; +flexsurv = derive { name="flexsurv"; version="0.5"; sha256="0a0mhnz9xayb0pjx4glq09yiz8jplynkq8aniw9saxdik8zd1srg"; depends=[survival muhaz mvtnorm deSolve]; }; +flip = derive { name="flip"; version="2.4.3"; sha256="04zf2gnk5w57gxnlnh26pn1ir1wfrzxhfhchr33ghk7prhc7k4b8"; depends=[e1071 someMTP cherry Rcpp Rcpp RcppArmadillo]; }; +flora = derive { name="flora"; version="0.2.3"; sha256="03n2as362fcz7jbkprwqr2rs86njbkywczsf8cjfa2akwh93gj7s"; depends=[shiny]; }; +flowfield = derive { name="flowfield"; version="1.0"; sha256="1cx3i0w3xq781mmms4x20fshlf1i9bwxw9bxx562crix3fq3m50j"; depends=[]; }; +flsa = derive { name="flsa"; version="1.05"; sha256="07z2b1pnpnimgbzkjgjl2b074pl9mml7nac2p8qvdgv7aj070cmh"; depends=[]; }; +flux = derive { name="flux"; version="0.3-0"; sha256="0pc9cab2pwrfl0fnz29wp7a398r49hvbi50jp8i2fk2rfvck21a7"; depends=[caTools]; }; +fma = derive { name="fma"; version="2.01"; sha256="1j5mvhbrdnkyj4svibpahnz7d4221nkhja5b7fnh68mbmil607fc"; depends=[tseries forecast]; }; +fmri = derive { name="fmri"; version="1.5-1"; sha256="0dla5w8x4njw2njryb35nqh4r31wdps9bl5wzab2grzl546wwmwm"; depends=[]; }; +fmsb = derive { name="fmsb"; version="0.5.1"; sha256="0y9h29a2wsngx73vn07f31l8ffrrm0si3qqx60hgxmb57v501kqz"; depends=[]; }; +fmt = derive { name="fmt"; version="1.0"; sha256="13gsywnyvf9zy5n644g2xyd60f92w2dp7vil2dncjvjcqsib22a0"; depends=[]; }; +foba = derive { name="foba"; version="0.1"; sha256="1af8whgl66v0vwzdf03b6141k3dysdc0svymlgifcga5gqkwzsl0"; depends=[]; }; +fontcm = derive { name="fontcm"; version="1.1"; sha256="1z6b4qdgj5vhvjqj90sm1hp0fffi1vxzvq71p0flxybzyb7d15la"; depends=[]; }; +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.6"; sha256="16dwbqqhjvn7q6zj4h0p3amjs3wlc0krpjaqmhk8p6ny11qaj70c"; depends=[zoo timeDate tseries fracdiff Rcpp nnet colorspace Rcpp RcppArmadillo]; }; +foreign = derive { name="foreign"; version="0.8-61"; sha256="0r994z3ihvrbfhzpvp2dkxbfgkbmccgrryfaxmy1vi56v59n73w8"; depends=[]; }; +forensic = derive { name="forensic"; version="0.2"; sha256="0kn8wn6p3fm67w88fbarg467vfnb42pc2cdgibs0vlgzw8l2dmig"; depends=[genetics combinat]; }; +forensim = derive { name="forensim"; version="4.3"; sha256="1j92imykw48cciay0r6n1aq1jrdb2b1grrz6lpc4kgbnbd7mk0qm"; depends=[tcltk2 tkrplot]; }; +fork = derive { name="fork"; version="1.2.4"; sha256="1sb4xypirmrknhrc872ky845kym58dmakn6c2crsbp67wpg63m4l"; depends=[]; }; +formatR = derive { name="formatR"; version="1.0"; sha256="18wv05ijdymipnyxy5h34y3nbx42ifk79qiapfgx5fjjzpspq6q5"; depends=[]; }; +formula_tools = derive { name="formula.tools"; version="1.3.4"; sha256="1xxl45x88fpskwvfj6sbcbfng84plpf8sjrkwawzki9a41ydhwaq"; depends=[operator_tools]; }; +fortunes = derive { name="fortunes"; version="1.5-2"; sha256="1wv1x055v388ay4gnd1l8y6dgvamyfvmsd0ik9fziygwsaljb049"; depends=[]; }; +forward = derive { name="forward"; version="1.0.3"; sha256="0swn5ysp3f660kl9jpmkck9324j1g3yhj2hl238rfrcr5wihxifc"; depends=[MASS]; }; +fossil = derive { name="fossil"; version="0.3.7"; sha256="188hyb3r1dnxkmqf2czh1kdzmk4mjc0v1kn1zml2yvxaxk7adsrz"; depends=[sp maps shapefiles]; }; +fpc = derive { name="fpc"; version="2.1-9"; sha256="01x7zcsbz9n10dxx8plb37c7z7pfz1xd5dvfrij3na327mny3pxs"; depends=[MASS cluster mclust flexmix prabclus class diptest mvtnorm robustbase kernlab trimcluster]; }; +fpca = derive { name="fpca"; version="0.2-1"; sha256="13b102026xlfb7c2rb3xsqsymm7xpmaxppaafjkb5dx0b1lz0jrc"; depends=[sm]; }; +fpow = derive { name="fpow"; version="0.0-2"; sha256="0am3nczimcfrm9hi02vl2xxsh703qjmr2j11y014mll3f2v1l8cy"; depends=[]; }; +fpp = derive { name="fpp"; version="0.5"; sha256="1jqnx6bgpvnbbj2fa2b6m6aj8jd5cb9kz877r8kp7a5qj62xv1ww"; depends=[forecast fma expsmooth lmtest tseries]; }; +fptdApprox = derive { name="fptdApprox"; version="2.0"; sha256="152bajs76wrapp0zdbkckff6kdkkm6sqqlqd2w220hsi96l2p9dh"; depends=[]; }; +fracdiff = derive { name="fracdiff"; version="1.4-2"; sha256="03l5dqpqwwi5c8fwc2vissfawcsignai60h2zalknkibvk782dwq"; depends=[]; }; +fractal = derive { name="fractal"; version="2.0-0"; sha256="17wz3c9f1l1rphzdn7j27j5nb1ll6j84f9ihk0z6fni41050szv7"; depends=[splus2R ifultools sapa wmtsa scatterplot3d]; }; +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]; }; +frair = derive { name="frair"; version="0.4"; sha256="1g52ykj1m9znpp0pvry7dnmhg4m73nbkw0bp31zl6pcsdgmxxqjr"; depends=[bbmle emdbook boot]; }; +frbs = derive { name="frbs"; version="2.2-0"; sha256="13m8hm2925h1mz2wgbsxiqls5gy7sgvp0rsdcsy2sm7czjnl2z7n"; depends=[]; }; +freeknotsplines = derive { name="freeknotsplines"; version="1.0"; sha256="19zs42q9njknirdbrbnp8bv4vr32kd8wxmkqj0a0nh06i5fcx67r"; depends=[]; }; +freestats = derive { name="freestats"; version="0.0.3"; sha256="0b18n8idap089gkmjknzzb94dvs2drpdqs0mrw7dqnacxgbbqwfj"; depends=[MASS mvtnorm]; }; +freqMAP = derive { name="freqMAP"; version="0.2"; sha256="02hpkqqrxifrr1cxn5brp166jwa8lgl1mcgmq7s8csrbbd900ziv"; depends=[]; }; +freqparcoord = derive { name="freqparcoord"; version="1.0.0"; sha256="0hn5y10yp3j76lqrmj6dsaafamgy4pfxx1p4y92z17s79x29j59q"; depends=[ggplot2 GGally FNN mvtnorm]; }; +freqweights = derive { name="freqweights"; version="1.0.1"; sha256="13wy8nzs888yn7ld96qq3p7k3xjn6s38qdlfb3nqmh52daqcnn7m"; depends=[plyr dplyr data_table biglm fastcluster FactoMineR]; }; +frm = derive { name="frm"; version="1.2"; sha256="128ya5gx27hywkhf9mivscxsk8rgf07c0y65fh15hp1c8m6dx0nz"; depends=[]; }; +frmhet = derive { name="frmhet"; version="1.0"; sha256="065lmmphz140r5gzspqkn6ch1mrlcwqb7rq7xb6sh0r9cizmqia3"; depends=[]; }; +frmqa = derive { name="frmqa"; version="0.1-5"; sha256="0vd5jnjzhkc0vd4cqn4cs6a3limd4fxwyb5i7845rwmkzk1944aj"; depends=[partitions Rmpfr]; }; +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.8.6.3"; sha256="0qfla027lwgyblfbl5x9i5d3i547z2g8cwpn06ly61zy1ck6j619"; depends=[caret gsubfn]; }; +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]; }; +ftnonpar = derive { name="ftnonpar"; version="0.1-88"; sha256="0df9zxwjpfc939ccnm1iipwhpf76b34v0x74nsi1mm1g927dfl0i"; depends=[]; }; +fts = derive { name="fts"; version="0.9.9"; sha256="1qgp8xdwr5pp2b7nd8r717a6p8b6izwqrindx2d1d0lhhnqlcwhv"; depends=[zoo BH]; }; +ftsa = derive { name="ftsa"; version="4.0"; sha256="0phqsw3zq0bq6sdqdacyajk1xk7ns66nd3rpszl96gi7jw5m5bf8"; depends=[forecast rainbow colorspace]; }; +fueleconomy = derive { name="fueleconomy"; version="0.1"; sha256="1svy5naqfwdvmz98l80j38v06563vknajisnk596yq5rwapl71vj"; depends=[]; }; +fugeR = derive { name="fugeR"; version="0.1.2"; sha256="0kd90s91vzv0g3v9ii733h10d8y6i05lk21p5npb3csizqbdx94l"; depends=[snowfall Rcpp Rcpp]; }; +fun = derive { name="fun"; version="0.1-0"; sha256="0z4nq2w1wz1clc7cf87pf870hayxq5mpzhllfgwj4mmh2xpphnrf"; depends=[]; }; +funFEM = derive { name="funFEM"; version="1.0"; sha256="1jvax3ch21391f34gdd4yp8cbnrhl3sj9hny7slj2v0iq9iiz2wj"; depends=[MASS fda elasticnet]; }; +funHDDC = derive { name="funHDDC"; version="1.0"; sha256="038m64yv27wz7ki2gcn94q011p8mv0ggmli5n27y0f5bnkfh6d6w"; depends=[fda]; }; +functional = derive { name="functional"; version="0.6"; sha256="120qq9apg6bf39n9vnp68db5rdhwvnj2vi12a8j8243vq8kqxdqr"; depends=[]; }; +funreg = derive { name="funreg"; version="1.1"; sha256="1sxr4mylcpbya197d55yi6d7g5pfspaf59xxbwjgmwgjw06rl76r"; depends=[MASS mgcv mvtnorm]; }; +futile_any = derive { name="futile.any"; version="1.3.0"; sha256="1c7pj64kz09qzwrxvkp1w1w8mvxwq36zkj6w4b7yyi8v7x3daq2a"; depends=[lambda_r]; }; +futile_logger = derive { name="futile.logger"; version="1.3.7"; sha256="0mcca1d70a173f2c54g05fp6174z3265bc4z73k8hs16sfb3s7zf"; depends=[lambda_r futile_options]; }; +futile_matrix = derive { name="futile.matrix"; version="1.2.2"; sha256="1cb975n93ck5fma0gvvbzainp7hv3nr8fc6b3qi8gnxy0d2i029m"; depends=[lambda_r lambda_tools futile_logger RMTstat]; }; +futile_options = derive { name="futile.options"; version="1.0.0"; sha256="1hp82h6xqq5cck67h7lpf22n3j7mg3v1mla5y5ivnzrrb7iyr17f"; depends=[]; }; +futile_paradigm = derive { name="futile.paradigm"; version="2.0.4"; sha256="14xsp1mgwhsawwmswqq81bv6jfz2z6ilr6pmnkx8cblyrl2nwh0v"; depends=[futile_options RUnit]; }; +fuzzyFDR = derive { name="fuzzyFDR"; version="1.0"; sha256="0zd8i9did0d9gp42xjmwrccm32glabvvy08kl8phhwb1yaq53h7w"; depends=[]; }; +fuzzyMM = derive { name="fuzzyMM"; version="1.0.1"; sha256="1pqfc9b9l2xx5pl45hfildikqjsdgqfhqzi2nbb34026nla5m8vk"; depends=[osmar frbs igraph rgeos rgdal]; }; +fuzzyRankTests = derive { name="fuzzyRankTests"; version="0.3-5"; sha256="1g09506bbpk05a2r2wxjynjs8dmjd2q7x74d83vjscg1kdk4kazq"; depends=[]; }; +fwdmsa = derive { name="fwdmsa"; version="0.2"; sha256="0p0kh8am6gajfaixkvq61f12hfbm6chl9372yzn1yilhiyvqdxgp"; depends=[]; }; +fwi_fbp = derive { name="fwi.fbp"; version="1.5"; sha256="08ngg70vi2fca5yblm2gf1lkjjmb6m39d8q6429n7i3jn6ca5nzf"; depends=[]; }; +fwsim = derive { name="fwsim"; version="0.3.2"; sha256="0yg3bpvf83ahy26fj1nfhfrblmr0i7i18kmnphi8w1bcqjwz6n8h"; depends=[Rcpp Rcpp]; }; +fxregime = derive { name="fxregime"; version="1.0-3"; sha256="15fh8yhcba2gw2xfd0yiw5ssvbgb62l6vb28bxz71ckdyv9nsahk"; depends=[zoo strucchange car sandwich]; }; +g_data = derive { name="g.data"; version="2.4"; sha256="14a4m0v38p3j1k1kymkxwydlgm8b73hlx9m80sg1l4aj38fvflzl"; depends=[]; }; +gCat = derive { name="gCat"; version="0.1"; sha256="10990ilsjk52kqkcdngj4nq0kcbn4w1syxl1mqjq2n5g1l002yjy"; depends=[]; }; +gIPFrm = derive { name="gIPFrm"; version="2.0"; sha256="1syjsnna7b7y27yf7zsxjwq8z5f4wxf2hfadhgjaw898gvfcnrbc"; depends=[]; }; +gMCP = derive { name="gMCP"; version="0.8-8"; sha256="0568pqvcbrpqbppvpvmgxf23rzy1fgl892asq9lhcjslzsz89an5"; depends=[rJava JavaGD xlsxjars MASS PolynomF multcomp mvtnorm Matrix CommonJavaJars]; }; +gMWT = derive { name="gMWT"; version="0.9"; sha256="0c91bwwfm0qyqrrd3n9g6l8kackqm58hmamypn1awzpz1p13axyv"; depends=[clinfun Rcpp RcppArmadillo Rcpp RcppArmadillo]; }; +gPCA = derive { name="gPCA"; version="1.0"; sha256="1ylb1d24dxnzpws9bbanwhyizjr3ljky2bhrph4c5yaq0zwwbrkw"; depends=[]; }; +gPdtest = derive { name="gPdtest"; version="0.4"; sha256="00dlhnklfg2yp4hp7yjgr2nfswv22c007xq1mxdbkll62zgd94mq"; depends=[]; }; +gProfileR = derive { name="gProfileR"; version="0.5"; sha256="0jadfj2hcn3zx4ph61685p5iz16330jccp5ipi8183dkcybvimw4"; depends=[RCurl plyr]; }; +gRain = derive { name="gRain"; version="1.2-3"; sha256="0cxlni9b4p4g02zhhsbbpkwhx9y3x83vm7qd6lsca02yi96palsi"; depends=[gRbase igraph]; }; +gRapHD = derive { name="gRapHD"; version="0.2.4"; sha256="0fxd04s6zh23chks4k6nwb5w408xjy89b44pa42kv6qnqj86ylvm"; depends=[]; }; +gRapfa = derive { name="gRapfa"; version="1.0"; sha256="07yzwzna9pdyzndxk6wwyl6v3gkfc7dvy1ixmdl3d38mcl1ahwyq"; depends=[igraph]; }; +gRbase = derive { name="gRbase"; version="1.7-0.1"; sha256="1x52i4c5jbry17y1pfnjq03kz4xxnk3anidva41z5alp7c73zlqv"; depends=[Matrix igraph Rcpp Rcpp RcppArmadillo RcppEigen]; }; +gRc = derive { name="gRc"; version="0.4-1"; sha256="1a6q24yj7js1sk0lfqbm7kdv605cby6i711w4dlygsxdvwxbrsdr"; depends=[gRbase]; }; +gRim = derive { name="gRim"; version="0.1-17"; sha256="0vn031r318kp78cx00n43fc42bv6sjyb8dm6q0l08s0g9n2w17dp"; depends=[gRbase gRain igraph Rcpp RcppArmadillo]; }; +gSeg = derive { name="gSeg"; version="0.1"; sha256="0qnv3c0rla0g2fb4s4x1i0zdp3dlvi98qf80wlr54gnn7s9vpjf1"; depends=[]; }; +gWidgets = derive { name="gWidgets"; version="0.0-54"; sha256="13lbbbnmkvb559klgsnz0q27qlyv102xakb6yccxsxjw249hm8c2"; depends=[]; }; +gWidgets2 = derive { name="gWidgets2"; version="1.0-5"; sha256="1y6vm6ds77yr1qiqlcaixbsarbwx5w53ba343svla7wva80ajbpl"; depends=[digest]; }; +gWidgets2RGtk2 = derive { name="gWidgets2RGtk2"; version="1.0-2"; sha256="1pzcpjz5cdizvj0ih2r4i3ll6flm45q8ym6sz0wqbg4j3ir0l5kh"; depends=[memoise RGtk2 gWidgets2]; }; +gWidgets2tcltk = derive { name="gWidgets2tcltk"; version="1.0-2"; sha256="1dzrc8yry4l2afpijr35irnqmvfpd22vlb3lih4pk14n52690y0h"; depends=[digest memoise gWidgets2]; }; +gWidgetsRGtk2 = derive { name="gWidgetsRGtk2"; version="0.0-83"; sha256="1kn2095jx1amyzbkvgf7m466zqfv548n232xc555bpsrw9ma5qhk"; depends=[RGtk2 gWidgets cairoDevice]; }; +gWidgetstcltk = derive { name="gWidgetstcltk"; version="0.0-55"; sha256="06991rqh4927bal7j718bn2ziy6rws8yq682lmp5vbqhdd36afv2"; depends=[gWidgets digest]; }; +gains = derive { name="gains"; version="1.1"; sha256="1mn8db8yxgkf8z6nm6k76g5l3i3vnw750ksg3w9ysd2pcabb65g1"; depends=[]; }; +galts = derive { name="galts"; version="1.3"; sha256="0b18hsdcsx43rn8l4x9nhy9hgggjr5b8kvjnbxrf6r23qsdk43mn"; depends=[genalg DEoptim]; }; +gam = derive { name="gam"; version="1.09.1"; sha256="09p83ki821x57kc74klh6i1h8bz3acsrvibz3mzzcgq6sa8gzr5i"; depends=[]; }; +gamair = derive { name="gamair"; version="0.0-8"; sha256="11qwmhrzks8gi9is2n9xcy6cviy7a8mwh2v78fw78x7g7ccd8i9x"; depends=[]; }; +gambin = derive { name="gambin"; version="1.1"; sha256="197k8j6mvf8236gwg8vvfnskf4hic9y075chsd8214n1nk7i6jmz"; depends=[]; }; +gamboostLSS = derive { name="gamboostLSS"; version="1.1-2"; sha256="1my718gp5wnzrpy50r9cjcjy4kbxvy0q1867n21dll6rhbxz0yil"; depends=[mboost]; }; +gamboostMSM = derive { name="gamboostMSM"; version="1.1.5"; sha256="1n6ngbxx9f3p98jfiq4x21y0rqmhy18zyv13y8mkrz7hrchh835f"; depends=[mboost]; }; +gamclass = derive { name="gamclass"; version="0.55"; sha256="0nhy1qdc221hsnby8j0m2a4x4a8qwfixbaq4gd22rn1xpbsdnfw3"; depends=[car mgcv DAAG MASS rpart randomForest lattice latticeExtra ape KernSmooth]; }; +games = derive { name="games"; version="1.1-1"; sha256="05x27vivz2acp7darja0x21l29ddlav6ch6l89a9s60v52zqflik"; depends=[maxLik Formula MASS stringr]; }; +gamlr = derive { name="gamlr"; version="1.12-1"; sha256="17vfb3kac5y3xfw8s1m8czm5bq5z6x6lc43f2szj5lv84mf2r6y7"; depends=[Matrix]; }; +gamlss = derive { name="gamlss"; version="4.3-1"; sha256="1yhg76shxaz78pmyadhh0kf710gaf9mz58hi832mpzd0hd2635y7"; depends=[gamlss_data gamlss_dist nlme MASS survival]; }; +gamlss_add = derive { name="gamlss.add"; version="4.3-0"; sha256="0kafvrh5b60pd7vs7swd6xq9c2py6ixjrdnhq2y4w112fp86jnbp"; depends=[gamlss mgcv nnet rpart]; }; +gamlss_cens = derive { name="gamlss.cens"; version="4.2.7"; sha256="1dy8myravipsa3cmkdwy3m46s419fhck0f0yz1kf6qlvxxr7a4m4"; depends=[gamlss gamlss_dist survival]; }; +gamlss_data = derive { name="gamlss.data"; version="4.2-7"; sha256="0g3fmqrwxmj14r0p0ai1adq6cs3bd3ys47gjcja035xjiajg6cs2"; depends=[]; }; +gamlss_demo = derive { name="gamlss.demo"; version="4.2-7"; sha256="1mlfkm290dk8fvfahmrr7adhw0bj4923zjs2xn0fvbj739rgv6b7"; depends=[rpanel gamlss gamlss_tr gamlss_util]; }; +gamlss_dist = derive { name="gamlss.dist"; version="4.3-1"; sha256="0598sg1dq5xx6a2pdlp87xmkfjfnk6prahnqlpn8yp3jmjm9ws47"; depends=[MASS]; }; +gamlss_mx = derive { name="gamlss.mx"; version="4.2-7"; sha256="0k1isn2mavmwm15jk4gp9r3ks6z9pwd7k3xdsc29b9p8v8iapj4q"; depends=[gamlss nnet MASS]; }; +gamlss_nl = derive { name="gamlss.nl"; version="4.1-0"; sha256="083l5lsb0csxcp4vffvdv2nr7jk3s2gkcavx66m8inzw16j7xilz"; depends=[gamlss survival]; }; +gamlss_spatial = derive { name="gamlss.spatial"; version="0.1"; sha256="0lsq3lfv9gxjvnbnib551sfvcn6g9amwg51q5ipwwzh12hdl0m98"; depends=[gamlss spam mgcv]; }; +gamlss_tr = derive { name="gamlss.tr"; version="4.2-7"; sha256="0f0vmspknkg8039dnrxkjqwjqbl34vjb5sgkcdvy5g8x8dlb5h3w"; depends=[gamlss]; }; +gamlss_util = derive { name="gamlss.util"; version="4.2-7"; sha256="1c8xc0qf387cd9d6k9fzlwvj9735y7v6njsb5fls2fimpnd5vsik"; depends=[gamlss colorspace Matrix MASS rgenoud zoo gamlss_add spam]; }; +gamm4 = derive { name="gamm4"; version="0.2-3"; sha256="19vy5wik9nh77cm25gp3j3j8w8vinwzx5pv90nzdzvx84yvvf0y3"; depends=[Matrix lme4 mgcv]; }; +gaoptim = derive { name="gaoptim"; version="1.1"; sha256="04igpn73k6f6652y496igwypfxmz4igg4jgxx6swqyi37182rqhm"; depends=[]; }; +gap = derive { name="gap"; version="1.1-12"; sha256="1760jwfrlfmb8crk8kba0swpazcznlv80c6j8fiyd9zxjhnq7zf5"; depends=[]; }; +gapmap = derive { name="gapmap"; version="0.0.2"; sha256="0xykpy3cmbiwwa3s8f4777585r7l441qb9ks6ajym01scqcj3nwl"; depends=[ggplot2 reshape2]; }; +gaussDiff = derive { name="gaussDiff"; version="1.1"; sha256="0fqjdxp2ibbami75ba16d02dz4rz5sk8mni45di9anydx44g9d45"; depends=[]; }; +gaussquad = derive { name="gaussquad"; version="1.0-2"; sha256="0bcvkssmwwngcd4cnv924n9h3c8z1w3x9c9bkwn5jbz9zyv1lfms"; depends=[polynom orthopolynom]; }; +gb = derive { name="gb"; version="1.1.8-8"; sha256="18n9wqz82mjxjgzk8vc68kyz3b6lk21d2f16551d6fikjla03adf"; depends=[boot]; }; +gbRd = derive { name="gbRd"; version="0.4-11"; sha256="06x97rw5i6v6cgjxkfhxnw4dn7lghn5q6ra7ri5ag1x9dkfzcl82"; depends=[]; }; +gbm = derive { name="gbm"; version="2.1"; sha256="1a150ksvdbdv8b5f4j62q7v68sbgjvvq0izm4d877izp6d8qd99g"; depends=[survival lattice]; }; +gbs = derive { name="gbs"; version="1.0"; sha256="19zcsvd258ibrj356zlwgryjqylcs56agg3z6d44xbnf8prg05ig"; depends=[nlme]; }; +gcExplorer = derive { name="gcExplorer"; version="0.9-4"; sha256="1ig5m278n8mp93z1c8z39mf1zwwlkl38csn6d6ykpnrfpa3kk65a"; depends=[flexclust flexclust modeltools]; }; +gcbd = derive { name="gcbd"; version="0.2.5"; sha256="0fkg6vk0jkl6680n1hljyv783j4hd84mql0k4pfblvqafwv4nhm3"; depends=[RSQLite plyr reshape lattice]; }; +gcdnet = derive { name="gcdnet"; version="1.0.4"; sha256="0fmy0li06rahch4ir0xa81yilvrd0zqyhmpl4hfxjahhl3npw370"; depends=[Matrix]; }; +gclus = derive { name="gclus"; version="1.3.1"; sha256="02ba6zj9bjwrzykamjp40ajynx9xjx9h2i85n0ym0r5lcki4x6fn"; depends=[cluster]; }; +gcmr = derive { name="gcmr"; version="0.6.1"; sha256="0a47xpgi6bfsc0nn7vkid1q9r29h01q0vjkysaxh1i4zbmxnx5dl"; depends=[nlme sandwich geoR betareg Formula]; }; +gconcord = derive { name="gconcord"; version="0.41"; sha256="1n3pfwk6vip19q1zhbz1n164f9vi7mig8pcd07c4wxnm5ir9dagy"; depends=[]; }; +gcookbook = derive { name="gcookbook"; version="1.0"; sha256="0hb52zfi5bl2j0h8lazz4gzhhcvpicb4ld6xm2vkvi4cj47piyy8"; depends=[]; }; +gdalUtils = derive { name="gdalUtils"; version="0.3.1"; sha256="1a6sg3x5yfffa9xrkvc98i2hm3lvna4jw7p89gn2bf74kzphqpmy"; depends=[sp foreach R_utils]; }; +gdata = derive { name="gdata"; version="2.13.3"; sha256="05k5l4gz0381z89sp64xhngcsykazzznwmankwsnimx5alwrfk2m"; depends=[gtools]; }; +gdimap = derive { name="gdimap"; version="0.1-8"; sha256="1za5aixb5q89b3347rb4590l1qrnslp681qmmz0y8y4x47jqfppr"; depends=[rgl Rniftilib gridExtra colorspace geometry gsl abind movMF]; }; +gdistance = derive { name="gdistance"; version="1.1-5"; sha256="12877mg0ih346h62xa087xwbrqrjvdh0fs8avrvyy4qpqls2s7qn"; depends=[raster igraph Matrix sp]; }; +gdsfmt = derive { name="gdsfmt"; version="1.1.0.1"; sha256="051b0d8i5g3w0i1r95md0334vj1qrclf9n5zzw20fqjbias1z3rs"; depends=[]; }; +gee = derive { name="gee"; version="4.13-18"; sha256="0zfxmjajbgr7999gbnqppq43zzk901kqra7b1d5fa2qn8js6h1ng"; depends=[]; }; +geeM = derive { name="geeM"; version="0.7.1"; sha256="0pzvy0ga17g5v5dd2q4q7fmcwj3nws0p1cg5s0dz3azmrj7n4s31"; depends=[Matrix]; }; +geepack = derive { name="geepack"; version="1.2-0"; sha256="1pxh9nsyj9a40znm4zza4nbi3dkhb96s3azi43p9ivvfj3l21m74"; depends=[]; }; +geesmv = derive { name="geesmv"; version="1.0"; sha256="1xxsiz6rwqxx113vmlddx89g190nmv1yaimmibz8ai0sam5hqnp9"; depends=[nlme gee matrixcalc MASS]; }; +geigen = derive { name="geigen"; version="1.4"; sha256="0k7h3farw9a3sxh0q4gilwqlgz1gqr4al6jbr70j2y5p6sbkvabd"; depends=[]; }; +geiger = derive { name="geiger"; version="2.0.3"; sha256="1wqihvscmq44i34205fzv79wk7j2a72qd8y6ycgrv74plql0316c"; depends=[ape MASS mvtnorm subplex deSolve digest Rcpp coda Rcpp]; }; +gems = derive { name="gems"; version="0.9.5"; sha256="15n3xfhifcxmhsmc2p4ijgfd9l1pmzqj0zmh0xxi8y10ax68f524"; depends=[MASS msm mstate plyr data_table]; }; +gemtc = derive { name="gemtc"; version="0.6"; sha256="03aw5r62577fizvbl7wpl7k3m8bxji21h8a41gl8yr4fpj0353yj"; depends=[coda igraph meta XML]; }; +gemtc_jar = derive { name="gemtc.jar"; version="0.14.3"; sha256="18hbiygpsv67flc4v6z6mir0rfq41v1vsh11dg9phmdr8bx4kcl1"; depends=[rJava]; }; +genMOSS = derive { name="genMOSS"; version="1.1"; sha256="08d6j0iwfah1ianqdr884hh6bg04vfk4kml3clmf7vzx8wfmliy5"; depends=[]; }; +genMOSSplus = derive { name="genMOSSplus"; version="1.0"; sha256="1n3ngx1piy3l14k5k95wrgvrjw9238jkygfqanl3xg2na2mmkr26"; depends=[]; }; +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=[]; }; +gender = derive { name="gender"; version="0.4.1"; sha256="1k14vdk8n4n1xsvjb4p8wk2wbb7qkfx06c230q5fb1bzf8grlxi2"; depends=[devtools dplyr httr jsonlite]; }; +geneListPie = derive { name="geneListPie"; version="1.0"; sha256="0z2gawfzhm05dafj4zlj6ifmf0dy7p1hrpa59lzxrnrc0wr6laji"; depends=[]; }; +geneSignatureFinder = derive { name="geneSignatureFinder"; version="2014.02.17"; sha256="1s9jj87wnzzgm9hnws09yhrxdlb6jw56i3ddwznvmh8vpzrspv4h"; depends=[survival cluster class]; }; +genepi = derive { name="genepi"; version="1.0.1"; sha256="1whhdlq9p8gmygv7464hvfz6dhm65gqq1dqls6hgpmw822zxgbd5"; depends=[]; }; +genetics = derive { name="genetics"; version="1.3.8.1"; sha256="0gfbrpz0zp5bgw3s21wrhjfy70laif47wcrjrm6mjgs6xapiw790"; depends=[combinat gdata gtools MASS mvtnorm]; }; +genlasso = derive { name="genlasso"; version="1.3"; sha256="1q4ybg8xzphnqwywwdb7i2q94dlxwpggvisjqqdj39jh2cabda57"; depends=[MASS Matrix igraph]; }; +genoPlotR = derive { name="genoPlotR"; version="0.8.2"; sha256="0q12sg13yn5f3j5gk0qzszp81x52lpwpk3z4cg0bgxi9zbwmw467"; depends=[ade4]; }; +genomicper = derive { name="genomicper"; version="1.3"; sha256="0fpvf286x0rf2mg9x82668kg5fx90arz5vf3731qinmdnnvrpziv"; depends=[]; }; +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]; }; +geoCount = derive { name="geoCount"; version="1.131209"; sha256="0v9nsqhwf58czq4vh9f2yim2r7w9sfx9g9hp4jdbfy4q7jc5m02a"; depends=[Rcpp RcppArmadillo 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]; }; +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.2"; sha256="1pv7fjsfhnj85y3bmvbr9yirnr0a7sgyc3kljbi60z1ypr5294np"; depends=[rgl jpeg vegan ape geiger phytools]; }; +geonames = derive { name="geonames"; version="0.997"; sha256="1lywi5fxbw9ky3rf3q72iknl9as86c8d5dkrqwzhxn5nbxiwbpsc"; depends=[rjson]; }; +geophys = derive { name="geophys"; version="1.3-6"; sha256="1yfhilgc2nv5jfp0n7iah0wl041an2850c2qnzrvx0vv9fywgw9g"; depends=[RPMG RSEIS RFOC GEOmap cluster]; }; +georob = derive { name="georob"; version="0.1-5"; sha256="0awcqcpv82pn2z7lgir73pg2b0whvrrfy55gi0jrjn7lzyakhqaq"; depends=[sp constrainedKriging lmtest nlme nleqslv quantreg RandomFields robustbase snowfall]; }; +geoscale = derive { name="geoscale"; version="1.1"; sha256="1xmn8y33jz1f16sjbzrld20gy7w54awrr79lhs9s4r8k1gmn0zqg"; depends=[]; }; +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-0"; sha256="11gs2g7gxrzzridlhgbvpgjv55zfxy7y3d24dr3zf9ssa2z8v4v2"; depends=[gstat genalg MASS sp nloptr fields gsl plyr TeachingDemos sgeostat]; }; +geostatsp = derive { name="geostatsp"; version="1.1.5"; sha256="0150qybwd7w570isfxn0vn29gwpcf7p0w43ryn53mvqwhaa0sxmb"; depends=[Matrix raster sp abind numDeriv pracma]; }; +geotools = derive { name="geotools"; version="0.1"; sha256="0d0vf9dvrrv68ivssp58qzaj8vra26ms33my097jmzmgagwy1spd"; depends=[]; }; +geotopbricks = derive { name="geotopbricks"; version="1.3.5.4"; sha256="065h5dd7qxjydblgkgj2amz8krscgf7ds61b923w3b4biin4s4q4"; depends=[raster stringr zoo]; }; +geozoo = derive { name="geozoo"; version="0.4.3"; sha256="0nmmmyk0ih5aqpsn7ip4dhgfm7jhcnca8pigyr9794b110icq1rv"; depends=[bitops]; }; +getopt = derive { name="getopt"; version="1.20.0"; sha256="00f57vgnzmg7cz80rjmjz1556xqcmx8nhrlbbhaq4w7gl2ibl87r"; depends=[]; }; +gets = derive { name="gets"; version="0.1"; sha256="1dibbbg02hrdh062br51f51576jwd01dn1y4vg2hwcah6pg9hh2s"; depends=[zoo lgarch]; }; +gettingtothebottom = derive { name="gettingtothebottom"; version="3.0"; sha256="0n3d8xx4pwh4bps6jkfj4g8mpknj0lsfk03bayhvil744r5jnrn7"; depends=[ggplot2 Matrix lpSolve reshape2]; }; +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.0.0"; sha256="173k0l8grsl3lvvhiflj98fqy1rdh9yiq14c81irm39dxai801xn"; depends=[ggplot2 randomForestSRC reshape2 survival dplyr]; }; +ggdendro = derive { name="ggdendro"; version="0.1-15"; sha256="1xa1pswkf7xnrxs1zqw71ws0r6r0nmc2gnc76bd372czfdn4npci"; depends=[MASS ggplot2]; }; +gglasso = derive { name="gglasso"; version="1.3"; sha256="0qqp5zak4xsakhydn9cfhpb19n6yidgqj183il1v7yi90qjfyn66"; depends=[]; }; +ggm = derive { name="ggm"; version="2.1"; sha256="1m2p5cn7lfy4757rspp3d3jnphjp5vh3lvrim1lxlda577kpdmnf"; depends=[igraph]; }; +ggmap = derive { name="ggmap"; version="2.3"; sha256="0sl3jkifba3q0khl5sg2nf08kgn1pirw5a1xag07za51sqda5b5q"; depends=[ggplot2 proto scales RgoogleMaps png plyr reshape2 rjson mapproj]; }; +ggmcmc = derive { name="ggmcmc"; version="0.5.1"; sha256="17pmb2kfrjc2s538my8finr029vy1npzk44626xvznf6bf6bv895"; depends=[plyr reshape2 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="1.7.0"; sha256="1wfqh3mq4hyyfgvw99bq1s8qxvl3qasa8qcikfhbp2ky898w5npb"; 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=[]; }; +gibbs_met = derive { name="gibbs.met"; version="1.1-3"; sha256="1yb5n8rkphsnxqn8rv8i54pgycv9p7x1xhinx4l5wzrds3xhf2dc"; depends=[]; }; +gitter = derive { name="gitter"; version="1.0.4"; sha256="1pvl8k8mb15mcfz1074y246s9basmi5vbpw2n1ca0d8wm5wdidap"; depends=[jpeg tiff logging PET ggplot2]; }; +glarma = derive { name="glarma"; version="1.3-0"; sha256="0r8c6c6q3jd2nv83jfws2skfji4zp9ia134k6wd4f535j7jqv2kw"; depends=[MASS]; }; +glasso = derive { name="glasso"; version="1.8"; sha256="0gcapw7kyxb19wvdyxq1vsmc5j7yyd0rvqxs2i71k31q352sg6zw"; depends=[]; }; +glassomix = derive { name="glassomix"; version="1.2"; sha256="13a2ly0by58z8djq8nbakpyacgb6nkdsqxjq44yw4v2fy3s22z3n"; depends=[mvtnorm glasso huge]; }; +glcm = derive { name="glcm"; version="1.0"; sha256="0i1i4dwswy0pi6fj78qffgk90pcrpzbr2dn87siq52kl7i66c2ny"; depends=[Rcpp Rcpp RcppArmadillo]; }; +gld = derive { name="gld"; version="2.2.1"; sha256="1x9xlqj87xmk90hn20k1yvnvyndxdbi67yrxrfdhr3lhxabq5msw"; depends=[]; }; +gldist = derive { name="gldist"; version="2160.2"; sha256="1dcf3pb4xqvhqj4m3xc3ihzjbzxjspjrnc8819hmlnmdd0csghmx"; depends=[]; }; +glinternet = derive { name="glinternet"; version="0.9.0"; sha256="0qihlzdb9ifqlyx5l34vkwi6z59xd7wbl72a3pj725n9kkk7bmig"; depends=[]; }; +gllm = derive { name="gllm"; version="0.35"; sha256="1m9asamh2yha9q8mrllvvc9qj2im6cspvfpafzc8krmh17zq4ins"; depends=[]; }; +glm2 = derive { name="glm2"; version="1.1.2"; sha256="1x9pq2ddsz9al8w044qch34s3fahca63dz85lvm5qn16945ccw1s"; depends=[]; }; +glmc = derive { name="glmc"; version="0.2-4"; sha256="03m1ym9w0b0gqib13pnh1yrjijlcwsn5lijg0nsr4hd6gxw29cla"; depends=[emplik]; }; +glmdm = derive { name="glmdm"; version="2.60"; sha256="09vljki24fccqkvxkmg2i6a8pxqhfwm155b41m2q51lqaq29bfw7"; depends=[]; }; +glmlep = derive { name="glmlep"; version="0.1"; sha256="0jnm3cf2r9fyncxzpk87g4pnxbryqcxxrc5y2a80pv48al3sxlzk"; depends=[]; }; +glmmBUGS = derive { name="glmmBUGS"; version="2.3"; sha256="1j96c1c2lqplhjvyigpj494yxj85bpmc7cnd1hl1rc8b552jr192"; depends=[MASS abind]; }; +glmmGS = derive { name="glmmGS"; version="0.5-1"; sha256="1aqyxw3nrjri8k8wlwvddy25dj7mjqndssd5p5arax8vaqgrdnjz"; depends=[]; }; +glmmLasso = derive { name="glmmLasso"; version="1.3.3"; sha256="122dl5l4ngl9xvyz1kr58hryyxmld0zpwp5437ckwbnkf9bv1ldk"; depends=[minqa]; }; +glmmML = derive { name="glmmML"; version="1.0"; sha256="0b1q5mj325xga3lfks28r03363bjfa31rlgjzwk4s0a6g21bdl4a"; depends=[]; }; +glmnet = derive { name="glmnet"; version="1.9-8"; sha256="1ndaq6qbn8vxs7ha4x9k0qcblr1byixvrhh572794xzgdn548prm"; depends=[Matrix]; }; +glmnetcr = derive { name="glmnetcr"; version="1.0.2"; sha256="1pyg23hdqksiaqdcrsaqz9vb7mgclm41hh0vb7ndkdv284bzzlbz"; depends=[glmnet]; }; +glmpath = derive { name="glmpath"; version="0.97"; sha256="054v188ffjl6x11cld5s9py22kxcs0iq58x4yhxb0ny7mbma5hkn"; depends=[survival]; }; +glmpathcr = derive { name="glmpathcr"; version="1.0.3"; sha256="0qa63c7kwpxf6smczgzf4fmvczw1ynqq5vgcw3bxdbs37q4ypj8n"; depends=[glmpath mvtnorm]; }; +glmperm = derive { name="glmperm"; version="1.0-5"; sha256="1m6nxk9k5qjmq4kvv1nv7n51hagwxi97pd5a3wgiky3wml4aa2nw"; depends=[survival]; }; +glmulti = derive { name="glmulti"; version="1.0.7"; sha256="154s72sjp6pz7ki7s4mgn5v62j7h0lfz9mngf40wvmy31da2s8ix"; depends=[rJava]; }; +glmvsd = derive { name="glmvsd"; version="1.1"; sha256="0qljc8drvc8xdcrs1vchby1zng1v228zp5v01pznfq1rb1knd15c"; depends=[glmnet ncvreg MASS]; }; +glmx = derive { name="glmx"; version="0.1-0"; sha256="0i0p1xk5yk1l274gfr4ijmqnnbq7yyzmi577pb7igwvi3hjn7g7k"; depends=[MASS Formula lmtest sandwich]; }; +globalGSA = derive { name="globalGSA"; version="1.0"; sha256="1f3xv03m6g2p725ff0xjhvn2xcfm7r7flyrba080i4ldy6fd8jg8"; depends=[]; }; +globalOptTests = derive { name="globalOptTests"; version="1.1"; sha256="0yf4p82dpjh36ddpfrby7m3fnj2blf5s76lncflch917sq251h4f"; depends=[]; }; +globalboosttest = derive { name="globalboosttest"; version="1.1-0"; sha256="1k7kgnday27sn6s1agzlj94asww81655d2zprx6qg7liv677bxvf"; depends=[mboost survival]; }; +glogis = derive { name="glogis"; version="1.0-0"; sha256="19h0d3x5lcjipkdvx4ppq5lyj2xzizayidx0gjg9ggb1qljpyw9m"; depends=[zoo sandwich]; }; +glpkAPI = derive { name="glpkAPI"; version="1.2.11"; sha256="194j9v4cpgqgw0zixzi3p73prkr7s7pi1ldrvxyw9j3176lylm0v"; depends=[]; }; +gmailr = derive { name="gmailr"; version="0.5.0"; sha256="1jr3xf561y08wi1a9ysdbra7vf85hp14ybjn457c5mhhyfvxav49"; depends=[httr base64enc magrittr jsonlite]; }; +gmatrix = derive { name="gmatrix"; version="0.2"; sha256="1w83m6q8xflifqqgkkg2my4fkjfjyv0qq4ly8yqk12k77lb03hxq"; depends=[]; }; +gmm = derive { name="gmm"; version="1.5-0"; sha256="071i2bk73z606yb6a3vrv4cfyvgfwkrirm09i7bg2l3y2is1dfgj"; depends=[sandwich]; }; +gmodels = derive { name="gmodels"; version="2.15.4.1"; sha256="1yizjw181bg0ml6j96calflz3k3wpvpxh61hfd3pdba013ixjib5"; depends=[MASS gdata]; }; +gmp = derive { name="gmp"; version="0.5-12"; sha256="10fpvcli526a8j6jaryn0mwk78c24xy7whdpcvqzzvb41l6nnkma"; depends=[]; }; +gmt = derive { name="gmt"; version="1.2-0"; sha256="09az2iwwhyrls4mr619vwzhzmaks6klm67lnir48bh40hynsvibp"; depends=[]; }; +gnm = derive { name="gnm"; version="1.0-7"; sha256="1jnh39i4462ky9vwnrlwq30d8qbp0jg73p8mwm6hnl8sdh53nkr1"; depends=[MASS Matrix nnet qvcalc relimp]; }; +gnmf = derive { name="gnmf"; version="0.7"; sha256="00y1dx1c66gv769yiwnb91xbr77wpidf36x0n0dzaqfn7s9yh6xq"; depends=[]; }; +gnumeric = derive { name="gnumeric"; version="0.7-2"; sha256="14c7a8aiqvqfbrjb1akpfjwidrzdhrw8a07ask083krki6vbi7hh"; depends=[XML]; }; +goalprog = derive { name="goalprog"; version="1.0-2"; sha256="1h3nd3d53hbz5hl3494lpfjnp1ddklc17nhgw18362jd1nk14awy"; depends=[lpSolve]; }; +gof = derive { name="gof"; version="0.9.1"; sha256="1s12gga9d6yizn2y7lzql4jd80lp5jpyml8ybn7xqswp8am82vpg"; depends=[]; }; +goft = derive { name="goft"; version="1.0"; sha256="061x6mnzidmnza9q7z2ikik9zrn434yjx1690bxbh41ckvb92hnx"; depends=[gPdtest mvShapiroTest]; }; +goftest = derive { name="goftest"; version="1.0-2"; sha256="11xw0cfj71z5smywsds9ijbhf3glxkqnhxmwwdqkv4gjrrr2y1bv"; depends=[]; }; +gogarch = derive { name="gogarch"; version="0.7-2"; sha256="03gpl73zc6kx4gni59xbg7b38dkpd7p4c7kvlqm46f58j257viik"; depends=[fGarch fastICA]; }; +gooJSON = derive { name="gooJSON"; version="1.0.01"; sha256="02sldh5lsrjprc9mbf99jyid7ij62db5f1h60z719gxl4pk6fjms"; depends=[rjson]; }; +googlePublicData = derive { name="googlePublicData"; version="0.12.05"; sha256="01wilag2h55zdxxim2h06k0l93csi2nl7iqjnmk4yf9ayz226bc8"; depends=[XML XLConnect]; }; +googleVis = derive { name="googleVis"; version="0.5.6"; sha256="1gv8j4k5529i8gwqi4jk4gqlhbs8hykh5g6q6yqdmx27hz5dq1yn"; depends=[RJSONIO]; }; +goric = derive { name="goric"; version="0.0-8"; sha256="0ayac0yfkxrl13ckc2pwfqnmsrhmbg5bi6iwzx0fmh81vrlp0zrm"; depends=[nlme quadprog mvtnorm MASS Matrix]; }; +govStatJPN = derive { name="govStatJPN"; version="0.1"; sha256="03sywa7rl5rblvv370mfszz5ngp850qf32yydy1fdx10lv5amrfl"; depends=[]; }; +gpairs = derive { name="gpairs"; version="1.2"; sha256="09mkdbs9hklxnmqcsnf65s3dfsfcr7kppp6zxj08v5hxym1gpz3l"; depends=[barcode lattice vcd MASS colorspace]; }; +gpclib = derive { name="gpclib"; version="1.5-5"; sha256="08j81b8wymsgin20n54gvm6m54rmdic51p6qzs9cz4pmgl7dkkjv"; depends=[]; }; +gpk = derive { name="gpk"; version="1.0"; sha256="1zfhkqyypb24mhbj2zi9qy3gw0kqxvlp8j5ni3zm7k5rz1bnrygg"; depends=[]; }; +gplm = derive { name="gplm"; version="0.7-2"; sha256="0pr39fbkv61iwd110lq76p2fi4dvx9qz6mjsvg6bpja9pfbb6wc0"; depends=[AER]; }; +gplots = derive { name="gplots"; version="2.14.2"; sha256="1ydb294qpz971kn44f9jq876wqxg58xisxm8y14v0kpl151yzclc"; depends=[gtools gdata caTools KernSmooth]; }; +gpmap = derive { name="gpmap"; version="0.1.1"; sha256="00jhslbxbp6dgq7bw346hfpw0gans048vsn7chyzjhyr7ah5xrfg"; depends=[isotone plyr ggplot2 foreach]; }; +gpr = derive { name="gpr"; version="1.1"; sha256="03ywik11kc6cnaqrzzzi94jkrdbd378m3sf26f2vpb7d834nl728"; depends=[]; }; +gptk = derive { name="gptk"; version="1.08"; sha256="0fk6c8f8fni4y2n2cbfwywlfyz74xlb8lx25wajsxr2v4x74pa7l"; depends=[Matrix fields]; }; +gputools = derive { name="gputools"; version="0.28"; sha256="0ria03ggcfqgn93gjv2anhvkd3k73c6vfwgka16kf66g1nfzxs4l"; depends=[]; }; +grImport = derive { name="grImport"; version="0.9-0"; sha256="1d8fd7502qj7cirjqdkr1qj51rylw2fz5hs06avfvc2dxs2xwfw1"; depends=[XML]; }; +grade = derive { name="grade"; version="0.2-1"; sha256="085hfvqn880yk19axdjv3z9jr33kls212vs172a8mzhnkallph1r"; depends=[]; }; +gramEvol = derive { name="gramEvol"; version="1.2-1"; sha256="12lixsczgy5ypriv6vwfv8ymfa72pxqhh58dc7n41wcl0zhgfzb4"; depends=[]; }; +granova = derive { name="granova"; version="2.1"; sha256="161fznqlnwmw53abmg2n62lhxxda7400ljnadvcdvsm8f6kcjf80"; depends=[car]; }; +granovaGG = derive { name="granovaGG"; version="1.2"; sha256="0gy8ba1zlm62f458sxrph3cyz4c6nqkaddm6nwj54nyicxqah32h"; depends=[ggplot2 RColorBrewer plyr gridExtra reshape2]; }; +graphicsQC = derive { name="graphicsQC"; version="1.0-5"; sha256="1h0qrf47r16np1ysymvlvvb95a8w86brh440kk20ajhbr5njp6kz"; depends=[XML]; }; +greport = derive { name="greport"; version="0.5-2"; sha256="0lmska9m29hsz9f4myix6my6mg53awr5abigg642i3i2axv7cjd7"; depends=[Hmisc data_table rms lattice latticeExtra Formula survival]; }; +gridBase = derive { name="gridBase"; version="0.4-7"; sha256="09jzw4rzwf2y5lcz7b16mb68pn0fqigv34ff7lr6w3yi9k91i1xy"; depends=[]; }; +gridDebug = derive { name="gridDebug"; version="0.4-0"; sha256="1nbcdjip6ghnlv0j7cf45bpqdpirwn636pg324f0hgiqj4rifn09"; depends=[gridGraphviz gridSVG]; }; +gridExtra = derive { name="gridExtra"; version="0.9.1"; sha256="15pj5w5wlrf8gw4z01i9j88gk6bm4kni64fpip9icmxkn887y3hx"; depends=[]; }; +gridGraphics = derive { name="gridGraphics"; version="0.1-2"; sha256="1ddgfjxvqd7kv4xax71v1srvq8887nvxsc5rn0px57w5fkdl69sh"; depends=[]; }; +gridGraphviz = derive { name="gridGraphviz"; version="0.1"; sha256="14zcr0w2c9cgdw6ij93w52k3bkmgdmx809snh9jjf2amy08p2gbg"; depends=[]; }; +gridSVG = derive { name="gridSVG"; version="1.4-0"; sha256="0ch1waz2z60a7ivn63nf1418kgypr0nv8vr3ak3my0i7gdgny2pc"; depends=[RJSONIO XML]; }; +grnn = derive { name="grnn"; version="0.1.0"; sha256="1dxcmar42g9hz4zlyszlmmnnsnja0gxfggav5jxv0gkp32rkd0wh"; depends=[]; }; +groc = derive { name="groc"; version="1.0.4"; sha256="1v32gwr8ghv47dmzp1x02n3aaqv3cfywh7xzx2486v4p960s42gc"; depends=[rrcov pls mgcv robust robustbase MASS]; }; +grofit = derive { name="grofit"; version="1.1.1-1"; sha256="1rnym5fxbg3bin2idmymrwvf1fcd646bipbgjd6wby8my69zy4c5"; depends=[]; }; +grouped = derive { name="grouped"; version="0.6-0"; sha256="1glxgacpwk7yjbkwg5ci6bmb2il6hf5zhydwi5bbq6hc032m9976"; depends=[MASS]; }; +growcurves = derive { name="growcurves"; version="0.2.3.9"; sha256="1f8hh8ppp6bgrb8crm46xrria3vdnz62aya9lhwcdaggfmy7j25l"; depends=[Rcpp RcppArmadillo reshape2 scales ggplot2 Formula testthat Rcpp RcppArmadillo]; }; +growfunctions = derive { name="growfunctions"; version="0.1"; sha256="0r11grbxbmdx2yg2jh22rf0frg7jz0w7n5d7mbhn16fwnkm3y9mw"; depends=[Rcpp Matrix spam mvtnorm ggplot2 reshape2 scales Rcpp RcppArmadillo]; }; +growthmodels = derive { name="growthmodels"; version="1.2.0"; sha256="1wy5z77819s3daa0mifafcjfkggsq0ac522yagj86ml3vf7yqppj"; depends=[]; }; +growthrate = derive { name="growthrate"; version="1.3"; sha256="1ak3yqlm7dnkdjlmikwa57qnf7yd9n1ixz36gv3shr252750x9cd"; depends=[Matrix clime mvtnorm]; }; +grplasso = derive { name="grplasso"; version="0.4-4"; sha256="1l27fbdf08xj6flvbyvq9pc9v0hv9xpwpxxgcalv1l7rnvbq42jm"; depends=[]; }; +grppenalty = derive { name="grppenalty"; version="2.1-0"; sha256="12hbghmg96dwlscjy6nspgkmqqj4vwq2qcwcz1gp50a08qbmdcrk"; depends=[]; }; +grpreg = derive { name="grpreg"; version="2.8-0"; sha256="1mfd3hzzv720zhl8s6ghw0vfpqkz8q050dwnvmmb0smhdvahd2zj"; depends=[Matrix]; }; +grt = derive { name="grt"; version="0.2"; sha256="0cqjk7yqk2ryx1pgvjd3x8l25hqv92p8rvdr7xw4jkzillllwmhz"; depends=[MASS rgl misc3d]; }; +gsDesign = derive { name="gsDesign"; version="2.9-3"; sha256="0dd96hciiksf436lpm1q35in06b82p4h09spklf28n0p5hgc9225"; depends=[ggplot2 xtable stringr RUnit plyr]; }; +gsalib = derive { name="gsalib"; version="2.0"; sha256="0yk39ca7yrsksga73ma2pdqfy3s1xpp07y8622x44b9cazv6rdy4"; depends=[]; }; +gsarima = derive { name="gsarima"; version="0.1-4"; sha256="1ay3iamnvg7mbnl1xaxxcyic559bdnfspy883w2bwgy20yhr34yg"; depends=[MASS]; }; +gsbDesign = derive { name="gsbDesign"; version="0.96-2"; sha256="0sk4a66z9bqi3aa2ky9472p9znfm93kc9p5igdmvii4dr0syyfxd"; depends=[gsDesign lattice]; }; +gset = derive { name="gset"; version="1.1.0"; sha256="1gingqw6la8n7mnl47wpz9sicxca4zi2m8p35n6cnihrniibhajc"; depends=[Hmisc mvtnorm MCMCpack]; }; +gsg = derive { name="gsg"; version="2.0"; sha256="17fjl7aw1s814krnszxd4y1d4210bnkrf4kb2fwsycqwcwms5pm7"; depends=[mgcv mvtnorm boot numDeriv]; }; +gskat = derive { name="gskat"; version="1.0"; sha256="19mbif7wr88vk5wlc7m2l4xghjmfj2qd3s8yvjlkawbnjk8x6ib0"; depends=[CompQuadForm e1071 gee geepack Matrix]; }; +gsl = derive { name="gsl"; version="1.9-10"; sha256="06n21p0k2ki6nb725a6sxwlb4p7xc5jhg11nq9c3z3dj39r0qgbd"; depends=[]; }; +gsmoothr = derive { name="gsmoothr"; version="0.1.7"; sha256="00z9852vn5pj04dhl3w36yk0xjawniay6iifw1i7fd8g98mgspxp"; depends=[]; }; +gss = derive { name="gss"; version="2.1-3"; sha256="07bp60fhax8v4nyzcgadadi1kfwgwk5r08y6ifsgim500jbw7apk"; depends=[]; }; +gsscopu = derive { name="gsscopu"; version="0.9-1"; sha256="0qg4ra7zvp0j6wjbb14sqajfq745bza3v50s0c5xxnddblqi4hcc"; depends=[gss]; }; +gstat = derive { name="gstat"; version="1.0-19"; sha256="1yhrp1dgkl11hr8jy1kmsiaf8avf02m85wcnvf34vlbil24hy7py"; depends=[lattice sp zoo spacetime FNN]; }; +gstudio = derive { name="gstudio"; version="1.3"; sha256="1ddifizswm41y4sxnnfw8j90clba6zf022x0z4xipccaznim2gy9"; depends=[ggplot2 raster sp reshape2 ggmap popgraph]; }; +gsubfn = derive { name="gsubfn"; version="0.6-6"; sha256="196x4c3ihf4q3i0v7b1xa6jm8jjld2rsx00qz03n90wfnjdx5idv"; depends=[proto]; }; +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]; }; +gtools = derive { name="gtools"; version="3.4.1"; sha256="0d5v864v3qnmmxas8xf74aarli9nr3l16bwj9qzs2s9k498q6azs"; depends=[]; }; +gtx = derive { name="gtx"; version="0.0.8"; sha256="0x71jji2yldi9wpx8d3nldbjfj4930j7zcasayzbylf9094gmg26"; depends=[survival]; }; +gumbel = derive { name="gumbel"; version="1.04"; sha256="0fl44i4kz9wbba1iv4fy1b74nf25axdkifhczgrgpy5d81ky43v6"; depends=[]; }; +gvcm_cat = derive { name="gvcm.cat"; version="1.7"; sha256="0wgras21wzx1magcayz9nra8licrbx8aglmc272wrw3nqiagh0fi"; 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]; }; +h2o = derive { name="h2o"; version="2.8.1.1"; sha256="12v5xjh7j7ns5wqj8aa6phx6cbh8d03r9h933g8ynss18pkd901w"; depends=[RCurl rjson statmod survival]; }; +hSDM = derive { name="hSDM"; version="1.4"; sha256="1jq6hdnyv446ng62srip0b48kccf0qw3xqym3fprg74mjdy3inqr"; depends=[coda]; }; +haarfisz = derive { name="haarfisz"; version="4.5"; sha256="1qmh4glwzqwqx3pvxc71rlcimp1l0plgdf380v9hk0b4gj7g3pkf"; depends=[wavethresh]; }; +hamlet = derive { name="hamlet"; version="0.7"; sha256="0f3gl5xvgdksaxk76dyv46hahc41f2j3pf9wp0rc0q7wpp5nfsjl"; depends=[]; }; +hapassoc = derive { name="hapassoc"; version="1.2-7"; sha256="1cyx68fzazyyihhp2r237c6igspnfklswnja2k4z3my528ggbq7k"; depends=[]; }; +haplo_ccs = derive { name="haplo.ccs"; version="1.3.1"; sha256="0cs90zxxbvglz1af0lh37dw1gxa04k0kawzxamz2was3dbh19lbz"; depends=[haplo_stats survival]; }; +haplo_stats = derive { name="haplo.stats"; version="1.6.11"; sha256="0j3zh4n2rly8dij8srm8ck6fl63haw6d27m3nfnrxywr87pljg14"; depends=[]; }; +hapsim = derive { name="hapsim"; version="0.3"; sha256="18r0cq15psjwxprml84ihj5gw4pk6agd7x0qicj899awa21f2qb3"; depends=[MASS]; }; +harvestr = derive { name="harvestr"; version="0.6.0"; sha256="1jg4d98bwx2cm3hliayqrazq43sa9kd9ynpaid6x4ld3mz5y8mlq"; depends=[plyr digest]; }; +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=[]; }; +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]; }; +hbmem = derive { name="hbmem"; version="0.3"; sha256="0ylxp77ack874sadwfnry84a6bg8gdl9xbw821lp5q05nnyg0dcj"; depends=[]; }; +hbsae = derive { name="hbsae"; version="1.0"; sha256="1iwmpi0pn5fxyxkwqkbmy6w1f1wcx0p809jnviim0ypwib32mhh7"; depends=[Matrix arm]; }; +hcc = derive { name="hcc"; version="0.54"; sha256="14b3pamkywb0wsjpbm0wpflcds0b5mfymvgk92rmf6ngz1bkpdbq"; depends=[]; }; +hcci = derive { name="hcci"; version="1.0.0"; sha256="11piy1ajg3j3dbh66szzf7lhc3x28fz75ai39vlx0gl5nc2v5zs5"; depends=[]; }; +hcp = derive { name="hcp"; version="0.1"; sha256="0hhcy70g13kclxv733kgiys7qn5bi28abpkli5n2vj0a58ac333m"; depends=[]; }; +hda = derive { name="hda"; version="0.2-12"; sha256="11z9p35dvhi7bdw09d2yawh46nxk8axw76b51vk089g12nr2b9x7"; depends=[e1071]; }; +hddplot = derive { name="hddplot"; version="0.56"; sha256="0s9iijwq8zfvavqq2bkqm2884sg0957ppkggsv6mmm3cbdi2xrlc"; depends=[MASS]; }; +hddtools = derive { name="hddtools"; version="0.2.2"; sha256="0ldasm8aqzcc0lfmgdbvljz103g11ydw01g4mv7wzysjvw6zlwfl"; depends=[sp rgdal raster RCurl XML zoo]; }; +hdeco = derive { name="hdeco"; version="0.4.1"; sha256="04nggwckvn1kwi238qd33l4pryzn4aq5bmi30bvfi99gwnrlgfgq"; depends=[]; }; +hdi = derive { name="hdi"; version="0.1-2"; sha256="19lc2h34jlj198gchnhbfbb8igwlan2b977a47j8p3q6haj5bcv1"; depends=[glmnet linprog MASS scalreg]; }; +hdlm = derive { name="hdlm"; version="1.2"; sha256="0s4lzg3s2k7f7byygb11s7f78l3rkkb0zn03kh3d7h8250wg9fax"; depends=[glmnet foreach MASS iterators]; }; +hdrcde = derive { name="hdrcde"; version="3.1"; sha256="027nxpzk1g0yx8rns7npdz30afs5hwpdqjiamc7yjrsi0rzm71lw"; depends=[mvtnorm locfit ash ks KernSmooth]; }; +heatex = derive { name="heatex"; version="1.0"; sha256="0c7bxblq24m80yi24gmrqqlcw8jh0lb749adsh51yr6nzpap6i9n"; depends=[]; }; +heatmap_plus = derive { name="heatmap.plus"; version="1.3"; sha256="0rzffm15a51b7l55k0krk6w7v8czy3vpwz1qmbybr7av0pln7wn3"; depends=[]; }; +heatmap3 = derive { name="heatmap3"; version="1.0.7"; sha256="037aw51ynhi45yzsdd9af9kv1lza2k5lvx8m8jbzp6adadpwr305"; depends=[fastcluster]; }; +heatmapFit = derive { name="heatmapFit"; version="2.0.2"; sha256="00p39y6x13yxrxfqx6gzmb80fk1hsyi8wa6brx40hj37pyyfis0p"; depends=[]; }; +heavy = derive { name="heavy"; version="0.2-35"; sha256="04aw0r2hgnxf9nsd18q2b5d130vj578nyv5wacivikgfifyy0y39"; depends=[]; }; +helloJavaWorld = derive { name="helloJavaWorld"; version="0.0-9"; sha256="1a8yxja54iqdy2k8bicrcx1y3rkgslas03is4v78yhbz42c9fi8s"; depends=[rJava]; }; +helsinki = derive { name="helsinki"; version="0.9.20"; sha256="0jlyvj8cyzb0si2gqwik4jzbmwfawwnap9k6jl1z2nw2rz5w1k3c"; depends=[maptools rjson RCurl]; }; +heplots = derive { name="heplots"; version="1.0-12"; sha256="064kanmqm4b0sbyw60wfb19adclpdagm23l6p86vi0hyx0dr0ykz"; depends=[car MASS]; }; +hergm = derive { name="hergm"; version="1.3-11"; sha256="1kfh7ry84smxf3d0ykjr7d0ckh2dk9y63761f4pmskfxqx12w98a"; depends=[ergm]; }; +heritability = derive { name="heritability"; version="1.0"; sha256="08hlj6blqp70812llaxx5m18qn1v65csfz6d0lhhab2pir7arlg8"; depends=[]; }; +hermite = derive { name="hermite"; version="1.0"; sha256="11daz0lwlr6klbqkc4bkkmghfm0p2pqmpclrp6dj5v3403h3yksh"; depends=[]; }; +het_test = derive { name="het.test"; version="0.1"; sha256="08kxp81dx32anh0k5b65x7w7madwnn9hiabdrk6ck6b6mx37x26v"; depends=[vars]; }; +hett = derive { name="hett"; version="0.3-1"; sha256="1y0hr9g2pjwzc5azh095h33qidxhhmlvd1csamjnhwdphj5drzz0"; depends=[MASS lattice]; }; +hexView = derive { name="hexView"; version="0.3-2"; sha256="19s87qxz9rjvzr64pv51wfd26jy5f00i8lwv39hhr6rh0jwngdly"; depends=[]; }; +hexbin = derive { name="hexbin"; version="1.27.0"; sha256="0fs5nsaalic6fj7b347yjczws310y3q2v37yr8sg74yq8wqzsdj8"; depends=[lattice]; }; +hflights = derive { name="hflights"; version="0.1"; sha256="1rb6finck13i6949i6hsgfk90q4ybxh1m3is2mlw2m6087bpzfbd"; depends=[]; }; +hgam = derive { name="hgam"; version="0.1-2"; sha256="1flcc67n8kbh9m5phdfl587xg1x935zbp305y0gdmkc8vpkiwpcf"; depends=[grplasso lattice rgl]; }; +hglasso = derive { name="hglasso"; version="1.2"; sha256="1qq41ma33wz7qjs5zx72yvngpsiq62z9sd6d5hvvl83brq0fcr4b"; depends=[glasso mvtnorm igraph fields]; }; +hglm = derive { name="hglm"; version="2.0-11"; sha256="0yqnky2p5avxn7nv8wnk57xkd0dpk89jas6d577q50ms4dpwdl6z"; depends=[Matrix MASS hglm_data]; }; +hglm_data = derive { name="hglm.data"; version="1.0-0"; sha256="1hrq1jac658z5xjsg03nfkb4kwm9z44bhciv5chk74ww8gjr9j9q"; depends=[Matrix MASS]; }; +hht = derive { name="hht"; version="2.1.1"; sha256="1pfjqydgbcr75j3l18jf466zj4hxghqfm33m5v7f7kw97rr5vyzm"; depends=[EMD fields spatstat]; }; +hiPOD = derive { name="hiPOD"; version="1.0"; sha256="1i15ickz2s0kffh99qq30pl5hsl0lbj0kp55jnbv4x72hndzhmla"; depends=[rgl]; }; +hiddenf = derive { name="hiddenf"; version="1.1"; sha256="04pl3glvg3m1xzvxnc5lwjz839zrpc8zhnsxcswvvaqpgzip5f1p"; depends=[]; }; +hier_part = derive { name="hier.part"; version="1.0-4"; sha256="03acdgzkhbk4p0wxw2g1hzklmq9hzmdkkvfj742vzfswdd803yg9"; depends=[gtools]; }; +hierNet = derive { name="hierNet"; version="1.6"; sha256="08lifk92caa4l9nfb89rl6vby8sd1ba3ay7z29ffirsg7cx07qiw"; depends=[]; }; +hierarchicalDS = derive { name="hierarchicalDS"; version="2.9"; sha256="0ckxy4pww5iik4m4kqs714f00g7lfzsarjdbpd0bcalvq4lmaal2"; depends=[truncnorm mvtnorm Matrix coda xtable mc2d ggplot2 rgeos]; }; +hierfstat = derive { name="hierfstat"; version="0.04-14"; sha256="0zbl5cq0cidv0glgi1g2q0azfw393lnb7hp8m69sxwdjn3y3912c"; depends=[gtools ade4]; }; +highD2pop = derive { name="highD2pop"; version="1.0"; sha256="1s4v6m2d3vzvxsgmjzczv1zj3kv3ygvv6gbkkbjwsdhkvc1rdmf0"; depends=[fastclime]; }; +highTtest = derive { name="highTtest"; version="1.0"; sha256="0iyr47nid147m9m8bsjjxc9kvjv68rgay4naxldwisyscqp8jl0m"; depends=[colorfulVennPlot]; }; +highlight = derive { name="highlight"; version="0.4.4"; sha256="03mch5waqkzb9pb4llgalbxdfn3h6adh05f3i43kscssc67bs30l"; depends=[]; }; +highr = derive { name="highr"; version="0.4"; sha256="18qfh6v5h29g6y2fkgd4qnkl1ijzzjh369gvn9pzcgaapm6s2wpf"; depends=[]; }; +hillmakeR = derive { name="hillmakeR"; version="0.2"; sha256="1baynibgn4xqmpsxna8irggxvdc484mq5nza00rwg58vh1bc7wzq"; depends=[]; }; +hint = derive { name="hint"; version="0.1-1"; sha256="1n18j2hcb1qynhsln10nzryi20l5aqhr7i1aanww10y5dz573zi3"; depends=[]; }; +hisemi = derive { name="hisemi"; version="1.0-319"; sha256="0pm7dsaaqrdhkvxsk2cjvk6qd2rqqmddmv012smnrivi7mpnvd4w"; depends=[Matrix Iso fda]; }; +histogram = derive { name="histogram"; version="0.0-23"; sha256="0hrhk423wdybqbvgsjn7dxgb95bkvmbh573q1696634hvzfdm68c"; depends=[]; }; +hitandrun = derive { name="hitandrun"; version="0.4-2"; sha256="143aj926mx0v26f8dsagr90ggzk23lfms57agzrnqfvddla7ng9c"; depends=[rcdd]; }; +hive = derive { name="hive"; version="0.1-16"; sha256="1xaxnr8nfkji2b5f5dq2h01pkl20rm24wxnf1y1xv695v3j58ibd"; depends=[rJava XML]; }; +hlr = derive { name="hlr"; version="0.0-4"; sha256="04w1hzjfg2ly9vm9ynh676fy74d9ncy3a1mak209z2ddgr3m7r2y"; depends=[MASS]; }; +hmeasure = derive { name="hmeasure"; version="1.0"; sha256="0wr0xq956glmhvy4yis3qq7cfqv9x82ci9fzx3wjvaykd16h0sx9"; depends=[]; }; +hmm_discnp = derive { name="hmm.discnp"; version="0.2-3"; sha256="1r9xxgsqh5pw9incldaxnsqhyanhd4jwm6w0ix1k43i53dw4diyr"; depends=[]; }; +hmmm = derive { name="hmmm"; version="1.0-3"; sha256="0yjx5i13jbv7vzxn84m6305124ri7jnym0bxbdj46s6l7lw025a9"; depends=[quadprog MASS mvtnorm]; }; +hoardeR = derive { name="hoardeR"; version="0.0-2"; sha256="1k9a469h6fmr1br93dsk4q14h2bw8225l0v5sfp2wyr8sfpwm1dg"; depends=[httr XML stringr]; }; +holdem = derive { name="holdem"; version="1.1"; sha256="07h4cbg7hx91hc6ypi6hbalzdd9qz9rfhjgk5sq1srnangwwnxlw"; depends=[]; }; +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=[]; }; +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=[]; }; +hpcwld = derive { name="hpcwld"; version="0.4"; sha256="1vh5jvq9nbghsl59fi6v3nmsh0jmxq7pzbs3fgasz8c3jmjw50kp"; depends=[]; }; +hpoPlot = derive { name="hpoPlot"; version="1.0"; sha256="0jd0imbhsw74gziafkzn7hrxz79llmpksspbnxnslm1mifl81www"; depends=[functional plotrix Hmisc]; }; +hqmisc = derive { name="hqmisc"; version="0.1-1"; sha256="0jcy2hb3dmzf9j4n92aq7247mx9w7n30wpsx0dkchqnjwlqwwncw"; depends=[]; }; +hrr = derive { name="hrr"; version="1.1.1"; sha256="17jzsgh2784y7jdwpa50v7qz99dw6k2n25sisnam6h1a39b96byn"; depends=[]; }; +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.0"; sha256="04zhqnrrzhg1kqxf251q7iglazsj28dqqvhvch472925xf7dnap3"; depends=[snowfall Rcpp RcppArmadillo Rcpp]; }; +htmltools = derive { name="htmltools"; version="0.2.6"; sha256="1gp6f6388xy3cvnb08q08vraidjp740gfxlafdd19m2s04v5hncz"; depends=[digest]; }; +hts = derive { name="hts"; version="4.4"; sha256="1dpm669lc4khjkcs49m1nh7i61sclsqy7xbcn4mqqjhfgs7sg7sk"; depends=[forecast SparseM]; }; +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.5"; sha256="074z78zv3nif53lsmn2k6hwv3yz4xr21wacb53s3f6hnmms8qvfp"; depends=[RCurl stringr digest jsonlite]; }; +huge = derive { name="huge"; version="1.2.6"; sha256="11njfd4i8q950apga6sdk84p4wk4qvp8bpg6yz9lgjrgj2hn14n2"; depends=[Matrix lattice igraph MASS]; }; +humanFormat = derive { name="humanFormat"; version="1.0"; sha256="0zwjbl8s5dx5d57sfmq6myc6snximc56zl88h8y1s1jqphyn9sir"; depends=[testthat]; }; +hwde = derive { name="hwde"; version="0.64"; sha256="1is39zknssqm98577sdjg8gn3h9wsraih19a9nd6n8mxdcsqivh4"; depends=[]; }; +hwriter = derive { name="hwriter"; version="1.3.2"; sha256="0arjsz854rfkfqhgvpqbm9lfni97dcjs66isdsfvwfd2wz932dbb"; depends=[]; }; +hwriterPlus = derive { name="hwriterPlus"; version="1.0-3"; sha256="06hq493v702hy2mv73glav4az2wphzy3lqqkxjkpjpab00xc42d5"; depends=[hwriter TeachingDemos]; }; +hybridEnsemble = derive { name="hybridEnsemble"; version="0.1.1"; sha256="1hn6zfz22mgxv5qpwdgmn7a9snha7hdkbbqq3xicy37j8xypsab5"; depends=[kernelFactory ada rpart ROCR nnet e1071 NMOF GenSA Rmalschains pso AUC soma genalg reportr nnls quadprog tabuSearch glmnet]; }; +hybridHclust = derive { name="hybridHclust"; version="1.0-4"; sha256="1967p6crkrbnlfghd9x1alr2x57nqjl1zh58hhyshgla3xmdmhx5"; depends=[cluster]; }; +hydroApps = derive { name="hydroApps"; version="0.1-1"; sha256="1ycv7l2ywwnx2mgklg6rry7n24jyhi4spvp1xl345yvyn9kf15dz"; depends=[nsRFA]; }; +hydroGOF = derive { name="hydroGOF"; version="0.3-8"; sha256="1ljk2dk5ydsg7qdizyzkbw0b2zdhnb3x9h965d94ygzg8nw5kbak"; depends=[zoo hydroTSM xts]; }; +hydroPSO = derive { name="hydroPSO"; version="0.3-4"; sha256="12md94g78m7m1np36sadx0wxpb149pn5gd8yj2kw7fphb8g6a218"; depends=[Hmisc sp lattice zoo lhs]; }; +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.1"; sha256="07pi1q4g5bhjq9vd31rvakqbrspk1yxhysds904b0cmax9wwlqlx"; depends=[]; }; +hyperSpec = derive { name="hyperSpec"; version="0.98-20140523"; sha256="1ypmq5xgcjqrq9i8f08csjqffv9qfpfkvrbawlf1ds7i49h6jq28"; depends=[lattice mvtnorm]; }; +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.0.2"; sha256="051623cxlqs7h4zf2a4adhcyqawsap8xszv6naj6m2zss33b4md3"; depends=[Rcpp rgl MASS geometry igraph Rcpp]; }; +hypothesestest = derive { name="hypothesestest"; version="1.0"; sha256="0g8sm386m1zm9i3900r62x83wb600cy8hqk7dlvbx6wcgrxg82sm"; depends=[]; }; +hypred = derive { name="hypred"; version="0.4"; sha256="08nqgw0h3zh4vyhfd1cngr6snz5n7skj3d9rg2qccz9pnjp7j1ab"; depends=[]; }; +hysteresis = derive { name="hysteresis"; version="2.0"; sha256="1g9d91djwi9k2q10zqak8fpmywnwmha1pm18g2hmwzrqrwnr6dh9"; depends=[car msm nlrwr]; }; +hzar = derive { name="hzar"; version="0.2-5"; sha256="000l4ki3hvznnhkxc5j422h5ifnsfqalv666j48yby1hsf1lc3kg"; depends=[MCMCpack foreach coda]; }; +iBATCGH = derive { name="iBATCGH"; version="1.1"; sha256="0nl5l17pm92ns40qzkmayc48a6i4j8w0562sp5jxyi95y4vb4aiy"; depends=[Rcpp msm Rcpp RcppArmadillo]; }; +iBUGS = derive { name="iBUGS"; version="0.1.4"; sha256="0vsxy8pnbix0rg7ksgywx7kypqb5ngkxhldh3cisjkvdv638ybps"; depends=[R2WinBUGS gWidgetsRGtk2]; }; +iC10 = derive { name="iC10"; version="1.1.1"; sha256="1awmg2m9f7lq5p16mzlmz2sw680vbi70j4ksxx8d385rhmy6v5w6"; depends=[pamr iC10TrainingData]; }; +iC10TrainingData = derive { name="iC10TrainingData"; version="1.0.1"; sha256="1x1kgxiib9l7whm2kmbv1s912hgpl7rdpqpn67nlkiswnr27hqn4"; depends=[]; }; +iCluster = derive { name="iCluster"; version="2.1.0"; sha256="09j36xv87d382m5ijkhmp2mxaajc4k97cf9k1hb11ksk7fxdqz6r"; depends=[lattice caTools gdata gtools gplots]; }; +iDynoR = derive { name="iDynoR"; version="1.0"; sha256="01702vl10191mbq2wby1m0y6h8i6y6ic4pa83d27cg3yccsrhziz"; depends=[XML vegan]; }; +iFad = derive { name="iFad"; version="3.0"; sha256="0jrl9bayihp3wb4k5w9kc71qlsdxk7vl83ydfibx2bg79c4hf3cs"; depends=[Rlab MASS coda ROCR]; }; +iGasso = derive { name="iGasso"; version="1.2"; sha256="123487slizsmw5b0imwqll8n03navx30kvawr6jfibbjfdd8vfn7"; depends=[lattice CompQuadForm]; }; +iRefR = derive { name="iRefR"; version="1.13"; sha256="17kjfga62xc4s1kii5clxszbag2dr1dyxfm7jasr20prx28ya6pp"; depends=[igraph]; }; +iRegression = derive { name="iRegression"; version="1.2"; sha256="1fn25xnrvgx2ayhss136rxn1h3c9pvq2gmb5kbp92vsf07klvh6v"; depends=[mgcv]; }; +iRepro = derive { name="iRepro"; version="1.0"; sha256="1knncn47pl411r31z1r5ipsiyagcpjbc2gb972n7l3539pcpf0zy"; depends=[]; }; +iScreen = derive { name="iScreen"; version="1.0"; sha256="09iyimzrx7510xamhl6w1f7p6j096wh5yck9zgwbk87mvabqynmg"; depends=[maptree]; }; +iWeigReg = derive { name="iWeigReg"; version="1.0"; sha256="09ajbqllr4ajmpk8qs6qw019fx8a7vsabm37867zycssn77z9nc8"; depends=[MASS trust]; }; +ibd = derive { name="ibd"; version="1.2"; sha256="0681v7lgx697yj2d60cw3p5axbbaxanzj291vdf7ailn7300p1ms"; depends=[lpSolve MASS car lsmeans multcompView]; }; +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=[]; }; +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=[]; }; +ica = derive { name="ica"; version="1.0-0"; sha256="009xv1ycgbnw6ysx1wxrgygny7qa2wd2mcjrg2fwxg958mzyrx4z"; depends=[]; }; +icaOcularCorrection = derive { name="icaOcularCorrection"; version="3.0.0"; sha256="1vmvarc2apipd0vlhprc5wpgh8i38m5myj1gqdymjrnky0azq17f"; depends=[fastICA mgcv]; }; +icamix = derive { name="icamix"; version="1.0.1"; sha256="06jaznzgixglbrrmvmp3cnghdldv30h5nfjghvdymia27m7ssdrr"; depends=[Rcpp Rcpp RcppArmadillo]; }; +icapca = derive { name="icapca"; version="1.1"; sha256="131gdrk8vsbac0krmsryvsp21bn9hzxqxq847zn16cxjf6y5i3xb"; depends=[]; }; +iccbeta = derive { name="iccbeta"; version="1.0"; sha256="0zsf2b5nrv39pssi5walf82892fr8p1f802c96hjjknh78q7gh0h"; depends=[lme4 Rcpp Rcpp RcppArmadillo]; }; +icd9 = derive { name="icd9"; version="0.5"; sha256="128gv2yxylncmbr6b1qz82ys7aanqxf35psrmrh2i4l84w3w5l8g"; depends=[memoise]; }; +icensmis = derive { name="icensmis"; version="1.2.1"; sha256="1h4l9irip4hv34hr92j8756qgmy455mfdblr7ypgsgvr27cgax8h"; depends=[Rcpp Rcpp]; }; +idbg = derive { name="idbg"; version="1.0"; sha256="1rxmj04hswxybrg7dfib3mjy8v8mdiv13zwbscp2q55z55hhf1m5"; depends=[]; }; +identity = derive { name="identity"; version="0.2-1"; sha256="1j5wb5cj5j49in2g6r1shdm4ri4cfzj22hpqazvcmq4dm291sdi9"; depends=[]; }; +idr = derive { name="idr"; version="1.2"; sha256="05nvgw1xdg670bsjjrxkgd1mrdkciccpw4krn0zcgdf2r21dzgwb"; depends=[]; }; +ieeeround = derive { name="ieeeround"; version="0.2-0"; sha256="0xaxrlalyn8w0w4fva8fd86306nvw3iyz44r0hvay3gsrmgn3fjh"; depends=[]; }; +ifa = derive { name="ifa"; version="7.0"; sha256="1cxafd7iwvyidzy27lyk1b9m27vk785ipj9ydkyx9z1v0zna2wnl"; depends=[mvtnorm]; }; +ifs = derive { name="ifs"; version="0.1.4"; sha256="0fzani8rnn4rdwlghq967hhi4zfjnk3gwpk3v6wys738xj7yfwp1"; depends=[]; }; +ifultools = derive { name="ifultools"; version="2.0-1"; sha256="16lrmajyfa15akgjq71w9xlfsr4y9aqfw7y0jf6gydaz4y6jq9b9"; depends=[splus2R MASS]; }; +igraph = derive { name="igraph"; version="0.7.1"; sha256="1nvb30zjjw861idbd8zap9qqg22k87zdi6qqvjf1s29v7hkx7kq7"; depends=[Matrix]; }; +igraphdata = derive { name="igraphdata"; version="0.2"; sha256="0hm757fc2snqlav3wx1vdmwy2gr5cskig97c2zlvk88sfwgx4i2m"; depends=[]; }; +igraphtosonia = derive { name="igraphtosonia"; version="1.0"; sha256="0vy9jnpjp68l8s0hi1l57j9p41c543h3iqv16pwl550f38zqp8j6"; depends=[igraph]; }; +iki_dataclim = derive { name="iki.dataclim"; version="1.0"; sha256="1yhvgr8d3j2r8y9c02rzcg80bz4cx58kzybm4rch78m0207wqs7p"; depends=[zoo lubridate climdex_pcic PCICt]; }; +ilc = derive { name="ilc"; version="1.0"; sha256="0hs0nxv7cd300mfxscgvcjag9f2igispcskfknb7sn7p8qvwr5ki"; depends=[demography rainbow forecast date survival]; }; +imguR = derive { name="imguR"; version="1.0.0"; sha256="0yhlir0qxi6hjmqlmmklwd4vkymc5bzv9id9dlis1fr1f8a64vwp"; depends=[RCurl httr png jpeg]; }; +imprProbEst = derive { name="imprProbEst"; version="1.0.1"; sha256="09y8yd9sw0b79ca45ryi7p82vy5s8cx0gg603rlc39lgwcdv45i3"; depends=[inline lpSolve]; }; +imputeLCMD = derive { name="imputeLCMD"; version="1.0"; sha256="0avgl8wwwsz27z439y415lv4h33af58db084mjr236y1z9sfhdyw"; depends=[tmvtnorm norm]; }; +imputeMDR = derive { name="imputeMDR"; version="1.1.2"; sha256="0ds5a4wav9vb9z5nji8hv5l76310rd970xf702fd0ckx1sh6rgd7"; depends=[]; }; +imputeR = derive { name="imputeR"; version="1.0.0"; sha256="18rx70w7xb33m84ifxl3p599js78pa748c9lmlkic6yqrgsabcip"; depends=[caret reshape2 glmnet pls rda Cubist ridge gbm mboost rpart]; }; +imputeYn = derive { name="imputeYn"; version="1.2"; sha256="08i3bwzmd4cn3cbwbrcjh3b75m7xms9m3dpmym99g08282cmljwx"; depends=[quadprog emplik mvtnorm survival]; }; +in2extRemes = derive { name="in2extRemes"; version="1.0-1"; sha256="0k5qczs54b7bl71my8xmnqly91g7c5skj0lm2g8dk4hgrx6wwsrf"; depends=[extRemes]; }; +inTrees = derive { name="inTrees"; version="1.1"; sha256="1b88zy4rarcx1qxzv3089gzdz1smga6ssj8cxxccyyzci6px85j1"; depends=[RRF arules gbm xtable]; }; +inarmix = derive { name="inarmix"; version="0.4"; sha256="11a1vaxq22d5lab07jp5pw0znkaqj6bmkn6vsx62y6m4mmqk04yr"; depends=[Matrix Rcpp Rcpp]; }; +incReg = derive { name="incReg"; version="1.0"; sha256="1kckx64hn8g9wvjg7g9xild5hclim1rs7z2m7rgmbdwlbayxpwgv"; depends=[car]; }; +indicoio = derive { name="indicoio"; version="0.3"; sha256="04c2j4l103fiiibf83z7iq95wfnlv9rj46cyp9xy68bzqkbwdi3m"; depends=[httr rjson stringr png]; }; +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]; }; +inflection = derive { name="inflection"; version="1.1"; sha256="1nb1pf07c371vwgplfyjs3q1iqgb5hyk9czxqrjiy18g8p7zdln2"; depends=[]; }; +influence_ME = derive { name="influence.ME"; version="0.9-4"; sha256="1smvhr72vnds20x71986idk6rak69g28dddlf9g2ivg0ajkji5q9"; depends=[lme4 Matrix lattice]; }; +influence_SEM = derive { name="influence.SEM"; version="1.4"; sha256="1grsnp8xwmhh9qx0yc5fy8b3g4i4cfqbg6sfzbmn39si2z34wrxw"; depends=[lavaan]; }; +infoDecompuTE = derive { name="infoDecompuTE"; version="0.5.1"; sha256="1aigd1fvpdqjplq1s1js0sy8px68q73lbp5q591rn52c77smdhaj"; depends=[MASS]; }; +informR = derive { name="informR"; version="1.0.04"; sha256="0s40hlilk8fjld2m43f2m50a3764qgnv07y5jwv60a8d0nf4gpa2"; depends=[abind relevent]; }; +infotheo = derive { name="infotheo"; version="1.2.0"; sha256="18xacczfq3z3xpy434js4nf3l19lczngzd0lq26wh22pvg1yniwv"; depends=[]; }; +infutil = derive { name="infutil"; version="1.0"; sha256="02d0hfbkdqjj0lm1fzwwxy60831kbcjn2m4rfblpib0krkbpz72n"; depends=[ltm]; }; +inline = derive { name="inline"; version="0.3.13"; sha256="1dijlcnm7wfd6jgy6wsj6imwg43f91cl7iiz5j2jhhavw2pczr62"; depends=[]; }; +inlinedocs = derive { name="inlinedocs"; version="2013.9.3"; sha256="13vk6v9723wlfv1z5fxmvxfqhaj68h0x3s2qq9j6ickr4wakb4ar"; depends=[]; }; +insideRODE = derive { name="insideRODE"; version="2.0"; sha256="1ffndk8761cpkririb3g1qsq9nwmh82lcrpql9i5fksdprvdjzcw"; depends=[deSolve nlme lattice]; }; +insol = derive { name="insol"; version="1.1.1"; sha256="0zbawkp4qb0kqb7y9ibiyy8sa9rfgbzwmcdswx6s87p0h7brrqn6"; depends=[]; }; +insuranceData = derive { name="insuranceData"; version="1.0"; sha256="0wryh8i1v3bnpbqn6d6dpxr9bwwl6mnh5cb5igz0yanh4m1rx96w"; depends=[]; }; +intReg = derive { name="intReg"; version="0.1-2"; sha256="1sm7v4fnfsdhyqr3q8dms0ifwb00hzf3x1g0fpm7xldlqc3wf6pr"; depends=[maxLik sets sets]; }; +intRegGOF = derive { name="intRegGOF"; version="0.85-1"; sha256="0fyvhl6jmi6krfbimsq61dhixlz9h9jxk4yjvwbx2vl8d9fnnr54"; depends=[]; }; +intamap = derive { name="intamap"; version="1.3-37"; sha256="17l1bifks0vsk0a3bj2g4w8qrvhmdh0p145kmd09223x9yc4mc9v"; depends=[sp gstat automap mvtnorm MASS evd]; }; +intamapInteractive = derive { name="intamapInteractive"; version="1.1-10"; sha256="073k6sdds40fmlbw1xnp3x5sc9qdyq2s1bhp7av4jjm930hsvsrn"; depends=[intamap spcosa spatstat automap gstat]; }; +intcox = derive { name="intcox"; version="0.9.3"; sha256="1m1lzmymh2pk570k6nxq3nj7wxkvs1s3nvz8cb456fnv72ng8fap"; depends=[survival]; }; +integrOmics = derive { name="integrOmics"; version="2.55"; sha256="1c9vkhvnndhs3h9qzcg3pvizjk9rhgk8gccaxh33spgr4rql8vcw"; depends=[]; }; +interAdapt = derive { name="interAdapt"; version="0.1"; sha256="06ki36l1mrnd9lbm696a6gapr488dz8na4wvl9y1fif9hfv4zk25"; depends=[shiny knitcitations RCurl mvtnorm knitr]; }; +intergraph = derive { name="intergraph"; version="2.0-0"; sha256="0y5cd7y08p86fxm4zqraj81sj5a5h7725wvzcyxd8p1q3ky2sj9f"; depends=[network igraph]; }; +interpretR = derive { name="interpretR"; version="0.1.0"; sha256="015rz4lm116ijx6hq1nz76f22fv21b8yyk1bb9qalmpyxk2lbgrz"; depends=[randomForest]; }; +interval = derive { name="interval"; version="1.1-0.1"; sha256="1lln9jkli28i4wivwzqrsxvv2n15560f7msjy5gssrm45vxrxms8"; depends=[survival perm MLEcens]; }; +intervals = derive { name="intervals"; version="0.15.0"; sha256="0lvxaq5ia7hj65n00awz454a2vdxpskxjw45wsakgh0sc60hk8yz"; depends=[]; }; +interventionalDBN = derive { name="interventionalDBN"; version="1.2.2"; sha256="0wpp4bfi22ncvl0vdivniwwvcqgnpifpgxb4g5jbyvr0z735cd9w"; depends=[]; }; +intpoint = derive { name="intpoint"; version="1.0"; sha256="0zcv64a0clgf1k3ylh97q1w5ddrv227846gy9a68h6sgwc0ps88b"; depends=[]; }; +introgress = derive { name="introgress"; version="1.2.3"; sha256="1j527gf7pmfy5365p2j2jbxq0fb0xh2992hj4d7dxapn4psgmvsk"; depends=[nnet genetics RColorBrewer]; }; +intsvy = derive { name="intsvy"; version="1.4"; sha256="0c50ivmy9g99zaqrm2qv915gwzlwd66baiqhlv0fcz50pqs3z4zk"; depends=[memisc foreign plyr ggplot2 reshape]; }; +invGauss = derive { name="invGauss"; version="1.1"; sha256="0l93pk2sh74dd6a6f3970nval5p29sz47ynzqnphx0wl3yfmmg9c"; depends=[survival optimx]; }; +investr = derive { name="investr"; version="1.1.2"; sha256="1nz6vkpf409vdz5jn4cni8x6ic9nqxdg5xjknqvf137pz1bs2dqx"; depends=[nlme]; }; +io = derive { name="io"; version="0.1"; sha256="1yvyxp45y1v1lrksga5gfjqb2w509l3v817830ya5f740h517l74"; depends=[]; }; +ionflows = derive { name="ionflows"; version="1.1"; sha256="1k9yz82hbjwljyg4cmi675ppykrc2yq9md8x1hhkfxmp070whcxl"; depends=[]; }; +iosmooth = derive { name="iosmooth"; version="0.91"; sha256="03kyzhcl5lipaiajs53dc8jaazxv877nl0njbq88cp4af3gd6s82"; depends=[]; }; +ipdmeta = derive { name="ipdmeta"; version="2.4"; sha256="0k9wqpmrvqdh73brmdzv86a2dbyddjyyyqzqgp1vqb3k48k009s2"; depends=[nlme]; }; +ipdw = derive { name="ipdw"; version="0.2-1"; sha256="18qvw635dy9ddz16nn0j4s0n97nbyw7yb4a8v1m0f5v9prggj7py"; depends=[gdistance raster]; }; +ipfp = derive { name="ipfp"; version="1.0"; sha256="1hpfbgygnpnl3fpx7zl728jyw00y3kbbc5f0d407phm56sfqmqwi"; depends=[]; }; +iplots = derive { name="iplots"; version="1.1-7"; sha256="052n8jdhj8gy72xlr23dwd5gqycqnph7s1djg1cdx2f05iy693y6"; depends=[rJava png]; }; +ipred = derive { name="ipred"; version="0.9-3"; sha256="07mw1mdlczlpy232n2sacwncdjcsn6mv7rrzk9xvl2g85pn3bhjl"; depends=[rpart MASS survival nnet class prodlim]; }; +ips = derive { name="ips"; version="0.0-7"; sha256="0r4394xbchv6czad9jz4ijnfz8ss3wfdvh7ixrdxic2xrw0ic90v"; depends=[ape colorspace XML]; }; +iqLearn = derive { name="iqLearn"; version="1.2"; sha256="160nl63bxr9ira7v89ags9fm7zd5v09h1820i8bq5wxxfcyjarja"; depends=[]; }; +irace = derive { name="irace"; version="1.06"; sha256="10dizzjds1aszvyh0fn6ahqvgn2x6sg3lwb7rca8zhgphrjg92bl"; depends=[]; }; +irlba = derive { name="irlba"; version="1.0.3"; sha256="1h2ymk9hg9xj2075w715742j23jl7kqa4cgzl1jvr48gcysq5byy"; depends=[Matrix]; }; +irr = derive { name="irr"; version="0.84"; sha256="0njxackqj8hyf9j1yszwxbnaxgp27fc2bwyyf7dip72wc12f81n5"; depends=[lpSolve]; }; +irtProb = derive { name="irtProb"; version="1.2"; sha256="12wnvbzkh0mx9i3iyh1v2n2f2wjsjj7ad3dgv9xj949x4nbz16j0"; depends=[lattice moments]; }; +irtoys = derive { name="irtoys"; version="0.1.7"; sha256="11nz675haigs6vg08qjibs8yccy2pbz0b9r8761fs8gw3n7bpfz4"; depends=[sm ltm]; }; +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=[]; }; +ismev = derive { name="ismev"; version="1.39"; sha256="0z5pam5lq72jv13gy40l35nvpk5hfcg3sq14mwhjqd129670gjbv"; depends=[mgcv]; }; +isocir = derive { name="isocir"; version="1.1-3"; sha256="1bx68n9wyfs2dcgph66rsy0jw8hjkl5kw212l0563kz3m1nik9sr"; depends=[circular combinat]; }; +isopam = derive { name="isopam"; version="0.9-12"; sha256="16zkw6y57i46w6v6z8zh0p2mapqry35ibl54vpb5mwp6six2hklk"; depends=[vegan cluster]; }; +isopat = derive { name="isopat"; version="1.0"; sha256="0fznvgycyd35dh7pbq1xhp667gsficlmycn5pcrqcbs89069xr1s"; depends=[]; }; +isotone = derive { name="isotone"; version="1.0-2"; sha256="0qcad691c1dk61a75813hxbc61jllvfc3j21gn85f0kcf4hn6dnz"; depends=[]; }; +isotonic_pen = derive { name="isotonic.pen"; version="1.0"; sha256="1lgw15df08f4dhrjjfr0jqkcvxwad92kflj2px526pcxwkj7cj3i"; depends=[coneproj Matrix]; }; +isva = derive { name="isva"; version="1.8"; sha256="09mrvvk09j460dzi45z8hwdpmibfshsii5dcp38g13czr40d48na"; depends=[fastICA]; }; +iteRates = derive { name="iteRates"; version="3.1"; sha256="1dycmlm3vldc60wz2jjdfbla14383911zfahgal5mx8whxwq95c5"; depends=[partitions VGAM MASS ape apTreeshape geiger gtools]; }; +iterLap = derive { name="iterLap"; version="1.1-2"; sha256="0ixh9aw115496ib0iswfsj97rjcd2f02z116dg57vl9hhzh28f13"; depends=[quadprog randtoolbox]; }; +iterators = derive { name="iterators"; version="1.0.7"; sha256="1zwqawhcpi95fx4qqj4cy31v5qln2z503f7cvv9v5ch3ard4xxqv"; depends=[]; }; +iterpc = derive { name="iterpc"; version="0.2.6"; sha256="1pr8b349cs40364mdkcicm7sccjghxrmhy46zzv6cdk8fs0fn2fi"; depends=[Rcpp polynom Rcpp]; }; +itertools = derive { name="itertools"; version="0.1-3"; sha256="1ls5biiva10pb1dj3ph4griykb9vam02hkrdmlr5a5wf660hg6xn"; depends=[iterators]; }; +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]; }; +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]; }; +ivivc = derive { name="ivivc"; version="0.2.2"; sha256="1qychbszcg9lmbmrnpv65xcv1i5k2xarsa374fs6gw7zlp5nrvap"; depends=[reshape optimx sciplot png deSolve minpack_lm]; }; +ivlewbel = derive { name="ivlewbel"; version="1.1"; sha256="0ykcfikm2i28s3fm6zzx8cjvpwhksg8an0rfr0b35gf7p69brgag"; depends=[gmm plyr lmtest]; }; +ivpack = derive { name="ivpack"; version="1.2"; sha256="0cr5acjrn41d3q0b77hlg2jmsbf1msvys9gcavm1blsryg2bc03c"; depends=[AER sandwich lmtest]; }; +ivprobit = derive { name="ivprobit"; version="1.0"; sha256="1kijq7k6iv2ybaxb08kqzm2s2k6wp2z50r01kxcq023pmyfjczwy"; depends=[]; }; +jSonarR = derive { name="jSonarR"; version="1.1.1"; sha256="054q3ly471xa64yyz2as6vkr440ip1y8n5wl6s3zbhqy3bqkdqif"; depends=[RCurl jsonlite]; }; +jaatha = derive { name="jaatha"; version="2.7.0"; sha256="1ibk84x38j03hbdrf9pi0bi025fxlk2ysqxmfrqiqr4zq2rzhbvp"; depends=[phyclust Rcpp reshape2 Rcpp]; }; +jackknifeKME = derive { name="jackknifeKME"; version="1.1"; sha256="1bzwgyyc2zcm27qahbbf5iqx24q0ddwlzwg7h4h866rlwzb4xf1b"; depends=[imputeYn]; }; +jackstraw = derive { name="jackstraw"; version="1.0"; sha256="1irfzivy7c9fb2pr98flx05s5hkk6sid1hkd5b3k9m9mgs6ixbfy"; depends=[corpcor]; }; +jiebaR = derive { name="jiebaR"; version="0.2"; sha256="1x1vh773rsm927n9npgx4q1zp3y0r09r4c5f056b7s3j4pnp8hj3"; depends=[Rcpp Rcpp]; }; +joineR = derive { name="joineR"; version="1.0-3"; sha256="0q98nswbxk5dz8sazzd66jhlg7hv5x7wyzcvjc6zkr6ffvrl8xj7"; depends=[nlme MASS boot survival lattice statmod gdata]; }; +jointDiag = derive { name="jointDiag"; version="0.2"; sha256="0y1gzrc79vahfhn4jrj5xys8pmkzxj4by7361730gi347f0frs0a"; depends=[]; }; +jointPm = derive { name="jointPm"; version="2.3.1"; sha256="1c2cn9sqwfyv9ksd63w8rrz0kh18jm2wv2sfdkgncjb7vfs4hbv9"; depends=[]; }; +jpeg = derive { name="jpeg"; version="0.1-8"; sha256="05hawv5qcb82ljc1l2nchx1wah8mq2k2kfkhpzyww554ngzbwcnh"; depends=[]; }; +jsonlite = derive { name="jsonlite"; version="0.9.13"; sha256="1l8l6a6l9427z4gkpgq718yfd3h4pbj7d2lazhpnb286ipp82w21"; depends=[]; }; +jtrans = derive { name="jtrans"; version="0.1"; sha256="1wcrjyifsnpk9jfmwc1cx30qp5vavwl87i0avbbls8cmji7z0nay"; depends=[]; }; +jvmr = derive { name="jvmr"; version="2.11.2.1"; sha256="0h76b1596zil2m6fbhp38gchxwif942sldbfc6sgbn3ig9mz8zw5"; depends=[rJava]; }; +kSamples = derive { name="kSamples"; version="1.0"; sha256="0a4kl6508isjsbv8g7b8g9c2kmai90lwdjn0576i7l4hnqvi532b"; 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]; }; +kaps = derive { name="kaps"; version="1.0.2"; sha256="0jg4smbq51v88i3815icb284j97iam09pc52rv3izxa57nv9a0gz"; depends=[survival Formula coin]; }; +kcirt = derive { name="kcirt"; version="0.6.0"; sha256="1gm3c89i5dq7lj8khc12v30j1c0l1gwb4kv24cyy1yw6wg40sjig"; depends=[mvtnorm snowfall corpcor]; }; +kdetrees = derive { name="kdetrees"; version="0.1.5"; sha256="1plf2yp2vl3r5znp5j92l6hx1kgj0pzs7ffqgvz2nap5nf1c6rdg"; depends=[ape distory ggplot2]; }; +kedd = derive { name="kedd"; version="1.0.1"; sha256="1hk4a6n4ywd61g24843zb1z0wbz10lz82as9cpig6m1hglbhs8ll"; depends=[]; }; +kelvin = derive { name="kelvin"; version="1.2-2"; sha256="0fl2yxc0dpmkhq3f7711gd08i7jlzlfncin1d6q251dfnmwd7rzf"; depends=[Bessel]; }; +kequate = derive { name="kequate"; version="1.4.0"; sha256="0vr45y4f6x3080pf3k53nifavf8mfhikz54nis66c53fs9rp0jwf"; depends=[ltm equateIRT]; }; +kerdiest = derive { name="kerdiest"; version="1.2"; sha256="16xj2br520ls8vw5qksxq9hqlpxlwmxccfk5balwgk5n2yhjs6r3"; depends=[date chron evir]; }; +kernelFactory = derive { name="kernelFactory"; version="0.2.0"; sha256="1ihghqrrndgif6kh6n0f4g3bfy5miskn3mk5ynxfcnnrfvp9h3xj"; depends=[randomForest AUC genalg kernlab]; }; +kernlab = derive { name="kernlab"; version="0.9-19"; sha256="0caqp5dp1irhwpq8lyram35r8x16qlfp6f5wzqyi5rzcz27d03sg"; depends=[]; }; +kimisc = derive { name="kimisc"; version="0.2-1"; sha256="1nbhw1q0p87w4z326wj5b4k0xdv0ybkgcc59b3cqbqhrdx8zsvql"; depends=[plyr]; }; +kin_cohort = derive { name="kin.cohort"; version="0.6"; sha256="13gnjk58m5kya9wj87klwm6h7cdqi61ba6y0cg9k1hgbc1ajy3s8"; depends=[survival]; }; +kinfit = derive { name="kinfit"; version="1.1.13"; sha256="1av33f4wns6qp79wyww70f7fsfybcqm83nby1ia65sjp2dz04dk1"; depends=[]; }; +kinship2 = derive { name="kinship2"; version="1.6.0"; sha256="06f544yk61i1xq0rm0r5gpzwfl6rvzyg7gz8z86bjyxg0z44h3vy"; depends=[Matrix quadprog]; }; +kintone = derive { name="kintone"; version="0.1.1"; sha256="13c82vkapks9j2crrb4awnhl60ld8b1r7xmy9yv4zzch868kcl5g"; depends=[RCurl rjson]; }; +kitagawa = derive { name="kitagawa"; version="2.1-0"; sha256="1ddyd0rwwmdpbq823qass5dlp2lvi9d64wpl61ik6fghms2p9ryr"; depends=[kelvin]; }; +kknn = derive { name="kknn"; version="1.2-5"; sha256="0c1qnn1lnypjybk2p0dpfrg6hzxflzbwmjb5biq45r57bzji7im7"; depends=[igraph Matrix]; }; +klaR = derive { name="klaR"; version="0.6-12"; sha256="10nkqb1zradbvifgv1fm373mhyydgdjjgmnw2442a2lark59z3vs"; depends=[MASS combinat]; }; +klausuR = derive { name="klausuR"; version="0.12-5"; sha256="1agd432ihljww3bhm73lqdvgkd8w99jqr7fp5xwwav7mawwsirfj"; depends=[xtable psychometric]; }; +klin = derive { name="klin"; version="2007-02-05"; sha256="0j0hr4bppzk754a66q5z42h7jzfavqpxgl7y266804aginfqm1ax"; depends=[Matrix]; }; +km_ci = derive { name="km.ci"; version="0.5-2"; sha256="1l6kw8jppaa1802yc5pbfwwgac56nhwc9p076ivylhms4w7cdf8v"; depends=[survival]; }; +kmc = derive { name="kmc"; version="0.1-2"; sha256="16lv8wk24cp91qg5202zhfmdhg83qw8bwiycknaml5ki820ffdlx"; depends=[rootSolve emplik Rcpp Rcpp]; }; +kmconfband = derive { name="kmconfband"; version="0.1"; sha256="10n5w8k57faqcclwshs4m66i2i5b70i6f3xq5nqlgsi2ldkysbc9"; depends=[survival]; }; +kmi = derive { name="kmi"; version="0.5.1"; sha256="0519mi7kwrsfpili7y8nmyiky6qwf8xkd0n7cwj02c8d119bk9sa"; depends=[survival mitools]; }; +kml = derive { name="kml"; version="2.2"; sha256="1g8wgmvs31r3hp7y8n9pkxc9qy5fxvb3nicmzgacmghaiwbwc8g3"; depends=[clv longitudinalData]; }; +kml3d = derive { name="kml3d"; version="2.2"; sha256="1n94kfi49rgb9149bgc9043f0y5xpaclmfjr8fkwairqz5nnmgbv"; depends=[clv rgl misc3d longitudinalData kml]; }; +kmlcov = derive { name="kmlcov"; version="1.0.1"; sha256="09s9ganfsnwp22msha78g6pjr45ppyfyqjf6ci64w3w15q5qlcd9"; depends=[]; }; +knitcitations = derive { name="knitcitations"; version="1.0.5"; sha256="1a9lw9gdb31akdwiif5xzbs4s0s9xkhm3n735xnkiyc9n6afwzn3"; depends=[RefManageR digest httr]; }; +knitr = derive { name="knitr"; version="1.8"; sha256="0sysgb0adlr6av8xhzywjl43dwvj9p4hglzwr5wnpyfay84ylhni"; depends=[evaluate digest formatR highr markdown stringr]; }; +knitrBootstrap = derive { name="knitrBootstrap"; version="0.9.0"; sha256="1cw5dvhjiypk6847qypxphfl9an54qjvd6qv029znhwijsg56mmg"; depends=[knitr markdown]; }; +knnGarden = derive { name="knnGarden"; version="1.0.1"; sha256="1gmhgr42l6pvc6pzlq5khrlh080795b0v1l5xf956g2ckgk5r8m1"; depends=[cluster]; }; +knnIndep = derive { name="knnIndep"; version="2.0"; sha256="1fwkldgs2994svf3sj90pwsfx6r22cwwa22b30hdmd24l8v9kzn7"; depends=[]; }; +koRpus = derive { name="koRpus"; version="0.05-5"; sha256="03rw0yb67y652j8hcr5m4c0py0rr3gp87y0hdxpypd81rkikwhfm"; depends=[]; }; +kobe = derive { name="kobe"; version="1.3.2"; sha256="1z64jwrq6ddpm22cvk2swmxl1j7qyz0ddk3880c7zfq6gk7f9bxl"; depends=[plyr reshape ggplot2 MASS emdbook coda]; }; +kofnGA = derive { name="kofnGA"; version="1.0"; sha256="1h50dkysydk2nk90xi0lw6qyc15131xh2m4vh0gkfch8sd2gwqiw"; depends=[]; }; +kohonen = derive { name="kohonen"; version="2.0.15"; sha256="1mamn6lwnd54jw7bbxgrxj511abn9wg5rxrm9fac7jndf00kjaim"; depends=[class MASS]; }; +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.0.1"; sha256="0ppkhjrz09x4b8syp6j2xjdv5gi4mjkvnqdfxv3pqcm3c7zqfdrs"; depends=[]; }; +krm = derive { name="krm"; version="13.11-03"; sha256="05yy06ib879j1gcgqgljkfw79a3vg2ij71w7zah4ixl7di0301la"; depends=[]; }; +ks = derive { name="ks"; version="1.9.3"; sha256="077sx9kms8nkgg6c4bg24n0j6a7bf253bp26hybyilbagp7k6pin"; depends=[KernSmooth misc3d mvtnorm rgl multicool]; }; +kselection = derive { name="kselection"; version="0.1.1"; sha256="18l8a00v8ldpzvbzi5ph7hmgrlsydkynfzqn3vs1i84zvwrh1fz5"; 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=[]; }; +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]; }; +l2boost = derive { name="l2boost"; version="1.0"; sha256="1p0sbvlnax4ba4wjkh3r0bmjs601k590g7bdfk6wxvlj42jxcnkl"; depends=[MASS]; }; +laGP = derive { name="laGP"; version="1.1-3"; sha256="11blzdnil0nw3q5vf4y1rv7l4zxjx8ilynv9jpkm14azv5dsr8jw"; depends=[tgp]; }; +labdsv = derive { name="labdsv"; version="1.6-1"; sha256="0bcsjznq9w1arv503895060hkri0447fnc49nj4ynry7fi35ci22"; depends=[mgcv MASS]; }; +label_switching = derive { name="label.switching"; version="1.3"; sha256="05kbxvrp0lm5913lhy7pgxr9cq64sm5hiz6ydmmgfmbmfirrcqyx"; depends=[combinat lpSolve]; }; +labeledLoop = derive { name="labeledLoop"; version="0.1"; sha256="0gq392h0sab8k7k8bzx6m7z5xpdsflldhwbpdf92zbmkbzxsz00m"; depends=[]; }; +labeling = derive { name="labeling"; version="0.3"; sha256="13sk7zrrrzry6ky1bp8mmnzcl9jhvkig8j4id9nny7z993mnk00d"; depends=[]; }; +labeltodendro = derive { name="labeltodendro"; version="1.3"; sha256="13kpmv26zzjf5iwpr4vs797irplmaixp1agx5v80wr4lvd2hirvg"; depends=[]; }; +labstatR = derive { name="labstatR"; version="1.0.7"; sha256="1p6xav9cb7yx3n8rkh8xm1jkykf3xw974id49j558hmayq47ad4f"; depends=[]; }; +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]; }; +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]; }; +landsat = derive { name="landsat"; version="1.0.8"; sha256="07zvj1yyryxk7rwgcrf1kl32p2karkkqz6xrnwy1096dg9iw2js7"; depends=[rgdal sp lmodel2 mgcv]; }; +languageR = derive { name="languageR"; version="1.4.1"; sha256="0grkhdjz9dcrgq6qwv7wpwmckn3mfv022c5wrx29b1dxafd0qzm0"; depends=[]; }; +lar = derive { name="lar"; version="0.1-2"; sha256="0qda0y4ag10kg83wxs3z754kc8c1dg2rwciy64klk7an4ln43i5b"; depends=[data_table treemap xlsx]; }; +lars = derive { name="lars"; version="1.2"; sha256="0blj44wqrx6lmym1m9v6wkz8zxzbjax2zl6swgdczci0ixb5nx34"; depends=[]; }; +laser = derive { name="laser"; version="2.4-1"; sha256="1f6j3xdks0w63fqjj9q8ng2m6ss90kcnsrigwal0bqskpvrpiqyz"; depends=[ape geiger]; }; +lasso2 = derive { name="lasso2"; version="1.2-19"; sha256="0zkwjsd42a6z4gylq9xbs4z8n1v7ncwvssjnn3h4yz1icjfzzlvk"; depends=[]; }; +lassoscore = derive { name="lassoscore"; version="0.6"; sha256="1i3i07da8sw9w47rcflhylz8zxvzkyycbc1a4gf6hbcpp21rqd7d"; depends=[glasso glmnet Matrix]; }; +lassoshooting = derive { name="lassoshooting"; version="0.1.5-1"; sha256="0ixjw8akplcfbzwyry9p4bhbcm128yghz2bjf9yr8np6qrn5ym22"; depends=[]; }; +latdiag = derive { name="latdiag"; version="0.2"; sha256="11fahajwky3cfbd8y5xfaiz24qf7bkifbzcnvhv7daan4gsha04z"; depends=[]; }; +latentnet = derive { name="latentnet"; version="2.5.1"; sha256="0jzdgsw3i0s0rn8199m7g4x2gwbbrc5nd7fzimhxmib99pyzvrjf"; depends=[statnet_common network ergm sna mvtnorm abind coda]; }; +lattice = derive { name="lattice"; version="0.20-29"; sha256="0ip6qw1kry68dqj97bh8ddpq6gfsxf3n3axc6pn3zv2n1mfv6s9s"; depends=[]; }; +latticeDensity = derive { name="latticeDensity"; version="1.0.7"; sha256="1y33p8hfmpzn8zl4a6zxg1q3zx912nhqlilca6kl5q156zi0sv3d"; depends=[splancs spdep spatstat spam]; }; +latticeExtra = derive { name="latticeExtra"; version="0.6-26"; sha256="16x00sg76mga8p5q5ybaxs34q0ibml8wq91822faj5fmg7r1050d"; depends=[RColorBrewer lattice]; }; +lava = derive { name="lava"; version="1.3"; sha256="1m8bnq1br6xj6ai05slgbr84g0l58hq6z8lmnk0gw0gbkqsxd2wa"; depends=[numDeriv]; }; +lava_tobit = derive { name="lava.tobit"; version="0.4-7"; sha256="1da98d5pndlbbw37k64fmr2mi1hvkhjxsmm3y9p4b772pz9i1pvj"; depends=[lava mvtnorm survival]; }; +lavaan = derive { name="lavaan"; version="0.5-17"; sha256="0rb9bra1nzsbrvvjwcj5vh7l689wdvaq1r86r85919b6n3x38v4b"; depends=[MASS mnormt pbivnorm quadprog]; }; +lavaan_survey = derive { name="lavaan.survey"; version="1.1"; sha256="1vscv165kilkc00pgs2s9qn404l3rv45zc9kzmrghxz42jsy04zc"; depends=[lavaan survey MASS Matrix]; }; +lawstat = derive { name="lawstat"; version="2.4.1"; sha256="142plbzpvi5xy7j5m5wizhz3w1n9im9hs8byhs6kfjpdw710qn7h"; depends=[mvtnorm VGAM]; }; +lazy = derive { name="lazy"; version="1.2-15"; sha256="1pdqgvn0qpfg5hcg5159ccf5qj2nd1ibai9p85rwjpddfynk6jks"; depends=[]; }; +lazyData = derive { name="lazyData"; version="1.0.3"; sha256="1i4jry54id8hhfla77pwk3rj2cci6na36hxj7k35k8lx666fdam2"; depends=[]; }; +lazyWeave = derive { name="lazyWeave"; version="2.2.5"; sha256="18j31lbbplxvrz4wnq7hfw9qcx1s0y4c34lbxwly2wyrvzjhxybl"; depends=[Hmisc survival]; }; +lazyeval = derive { name="lazyeval"; version="0.1.9"; sha256="1qqm9pvjh32h9c9g7wnrsa2lc15azqkq1vwq1knlyksyvwh3rbpl"; depends=[]; }; +lbfgs = derive { name="lbfgs"; version="1.2.1"; sha256="0p99g4f3f63vhsw0s1m0y241is9lfqma86p26pvja1szlapz3jf5"; depends=[Rcpp Rcpp]; }; +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]; }; +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]; }; +ldlasso = derive { name="ldlasso"; version="3.2"; sha256="0ij68zvgm8dfd2qwx6h6ygndac29qa0ddpf11z959v06n8jsnk11"; depends=[GenABEL quadprog]; }; +ldr = derive { name="ldr"; version="1.3.3"; sha256="1c48qm388zlya186qmsbxxdcg1mdv3nc3i96lqb40yhcx2yshbip"; depends=[GrassmannOptim Matrix]; }; +leafletR = derive { name="leafletR"; version="0.3-1"; sha256="1jgmjm4f91saq2cjfgi240zz3i1r1nfb267i0gj15k2nak6ng86j"; depends=[brew jsonlite]; }; +leapp = derive { name="leapp"; version="1.2"; sha256="1yiqzmhgl5f3zwpcc5sz3yqrvp8p6r4w2ffdfyirirayqc96ar17"; depends=[MASS corpcor]; }; +leaps = derive { name="leaps"; version="2.9"; sha256="1ax9v983401hvb6cdswkc1k7j62j8yk6ds22qdj24vdidhdz5979"; depends=[]; }; +learningr = derive { name="learningr"; version="0.29"; sha256="1nr4ydcq2mskv4c0pmf0kxv5wm8pvjqmv19xz5yaq0j834b0n5q7"; depends=[plyr]; }; +lefse = derive { name="lefse"; version="0.1"; sha256="1zdmjxr5xa5p3miw79mhsswsh289hgzfmn3mpj1lyzal1qgw1h5m"; depends=[ape picante geiger fBasics SDMTools vegan]; }; +leiv = derive { name="leiv"; version="2.0-6"; sha256="18cf050653qrwyma23r50i66irjpdbp03nc96pirji5sl4dr9q7x"; depends=[]; }; +lessR = derive { name="lessR"; version="3.1.1"; sha256="0cx5bvwfkrfy5im7x718ixf45aw22561b9w0vv0qp97y7xyjqja5"; depends=[car leaps MBESS foreign gdata triangle]; }; +lestat = derive { name="lestat"; version="1.8"; sha256="12w3s5yr9lsnjkr3nsay5sm4p241y4xz0s3ir56kxjqw23g6m80v"; depends=[MASS]; }; +letsR = derive { name="letsR"; version="1.0"; sha256="1far1vil7g4ymvmhzb0dgfng5d1nkcb4rr1sp7yi72lz60h3g9hk"; depends=[maps raster XML geosphere maptools sp]; }; +lfe = derive { name="lfe"; version="1.7-1404"; sha256="1pjjm7a770la4zwajw3qc4wpaydbj9dwm4wd28jjpi01wcb07cli"; depends=[Matrix Formula xtable]; }; +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]; }; +lgarch = derive { name="lgarch"; version="0.5"; sha256="01y5p3w4i1yfxb647pkdazqn9yac1p6jp7rk92ddxnvvjb6fdp59"; depends=[zoo]; }; +lgcp = derive { name="lgcp"; version="1.3-6"; sha256="04khs0knax3g20hgi5ykny1ck4jxz1aivaa19bb24fljvhn88prv"; depends=[spatstat sp raster RandomFields iterators ncdf rpanel fields maptools Matrix rgeos]; }; +lgtdl = derive { name="lgtdl"; version="1.1.3"; sha256="00lffc60aq1qjyy66nygaypdky9rypy607mr8brwimjn8k1f0gx4"; depends=[]; }; +lhs = derive { name="lhs"; version="0.10"; sha256="1hc23g04b6nsg8xffkscwsq2mr725r6s296iqll887b3mnm3xaqz"; depends=[]; }; +libamtrack = derive { name="libamtrack"; version="0.5.5"; sha256="0v2h4ficf87ai3h2liw8j7428k0bzzb59zini2vskwhcqb7ky7yw"; depends=[]; }; +lifecontingencies = derive { name="lifecontingencies"; version="1.1"; sha256="0rjiqmhqiliy8zbprxnr63r0wvwzs825gd6rrz4skwxcwpl4d0sh"; depends=[]; }; +likeLTD = derive { name="likeLTD"; version="5.4.0"; sha256="09h1a4pn1i3vm3116yxvx07b62cbqmq84svpkbxykl4jmlqmwg8x"; depends=[DEoptim ggplot2 gtools rtf gdata]; }; +likelihood = derive { name="likelihood"; version="1.6"; sha256="11p7k6wpr7ypas414qir0hracy0960j8g3nwlhjbmynwmfzpkq1r"; depends=[nlme]; }; +likert = derive { name="likert"; version="1.2"; sha256="1x1mlaqzwr15xzcfq9934jxb3m5irvw6yivirrj45wscxn3kz5s1"; depends=[ggplot2 xtable psych reshape gridExtra plyr]; }; +limSolve = derive { name="limSolve"; version="1.5.5.1"; sha256="0anrbhw07mird9fj96x1p0gynjnjcj07gpwlq0ffjlqq2qmkzgqs"; depends=[quadprog lpSolve MASS]; }; +limitplot = derive { name="limitplot"; version="1.2"; sha256="0wj1xalm80fa5pvjwh2zf5hpvxa3r1hnkh2z9z285wkbrcl0qfl2"; depends=[]; }; +linLIR = derive { name="linLIR"; version="1.1"; sha256="1v5bwki5j567x2kndfd5nli5i093a33in31025h9hsvkbal1dxgp"; depends=[]; }; +lineup = derive { name="lineup"; version="0.34-1"; sha256="0p6gxbv8xdrhgk8zdlnqrybald9vqz717czb49b123h84rjr2f19"; depends=[qtl class]; }; +linkcomm = derive { name="linkcomm"; version="1.0-11"; sha256="1w5sfmzvrk30fr161pk0cy5nj8kasqm6hqgyafq6r280b5s272cb"; depends=[igraph RColorBrewer dynamicTreeCut]; }; +linkim = derive { name="linkim"; version="0.1"; sha256="0yvyid9x59ias8h436a202hd2kmqvn8k1zcrgja2l4z2pzcvfn91"; depends=[]; }; +linprog = derive { name="linprog"; version="0.9-2"; sha256="1ki14an0pmhs2mnmfjjvdzd76pshiyvi659zf7hqvqwj0viv4dw9"; depends=[lpSolve]; }; +lint = derive { name="lint"; version="0.3"; sha256="0lkrn5nsizyixhdp5njxgrgwmygwr663jxv5k9a22a63x1qbwpiq"; depends=[plyr harvestr stringr dostats foreach]; }; +liso = derive { name="liso"; version="0.2"; sha256="072l7ac1fbkh8baiiwx2psiv1sd7h8ggmgk5xkzml069ihhldj5i"; depends=[MASS Iso]; }; +lisp = derive { name="lisp"; version="0.1"; sha256="025sq46277q9i21189cbmx5dnrh5wfshc5k6la1wjilhr1iqf6nj"; depends=[]; }; +lisrelToR = derive { name="lisrelToR"; version="0.1.4"; sha256="0zicq0z3hhixan1p1apybnf3v5s6v6ysll4pcz8ivygwr2swv3p5"; depends=[]; }; +list = derive { name="list"; version="7.0"; sha256="07i8gixsi34yq17832md2qgsnxgnbwq31bc5h8bwdxb08ndg8qlm"; depends=[sandwich VGAM magic gamlss_dist MASS quadprog arm corpcor mvtnorm coda]; }; +llama = derive { name="llama"; version="0.7.2"; sha256="115j944891mf6sba2bk1lhb8ksdw2halncjvf1j9wsjb6d41liha"; depends=[mlr plyr rJava parallelMap]; }; +lle = derive { name="lle"; version="1.1"; sha256="09wq7mzw48czp5k0b4ij399cflc1jz876fqv0mfvlrydc9igmjhk"; depends=[scatterplot3d MASS snowfall]; }; +lllcrc = derive { name="lllcrc"; version="1.2"; sha256="06n1fcd3g3z5rl2cyx8jhyscq9fb52mmh0cxg81cnbmai3sliccb"; depends=[data_table combinat VGAM plyr]; }; +lm_beta = derive { name="lm.beta"; version="1.5"; sha256="1f7bmfjmz90snfjkvx54knwgav3r6fr85wayi19bwljh1d57wv1i"; depends=[]; }; +lm_br = derive { name="lm.br"; version="2.6"; sha256="1f7cxd6ksspgpz2lnppyb466lgis5isk0bj8z4bjiwk4abg4lg3i"; depends=[Rcpp Rcpp]; }; +lmSupport = derive { name="lmSupport"; version="2.9.1"; sha256="11c86ji7srv80zlrp6c8ark312xzvajig8flc5qm77dgacik8daq"; depends=[car psych gvlma AICcmodavg lme4 pbkrtest]; }; +lmbc = derive { name="lmbc"; version="0.9.1"; sha256="0pxm29n8rhcy7g8kia0bgz78w5nr851dhhrb7nn13szw6j13ji8x"; depends=[mseq lars]; }; +lme4 = derive { name="lme4"; version="1.1-7"; sha256="0v9vl9rspakyw2dmcl5lbhv1nlg10yhgdvi3gpfnizln7xw9ksyp"; depends=[Matrix Rcpp MASS nlme lattice minqa nloptr Rcpp RcppEigen]; }; +lmeNB = derive { name="lmeNB"; version="1.2"; sha256="0xgw1kmq3krz8z0ickjg6qkj3bq2bkbwcd79c5fkl6fa3hp035mh"; depends=[numDeriv statmod lmeNBBayes]; }; +lmeNBBayes = derive { name="lmeNBBayes"; version="1.2"; sha256="0zpxdgqv5yhpwl2jfrxx37b126pgrflynmw9i4vmcvzx830d084l"; depends=[]; }; +lmeSplines = derive { name="lmeSplines"; version="1.1-10"; sha256="0fy6hspk7rqqkzv0czvvs8r4ishvs7zsf4ykvia65nj26w7yhyia"; depends=[nlme]; }; +lmeVarComp = derive { name="lmeVarComp"; version="1.0"; sha256="17zrl33h4lcd8lpdv3d12h5afj8nxr2lyw6699zq4fds2chbq66l"; depends=[]; }; +lmec = derive { name="lmec"; version="1.0"; sha256="09shj01h2dl5lh7ch0wayr7qyhlmk0prv3p1vfgy91sn0wpbqlxr"; depends=[mvtnorm]; }; +lmenssp = derive { name="lmenssp"; version="1.0"; sha256="0a1q9ax0pnz9gcv4nzgay9lznaz9gp27jj6vp6la7vfhrfg5qcg6"; depends=[MASS nlme]; }; +lmerTest = derive { name="lmerTest"; version="2.0-20"; sha256="1x3h78lnj7j002lzx0yxg36vl98z5xmk913k3h2wssxfva9ljp0w"; depends=[Matrix lme4 plyr numDeriv MASS Hmisc gplots]; }; +lmf = derive { name="lmf"; version="1.2"; sha256="1xqlqmjl7wf5b2s2a1k1ara21v74b3wvwl4mhbj9dkdb0jcrgfva"; depends=[]; }; +lmm = derive { name="lmm"; version="0.9"; sha256="0gs68iwk9gajb5af5ibgg9k5280ixqki8vxyp3cq5lrk96gcmqpr"; depends=[]; }; +lmmfit = derive { name="lmmfit"; version="1.0"; sha256="06mzmx7md7qw5mfhgdljc7i40sx9yrx7j57xbbp3fhl2zs1dpb4g"; depends=[nlme MASS]; }; +lmmlasso = derive { name="lmmlasso"; version="0.1-2"; sha256="1mvd38k9npyc05a2x7z0908qz9x4srqgzq9yjyyggplqfrl4dgsz"; depends=[emulator miscTools penalized]; }; +lmmot = derive { name="lmmot"; version="0.1.1"; sha256="134rw5sy6ibpp5cn3hayym4l2s5cr0123ygk2rjf54j5mf52szm3"; depends=[maxLik MASS]; }; +lmms = derive { name="lmms"; version="1.2"; sha256="12wli7iwnihq42pa1jy1ml4y3l93grwrv9n7vpgp5wp1hj4d1s8c"; depends=[nlme lmeSplines reshape gdata gplots ggplot2]; }; +lmodel2 = derive { name="lmodel2"; version="1.7-2"; sha256="0dyzxflr82k7ns824zlycj502jx3qmgrck125im2k2da34ir3m3q"; depends=[]; }; +lmom = derive { name="lmom"; version="2.4"; sha256="04mfp7fcw1696qn34pxdffspwy0xalig3p7mqcj49v6kdxclpx1p"; depends=[]; }; +lmomRFA = derive { name="lmomRFA"; version="3.0"; sha256="188i2fk2csqwdmw3x1wwigaajbvwfd9dwd8q3pmx7ha4smp49amk"; depends=[lmom]; }; +lmomco = derive { name="lmomco"; version="2.1.1"; sha256="0q58g13j7h8pag3yj96qpnsa2m77hrrjkc24f6x847vlsn39md80"; depends=[]; }; +lmtest = derive { name="lmtest"; version="0.9-33"; sha256="1ycmxjrxf41mnbgakdmn4y2kmgp4rkj7v3nqwqnlc6gdfdmac73s"; depends=[zoo]; }; +loa = derive { name="loa"; version="0.2.15"; sha256="137l90qz87xrid28knbj8997pjqgqf6769cwfj82cm57m98bda91"; depends=[lattice MASS png RgoogleMaps RColorBrewer]; }; +localdepth = derive { name="localdepth"; version="0.5-7"; sha256="0h0y74xnhdqa7y51ljmpz7ayznppvy2ll06wfds6200lb9cxgr7k"; depends=[circular]; }; +localgauss = derive { name="localgauss"; version="0.33"; sha256="1xgcwlgkzkxws771zig4x6v0m6flf9vlcgpa80ajr0vmjhlplbly"; depends=[ggplot2 MASS foreach matrixStats]; }; +localsolver = derive { name="localsolver"; version="2.3"; sha256="1d18rihzqf1f5j9agfp8jysll7lqk1ai23hkdqkn6wwxj442llv4"; depends=[]; }; +locfit = derive { name="locfit"; version="1.5-9.1"; sha256="0lafrmq1q7x026m92h01hc9cjjiximqqi3v1g2hw7ai9vf7i897m"; depends=[lattice]; }; +locits = derive { name="locits"; version="1.4"; sha256="1q9vsf5h4n7r4gy1dwdhfyq3n0rn33akb3nx6yzinncj4w4cqq0h"; depends=[wavethresh igraph]; }; +locpol = derive { name="locpol"; version="0.6-0"; sha256="1zpdh3g7yx3rcn3rhlc3dm19c4b9kx2k8wy8vkwh744a1kysvdga"; depends=[]; }; +loe = derive { name="loe"; version="1.0"; sha256="11wjzq4h7qjrnrj1zg3msg1ksld9c3r3n3biamf2hz8zvi1asvqv"; depends=[igraph MASS vegan Matrix]; }; +log4r = derive { name="log4r"; version="0.2"; sha256="07q8m7z2sxm6n25a62invf76qakxdsijfh3272spc8xrmdmyw6rj"; depends=[]; }; +logbin = derive { name="logbin"; version="1.0"; sha256="17vabb348kczn839mhwshn20qgrdnpd0ll81hb8bcsricm6dqhna"; depends=[glm2]; }; +logconPH = derive { name="logconPH"; version="1.3"; sha256="1fmv2zp48pvyimyz3czfr13q09f8hj4pjdf1fh53rfdir8gvgv5g"; depends=[]; }; +logconcens = derive { name="logconcens"; version="0.16-4"; sha256="11bk03kjlb747g54axmb0nayz226g41xvanbw79aij76vjbglv7y"; depends=[]; }; +logcondens = derive { name="logcondens"; version="2.1.2"; sha256="0lnsyjl77l9024pqncyxwivmj05f5mfa3563jql47jajaai0my8y"; depends=[ks]; }; +logcondens_mode = derive { name="logcondens.mode"; version="1.0.1"; sha256="1i2c2prk5j863p3a3q3xnsv684igfi5czz3dib7zfjldpf0qyaq7"; depends=[logcondens distr]; }; +logcondiscr = derive { name="logcondiscr"; version="1.0.5"; sha256="170rg4rqch0mlhmc1zc59h271b57y3xfxrc3gh9pwvc9r11gw7k5"; depends=[Matrix mvtnorm cobs]; }; +logging = derive { name="logging"; version="0.7-103"; sha256="1sp7q217awizb6l8c9p5dix6skpq8j7w8i088x4mm0fc0qr1ba5c"; depends=[]; }; +logistf = derive { name="logistf"; version="1.21"; sha256="0cwbmd0mvj4wywpx7p4lhs70nhab7bfl6fzz2c4snn3ma6sy7x8c"; depends=[mice mgcv]; }; +logitchoice = derive { name="logitchoice"; version="0.9.4"; sha256="1vkw7cwp7nwrsj9ifn4gz21zbw9da5rph9lr3w466zxkzdkbldqj"; depends=[]; }; +logitnorm = derive { name="logitnorm"; version="0.8.29"; sha256="0wbdxh3n44nzb6c0ahyd8gndfql1y56fns2bkmzqi3nxy9blhx18"; depends=[]; }; +loglognorm = derive { name="loglognorm"; version="1.0.1"; sha256="0rhx769a5nmidpbpngs2vglsbkpgw9badz3kj3jfmpj873jfnbln"; depends=[]; }; +logmult = derive { name="logmult"; version="0.6"; sha256="1r8i2zgmgm44dhg2z2k7cqy10hldp1p91idjiyg9pmi8dfch8xki"; depends=[gnm qvcalc]; }; +logspline = derive { name="logspline"; version="2.1.5"; sha256="18hpzcg71v3zjzp92whgxgn7w87cadgxr65pp7nv6m5pvj130i3p"; depends=[]; }; +lokern = derive { name="lokern"; version="1.1-6"; sha256="0iixxs23zsb0qadppcwmwf6vbxcjnm8zmwyz1xkkmhrpp06sa3jw"; depends=[sfsmisc]; }; +lomb = derive { name="lomb"; version="1.0"; sha256="06lbk7s1ilqx6xsgj628wzdwmnvbs0p03hdpx8665fhddcxh3ryy"; depends=[]; }; +longCatEDA = derive { name="longCatEDA"; version="0.17"; sha256="1yb0117ycj4079590mrx3lg9m5k7xd1dhb779r3rmnww94pmvja9"; depends=[]; }; +longitudinal = derive { name="longitudinal"; version="1.1.10"; sha256="1mnviq4v040kbcsca04gzfx2lfz2ipv3nbmqgkbp9v45w96qymq9"; depends=[corpcor]; }; +longitudinalData = derive { name="longitudinalData"; version="2.2"; sha256="1kdgnkhk39a9r4fq6zmrvzcvs7qjd21knpzfjglxyx723r9p3fs7"; depends=[clv class rgl misc3d]; }; +longmemo = derive { name="longmemo"; version="1.0-0"; sha256="1jnck5nfwxywj74awl4s9i9jn431655mmi85g0nfbg4y71aprzdc"; depends=[]; }; +longpower = derive { name="longpower"; version="1.0-10"; sha256="0907s9807c1vcxac8xf6aqbw2fi7pdqfjs14nxl7wf0r0wi9jgw2"; depends=[Matrix lme4 nlme]; }; +loop = derive { name="loop"; version="1.1"; sha256="1gr257fm92rfh1sdhsb4hy0fzwjkwvwm3v85302gzn02f86qr5dm"; depends=[MASS]; }; +lordif = derive { name="lordif"; version="0.2-2"; sha256="0898k5w9wky318k8x0zknjqdzdify0yyrnb1506j341l4n1bm04s"; depends=[MASS msm mvtnorm polycor sfsmisc ltm Hmisc rms]; }; +lorec = derive { name="lorec"; version="0.6.1"; sha256="0mgypd8awixh1lzbh5559br4k7vi3pfmwniqhgh68wc06sc6bn65"; depends=[]; }; +lpSolve = derive { name="lpSolve"; version="5.6.10"; sha256="0hrgac5gfihhk4spy5smwgnawgn5nbv7aydb1w28lgd46a4zldvc"; depends=[]; }; +lpSolveAPI = derive { name="lpSolveAPI"; version="5.5.2.0-14"; sha256="1ffmb9xv6m25ii4n7v576g8xw31qlsxd99ka8cjdhqs7fbr4ng5x"; depends=[]; }; +lpc = derive { name="lpc"; version="1.0.2"; sha256="1r6ynkhqjic1m7fqrqsp7f8rpxqih5idn4j96fqrdj8nj01znv29"; depends=[]; }; +lpint = derive { name="lpint"; version="2.0"; sha256="0p1np8wlfbax0c7ysc5fs9dai8s00h1v0gan89dbd6bx06307w2r"; depends=[]; }; +lpme = derive { name="lpme"; version="1.0.0"; sha256="0nl64hgkdk435dz8hs4gns325gdsjd266ypg66j5r57nisnf4mmm"; depends=[Rcpp Rcpp RcppArmadillo]; }; +lpmodeler = derive { name="lpmodeler"; version="0.2-1"; sha256="17k67l03dkjx61p4hwswghjm6awk0zx173x9xafxrfd8jrgsf6kf"; depends=[slam]; }; +lpridge = derive { name="lpridge"; version="1.0-7"; sha256="0nkl70fwzra308bzlhjfpkxr8hpd8v1xdnah7nscxa10qlisgr2k"; depends=[]; }; +lqa = derive { name="lqa"; version="1.0-3"; sha256="141r2cd9kybi6n9jbdsvhza8jdxxqch4z3qizvpazjy8qifng29q"; depends=[]; }; +lqmm = derive { name="lqmm"; version="1.5"; sha256="12fggqka00y2hwknxwfa2326r2r17mdn2qd213n7xs3pn7v0rg18"; depends=[SparseGrid nlme]; }; +lrmest = derive { name="lrmest"; version="1.0"; sha256="1gdj8pmmzvs1li05pwhad63blhibq45xd1acajxsx06k7k21ajs7"; depends=[MASS]; }; +lsa = derive { name="lsa"; version="0.73"; sha256="041wa1i85i90qvm5sxvd9nidis8s069cvf9nw1r68ajkvds65y91"; depends=[SnowballC]; }; +lsdv = derive { name="lsdv"; version="1.1"; sha256="0rl1xszr9r8v71j98gjpav30n2ncsci19hjlc9flzs1s20sb1xpr"; depends=[]; }; +lsgl = derive { name="lsgl"; version="1.0.123.1"; sha256="10q3f56yjgs3kvyk7b7d1xi06sa16pv9y3c6lsp1461whqvinpj4"; depends=[sglOptim Matrix sglOptim Rcpp RcppProgress RcppArmadillo BH]; }; +lshorth = derive { name="lshorth"; version="0.1-6"; sha256="0nbjakx0zx4fg09fv26pr9dlrbvb7ybi6swg84m2kwjky8399vvx"; depends=[]; }; +lsmeans = derive { name="lsmeans"; version="2.13"; sha256="0bcbya714d8sak0r1jkdyb9lrr10vfqbibkx4b7gp5qg9wnl0mgr"; depends=[multcomp plyr Matrix]; }; +lspls = derive { name="lspls"; version="0.2-1"; sha256="1g27fqhnx9db0zrxbhqr76agvxy8a5fx1bfy58j2ni76pki1y4rl"; depends=[pls]; }; +lsr = derive { name="lsr"; version="0.3.2"; sha256="1ahcj3ja5hj7pc7hvzlvhmh62mql3a0awli8szsyld0fpn50wprz"; 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]; }; +ltmle = derive { name="ltmle"; version="0.9.3-1"; sha256="0nvcxl55nmcabsz79vkjxmnifzm2vxg0lgwcjqiwsj242vhnfjhh"; depends=[]; }; +ltsa = derive { name="ltsa"; version="1.4.4"; sha256="06db0d4j0kqp4q6rpa3sawcsm5rfgdhzl8fl7cxivjbbyrfnszqp"; depends=[]; }; +ltsbase = derive { name="ltsbase"; version="1.0.1"; sha256="16p5ln9ak3h7h0icv5jfi0a3fbw5wdqs3si69sjbn8f5qs2hz7yp"; depends=[MASS robustbase]; }; +ltsk = derive { name="ltsk"; version="1.0.1"; sha256="1ym9h6af1aq46b6yxhdwnp6kqgx3zw08sal67y8rqd9z68432lx4"; depends=[fields]; }; +lubridate = derive { name="lubridate"; version="1.3.3"; sha256="1f07z3f90vbghsarwjzn2nj6qz8qyfkqalszx8cb5kliijdkwy8z"; depends=[plyr stringr memoise]; }; +luca = derive { name="luca"; version="1.0-5"; sha256="1jiqwibkrgga4ahz0qgpfkvrsxjqc55i2nwnm60xddb8hpb6a6qx"; depends=[survival genetics]; }; +lucid = derive { name="lucid"; version="1.0"; sha256="15fpwskyf5qhzdsm44ik3fz3wkxdc3frnnyqgksbc06w3jpm3jrb"; depends=[nlme]; }; +lunar = derive { name="lunar"; version="0.1-04"; sha256="0nkzy6sf40hxkvsnkzmqxk4sfb3nk7ay4rjdnwf2zym30qax74kk"; depends=[]; }; +lvm4net = derive { name="lvm4net"; version="0.1"; sha256="0b140jybn6jpr1qh3s84vg0ba34356vc8pa4v2zfp9ggipfl073b"; depends=[ergm ellipse igraph]; }; +lxb = derive { name="lxb"; version="1.3"; sha256="0mvjk0s9bzvznjy0cxjsqv28f6jjzvr713b2346ym4cm0y4l3mir"; depends=[]; }; +lymphclon = derive { name="lymphclon"; version="1.3.0"; sha256="1jns41sk2rx1j3mg06dzy434k30gpfhbkn6s47fmyv1y8701vfl0"; depends=[MASS expm corpcor]; }; +m4fe = derive { name="m4fe"; version="0.1"; sha256="06lh45591z2lc6lw91vyn066x0m1zwxxfp6nbirp1rz901v843ph"; depends=[]; }; +mAr = derive { name="mAr"; version="1.1-2"; sha256="0i9zp8n8i3fxldgvwj045scss533zsv8p476lsla294gp174njr7"; depends=[MASS]; }; +mFilter = derive { name="mFilter"; version="0.1-3"; sha256="1cz9d8447iiy7sq47civ1lcjafqdqs40lzxm2a4alw4wy57hc2h6"; depends=[]; }; +mGSZ = derive { name="mGSZ"; version="1.0"; sha256="08l98i75h2h8kx9ksvzp5qr8jhf0l6n4j7rg8fcn7hk8chn8v5zh"; depends=[GSA MASS ismev]; }; +mQTL = derive { name="mQTL"; version="1.0"; sha256="0k80xvkr0b0mp3bj2s558fjxi2zf4k7ggnw6hsjm8lr84i108dks"; depends=[qtl MASS outliers]; }; +mRMRe = derive { name="mRMRe"; version="2.0.5"; sha256="1lhpamjy8dbk3lzjj0wj041cg99rw6925i9fq297c93jxq562414"; depends=[survival igraph]; }; +mRm = derive { name="mRm"; version="1.1.5"; sha256="0sbpk7z4ij917nw8wyvnm87iav95ybqrzvmsjy3r8nyq55bjzyn7"; depends=[]; }; +maRketSim = derive { name="maRketSim"; version="0.9.2"; sha256="1cq17zjwyf4i5lcqgxqkw805s4mr6qp89blgpmpxy8gdrbfj93m4"; depends=[]; }; +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.6"; sha256="10vw138ykfz0s8c2q39fd4vipran85w04jmr1fni4z8x0i67iak2"; depends=[mvtnorm ellipse mvmeta]; }; +mads = derive { name="mads"; version="0.1.0"; sha256="0m04f61xm54pczq91cq64sfq4q12785jls7ylskc4qnnl7zkwkz8"; 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]; }; +magma = derive { name="magma"; version="1.3.0-2"; sha256="0hgwjq30ksx2qg4q9fj57m27i96sci8hrfrqc2lw4hz18b6kkph4"; depends=[]; }; +magrittr = derive { name="magrittr"; version="1.5"; sha256="1s1ar6rag8m277qcqmdp02gn4awn9bdj9ax0r8s32i59mm1mki05"; depends=[]; }; +mail = derive { name="mail"; version="1.0"; sha256="1m89cvw5ba4d87kp2dj3f8bvd6sgj9k56prqmw761q919xwprgw6"; depends=[]; }; +mailR = derive { name="mailR"; version="0.3"; sha256="0m23npg5zsdwflw4744v30ypnpa6f8ddflwh3mpabxrxw4scb547"; depends=[rJava stringr]; }; +makeProject = derive { name="makeProject"; version="1.0"; sha256="09q8xa5j4s5spgzzr3y06l3xis93lqxlx0q66s2nczrhd8nrz3ca"; depends=[]; }; +malaria_em = derive { name="malaria.em"; version="2.0"; sha256="1n34ahifggpdlpmigy010zysana0fg9c8ji0khk8g3il2gmzmgim"; depends=[]; }; +mallet = derive { name="mallet"; version="1.0"; sha256="06rksf5nvxp4sizgya7h4sb6fgw3yz212a01dqmc9p5a5wqi76x0"; depends=[rJava]; }; +managelocalrepo = derive { name="managelocalrepo"; version="0.1.4"; sha256="060r9wkrn2v6wij926l7qlxlw8k2zbgrmwf2awf1x6llfs4vaiby"; depends=[stringr assertthat]; }; +mapStats = derive { name="mapStats"; version="1.17"; sha256="1jnqchrrn2v1smzk1c3laycr2fs8x59c9mb8lhs4bxqbhhwgmi8p"; depends=[survey lattice maptools RColorBrewer Hmisc quantreg classInt sp colorspace reshape2]; }; +mapdata = derive { name="mapdata"; version="2.2-3"; sha256="1fhj34cgq6rniy0339qv2ghbs0aiq38h9jfwx7szb83yj37v7wm6"; depends=[maps]; }; +mapmisc = derive { name="mapmisc"; version="1.0.0"; sha256="0y4p1fs6kqiwlp41kn7r5z2222xcqgzdnl9q4v0dlawfck2kbzcw"; depends=[sp raster]; }; +mapplots = derive { name="mapplots"; version="1.5"; sha256="09sk78a0p8hlwhk3w2dwvpb0a6p7fqdxyskvz32p1lcav7y3jfrb"; depends=[]; }; +mapproj = derive { name="mapproj"; version="1.2-2"; sha256="1fdb72hvcp6jm7rhvs8zdkya6ifs92lfqnmq5vj5amwckkxfidc6"; depends=[maps]; }; +maps = derive { name="maps"; version="2.3-9"; sha256="1gzy81sl4vpr4hsnh4jsp5rd26jdkzsw99qxwfmbadjyf55q06wv"; depends=[]; }; +maptools = derive { name="maptools"; version="0.8-30"; sha256="0vbpgxdz6xl8a2bkhcw6rfs15nvmppka0ad7i2v2pi18350riwpq"; depends=[sp foreign lattice]; }; +maptpx = derive { name="maptpx"; version="1.9-1"; sha256="1yrlgz5bkjjs3m59dqp60n95lax0fp7xw00v59kymmw5hr3sis6f"; depends=[slam]; }; +maptree = derive { name="maptree"; version="1.4-7"; sha256="1k7v84wvy6wz6g0dyiwvd3lvf78rlfidk60ll4fz7chvr2nrqdp4"; depends=[cluster rpart]; }; +mar1s = derive { name="mar1s"; version="2.1"; sha256="0psjva7nsgar5sj03adjx44pw0sdqnsd96m4g6k8d76pv30m1g7l"; depends=[cmrutils fda zoo]; }; +marelac = derive { name="marelac"; version="2.1.4"; sha256="0mm1rmaxrbhk6r9z62ns832p2q9fajq0jpvd3if3rg2wgdbb1505"; depends=[shape seacarb]; }; +marg = derive { name="marg"; version="1.2-2"; sha256="0j08zzcrj8nqsargi6xi50gy9pl4smmsp4b7ywlga7r1ga38g82r"; depends=[statmod survival]; }; +margie = derive { name="margie"; version="1.0"; sha256="1jkhg15xdiqjvpzbbc39l8jlfw0yrbarnd3zbgb3p0rh733x5g4j"; depends=[]; }; +marginalmodelplots = derive { name="marginalmodelplots"; version="0.4.2"; sha256="0d7m7sddz9rp1mkvirhcmk7hlbxsag3nm3vqfampnr7l2h158baa"; depends=[locfit]; }; +markdown = derive { name="markdown"; version="0.7.4"; sha256="09bqwv75mvfnjwbsz4v0zr9mmjdccwwgayiv7f6db48lngijng4f"; depends=[mime]; }; +marked = derive { name="marked"; version="1.1.6"; sha256="0f9sa4mdkiq1fn99sczb0glf5xfm17a3x8dq9ycf0l39fyg582d0"; depends=[lme4 R2admb truncnorm coda optimx ggplot2 Matrix numDeriv Rcpp plyr Rcpp]; }; +markovchain = derive { name="markovchain"; version="0.0.9.5"; sha256="06fsfrfm7xyba97yfxcp85vqamavbinvm8wr2darafn20ggahrck"; depends=[igraph Matrix matlab expm]; }; +marmap = derive { name="marmap"; version="0.9"; sha256="0vabxk1j866m5bxgk3327sifvlm4f6yp0gmgvfnqn4jp6sviwdvk"; depends=[DBI RSQLite gdistance geosphere sp raster ncdf plotrix shape reshape2]; }; +marqLevAlg = derive { name="marqLevAlg"; version="1.1"; sha256="1wmqi68g0flrlmj87vwgvyxap0miss0n42qiiw7ypyj4jw9kwm8j"; depends=[]; }; +matR = derive { name="matR"; version="0.9"; sha256="0lih3g2z6rxykprl3s529xcf466bpzpsv4l20dkgx1fgfslfcl2p"; depends=[MGRASTer BIOM_utils]; }; +matchingMarkets = derive { name="matchingMarkets"; version="0.1-2"; sha256="02hx8q13n0l2880480vfkizlz6i1l78q95kn08c4mnnqd0jglifv"; depends=[Rcpp lpSolve partitions Rcpp RcppArmadillo]; }; +mathgraph = derive { name="mathgraph"; version="0.9-11"; sha256="0xikgzn24p0qqlrmaydmjk5yz5pq2rilsvpx86n3p2k2fc3wpwjy"; depends=[]; }; +matie = derive { name="matie"; version="1.2"; sha256="1ymx49cyvz63imqw5n48grilphiqvvdirwsrv82p7jgxdyav2xv0"; depends=[dfoptim mvtnorm seriation igraph gplots cba]; }; +matlab = derive { name="matlab"; version="1.0.2"; sha256="0m21k2vzbc5d3c93p2hk4208xyd2av2slg55q5j1ibjidiryqgd2"; depends=[]; }; +matpow = derive { name="matpow"; version="0.1.1"; sha256="1a6q21ba16qfdpykmjwgmrb1kkvvyx48qg8cbgpdmch0vhibcgcp"; depends=[]; }; +matrixStats = derive { name="matrixStats"; version="0.10.3"; sha256="1qskky9m217cv9pa5dyi31fa8isdg9cwadq80q85vn3p24rap5l4"; depends=[R_methodsS3]; }; +matrixcalc = derive { name="matrixcalc"; version="1.0-3"; sha256="1c4w9dhi5w98qj1wwh9bbpnfk39rhiwjbanalr8bi5nmxkpcmrhp"; depends=[]; }; +matrixpls = derive { name="matrixpls"; version="0.4.0"; sha256="0vd8k7rkv2xwh8rx1ra9im9xqlal5r29gzbvxd2b33xwngvg89m2"; depends=[assertive matrixcalc psych lavaan MASS]; }; +maxLik = derive { name="maxLik"; version="1.2-0"; sha256="1vgq2pjy8244ccdjcrrgri4sn2kcwqyfwskh885ci5aw01121d36"; depends=[miscTools sandwich]; }; +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-20"; sha256="171xsq96qdclb7ndpmv8652gh372ncxfkn5yfngvjv1fb12dq8jx"; depends=[exactRankTests mvtnorm]; }; +mbbefd = derive { name="mbbefd"; version="0.1"; sha256="0m24q679b7a27hw7v370p21w9bq18zc225q2df319hdrya3aygf2"; depends=[]; }; +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]; }; +mboost = derive { name="mboost"; version="2.4-0"; sha256="1rv16vg7zfj9pl8pkzfh4pr79bsdnxhacv8pysf8bbr17hrvm8yn"; depends=[stabs Matrix survival lattice nnls quadprog]; }; +mc2d = derive { name="mc2d"; version="0.1-15"; sha256="1kp2l1gvw3caplq9916s1dmpmfp6fb2xscys9gj6dykl6gi4h4hb"; depends=[mvtnorm]; }; +mcGlobaloptim = derive { name="mcGlobaloptim"; version="0.1"; sha256="1p8841y9a4yq51prv6iirgw9ln8jznx8nk547sc5xlznksjy1g9n"; depends=[randtoolbox snow]; }; +mcIRT = derive { name="mcIRT"; version="0.41"; sha256="0pbwydl4zjzwdlpzwpqm4xhq716zgq9s7bvcbrqp6q0jkba9zjnw"; depends=[Rcpp Rcpp RcppArmadillo]; }; +mcbiopi = derive { name="mcbiopi"; version="1.1.2"; sha256="12h4bv3hx1m6bsqdxj5n3b5gh98ms508am8pigz7ckmv0xkyhx85"; depends=[]; }; +mcc = derive { name="mcc"; version="1.0"; sha256="0p661a870bvh3xhcahqqq85azn9rjl3vacjy96jsdn86irj4s0vi"; depends=[]; }; +mcclust = derive { name="mcclust"; version="1.0"; sha256="00qprmsjwbn2d0jl7p9mz8pv7k8ld3mzk862pr1grigk0lqwhx06"; depends=[lpSolve]; }; +mcga = derive { name="mcga"; version="2.0.9"; sha256="197yldx03c634f3x0mpxxvqrys93n7z7n3x0alvqa42z3vdkrz7b"; depends=[]; }; +mcgibbsit = derive { name="mcgibbsit"; version="1.1.0"; sha256="09ydcbjz3abmh46966v01dh26fy79dfklk3zjf262zp3c62ld9yf"; depends=[coda]; }; +mcheatmaps = derive { name="mcheatmaps"; version="1.0.0"; sha256="1gglm32xpmim38m7fziczgqfbpcq2899lxardsrzg6j1vhmf765y"; depends=[gridBase]; }; +mcll = derive { name="mcll"; version="1.2"; sha256="0i9zqbh0l9a9mv4558gbdq9mh52chanykyfwmiymmxygxhp809sz"; depends=[statmod locfit]; }; +mclogit = derive { name="mclogit"; version="0.3-1"; sha256="0zyms6v9qjh6a5ccahfanarp4sg49yingb8wpjcz61skqvm8j7qx"; depends=[Matrix]; }; +mclust = derive { name="mclust"; version="4.4"; sha256="1xwk5w3nzwmwavn1ni53bnhf3klvy65c05819j1aqa6dna1j1jkq"; depends=[]; }; +mcmc = derive { name="mcmc"; version="0.9-3"; sha256="148l28nb1qv82x2hj46c26yhn0lw8x5jsrp2dav9sbysv1bdj2f8"; depends=[]; }; +mcmcplots = derive { name="mcmcplots"; version="0.4.1"; sha256="0japi78j1a9q6mb7j74d81lj45j8878mdby7765yz8xnjzwjpslb"; depends=[coda sfsmisc colorspace denstrip]; }; +mcmcse = derive { name="mcmcse"; version="1.0-1"; sha256="1jn5hl6aw83qmwccyfmcsvcymx9cp4d3qnfzzqvlw22x26rx88r6"; depends=[]; }; +mco = derive { name="mco"; version="1.0-15"; sha256="0mbhc98f4gy5d5mhf06w036bp7syfzy0nv5xzlsygjkdpgzkwpm2"; depends=[]; }; +mcprofile = derive { name="mcprofile"; version="0.2-1"; sha256="0q1d236mcmgp5p5gl474myp1zz8cbxffd0kvsd8338jijalj05p0"; depends=[ggplot2 quadprog mvtnorm]; }; +mcr = derive { name="mcr"; version="1.2.1"; sha256="0237w41xichd418ax9xviq4wxbcc6c0cgr5gvzkca67nnqgc4jaz"; depends=[]; }; +mcsm = derive { name="mcsm"; version="1.0"; sha256="13sx7s3ywis5n4a70ld2szld9fb8jkfsc82dy6iskhy17vy8pml0"; depends=[MASS coda]; }; +mda = derive { name="mda"; version="0.4-4"; sha256="18a12fnhcx911ii8wfqkyi8yxrhbiw2pi6mhywgxzsl3a09g8ghh"; depends=[class]; }; +mdatools = derive { name="mdatools"; version="0.5.3"; sha256="00zv97asyxp6m4fckkrzba2v1b24a3qzdh4f03nbv5nxdkmbpv4a"; depends=[]; }; +mded = derive { name="mded"; version="0.1-1"; sha256="1r2sjg661abzsbqdyq2mlyacnv5rd60jfg2156cq5qyknxkin01m"; depends=[]; }; +mdscore = derive { name="mdscore"; version="0.1-2"; sha256="1g473rwffkb2x6y6wcm98i6xr5dhz11ypnbrvhb2klbvi81jj511"; depends=[MASS]; }; +mdsdt = derive { name="mdsdt"; version="1.0"; sha256="0ngf2p6lm32124qyfh18zlgf0dipj3njn6d0m8f192563kp50q0p"; depends=[ellipse mnormt polycor]; }; +measuRing = derive { name="measuRing"; version="0.1"; sha256="1nlsxrld6dsqv4cyssjpva2hh38csyjr52bpgrvrh1kdjd951qrc"; depends=[tiff zoo pastecs]; }; +meboot = derive { name="meboot"; version="1.4-5"; sha256="1h33f3dpx906q5nmd57hhkq07mbs2kg8mv6mi4imaa2zpr5vc4py"; depends=[dynlm nlme]; }; +medSTC = derive { name="medSTC"; version="1.0.0"; sha256="1f7w6jbxairqvghr5b7vgdllg3ian16a1fgi7vqlq0mhy2j6phan"; depends=[]; }; +mederrRank = derive { name="mederrRank"; version="0.0.7"; sha256="08jbqmb418qb7v2x6lm4wig1pfzzfx6fhb49mbfhlkbmssbqsjfq"; depends=[BB numDeriv]; }; +mediation = derive { name="mediation"; version="4.4.3"; sha256="1m3q7zw1wsl6nnfjigbp3yg8mjnqxzawbgdrj7diclz8s6f07b4x"; depends=[MASS Matrix mvtnorm sandwich lpSolve Hmisc]; }; +mefa = derive { name="mefa"; version="3.2-5"; sha256="037vpnwclyj6xgycznh6g6qlirlgy3sjnkjqb1046q80b5ywv2ni"; depends=[]; }; +mefa4 = derive { name="mefa4"; version="0.3-1"; sha256="0zyjhq80krnb11wh8p8006qz0znrps3qsd2qnhkw7zwl5282i1zp"; depends=[Matrix]; }; +megaptera = derive { name="megaptera"; version="1.0-0"; sha256="1fczhdydqca1jcdc315kwrhxcjisxfq23l4sm7m2011k5nrjmv37"; depends=[snowfall ips ape seqinr RPostgreSQL XML]; }; +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]; }; +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=[]; }; +metRology = derive { name="metRology"; version="0.9-17"; sha256="1g4gv3mpii71i6imfwqg9d5iwfx03bq4lizzhx7dy39b2mj7jd4q"; depends=[MASS numDeriv]; }; +meta = derive { name="meta"; version="4.0-1"; sha256="1h0d2803z1yzzyiyz1yq2gy7zyx8ji2ya2mk8lrl3d83lrx4psw8"; depends=[]; }; +metaLik = derive { name="metaLik"; version="0.41.0"; sha256="08wiriq6cm02d0b0q34056y5249daidpjzkwzgjq6dh55v5fp2s4"; depends=[]; }; +metaMA = derive { name="metaMA"; version="2.1"; sha256="1hwhj3m4n48qb9vqix2qazsy1xnmwk8x37zm826xx9j0n5j2ilac"; depends=[SMVar]; }; +metaMix = derive { name="metaMix"; version="0.1"; sha256="15vw8cwsy56fhq0q9w99799bnkj2ji2ns0ljfkg1p7wwhfrj689f"; depends=[data_table Matrix gtools Rmpi ggplot2]; }; +metaRNASeq = derive { name="metaRNASeq"; version="0.4"; sha256="14xqgxvlip6il1gx9xvv37683qm7zmyswklbcgqw9rgqifi0plal"; depends=[]; }; +metacom = derive { name="metacom"; version="1.3"; sha256="12asmqwaihm9j6p6qp79m1j93gfcj6rkwmpywhi6nv4g85c1shll"; depends=[vegan lattice]; }; +metacor = derive { name="metacor"; version="1.0-2"; sha256="04k3ph0yg3jp8x4g6l1h4m0qwl51mx0626xmm0fzr1pv4b4a1ypw"; depends=[rmeta gsl]; }; +metafolio = derive { name="metafolio"; version="0.1.0"; sha256="18s78lljwnn3j0l3mqc0svszcb3c8yzyzlpnimndbiq9yxagxnnf"; depends=[Rcpp plyr colorspace MASS Rcpp RcppArmadillo]; }; +metafor = derive { name="metafor"; version="1.9-5"; sha256="1ayvkm57c7s91m9kcsdax0fk61v0kvsbgaymlzg1sgsxkgnwcgj4"; depends=[Matrix]; }; +metagen = derive { name="metagen"; version="1.0"; sha256="0jvbm22976aqvmfnjzs51n2w099yj5hpx6hd0pgvbia80jk7b9vk"; depends=[MASS lhs plyr BBmisc ParamHelpers BatchJobs BatchExperiments ggplot2 metafor]; }; +metamisc = derive { name="metamisc"; version="0.1.1"; sha256="1cvlsix3b857xdw6anqhqsrfwxpnf4rbzg4ybf6aw7vcdc05zgwd"; depends=[mvtnorm ellipse bbmle rjags coda]; }; +metap = derive { name="metap"; version="0.6"; sha256="1iy5cmwrlsr70z0qnqn30n15knsfclg383815a2a8yqpg5gs4953"; depends=[]; }; +metaplus = derive { name="metaplus"; version="0.6-1"; sha256="1fk6sphjjcazd6v5k9dm5491487g0wzglzd0hg2pfy029bllx0a8"; depends=[bbmle metafor boot numDeriv]; }; +metasens = derive { name="metasens"; version="0.1-0"; sha256="0hrrzn6p14p2vs7bllkh9yxg0a3x87dmniglhq05p23g4lymcmbl"; depends=[meta]; }; +metatest = derive { name="metatest"; version="1.0-4"; sha256="0bz6gg2n4ffkr144jxk27y24xpqhp8awr09wkaijmv8902qx6qah"; depends=[]; }; +meteoForecast = derive { name="meteoForecast"; version="0.43"; sha256="1fpbxkdkgi50xbx3n26apdm6i29a2302vabfz0z3czafd76wkwg7"; depends=[raster sp zoo ncdf rjson]; }; +meteogRam = derive { name="meteogRam"; version="1.0"; sha256="167gyxjnl4dyfqs3znv8sdpkvpqdxzdqi1g730s30gycrm9snap9"; depends=[ggplot2 RadioSonde]; }; +mets = derive { name="mets"; version="1.0"; sha256="1jmvcnhxxqhfim8dxm2jglr616lj9dqzp9931m318m167gk4785z"; 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.0"; sha256="1hqsw7dn7vwgg5qhjmx50xdm0k3g95n0r6r8wbqrp3nx8rzxgsnr"; 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]; }; +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.12"; sha256="0k8qm447fcgfc5fmqn478dszr76jmin85k51ccqmhgk14jiz64bf"; depends=[mvtnorm]; }; +mht = derive { name="mht"; version="3.0.11"; sha256="1d1ca3jp5q9xmnlnjsqi247vz6gm25bb8x5lzwd6z0n87lv26n1k"; depends=[glmnet]; }; +mhurdle = derive { name="mhurdle"; version="1.0-1"; sha256="1x631fgbq3ika05svyavzadyjd7vi9bcmsgb58wfhpf9xq6j5rcr"; depends=[Formula truncreg maxLik pbivnorm]; }; +mi = derive { name="mi"; version="0.09-19"; sha256="1r3b6mm3pr95lb52m2vynmg0l2wy80hznjq2rff1qwplbq1pl04n"; depends=[arm abind car foreign lme4 MASS Matrix nnet R2WinBUGS]; }; +miP = derive { name="miP"; version="1.1"; sha256="17y2badm76iwidjp45flm9ln098lk9r5m6lgx3skzcq3hp075967"; depends=[VIM mi mice Amelia lattice vcd]; }; +miRada = derive { name="miRada"; version="1.13.8-8"; sha256="1m6rm65pv4r16r0s5ih69nr3v2rnpsvpdpk07pi7k4f7v9wck71v"; depends=[]; }; +miRtest = derive { name="miRtest"; version="1.8"; sha256="0i66s1sz7vf8p8ihfrxmag7wbkw8mlkldcp1w2figlzyhs74c85p"; depends=[corpcor MASS RepeatedHighDim]; }; +micEcon = derive { name="micEcon"; version="0.6-12"; sha256="1kxhr3qqgswq8glrjfcjz0hyb163lwf303yhwlgrwjciqgp5dq17"; depends=[miscTools]; }; +micEconAids = derive { name="micEconAids"; version="0.6-16"; sha256="07hsabrlkwpdaalh0b7izraz2q5dlxn373ccijc5c4zsrkgk7kij"; depends=[lmtest micEcon systemfit miscTools]; }; +micEconCES = derive { name="micEconCES"; version="0.9-8"; sha256="06g6z8hf7y9d942w6gya0fd5aidzfjkx3280gjygdlwpv7nlpqzv"; depends=[minpack_lm DEoptim systemfit car micEcon miscTools]; }; +micEconSNQP = derive { name="micEconSNQP"; version="0.6-6"; sha256="1n3pxapc90iz1w3plaqflayd0b1jqd65yw5nbbm9xz0ih132dby9"; depends=[miscTools systemfit MASS]; }; +mice = derive { name="mice"; version="2.22"; sha256="1b7ivpa21ipzbmmwjn1ch968zpw6wydg30f7jdk95m40lrk2xs68"; depends=[Rcpp lattice MASS nnet randomForest rpart Rcpp]; }; +miceadds = derive { name="miceadds"; version="1.0"; sha256="15kz3n7gx40il4sagnp5qc7c31dk1phdb932289lc0xknrb8k00a"; depends=[MASS mice mvtnorm pan sirt lme4 MBESS pls mitools bayesm Rcpp inline car foreign Rcpp RcppArmadillo]; }; +microbenchmark = derive { name="microbenchmark"; version="1.4-2"; sha256="05yxvdnkxr2ll94h6f2m5sn3gg7vrlm9nbdxgmj2g8cp8gfxpfkg"; depends=[ggplot2]; }; +micromap = derive { name="micromap"; version="1.9"; sha256="0scb79rrj11vy7qgq27hy8222ar22yagk31bq8b5z268zwfbw4fs"; depends=[ggplot2 maptools RColorBrewer rgdal]; }; +micromapST = derive { name="micromapST"; version="1.0.3"; sha256="182zhpsps8cx3wflc5j62njzsv108d5a30v9sb1wpxpcrnsyr343"; depends=[RColorBrewer]; }; +micropan = derive { name="micropan"; version="1.0"; sha256="0qnxm6z2pk1wibchj6rhn3hld77dzl5qgvzl4v9n16ywlgdv09ai"; depends=[igraph]; }; +midasr = derive { name="midasr"; version="0.3"; sha256="1gdfrf8p4wxz03bzdqrvj4ss14zy7dh5ac04ncvg4db2wcdxq6z5"; depends=[sandwich optimx MASS numDeriv Matrix]; }; +migest = derive { name="migest"; version="1.6"; sha256="1mjjcba74nk10kdbsaphih3zdyaqmf02hrv13s34klwdwkp3nv0m"; depends=[]; }; +migration_indices = derive { name="migration.indices"; version="0.3.0"; sha256="0h0yjcj70wzpgrv3wl1f2h2wangh1klsllq0i0935plgzw736mwd"; depends=[calibrate]; }; +migui = derive { name="migui"; version="0.00-09"; sha256="0mrvsls9q039pay0vf59xwg6bbr7ahwl4x3iwvar6sbfg8606as8"; depends=[tkrplot mi foreign]; }; +mime = derive { name="mime"; version="0.2"; sha256="0kg1wwxh7v7b7wqbxf47ngy978hc2a9nknwra5racpd2gzyg3ghn"; depends=[]; }; +minPtest = derive { name="minPtest"; version="1.7"; sha256="088kckpbfy2yp0pk3zrixrimywrvkaib5ywa7fkr5phnzlsl80sv"; depends=[scrime Epi]; }; +minerva = derive { name="minerva"; version="1.4.1"; sha256="0dg5xnl9srdvid49na8478bnvagv0khiv6hl7z8gw6m745681i89"; depends=[]; }; +miniCRAN = derive { name="miniCRAN"; version="0.1-1"; sha256="0azyv5wcl4dk1z4j6pq26y7h7f9lvq6m198dj4aa142k9smxfrnw"; depends=[XML httr igraph]; }; +miniGUI = derive { name="miniGUI"; version="0.8.0"; sha256="1iq52x7wbcin7ya207jj3k9vym7mavm5z61vggyabdmr768pci39"; depends=[]; }; +minimax = derive { name="minimax"; version="1.0"; sha256="1g0d9q5h1avbb0yg7ajw5330820i3n5cgkpsif754l4j3ikya8p3"; depends=[]; }; +minpack_lm = derive { name="minpack.lm"; version="1.1-8"; sha256="0nvsxqwg3k9k3dqjzkz1vq2z0xla317011zm9ms8y1qvf75raz83"; depends=[]; }; +minqa = derive { name="minqa"; version="1.2.4"; sha256="036drja6xz7awja9iwb76x91415p26fb0jmg7y7v0p65m6j978fg"; depends=[Rcpp Rcpp]; }; +minque = derive { name="minque"; version="1.1"; sha256="1hx4j38213hs8lssf9kj5s423imk7dzv60mdbzrpbp7la7jk2n57"; depends=[klaR Matrix]; }; +minxent = derive { name="minxent"; version="0.01"; sha256="1a0kak4ff1mnpvc9arr3sihp4adialnxxyaacdgmwpw61wgcir7h"; depends=[]; }; +mirt = derive { name="mirt"; version="1.6.1"; sha256="0wc085dcr59rkfj6ssmpdg50s76ilxcgh2jyin7f7028xwyy40a2"; depends=[lattice GPArotation Rcpp sfsmisc numDeriv Rcpp]; }; +mirtCAT = derive { name="mirtCAT"; version="0.2"; sha256="0n81wx5mvbkgk1ybk0n3slp6qg15gw8y7lmfrsbgjx7bcs80b8ky"; depends=[mirt shiny lattice]; }; +misc3d = derive { name="misc3d"; version="0.8-4"; sha256="0qjzpw3h09qi2gfz52b7nhzd95p7yyxsd03fldc9wzzn6wi3vpkm"; depends=[]; }; +miscF = derive { name="miscF"; version="0.1-2"; sha256="195rb9acdirfhap0z35yvcci5xn4j84mlbafki4l1vfgqgnh0ajj"; depends=[MCMCpack mvtnorm Rcpp RcppArmadillo Rcpp RcppArmadillo]; }; +miscFuncs = derive { name="miscFuncs"; version="1.2-6"; sha256="1302k6pvf74a0b9bkdjdr2j1xl98842rbq7137h8hwldl50g48i7"; depends=[roxygen2 mvtnorm]; }; +miscTools = derive { name="miscTools"; version="0.6-16"; sha256="19mslb64lm8srrmml1v40rfkxhqw02bplw0yjv7qnkqj44hcqfw1"; depends=[]; }; +miscset = derive { name="miscset"; version="0.4"; sha256="04cl8a2chcynfn5rljqw2ll4ry0wqaslqgjh9ny8ax3hcvyvmmwl"; depends=[data_table gridExtra Rcpp xtable Rcpp]; }; +missForest = derive { name="missForest"; version="1.4"; sha256="0y02dhrbcx10hfkakg5ysr3kpyrsh2d9i5b0qzhj9x5x0d5q11gp"; depends=[randomForest foreach itertools]; }; +missMDA = derive { name="missMDA"; version="1.7.3"; sha256="1wg4rgziw2f8asdxi2a5dx1mn4z0sd1lf9a8fp7dg29bnv82brmh"; depends=[FactoMineR]; }; +mistat = derive { name="mistat"; version="1.0-2"; sha256="1n5wdn5pl6mflzxpdwjj0x44c8a3cxxpwhmyw1jkx5r8yk95mh3p"; depends=[]; }; +mistral = derive { name="mistral"; version="1.1-1"; sha256="19zkc5ddjzw17y70x3l6maljsfvg0295xyzx7kavmjrws74jx4rc"; depends=[DiceKriging e1071 kernlab Matrix mvtnorm rgenoud]; }; +mitools = derive { name="mitools"; version="2.3"; sha256="0w76zcl8mfgd7d4njhh0k473hagf9ndcadnnjd35c94ym98jja33"; depends=[]; }; +mix = derive { name="mix"; version="1.0-8"; sha256="0zdbxrslj39cl272ggzvlc41gysj1inbcbmsa4ch7ss5xvk5vfbf"; depends=[]; }; +mixAK = derive { name="mixAK"; version="3.8"; sha256="1mkfa9zy61j4hn131x9kfsvydk7p0kp79zg1x9aidpaz5agdc92k"; depends=[colorspace lme4 fastGHQuad mnormt coda]; }; +mixOmics = derive { name="mixOmics"; version="5.0-3"; sha256="1b8ms3jz4acvbfm2b1iw30h2d80lpqgabwr5j9k2gy3nvqm72nxq"; depends=[MASS lattice RGCCA igraph rgl pheatmap]; }; +mixPHM = derive { name="mixPHM"; version="0.7-1"; sha256="0v75xv06m40jqq0c4y1gvdrmyddxs814djbpyq61fv8cn22fn7wx"; depends=[survival lattice]; }; +mixRasch = derive { name="mixRasch"; version="1.1"; sha256="1r067pv7b54y1bz8p496wxv4by96dxfi2n1c99gziqf5ramx3qzp"; depends=[]; }; +mixcat = derive { name="mixcat"; version="1.0-3"; sha256="0xszngygd3yj61pvv6jrrb5j0sxgpxzhlic69xrd5mv5iyw0cmxd"; depends=[statmod]; }; +mixdist = derive { name="mixdist"; version="0.5-4"; sha256="100i9mb930mzvdha31m1srylmpa64wxyjv6pkw1g5lhm1hsclwm3"; depends=[]; }; +mixedQF = derive { name="mixedQF"; version="0.3"; sha256="037376k13qh0c5nw1nxx3fvffisl9kcdyjz5d4i6vn3gfj0yqccc"; depends=[nnet MASS]; }; +mixer = derive { name="mixer"; version="1.7"; sha256="0as9l0s646snli5pykh0i6zpz168f8i5wmxk07l5rhxnb74m0id2"; depends=[]; }; +mixexp = derive { name="mixexp"; version="1.1.8"; sha256="0spjvwnv9xg3sbh17d5b52spwfznka7g25vxbyqpabnbg42iik2b"; depends=[gdata lattice daewr]; }; +mixlm = derive { name="mixlm"; version="1.0.7"; sha256="14bhwl11cyhwfdx0vf9iw8labmrs1zff0n2987zysjmv63kxacgi"; depends=[multcomp pls pracma leaps lme4 car]; }; +mixlow = derive { name="mixlow"; version="1.0.1"; sha256="12vnp3gl3ykxzgvc4bwhi4flmc1sl2y77yi0zi4by17q93a49akm"; depends=[nlme]; }; +mixreg = derive { name="mixreg"; version="0.0-5"; sha256="0wsb1z98ymhshw9nhsvlszsanflxv3alwpdsw8lr3v62bkwka8zr"; depends=[]; }; +mixsep = derive { name="mixsep"; version="0.2.1-2"; sha256="1ywwag02wbx3pkd7h0j9aab44bdmwsaaz0p2pcqn1fs3cpw35wa2"; depends=[tcltk2 MASS RODBC]; }; +mixsmsn = derive { name="mixsmsn"; version="1.0-9"; sha256="0pgip1xfgfrdy3g3197d7visn164zi7xnp6wlsgjwxdylvjsxkji"; depends=[mvtnorm]; }; +mixtools = derive { name="mixtools"; version="1.0.2"; sha256="0x809m6lbzprd5kq6wqk528x9apaj5df3sidzk9jiw06qklngwg8"; depends=[boot MASS segmented]; }; +mixture = derive { name="mixture"; version="1.1"; sha256="09hp28fh1y2kllny6l0zciwbhhnjjgyipsx1vs55rq7rr0s94pkn"; depends=[]; }; +mizer = derive { name="mizer"; version="0.2"; sha256="0cpal9lrjbvc923h499hbv4pqw3yjd4jvvhgayxgkak2lz2jzmcz"; depends=[plyr reshape2 ggplot2]; }; +mkde = derive { name="mkde"; version="0.1"; sha256="04v84arpnmjrkk88ffphnhkz32x7y0dypk75jfmbbgcgv59xlglv"; depends=[Rcpp raster sp Rcpp]; }; +mkin = derive { name="mkin"; version="0.9-34"; sha256="0g0r30hs5ja2x1mwj336x8y3p0b33asfql076w2krmw38xkpla44"; depends=[minpack_lm rootSolve FME deSolve]; }; +mkssd = derive { name="mkssd"; version="1.1"; sha256="1qqzy6fn6sc3lxahc19hzzf1hzxsyvxqi7npynw0vkknlrvh2ijp"; depends=[]; }; +mlDNA = derive { name="mlDNA"; version="1.1"; sha256="0d9lydiwar98hin26slnym4svn0g1xmyn212vvzsx9lzlvs5a9k4"; depends=[snowfall igraph rsgcc e1071 randomForest pROC ROCR]; }; +mlPhaser = derive { name="mlPhaser"; version="0.01"; sha256="1s2mqlnbcjdkx0ghvr2sw9rzggqa4jy2vzi9vbyqkh6795lgck6n"; depends=[]; }; +mlbench = derive { name="mlbench"; version="2.1-1"; sha256="1rp035qxfgh5ail92zjh9jh57dj0b8babw3wsg29v8ricpal30bl"; depends=[]; }; +mlearning = derive { name="mlearning"; version="1.0-0"; sha256="0r8xfaxw83s2r27b8x5qd0k4r5ayxpkafzn9b1a0jvsr87i6520r"; depends=[class nnet MASS e1071 randomForest ipred]; }; +mlegp = derive { name="mlegp"; version="3.1.4"; sha256="1932544irhzhf6a8rjyh66j57h9awlhwd6xam603bamfg106cmg2"; depends=[]; }; +mleur = derive { name="mleur"; version="1.0-6"; sha256="0mddphq3b6y2jaafaa9y41842kcaqdl3dh7j4pva55q2vcjcclj7"; depends=[urca stabledist fGarch lattice]; }; +mlgt = derive { name="mlgt"; version="0.16"; sha256="1nvdq6mvgr39ikkf73aggsb6pmbw132injj8fdkr8hgcmwm6lgd9"; depends=[seqinr]; }; +mlica2 = derive { name="mlica2"; version="2.1"; sha256="0c3m1zd9x99n6lw12hfzmd59355z51xa8rhg1h7qwfn9p86r826f"; depends=[]; }; +mlmRev = derive { name="mlmRev"; version="1.0-6"; sha256="0mvmahnbbp478xwldj4wlsjib4v4afhs07643gxgcqpi56zbd5h7"; depends=[lme4]; }; +mlmmm = derive { name="mlmmm"; version="0.3-1.2"; sha256="1m5ziiqs3ll1xjm1yf7x4sdc910jypn3kjnbadf95xxkvqmfrsqq"; depends=[]; }; +mlogit = derive { name="mlogit"; version="0.2-4"; sha256="15ndly7i56k8blgvpn15ixxnqx9yvbci7n3mb3hm9mnrxwh5v7sx"; depends=[Formula maxLik statmod zoo MASS lmtest]; }; +mlogitBMA = derive { name="mlogitBMA"; version="0.1-6"; sha256="1wl8ljh6rr1wx7dxmd1rq5wjbpz3426z8dpg7pkf1x9wr94a2q25"; depends=[BMA abind maxLik]; }; +mlr = derive { name="mlr"; version="2.2"; sha256="1l1ng2k3iyz3x1237kshcana6f8dds79dzs703c95wrzvfsrim89"; depends=[ParamHelpers BBmisc checkmate codetools ggplot2 parallelMap plyr survival]; }; +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]; }; +mmds = derive { name="mmds"; version="1.1"; sha256="0f5qzkfhi7vg8vsd8r41idmbwrrgc7qzfnp81adms2yzrza17wrw"; depends=[]; }; +mme = derive { name="mme"; version="0.1-5"; sha256="07k1xagwpyzsrlc00y9xlaxcpwdhz55v567i7fzvqa96ical8nlf"; depends=[MASS Matrix]; }; +mmeln = derive { name="mmeln"; version="1.1"; sha256="06bxp157cdab6ghx3yrsn8l2gixh9cyv6fv4pqyq0yxqwbjf9bmi"; depends=[]; }; +mmeta = derive { name="mmeta"; version="2.2"; sha256="06zkazi97f3il2vlx4f8c7zz4kxs9ylhscd06j31h504c1w96ddf"; depends=[aod HI]; }; +mmm = derive { name="mmm"; version="1.4"; sha256="1nydian004nldqhyw3x15w6qfml2gkjc0x8ii54faz563byjv3d8"; depends=[gee]; }; +mmm2 = derive { name="mmm2"; version="1.2"; sha256="1h9pn5s3jjs4bydrr1qysjb4hv7vs4h3m7mvi22ggs2dzyz3b298"; depends=[gee]; }; +mmod = derive { name="mmod"; version="1.2.1"; sha256="0c2ijg5116hacq0f18xhkbxankjp0k34zfnw8q02ahzwd26ds0z7"; depends=[adegenet pegas]; }; +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]; }; +modTempEff = derive { name="modTempEff"; version="1.5.2"; sha256="00xdvc0i3p8wq913giy44w0xz07sa4bdgqpi7pmpbv2c5wj30pk1"; depends=[mgcv]; }; +modeest = derive { name="modeest"; version="2.1"; sha256="0l4y7yhkgsxycdd2lck0g8g6k2r059hwlrrcpl46md3rva4jgbnp"; depends=[]; }; +modehunt = derive { name="modehunt"; version="1.0.6"; sha256="15rq1yyrjhsn2rlkyiqj36jvji635hy6jsih845mfxdpn4vnssa3"; depends=[]; }; +modelfree = derive { name="modelfree"; version="1.1-1"; sha256="0ammka2wxx90z31zfzypw9dk5n118l0vxhykxbx6srfig2vdyn82"; depends=[PolynomF SparseM]; }; +modeltools = derive { name="modeltools"; version="0.2-21"; sha256="0ynds453xprxv0jqqzi3blnv5w6vrdww9pvd1sq4lrr5ar3k3cq7"; depends=[]; }; +modiscloud = derive { name="modiscloud"; version="0.14"; sha256="0vwhfp50yb21xkanvzk983vk0laflv60kj1ybx3fydfljwqx0rwj"; depends=[date sp sfsmisc raster rgdal]; }; +moduleColor = derive { name="moduleColor"; version="1.08-3"; sha256="183l968l49b7jbmvsjjnmk1xd36cpjkp777c00gw1f73h6nb2na8"; depends=[dynamicTreeCut]; }; +mokken = derive { name="mokken"; version="2.7.7"; sha256="1v0khh1bb2h7j2x54mdw8vqlimhw25r2ps89hw4l88qfaz05ir77"; depends=[poLCA]; }; +mombf = derive { name="mombf"; version="1.5.9"; sha256="0lc3rrmm2vsa4mg2zkbhp5dpnps7w0ld35lav19ff86kccspw1rg"; depends=[mvtnorm ncvreg actuar mgcv survival]; }; +moments = derive { name="moments"; version="0.13"; sha256="05pa4gkmpmp744a5rsr2arqh7y5bgalwrwdn731jg6waqiniy024"; depends=[]; }; +mondate = derive { name="mondate"; version="0.10.01.02"; sha256="18v15y7fkll47q6kg7xzmj5777bz0yw4c7qfiw2bjp0f3b11qrd2"; depends=[]; }; +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=[]; }; +moonsun = derive { name="moonsun"; version="0.1.3"; sha256="1y8mwxmcy4iz444c2fayyi4i0jk1k561dp6cbjg2b3lmdml0whmi"; depends=[]; }; +mopsocd = derive { name="mopsocd"; version="0.5.1"; sha256="10hssnm1afqmxa9kw6ifqnz3p3yyjrmxgi98zlj31a5g4nis8wb1"; depends=[]; }; +morgenstemning = derive { name="morgenstemning"; version="1.0"; sha256="17y90cf8ajmkfwla0hm4jgkbkd1mxnym63ph2468sfxkhn0r3v88"; depends=[]; }; +morse = derive { name="morse"; version="1.0.2"; sha256="044aljv48mfq6yj9i77yqf03qa4qqkncaalzhph3wr9w4jvxpxn5"; depends=[plyr]; }; +mosaic = derive { name="mosaic"; version="0.9.1-3"; sha256="1flnzg2hwzlvhkn167y8chc0prrhijb96y0sr87rssbcy5zyzhzr"; depends=[car dplyr lattice ggplot2 mosaicData MASS reshape2 plyr latticeExtra gridExtra ggdendro]; }; +mosaicData = derive { name="mosaicData"; version="0.9.1"; sha256="0gxnw3x806pm97x1043qq3qf1cwn1z1771cayp3xlh5khn5bijk7"; depends=[]; }; +moult = derive { name="moult"; version="1.4"; sha256="0nglf7wijp2v66fpyh88glbn1glp8vvkbvpc1g6136bg6ahbbkkl"; depends=[Formula Matrix]; }; +movMF = derive { name="movMF"; version="0.2-0"; sha256="1p9ay7w93gyx4janw23iwg2j0wkvnvzalaa20n1rlahhmh327g7i"; depends=[skmeans clue slam]; }; +move = derive { name="move"; version="1.2.475"; sha256="0d542554bamgnc5qd7z497ssk885mz4m1wbaiqpi5cyxd24kwgii"; depends=[geosphere sp raster rgdal]; }; +mp = derive { name="mp"; version="0.2.0"; sha256="1vpjrx04yn1rdmrhj42rhc757cj02sghrv0i5jfm4k2y28ab7qh1"; depends=[svd Rcpp Rcpp RcppArmadillo]; }; +mpMap = derive { name="mpMap"; version="1.14"; sha256="0gmhg5ps8yli8699a5aw26skfbjxx4zpp0paqxxdc0zl28l0pdff"; depends=[gdata seriation qtl wgaim]; }; +mpa = derive { name="mpa"; version="0.7.3"; sha256="0mhnsbgr77fkn957zfiw8skyvgd084rja1y4wk5zf08q5xjs2zvn"; depends=[network]; }; +mpath = derive { name="mpath"; version="0.1-17"; sha256="031mf0b32435y0cfar7zh9d1wd62ghqpspipin1cjhvnr2lyzw21"; depends=[MASS glmnet pscl numDeriv]; }; +mpcv = derive { name="mpcv"; version="1.1"; sha256="0vwycspiw9saj811f6alkbijivy7szpahf35bxn2rpn2bdhbn21i"; depends=[lpSolve]; }; +mph = derive { name="mph"; version="0.9"; sha256="11wcy23sv8x7aq6ky8wi0cq55yhjkkm9hn672qy803dwzzxv5y61"; depends=[]; }; +mpm = derive { name="mpm"; version="1.0-22"; sha256="0wijw8v0wmbfrda5564cmnp788qmlkk21yn5cp5qk8aprm9l1fnk"; depends=[MASS KernSmooth]; }; +mpmcorrelogram = derive { name="mpmcorrelogram"; version="0.1-3"; sha256="0qgzsh744002whh3v1hrxs1i0xnk9zgfgkdgx2f0ffj00vvnwr97"; depends=[vegan]; }; +mpmi = derive { name="mpmi"; version="0.41"; sha256="1iwdhvdglsamzq18f0r5mh0anrd4ffrddafdlbw16kr8jy0c8fdn"; depends=[KernSmooth]; }; +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-0"; sha256="0bsfk8rxl3bnsydzs32061ayfgxkyxhnjk8pirgzrrsm2vk6j3j9"; 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.10"; sha256="0gbivbawvzpg9s9yrfnil44h8ng9k8gf8swfgmlzibi9ixrv90lb"; depends=[optimx mgcv Rsolnp]; }; +mreg = derive { name="mreg"; version="1.1"; sha256="06la0yy2yys161jhlzlcm5lcv0664wm6sa8gjdnpd1s1nx52jkqf"; depends=[]; }; +mritc = derive { name="mritc"; version="0.4-0"; sha256="02a8h1x3pk406zpn89gl5wkcd74qm5gqz8gqpckk3nv881pkayaz"; depends=[lattice misc3d fmri AnalyzeFMRI]; }; +msBP = derive { name="msBP"; version="1.0-1"; sha256="136s1az62zq0z92ahzywld7lnpjknxklmlh56dhgxif52b81vq0p"; depends=[DPpackage]; }; +msSurv = derive { name="msSurv"; version="1.1-2"; sha256="1nyadgzwdyf48qhqdx8sszvgkhxafacnccacg39ghm6gqv8b5j60"; depends=[class lattice]; }; +msap = derive { name="msap"; version="1.1.8"; sha256="0z5lm782jjb9w1h5vgz8bmxjdcrq9zb3xp1w5cb479jjc7krlgg3"; depends=[ade4 ape]; }; +msarc = derive { name="msarc"; version="1.3.4"; sha256="0rgbrgdwjsybqcbfpf71b9z6qwwn8ph87z4hp0c1gmjrv8b9byld"; depends=[gplots]; }; +msda = derive { name="msda"; version="1.0.1"; sha256="0bd9am0dyrs9x8xj6rccgqcx15ddag1fakjzpyw43n3zi0h24fa6"; depends=[Matrix MASS]; }; +mseapca = derive { name="mseapca"; version="1.0"; sha256="115njdk8cv55zxd38hq9qaca686ykckni0f3xl8w3bn32gb5g9a7"; depends=[XML]; }; +mseq = derive { name="mseq"; version="1.2"; sha256="0h1wdnmlw7raqyy7844zl5k942d6glhv0lihd4h3gcv5is0if66w"; depends=[gbm]; }; +msgl = derive { name="msgl"; version="2.0.125.1"; sha256="1k2n8yn9j5sknw95saq2zgl3jfanyp3c2xyj49wqgawhwsw81jdh"; depends=[Matrix sglOptim Rcpp RcppProgress RcppArmadillo BH sglOptim]; }; +msgpackR = derive { name="msgpackR"; version="1.1"; sha256="0a6vm4q1zfy8wlvhl9wfy09ig1iag9fvjasz5w9bll7idky4ldx5"; depends=[]; }; +msgps = derive { name="msgps"; version="1.3"; sha256="0nvxy9a41z5d111gqr1gh521imm795l1li70g1mzrag1gpg810c5"; depends=[]; }; +msir = derive { name="msir"; version="1.3"; sha256="0d7zxjmhr1ri3qz3fdkf56fi5dz2p9lb2vyqccrpn7js2ibkqhpl"; depends=[mclust]; }; +msm = derive { name="msm"; version="1.4"; sha256="1x7ys6695jarwfkh3xv607mwm5l2y2gzq2mczjfdcs9mla2l96a5"; depends=[survival mvtnorm expm]; }; +msme = derive { name="msme"; version="0.5.1"; sha256="1bkj10pgmv9q61384fwd2pxccclclc3knc5x212p42w4w49hnm1q"; depends=[MASS lattice]; }; +msos = derive { name="msos"; version="1.0.1"; sha256="0fbxi8x83sj8a6bahc7q28vql00pxqdia2vxb6ilsc459xaph6vc"; depends=[mclust tree]; }; +msr = derive { name="msr"; version="0.4.1"; sha256="1kfj6xq7l32ligc53akiym3s9if87087gan8nqz4w7d8nxp693s7"; depends=[Matrix class glmnet e1071 rgl RColorBrewer colorspace]; }; +mstate = derive { name="mstate"; version="0.2.7"; sha256="0rys25cwr814k8z65206s12yv18dala66b3nlfq882dw5cfpaybl"; depends=[survival RColorBrewer]; }; +mtk = derive { name="mtk"; version="1.0"; sha256="0vq2xlxf86l92fl91qm8m4yfjyz1h8szmwxiics7sc9f0as0dkmy"; depends=[stringr XML sensitivity lhs rgl]; }; +mtsdi = derive { name="mtsdi"; version="0.3.3"; sha256="1hx4m1jnfhkycxizxaklnd9illajqvv1nml8ajfn3kjmrb5z7qlp"; depends=[gam]; }; +muRL = derive { name="muRL"; version="0.1-9"; sha256="0711hxq8l0zc8w8k3aj4f9sq8xl5mqqx70dvq0m66kahkh2pnhgb"; depends=[maps]; }; +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-7"; sha256="1g9vzhh2m5vh957n6mhn9ikmgn0kwjwvrcra1flqhqq2zhqsh75x"; depends=[mvtnorm survival TH_data sandwich]; }; +multcompView = derive { name="multcompView"; version="0.1-5"; sha256="0vfgvqxqgxyifkqs3r5xxj7rfn8lfmby6wyyiqa5jv01073xchib"; depends=[]; }; +multgee = derive { name="multgee"; version="1.5.0"; sha256="1wa4pfvn4q77j4h6drvzysr3syni92z2yp2nppvzfpd29aib1fyd"; depends=[gnm VGAM]; }; +multiDimBio = derive { name="multiDimBio"; version="0.3.3"; sha256="1aj6yam31mr0abjb6m5m85r1w71snha4s7h4ikyw66sc73xkmb9m"; depends=[ggplot2 lme4 misc3d MASS RColorBrewer]; }; +multiPIM = derive { name="multiPIM"; version="1.4-1"; sha256="0r69gkl8k6dd2rafrwvrdkpz4jlffz1g6czspsi908jf9dyw8y72"; depends=[lars penalized polspline rpart]; }; +multibiplotGUI = derive { name="multibiplotGUI"; version="0.0-1"; sha256="0klslbj1v0j10hv8xgyxgp4d2rkm3l4gr0gyrr1g8lyj0gf43sb3"; depends=[rgl tkrplot RODBC]; }; +multic = derive { name="multic"; version="0.3.8.1"; sha256="06lc9kn0z3s7x00hz8vj903q0c6cncnj4v3ygvd2yvkgcbhfvjd0"; depends=[]; }; +multicon = derive { name="multicon"; version="1.3"; sha256="0qc7szww7fmzckvkfa368pqphw0gfnv28r1wy6n8kaps6dm2r8li"; depends=[psych abind foreach mvtnorm sciplot]; }; +multicool = derive { name="multicool"; version="0.1-2"; sha256="1rs7q93lcr1crrx433zgil2db1rb3n4qw62r52nvpllqfwfx98dc"; depends=[]; }; +multigroup = derive { name="multigroup"; version="0.4.2"; sha256="0wnxql8mhz1sk82mrc2rvs96g91azcxzhsas3pfygk162lild035"; 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]; }; +multinbmod = derive { name="multinbmod"; version="1.0"; sha256="1c4jyzlcjkqdafj9b6hrqp6zs33q6qnp3wb3d7ldlij7ns9fhg71"; depends=[]; }; +multinomRob = derive { name="multinomRob"; version="1.8-6.1"; sha256="1fdjfk77a79fy7jczhpd2jlbyj6dyscl1w95g64jwxiq4hsix9s6"; depends=[rgenoud MASS mvtnorm]; }; +multipleNCC = derive { name="multipleNCC"; version="1.0"; sha256="13z6yq77h1r6kp8wgza58c6yp9a1gqm0w36x534mxbhcmingdw9f"; depends=[survival gam]; }; +multiplex = derive { name="multiplex"; version="1.2"; sha256="06wrzglgrvahavlcknf80cp0j4k840dhmclw9g6wqv51pq9brj2f"; depends=[]; }; +multipol = derive { name="multipol"; version="1.0-6"; sha256="1yjz0p4mcgzs98s61i8315wyhh986jxp8b0lq66375ckpr2ddcss"; depends=[abind]; }; +multisensi = derive { name="multisensi"; version="1.0-7"; sha256="1sq0jxkp33wsv6id27nka0764mr1jskqzsr2nhmqc4c8l312bkp6"; depends=[]; }; +multispatialCCM = derive { name="multispatialCCM"; version="1.0"; sha256="1fzd91w10iln8qb81z240lq3fi4gq22l4rh9npkav6fiq6g6rlp8"; depends=[]; }; +multitable = derive { name="multitable"; version="1.6"; sha256="067bgl793wwvb1rhan70ih0ga3dxja2c6zx7fwzml5rqi6p728pr"; depends=[]; }; +multitaper = derive { name="multitaper"; version="1.0-8"; sha256="1x0a4nrngh1hs44h4gnmjfhx57kgxmkyzm431i5k288ydv57vvx0"; depends=[]; }; +multivator = derive { name="multivator"; version="1.1-4"; sha256="125ifkpm1pny4rjpzirnwpmpjfg0y8w0rygj0way0p1qwm0l207n"; depends=[emulator mvtnorm]; }; +multiwayvcov = derive { name="multiwayvcov"; version="1.2.1"; sha256="15gxcrg2i1aqbxkif5dmdz81yzqj7a4hq0dcd0narzsvm5b4w9py"; depends=[sandwich boot]; }; +multxpert = derive { name="multxpert"; version="0.1"; sha256="03mvf4m0kabm22vy4zkj1cfh884larpj8cbgg3p9l3pag20snf1l"; depends=[mvtnorm]; }; +muma = derive { name="muma"; version="1.4"; sha256="0midx3wzyvcz8rk9kvsfll3xg41pkz40si4jw2ps54ykkf9rkm99"; depends=[car pdist pls gplots mvtnorm robustbase gtools bitops caTools pcaPP rrcov]; }; +munfold = derive { name="munfold"; version="0.3-1"; sha256="0rjicbyhxp0xr375ryg7kb2a4rvh3giw62ypws63nc3l8iwsig2m"; depends=[memisc MASS]; }; +munsell = derive { name="munsell"; version="0.4.2"; sha256="1bi5yi0i80778bbzx2rm4f0glpc34kvh24pwwfhm4v32izsqgrw4"; depends=[colorspace]; }; +munsellinterpol = derive { name="munsellinterpol"; version="1.0.1"; sha256="0q3n4z1z8sbqslzp97jw9xmdnypi66073g64ppk65r1aiq41hvac"; depends=[geometry]; }; +muscle = derive { name="muscle"; version="3.8.31-4"; sha256="0pijc8x6pwsb6z4061v1r7iwq5lsnia5qn1bikwpxy8ir19nic72"; depends=[]; }; +musicNMR = derive { name="musicNMR"; version="0.0.2"; sha256="09xxc78ajk428yc3617jfxqp5fy89nfc24f1rig6cw28fflwqj0k"; depends=[seewave]; }; +mutoss = derive { name="mutoss"; version="0.1-8"; sha256="13x49dk1xyn697yindg6m00nqbn2cb12544v2k14ckmnw07mp1gq"; depends=[mvtnorm plotrix multcomp]; }; +mutossGUI = derive { name="mutossGUI"; version="0.1-9"; sha256="1xdby6n0w1155kx6mhinvgqm0ssgyy4443pkq3k88a5s4bfxw5bw"; depends=[mutoss multcomp plotrix rJava JavaGD CommonJavaJars JGR]; }; +mvMORPH = derive { name="mvMORPH"; version="1.0.2"; sha256="1zzh2vmm3l6zvzg8b39ivkx2jmbw2g6n00jj4icp46w8jb26rlwa"; depends=[phytools ape corpcor subplex]; }; +mvProbit = derive { name="mvProbit"; version="0.1-0"; sha256="0fnrlralydlsf9iphq385f8hpqigfmi8rafvgp443gygvpq5b6g0"; depends=[mvtnorm maxLik abind bayesm miscTools]; }; +mvSLOUCH = derive { name="mvSLOUCH"; version="1.1.4"; sha256="00grmwqn8z5h5b4cbk0ip45a2474zjkqvssf53q40vwz7s2ilxnb"; depends=[ouch ape numDeriv mvtnorm corpcor]; }; +mvShapiroTest = derive { name="mvShapiroTest"; version="1.0"; sha256="0zcv5l28gwipkmymk12l4wcj9v047pr8k8q5avljdrs2a37f74v1"; depends=[]; }; +mvabund = derive { name="mvabund"; version="3.9.3"; sha256="1vr4rw8ivkhmzrpvz2k8v594cavrw88i7nqr9g1mar76d9mpchkx"; depends=[Rcpp MASS tweedie statmod Rcpp]; }; +mvbutils = derive { name="mvbutils"; version="2.7.4.1"; sha256="1vs97yia78xh35sdfv5pj3ddqmy83qgamvyyh9gjg0vdznqhffzg"; depends=[]; }; +mvc = derive { name="mvc"; version="1.3"; sha256="0kmh6vp7c2y9jf71f4a29b0fxcl0h7m4p8wig4dk3fi7alhjf7ym"; depends=[rattle]; }; +mvctm = derive { name="mvctm"; version="1.0"; sha256="1naxjh2k3vv4wlpzzx0y2zwvbn4kdqyls8a8qx6bz609ynzay5r9"; depends=[Formula nlme MNM quantreg Rfit]; }; +mvcwt = derive { name="mvcwt"; version="1.3"; sha256="0fqdyypmszm00rpl04z8kiiw6jd416a0b2rap3dqq3kchnz8h4s2"; depends=[foreach RColorBrewer]; }; +mvglmmRank = derive { name="mvglmmRank"; version="1.0-2"; sha256="0gpp0ibgji86pxscqzcws0d1qn1ciqqvyfb0x2v18580r4cx8jv7"; depends=[Matrix numDeriv]; }; +mvinfluence = derive { name="mvinfluence"; version="0.6"; sha256="1cd5p6cl2zln8madjf3vsbmqlg4nsklzzy6ngdd5glj1a9qapd6c"; depends=[car heplots]; }; +mvmeta = derive { name="mvmeta"; version="0.4.5"; sha256="0faczanbz6i7794sqxm21a6v52cs5hrjjzdypdvi23bkl4mkxjrb"; depends=[]; }; +mvna = derive { name="mvna"; version="1.2-3"; sha256="1gwv17j6w9c38bqvnasv9kfigbdxiqkzwj89gqmkxgw715f9nnpp"; depends=[lattice]; }; +mvnfast = derive { name="mvnfast"; version="0.1.3"; sha256="1ghm6zdrh2ax8r4jin8gka0qjwcsixn5faclf17sr5bx7l5b62np"; depends=[Rcpp Rcpp RcppArmadillo BH]; }; +mvngGrAd = derive { name="mvngGrAd"; version="0.1.3"; sha256="1c0rwywsa2dzhhphwc9prdxv6jyk1qdc655zvzyxif6ay3wnganf"; depends=[]; }; +mvnmle = derive { name="mvnmle"; version="0.1-11"; sha256="02mpmrr22cqb3v8x7kydgg715yl3lrdgzgdqpchmp0xrl2db8gq4"; depends=[]; }; +mvnormtest = derive { name="mvnormtest"; version="0.1-9"; sha256="1iaxjwp7bgxhaa4xqvgqb61316mq2fb0452d0pabhmbxkvmvdnj6"; depends=[]; }; +mvoutlier = derive { name="mvoutlier"; version="2.0.5"; sha256="1n12wy2i9jkb6brrqc0ibw3wiyd25dm5jhyapf05cj8wi06jfrsf"; depends=[sgeostat robCompositions robustbase]; }; +mvpart = derive { name="mvpart"; version="1.6-2"; sha256="1ddamzkv3j3a1niwqrrdpajn10v48s4li69n63mwlanrw9gdyzhn"; depends=[]; }; +mvprpb = derive { name="mvprpb"; version="1.0.4"; sha256="1kcjynz9s7vrvcgjb9sbqv7g50yiymbpkpg6ci34wznd33f7nrxm"; depends=[]; }; +mvrtn = derive { name="mvrtn"; version="1.0"; sha256="0k0k76wk5zq0cjydncsrb60rdhmb58mlf7zhclhaqmli1cy697k8"; depends=[]; }; +mvsf = derive { name="mvsf"; version="1.0"; sha256="1krvsxvj38c5ndvnsd1m18fkqld748kn5j2jbgdr3ca9m3i5nlwf"; depends=[nortest mvnormtest]; }; +mvtmeta = derive { name="mvtmeta"; version="1.0"; sha256="0g0d4lrz854wkd0dz5aiad54i46aqkfhsq6cpbsfv0w5l2kwiqqz"; depends=[gtools]; }; +mvtnorm = derive { name="mvtnorm"; version="1.0-1"; sha256="132k88pm5k2yib81f10734z17l6ksw008f6bfddajv2w27h79a2j"; depends=[]; }; +mvtsplot = derive { name="mvtsplot"; version="1.0-1"; sha256="0g5grrha77rsnkfasw5pxnpmkl7vgb728ms8apyg8xnbmgilg9vv"; depends=[RColorBrewer]; }; +mwa = derive { name="mwa"; version="0.3.2"; sha256="123xvm4vrwl7vfc9sas4jj7fn38m37c6h38j0aczpmygmx54bbmr"; depends=[cem rJava MASS]; }; +mwaved = derive { name="mwaved"; version="1.1.0"; sha256="1d06b0yxhrqx190qqisgaj2c6mx47bpj1h89jgbk9zdww9pqnvq4"; depends=[Rcpp shiny Rcpp]; }; +mxkssd = derive { name="mxkssd"; version="1.1"; sha256="0m9763dqrk8qkrvp18bsv96jv0xhc2m8sbxdk6x3w6kdjcl663p2"; depends=[]; }; +myTAI = derive { name="myTAI"; version="0.0.1"; sha256="0xmc0nj4yw5vlrplqp18ig4ybpy8hbjandvjy0p3rdg6x6jj671j"; depends=[Rcpp nortest fitdistrplus foreach iterators Rcpp]; }; +mycobacrvR = derive { name="mycobacrvR"; version="1.0"; sha256="1xd9ackzdd8db6bayza0bg4n256mi9rdqih0cdc0nl212c3iz75g"; depends=[]; }; +mycor = derive { name="mycor"; version="0.1"; sha256="1ibcxl9v2d2mxpwad0rv5dw1j645rrg05f4aqvyhyd40hz9823mr"; depends=[lattice]; }; +myepisodes = derive { name="myepisodes"; version="1.1.1"; sha256="0xk9bwgpl630nhc8qa2pc0rwqbqk3haxnp78gfxq6sn6z7i44k1p"; depends=[XML]; }; +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]; }; +nFactors = derive { name="nFactors"; version="2.3.3"; sha256="016d76yfxz7gx7zz5dgwjmj2c5m6kxdmqj0lln5w6d70r9g1kxg7"; depends=[MASS psych boot lattice]; }; +nabor = derive { name="nabor"; version="0.4.3"; sha256="10h6pf44db75y956h5wfkfwh7lm5lxpz33p8h60802sg0nvs8src"; depends=[Rcpp Rcpp RcppEigen BH]; }; +nacopula = derive { name="nacopula"; version="0.8-1"; sha256="1g1kcs6vqagq0nisyc43040ri3a9iy3fv4bnjjjc5zrla52a20w5"; depends=[copula copula]; }; +nadiv = derive { name="nadiv"; version="2.13.2"; sha256="1r63z08k46b6hryxracicsw1hr91x4pgk2x58c9nijdni4my7kkc"; depends=[Matrix]; }; +namespace = derive { name="namespace"; version="0.9.1"; sha256="1bsx5q19l7m3q2qys87izvq06zgb22b7hqblx0spkvzgiiwlq236"; depends=[]; }; +nanop = derive { name="nanop"; version="2.0-4"; sha256="0795kksw6yry9il8xj21iq13xw6jipqcv5vjs3k7s19dbah2k8pi"; depends=[distrEx rgl]; }; +nasaweather = derive { name="nasaweather"; version="0.1"; sha256="05pqrsf2vmkzc7l4jvvqbi8wf9f46854y73q2gilag62s85vm9xb"; depends=[]; }; +nat = derive { name="nat"; version="1.5.12"; sha256="1pf6d6y6zakixlhvmpv1di27waz5gnhk8gmnk4n76xgfs3zk85lb"; depends=[rgl RANN igraph filehash digest nat_utils plyr]; }; +nat_nblast = derive { name="nat.nblast"; version="1.5"; sha256="1slpk126fwgn90j3aazlf3pw2ij050dghc1yqadv6mjcj82qpm5i"; depends=[rgl nat nabor dendroextras plyr spam]; }; +nat_templatebrains = derive { name="nat.templatebrains"; version="0.4.1"; sha256="06vqnrwcara4ljkf5wbwqbsfx1ypd8xsv8pbrs5x6hyj5jxnnvaz"; depends=[rgl nat]; }; +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.0"; sha256="0ncw8xihdh24cfz0rhcvvp2l5mhm2z7hllnkf45bhdhpams6yryp"; depends=[Hmisc MASS]; }; +ncbit = derive { name="ncbit"; version="2013.03.29"; sha256="0f07h8v68119rjvgm84b75j0j7dvcrl6dq62vp41adlm2hgjg024"; depends=[]; }; +ncdf = derive { name="ncdf"; version="1.6.8"; sha256="0600qh0diw1j47w8b7gpk1wkpvinpvf3g9v3hlp3f8hcwpdn3s0y"; depends=[]; }; +ncdf_tools = derive { name="ncdf.tools"; version="0.7.1.291"; sha256="149d89kim67q77w17afc5x7hkvmk05gfkaw6cpl583j2zxingify"; depends=[RNetCDF chron abind plotrix raster RColorBrewer JBTools]; }; +ncdf4 = derive { name="ncdf4"; version="1.13"; sha256="07s1lh5cg4fck7sapfka2skky70max1rfhimblnqf41phndxjcsv"; depends=[]; }; +ncdf4_helpers = derive { name="ncdf4.helpers"; version="0.3-3"; sha256="051akd7r6zx805a0xwcs95q5sd8alag0f1gzqjk3n188q8r3ji5j"; depends=[ncdf4 PCICt abind]; }; +ncf = derive { name="ncf"; version="1.1-5"; sha256="03nbmg9swxhpwrmfjsanp6fj5l2nw160sys70mj10a0ljlaf904z"; depends=[]; }; +ncg = derive { name="ncg"; version="0.1.1"; sha256="1jzkzp61cc5jxmdnl867lcrjjm7y2iw9imzprbd098p1j3w8fvj7"; depends=[]; }; +ncvreg = derive { name="ncvreg"; version="3.2-0"; sha256="0j53aj71lxz3pxh6a4vlgw0f9zk4gjh4xf5c7qsm5cp8nfpkplm5"; depends=[]; }; +ndl = derive { name="ndl"; version="0.2.16"; sha256="1l56kg3x4579hzr4sig3iwrd81rhm8nmmrqfs54zxqv5yxpk3hp4"; depends=[Rcpp MASS Rcpp]; }; +ndtv = derive { name="ndtv"; version="0.5.1"; sha256="0cvqpr74als10zhdravbc7ykacy3ll7y5fx4n5jik0avwcaclgkc"; depends=[network networkDynamic animation sna MASS statnet_common]; }; +neariso = derive { name="neariso"; version="1.0"; sha256="1npfd5g5xqjpsm5hvhwy7y84sj5lqw9yzbnxk6aqi80gfxhfml4c"; depends=[]; }; +needy = derive { name="needy"; version="0.2"; sha256="1ixgpnwrg6ph1n5vy91qhl1mqirli9586nzkmfvzjrhdvrm0j5l0"; depends=[]; }; +negenes = derive { name="negenes"; version="1.0-1"; sha256="0g8m3idjm24cf9b1wngw2pv1axgnv9mk5wqs78zgwvn0m67ypsiz"; depends=[]; }; +neldermead = derive { name="neldermead"; version="1.0-9"; sha256="144liymq0cnd80cp2vn2d1j22g0izipnchc90r526gfpm2gklh7n"; depends=[optimbase optimsimplex]; }; +nephro = derive { name="nephro"; version="1.0"; sha256="0dv6gj1q6qrg9y6cpf230q1mksqk3nvzj3afavhrwz1fcz2w22f4"; depends=[]; }; +netClass = derive { name="netClass"; version="1.2.1"; sha256="04yrj71l5p83rpwd0iaxdkhm49z9qp3h6b7rp9cgav244q060m9y"; depends=[kernlab Matrix ROCR igraph samr]; }; +netmeta = derive { name="netmeta"; version="0.6-0"; sha256="0cwlwd4bms0kf6nicx7crjjighzrzjgfgmx5yl5v7am4v7kwhz2g"; 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.10.2"; sha256="1qdlwdhqyv1z4vhcbyqfx4iw207m76gly87pgyb85wqif4fifk0x"; depends=[]; }; +networkDynamic = derive { name="networkDynamic"; version="0.6.3"; sha256="0yb536q7v16wx491c5dmw7sf7h4f2rxs39bsdi0sknizgnmsqlv0"; depends=[network statnet_common]; }; +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]; }; +networkreporting = derive { name="networkreporting"; version="0.0.1"; sha256="1vfvx5gf90p31gy6kcv7l2ibzbfl382gffa79dl8gascbsg6s8z8"; depends=[functional ggplot2 plyr reshape2 stringr]; }; +networksis = derive { name="networksis"; version="2.1-2"; sha256="05x0mp9ig7nff1js0zv7hq8p7jr7dqscs46zlbrxrrcy1waydb0s"; depends=[ergm network]; }; +neuRosim = derive { name="neuRosim"; version="0.2-10"; sha256="1h6hhzf3rl8fnvdv8vw3lzzd23pbnv1shd9d8gpk41fgigjnxp1v"; depends=[deSolve]; }; +neural = derive { name="neural"; version="1.4.2.2"; sha256="05hrqgppgwp38rdzw86naglxj0bz3wqv04akq7f0jxbbjc6kwy4j"; depends=[]; }; +neuralnet = derive { name="neuralnet"; version="1.32"; sha256="0p9r5j8q0flv15wn5s6qi9if7npna107l1ffv37nzx1b4vgswnl9"; depends=[MASS]; }; +neuroblastoma = derive { name="neuroblastoma"; version="1.0"; sha256="0hs87fvwaq53xxbh2dw3hjsmf1zkyqli9qyacxf72fnkyhhl8b45"; depends=[]; }; +neuroim = derive { name="neuroim"; version="0.0.3"; sha256="0n5jkyvdaiigv51s5bb508w5xkh0qkd1zbs67nnms14s1664fhiz"; depends=[stringr hash iterators abind Matrix yaImpute]; }; +ngram = derive { name="ngram"; version="1.1"; sha256="0p5wm55anch1i0y3478f5d4sivs7q8j3kwlg89nk3337win06499"; depends=[]; }; +ngramr = derive { name="ngramr"; version="1.4.5"; sha256="1cqapla0lknxl669w5x3av9nr4vy9qrfznznqj22xlqaj0p53c18"; depends=[httr RCurl plyr rjson stringr reshape2 ggplot2 scales]; }; +ngspatial = derive { name="ngspatial"; version="1.0-4"; sha256="0nxqjhlgp8jx7p6mcxcb2nz7m65jkraib8ffkf90kbd8xqz42wf1"; depends=[Rcpp batchmeans Rcpp RcppArmadillo]; }; +nhlscrapr = derive { name="nhlscrapr"; version="1.8"; sha256="0y2shw3g84flh88a15czdsb62xwdqxhvzkn4kpbn0k9ddyfzxc48"; depends=[RCurl rjson biglm bitops]; }; +nice = derive { name="nice"; version="0.4"; sha256="1alq8n8pchn9v0fvwrifdisazkh519x109bqgnpgnwf79wblmnhy"; depends=[]; }; +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=[]; }; +nlme = derive { name="nlme"; version="3.1-118"; sha256="1lr78gyplxr4g0m3qpv62l4qp1b4nrhgk7lz1v3m0xd70y2l9j6c"; 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]; }; +nlmrt = derive { name="nlmrt"; version="2013-9.24"; sha256="1nqcxfgl5iplmar58015ixir2c7agdw91i0ndn2imdx0il1x2hra"; depends=[]; }; +nloptr = derive { name="nloptr"; version="1.0.4"; sha256="1cypz91z28vhvwq2rzqjrbdc6a2lvfr2g16vid2sax618q6ai089"; depends=[]; }; +nlreg = derive { name="nlreg"; version="1.2-2"; sha256="1pi7057ldiqb12kw334iavb4i92ziy1kv4amcc4d1nfsjam03jxv"; depends=[statmod survival]; }; +nlrwr = derive { name="nlrwr"; version="1.1-0"; sha256="1j9wfcjimvfhxiwxsxcp5dni70i7bj5iizd8dq3kamzp7319mryv"; depends=[alr3 car drc HydroMe lattice lmtest MASS NISTnls nlme nls2 nlstools NRAIA sandwich]; }; +nls2 = derive { name="nls2"; version="0.2"; sha256="0k46i865p6jk0jchy03jiq131pc20h9crn3hygzy305rdnqvaccq"; depends=[proto]; }; +nlsMicrobio = derive { name="nlsMicrobio"; version="0.0-1"; sha256="0676n78265z00dacmq593c9l2239ii574djm9s7i7w8jk1kdhzx2"; depends=[nlstools]; }; +nlsmsn = derive { name="nlsmsn"; version="0.0-4"; sha256="1gvpy8rq020l64bdw6n7kv354l7gwa2rgxarm6k0mqq7z21fxf58"; depends=[]; }; +nlstools = derive { name="nlstools"; version="1.0-0"; sha256="04y3yzpipr82fgafppp09fbi6invmwyalljirmmh01qnrzfimwna"; 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-8"; sha256="0nhbprhwkpnhzw6jls8y76xskfh9gq491kg8q8wnamjv3gnngfa5"; 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="0.9.3"; sha256="0pn2hbr3ab5d6f79anzgaaizsp2ymsvamcs8wc25b7xlmv5cc0y5"; depends=[picante raster ape sp vegan]; }; +noia = derive { name="noia"; version="0.96"; sha256="0f5gfb78vaj9iklj7gq3g85v78xh5izghjc7v3827jr1irfjivap"; 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]; }; +nonnest2 = derive { name="nonnest2"; version="0.1-1"; sha256="1qp7z3pr7q3cbqm3kvdw3kciz9a52r1j21gh2w2gv0wnaq5msdk3"; depends=[CompQuadForm mvtnorm sandwich]; }; +nonparaeff = derive { name="nonparaeff"; version="0.5-8"; sha256="1kkn68m7cqlzx3v539cjxw3x5a2y86lvmyv2k98s87m3yvqg0gdk"; depends=[lpSolve gdata Hmisc rms geometry psych pwt]; }; +nonrandom = derive { name="nonrandom"; version="1.42"; sha256="0icm23hw593322z41wmjkwxqknh2pa9kpzbrch7xw1mhp93sd5ll"; depends=[lme4]; }; +nontarget = derive { name="nontarget"; version="1.5"; sha256="1b9hvsm0pzaxlrl1w9n6dw7vf9474nxq9nsan00a07kd40x3rssi"; depends=[enviPat nontargetData mgcv]; }; +nontargetData = derive { name="nontargetData"; version="1.1"; sha256="07cdbpmn64sg4jfhljdcx503d55azyz58x7nkji044z3jmdryzqw"; depends=[]; }; +nopp = derive { name="nopp"; version="1.0.4"; sha256="00wn0pnqpy9xll0aa8ah45ldgk1ziw464x8zkc8iq4l2a22lgn4v"; depends=[mlogit]; }; +nor1mix = derive { name="nor1mix"; version="1.2-0"; sha256="1s92bwpwq9p0d06adclm43yqq0k7ifv8lknn1scxg8nj4g03qjhs"; depends=[]; }; +nordklimdata1 = derive { name="nordklimdata1"; version="1.0"; sha256="0l50g09c102r8fz8ks42dfywg2vh2ad8lhqi7n3gc8nhad8rapqr"; depends=[]; }; +norm = derive { name="norm"; version="1.0-9.5"; sha256="01j1h412yfjx5r4dd0w8rhlf55997spgb6zd6pawy19rgw0byp1h"; depends=[]; }; +normalp = derive { name="normalp"; version="0.6.9"; sha256="1a2m7agcnqmf69mgbkjmmp7mvpx9r4gk13x98yfkg1dyh3b48rri"; 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=[]; }; +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=[]; }; +np = derive { name="np"; version="0.60-2"; sha256="0zs1d4mmgns7s26qcplf9mlz9rkp6f9mv7abb0b9b2an23y6gmi5"; depends=[boot cubature]; }; +npRmpi = derive { name="npRmpi"; version="0.60-2"; sha256="10gify91m9jsbghdgkwjz57qn6ybj4i239caflm9vkrfxsg6yx2d"; depends=[boot cubature]; }; +nparLD = derive { name="nparLD"; version="2.1"; sha256="1asq00lv1rz3rkz1gqpi7f83p5vhzfib3m7ka1ywpf2wfbfng27n"; depends=[MASS]; }; +nparcomp = derive { name="nparcomp"; version="2.5"; sha256="0s865cqy29m5wiwndbmw3sl6m86f3zjbjr41924zd4alxkhm1wbi"; depends=[multcomp mvtnorm]; }; +npbr = derive { name="npbr"; version="1.0"; sha256="12s25vn4f0373y2ijmpam0an4p64xr3m71xgf20g5przmr77bm0a"; depends=[Rglpk Benchmarking]; }; +npcp = derive { name="npcp"; version="0.1-0"; sha256="1kkz7qnvmbbl2yfar8s23cn2jh2cqjwnrgjqw5a0wzli5ky613nl"; depends=[]; }; +npde = derive { name="npde"; version="2.0"; sha256="1cp4k7jvsw9rc6rrck902nqqjaf2c1nxjic7i9r3fd6yca1lgqb9"; depends=[mclust]; }; +nplplot = derive { name="nplplot"; version="4.5"; sha256="1dpbs0jb34gv0zj528357z1j2pwahjbp04rm7jir6qk0jhyaxxgh"; depends=[]; }; +nplr = derive { name="nplr"; version="0.1-1"; sha256="0br7flriqbig8frq0j4lxiv6i8bwgsj422faln85ga93hnlky0a1"; depends=[]; }; +npmlreg = derive { name="npmlreg"; version="0.46-1"; sha256="1gddl6diw8ix8vz7n1r4ps9cjx3q00mafpapskjk7pcz69m6hfv1"; depends=[statmod]; }; +npmv = derive { name="npmv"; version="2.1"; sha256="0ivd3wm1fmmaq8i2h0kdd11z9k1czb61ms8fj0xb5xmfy0g1rphy"; depends=[Formula ggplot2]; }; +nppbib = derive { name="nppbib"; version="1.0-0"; sha256="075jb13zckkh66jwdmdlq4d2drjcc3lkj26px3w79b91223yymf2"; depends=[]; }; +npsm = derive { name="npsm"; version="0.5"; sha256="12jq6ygp3di5rknh7izrr3bxvpn6bqnj3jhfxzf29yf0bd86hzqk"; depends=[Rfit plyr]; }; +npsp = derive { name="npsp"; version="0.3-6"; sha256="1wiv4gp3y1c26xaq8zssias3j3h8mpb6izcmcarghvnfhj32l8jb"; depends=[quadprog]; }; +npst = derive { name="npst"; version="2.0"; sha256="1y5ij3nmh9pj6p97jpx75g26sk508mznr0l67cwj381zfb77hj1n"; depends=[]; }; +nricens = derive { name="nricens"; version="1.2"; sha256="17h0vckchqlvcsa604cgbcw1akaxl30yx24x1d8201svyz9n0hhb"; depends=[survival]; }; +nsRFA = derive { name="nsRFA"; version="0.7-12"; sha256="182zshwyg0l6shb5wcwibqygxs8qmgma9c4s683za8q3f9l94aqj"; depends=[]; }; +nscancor = derive { name="nscancor"; version="0.6"; sha256="1wkk08h8yz2mzgvmq0vr30iiczpbp0304vjwxqgsa3h240m4awsm"; depends=[]; }; +nsga2R = derive { name="nsga2R"; version="1.0"; sha256="04jj0a3isfc348vg46il5x9l33cr7xawz5w0mm4pwr6djhd8nfhx"; depends=[mco]; }; +nsgp = derive { name="nsgp"; version="1.0.5"; sha256="0piajjz3r71dnjw7lwpjhbaygxcrbbxfvhf8p3n2izyr2pw5fml9"; depends=[MASS]; }; +nsprcomp = derive { name="nsprcomp"; version="0.5"; sha256="1rrjiwkpiaqlp27s5xfd6jwmmpzgxm5d7874gp33511wa0vrhnnf"; depends=[]; }; +nullabor = derive { name="nullabor"; version="0.3.0"; sha256="0bpqqn56x04kplgdlchwvi7gvs3hbc2xyza4kr8nxlj7wsh95pk3"; depends=[ggplot2 MASS plyr dplyr moments fpc]; }; +numDeriv = derive { name="numDeriv"; version="2012.9-1"; sha256="09s00a1wddpq5556mz87vdmx045rhjrx1w8f2a37m8hljghy86k9"; depends=[]; }; +numOSL = derive { name="numOSL"; version="1.7"; sha256="1hgyjjxpirgf2vmn273s861mnpyq2363kaafnkzgbcg0s08xxj1r"; depends=[]; }; +numbers = derive { name="numbers"; version="0.4-5"; sha256="0z69samkj7fvbk0wj2nbnkcw17y1sdha7hghkc7yhgkwx2z1pana"; depends=[gmp]; }; +nutshell = derive { name="nutshell"; version="2.0"; sha256="1v11g5wqyxnj29b7akl0cwa34hcqs79ijbiv735pg3df4ggyrzvm"; depends=[nutshell_bbdb nutshell_audioscrobbler]; }; +nutshell_audioscrobbler = derive { name="nutshell.audioscrobbler"; version="1.0"; sha256="10fvc5d22gnfb0bkgbww48f0vvcaja96g5gfv85kap939j11172j"; depends=[]; }; +nutshell_bbdb = derive { name="nutshell.bbdb"; version="1.0"; sha256="19c4047rjahyh6wa6kcf82pj09smskskvhka9lnpchj13br8rizw"; depends=[]; }; +nws = derive { name="nws"; version="1.7.0.1"; sha256="1fn92n6brjhh8hpvhax7211cphx2cn0rl99kjqksig6z7242c316"; depends=[]; }; +nycflights13 = derive { name="nycflights13"; version="0.1"; sha256="15bqaphxwqpdzr4bkn6qgbjb3knja5hk34qxjd6xhpjzkgfs5c0b"; depends=[]; }; +oaxaca = derive { name="oaxaca"; version="0.1"; sha256="1nhdxivmxacywxl7bjxfbs5p6lsvk55l5d5c4mvbpq3bw125a29c"; depends=[Formula ggplot2 reshape2]; }; +objectProperties = derive { name="objectProperties"; version="0.6.5"; sha256="0wn19byb1ia5gsfmdi6cj05pnlxbr3zcrjabjg3g1d7b58nz7wlh"; depends=[objectSignals objectSignals]; }; +objectSignals = derive { name="objectSignals"; version="0.10.2"; sha256="1rcgfq1i3nz2q93vv4l069f3mli1c6fd5dhhhw1p7cc4sy81008w"; depends=[]; }; +obliclus = derive { name="obliclus"; version="0.9"; sha256="000r1dx4zbgjxrfs66c1yazm0w6q2z0z1scf45g2qj5ykcm9ylma"; depends=[]; }; +oblique_tree = derive { name="oblique.tree"; version="1.1.1"; sha256="01vyc46gz7qx8fc5bg3zbhjyhnmfgjii120a915vmr38cs51qhqh"; depends=[tree glmnet nnet]; }; +obliqueRF = derive { name="obliqueRF"; version="0.3"; sha256="1bwlgv820mmpc6vg26bsdlfy2p78586i3y42hkzbw3z1fmwq3pz5"; depends=[ROCR pls mda e1071]; }; +obs_agree = derive { name="obs.agree"; version="1.0"; sha256="191xshnrncjqzwd2rdq334vsx0338q3y3k1nbm04hdaysbnla9jv"; depends=[]; }; +obsSens = derive { name="obsSens"; version="1.3"; sha256="1vfm1mzsycwkqa39vf3fcdv1s6adps9hw1rxlvl8v9kq746hcabw"; depends=[]; }; +oc = derive { name="oc"; version="0.95"; sha256="1zmy34fsqcd4rq0v72r514k6gm3jmf9a5zv4m6kj09hl89xvqsci"; depends=[pscl]; }; +occ = derive { name="occ"; version="1.0"; sha256="1gn8rg6k5lwwb6axfby7hiss5m64j2rh3hsmwwij58j5xda3jlbx"; depends=[]; }; +oce = derive { name="oce"; version="0.9-14"; sha256="03vp83504pwjk6wbx5l4s31qvxfyd3g38snvfvp8b0pvnlv8f2fh"; depends=[mapproj]; }; +ocean = derive { name="ocean"; version="0.2-4"; sha256="1554iixfbw3k6w9xh3hgbiygszqvj5ci431cfmnx48jm27h2alqg"; depends=[ncdf4 proj4]; }; +ocedata = derive { name="ocedata"; version="0.1.2"; sha256="0kic6m09a66zc5fxh9fkqk7rp3mnpf0p6i1qy2irh3bj9ccmdkvk"; depends=[]; }; +odfWeave = derive { name="odfWeave"; version="0.8.4"; sha256="1rp9j3snkkp0fqmkr6h6pxqd4cxkdfajgh4vlhpz56gr2l9j48q5"; depends=[lattice XML]; }; +odfWeave_survey = derive { name="odfWeave.survey"; version="1.0"; sha256="0cz7dxh1x4aflvfrdzhi5j64ma5s19ma8fk9q2m086j11a1dw3jn"; depends=[odfWeave survey]; }; +oem = derive { name="oem"; version="1.02.1"; sha256="0z9k0jhpp5dayyin6v8p26rgl8s983hnpsk195c9z458i7nbmrpd"; depends=[Rcpp Rcpp RcppArmadillo]; }; +okmesonet = derive { name="okmesonet"; version="0.1.4"; sha256="1fq17v1wx8hxvlk489vp6nlsx8ifs4491099zhikhn1fj7b1m346"; depends=[plyr]; }; +omd = derive { name="omd"; version="1.0"; sha256="0s1wcgivqapbkzjammga8m12gqgw113729kzfzgn02nsfzmsxspv"; depends=[]; }; +oncomodel = derive { name="oncomodel"; version="1.0"; sha256="1jyyq9znffiv7rg26mjldbwc5yi2f4f8npsd2ykhxyacb3g96fp1"; depends=[ade4]; }; +onemap = derive { name="onemap"; version="2.0-4"; sha256="00xmhm5qy0ycw0mnlyl20vfw0wxmpb36f07k0jj92c4zbpwjiygx"; depends=[tkrplot]; }; +onion = derive { name="onion"; version="1.2-4"; sha256="0x3n9mwknxjwhpdg8an0ilix5cb8dyy5fqnb6nxx7ww885k0381a"; depends=[]; }; +opefimor = derive { name="opefimor"; version="1.1"; sha256="0xv57l38wx3w67h312g5xcpi9m7ggd6crqvqjh5gddq0g1g93bjq"; depends=[]; }; +openNLP = derive { name="openNLP"; version="0.2-3"; sha256="1d609hv24sxjppxpkgfvsl7p8vsajj0ivczcjixlnrly09j9ajrh"; depends=[NLP openNLPdata rJava]; }; +openNLPdata = derive { name="openNLPdata"; version="1.5.3-1"; sha256="1a048irgv56yi2lvhpqh8vh4dl7g7zfg934qypjxg8mcdcqi820y"; depends=[rJava]; }; +openair = derive { name="openair"; version="1.0"; sha256="04swl74189ccbak0qw55gyw66v07ia0wg8xwiak81233wc0ins42"; depends=[plyr reshape2 mgcv lattice latticeExtra cluster RColorBrewer Rcpp Rcpp]; }; +opencpu = derive { name="opencpu"; version="1.4.5"; sha256="1nbrj0jqg1hjpgj7vwj5d1yqzc6h6498saib8gcmps558gj94fj8"; depends=[evaluate httpuv knitr jsonlite devtools httr brew pander openssl]; }; +openintro = derive { name="openintro"; version="1.4"; sha256="1k6pzlsrqikbri795vic9h191nf2j7v7hjybjfkrx6847c1r4iam"; depends=[]; }; +openssl = derive { name="openssl"; version="0.2"; sha256="1gryl49a6jaj5wj6alxw6jd0r07kj347jnb7gby4z8xfz2skqpvp"; 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]; }; +operator_tools = derive { name="operator.tools"; version="1.3.0"; sha256="0y5f0ifj4gaq03gm44vdvslcs7lglk1p8kq47mdc0gc1yfa6l00c"; depends=[]; }; +operators = derive { name="operators"; version="0.1-7"; sha256="1qik9ihv5blz77bzsnrslf665ndpa8vp3xldqsgvs4gr5bg5algw"; depends=[]; }; +opm = derive { name="opm"; version="1.1.0"; sha256="14sj0frjfd4a7j30zyk1fbhkpry45bjcn2k0l9jf7xc8415rbc3v"; depends=[lattice boot hwriter plotrix Ckmeans_1d_dp pkgutils yaml mgcv grofit rjson nlme DBI]; }; +opmdata = derive { name="opmdata"; version="0.7.0"; sha256="043zzp2p4cvda5rshi9s990lm5qyi6ydkmy84xanwaqvysi1cpyy"; depends=[opm]; }; +ops = derive { name="ops"; version="1.0"; sha256="0cvwyn5sz5lx8sin8w4k8ymslfl4nfaa012a9vcl2hvp4850rk25"; depends=[]; }; +optAUC = derive { name="optAUC"; version="1.0"; sha256="0j1llzqa3n7kqw3i5bb7284z0hi6s5jbjfl9zap0l7xf6hg4x1dn"; depends=[MASS]; }; +optBiomarker = derive { name="optBiomarker"; version="1.0-27"; sha256="1kkj602d4klwyd8kylawgfysg8dlp2g6j7afkppzv5x8mbhs5ji4"; depends=[rpanel rgl MASS randomForest e1071 ipred msm Matrix]; }; +optR = derive { name="optR"; version="1.1.1"; sha256="1lr5n0g21jayb27b2j8zh16f1k28avzg7k2mwyc7rjhhxv8k9w1j"; depends=[]; }; +optextras = derive { name="optextras"; version="2013-10.27"; sha256="0898dgl8div4hdhb4wyj39vak94nm2311x550b8k8ljbx0nmp9gh"; depends=[numDeriv]; }; +optiRum = derive { name="optiRum"; version="0.33"; sha256="1324wmi6b2y9whacf9883k1f86bs9gvxp46gksiga1dwab53nlhv"; depends=[data_table]; }; +optimbase = derive { name="optimbase"; version="1.0-9"; sha256="0ivz24kf3yacgq5bl3s3az1pcyhsz0cza5f8vdksy5gchwqplm8n"; depends=[Matrix]; }; +optimsimplex = derive { name="optimsimplex"; version="1.0-5"; sha256="1aiq0w2zlra3k6x4hf2rglb6bj8w25yc8djnpgm508kkrbv3cc17"; depends=[optimbase]; }; +optimx = derive { name="optimx"; version="2013.8.7"; sha256="0pbd7s02isj24npi4m1m1f008xqwzvwp3kn472wz8nmy4zrid30s"; depends=[numDeriv ucminf BB Rcgmin Rvmmin minqa setRNG dfoptim svUnit]; }; +optiscale = derive { name="optiscale"; version="1.1"; sha256="1c263w9df66m7lgvzpdfm2zwx9nj8wcdpgh5gijachr2dzffmrp2"; depends=[lattice]; }; +optmatch = derive { name="optmatch"; version="0.9-3"; sha256="16mhrhdpyqrj1g24mwc3fl0qyqq1kna8z6cj239fpbjhqb1mirjb"; depends=[digest]; }; +optparse = derive { name="optparse"; version="1.2.0"; sha256="064grlajnmbcbyhmfgx58mbbmv94sxdkxdqqww0cbi7dg441sli2"; depends=[getopt]; }; +optpart = derive { name="optpart"; version="2.1-1"; sha256="0m2nsrynqbw9sj7cp7c37grx9g20dld2f26g0xzbj16wz7whgp02"; depends=[cluster labdsv MASS plotrix]; }; +optrees = derive { name="optrees"; version="1.0"; sha256="1zqpjii8dsfs98n58qpif81ckvyxkr0661svhlbgzi19xb2vszqs"; depends=[igraph]; }; +orQA = derive { name="orQA"; version="0.2.1"; sha256="0vivjrpcbql42y078gi91kfpfdpv73j23jkiv8fpazzwzdi8ydqq"; depends=[Rcpp gtools nlme Rcpp]; }; +ora = derive { name="ora"; version="2.0-1"; sha256="0albxqma220rnrpfdq3z9cawr83q1a0zzczbbcy4nijjm4mswphy"; depends=[DBI ROracle]; }; +orca = derive { name="orca"; version="1.0"; sha256="0cqz1zmlzwdprhbxs4arjv2gx868dx47xg8jmjvzk7g2xc9prj62"; depends=[]; }; +orclus = derive { name="orclus"; version="0.2-5"; sha256="0kkxhyqjxib862npinzf3mipqg5imgscdmb5wqm8wf2j2mbislsx"; depends=[]; }; +orcutt = derive { name="orcutt"; version="1.1"; sha256="0hz7aw4jpf4l7ihj4bjnjv1m8ynr71n4l12x046qj8y7mrnl9p4k"; depends=[]; }; +ordBTL = derive { name="ordBTL"; version="0.8"; sha256="09x3zfmss4fsh3rjghgmpv8y34dnkz4mw696b3k3nvlgk55a1423"; depends=[caret VGAM wikibooks gtools]; }; +ordPens = derive { name="ordPens"; version="0.2-1"; sha256="1kcxjfr2ncnqg293ph509hpgzzn5s4ih2kd8agl335zlxcksz3fp"; depends=[grplasso mgcv RLRsim]; }; +orddom = derive { name="orddom"; version="3.1"; sha256="165axs15fvwhrp89xd87l81q3h2qjll1vrwcsap645cwvb85nwsh"; depends=[psych]; }; +orderbook = derive { name="orderbook"; version="1.03"; sha256="0dlvjrzdhhh8js4g1lvxs46q7fdxfxavxnb4nj6xlwca75i51675"; depends=[lattice hash]; }; +orderedLasso = derive { name="orderedLasso"; version="1.7"; sha256="0vrh89nrmpi8xscvambcb1y70gqqi5819a2gxh02h4pnyjn8axql"; depends=[Matrix Iso quadprog ggplot2 reshape2]; }; +ordinal = derive { name="ordinal"; version="2014.11-14"; sha256="012bpzxgqpq8b8jfi9m832pkjzr7klya0zafhgpip6hf9ihhdjps"; depends=[ucminf MASS Matrix]; }; +ordinalgmifs = derive { name="ordinalgmifs"; version="1.0.2"; sha256="1rbn2mb516hdr0chny1849m1aq0vb0vmr636b4fp914l5zh75vgi"; depends=[]; }; +ore = derive { name="ore"; version="1.0.4"; sha256="0nminl02rxlwg68zdv12aq2baagv1p06x7bgpmfq2v4a01dxmfa5"; depends=[]; }; +orientlib = derive { name="orientlib"; version="0.10.3"; sha256="1qi46hkz73b8722zc3w6wvsq1ydlk37yxn9rd1dqygqbs1svkmvv"; depends=[]; }; +orloca = derive { name="orloca"; version="4.2"; sha256="14accc5kcvvin5qav6g3rx10by00r0b8970nd09w4c09nhwyblcd"; depends=[]; }; +orloca_es = derive { name="orloca.es"; version="4.1"; sha256="0nzhg7vzfxlmryw5ijww8z2b1g9cmgcgzi3gsgigsgn4shnc2hni"; depends=[orloca]; }; +oro_dicom = derive { name="oro.dicom"; version="0.4.1"; sha256="0mxjqk7b0k4srkk5yqm21b2x67c5hyd7nwf3b1qlb9rvnfjhqyhk"; depends=[oro_nifti]; }; +oro_nifti = derive { name="oro.nifti"; version="0.4.0"; sha256="1pragzjdldzgiaj4rbx37ki0930wfxj3kvan43vijd11a8ij1g5l"; depends=[bitops]; }; +oro_pet = derive { name="oro.pet"; version="0.2.3"; sha256="06agl6rvd01h6mnilj0vl52dxw6b7b41vl6vmbvaq5qy1wmiaiz7"; depends=[oro_dicom oro_nifti]; }; +orsk = derive { name="orsk"; version="1.0-1"; sha256="155wc9sfla3717b6xmhmsmvsnh2qbzzkffhibmj4xc0pd9lwwz2v"; depends=[BB BHH2]; }; +orthogonalsplinebasis = derive { name="orthogonalsplinebasis"; version="0.1.5"; sha256="060g2z8zx5gkk8v31cs0c6v5jzkd7hc9l2syx6hmvj6przr2cxi4"; depends=[]; }; +orthopolynom = derive { name="orthopolynom"; version="1.0-5"; sha256="1gvhqx6jlh06hjmkmbsl83gri0gncrm3rkliyzyzmj75m8vz993d"; depends=[polynom]; }; +osDesign = derive { name="osDesign"; version="1.7"; sha256="0y68pnsmq4nlmfsn28306q2kxab200pirr6ha0w4himzpnw1sil3"; depends=[]; }; +osmar = derive { name="osmar"; version="1.1-7"; sha256="0q6d8nw7d580bnx66mjc282dx45zw9srczz90b520hjcli4w3i3r"; depends=[XML RCurl geosphere]; }; +ouch = derive { name="ouch"; version="2.8-4"; sha256="1kx6qjvc8zlcxihqfxs288hwwh9m05s5544w4c6m1wc02083b735"; depends=[subplex]; }; +outbreaker = derive { name="outbreaker"; version="1.1-3"; sha256="0ahkzcgicdlk6g8fd7rnni0n333wrixlfpck5wpznp4a1ny44zn4"; depends=[ape igraph adegenet]; }; +outliers = derive { name="outliers"; version="0.14"; sha256="0vcqfqmmv4yblyp3s6bd25r49pxb7hjzipiic5a82924nqfqzkmn"; depends=[]; }; +overlap = derive { name="overlap"; version="0.2.4"; sha256="1pp3fggkbhif52i5lpihy7syhq2qp56mjvsxgbgwlcfbzy27ph1c"; depends=[]; }; +oz = derive { name="oz"; version="1.0-20"; sha256="1d420606ldyw2rhl8dh5hpscvjx6vanbq0hrg81m7b6v0q5rkfri"; depends=[]; }; +p2distance = derive { name="p2distance"; version="1.0.1"; sha256="1ims8i5z5k97kjpdysgx8g7lgvnvf7amahcrssw7bk38bvbxawni"; depends=[]; }; +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]; }; +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]; }; +pa = derive { name="pa"; version="1.2-1"; sha256="1pfgzxirkb0p8f6smjlrbp1qpsh0vsvqf306cvldaj9zx8cw0q9f"; depends=[ggplot2]; }; +pacbpred = derive { name="pacbpred"; version="0.92.2"; sha256="13p405vh9rf1r5idxl5payc85vwlzcd87wm15163vc9gmil1ncsf"; depends=[]; }; +pack = derive { name="pack"; version="0.1-1"; sha256="0x4p8clwp49s2y67y7in530xwhjngnqwagf9xnyb1jp0z3myd3r7"; depends=[]; }; +packClassic = derive { name="packClassic"; version="0.5.2"; sha256="04a1sg9vx3r0sq54q9kj0kpahp6my246jy3bivgy09g5fjk0dmkj"; depends=[]; }; +packHV = derive { name="packHV"; version="1.8"; sha256="0dr2picjd7mm633vw29524f3n4jpyillpzi9cg7yc2cymxnrgvyg"; depends=[survival WriteXLS]; }; +packS4 = derive { name="packS4"; version="0.9.1"; sha256="01kkw5g3xcn9hhfglmfvwsryid0w4vw9azh6as8l8d5i1xjyp9k7"; depends=[]; }; +packdep = derive { name="packdep"; version="0.3.1"; sha256="1827h9xcvgdad9nwz9k3hi79jc33yr7dnxy4xn2frp3fdh4q81ll"; depends=[igraph]; }; +packrat = derive { name="packrat"; version="0.4.1-1"; sha256="17c91ivyrxzq1mj3yw3kxlrl0rvq2072q0ivckfxhlgl1qlpk4fx"; depends=[]; }; +paf = derive { name="paf"; version="1.0"; sha256="0wrqn67jfrjjxwcrkka6dljgi3mdk00vfjkzzcv2v7c97gx1zvwn"; depends=[survival]; }; +pairedCI = derive { name="pairedCI"; version="0.5-4"; sha256="03wf526n3bbr2ai44zwrdhbfx99pxq1nbng9wsbndrdg2ji4dar2"; depends=[]; }; +pairheatmap = derive { name="pairheatmap"; version="1.0.1"; sha256="1awmqr5n9gbqxadkblpxwcjl9hm73019bwwfwy1f006jpn050d6l"; depends=[]; }; +pairwise = derive { name="pairwise"; version="0.2.5"; sha256="0r08v95f6f2safi6c0x84v5gib5qnkv46dmi97rdb9l2xzly249b"; depends=[]; }; +pairwiseCI = derive { name="pairwiseCI"; version="0.1-22"; sha256="1lgir9gcikx8c9pd2wdsqnik9rwr4qkymcf4ndp8s491vj6cm6sa"; depends=[MCPAN coin boot mratios binMto MASS]; }; +palaeoSig = derive { name="palaeoSig"; version="1.1-2"; sha256="0f5y69zzb32zi3kdy8jpcvz3i38nmmi0d9ajs44jrq4rkhhhwq3v"; depends=[rioja vegan TeachingDemos gstat fields mapproj]; }; +paleoMAS = derive { name="paleoMAS"; version="2.0-1"; sha256="1hhb5wbj4m3ch8wnvd1zkl5bk6wa9nl6jl1dhm4z6yqkh29yn9z6"; depends=[MASS vegan lattice]; }; +paleoTS = derive { name="paleoTS"; version="0.4-4"; sha256="19acfq5z42blk6ya7sj3sprddlgvhrzb9zqpvpy4q8siqkxxrjah"; depends=[mvtnorm]; }; +paleobioDB = derive { name="paleobioDB"; version="0.3"; sha256="1vcfssi6w0m2wd2smyjxp1zf0y48y95386kkb8qdndqw99g089w8"; depends=[raster maps rjson gtools RCurl plyr scales]; }; +paleofire = derive { name="paleofire"; version="1.1.4"; sha256="16mqfsb435hp777ymk2dbsavx1dd4n07zm8xpmzqpfs8k2gdd024"; depends=[GCD rworldmap locfit gtools caTools Imap raster rgdal ggplot2 lattice RColorBrewer plyr sp pscl agricolae]; }; +paleotree = derive { name="paleotree"; version="2.2"; sha256="01gjmi4ji8356cl2ifyq8d18avmac60013xnd2rl0akycprv5l9z"; depends=[ape phangorn]; }; +palinsol = derive { name="palinsol"; version="0.92"; sha256="1jxy3qx8w1r8jwgdavf37gqjjqpizdqk218xcc7b77xi8w52vxpg"; depends=[gsl]; }; +pamm = derive { name="pamm"; version="0.7"; sha256="02py4zcymmwnlpsvha5cgc4ik8fp0gbsg86s5q7z5fl3ma3g669j"; depends=[lme4 mvtnorm gmodels]; }; +pamr = derive { name="pamr"; version="1.55"; sha256="1hy3khb0gikdr3vpjz0s245m5zang1vq8k93g7n9fq3sjfa034gd"; depends=[cluster survival]; }; +pan = derive { name="pan"; version="0.9"; sha256="1payx5bzs0hp3f176ia56y4a9pym8p4h7ap5wag2symlvprzppah"; depends=[]; }; +pander = derive { name="pander"; version="0.5.1"; sha256="0m95vnrzw9v4cq52kn3a605gbk1qd24ivh7aywhk1lh0imlk7i85"; depends=[digest Rcpp Rcpp]; }; +panelAR = derive { name="panelAR"; version="0.1"; sha256="1ka2rbl9gs65xh2y2m4aqwh5qj4szibjy101hqfmza9wmdh25gpq"; depends=[car]; }; +papeR = derive { name="papeR"; version="0.5-0"; sha256="1j366644scrsq2sjl9vip0ids97y9m6c8fyx16qlismrfcfbapyz"; depends=[car gmodels]; }; +parallelMCMCcombine = derive { name="parallelMCMCcombine"; version="1.0"; sha256="05krkd643awqhfrylq9lxr2cmgvnm1msn2x8p1l1483n2gzyklz7"; depends=[mvtnorm]; }; +parallelMap = derive { name="parallelMap"; version="1.1"; sha256="1h3im52ia29m1qv4dcvw1zxciv3v9b9fq2difg6cs9apdn0fvlz8"; depends=[BBmisc checkmate fail]; }; +parallelize_dynamic = derive { name="parallelize.dynamic"; version="0.9-1"; sha256="03zypcvk1iwkgy6dmd5bxg3h2bqvjikxrbzw676804zi6y49mhln"; depends=[]; }; +paramlink = derive { name="paramlink"; version="0.9-6"; sha256="0pazllkjbqzvl9vmpvr67lkcsd960mipcd1p1nf00y8hknrwh7qp"; depends=[kinship2 maxLik]; }; +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=[]; }; +parsedate = derive { name="parsedate"; version="1.1.1"; sha256="0mr97rw4fzg2v9dh5d4x0b76d5s56gi6zilq69yjhbx78w46apzc"; depends=[]; }; +partDSA = derive { name="partDSA"; version="0.9.5"; sha256="0zblwjzwhalcnbmgwnqxpq7ixf4xhgx9lpf0lk3krry3di537s0q"; depends=[survival]; }; +partialOR = derive { name="partialOR"; version="0.9"; sha256="02vbvln8lswysaafpxq5rxb6crp7yhlc13i42kybv8fr10jaagjj"; depends=[nnet]; }; +partitionMap = derive { name="partitionMap"; version="0.5"; sha256="0pi066xaaq0iqr0d7cncdzjd7bacmgrivc4qvhqx0y7q1vifrdjm"; depends=[randomForest]; }; +partitionMetric = derive { name="partitionMetric"; version="1.1"; sha256="1wry9d3s814yp79ayab7rzf8z5l2mwpgnrc5j7d2sac24vp4pd48"; depends=[]; }; +partitions = derive { name="partitions"; version="1.9-15"; sha256="0jgpknm4zah50w9i3fbq2f1whm4hywm2j72vxc3ignx1snx2z0gs"; depends=[gmp polynom]; }; +partsm = derive { name="partsm"; version="1.1-2"; sha256="0cv3lgkdkn97bc85iwlv9w5pmqwwwsgb717zxnbgb5mzf4xn3f3g"; depends=[]; }; +party = derive { name="party"; version="1.0-18"; sha256="034l6kxj7c0cn8zhz6fr12b6w05j2j77vbmbj8995bn2ivhzzmrp"; depends=[zoo sandwich strucchange modeltools survival coin]; }; +partykit = derive { name="partykit"; version="0.8-2"; sha256="1yygbf3kj60r1h6afl82if73mzn2pampyiicfhav6l7za93z7qzw"; depends=[survival]; }; +parviol = derive { name="parviol"; version="1.1"; sha256="1sfgic86ssd5wjf9ydss9kjd3m4jmm2d1v896sjsv8bydwymbpx3"; depends=[vioplot]; }; +pass = derive { name="pass"; version="1.0"; sha256="00dzwg2lnzmrrmzq3fyrs4axswgnsn7f62l2f2a8d8gyf8qzz3nf"; depends=[MASS lars ncvreg]; }; +pastecs = derive { name="pastecs"; version="1.3-18"; sha256="0ixlnc1psgqgm71bsf5z5j65lvr92ghpsk9f1ifm94dzjhi6d22i"; depends=[boot]; }; +pastis = derive { name="pastis"; version="0.1-2"; sha256="0211pzj3xrmqgxjpspij95kmlpa2klpicw49n6pnz2g1fapjy2bd"; depends=[caper ape]; }; +patchDVI = derive { name="patchDVI"; version="1.9.1601"; sha256="0vv1rmmd78n2r14dsl9fx25v6ym9mav557ya0aagr548wqcajf0m"; depends=[]; }; +patchPlot = derive { name="patchPlot"; version="0.1.5"; sha256="1b4k0dvvj6qwyxbqb36knyrawvy5qq8hl45pz896c9rkqhlg02bx"; depends=[datautils]; }; +pathClass = derive { name="pathClass"; version="0.9.4"; sha256="1vzmz3bml37wfxsjhkw9fip90sr1iv521ccr7nlf6xd30wavqywk"; depends=[svmpath kernlab ROCR igraph lpSolve]; }; +pathdiagram = derive { name="pathdiagram"; version="0.1.9"; sha256="1j2h9mmwfi95nwhk9214kcfpb1qrmw249mjaza7i9gijmlicraxz"; depends=[shape]; }; +pathmox = derive { name="pathmox"; version="0.2.0"; sha256="0hcllnpjjays35yngz309f1gcx9qg5z9h302kg9mhxs90470x4w0"; depends=[plspm tester]; }; +pauwels2014 = derive { name="pauwels2014"; version="1.0"; sha256="1b7whn13lgydc69kg1fhnwkxirw0nqq75cfvii0yg0j4p8r1lw42"; depends=[deSolve ggplot2]; }; +pavo = derive { name="pavo"; version="0.5-1"; sha256="189kshc5dm02qv0rm1dlcxrhvga4yhlkn3yyj3rjhmrags4rmwcb"; depends=[rgl rcdd mapproj geometry]; }; +pawacc = derive { name="pawacc"; version="1.2"; sha256="1a9dzym02rfymjqw1rnp0hri50ysdnax171x5whi5j7fmvmc9rk5"; depends=[SparseM]; }; +pbapply = derive { name="pbapply"; version="1.1-1"; sha256="1dshpnnmq1g2v223qy7pgbxydy9sqj04zwqxvzylm4mqc91ks4n2"; depends=[]; }; +pbatR = derive { name="pbatR"; version="2.2-9"; sha256="1p8rj0lzm4pp1svgy7xia2sclkngzfjbgbikq94s6v92d582wncw"; depends=[survival rootSolve]; }; +pbdBASE = derive { name="pbdBASE"; version="0.2-3"; sha256="1zfz45fnjmp8yz4nlac9q1d49gpczkl2b0rz2s33jbv5i32z3yvs"; depends=[rlecuyer pbdMPI pbdSLAP]; }; +pbdDEMO = derive { name="pbdDEMO"; version="0.2-0"; sha256="0vilri4d25mb339zsgh1zypyqxv1vzfdc8b8ivqi5yz1nrzm05gz"; depends=[rlecuyer pbdMPI pbdSLAP pbdBASE pbdDMAT]; }; +pbdDMAT = derive { name="pbdDMAT"; version="0.2-3"; sha256="18x607r0gx1nnw9p305ci5sfcxbi5zdr2b6yf9y6vqjsckicnw62"; depends=[rlecuyer pbdMPI pbdSLAP pbdBASE]; }; +pbdMPI = derive { name="pbdMPI"; version="0.2-5"; sha256="0g21zyl8dck5mxjsg4iif62ngrigj58hr8mzdvr47r1b081abzb4"; depends=[rlecuyer]; }; +pbdNCDF4 = derive { name="pbdNCDF4"; version="0.1-4"; sha256="0fd29mnbns30ck09kkh53dgj24ddrqzks4xrrk2hh1wiy7ap1h95"; depends=[]; }; +pbdPROF = derive { name="pbdPROF"; version="0.2-3"; sha256="0vk29vgsv7fhw240sagz0szg0wb649sqc05j1aj027zvz931vfl8"; depends=[ggplot2 gridExtra reshape2]; }; +pbdSLAP = derive { name="pbdSLAP"; version="0.1-9"; sha256="118fy8316p3ahshq0wcwqj20v019dgbgx9wlz7vq35zg5i2fwccw"; depends=[rlecuyer pbdMPI]; }; +pbivnorm = derive { name="pbivnorm"; version="0.5-1"; sha256="18ry0qz0ryazplv5iwdvbfngn0zv7frqp16nc2x70s0wf3izxkwr"; depends=[]; }; +pbkrtest = derive { name="pbkrtest"; version="0.4-2"; sha256="1yppp24a8rl36x6sn1jjhhgs41irbf0z5nrv454g9qwhbvfgiay5"; depends=[lme4 Matrix MASS]; }; +pbo = derive { name="pbo"; version="1.3.4"; sha256="0v522z36q48k4mx5gym564kgvhmf08fsadp8qs6amzbgkdx40yc4"; depends=[lattice]; }; +pbs = derive { name="pbs"; version="1.1"; sha256="0cpgs6k5h8y2cia01zs1p4ri8r7ljg2z4x8xcbx73s680dvnxa2w"; depends=[]; }; +pcIRT = derive { name="pcIRT"; version="0.1"; sha256="0vfbbmnp4jyrbi5d9gz1krh707aazbrqfcgc3rjrwwyjld11wyzn"; depends=[combinat]; }; +pca3d = derive { name="pca3d"; version="0.3"; sha256="01nc4p68r7bnly18q8rkhnnj6vq9mwbb5hhdcblan6nhhlzhnld0"; depends=[rgl]; }; +pcaL1 = derive { name="pcaL1"; version="1.2.1"; sha256="00jfsbhnpq5mvnmpv066w1nhz2lhv55imgbl2z7dza9b8gxb88ry"; depends=[]; }; +pcaPA = derive { name="pcaPA"; version="1.2"; sha256="1acfhv6225r0d8m45z7dlx78lmypdlh1cg4irvf8b3av0qv12g5x"; depends=[polycor ltm ggplot2 mc2d]; }; +pcaPP = derive { name="pcaPP"; version="1.9-60"; sha256="10mwgykpp05d7qsbli0pr99i6arhq5aladsbp1gnb67lasbx4fs5"; depends=[mvtnorm]; }; +pcalg = derive { name="pcalg"; version="2.0-3"; sha256="1vfrqm8hjdprsdqpik6a4zhv4yxyqyqa3dr2226qkm5ijblrcmwx"; depends=[abind igraph ggm corpcor robustbase vcd Rcpp Rcpp RcppArmadillo BH]; }; +pcg = derive { name="pcg"; version="1.1"; sha256="194j72hcp7ywq1q3dd493pwkn1fmdg647gmhxcd1jm6xgijhvv87"; depends=[]; }; +pcnetmeta = derive { name="pcnetmeta"; version="1.2"; sha256="18ha74i6azgkb8wzjgs8c55fi386a1z9n5bm1llb8mk089h2gx8j"; depends=[R2jags network runjags]; }; +pcrcoal = derive { name="pcrcoal"; version="1.1"; sha256="17mm13xpmghachiqr7v2691jk39mbfsadpg028gs3iiwmh0pksa0"; depends=[ape ggplot2 phylosim]; }; +pcse = derive { name="pcse"; version="1.9"; sha256="04vprsvcmv1ivxqrrvd1f8ifg493byncqvmr84fmc0jw5m9jrk3j"; depends=[]; }; +pdR = derive { name="pdR"; version="1.1"; sha256="1nizjvrhcg7x4cd12jvgyg4vqxcpfli64z48gw99n53gjbjnb6sq"; depends=[]; }; +pdc = derive { name="pdc"; version="1.0.2"; sha256="0d7p65rkwrh39njhszdrbv25z4jz27746y1qyhqmhkxmvkx6g1fl"; depends=[]; }; +pdfCluster = derive { name="pdfCluster"; version="1.0-2"; sha256="0kbci54dlzn736835fh18xnf2pmzqrdmwa3jim29xcnwa1r2gklb"; depends=[geometry]; }; +pdfetch = derive { name="pdfetch"; version="0.1.6"; sha256="1j3fdjnmfj84pfd5bc37ssbs83ya3ma0hj5iy1a0bg9wb5xqap13"; depends=[httr zoo xts XML lubridate jsonlite reshape2]; }; +pdist = derive { name="pdist"; version="1.2"; sha256="18nd3mgad11f2zmwcp0w3sxlch4a9y6wp8dfdyzvjn7y4b4bq0dd"; depends=[]; }; +pdmod = derive { name="pdmod"; version="1.0"; sha256="1czpaghp2lcad4j6wxswdfw0n9m0phngy966zr4fr3ciqpx3q129"; depends=[mco]; }; +peacots = derive { name="peacots"; version="1.1"; sha256="042644i8x0s4nd425lp8v1i4jspib3qxkgvprgapdhgqcp6cabk0"; depends=[]; }; +pear = derive { name="pear"; version="1.2"; sha256="1ixmyzm72s18qrfv2m8xzh5503k1q90lhddq4sp46m0q7qyxb192"; depends=[]; }; +pearson7 = derive { name="pearson7"; version="1.0"; sha256="0dz5zf3k6bwj460gna6ak7hwdrsjinhv2ckkgqrycilfsx1w5h44"; depends=[]; }; +pec = derive { name="pec"; version="2.3.7"; sha256="16mw9waz4lizac3vdcvrpnznn00h4lf9q50k02iqvmw26q4rrx81"; depends=[prodlim foreach rms survival]; }; +pedantics = derive { name="pedantics"; version="1.5"; sha256="0m5jxzkf1pf657q2klv6idnywg18ki962666nj7sfyl4rq06xhsi"; depends=[MasterBayes MCMCglmm kinship2]; }; +pedgene = derive { name="pedgene"; version="2.1"; sha256="0nmp1s0i5b4h45p3f4rvvixjz8sgv56as3c85rvv3a8xwfd1gcxq"; depends=[Matrix CompQuadForm survey kinship2]; }; +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.3-0"; sha256="1fwbs2fhi7dqnhfyc0z45sy1jpr46lymdaykapcyxsmj9a0hxhj0"; depends=[car gstat lattice latticeExtra MASS moments plyr pbapply rgeos sp spsurvey stringr VecStatGraphs2D xtable XML]; }; +pegas = derive { name="pegas"; version="0.6"; sha256="142hcc5h52sil1wp3m315y07wa6aqvx8igf2pywdz56ydwk2rwpk"; 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.97"; sha256="0jpmsc950mgnjwlbzy00zsw0xihmmml56nmlgmrxpfzaxq0657ay"; depends=[]; }; +penalized = derive { name="penalized"; version="0.9-42"; sha256="160ypgfcbdxcrgrhq99rgxl1wgn7854y64820nkvmfpc0ady7s4q"; depends=[survival survival]; }; +penalizedLDA = derive { name="penalizedLDA"; version="1.0"; sha256="1ib33l5nqmvi6qn9ykybkdpc0pp55k1b6x4vqpklzp3dgckg0lp6"; depends=[flsa]; }; +penalizedSVM = derive { name="penalizedSVM"; version="1.1"; sha256="0zc36cgcrdy4rwhg4hhhahymqfalvc5v2zmqq56ikz5blln82qvq"; depends=[e1071 MASS corpcor statmod tgp mlegp lhs]; }; +pencopula = derive { name="pencopula"; version="0.3.5"; sha256="1cy36pprbrfabk9n3x4d1xbj1vd2dda7xq3ihj2hzniwn77j63wi"; depends=[lattice fda quadprog latticeExtra]; }; +pendensity = derive { name="pendensity"; version="0.2.7"; sha256="1f7v0dqcip6mvza9h6j1ajkc6awjs0g8i07v529xn7fhygzwwccr"; depends=[lattice fda]; }; +pensim = derive { name="pensim"; version="1.2.9"; sha256="10nrnxwfs41bhybs7j6xgnx0pq3c802n9k8irngmh8iy4w3wbhrq"; depends=[penalized MASS]; }; +peperr = derive { name="peperr"; version="1.1-7"; sha256="01a6sxcmb8v2iz2xdwhdnr92k3w2vn3hr0hg9b6mkpzjf4n45q3k"; depends=[snowfall survival]; }; +peplib = derive { name="peplib"; version="1.5.1"; sha256="1bdgmwbk76ryl5gxcgf3slds92yilg9p1x1lx0hnzzwcgx99wif3"; depends=[]; }; +peptider = derive { name="peptider"; version="0.1.5"; sha256="1jlvzfm1i7yyplwgsp08x3sx07gmkv24ri8jrlkz6jspj9w90dwq"; depends=[discreteRV plyr dplyr]; }; +pequod = derive { name="pequod"; version="0.0-3"; sha256="14nag0bd2icg294y7n47c6xlw54rrdia887d2ni6achjqgwvffzh"; depends=[ggplot2 car]; }; +perARMA = derive { name="perARMA"; version="1.5"; sha256="1d9vrxv8r6qgxhaz3pv8n34c526gi5cd8w7wxy9qc914y8kplmzr"; depends=[corpcor gnm matlab Matrix signal]; }; +performanceEstimation = derive { name="performanceEstimation"; version="0.1.1"; sha256="1km2ljsy8hj9x6xr9am0f4wzihlhbyxhcss7kcxbimxvcv0a479n"; depends=[ggplot2]; }; +perm = derive { name="perm"; version="1.0-0.0"; sha256="0075awl66ynv10vypg63fcxk33qzvxddrp8mi4w08ysvimcyxijk"; depends=[]; }; +permGPU = derive { name="permGPU"; version="0.14.6"; sha256="1h01nfq8hn7i29xanma70q6s5mj83znbb2lg9x7bjgdrgj38vy2m"; depends=[RUnit foreach survival]; }; +permtest = derive { name="permtest"; version="1.2"; sha256="1sciyjs840h004zg8bwclq0j0n22anvjvx3fz62y4dzblrynhrci"; depends=[]; }; +permute = derive { name="permute"; version="0.8-3"; sha256="0zc3b3cl7q7y9pglc690ldg6p7bl7d1h7xkwnqqmvrpn7cq29rdb"; depends=[]; }; +perry = derive { name="perry"; version="0.2.0"; sha256="1lfmcq2xsxmfs7cxvhgxcsggslgjicbaks4wcjw1yjh67n559j46"; depends=[ggplot2 robustbase]; }; +persiandictionary = derive { name="persiandictionary"; version="1.0"; sha256="0rgi36ngpiax3p5zk4cdgf3463vgx7zg5wxscs2j7834yh37jwax"; depends=[]; }; +perturb = derive { name="perturb"; version="2.05"; sha256="18ydmmp8aq4rf9834dmsr4fr9r07zyn97v8a1jqz3g9njza983la"; depends=[]; }; +pesticides = derive { name="pesticides"; version="0.1"; sha256="1w180hqqav0mh9sr9djj94sf55fzh4r373a7h08a2nz9nyjpq09w"; depends=[]; }; +pez = derive { name="pez"; version="0.9-0"; sha256="088rvlgc9d7i4g5n39iymaaqzjbcrk5vh526xl6sa31yd2cr8240"; depends=[ape caper picante quantreg mvtnorm vegan PVR ade4 apTreeshape FD]; }; +pgam = derive { name="pgam"; version="0.4.12"; sha256="0vhac2mysd053bswy3xwpiz0q0qh260hziw6bygpf83vkj94qf2v"; depends=[]; }; +pgirmess = derive { name="pgirmess"; version="1.5.9"; sha256="1n58r5ghd2ppnid6787gd1n18f23pf0fk7yr3vagcqpzv4pk0wic"; depends=[boot nlme rgdal sp spdep splancs]; }; +pglm = derive { name="pglm"; version="0.1-2"; sha256="1arn2gf0bkg0s59a96hyhrm7adw66d33qs2al2s0ghln6fyk8674"; depends=[maxLik plm statmod]; }; +pgmm = derive { name="pgmm"; version="1.1"; sha256="0ajdcnxxy18ifidid4xnq9a03bsrvcbh3dh2vhviggkhq8gji1dn"; depends=[]; }; +pgs = derive { name="pgs"; version="0.4-0"; sha256="1zf5sjn662sds3h06zk5p4g71qnpwp5yhw1dkjzs1rs48pxmagrx"; depends=[gsl R2Cuba]; }; +phalen = derive { name="phalen"; version="1.0"; sha256="0awj9a48dy0azkhqkkzf82q75hrsb2yw6dgbsvlsb0a71g4wyhlr"; depends=[sqldf]; }; +phangorn = derive { name="phangorn"; version="1.99-11"; sha256="16ymrm0iifzimg7y7f7wkj2syj4mbhwxm0sx6kyw8jglx82qw7fs"; depends=[ape quadprog igraph Matrix fastmatch rgl]; }; +phaseR = derive { name="phaseR"; version="1.3"; sha256="1hwclb7lys00vc260y3z9428b5dgm7zq474i8yg0w07rxqriaq2h"; depends=[deSolve]; }; +phcfM = derive { name="phcfM"; version="1.2"; sha256="0i1vr8rmq5zs34syz2vvy8c9603ifzr9s5v2izh1fh8xhzg7655x"; depends=[coda]; }; +pheatmap = derive { name="pheatmap"; version="0.7.7"; sha256="0zj6n6cjkim20apihl943rhzxlmkmpqwh00l6h2c8z04m3pv186v"; depends=[RColorBrewer]; }; +phenability = derive { name="phenability"; version="1.0"; sha256="19vxknc0v8vz5cd748fhsndsrpggzlsiims9j7p2s6jlankkgsz9"; depends=[calibrate]; }; +phenex = derive { name="phenex"; version="1.0-7"; sha256="0q563cv9lskikf3ls0idp56lirw9gxn71rgxp9xn8an05gwdg0xr"; depends=[]; }; +phenmod = derive { name="phenmod"; version="1.2-3"; sha256="0dxwx8c7zka29fq7svrvn8bghj8jh8grbrgsw4pvavx2439cldak"; depends=[gstat RColorBrewer lattice pheno]; }; +pheno = derive { name="pheno"; version="1.6"; sha256="0xdya1g1ap7h12c6zn3apbkxr725rjhcp4gbdchkvcnwz4y9vw8c"; depends=[nlme SparseM quantreg]; }; +pheno2geno = derive { name="pheno2geno"; version="1.2.1"; sha256="0rh4fzka453i5djsyv4c0z3x6d5r7fvyvxi6x1a1806nzy7w43hj"; depends=[qtl VGAM mixtools]; }; +phenology = derive { name="phenology"; version="4.0"; sha256="04zpqvbq5qb3kr1crgj2lbnzj9hcipak2rp4qvskisg750rr8h3p"; depends=[fields zoo coda shiny]; }; +phia = derive { name="phia"; version="0.1-5"; sha256="0vkl4ccsdx72dwis2959f6w9zg584wfkn58fh2slybdyg9p8886a"; depends=[car]; }; +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=[]; }; +phonTools = derive { name="phonTools"; version="0.2-2.0"; sha256="1wd1a5506p3ny6vi9pq6yg9gbz082fxw4l3cxsplkdpqgkhryrww"; depends=[]; }; +phreeqc = derive { name="phreeqc"; version="1.0-8877"; sha256="0w529qpqrjcn619bqinkdd8f02vigiwy799h7i33p7iwbf15jvzj"; depends=[]; }; +phtt = derive { name="phtt"; version="3.1.2"; sha256="1fvvx5jilq5dlgh3qlfsjxr8jizy4k34a1g3lknfkmvn713ycp7v"; depends=[pspline]; }; +phyclust = derive { name="phyclust"; version="0.1-15"; sha256="1j643k0mjmswsvp9jyiawkjf2qhfrw6xf4s2viqv987zxif2kd7z"; depends=[ape]; }; +phyext = derive { name="phyext"; version="0.0.1"; sha256="07hmjgp4qb3x95rbgm83sh9zwhsxjl1v5rvs39m565sc0fax1qdi"; depends=[phylobase ape]; }; +phylin = derive { name="phylin"; version="1.0"; sha256="10pbs4adsyp43i89jb3xi0m55sl1w7ifmc98v74iq9p8xa15sdci"; depends=[]; }; +phyloTop = derive { name="phyloTop"; version="1.1.1"; sha256="046myyr01c4zc6sfy7r6p2vswkqqqd3w4k173gjbjazl1ims1sjs"; depends=[phylobase NHPoisson ape igraph]; }; +phylobase = derive { name="phylobase"; version="0.6.8"; sha256="0xj7x4cdfp0yadvjhdkw1ai3yd081ri4gpdg0n5g0z13cjaa6mjh"; depends=[ade4 ape Rcpp Rcpp]; }; +phyloclim = derive { name="phyloclim"; version="0.9-4"; sha256="0ngg8x192lrhd75rr6qbh72pqijbrhrpizl27q0vr6hp7n9ch3zx"; depends=[ape raster]; }; +phyloland = derive { name="phyloland"; version="1.3"; sha256="10g40m6n2s4qvnzlqcwpy3k0j7bxdp79f586jj910b8p00ymrksp"; depends=[ape]; }; +phylolm = derive { name="phylolm"; version="2.2"; sha256="1x1mi1mcq3ijbqhr0951scqzv4zza0r3fcs0hh4gpbr8z49b6d98"; depends=[ape]; }; +phylosim = derive { name="phylosim"; version="2.1.1"; sha256="0rrz5c7zl2hjalwm6m8pydikiwmiq2dybx2yhzp0ps2bcsn02lhn"; depends=[R_oo ape compoisson ggplot2 R_methodsS3]; }; +phylotools = derive { name="phylotools"; version="0.1.2"; sha256="19w7xzk6sk1g9br7vwv338nvszzh0lk5rdzf0khiywka31bbsjyb"; depends=[seqRFLP ape picante spaa fields]; }; +phyreg = derive { name="phyreg"; version="0.7"; sha256="0saynhq4yvd4x2xaljcsfmqk7da2jq3jqk26fm9qivg900z4kf35"; depends=[]; }; +phytools = derive { name="phytools"; version="0.4-31"; sha256="1dmwjkd2c16amz7v4nwyd0006kydy3snrb1wkjd69n6qnfwmr7ba"; depends=[ape maps animation clusterGeneration mnormt msm numDeriv phangorn plotrix scatterplot3d]; }; +pi0 = derive { name="pi0"; version="1.3-250"; sha256="1561zvf1hcd05iqy245c0z23mi8ypk6q3lkfldcr55cs67w4lmz6"; depends=[LowRankQP Matrix numDeriv limSolve rgl scatterplot3d Iso quadprog kernlab]; }; +picante = derive { name="picante"; version="1.6-2"; sha256="1zxpd8kh3ay6f3gdqkij1a6vnkr98dc1jib2r6br2kjyzshabcsd"; depends=[ape vegan nlme]; }; +picasso = derive { name="picasso"; version="0.3.0"; sha256="0z314akr1x2a28hh5hbb7mzkyaxsj4dfkdmx10l6gqllgk9j5qca"; depends=[lattice igraph MASS Matrix]; }; +pingr = derive { name="pingr"; version="1.1.0"; sha256="0j03qcsyckv3zh2v4m8wz8kyfl0k8qi71rm20rc0spy1s9ng7fcb"; depends=[]; }; +pipeR = derive { name="pipeR"; version="0.5"; sha256="1x761ycmnldzsvahfaz1k8qz0qnrqp54qxqaskc8zp841cbhp8bh"; depends=[]; }; +pitchRx = derive { name="pitchRx"; version="1.6"; sha256="16x152xz7vs4bwi4xh05sbj38xgqzk8g95vfm0vm5mf94qnnaa6c"; depends=[ggplot2 XML2R plyr MASS hexbin mgcv]; }; +pixmap = derive { name="pixmap"; version="0.4-11"; sha256="04klxp6jndw1bp6z40v20fbmdmdpfca2g0czmmmgbkark9s1183g"; depends=[]; }; +pkgKitten = derive { name="pkgKitten"; version="0.1.2"; sha256="0nk51c3cx9hy8dwdi7llf9k6kq8495dvy8bxjlajwiwd39jipvgs"; depends=[]; }; +pkgmaker = derive { name="pkgmaker"; version="0.22"; sha256="0vrqnd3kg6liqvpbd969jjsdx0f0rvmmxgdbwwrp6xfmdg0pib8r"; depends=[registry codetools digest stringr xtable]; }; +pkgutils = derive { name="pkgutils"; version="0.6.0"; sha256="0pi1xaamirsv1bwlwcvyd1hvdgbjbdmw3vg3krawsb34mynbrcff"; depends=[]; }; +pks = derive { name="pks"; version="0.3-0"; sha256="0lvj5kfjf8wikszz1dipwr1fw9xbhy3nx0ksqz4ln240k7fn5kcj"; depends=[sets]; }; +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]; }; +playwith = derive { name="playwith"; version="0.9-54"; sha256="1zmm8sskchim3ba3l0zqfvxnrqfmiv94a8l6slcf3if3cf9kkzal"; depends=[lattice cairoDevice gWidgetsRGtk2 RGtk2 gWidgets gridBase]; }; +plfm = derive { name="plfm"; version="1.1.1"; sha256="0vsbva2clkjn8ddinmihq1gzd8g8yjiwd11rl7xzbyabjxkp95n1"; depends=[sfsmisc abind]; }; +plgp = derive { name="plgp"; version="1.1-5"; sha256="04kxiixm6p9s42fs775lrh8112v2m7akjp78r46l0rd8fzp3zyiq"; depends=[mvtnorm tgp]; }; +plm = derive { name="plm"; version="1.4-0"; sha256="13y9s7gyrgqmnzafhn4c1zkz6gdawc8nr5nbrx0pn2mbw3fqfrjh"; depends=[Formula MASS bdsmatrix zoo nlme sandwich]; }; +plmDE = derive { name="plmDE"; version="1.0"; sha256="19xxi0zzpxcrsdrbs0hiwqgnv2aaw1q3mi586wv27zz6lfqcr9lr"; depends=[MASS R_oo]; }; +plmm = derive { name="plmm"; version="0.1-1"; sha256="1dfxd1mqqjy2mf7qc6mh4wx5ya9q8fkqgrf01apisb66xxx5zya7"; depends=[sm Formula nlme]; }; +pln = derive { name="pln"; version="0.2-1"; sha256="09zg7zwmmqpjr1j59lqsjf4blrkya9wfwddgzfm9rr5jxrzvqcv8"; depends=[]; }; +plot2groups = derive { name="plot2groups"; version="0.10"; sha256="00mp82vvx6inlc2zj2cqqnzyglrm9x9im2vrqqk8j2jn0hbgfymy"; depends=[ggplot2]; }; +plot3D = derive { name="plot3D"; version="1.0-2"; sha256="0qsrd1na4xw2bm1rzwj3asgkh7xqpyja0dxdmz41f3x58ip9wnz1"; depends=[misc3d]; }; +plot3Drgl = derive { name="plot3Drgl"; version="1.0"; sha256="109vsivif4hmw2hk3hi4y703d3snzxbr9pzhn1846imdclkl12yg"; depends=[rgl plot3D]; }; +plotGoogleMaps = derive { name="plotGoogleMaps"; version="2.1"; sha256="1hymq35va75grxsjhd8sk7x4xfqsyfk5r5i1l3drwrajl1sx8b1a"; depends=[sp spacetime rgdal maptools lattice raster]; }; +plotKML = derive { name="plotKML"; version="0.4-5"; sha256="1w8dxwx57a9lis775xis44c0s1qfzc0h9b43wygcbzndkcn1dsh7"; depends=[XML sp raster rgdal spacetime colorspace plotrix dismo aqp pixmap plyr stringr colorRamps scales gstat zoo RColorBrewer RSAGA classInt]; }; +plotMCMC = derive { name="plotMCMC"; version="2.0-0"; sha256="0i4kcx6cpqjd6i16w3i8s34siw44qigca2jbk98b9ligbi65qnqb"; depends=[coda gplots lattice]; }; +plotROC = derive { name="plotROC"; version="1.2"; sha256="0x9wpj65cr6k97irwpx0b5zhljgzdii048nmz4xansazvmh04mgj"; depends=[ggplot2 gridSVG shiny]; }; +plotSEMM = derive { name="plotSEMM"; version="2.0"; sha256="0n30m1nz9fnilbgxg5jcmx2bsscdvz5mkjkyrgx7yr3alazkaimd"; depends=[plyr shiny MplusAutomation Rcpp plotrix Rcpp]; }; +plotmo = derive { name="plotmo"; version="2.0.0"; sha256="10034lz1g21slg51hik8jagcffccva4mbly8dynr95r12wkpy2n9"; depends=[]; }; +plotpc = derive { name="plotpc"; version="1.0-2"; sha256="0z73wyhdnz5qv2jy8c0sby6sbjr1q9026h0bk2ykjkjvckggnabc"; depends=[]; }; +plotrix = derive { name="plotrix"; version="3.5-10"; sha256="1x1398cy2cji5g5jgqlw23dw9bvsmyam4r1lyha9mj0481af0zh8"; depends=[]; }; +pls = derive { name="pls"; version="2.4-3"; sha256="114ka4766x8fx0zvvr7cylky1jsy542nj6s7sb2dwv8zjhbclkhn"; depends=[]; }; +plsRbeta = derive { name="plsRbeta"; version="0.1.8"; sha256="1gfwl659pmwjkif8n1vz7ljij3r8akzrlf389qwmhy57d6lhyb6w"; depends=[mvtnorm boot Formula plsdof MASS plsRglm betareg]; }; +plsRcox = derive { name="plsRcox"; version="1.7.0"; sha256="08cnxbqgxwmvbyhp8hwa7b30bznxvj7qcpq9p8jgcfnrxwslv2k6"; depends=[survival plsRglm lars pls kernlab mixOmics risksetROC survAUC rms]; }; +plsRglm = derive { name="plsRglm"; version="1.1.0"; sha256="0bh88rdlk09hh2zaiqgpv05d5kn656ckn3g0wfzhkb445xb84pqq"; depends=[mvtnorm boot bipartite]; }; +plsdepot = derive { name="plsdepot"; version="0.1.17"; sha256="1i00wxr451xpfy6dnvcm11aqf9106jsh5hj7gpds22ysgm4iq5w4"; depends=[]; }; +plsdof = derive { name="plsdof"; version="0.2-7"; sha256="1z8z9m0nsnyy1fipzvm1srpxn3q6wjrlivmmki1f8plwkixkyc5y"; depends=[MASS]; }; +plsgenomics = derive { name="plsgenomics"; version="1.2-6"; sha256="0f0pns20hd8hfc3v9m9vb8sng8qib6cry1k49nqs9gn09hhh26w9"; depends=[MASS]; }; +plspm = derive { name="plspm"; version="0.4.1"; sha256="00ibz69vhf0x3c73khkg57mzw49c3vq20yiqdqm9cpkdr9fczn2n"; depends=[amap diagram tester turner]; }; +plugdensity = derive { name="plugdensity"; version="0.8-3"; sha256="1jdmq4kbs8yzgkf9f5dc7c8c52ia68fgavw7nsnc2hnz5ylw1qy9"; depends=[]; }; +plumbr = derive { name="plumbr"; version="0.6.9"; sha256="1avbclblqfy57pd72ximvj3zq92q1w8vszvyf6fw75j5rfwdaibk"; depends=[objectSignals]; }; +plus = derive { name="plus"; version="1.0"; sha256="1l7lvnq7vahj8m7knmr4q3wj00ar7iq89j45a2dqn2bh0qyj68ls"; depends=[]; }; +plusser = derive { name="plusser"; version="0.4-0"; sha256="1g100dh8cvn9q09j0jbkw4xmwjdp1lm4651369975fm99nrlp1j9"; depends=[RCurl RJSONIO lubridate plyr]; }; +plyr = derive { name="plyr"; version="1.8.1"; sha256="0f2an3pr7flpng9y9mmrmyh08g3nivi6gdkfnw54arn0wxhkqfcm"; depends=[Rcpp Rcpp]; }; +pmcgd = derive { name="pmcgd"; version="1.1"; sha256="1pybzvyjmzpcnxrjsas06diy3x83i1r5491s6ccyr63l56hs55d5"; depends=[mixture mnormt]; }; +pmclust = derive { name="pmclust"; version="0.1-6"; sha256="05zjx4psvk5zjmr0iwwwig990g6h04ajn5wi0xi8bqv046r47q3h"; depends=[rlecuyer pbdMPI MASS]; }; +pmg = derive { name="pmg"; version="0.9-43"; sha256="0i7d50m4w7p8ipyx2d3qmc54aiqvw0ls8igkk8s1xc7k8ympfqi6"; depends=[gWidgets gWidgetsRGtk2 proto lattice foreign MASS]; }; +pmlr = derive { name="pmlr"; version="1.0"; sha256="1z3hbw4wabpai1q8kbn77nzxqziag8y04cidlfiw7z969s4pkmgl"; depends=[]; }; +pmml = derive { name="pmml"; version="1.4.2"; sha256="0588sph67zs58knf4g3fd7c84i2yag81igr882jgbaxhfhxrpk6n"; depends=[XML survival]; }; +pmmlTransformations = derive { name="pmmlTransformations"; version="1.2.2"; sha256="1p31lakhqwk0qhb565j2sjcfsjsx0i5v8kj8779ryjyvy7717m6m"; depends=[]; }; +pmr = derive { name="pmr"; version="1.2.4"; sha256="15yrh533rj5i728nvcpjj3m5wa3jbspnfj941px3mf11h14npxpp"; depends=[]; }; +png = derive { name="png"; version="0.1-7"; sha256="0g2mcp55lvvpx4kd3mn225mpbxqcq73wy5qx8b4lyf04iybgysg2"; depends=[]; }; +pnmtrem = derive { name="pnmtrem"; version="1.3"; sha256="0053gg368sdpcw2qzydpq0c5v2cxdlwgf5k68cbw0yx41csjgvz0"; depends=[MASS]; }; +pnn = derive { name="pnn"; version="1.0.1"; sha256="1s6ib60sbdas4720hrsr5lsszsa474kfblqcalsb56c84gkl42ka"; depends=[]; }; +poLCA = derive { name="poLCA"; version="1.4.1"; sha256="0bknnndcxsnlq6z9k1vbhqiib1mlzlx4badz85kc7a3xbrdrfs9f"; depends=[scatterplot3d MASS]; }; +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=[]; }; +pointdensityP = derive { name="pointdensityP"; version="0.1"; sha256="1wa10sp0pxcjyicifz638f89b7ynsy7718qbh2p2gn66lbvjpkhr"; depends=[]; }; +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]; }; +polspline = derive { name="polspline"; version="1.1.9"; sha256="1n08dhwpf53slk1zib491kii54x9h16g3jgr2kxxpyc5xfv4yj26"; depends=[]; }; +polyCub = derive { name="polyCub"; version="0.5-1"; sha256="13l0gnzj5gs4iikcaj13nsb8ndbb7asx8ycllli61az12rc2p6yf"; 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=[]; }; +polyapost = derive { name="polyapost"; version="1.1-6"; sha256="1wk85nl2p9plnaavjdr4bqxxhjc84ynv53bh2v1rmq87jymw40b1"; depends=[boot]; }; +polyclip = derive { name="polyclip"; version="1.3-0"; sha256="05bbj4hy4h1hcb4pzg1mjp8k7k91kqq5rg2x0ns4hcs1h4zrspds"; depends=[]; }; +polycor = derive { name="polycor"; version="0.7-8"; sha256="0hvww5grl68dff23069smfk3isysyi5n2jm4qmaynrk0m3yvhxwn"; depends=[mvtnorm sfsmisc]; }; +polynom = derive { name="polynom"; version="1.3-8"; sha256="05lng88c8cwj65cav31hsrca9nbrqn5rmcz79b17issyk2j0g86p"; depends=[]; }; +polysat = derive { name="polysat"; version="1.3-3"; sha256="02h1lf1bk7hhphfdcql0rmiszp3b3mdfhqfwxj369389dg0q57bd"; depends=[]; }; +polytomous = derive { name="polytomous"; version="0.1.6"; sha256="137qcnncih1lm2wshwrznlcr0k552n0sqhiy73iwis59lg854caa"; depends=[MASS Hmisc lme4]; }; +polywog = derive { name="polywog"; version="0.4-0"; sha256="0wl9br0g4kgi3nz2fq28nsk6fw0ll0y715v4vz8lv3pvfwc7518j"; depends=[miscTools foreach Formula glmnet iterators Matrix ncvreg Rcpp stringr Rcpp]; }; +pom = derive { name="pom"; version="1.1"; sha256="02jv19apn0kmp1ric2cxajlaad2fmsz4nm4izd2c3691vzas7l83"; depends=[matrixcalc]; }; +pomp = derive { name="pomp"; version="0.53-5"; sha256="1bfb2b1fdj673b43jnq9pzh36h1hfb8dsarf1dq6pwain7dnqjyp"; depends=[subplex nloptr mvtnorm deSolve coda]; }; +pooh = derive { name="pooh"; version="0.2-1"; sha256="1h8b5zwawhvq6h29dfznnhdb33al06hkvy05dphsmycd1lsha0jm"; depends=[]; }; +popKorn = derive { name="popKorn"; version="0.3-0"; sha256="1zcl6ms7ghbcjyjgfg35h37ma8nspg15rk2ik82yalqlzxjf7kxw"; depends=[boot]; }; +popRange = derive { name="popRange"; version="1.1.3"; sha256="0kkz6va0p8zv3skaqqcpw42014d9x9x4ilx0czz91qf46h61jgb0"; depends=[findpython]; }; +popReconstruct = derive { name="popReconstruct"; version="1.0-3"; sha256="1m4gj43bzsz8y4jay0bc5mvdfwqx5agha4l2r0svm6qg8cfl4lza"; depends=[coda]; }; +popbio = derive { name="popbio"; version="2.4"; sha256="12hvxkgbr6snypplxv404sj0ass6ab9i969bb00ipy10gny1w4ww"; depends=[quadprog]; }; +popdemo = derive { name="popdemo"; version="0.1-4"; sha256="0syhmm8fnxbsdzj75y7dpahmpf453a6gwp3yljkvmfl0bfv1g1ng"; depends=[expm]; }; +popgen = derive { name="popgen"; version="1.0-3"; sha256="00rgfwmmiharfxqlpy21n3jbxwr5whzdg8psqylkjf83ls2myqzm"; depends=[cluster]; }; +popgraph = derive { name="popgraph"; version="1.4"; sha256="1z6w6vj3vl2w10hvzwmkw4d475bqcd6ys92xnn445ag6vpq0cvxq"; depends=[ggplot2 igraph MASS sp Matrix sampling]; }; +poplite = derive { name="poplite"; version="0.99.5"; sha256="0xcq5m2yhslaip3aa2s23dwp8bgi9qcdfbqd0af5bsn7kqrgwh94"; depends=[dplyr DBI igraph lazyeval RSQLite]; }; +poppr = derive { name="poppr"; version="1.1.2"; sha256="0qzqyrx8jqz9xhwq6v2ic2jm82g3csg6cs31g7hailx559axxi8i"; depends=[adegenet vegan ggplot2 phangorn ape igraph ade4 pegas reshape2]; }; +popsom = derive { name="popsom"; version="2.3"; sha256="0hdg1nx8mlpqw9aj2q08sb20frsc5jnbvqpfalf5kyvlygnhxdlc"; depends=[som fields]; }; +portes = derive { name="portes"; version="2.1-3"; sha256="0nqh6aync5igmvg7nr5inkv2cwgzd0zi6ky0vvrc3abchqsjm2ck"; depends=[]; }; +portfolio = derive { name="portfolio"; version="0.4-6"; sha256="0kaaincyzc2f4dm7n08y3vs1yd1r7pd997gf2wvfjydw7wkc5pin"; depends=[lattice nlme]; }; +portfolioSim = derive { name="portfolioSim"; version="0.2-7"; sha256="1vf46882ys06ia6gfiibxx1b1g81xrg0zzman9hvsj4iky3pwbar"; depends=[lattice portfolio]; }; +potts = derive { name="potts"; version="0.5-2"; sha256="1q4kvknxkrd8qbv8l3vmwrppgzq5bsysnqgm029lx7iys73x4fck"; depends=[]; }; +poweRlaw = derive { name="poweRlaw"; version="0.20.5"; sha256="03s4kn01q4v2wx2y5pglqycjr37076g9alp9kz915h0ckfv1i42f"; depends=[VGAM]; }; +powell = derive { name="powell"; version="1.0-0"; sha256="160i4ki3ymvq08szaxshqlz7w063493j5zqvnw6cgjmxs7y0vj8y"; depends=[]; }; +powerAnalysis = derive { name="powerAnalysis"; version="0.2"; sha256="15ff3wnn37sjkiyycgh16g7gwl3l321fbw12kv621dad5bki14jl"; depends=[]; }; +powerGWASinteraction = derive { name="powerGWASinteraction"; version="1.1.0"; sha256="08xf7dvwz2md2y8j4bjlfr5vs7y2wxssdfpkdl0h39cdrz8y1pv2"; depends=[mvtnorm pwr]; }; +powerMediation = derive { name="powerMediation"; version="0.1.7"; sha256="1nysqyz5rbpn25k1pi9g7gwiarm8ncyw5xxal972wv8c70lsn4ir"; 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=[]; }; +ppls = derive { name="ppls"; version="1.6-1"; sha256="1r3h4pf79bkzpqdvyg33nwjabsqfv7r8a4ziq2zwx5vvm7mdy7pd"; depends=[MASS]; }; +pps = derive { name="pps"; version="0.94"; sha256="0sirxpagqc2ghc01zc6q4dk691six9wkgknfbwaqxbxvda3hcmyq"; depends=[]; }; +pqantimalarials = derive { name="pqantimalarials"; version="0.2"; sha256="0azxkf1rvk9cyzr4gbp4y2vcxrxw3d4f002d5gjkvv1f4kx8faw1"; depends=[reshape2 RColorBrewer plyr shiny]; }; +prLogistic = derive { name="prLogistic"; version="1.2"; sha256="1abwz7nqkz2qbyqyr603kl9a3rkad3f4vxhck6a9kl80xrmfrj9s"; depends=[boot lme4 Hmisc]; }; +prabclus = derive { name="prabclus"; version="2.2-4"; sha256="1p4hhs002cyrmnmfc2s11zia2jcnafidmy41dl3bd8mqyq3d193z"; depends=[MASS mclust]; }; +pracma = derive { name="pracma"; version="1.7.9"; sha256="1yxahsr7sln6c6d777vs5iwa5wyp2zfyd5iq2hnqf2z05whc72ks"; depends=[]; }; +pragma = derive { name="pragma"; version="0.1.3"; sha256="1n30a346pph4d8cj4p4qx2l6fnwhkxa8yxdisx47pix376ljpjfx"; depends=[]; }; +praktikum = derive { name="praktikum"; version="0.1"; sha256="0kkydgglvqw371fxh46fi86fmdndhwq1n8qj0ynbh2gz1cn86aw1"; depends=[]; }; +prc = derive { name="prc"; version="2014.11-4"; sha256="0r4c0s80fdzc9ifbfy8aaqi7164blqgiv3vbzp9x70c4dfl3lwxx"; depends=[kyotil nlme]; }; +predfinitepop = derive { name="predfinitepop"; version="1.0"; sha256="1x5ri1kvd1rd9bjp2ygqwl68yp6hyb6aly22bs5kdwv2vn9nlq9w"; depends=[]; }; +predictmeans = derive { name="predictmeans"; version="0.99"; sha256="1qfqh21d3m0k2491hv5rl5k4v49j5089xsdk3bxicp30l512rax0"; depends=[lme4 nlme ggplot2 lattice pbkrtest plyr]; }; +predmixcor = derive { name="predmixcor"; version="1.1-1"; sha256="0v99as0dzn0lqnbbzycq9j885rgsa1cy4qgbya37bbjd01b3pykd"; depends=[]; }; +prefmod = derive { name="prefmod"; version="0.8-32"; sha256="0v5r195gzbfi6jbqz8r1x2fzj3anqxf4hxaxb9krm9rkwgphrwpi"; depends=[gnm colorspace]; }; +preseqR = derive { name="preseqR"; version="1.0.1"; sha256="0plwhgs6fgvra2w5xcjrr260fra0nl2cpsn5r1z701q7b8nbm257"; depends=[]; }; +prettyGraphs = derive { name="prettyGraphs"; version="2.1.5"; sha256="19jag5cymancxy5lvkj5mkhdbxr37pciqj4vdvmxr82mvw3d75m4"; depends=[]; }; +prettyR = derive { name="prettyR"; version="2.0-8"; sha256="1wz802mmsbm4011jskdvifm9p5vqjiq7x2cmxyvc6fi2g8s224rw"; depends=[]; }; +prettyunits = derive { name="prettyunits"; version="1.0.0"; sha256="0lh83pf30hnqcq6ppq8axlyawp0qxpym0lqq8pchh3gq8mgcdz1h"; depends=[magrittr assertthat]; }; +prevR = derive { name="prevR"; version="2.9"; sha256="1h0v52pwhrb9ib61wjqdcand5prc1h205nd2rl5qiiqcnq4xn582"; depends=[sp gstat GenKern rgdal fields]; }; +prevalence = derive { name="prevalence"; version="0.3.0"; sha256="0hg4vpw89pyx2i9za3zg666kyi016sn4jpbk2sp0s435fzqp74dp"; depends=[rjags coda]; }; +prim = derive { name="prim"; version="1.0.15"; sha256="008a8fm4as5b6j70xxwiipywhbg1wmdbgjz9r7qfnivcpfarxv7f"; depends=[rgl misc3d]; }; +primer = derive { name="primer"; version="1.0"; sha256="0vkq794a9qmz9klgzz7xz35msnmhdaq3f91lcix762wlchz6v7sg"; depends=[deSolve lattice]; }; +primerTree = derive { name="primerTree"; version="1.0.1"; sha256="068j5a2rh8f1h1y7rv2xacnvkn2darzvp1adhi3hqkmwsb3znhjk"; depends=[directlabels gridExtra ggplot2 XML ape httr lubridate plyr scales stringr foreach]; }; +princurve = derive { name="princurve"; version="1.1-12"; sha256="19fprwpfhgv6n6ann978ilwhh58qi443q25z01qzxml4b5jzsd7w"; depends=[]; }; +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]; }; +probsvm = derive { name="probsvm"; version="1.00"; sha256="1k0zysym7ncmjy9h7whwi49qsfkpxfk7chfdjrydl6hn6pscis37"; depends=[kernlab]; }; +prodlim = derive { name="prodlim"; version="1.4.5"; sha256="0p2b01i01k9qbj91sp73wg998d07cv6ppragvizz6r185m10ip35"; depends=[survival KernSmooth lava]; }; +profdpm = derive { name="profdpm"; version="3.3"; sha256="07lhjavrx4fa5950w928mfpddmmnmvdapl5n6mv49m8h3bxs4nmy"; depends=[]; }; +profileModel = derive { name="profileModel"; version="0.5-9"; sha256="1p9b9jr5842im195d60ja82pp7vbk85vs8b0r3fnf62j4b92aky9"; depends=[]; }; +profileR = derive { name="profileR"; version="0.2-1"; sha256="1hcydy7hqjac9mvbaim2g75ab1ziyvpbrkb4k21966m54zjk9kka"; depends=[ggplot2 MASS RColorBrewer reshape plyr]; }; +profr = derive { name="profr"; version="0.3.1"; sha256="1w06mm89apggy6wc273b2nsp95smajr8sf3dwshykivv7mhkxs5d"; depends=[stringr plyr]; }; +proftools = derive { name="proftools"; version="0.1-0"; sha256="1wzkrz7zr2pjw5id2sp6jdqm5pgrrh35zfwjrkr6mac22lniq4bv"; depends=[]; }; +prognosticROC = derive { name="prognosticROC"; version="0.7"; sha256="0lscsyll41hpfzihdavygdzqw9xxjp48dmy4i17qsx5h01jl1h4i"; depends=[survival]; }; +proj4 = derive { name="proj4"; version="1.0-8"; sha256="06r3lavgixrsa52d1v31laqcbw6fb9xn23akv39hvaib78diglv9"; depends=[]; }; +propOverlap = derive { name="propOverlap"; version="1.0"; sha256="0q72z9vbkpll4i3wy3fq06rz97in2cm3jjnvl6p9w8qc44zjlcyl"; depends=[]; }; +propagate = derive { name="propagate"; version="1.0-4"; sha256="18vyh4i4zlsmggfyd4w0zrznk75m84k08p1qa9crind04n5581j1"; depends=[MASS tmvtnorm Rcpp ff minpack_lm Rcpp]; }; +prospectr = derive { name="prospectr"; version="0.1.3"; sha256="18lh03xg6bgzsdsl56bjd63xdp16sqgr3s326sgifkkak8ffbv7q"; depends=[RcppArmadillo foreach iterators Rcpp Rcpp RcppArmadillo]; }; +protViz = derive { name="protViz"; version="0.2.9"; sha256="0kn2dd3za8mmb6476v3wqnymhihyavw2qsh98i4q3xdiz1g77vql"; depends=[Rcpp]; }; +proteomicdesign = derive { name="proteomicdesign"; version="2.0"; sha256="01s47pgwxy4xx10f3qmbfv59gbaj0qw017kpkpsn33s8w7ad63r0"; depends=[MASS]; }; +proteomics = derive { name="proteomics"; version="0.2"; sha256="01cd4sb79gcx8gbzl624scvjbwhgcsca1wdvvfkhsv7jfwdd2ry2"; depends=[plyr reshape2 ggplot2 foreach]; }; +protiq = derive { name="protiq"; version="1.2"; sha256="00hv6hmfba4is2q1s9h5csx42s7ry2qdmi7vasgcafp8s4fc999l"; depends=[mvtnorm]; }; +proto = derive { name="proto"; version="0.3-10"; sha256="03mvzi529y6kjcp9bkpk7zlgpcakb3iz73hca6rpjy14pyzl3nfh"; depends=[]; }; +protoclass = derive { name="protoclass"; version="1.0"; sha256="17d2m6r1shgb47v8mwdg1a7f5h29m5l7f5m0nsmv0xc90s9cpvk8"; depends=[class]; }; +protr = derive { name="protr"; version="0.4-1"; sha256="09hl9q34qsmcz6rrsp05zy9zhgjxl3hp9g8ag6501sxlk470y80x"; depends=[]; }; +proxy = derive { name="proxy"; version="0.4-13"; sha256="1lqkv2m9xryi6504mxxgw1xmvvz5qbh887ak38aqkf8cyzc10mi1"; depends=[]; }; +pryr = derive { name="pryr"; version="0.1"; sha256="1vp63v1l4myahmmbphc043x1kpmvvdhs6dr640dxi0napvkdqlq6"; depends=[stringr codetools Rcpp Rcpp]; }; +psData = derive { name="psData"; version="0.1.2"; sha256="0w8kzivqrh1b6gq803rfd10drxdwgy0cxb5sff273m6jxzak52f2"; depends=[countrycode DataCombine foreign xlsx]; }; +psbcGroup = derive { name="psbcGroup"; version="1.0"; sha256="1l28sy0jys1g3nyfls9nl9vx9b6qh405a2nhx0qgxwb24l67x56n"; depends=[bayesm LearnBayes SuppDists mvtnorm]; }; +pscl = derive { name="pscl"; version="1.4.6"; sha256="13bdmnm4g36x32r0vzzcvlgks9yx44lphvm9k80m24l45mlh7sby"; depends=[MASS lattice]; }; +psd = derive { name="psd"; version="0.4-1"; sha256="1knfpgvmhrispfvlv94rnpbrjkyggqrmng65bjdjjigq83hhzywm"; depends=[fftw RColorBrewer signal zoo]; }; +pse = derive { name="pse"; version="0.3.4"; sha256="1ni4rwskcr326x5z81hsh36nkcrpq5d7pkqh6xyh4fjm57wjwzbp"; depends=[Hmisc boot]; }; +pseudo = derive { name="pseudo"; version="1.1"; sha256="0dcx6b892cic47rwzazsbnsicpgyrbdcndr3q5s6z0j1b41lzknd"; depends=[KMsurv geepack]; }; +psgp = derive { name="psgp"; version="0.3-6"; sha256="0h9gyadfy0djj32pgwhg8vy2gfn7i7yj5nnsm6pvfypc3k71s2wf"; depends=[intamap automap gstat Rcpp RcppArmadillo]; }; +psidR = derive { name="psidR"; version="1.2"; sha256="14cpxk7z0inrpvhsdb3z6r5nrpyb4v8bv77mygxcf51rxihigzvj"; depends=[data_table RCurl foreign SAScii]; }; +pso = derive { name="pso"; version="1.0.3"; sha256="0alar695c6kc1rsvwipsrvlxc93f3sy9l0yhp0mggyqgxkkvy406"; depends=[]; }; +pspearman = derive { name="pspearman"; version="0.3-0"; sha256="1l5mqga7b5nvm6v9gbl1xsspdqsjqyhhdn4gc4qlz6ld7fqfq6cx"; depends=[]; }; +pspline = derive { name="pspline"; version="1.0-16"; sha256="170apwfv2lbf2rggzzynrf9vi2mr0y15sm4zy8djxxpzv217iaf7"; depends=[]; }; +psy = derive { name="psy"; version="1.1"; sha256="027whr670w65pf8f7x0vfk9wmadl6nn2idyi6z971069lf01wdlk"; depends=[]; }; +psych = derive { name="psych"; version="1.4.8.11"; sha256="110j5d7xdaviklf3mv9jlnli3l4n5g4mxasgxdj6kw7f66fqh634"; depends=[]; }; +psychometric = derive { name="psychometric"; version="2.2"; sha256="1b7cx6icixh8k3bv60fqxjjks23qn09vlcimqfv2x3m3nkf8p1s9"; depends=[multilevel nlme multilevel nlme]; }; +psychomix = derive { name="psychomix"; version="1.1-1"; sha256="0p3kidbsmfm09s7c3p8nlj069wcyln1cxmjmj5nj7f618c407zyf"; depends=[flexmix psychotools lattice Formula modeltools]; }; +psychotools = derive { name="psychotools"; version="0.3-0"; sha256="0iwk1sqsbilh4k80n0kh2pv44dd9fgn6zhfl94hqgm1bbrqf9qgc"; depends=[]; }; +psychotree = derive { name="psychotree"; version="0.14-0"; sha256="18kmiqqxfhc0ydqx18561j05xawrhg8gshw7hr8zh4j6ymga23fh"; depends=[partykit psychotools Formula]; }; +psyphy = derive { name="psyphy"; version="0.1-9"; sha256="1ndc6sy662wj2qfx7r97crlqjd8fdkfvfy59qmf34bcbzbg33riz"; depends=[]; }; +psytabs = derive { name="psytabs"; version="0.5"; sha256="0jcsv771ndf0fv76982rbv099ii4l55a8bj1mhgr54838ins0gg7"; depends=[psych plyr rtf R2HTML mokken lavaan semTools]; }; +pt = derive { name="pt"; version="1.0"; sha256="0hjijfmc9dip3ys8xg44w0fwvyzyjyjl9hpwm7j2nzg3plv6i1fz"; depends=[]; }; +ptinpoly = derive { name="ptinpoly"; version="2.4"; sha256="1jbj8z7lqg7w1mqdh230qjaydx2yb6ffgkc39k7dx8xl30g00i5b"; depends=[misc3d]; }; +ptw = derive { name="ptw"; version="1.0-7"; sha256="195pa6hj3y9spyc7yxfgr8alkp48a7ccnyp64r6fyjwj6ds08b64"; depends=[]; }; +pubmed_mineR = derive { name="pubmed.mineR"; version="1.0.2"; sha256="0r3n4116z3f4yf3rglq3r34qfv2qcb01hwgmzm7d7q07cx9p5lqk"; depends=[RCurl XML NCBI2R boot R2HTML]; }; +pumilioR = derive { name="pumilioR"; version="1.3"; sha256="1zmcdp978p73bh9fdshxlrzgfg18j007xgxgr439rq90bwiwva6j"; depends=[XML RCurl]; }; +pushoverr = derive { name="pushoverr"; version="0.1.4"; sha256="1qa7cajgri3dwlvbpwn244m92n3q3apl4m5420mzsa9ngnmm8hj1"; depends=[httr]; }; +pvar = derive { name="pvar"; version="2.0"; sha256="0ab6pk9iwd45vkqpa6jdwcicxq62swy732hai1gq3l8j6bbm382d"; depends=[Rcpp Rcpp]; }; +pvclass = derive { name="pvclass"; version="1.2"; sha256="099lk0x24h7g77lpr22mzpl22q2b0nr466ljgm6jcdyjbkzgx237"; depends=[Matrix]; }; +pvclust = derive { name="pvclust"; version="1.3-0"; sha256="1cm1m6ps90qn7lyi16vjnjwllzd6lmvwpipmdwnbq6zgnwjcn2iz"; depends=[]; }; +pvsR = derive { name="pvsR"; version="0.3"; sha256="1ijmqlcsc8z0aphdd3j37ci8yqsy50wnr2fwn7h8fxbyd12ax2nj"; depends=[XML nnet httr]; }; +pwr = derive { name="pwr"; version="1.1.1"; sha256="1is6kqqjf3bzsddj4advj8qcp30rz2zlqc0g98072m96nmq5ywgn"; 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.2"; sha256="1h81kw0aprrdjxhp3gz8w29fvw9lnbsna3qbngpq4kgvc1gb1nha"; 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=[]; }; +qPCR_CT = derive { name="qPCR.CT"; version="1.1"; sha256="19j41fsd2m7p2nxi2h2mj43rjxx6sz2jpf4sk0bfvl1gyj0iz3hi"; depends=[RColorBrewer]; }; +qVarSel = derive { name="qVarSel"; version="1.0"; sha256="13x2hnqjsm0ifzmqkkl9ilhykrh80q04lhlkkp06hkysmh5w9rkx"; depends=[lpSolveAPI Rcpp Rcpp]; }; +qat = derive { name="qat"; version="0.73"; sha256="1fff4sv1n3i0gfgj83sy4pygxalifdycm27hsw51r72n86049cdc"; depends=[ncdf XML gdata moments boot fields gplots]; }; +qcc = derive { name="qcc"; version="2.6"; sha256="0bsdgpsqvkz2w1qanxwx8kvrpkpzs9jgw8ml2lyqhmhqbxyg125r"; depends=[MASS]; }; +qcr = derive { name="qcr"; version="0.1-18"; sha256="16dfda3rwivsdhp7j5izzbk2rzwfabfmxgpq4kjc4h7r90n2vly2"; depends=[qcc]; }; +qdap = derive { name="qdap"; version="2.2.0"; sha256="0lbc38x4gvh6q2sb6d524ksfhpvxm8knfy85bmwbf6d3q4s0b6q4"; depends=[ggplot2 qdapDictionaries qdapRegex qdapTools RColorBrewer chron dplyr gdata gender gridExtra igraph NLP openNLP plotrix RCurl reports reshape2 scales stringdist tm venneuler wordcloud xlsx XML]; }; +qdapDictionaries = derive { name="qdapDictionaries"; version="1.0.2"; sha256="0s1dqp3hjllkvq638hvggcbfsdwks91r0ymynl7cdh7dr5pg91bc"; depends=[]; }; +qdapRegex = derive { name="qdapRegex"; version="0.1.2"; sha256="1fn6rsjh76qh4kscb43gld06bs5k3v6hkn4viccw0ixzv3x6pq7k"; depends=[stringi]; }; +qdapTools = derive { name="qdapTools"; version="1.0.3"; sha256="15ba12vk923l71lbhdhqq2pv6nqrdgm3ljsq7k818l40j7z1376a"; depends=[chron data_table RCurl]; }; +qdm = derive { name="qdm"; version="0.1-0"; sha256="0cfxyy8s5zfb7867f9xv9scq9blq2qnw68x66m7y7nqlrrff5xdr"; depends=[]; }; +qgraph = derive { name="qgraph"; version="1.2.5"; sha256="1jgjxfds28kk03qrk01r8dla4xjpbqcqdwa1ifay2vqahwlkpz65"; depends=[psych ellipse lavaan sem plyr Hmisc igraph jpeg png colorspace Matrix sna corpcor reshape2 ggplot2 glasso huge]; }; +qgtools = derive { name="qgtools"; version="1.0"; sha256="0irqfaj2qqx7n1jfc0kmfpgzqrhwwlj0qizsmya94zk9d27bcpn5"; depends=[Matrix MASS]; }; +qicharts = derive { name="qicharts"; version="0.1.1"; sha256="1aisbm9h7jdzkgnfh679wi5hfzxw1asgr62z7l51zk9yw7p7mjaw"; depends=[lattice latticeExtra]; }; +qiimer = derive { name="qiimer"; version="0.9.2"; sha256="08625hz2n7yk9zk1k9sa46n2ggbw5qs0mlqkmzyjjh3qlnb1354a"; depends=[pheatmap]; }; +qlcMatrix = derive { name="qlcMatrix"; version="0.9.2"; sha256="1d8953bj69d0nia3qh3s1djf9m7wkvfdxqd234026gh1d3qchkr2"; depends=[Matrix]; }; +qlspack = derive { name="qlspack"; version="2.2"; sha256="0b9sqvnvldhd8vymajrbql0vn70rml13jgsq5ihm6skzq5qms7y6"; depends=[geepack]; }; +qmap = derive { name="qmap"; version="1.0-3"; sha256="1c7qvmd5whi446nzssqvhz1j2mpx22nlzzdrcql84v18ry0dr18m"; depends=[fitdistrplus]; }; +qmethod = derive { name="qmethod"; version="1.2.2"; sha256="02qa8vnn5p4zqkak8m7j7n35pkn9m8y5n6g70wdmkklnmj2nzgzs"; depends=[psych GPArotation]; }; +qmrparser = derive { name="qmrparser"; version="0.1.4"; sha256="1lw8sn4qsdv4bxf5p7gnkm0vmiymyj03svbl232zyyb0fh97i7nk"; depends=[]; }; +qp = derive { name="qp"; version="0.3-2"; sha256="1964bj2ggmpaqz0rnmc2zx5hyrzawlmawz3mh046cx1pdzlsqfwh"; depends=[]; }; +qpcR = derive { name="qpcR"; version="1.4-0"; sha256="029qhncfiicb3picay5yd42g6qi0x981r6mgd67vdx71cac9fp59"; depends=[MASS minpack_lm rgl robustbase Matrix]; }; +qqman = derive { name="qqman"; version="0.1.2"; sha256="024ln79hig5ggcyc3466r6y6zx2hwy2698x65cha5zpm51kq1abs"; depends=[]; }; +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.34-17"; sha256="0i5pqsrka0s1a5ak782a0vg5852waazq11cyfhf3ck6lgqbba462"; 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]; }; +qtlhot = derive { name="qtlhot"; version="0.9.0"; sha256="1043rksqqzgmr7q03j18wxgm706prqxq9ki9b9p2dxvc62vfcfih"; depends=[qtl lattice corpcor mnormt]; }; +qtlmt = derive { name="qtlmt"; version="0.1-3"; sha256="01ql0fr2mxl8a8nd6lpig5j8vznv594ygn6bj6d31gj15r5rs8fs"; depends=[]; }; +qtlnet = derive { name="qtlnet"; version="1.3.6"; sha256="044a2p3mpp203kb85s2fr3qiyypm461lrzxkfi0hnzq44qqba169"; depends=[qtl igraph sem pcalg]; }; +qtpaint = derive { name="qtpaint"; version="0.9.0"; sha256="06yqakg134mks8q7a40f5knjpcm1k2wdzchs0ywvfpwvpwgwig01"; depends=[qtbase qtbase qtbase]; }; +qtutils = derive { name="qtutils"; version="0.1-3"; sha256="018k9v3mab1mfcjh4mv1a1iish50fwdhb51mqn17k6fyrrrv7vs5"; depends=[qtbase qtbase qtbase]; }; +quad = derive { name="quad"; version="1.0"; sha256="0fak12l19f260k0ygh6zimx8dabzsv7a9i2njw8hnfcs3ndffhv5"; depends=[PearsonDS]; }; +quadprog = derive { name="quadprog"; version="1.5-5"; sha256="0jg3r6abmhp8r9vkbhpx9ldjfw6vyl1m4c5vwlyjhk1mi03656fr"; depends=[]; }; +quadrupen = derive { name="quadrupen"; version="0.2-4"; sha256="0gs565zi5qkccr9f65smvzgq2d97p7i5inksp2492bjvqhsbagxj"; depends=[Rcpp ggplot2 Matrix reshape2 scales Rcpp RcppArmadillo]; }; +qualCI = derive { name="qualCI"; version="0.1"; sha256="09mzsy5ryyrn1gz9ahrh95cpfk7g09pmjjy0m82fh4xc7j5w6kpf"; depends=[combinat]; }; +qualV = derive { name="qualV"; version="0.3"; sha256="0cr3jlp0y83nk6i965bd6v86sl8pjx47z1y20lcygrf5cb6m4ifw"; depends=[KernSmooth]; }; +qualityTools = derive { name="qualityTools"; version="1.54"; sha256="0ylp5a49b4q4max4yz30ia7r12s4jrvqn9zx5a21qcnpinf8b932"; depends=[]; }; +quantchem = derive { name="quantchem"; version="0.13"; sha256="1ga5xa7lsk04flfp1syjzpnvj3i2ypzh1m49vq1xkdwpm6axdy8n"; depends=[MASS outliers]; }; +quantmod = derive { name="quantmod"; version="0.4-2"; sha256="02krcvm320pb4wlzq7x34a605cwlnizc42ar64i8sif49hin1agj"; depends=[xts zoo TTR]; }; +quantreg = derive { name="quantreg"; version="5.05"; sha256="07djmdlmij9add2sgdsb1p6521hlnsfmll8lqs3x0z9gmr2wyx4f"; 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]; }; +quantspec = derive { name="quantspec"; version="1.0-2"; sha256="09x3wg7msj11b5kpxbxbbhgw4v05alxaw06gyx076kdnbi9mv0bm"; depends=[quantreg abind zoo snowfall Rcpp Rcpp]; }; +questionr = derive { name="questionr"; version="0.4.2"; sha256="04s9g1njfmsnay3szfnmxw72z60mz0gp8yapwv1hi0p63rr5hv5r"; depends=[shiny highr classInt htmltools]; }; +queueing = derive { name="queueing"; version="0.2.2"; sha256="1db8w9pzy4krgcc4xahfs9aw45gvvyl6kqm1hkklw21pfc0ka09f"; depends=[]; }; +quint = derive { name="quint"; version="1.0"; sha256="19dxrssy4dw7v3s4hhhy6yilbc7zb6pvcnh3mm1z6vv5a1wfr245"; depends=[partykit Formula rpart]; }; +quipu = derive { name="quipu"; version="1.9.0"; sha256="1py1qpbwp2smr5di8b3zmzxxhchfmr5qfhqkdiqig28mcnqcmp5n"; depends=[agricolae stringr pixmap shiny xtable]; }; +qvcalc = derive { name="qvcalc"; version="0.8-8"; sha256="0xmbn6p7ryr43yf978pqpdnlxdq84v965hxbff8dviqhxwgqv4aq"; depends=[]; }; +r2d2 = derive { name="r2d2"; version="1.0-0"; sha256="1zl0b36kx49ymfks8rm33hh0z460y3cz6189zqaf0kblg3a32nsi"; depends=[KernSmooth MASS sp]; }; +r2dRue = derive { name="r2dRue"; version="1.0.4"; sha256="1apdq7zj5fhs349wm9g6y06nn33x24pg3gdp4z1frd18qlacf8z5"; depends=[rgdal sp matrixStats]; }; +r2lh = derive { name="r2lh"; version="0.7"; sha256="1kkyjv9x2klrjnaaw4a16sxdfqmpp9s5mlclzlczlqjypbf2aa6d"; depends=[]; }; +r2stl = derive { name="r2stl"; version="1.0.0"; sha256="18lvnxr40cm450s8qh09c3cnkl1hg83jhmv1gzsv6nkjrq4mj5wh"; depends=[]; }; +r4ss = derive { name="r4ss"; version="1.22.1"; sha256="1rjnglwa3i8rlzyqqr5h8yh7vglrh8zpd3829qcc1vfi4swcwwqw"; depends=[coda corpcor gplots gtools maps pso RCurl]; }; +rARPACK = derive { name="rARPACK"; version="0.7-0"; sha256="1r1ypa56wkxvll9yqr50f3x2krimi22lwyrkksf5zf6laksmiq1w"; depends=[Matrix Rcpp Rcpp RcppEigen]; }; +rAltmetric = derive { name="rAltmetric"; version="0.3"; sha256="0jq5w5yd1cps4npbm9wmrjb5vc36y89ib986ggqycd9jalmshxjd"; depends=[plyr RCurl reshape2 png ggplot2 RJSONIO]; }; +rAverage = derive { name="rAverage"; version="0.4-10"; sha256="1lyjbh068gfs5m6sncfb47p3ldysw97y02f7g7lmk6135hymfrgv"; depends=[]; }; +rAvis = derive { name="rAvis"; version="0.1.2"; sha256="0m5dl8as0vmmsd3j0z0xwcpq55yfax42fa67qn4lsnaglyqmd4lm"; depends=[stringr XML RCurl scrapeR gdata scales rgdal maptools raster sp]; }; +rBeta2009 = derive { name="rBeta2009"; version="1.0"; sha256="0ljzxlndn9ba36lh7s3k4biim2qkh2mw9c0kj22a507qbzw1vgnq"; depends=[]; }; +rCMA = derive { name="rCMA"; version="1.0.0"; sha256="16d3cdxiaq65lwbvq8wjcp89vrfdp9kwrdl2jy9fynsg0v2lasvp"; depends=[rJava]; }; +rCUR = derive { name="rCUR"; version="1.3"; sha256="1f38xbc5n91k2y88cg0sv1z2p4g5vl7v2k1024f42f7526g2p2lx"; depends=[MASS Matrix lattice]; }; +rCarto = derive { name="rCarto"; version="0.8"; sha256="08813l4xfahjyn0jv48q8f6sy402n78dqsg01192pxl2dfc2i9ry"; depends=[RColorBrewer maptools classInt]; }; +rChoiceDialogs = derive { name="rChoiceDialogs"; version="1.0.6"; sha256="0lp8amdalirpsba44aa3r31xnhmi36qb9qf8f8gdxxbarpgprsbi"; depends=[rJava]; }; +rClinicalCodes = derive { name="rClinicalCodes"; version="1.0.1"; sha256="1p4p8r2n0k8h9xdzbngb95rshjp3376f5lsx228biqmswhpkhvlf"; depends=[stringr RCurl XML rjson tm]; }; +rDNA = derive { name="rDNA"; version="1.30.1"; sha256="12h83zirv55sryc1zww97ws8kvsym1z7p7y5d4w43nam8mi3fpcd"; depends=[rJava]; }; +rDVR = derive { name="rDVR"; version="0.1.1"; sha256="19a4f9k65bd49vkn3sxkjdmcpwyawk7gwmvancvqr745gfgs0wzg"; depends=[RCurl]; }; +rEMM = derive { name="rEMM"; version="1.0-8"; sha256="1d8nwranqfvr9c0g2ny7akawgqk5hjnr1mclk87gmbmwn9iwik34"; depends=[proxy MASS clusterGeneration igraph]; }; +rFDSN = derive { name="rFDSN"; version="0.0.0"; sha256="1ffiqpdzy4ipy2aci22zkih4373ifkjkpvsrza8awhyf9fwqwdsl"; depends=[XML]; }; +rFerns = derive { name="rFerns"; version="1.0.0"; sha256="1rxqq4p1yzij6pf46l3hy00k7wqhy41zdiyqx3c57xld57dv3lfb"; depends=[]; }; +rGammaGamma = derive { name="rGammaGamma"; version="1.0.12"; sha256="1051ah6q11qkxj1my4xybbzc8xcqkxfmps8mv2his5cyfllwidbs"; depends=[gsl]; }; +rHealthDataGov = derive { name="rHealthDataGov"; version="1.0.1"; sha256="0lkjprss15yl6n9wgh79r4clip3jndly2ab1lv4iijzxnxay099d"; depends=[bit64 httr jsonlite]; }; +rHpcc = derive { name="rHpcc"; version="1.0"; sha256="0096z90mmf1j2xpb9034a5ph52m8z6n6xjh3km2vrhw63g3cpwap"; depends=[RCurl XML]; }; +rJPSGCS = derive { name="rJPSGCS"; version="0.2-6"; sha256="1x6mwy6232kjl8ssvkbamhfvxsc3rqbjsrlrprj0bprssm3pcr2g"; depends=[rJava]; }; +rJava = derive { name="rJava"; version="0.9-6"; sha256="008g6s6rcb5lnz5y2a2rs4iq85a4nl522g714s1w1r153qcc0jz0"; depends=[]; }; +rJavax = derive { name="rJavax"; version="0.3"; sha256="0sv2fjinp4wmdfvcpgm4hv8v3fkiiv84ywqyr4hz86j50ncd79km"; depends=[rJava]; }; +rJython = derive { name="rJython"; version="0.0-4"; sha256="13fpcw37cca738v9idqgi3gv9avfkfwfacxj54p2c4wyg46ghnah"; depends=[rJava rjson]; }; +rLakeAnalyzer = derive { name="rLakeAnalyzer"; version="1.4"; sha256="1qs8f4sv044bxrf45wzfj444plkcq3i61353881x8shn13h3awas"; depends=[plyr]; }; +rLindo = derive { name="rLindo"; version="8.0.1"; sha256="05qyc4wvpjgw8jxmwn2nwybi695fjn0cdilkprwmjg07c82f0q5n"; depends=[]; }; +rNOMADS = derive { name="rNOMADS"; version="2.0.4"; sha256="181f514apvdx2hyfmlpd0gdybrmm00n72vhz9zwbci039azbb582"; depends=[scrapeR stringr fields XML GEOmap MBA RCurl]; }; +rPlant = derive { name="rPlant"; version="2.7"; sha256="0gqxb49d6qzkd533s9qp75byvz66v1csdlnmh3m2zg96aw32178r"; depends=[rjson RCurl seqinr knitcitations]; }; +rPref = derive { name="rPref"; version="0.3"; sha256="1lhxbmg0f3jdlslrvh8q2sb4m89gzc2zzmqkkmamncyipi1pijpp"; 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.03"; sha256="0bgapvlx5n0984ryyh1is0w88lhxj49gcar8gkwiw455jbzx7isp"; depends=[MASS]; }; +rSymPy = derive { name="rSymPy"; version="0.2-1.1"; sha256="1mrfpyalrq8b6yicy28jsj0xy7hlawa72imsfhabwd3hrx6ld150"; depends=[rJython]; }; +rTensor = derive { name="rTensor"; version="1.2"; sha256="1qikicdi8d5yhw43660m8v587f5xzs2k2lpmbhfw037n0liivay2"; depends=[]; }; +rWBclimate = derive { name="rWBclimate"; version="0.1.3"; sha256="0vs56hx7a85pw4jx8nb8bdlr9dbkl4zdhzhqsm0505xc3qz18vxh"; depends=[ggplot2 httr plyr rgdal jsonlite reshape2 sp]; }; +rYoutheria = derive { name="rYoutheria"; version="1.0.0"; sha256="1yj66ars5a8mbv2axl6l5g7wflwz3j4mhwk3iz5w33rfhixixm9l"; depends=[plyr RJSONIO reshape2 RCurl]; }; +race = derive { name="race"; version="0.1.59"; sha256="13jprlnngribgvyr7fbg9d36i8qf3cax85n71dl71iv0y24al1cy"; depends=[]; }; +rags2ridges = derive { name="rags2ridges"; version="1.4"; sha256="1vwd39vp8xdrcz1kfsjng3lzfrfb3czsxg1kvll5d275xsrhz5ix"; depends=[igraph expm reshape ggplot2 Hmisc fdrtool snowfall]; }; +rainbow = derive { name="rainbow"; version="3.2"; sha256="043qbbyb1i7b8n3vspr6rdwlpqg3wdn31rsq3hmlahvwrfqma70n"; depends=[MASS pcaPP hdrcde cluster colorspace ks]; }; +raincpc = derive { name="raincpc"; version="0.4"; sha256="0yzpyidvf24frf82pj7rarjh0ncm5dhm0mmpsf2ycqlvp0qld10i"; depends=[SDMTools]; }; +rainfreq = derive { name="rainfreq"; version="0.2"; sha256="0ryvgfi685lpsm7lqz1rnpsapw308pjxs47nvfg1nd6vp63vq3qk"; depends=[RCurl SDMTools]; }; +ramps = derive { name="ramps"; version="0.6-12"; sha256="128lqfkgmcbcfvs210j14h54spqjcr4jdhk2rqgrwcjp5wjv209w"; depends=[coda maps Matrix nlme fields]; }; +randaes = derive { name="randaes"; version="0.3"; sha256="14803argy0xdd8mpn4v67gbp90qi2is4x6na9zw7i9pm504xji1x"; depends=[]; }; +random = derive { name="random"; version="0.2.2"; sha256="0h3vmd581i0srf9lfdgjv8kkinxf1kjg8aia0dhr5adghqvf5dck"; depends=[]; }; +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.5.5"; sha256="1n1zpcppx1x3q871ynyx083397h86zrp5c0ldbv6b4wsz6ja6lv1"; depends=[]; }; +randomGLM = derive { name="randomGLM"; version="1.02-1"; sha256="031338zxy6vqak8ibl2as0l37pa6qndln0g3i9gi4s6cvbdw3xrv"; depends=[MASS foreach doParallel]; }; +randomLCA = derive { name="randomLCA"; version="1.0-1"; sha256="0v20hqpm4l62v4g8xwhlli0254cwzqzc12r8v7kbcq3r8gd26hq4"; depends=[lattice boot fastGHQuad]; }; +randomNames = derive { name="randomNames"; version="0.0-6"; sha256="18fyxpqj6xv933nyv4s59wv7pgl4wra123qmf0fa68gk1zj9l153"; depends=[data_table]; }; +randomSurvivalForest = derive { name="randomSurvivalForest"; version="3.6.4"; sha256="1k08q43rxlz822rqzz3nvy40646764c8ds25ylsvg6daan2qzzmv"; depends=[]; }; +randomUniformForest = derive { name="randomUniformForest"; version="1.1.0"; sha256="1gjm8v5qf845122lg5fjjhkw2w5jdm4xwd57gk2rdp5cli1a92jn"; depends=[Rcpp doParallel iterators foreach ggplot2 pROC gtools cluster MASS Rcpp]; }; +randomizationInference = derive { name="randomizationInference"; version="1.0.2"; sha256="1qxl88r5xai7z4sh0xxv225fzmslrbzfgrqx1ab5zm1i1w8g55yv"; depends=[permute matrixStats]; }; +randomizeBE = derive { name="randomizeBE"; version="0.3-1"; sha256="06hj614wp9lb348qwyqgw5zk2vn0m81bkwz4jprgjd72kpy8kv1h"; depends=[]; }; +randtests = derive { name="randtests"; version="1.0"; sha256="03z3kxl4x0l91dsv65ld9kgc58z82ld1f4lk18i18dpvwcgkqk82"; depends=[]; }; +randtoolbox = derive { name="randtoolbox"; version="1.15"; sha256="02knvk0ln6x0hlpbvvpll0dnb5d7s3n6zn5kdxih792y5yihiwbh"; depends=[rngWELL]; }; +rangeMapper = derive { name="rangeMapper"; version="0.2-8"; sha256="0bxb37gy98smypjj27r3dbd0vfyvaqw2p25qv07j3isykcn2pxpn"; depends=[RSQLite rgdal sp rgeos raster maptools lattice RColorBrewer classInt]; }; +rankhazard = derive { name="rankhazard"; version="1.0"; sha256="1kylg8yjrixbv86i2ffhhn8f5shsj8kvi66k202ari0li92y7dsg"; depends=[survival]; }; +rappdirs = derive { name="rappdirs"; version="0.3"; sha256="1yjd91h1knagri5m4djal25p7925162zz5g6005h1fgcvwz3sszd"; depends=[]; }; +rapport = derive { name="rapport"; version="0.51"; sha256="1qn45nrcawr8d9pkdnpmm37dg31l28gfbnwjl62fs7y691187cqp"; depends=[lattice plyr pander yaml reshape]; }; +rapportools = derive { name="rapportools"; version="1.0"; sha256="1sgv4sc737i12arh5dc3263kjsz3dzg06qihfmrqyax94mv2d01b"; depends=[reshape plyr pander]; }; +rareGE = derive { name="rareGE"; version="0.1"; sha256="0v3a2wns77q923ilddicqzg0108f8kmfdnsff1n65icin7cfzsny"; depends=[MASS nlme survey]; }; +rareNMtests = derive { name="rareNMtests"; version="1.1"; sha256="13r2hipqsf8z9k48ha5bh53n3plw1whb7crpy8zqqkcac8444b2z"; depends=[vegan]; }; +rasclass = derive { name="rasclass"; version="0.2.1"; sha256="04g2sirxrf16xjmyn4zcci757k7sgvsjbg0qjfr5phbr1rssy9qf"; depends=[car nnet RSNNS e1071 randomForest]; }; +raster = derive { name="raster"; version="2.3-12"; sha256="13h3glha5q1j3kvms0l8lbkm1vy49w675s83fxh0fyfh4rh0lrb7"; depends=[sp]; }; +rasterVis = derive { name="rasterVis"; version="0.32"; sha256="040cg1v30ixkjkibqjpvz94wz486ffsrsnpfgzlp302xvvsmb3dk"; depends=[raster lattice latticeExtra hexbin sp zoo RColorBrewer]; }; +rateratio_test = derive { name="rateratio.test"; version="1.0-2"; sha256="1a2v12z2dr893ha80fhada1820z5ih53w4pnsss9r9xw3hi0m6k5"; depends=[]; }; +raters = derive { name="raters"; version="1.1"; sha256="0djpax59qvvqklph847wh4m2231y3zrzv2i7maq43pr8pyw9f2md"; depends=[]; }; +rationalfun = derive { name="rationalfun"; version="0.1-0"; sha256="15949vs9pdjz7426zhgqn7y87xzn79ikrpa2vyjnsid1igpyh0mp"; depends=[polynom]; }; +rattle = derive { name="rattle"; version="3.3.0"; sha256="0qjlfjpklq94ifgrywc6ldq9n7b06k4pcrkmvv9npary4pkb44bf"; depends=[]; }; +rawFasta = derive { name="rawFasta"; version="1.0.0"; sha256="0krvs8d1r8hggjg84n7g3ncdkifa3hipbma98f49kf81fzn2npip"; depends=[]; }; +rbamtools = derive { name="rbamtools"; version="2.10.0"; sha256="00y5393nac4x1vz9m5li0053cr679dj29v7ss6njgph8q27mv19c"; depends=[]; }; +rbefdata = derive { name="rbefdata"; version="0.3.5"; sha256="12mcqz0pqgwfw5fmma0gwddj4zk0hpwmrsb74dvzqvgcvpfjnv98"; depends=[XML RCurl rjson wordcloud rtematres RColorBrewer]; }; +rbenchmark = derive { name="rbenchmark"; version="1.0.0"; sha256="010fn3qwnk2k411cbqyvra1d12c3bhhl3spzm8kxffmirj4p2al9"; depends=[]; }; +rbhl = derive { name="rbhl"; version="0.1.0"; sha256="1m2n1qczhhdlv9pkmw9dlqi2wmdw8wac8d557c4rk0vnzwzgpgpi"; depends=[httr XML RJSONIO plyr]; }; +rbiouml = derive { name="rbiouml"; version="1.4"; sha256="03zpchcwq4sn8cymcrzw6r6fkxh85b8mivy42jkd0knm6i7f9aa6"; depends=[RCurl RJSONIO]; }; +rbison = derive { name="rbison"; version="0.4.3"; sha256="1d9f1p17rfxw8nzj8ffnjlpgibh6fdk8gmpizac7j2idhs6k26fw"; depends=[plyr httr mapproj ggplot2 gridExtra maptools sp dplyr jsonlite assertthat]; }; +rbitcoinchartsapi = derive { name="rbitcoinchartsapi"; version="1.0.4"; sha256="0r272jvjh3rzch8dmn4s0a5n5k6dsir7pr4qswzfvafqjdiwjajz"; depends=[RJSONIO RCurl]; }; +rbmn = derive { name="rbmn"; version="0.9-2"; sha256="1zy832y399cmfmhpyfh7vfd293fylf1ylmp8w8krkmzkmyfa80f2"; depends=[MASS]; }; +rbounds = derive { name="rbounds"; version="2.0"; sha256="19xxz5dzzh706pp9391fq4v0g1fsd442x6mqqdvhkm51a9x0ih3p"; depends=[Matching]; }; +rbugs = derive { name="rbugs"; version="0.5-9"; sha256="1kvn7x931gjpxymrz0bv50k69s1x1x9mv34vkz54sdkmi08rgb3y"; depends=[]; }; +rbundler = derive { name="rbundler"; version="0.3.7"; sha256="0wmahn59h9vqm6bq1gwnf6mvfkyhqh6xvdc5hraszn1419asy26f"; depends=[devtools]; }; +rcbalance = derive { name="rcbalance"; version="1.2"; sha256="0880bvzbnq9gak2n70iwdk6n86bn1glg67lb7fby6fhipkgfxcp2"; depends=[MASS plyr]; }; +rcdd = derive { name="rcdd"; version="1.1-8"; sha256="09bb92rp44palx9dvc9pb0gdmb1g22289xjk8p9s918lalc6i9aw"; depends=[]; }; +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.2.5"; sha256="0afgmdzs3npsy3cjz0n4msnyvhpaklbjr6jlzh3zgcp8jsjn34bp"; depends=[matlab aspace jpeg]; }; +rclinicaltrials = derive { name="rclinicaltrials"; version="1.4"; sha256="1jh4jn52hcwbycvwvfn7wb1h0r7makkli3hvxg17dbalrxky9xgq"; depends=[httr XML plyr]; }; +rcppbugs = derive { name="rcppbugs"; version="0.1.4.1"; sha256="0wb5mzw1sdrr7lc6izilv60k5v0wcvy8q31a863b63a9jvh16g8d"; depends=[Rcpp Rcpp RcppArmadillo BH]; }; +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]; }; +rdetools = derive { name="rdetools"; version="1.0"; sha256="0pkl990viv7ifr7ihgdcsww93sk2wlzp2cg931wywagfp8dijd02"; depends=[]; }; +rdrobust = derive { name="rdrobust"; version="0.70"; sha256="1zfsgzyi648v5zzbjjw01vvznws6yv30n981ljn996g4y2qy7gp4"; depends=[]; }; +rdryad = derive { name="rdryad"; version="0.1.1"; sha256="0mqpkmwkznyxj0nn1v389p741dlc66dixcvljsn2rvg0q6p75fkj"; depends=[XML RCurl OAIHarvester ape gdata plyr stringr RJSONIO]; }; +readBrukerFlexData = derive { name="readBrukerFlexData"; version="1.8.1"; sha256="14ks9dnxrgfc51l8xd05pzszimr1902pklapcghm8jxmcvahh8xm"; depends=[]; }; +readMLData = derive { name="readMLData"; version="0.9-6"; sha256="15rb8hm60fc30xgxjwxl7v5blzf02s6cb8pk0p26cgn9liiavjhb"; depends=[XML]; }; +readMzXmlData = derive { name="readMzXmlData"; version="2.8"; sha256="0x5h3dh6fkc30m6gx6pzmrxr31s80d1qgpcakspjza53qn6fjb16"; depends=[base64enc digest XML]; }; +readODS = derive { name="readODS"; version="1.4"; sha256="00xcas8y0cq3scgi9vlfkrjalphmd7bsynlzpy7izxa5w9b7x79f"; depends=[XML]; }; +readbitmap = derive { name="readbitmap"; version="0.1-4"; sha256="08fqqsdb2wsx415mnac9mzl5sr5and0zx72ablnlidqfxv8xsi9d"; depends=[bmp jpeg png]; }; +reader = derive { name="reader"; version="1.0.4"; sha256="0hfv6x80c3jlhy5pspibbpfqqik0rly399qh4b1wn5da0vrbmvs3"; depends=[NCmisc]; }; +reams = derive { name="reams"; version="0.1"; sha256="07hqi0y59kv5lg0nl75xy8n48zw03y5m71zx58aiig94bf3yl95c"; depends=[leaps mgcv]; }; +rebird = derive { name="rebird"; version="0.1.1"; sha256="0s8wmp2sghs56ppca57fjfab7wngszmy1g8rd3hiwx6br0sjidcg"; depends=[RJSONIO httr RCurl plyr]; }; +rebmix = derive { name="rebmix"; version="2.6.2"; sha256="1cib2xwxv2pzhhc1fw7dfnjmk7s8fvxpn7025fvisg0gx5533978"; 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.5"; sha256="1hyq3nxbkah9jmly9a7ykzrf72r8yyd5ra5hf6d8fcprg15h8gg2"; 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]; }; +recosystem = derive { name="recosystem"; version="0.2.4"; sha256="19d8c98wkzaxmzkg5z3ry6klcqgbcmb8ycwh52l9mvvy2k1ybkw6"; depends=[Rcpp Rcpp]; }; +redcapAPI = derive { name="redcapAPI"; version="1.1"; sha256="1wjhagb02zphnlcvmg8mil4pp3wrznrhb8h0fb6xmwwyjhfgvgwq"; depends=[chron Hmisc httr stringr]; }; +ref = derive { name="ref"; version="0.99"; sha256="0f0yz08pqpg57mcm7rh4g0rbvlcvs5fbpjkfrq7fmj850z1ixvw0"; depends=[]; }; +refGenome = derive { name="refGenome"; version="1.3.0"; sha256="121aw4w84hlhxgwlf1gh0w3ydvd8zsijrh0q7fzcwi1vdgnjb7lv"; depends=[doBy RSQLite DBI]; }; +referenceIntervals = derive { name="referenceIntervals"; version="1.1.1"; sha256="04199nxh216msaghkp66zsi96h76a7c42ldml0fm66v2vamcslg8"; depends=[boot extremevalues car outliers]; }; +refund = derive { name="refund"; version="0.1-11"; sha256="1afsxab1jivs4vj6diqh7352v98divna6az1dxsdn7lvw6cmph6y"; depends=[fda lattice boot mgcv MASS glmnet magic nlme wavethresh Matrix gamm4 matrixStats lme4 RLRsim]; }; +refund_wave = derive { name="refund.wave"; version="0.1"; sha256="1vnhg7gi5r8scwivqjwhrv72sq8asnm4whx3jk39saphdxpk5hxv"; depends=[glmnet wavethresh]; }; +regRSM = derive { name="regRSM"; version="0.4"; sha256="1rg74jqj8rw69q6my0n4alflx7mgfwng35ff72bxwjhn9ghhj347"; depends=[]; }; +registry = derive { name="registry"; version="0.2"; sha256="1ifv9sql70kylfj12cdb1j1zpk3ix728m8qj46sf1zyc5mhll01s"; depends=[]; }; +reglogit = derive { name="reglogit"; version="1.2-2"; sha256="0nq60s8l860z6nd52l6c77vamis7hl2j667gkxry0jir2pxsk4jp"; depends=[mvtnorm boot Matrix]; }; +regpro = derive { name="regpro"; version="0.1.0"; sha256="0d47ffsqx1633pmf3abi7wksyng2g71mz2z9nb2zqdak794l1n44"; depends=[denpro]; }; +regress = derive { name="regress"; version="1.3-14"; sha256="0qnks28fr8siq95iiiqyvz82cbdg14i18rj7g9rqyjhiam12fshl"; depends=[]; }; +regsubseq = derive { name="regsubseq"; version="0.12"; sha256="0879r4r8kpr8jd6a3fa9cifm7cv0sqzz8z1alkm1b2fr1625md3g"; depends=[]; }; +regtest = derive { name="regtest"; version="0.05"; sha256="1wrrpp2hvkas0yc512gya3pvd0v97pn4v51k5jxkwyd1pp68zd1q"; depends=[]; }; +rehh = derive { name="rehh"; version="1.11"; sha256="1fvcwi9ijj886aswphblkxzgivmk76gr1m3s6zqblcbybxypm5cg"; depends=[gplots]; }; +relSim = derive { name="relSim"; version="0.1-47"; sha256="13asl14f3547nl50jwrk72pbm2vx140k27gz3b38j28cpmvi03mz"; depends=[DNAtools]; }; +rela = derive { name="rela"; version="4.1"; sha256="00ksm7zh1mpd2d5c5d823id3sxj0h3x0ccg6a40fadibvr1ay3ny"; depends=[]; }; +relaimpo = derive { name="relaimpo"; version="2.2-2"; sha256="1rxjg2yw2gyshaij98w83cshxwscnq3ql7bg13n7v4nbjsi1l6zh"; depends=[MASS boot survey mitools corpcor]; }; +relations = derive { name="relations"; version="0.6-3"; sha256="1hw6g297h2az5f97q2rr3f6mb9d681wrgl9p8f2q1z3ww39b5vgw"; depends=[cluster slam sets]; }; +relax = derive { name="relax"; version="1.3.15"; sha256="0cgvxw3pmy9kx8p81bb5n5nnbn6l9hm07k6hdy7p2j2gl15xxnpq"; depends=[]; }; +relaxnet = derive { name="relaxnet"; version="0.3-2"; sha256="1l83rk7r4vkcxbfljmibzm8lzpx0vf406hv4h5cy9x0k3rz2bfh0"; depends=[glmnet]; }; +relaxo = derive { name="relaxo"; version="0.1-2"; sha256="1rzmq7q3j271s6qwwrmwidv0vxcjpgjhyiqgr6fkczkai2lbnd8x"; depends=[lars]; }; +reldist = derive { name="reldist"; version="1.6-3"; sha256="1qr2sbr0h7by6zllz23p3k136wk1i1lzn066hllw4cqhxfviaynm"; depends=[mgcv]; }; +relevent = derive { name="relevent"; version="1.0-3"; sha256="054x4kmc0h0s6a4svjqawy52sllzmaca46q6abnr5qhdzzmfh21n"; depends=[trust sna]; }; +reliaR = derive { name="reliaR"; version="0.01"; sha256="000nafjp386nzd0n57hshmjzippiha6s6c4nfrcwl059dzmi088i"; depends=[]; }; +relimp = derive { name="relimp"; version="1.0-3"; sha256="1isn2ns3qiz985wrg7992dmmqxwdq75a9yhfqnb64xhnzzpcpszq"; depends=[]; }; +relsurv = derive { name="relsurv"; version="2.0-4"; sha256="1da3sj7hks5azm18m23fh8r2g02p0nivgilayndxwwvd1i70ycrx"; depends=[survival date MASS]; }; +remMap = derive { name="remMap"; version="0.1-0"; sha256="03jbrnk8nbaj6l8g428il5h6p2sszndd2bl4rvg8347pw7cp4kk1"; 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.3.1"; sha256="1awamp0730wzpxzbdr9rhy4xb06b25xrmk2pj3h6kj75k4k7h5vs"; depends=[XML httr]; }; +repfdr = derive { name="repfdr"; version="1.1"; sha256="1k85y27k42kw5zmbrnnqb62x3djjzdm4zrvm2g4dl8ykdlnaikv9"; depends=[]; }; +replicationInterval = derive { name="replicationInterval"; version="0.2"; sha256="1hs5alhpdnhwn86wrlqhbf1cpy96hh6rffkmcpbxxpcv3fhzgz7b"; depends=[MBESS]; }; +repmis = derive { name="repmis"; version="0.3"; sha256="11z931vcz4z85w03y32zs3iyh40abnmlnkdd6h1q93b3m14k0ykj"; depends=[digest httr plyr R_cache xlsx]; }; +repolr = derive { name="repolr"; version="2.0"; sha256="10wg07sfxcxzswf3zh5sx2cm9dxjx11zymy82a4q9awnacb5gp9b"; depends=[gee]; }; +reportRx = derive { name="reportRx"; version="1.0"; sha256="0npiflql0lq8sqp6xgydxbw7xdr0zdxj1s2h4bnpmn4clc05r7m4"; depends=[reshape survival xtable aod cmprsk geoR stringr]; }; +reportr = derive { name="reportr"; version="1.1.2"; sha256="0lxnmay9vgg7dsa3scszx3v4lb6m3bv6kjl0dk7hrl7bd67azdrk"; depends=[]; }; +reports = derive { name="reports"; version="0.1.2"; sha256="14w9dlhvk4080sq03ad3dhcww7c213f8ygbnxm7kxcpk36j71yjn"; depends=[knitr knitcitations]; }; +reporttools = derive { name="reporttools"; version="1.1.1"; sha256="0cnxzq679f860z063j3pbm2c5qcaz45g73khj9rdp3if0cci8ikj"; depends=[xtable]; }; +repra = derive { name="repra"; version="0.4.2"; sha256="1djcs83z8ckpmsbyzscnysmy45z28kswzm852176b9pip21mb1w8"; depends=[data_table dplyr Rcpp reshape2 ggplot2 assertthat Rcpp]; }; +represent = derive { name="represent"; version="1.0"; sha256="0jvb40i6r1bh9ysfqwsj7s1g933d7z5fq9d618yjrqr6hbbqsvac"; depends=[]; }; +resample = derive { name="resample"; version="0.2"; sha256="1p6hyd0wi037bsz0xd9gkw28sp4nkj1zmqs9h0lzkxbspn6h0q7j"; depends=[]; }; +resemble = derive { name="resemble"; version="1.1.1"; sha256="0mz5mxm6p1drfx2s9dx35m2bnvirr8lkjjh5b4vdk9p2cdv1qkkv"; depends=[RcppArmadillo foreach iterators pls Rcpp Rcpp RcppArmadillo]; }; +reshape = derive { name="reshape"; version="0.8.5"; sha256="08jm9fb02g1fp9vmiqmc0yki6n3rnnp2ph1rk8n9lb5c1s390f4k"; depends=[plyr]; }; +reshape2 = derive { name="reshape2"; version="1.4"; sha256="0i3bim4clwyfdwwrmszsn9ga5gm4a2sh1i0jmpji3afbxc151yjp"; depends=[plyr stringr Rcpp Rcpp]; }; +reshapeGUI = derive { name="reshapeGUI"; version="0.1.0"; sha256="0kb57isws8gw0nlr6v9lg06c8000hqw0fvhfjsjyf8w6zwbbq3zs"; depends=[reshape2 plyr gWidgets gWidgetsRGtk2]; }; +restlos = derive { name="restlos"; version="0.1-3"; sha256="0lqkvxczclg7ab8n0rd8b27ycrakw3pf379n1js49fwvvvqkymdg"; depends=[som rgl geometry igraph]; }; +restorepoint = derive { name="restorepoint"; version="0.1.5"; sha256="0xmpxprirnd1yavwk3vkc0cp715d187mn0amppya7kd47iw10wsy"; depends=[]; }; +retimes = derive { name="retimes"; version="0.1-2"; sha256="019sllyfahlqnqry2gqw4w5cy4cavrqnwpwrbb25cgjpdb19raja"; depends=[]; }; +reutils = derive { name="reutils"; version="0.1.2"; sha256="0f2c6zxk6x2plq649b1ml6b112j6y8ys074pn30yw35ncg3h86fa"; depends=[assertthat RCurl XML]; }; +revealedPrefs = derive { name="revealedPrefs"; version="0.1"; sha256="1akinhrvw3rmsxircnj2ymfphsca50j2jda5v4kqcprpigf1i8j1"; depends=[Rcpp Rcpp RcppArmadillo]; }; +review = derive { name="review"; version="2.5"; sha256="0qk4n6g0hp49rjqhpipgja777namdafk6yf4kcxdld1cghdikw31"; depends=[XML Hmisc]; }; +reweight = derive { name="reweight"; version="1.2.1"; sha256="0fv7q1zb3f4vplg3b5ykb1ydwbzmiajgd1ihrxl732ll8rkkfa4v"; depends=[]; }; +rex = derive { name="rex"; version="0.2.0"; sha256="1q9dkk94w152naw1lpd2l2v08ikrfgilqx9v5z14dyqaascqbmva"; depends=[magrittr lazyeval]; }; +rexpokit = derive { name="rexpokit"; version="0.24.1"; sha256="143zi6qb0l8vbx87jf58v1zfxqmvv6x4im1knd6q4dpp9gffqs22"; depends=[SparseM Rcpp Rcpp]; }; +rfPermute = derive { name="rfPermute"; version="1.6.1"; sha256="1fpj0wjaxfqcp6z0azkmgqjsysgpm0vgg81pi6w9xs6a5nwa6wd1"; depends=[randomForest ggplot2 gridExtra]; }; +rfUtilities = derive { name="rfUtilities"; version="1.0"; sha256="020wwrbpfzi7pl6vf80gsi8qc4fqr9hsxnyj5qzab1axzdqq9hjq"; depends=[randomForest e1071]; }; +rfigshare = derive { name="rfigshare"; version="0.3.6"; sha256="1n6i5ppn3v93126gvva8sn85v1h4f7hgc43pxja9bwr1ypmzgr45"; depends=[RJSONIO httr httpuv plyr yaml ggplot2 XML]; }; +rfishbase = derive { name="rfishbase"; version="0.2-2"; sha256="09pa5zpw9rclf5pqj1wjjhdcblca9sm9xcs9ka3xfa7azj7n9ljd"; depends=[XML RCurl]; }; +rfisheries = derive { name="rfisheries"; version="0.1"; sha256="1g0h3icj7cikfkh76yff84hil23rfshlnnqmgvnfbhykyr2zmk61"; depends=[httr data_table assertthat ggplot2 rjson]; }; +rfoaas = derive { name="rfoaas"; version="0.0.4"; sha256="1p6sd197jbrccckpmpkicvdzy56a5p91mddiaw3384krqn3q3lb1"; depends=[]; }; +rfordummies = derive { name="rfordummies"; version="0.0-2"; sha256="01wbhn8wpwkwvkafx4m8l5zj2xjbvwjlzbnwkd4i7g2nrvw29wsx"; depends=[]; }; +rforensicbatwing = derive { name="rforensicbatwing"; version="1.3"; sha256="0ff4v7px4wm5rd4f4z8s4arh48hgayqjfpnni2997c92wlsq3d12"; depends=[Rcpp Rcpp]; }; +rgabriel = derive { name="rgabriel"; version="0.7"; sha256="1c6awfppm1gqg7rm3551k6wyhqvjpyidqikjisg2p2kkhmyfkyzx"; depends=[]; }; +rgam = derive { name="rgam"; version="0.6.3"; sha256="0mbyyhhyr7ijv2sq9n7g0vaxivngwf4nbb5398xpsh7fxvgw5zdw"; depends=[Rcpp Rcpp RcppArmadillo]; }; +rgauges = derive { name="rgauges"; version="0.2.0"; sha256="0p42hh32wcjcchsalpsan52kvz6nd1gw28xnydqgfzkzcqkl22dd"; depends=[ggplot2 lubridate plyr httr reshape2 gridExtra scales data_table]; }; +rgbif = derive { name="rgbif"; version="0.7.7"; sha256="074psvcpnyaqf4dhwlr9gylc9a70ksfhszpknyw52axgh3wq758c"; depends=[XML plyr ggplot2 maps httr rgeos sp data_table stringr assertthat whisker magrittr jsonlite]; }; +rgcvpack = derive { name="rgcvpack"; version="0.1-4"; sha256="1vlvw9slrra18qaizqk2xglzky0i6z3bsan85x908wrg8drss4h5"; depends=[]; }; +rgdal = derive { name="rgdal"; version="0.9-1"; sha256="1jq6z4z0q00djfmm2nsr5cn7idall5pfqp2p88ah9g24k928v3gf"; depends=[sp sp]; }; +rgenoud = derive { name="rgenoud"; version="5.7-12"; sha256="17gzkn4laylnksy8h2w8c0whcxpchsx7bwjzk1q5sfqxswclqq0g"; depends=[]; }; +rgeos = derive { name="rgeos"; version="0.3-8"; sha256="0snbfxzh700fn415li0wia94zgb0x73vwdrbrpimvz9k3y43yvp8"; depends=[sp sp]; }; +rgexf = derive { name="rgexf"; version="0.14.3.11"; sha256="16mil1csyzkaywcdrjzz5r60n4xhhinxawg30skc7d9awkf26qfa"; depends=[XML Rook igraph]; }; +rggobi = derive { name="rggobi"; version="2.1.20"; sha256="1a7l68h3m9cq14k7y96ijgh0iz3d6j4j2anxg50pykz20lnykr9g"; depends=[RGtk2]; }; +rgl = derive { name="rgl"; version="0.95.1158"; sha256="0gb2ybi452hp31llfi54kk7jc2mgagczbjj0f8rv4wbjaxxr82xx"; depends=[]; }; +rgp = derive { name="rgp"; version="0.4-1"; sha256="1p5qa46v0sli7ccyp39iysn04yvq80dy2w1hk4c80pfwrxc6n03g"; depends=[emoa]; }; +rgpui = derive { name="rgpui"; version="0.1-1"; sha256="0hp1z00n6jzi45j61hlp5qj26wpjvbzjz3nvpxvmcjdmkk3vjfyp"; depends=[rgp shiny emoa]; }; +rgr = derive { name="rgr"; version="1.1.9"; sha256="1fs8f0g1wm6virwjzlgabp1i89n8jpdiwnkvk5w1lggs36xc8q59"; depends=[MASS fastICA]; }; +rgrs = derive { name="rgrs"; version="0.3"; sha256="19whlp3i0jps4pdif03h6z79zliw4shiqh7ackhk2gwq5c28jsql"; depends=[questionr]; }; +rhosp = derive { name="rhosp"; version="1.05"; sha256="1d1a4dc8hgvjmfb21s7j19yadbi1a9qp06prd80izbhvj2hni573"; depends=[]; }; +ri = derive { name="ri"; version="0.9"; sha256="00y01n9cx95bjhdpnh7vi0xd5p6al3sxbjszbyxafn7m9mygmnhv"; depends=[]; }; +rich = derive { name="rich"; version="0.3"; sha256="122xb729xlm8gyb7b3glw4sdvrh98wh89528kcbibpx83bp3frc0"; depends=[boot vegan permute]; }; +ridge = derive { name="ridge"; version="2.1-3"; sha256="0pdmybygf730dw73a5ncl9fw3kjnnpqqkanqxi97aj9n4cfcjn7z"; depends=[]; }; +rinat = derive { name="rinat"; version="0.1.4"; sha256="1m5k1wcinm6is3mf86314scgy3xfifz7ly7il5zgqyg9jkkpywbz"; depends=[httr plyr jsonlite ggplot2 maps]; }; +rindex = derive { name="rindex"; version="0.12"; sha256="1k9zihvrp955c4lh70zjlsssviy2app8w6mv5ln4nawackbz0six"; depends=[regtest]; }; +ringbuffer = derive { name="ringbuffer"; version="1.1"; sha256="1jj6zdvqlkc30bnxapg0sjl5ci5kq76611smqc4jc8adzhzwrh3f"; depends=[]; }; +ringscale = derive { name="ringscale"; version="0.1.2"; sha256="1gnnapkvxmkfws8dw41gj9h3svy3h6mi4zv413aykg9vrmy7d3rp"; depends=[FITSio]; }; +rio = derive { name="rio"; version="0.1.2"; sha256="0h80msbj1qcc9m4408qcckw238ydqdzzgr9frlmmc7qi4dyba4i4"; depends=[stringr foreign testthat]; }; +rioja = derive { name="rioja"; version="0.8-7"; sha256="1164sxwv9wafqmprnkr9sdsd109ss8w2l1j8ir7kq8ya071k3zbl"; depends=[vegan]; }; +ripa = derive { name="ripa"; version="2.0-2"; sha256="0n1gaga0d4bb9qdlm7gksa1nwi4y28kbgwr3icwqgihf1bfb9m81"; depends=[Rcpp Rcpp]; }; +riskRegression = derive { name="riskRegression"; version="0.0.8"; sha256="0bjxwj4wrlcqkm1zf25p39h3jwf0f11zspzsk4b41axr3adlvmdw"; depends=[prodlim rms pec rms cmprsk survival]; }; +riskSimul = derive { name="riskSimul"; version="0.1"; sha256="0s2a1mn6g11m96gqscb916caj2aykcs3rkacpqcdnlyzryk1gsnb"; depends=[Runuran]; }; +risksetROC = derive { name="risksetROC"; version="1.0.4"; sha256="1fh0jf8v536qzf1v3awx3f73wykzicli4r54yg1z926ccqb4h80l"; depends=[survival MASS]; }; +rite = derive { name="rite"; version="0.3.4"; sha256="196ashcfj5p52qpnpnrkg7vxq87v7vhf1d7z40mk134gmxk2784j"; depends=[tcltk2 RCurl knitr markdown]; }; +riv = derive { name="riv"; version="2.0-4"; sha256="1c9k62plqgxcgcm2j1s26hqvgww96n6bfjz2yk7m3p2wf8gkkyam"; depends=[MASS rrcov quantreg]; }; +rivernet = derive { name="rivernet"; version="1.0"; sha256="0za5k00k9vivpq4wr1xqc4aw7mlcxhjj2b3iiip1qy13fg7bhbjm"; depends=[]; }; +riverplot = derive { name="riverplot"; version="0.3"; sha256="1x02ci6744k3lsqh53vmpmv957b5wwr1idvn16nzixvzknixryq8"; depends=[]; }; +rivervis = derive { name="rivervis"; version="0.39.4"; sha256="1al0ylmpvkxfhkv9i4j6pvrlqn13pdwmzs7s6vazmgmkl3iggav4"; depends=[]; }; +rjags = derive { name="rjags"; version="3-14"; sha256="1hfsa8jl5imk2j2qnafa5q95zn69bhvijdpvfs64vsiqsalsg7yk"; depends=[coda]; }; +rje = derive { name="rje"; version="1.9"; sha256="1dyd34z6lb0p6zmyax5dpzflgc9a4saka33mvdfcxi5pj0rnygaz"; depends=[]; }; +rjson = derive { name="rjson"; version="0.2.15"; sha256="1vzjyvf57k1fjizlk28rby65y5lsww5qnfvgnhln74qwda7hvl3p"; depends=[]; }; +rjstat = derive { name="rjstat"; version="0.2"; sha256="1ylwp6d3cc8xb8129yr49grx9vb4xyp62ig0qa7vzkbdplba2zr2"; depends=[jsonlite assertthat]; }; +rknn = derive { name="rknn"; version="1.2"; sha256="1c92cv3462f00p237fkh06hl66j912ssiav4hpc4jphvs01g30kz"; depends=[gmp]; }; +rkt = derive { name="rkt"; version="1.3"; sha256="0d82id22xac84l5iqls0mlg1g9yn4hhkmf4ln7xlp0zinmmhym9m"; depends=[]; }; +rkvo = derive { name="rkvo"; version="0.1"; sha256="0ci8jqf9nc8hb063nckxdnp0nlyr4ghby356lxm00anw44jlmw8v"; depends=[Rcpp Rcpp]; }; +rlecuyer = derive { name="rlecuyer"; version="0.3-3"; sha256="1n0vny3k5s5152y0ggz9vfn4bqay9ncbdzkw9g4703pszrbwq7xh"; depends=[]; }; +rlist = derive { name="rlist"; version="0.3-2"; sha256="11br13s7frwz9ix7lgb4qpgcnvbqrzx0l0mx5kdg4pbvlbhjd4ij"; depends=[stringdist data_table yaml jsonlite]; }; +rlme = derive { name="rlme"; version="0.4"; sha256="02683sklihj3726a90jryybf855rvbz9v3dm9z9yhb32q9bfmy34"; depends=[MASS quantreg nlme mgcv stringr magic robustbase Rcpp Rcpp]; }; +rmaf = derive { name="rmaf"; version="2.0"; sha256="00qhdfzbjvmz83nicl73yhx7w8sv6j7x928j4vd6ll79098x4y84"; depends=[]; }; +rmarkdown = derive { name="rmarkdown"; version="0.3.3"; sha256="0i3wdis931s91fzy9n2lkfslxiw7wayyfbkygl0mgs1dhldhgk4m"; depends=[knitr yaml htmltools caTools]; }; +rmatio = derive { name="rmatio"; version="0.10.0"; sha256="1p1gsv7fj14hynna4a7nnxbchd0i1db03yxah4pcz3sd3a9hqw0f"; depends=[Matrix lattice]; }; +rmeta = derive { name="rmeta"; version="2.16"; sha256="1s3n185kk0ddv8v6c7mbc7cpj6yg532r7is6pjf9vda7317rxywy"; depends=[]; }; +rmetasim = derive { name="rmetasim"; version="2.0.4"; sha256="1a3bhiybzdvgqnnyh3d31d6vdsp4mi33sv8ks9b9xd9r369npk86"; depends=[ape ade4 gtools]; }; +rmgarch = derive { name="rmgarch"; version="1.2-8"; sha256="19q35kzyzzs19b4xgslrnl8ihlx1wlmrwfdimnq8racfx0y46lm5"; depends=[rugarch Rsolnp MASS Matrix zoo xts Bessel ff shape pcaPP spd Rcpp Rcpp RcppArmadillo]; }; +rminer = derive { name="rminer"; version="1.4"; sha256="07s971fpl16l4ryrbb24zwy1xx6dwia1ms4hrcpnpz3kb8f6ydda"; depends=[kknn plotrix lattice nnet pls MASS mda rpart randomForest adabag party Cubist kernlab e1071]; }; +rmngb = derive { name="rmngb"; version="0.5-1"; sha256="0xlkf0ar14d06pxsrzakhvb0yqx13fwvlal3mwmvz4r0wg8c1vyc"; depends=[]; }; +rmongodb = derive { name="rmongodb"; version="1.8.0"; sha256="035a76ak6wi21hdvgzzbggz0qnb53rrr2wfx97ngc8ijwhw8hjh7"; depends=[jsonlite plyr]; }; +rmp = derive { name="rmp"; version="1.0"; sha256="1g0785fwjbwbj82sir3n7sg3idsjzdhrpxc7z88339cv9g4rl7ry"; depends=[]; }; +rms = derive { name="rms"; version="4.2-1"; sha256="078i2x88r8p81mz83l0nwkhh7v0zv6229rff6lgkdv4x6qbn11x0"; depends=[Hmisc survival lattice SparseM quantreg nlme rpart polspline multcomp]; }; +rms_gof = derive { name="rms.gof"; version="1.0"; sha256="1n0h3nrp11f2x70mfjxpk2f3g4vwjaf4476pjjwy49smxxlxwz82"; depends=[]; }; +rnaseqWrapper = derive { name="rnaseqWrapper"; version="1.0-1"; sha256="1fa3hmwrpccf09dlpginl31lcxpj5ypxspa0mlraynlfl5jrivch"; depends=[ecodist gplots gtools]; }; +rnbn = derive { name="rnbn"; version="1.0.0"; sha256="1f3yv8cvrwlnzyk8g5b5sg5pvp6f15mi6bhfff44d0v1m6nwnp01"; depends=[RCurl RJSONIO]; }; +rneos = derive { name="rneos"; version="0.2-7"; sha256="0vsifj6zfrdij1gjdp1dlh41cckwd04h41q30m7ard4pgyl9n7za"; depends=[RCurl XML]; }; +rngWELL = derive { name="rngWELL"; version="0.10-3"; sha256="1wijscc0s6h1ipc1r8h179y94s1bzf409xlpiyr1njaxvvvpwvw1"; depends=[]; }; +rngtools = derive { name="rngtools"; version="1.2.4"; sha256="1fcgfqrrb48z37xgy8sffx91p9irp39yqzxv7nqp1x2hnwsrh097"; depends=[pkgmaker stringr digest]; }; +rngwell19937 = derive { name="rngwell19937"; version="0.5-4"; sha256="1c6p0v673n328sdynvv780911yqxk2ayimb93k1f1h3ci915pixy"; depends=[]; }; +rnoaa = derive { name="rnoaa"; version="0.2.0"; sha256="1v1yiwzsaqk95yxxla277bfdxs397p99y17yzh8z2m2xz54pn6sh"; depends=[httr lubridate plyr ggplot2 scales sp rgdal rgeos maptools stringr XML data_table assertthat jsonlite]; }; +rnrfa = derive { name="rnrfa"; version="0.1.5"; sha256="0lpa0gmf9j9adq0p41jgayzcwg6220bihnsfqj55d217mfalbhnd"; depends=[XML2R RCurl zoo rjson rgdal sp stringr]; }; +robCompositions = derive { name="robCompositions"; version="1.9.0"; sha256="0kplw0zlszfarkhsk2hrakf649c3sl1ig8l8xhknj1v2qwkblbx2"; depends=[robustbase rrcov GGally MASS pls]; }; +robcor = derive { name="robcor"; version="0.1-6"; sha256="1hw8simv93jq8a5y79hblhqz157wr8q9dzgm0xhvvv5nkzyqkpzf"; depends=[]; }; +robeth = derive { name="robeth"; version="2.7"; sha256="03pnwd3xjb9yv8jfav0s4l9k5pgpampp15ak7z0yvkjs20rvfq3d"; depends=[]; }; +robfilter = derive { name="robfilter"; version="4.0"; sha256="1mj50531xjncg9lfidxzlyqrzwjm7pdsky88s3syspf70cjq6mg8"; depends=[robustbase MASS lattice]; }; +robumeta = derive { name="robumeta"; version="1.3"; sha256="0b4w9gv1sjcpds4i7hsqmbrc4b4x7cbv26snvzy60ng23dpyc8aq"; depends=[]; }; +robust = derive { name="robust"; version="0.4-16"; sha256="0psai9d6w7yi0wfm57cc7b2jd5i7wbk2xagrhnvhxknw0dwzf2jh"; depends=[fit_models MASS lattice robustbase rrcov]; }; +robustDA = derive { name="robustDA"; version="1.0"; sha256="0yp18kskj46jfhkrn96nsf9a5dw0vy52h5m23w4xrln8b6l9g978"; depends=[MASS mclust Rsolnp]; }; +robustHD = derive { name="robustHD"; version="0.5.0"; sha256="14ql2k5880lbwkv1acydrli6jyh6dls32jjhimbz82zzkzfk2cxr"; depends=[ggplot2 perry robustbase MASS Rcpp RcppArmadillo]; }; +robustX = derive { name="robustX"; version="1.1-4"; sha256="1s2aav2jr22dgrl7xzk09yn9909k76kpiz271w5r1id6hpfprjwc"; depends=[robustbase]; }; +robustbase = derive { name="robustbase"; version="0.92-2"; sha256="1z9fjbq7ig63zqwvxvbpcz3ga1ddjrwhvc9lhb6p6sglq301q90z"; depends=[DEoptimR]; }; +robustfa = derive { name="robustfa"; version="1.0-5"; sha256="04nk5ipml54snsmiqf5sbhx490i46gnhs7yibf4wscrsj1bh2mqy"; depends=[rrcov]; }; +robustgam = derive { name="robustgam"; version="0.1.7"; sha256="0s1z7jylj757g91najbyi1aiqnssd207jfm9yhias746540qp3kw"; depends=[Rcpp RcppArmadillo mgcv robustbase Rcpp RcppArmadillo]; }; +robustlmm = derive { name="robustlmm"; version="1.6"; sha256="18lhbnmcd6nc0qr23a19mhw9k9r30li6z92g600dil6ll8s5m54z"; depends=[lme4 Matrix ggplot2 lattice nlme robustbase xtable]; }; +robustloggamma = derive { name="robustloggamma"; version="0.4-28"; sha256="0wwa7i2qw0fd5fiy45h7qiw7526zyyxx379ll4ha2n593dwhybx3"; depends=[robustbase]; }; +robustreg = derive { name="robustreg"; version="0.1-7"; sha256="1nrz10065mwccil78c74vmkhinskpnk1vyp1ikrdw23vyk2l00nc"; depends=[Rcpp Matrix Rcpp RcppArmadillo]; }; +robustvarComp = derive { name="robustvarComp"; version="0.1-2"; sha256="187mcpih509hx15wjjr7z2h6h76mz2v0d8xgsxjd8wz7l3dnlp2f"; depends=[robustbase GSE numDeriv robust plyr]; }; +rocc = derive { name="rocc"; version="1.2"; sha256="00yxbbphhwkg4sj2h7pd9vw86yavl711nk8yylwmjd3qv39qjml0"; depends=[ROCR]; }; +rockchalk = derive { name="rockchalk"; version="1.8.86"; sha256="0rdp9dmgz2wjac1ahvivpb8fzjamr8v1vszgsjpfiyc9l90zv4bk"; depends=[lme4 car MASS]; }; +rococo = derive { name="rococo"; version="1.1.2"; sha256="08204y3g3xd2srpcpnbkq1laqfr3wrhy73whlxf83gffw8j0iyv8"; depends=[Rcpp Rcpp]; }; +rootSolve = derive { name="rootSolve"; version="1.6.5.1"; sha256="02ydj4ydgljs80nrrrxb4dhfa7m12rw65xy79d7g71w97326w8p2"; depends=[]; }; +ropensecretsapi = derive { name="ropensecretsapi"; version="1.0.1"; sha256="0d4yl0h4am3blskdnzk119hk374c3vx0cg99r20w07yh8jfafrw7"; depends=[RJSONIO RCurl]; }; +ror = derive { name="ror"; version="1.2"; sha256="0n8mk35rm3rp0c7a3i961kij21a177znh9hkq4snqqlw9vf50hdg"; depends=[rJava ROI ROI_plugin_glpk igraph]; }; +rorutadis = derive { name="rorutadis"; version="0.1.3"; sha256="0ik0dpmsyb4g9wl1fb7mm0dry9s26nfvv1v91cslss82phhf16wd"; depends=[Rglpk ggplot2 gridExtra]; }; +rotations = derive { name="rotations"; version="1.2"; sha256="13z5ysjqz3qkiw4nrp9dgy55kbmff5j7m3hfp2h0sj8x1saglf66"; depends=[ggplot2 Rcpp Rcpp RcppArmadillo]; }; +rowr = derive { name="rowr"; version="1.1.1"; sha256="1bpx9vd6i2ljwww3gp4c1fxbv9lsdxh3jdwkmrqqj2s18bkf0a7a"; depends=[]; }; +roxygen2 = derive { name="roxygen2"; version="4.0.2"; sha256="1rn43rssbgamnfd4ipsq50mrgki5h63z898v9fjd7kr9rrrbpidm"; depends=[stringr brew digest Rcpp Rcpp]; }; +royston = derive { name="royston"; version="1.0"; sha256="1hhb1v1aqvvlzirxiyhv6zahz82w2pq4d6yp3rcakq0sw7dhawn6"; depends=[nortest moments]; }; +rpanel = derive { name="rpanel"; version="1.1-3"; sha256="1wm0dcbyvxz4ily8skz2yda44n74x2nmc4pg11ja0yvk038gjfns"; depends=[]; }; +rpart = derive { name="rpart"; version="4.1-8"; sha256="1vhmwvb7hsh75lvmsjmkab2zl136irca1dhr6p57s1yhmpw4cys0"; depends=[]; }; +rpart_plot = derive { name="rpart.plot"; version="1.4-5"; sha256="005wnmbk1bgrgr4wljljyfhn4kadx8ly3r6hf5rxvrzmvrcjk4ia"; depends=[rpart]; }; +rpart_utils = derive { name="rpart.utils"; version="0.5"; sha256="00ahvmly6cdf7qhhcic0dbjlljqq8kbhx15rc7vrkd3hzd55c0im"; depends=[rpart]; }; +rpartScore = derive { name="rpartScore"; version="1.0-1"; sha256="15zamlzbf6avir8zfw88531zg5c0a6sc5r9v5cy9h08ypf34xf4y"; depends=[rpart]; }; +rpartitions = derive { name="rpartitions"; version="0.1"; sha256="1gklsi4pqhk16xp9s49n1lr9ldm1vx61pvphjqsqkzrlxwcpx3j8"; depends=[hash]; }; +rpf = derive { name="rpf"; version="0.43"; sha256="0zqhrk0q4c9ps44qi67an76n8wc6hr8jlcs0cgvnndd73ahfqfw9"; depends=[mvtnorm RcppEigen]; }; +rpg = derive { name="rpg"; version="1.2"; sha256="13vvym3xf70fmm57nl56dc5wvvv9va9id2agxlzxd9yrhlxbcnhm"; depends=[Rcpp uuid RApiSerialize Rcpp RApiSerialize]; }; +rphast = derive { name="rphast"; version="1.5"; sha256="0r6bk0lbqpv60byhiv847ij5bxrflrs0nsla1zrn8ww7371czsgj"; depends=[]; }; +rplexos = derive { name="rplexos"; version="0.10.0.1"; sha256="1zqz5s5iixd7daw5wss7c12kdj2j5qrmybmhb7pgnn9zp57mxadg"; depends=[dplyr RSQLite Rcpp DBI data_table lubridate reshape2 stringi assertthat Rcpp]; }; +rplos = derive { name="rplos"; version="0.4.1"; sha256="1v757v0b09mggdrgfzqmhvmf7yhqm3k42ml8sg8v4j74lscy653l"; depends=[ggplot2 RCurl RJSONIO XML plyr stringr googleVis httr lubridate reshape2 data_table whisker solr assertthat]; }; +rplotengine = derive { name="rplotengine"; version="1.0-5"; sha256="1wwpfnr5vi8z26alm8y5gply0y4iniagimldzy2z696djzz8p8p8"; depends=[xtable]; }; +rportfolios = derive { name="rportfolios"; version="1.0"; sha256="1zcv5ddmk15l0p03nlffimlhhpcc7l1c05xl2d1xlfk58rkvqns6"; depends=[]; }; +rprintf = derive { name="rprintf"; version="0.1-2"; sha256="1jsn6i3ikcdbrg8g89hmb1ky3a84fykx5gpnbswplhidh2qhb9jz"; depends=[stringr]; }; +rpsychi = derive { name="rpsychi"; version="0.8"; sha256="1h40kbqvvwwjkz5hrclj6j22zhav3yyfbbhqahs1whwjkksnam4w"; depends=[gtools]; }; +rpubchem = derive { name="rpubchem"; version="1.5.0.2"; sha256="0lvi7m8jb2izsfia3c0qigsd1k1x9r02gymlwfg29pb8k10lwcjf"; depends=[XML car RCurl RJSONIO]; }; +rpud = derive { name="rpud"; version="0.0.2"; sha256="03xddc6kh39wlcv8dvpnv4h0f5qx5cv327xip26zk7gg7pgrn05x"; depends=[]; }; +rqPen = derive { name="rqPen"; version="1.0"; sha256="1vd2kjbqb5jqvbciagw03fp28ljswifznkdqj34q753kzvryblri"; depends=[quantreg]; }; +rrBLUP = derive { name="rrBLUP"; version="4.3"; sha256="0wydh4sx7b6rcrgb3qvqh0z46pixx63711q2nf8s3c32090a5g81"; depends=[]; }; +rrBlupMethod6 = derive { name="rrBlupMethod6"; version="1.3"; sha256="1qwv954mhry46ff2ax48xcmnasygi5alv8d413g3qbk2da6i0d8l"; depends=[]; }; +rrcov = derive { name="rrcov"; version="1.3-4"; sha256="0k2lqwsfb9ir053m4dbz8z57xq6mlfj63i1k64p1h5jdzbpyw1ks"; depends=[robustbase pcaPP mvtnorm]; }; +rrcovHD = derive { name="rrcovHD"; version="0.2-2"; sha256="03b1mpqqhfjxjzz9agx575mcgalb7jrsv843zjqv9jp4wszprs6z"; depends=[rrcov robustbase pcaPP pls spls]; }; +rrcovNA = derive { name="rrcovNA"; version="0.4-4"; sha256="0zrzgnl83wfsaz0rma07hgb5jlmhvqwv06q7zkm65xd6mfsalqv0"; depends=[rrcov robustbase norm]; }; +rredis = derive { name="rredis"; version="1.6.9"; sha256="00fgrhyj6bai0kc18c2m1fsk9ja5c9q7m6dpsb8wsn4gs79mw3sc"; depends=[]; }; +rriskDistributions = derive { name="rriskDistributions"; version="2.0"; sha256="0278426m4v7b8qb9ydzxqncayq8z25b36n4livqg40zpazp3hy85"; depends=[mc2d eha msm tkrplot]; }; +rrlda = derive { name="rrlda"; version="1.1"; sha256="06n9jah190cz25n93jlb5zb0xrx91bjvxgswwdx9hdf0fmwrpkvz"; depends=[pcaPP mvoutlier glasso matrixcalc]; }; +rrules = derive { name="rrules"; version="0.1-0"; sha256="0f9msp289akzricjrm8dvfbh2dihfbszr7ms4fld1cr30zssajin"; depends=[]; }; +rsae = derive { name="rsae"; version="0.1-5"; sha256="1f3ry3jwa6vg2vq2npx2pzzvfwadz8m48hjrqjk860nfjrymwgx5"; 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-2"; sha256="0z0di9fw1wd0ljji2n6ciyh8ppwf7dsr6x71zgg9mgzhibks26kq"; depends=[XML RCurl plyr]; }; +rseedcalc = derive { name="rseedcalc"; version="1.2"; sha256="1di9bzwxyxm9gs14ks9z6sixi656hz9xwmq3aaqh53cjjr1ka0rc"; depends=[]; }; +rsem = derive { name="rsem"; version="0.4.5"; sha256="02vccj03bxisi2jwl31rwi4gw9i26g70aagdgg5gk8z0bys78v4d"; depends=[MASS lavaan]; }; +rsgcc = derive { name="rsgcc"; version="1.0.6"; sha256="12f8xsg6abmhdgkrrc8sfzmv4i1pycq1g0jfad664d17yciw7rhh"; depends=[biwt cairoDevice fBasics gplots gWidgets gWidgetsRGtk2 minerva parmigene stringr snowfall]; }; +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]; }; +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=[]; }; +rstiefel = derive { name="rstiefel"; version="0.10"; sha256="0b2sdgpb3hzal34gd9ldd7aihlhl3wndg4i4b3wy6rrrjkficrl1"; depends=[]; }; +rstream = derive { name="rstream"; version="1.3.2"; sha256="1habswhdlx7l92s9p9554px4kf9f9mhk5vkdq2fv4wk3381c0fgi"; depends=[]; }; +rstudioapi = derive { name="rstudioapi"; version="0.1"; sha256="027482pbdxnfhcpdw2ns2qhpa18zri71nz8fk0svq6900m2237h8"; depends=[]; }; +rsubgroup = derive { name="rsubgroup"; version="0.6"; sha256="1hz8rnbsl97ch6sjwxdicn2sjyn6cajg2zwmfp03idzpb3ixlk7l"; depends=[rJava foreign]; }; +rsunlight = derive { name="rsunlight"; version="0.3.0"; sha256="148byg8180657ny01xny28sdawbq87hf89f8c1rzfjl5qwcxmbqd"; depends=[httr plyr jsonlite stringr assertthat]; }; +rtape = derive { name="rtape"; version="2.2"; sha256="0q7rs7pc1k1kayr734lvh367j5qig2nnq5mgak1wbpimhl7z3wm7"; depends=[]; }; +rtematres = derive { name="rtematres"; version="0.2"; sha256="1d0vrprvnlk4hl2dbc6px9xn9kx9d1qvlqxd798hzda6qg5wwvf2"; depends=[XML RCurl plyr gdata]; }; +rtf = derive { name="rtf"; version="0.4-11"; sha256="04z0s5l9qjlbqahmqdaqv7mkqavsz4yz25swahh99xfwp9plknfl"; depends=[R_oo R_methodsS3]; }; +rtfbs = derive { name="rtfbs"; version="0.3.2"; sha256="1v26znlispc8304xid0dsflphiwzil6nrxlsgj8dkp4prh6hdb34"; depends=[rphast]; }; +rtiff = derive { name="rtiff"; version="1.4.4"; sha256="13cz35dfz735yk2lci8cmjmsg4ddm31lv98lpx8ymy3bwmzdmc3c"; depends=[pixmap]; }; +rtkpp = derive { name="rtkpp"; version="0.8.4"; sha256="0v1n16hi1zvbdn6p737ryw8baflyw7aqjpnnzqr7rgwc518zhd1f"; depends=[Rcpp Rcpp]; }; +rtop = derive { name="rtop"; version="0.3-45"; sha256="0dh7jlnakk1hd27swspa0fj6pq6yddxhz32w3d7xq8jgr7xm8d70"; depends=[sp gstat]; }; +rts = derive { name="rts"; version="1.0-3"; sha256="0jqk0p2q1vx9l6zf9pbc5k3lsw4hg5x1r6p0f7wjiks50x55pbl4"; depends=[raster xts zoo]; }; +rtype = derive { name="rtype"; version="0.1-1"; sha256="0wjf359w7gb1nrhbxknzg7qdys0hdn6alv07rd9wm6zynnn1vwxy"; depends=[]; }; +rucm = derive { name="rucm"; version="0.4"; sha256="1s3q6wfp9nb50rqsaq6h2wb48qvxncmlf8l4gm18pr25wkangfxq"; depends=[KFAS]; }; +rugarch = derive { name="rugarch"; version="1.3-4"; sha256="1za92hqfaws8azf2zml1q8mlbirrdw3rb4rvwg6sclfx7z7gsqkh"; depends=[Rsolnp nloptr ks numDeriv spd xts zoo chron SkewHyperbolic expm Rcpp Rcpp RcppArmadillo]; }; +runjags = derive { name="runjags"; version="1.2.1-0"; sha256="0rsqyrk9vzrnhw66c7hdqnbnvk6qsl882fshh2njzivaqxk2ibqq"; depends=[lattice coda]; }; +ruv = derive { name="ruv"; version="0.9.4"; sha256="07bvyqrkm10vh63l8dm93spd7l0v105a87lsbjw4vg65czp1iayg"; depends=[]; }; +rv = derive { name="rv"; version="2.3.1"; sha256="0bjqwk7djl625fws3jlzr1naanwmrfb37hzkyy5szai52nqr2xij"; depends=[]; }; +rvHPDT = derive { name="rvHPDT"; version="3.0"; sha256="05nrfnyvb8ar7k2bmn227rn20w1yzkp1smwi4sysc00hyjrlyg8s"; depends=[gtools]; }; +rvTDT = derive { name="rvTDT"; version="1.0"; sha256="09c2fbqnlwkhaxfmgpsdprl0bb447ajk9xl7qdlda201fvxkdc8v"; depends=[CompQuadForm]; }; +rvalues = derive { name="rvalues"; version="0.2"; sha256="1zc4irq0s9mm7yz8pc3n9il0z508wwf2a2j741wyyw90f35fasi0"; depends=[]; }; +rvertnet = derive { name="rvertnet"; version="0.0-5"; sha256="1rj6csx2qb094wgkablrpzlbqb0hpzg5d29xrar2cy39gjmz40cj"; depends=[RCurl plyr RJSONIO httr ggplot2 maps]; }; +rvest = derive { name="rvest"; version="0.1.0"; sha256="1bv05yk4cw8sq5rng6gxvvbchmz4qx0i47bb2k0wg5vbp8xhrcrh"; depends=[httr XML selectr magrittr]; }; +rvgtest = derive { name="rvgtest"; version="0.7.4"; sha256="1lhha5nh8fk42pckg4ziha8sa6g20m0l4p078pjj51kz0k8929ng"; depends=[]; }; +rworldmap = derive { name="rworldmap"; version="1.3-1"; sha256="0wrg6ap39bq88sv5axxd90yyqafn77amk5429pxd9v5a2hdm3g8w"; depends=[sp maptools fields]; }; +rworldxtra = derive { name="rworldxtra"; version="1.01"; sha256="183z01h316wf1r4vjvjhbj7cg4xarn4b8qbmnn5y7nrrdndzi163"; depends=[sp]; }; +rwt = derive { name="rwt"; version="1.0.0"; sha256="112wp682z4gkxsd3bqnlkdrh42bfzwnnhzyangxi2dh0qw63bgcr"; depends=[matlab]; }; +ryouready = derive { name="ryouready"; version="0.3"; sha256="0nms3zfkis2fsxkyj3dr95vz3kk6pkm7l5ga7iz8pxy1ywrawj2i"; depends=[stringr car]; }; +rysgran = derive { name="rysgran"; version="2.1.0"; sha256="1l2mx297iyipap8cw2wcw5gm7jq4076bf4gvgvij4q35vp62m85z"; depends=[soiltexture lattice]; }; +rzmq = derive { name="rzmq"; version="0.6.8"; sha256="0likcj1xivr0y42krnm5zynkr6slfc3yqq2nd90x79ldvbfdqxc6"; depends=[]; }; +s20x = derive { name="s20x"; version="3.1-10"; sha256="0hxi8d1pl0jgg66jxzz0z973sg3f4s1jf75smmizy99kd76rdnh0"; depends=[]; }; +s2dverification = derive { name="s2dverification"; version="2.1.1"; sha256="1m3m5sbq96fhnl4slxgb2j0009kqfdivdn3nbb203pc0knjpflnq"; depends=[GEOmap geomapdata maps mapproj]; }; +s4vd = derive { name="s4vd"; version="1.0"; sha256="07pnkhyqf9iymj913813d93dmb3iqbdlcl0gsgacihyyinb4id5s"; depends=[biclust]; }; +sBF = derive { name="sBF"; version="1.1"; sha256="11yjw6y1k0fi95p68bc4481gac25lympmmdykh71ljg0hnrm0s53"; depends=[]; }; +sExtinct = derive { name="sExtinct"; version="1.1"; sha256="1l6232z6c4z3cfl1da94wa6hlv9hj5mcb85fj1y0yparkvvl8249"; depends=[lattice]; }; +sGPCA = derive { name="sGPCA"; version="1.0"; sha256="16aa5jgvkabrlxaf1p7ngrls79mksarh6di3vp26kb3d3wx087dx"; depends=[Matrix fields]; }; +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]; }; +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]; }; +saeSim = derive { name="saeSim"; version="0.6.0"; sha256="10gvbzscnhc42a8z2jq8951i74v8pq7xsh3v3zsk2k4g8sx9hdy2"; depends=[dplyr ggplot2 MASS spdep]; }; +saemix = derive { name="saemix"; version="1.2"; sha256="1whwn54iiapdfig6qpzji3z3skir6jrs34dq78zlynibgrg95hx6"; depends=[]; }; +saery = derive { name="saery"; version="1.0"; sha256="09x1v627llqbpiwkh1wr0z7gsndfdrjzag2hprhq1adbzh05k47z"; depends=[]; }; +safeBinaryRegression = derive { name="safeBinaryRegression"; version="0.1-3"; sha256="1g68r6pp5l41rbgyfqgcha1gpsisnl0ybdmdqr4ylr43f61dpgvd"; depends=[lpSolveAPI]; }; +safi = derive { name="safi"; version="1.0"; sha256="1km58w57kdmyfj4a97zhnjcka4q4pxm8r2br01qq2niaihpbzp98"; depends=[]; }; +sampSurf = derive { name="sampSurf"; version="0.7-2"; sha256="1bj1m5c8bx8i4jyk6kdgcfmgfj15iirxwg259r0c4fk7whcnfz59"; depends=[sp raster rasterVis boot]; }; +sampleSelection = derive { name="sampleSelection"; version="1.0-2"; sha256="1hzvvwvqp6v9d6ldm17kx3g8pbgngw2pxklny0b3man47zh5jshc"; depends=[maxLik miscTools systemfit Formula]; }; +samplesize = derive { name="samplesize"; version="0.1-8"; sha256="0w4aa6p0j7l9xykhgqv7yps2nxx11q1mrgivdnv4si8fbkqx148n"; depends=[]; }; +samplesize4surveys = derive { name="samplesize4surveys"; version="2.1.0"; sha256="08vs1b4rwyd4yh3y2l1gkh8wpjhh2w52929p6b0sfj0iywp2dr03"; depends=[TeachingSampling]; }; +sampling = derive { name="sampling"; version="2.6"; sha256="11r8p29kwc0ggycbv7sm1zmazmfm4p5207l764ad4znjib0cab6p"; depends=[MASS lpSolve]; }; +samplingEstimates = derive { name="samplingEstimates"; version="0.1-3"; sha256="1srdchlpxksfdqhf5qdvl7nz0qsxkxww7hzqj0q71asbzlq3am3p"; depends=[samplingVarEst]; }; +samplingVarEst = derive { name="samplingVarEst"; version="0.9-9"; sha256="04wgsq3sh69iy8p07ch210p22n5mds7cxp5s6zggzamqpf0hpnw7"; depends=[]; }; +samplingbook = derive { name="samplingbook"; version="1.2.0"; sha256="1vynz6hsnz5d0vg66f8k67h24rb809k9chb4waymk6vwnp8lksz9"; depends=[pps sampling survey]; }; +samr = derive { name="samr"; version="2.0"; sha256="0rsfca07pvmhfn7b49yk2ycw00wsq6dmrpv9haxz8q0xv7n5n2q9"; depends=[matrixStats]; }; +sand = derive { name="sand"; version="1.0.2"; sha256="1y371ds86gcq2id996vp56h5dax2wm0mlk1ks2mp1k81n63l7wmf"; depends=[igraph igraphdata]; }; +sandwich = derive { name="sandwich"; version="2.3-2"; sha256="10ag2iwwxcwgbmbibfkpxxc8iih7bmya57zl4g983fb7zyd36mhz"; depends=[zoo]; }; +sanitizers = derive { name="sanitizers"; version="0.1.0"; sha256="1c1831fnv1nzpq8nw9krgf9fm8v54w0gvcn4443b6jghnnbhn2n6"; depends=[]; }; +sanon = derive { name="sanon"; version="1.4"; sha256="0zg0paiz3rb0fk2mgi8rlzqy9vq3afy5vx6s15k1xqz8rjgsbd1x"; depends=[]; }; +sapa = derive { name="sapa"; version="2.0-0"; sha256="04zf1xs4w7s28mvc272la8z3r1slnf50pw0k8zj335j3i56x6b9y"; depends=[ifultools splus2R]; }; +saps = derive { name="saps"; version="1.0.0"; sha256="02si76ckinkm4ajclq4isy6gi0cf1mwfrq3w17i5gflbfqmf2qvj"; depends=[survival reshape2]; }; +sas7bdat = derive { name="sas7bdat"; version="0.5"; sha256="0qxlapb6wdhzpwlmzlhscy3av7va3h6gkzsppn4sx5q960310an3"; depends=[]; }; +saves = derive { name="saves"; version="0.5"; sha256="1b4mfi2851bwcp0frx079h5yl6y1bhc2s8ziigmr8kwy1y1cxw10"; depends=[]; }; +saws = derive { name="saws"; version="0.9-6.1"; sha256="0w40j6xczqs74z1z3na4510w06px7yn55s2mw9mddd6736l56fv1"; depends=[gee]; }; +sbgcop = derive { name="sbgcop"; version="0.975"; sha256="0f47mvwbsym4khwgl0ic3pqkw3jwdah9a48qi3q93d46p2xich61"; depends=[]; }; +sbioPN = derive { name="sbioPN"; version="1.1.0"; sha256="0yvg55xnkhm35hfl7rldy2grb26hm4a68jr4x9n45fs7hhdylxri"; depends=[]; }; +sca = derive { name="sca"; version="0.8-9"; sha256="024yxm1rlyz3hx9viv2nb6rapy938diaknc3nzkgq0ffky2gf0s3"; depends=[]; }; +scaRabee = derive { name="scaRabee"; version="1.1-3"; sha256="1yap3hi36f8hk93jn59nxrbgq8iw0xwkkm3pc2gb50cpcpaq41pd"; depends=[neldermead lattice deSolve]; }; +scagnostics = derive { name="scagnostics"; version="0.2-4"; sha256="0fhc7d2nfhm8w6s6z1ls6i8d7c90h4q7rb92rz8pgq3xh031hpcf"; depends=[rJava]; }; +scales = derive { name="scales"; version="0.2.4"; sha256="08dryii8ibh16wxs61pam07b24rwhqvdcdhk09mij289l309192v"; depends=[RColorBrewer dichromat munsell plyr labeling]; }; +scalreg = derive { name="scalreg"; version="1.0"; sha256="06iqij1cyiw55ijzk2byrwh3m5iwsra7clx8l4v69rc236q8zbdi"; depends=[lars MASS]; }; +scam = derive { name="scam"; version="1.1-8"; sha256="1190xdahr4cx50qn32lxqm3p8m9c3968qx6f5mpyicaw34j9whz4"; depends=[mgcv Matrix]; }; +scape = derive { name="scape"; version="2.2-0"; sha256="0dgbh65fg6i5x4lpfkshn382zcc4jk1wp62pwd2l2f59pyfb92a3"; depends=[coda Hmisc lattice]; }; +scar = derive { name="scar"; version="0.2-1"; sha256="04x42414qxrz8c7xrnmpr00r46png2jy5giwicdx6gx8jwrkzhzs"; depends=[]; }; +scatterplot3d = derive { name="scatterplot3d"; version="0.3-35"; sha256="1w0r7cyz01rzmgcf2x7wa4xs88ga6fd67wksyjyzrh2pdcbc56yx"; depends=[]; }; +schoRsch = derive { name="schoRsch"; version="1.1"; sha256="0bi2vn9qr49yy3g45xgglqn1b5b6z8cbn9phzmqjc1v7rn80s5zg"; depends=[]; }; +scholar = derive { name="scholar"; version="0.1.2"; sha256="1h1a6psgmiifi7p87ar3fr0mcfmg44yh4683dmqxrxrfcvgaxvca"; depends=[stringr plyr R_cache XML]; }; +schoolmath = derive { name="schoolmath"; version="0.4"; sha256="06gcmm294d0bs5whvknrq48sk7li961lzy4bcncjg052zbbpn67x"; depends=[]; }; +schwartz97 = derive { name="schwartz97"; version="0.0.6"; sha256="0l34f30l75zrg3n377jp0cw7m88cqkgzy6ql78mrx8ra88aspfzn"; depends=[FKF mvtnorm RUnit]; }; +scidb = derive { name="scidb"; version="1.1-2"; sha256="1nkyzvjpacm4imv778nc6gc468419shkyhxb59hsaw9840wcs1na"; depends=[Matrix iterators RCurl zoo]; }; +scio = derive { name="scio"; version="0.6.1"; sha256="0h15sscv7k3j7qyr70h00n58i5f44k96qg263mxcdjk9mwqr0y65"; depends=[]; }; +sciplot = derive { name="sciplot"; version="1.1-0"; sha256="0na4qkslg3lns439q1124y4fl68dgqjck60a7yvgxc76p355spl4"; depends=[]; }; +scoring = derive { name="scoring"; version="0.5-1"; sha256="0vxjcbp43h2ipc428qc0gx7nh6my7202hixwhnmspl4f3kai3wkp"; depends=[]; }; +scout = derive { name="scout"; version="1.0.3"; sha256="0wmjmk0ckd211cq5ykd0yzjschs7fkg04w67arl4pwma0z5z56lq"; depends=[glasso lars]; }; +scrapeR = derive { name="scrapeR"; version="0.1.6"; sha256="1rqgqpn9rc43rh356z9gb51pjhdczr9a9mgv0i078nniq156rmlb"; depends=[XML RCurl]; }; +scrime = derive { name="scrime"; version="1.3.3"; sha256="1vp7ai10m0f3s0hywyqh0yllxj6z6p795zqpr6vp58fh6yq20x73"; depends=[]; }; +scriptests = derive { name="scriptests"; version="1.0-9"; sha256="03jv5hgzs4hvkpvjr9073nncmwj20cwispzwrbvxjdnvm5hnjg3y"; depends=[]; }; +scrm = derive { name="scrm"; version="1.3-3"; sha256="0if338nkbfiakb82wrvy25xsnf337gm4xz5b9027s5yblwwxngf1"; depends=[Rcpp Rcpp]; }; +scrypt = derive { name="scrypt"; version="0.1.0"; sha256="1hc1rziigwggdx2pvklldkw88mdzbwa8b8a2a0ip4cm1w6flsl9n"; depends=[Rcpp Rcpp]; }; +scuba = derive { name="scuba"; version="1.7-0"; sha256="11mdc8pj552ag36ib4sfbjv8r0psa6wnb13spz0v3rbaslz25hpw"; depends=[]; }; +sda = derive { name="sda"; version="1.3.5"; sha256="0i5dxqc47d32b860qz9ipyy6h4mszx0vmg8xd5mz9lxz2if9k2gm"; depends=[entropy corpcor fdrtool]; }; +sdcMicro = derive { name="sdcMicro"; version="4.4.0"; sha256="0ig43sdzn940mpv2d8v1v0k77nb5mwwsy8amkb6vdxs0rql7qvyy"; depends=[brew knitr data_table xtable car robustbase cluster MASS e1071 Rcpp sets Rcpp]; }; +sdcMicroGUI = derive { name="sdcMicroGUI"; version="1.1.1"; sha256="0icxxbfxl65da07bpi7l2jzk85y990ndhl60lwyp077sjq5rd20q"; depends=[sdcMicro gWidgetsRGtk2 cairoDevice vcd foreign Hmisc]; }; +sdcTable = derive { name="sdcTable"; version="0.17.1"; sha256="0wljdpggf8mhsjg0xrgb3xqd346zb4f8pk0jfgv38krhkfxz1ss5"; depends=[stringr Rcpp Rglpk lpSolveAPI data_table Rcpp]; }; +sdcTarget = derive { name="sdcTarget"; version="0.9-11"; sha256="18cf276mh1sv16xn0dn8par4zg8k7y8710byxiih6db4i616fjpi"; depends=[magic foreach doParallel tuple]; }; +sddpack = derive { name="sddpack"; version="0.9"; sha256="1963l8jbfwrqhqcpif73di9i5mb996r4f8smjyil6l7sdir7cg9l"; depends=[]; }; +sde = derive { name="sde"; version="2.0.13"; sha256="194dkwrww9win5chhlffjv1xkhpxx2bcv6hf81xaqk7pdf7ifj80"; depends=[MASS fda zoo]; }; +sdef = derive { name="sdef"; version="1.5"; sha256="1xmx3nfjjfh6zw1vq7iip4rnshh40azja83xyvnz04jcv574vhxm"; depends=[]; }; +sdmvspecies = derive { name="sdmvspecies"; version="0.3.1"; sha256="1rpbj55598862vb4bwrvcbskm10xibsvx58fpvkn58zbm6ab2534"; depends=[GPArotation ggplot2 psych raster]; }; +sdnet = derive { name="sdnet"; version="2.01.3"; sha256="1sr60ca2dn182nacsi1ix02cdjygf45jv51dcfz5744hj7afcvws"; depends=[]; }; +sdprisk = derive { name="sdprisk"; version="1.0-3"; sha256="0v490zz2c1qa0w9nfd0xs5xbbvd9g8vp39fp8x7k7cy598vby4yx"; depends=[numDeriv PolynomF rootSolve]; }; +sdtoolkit = derive { name="sdtoolkit"; version="2.33-1"; sha256="0pirgzcn8b87hjb35bmg082qp14idc5pfvm6dikpgkswag23hwh8"; depends=[]; }; +seacarb = derive { name="seacarb"; version="3.0.2"; sha256="0v32fwryfhc9hmri5p7x53vi6z6g2f2a4rgwrn5rjvbkkhndb7vv"; depends=[]; }; +sealasso = derive { name="sealasso"; version="0.1-2"; sha256="0cjy3fj170p5wa41c2hwscmhqxwkjq22vhg9kbajnq7df2s20jcp"; depends=[lars]; }; +seas = derive { name="seas"; version="0.4-3"; sha256="1n0acg6fvaym4nx1ihw0vmb79csds0k4x9427qmcyxbl9hxxmllp"; depends=[]; }; +season = derive { name="season"; version="0.3-4"; sha256="0rcz1gd3wbk77289b2vblbs3hhzf5vszdfmjvw4byfsw2willa7n"; depends=[ggplot2 MASS mgcv survival coda]; }; +seasonal = derive { name="seasonal"; version="0.70.1"; sha256="0vjyr864v5v1hxy00djzmbq38ajmywacp9k0zfv1q9nf64kg62l5"; depends=[]; }; +seawaveQ = derive { name="seawaveQ"; version="1.0.0"; sha256="19vm1f0qkmkkbnfy1hkqnfz6x2a7g9902ka76bhpcscynl69iy56"; depends=[survival NADA lubridate]; }; +secr = derive { name="secr"; version="2.9.2"; sha256="124x58d3ggj0l1as3zb1vzg0j61cybmcvfpg2qyarfxi65s8313r"; depends=[abind MASS nlme sp mgcv raster]; }; +secrdesign = derive { name="secrdesign"; version="2.2.1"; sha256="1q3bc38js1qajsfcyz25cxs2j84qp8yw5l5746fh7kfqmah7ngn3"; depends=[secr abind]; }; +seedy = derive { name="seedy"; version="1.0"; sha256="1p9mbnkgdz3rlaj5ygaai81g8kvs68y4zcgf7745gr17vflys8kf"; depends=[]; }; +seeg = derive { name="seeg"; version="1.0"; sha256="1d45vl075p4qbd74gpaa8aw1h82p9n633fym10yp9bmcv4gwksg6"; depends=[car spatstat sgeostat]; }; +seem = derive { name="seem"; version="1.0"; sha256="0cjdi9c89bqvrx9gzxph958cfqicc1qfnzsair0gvsk3cxsrw6bf"; depends=[]; }; +seewave = derive { name="seewave"; version="1.7.6"; sha256="1sh2i9hb8v0awhczvkj803lmdvg5p1fla685xb3s2a3if1q5zc5i"; depends=[fftw tuneR]; }; +seg = derive { name="seg"; version="0.5-1"; sha256="0gsdbq7b5wpknhlilrw771japr63snvx4vpirvzph4fjyby1c7rg"; depends=[sp splancs]; }; +segmag = derive { name="segmag"; version="1.2.2"; sha256="130saznhssg0qsc34fcw80x92mmqhjgizrb4fxpjsg7a8jjrclp8"; depends=[Rcpp Rcpp]; }; +segmented = derive { name="segmented"; version="0.5-0.0"; sha256="13p259snxj96xysj05gy2c705n6brbf5dfba4n3riwwb8ngs69cd"; depends=[]; }; +selectMeta = derive { name="selectMeta"; version="1.0.7"; sha256="1ibiiddl9km8dahfc3kdpl42k43fx4mqgqibxgv5q8zbcp2829p9"; depends=[DEoptim]; }; +selectiongain = derive { name="selectiongain"; version="2.0.29"; sha256="0l0av8dw14yfnc5a17nknjimhbi0nw30h7m8la346kibcsmszyvr"; depends=[mvtnorm]; }; +selectr = derive { name="selectr"; version="0.2-2"; sha256="0hzj8ccs2jcfaqlpgrf59y6z7hrxsb2c85kkxflp6180rpqjrwq4"; depends=[XML stringr]; }; +selectspm = derive { name="selectspm"; version="0.1"; sha256="0bihyjaacpyjnm5vznix8krw2sqmy62in33hmb5yj4yidwz1gpv0"; depends=[spatstat ecespa]; }; +sem = derive { name="sem"; version="3.1-5"; sha256="093kklhl9fnawpwj3km1q0px6fm40kc3vg7kw93y3yb6hniwla35"; depends=[matrixcalc]; }; +semGOF = derive { name="semGOF"; version="0.2-0"; sha256="1lsv72yaza80jqadmah7v2cpfqfay57y12hcz6brvia6bmr5qagb"; depends=[sem MASS matrixcalc]; }; +semPLS = derive { name="semPLS"; version="1.0-10"; sha256="0q5linjyv5npkw4grx3vq58iq2q1grf06ikivhkg8w7rvb7pqn6b"; depends=[lattice]; }; +semPlot = derive { name="semPlot"; version="1.0.1"; sha256="0sdp970qb4mz5vzncfmqxvg1z12gmiyqi3yaz9x2drm3rgzavy83"; depends=[qgraph lavaan sem plyr XML igraph lisrelToR rockchalk colorspace corpcor]; }; +semTools = derive { name="semTools"; version="0.4-6"; sha256="1rxs6kwfc4bp273i9p25v4mc2sm91fkgsg178ifd4d3235xawcvz"; depends=[lavaan]; }; +semdiag = derive { name="semdiag"; version="0.1.2"; sha256="0kjcflw7dn907zx6790w7hnf5db6bf549whfsc0c2r173kf13irp"; depends=[sem]; }; +semiArtificial = derive { name="semiArtificial"; version="1.2.0"; sha256="11pwdqpsf5d5g74s2b8ixmrh2khkha3d4akzlkn652s98qr55dpc"; depends=[CORElearn MASS nnet cluster mclust fpc timeSeries timeDate]; }; +semisupKernelPCA = derive { name="semisupKernelPCA"; version="0.1.5"; sha256="1v8wdq63b1gqicj8c9a24k0w7cc0bkg0mnc9z5mklsfcl7g0g6k9"; depends=[datautils irlba]; }; +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-0"; sha256="19yddfcql1w154v81fsdm50wl15vl3vcx44iz3ss7in4gj1g884m"; depends=[multcomp MASS numDeriv]; }; +sensitivity = derive { name="sensitivity"; version="1.10"; sha256="1by3ri79k45aiz5pv1vr2325c9ra91kg3nx75ng457apcixqza0v"; depends=[boot]; }; +sensitivitymv = derive { name="sensitivitymv"; version="1.2"; sha256="0h8lbl5yhxgzdrajjydb2ap9q3dnm1abxdk8gdhp84m1bv8pznkj"; depends=[]; }; +sensitivitymw = derive { name="sensitivitymw"; version="1.1"; sha256="1bknnfkkqgmchabcjdfikm37sn5k41ar8lpnjw58i8qh7yzq237i"; depends=[]; }; +sensory = derive { name="sensory"; version="1.0"; sha256="0mfjj3lsx5i8bc8ikhqwycmfryzg9vd64m6ahqjf6xva7bj5h1v6"; depends=[Matrix gtools MASS]; }; +separationplot = derive { name="separationplot"; version="1.0"; sha256="1m8s531dsmzdam5s2yn0qyvm89zfxrzj8sh8r2gpcf31qrai7m26"; depends=[MASS RColorBrewer]; }; +seqCBS = derive { name="seqCBS"; version="1.2"; sha256="1kywi3kvvl9y6nm7cwf6fj8gz9gzznp5va336g1akzgy77k82d8v"; depends=[clue]; }; +seqDesign = derive { name="seqDesign"; version="1.0.2"; sha256="0v4g4r9y79vqf4i2r96y6wgjf2aww98k06rk3lpr4cz1yp5x3gvx"; depends=[survival xtable]; }; +seqMeta = derive { name="seqMeta"; version="1.5"; sha256="1igag08qkfvkx83w6jjyfmjpxil9wvag1yfnxp3pqbglj9l99pmn"; depends=[survival Matrix coxme CompQuadForm]; }; +seqPERM = derive { name="seqPERM"; version="1.0"; sha256="1i8ai4gxybh08wxjh96m6xlqxhh7ch0xihjs879snmy4zqfi0pap"; depends=[]; }; +seqRFLP = derive { name="seqRFLP"; version="1.0.1"; sha256="1i98hm8wgwr8b6hd237y2i9i0xgn35w4n2rxy4lqc5zq71gkwkvk"; depends=[]; }; +seqinr = derive { name="seqinr"; version="3.0-9"; sha256="1m57nmpkxhka1mgfaq5clwdhipz36v795w1d51qr8zypdnxacfgq"; depends=[ade4]; }; +seqminer = derive { name="seqminer"; version="3.1"; sha256="15b63j15bgqzix4vp57q1vi9jnqn5an2p8kmvacg95ahrv8w0a0m"; depends=[stringr]; }; +seqmon = derive { name="seqmon"; version="0.2"; sha256="075hc6vgl1w3nisrihf5w6mkkg9q601jsqxm9hk9yagyvvd7d78w"; depends=[]; }; +sequences = derive { name="sequences"; version="0.5.8"; sha256="1872737x77mknn2ay7qh8brd28hzsqzjqkx4shwkp0w7lk2p0rp0"; depends=[Rcpp Rcpp]; }; +sequenza = derive { name="sequenza"; version="2.1.0"; sha256="0qnznw6gn5yfd64mib8h9y29vak40d3znzkqvhlpnn0da6aak1zv"; depends=[squash]; }; +seriation = derive { name="seriation"; version="1.0-13"; sha256="0k3m4x0msdynblcy1ign4p5qlsqmxk2p4vfjkv0fz3qjsbxfw61n"; depends=[TSP cluster gclus colorspace MASS]; }; +servr = derive { name="servr"; version="0.1"; sha256="035pf1xg0jgjrba39wxwlrh7n43kp29ymagfv7yskxj31dh3b34i"; depends=[httpuv]; }; +sesem = derive { name="sesem"; version="1.0.1"; sha256="0s4xkv6bc5nxhj09mk9agnj11b9h7swccs9jrn4lg3fy12vqhf5a"; depends=[lavaan mgcv gplots]; }; +session = derive { name="session"; version="1.0.3"; sha256="04mcy1ac75fd33bg70c47nxqxrmqh665m9r8b1zsz5jij1sbl8q5"; depends=[]; }; +setRNG = derive { name="setRNG"; version="2013.9-1"; sha256="02198cikj769yc32v8m2qrv5c01l2fxmx61l77m5ysm0hab3j6hs"; depends=[]; }; +sets = derive { name="sets"; version="1.0-13"; sha256="1ys17iy2gjkfnp3914g6sfx3ilgm18pdfak59cqrwalwwnhc3zaz"; depends=[]; }; +settings = derive { name="settings"; version="0.1.1"; sha256="00b69vh4r8f40v6rm11hgry7dfqsrd2ij9h07y60xxzdjrwigm14"; depends=[]; }; +setwidth = derive { name="setwidth"; version="1.0-3"; sha256="1s6m24kmkafscgibgfldm70m57bv4gs0m7fdki18nwdi1rvwpkbf"; depends=[]; }; +severity = derive { name="severity"; version="2.0"; sha256="1mp19y2pn7nl9m8xfljc515kk5dirv0r2kypazpmd956lcivziqq"; depends=[]; }; +sfa = derive { name="sfa"; version="1.0-1"; sha256="1acqxgydf8j5csdkx0yf169x3yaa31r0ccdrqarh6vj1hacm89ad"; depends=[]; }; +sfsmisc = derive { name="sfsmisc"; version="1.0-26"; sha256="0claxq1s1hkwwymx8iva650v51fjf4ly10zm17d42qhnn4b2whgd"; depends=[]; }; +sft = derive { name="sft"; version="2.0-7"; sha256="1fq1b32f08i4k9bv4hh7rhk1jj7kgans6dwh1bmawaqkchyab3jr"; depends=[fda]; }; +sgeostat = derive { name="sgeostat"; version="1.0-25"; sha256="04zl932s6zb26r42h2l8qf3d43bmrq67281mrkh4spn4vcddv5da"; depends=[]; }; +sglOptim = derive { name="sglOptim"; version="1.0.122.1"; sha256="0ld53rdxai85r9hwz9jrsxr08lxin0ksxa6823r7cr96w18c1ssm"; depends=[Matrix Rcpp RcppProgress RcppArmadillo BH]; }; +sglasso = derive { name="sglasso"; version="1.1-0"; sha256="1iyj8clk2ibj94nxh1xi1wr50y2l53fxcivc2jdnilcqmscwbf1x"; depends=[Matrix]; }; +sglr = derive { name="sglr"; version="0.7"; sha256="11gjbvq51xq7xbmpziyzwqfzf4avyxj2wpiz0kp4vfdj3v7p4fp9"; depends=[ggplot2 shiny]; }; +sgof = derive { name="sgof"; version="2.1.1"; sha256="02gbqyzjrma48aw3p038hlc2a7gdmgb6ac81473w1rg495n9sx7p"; depends=[]; }; +sgr = derive { name="sgr"; version="1.3"; sha256="0zxmrbv3fyb686hcgfy2w1w2jffxf41ab8yc90dsgf931s9c55wn"; depends=[MASS]; }; +shape = derive { name="shape"; version="1.4.2"; sha256="0yk3cmsa57svcvbnm21pyr0s0qbhnllka8nmsg4yb41frjlqph66"; depends=[]; }; +shapefiles = derive { name="shapefiles"; version="0.7"; sha256="08ghndihs45kylbzd9wnxffn8ixvxjhjnjldjyd526ai2sj8xcgf"; depends=[foreign]; }; +shapes = derive { name="shapes"; version="1.1-10"; sha256="038xps6f8b6w9qa9csqk33ggmb311h5zxwsxr027bd95a3vmyijx"; depends=[scatterplot3d rgl MASS]; }; +sharpshootR = derive { name="sharpshootR"; version="0.6-3"; sha256="1dpcyd1wi022zcs9s48xg3wzy17dqcd0622ak0phvbwxgpwmz9j2"; depends=[aqp ape igraph cluster lattice latticeExtra vegan sp reshape2 Hmisc scales circular RColorBrewer plyr]; }; +sharx = derive { name="sharx"; version="1.0-4"; sha256="1flcflx6w93s8bk4lcwcscwx8vacdl8900ikwkz358jbgywskd5n"; depends=[Formula dcmle dclone]; }; +shiny = derive { name="shiny"; version="0.10.2.1"; sha256="03figla0lm6fb51f0g3mvlpy2nsmywxkpila4x9lqh0hs6yw0v4v"; depends=[httpuv mime RJSONIO xtable digest htmltools R6]; }; +shinyAce = derive { name="shinyAce"; version="0.1.0"; sha256="1031hzh647ys0d5hkw7cqxj0wgry3rxgq95fgs7slbm0rgx9g6f7"; depends=[shiny]; }; +shinyBS = derive { name="shinyBS"; version="0.20"; sha256="1l95g2rzv53vwx5zcaqiqz8jirncwh1yb14y62x9phg4n5jfk9f8"; depends=[shiny]; }; +shinyFiles = derive { name="shinyFiles"; version="0.4.0"; sha256="147g9ah7p97wkn3zpfhn5fljpwy2v936r4jqbdm7fbh7zi3rb3k2"; depends=[shiny htmltools]; }; +shinyRGL = derive { name="shinyRGL"; version="0.1.0"; sha256="07llg1yg5vmsp89jk60ly695zvxky6n06ar77mjxzlyc294akwmy"; depends=[rgl 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]; }; +shp2graph = derive { name="shp2graph"; version="0-2"; sha256="09gbb7f9h3q2p56dwb2813mr36115ah70szq47jimpymzkd2x08m"; depends=[maptools igraph]; }; +shrink = derive { name="shrink"; version="1.2.0"; sha256="0r207mj57kjn6wfmz4f2l4wmbz7g1pvj96gpl0s76vkdjzbh1l47"; depends=[survival MASS rms]; }; +shuffle = derive { name="shuffle"; version="1.0"; sha256="037i45mfys1nr9sqmmsfb2yd3ba3aa22hc701f5j2zp8jx57qn3k"; depends=[]; }; +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]; }; +sievetest = derive { name="sievetest"; version="1.2.2"; sha256="0mbgkf014m6bc7qg60vf065i6mvl5n4a0bvg8vb7dw531vsw2771"; depends=[]; }; +sig = derive { name="sig"; version="0.0-4"; sha256="0q5bwaj15jlmcg4qqcdkkwbnqphwgwzcnfzga12xzr912rwjybjr"; 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]; }; +sigora = derive { name="sigora"; version="0.9.2"; sha256="1s3c0xwxabr3n8sb6rjhzkkzbpvcczbgqq6b263yypwasqbg4mlb"; depends=[]; }; +simFrame = derive { name="simFrame"; version="0.5.3"; sha256="154d4k6x074ib813dp42l5l8v81x9bq2c8q0p5mwm63pj0rgf5f3"; depends=[Rcpp lattice Rcpp]; }; +simMSM = derive { name="simMSM"; version="1.0.1"; sha256="0lway32vjajlsnkvi7j9hcsaz7bmhzmi1w3r2gr28y5mbkpfkgb2"; depends=[]; }; +simPH = derive { name="simPH"; version="1.2.3"; sha256="1x773y7jblrv048vq1p99dzmb95wj2s4c01jgl0m7dg78z1hh5fl"; depends=[car DataCombine data_table dplyr ggplot2 gridExtra lazyeval MASS mgcv reshape2 stringr survival quadprog]; }; +simPop = derive { name="simPop"; version="0.2.6"; sha256="1cpi4bva7qpqlsl6xx6174hz3x5vk22i0y9am0ib0jdxampfz1v8"; 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=[]; }; +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]; }; +simone = derive { name="simone"; version="1.0-2"; sha256="071krim64s7fjwvwq7bjr0pw33mw9am9wpyypcy4gs7g1hj8wcir"; depends=[mixer]; }; +simpleboot = derive { name="simpleboot"; version="1.1-3"; sha256="1qprjisfflhzg8ll12p3q1zcfdiyc45glic2j9cw9nhx5rb065fk"; depends=[boot]; }; +simplexreg = derive { name="simplexreg"; version="1.0"; sha256="144kljh968i7n2d21r4204i4h952mfrkfc8b5r6x760msgjphxvh"; depends=[Formula plotrix]; }; +simsalapar = derive { name="simsalapar"; version="1.0-4"; sha256="035mimkia6q1yiz413pwbgfwk6cyad24kpvhmd6gp61njawwha19"; depends=[sfsmisc gridBase colorspace]; }; +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.1"; sha256="1m6sd41l723j0aa2f5pkgkwh3rs9jf946xkcyksywwxjmsflxcd7"; depends=[TAM CDM mirt combinat ic_infer sfsmisc sm psych pbivnorm gtools Rcpp qgraph lavaan semPlot 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]; }; +sitools = derive { name="sitools"; version="1.4"; sha256="0c0qnvsv06g6v7hxad96fkp9j641v8472mbphvaxa60k3xc7ackb"; depends=[]; }; +sjPlot = derive { name="sjPlot"; version="1.6"; sha256="03fxmvl8c4f8xd3l5hzha6rpk84xcilygpldlry5fvg0lrjcx7ry"; depends=[ggplot2 MASS car foreign plyr psych reshape2 scales]; }; +sjdbc = derive { name="sjdbc"; version="1.5.0-71"; sha256="0i9wdfadfcabayq78ilcn6x6y5csazbsgd60vssa2hdff0ncgvk1"; depends=[rJava]; }; +skatMeta = derive { name="skatMeta"; version="1.4.3"; sha256="0bknv066ya4yl4hl4y02d9lglq2wkl9c2j1shzg3d64dg4sjvbak"; depends=[Matrix coxme survival CompQuadForm]; }; +skda = derive { name="skda"; version="0.1"; sha256="0a6mksr1d0j3pd0kz4jb6yh466gvl4fkrvgvnlmvivpv6b2gqs3q"; depends=[]; }; +skewt = derive { name="skewt"; version="0.1"; sha256="1xm00zfzjv53cq9drfcx7w2ri5dwsq7kajrk2hc1mvw0b6s4x2ix"; depends=[]; }; +skmeans = derive { name="skmeans"; version="0.2-6"; sha256="1ncas6mx9w5saz28vvwni8g0wbm6m7gfv8a7azw4305pc64bawam"; depends=[slam clue cluster]; }; +sla = derive { name="sla"; version="0.1"; sha256="0fr5n65ppwsh9z7a6rma9ak0bl8x3nz7v25lij7wb5nrf3sl74yb"; depends=[]; }; +slackr = derive { name="slackr"; version="1.2"; sha256="1ymj3x52wyp0mp41xnnycg0vhdmv8whimwk1hzfsqr30pccnvn9j"; depends=[httr jsonlite data_table ggplot2]; }; +slam = derive { name="slam"; version="0.1-32"; sha256="000636dwj4kmj5w1w5s6bqixh78m7262y3fgizj7rfhcnc2gz7ad"; depends=[]; }; +sld = derive { name="sld"; version="0.3"; sha256="18xj57v9gg78d894cr1h6wp10i05hrnmwhmq6yh6211kdyj9ljp1"; depends=[lmom]; }; +slfm = derive { name="slfm"; version="0.1"; sha256="0s5q6ank6075sls9pkqhf7jlvi6gyvsbxa99c34d6ccrv88skyzq"; depends=[Rcpp coda Rcpp RcppArmadillo]; }; +slp = derive { name="slp"; version="1.0-3"; sha256="09jyrp6y3rigy043d8s5i7nh89pgpvn3cv51mr729c9ccr6jdjb1"; depends=[mgcv]; }; +sm = derive { name="sm"; version="2.2-5.4"; sha256="0hnq5s2fv94gaj0nyqc1vjdjd64vsp9z23nqa8hxvjcaf996rwj9"; depends=[]; }; +smaa = derive { name="smaa"; version="0.2-2"; sha256="1xd5yd63j67w9kb3sl3jbxkvd76270c1wlg9r3k85dm2mjd0l38v"; depends=[]; }; +smac = derive { name="smac"; version="1.0"; sha256="1inn7i5k0q5vln24kazh3gl3szf6lxwnjr2rw70jcyn9dr9iy952"; depends=[]; }; +smacof = derive { name="smacof"; version="1.5-0"; sha256="06csyz9fvdicxm11wh9mp6i4mvlgxyiclhlyg45grag0kqjgg6ha"; depends=[rgl polynom scatterplot3d Hmisc colorspace nnls]; }; +smacpod = derive { name="smacpod"; version="1.1.1"; sha256="1pmgxvww24mcgrvv87axqvw457r5wl57scqy93inmzia2mgyva1p"; depends=[spatstat]; }; +smam = derive { name="smam"; version="0.2-2"; sha256="1p6bzk4b9kpmfs4nxmcgc46hgdpldqg0pzpc0zhvs187z2nrfw75"; depends=[Matrix]; }; +smart = derive { name="smart"; version="1.0.1"; sha256="0ki3qn71zrw0nyv395qijcwahnxyv1p21j8x6cxr9spah2wzz8lb"; depends=[Matrix gplots gtools PMA elasticnet pcaPP igraph]; }; +smatr = derive { name="smatr"; version="3.4-3"; sha256="0iiazln4albj7k5w67slvyn98cqg4f6k409mml0n1pvlkki0h7gy"; depends=[plyr]; }; +smcUtils = derive { name="smcUtils"; version="0.2.2"; sha256="0d1kmg386j0zrpp8vgxjwvpf1i25l86xrh82767xkp0n9qj8srwq"; depends=[]; }; +smco = derive { name="smco"; version="0.1"; sha256="1sj3y1x6pc32cwzyhn9gaxs964xh5xl4vw08hsa8kfcxhh2r0s99"; depends=[]; }; +smcure = derive { name="smcure"; version="2.0"; sha256="1j7fxnb0sx57a0l929c3haz4f1y829ymlq0cvdh0cia4qp6ydv60"; depends=[survival]; }; +smdata = derive { name="smdata"; version="1.1"; sha256="1hcr093xfkp88fn75imjkmfnp9cfsng5ndxpa8m2g0l29qhpxfvk"; depends=[]; }; +smdc = derive { name="smdc"; version="0.0.2"; sha256="1j6xnzjbmmakbmk3lyjck3bsy8w8hyd9d8h04s4gbddhci283mqm"; depends=[proxy tm]; }; +sme = derive { name="sme"; version="0.8"; sha256="1djrs3z699p6q2y1hfywh27csqc9cp1cfm3lxkigmmvxqjhyshz6"; depends=[lattice]; }; +smfsb = derive { name="smfsb"; version="1.1"; sha256="0khd23b6k9zgxz2x6g6c6k2g32mbpli32izdq6fgk1a990kdsp6j"; depends=[]; }; +smirnov = derive { name="smirnov"; version="1.0-1"; sha256="09mpb45wj8rfi6n6822h4c335xp2pl0xsyxgin1bkfw97yjcvrgk"; depends=[]; }; +smoothHR = derive { name="smoothHR"; version="1.0.1"; sha256="02kjqkgnhjwhq1vmva9nmy36a7bc6zjj6g81dw9m4zd3y9nbb005"; depends=[survival]; }; +smoothSurv = derive { name="smoothSurv"; version="1.3-2"; sha256="11aq3yb7q4pilp00l7q8r3ywbmwnka63kkjpvakp27mvaqyr02qr"; depends=[survival]; }; +smoother = derive { name="smoother"; version="1.0.0.0"; sha256="0i4g19xh20v4ig9fcy1gvbawi0a92jkg2qwdcxvgcflvppnvbv22"; depends=[]; }; +smoothie = derive { name="smoothie"; version="1.0-1"; sha256="12p4ig8fbmlsby5jjd3d27njv8j7aiwx0m2n1nmgvjj0n330s1kj"; depends=[]; }; +smoothmest = derive { name="smoothmest"; version="0.1-2"; sha256="14cri1b6ha8w4h8m26b3d7qip211wfv1sywgdxw3a6vqgc65hmk5"; depends=[MASS]; }; +smoothtail = derive { name="smoothtail"; version="2.0.3"; sha256="0yr3j5mq1h9pd72kyi9z6wzly9cqkscim814yi710y79l03gp0fd"; depends=[logcondens]; }; +sms = derive { name="sms"; version="2.3"; sha256="0grxyp590hj2rvw1fw3yidzkl8nqqp5a14bp9xfpdph2nyas61qq"; depends=[doParallel foreach]; }; +smss = derive { name="smss"; version="1.0-1"; sha256="17a0x92hxzn212yiz87n7ssyi3bdhnyawxk1kkmk46q1ss22a1pm"; depends=[]; }; +sn = derive { name="sn"; version="1.1-1"; sha256="0nmwg1jqq42d4i7zhdlsjhja5wa2ily0n3d4vsri0f96cppnpkn2"; depends=[mnormt numDeriv]; }; +sna = derive { name="sna"; version="2.3-2"; sha256="1dmdv1bi22gg4qdrjkdzdc51qsbb2bg4hn47b50lxnrywdj1b5jy"; depends=[]; }; +snapshot = derive { name="snapshot"; version="0.1.2"; sha256="0cif1ybxxjpyp3spnh98qpyw1i5sgi1jlafcbcldbqhsdzfz4q10"; depends=[]; }; +snht = derive { name="snht"; version="1.0"; sha256="12aw4d6n97g05qwwj8bk2pfg2b4b3k1hm9ihl17av3aicgvzmw3p"; depends=[MASS zoo plyr reshape]; }; +snipEM = derive { name="snipEM"; version="1.0"; sha256="0f98c3ycl0g0l3sgjgk7xrjp6ss7n8zzlyzvpcb6agc60cnw3w03"; depends=[Rcpp mvtnorm MASS GSE Rcpp RcppArmadillo]; }; +snow = derive { name="snow"; version="0.3-13"; sha256="1habq43ncac9609xky3nqfkbq52cz36dg8jbdihag269z1kazdnf"; depends=[]; }; +snowFT = derive { name="snowFT"; version="1.3-0"; sha256="10hhhzzzyz1ph7c8k08s79h4pdwq4jk8bh47y37ww0yjq0fd6gik"; depends=[snow]; }; +snowfall = derive { name="snowfall"; version="1.84-6"; sha256="1n9v9m4c02pspgkxfmq7zdk41s2vjcsk06b0kz9km4xy1x7k0hsg"; depends=[snow]; }; +snp_plotter = derive { name="snp.plotter"; version="0.5.1"; sha256="16apsqvkah5l0d5qcwp3lq2jspkb6n62wzr0wskmj84jblx483vv"; depends=[genetics]; }; +snpEnrichment = derive { name="snpEnrichment"; version="1.6.0"; sha256="1wzzlvjrvp8bwjxa0rh7427j9d9fkvxx2q4rs9hq1sf51vj5986b"; depends=[]; }; +snpStatsWriter = derive { name="snpStatsWriter"; version="1.5-6"; sha256="04qhng888yih8gc7yd6rrxvvqf98x3c2xxz22gkwqx59waqd4jlq"; depends=[colorspace]; }; +snpar = derive { name="snpar"; version="1.0"; sha256="0c9myg748jm7khqs8yhg2glxgar1wcf6gyg0xwbmw0qc41myzfnq"; depends=[]; }; +snplist = derive { name="snplist"; version="0.12"; sha256="0jsf080pbpnsx2jygyqg0l14lsr4fvjzahgchdrawjhl2rky4nwl"; depends=[RSQLite Rcpp R_utils Rcpp]; }; +sns = derive { name="sns"; version="0.9.1"; sha256="1knah4y3amv9j03djdm0kcwd50z8hdrpiknx1i35m3bdix85knsn"; depends=[mvtnorm]; }; +soc_ca = derive { name="soc.ca"; version="0.7.1"; sha256="0lg1bpbd0crywa29xc79cn3kr614wq4hr09xpwk17nv7q8qw8cnh"; depends=[ggplot2 gridExtra ellipse scales]; }; +softImpute = derive { name="softImpute"; version="1.0"; sha256="0pkpr8pxvrrw4p95907bnhl3k54dxz5r2fk8zi56kilrarhzchqr"; depends=[Matrix]; }; +softclassval = derive { name="softclassval"; version="1.0-20130317"; sha256="1ifqm4a3xxi9wd4l1q4l5h4q5f8hp0k28mqpszzj8k1czbph88ql"; depends=[arrayhelpers]; }; +soil_spec = derive { name="soil.spec"; version="2.1.3"; sha256="17fm4hyx8g6pj7qv11xlnx459x1s41fapz6ck4my9br734gcm4ns"; depends=[KernSmooth wavelets hexView pls]; }; +soilDB = derive { name="soilDB"; version="1.3-2"; sha256="0rpkj9rjk75nz4dp0hkp4xjmd5s4lwppabbdqppwc5xs0565rdb6"; depends=[RODBC aqp plyr Hmisc]; }; +soilphysics = derive { name="soilphysics"; version="1.2"; sha256="0n1w211dkgacahna8b62v2mk813nma66m0y4krwydcbsnwhs4k30"; depends=[rpanel MASS]; }; +soilprofile = derive { name="soilprofile"; version="1.0"; sha256="0sdfg6m2m6rb11hj017jx2lzcgk6llb01994x749s0qhzxmvx9mb"; depends=[aqp lattice munsell splancs]; }; +soiltexture = derive { name="soiltexture"; version="1.2.19"; sha256="0nw72913qb1hpifjqv0s1z5sxhgavhbalqhjczxg8b66fwqzrs7l"; depends=[sp MASS]; }; +soilwater = derive { name="soilwater"; version="1.0.1"; sha256="08rz1i5dsgwfvfd4sl5x9j970v82v3kny0rqg1zbdnr53vp2xc7j"; depends=[]; }; +solaR = derive { name="solaR"; version="0.38"; sha256="0cvza0d4kd47kr6749ysvw664kjja87ppn4jvan4hrklczbpdc9z"; depends=[lattice latticeExtra zoo]; }; +solr = derive { name="solr"; version="0.1.4"; sha256="0b1f6mf8fi2ql8j06b0mkk7nyy5wj1zsg46lfxi6bp8n4ywbym9n"; depends=[plyr httr XML assertthat rjson]; }; +som = derive { name="som"; version="0.3-5"; sha256="01xsysmqj0zhzifqpwcrs0mflh56ndv4q3nm5n5imx7wmzx2lrzp"; depends=[]; }; +soma = derive { name="soma"; version="1.1.1"; sha256="1mc1yr9sq9h2z60v40aqmil0xswj5hgxfdh4racq297qw3a97my4"; depends=[reportr]; }; +someKfwer = derive { name="someKfwer"; version="1.2"; sha256="0widny5l04ja91fy16x4giwrabwqhx0fs3yl48pv9xh4zj6sx563"; depends=[]; }; +someMTP = derive { name="someMTP"; version="1.4.1"; sha256="19bsn8rny1vv9343bvk8xzhh82sskl0zg0f5r59g9k812q5llchn"; depends=[]; }; +somebm = derive { name="somebm"; version="0.1"; sha256="1iwwc94k6znh4d3bbjnvwp4chc4wg0iy4v2f99cs4jasrsimb4p8"; depends=[]; }; +somplot = derive { name="somplot"; version="1.6.4"; sha256="06c8p2lqz3yxmxdl7ji8a3czvxnsbl7bwyiig76pkwc3a5qqfbb9"; depends=[hexbin]; }; +sonicLength = derive { name="sonicLength"; version="1.4.4"; sha256="1v46xzx3jxxxs2biyrq6xbv2lhpz1i95la93hj6dl4jfyikmx0im"; depends=[]; }; +soobench = derive { name="soobench"; version="1.0-73"; sha256="1y2r061pd4kr0kdgp8db3qy2aj07jdiyvy2py4fmwg6b8pcf9y0l"; depends=[]; }; +sortinghat = derive { name="sortinghat"; version="0.1"; sha256="1wrxwhdp3gj1ra0rgldnmc0w019bnjb6z9j20c5p1ab09x4dmlny"; depends=[MASS bdsmatrix mvtnorm]; }; +sorvi = derive { name="sorvi"; version="0.6.23"; sha256="070g6kxnacqwzl4djhbb5zjvp71997xl2l53cfni05yf7mkm17as"; depends=[reshape pxR ggplot2 plyr RColorBrewer XML]; }; +sos = derive { name="sos"; version="1.3-8"; sha256="0vcgq8hpgdnlmkxc7qh1jqigr0gvm9x3w4ijbhma7x4i5fx3c2il"; depends=[brew]; }; +sos4R = derive { name="sos4R"; version="0.2-11"; sha256="0r4lficx8wr0bsd510z4cp6la32xf928rsiznbywpxghnypsrcgg"; depends=[XML RCurl sp]; }; +sotkanet = derive { name="sotkanet"; version="0.9.03"; sha256="1h8jmwv99hcrl5hkd99ypphvl8hx6k765vb8aphzp8a0vh42pkl1"; depends=[ggplot2 rjson]; }; +soundecology = derive { name="soundecology"; version="1.1.1"; sha256="0md33ipcqcsbl361s242c4wk9szsl8sywks6ikzljabrfpjy3bkp"; depends=[pracma oce ineq vegan tuneR seewave]; }; +source_gist = derive { name="source.gist"; version="1.0.0"; sha256="03bv0l4ccz9p41cjw18wlz081vbjxzfgq3imlhq3pgy9jdwcd8fp"; depends=[RCurl rjson]; }; +sp = derive { name="sp"; version="1.0-16"; sha256="1g65kwf4c7wip91q36d0i7ir52vlgpsrahw2phgkn37k25nwzxs3"; depends=[lattice]; }; +sp23design = derive { name="sp23design"; version="0.9"; sha256="1ihvcld19cxflq2h93m9k9yaidhwixvbn46fqqc1p3wxzplmh8bs"; depends=[mvtnorm survival]; }; +spBayes = derive { name="spBayes"; version="0.3-8"; sha256="0pmriffqnblqyd1332a2pqrjr7y3wllb17swb403h7c9dph6mzzv"; depends=[coda magic abind Formula]; }; +spBayesSurv = derive { name="spBayesSurv"; version="1.0.1"; sha256="1c23f73hzzdpz5cbjixgdg7b5xj6d9ch45hf71skr2rd79a39sqi"; depends=[Rcpp survival coda Rcpp RcppArmadillo]; }; +spMC = derive { name="spMC"; version="0.3.4"; sha256="0s04vdj7xi2zayxy6qx918fqsp0p8hixx6a101b0w0a3db9gshv5"; depends=[]; }; +spThin = derive { name="spThin"; version="0.1.0"; sha256="06qbk0qiaw7ly1ywbr4cnkmqfasymr7gbhvq8jjbljm0l69fgjpp"; depends=[spam fields knitr]; }; +spTimer = derive { name="spTimer"; version="1.0-3"; sha256="0ys1apara63l3a6sx07hgb1v67yq02lm9w8x70f1ixisilhw6q39"; depends=[coda sp]; }; +spa = derive { name="spa"; version="2.0"; sha256="1np50qiiy3481xs8w0xfmyfl3aypikl1i1w8aa5n2qr16ksxrnq3"; depends=[cluster MASS]; }; +spaMM = derive { name="spaMM"; version="1.4.1"; sha256="1dz6kx64g69i8fv87ws74a3j33hssshii15qf99brrs5dsd16jfz"; depends=[Matrix MASS lpSolveAPI proxy geometry Rcpp nlme Rcpp RcppEigen]; }; +spaa = derive { name="spaa"; version="0.2.1"; sha256="0qlfbfvv97avbnixm5dz9il3dmd40wnpvv33jh7fa0mh740bircy"; depends=[]; }; +space = derive { name="space"; version="0.1-1"; sha256="1qigfz62xz47hqi43aii3yr4h7ddvaf11a5nil7rqprgkd0k6mv3"; depends=[]; }; +spaceExt = derive { name="spaceExt"; version="1.0"; sha256="0lp8qmb7vcgxqqpsi89zjy7kxpibg3x2mq205pjmsrbbh7saqzr4"; depends=[limSolve glasso]; }; +spacejam = derive { name="spacejam"; version="1.1"; sha256="1mdxmfa1aifh3h279cklm4inin0cx3h0z2lm738bai34j6hpvar7"; depends=[igraph Matrix]; }; +spacetime = derive { name="spacetime"; version="1.1-1"; sha256="1c5bkc2dih30frzv2qbzmjvd0vy6n1d4ajp8r84kag2ync3hsdqd"; depends=[sp zoo xts intervals lattice rgeos]; }; +spacodiR = derive { name="spacodiR"; version="0.13.0115"; sha256="0c0grrvillpwjzv6fixviizq9l33y7486ypxniwg7i5j6k36nkpl"; depends=[picante colorspace Rcpp Rcpp]; }; +spacom = derive { name="spacom"; version="1.0-4"; sha256="1jfsbgy7b0mwl4n2pgrkkghx9p8b0wipvg4c5jar6v8ydby6qg94"; depends=[spdep foreach iterators lme4 nlme Matrix]; }; +spam = derive { name="spam"; version="1.0-1"; sha256="033s5ka05kg97fmc3l1li3z6x5225rwhrdxh57wwn4axrjwy1nyy"; depends=[]; }; +sparc = derive { name="sparc"; version="0.9.0"; sha256="0jsirrkmvrfxav9sphk8a4n52fg0d1vnk3i8m804i4xl0s7lrg8s"; depends=[]; }; +sparcl = derive { name="sparcl"; version="1.0.3"; sha256="1348pi8akx1k6b7cf4bhpm4jqr5v8l5k086c7s6rbi5p6qlpsrvz"; depends=[]; }; +spareserver = derive { name="spareserver"; version="1.0.0"; sha256="0vaql5v3337xh1ifjziav3v7fkjff4zhrz557mgy75ham554gs7c"; depends=[assertthat pingr httr]; }; +spark = derive { name="spark"; version="1.0.0"; sha256="0ryc7kq3hx8nd5m999p1y7lxli6x862y6hqpv8xwpqak0y863p6m"; depends=[magrittr]; }; +sparkTable = derive { name="sparkTable"; version="0.12.0"; sha256="1q0wz090db9ff46k9w6wk1qk20yr527ilg2ply4qcw3zjydk8cc5"; depends=[Cairo gridExtra ggplot2 shiny Rglpk xtable StatMatch boot pixmap RGraphics]; }; +sparktex = derive { name="sparktex"; version="0.1"; sha256="0r6jnn9fj166pdhnjbsaqmfmnkq0qr1cjprihlnln9jad05mrkjx"; depends=[]; }; +sparr = derive { name="sparr"; version="0.3-6"; sha256="1imgph2bf575rm06l4vsz0nhizkrwa3p5j6b6gdn30l0hlhxjp0j"; depends=[spatstat rgl MASS]; }; +sparseBC = derive { name="sparseBC"; version="1.0"; sha256="16x581pm9fkbb4kp8lvz95mnckgrjbiwj9zin8hzyxdl1nrg4c3m"; depends=[glasso]; }; +sparseHessianFD = derive { name="sparseHessianFD"; version="0.1.1"; sha256="15x9v7b40mxl1z9ncazxzfzz7igvzmck22wlgj2y7c2ja8jxi6n2"; depends=[Rcpp RcppEigen Matrix Rcpp RcppEigen]; }; +sparseLDA = derive { name="sparseLDA"; version="0.1-6"; sha256="0k9v2pjx4q4nhvpjhv496v4gfr5h19w0h2h7za7j6zqfn6aygvz6"; depends=[lars elasticnet MASS mda]; }; +sparseLTSEigen = derive { name="sparseLTSEigen"; version="0.2.0"; sha256="11llmrkq0pnrdphgjvhmg269bq3xbbn4s7kd7xhvk62sigvspkcj"; depends=[robustHD Rcpp RcppEigen Rcpp RcppEigen]; }; +sparseMVN = derive { name="sparseMVN"; version="0.1.0"; sha256="1xcq1w80ypqdz4zxwhnnzc50lhja6qxfxxnrg5xkgzpmy1zvjbzq"; depends=[Matrix]; }; +sparseSEM = derive { name="sparseSEM"; version="2.5"; sha256="0ig8apsi94kvbcq3i8nzmywbdizlss7c6r9bppcyl9lxgikc3cds"; depends=[]; }; +sparsediscrim = derive { name="sparsediscrim"; version="0.2"; sha256="0m8ccmqpg1np738njavf736qh917hd3blywyzc3vwa1xl59wqccl"; depends=[corpcor bdsmatrix mvtnorm]; }; +sparsenet = derive { name="sparsenet"; version="1.2"; sha256="106a2q4syrcnmicrx92gnbsf2i5ml7pidwghrpl6926glj59j248"; depends=[glmnet shape]; }; +spartan = derive { name="spartan"; version="2.1"; sha256="1zkb08ppsmbkvgw16y46nlhcsb2s7dh3rcm7f57ydchpda2gxixh"; depends=[]; }; +spatcounts = derive { name="spatcounts"; version="1.1"; sha256="0rp8054aiwc62r1m3l4v5dh3cavbs5h2yb01453bw9rwis1pj2qm"; depends=[]; }; +spate = derive { name="spate"; version="1.3"; sha256="17aiqi5cd17y9kaqx9yssk772ghcldk9i4s8nyafq8zp8d4r85i1"; depends=[mvtnorm truncnorm]; }; +spatgraphs = derive { name="spatgraphs"; version="2.62"; sha256="1h7sv6qc5zhaiaqlrzagrlc2mxlasdzilmi5q9nrd1vsdzsqxvb4"; depends=[]; }; +spatial = derive { name="spatial"; version="7.3-8"; sha256="1vc6pc5i7nbazbh5y3hhr9kgaq0gd9xi89xc8ah4n0lrivjbxfa8"; depends=[]; }; +spatial_gev_bma = derive { name="spatial.gev.bma"; version="1.0"; sha256="1rjn0gsbgiv69brhnm0zj25ya3nyfh4yf6jizng85mvss3viv3hj"; depends=[SpatialExtremes msm coda]; }; +spatial_tools = derive { name="spatial.tools"; version="1.4.8"; sha256="0qnsjfx974na87p3n7sp711sc13v6dmpvb2kjpvscixs8rsy03y1"; depends=[iterators foreach rgdal raster mmap abind doParallel]; }; +spatialCovariance = derive { name="spatialCovariance"; version="0.6-8"; sha256="06z6jz9sadqc382w07ysnnlhqc96hxaasz9wncbhipd4cd1y4daa"; depends=[]; }; +spatialTailDep = derive { name="spatialTailDep"; version="1.0.2"; sha256="107yldc43pgbadxdisnc7vq8vyvcps1b1isyvxd0kyf59xldiq47"; depends=[cubature mvtnorm SpatialExtremes]; }; +spatialkernel = derive { name="spatialkernel"; version="0.4-19"; sha256="0gbl6lrbaxzv2f975k0vd6ghrljgf1kjazld3hm7781kv1f87lji"; depends=[]; }; +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.39-1"; sha256="0z5vma9mk2laf33sqqvbcachs41niqdxvggzk6bk9fjnqbr85520"; depends=[mgcv 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=[]; }; +spcadjust = derive { name="spcadjust"; version="0.1-3"; sha256="1l6m4aisk780znpjr7lnlh0z42rbc2jyblv17hafbr1siymrasc2"; depends=[]; }; +spcosa = derive { name="spcosa"; version="0.3-5"; sha256="15q0f2sfhm1b13zs5a50yfvqhgcn4fyncf0h5ivin2k9g5xvq4k4"; depends=[rJava ggplot2 sp]; }; +spcov = derive { name="spcov"; version="1.01"; sha256="1brmy64wbk56bwz9va7mc86a0ajbfy09qpjafyq2jv7gm7a35ph5"; depends=[]; }; +spcr = derive { name="spcr"; version="1.2"; sha256="0xixl6b4h3iawpbfgdni6z2v7ch3ydn7s9fyr8g0sjr4svzqbyiv"; depends=[]; }; +spd = derive { name="spd"; version="2.0-0"; sha256="0aznzj68gynhx295gdb4sb7xxjiya4vbdg3gshfs0mwg1qzrhxy9"; depends=[KernSmooth]; }; +spdep = derive { name="spdep"; version="0.5-77"; sha256="0l4qsfcjdmj1xpc53b0vhv50n533ijzjcg0lmm7w8pslyhkmq8hh"; depends=[sp Matrix LearnBayes deldir boot coda nlme MASS]; }; +spdynmod = derive { name="spdynmod"; version="1.0"; sha256="05gaaln14lrrds43l2f9hw43c86gswyzymz97hc3mci1cgiwfwbz"; depends=[deSolve raster animation]; }; +spe = derive { name="spe"; version="1.1.2"; sha256="0xyx42n3gcsgqmy80nc9la6p6gq07anpzx0afwffyx9fv20fvys0"; 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.1"; sha256="1bc8y4wk09spsvbv8cn1iqq2y9qdlvrcnpqh2s0b8j4nxx262gyb"; 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]; }; +sperich = derive { name="sperich"; version="1.5-5"; sha256="0xwzyfx3z06lapvhzdzrfr9hw2hm8d0cyfmc29p5fcplmjm24idh"; depends=[]; }; +sperrorest = derive { name="sperrorest"; version="0.2-1"; sha256="17jq8r98pq3hsyiinxg30lddxwpwi696srsvm3lfxrzk11076j6v"; depends=[ROCR rpart]; }; +spfrontier = derive { name="spfrontier"; version="0.1.10"; sha256="0x1f8g8lg1f5kp9m2pnj8qbv5pjk40kh40yd3s6iwgny4hjsmg60"; depends=[moments ezsim tmvtnorm mvtnorm Matrix]; }; +spgrass6 = derive { name="spgrass6"; version="0.8-6"; sha256="0vpv2vycd6rdnwm1f73733x1nclhr2x4x1s5116szskni77b0pii"; depends=[sp XML]; }; +spgwr = derive { name="spgwr"; version="0.6-25"; sha256="03kddalnlis5vw9d8shmp2v8f057nqnsvh5qncx75hpbhrzvkmni"; depends=[sp]; }; +sphereplot = derive { name="sphereplot"; version="1.5"; sha256="1i1p20h95cgw5wqp9bwfs9nygm4dxzsggz08ncjs1xrsvhhq9air"; depends=[rgl]; }; +sphet = derive { name="sphet"; version="1.5"; sha256="00hgzashw5qdv7j2q0cz433k595d8dzlxr89kvz1z2cpb87pfv54"; depends=[nlme spdep Matrix sp]; }; +spi = derive { name="spi"; version="1.1"; sha256="0gc504f7sji5x0kmsidnwfm7l5g4b1asl3jkn2jzsf2nvjnplx1z"; depends=[]; }; +spider = derive { name="spider"; version="1.3-0"; sha256="1p6f8mlm055xq3qwa4bqn9kvq60p8fn2w0cc6qcr22cblm5ww7jp"; depends=[ape pegas]; }; +spikeSlabGAM = derive { name="spikeSlabGAM"; version="1.1-7"; sha256="1hdclj3fq31n9hvyggj2rvz2m95kjszbcswa46vfi2vyiwbb2bia"; depends=[ggplot2 akima coda cluster gridExtra MASS MCMCpack mvtnorm R2WinBUGS reshape scales]; }; +spikeslab = derive { name="spikeslab"; version="1.1.5"; sha256="0dzkipbrpwki6fyk4hqlql3yhadwmclgbrx00bxahrmlaz1vjzh2"; depends=[lars randomForest]; }; +splancs = derive { name="splancs"; version="2.01-36"; sha256="0m29zh91jyz69nh2a9iigzcaxd1mlhq3b7z40vgqib4jnbzkbyg5"; depends=[sp]; }; +splitstackshape = derive { name="splitstackshape"; version="1.4.2"; sha256="0m9karfh0pcy0jj3dzq87vybxv9gmcrq5m2k7byxpki95apbrsmg"; depends=[data_table]; }; +splm = derive { name="splm"; version="1.1-0"; sha256="1dhfasan5abr9gf6lfdl83cr47ckkj5sqjqgclnc6f6a2125q1fi"; depends=[MASS nlme spdep plm Matrix bdsmatrix spam ibdreg car lmtest Ecdat maxLik]; }; +spls = derive { name="spls"; version="2.2-1"; sha256="0zgk9qd825zqgikpkg13jm8hi6ncg48qw5f985bi145nwy9j19xs"; depends=[MASS nnet pls]; }; +splus2R = derive { name="splus2R"; version="1.2-0"; sha256="0kmyr1azyh0m518kzwvvgz7hv1x5myj37xn7w2gfn0vbn5xl8pv1"; depends=[]; }; +splusTimeDate = derive { name="splusTimeDate"; version="2.5.0-135"; sha256="0hghggdcr70vfjx4npj37nmd96qvgrp1gpwa9bznvjkvyfawwy6i"; depends=[]; }; +splusTimeSeries = derive { name="splusTimeSeries"; version="1.5.0-73"; sha256="1csk0ffgg1bi2k1m2bbxl6aqqqxf6i8sc8d4azip8ck7rn8vya46"; depends=[splusTimeDate]; }; +spnet = derive { name="spnet"; version="0.9.0.1"; sha256="0fy19y155m1fmifdnsyb8y71xgnk3hyril28x68bwvn2v9d737k5"; depends=[sp shape]; }; +spocc = derive { name="spocc"; version="0.2.2"; sha256="0hy72nh29hkzgqhsbadx4708y4sswacn9z75kcrqd1krc5fqa926"; depends=[ggplot2 rgbif rinat rbison ecoengine rebird AntWeb plyr ggmap maptools rworldmap sp rgeos lubridate RColorBrewer httr XML rgdal RJSONIO leafletR data_table assertthat whisker]; }; +sporm = derive { name="sporm"; version="1.1"; sha256="07sxz62h4jb7xlqg08sj4wpx121n9jfk65196mnxdvb36lqmb4hp"; depends=[]; }; +sprint = derive { name="sprint"; version="1.0.7"; sha256="1yzx1qjpxx9yc0hbm1mmha5b7aq13iflq66af597b7yj6abm7zjp"; depends=[rlecuyer ff randomForest boot e1071]; }; +sprinter = derive { name="sprinter"; version="1.0.0"; sha256="0g14hygc8hmm82vfkaxs2vhfsdkwfz3mklhz273jgvzhx0wzbmf7"; depends=[randomForestSRC CoxBoost survival LogicReg]; }; +sprsmdl = derive { name="sprsmdl"; version="0.1-0"; sha256="09klwsjp5w6p7dkn5ddmqp7m9a3zcmpr9vhcf00ynwyp1w7d26gi"; depends=[]; }; +spsmooth = derive { name="spsmooth"; version="1.1-3"; sha256="09b740586zyi8npq0bmy8qifs9rq0rzhs9c300fr6pjpc7134xn4"; depends=[mgcv]; }; +spsurvey = derive { name="spsurvey"; version="2.6"; sha256="1s48acqi502mdabhymhn0jjsghnlh2w6wnrfaa9gv0a7xjvjkydq"; depends=[sp deldir foreign MASS rgeos]; }; +spt = derive { name="spt"; version="1.13-8-8"; sha256="18s74pxfmsjaj92z2a34nq90caf61s84c616yv33a0xvfvp32qr5"; depends=[]; }; +sptm = derive { name="sptm"; version="14.10-11"; sha256="1g7dqfsyy0cvv3idx16bpny9z4f638aprbc50x8kk4zfk3km7wnr"; depends=[survival survey kyotil]; }; +spuRs = derive { name="spuRs"; version="2.0.0"; sha256="0lbc3nny6idijdaxrxfkfrn40bxfyp9z3yl9mwb1k6cyd10v5mfj"; depends=[MASS lattice]; }; +sqldf = derive { name="sqldf"; version="0.4-10"; sha256="0n8yvrg3gjgbc3vzq0vlf7fwhgm28kwf0jv25qy44x21n6fg11h7"; depends=[gsubfn proto RSQLite DBI chron]; }; +sqliter = derive { name="sqliter"; version="0.1.0"; sha256="17jjljq60szz0m8p2wc5l56659aap7an5gknc848dp89ycjgj3zx"; depends=[stringr functional DBI RSQLite]; }; +sqlshare = derive { name="sqlshare"; version="1.0.3"; sha256="1qy8vlzi6i4wsr53i71jlsv1b7ww254mbk2qzsvmcrranf42zbp8"; depends=[RCurl]; }; +sqlutils = derive { name="sqlutils"; version="1.2"; sha256="0dq4idg8i4hv9xg8jllllizqf3s75pdfm1wgncdjj52xhxh169pf"; depends=[roxygen2 stringr DBI]; }; +squash = derive { name="squash"; version="1.0.6"; sha256="16iplngzzlif999z821a9bwx9jlmikdvwnk6p6d9w75b1fsbc0pz"; depends=[]; }; +sra = derive { name="sra"; version="0.1"; sha256="165r1aiv17gdhln2374724nx04wjcdpillxwwkxgshz3kjyvajvj"; depends=[]; }; +ss3sim = derive { name="ss3sim"; version="0.8.2"; sha256="1gj3kf4ccd5n2jr4sm50gny5x1zq4brkhqgw0nww41spnimascfr"; depends=[plyr r4ss gtools lubridate reshape2]; }; +ssanv = derive { name="ssanv"; version="1.0-2"; sha256="18ib0djqxjpp4xgvsffwqgxqljpwc24ysxj26phpr6p8kdl3hr2f"; depends=[]; }; +sse = derive { name="sse"; version="0.5-1"; sha256="0g0bwmgc585haqbb13366s3pv1vdh793hwwibz7im0avjs2ldsjq"; depends=[lattice]; }; +ssfit = derive { name="ssfit"; version="1.1"; sha256="1fais0msi2ppgfp0vbx3qri7s9zs51i7n90w36xkwwac4f46bq5y"; depends=[survey]; }; +ssh_utils = derive { name="ssh.utils"; version="1.0"; sha256="08313zzzgcyvzkrkq0w0yf748ya1a9shx5xnan5891v0lah9v0b1"; depends=[stringr]; }; +ssize_fdr = derive { name="ssize.fdr"; version="1.1"; sha256="00y00cb0bhsk0qcq9f96dcmmzmy88k1qyhx9ampws34n133cl509"; depends=[]; }; +ssmrob = derive { name="ssmrob"; version="0.4"; sha256="1inndspir7571f54kalbj0h599v9k6dxdmp0n1l5r3a62vn45hd3"; depends=[sampleSelection robustbase mvtnorm MASS]; }; +sspline = derive { name="sspline"; version="0.1-6"; sha256="0d6ms8szyn39c7v0397d5ar2hrl8v1l2b7m8hlj37hgp70b9s55h"; depends=[]; }; +sss = derive { name="sss"; version="0.0-11"; sha256="0k7p1ws0w7wg9wyxcg1zpk8q6kr32l3jl6yd9r4qmzq04dwqrdgz"; depends=[plyr XML]; }; +ssvd = derive { name="ssvd"; version="1.0"; sha256="1fdpr38qi59ijrz16jixn6ii1hvmxfjirjqfcp7dxrqz9nx8x0sk"; depends=[]; }; +ssym = derive { name="ssym"; version="1.5.1"; sha256="026qn8qaf0y7kwb82rqpbhhkc645s5a2s6r408h8hx6bppvg7i8y"; depends=[GIGrvg numDeriv normalp Formula]; }; +st = derive { name="st"; version="1.2.3"; sha256="10wq705vyzarkgmfn3sblac979p20xv02hq01g75yp2krm1v8h3x"; depends=[sda fdrtool corpcor]; }; +stab = derive { name="stab"; version="0.1.8"; sha256="1rbwfxdbdqb1l91xmnnz5z5m353z4rjihr0c1f7r77a0zl7sa3zj"; depends=[MASS reshape]; }; +stabledist = derive { name="stabledist"; version="0.6-6"; sha256="0s59jp3y5ks4rfj7x76vb9g3slbbn98lvki54lv96yxdfr8i7ry5"; depends=[]; }; +stabs = derive { name="stabs"; version="0.1-0"; sha256="0ira32jw8fdv7qcmvk6ai0vgwn7mh1srxb5m7v2v5aj29gd2zfcd"; depends=[]; }; +stacomirtools = derive { name="stacomirtools"; version="0.3"; sha256="1lbbnvmilf3j3hyhvpkyjd4b4sf3zwygilb8x0kjn2jfhkxnx4c1"; depends=[RODBC xtable]; }; +stam = derive { name="stam"; version="0.0-1"; sha256="1x1j45fir64kffny0nssb2hwn4rcp8gd2cjv6fw4yy0l4d0xi5iv"; depends=[np sp]; }; +stargazer = derive { name="stargazer"; version="5.1"; sha256="0ar0qm289ncsns2pqkabpyjc90ws0il1q7fp5206wqghgsvqjcc0"; depends=[]; }; +startupmsg = derive { name="startupmsg"; version="0.9"; sha256="1l75w4v1cf4kkb05akhgzk5n77zsj6h20ds8y0aa6kd2208zxd9f"; depends=[]; }; +stashR = derive { name="stashR"; version="0.3-5"; sha256="1lnpi1vb043aj4b9vmmy56anj4344709986b27hqaqk5ajzq9c3w"; depends=[filehash digest]; }; +statar = derive { name="statar"; version="0.1.2"; sha256="1sy0nvpx9ji39bjjrlb23d46r2inyljzsk54lf1llmfjpy6pslkp"; depends=[data_table dplyr ggplot2 Hmisc lazyeval lfe lubridate matrixStats stringr tidyr]; }; +statcheck = derive { name="statcheck"; version="1.0.0"; sha256="05hvwyy5fdy11v6dim0sm4n7qffhhkgpwg0120jhykjssyivimpx"; depends=[plyr]; }; +statebins = derive { name="statebins"; version="1.0"; sha256="1mqky4nb31xjhn922csvv8ps2fwgcgazxs56rcn3ka32c59a4mmg"; depends=[ggplot2 scales gridExtra RColorBrewer]; }; +statfi = derive { name="statfi"; version="0.9.8"; sha256="0kg9bj2mmd95ysg604rcg4szqx3whbqm14fwivnd110jgfy20gk2"; depends=[pxR]; }; +statmod = derive { name="statmod"; version="1.4.20"; sha256="11986yjry1lg28s09q6vv2671x51nnfin6j0mpscq2ygyi615jwz"; depends=[]; }; +statnet = derive { name="statnet"; version="2014.2.0"; sha256="0xp8xnqb32wzkxfm7f34z6mnsd9id8an5829n16czwldj9vv6s10"; depends=[network ergm sna networkDynamic tergm ergm_count latentnet statnet_common]; }; +statnet_common = derive { name="statnet.common"; version="3.1.1"; sha256="1fs38f4dxrvgm60xvn04jr2wwyrjg25h3rbdwrx7dx24fj7sx6wl"; depends=[]; }; +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=[]; }; +stepp = derive { name="stepp"; version="3.0-11"; sha256="0jrwfvcgh3sjm3zag93kjyny2qqsyiw988vnx6jw7s31bv9g0d6s"; depends=[car survival]; }; +stepwise = derive { name="stepwise"; version="0.3"; sha256="1lbx1bxwkf9dw6q46w40pp7h5nkxgghmx8rkpaymm6iybc7gyir2"; 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]; }; +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="0.9-0"; sha256="1ziad5jdq4ilfrd3fkh83sz32k21cq7g982qnkdam9aly1rnrijf"; depends=[coda Rcpp Rcpp]; }; +stockPortfolio = derive { name="stockPortfolio"; version="1.2"; sha256="0k5ss6lf9yhcvc4hwqmcfpdn6qkbq5kaw0arldkl46391kac3bd1"; depends=[]; }; +stoichcalc = derive { name="stoichcalc"; version="1.1-3"; sha256="0z9fnapibfp070jxg27k74fdxpgszl07xiqfj448dkydpg8ydkrb"; depends=[]; }; +stosim = derive { name="stosim"; version="0.0.12"; sha256="0c4sj5iirm542hx782izfdmy2m3kl5q28l10xjj0ib4xn5y6yx3c"; depends=[tcltk2 Rcpp Rcpp]; }; +stpp = derive { name="stpp"; version="1.0-4"; sha256="04xl2745xr5r7yirbdmxaxqvl4gp73wr6xl08w21mcccsnpc3d1s"; depends=[splancs KernSmooth spatstat]; }; +stppResid = derive { name="stppResid"; version="1.1"; sha256="0hgzsyy5y0sqd4d2agdr7p2kq0w51vs8f63dvj6j49h8cvgiws2x"; depends=[deldir splancs cubature]; }; +strap = derive { name="strap"; version="1.4"; sha256="0gdvx02w0dv1cq9bb2yvap00lsssklfnqw0mwsgblcy2j6fln7b0"; depends=[ape geoscale]; }; +stratification = derive { name="stratification"; version="2.2-3"; sha256="0mjv5x47rc7ci4ca949pg6ixmv6bfdfph6yz31syqk5xrgm8zmxq"; depends=[]; }; +stratigraph = derive { name="stratigraph"; version="0.64"; sha256="1mi4s3wxbrmcxb7k18z02dy5dnvg7kka1dbg2hgyi4nm9y8casdl"; depends=[]; }; +straweib = derive { name="straweib"; version="1.0"; sha256="0bh2f4n4i7fiki52sa57v96757qw1gn1lcn7vgxmc5hk5rzp2mi8"; depends=[]; }; +stream = derive { name="stream"; version="1.0-3"; sha256="14l1fdqzbvy8vxq0rmrwm2afwd4h85khc0a22r6vk488355wn9ps"; depends=[hash proxy animation clue cluster clusterGeneration fpc MASS mlbench]; }; +streamMOA = derive { name="streamMOA"; version="0.1-1"; sha256="12x9i0cr56s54b2z3wfblrv6f36z8k2pgrr5gaqyshl8rgvyvrzz"; depends=[stream rJava]; }; +streamR = derive { name="streamR"; version="0.2.1"; sha256="1ml33mj7zqlzfyyam23xk5d25jkm3qr7rfj2kc5j5vgsih6kr0gl"; depends=[RCurl rjson]; }; +stremo = derive { name="stremo"; version="0.2"; sha256="13b9xnd8ykxrm8gnakh0ixbsb7yppqv3isga8dsz473wzy82y6h1"; depends=[lavaan numDeriv MASS]; }; +stressr = derive { name="stressr"; version="1.0.0"; sha256="00b93gfh1jd5r7i3dhsfqjidrczf693kyqlsa1krdndg8f0jkyj7"; depends=[xts XML lattice latticeExtra]; }; +stringdist = derive { name="stringdist"; version="0.8.1"; sha256="0ry5v1cmxm7nsvvz0dm7fzrfgss7g7k9k89cp5jpyyxzksi9xrf1"; depends=[]; }; +stringi = derive { name="stringi"; version="0.3-1"; sha256="16jg0vq61p8qqylrsv9x2bnbjyz3nxcx7m087k4jx881rg4ahvds"; depends=[]; }; +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.4"; sha256="06y4bf2z55zl5k9snd7mgbrfx85irnbk316g9169m5mij4lca4g7"; depends=[pedigree MASS Rcpp Rcpp RcppArmadillo]; }; +strvalidator = derive { name="strvalidator"; version="1.3.1"; sha256="1d69qrs4wfx7wjbr5xy0wmf81lhih8asz9hwy861fxy7iak6gvlw"; depends=[ggplot2 gWidgets gridExtra gtable plyr scales gWidgetsRGtk2 RGtk2]; }; +stsm = derive { name="stsm"; version="1.4"; sha256="0j6kvsij6rsvkjc4q1m9vi9afvsib8x6zwjka1xwbp8g6fzamjq4"; depends=[KFKSDS stsm_class]; }; +stsm_class = derive { name="stsm.class"; version="1.3"; sha256="19jrja5ff31gh5k2zqhqsyd7w2ivr4s6bkliash6x8fmd22h5zs8"; depends=[]; }; +stylo = derive { name="stylo"; version="0.5.8-2"; sha256="1vslcn0gnzvsznashivpfsh45z1kjzpx55lq58s2ryaz8hdigy41"; depends=[tcltk2 ape pamr e1071 class lattice tsne]; }; +suRtex = derive { name="suRtex"; version="0.9"; sha256="0xcy3x1079v10bn3n3y6lxignb9n3h57w4hhrvzi5y14x05jjyda"; depends=[]; }; +subgroup = derive { name="subgroup"; version="1.1"; sha256="1n3qw7vih1rngmp4fwjbs050ngby840frj28i8x7d7aa52ha2syf"; depends=[]; }; +subplex = derive { name="subplex"; version="1.1-4"; sha256="0c6y5ibyxh0mpn77f7kwrmkpb3mah10hbqhwqmz4i1lfv58mb4zk"; depends=[]; }; +subrank = derive { name="subrank"; version="0.8.5"; sha256="0vcizby33aig56qhy19dyfx0bp7ha3j859yapqk8yq73cszj7mk9"; depends=[]; }; +subselect = derive { name="subselect"; version="0.12-4"; sha256="0h56d68clsr4lmvn2a291di62xvjdypbwlpk2x1xjlyss10yhamh"; depends=[]; }; +subsemble = derive { name="subsemble"; version="0.0.9"; sha256="0vzjmxpdwagqb9p2r4f2xyghmrprx3nk58bd6zfskdgj0ymfgz5z"; depends=[SuperLearner]; }; +subtype = derive { name="subtype"; version="1.0"; sha256="1094q46j0njkkqv09slliclp3jf8hkg4147hmisggy433xwd19xh"; depends=[penalized ROCR]; }; +sudoku = derive { name="sudoku"; version="2.6"; sha256="13j7m06m38s654wn75kbbrin5nqda4faiawlsharxgrljcibcbrk"; depends=[]; }; +sudokuAlt = derive { name="sudokuAlt"; version="0.1-4"; sha256="14jqwsp692dq0bfnk2i70qc42inb6jbissvp88c5r2cgzc1ry072"; depends=[]; }; +summarytools = derive { name="summarytools"; version="0.2"; sha256="056fah6526j9y63aksq43qj29jn233lkj45ql68sv08g0vbv28qs"; depends=[pander rapportools]; }; +supclust = derive { name="supclust"; version="1.0-7"; sha256="0437pccagvqv6ikdsgzpif9yyiv6p24lhn5frk6yqby2asj09727"; depends=[rpart class]; }; +superMDS = derive { name="superMDS"; version="1.0.2"; sha256="0jxbwm3izk7bc3bd01ygisn6ihnapg9k5lr6nbkr96d3blpikk04"; depends=[]; }; +superbiclust = derive { name="superbiclust"; version="1.1"; sha256="1gzjbzbl8y1nzdfhyd6dlrwjq8mwj43a26qav84s1bdzwx6dra48"; depends=[biclust Matrix]; }; +superdiag = derive { name="superdiag"; version="1.1"; sha256="0pa3mv74riabpm7j4587zww2364fszzlw48ijj1apcgz8y6pyqbw"; depends=[coda boa]; }; +superpc = derive { name="superpc"; version="1.09"; sha256="1p3xlg2n7p57n54g2w4frfrng5vjh97kp6ax4mrgvj3pqmd1m69z"; depends=[survival]; }; +support_BWS = derive { name="support.BWS"; version="0.1-2"; sha256="14p5b4b84x66lzn7qz1xy7sbb5i3wqwcsf6r6ap612nj83srjmqa"; depends=[]; }; +support_CEs = derive { name="support.CEs"; version="0.3-2"; sha256="0q8n4w3p682165lv20m30m8p9mhd3wzrzg8aqizf9zc2m5w9ffyd"; depends=[DoE_base MASS simex]; }; +surface = derive { name="surface"; version="0.4-1"; sha256="0z7fh09hjmxfmqzi588gjwqqlpj1a475aixrnvy911lkx3zfk146"; depends=[ape ouch MASS geiger]; }; +surv2sampleComp = derive { name="surv2sampleComp"; version="1.0-4"; sha256="1ihz71vzrkd5ksy7421myrgkbww0z5k0ywcb2bfalxx2bd2cs2wf"; depends=[survival plotrix flexsurv survC1]; }; +survAUC = derive { name="survAUC"; version="1.0-5"; sha256="0bcj982ib1h0sjql09zbvx3h1m96jy9q37krmk6kfzw25ms6bzzr"; depends=[survival]; }; +survAccuracyMeasures = derive { name="survAccuracyMeasures"; version="1.2"; sha256="1i41xkvqpxpq9spryh1syp57ymlzw71ygdjqn41rv8jjc9q52x9g"; depends=[survival Rcpp Rcpp RcppArmadillo]; }; +survC1 = derive { name="survC1"; version="1.0-2"; sha256="1bidjhq3k5ab7gqj1b2afngip7pp6c9c7q0m6ww7h7i2vg505l7v"; depends=[survival]; }; +survIDINRI = derive { name="survIDINRI"; version="1.1-1"; sha256="03lsypx189zm28gv764gdq24a18jj3kpdk91ssa501qxj5jv7v29"; depends=[survival survC1]; }; +survMisc = derive { name="survMisc"; version="0.4.2"; sha256="1mv503lrgjfbggasgsls2pqlxz3kj4hrw9qslgzxh3dizfqkb02c"; depends=[survival ggplot2 data_table rpart gridExtra combinat Hmisc zoo km_ci KMsurv gam]; }; +survPresmooth = derive { name="survPresmooth"; version="1.1-8"; sha256="1qva7yx4vv99mgh3wqxdnbasa1gy0ixxyxpqrfbn6827whjzf91m"; depends=[]; }; +survSNP = derive { name="survSNP"; version="0.21-7"; sha256="0fanya7ghd61pw7a21xkaxz4mgzdwjwkh1wm41h40wq1c529dzph"; depends=[survival Rcpp lattice foreach xtable Rcpp]; }; +surveillance = derive { name="surveillance"; version="1.8-1"; sha256="08a876xzzca8q0rvcl5058z2rkj9qn24iqbhxwq481f27112k4v7"; depends=[Rcpp sp xtable polyCub MASS Matrix spatstat Rcpp]; }; +survexp_fr = derive { name="survexp.fr"; version="1.0"; sha256="12rjpnih0xld4dg5gl7gwxdxmrdmyzsymm7j05v98ynldd1jkjl8"; depends=[survival]; }; +survey = derive { name="survey"; version="3.30-3"; sha256="0vcyph1vpnl4xaqd85ffh1gm0dqhvgr3343q0mlycmyq485x0idy"; depends=[]; }; +surveydata = derive { name="surveydata"; version="0.1-14"; sha256="1zcp3wb7yhsa59cl4bdw7p08vpviypvfa9hggwc60w7ashpky73i"; depends=[stringr plyr]; }; +survival = derive { name="survival"; version="2.37-7"; sha256="1ihs42gjbw06aj5hz128964lshpi934cyc8npv9c8ann4mc2r3b5"; depends=[]; }; +survivalMPL = derive { name="survivalMPL"; version="0.1.1"; sha256="0c4hr2q50snd5qm2drg4qzfkcz4klxr4jba6xpc8n2i8wn573cvc"; depends=[survival]; }; +survivalROC = derive { name="survivalROC"; version="1.0.3"; sha256="0wnd65ff5w679hxa1zrpfrx9qg47q21pjxppsga6m3h4iq1yfj8l"; depends=[]; }; +survrec = derive { name="survrec"; version="1.2-2"; sha256="0b77ncr1wg2xqqg1bv1bvb48kmd9h3ja2dysiggvprzjrj7hdlmx"; depends=[boot]; }; +survsim = derive { name="survsim"; version="1.1.2"; sha256="1pnzkw0hr0gpwh0v26k4fh7qjl0c6ps9y8gmfd46h8wz2fb25vqx"; depends=[eha statmod]; }; +svDialogs = derive { name="svDialogs"; version="0.9-55"; sha256="0x1wzqypxir0322mr3zsax1v64y9jdz5sya98y20hc3619mpynwj"; depends=[svGUI]; }; +svDialogstcltk = derive { name="svDialogstcltk"; version="0.9-4"; sha256="16166f8i6nsg7palqmnlp5b9s91d6ja9n0zm6rcvd2fwnw2ljkr4"; depends=[svDialogs svGUI]; }; +svGUI = derive { name="svGUI"; version="0.9-55"; sha256="1fkkc12mhcbn3s2wzk0xdsp8jl2xmn48ys2an8jhxbww3gplk1rq"; depends=[]; }; +svHttp = derive { name="svHttp"; version="0.9-55"; sha256="0qxsh6ifk3fszgzz497qwia4pxzplwraf2qnn5cqlv5l79nja5yq"; depends=[svMisc]; }; +svIDE = derive { name="svIDE"; version="0.9-52"; sha256="19wsmi1i7nlnqdah1h2pxzsy8m50bnb282fdbj4219p86bb92a86"; depends=[svMisc XML]; }; +svKomodo = derive { name="svKomodo"; version="0.9-62"; sha256="1af22nfbhmx5b3n45k5xfwq667w4cd7m0g5hx5dvv2vfikr613nx"; depends=[svMisc]; }; +svMisc = derive { name="svMisc"; version="0.9-70"; sha256="1xprymz5hblbc929kmbaz0lj633xvgz6mm4snhhjib47cz5anl1w"; depends=[]; }; +svSocket = derive { name="svSocket"; version="0.9-57"; sha256="0id93b500iybza6sbn60ybm91mkh5cjpvhypqs4f3dv13m6blb9j"; depends=[svMisc]; }; +svSweave = derive { name="svSweave"; version="0.9-8"; sha256="0zkng8lwdpjdbic9f6jnk2ndxbch2kjyz71ds1bksvd3kmk03lks"; depends=[knitr]; }; +svTools = derive { name="svTools"; version="0.9-4"; sha256="0szr5dcxjsh5p1nkszvmj0vmi9x70d656hfvhmqf0wyjwv63vp90"; depends=[codetools svMisc]; }; +svUnit = derive { name="svUnit"; version="0.7-12"; sha256="16iiryj3v34zbnk1x05g30paza7al1frqx52fkw8ka61icizsrf5"; depends=[]; }; +svWidgets = derive { name="svWidgets"; version="0.9-44"; sha256="18k06wldcg6xpyf8nz9rdbig5nhvghn7zgf1316413kq3v90vz7b"; depends=[svMisc]; }; +svapls = derive { name="svapls"; version="1.4"; sha256="12gk8wrgp556phdv89jqza22zmsnachsydr5vlz38s664d2lplbg"; depends=[class pls]; }; +svcm = derive { name="svcm"; version="0.1.2"; sha256="1lkik65md8xdxzkmi990dvmbkc6zwkyxv8maypv2vbi2x534jkhl"; depends=[Matrix]; }; +svd = derive { name="svd"; version="0.3.3-2"; sha256="064y4iq4rj2h35fhi6749wkffg37ppj29g9aw7h156c2rqvhxcln"; depends=[]; }; +svdvisual = derive { name="svdvisual"; version="1.1"; sha256="02mzh2cy4jzb62fd4m1iyq499fzwar99p12pyanbdnmqlx206mc2"; depends=[lattice]; }; +svmpath = derive { name="svmpath"; version="0.953"; sha256="0hqga4cwy1az8cckh3nkknbq1ag67f4m5xdg271f2jxvnmhdv6wv"; depends=[]; }; +svyPVpack = derive { name="svyPVpack"; version="0.1-1"; sha256="15k5ziy2ng853jxl66wjr27lzc90l6i5qr08q8xgcs359vn02pmp"; depends=[survey]; }; +swamp = derive { name="swamp"; version="1.2.3"; sha256="1xpnq5yrmmsx3d48x411p7nx6zmwmfc9hz6m3v9avvpjkbc3glkg"; depends=[amap gplots MASS]; }; +sweidnumbr = derive { name="sweidnumbr"; version="0.2"; sha256="0zsijh9jf0pnil5n69ix408j3plbrnj0235whh9rch486ibyk779"; depends=[lubridate]; }; +swfscMisc = derive { name="swfscMisc"; version="1.0.1"; sha256="0ya0ng6973mix9i0k817mgvfqwshpfqjlnn5xbs6vz2cw2xm8g6g"; depends=[mapdata maps]; }; +swirl = derive { name="swirl"; version="2.2.16"; sha256="0wfm44nicrswszly7bwkb8z046x92p687ycglbjinvr73p4bmv0q"; depends=[stringr testthat httr yaml RCurl digest]; }; +switchnpreg = derive { name="switchnpreg"; version="0.8-0"; sha256="1vaanz01vd62ds2g2xv4kjlnvp13h59n8yqikwx07293ixd4qhpw"; depends=[MASS fda expm HiddenMarkov]; }; +sybil = derive { name="sybil"; version="1.2.6"; sha256="1d7q0dvpqxay86dy4zbllv78dsh0amr8n7wl0vkrb8jbakq4afip"; depends=[Matrix lattice]; }; +sybilDynFBA = derive { name="sybilDynFBA"; version="0.0.2"; sha256="1sqk6dwwfrwvgkwk6mra0i1dszhhvcwm58ax6m89sxk8n0nbmr4b"; depends=[sybil]; }; +sybilEFBA = derive { name="sybilEFBA"; version="1.0.1"; sha256="1advbbsyig49av7sbpbvs47xzg6f8czjb1938ynd0n2yq1bgq5xm"; depends=[sybil Matrix]; }; +sybilSBML = derive { name="sybilSBML"; version="2.0.8"; sha256="1sxp0naws7d1ak0xna1sy87zzjrravwax0qvcd6vy4p0f39z06ci"; depends=[Matrix sybil]; }; +sybilccFBA = derive { name="sybilccFBA"; version="1.0.0"; sha256="1fmhgyqzipddcqx2srms9bgigjmijasxhsmivv6c45ln23qjvgf5"; depends=[sybil Matrix]; }; +sybilcycleFreeFlux = derive { name="sybilcycleFreeFlux"; version="1.0.1"; sha256="0ffmgnr239xz8864vmrqlhwwc97fqzzib6kwrsm7bszdnw1kkv3r"; depends=[sybil Matrix MASS]; }; +symbolicDA = derive { name="symbolicDA"; version="0.4-1"; sha256="14lcxgbsizw0l1xcjrmz3jvfsbwlirkd0shp293hg3qi7gbzcms8"; depends=[clusterSim XML rgl shapes e1071 ade4]; }; +symbols = derive { name="symbols"; version="1.1"; sha256="1234rx3divhg60p0h0zn11viqn51fm6b8876m6rip2i6z8vrg319"; depends=[shape]; }; +symmoments = derive { name="symmoments"; version="1.2"; sha256="074k0285c0yri39zags420kjls6kjlvlhymg3r7y24h42zdy82d4"; depends=[mvtnorm cubature combinat multipol]; }; +synbreed = derive { name="synbreed"; version="0.10-5"; sha256="0qhcxmcxa0ixn6ql2dr7pq10g7hmv55rcn279wz4cg5mbgqkhvmm"; depends=[doBy BLR regress abind lattice igraph MASS LDheatmap qtl synbreedData]; }; +synbreedData = derive { name="synbreedData"; version="1.4"; sha256="0pfpvg4wvxfwpvxq8f93z1amfss98as66kwpj5mnvvlr33ffmka9"; depends=[]; }; +synchronicity = derive { name="synchronicity"; version="1.1.4"; sha256="0hcxwgf1irswwabgl0b6vb9q09nhxc1ljsm195lc8ql49sfj9mfz"; depends=[bigmemory_sri BH]; }; +synchrony = derive { name="synchrony"; version="0.2.3"; sha256="0fi9a3j8dfslf1nqx8d53fi635y3aq8isxw0dbjbpgk7rc71nzby"; depends=[]; }; +synlik = derive { name="synlik"; version="0.1.1"; sha256="0g4n78amydihsq4jg2i9barjm9g40zczasb31fj10yn6wir1dhv7"; depends=[Rcpp Matrix Rcpp RcppArmadillo]; }; +synthpop = derive { name="synthpop"; version="1.0-0"; sha256="1ifdzfql2a9gn021l5f93qrx30db48hpq43c5zanmb2zdqb8zc16"; depends=[lattice MASS nnet rpart party]; }; +sysfonts = derive { name="sysfonts"; version="0.2"; sha256="15wzb7c89645xxbhn29bh0djys73iklq05228qnhd5gx5sr43dd0"; depends=[]; }; +systemfit = derive { name="systemfit"; version="1.1-14"; sha256="0f33v96awyhxw3i6zr6whdz91hbfi7vwnfs0bz7xsrjcinqhm6h5"; depends=[Matrix car lmtest sandwich]; }; +taRifx = derive { name="taRifx"; version="1.0.6"; sha256="10kp06hkdx1qrzh2zs9mkrgcnn6d31cldjczmk5h9n98r34hmirx"; depends=[reshape2 plyr]; }; +taRifx_geo = derive { name="taRifx.geo"; version="1.0.6"; sha256="0w7nwp3kvidqhwaxaiq267h99akkrj6xgkviwj0w01511m2lzghs"; depends=[taRifx sp rgdal RJSONIO rgeos RCurl]; }; +tab = derive { name="tab"; version="2.1.3"; sha256="0ypb11gvasx7mdkpysfjvxb61660sdaggp6l43iyp2grfrilkm7y"; depends=[survey survival gee]; }; +table1xls = derive { name="table1xls"; version="0.3.1"; sha256="0zd93wrdj4q0ph375qlgdhpqm3n8s941vks5h07ks9gc8id1bnx5"; depends=[XLConnect]; }; +tableone = derive { name="tableone"; version="0.6.2"; sha256="0jmii05kqd01bllc4wi9r38qa0dpxqlcpk572d3m7c009izsz8zl"; depends=[e1071 gmodels]; }; +tableplot = derive { name="tableplot"; version="0.3-5"; sha256="1jkkl2jw7lwm5zkx2yaiwnq1s3li81vidjkyl393g1aqm9jf129l"; depends=[]; }; +tables = derive { name="tables"; version="0.7.79"; sha256="05f23y5ff961ksx4fnmwpf6zvc9573if8s2cmz9bwki66h2g9xb7"; depends=[Hmisc]; }; +tabplot = derive { name="tabplot"; version="1.1"; sha256="0vyc6b6h540sqwhrza2ijg7ghw2x8rla827b8qy2sh0ckm0ybjrx"; depends=[ffbase]; }; +tabplotd3 = derive { name="tabplotd3"; version="0.3.3"; sha256="0mbj45vb17wlnndpkhvq7xaawsb814x7zxa4rqbfgidvbm1p3abv"; depends=[tabplot httpuv Rook brew RJSONIO]; }; +tabuSearch = derive { name="tabuSearch"; version="1.1"; sha256="0bri03jksm314xy537dldbdvgyq6sywfmpmj2g2acdcli31kkpq0"; depends=[]; }; +tagcloud = derive { name="tagcloud"; version="0.5"; sha256="0d6h54p20pjnh1y7bw381nqbml1hv5x71gm33mgrzcib7mqa0c0b"; depends=[Rcpp RColorBrewer Rcpp]; }; +tau = derive { name="tau"; version="0.0-18"; sha256="10akzwf0fi05vplgy4njzrb4jdqa079zhycri4014w8sihb5msan"; depends=[]; }; +tawny = derive { name="tawny"; version="2.1.2"; sha256="0ihg3qlng8swak1dfpbnlx5xc45d1i9rgqawmqa97v5m91smfa71"; depends=[lambda_r lambda_tools futile_logger futile_matrix tawny_types zoo xts PerformanceAnalytics quantmod]; }; +tawny_types = derive { name="tawny.types"; version="1.1.3"; sha256="1v0k6nn45rdczjn5ymsp2fqq0ijnlniyf3bc08ibd8yd1jcdyjnj"; depends=[lambda_r lambda_tools futile_logger futile_options zoo xts quantmod]; }; +taxize = derive { name="taxize"; version="0.4.0"; sha256="11wq690nkdgpssmm5sw85j2wb88bpjr5qiy3y2rg3xppf68xb5ib"; depends=[XML RCurl stringr plyr httr jsonlite foreach ape Taxonstand reshape2 data_table vegan assertthat bold]; }; +tbart = derive { name="tbart"; version="0.9.1"; sha256="1xpv9vfak57836c50n7rg9hrxd6iz6378jpddsd4zm7pvnzzhhim"; depends=[Rcpp sp Rcpp]; }; +tbdiag = derive { name="tbdiag"; version="0.1"; sha256="1wr2whgdk84426hb2pf8iiyradh9c61gyazvcrnbkgx2injkz65q"; depends=[]; }; +tcltk2 = derive { name="tcltk2"; version="1.2-10"; sha256="0m648n028xc6gi3ypih0nyswczh787pwfq7ky2hsxabp958faflb"; depends=[]; }; +tclust = derive { name="tclust"; version="1.2-3"; sha256="0a1b7yp4l9wf6ic5czizyl2cnxrc1virj0icr8i6m1vv23jd8jfp"; depends=[mvtnorm sn mclust cluster]; }; +tdm = derive { name="tdm"; version="3.0.2"; sha256="06k2dp5gf2k9q23mpswn2yh0525xaz0zznx6r7gn0gim2l7msbqj"; depends=[rjags coda png deSolve]; }; +tdthap = derive { name="tdthap"; version="1.1-7"; sha256="0lqcw4bzjd995pwn2yrmzay82gnkxnmxxsqplpbn5gg8p6sf5qqk"; depends=[]; }; +teigen = derive { name="teigen"; version="2.0.7"; sha256="0pyxpmmd4s6azq8lzn0lrg7jkr7g638xkhljx1w5bval6cq2bcwk"; depends=[]; }; +tempdisagg = derive { name="tempdisagg"; version="0.23"; sha256="1ym0cbvm8f1wvnkpdm34d5yzgbn3hig1kc3zv8b24pnx11ywv751"; depends=[]; }; +tensor = derive { name="tensor"; version="1.5"; sha256="19mfsgr6vz4lgwidm80i4yw0y1dr3n8i6qz7g4n2xa0k74zc5pp1"; depends=[]; }; +tensorA = derive { name="tensorA"; version="0.36"; sha256="1xpczn94a6vfkfibfvr71a7wccksg16pc22h0inpafna4qpygcwp"; depends=[]; }; +tergm = derive { name="tergm"; version="3.1.4"; sha256="0w5s4ziacxp9zdylmb8f7xrwvql58c6c9jvv27wjxdxpaf9iyp8h"; depends=[statnet_common ergm network networkDynamic robustbase coda nlme ergm]; }; +termstrc = derive { name="termstrc"; version="1.3.7"; sha256="12bycwhjrhkadafcckc30jr0md0ssj21n4v75yjhy21yvqjx1d7a"; depends=[lmtest Rcpp rgl sandwich urca zoo Rcpp]; }; +ternvis = derive { name="ternvis"; version="1.1"; sha256="16q1a1ns7q0d46js2m1hr6zm8msg3ncgp8w7yrwch11xq0759sb4"; depends=[quadprog maps maptools mapdata dichromat]; }; +tester = derive { name="tester"; version="0.1.7"; sha256="1x5m43abk3x3fvb2yrb1xwa7rb4jxl8wjrnkyd899ii1kh8lbimr"; depends=[]; }; +testit = derive { name="testit"; version="0.3"; sha256="142q0zwlzx3w69j0fsd06s3pihr76kw9yg21596aalazh7c2yfgi"; depends=[]; }; +testthat = derive { name="testthat"; version="0.9.1"; sha256="0hbkyfx54fz4lwyz3azfxb6xkdcmm6kjdv6ma47gv947m90ysnfk"; depends=[digest]; }; +testthatsomemore = derive { name="testthatsomemore"; version="0.1"; sha256="0j9sszm4l0mn7nqz47li6fq5ycb3yawc2yrad9ngb75cvp47ikkk"; depends=[testthat]; }; +texmex = derive { name="texmex"; version="2.1"; sha256="17x4xw2h4g9a10zk4mvi3jz3gf4rf81b29hg2g3gq6a6nrxsj8sy"; depends=[mvtnorm]; }; +texreg = derive { name="texreg"; version="1.34"; sha256="03w8fk5lkpgag22a63jnhf0cn3l5ryjh4pkfhxgqzrijvrr1v2cb"; depends=[]; }; +textcat = derive { name="textcat"; version="1.0-2"; sha256="0m8jbw8k8h6m9q9x25gvx0glzwhhpy73pjv4zivivna5zxapgi23"; depends=[tau slam]; }; +textir = derive { name="textir"; version="2.0-2"; sha256="19n14nqx7gcp5ypfqwmk80lxxwqc0dklm09z3f9czg68j6qv181i"; depends=[distrom gamlr Matrix]; }; +textometry = derive { name="textometry"; version="0.1.3"; sha256="1a0dp1flx3yh7wqn0cmb5pq83qqnz94ynkqkmj4kw9ha5j8kcnwx"; depends=[]; }; +tfer = derive { name="tfer"; version="1.1"; sha256="19d31hkxs6dc4hvj5495a3kmydm29mhp9b2wp65mmig5c82cl9ck"; depends=[]; }; +tfplot = derive { name="tfplot"; version="2014.2-2"; sha256="1jrkzccvqmwghp6nhxay0m1qx8r5wa96zb9r8v6qihryi9m3amhs"; depends=[tframe]; }; +tframe = derive { name="tframe"; version="2012.8-1"; sha256="0m6kwwn7y4n0vkk9zvwixn2jg67rsv9f9s2xma2mxdxl1f5lnfvh"; depends=[]; }; +tframePlus = derive { name="tframePlus"; version="2013.9-1"; sha256="070ad1g7yv1d5by6xrvshgn43jjxpq8waa339xhzc1am2qzb6mqr"; depends=[tframe timeSeries]; }; +tgp = derive { name="tgp"; version="2.4-9"; sha256="0ghn7pmwipwmq6lch7jvzghks9mbj9jrdv5140550vq4w6mnf57q"; depends=[]; }; +tgram = derive { name="tgram"; version="0.2-2"; sha256="091g6j5ry1gmjff1kprk5vi2lirl8zbynqxkkywaqpifz302p39q"; depends=[zoo]; }; +thgenetics = derive { name="thgenetics"; version="0.3-4"; sha256="1316nx0s52y12j9499mvi050p3qvp6b8i01v82na01vidl54b9c2"; depends=[]; }; +threeboost = derive { name="threeboost"; version="1.1"; sha256="033vwn42ys81w6z90w5ii41xfihjilk61vdnsgap269l9l0c8gmn"; depends=[Matrix]; }; +threg = derive { name="threg"; version="1.0.2"; sha256="0wb9waj0j83zrj763d3fdnp3lp52gfdyzv23yrvxvd6zmk5clgi2"; depends=[survival Formula]; }; +tibbrConnector = derive { name="tibbrConnector"; version="1.5.0-71"; sha256="0d8gy126hzzardcwr9ydagdb0dy9bdw30l8s2wwi7zaxx2lpii6q"; depends=[RCurl rjson]; }; +tictoc = derive { name="tictoc"; version="1.0"; sha256="1zp2n8k2ax2jjw89dsri268asmm5ry3ijf32wbca5ji231y0knj7"; depends=[]; }; +tidyr = derive { name="tidyr"; version="0.1"; sha256="1rcf2cmd0zbjkvazkdfiv4sy50rxzj0fs4ldgmkz89vlffy5kdgc"; depends=[reshape2 dplyr]; }; +tiff = derive { name="tiff"; version="0.1-5"; sha256="0asf2bws3x3yd3g3ixvk0f86b0mdf882pl8xrqlxrkbgjalyc54m"; depends=[]; }; +tiger = derive { name="tiger"; version="0.2.3.1"; sha256="0xr56c46b956yiwkili6vp8rhk885pcmfyd3j0rr4h8sz085md6n"; depends=[e1071 hexbin qualV klaR som lattice]; }; +tigerstats = derive { name="tigerstats"; version="0.1.6"; sha256="18gvmc4gfwi2x5nqj6jm7lddzlqmjvj0bf4h6r0yzvrp07wayvan"; depends=[lattice MASS]; }; +tightClust = derive { name="tightClust"; version="1.0"; sha256="0psyzk6d33qkql8v6hzkp8mfwb678r95vfycz2gh6fky7m5k3yyz"; depends=[]; }; +tikzDevice = derive { name="tikzDevice"; version="0.7.0"; sha256="12r6qk5qp4yvi3vqvdxp02799y6fhmg21qv6abp1s620n8hgva6d"; depends=[filehash]; }; +tileHMM = derive { name="tileHMM"; version="1.0-6"; sha256="18vqj7fdh4knnjk9s7yk2bgn3qwqz92fmm5fdny21gi0wl4qgdsd"; depends=[]; }; +timeDate = derive { name="timeDate"; version="3011.99"; sha256="1fav8pi305vpbr7gkvpj5y9pgmck8359ba6gviki6h5xxs8zxi0s"; depends=[]; }; +timeROC = derive { name="timeROC"; version="0.2"; sha256="1ikd2wr5cja784hihqdyk7mwky18czz58sl0xrvmzhc67153a4jz"; depends=[pec mvtnorm timereg]; }; +timeSeries = derive { name="timeSeries"; version="3011.98"; sha256="1smcm4k1a6br696p39s9w9ivzip33mspsixf6c72i01zgbrj6qnc"; depends=[timeDate]; }; +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.7"; sha256="0mb2sa74var1k65a90vkqhk4b4hykb8ngs7cz9j7cgn2x91x4qzq"; depends=[igraph plyr]; }; +timereg = derive { name="timereg"; version="1.8.6"; sha256="02whk0wqd1n2dzsfqvhs4plgkvrj04r1i83lvsa2j2qwjvbf831p"; depends=[survival lava]; }; +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.1"; sha256="13hl9xp010dcwlcyhi62qw66cvd7k6w86ba3m543c9y4x79nw86b"; depends=[]; }; +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=[]; }; +titan = derive { name="titan"; version="1.0-16"; sha256="0x30a877vj99z3fh3cw9762j5ci56964j2466xfbwcywhn9njz5r"; depends=[MASS boot lattice]; }; +tkrgl = derive { name="tkrgl"; version="0.7"; sha256="1kpq5p6izqrn1zr53firis3rmifq9lf6326lf3z7l1p82nf2yps5"; depends=[rgl]; }; +tkrplot = derive { name="tkrplot"; version="0.0-23"; sha256="1cnyszn3rmr1kwvi5a178dr3074skdijfixf5ln8av5wwcy35947"; depends=[]; }; +tlemix = derive { name="tlemix"; version="0.1.3"; sha256="0c4mvdxlhbmyxj070xyipx4c27hwxlb3c5ps65ipm6gi8v8r6spj"; depends=[]; }; +tlm = derive { name="tlm"; version="0.1.2"; sha256="1y2kz5xnq3x0c7jrrl4rw8azk2qhm62i3qsglvrdffiy898qa40j"; depends=[boot]; }; +tlmec = derive { name="tlmec"; version="0.0-2"; sha256="1gak8vxmfjf05bhaj6lych7bm8hgav1x3h14k2ra7236v82rqbw7"; depends=[mvtnorm]; }; +tlnise = derive { name="tlnise"; version="2.0"; sha256="1vh998vqj359249n9zmw04rsivb7nlbdfgzf20pgh2sndm3rh8qz"; depends=[]; }; +tm = derive { name="tm"; version="0.6"; sha256="004hswgswz3gdrpa6j61hl4rls843bxnsp5qac5kyxvfmwalsgr8"; depends=[NLP slam]; }; +tm_plugin_alceste = derive { name="tm.plugin.alceste"; version="1.1"; sha256="0wid51bbbx01mjfhnaiv50vfyxxmjxw8alb73c1hq9wlsh3x3vjf"; depends=[NLP tm]; }; +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_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]; }; +tmle = derive { name="tmle"; version="1.2.0-4"; sha256="11hjp2vak1zv73326yzzv99wg8a2xyvfgvbyvx3jfxkgk33mybbm"; depends=[SuperLearner]; }; +tmle_npvi = derive { name="tmle.npvi"; version="0.8.1"; sha256="1vxkhf17x3zsf4fvx458qyqn0xi460db6kw6zmaw6jhagjk5yaj0"; depends=[R_utils MASS sgeostat]; }; +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=[]; }; +topologyGSA = derive { name="topologyGSA"; version="1.4.4"; sha256="092f57gpm8jlb2y4j74a6dx1lwqjdgcm3yrm1yzy4511j6vg0axh"; depends=[gRbase fields]; }; +topsis = derive { name="topsis"; version="1.0"; sha256="056cgi684qy2chh1rvhgkxwhfv9nnfd7dfzc05m24gy2wyypgxj3"; depends=[]; }; +tosls = derive { name="tosls"; version="1.0"; sha256="03nqwahap504yvcksvxdhykplbzmf5wdwgpzm7svn8bymdc472v2"; depends=[Formula]; }; +tourr = derive { name="tourr"; version="0.5.3"; sha256="0jsj2r9lhy0pa4kxnfb1cpf28c8q26rcprssax765n5ip1w9ycra"; depends=[]; }; +tourrGui = derive { name="tourrGui"; version="0.4"; sha256="1g9928q3x9rrd9k3k84r201wss3vjd2pngvbaflk5dqh9yf75jpq"; depends=[tourr colorspace RGtk2 gWidgets Cairo]; }; +toxtestD = derive { name="toxtestD"; version="2.0"; sha256="0b7hmpfhwg626r8il12shni0kw94cqnbj49y4vfh8gn98x1s6m48"; depends=[]; }; +tpe = derive { name="tpe"; version="1.0.1"; sha256="0zsa8vb4qmln3sb4lplv43lh50yys9vfd3rxfp6qxqqjxivd0xsh"; depends=[]; }; +tpr = derive { name="tpr"; version="0.3-1"; sha256="0nxl0m39zaii6rwm35hxcdk6iy2f729jjmhc2cpr8h0mgvgqf19d"; depends=[lgtdl]; }; +track = derive { name="track"; version="1.0-15"; sha256="05v6p2mfms59p3cs4vwpzvi9gaadrin50fc39l5kjqwqa9vhmkz7"; depends=[]; }; +trackObjs = derive { name="trackObjs"; version="1.0-18"; sha256="0wwm9yx5wnmgvyd7zczkv8mdzixazb3kps112w19rdbnkiq1db3d"; depends=[]; }; +tractor_base = derive { name="tractor.base"; version="2.5.0"; sha256="17s4iyp67w7m8gslm87p3ic5r9iq7x1ifpxqrmnin3y5a3d04f5v"; depends=[reportr]; }; +traitr = derive { name="traitr"; version="0.14"; sha256="1pkc8wcq55229wkwb54hg9ndbhlxziv51n8880z6yq73zac1hbmf"; depends=[digest proto gWidgets]; }; +traj = derive { name="traj"; version="1.0"; sha256="0g8fmq3ndp8kdk9jrjakw5hbkw6nh2m0lw396xk42sa0rb4df5s6"; depends=[cluster psych pastecs NbClust GPArotation]; }; +trajectories = derive { name="trajectories"; version="0.1-1"; sha256="0vf1czc97bqq5snqdma9l1knb4bznyn8pcs8f1q6ssk0xfjrl3s3"; depends=[lattice sp spacetime rgdal rgeos]; }; +translate = derive { name="translate"; version="0.1.2"; sha256="1w0xrg1xxwfdanlammmixf06hwq700ssbjlc3cfigl50p87dbc5x"; depends=[RCurl RJSONIO functional lisp]; }; +translateR = derive { name="translateR"; version="1.0"; sha256="11kh9hjpsj5rfmzybnh345n1gzb0pdksrjp04nzlv948yc0mg5gm"; depends=[RJSONIO RCurl textcat httr]; }; +transport = derive { name="transport"; version="0.6-3"; sha256="1sldlccsprzan1liyslzp9wzz3d36khyr6zri773npvnss9pa67w"; depends=[]; }; +trapezoid = derive { name="trapezoid"; version="2.0-0"; sha256="0f6rwmnn61bj97xxdgbydi94jizv1dbq0qycl60jb4dsxvif8l3n"; depends=[]; }; +treatSens = derive { name="treatSens"; version="1.0"; sha256="0g3v9b1kdndqls9h1ijp5v17ybb1710bdclid745y6lfkia1b71w"; depends=[]; }; +tree = derive { name="tree"; version="1.0-35"; sha256="1k8c2kjk53gix68frprlyx5ww7cm373vz1xg2r2jxbzxg1y4v691"; depends=[]; }; +treebase = derive { name="treebase"; version="0.0-7.1"; sha256="0kj1cyk14j4qzm31f47a8g7qh4842rqkzr0fqh9i5c8kzrqxbc0g"; depends=[ape XML RCurl reshape2 data_table]; }; +treeclim = derive { name="treeclim"; version="1.0.7"; sha256="1l2m4pq5wcb3wkxy9mkay87vzdcn8rxgsknsb72ahdb3zim0yg0v"; depends=[Rcpp abind plyr ggplot2 lmtest lmodel2 np boot Rcpp RcppArmadillo]; }; +treecm = derive { name="treecm"; version="1.2.1"; sha256="02al6iz25pay7y1qmbpy04nw8dj9c5r7km6q5k3v3jdkfal6cm6k"; depends=[plyr]; }; +treelet = derive { name="treelet"; version="1.0"; sha256="16g4lmp4yrfg328d0qwrp101y1qnwcrff7kna60cjmqdpvg3wm15"; depends=[]; }; +treemap = derive { name="treemap"; version="2.2"; sha256="0h4wkjw12n9awqsvrs72nmsxq3d5as3zjy8kyhw7715h1cvry769"; depends=[colorspace data_table ggplot2 gridBase igraph RColorBrewer shiny]; }; +treethresh = derive { name="treethresh"; version="0.1-8"; sha256="1xkbqlr9gkpw6axzl7v5aipackhvy873yrpwn2b9zqr35pj06pr6"; depends=[EbayesThresh wavethresh]; }; +triangle = derive { name="triangle"; version="0.8"; sha256="0jdphz1rf4cx4y28syfffaz7fbl41g3rw3mrv9dywycdznhxdnrp"; depends=[]; }; +trifield = derive { name="trifield"; version="1.1"; sha256="0xk48fkd5xa3mfn3pwdya0ihpkwnh20sgj3rc7fmzjil47kqscvy"; depends=[]; }; +trimTrees = derive { name="trimTrees"; version="1.2"; sha256="0v75xf5186dy76332x4w7vdwcz7zpqga8mxrb5all2miq2v45fi8"; depends=[randomForest mlbench]; }; +trimcluster = derive { name="trimcluster"; version="0.1-2"; sha256="0lsgbg93hm0w1rdb813ry0ks2l0jfpyqzqkf3h3bj6fch0avcbv2"; depends=[]; }; +trioGxE = derive { name="trioGxE"; version="0.1-1"; sha256="1ra86l3i7fhb6nsy8izixyvm6z23shv7fcjmnnpil54995j15ax4"; depends=[msm mgcv gtools]; }; +trip = derive { name="trip"; version="1.1-19"; sha256="1353lzfgvq8236ijxy8521r7hhmgyfrvc17ga8p8c0851nx53xn3"; depends=[sp maptools MASS spatstat]; }; +tripEstimation = derive { name="tripEstimation"; version="0.0-41"; sha256="11cn9lz4vdcx8wb46cm5sj0rfjl9cs50z7zxfxrn79nz0pga4gwn"; depends=[lattice mgcv rgdal sp zoo]; }; +tripack = derive { name="tripack"; version="1.3-6"; sha256="1dknz1arzfyknip04a9fxdhqmrkb0r0lr8hgria9s0d57hr1ay12"; depends=[]; }; +trotter = derive { name="trotter"; version="0.6"; sha256="0i8r2f2klkkfnjm7jhvga3gx6m7r97pd73d88004jzlm9ficspgy"; depends=[]; }; +trueskill = derive { name="trueskill"; version="0.1"; sha256="0mqvm64fcsxjlh789lqdk6l28q31yhh6jjirwjlgbpxxb90c5107"; depends=[]; }; +truncSP = derive { name="truncSP"; version="1.2.2"; sha256="1hdi518j3sg9273g01l1jqlmqya3ppim82ma7zakwqpmsjmzw18q"; depends=[truncreg boot]; }; +truncdist = derive { name="truncdist"; version="1.0-1"; sha256="0aszs6rz8nydyf2dw1m4fj9fclb0r4vpgqywyaqjkdnhzmyn593g"; depends=[evd]; }; +truncgof = derive { name="truncgof"; version="0.6-0"; sha256="0b499i9zjwvva5jfl9fj02jjrgy8myxqfjwa0cjg0jrpgxczgwg8"; depends=[MASS]; }; +truncnorm = derive { name="truncnorm"; version="1.0-7"; sha256="1qac05z50618y4bw1d7yznsli1bv82s0g8h37iacrjrdkv87bmy7"; depends=[]; }; +truncreg = derive { name="truncreg"; version="0.2-1"; sha256="0qvdfj93phk1s2p4n0rmpf8x9gj5n1j75h4z424mrg10r24699rd"; depends=[maxLik]; }; +trust = derive { name="trust"; version="0.1-6"; sha256="1jghgwnazhqgyn2k0b3x4n8swncyy6dzlkv86chv98zw4s3bnlak"; depends=[]; }; +trustOptim = derive { name="trustOptim"; version="0.8.4.1"; sha256="1m4jp0nqrazpkpw0s8rnd5f4hhvckwy6kb6qh7zw9nmgq4nlb93k"; depends=[Matrix Rcpp Rcpp RcppEigen]; }; +tsDyn = derive { name="tsDyn"; version="0.9-41"; sha256="1ssb0z35xmnwyrsvmk2jsxfd5h0xhnx8kp8qyxc43j4v2nz5l4kq"; depends=[mnormt mgcv nnet tseriesChaos tseries vars urca forecast MASS Matrix foreach]; }; +tsModel = derive { name="tsModel"; version="0.6"; sha256="0mkmhzj4g38ngzfcfx0zsiqpxs2qpw82kgmm1b8gl671s4rz00zs"; depends=[]; }; +tsbridge = derive { name="tsbridge"; version="1.1"; sha256="0mry3ia54cdfydpzm8asrq1ldj70gnpb5dqzj51w0jiyps2zlw6f"; depends=[mvtnorm tsbugs]; }; +tsbugs = derive { name="tsbugs"; version="1.2"; sha256="130v4x6cfy7ddvhijsnvipm4ycrispkj1j0z5f326yb4v5lrk91x"; depends=[]; }; +tseries = derive { name="tseries"; version="0.10-32"; sha256="0jz8a3z3hx2ps7krmpg6m10jvz5ddgmcrmnd38jpxb6ndnhh3pzw"; depends=[quadprog zoo]; }; +tseriesChaos = derive { name="tseriesChaos"; version="0.1-13"; sha256="0f2hycxyvcaj3s1lmva1qy46xr6qi43k8fvnm4md5qj8jp2zkazg"; depends=[deSolve]; }; +tsfa = derive { name="tsfa"; version="2014.2-2"; sha256="07g9qfdrhccl5dlsbpxn1ihavxljd9nq21hzbyn225cfi4bkx42h"; depends=[GPArotation dse EvalEst setRNG tframe tfplot]; }; +tsintermittent = derive { name="tsintermittent"; version="1.5"; sha256="1qziwdpxfc2v010bk2cnhkrajza0z7lrrsjg06m49msyk5bk62z1"; depends=[MAPA]; }; +tslars = derive { name="tslars"; version="1.0"; sha256="0ylpn4jxmrck7hna3j420kw2yhsrklrq2664w85z30xij3zrrrci"; depends=[]; }; +tsne = derive { name="tsne"; version="0.1-2"; sha256="12q5s79r2949zhm61byd4dbgw6sz3bmxzcwr8b0wlp8g1xg4bhy6"; depends=[]; }; +tsoutliers = derive { name="tsoutliers"; version="0.4"; sha256="08b8ssd8ha2n96la1kc64w2r1616c2d417vr6292g8m60fvlcq48"; depends=[forecast polynom stsm stsm_class KFKSDS]; }; +tspmeta = derive { name="tspmeta"; version="1.1"; sha256="11kr5avf67v2cxy3k1yrpv9lcbmiprd0w43w7zvizhsij58h13vm"; depends=[ggplot2 TSP MASS BBmisc fpc vegan stringr splancs]; }; +ttScreening = derive { name="ttScreening"; version="1.5"; sha256="0qn8lkvgvqpmm368fwpqkm09yaj9mw42mjlikyiwpv2wrgbpmg9n"; depends=[matrixStats corpcor MASS]; }; +tth = derive { name="tth"; version="4.3-2"; sha256="1gs8xjljklvs0pavvn9f59y09hw7x2da58a46b5x01g08i0j8h1d"; depends=[]; }; +ttutils = derive { name="ttutils"; version="1.0-1"; sha256="18mk30070mcplybg320vjbk9v5flxnbqi5gx0yyr1z6ymjmnrxbc"; depends=[]; }; +ttwa = derive { name="ttwa"; version="0.8.5.1"; sha256="1lhypcwssq0dspizvln3w4dg16ad6mz8cj4w34c5vsrayqid7fyn"; depends=[data_table]; }; +tufterhandout = derive { name="tufterhandout"; version="1.2"; sha256="0g0av6qfm8bpvlhxb3cckzmn997af2h9j367j4afrip7sdzc9bn6"; depends=[rmarkdown knitr]; }; +tumblR = derive { name="tumblR"; version="1.0"; sha256="01y4vx72p8fvc4nx0y8j8i7gnb573zhvnb4ffl3kx6znzx6hz9ll"; depends=[httr RCurl ROAuth stringr RJSONIO]; }; +tuneR = derive { name="tuneR"; version="1.2.1"; sha256="1f6mdkfwfy6r62sbwq37sylvcji6f3mj9w13sgicxjn6swbszf57"; depends=[signal]; }; +tuple = derive { name="tuple"; version="0.4-02"; sha256="0fm8fsdfiwknjpc20ivi5m5b19r9scdxhzij70l8qi3ixw1f0rnk"; depends=[]; }; +turboEM = derive { name="turboEM"; version="2014.8-1"; sha256="0g9nm1m542hslz8272n5qz6h59criyf71l2w218dvq34bcjcd3yy"; depends=[doParallel foreach numDeriv quantreg iterators]; }; +turfR = derive { name="turfR"; version="0.8-4"; sha256="0fqzwnrwxlighxbapmnarxzh91s6khjbb26xs8gqzz3f8xwmj9dy"; depends=[dplyr]; }; +turner = derive { name="turner"; version="0.1.7"; sha256="1xckb750hbfmzhvabj0lzrsscib7g187b44ag831z58zvawwh772"; depends=[tester]; }; +tvd = derive { name="tvd"; version="0.1.0"; sha256="07al7gpm81a16q5nppsyc5rhv6zzkcvw72isx955b1q189v073aw"; depends=[Rcpp Rcpp]; }; +tvm = derive { name="tvm"; version="0.2"; sha256="1fwa37xnp3idal8v1xxlc9gr25595f644i7a3h8xpd0k086sp1dg"; depends=[ggplot2 reshape2]; }; +twang = derive { name="twang"; version="1.4-0"; sha256="0r9n0s421dhvsr3ppzhdxsq4viz18mbi9mglhyyl5r6slzyb4m0x"; depends=[gbm survey xtable latticeExtra]; }; +tweedie = derive { name="tweedie"; version="2.2.1"; sha256="1fsi0qf901bvvwa8bb6qvp90fkx1svzswljlvw4zirdavy65w0iq"; depends=[]; }; +twiddler = derive { name="twiddler"; version="0.5-0"; sha256="0r16nfk2afcw7w0j0n3g0sjs07dnafrp88abwcqg3jyvldp3kxnx"; depends=[]; }; +twitteR = derive { name="twitteR"; version="1.1.7"; sha256="0zkz44brvkrsp1g7i90j2lvnj462vav706vqyxv0jfkp52f0s1z4"; depends=[ROAuth RCurl rjson]; }; +twoStageGwasPower = derive { name="twoStageGwasPower"; version="0.99.0"; sha256="1xvy6v444v47i29aw54y29xiizkmryv8p3mjha93xr3xq9bx2mq7"; depends=[]; }; +twostageTE = derive { name="twostageTE"; version="1.2"; sha256="05k9lvkailv06cah71p71hnx8in045nxz6waplsccznplhgqg5ar"; depends=[isotone]; }; +txtplot = derive { name="txtplot"; version="1.0-3"; sha256="1949ab1bzvysdb79g8x1gaknj0ih3d6g63pv9512h5m5l3a6c31h"; depends=[]; }; +ucbthesis = derive { name="ucbthesis"; version="1.0"; sha256="0l855if3a7862lxlnkbx52qa617mby634sbb2gkprj21rwd7lcbp"; depends=[knitr stringr]; }; +ucminf = derive { name="ucminf"; version="1.1-3"; sha256="19gmbz32rhrdagvhf2s901lvi1r6273wzznry5daryq6w1jx5z3v"; depends=[]; }; +udunits2 = derive { name="udunits2"; version="0.6"; sha256="1dlxcx7yw7yqpimnfikdraqcmjsjz7js0j24li0879dzwrqa27ja"; depends=[]; }; +ump = derive { name="ump"; version="0.5-4"; sha256="05nd9bnysp8gaw916h7hk425banffcm0xfygalbp7brl71q0zby6"; depends=[]; }; +unbalanced = derive { name="unbalanced"; version="1.1"; sha256="0crkykmyxbag4ri2zikz4r22bf92r3v6q1lfdcvwdvv27slhyfn2"; depends=[FNN RANN]; }; +unbalhaar = derive { name="unbalhaar"; version="2.0"; sha256="0v6bkin1cakwl9lmv49s0jnccl9d6vdslbi1a7kfvmr5dgy760hs"; depends=[]; }; +uniCox = derive { name="uniCox"; version="1.0"; sha256="1glgk6k8gwxk3haqaswd2gmr7a2hgwjkwk2i1qc5ya7gg8svyavv"; depends=[survival]; }; +uniReg = derive { name="uniReg"; version="1.0"; sha256="1xl19dqnxxibgiiny9ysll2z8j1i70qrszf4xbacq1a6z31vm840"; depends=[DoseFinding MASS mvtnorm quadprog SEL]; }; +unittest = derive { name="unittest"; version="1.0-1"; sha256="08r4qpfj37mykbwd893m4nqyxzar0c3qal76jwsypv3gr7y0khd9"; depends=[]; }; +unmarked = derive { name="unmarked"; version="0.10-4"; sha256="1mb9c6h51y476y50q4bh9v6wx6d91b2npf18a66gjs406nra3yck"; depends=[reshape lattice Rcpp plyr Rcpp RcppArmadillo]; }; +untb = derive { name="untb"; version="1.7-2"; sha256="1ha0xj94sz1r325qb4sb5hla9hw1gbqr76703vk792x9696skhji"; depends=[Brobdingnag partitions polynom]; }; +upclass = derive { name="upclass"; version="2.0"; sha256="0jkxn6jgglw6pzzbcvi1pnq4hwfach3xbi13zwml4i83s3n5b0vg"; depends=[mclust]; }; +uplift = derive { name="uplift"; version="0.3.5"; sha256="11xikfmg6dg8mhwqq6wq9j9aw4ljh84vywpm9v0fk8r5a1wyy2f6"; depends=[RItools MASS coin tables penalized]; }; +urca = derive { name="urca"; version="1.2-8"; sha256="0gyjb99m6w6h701vmsav16jpfl5276vlyaagizax8k20ns9ddl4b"; depends=[nlme]; }; +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]; }; +uskewFactors = derive { name="uskewFactors"; version="1.0"; sha256="1ixcxqw8ai77ndn1cfkq53a090fgs95yzvas1qg2siwpfsm4yix6"; depends=[tmvtnorm mvtnorm MCMCpack MASS]; }; +usl = derive { name="usl"; version="1.4.0"; sha256="12wrznlwdnapa4blq542s8jcb8wcsw8h0c6jgq0n4jzxxp9k14n4"; depends=[nlmrt]; }; +ustyc = derive { name="ustyc"; version="1.0.0"; sha256="1267bng2dz3229cbbq47w22i2yq2ydpw26ngqa1nbi3ma6hwqsv4"; depends=[XML plyr]; }; +utility = derive { name="utility"; version="1.3"; sha256="0ng7jc45k9rgj9055ndmgl308zjvxd2cjsk2pn57x44rl1lldcj5"; depends=[]; }; +uuid = derive { name="uuid"; version="0.1-1"; sha256="1b35h2n86233zb6dwkgxxlvnlld8kmv0j6j3m31xjbpmc3ppr7w3"; depends=[]; }; +vacem = derive { name="vacem"; version="0.1-1"; sha256="0lh32hj4g1hsa45v6pmfyj1hw0klk8gr1k451lvs4hzpkkcwkqbn"; depends=[foreach]; }; +varComp = derive { name="varComp"; version="0.1-317"; sha256="16nmhipi0nlh0igc3g9jbv1pqvigmgxy8f395xx6hbzyg87x2ha9"; depends=[quadprog Matrix MASS CompQuadForm RLRsim SPA3G mvtnorm nlme]; }; +varSelRF = derive { name="varSelRF"; version="0.7-3"; sha256="11am1hdcaxh58mqa1v16siip6adg61pjxhdyl8mlgnnmffslnpq9"; depends=[randomForest]; }; +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.0.14"; sha256="08knzndbidg50z35lxh91x06krycifps1r2hycl4pi92bmzwkmq5"; 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=[]; }; +vbsr = derive { name="vbsr"; version="0.0.5"; sha256="1avskbxxyinjjdga4rnghcfvd4sypv4m39ysfaij5avvmi89bx3b"; depends=[]; }; +vcd = derive { name="vcd"; version="1.3-2"; sha256="1ww69sgg178aqcs90mm599nlr6hnxn54d2wzyhddgx1z3qxhzwjd"; depends=[MASS colorspace]; }; +vcdExtra = derive { name="vcdExtra"; version="0.6-3"; sha256="1zpgr4ykcys1gc0cicrdl5w02mr2f5bm60cpm3r3mqs718nsjxkv"; depends=[vcd gnm MASS]; }; +vcrpart = derive { name="vcrpart"; version="0.2-3"; sha256="1w1kiykddk3sha4c3fqdc38yd3x4y7sxq5jdclnm8nq8z9widcbj"; depends=[partykit nlme rpart numDeriv ucminf zoo sandwich strucchange]; }; +vdg = derive { name="vdg"; version="1.0"; sha256="1agikw9w9rnn3b2q8lp9y3bxjrf8vx24j624wf19bvx5s3ghqc36"; depends=[ggplot2 quantreg proxy]; }; +vdmR = derive { name="vdmR"; version="0.1.0"; sha256="0rv9c6bn711dn1fhgmr4ig0lr9s6yjk7r5ccvyiadgn6g5mr2bds"; depends=[ggplot2 plyr maptools gridSVG rjson GGally Rook dplyr]; }; +vec2dtransf = derive { name="vec2dtransf"; version="1.1"; sha256="029xynay9f9rn0syphh2rhd3szv50ib4r0h0xfhhvbbb37h5dc9s"; depends=[sp]; }; +vecsets = derive { name="vecsets"; version="1.1"; sha256="0k27g3frc9y9z2qlm19kfpls6wl0422dilhdlk6096f1fp3mc6ij"; depends=[]; }; +vectoptim = derive { name="vectoptim"; version="0.2"; sha256="1n19sipx5r0qy08jmrbsrf0kgwgl31np88wc1zyc2bkx8h1zkmf2"; depends=[foreach doParallel]; }; +vegan = derive { name="vegan"; version="2.2-0"; sha256="1wr3jy86mg6dvhdrbp4r0idai9w7dch6m797zb8l7sfzm4irgaja"; depends=[permute lattice MASS cluster mgcv]; }; +vegan3d = derive { name="vegan3d"; version="0.65-0"; sha256="0c75hybhwqv56f2zpskr99rr9k6hw6rbv29bcxn0fciw5jqk01m3"; depends=[vegan rgl scatterplot3d]; }; +vegclust = derive { name="vegclust"; version="1.6.3"; sha256="0l6j4sgzfqvcypx2dszpnsd1sivk33pixlgf9abqifp45skpkwfg"; depends=[vegan sp]; }; +vegdata = derive { name="vegdata"; version="0.6-7"; sha256="0k680sq5dk95alzzwmixvxm856scr5cnf8gfr1k0z8cbz0gzawd2"; depends=[foreign XML]; }; +vegetarian = derive { name="vegetarian"; version="1.2"; sha256="15ys1m8p3067dfsjwz6ds837n6rqd19my23yj8vw78xli3qmn445"; depends=[]; }; +venneuler = derive { name="venneuler"; version="1.1-0"; sha256="10fviqv9vr7zkmqm6iy2l9bjxglf2ljb7sx423vi4s9vffcxjp17"; depends=[rJava]; }; +verification = derive { name="verification"; version="1.40"; sha256="19nhpv41s024cqd3qzx0d2sc9234x73s6k8nfj6wf5jvbc5z0xv4"; depends=[fields boot CircStats MASS dtw]; }; +vetools = derive { name="vetools"; version="1.3-28"; sha256="1470xgqdq9n5kj86gdfds15k3vqidk3h99zi3g76hhyfl8gyl1c0"; depends=[sp stringr tis lubridate maptools plyr xts scales]; }; +vines = derive { name="vines"; version="1.1.0"; sha256="1cf06i2vci0hwszdlpcig90klxgd7l2k79dln71lc9y0xrzxz9lf"; depends=[copula ADGofTest cubature TSP]; }; +violinmplot = derive { name="violinmplot"; version="0.2.1"; sha256="1j3hb03y988xa704kp25v1z1pmpxw5k1502zfqjaf8cy4lr3kzsc"; depends=[lattice]; }; +vioplot = derive { name="vioplot"; version="0.2"; sha256="16wkb26kv6qr34hv5zgqmgq6zzgysg9i78pvy2c097lr60v087v0"; depends=[sm]; }; +viopoints = derive { name="viopoints"; version="0.2-1"; sha256="0cpbkkzm1rxch8gnvlmmzy8g521f5ang3nhlcnin419gha0w6avf"; depends=[]; }; +virtualspecies = derive { name="virtualspecies"; version="1.0"; sha256="1qg5106ja17nsqzjnyswjf438f55195l197pizkybb2ilg4fw0x1"; depends=[raster ade4 dismo rworldmap]; }; +visova = derive { name="visova"; version="1.1"; sha256="1ag1vs5alh62yj5722qb74rmvvxv7906h7nb5m31bac2p4ldbfar"; depends=[RJSONIO]; }; +visreg = derive { name="visreg"; version="2.1-0"; sha256="1l8az4ykfr3rfgxx7wj9qvma77lcgr3pa60cxzqabm9cg6622fsf"; depends=[lattice]; }; +visualFields = derive { name="visualFields"; version="0.4"; sha256="07pkaccnk8c9zzizpcdw82vcbqdng2bi9aczpa68i7fz24bvcfan"; depends=[gridBase flip matrixStats Hmisc]; }; +visualize = derive { name="visualize"; version="4.2"; sha256="1jgk7j0f3p72wbqnmplrgpy7hlh7k2cmvx83gr2zfnbhygdi22mk"; depends=[]; }; +vitality = derive { name="vitality"; version="1.0"; sha256="0di72khz1mwqlirx78a86lwqhjmbbgmxm6vmlwq546dwvs6q071g"; depends=[IMIS]; }; +vowels = derive { name="vowels"; version="1.2-1"; sha256="0177xysb5y8jzpxn9wdygq2f74gys67g29cd12zw77vlq3c3kkbr"; depends=[]; }; +vows = derive { name="vows"; version="0.3"; sha256="0b8jgf1zh7qqkiszbygm9hgld3gv6m5vsw7jz8sl3zkc0lixxysn"; depends=[fda gamm4 rpanel mgcv RLRsim Rniftilib shape stringr]; }; +vrmlgen = derive { name="vrmlgen"; version="1.4.9"; sha256="0lifhhf41yml4k83wpkssl14jgn8jaw1lcknwbci1sd8s1c4478l"; depends=[]; }; +vrtest = derive { name="vrtest"; version="0.97"; sha256="00hdgb0r18nwv3qay97b09kqqw9xqsbya06rrjyddqh9r6ggx1y0"; depends=[]; }; +vscc = derive { name="vscc"; version="0.2"; sha256="1p14v8vd8kckd44g4dvzh51gdkd8jvsc4bkd2i4csx8vjiwrni5w"; depends=[teigen mclust]; }; +vudc = derive { name="vudc"; version="1.0"; sha256="1xjbjfya4zn94arc76pcfflc2dcn40qj1fkzwnzqz70czc2msppw"; depends=[]; }; +vwr = derive { name="vwr"; version="0.3.0"; sha256="1h790vjcdfngs1siwldvqz8jrxpkajl3266lzadfnmchfan1x7xv"; depends=[stringdist lattice latticeExtra]; }; +wSVM = derive { name="wSVM"; version="0.1-7"; sha256="0c7rblzgagwfb8mmddkc0nd0f9rv6kapw8znpwapv3fv0j2qzq7h"; depends=[MASS quadprog]; }; +waffect = derive { name="waffect"; version="1.2"; sha256="0r5dvm0ggyxyv81hxdr1an658wkqkhqq2xaqzqpnh4sh4wbak35a"; depends=[Rcpp Rcpp]; }; +waldwolf = derive { name="waldwolf"; version="0.1"; sha256="0gig3dqs8f44kdzr3abmm4wcnby2ifgqs72ck5wvny6gkwyfdvys"; depends=[]; }; +walkscoreAPI = derive { name="walkscoreAPI"; version="1.2"; sha256="1c2gfkl5yl3mkviah8s8zjnqk6lnzma1yilxgfxckdh5wywi39fx"; depends=[]; }; +wasim = derive { name="wasim"; version="1.1.2"; sha256="1zydzw7cihhdwv0474fnc4lgaq5fwrv8jinz79vkbidbgcy7i2fd"; depends=[MASS qualV tiger fast]; }; +waterData = derive { name="waterData"; version="1.0.4"; sha256="0wk49f079jfbjncyirdvq50wswf9g361iivshjfhyndv83gbqrzk"; depends=[lattice latticeExtra XML]; }; +waterfall = derive { name="waterfall"; version="0.9.9.20121030"; sha256="140s5639ayd9qgn4i1s1qk541vi34ndzdcqpaps7q53g42n8akfw"; depends=[lattice]; }; +waveband = derive { name="waveband"; version="4.6"; sha256="1y2qi2zb8l2ap6f8ihnpq2yavic464bl5mp5yv1dscbk0nmfn966"; depends=[wavethresh]; }; +waved = derive { name="waved"; version="1.1-2"; sha256="17pr9qhz0dbbcr78vwm964d9zd7yrfrqvadr1lwf756bsrscmlg3"; depends=[]; }; +wavelets = derive { name="wavelets"; version="0.3-0"; sha256="141s7z7wxl5plxp7xp7wczswlcvb18a4h3n881l9qc4ny9p7gfpa"; depends=[]; }; +wavemulcor = derive { name="wavemulcor"; version="1.2"; sha256="1039y5rakjkx2mvfmykg2z4jpkpbcj7rclyg7ab19wnxmdm8ls81"; depends=[waveslim]; }; +waveslim = derive { name="waveslim"; version="1.7.3"; sha256="0lkq8lcg8cd4iw95jb0r5iwl2habngzzzwcxfic05gbpj5gfmapk"; depends=[]; }; +wavethresh = derive { name="wavethresh"; version="4.6.6"; sha256="1ykhfw1bdibvq2b3rrgqszvwqmzkd3fgxqg7p36ms1cxph68g2r9"; depends=[MASS]; }; +wbs = derive { name="wbs"; version="1.2"; sha256="1mnbx0ik4bakf818nbpgi4zgb8y4ljvz5yq602h3crsc4b32kq1k"; depends=[]; }; +wccsom = derive { name="wccsom"; version="1.2.8"; sha256="0dnqcmrrnzqys4mr1md7f0k0h434x25mdc576j00s3pmjjjh873a"; depends=[class MASS]; }; +weatherData = derive { name="weatherData"; version="0.4.1"; sha256="19ynb9w52ay15awaf4bqm9lj2w6pk70lyaipn46jrspwxqsvfhlc"; depends=[plyr]; }; +webutils = derive { name="webutils"; version="0.2"; sha256="19b39jmhblvljkazzf6a55pxd74hx65cvh4s1vgx7m475rqrg6ih"; 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]; }; +weightedScores = derive { name="weightedScores"; version="0.9.1"; sha256="0wd2ymxy8yh3l4xd3xgifbihi89h53wy6n84x7x26px12c70q8fa"; depends=[mvtnorm rootSolve]; }; +weights = derive { name="weights"; version="0.80"; sha256="147fgs99sg1agq081ikj2fhb4b2vzsppdg1h1w036bb92vsjb0g5"; depends=[Hmisc gdata]; }; +weirs = derive { name="weirs"; version="0.23"; sha256="1kp49r5ba7ii1mr1nszbssx3fn0c2hcfpawm3a1kbh4rmhvy3frs"; depends=[]; }; +wesanderson = derive { name="wesanderson"; version="0.3"; sha256="169phanzwz3mgzqncwxc5kdshhmj922nzlbq8gz6grvh51bc7aaa"; depends=[]; }; +wfe = derive { name="wfe"; version="1.3"; sha256="16b39i60x10kw6yz44ff19h638s9lsgnz8azc76zl9b8s64jliya"; depends=[arm Matrix MASS]; }; +wgaim = derive { name="wgaim"; version="1.4-3"; sha256="132i8dw2x46hihvv49ppx9ddll1clz7235y6b5cq1rzs19y7bwqd"; depends=[qtl lattice]; }; +wgsea = derive { name="wgsea"; version="1.8"; sha256="1114wik011sm2n12bwm2bhqvdxagbhbscif45k4pgxdkahy2abpi"; depends=[]; }; +whisker = derive { name="whisker"; version="0.3-2"; sha256="0z4cn115gxcl086d6bnqr8afi67b6a7xqg6ivmk3l4ng1x8kcj28"; depends=[]; }; +widals = derive { name="widals"; version="0.5.4"; sha256="1bl59s1r4gkvq4nkf94fk7m0zvhbrszkgmig66lfxhyvk9r84fvb"; depends=[snowfall]; }; +widenet = derive { name="widenet"; version="0.1-2"; sha256="1nimm8szbg82vg00f5c7b3f3sk0gplssbl4ggasjnh7dl621vfny"; depends=[glmnet relaxnet]; }; +wikibooks = derive { name="wikibooks"; version="0.2"; sha256="178lhri1b8if2j7y7l9kqgyvmkn4z0bxp5l4dmm97x3pav98c7ks"; depends=[]; }; +wikipediatrend = derive { name="wikipediatrend"; version="0.2.0"; sha256="11gxi94i6xfsj4dz7g2r7ag0gbah2km9ibbmjqihbk5ccxh5kfd6"; depends=[jsonlite stringr RCurl]; }; +wildlifeDI = derive { name="wildlifeDI"; version="0.1"; sha256="16262cb02d3w2lkaqns5zhzk9wm25lfcbwsgcav2hs93pmdx2dma"; 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=[]; }; +wle = derive { name="wle"; version="0.9-9"; sha256="032zqfqg6ghg56zgr005g8q94zskmbzv1p08lxv227ikkbmnwn53"; depends=[circular]; }; +wmtsa = derive { name="wmtsa"; version="2.0-0"; sha256="0y2bv166xwwpb1wf6897qybyf84f34qjsmygdbv90r637c050yk5"; depends=[splus2R ifultools MASS]; }; +wnominate = derive { name="wnominate"; version="0.99"; sha256="19pis0p4kkwyddn8f93p4ff7l1hvcdr7m3hrv4bzmm9nd8iy8mk1"; depends=[pscl]; }; +wombsoft = derive { name="wombsoft"; version="2.0"; sha256="11ri29vj1yg2lpr6vf1i45w20hqh8dswj04ylbq0vy27cwmxqljd"; depends=[]; }; +wordcloud = derive { name="wordcloud"; version="2.5"; sha256="1ajqdkm8h1wid3d41zd8v7xzf2swid998w31zrghd45a5lcp7qcm"; depends=[RColorBrewer slam Rcpp Rcpp]; }; +wordmatch = derive { name="wordmatch"; version="1.0"; sha256="0zscp361qf79y1zsliga18hc7wj36cnydshrqb9pv67b65njrznz"; depends=[plyr reshape2]; }; +wordnet = derive { name="wordnet"; version="0.1-10"; sha256="0s68hkyk28ry0g96d4gxy7r9nywypx7ymqpzadlb79dls32i20lz"; depends=[rJava]; }; +wpp2008 = derive { name="wpp2008"; version="1.0-1"; sha256="0gd3vjw1fpzhp3qlf1jpc24f76i0pxsjs5pb1v3k2si6df7q4msd"; depends=[]; }; +wpp2010 = derive { name="wpp2010"; version="1.2-0"; sha256="1h87r1cn4lnx80dprvawsyzfkriscqjgr27gvv7n19wvsx8qd57k"; depends=[]; }; +wpp2012 = derive { name="wpp2012"; version="2.2-1"; sha256="00283s4r36zzwn67fydrl7ldg6jhn14qkf47h0ifmsky95bd1n5k"; depends=[]; }; +wppExplorer = derive { name="wppExplorer"; version="1.4-0"; sha256="1dyg9482h9854nx526151rclh3m45g78x36ll8xw78ywnj9xrjzj"; depends=[shiny plyr reshape2 googleVis wpp2012 Hmisc ggplot2]; }; +wq = derive { name="wq"; version="0.4-1"; sha256="0a46islpzpbkx6c7mbn6q787mh9mb6sy4k46lz8s63fh2h7p0szk"; depends=[zoo]; }; +write_snns = derive { name="write.snns"; version="0.0-4.2"; sha256="0sxg7z8rnh4lssbivkrfxldv4ivy37wkndzzndpbvq2gbvbjnp4l"; depends=[]; }; +wrspathrow = derive { name="wrspathrow"; version="0.1"; sha256="1xkh12aal85qhk8d0pdj2qbi6pp4jnr6zbxkhdw2zwav57ly3f4i"; depends=[wrspathrowData sp raster rgeos rgdal]; }; +wrspathrowData = derive { name="wrspathrowData"; version="1.0"; sha256="0a1aggcll0fmkwfg4h7rs4j5h3v1bh95dkbriwrb0bx0cikg63x3"; depends=[]; }; +wskm = derive { name="wskm"; version="1.4.11"; sha256="1pmsir4msy95x080k463f34ms4vm8nayr21g2cd50mmzffbm5mwl"; depends=[lattice latticeExtra clv]; }; +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-2"; sha256="1x3d4ndaz6qpbd99vf1a9k68zj3jdk43gwix7022ds9ilq2wk4pj"; 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]; }; +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.3"; sha256="1bkvxi3f7hmzx9mlbp30sk1ixhyxwai9rgahs25hrzy4dsnyxyk0"; depends=[ergm statnet statnet_common network sna texreg Matrix boot coda ROCR igraph vegan lme4]; }; +xgboost = derive { name="xgboost"; version="0.3-2"; sha256="1sp0rl4ixdcqljcf12cc517vnwj851g88xla641nfl0qbcj8b7n7"; depends=[Matrix]; }; +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.3"; sha256="086kdy4dp7312pxv7zpx3qf8rk91lv0snrhipzcmcn1m4q77q9z2"; depends=[Hmisc ggplot2]; }; +xlsx = derive { name="xlsx"; version="0.5.7"; sha256="0qxkdpf1dvi0x7fy65abjx2j60rdx7fv5yi8l2wdm0f2631pnwin"; depends=[rJava xlsxjars]; }; +xlsxjars = derive { name="xlsxjars"; version="0.6.1"; sha256="1rka5smm7yqnhhlblpihhciydfap4i6kjaa4a7isdg7qjmzm3h9p"; depends=[rJava]; }; +xoi = derive { name="xoi"; version="0.61-1"; sha256="0ypy0rb0f0bns41vjzyln04k3hypgr3wysqbdi0b0r14ip5rb47k"; depends=[qtl]; }; +xpose4 = derive { name="xpose4"; version="4.5.3"; sha256="02m3ad4287ljsi4qrzwd84lfj1y6rz9nias2zk4cbqm14gf19pdf"; depends=[lattice gam Hmisc survival]; }; +xtable = derive { name="xtable"; version="1.7-4"; sha256="1fvx4p058ygsyj9f4xb9k5h0fdi4zibadqrsn4qbx4am30qrlqj7"; depends=[]; }; +xtal = derive { name="xtal"; version="1.0"; sha256="1717pl64nbliwbdg5fs6cwj7zvgrm00zlyj2dhi06yyg16gq1w8k"; depends=[]; }; +xtermStyle = derive { name="xtermStyle"; version="2.2-4"; sha256="0m1lwr7smym7aczcqqgqj5bx46j38ymmljilxl54bby188qhfcyz"; depends=[]; }; +xts = derive { name="xts"; version="0.9-7"; sha256="163hzcnxrdb4lbsnwwv7qa00h4qlg4jm289acgvbg4jbiywpq7zi"; depends=[zoo]; }; +yaImpute = derive { name="yaImpute"; version="1.0-22"; sha256="1yg26f1q1i6vl1jvdff126025rimkvpj8dhr12d8ld8ryl1qghr3"; depends=[]; }; +yacca = derive { name="yacca"; version="1.1"; sha256="0wg2wgvh1najmccmgzyigj11mshrdb8w4r2pqq360dracpn0ak6x"; depends=[]; }; +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.1"; sha256="0s75md4r6k6kqw1fi2ms8k09y8lml9gcyj0zmbyygjncf3zlgxq0"; 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]; }; +zendeskR = derive { name="zendeskR"; version="0.4"; sha256="06cjwk08w3x6dx717123psinid5bx6c563jnfn890373jw6xnfrk"; depends=[RCurl rjson]; }; +zic = derive { name="zic"; version="0.8.1"; sha256="05mn894qdx6k7158dbsjy2b49n0gz5xnmlixr2dhkxc12ydj6zs5"; depends=[Rcpp RcppArmadillo coda Rcpp RcppArmadillo]; }; +zipcode = derive { name="zipcode"; version="1.0"; sha256="1lvlf1h5fv412idpdssjfh4fki933dm5nhr41ppl1mf45b9j7azn"; depends=[]; }; +zipfR = derive { name="zipfR"; version="0.6-6"; sha256="1y3nqfjg5m89mdvcmqwjmwlc8p3hpcqnwv4ji1a7ggg4n63lwl3j"; depends=[]; }; +zoeppritz = derive { name="zoeppritz"; version="1.0-4"; sha256="0mjg55jc5b8h2jj6cy8b34a4q7jhhx73xns0v2dpfkq4kmilsv5p"; depends=[]; }; +zoib = derive { name="zoib"; version="1.0"; sha256="0mxd9j5sbwyv3bhhrly2ikbfqgk3cgkl6jzai9q6lq3lbg55mh9a"; depends=[rjags coda matrixcalc Formula]; }; +zoo = derive { name="zoo"; version="1.7-11"; sha256="0fp726rp9mqsfmm391bmckk76lqsvzwd39ffvb355wf2spl8nzvf"; depends=[lattice]; }; +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=[]; }; +zyp = derive { name="zyp"; version="0.10-1"; sha256="0f1fqqxysf3psnvn08s5qly2c958h1hhznjjj8mvpjr5g6hqlr1k"; depends=[Kendall]; }; +} diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix new file mode 100644 index 000000000000..1ec48bcc06f2 --- /dev/null +++ b/pkgs/development/r-modules/default.nix @@ -0,0 +1,1081 @@ +/* This file defines the composition for CRAN (R) packages. */ + +{ pkgs, overrides }: + +let + inherit (pkgs) R fetchurl stdenv lib xvfb_run utillinux; + + buildRPackage = import ./generic-builder.nix { inherit R xvfb_run utillinux ; }; + + # Package template + # + # some packages, e.g. cncaGUI, require X running while installation, + # so that we use xvfb-run if requireX is true. + derive = lib.makeOverridable ({ + name, version, sha256, + depends ? [], + doCheck ? true, + requireX ? false, + broken ? false, + hydraPlatforms ? R.meta.hydraPlatforms + }: buildRPackage { + name = "${name}-${version}"; + src = fetchurl { + urls = [ + "mirror://cran/src/contrib/${name}_${version}.tar.gz" + "mirror://cran/src/contrib/Archive/${name}/${name}_${version}.tar.gz" + ]; + inherit sha256; + }; + inherit doCheck requireX; + propagatedBuildInputs = depends; + nativeBuildInputs = depends; + meta.homepage = "http://cran.r-project.org/web/packages/${name}/"; + meta.platforms = R.meta.platforms; + meta.hydraPlatforms = hydraPlatforms; + meta.broken = broken; + }); + + # Overrides package definitions with nativeBuildInputs. + # For example, + # + # overrideNativeBuildInputs { + # foo = [ pkgs.bar ] + # } old + # + # results in + # + # { + # foo = old.foo.overrideDerivation (attrs: { + # nativeBuildInputs = attrs.nativeBuildInputs ++ [ pkgs.bar ]; + # }); + # } + overrideNativeBuildInputs = overrides: old: + let + attrNames = builtins.attrNames overrides; + nameValuePairs = map (name: rec { + inherit name; + nativeBuildInputs = builtins.getAttr name overrides; + value = (builtins.getAttr name old).overrideDerivation (attrs: { + nativeBuildInputs = attrs.nativeBuildInputs ++ nativeBuildInputs; + }); + }) attrNames; + in + builtins.listToAttrs nameValuePairs; + + # Overrides package definitions with buildInputs. + # For example, + # + # overrideBuildInputs { + # foo = [ pkgs.bar ] + # } old + # + # results in + # + # { + # foo = old.foo.overrideDerivation (attrs: { + # buildInputs = attrs.buildInputs ++ [ pkgs.bar ]; + # }); + # } + overrideBuildInputs = overrides: old: + let + attrNames = builtins.attrNames overrides; + nameValuePairs = map (name: rec { + inherit name; + buildInputs = builtins.getAttr name overrides; + value = (builtins.getAttr name old).overrideDerivation (attrs: { + buildInputs = attrs.buildInputs ++ buildInputs; + }); + }) attrNames; + in + builtins.listToAttrs nameValuePairs; + + # Overrides package definition requiring X running to install. + # For example, + # + # overrideRequireX [ + # "foo" + # ] old + # + # results in + # + # { + # foo = old.foo.override { + # requireX = true; + # }; + # } + overrideRequireX = packageNames: old: + let + nameValuePairs = map (name: { + inherit name; + value = (builtins.getAttr name old).override { + requireX = true; + }; + }) packageNames; + in + builtins.listToAttrs nameValuePairs; + + # Overrides package definition to skip check. + # For example, + # + # overrideSkipCheck [ + # "foo" + # ] old + # + # results in + # + # { + # foo = old.foo.override { + # doCheck = false; + # }; + # } + overrideSkipCheck = packageNames: old: + let + nameValuePairs = map (name: { + inherit name; + value = (builtins.getAttr name old).override { + doCheck = false; + }; + }) packageNames; + in + builtins.listToAttrs nameValuePairs; + + # Overrides package definition to mark it broken. + # For example, + # + # overrideBroken [ + # "foo" + # ] old + # + # results in + # + # { + # foo = old.foo.override { + # broken = true; + # }; + # } + overrideBroken = packageNames: old: + let + nameValuePairs = map (name: { + inherit name; + value = (builtins.getAttr name old).override { + broken = true; + }; + }) packageNames; + in + builtins.listToAttrs nameValuePairs; + + defaultOverrides = old: new: + let old0 = old; in + let + old1 = old0 // (overrideRequireX packagesRequireingX old0); + old2 = old1 // (overrideSkipCheck packagesToSkipCheck old1); + old3 = old2 // (overrideNativeBuildInputs packagesWithNativeBuildInputs old2); + old4 = old3 // (overrideBuildInputs packagesWithBuildInputs old3); + old5 = old4 // (overrideBroken brokenPackages old4); + old = old5; + in old // (otherOverrides old new); + + # Recursive override pattern. + # `_self` is a collection of packages; + # `self` is `_self` with overridden packages; + # packages in `_self` may depends on overridden packages. + self = (defaultOverrides _self self) // overrides; + _self = import ./cran-packages.nix { inherit self derive; }; + + # tweaks for the individual packages and "in self" follow + + packagesWithNativeBuildInputs = { + # sort -t '=' -k 2 + RAppArmor = [ pkgs.apparmor ]; + SOD = [ pkgs.cudatoolkit ]; # requres CL/cl.h + curl = [ pkgs.curl pkgs.openldap ]; + Rssa = [ pkgs.fftw ]; + fftw = [ pkgs.fftw ]; + fftwtools = [ pkgs.fftw ]; + kza = [ pkgs.fftw ]; + mwaved = [ pkgs.fftw ]; + spate = [ pkgs.fftw ]; + chebpol = [ pkgs.fftw ]; + seewave = [ pkgs.fftw pkgs.libsndfile ]; + rgeos = [ pkgs.geos ]; + Rglpk = [ pkgs.glpk ]; + RCA = [ pkgs.gmp ]; + gmp = [ pkgs.gmp ]; + rcdd = [ pkgs.gmp ]; + igraph = [ pkgs.gmp ]; + glpkAPI = [ pkgs.gmp pkgs.glpk ]; + sdcTable = [ pkgs.gmp pkgs.glpk ]; + Rmpfr = [ pkgs.gmp pkgs.mpfr ]; + BNSP = [ pkgs.gsl ]; + BayesSAE = [ pkgs.gsl ]; + BayesVarSel = [ pkgs.gsl ]; + HiCseg = [ pkgs.gsl ]; + KFKSDS = [ pkgs.gsl ]; + R2GUESS = [ pkgs.gsl ]; + RcppZiggurat = [ pkgs.gsl ]; + SemiCompRisks = [ pkgs.gsl ]; + VBLPCM = [ pkgs.gsl ]; + abn = [ pkgs.gsl ]; + cit = [ pkgs.gsl ]; + libamtrack = [ pkgs.gsl ]; + mixcat = [ pkgs.gsl ]; + outbreaker = [ pkgs.gsl ]; + pcaPA = [ pkgs.gsl ]; + ridge = [ pkgs.gsl ]; + simplexreg = [ pkgs.gsl ]; + stsm = [ pkgs.gsl ]; + survSNP = [ pkgs.gsl ]; + topicmodels = [ pkgs.gsl ]; + RcppGSL = [ pkgs.gsl ]; + bnpmr = [ pkgs.gsl ]; + geoCount = [ pkgs.gsl ]; + gsl = [ pkgs.gsl ]; + mvabund = [ pkgs.gsl ]; + diversitree = [ pkgs.gsl pkgs.fftw ]; + VBmix = [ pkgs.gsl pkgs.fftw pkgs.qt4 ]; + RGtk2 = [ pkgs.gtk2 ]; + cairoDevice = [ pkgs.gtk2 ]; + adimpro = [ pkgs.imagemagick ]; + rjags = [ pkgs.jags ]; + runjags = [ pkgs.jags ]; + JavaGD = [ pkgs.jdk ]; + RODBC = [ pkgs.libiodbc ]; + RODBCext = [ pkgs.libiodbc ]; + jpeg = [ pkgs.libjpeg ]; + EMCluster = [ pkgs.liblapack ]; + png = [ pkgs.libpng ]; + rtiff = [ pkgs.libtiff ]; + tiff = [ pkgs.libtiff ]; + Cairo = [ pkgs.libtiff pkgs.libjpeg pkgs.cairo ]; + XML = [ pkgs.libtool pkgs.libxml2 pkgs.xmlsec pkgs.libxslt ]; + rpud = [ pkgs.linuxPackages.nvidia_x11 ]; + CARramps = [ pkgs.linuxPackages.nvidia_x11 pkgs.liblapack ]; + rgl = [ pkgs.mesa pkgs.x11 ]; + ncdf = [ pkgs.netcdf ]; + ncdf4 = [ pkgs.netcdf ]; + pbdNCDF4 = [ pkgs.netcdf ]; + RNetCDF = [ pkgs.netcdf pkgs.udunits ]; + nloptr = [ pkgs.nlopt ]; + npRmpi = [ pkgs.openmpi ]; + pbdPROF = [ pkgs.openmpi ]; + sprint = [ pkgs.openmpi ]; + Rmpi = [ pkgs.openmpi ]; + openssl = [ pkgs.openssl ]; + PKI = [ pkgs.openssl ]; + RSclient = [ pkgs.openssl ]; + Rserve = [ pkgs.openssl ]; + Rpoppler = [ pkgs.poppler ]; + audio = [ pkgs.portaudio ]; + rpg = [ pkgs.postgresql ]; + RPostgreSQL = [ pkgs.postgresql ]; + ssanv = [ pkgs.proj ]; + proj4 = [ pkgs.proj ]; + rgdal = [ pkgs.proj pkgs.gdal ]; + RProtoBuf = [ pkgs.protobuf ]; + rPython = [ pkgs.python ]; + qtpaint = [ pkgs.qt4 ]; + qtbase = [ pkgs.qt4 ]; + BayesXsrc = [ pkgs.readline pkgs.ncurses ]; + udunits2 = [ pkgs.udunits pkgs.expat ]; + tkrplot = [ pkgs.xlibs.libX11 ]; + rzmq = [ pkgs.zeromq2 ]; + PopGenome = [ pkgs.zlib ]; + RJaCGH = [ pkgs.zlib ]; + RcppCNPy = [ pkgs.zlib ]; + Rniftilib = [ pkgs.zlib ]; + WhopGenome = [ pkgs.zlib ]; + devEMF = [ pkgs.zlib ]; + gdsfmt = [ pkgs.zlib ]; + rbamtools = [ pkgs.zlib ]; + rmatio = [ pkgs.zlib ]; + RVowpalWabbit = [ pkgs.zlib pkgs.boost ]; + seqminer = [ pkgs.zlib pkgs.bzip2 ]; + rphast = [ pkgs.zlib pkgs.bzip2 pkgs.gzip pkgs.readline ]; + rtfbs = [ pkgs.zlib pkgs.bzip2 pkgs.gzip pkgs.readline ]; + Rhpc = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.openmpi pkgs.pcre ]; + SAVE = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre ]; + RcppOctave = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre pkgs.octave ]; + rJava = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre pkgs.jdk pkgs.libzip ]; + R2SWF = [ pkgs.zlib pkgs.libpng pkgs.freetype ]; + sysfonts = [ pkgs.zlib pkgs.libpng pkgs.freetype ]; + showtext = [ pkgs.zlib pkgs.libpng pkgs.icu pkgs.freetype ]; + XBRL = [ pkgs.zlib pkgs.libxml2 ]; + RMySQL = [ pkgs.zlib pkgs.mysql ]; + }; + + packagesWithBuildInputs = { + # sort -t '=' -k 2 + qtpaint = [ pkgs.cmake ]; + qtbase = [ pkgs.cmake pkgs.perl ]; + gmatrix = [ pkgs.cudatoolkit ]; + WideLM = [ pkgs.cudatoolkit ]; + RCurl = [ pkgs.curl ]; + Rgnuplot = [ pkgs.gnuplot ]; + R2SWF = [ pkgs.pkgconfig ]; + RGtk2 = [ pkgs.pkgconfig ]; + RProtoBuf = [ pkgs.pkgconfig ]; + Rpoppler = [ pkgs.pkgconfig ]; + VBmix = [ pkgs.pkgconfig ]; + XML = [ pkgs.pkgconfig ]; + cairoDevice = [ pkgs.pkgconfig ]; + chebpol = [ pkgs.pkgconfig ]; + fftw = [ pkgs.pkgconfig ]; + geoCount = [ pkgs.pkgconfig ]; + kza = [ pkgs.pkgconfig ]; + mwaved = [ pkgs.pkgconfig ]; + showtext = [ pkgs.pkgconfig ]; + spate = [ pkgs.pkgconfig ]; + stringi = [ pkgs.pkgconfig ]; + sysfonts = [ pkgs.pkgconfig ]; + Cairo = [ pkgs.pkgconfig ]; + Rsymphony = [ pkgs.pkgconfig pkgs.doxygen pkgs.graphviz pkgs.subversion ]; + qtutils = [ pkgs.qt4 ]; + tcltk2 = [ pkgs.tcl pkgs.tk ]; + tikzDevice = [ pkgs.texLive ]; + rPython = [ pkgs.which ]; + CARramps = [ pkgs.which pkgs.cudatoolkit ]; + gputools = [ pkgs.which pkgs.cudatoolkit ]; + rpud = [ pkgs.which pkgs.cudatoolkit ]; + adimpro = [ pkgs.which pkgs.xorg.xdpyinfo ]; + PET = [ pkgs.which pkgs.xorg.xdpyinfo pkgs.imagemagick ]; + dti = [ pkgs.which pkgs.xorg.xdpyinfo pkgs.imagemagick ]; + }; + + packagesRequireingX = [ + "AnalyzeFMRI" + "AnnotLists" + "AnthropMMD" + "AtelieR" + "BAT" + "BCA" + "BEQI2" + "BHMSMAfMRI" + "BioGeoBEARS" + "BiodiversityR" + "CCTpack" + "CommunityCorrelogram" + "ConvergenceConcepts" + "DALY" + "DSpat" + "Deducer" + "DeducerExtras" + "DeducerPlugInExample" + "DeducerPlugInScaling" + "DeducerSpatial" + "DeducerSurvival" + "DeducerText" + "Demerelate" + "DescTools" + "DivMelt" + "ENiRG" + "EcoVirtual" + "EnQuireR" + "FAiR" + "FD" + "FFD" + "FeedbackTS" + "FreeSortR" + "GGEBiplotGUI" + "GPCSIV" + "GUniFrac" + "Geneland" + "GeoGenetix" + "GeoXp" + "GrammR" + "GrapheR" + "GroupSeq" + "HH" + "HiveR" + "IsotopeR" + "JGR" + "KappaGUI" + "LS2Wstat" + "MAR1" + "MTurkR" + "MVPARTwrap" + "MareyMap" + "MergeGUI" + "Meth27QC" + "MicroStrategyR" + "MissingDataGUI" + "MplusAutomation" + "OligoSpecificitySystem" + "OpenRepGrid" + "PBSadmb" + "PBSmodelling" + "PCPS" + "PKmodelFinder" + "PoMoS" + "PopGenReport" + "PredictABEL" + "PrevMap" + "ProbForecastGOP" + "QCAGUI" + "R2STATS" + "RHRV" + "RNCEP" + "RQDA" + "RSDA" + "RSurvey" + "RandomFields" + "Rcmdr" + "RcmdrPlugin_BCA" + "RcmdrPlugin_DoE" + "RcmdrPlugin_EACSPIR" + "RcmdrPlugin_EBM" + "RcmdrPlugin_EZR" + "RcmdrPlugin_EcoVirtual" + "RcmdrPlugin_FactoMineR" + "RcmdrPlugin_HH" + "RcmdrPlugin_IPSUR" + "RcmdrPlugin_KMggplot2" + "RcmdrPlugin_MA" + "RcmdrPlugin_MPAStats" + "RcmdrPlugin_NMBU" + "RcmdrPlugin_ROC" + "RcmdrPlugin_SCDA" + "RcmdrPlugin_SLC" + "RcmdrPlugin_SM" + "RcmdrPlugin_StatisticalURV" + "RcmdrPlugin_TeachingDemos" + "RcmdrPlugin_UCA" + "RcmdrPlugin_coin" + "RcmdrPlugin_depthTools" + "RcmdrPlugin_doex" + "RcmdrPlugin_epack" + "RcmdrPlugin_lfstat" + "RcmdrPlugin_mosaic" + "RcmdrPlugin_orloca" + "RcmdrPlugin_plotByGroup" + "RcmdrPlugin_pointG" + "RcmdrPlugin_qual" + "RcmdrPlugin_sampling" + "RcmdrPlugin_sos" + "RcmdrPlugin_steepness" + "RcmdrPlugin_survival" + "RcmdrPlugin_temis" + "RenextGUI" + "RunuranGUI" + "SOLOMON" + "SPACECAP" + "SRRS" + "SSDforR" + "STEPCAM" + "SYNCSA" + "Simile" + "SimpleTable" + "StatDA" + "SyNet" + "TDMR" + "TED" + "TIMP" + "TTAinterfaceTrendAnalysis" + "TestScorer" + "VIMGUI" + "VecStatGraphs3D" + "VisuClust" + "WMCapacity" + "accrual" + "ade4TkGUI" + "adehabitat" + "analogue" + "analogueExtra" + "aplpack" + "aqfig" + "arf3DS4" + "asbio" + "bayesDem" + "betapart" + "betaper" + "bio_infer" + "bipartite" + "biplotbootGUI" + "blender" + "cairoDevice" + "cncaGUI" + "cocorresp" + "confidence" + "constrainedKriging" + "cpa" + "dave" + "debug" + "detrendeR" + "dgmb" + "dpa" + "dynBiplotGUI" + "dynamicGraph" + "eVenn" + "exactLoglinTest" + "fSRM" + "fat2Lpoly" + "fbati" + "feature" + "fgui" + "fisheyeR" + "fit4NM" + "forams" + "forensim" + "fscaret" + "gWidgets2RGtk2" + "gWidgets2tcltk" + "gWidgetsRGtk2" + "gWidgetstcltk" + "gcmr" + "geoR" + "geoRglm" + "geomorph" + "georob" + "gnm" + "gsubfn" + "iBUGS" + "iDynoR" + "ic50" + "in2extRemes" + "iplots" + "isopam" + "likeLTD" + "loe" + "logmult" + "memgene" + "metacom" + "migui" + "miniGUI" + "mixsep" + "mlDNA" + "mpmcorrelogram" + "mritc" + "multgee" + "multibiplotGUI" + "nodiv" + "onemap" + "palaeoSig" + "paleoMAS" + "pbatR" + "pez" + "phylotools" + "picante" + "playwith" + "plotSEMM" + "plsRbeta" + "plsRglm" + "pmg" + "poppr" + "powerpkg" + "prefmod" + "qtbase" + "qtpaint" + "qtutils" + "r4ss" + "rAverage" + "rareNMtests" + "recluster" + "relax" + "relimp" + "reportRx" + "reshapeGUI" + "rgl" + "rich" + "ringscale" + "rioja" + "ripa" + "rite" + "rnbn" + "rriskDistributions" + "rsgcc" + "sdcMicroGUI" + "sharpshootR" + "simba" + "soundecology" + "spacodiR" + "spatsurv" + "sqldf" + "statcheck" + "stosim" + "strvalidator" + "stylo" + "svDialogstcltk" + "svIDE" + "svSocket" + "svWidgets" + "tcltk2" + "titan" + "tkrgl" + "tkrplot" + "tmap" + "tspmeta" + "twiddler" + "vcdExtra" + "vegan" + "vegan3d" + "vegclust" + "x12GUI" + "xergm" + ]; + + packagesToSkipCheck = [ + "Rmpi" # tries to run MPI processes + "gmatrix" # requires CUDA runtime + "npRmpi" # tries to run MPI processes + "sprint" # tries to run MPI processes + ]; + + # Packages which cannot be installed due to lack of dependencies or other reasons. + brokenPackages = [ + # sort -t '#' -k 2 + + "rpanel" # I could not make Tcl to recognize BWidget. HELP WANTED! + "MigClim" # SDMTools.So: Undefined Symbol: X + "PatternClass" # SDMTools.So: Undefined Symbol: X + "Actigraphy" # SDMTools.so: undefined symbol: X + "lefse" # SDMTools.so: undefined symbol: X + "raincpc" # SDMTools.so: undefined symbol: X + "rainfreq" # SDMTools.so: undefined symbol: X + "CARrampsOcl" # depends on OpenCL + "RGA" # jsonlite.so: undefined symbol: XXX + "RSiteCatalyst" # jsonlite.so: undefined symbol: XXX + "RSocrata" # jsonlite.so: undefined symbol: XXX + "SGP" # jsonlite.so: undefined symbol: XXX + "SocialMediaMineR" # jsonlite.so: undefined symbol: XXX + "WikipediR" # jsonlite.so: undefined symbol: XXX + "alm" # jsonlite.so: undefined symbol: XXX + "archivist" # jsonlite.so: undefined symbol: XXX + "bold" # jsonlite.so: undefined symbol: XXX + "enigma" # jsonlite.so: undefined symbol: XXX + "exCon" # jsonlite.so: undefined symbol: XXX + "gender" # jsonlite.so: undefined symbol: XXX + "jSonarR" # jsonlite.so: undefined symbol: XXX + "leafletR" # jsonlite.so: undefined symbol: XXX + "opencpu" # jsonlite.so: undefined symbol: XXX + "pdfetch" # jsonlite.so: undefined symbol: XXX + "polidata" # jsonlite.so: undefined symbol: XXX + "pollstR" # jsonlite.so: undefined symbol: XXX + "rHealthDataGov" # jsonlite.so: undefined symbol: XXX + "rWBclimate" # jsonlite.so: undefined symbol: XXX + "rbison" # jsonlite.so: undefined symbol: XXX + "rinat" # jsonlite.so: undefined symbol: XXX + "rjstat" # jsonlite.so: undefined symbol: XXX + "rmongodb" # jsonlite.so: undefined symbol: XXX + "rnoaa" # jsonlite.so: undefined symbol: XXX + "rsunlight" # jsonlite.so: undefined symbol: XXX + "slackr" # jsonlite.so: undefined symbol: XXX + "webutils" # jsonlite.so: undefined symbol: XXX + "msarc" # requires AnnotationDbi + "MetaLandSim" # requires Biobase + "RobLox" # requires Biobase + "RobLoxBioC" # requires Biobase + "compendiumdb" # requires Biobase + "ktspair" # requires Biobase + "permGPU" # requires Biobase + "propOverlap" # requires Biobase + "GExMap" # requires Biobase and multtest + "IsoGene" # requires Biobase, and affy + "mGSZ" # requires Biobase, and limma + "netweavers" # requires BiocGenerics, Biobase, and limma + "NCmisc" # requires BiocInstaller + "EMDomics" # requires BiocParallel + "RADami" # requires Biostrings + "ionflows" # requires Biostrings + "RAPIDR" # requires Biostrings, Rsamtools, and GenomicRanges + "SimRAD" # requires Biostrings, and ShortRead + "SeqFeatR" # requires Biostrings, qvalue, and widgetTools + "OpenCL" # requires CL/opencl.h + "cplexAPI" # requires CPLEX + "empiricalFDR_DESeq2" # requires DESeq2, and GenomicRanges + "CHAT" # requires DNAcopy + "PSCBS" # requires DNAcopy + "ParDNAcopy" # requires DNAcopy + "Rcell" # requires EBImage + "RockFab" # requires EBImage + "gitter" # requires EBImage + "rggobi" # requires GGobi + "PANDA" # requires GO.db + "BiSEp" # requires GOSemSim, GO.db, and org.Hs.eg.db + "PubMedWordcloud" # requires GOsummaries + "ExomeDepth" # requires GenomicRanges, and Rsamtools + "HTSDiff" # requires HTSCluster + "RAM" # requires Heatplus + "RcppRedis" # requires Hiredis + "MSIseq" # requires IRanges + "SNPtools" # requires IRanges, GenomicRanges, Biostrings, and Rsamtools + "interval" # requires Icens + "PhViD" # requires LBE + "rLindo" # requires LINDO API + "magma" # requires MAGMA + "HiPLARM" # requires MAGMA or PLASMA + "bigGP" # requires MPI running. HELP WANTED! + "doMPI" # requires MPI running. HELP WANTED! + "metaMix" # requires MPI running. HELP WANTED! + "pbdMPI" # requires MPI running. HELP WANTED! + "pmclust" # requires MPI running. HELP WANTED! + "MSeasyTkGUI" # requires MSeasyTkGUI + "bigpca" # requires NCmisc + "reader" # requires NCmisc + "ROracle" # requires OCI + "BRugs" # requires OpenBUGS + "smart" # requires PMA + "aroma_cn" # requires PSCBS + "aroma_core" # requires PSCBS + "RQuantLib" # requires QuantLib + "RSeed" # requires RBGL, and graph + "gRbase" # requires RBGL, and graph + "ora" # requires ROracle + "semiArtificial" # requires RSNNS + "branchLars" # requires Rgraphviz + "gcExplorer" # requires Rgraphviz + "hasseDiagram" # requires Rgraphviz + "hpoPlot" # requires Rgraphviz + "strum" # requires Rgraphviz + "dagbag" # requires Rlapack + "ltsk" # requires Rlapack and Rblas + "REBayes" # requires Rmosek + "cqrReg" # requires Rmosek + "LinRegInteractive" # requires Rpanel + "RVideoPoker" # requires Rpanel + "ArrayBin" # requires SAGx + "RSAP" # requires SAPNWRFCSDK + "DBKGrad" # requires SDD + "pubmed_mineR" # requires SSOAP + "ENA" # requires WGCNA + "GOGANPA" # requires WGCNA + "nettools" # requires WGCNA + "rneos" # requires XMLRPC + "demi" # requires affy, affxparser, and oligo + "KANT" # requires affy, and Biobase + "pathClass" # requires affy, and Biobase + "ACNE" # requires aroma_affymetrix + "NSA" # requires aroma_core + "aroma_affymetrix" # requires aroma_core + "calmate" # requires aroma_core + "beadarrayFilter" # requires beadarray + "PepPrep" # requires biomaRt + "snplist" # requires biomaRt + "FunctionalNetworks" # requires breastCancerVDX, and Biobase + "rJPSGCS" # requires chopsticks + "clpAPI" # requires clp + "pcaL1" # requires clp + "bmrm" # requires clpAPI + "sequenza" # requires copynumber + "Rcplex" # requires cplexAPI + "dcGOR" # requires dnet + "bcool" # requires doMPI + "GSAgm" # requires edgeR + "HTSCluster" # requires edgeR + "QuasiSeq" # requires edgeR + "SimSeq" # requires edgeR + "babel" # requires edgeR + "edgeRun" # requires edgeR + "BcDiag" # requires fabia + "superbiclust" # requires fabia + "curvHDR" # requires flowCore + "RbioRXN" # requires fmcsR, and KEGGREST + "D2C" # requires gRbase + "LogisticDx" # requires gRbase + "gRain" # requires gRbase + "gRc" # requires gRbase + "gRim" # requires gRbase + "topologyGSA" # requires gRbase + "qdap" # requires gender + "orQA" # requires genefilter + "apmsWAPP" # requires genefilter, Biobase, multtest, edgeR, DESeq, and aroma.light + "miRtest" # requires globaltest, GlobalAncova, and limma + "PairViz" # requires graph + "eulerian" # requires graph + "gRapHD" # requires graph + "msSurv" # requires graph + "QuACN" # requires graph, RBGL + "RnavGraph" # requires graph, and RBGL + "iRefR" # requires graph, and RBGL + "pcalg" # requires graph, and RBGL + "protiq" # requires graph, and RBGL + "classGraph" # requires graph, and Rgraphviz + "epoc" # requires graph, and Rgraphviz + "gridGraphviz" # requires graph, and Rgraphviz + "ddepn" # requires graph, and genefilter + "gridDebug" # requires gridGraphviz + "FAMT" # requires impute + "PMA" # requires impute + "WGCNA" # requires impute + "moduleColor" # requires impute + "samr" # requires impute + "swamp" # requires impute + "MetaDE" # requires impute, and Biobase + "FHtest" # requires interval + "RefFreeEWAS" # requires isva + "AntWeb" # requires leafletR + "ecoengine" # requires leafletR + "spocc" # requires leafletR + "sybilSBML" # requires libSBML + "RDieHarder" # requires libdieharder + "CORM" # requires limma + "DAAGbio" # requires limma + "DCGL" # requires limma + "SQDA" # requires limma + "metaMA" # requires limma + "plmDE" # requires limma + "RPPanalyzer" # requires limma, and Biobase + "PerfMeas" # requires limma, graph, and RBGL + "MAMA" # requires metaMA + "Rmosek" # requires mosek + "PCS" # requires multtest + "TcGSA" # requires multtest + "hddplot" # requires multtest + "mutoss" # requires multtest + "structSSI" # requires multtest + "mutossGUI" # requires mutoss + "Biograph" # requires mvna + "MSeasy" # requires mzR, and xcms + "x_ent" # requires opencpu + "pbdBASE" # requires pbdMPI + "pbdDEMO" # requires pbdMPI + "pbdDMAT" # requires pbdMPI + "pbdSLAP" # requires pbdMPI + "LOST" # requires pcaMethods + "agridat" # requires pcaMethods + "multiDimBio" # requires pcaMethods + "crmn" # requires pcaMethods, and Biobase + "imputeLCMD" # requires pcaMethods, and impute + "MEET" # requires pcaMethods, and seqLogo + "qtlnet" # requires pcalg + "SigTree" # requires phyloseq + "saps" # requires piano, and survcomp + "surveillance" # requires polyCub + "aLFQ" # requires protiq + "NLPutils" # requires qdap + "NBPSeq" # requires qvalue + "RSNPset" # requires qvalue + "evora" # requires qvalue + "isva" # requires qvalue + "pi0" # requires qvalue + "CrypticIBDcheck" # requires rJPSGCS + "PKgraph" # requires rggobi + "SeqGrapheR" # requires rggobi + "beadarrayMSV" # requires rggobi + "clusterfly" # requires rggobi + "HierO" # requires rneos + "fPortfolio" # requires rneos + "GUIDE" # requires rpanel + "SDD" # requires rpanel + "biotools" # requires rpanel + "erpR" # requires rpanel + "gamlss_demo" # requires rpanel + "lgcp" # requires rpanel + "optBiomarker" # requires rpanel + "soilphysics" # requires rpanel + "vows" # requires rpanel + "PCGSE" # requires safe + "DepthProc" # requires samr + "netClass" # requires samr + "RcmdrPlugin_seeg" # requires seeg + "EMA" # requires siggenes, affy, multtest, gcrma, biomaRt, and AnnotationDbi + "GeneticTools" # requires snpStats + "snpEnrichment" # requires snpStats + "snpStatsWriter" # requires snpStats + "wgsea" # requires snpStats + "rysgran" # requires soiltexture + "DSpat" # requires spatstat + "Digiroo2" # requires spatstat + "ETAS" # requires spatstat + "GriegSmith" # requires spatstat + "RImageJROI" # requires spatstat + "SGCS" # requires spatstat + "SpatialVx" # requires spatstat + "adaptsmoFMRI" # requires spatstat + "ads" # requires spatstat + "aoristic" # requires spatstat + "dbmss" # requires spatstat + "dixon" # requires spatstat + "dpcR" # requires spatstat + "ecespa" # requires spatstat + "ecospat" # requires spatstat + "intamapInteractive" # requires spatstat + "latticeDensity" # requires spatstat + "polyCub" # requires spatstat + "seeg" # requires spatstat + "siar" # requires spatstat + "siplab" # requires spatstat + "sparr" # requires spatstat + "spatialsegregation" # requires spatstat + "stpp" # requires spatstat + "trip" # requires spatstat + "dnet" # requires supraHex, graph, Rgraphviz, and Biobase + "plsRcox" # requires survcomp + "rsig" # requires survcomp + "leapp" # requires sva + "ttScreening" # requires sva, and limma + "cudaBayesreg" # requres Rmath + "taxize" # requres bold + "rsprng" # requres sprng + "evobiR" # requres taxiz + "RNeXML" # requres taxize + "TR8" # requres taxize + "bdvis" # requres taxize + "h2o" # tries to download some h2o.jar during its build + "jvmr" # tries to download files during its build + "qtbase" # the smokegen binary cannot find libQtCore.so.4 etc. at runtime + ]; + + otherOverrides = old: new: { + RcppArmadillo = old.RcppArmadillo.overrideDerivation (attrs: { + patchPhase = "patchShebangs configure"; + }); + + rpf = old.rpf.overrideDerivation (attrs: { + patchPhase = "patchShebangs configure"; + }); + + BayesXsrc = old.BayesXsrc.overrideDerivation (attrs: { + patches = [ ./patches/BayesXsrc.patch ]; + }); + + rJava = old.rJava.overrideDerivation (attrs: { + preConfigure = '' + export JAVA_CPPFLAGS=-I${pkgs.jdk}/include/ + export JAVA_HOME=${pkgs.jdk} + ''; + }); + + JavaGD = old.JavaGD.overrideDerivation (attrs: { + preConfigure = '' + export JAVA_CPPFLAGS=-I${pkgs.jdk}/include/ + export JAVA_HOME=${pkgs.jdk} + ''; + }); + + Mposterior = old.Mposterior.overrideDerivation (attrs: { + PKG_LIBS = "-L${pkgs.atlas}/lib -lf77blas -latlas"; + }); + + qtbase = old.qtbase.overrideDerivation (attrs: { + patches = [ ./patches/qtbase.patch ]; + }); + + Rmpi = old.Rmpi.overrideDerivation (attrs: { + configureFlags = [ + "--with-Rmpi-type=OPENMPI" + ]; + }); + + npRmpi = old.npRmpi.overrideDerivation (attrs: { + configureFlags = [ + "--with-Rmpi-type=OPENMPI" + ]; + }); + + Rmpfr = old.Rmpfr.overrideDerivation (attrs: { + configureFlags = [ + "--with-mpfr-include=${pkgs.mpfr}/include" + ]; + }); + + RVowpalWabbit = old.RVowpalWabbit.overrideDerivation (attrs: { + configureFlags = [ + "--with-boost=${pkgs.boost.dev}" "--with-boost-libdir=${pkgs.boost.lib}/lib" + ]; + }); + + RAppArmor = old.RAppArmor.overrideDerivation (attrs: { + patches = [ ./patches/RAppArmor.patch ]; + LIBAPPARMOR_HOME = "${pkgs.apparmor}"; + }); + + RMySQL = old.RMySQL.overrideDerivation (attrs: { + configureFlags = [ + "--with-mysql-dir=${pkgs.mysql}" + ]; + }); + + slfm = old.slfm.overrideDerivation (attrs: { + PKG_LIBS = "-L${pkgs.atlas}/lib -lf77blas -latlas"; + }); + + SamplerCompare = old.SamplerCompare.overrideDerivation (attrs: { + PKG_LIBS = "-L${pkgs.atlas}/lib -lf77blas -latlas"; + }); + + gputools = old.gputools.overrideDerivation (attrs: { + patches = [ ./patches/gputools.patch ]; + CUDA_HOME = "${pkgs.cudatoolkit}"; + }); + + # It seems that we cannot override meta attributes with overrideDerivation. + CARramps = (old.CARramps.override { hydraPlatforms = stdenv.lib.platforms.none; }).overrideDerivation (attrs: { + patches = [ ./patches/CARramps.patch ]; + configureFlags = [ + "--with-cuda-home=${pkgs.cudatoolkit}" + ]; + }); + + gmatrix = old.gmatrix.overrideDerivation (attrs: { + patches = [ ./patches/gmatrix.patch ]; + CUDA_LIB_PATH = "${pkgs.cudatoolkit}/lib64"; + R_INC_PATH = "${pkgs.R}/lib/R/include"; + CUDA_INC_PATH = "${pkgs.cudatoolkit}/usr_include"; + }); + + # It seems that we cannot override meta attributes with overrideDerivation. + rpud = (old.rpud.override { hydraPlatforms = stdenv.lib.platforms.none; }).overrideDerivation (attrs: { + patches = [ ./patches/rpud.patch ]; + CUDA_HOME = "${pkgs.cudatoolkit}"; + }); + + WideLM = old.WideLM.overrideDerivation (attrs: { + patches = [ ./patches/WideLM.patch ]; + configureFlags = [ + "--with-cuda-home=${pkgs.cudatoolkit}" + ]; + }); + + EMCluster = old.EMCluster.overrideDerivation (attrs: { + patches = [ ./patches/EMCluster.patch ]; + }); + + spMC = old.spMC.overrideDerivation (attrs: { + patches = [ ./patches/spMC.patch ]; + }); + + BayesLogit = old.BayesLogit.overrideDerivation (attrs: { + patches = [ ./patches/BayesLogit.patch ]; + }); + + BayesBridge = old.BayesBridge.overrideDerivation (attrs: { + patches = [ ./patches/BayesBridge.patch ]; + }); + + openssl = old.openssl.overrideDerivation (attrs: { + patches = [ ./patches/openssl.patch ]; + OPENSSL_HOME = "${pkgs.openssl}"; + }); + + Rserve = old.Rserve.overrideDerivation (attrs: { + patches = [ ./patches/Rserve.patch ]; + configureFlags = [ + "--with-server" "--with-client" + ]; + }); + + nloptr = old.nloptr.overrideDerivation (attrs: { + configureFlags = [ + "--with-nlopt-cflags=-I${pkgs.nlopt}/include" + "--with-nlopt-libs='-L${pkgs.nlopt}/lib -lnlopt_cxx -lm'" + ]; + }); + + # Depends on broken ecespa package. + selectspm = old.selectspm.override { hydraPlatforms = stdenv.lib.platforms.none; }; + + # Depends on broken qtbase package. + qtutils = old.qtutils.override { hydraPlatforms = stdenv.lib.platforms.none; }; + qtpaint = old.qtpaint.override { hydraPlatforms = stdenv.lib.platforms.none; }; + bamboo = old.bamboo.override { hydraPlatforms = stdenv.lib.platforms.none; }; + + # Obsolete package that I keep around temporarily because some + # existing code depends on it. + Defaults = derive { + name="Defaults"; + version="1.1-1"; + sha256="0ikgd5mswlky327pzp09cz93bn3mq7qnybq1r64y19c2brbax00d"; + }; + }; +in + self diff --git a/pkgs/development/r-modules/generate-cran-packages.R b/pkgs/development/r-modules/generate-cran-packages.R new file mode 100644 index 000000000000..3dea348f3301 --- /dev/null +++ b/pkgs/development/r-modules/generate-cran-packages.R @@ -0,0 +1,43 @@ +library(data.table) +library(parallel) +cl <- makeCluster(10) +options(repos=structure(c(CRAN="http://cran.rstudio.com/"))) + +nixPrefetch <- function(name, version) { + system(paste0("nix-prefetch-url --type sha256 http://cran.rstudio.com/src/contrib/", name, "_", version, ".tar.gz"), intern=TRUE) + # system(paste0("nix-hash --flat --base32 --type sha256 /nix/store/*", name, "_", version, ".tar.gz", "| head -n 1"), intern=TRUE) +} + +formatPackage <- function(name, version, sha256, depends, imports, linkingTo, knownPackages) { + attr <- gsub(".", "_", name, fixed=TRUE) + if (is.na(depends)) depends <- ""; + depends <- unlist(strsplit(depends, split="[ \t\n]*,[ \t\n]*", fixed=FALSE)) + depends <- c(depends, unlist(strsplit(imports, split="[ \t\n]*,[ \t\n]*", fixed=FALSE))) + depends <- c(depends, unlist(strsplit(linkingTo, split="[ \t\n]*,[ \t\n]*", fixed=FALSE))) + depends <- sapply(depends, gsub, pattern="([^ \t\n(]+).*", replacement="\\1") + depends <- depends[depends %in% knownPackages] + depends <- sapply(depends, gsub, pattern=".", replacement="_", fixed=TRUE) + depends <- paste(depends, collapse=" ") + paste0(attr, " = derive { name=\"", name, "\"; version=\"", version, "\"; sha256=\"", sha256, "\"; depends=[", depends, "]; };") +} + +clusterExport(cl, c("nixPrefetch")) + +pkgs <- as.data.table(available.packages(filters=c("R_version", "OS_type", "CRAN", "duplicates"))) +pkgs <- subset(pkgs, Repository=="http://cran.rstudio.com/src/contrib") +pkgs <- pkgs[order(Package)] +pkgs$sha256 <- parApply(cl, pkgs, 1, function(p) nixPrefetch(p[1], p[2])) +knownPackages <- unique(pkgs$Package) + +nix <- apply(pkgs, 1, function(p) formatPackage(p[1], p[2], p[18], p[4], p[5], p[6], knownPackages)) + +cat("# This file is generated from generate-cran-packages.R. DO NOT EDIT.\n") +cat("# Execute the following command to update the file.\n") +cat("#\n") +cat("# Rscript generate-cran-packages.R > cran-packages.nix\n") +cat("\n") +cat("{ self, derive }: with self; {\n") +cat(paste(nix, collapse="\n"), "\n") +cat("}\n") + +stopCluster(cl) diff --git a/pkgs/development/r-modules/generic-builder.nix b/pkgs/development/r-modules/generic-builder.nix index da63566f38bc..bca7c10e0fd2 100644 --- a/pkgs/development/r-modules/generic-builder.nix +++ b/pkgs/development/r-modules/generic-builder.nix @@ -1,9 +1,9 @@ -R: +{ R, xvfb_run, utillinux }: { name, buildInputs ? [], ... } @ attrs: R.stdenv.mkDerivation ({ - buildInputs = buildInputs ++ [R]; + buildInputs = buildInputs ++ [R xvfb_run utillinux]; configurePhase = '' runHook preConfigure @@ -16,10 +16,22 @@ R.stdenv.mkDerivation ({ runHook postBuild ''; + installFlags = if attrs.doCheck or true then + [] + else + [ "--no-test-load" ]; + + rCommand = if attrs.requireX or false then + # Unfortunately, xvfb-run has a race condition even with -a option, so that + # we acquire a lock explicitly. + "flock ${xvfb_run} xvfb-run -a -e xvfb-error R" + else + "R"; + installPhase = '' runHook preInstall mkdir -p $out/library - R CMD INSTALL -l $out/library . + $rCommand CMD INSTALL $installFlags --configure-args="$configureFlags" -l $out/library . runHook postInstall ''; @@ -28,6 +40,10 @@ R.stdenv.mkDerivation ({ ln -s $out/nix-support/propagated-native-build-inputs $out/nix-support/propagated-user-env-packages fi ''; + + checkPhase = '' + # noop since R CMD INSTALL tests packages + ''; } // attrs // { name = "r-" + name; }) diff --git a/pkgs/development/r-modules/patches/BayesBridge.patch b/pkgs/development/r-modules/patches/BayesBridge.patch new file mode 100644 index 000000000000..2fb0392bf3e9 --- /dev/null +++ b/pkgs/development/r-modules/patches/BayesBridge.patch @@ -0,0 +1,9 @@ +diff -ru -x '*~' BayesBridge_orig/src/Makevars BayesBridge/src/Makevars +--- BayesBridge_orig/src/Makevars 2014-07-19 05:08:55.000000000 +0900 ++++ BayesBridge/src/Makevars 2014-10-25 18:35:01.398539305 +0900 +@@ -9,4 +9,4 @@ + # PKG_CPPFLAGS = -DUSE_R -DDISABLE_FIO -I../inst/include/ -DDISABLE_SINGLE -DNTHROW + PKG_CPPFLAGS = -DUSE_R -DDISABLE_FIO -DDISABLE_SINGLE -DNTHROW + # PKG_CPPFLAGS = -DUSE_R -DDISABLE_SINGLE -DNTHROW -Wall -pedantic -Wshadow -ansi -Wsequence-point +-PKG_LIBS = $(BLAS_LIBS) $(FLIBS) $(LAPACK_LIBS) ++PKG_LIBS = $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) diff --git a/pkgs/development/r-modules/patches/BayesBridge_cblas.patch b/pkgs/development/r-modules/patches/BayesBridge_cblas.patch new file mode 100644 index 000000000000..418a6b95ee71 --- /dev/null +++ b/pkgs/development/r-modules/patches/BayesBridge_cblas.patch @@ -0,0 +1,9 @@ +diff -ru -x '*~' BayesBridge_orig/src/Makevars BayesBridge/src/Makevars +--- BayesBridge_orig/src/Makevars 2014-07-19 05:08:55.000000000 +0900 ++++ BayesBridge/src/Makevars 2014-10-25 14:44:23.422592445 +0900 +@@ -9,4 +9,4 @@ + # PKG_CPPFLAGS = -DUSE_R -DDISABLE_FIO -I../inst/include/ -DDISABLE_SINGLE -DNTHROW + PKG_CPPFLAGS = -DUSE_R -DDISABLE_FIO -DDISABLE_SINGLE -DNTHROW + # PKG_CPPFLAGS = -DUSE_R -DDISABLE_SINGLE -DNTHROW -Wall -pedantic -Wshadow -ansi -Wsequence-point +-PKG_LIBS = $(BLAS_LIBS) $(FLIBS) $(LAPACK_LIBS) ++PKG_LIBS = $(BLAS_LIBS) $(FLIBS) $(LAPACK_LIBS) -lcblas diff --git a/pkgs/development/r-modules/patches/BayesLogit.patch b/pkgs/development/r-modules/patches/BayesLogit.patch new file mode 100644 index 000000000000..83c865e479c2 --- /dev/null +++ b/pkgs/development/r-modules/patches/BayesLogit.patch @@ -0,0 +1,12 @@ +diff -ru -x '*~' BayesLogit_orig/src/Makevars BayesLogit/src/Makevars +--- BayesLogit_orig/src/Makevars 2014-04-24 23:31:13.000000000 +0900 ++++ BayesLogit/src/Makevars 2014-10-25 18:33:32.398572641 +0900 +@@ -6,7 +6,7 @@ + ## W/OUT Dynamic Stuff + OBJECTS = Matrix.o MatrixFrame.o RRNG.o RNG.o FSF_nmix.o LogitWrapper.o \ + PolyaGamma.o PolyaGammaAlt.o PolyaGammaSP.o InvertY.o +-PKG_LIBS = $(BLAS_LIBS) $(FLIBS) $(LAPACK_LIBS) ++PKG_LIBS = $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) + # PKG_CPPFLAGS = -DUSE_R -DNDEBUG -DDISABLE_SINGLE -DNTHROW -Wall -pedantic -Wextra + PKG_CPPFLAGS = -DUSE_R -DNDEBUG -DDISABLE_SINGLE -DNTHROW + diff --git a/pkgs/development/r-modules/patches/BayesLogit_cblas.patch b/pkgs/development/r-modules/patches/BayesLogit_cblas.patch new file mode 100644 index 000000000000..4c8778c46976 --- /dev/null +++ b/pkgs/development/r-modules/patches/BayesLogit_cblas.patch @@ -0,0 +1,12 @@ +diff -ru -x '*~' BayesLogit_orig/src/Makevars BayesLogit/src/Makevars +--- BayesLogit_orig/src/Makevars 2014-04-24 23:31:13.000000000 +0900 ++++ BayesLogit/src/Makevars 2014-10-21 21:00:15.570699136 +0900 +@@ -6,7 +6,7 @@ + ## W/OUT Dynamic Stuff + OBJECTS = Matrix.o MatrixFrame.o RRNG.o RNG.o FSF_nmix.o LogitWrapper.o \ + PolyaGamma.o PolyaGammaAlt.o PolyaGammaSP.o InvertY.o +-PKG_LIBS = $(BLAS_LIBS) $(FLIBS) $(LAPACK_LIBS) ++PKG_LIBS = $(BLAS_LIBS) $(FLIBS) $(LAPACK_LIBS) -llapack -lf77blas -lcblas -latlas -lgfortran + # PKG_CPPFLAGS = -DUSE_R -DNDEBUG -DDISABLE_SINGLE -DNTHROW -Wall -pedantic -Wextra + PKG_CPPFLAGS = -DUSE_R -DNDEBUG -DDISABLE_SINGLE -DNTHROW + diff --git a/pkgs/development/r-modules/patches/BayesXsrc.patch b/pkgs/development/r-modules/patches/BayesXsrc.patch new file mode 100644 index 000000000000..b357d7f83fcc --- /dev/null +++ b/pkgs/development/r-modules/patches/BayesXsrc.patch @@ -0,0 +1,55 @@ +diff -ru -x '*~' BayesXsrc_org/MD5 BayesXsrc/MD5 +--- BayesXsrc_org/MD5 2013-11-22 21:59:01.000000000 +0900 ++++ BayesXsrc/MD5 2014-10-14 22:50:46.040754675 +0900 +@@ -4,7 +4,7 @@ + cba21fc7e2d39608d0241d8cedc4fd43 *R/run.bayesx.R + 112cb3aff0f8f0cd60bb146b14df1fcf *inst/CITATION + cf04425475f03ee67c06efcebbd8d476 *man/run.bayesx.Rd +-1f73de4dba1228cdaa8d5435d1c1656b *src/Makefile ++658152ec0b336198a2654385bb27666d *src/Makefile + 2971212d003d1d647110264fb471e63b *src/Makefile.win + e0fd1515e0d2f8553d4034c3f7544fc5 *src/bayesxsrc/adaptiv/fullcond_adaptiv.cpp + 08cd954d541c3c0d635bbbd61cd05d15 *src/bayesxsrc/adaptiv/fullcond_adaptiv.h +@@ -320,7 +320,7 @@ + 465ac930657299f89a0a164232dc15d2 *src/dev-Makefile + d9aafe726622cd8c46bab760fef0d813 *src/dev-Makefile.win + 50413e579bc999d49037293a612190c0 *src/install.libs.R +-1f73de4dba1228cdaa8d5435d1c1656b *src/rel-Makefile ++658152ec0b336198a2654385bb27666d *src/rel-Makefile + 2971212d003d1d647110264fb471e63b *src/rel-Makefile.win + 4d675785837670b6a9b2b3405812a910 *tests/data.raw + 1d3777462fcefa39559aa645305a65f2 *tests/mcmc.R +diff -ru -x '*~' BayesXsrc_org/src/Makefile BayesXsrc/src/Makefile +--- BayesXsrc_org/src/Makefile 2013-11-22 21:49:16.000000000 +0900 ++++ BayesXsrc/src/Makefile 2014-10-14 22:47:15.458766001 +0900 +@@ -137,11 +137,11 @@ + ${PSPLINES_OBJS}\ + ${STRUCTADD_OBJS}\ + bayesxsrc/main.o\ +- bayesxsrc/samson/multgaussian.o\ ++ bayesxsrc/samson/multgaussian.o\ + bayesxsrc/adaptiv/fullcond_adaptiv.o\ + bayesxsrc/alex/mixture.o + +-LDFLAGS += -L${R_HOME}/lib -lreadline -lcurses ++LDFLAGS += -L${R_HOME}/lib -lreadline -lncurses + CPPFLAGS += -Ibayesxsrc/. -I"bayesxsrc/bib" -I"bayesxsrc/alex" -I"bayesxsrc/adaptiv" -I"bayesxsrc/andrea" -I"bayesxsrc/dag" -I"bayesxsrc/graph" -I"bayesxsrc/mcmc" -I"bayesxsrc/psplines" -I"bayesxsrc/samson" -I"bayesxsrc/leyre" -I"bayesxsrc/structadd" + CPPFLAGS += -D__BUILDING_GNU -D__BUILDING_LINUX -DTEMPL_INCL_DEF -D_MSC_VER2 -DNO_TEMPLATE_FRIENDS -DINCLUDE_REML -DINCLUDE_MCMC + # CXXFLAGS += -O3 -ansi +diff -ru -x '*~' BayesXsrc_org/src/rel-Makefile BayesXsrc/src/rel-Makefile +--- BayesXsrc_org/src/rel-Makefile 2013-10-08 21:28:09.000000000 +0900 ++++ BayesXsrc/src/rel-Makefile 2014-10-14 22:47:04.601766431 +0900 +@@ -137,11 +137,11 @@ + ${PSPLINES_OBJS}\ + ${STRUCTADD_OBJS}\ + bayesxsrc/main.o\ +- bayesxsrc/samson/multgaussian.o\ ++ bayesxsrc/samson/multgaussian.o\ + bayesxsrc/adaptiv/fullcond_adaptiv.o\ + bayesxsrc/alex/mixture.o + +-LDFLAGS += -L${R_HOME}/lib -lreadline -lcurses ++LDFLAGS += -L${R_HOME}/lib -lreadline -lncurses + CPPFLAGS += -Ibayesxsrc/. -I"bayesxsrc/bib" -I"bayesxsrc/alex" -I"bayesxsrc/adaptiv" -I"bayesxsrc/andrea" -I"bayesxsrc/dag" -I"bayesxsrc/graph" -I"bayesxsrc/mcmc" -I"bayesxsrc/psplines" -I"bayesxsrc/samson" -I"bayesxsrc/leyre" -I"bayesxsrc/structadd" + CPPFLAGS += -D__BUILDING_GNU -D__BUILDING_LINUX -DTEMPL_INCL_DEF -D_MSC_VER2 -DNO_TEMPLATE_FRIENDS -DINCLUDE_REML -DINCLUDE_MCMC + # CXXFLAGS += -O3 -ansi diff --git a/pkgs/development/r-modules/patches/CARramps.patch b/pkgs/development/r-modules/patches/CARramps.patch new file mode 100644 index 000000000000..901ab1f69b72 --- /dev/null +++ b/pkgs/development/r-modules/patches/CARramps.patch @@ -0,0 +1,24 @@ +diff -ru -x '*~' CARramps_orig/configure CARramps/configure +--- CARramps_orig/configure 2011-12-01 22:27:06.000000000 +0900 ++++ CARramps/configure 2014-10-25 14:56:04.599337748 +0900 +@@ -2395,7 +2395,7 @@ + + + NCFLAGS="-arch=sm_13 -O2" +-CUDA_INC=${CUDA_HOME}/include ++CUDA_INC=${CUDA_HOME}/usr_include + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CUDA headers" >&5 + $as_echo_n "checking for CUDA headers... " >&6; } + as_ac_File=`$as_echo "ac_cv_file_${CUDA_INC}/cublas.h" | $as_tr_sh` +diff -ru -x '*~' CARramps_orig/src/combo1colForR1Q_d.cu CARramps/src/combo1colForR1Q_d.cu +--- CARramps_orig/src/combo1colForR1Q_d.cu 2011-12-01 22:27:06.000000000 +0900 ++++ CARramps/src/combo1colForR1Q_d.cu 2014-10-25 14:59:06.869299163 +0900 +@@ -4,7 +4,7 @@ + #include <cuda.h> + #include <R.h> + #include <Rmath.h> +-#include <combo1colForR1Q_d.h> ++#include "combo1colForR1Q_d.h" + + #define BLOCKSIZE 256 + diff --git a/pkgs/development/r-modules/patches/EMCluster.patch b/pkgs/development/r-modules/patches/EMCluster.patch new file mode 100644 index 000000000000..afc9de3a95a9 --- /dev/null +++ b/pkgs/development/r-modules/patches/EMCluster.patch @@ -0,0 +1,6 @@ +diff -ru -x '*~' EMCluster_orig/src/Makevars EMCluster/src/Makevars +--- EMCluster_orig/src/Makevars 2013-07-05 02:43:25.000000000 +0900 ++++ EMCluster/src/Makevars 2014-10-25 18:10:19.190992120 +0900 +@@ -1 +1 @@ +-PKG_LIBS = $(FLIBS) $(BLAS_LIBS) $(LAPACK_LIBS) ++PKG_LIBS = $(FLIBS) $(LAPACK_LIBS) $(BLAS_LIBS) diff --git a/pkgs/development/r-modules/patches/RAppArmor.patch b/pkgs/development/r-modules/patches/RAppArmor.patch new file mode 100644 index 000000000000..f2dc49bd4766 --- /dev/null +++ b/pkgs/development/r-modules/patches/RAppArmor.patch @@ -0,0 +1,20 @@ +diff -ru -x '*~' RAppArmor_orig/configure RAppArmor/configure +--- RAppArmor_orig/configure 2013-12-17 11:23:00.000000000 +0900 ++++ RAppArmor/configure 2014-10-18 22:22:39.641341244 +0900 +@@ -1,15 +1,2 @@ +-if [ ! -e /usr/include/sys/apparmor.h ] +-then +- echo "sys/apparmor.h not found. Make sure libapparmor-dev is installed." +- exit 1 +-fi +- +-LIBFILE=$(/sbin/ldconfig -p | egrep -oh " [-_a-zA-Z0-9/]*/libapparmor.so(.1)?$") +- +-if [ -z "$LIBFILE" ] +-then +- echo "libapparmor.so not found. Make sure libapparmor-dev is installed." +- exit 1 +-fi +- ++LIBFILE="$LIBAPPARMOR_HOME/lib/libapparmor.so.1" + echo "PKG_LIBS="$LIBFILE > src/Makevars diff --git a/pkgs/development/r-modules/patches/Rserve.patch b/pkgs/development/r-modules/patches/Rserve.patch new file mode 100644 index 000000000000..1ffe17e55420 --- /dev/null +++ b/pkgs/development/r-modules/patches/Rserve.patch @@ -0,0 +1,15 @@ +diff -ru -x '*~' Rserve_orig/src/Makevars.in Rserve/src/Makevars.in +--- Rserve_orig/src/Makevars.in 2013-08-22 06:09:33.000000000 +0900 ++++ Rserve/src/Makevars.in 2014-11-09 21:36:31.184590320 +0900 +@@ -12,8 +12,9 @@ + $(CC) -DSTANDALONE_RSERVE -DRSERV_DEBUG -DNODAEMON -I. -Iinclude $(ALL_CPPFLAGS) $(ALL_CFLAGS) $(PKG_CPPFLAGS) $(PKG_CFLAGS) -o Rserve.dbg $(SERVER_SRC) $(ALL_LIBS) $(PKG_LIBS) + + # merging to bin/Rserve works only if installed from sources, won't work for binary +- -./mergefat Rserve "$(R_HOME)/bin/Rserve" +- -./mergefat Rserve.dbg "$(R_HOME)/bin/Rserve.dbg" ++ mkdir $(out)/bin ++ -./mergefat Rserve "$(out)/bin/Rserve" ++ -./mergefat Rserve.dbg "$(out)/bin/Rserve.dbg" + + client: config.h + cp config.h client/cxx/ diff --git a/pkgs/development/r-modules/patches/WideLM.patch b/pkgs/development/r-modules/patches/WideLM.patch new file mode 100644 index 000000000000..f86d66bf7468 --- /dev/null +++ b/pkgs/development/r-modules/patches/WideLM.patch @@ -0,0 +1,19 @@ +diff -ru -x '*~' WideLM_orig/src/Makefile.in WideLM/src/Makefile.in +--- WideLM_orig/src/Makefile.in 2012-02-17 04:28:05.000000000 +0900 ++++ WideLM/src/Makefile.in 2014-10-25 18:54:49.110011921 +0900 +@@ -12,12 +12,12 @@ + #compiler/preprocessor options + R_INCS := @R_INCL@ @RCPP_INCL@ + CC_ARGS := @CU_PARAMS@ -Xcompiler @R_CPIC@ +-CU_INCS := -I@CUDA_HOME@/include ++CU_INCS := -I@CUDA_HOME@/usr_include + CU_ARCH := -gencode arch=compute_20,code=sm_20 + + #linker options +-LD_PARAMS := -Xlinker "@RCPP_LDFLAGS@" +-RCU_LIBS := @R_LIB@ -L@CU_LIBDIR@ -lcublas ++LD_PARAMS := -Xlinker "--export-dynamic -fopenmp -L${R_HOME}/lib -lR" ++RCU_LIBS := -Xlinker "-L@CU_LIBDIR@ -lcublas" + + all : WideLM.so + diff --git a/pkgs/development/r-modules/patches/gmatrix.patch b/pkgs/development/r-modules/patches/gmatrix.patch new file mode 100644 index 000000000000..990debb8a42d --- /dev/null +++ b/pkgs/development/r-modules/patches/gmatrix.patch @@ -0,0 +1,48 @@ +diff -ru -x '*~' gmatrix_orig/src/Makefile gmatrix/src/Makefile +--- gmatrix_orig/src/Makefile 2014-08-27 02:42:04.000000000 +0900 ++++ gmatrix/src/Makefile 2014-10-25 15:35:29.797202981 +0900 +@@ -21,6 +21,7 @@ + # to the manual on the gmatrix install instructions) + CUDA_LIB_PATH ?= /usr/local/cuda/lib64 + R_INC_PATH ?= /usr/include/R ++CUDA_INC_PATH ?= /usr/local/cuda/include + + + # Nvidia CUDA Compiler +@@ -49,25 +50,25 @@ + # Build rules + build: $(OUT_OBJ) + $(R_CC) $(OUT_OBJ) -o $(OUT_SO) $(LIBS) -L$(CUDA_LIB_PATH) +- ++ + conversions.o: +- $(NVCC) -c conversions.cu -o conversions.o $(NVCC_FLAGS) -I$(R_INC_PATH) +- ++ $(NVCC) -c conversions.cu -o conversions.o $(NVCC_FLAGS) -I$(R_INC_PATH) -I${CUDA_INC_PATH} ++ + manipulation.o: +- $(NVCC) -c manipulation.cu -o manipulation.o $(NVCC_FLAGS) -I$(R_INC_PATH) ++ $(NVCC) -c manipulation.cu -o manipulation.o $(NVCC_FLAGS) -I$(R_INC_PATH) -I${CUDA_INC_PATH} + + general.o: +- $(NVCC) -c general.cu -o general.o $(NVCC_FLAGS) -I$(R_INC_PATH) ++ $(NVCC) -c general.cu -o general.o $(NVCC_FLAGS) -I$(R_INC_PATH) -I${CUDA_INC_PATH} + + matrix.o: +- $(NVCC) -c matrix.cu -o matrix.o $(NVCC_FLAGS) -I$(R_INC_PATH) +- ++ $(NVCC) -c matrix.cu -o matrix.o $(NVCC_FLAGS) -I$(R_INC_PATH) -I${CUDA_INC_PATH} ++ + ops.o: +- $(NVCC) -c ops.cu -o ops.o $(NVCC_FLAGS) -I$(R_INC_PATH) +- ++ $(NVCC) -c ops.cu -o ops.o $(NVCC_FLAGS) -I$(R_INC_PATH) -I${CUDA_INC_PATH} ++ + dist.o: +- $(NVCC) -c dist.cu -o dist.o $(NVCC_FLAGS) -I$(R_INC_PATH) +- ++ $(NVCC) -c dist.cu -o dist.o $(NVCC_FLAGS) -I$(R_INC_PATH) -I${CUDA_INC_PATH} ++ + + clean: + -rm -f *.o core diff --git a/pkgs/development/r-modules/patches/gputools.patch b/pkgs/development/r-modules/patches/gputools.patch new file mode 100644 index 000000000000..61cbcea93706 --- /dev/null +++ b/pkgs/development/r-modules/patches/gputools.patch @@ -0,0 +1,13 @@ +diff -ru -x '*~' gputools_orig/src/Makefile gputools/src/Makefile +--- gputools_orig/src/Makefile 2013-05-09 01:43:32.000000000 +0900 ++++ gputools/src/Makefile 2014-10-21 21:41:23.067148490 +0900 +@@ -6,6 +6,9 @@ + + R_HOME := $(shell R RHOME) + ++CUDA_INC := $(CUDA_HOME)/usr_include ++CUDA_LIB := $(CUDA_HOME)/lib ++ + #compiler/preprocessor options + INCS := -I. -I"$(CUDA_INC)" -I"$(R_INC)" + PARAMS := $(DEVICEOPTS) -Xcompiler $(CPICFLAGS) diff --git a/pkgs/development/r-modules/patches/magma_cuda_include.patch b/pkgs/development/r-modules/patches/magma_cuda_include.patch new file mode 100644 index 000000000000..67552325ae9b --- /dev/null +++ b/pkgs/development/r-modules/patches/magma_cuda_include.patch @@ -0,0 +1,12 @@ +diff -ru -x '*~' magma_orig/configure magma/configure +--- magma_orig/configure 2013-04-03 11:07:42.000000000 +0900 ++++ magma/configure 2014-10-18 21:58:48.745890187 +0900 +@@ -2377,7 +2377,7 @@ + + + NCFLAGS="-arch=sm_13 -O2 -DADD_" +-CUDA_INC=${CUDA_HOME}/include ++CUDA_INC=${CUDA_HOME}/usr_include + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CUDA headers" >&5 + $as_echo_n "checking for CUDA headers... " >&6; } + as_ac_File=`$as_echo "ac_cv_file_${CUDA_INC}/cublas.h" | $as_tr_sh` diff --git a/pkgs/development/r-modules/patches/openssl.patch b/pkgs/development/r-modules/patches/openssl.patch new file mode 100644 index 000000000000..d89c30f61a14 --- /dev/null +++ b/pkgs/development/r-modules/patches/openssl.patch @@ -0,0 +1,30 @@ +diff -ru -x '*~' openssl_orig/configure openssl/configure +--- openssl_orig/configure 2014-11-08 02:32:33.000000000 +0900 ++++ openssl/configure 2014-11-29 20:57:19.919495325 +0900 +@@ -4,14 +4,15 @@ + # if present, hence this script is not really required. On CRAN, we use + # the $OPENSSL_INCLUDES variable; elsewhere we assume to the standard + # linux location: /usr/include/openssl. +-if [ -z "$OPENSSL_INCLUDES" ]; then +- OPENSSL_INCLUDES="/usr/include" +-else +- echo "PKG_CPPFLAGS= -I$OPENSSL_INCLUDES" >> src/Makevars +-fi ++# if [ -z "$OPENSSL_INCLUDES" ]; then ++# OPENSSL_INCLUDES="/usr/include" ++# else ++# echo "PKG_CPPFLAGS= -I$OPENSSL_INCLUDES" >> src/Makevars ++# fi + +-# Verify that openssl RNG is present +-if [ ! -e $OPENSSL_INCLUDES/openssl/rand.h ]; then +- echo "File $OPENSSL_INCLUDES/rand.h not found. Make sure libssl-dev (deb) or openssl-devel (rpm) is installed." +- exit 1 +-fi ++# # Verify that openssl RNG is present ++# if [ ! -e $OPENSSL_INCLUDES/openssl/rand.h ]; then ++# echo "File $OPENSSL_INCLUDES/rand.h not found. Make sure libssl-dev (deb) or openssl-devel (rpm) is installed." ++# exit 1 ++# fi ++echo "PKG_LIBS= -L"${OPENSSL_HOME}/lib" -lssl -lcrypto" > src/Makevars +\ No newline at end of file diff --git a/pkgs/development/r-modules/patches/qtbase.patch b/pkgs/development/r-modules/patches/qtbase.patch new file mode 100644 index 000000000000..14427b72630e --- /dev/null +++ b/pkgs/development/r-modules/patches/qtbase.patch @@ -0,0 +1,13 @@ +diff -ru -x '*~' qtbase_orig/src/Makefile qtbase/src/Makefile +--- qtbase_orig/src/Makefile 2012-03-03 03:57:47.000000000 +0900 ++++ qtbase/src/Makefile 2014-11-01 23:06:51.383876323 +0900 +@@ -10,6 +10,9 @@ + -DR_INCLUDES=${R_INCLUDE_DIR} \ + -DCMAKE_INSTALL_PREFIX=../src; \ + make install ++# I could not control RPATH via CMake. HELP WANTED! ++ patchelf --set-rpath ${CMAKE_LIBRARY_PATH} qtbase.so ++ find ../inst/local/ -executable -type f -print0 | xargs -0 patchelf --set-rpath ${CMAKE_LIBRARY_PATH} + + clean: + rm -rf ../kdebindings-build diff --git a/pkgs/development/r-modules/patches/rpud.patch b/pkgs/development/r-modules/patches/rpud.patch new file mode 100644 index 000000000000..45d20e6bd670 --- /dev/null +++ b/pkgs/development/r-modules/patches/rpud.patch @@ -0,0 +1,29 @@ +diff -ru -x '*~' rpud_orig/configure rpud/configure +--- rpud_orig/configure 2010-09-08 02:14:55.000000000 +0900 ++++ rpud/configure 2014-10-25 16:46:39.479098648 +0900 +@@ -1794,7 +1794,7 @@ + fi + + LIBS="-L${CUDA_HOME}${CUDA_LIB_DIR} -lcublas -lcuda" +-RPATHFLAG="-Wl,-rpath,${CUDA_HOME}${CUDA_LIB_DIR}" ++RPATHFLAG="-Xlinker -rpath=${CUDA_HOME}${CUDA_LIB_DIR}" + + + +diff -ru -x '*~' rpud_orig/src/Makefile.in rpud/src/Makefile.in +--- rpud_orig/src/Makefile.in 2010-08-31 01:53:50.000000000 +0900 ++++ rpud/src/Makefile.in 2014-10-25 16:45:30.248109883 +0900 +@@ -3,11 +3,11 @@ + OBJS := rpud.o rpudist.o + + #compiler/preprocessor options +-INCS := -I@CUDA_HOME@/include ++INCS := -I@CUDA_HOME@/usr_include + PARAMS := -Xcompiler "@R_INCLUDE@ @CPICFLAGS@" + + #linker options +-LD_PARAMS := -Xlinker "@R_LIB@ @RPATHFLAG@" ++LD_PARAMS := -Xlinker "--export-dynamic -fopenmp -L${R_HOME}/lib -lR @RPATHFLAG@" + LIBS := @LIBS@ + + TARGETS := rpud.so diff --git a/pkgs/development/r-modules/patches/spMC.patch b/pkgs/development/r-modules/patches/spMC.patch new file mode 100644 index 000000000000..04239d721c07 --- /dev/null +++ b/pkgs/development/r-modules/patches/spMC.patch @@ -0,0 +1,8 @@ +Only in spMC_orig: spMC +diff -ru -x '*~' spMC_orig/src/Makevars spMC/src/Makevars +--- spMC_orig/src/Makevars 2014-09-19 21:23:30.000000000 +0900 ++++ spMC/src/Makevars 2014-10-25 18:14:48.366954769 +0900 +@@ -1,2 +1,2 @@ + PKG_CFLAGS=$(SHLIB_OPENMP_CFLAGS) +-PKG_LIBS=$(SHLIB_OPENMP_CFLAGS) $(BLAS_LIBS) $(LAPACK_LIBS) $(FLIBS) ++PKG_LIBS=$(SHLIB_OPENMP_CFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 56797d9c7028..69abe8ac7b92 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "5.7"; + version = "6.1.1"; name = "checkstyle-${version}"; src = fetchurl { url = "mirror://sourceforge/checkstyle/${version}/${name}-bin.tar.gz"; - sha256 = "0kzj507ylynq6p7v097bjzsckkjny5i2fxwxyrlwi5samhi2m06x"; + sha256 = "07qickjgayakzfq54nwb9rpxydjkymxw6lnhzxri36mxspq9pzda"; }; installPhase = '' @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { cp -R * $out/checkstyle ''; - meta = { + meta = with stdenv.lib; { description = "Checks Java source against a coding standard"; longDescription = '' checkstyle is a development tool to help programmers write Java code that @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { Conventions, but is highly configurable. ''; homepage = http://checkstyle.sourceforge.net/; - license = stdenv.lib.licenses.lgpl21; + license = licenses.lgpl21; + maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index 094cabb73060..d65500d9d50c 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -4,14 +4,14 @@ let name = "cppcheck"; - version = "1.66"; + version = "1.67"; in stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { url = "mirror://sourceforge/${name}/${name}-${version}.tar.bz2"; - sha256 = "1dy1jd9ckqs565iwcv281pc3xmp9fnfw5ydh3wq06pyz74yw4scl"; + sha256 = "1f9azv714mk37mjij29nfyd3hizsnj6wry1mmv7kxj0i1k7w0532"; }; configurePhase = '' diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix new file mode 100644 index 000000000000..0777b5a5f9a6 --- /dev/null +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, ocaml, libelf }: + +stdenv.mkDerivation rec { + version = "0.1.0"; + name = "flow-${version}"; + src = fetchFromGitHub { + owner = "facebook"; + repo = "flow"; + rev = "v${version}"; + sha256 = "1f33zmajd6agb36gp8bwj0yqihjhxnkpig9x3a4ggn369x6ixhn3"; + }; + + installPhase = '' + mkdir -p $out/bin + cp bin/flow $out/bin/ + ''; + + buildInputs = [ ocaml libelf ]; + + meta = with stdenv.lib; { + homepage = "http://flowtype.org/"; + description = "A static type checker for JavaScript"; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.unix; + maintainers = with maintainers; [ puffnfresh ]; + }; +} diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix index baa63855a0af..9e2f310b8a11 100644 --- a/pkgs/development/tools/analysis/frama-c/default.nix +++ b/pkgs/development/tools/analysis/frama-c/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, ncurses, ocamlPackages, graphviz -, ltl2ba, coq, alt-ergo, gmp, why3 }: +, ltl2ba, coq, alt-ergo, why3 }: stdenv.mkDerivation rec { name = "frama-c-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; buildInputs = with ocamlPackages; [ - ncurses ocaml findlib alt-ergo ltl2ba ocamlgraph gmp + ncurses ocaml findlib alt-ergo ltl2ba ocamlgraph lablgtk coq graphviz zarith why3 zarith ]; diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix new file mode 100644 index 000000000000..c2ab7a334fe8 --- /dev/null +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, cmake, libpfm, zlib }: + +stdenv.mkDerivation rec { + version = "2.0.0"; + name = "rr-${version}"; + + src = fetchFromGitHub { + owner = "mozilla"; + repo = "rr"; + rev = version; + sha256 = "0mlxkj35zmm15dgnc7rfynnh2s2hpym01147vwc8pwv8qgab903s"; + }; + + buildInputs = [ cmake libpfm zlib ]; + cmakeFlags = "-DCMAKE_C_FLAGS_RELEASE:STRING= -DCMAKE_CXX_FLAGS_RELEASE:STRING="; + + meta = { + homepage = http://rr-project.org/; + description = "Records nondeterministic executions and debugs them deterministically"; + longDescription = '' + rr aspires to be your primary debugging tool, replacing -- well, + enhancing -- gdb. You record a failure once, then debug the + recording, deterministically, as many times as you want. Every + time the same execution is replayed. + ''; + + license = "custom"; + maintainers = [ stdenv.lib.maintainers.pierron ]; + platforms = [ "i686-linux" ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/tools/analysis/smatch/default.nix b/pkgs/development/tools/analysis/smatch/default.nix index 3bf459000342..e3fd1306cece 100644 --- a/pkgs/development/tools/analysis/smatch/default.nix +++ b/pkgs/development/tools/analysis/smatch/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation { meta = { description = "A semantic analysis tool for C"; homepage = "http://smatch.sourceforge.net/"; - license = "free"; /* OSL, see http://www.opensource.org */ + license = stdenv.lib.licenses.free; /* OSL, see http://www.opensource.org */ }; } diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix index 62182d0b8456..e21ae8e92738 100644 --- a/pkgs/development/tools/analysis/spin/default.nix +++ b/pkgs/development/tools/analysis/spin/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Formal verification tool for distributed software systems"; homepage = http://spinroot.com/; - license = "free"; + license = stdenv.lib.licenses.free; maintainers = with maintainers; [ mornfall pSub ]; }; } diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index 64f3b7d60abd..27fd739ed544 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -38,6 +38,8 @@ stdenv.mkDerivation rec { --replace 'obj:/usr/X11R6/lib' 'obj:*/lib' \ --replace 'obj:/usr/lib' 'obj:*/lib' done + + paxmark m $out/lib/valgrind/*-*-linux ''; meta = { diff --git a/pkgs/development/tools/atom-shell/default.nix b/pkgs/development/tools/atom-shell/default.nix new file mode 100644 index 000000000000..141ba284cc05 --- /dev/null +++ b/pkgs/development/tools/atom-shell/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib +, dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf +, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xlibs, libcap, unzip +}: +let + atomEnv = buildEnv { + name = "env-atom"; + paths = [ + stdenv.gcc.gcc zlib glib dbus gtk atk pango freetype libgnome_keyring3 + fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss + xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst + xlibs.libXcomposite xlibs.libXi xlibs.libXfixes xlibs.libXrandr + xlibs.libXcursor libcap + ]; + }; +in stdenv.mkDerivation rec { + name = "atom-shell-${version}"; + version = "0.19.1"; + + src = fetchurl { + url = "https://github.com/atom/atom-shell/releases/download/v0.19.1/atom-shell-v0.19.1-linux-x64.zip"; + sha256 = "10q1slwv2lkiqqxpv0m5a1k0gj2yp8bi9a7ilb05zz1wg7j3yw4y"; + name = "${name}.zip"; + }; + + buildInputs = [ atomEnv makeWrapper unzip ]; + + phases = [ "installPhase" "fixupPhase" ]; + + unpackCmd = "unzip"; + + installPhase = '' + mkdir -p $out/bin + unzip -d $out/bin $src + patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + $out/bin/atom + mv $out/bin/atom $out/bin/atom-shell + wrapProgram $out/bin/atom-shell \ + --prefix "LD_LIBRARY_PATH" : "${atomEnv}/lib:${atomEnv}/lib64" + ''; + + meta = with stdenv.lib; { + description = "Cross platform desktop application shell"; + homepage = https://github.com/atom/atom-shell; + license = [ licenses.mit ]; + maintainers = [ maintainers.fluffynukeit ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/tools/boost-build/default.nix b/pkgs/development/tools/boost-build/default.nix index 5538eae4104a..723219336bb9 100644 --- a/pkgs/development/tools/boost-build/default.nix +++ b/pkgs/development/tools/boost-build/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://www.boost.org/boost-build2/; - license = "boost-license"; + license = stdenv.lib.licenses.boost; platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; }; diff --git a/pkgs/development/tools/build-managers/bam/default.nix b/pkgs/development/tools/build-managers/bam/default.nix index e7e4b6d09092..b01d22b524b7 100644 --- a/pkgs/development/tools/build-managers/bam/default.nix +++ b/pkgs/development/tools/build-managers/bam/default.nix @@ -2,9 +2,9 @@ x@{builderDefsPackage , lua5, python , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) @@ -43,7 +43,7 @@ rec { mkdir -p "$out/bin" cp bam "$out/bin" '' ["minInit" "defEnsureDir" "build"]; - + meta = { description = "Yet another build manager"; maintainers = with a.lib.maintainers; @@ -52,7 +52,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "free-noncopyleft"; + license = a.lib.licenses.free; }; passthru = { updateInfo = { @@ -60,4 +60,3 @@ rec { }; }; }) x - diff --git a/pkgs/development/tools/build-managers/cargo/common.nix b/pkgs/development/tools/build-managers/cargo/common.nix index e60efc18d29d..447aed275700 100644 --- a/pkgs/development/tools/build-managers/cargo/common.nix +++ b/pkgs/development/tools/build-managers/cargo/common.nix @@ -14,16 +14,16 @@ rec { else throw "no snapshot to boostrap for this platform (missing platform url suffix)"; snapshotHash = if stdenv.system == "i686-linux" - then "c92895421e6fa170dbd713e74334b8c3cf22b817" + then "3204c8a38721199f69d2971db887d1dc71a63825" else if stdenv.system == "x86_64-linux" - then "66ee4126f9e4820cd82e78181931f8ea365904de" + then "39ca0d02eac184bc764ff9c1f645ca361715c5c2" else if stdenv.system == "i686-darwin" - then "e2364b1f1ece338b9fc4c308c472fc2413bff04e" + then "ebc1836424c4b3ba49f9adef271c50d2a8e134c0" else if stdenv.system == "x86_64-darwin" - then "09f92f06ab4f048acf71d83dc0426ff1509779a9" + then "a2045e95984b65eab4a704152566f8ab9a3be518" else throw "no snapshot for platform ${stdenv.system}"; - snapshotDate = "2014-09-19"; + snapshotDate = "2014-11-22"; snapshotName = "cargo-nightly-${platform}.tar.gz"; snapshot = stdenv.mkDerivation { diff --git a/pkgs/development/tools/build-managers/cmake/3.0.nix b/pkgs/development/tools/build-managers/cmake/3.0.nix new file mode 100644 index 000000000000..f4c368c46647 --- /dev/null +++ b/pkgs/development/tools/build-managers/cmake/3.0.nix @@ -0,0 +1,69 @@ +{ stdenv, fetchurl, fetchpatch, replace, curl, expat, zlib, bzip2, libarchive +, useNcurses ? false, ncurses, useQt4 ? false, qt4 +}: + +with stdenv.lib; + +let + os = stdenv.lib.optionalString; + majorVersion = "3.0"; + minorVersion = "2"; + version = "${majorVersion}.${minorVersion}"; +in + +stdenv.mkDerivation rec { + name = "cmake-${os useNcurses "cursesUI-"}${os useQt4 "qt4UI-"}${version}"; + + inherit majorVersion; + + src = fetchurl { + url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz"; + sha256 = "0gk90mw7f93sgkrsrxqy2b6fm5j43yfw50xkrk0bxndvmlgackkb"; + }; + + enableParallelBuilding = true; + + patches = + [(fetchpatch { # see http://www.cmake.org/Bug/view.php?id=13959 + name = "FindFreetype-2.5.patch"; + url = "http://www.cmake.org/Bug/file_download.php?file_id=4660&type=bug"; + sha256 = "136z63ff83hnwd247cq4m8m8164pklzyl5i2csf5h6wd8p01pdkj"; + })] ++ + # Don't search in non-Nix locations such as /usr, but do search in + # Nixpkgs' Glibc. + optional (stdenv ? glibc) ./search-path-3.0.patch ++ + optional (stdenv ? cross) (fetchurl { + name = "fix-darwin-cross-compile.patch"; + url = "http://public.kitware.com/Bug/file_download.php?" + + "file_id=4981&type=bug"; + sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv"; + }); + + buildInputs = [ curl expat zlib bzip2 libarchive ] + ++ optional useNcurses ncurses + ++ optional useQt4 qt4; + + CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" buildInputs; + + configureFlags = + "--docdir=/share/doc/${name} --mandir=/share/man --system-libs" + + stdenv.lib.optionalString useQt4 " --qt-gui"; + + setupHook = ./setup-hook.sh; + + dontUseCmakeConfigure = true; + + preConfigure = optionalString (stdenv ? glibc) + '' + source $setupHook + fixCmakeFiles . + substituteInPlace Modules/Platform/UnixPaths.cmake --subst-var-by glibc ${stdenv.glibc} + ''; + + meta = { + homepage = http://www.cmake.org/; + description = "Cross-Platform Makefile Generator"; + platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.all; + maintainers = with stdenv.lib.maintainers; [ urkud mornfall ]; + }; +} diff --git a/pkgs/development/tools/build-managers/cmake/search-path-3.0.patch b/pkgs/development/tools/build-managers/cmake/search-path-3.0.patch new file mode 100644 index 000000000000..b0447e706071 --- /dev/null +++ b/pkgs/development/tools/build-managers/cmake/search-path-3.0.patch @@ -0,0 +1,74 @@ +diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake +index 20ee1d1..39834e6 100644 +--- a/Modules/Platform/UnixPaths.cmake ++++ b/Modules/Platform/UnixPaths.cmake +@@ -33,64 +33,18 @@ get_filename_component(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH) + # search types. + list(APPEND CMAKE_SYSTEM_PREFIX_PATH + # Standard +- /usr/local /usr / +- +- # CMake install location +- "${_CMAKE_INSTALL_DIR}" +- ) +-if (NOT CMAKE_FIND_NO_INSTALL_PREFIX) +- list(APPEND CMAKE_SYSTEM_PREFIX_PATH +- # Project install destination. +- "${CMAKE_INSTALL_PREFIX}" +- ) +- if(CMAKE_STAGING_PREFIX) +- list(APPEND CMAKE_SYSTEM_PREFIX_PATH +- # User-supplied staging prefix. +- "${CMAKE_STAGING_PREFIX}" +- ) +- endif() +-endif() +- +-# List common include file locations not under the common prefixes. +-list(APPEND CMAKE_SYSTEM_INCLUDE_PATH +- # Windows API on Cygwin +- /usr/include/w32api +- +- # X11 +- /usr/X11R6/include /usr/include/X11 +- +- # Other +- /usr/pkg/include +- /opt/csw/include /opt/include +- /usr/openwin/include +- ) +- +-list(APPEND CMAKE_SYSTEM_LIBRARY_PATH +- # Windows API on Cygwin +- /usr/lib/w32api +- +- # X11 +- /usr/X11R6/lib /usr/lib/X11 +- +- # Other +- /usr/pkg/lib +- /opt/csw/lib /opt/lib +- /usr/openwin/lib +- ) +- +-list(APPEND CMAKE_SYSTEM_PROGRAM_PATH +- /usr/pkg/bin ++ "@glibc@" + ) + + list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES +- /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64 ++ "@glibc@/lib" + ) + + list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES +- /usr/include ++ "@glibc@/include" + ) + list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES +- /usr/include ++ "@glibc@/include" + ) + + # Enable use of lib64 search path variants by default. + diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index a4863d12b5ca..62662d273c8b 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, unzip, jdk, makeWrapper }: stdenv.mkDerivation rec { - name = "gradle-1.11"; + name = "gradle-2.1"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "14a0qdzjiar97l9a0i3ds2y48p1lrqkj7skkkvhz0r29hbgkbqh7"; + sha256 = "0y7qifc61nng24zn73bdwh5d0m25dnllfiwfkyw220mblag4zviy"; }; installPhase = '' @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { makeWrapper ${jdk}/bin/java $out/bin/gradle \ --set JAVA_HOME ${jdk} \ - --add-flags "-classpath $out/lib/gradle-launcher-1.11.jar org.gradle.launcher.GradleMain" + --add-flags "-classpath $out/lib/gradle-launcher-2.1.jar org.gradle.launcher.GradleMain" ''; phases = "unpackPhase installPhase"; diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix new file mode 100644 index 000000000000..a32ea9a3adda --- /dev/null +++ b/pkgs/development/tools/build-managers/icmake/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "icmake-${version}"; + version = "7.21.01"; + + src = fetchurl { + url = "mirror://sourceforge/icmake/icmake_${version}.orig.tar.gz"; + sha256 = "0jx547bb0h1z5f3v9kvjiq5bgarbrcs1h47y1nnwdkg0q1mqma1h"; + }; + + preConfigure = '' + patchShebangs ./ + sed -i "s;usr/;;g" INSTALL.im + ''; + + buildPhase = "./icm_bootstrap $out"; + + installPhase = "./icm_install all /"; + + meta = with stdenv.lib; { + description = "A program maintenance (make) utility using a C-like grammar"; + homepage = http://icmake.sourceforge.net/; + license = licenses.gpl3; + maintainers = with maintainers; [ pSub ]; + platforms = platforms.linux; + }; +} \ No newline at end of file diff --git a/pkgs/development/tools/build-managers/jam/default.nix b/pkgs/development/tools/build-managers/jam/default.nix index 434e23d9b990..8f56577de32f 100644 --- a/pkgs/development/tools/build-managers/jam/default.nix +++ b/pkgs/development/tools/build-managers/jam/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { homepage = http://public.perforce.com/wiki/Jam; - license = "free"; + license = stdenv.lib.licenses.free; description = "Just Another Make"; }; } diff --git a/pkgs/development/tools/build-managers/leiningen/builder.sh b/pkgs/development/tools/build-managers/leiningen/builder.sh index c28854ca0896..a4aaed8f12f3 100644 --- a/pkgs/development/tools/build-managers/leiningen/builder.sh +++ b/pkgs/development/tools/build-managers/leiningen/builder.sh @@ -8,7 +8,6 @@ out_bin=$out/bin/lein cp -v $src $out_bin cp -v $jarsrc $out/share/java -cp -v $clojure/share/java/* $out/share/java/ for p in $patches; do diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index 49e1dcb29c34..5f3a032051b1 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeWrapper -, coreutils, findutils, jdk, rlwrap, clojure, gnupg }: +, coreutils, findutils, jdk, rlwrap, gnupg }: stdenv.mkDerivation rec { pname = "leiningen"; @@ -18,19 +18,19 @@ stdenv.mkDerivation rec { patches = [ ./lein-fix-jar-path.patch ]; - inherit rlwrap clojure gnupg findutils coreutils jdk; + inherit rlwrap gnupg findutils coreutils jdk; builder = ./builder.sh; buildInputs = [ makeWrapper ]; - propagatedBuildInputs = [ jdk clojure ]; + propagatedBuildInputs = [ jdk ]; meta = { homepage = http://leiningen.org/; description = "Project automation for Clojure"; - license = "EPL"; - platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.epl10; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 39937f7d378b..72beb092bb07 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sbt-${version}"; - version = "0.13.5"; + version = "0.13.7"; src = fetchurl { url = "http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/${version}/sbt-launch.jar"; - sha256 = "05zvb3j7xxswpz7fz2nwbl4dwfdf0cyx5xzjis5fyi2dbzmfdrmp"; + sha256 = "9673ca4611e6367955ae068d5888f7ae665ab013c3e8435ffe2ca94318c6d607"; }; phases = [ "installPhase" ]; diff --git a/pkgs/development/tools/build-managers/skarnet/default.nix b/pkgs/development/tools/build-managers/skarnet/default.nix new file mode 100644 index 000000000000..5490fcabef96 --- /dev/null +++ b/pkgs/development/tools/build-managers/skarnet/default.nix @@ -0,0 +1,21 @@ +{ stdenv }: + +let + + version = "2014-11-28"; + +in stdenv.mkDerivation { + + name = "skarnet-conf-compile-${version}"; + + phases = [ "fixupPhase" ]; + + setupHook = ./setup-hook.sh; + + meta = { + homepage = http://www.skarnet.org/software/conf-compile.html; + description = "Support for configuring skarnet.org packages for nix builds"; + platforms = stdenv.lib.platforms.all; + }; + +} diff --git a/pkgs/development/tools/build-managers/skarnet/setup-hook.sh b/pkgs/development/tools/build-managers/skarnet/setup-hook.sh new file mode 100644 index 000000000000..e9cd02a4e7e6 --- /dev/null +++ b/pkgs/development/tools/build-managers/skarnet/setup-hook.sh @@ -0,0 +1,47 @@ +# Packages from skarnet.org use a unique build system. These functions +# assist with some common configuration and shebang patching. + +skarnetConfigure() { + runHook preConfigure + + pushd conf-compile >/dev/null + + # paths + > conf-defaultpath printf "$out/bin" + > conf-etc printf "$out/etc" + > conf-install-command printf "$out/bin" + > conf-install-include printf "$out/include" + > conf-install-libexec printf "$out/libexec" + > conf-install-library printf "$out/lib" + > conf-install-library.so printf "$out/lib" + > conf-install-sysdeps printf "$out/sysdeps" + + # use generic 'cc' to support both gcc and clang (darwin) stdenvs + for file in conf-cc conf-dynld conf-ld; do + substituteInPlace $file --replace gcc cc + done + + # let nix builder strip things, cross-platform + truncate --size 0 conf-stripbins conf-striplibs + + rm -f flag-slashpackage + touch flag-allstatic + touch flag-forcedevr # only used for skalibs + + # build inputs + truncate --size 0 import path-include path-library + for input in $nativeBuildInputs; do + [[ -a "$input/sysdeps" ]] && >> import printf "$input/sysdeps" + [[ -a "$input/include" ]] && >> path-include printf "$input/include" + [[ -a "$input/lib" ]] && >> path-library printf "$input/lib" + done + + popd >/dev/null + + # patch various scripts to use stdenv shell + patchShebangs src/sys + + runHook postConfigure +} + +export configurePhase=skarnetConfigure diff --git a/pkgs/development/tools/cdecl/default.nix b/pkgs/development/tools/cdecl/default.nix index d923fea8b598..48d04fd48ab3 100644 --- a/pkgs/development/tools/cdecl/default.nix +++ b/pkgs/development/tools/cdecl/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { description = "Translator English -- C/C++ declarations"; - license = "Public Domain"; + license = stdenv.lib.licenses.publicDomain; maintainers = with stdenv.lib.maintainers; [viric joelteon]; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/tools/documentation/haddock/2.10.0.nix b/pkgs/development/tools/documentation/haddock/2.10.0.nix deleted file mode 100644 index af9a72058b29..000000000000 --- a/pkgs/development/tools/documentation/haddock/2.10.0.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ cabal, alex, Cabal, filepath, ghcPaths, happy, xhtml, makeWrapper }: - -cabal.mkDerivation (self: { - pname = "haddock"; - version = "2.10.0"; - sha256 = "045lmmna5nwj07si81vxms5xkkmqvjsiif20nny5mvlabshxn1yi"; - isLibrary = true; - isExecutable = true; - buildDepends = [ Cabal filepath ghcPaths xhtml makeWrapper ]; - testDepends = [ Cabal filepath ]; - buildTools = [ alex happy ]; - doCheck = false; - - postInstall = '' - wrapProgram $out/bin/haddock --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"--optghc=-package-conf --optghc=\")" - ''; - - meta = { - homepage = "http://www.haskell.org/haddock/"; - description = "A documentation-generation tool for Haskell libraries"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/tools/documentation/haddock/2.11.0.nix b/pkgs/development/tools/documentation/haddock/2.11.0.nix deleted file mode 100644 index d43e529585ba..000000000000 --- a/pkgs/development/tools/documentation/haddock/2.11.0.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ cabal, alex, Cabal, filepath, ghcPaths, happy, xhtml, makeWrapper }: - -cabal.mkDerivation (self: { - pname = "haddock"; - version = "2.11.0"; - sha256 = "0a29n6y9lmk5w78f6j8s7pg0m0k3wm7bx5r2lhk7bnzkr5f7rkcd"; - isLibrary = true; - isExecutable = true; - buildDepends = [ Cabal filepath ghcPaths xhtml makeWrapper ]; - testDepends = [ Cabal filepath ]; - buildTools = [ alex happy ]; - doCheck = false; - - postInstall = '' - wrapProgram $out/bin/haddock --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"--optghc=-package-conf --optghc=\")" - ''; - - meta = { - homepage = "http://www.haskell.org/haddock/"; - description = "A documentation-generation tool for Haskell libraries"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/tools/documentation/haddock/2.12.0.nix b/pkgs/development/tools/documentation/haddock/2.12.0.nix deleted file mode 100644 index b1249eee3278..000000000000 --- a/pkgs/development/tools/documentation/haddock/2.12.0.nix +++ /dev/null @@ -1,22 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, alex, Cabal, deepseq, filepath, ghcPaths, happy, xhtml }: - -cabal.mkDerivation (self: { - pname = "haddock"; - version = "2.12.0"; - sha256 = "00kdmpa6vhn6x790641ln40v3pn7aj4ws6pq854n1iyg5ly3ridn"; - isLibrary = true; - isExecutable = true; - buildDepends = [ Cabal deepseq filepath ghcPaths xhtml ]; - testDepends = [ Cabal filepath ]; - buildTools = [ alex happy ]; - doCheck = false; - meta = { - homepage = "http://www.haskell.org/haddock/"; - description = "A documentation-generation tool for Haskell libraries"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/tools/documentation/haddock/2.13.2.1.nix b/pkgs/development/tools/documentation/haddock/2.13.2.1.nix deleted file mode 100644 index 749fee28571c..000000000000 --- a/pkgs/development/tools/documentation/haddock/2.13.2.1.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ cabal, alex, Cabal, deepseq, filepath, ghcPaths, happy, xhtml, makeWrapper }: - -cabal.mkDerivation (self: { - pname = "haddock"; - version = "2.13.2.1"; - sha256 = "0kpk3bmlyd7cb6s39ix8s0ak65xhrln9mg481y3h24lf5syy5ky9"; - isLibrary = true; - isExecutable = true; - buildDepends = [ Cabal deepseq filepath ghcPaths xhtml makeWrapper ]; - testDepends = [ Cabal deepseq filepath ]; - buildTools = [ alex happy ]; - doCheck = false; - - postInstall = '' - wrapProgram $out/bin/haddock --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"--optghc=-package-conf --optghc=\")" - ''; - - meta = { - homepage = "http://www.haskell.org/haddock/"; - description = "A documentation-generation tool for Haskell libraries"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/tools/documentation/haddock/2.13.2.nix b/pkgs/development/tools/documentation/haddock/2.13.2.nix deleted file mode 100644 index aa5be90fbae2..000000000000 --- a/pkgs/development/tools/documentation/haddock/2.13.2.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ cabal, alex, Cabal, deepseq, filepath, ghcPaths, happy, xhtml, makeWrapper }: - -cabal.mkDerivation (self: { - pname = "haddock"; - version = "2.13.2"; - sha256 = "1qwj13ks3fzar14s587svv1pdiwk80m7x5pzn74v3jrqkn0xbrr5"; - isLibrary = true; - isExecutable = true; - buildDepends = [ Cabal deepseq filepath ghcPaths xhtml makeWrapper ]; - testDepends = [ Cabal deepseq filepath ]; - buildTools = [ alex happy ]; - doCheck = false; - - postInstall = '' - wrapProgram $out/bin/haddock --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"--optghc=-package-conf --optghc=\")" - ''; - - meta = { - homepage = "http://www.haskell.org/haddock/"; - description = "A documentation-generation tool for Haskell libraries"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/tools/documentation/haddock/2.14.2.nix b/pkgs/development/tools/documentation/haddock/2.14.2.nix deleted file mode 100644 index c8ef4299f560..000000000000 --- a/pkgs/development/tools/documentation/haddock/2.14.2.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ cabal, Cabal, deepseq, filepath, ghcPaths, hspec, QuickCheck -, xhtml, makeWrapper -}: - -cabal.mkDerivation (self: { - pname = "haddock"; - version = "2.14.2"; - sha256 = "0h96jj6y093h4gcqpiq0nyv7h5wjg8ji7z1im9ydivmsv0627prk"; - isLibrary = true; - isExecutable = true; - buildDepends = [ Cabal deepseq filepath ghcPaths xhtml makeWrapper ]; - testDepends = [ Cabal deepseq filepath hspec QuickCheck ]; - doCheck = false; - - postInstall = '' - wrapProgram $out/bin/haddock --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"--optghc=-package-conf --optghc=\")" - ''; - - meta = { - homepage = "http://www.haskell.org/haddock/"; - description = "A documentation-generation tool for Haskell libraries"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/tools/documentation/haddock/2.14.3.nix b/pkgs/development/tools/documentation/haddock/2.14.3.nix deleted file mode 100644 index 7ce4782bb60c..000000000000 --- a/pkgs/development/tools/documentation/haddock/2.14.3.nix +++ /dev/null @@ -1,23 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, Cabal, deepseq, filepath, ghcPaths, hspec, QuickCheck -, xhtml -}: - -cabal.mkDerivation (self: { - pname = "haddock"; - version = "2.14.3"; - sha256 = "031ikrsbkpmmwgdkgdr8s19dfx5y6n39rmyljjdfqygas17gcm6l"; - isLibrary = true; - isExecutable = true; - buildDepends = [ Cabal deepseq filepath ghcPaths xhtml ]; - testDepends = [ Cabal deepseq filepath hspec QuickCheck ]; - preCheck = "unset GHC_PACKAGE_PATH"; - meta = { - homepage = "http://www.haskell.org/haddock/"; - description = "A documentation-generation tool for Haskell libraries"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/tools/documentation/haddock/2.4.2.nix b/pkgs/development/tools/documentation/haddock/2.4.2.nix deleted file mode 100644 index 6493302218f9..000000000000 --- a/pkgs/development/tools/documentation/haddock/2.4.2.nix +++ /dev/null @@ -1,21 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, alex, Cabal, filepath, ghcPaths, happy }: - -cabal.mkDerivation (self: { - pname = "haddock"; - version = "2.4.2"; - sha256 = "dbf0a7d0103a3ce6a91b2a3b96148c1b9c13ea7f8bd74260c21fe98df7839547"; - isLibrary = true; - isExecutable = true; - buildDepends = [ Cabal filepath ghcPaths ]; - buildTools = [ alex happy ]; - doCheck = false; - meta = { - homepage = "http://www.haskell.org/haddock/"; - description = "A documentation-generation tool for Haskell libraries"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/tools/documentation/haddock/2.7.2.nix b/pkgs/development/tools/documentation/haddock/2.7.2.nix deleted file mode 100644 index 53178aca0a18..000000000000 --- a/pkgs/development/tools/documentation/haddock/2.7.2.nix +++ /dev/null @@ -1,24 +0,0 @@ -{cabal, ghcPaths, alex, happy, makeWrapper}: - -cabal.mkDerivation (self : { - pname = "haddock"; - version = "2.7.2"; # Haskell Platform 2010.1.0.0 and 2010.2.0.0 - name = self.fname; - sha256 = "4eaaaf62785f0ba3d37ba356cfac4679faef91c0902d8cdbf42837cbe5daab82"; - buildTools = [alex happy makeWrapper]; - propagatedBuildInputs = [ghcPaths]; - doCheck = false; - - postInstall = '' - wrapProgram $out/bin/haddock --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"--optghc=-package-conf --optghc=\")" - ''; - - meta = { - homepage = "http://www.haskell.org/haddock/"; - description = "A documentation-generation tool for Haskell libraries"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/tools/documentation/haddock/2.9.2.nix b/pkgs/development/tools/documentation/haddock/2.9.2.nix deleted file mode 100644 index 2ed94ff072ab..000000000000 --- a/pkgs/development/tools/documentation/haddock/2.9.2.nix +++ /dev/null @@ -1,26 +0,0 @@ -{cabal, ghcPaths, xhtml, alex, happy, makeWrapper}: - -cabal.mkDerivation (self : { - pname = "haddock"; - version = "2.9.2"; # Haskell Platform 2011.2.0.0 - name = self.fname; - sha256 = "189vvp173pqc69zgzqqx6vyhvsc13p1s86ql60rs1j5qlhh8ajg8"; - buildTools = [alex happy makeWrapper]; - propagatedBuildInputs = [ghcPaths xhtml]; - doCheck = false; - - postInstall = '' - wrapProgram $out/bin/haddock --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"--optghc=-package-conf --optghc=\")" - ''; - - meta = { - homepage = "http://www.haskell.org/haddock/"; - description = "A documentation-generation tool for Haskell libraries"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = [ - self.stdenv.lib.maintainers.andres - ]; - }; -}) diff --git a/pkgs/development/tools/documentation/haddock/2.9.4.nix b/pkgs/development/tools/documentation/haddock/2.9.4.nix deleted file mode 100644 index 80d7c623c1e9..000000000000 --- a/pkgs/development/tools/documentation/haddock/2.9.4.nix +++ /dev/null @@ -1,23 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, alex, Cabal, filepath, ghcPaths, happy, regexCompat, xhtml -}: - -cabal.mkDerivation (self: { - pname = "haddock"; - version = "2.9.4"; - sha256 = "18w5pa1zpjy9mmdzjh0hs8jybmky8j87vzry54nni6a3517c5x86"; - isLibrary = true; - isExecutable = true; - buildDepends = [ Cabal filepath ghcPaths xhtml ]; - testDepends = [ Cabal filepath regexCompat ]; - buildTools = [ alex happy ]; - doCheck = false; - meta = { - homepage = "http://www.haskell.org/haddock/"; - description = "A documentation-generation tool for Haskell libraries"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/tools/documentation/haddock/2.15.0.nix b/pkgs/development/tools/documentation/haddock/default.nix index 3b3d91a1f2f1..3b3d91a1f2f1 100644 --- a/pkgs/development/tools/documentation/haddock/2.15.0.nix +++ b/pkgs/development/tools/documentation/haddock/default.nix diff --git a/pkgs/development/tools/egg2nix/chicken-eggs.nix b/pkgs/development/tools/egg2nix/chicken-eggs.nix new file mode 100644 index 000000000000..4ec9e0daa47a --- /dev/null +++ b/pkgs/development/tools/egg2nix/chicken-eggs.nix @@ -0,0 +1,296 @@ +{ pkgs, stdenv }: +rec { + inherit (pkgs) eggDerivation fetchegg; + + base64 = eggDerivation { + name = "base64-3.3.1"; + + src = fetchegg { + name = "base64"; + version = "3.3.1"; + sha256 = "0wmldiwwg1jpcn07wb906nc53si5j7sa83wgyq643xzqcx4v4x1d"; + }; + + buildInputs = [ + + ]; + }; + + blob-utils = eggDerivation { + name = "blob-utils-1.0.3"; + + src = fetchegg { + name = "blob-utils"; + version = "1.0.3"; + sha256 = "17vdn02fnxnjx5ixgqimln93lqvzyq4y9w02fw7xnbdcjzqm0xml"; + }; + + buildInputs = [ + setup-helper + string-utils + ]; + }; + + check-errors = eggDerivation { + name = "check-errors-1.13.0"; + + src = fetchegg { + name = "check-errors"; + version = "1.13.0"; + sha256 = "12a0sn82n98jybh72zb39fdddmr5k4785xglxb16750fhy8rmjwi"; + }; + + buildInputs = [ + setup-helper + ]; + }; + + defstruct = eggDerivation { + name = "defstruct-1.6"; + + src = fetchegg { + name = "defstruct"; + version = "1.6"; + sha256 = "0lsgl32nmb5hxqiii4r3292cx5vqh50kp6v062nfiyid9lhrj0li"; + }; + + buildInputs = [ + + ]; + }; + + http-client = eggDerivation { + name = "http-client-0.7.1"; + + src = fetchegg { + name = "http-client"; + version = "0.7.1"; + sha256 = "1s03zgmb7kb99ld0f2ylqgicrab9qgza53fkgsqvg7bh5njmzhxr"; + }; + + buildInputs = [ + intarweb + uri-common + message-digest + md5 + string-utils + sendfile + ]; + }; + + intarweb = eggDerivation { + name = "intarweb-1.3"; + + src = fetchegg { + name = "intarweb"; + version = "1.3"; + sha256 = "0izlby78c25py29bdcbc0vapb6h7xgchqrzi6i51d0rb3mnwy88h"; + }; + + buildInputs = [ + defstruct + uri-common + base64 + ]; + }; + + lookup-table = eggDerivation { + name = "lookup-table-1.13.5"; + + src = fetchegg { + name = "lookup-table"; + version = "1.13.5"; + sha256 = "1nzly6rhynawlvzlyilk8z8cxz57cf9n5iv20glkhh28pz2izmrb"; + }; + + buildInputs = [ + setup-helper + check-errors + miscmacros + record-variants + synch + ]; + }; + + matchable = eggDerivation { + name = "matchable-3.3"; + + src = fetchegg { + name = "matchable"; + version = "3.3"; + sha256 = "07y3lpzgm4djiwi9y2adc796f9kwkmdr28fkfkw65syahdax8990"; + }; + + buildInputs = [ + + ]; + }; + + md5 = eggDerivation { + name = "md5-3.1.0"; + + src = fetchegg { + name = "md5"; + version = "3.1.0"; + sha256 = "0bka43nx8x9b0b079qpvml2fl20km19ny0qjmhwzlh6rwmzazj2a"; + }; + + buildInputs = [ + message-digest + ]; + }; + + message-digest = eggDerivation { + name = "message-digest-3.1.0"; + + src = fetchegg { + name = "message-digest"; + version = "3.1.0"; + sha256 = "1w6bax19dwgih78vcimiws0rja7qsd8hmbm6qqg2hf9cw3vab21s"; + }; + + buildInputs = [ + setup-helper + miscmacros + check-errors + variable-item + blob-utils + string-utils + ]; + }; + + miscmacros = eggDerivation { + name = "miscmacros-2.96"; + + src = fetchegg { + name = "miscmacros"; + version = "2.96"; + sha256 = "1ajdgjrni10i2hmhcp4rawnxajjxry3kmq1krdmah4sf0kjrgajc"; + }; + + buildInputs = [ + + ]; + }; + + record-variants = eggDerivation { + name = "record-variants-0.5.1"; + + src = fetchegg { + name = "record-variants"; + version = "0.5.1"; + sha256 = "15wgysxkm8m4hx9nhhw9akchzipdnqc7yj3qd3zn0z7sxg4sld1h"; + }; + + buildInputs = [ + + ]; + }; + + sendfile = eggDerivation { + name = "sendfile-1.7.29"; + + src = fetchegg { + name = "sendfile"; + version = "1.7.29"; + sha256 = "1dc02cbkx5kixhbqjy26g6gs680vy7krc9qis1p1v4aa0b2lgj7k"; + }; + + buildInputs = [ + + ]; + }; + + setup-helper = eggDerivation { + name = "setup-helper-1.5.4"; + + src = fetchegg { + name = "setup-helper"; + version = "1.5.4"; + sha256 = "1k644y0md2isdcvazqfm4nyc8rh3dby6b0j3r4na4w8ryspqp6gj"; + }; + + buildInputs = [ + + ]; + }; + + string-utils = eggDerivation { + name = "string-utils-1.2.4"; + + src = fetchegg { + name = "string-utils"; + version = "1.2.4"; + sha256 = "07alvghg0dahilrm4jg44bndl0x69sv1zbna9l20cbdvi35i0jp1"; + }; + + buildInputs = [ + setup-helper + miscmacros + lookup-table + check-errors + ]; + }; + + synch = eggDerivation { + name = "synch-2.1.2"; + + src = fetchegg { + name = "synch"; + version = "2.1.2"; + sha256 = "1m9mnbq0m5jsxmd1a3rqpwpxj0l1b7vn1fknvxycc047pmlcyl00"; + }; + + buildInputs = [ + setup-helper + check-errors + ]; + }; + + uri-common = eggDerivation { + name = "uri-common-1.4"; + + src = fetchegg { + name = "uri-common"; + version = "1.4"; + sha256 = "01ds1gixcn4rz657x3hr4rhw2496hsjff42ninw0k39l8i1cbh7c"; + }; + + buildInputs = [ + uri-generic + defstruct + matchable + ]; + }; + + uri-generic = eggDerivation { + name = "uri-generic-2.41"; + + src = fetchegg { + name = "uri-generic"; + version = "2.41"; + sha256 = "1r5jbzjllbnmhm5n0m3fcx0g6dc2c2jzp1dcndkfmxz0cl99zxac"; + }; + + buildInputs = [ + matchable + defstruct + ]; + }; + + variable-item = eggDerivation { + name = "variable-item-1.3.1"; + + src = fetchegg { + name = "variable-item"; + version = "1.3.1"; + sha256 = "19b3mhb8kr892sz9yyzq79l0vv28dgilw9cf415kj6aq16yp4d5n"; + }; + + buildInputs = [ + setup-helper + check-errors + ]; + }; +} + diff --git a/pkgs/development/tools/egg2nix/chicken-eggs.scm b/pkgs/development/tools/egg2nix/chicken-eggs.scm new file mode 100644 index 000000000000..d847ae9e29b9 --- /dev/null +++ b/pkgs/development/tools/egg2nix/chicken-eggs.scm @@ -0,0 +1,5 @@ +;; Eggs used by egg2nix +http-client +intarweb +matchable +uri-common diff --git a/pkgs/development/tools/egg2nix/default.nix b/pkgs/development/tools/egg2nix/default.nix new file mode 100644 index 000000000000..dd1c00116e4d --- /dev/null +++ b/pkgs/development/tools/egg2nix/default.nix @@ -0,0 +1,27 @@ +{ stdenv, eggDerivation, fetchurl, chickenEggs }: + +# Note: This mostly reimplements the default.nix already contained in +# the tarball. Is there a nicer way than duplicating code? + +let + version = "0.4"; +in +eggDerivation { + src = fetchurl { + url = "https://github.com/the-kenny/egg2nix/archive/${version}.tar.gz"; + sha256 = "1xn79fgqxg0i47asjah31zi56v60is1n8d0cy8w4gbj0i41z7pvm"; + }; + + name = "egg2nix-${version}"; + buildInputs = with chickenEggs; [ + matchable http-client + ]; + + meta = { + description = "Generate nix-expression from CHICKEN scheme eggs"; + homepage = https://github.com/the-kenny/egg2nix; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.the-kenny ]; + }; +} diff --git a/pkgs/development/tools/gnulib/default.nix b/pkgs/development/tools/gnulib/default.nix index 2e5701375a47..f5aa7d896daf 100644 --- a/pkgs/development/tools/gnulib/default.nix +++ b/pkgs/development/tools/gnulib/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchgit }: stdenv.mkDerivation { - name = "gnulib-0.1-83-g8008cac"; + name = "gnulib-0.1-263-g92b60e6"; + + phases = ["unpackPhase" "installPhase"]; src = fetchgit { url = "http://git.savannah.gnu.org/r/gnulib.git"; - rev = "8008cac0568ee76a4a9b7002f839e1abbad78af6"; - sha256 = "1w8wh5ljh1qpssnj2lxizf45ggd7fgk5ggwhrnzjxxhn9m7rdvwm"; + rev = "92b60e61666f008385d9b7f7443da17c7a44d1b1"; + sha256 = "0xpxq8vqdl0niib961dnsrgjq6kbpyap6nnydzp15dvzfhzgz189"; }; - buildPhase = ":"; - installPhase = "mkdir -p $out; mv * $out/"; meta = { diff --git a/pkgs/development/tools/golint/default.nix b/pkgs/development/tools/golint/default.nix new file mode 100644 index 000000000000..b9292f6fa117 --- /dev/null +++ b/pkgs/development/tools/golint/default.nix @@ -0,0 +1,29 @@ +{ stdenv, lib, go, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "golint"; + + src = import ./deps.nix { + inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub; + }; + + buildInputs = [ go ]; + + buildPhase = '' + export GOPATH=$src + go build -v -o lint github.com/golang/lint/golint + ''; + + installPhase = '' + mkdir -p $out/bin + mv lint $out/bin/golint + ''; + + meta = with lib; { + description = "Linter for Go source code"; + homepage = https://github.com/golang/lint; + license = licenses.mit; + maintainers = with maintainers; [ offline ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/golint/deps.nix b/pkgs/development/tools/golint/deps.nix new file mode 100644 index 000000000000..47b8ade22982 --- /dev/null +++ b/pkgs/development/tools/golint/deps.nix @@ -0,0 +1,27 @@ +{ stdenv, lib, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: + +let + goDeps = [ + { + root = "github.com/golang/lint"; + src = fetchFromGitHub { + owner = "golang"; + repo = "lint"; + rev = "8ca23475bcb43213a55dd8210b69363f6b0e09c1"; + sha256 = "16wbykik6dw3x9s7iqi4ln8kvzsh3g621wb8mk4nfldw7lyqp3cs"; + }; + } + ]; + +in + +stdenv.mkDerivation rec { + name = "go-deps"; + + buildCommand = + lib.concatStrings + (map (dep: '' + mkdir -p $out/src/`dirname ${dep.root}` + ln -s ${dep.src} $out/src/${dep.root} + '') goDeps); +} diff --git a/pkgs/development/tools/gotags/default.nix b/pkgs/development/tools/gotags/default.nix new file mode 100644 index 000000000000..5fec8c181a89 --- /dev/null +++ b/pkgs/development/tools/gotags/default.nix @@ -0,0 +1,29 @@ +{ stdenv, lib, go, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "gotags"; + + src = import ./deps.nix { + inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub; + }; + + buildInputs = [ go ]; + + buildPhase = '' + export GOPATH=$src + go build -v -o gotags github.com/jstemmer/gotags + ''; + + installPhase = '' + mkdir -p $out/bin + mv gotags $out/bin + ''; + + meta = with lib; { + description = "Ctags-compatible tag generator for Go"; + homepage = https://github.com/nsf/gotags; + license = licenses.mit; + maintainers = with maintainers; [ offline ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/gotags/deps.nix b/pkgs/development/tools/gotags/deps.nix new file mode 100644 index 000000000000..97e77bdd977e --- /dev/null +++ b/pkgs/development/tools/gotags/deps.nix @@ -0,0 +1,27 @@ +{ stdenv, lib, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: + +let + goDeps = [ + { + root = "github.com/jstemmer/gotags"; + src = fetchFromGitHub { + owner = "jstemmer"; + repo = "gotags"; + rev = "a60c6a1b171faedc44354bd437d965e5e3bdc220"; + sha256 = "1drbypby0isdmkq44jmlv59k3jrwvq2jciaccxx2qc2nnx444fkq"; + }; + } + ]; + +in + +stdenv.mkDerivation rec { + name = "go-deps"; + + buildCommand = + lib.concatStrings + (map (dep: '' + mkdir -p $out/src/`dirname ${dep.root}` + ln -s ${dep.src} $out/src/${dep.root} + '') goDeps); +} diff --git a/pkgs/development/tools/haskell/BNFC/default.nix b/pkgs/development/tools/haskell/BNFC/default.nix index 4acc8f38f175..4a2ed055cf8f 100644 --- a/pkgs/development/tools/haskell/BNFC/default.nix +++ b/pkgs/development/tools/haskell/BNFC/default.nix @@ -1,18 +1,18 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, alex, deepseq, filepath, happy, hspec, HUnit, mtl +{ cabal, alex, deepseq, doctest, filepath, happy, hspec, HUnit, mtl , QuickCheck, temporary }: cabal.mkDerivation (self: { pname = "BNFC"; - version = "2.7.0.1"; - sha256 = "18009jrpd5kcaz06j4ksay4c7c65m4zrc7jrp3rjx81bs6gkrwk1"; + version = "2.7.1"; + sha256 = "1n9l64wzga3i7ifh2k5rwhxp60gb0av5fszygw5mvr31r64cf4fp"; isLibrary = true; isExecutable = true; buildDepends = [ deepseq filepath mtl ]; testDepends = [ - deepseq filepath hspec HUnit mtl QuickCheck temporary + deepseq doctest filepath hspec HUnit mtl QuickCheck temporary ]; buildTools = [ alex happy ]; meta = { diff --git a/pkgs/development/tools/haskell/PastePipe/default.nix b/pkgs/development/tools/haskell/PastePipe/default.nix index ce1c8a27c54e..9d967c30f1cf 100644 --- a/pkgs/development/tools/haskell/PastePipe/default.nix +++ b/pkgs/development/tools/haskell/PastePipe/default.nix @@ -1,18 +1,18 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, cmdargs, HTTP, network }: +{ cabal, cmdargs, HTTP, network, networkUri }: cabal.mkDerivation (self: { pname = "PastePipe"; - version = "1.5"; - sha256 = "1jqfk6d22vi0vrwx0whjkh4pxwagr4hmi79bid6bffn72c7ygm8f"; + version = "1.7"; + sha256 = "0had11n44y7zjhhymdbvahwmxcxxrbxy7c9jxijhw3n7xqhdmva0"; isLibrary = true; isExecutable = true; - buildDepends = [ cmdargs HTTP network ]; + buildDepends = [ cmdargs HTTP network networkUri ]; meta = { - homepage = "http://github.com/creswick/pastepipe"; + homepage = "http://github.com/Fuuzetsu/pastepipe"; description = "CLI for pasting to lpaste.net"; - license = "GPL"; + license = self.stdenv.lib.licenses.gpl3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; }; diff --git a/pkgs/development/tools/haskell/SourceGraph/default.nix b/pkgs/development/tools/haskell/SourceGraph/default.nix index abfd386c82aa..0ce5872d26a2 100644 --- a/pkgs/development/tools/haskell/SourceGraph/default.nix +++ b/pkgs/development/tools/haskell/SourceGraph/default.nix @@ -18,5 +18,6 @@ cabal.mkDerivation (self: { description = "Static code analysis using graph-theoretic techniques"; license = "GPL"; platforms = self.ghc.meta.platforms; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/c2hs/default.nix b/pkgs/development/tools/haskell/c2hs/default.nix index a082a9ef2af1..fe8992e9989f 100644 --- a/pkgs/development/libraries/haskell/c2hs/default.nix +++ b/pkgs/development/tools/haskell/c2hs/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "c2hs"; - version = "0.18.2"; - sha256 = "0rkarj8y8sj83svjz9jivrr1dh2ryky4sb35cxlyxv623bl6sc1x"; + version = "0.19.1"; + sha256 = "18vk4q43bn4n59mcjid382dlm113nwll94hsqhqvk52sp1jkmjn3"; isLibrary = false; isExecutable = true; buildDepends = [ dlist filepath languageC ]; @@ -15,8 +15,6 @@ cabal.mkDerivation (self: { filepath HUnit shelly testFramework testFrameworkHunit text transformers ]; - jailbreak = true; - doCheck = false; meta = { homepage = "https://github.com/haskell/c2hs"; description = "C->Haskell FFI tool that gives some cross-language type safety"; diff --git a/pkgs/development/libraries/haskell/c2hsc/default.nix b/pkgs/development/tools/haskell/c2hsc/default.nix index cf56c0bf545f..cf56c0bf545f 100644 --- a/pkgs/development/libraries/haskell/c2hsc/default.nix +++ b/pkgs/development/tools/haskell/c2hsc/default.nix diff --git a/pkgs/development/tools/haskell/cabal-bounds/default.nix b/pkgs/development/tools/haskell/cabal-bounds/default.nix index b0bf11bb2a01..0f10b13c5d11 100644 --- a/pkgs/development/tools/haskell/cabal-bounds/default.nix +++ b/pkgs/development/tools/haskell/cabal-bounds/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "cabal-bounds"; - version = "0.8.7"; - sha256 = "03kp59nhdyq3bl91akd38iwvwwy3zgvadx85lwl3827nr6s774qk"; + version = "0.8.9"; + sha256 = "1vprf6nsw3qnppqxcm5jwvwxyalkaq364xcmig54ma47rsk23nzk"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/tools/haskell/cabal-db/default.nix b/pkgs/development/tools/haskell/cabal-db/default.nix index 234c158cf90c..61e3cbdd04c9 100644 --- a/pkgs/development/tools/haskell/cabal-db/default.nix +++ b/pkgs/development/tools/haskell/cabal-db/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "cabal-db"; - version = "0.1.9"; - sha256 = "19mw5ycc2y5wkn1h7wkdm2gb29pq2sh0n8z52dbxlkf0rwcgjbfq"; + version = "0.1.11"; + sha256 = "0kxj7xf0r1waxxi25g46a2wj43dcd3b1lkdn20l4r7m3r44y1nd7"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -15,7 +15,7 @@ cabal.mkDerivation (self: { ]; meta = { homepage = "http://github.com/vincenthz/cabal-db"; - description = "query tools for the local cabal database (revdeps, graph, info, search-by, license, bounds)"; + description = "query tools for the local cabal database"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index 07ba2a4a09ec..315dfc6e2daa 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -6,15 +6,15 @@ cabal.mkDerivation (self: { pname = "cabal2nix"; - version = "1.70"; - sha256 = "0jc66x6p6blcz1pk4pkdh93dx17658pr0i5h4w3zynv4c2jgy138"; + version = "1.71"; + sha256 = "1hhw1i4gqsd73mrj60sza36dqfz32ydh70sk9182m4wpgpsrwxvr"; isLibrary = false; isExecutable = true; buildDepends = [ Cabal filepath hackageDb mtl regexPosix transformers ]; testDepends = [ doctest ]; - doCheck = self.stdenv.lib.versionOlder "7.6" self.ghc.version; + doCheck = self.stdenv.lib.versionOlder "7.8" self.ghc.version; meta = { homepage = "http://github.com/NixOS/cabal2nix"; description = "Convert Cabal files into Nix build instructions"; diff --git a/pkgs/development/tools/haskell/codex/default.nix b/pkgs/development/tools/haskell/codex/default.nix index b3c1ba9fa667..902faca957f5 100644 --- a/pkgs/development/tools/haskell/codex/default.nix +++ b/pkgs/development/tools/haskell/codex/default.nix @@ -1,18 +1,20 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, Cabal, downloadCurl, either, filepath, hackageDb, MissingH -, monadLoops, tar, text, transformers, yaml, zlib +{ cabal, Cabal, downloadCurl, either, filepath, hackageDb, machines +, machinesDirectory, MissingH, monadLoops, monoTraversable, tar +, text, transformers, yaml, zlib }: cabal.mkDerivation (self: { pname = "codex"; - version = "0.1.0.5"; - sha256 = "0hlx72dan9qvwrpp6rkyr6y9zk2lafa15va098w38r7658jymfy0"; + version = "0.2.0.2"; + sha256 = "0an043cmsxc296i90pv19d8xdl7fg2fvf026lx4rly7bwskzn99x"; isLibrary = true; isExecutable = true; buildDepends = [ - Cabal downloadCurl either filepath hackageDb MissingH monadLoops - tar text transformers yaml zlib + Cabal downloadCurl either filepath hackageDb machines + machinesDirectory MissingH monadLoops monoTraversable tar text + transformers yaml zlib ]; jailbreak = true; meta = { diff --git a/pkgs/development/tools/haskell/ghcid/default.nix b/pkgs/development/tools/haskell/ghcid/default.nix new file mode 100644 index 000000000000..2ce069f53c37 --- /dev/null +++ b/pkgs/development/tools/haskell/ghcid/default.nix @@ -0,0 +1,24 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, cmdargs, extra, filepath, tasty, tastyHunit, terminalSize +, time +}: + +cabal.mkDerivation (self: { + pname = "ghcid"; + version = "0.3.2"; + sha256 = "1kx20la4snldhd709y69za8bs57v90nblghfrxrvmzhrmpvh4bn3"; + isLibrary = true; + isExecutable = true; + buildDepends = [ cmdargs extra filepath terminalSize time ]; + testDepends = [ + cmdargs extra filepath tasty tastyHunit terminalSize time + ]; + doCheck = false; + meta = { + homepage = "https://github.com/ndmitchell/ghcid#readme"; + description = "GHCi based bare bones IDE"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/tools/haskell/graphmod/default.nix b/pkgs/development/tools/haskell/graphmod/default.nix index 6165e46dd5bd..496e854fb864 100644 --- a/pkgs/development/tools/haskell/graphmod/default.nix +++ b/pkgs/development/tools/haskell/graphmod/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "graphmod"; - version = "1.2.5"; - sha256 = "1rmrsfvajzrak7jlhwnvhrgszgyg1b6z5wp21k0d7pv2cbfdkp8s"; + version = "1.2.6"; + sha256 = "02p1x44ywv2mb4l2dsz9z3ybnvv4nns3882lqm3nc8sw2hkib8z3"; isLibrary = false; isExecutable = true; buildDepends = [ dotgen filepath haskellLexer ]; diff --git a/pkgs/development/tools/haskell/hasktags/default.nix b/pkgs/development/tools/haskell/hasktags/default.nix index 36b3739a1405..03dfaee87861 100644 --- a/pkgs/development/tools/haskell/hasktags/default.nix +++ b/pkgs/development/tools/haskell/hasktags/default.nix @@ -9,6 +9,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ filepath json utf8String ]; + jailbreak = true; meta = { homepage = "http://github.com/MarcWeber/hasktags"; description = "Produces ctags \"tags\" and etags \"TAGS\" files for Haskell programs"; diff --git a/pkgs/development/tools/haskell/hdevtools/default.nix b/pkgs/development/tools/haskell/hdevtools/default.nix index 350ad216bcab..8f1397775b7e 100644 --- a/pkgs/development/tools/haskell/hdevtools/default.nix +++ b/pkgs/development/tools/haskell/hdevtools/default.nix @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1a218m817q35f52fv6mn28sfv136i6fm2mzgdidpm24pc0585gl7"; isLibrary = false; isExecutable = true; - patches = [ (fetchurl { url = "https://github.com/ts468/hdevtools/pull/2.patch"; md5 = "256609d2d3f5b719caa0002ee579d169"; }) ]; + patches = [ (fetchurl { url = "https://github.com/ts468/hdevtools/pull/2.patch"; sha256 = "104vdw6qxl71fdg43ppv0hrg6k17zaijq73vap794178d3gb35al"; }) ]; buildDepends = [ cmdargs ghcPaths network syb time ]; meta = { homepage = "https://github.com/bitc/hdevtools/"; diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix index 92a33602a1f6..0699337640f1 100644 --- a/pkgs/development/tools/haskell/hlint/default.nix +++ b/pkgs/development/tools/haskell/hlint/default.nix @@ -1,18 +1,18 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, cmdargs, cpphs, filepath, haskellSrcExts, hscolour -, transformers, uniplate +{ cabal, ansiTerminal, cmdargs, cpphs, extra, filepath +, haskellSrcExts, hscolour, transformers, uniplate }: cabal.mkDerivation (self: { pname = "hlint"; - version = "1.9.4"; - sha256 = "0vqdkrhzxi99py9zrk01cz3hayfbp757rh1c1sgz00a1gf1pyz8m"; + version = "1.9.12"; + sha256 = "0ga66b7lpvgx2w1fg5gnilncg75dfxcjcrx9hvjyxh7fin4y1z6a"; isLibrary = true; isExecutable = true; buildDepends = [ - cmdargs cpphs filepath haskellSrcExts hscolour transformers - uniplate + ansiTerminal cmdargs cpphs extra filepath haskellSrcExts hscolour + transformers uniplate ]; meta = { homepage = "http://community.haskell.org/~ndm/hlint/"; diff --git a/pkgs/development/tools/haskell/hsb2hs/default.nix b/pkgs/development/tools/haskell/hsb2hs/default.nix new file mode 100644 index 000000000000..9efebdf1db76 --- /dev/null +++ b/pkgs/development/tools/haskell/hsb2hs/default.nix @@ -0,0 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, filepath, preprocessorTools }: + +cabal.mkDerivation (self: { + pname = "hsb2hs"; + version = "0.2"; + sha256 = "013n3l80449wxmbfmcidg8mdjk4nkxv7s3jcbfy5g4jps6gsg1fx"; + isLibrary = false; + isExecutable = true; + buildDepends = [ filepath preprocessorTools ]; + meta = { + description = "Preprocesses a file, adding blobs from files as string literals"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/tools/haskell/hscope/default.nix b/pkgs/development/tools/haskell/hscope/default.nix index 981e61204440..a295cc4896ca 100644 --- a/pkgs/development/tools/haskell/hscope/default.nix +++ b/pkgs/development/tools/haskell/hscope/default.nix @@ -6,15 +6,14 @@ cabal.mkDerivation (self: { pname = "hscope"; - version = "0.4"; - sha256 = "1jb2d61c1as6li54zw33jsyvfap214pqxpkr2m6lkzaizh8396hg"; + version = "0.4.1"; + sha256 = "1m5mp45pvf64pnpc3lsig382177vfc232bbm9g3a8q58jrwridy7"; isLibrary = false; isExecutable = true; buildDepends = [ cereal cpphs deepseq haskellSrcExts mtl pureCdb uniplate vector ]; testDepends = [ mtl testSimple Unixutils ]; - doCheck = false; meta = { homepage = "https://github.com/bosu/hscope"; description = "cscope like browser for Haskell code"; diff --git a/pkgs/development/tools/haskell/hslogger/default.nix b/pkgs/development/tools/haskell/hslogger/default.nix index 43da5b21ca4e..40ce0f342331 100644 --- a/pkgs/development/tools/haskell/hslogger/default.nix +++ b/pkgs/development/tools/haskell/hslogger/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hslogger"; - version = "1.2.4"; - sha256 = "0r0c7wqz49lzxg7sakkw6nwmxnyzhqscxvnxiqwkwsgv3q2sh3wc"; + version = "1.2.6"; + sha256 = "0yqw7824bn8vb9iynx8lkgswxd0nz484k4bvcwd02wvakbbfawkk"; isLibrary = true; isExecutable = true; buildDepends = [ mtl network time ]; diff --git a/pkgs/development/tools/haskell/ihaskell/default.nix b/pkgs/development/tools/haskell/ihaskell/default.nix index f65053841283..53956a3e098a 100644 --- a/pkgs/development/tools/haskell/ihaskell/default.nix +++ b/pkgs/development/tools/haskell/ihaskell/default.nix @@ -1,27 +1,19 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -# This file was later edited to add patches, disable testing. -# Also patch the profile config to point to the ihaskell kernel exe { cabal, aeson, base64Bytestring, cereal, classyPrelude, cmdargs , filepath, ghcParser, ghcPaths, haskeline, haskellSrcExts, here , hlint, hspec, HTTP, HUnit, MissingH, monoTraversable, mtl, parsec , random, setenv, shelly, split, stm, strict, systemArgv0 , systemFilepath, tar, text, transformers, unorderedContainers -, utf8String, uuid, vector, zeromq4Haskell, fetchpatch +, utf8String, uuid, vector, zeromq4Haskell }: cabal.mkDerivation (self: { pname = "ihaskell"; - version = "0.4.2.0"; - sha256 = "012rmasdc167w6gl18ysr53737j4p4afk0qcsv81hif92vvg5j1c"; + version = "0.4.3.0"; + sha256 = "1k6i56cdzv5ikci20brq7qj07nqdpzkfj7xr69lh1gvx7xb24ida"; isLibrary = true; isExecutable = true; - patches = [ (fetchpatch { url = "https://github.com/gibiansky/IHaskell/pull/288.patch"; sha256 = "022zdz4wnyra6cfa7mq0w2ycsb007cvppn2f1360nr3fa5s9wibg"; }) ]; - prePatch = '' - tar xvf profile/profile.tar -C profile - sed -i -e '1iexe = "'$out'/bin/IHaskell".replace(" ", "\\ ")\' profile/ipython_config.py - ''; - doCheck = false; buildDepends = [ aeson base64Bytestring cereal classyPrelude cmdargs filepath ghcParser ghcPaths haskeline haskellSrcExts here hlint hspec HTTP @@ -29,21 +21,20 @@ cabal.mkDerivation (self: { strict systemArgv0 systemFilepath tar text transformers unorderedContainers utf8String uuid vector zeromq4Haskell ]; - testDepends = [ # let's keep these anyway + testDepends = [ aeson base64Bytestring cereal classyPrelude cmdargs filepath ghcParser ghcPaths haskeline haskellSrcExts here hlint hspec HTTP HUnit MissingH monoTraversable mtl parsec random setenv shelly split stm strict systemArgv0 systemFilepath tar text transformers unorderedContainers utf8String uuid vector zeromq4Haskell ]; - postInstall = '' - patchShebangs . - ''; - meta = with self.stdenv.lib; { + jailbreak = true; + doCheck = false; + meta = { homepage = "http://gibiansky.github.io/IHaskell/"; description = "A Haskell backend kernel for the IPython project"; - license = licenses.mit; + license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = with maintainers; [ edwtjo ]; + maintainers = with self.stdenv.lib.maintainers; [ edwtjo ]; }; }) diff --git a/pkgs/development/tools/haskell/ihaskell/wrapper.nix b/pkgs/development/tools/haskell/ihaskell/wrapper.nix index f98de4af2290..7a5b24ce0393 100644 --- a/pkgs/development/tools/haskell/ihaskell/wrapper.nix +++ b/pkgs/development/tools/haskell/ihaskell/wrapper.nix @@ -20,7 +20,5 @@ stdenv.mkDerivation rec { --set GHC_PACKAGE_PATH "\$GHC_PACKAGE_PATH:" # always end with : to include base packages ''; - meta = { - description = ihaskell.meta.description; - }; -} \ No newline at end of file + inherit (ihaskell) meta; +} diff --git a/pkgs/development/tools/haskell/keter/default.nix b/pkgs/development/tools/haskell/keter/default.nix index 22b52975cde5..9aa35ea940ff 100644 --- a/pkgs/development/tools/haskell/keter/default.nix +++ b/pkgs/development/tools/haskell/keter/default.nix @@ -11,8 +11,8 @@ cabal.mkDerivation (self: { pname = "keter"; - version = "1.3.4"; - sha256 = "127sv155kgwz64adylfn2dmpnqh833pa53lnc8ahhwa63xwf9pzk"; + version = "1.3.6"; + sha256 = "00g34gazj3kk39nk34vzw88dy04rr3swb0hcl6k6gafwqrpv3i79"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/tools/haskell/packunused/default.nix b/pkgs/development/tools/haskell/packunused/default.nix index c68d5dec8b3a..9df5b2472bf8 100644 --- a/pkgs/development/tools/haskell/packunused/default.nix +++ b/pkgs/development/tools/haskell/packunused/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "packunused"; - version = "0.1.1.2"; - sha256 = "1kp004lh6sa4gjqm37ldgk70jbncrnr76rk9c77464cnj6ajxmlm"; + version = "0.1.1.3"; + sha256 = "1f8lc9lzqwyzdz1j8czdan04d4bj393xk1rxfhr39j4a56qskp1c"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/tools/haskell/pointfree/default.nix b/pkgs/development/tools/haskell/pointfree/default.nix index 166105f22b6a..4eb911ebd621 100644 --- a/pkgs/development/tools/haskell/pointfree/default.nix +++ b/pkgs/development/tools/haskell/pointfree/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "pointfree"; - version = "1.0.4.7"; - sha256 = "0jwql0ka01cr53ayjc4dpaci11i7r1y3b9gcbh3rlamb1mnfcqvl"; + version = "1.0.4.8"; + sha256 = "0nb3mqp6zwnnq6fs27xhcqv4w8h6sr5k01hldkqnkgwz0yyy7ljy"; isLibrary = false; isExecutable = true; buildDepends = [ haskellSrcExts transformers ]; diff --git a/pkgs/development/tools/haskell/threadscope/default.nix b/pkgs/development/tools/haskell/threadscope/default.nix index 892faca8e8cd..f31ef0d52fa8 100644 --- a/pkgs/development/tools/haskell/threadscope/default.nix +++ b/pkgs/development/tools/haskell/threadscope/default.nix @@ -1,17 +1,18 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, binary, cairo, deepseq, filepath, ghcEvents, glib, gtk -, mtl, pango, time +, mtl, pango, text, time }: cabal.mkDerivation (self: { pname = "threadscope"; - version = "0.2.4"; - sha256 = "1208gp80vj3dngc4nrj1jk5y4h1181bgwq2qj764kcjvkaxch599"; + version = "0.2.6"; + sha256 = "0pycxvf3gjx86yp948anczxidhi6ra95szkqyvvlfpriay7klfya"; isLibrary = false; isExecutable = true; buildDepends = [ - binary cairo deepseq filepath ghcEvents glib gtk mtl pango time + binary cairo deepseq filepath ghcEvents glib gtk mtl pango text + time ]; configureFlags = "--ghc-options=-rtsopts"; meta = { @@ -19,7 +20,5 @@ cabal.mkDerivation (self: { description = "A graphical tool for profiling parallel Haskell programs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - broken = true; }; }) diff --git a/pkgs/development/tools/haskell/timeplot/default.nix b/pkgs/development/tools/haskell/timeplot/default.nix index a07383778ed1..bcc7b7c35d69 100644 --- a/pkgs/development/tools/haskell/timeplot/default.nix +++ b/pkgs/development/tools/haskell/timeplot/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "timeplot"; - version = "1.0.25"; - sha256 = "14zyzr53gpp0i7wx49zzdrndqdhsw3q4z3w5hdl8c4m541pr25fw"; + version = "1.0.27"; + sha256 = "072bxa0pfxyia4xvj0w0h8v3yfk05bbq5j905sj6jf9apjr9h558"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -20,7 +20,5 @@ cabal.mkDerivation (self: { description = "A tool for visualizing time series from log files"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - broken = true; }; }) diff --git a/pkgs/development/tools/java/fastjar/default.nix b/pkgs/development/tools/java/fastjar/default.nix index e5a9ca50ce92..f9e1d9a08424 100644 --- a/pkgs/development/tools/java/fastjar/default.nix +++ b/pkgs/development/tools/java/fastjar/default.nix @@ -1,12 +1,12 @@ { fetchurl, stdenv, zlib }: -let version = "0.94"; in - stdenv.mkDerivation rec { +let version = "0.98"; in + stdenv.mkDerivation { name = "fastjar-${version}"; src = fetchurl { - url = "mirror://sourceforge/fastjar/${version}/${name}.tar.gz"; - sha256 = "15bvhvn2fzpziynk4myg1wl70wxa5a6v65hkzlcgnzh1wg1py8as"; + url = "http://download.savannah.gnu.org/releases/fastjar/fastjar-${version}.tar.gz"; + sha256 = "0iginbz2m15hcsa3x4y7v3mhk54gr1r7m3ghx0pg4n46vv2snmpi"; }; buildInputs = [ zlib ]; @@ -22,10 +22,10 @@ let version = "0.94"; in the stock `jar' program running without a JIT. ''; - homepage = http://fastjar.sourceforge.net/; + homepage = http://savannah.nongnu.org/projects/fastjar/; license = stdenv.lib.licenses.gpl2Plus; - + platforms = stdenv.lib.platforms.linux; maintainers = [ ]; }; } diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix index 8194ffc22a81..76e74d7623e9 100644 --- a/pkgs/development/tools/jq/default.nix +++ b/pkgs/development/tools/jq/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation { description = ''A lightweight and flexible command-line JSON processor''; license = stdenv.lib.licenses.mit ; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/development/tools/misc/ShellCheck/default.nix b/pkgs/development/tools/misc/ShellCheck/default.nix index d93383171dd6..519ca892f3c1 100644 --- a/pkgs/development/tools/misc/ShellCheck/default.nix +++ b/pkgs/development/tools/misc/ShellCheck/default.nix @@ -1,19 +1,24 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, json, mtl, parsec, QuickCheck, regexCompat }: +{ cabal, json, mtl, parsec, QuickCheck, regexCompat, transformers +}: cabal.mkDerivation (self: { pname = "ShellCheck"; - version = "0.3.4"; - sha256 = "07fw8c33p7h1kvg899dwnvqpxpywcidhbw9jhjd8xsma7kz471iw"; + version = "0.3.5"; + sha256 = "0x4rvhpzrjkn9a9fsmp9iwv9g21hkrd8fgq05iy4wgv8nfhgv2cj"; isLibrary = true; isExecutable = true; - buildDepends = [ json mtl parsec QuickCheck regexCompat ]; - testDepends = [ json mtl parsec QuickCheck regexCompat ]; + buildDepends = [ + json mtl parsec QuickCheck regexCompat transformers + ]; + testDepends = [ + json mtl parsec QuickCheck regexCompat transformers + ]; meta = { homepage = "http://www.shellcheck.net/"; description = "Shell script analysis tool"; - license = "unknown"; + license = self.stdenv.lib.licenses.agpl3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ aycanirican ]; }; diff --git a/pkgs/development/tools/misc/autoconf/2.13.nix b/pkgs/development/tools/misc/autoconf/2.13.nix index c3b44ca56863..29939a423af5 100644 --- a/pkgs/development/tools/misc/autoconf/2.13.nix +++ b/pkgs/development/tools/misc/autoconf/2.13.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "autoconf-2.13"; - + src = fetchurl { url = "mirror://gnu/autoconf/${name}.tar.gz"; sha256 = "07krzl4czczdsgzrrw9fiqx35xcf32naf751khg821g5pqv12qgh"; @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { # "fixed" path in generated files! dontPatchShebangs = true; + postInstall = ''ln -s autoconf "$out"/bin/autoconf-2.13''; + meta = { homepage = http://www.gnu.org/software/autoconf/; description = "Part of the GNU Build System"; diff --git a/pkgs/development/tools/misc/automake/automake-1.11.x.nix b/pkgs/development/tools/misc/automake/automake-1.11.x.nix index 2cd80eb4bac5..879c7e0e8709 100644 --- a/pkgs/development/tools/misc/automake/automake-1.11.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.11.x.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { + branch = "1.11"; homepage = http://www.gnu.org/software/automake/; description = "GNU standard-compliant makefile generator"; diff --git a/pkgs/development/tools/misc/automake/automake-1.12.x.nix b/pkgs/development/tools/misc/automake/automake-1.12.x.nix index 6a93cdc78fdc..a875298486ff 100644 --- a/pkgs/development/tools/misc/automake/automake-1.12.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.12.x.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { dontPatchShebangs = true; meta = { + branch = "1.12"; homepage = http://www.gnu.org/software/automake/; description = "GNU standard-compliant makefile generator"; diff --git a/pkgs/development/tools/misc/automake/automake-1.13.x.nix b/pkgs/development/tools/misc/automake/automake-1.13.x.nix index d4369787f1b6..a512cffa0075 100644 --- a/pkgs/development/tools/misc/automake/automake-1.13.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.13.x.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { dontPatchShebangs = true; meta = { + branch = "1.13"; homepage = "http://www.gnu.org/software/automake/"; description = "GNU standard-compliant makefile generator"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/development/tools/misc/automake/automake-1.14.x.nix b/pkgs/development/tools/misc/automake/automake-1.14.x.nix index 0c6ed42825a9..f95b7de2e17a 100644 --- a/pkgs/development/tools/misc/automake/automake-1.14.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.14.x.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { dontPatchShebangs = true; meta = { + branch = "1.14"; homepage = "http://www.gnu.org/software/automake/"; description = "GNU standard-compliant makefile generator"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/development/tools/misc/automake/setup-hook.sh b/pkgs/development/tools/misc/automake/setup-hook.sh index 6f34f0d0ae17..5cd8c6229f68 100644 --- a/pkgs/development/tools/misc/automake/setup-hook.sh +++ b/pkgs/development/tools/misc/automake/setup-hook.sh @@ -2,4 +2,4 @@ addAclocals () { addToSearchPathWithCustomDelimiter : ACLOCAL_PATH $1/share/aclocal } -envHooks=(${envHooks[@]} addAclocals) +envHooks+=(addAclocals) diff --git a/pkgs/development/tools/misc/babeltrace/default.nix b/pkgs/development/tools/misc/babeltrace/default.nix index 3c8c2fbec615..282ab740b494 100644 --- a/pkgs/development/tools/misc/babeltrace/default.nix +++ b/pkgs/development/tools/misc/babeltrace/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, libuuid, popt }: stdenv.mkDerivation rec { - name = "babeltrace-1.2.3"; + name = "babeltrace-1.2.4"; src = fetchurl { url = "http://www.efficios.com/files/babeltrace/${name}.tar.bz2"; - sha256 = "1b47d4i4f3gjb37m62k6hq0jlag4qkmblx6lcjf4s902h6bscvvr"; + sha256 = "1ccy432srwz4xzi6pswfkjsymw00g1p0aqwr0l1mfzfws8d3lvk6"; }; buildInputs = [ pkgconfig glib libuuid popt ]; diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 3dd634274f3e..cb3c78c28b49 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -1,12 +1,14 @@ {stdenv, fetchurl, runCommand, gcc, zlib}: +assert stdenv.isLinux; + let ccache = stdenv.mkDerivation { - name = "ccache-3.1.9"; + name = "ccache-3.1.10"; src = fetchurl { - url = http://samba.org/ftp/ccache/ccache-3.1.9.tar.gz; - sha256 = "0ixlxqv1xyacwgg0k9b4a6by07c7k75y0xbr8dp76jvyada0c9x2"; + url = http://samba.org/ftp/ccache/ccache-3.1.10.tar.gz; + sha256 = "0fzxa45q7wfm63zrak65wh31w7pnsp0k65fxv00cgmf454as4dza"; }; buildInputs = [ zlib ]; @@ -14,11 +16,10 @@ stdenv.mkDerivation { passthru = { # A derivation that provides gcc and g++ commands, but that # will end up calling ccache for the given cacheDir - links = extraConfig : (runCommand "ccache-links" - { inherit (gcc) langC langCC; } + links = extraConfig : (runCommand "ccache-links" { } '' mkdir -p $out/bin - if [ $langC -eq 1 ]; then + if [ -x "${gcc.gcc}/bin/gcc" ]; then cat > $out/bin/gcc << EOF #!/bin/sh ${extraConfig} @@ -26,7 +27,7 @@ stdenv.mkDerivation { EOF chmod +x $out/bin/gcc fi - if [ $langCC -eq 1 ]; then + if [ -x "${gcc.gcc}/bin/g++" ]; then cat > $out/bin/g++ << EOF #!/bin/sh ${extraConfig} @@ -40,7 +41,7 @@ stdenv.mkDerivation { meta = { description = "Compiler cache for fast recompilation of C/C++ code"; homepage = http://ccache.samba.org/; - license = "GPL"; + license = stdenv.lib.licenses.gpl3Plus; }; }; in diff --git a/pkgs/development/tools/misc/cgdb/default.nix b/pkgs/development/tools/misc/cgdb/default.nix index 09c9325d4ff2..fa13b4d6ebb4 100644 --- a/pkgs/development/tools/misc/cgdb/default.nix +++ b/pkgs/development/tools/misc/cgdb/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, ncurses, readline }: stdenv.mkDerivation rec { - name = "cgdb-0.6.6"; + name = "cgdb-${version}"; + version = "0.6.7"; src = fetchurl { - url = "mirror://sourceforge/cgdb/${name}.tar.gz"; - sha256 = "0iap84ikpk1h58wy14zzi1kwszv1hsnvpvnz14swkz54yrh9z7ng"; + url = "http://cgdb.me/files/${name}.tar.gz"; + sha256 = "1agxk6a97v6q0n097zw57qqpaza4j79jg36x99bh8yl23qfx6kh7"; }; buildInputs = [ ncurses readline ]; @@ -13,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "A curses interface to gdb"; - homepage = http://cgdb.sourceforge.net/; + homepage = https://cgdb.github.io/; repositories.git = git://github.com/cgdb/cgdb.git; diff --git a/pkgs/development/tools/misc/chruby/default.nix b/pkgs/development/tools/misc/chruby/default.nix new file mode 100644 index 000000000000..0569dc2abdf3 --- /dev/null +++ b/pkgs/development/tools/misc/chruby/default.nix @@ -0,0 +1,43 @@ +{ stdenv, lib, fetchFromGitHub, runCommand, rubies ? null }: + +let + rubiesEnv = runCommand "chruby-env" { preferLocalBuild = true; } '' + mkdir $out + ${lib.concatStrings + (lib.mapAttrsToList (name: path: "ln -s ${path} $out/${name}\n") rubies)} + ''; + +in stdenv.mkDerivation rec { + name = "chruby"; + + src = fetchFromGitHub { + owner = "postmodern"; + repo = "chruby"; + rev = "d5ae98410311aec1358d4cfcc1e3ec02de593c3b"; + sha256 = "1iq9milnnj3189yw02hkly2pnnh4g0vn2fxq6dfx90kldjwpwxq5"; + }; + + phases = [ "unpackPhase" "patchPhase" "installPhase" "fixupPhase" ]; + + patches = lib.optionalString (rubies != null) [ + ./env.patch + ]; + + postPatch = lib.optionalString (rubies != null) '' + substituteInPlace share/chruby/chruby.sh --replace "@rubiesEnv@" ${rubiesEnv} + ''; + + installPhase = '' + mkdir $out + cp -r bin $out + cp -r share $out + ''; + + meta = with lib; { + description = "Changes the current Ruby"; + homepage = https://github.com/postmodern/chruby; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ cstrahan ]; + }; +} diff --git a/pkgs/development/tools/misc/chruby/env.patch b/pkgs/development/tools/misc/chruby/env.patch new file mode 100644 index 000000000000..6a4ef8b73497 --- /dev/null +++ b/pkgs/development/tools/misc/chruby/env.patch @@ -0,0 +1,12 @@ +diff --git a/share/chruby/chruby.sh b/share/chruby/chruby.sh +--- a/share/chruby/chruby.sh ++++ b/share/chruby/chruby.sh +@@ -1,7 +1,7 @@ + CHRUBY_VERSION="0.3.8" + RUBIES=() + +-for dir in "$PREFIX/opt/rubies" "$HOME/.rubies"; do ++for dir in @rubiesEnv@; do + [[ -d "$dir" && -n "$(ls -A "$dir")" ]] && RUBIES+=("$dir"/*) + done + unset dir diff --git a/pkgs/development/tools/misc/cpphs/default.nix b/pkgs/development/tools/misc/cpphs/default.nix index 4a732983af02..4e996c3288fa 100644 --- a/pkgs/development/tools/misc/cpphs/default.nix +++ b/pkgs/development/tools/misc/cpphs/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cpphs"; - version = "1.18.5"; - sha256 = "0bqfz0wkfnxvv711fgmhmh6rbwffgna1pfqbj7whb6crqji9w7g7"; + version = "1.18.6"; + sha256 = "0ds712zabigswf3cljzh7f2ys4rl1fj2cf76lbw856adm8514gxc"; isLibrary = true; isExecutable = true; buildDepends = [ oldTime polyparse ]; diff --git a/pkgs/development/tools/misc/cproto/default.nix b/pkgs/development/tools/misc/cproto/default.nix index c91d826e3b37..a72982149265 100644 --- a/pkgs/development/tools/misc/cproto/default.nix +++ b/pkgs/development/tools/misc/cproto/default.nix @@ -13,9 +13,9 @@ stdenv.mkDerivation { # patch made by Joe Khoobyar copied from gentoo bugs patches = ./cproto_patch; - meta = { + meta = { description = "Tool to generate C function prototypes from C source code"; homepage = http://cproto.sourceforge.net/; - license = "public domain"; + license = stdenv.lib.licenses.publicDomain; }; } diff --git a/pkgs/development/tools/misc/ddd/default.nix b/pkgs/development/tools/misc/ddd/default.nix index 91150255bdaa..a57840827c1f 100644 --- a/pkgs/development/tools/misc/ddd/default.nix +++ b/pkgs/development/tools/misc/ddd/default.nix @@ -7,12 +7,14 @@ stdenv.mkDerivation rec { sha256 = "0p5nx387857w3v2jbgvps2p6mlm0chajcdw5sfrddcglsxkwvmis"; }; buildInputs = [lesstif ncurses libX11 libXt]; - configureFlags = "--with-x"; + configureFlags = "--with-x"; patches = [ ./gcc44.patch ]; - meta = { - homepage = http://www.gnu.org/software/ddd; - description = "Graphical front-end for command-line debuggers"; - license = stdenv.lib.licenses.gpl2; - }; + + meta = { + homepage = http://www.gnu.org/software/ddd; + description = "Graphical front-end for command-line debuggers"; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/development/tools/misc/dfu-programmer/default.nix b/pkgs/development/tools/misc/dfu-programmer/default.nix index 2df687b8bc6b..577bd6f01f56 100644 --- a/pkgs/development/tools/misc/dfu-programmer/default.nix +++ b/pkgs/development/tools/misc/dfu-programmer/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { license = licenses.gpl2; - description = "A Device Firmware Update based USB programmer for Atmel chips with a USB bootloader."; + description = "A Device Firmware Update based USB programmer for Atmel chips with a USB bootloader"; homepage = http://dfu-programmer.sourceforge.net/; maintainers = [ maintainers.the-kenny ]; }; diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix index 565d7835f05d..300e15f1317b 100644 --- a/pkgs/development/tools/misc/distcc/default.nix +++ b/pkgs/development/tools/misc/distcc/default.nix @@ -41,11 +41,10 @@ let # # extraConfig is meant to be sh lines exporting environment # variables like DISTCC_HOSTS, DISTCC_DIR, ... - links = extraConfig : (runCommand "distcc-links" - { inherit (gcc) langC langCC; } + links = extraConfig : (runCommand "distcc-links" { } '' mkdir -p $out/bin - if [ $langC -eq 1 ]; then + if [ -x "${gcc.gcc}/bin/gcc" ]; then cat > $out/bin/gcc << EOF #!/bin/sh ${extraConfig} @@ -53,7 +52,7 @@ let EOF chmod +x $out/bin/gcc fi - if [ $langCC -eq 1 ]; then + if [ -x "${gcc.gcc}/bin/g++" ]; then cat > $out/bin/g++ << EOF #!/bin/sh ${extraConfig} diff --git a/pkgs/development/tools/misc/distcc/masq.nix b/pkgs/development/tools/misc/distcc/masq.nix index 753c35b5d3a2..28b31cbb48d5 100644 --- a/pkgs/development/tools/misc/distcc/masq.nix +++ b/pkgs/development/tools/misc/distcc/masq.nix @@ -3,6 +3,10 @@ stdenv.mkDerivation { name = "distcc-masq-${gccRaw.name}"; + meta = { + platforms = stdenv.lib.platforms.linux; + }; + phases = [ "installPhase" ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/development/tools/misc/epm/default.nix b/pkgs/development/tools/misc/epm/default.nix index 23b781902e7b..9d84011e3657 100644 --- a/pkgs/development/tools/misc/epm/default.nix +++ b/pkgs/development/tools/misc/epm/default.nix @@ -1,17 +1,21 @@ {stdenv, fetchurl, rpm}: -stdenv.mkDerivation { - name = "epm-4.1"; +stdenv.mkDerivation rec { + name = "epm-${version}"; + version = "4.2"; src = fetchurl { - url = http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/epm/4.1/epm-4.1-source.tar.bz2; - sha256 = "18xq1h9hx410x28bfccabydrqb1c0dqnq62qa17wc3846rwf234n"; + url = "http://www.msweet.org/files/project2/epm-4.2-source.tar.bz2"; + sha256 = "13imglm1fgd7p5y9lc0xsl6x4cdjsk5lnan5sn8f7m4jwbx8kik6"; }; - buildInputs = [rpm]; + buildInputs = [ rpm ]; - meta = { + meta = with stdenv.lib; { description = "The ESP Package Manager generates distribution archives for a variety of platforms"; - homepage = http://www.easysw.com/epm/index.php; + homepage = http://www.msweet.org/projects.php?Z2; + license = licenses.gpl2; + maintainers = with maintainers; [ pSub ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index caf9dc489b5b..e93d844db23c 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, gettext, LocaleGettext, makeWrapper }: stdenv.mkDerivation rec { - name = "help2man-1.46.3"; + name = "help2man-1.46.4"; src = fetchurl { url = "mirror://gnu/help2man/${name}.tar.xz"; - sha256 = "0hi94a6ai96yw0v8xgjzpp5c6jr33ifmbn2mkp7wz7rgmwxxqsd6"; + sha256 = "0csn7jx7nhlrflalw1992p3l5afawlpdyjdff2q5bk5hadgz3rqs"; }; buildInputs = [ makeWrapper perl gettext LocaleGettext ]; diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix deleted file mode 100644 index 0940bcca191a..000000000000 --- a/pkgs/development/tools/misc/hydra/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ stdenv, fetchurl, nix, perlPackages, perl, makeWrapper, libtool -, unzip, nukeReferences, pkgconfig, boehmgc, libxslt, sqlite -, subversion, openssh, coreutils, findutils, gzip, bzip2, lzma -, gnutar, git, mercurial, gnused, graphviz, rpm, dpkg, cdrkit -}: - -let - - perldeps = with perlPackages; - [ CatalystDevel - CatalystPluginSessionStoreFastMmap - CatalystPluginStackTrace - CatalystPluginAuthorizationRoles - CatalystAuthenticationStoreDBIxClass - CatalystViewTT - CatalystEngineHTTPPrefork - CatalystViewDownload - XMLSimple - IPCRun - IOCompress - Readonly - DBDPg - EmailSender - TextTable - NetTwitterLite - PadWalker - DataDump - JSONXS - DateTime - DigestSHA1 - CryptRandPasswd - nixPerl - ]; - - version = "0.1pre27592"; - -in - -stdenv.mkDerivation { - name = "hydra-${version}"; - - src = fetchurl { - url = http://hydra.nixos.org/build/1142240/download/2/hydra-0.1pre27592.tar.gz; - sha256 = "0197bcfkabqqv7611fh9kjabfm0nfci8kanfaa59hqwf3h6fmpwz"; - }; - - configureFlags = "--with-nix=${nix}"; - - buildInputs = [ perl makeWrapper libtool nix unzip nukeReferences pkgconfig boehmgc ] ++ perldeps ; - - hydraPath = stdenv.lib.concatStringsSep ":" (map (p: "${p}/bin") ( [ - libxslt sqlite subversion openssh nix coreutils findutils - gzip bzip2 lzma gnutar unzip git mercurial gnused graphviz - rpm dpkg cdrkit])); - - postInstall = '' - for i in "$out/bin/"*; do - wrapProgram $i \ - --prefix PERL5LIB ':' $out/libexec/hydra/lib:$PERL5LIB \ - --prefix PATH ':' $out/bin:$hydraPath \ - --set HYDRA_RELEASE ${version} \ - --set HYDRA_HOME $out/libexec/hydra \ - --set NIX_RELEASE ${nix.name} - done - ''; - - meta = { - description = "Hydra, the Nix-based continuous integration system"; - homepage = http://nixos.org/hydra/; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix index 14bfe74821de..a27b2318b95f 100644 --- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, dri2proto, udev, libX11, libXext, libXv, libXrandr, glib, bison }: stdenv.mkDerivation rec { - name = "intel-gpu-tools-1.7"; + name = "intel-gpu-tools-1.8"; src = fetchurl { url = "http://xorg.freedesktop.org/archive/individual/app/${name}.tar.bz2"; - sha256 = "0yi0024kr1xzglkkhyjpxr081bmwvdakb61az6wiidfrpd1j6q92"; + sha256 = "0n9pzwjzx4xiffcy3nkc7q7689sid2ry8m9xx4vgxxspr8ds3qpz"; }; configureFlags = [ "--disable-tests" ]; diff --git a/pkgs/development/tools/misc/kibana/default.nix b/pkgs/development/tools/misc/kibana/default.nix index 42e5c2209f1c..dab04861d9fa 100644 --- a/pkgs/development/tools/misc/kibana/default.nix +++ b/pkgs/development/tools/misc/kibana/default.nix @@ -1,29 +1,28 @@ -{ stdenv, fetchurl, unzip, conf ? null }: +{ stdenv, fetchurl, conf ? null }: with stdenv.lib; stdenv.mkDerivation rec { name = "kibana-${version}"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://download.elasticsearch.org/kibana/kibana/${name}.zip"; - sha256 = "05i97zi08rxwx951hgs92fbhk6cchpvdlikrfz07v1dpn787xz8j"; + url = "https://download.elasticsearch.org/kibana/kibana/${name}.tar.gz"; + sha256 = "195x6zq9x16nlh2akvn6z0kp8qnba4vq90yrysiafgv8dmw34p5b"; }; - buildInputs = [ unzip ]; - phases = ["unpackPhase" "installPhase"]; + installPhase = '' - mkdir -p $out && cp -R * $out - ${optionalString (conf!=null) ''cp ${conf} $out/config.js''} + mkdir -p $out + mv * $out/ + ${optionalString (conf != null) "cp ${conf} $out/config.js"} ''; meta = { description = "Visualize logs and time-stamped data"; homepage = http://www.elasticsearch.org/overview/kibana; license = licenses.asl20; - - maintainers = [ maintainers.offline ]; + maintainers = with maintainers; [ offline rickynils ]; }; } diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix index 5758500d86f9..800947e788ab 100644 --- a/pkgs/development/tools/misc/lttng-tools/default.nix +++ b/pkgs/development/tools/misc/lttng-tools/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, popt, libuuid, liburcu, lttng-ust, kmod }: +{ stdenv, fetchurl, popt, libuuid, liburcu, lttng-ust, kmod, libxml2 }: stdenv.mkDerivation rec { - name = "lttng-tools-2.4.1"; + name = "lttng-tools-2.5.0"; src = fetchurl { url = "https://lttng.org/files/lttng-tools/${name}.tar.bz2"; - sha256 = "1v9f7a3c2shwgn4g759bblgr27h9ql9sfq71r1mbkf8rd235g2jr"; + sha256 = "19qw3v8z5kz9ls988sc1d8yczl9i1d5c6vmzna8wz790szwvin6s"; }; - buildInputs = [ popt libuuid liburcu lttng-ust ]; + buildInputs = [ popt libuuid liburcu lttng-ust libxml2 ]; prePatch = '' sed -e "s|/sbin/modprobe|${kmod}/sbin/modprobe|g" \ diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix index 0cba211f28b9..3c47966ac5ca 100644 --- a/pkgs/development/tools/misc/lttng-ust/default.nix +++ b/pkgs/development/tools/misc/lttng-ust/default.nix @@ -12,11 +12,11 @@ # Debian builds with std.h (systemtap). stdenv.mkDerivation rec { - name = "lttng-ust-2.4.1"; + name = "lttng-ust-2.5.0"; src = fetchurl { url = "https://lttng.org/files/lttng-ust/${name}.tar.bz2"; - sha256 = "1nx9b1haiylajzjy03wgfcy85nwg578c6gy8ip55y8cabjrw0hp1"; + sha256 = "1an3ymk6hy86gp4z4py93mdyb9q8f74hq2hixbnyccr8l60vpl6w"; }; buildInputs = [ liburcu ]; diff --git a/pkgs/development/tools/misc/lttv/default.nix b/pkgs/development/tools/misc/lttv/default.nix index 0096cbdbabf5..5cf8b6649418 100644 --- a/pkgs/development/tools/misc/lttv/default.nix +++ b/pkgs/development/tools/misc/lttv/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { homepage = http://lttng.org/; # liblttvtraceread (ltt/ directory) is distributed under the GNU LGPL v2.1. # The rest of the LTTV package is distributed under the GNU GPL v2. - # TODO license = with licenses; [ gpl2 lgpl21 ]; + license = with licenses; [ gpl2 lgpl21 ]; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/development/tools/misc/patchelf/default.nix b/pkgs/development/tools/misc/patchelf/default.nix index 06b5c2ef516d..5aa81e46bed1 100644 --- a/pkgs/development/tools/misc/patchelf/default.nix +++ b/pkgs/development/tools/misc/patchelf/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "c99f84d124347340c36707089ec8f70530abd56e7827c54d506eb4cc097a17e7"; }; + setupHook = [ ./setup-hook.sh ]; + meta = { homepage = http://nixos.org/patchelf.html; license = "GPL"; diff --git a/pkgs/development/tools/misc/patchelf/setup-hook.sh b/pkgs/development/tools/misc/patchelf/setup-hook.sh new file mode 100644 index 000000000000..b0d37b73e2b6 --- /dev/null +++ b/pkgs/development/tools/misc/patchelf/setup-hook.sh @@ -0,0 +1,16 @@ +# This setup hook calls patchelf to automatically remove unneeded +# directories from the RPATH of every library or executable in every +# output. + +fixupOutputHooks+=('if [ -z "$dontPatchELF" ]; then patchELF "$prefix"; fi') + +patchELF() { + header "patching ELF executables and libraries in $prefix" + if [ -e "$prefix" ]; then + find "$prefix" \( \ + \( -type f -a -name "*.so*" \) -o \ + \( -type f -a -perm +0100 \) \ + \) -print -exec patchelf --shrink-rpath '{}' \; + fi + stopNest +} diff --git a/pkgs/development/tools/misc/pkgconfig/setup-hook.sh b/pkgs/development/tools/misc/pkgconfig/setup-hook.sh index 77a69fb18781..1c153976a343 100644 --- a/pkgs/development/tools/misc/pkgconfig/setup-hook.sh +++ b/pkgs/development/tools/misc/pkgconfig/setup-hook.sh @@ -4,7 +4,7 @@ addPkgConfigPath () { } if test -n "$crossConfig"; then - crossEnvHooks=(${crossEnvHooks[@]} addPkgConfigPath) + crossEnvHooks+=(addPkgConfigPath) else - envHooks=(${envHooks[@]} addPkgConfigPath) + envHooks+=(addPkgConfigPath) fi diff --git a/pkgs/development/tools/misc/sloccount/default.nix b/pkgs/development/tools/misc/sloccount/default.nix index 1aa9a2c058d6..cf143f7d9e9d 100644 --- a/pkgs/development/tools/misc/sloccount/default.nix +++ b/pkgs/development/tools/misc/sloccount/default.nix @@ -29,9 +29,7 @@ stdenv.mkDerivation rec { done ''; - configurePhase = '' - sed -i "makefile" -"es|PREFIX[[:blank:]]*=.*$|PREFIX = $out|g" - ''; + makeFlags = "PREFIX=$(out) CC=cc"; doCheck = true; checkPhase = ''HOME="$TMPDIR" PATH="$PWD:$PATH" make test''; diff --git a/pkgs/development/tools/misc/srecord/default.nix b/pkgs/development/tools/misc/srecord/default.nix index e316b4a628e5..9d0e2d7430e8 100644 --- a/pkgs/development/tools/misc/srecord/default.nix +++ b/pkgs/development/tools/misc/srecord/default.nix @@ -1,14 +1,17 @@ -{ stdenv, fetchurl, boost, libtool, groff, ghostscript }: +{ stdenv, fetchurl, boost, libtool, groff, ghostscript, libgcrypt ? null }: stdenv.mkDerivation rec { - name = "srecord-1.63"; + name = "srecord-1.64"; src = fetchurl { url = "mirror://sourceforge/srecord/${name}.tar.gz"; - sha256 = "06mzj9lrk8lzfzhnfyh8xm4p92j242jik6zm37ihcia20inwgzkq"; + sha256 = "1qk75q0k5vzmm3932q9hqz2gp8n9rrdfjacsswxc02656f3l3929"; }; - buildInputs = [ boost libtool groff ghostscript ]; + buildInputs = [ boost libtool groff ghostscript libgcrypt ]; + + configureFlags = stdenv.lib.optionalString + (libgcrypt == null) "--without-gcrypt"; meta = with stdenv.lib; { description = "Collection of powerful tools for manipulating EPROM load files"; diff --git a/pkgs/development/tools/misc/swig/3.x.nix b/pkgs/development/tools/misc/swig/3.x.nix index 653fb0616034..1a02c88bb71e 100644 --- a/pkgs/development/tools/misc/swig/3.x.nix +++ b/pkgs/development/tools/misc/swig/3.x.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pcre }: stdenv.mkDerivation rec { - name = "swig-3.0.0"; + name = "swig-3.0.2"; src = fetchurl { url = "mirror://sourceforge/swig/${name}.tar.gz"; - sha256 = "99cab1055877d00280509f0e04c1fe76643ec3792e9b8e7efcc9aa6e247229df"; + sha256 = "04vqrij3k6pcq41y7rzl5rmhnghqg905f11wyrqw7vdwr9brcrm2"; }; buildInputs = [ pcre ]; diff --git a/pkgs/development/tools/misc/texinfo/4.13a.nix b/pkgs/development/tools/misc/texinfo/4.13a.nix index a31552305147..6eb384f51e31 100644 --- a/pkgs/development/tools/misc/texinfo/4.13a.nix +++ b/pkgs/development/tools/misc/texinfo/4.13a.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/texinfo/; + branch = "4.13"; }; } diff --git a/pkgs/development/tools/misc/texinfo/5.2.nix b/pkgs/development/tools/misc/texinfo/5.2.nix index 62e1ff62d1e3..c43ebcd2de28 100644 --- a/pkgs/development/tools/misc/texinfo/5.2.nix +++ b/pkgs/development/tools/misc/texinfo/5.2.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation rec { need revise only that one document. The Texinfo system is well-integrated with GNU Emacs. ''; + branch = "5.2"; }; } diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/development/tools/misc/yodl/default.nix index 4c92946008ec..691974353e10 100644 --- a/pkgs/development/tools/misc/yodl/default.nix +++ b/pkgs/development/tools/misc/yodl/default.nix @@ -1,31 +1,40 @@ -# This package is only used to create the documentation of zsh-cvs -# eg have a look at http://www.zsh.org/mla/users/2008/msg00715.html -# latest release is newer though +{ stdenv, fetchurl, perl, icmake }: -{ stdenv, fetchurl, perl }: +stdenv.mkDerivation rec { + name = "yodl-${version}"; + version = "3.04.00"; -stdenv.mkDerivation { - name = "yodl-2.14.3"; - - buildInputs = [ perl ]; + buildInputs = [ perl icmake ]; src = fetchurl { - url = "mirror://sourceforge/yodl/yodl_2.14.3.orig.tar.gz"; - sha256 = "0paypm76p34hap3d18vvks5rrilchcw6q56rvq6pjf9raqw8ynd4"; + url = "mirror://sourceforge/yodl/yodl_${version}.orig.tar.gz"; + sha256 = "14sqd03j3w9g5l5rkdnqyxv174yz38m39ycncx86bq86g63igcv6"; }; - - patches = - [ (fetchurl { - url = "mirror://sourceforge/yodl/yodl_2.14.3-1.diff.gz"; - sha256 = "176hlbiidv7p9051f04anzj4sr9dwlp9439f9mjvvgks47ac0qx4"; - }) - ]; - # This doesn't isntall docs yet, do you need them? + preConfigure = '' + patchShebangs scripts/. + sed -i 's;/usr;;g' INSTALL.im + substituteInPlace build --replace /usr/bin/icmake ${icmake}/bin/icmake + substituteInPlace macros/rawmacros/startdoc.pl --replace /usr/bin/perl ${perl}/bin/perl + ''; + + buildPhase = '' + ./build programs + ./build man + ./build macros + ''; + installPhase = '' - # -> $out - sed -i "s@'/usr/@'$out/@" contrib/build.pl - perl contrib/build.pl make-software - perl contrib/build.pl install-software + ./build install programs $out + ./build install man $out + ./build install macros $out ''; + + meta = with stdenv.lib; { + description = "A package that implements a pre-document language and tools to process it"; + homepage = http://yodl.sourceforge.net/; + license = licenses.gpl3; + maintainers = with maintainers; [ pSub ]; + platforms = platforms.linux; + }; } diff --git a/pkgs/development/tools/ocaml/camlp4/default.nix b/pkgs/development/tools/ocaml/camlp4/default.nix index bd2466c8854a..a8043a9fc5ee 100644 --- a/pkgs/development/tools/ocaml/camlp4/default.nix +++ b/pkgs/development/tools/ocaml/camlp4/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { ''; - makePhase = "make all"; + makeFlags = "all"; installTargets = "install install-META"; diff --git a/pkgs/development/tools/ocaml/camlp5/5.15.nix b/pkgs/development/tools/ocaml/camlp5/5.15.nix index 97099d1b4920..adfdb4bd204c 100644 --- a/pkgs/development/tools/ocaml/camlp5/5.15.nix +++ b/pkgs/development/tools/ocaml/camlp5/5.15.nix @@ -37,7 +37,8 @@ stdenv.mkDerivation { It also provides parsing and printing tools. ''; homepage = "${webpage}"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; + branch = "5"; platforms = ocaml.meta.platforms; maintainers = [ stdenv.lib.maintainers.z77z diff --git a/pkgs/development/tools/ocaml/cppo/default.nix b/pkgs/development/tools/ocaml/cppo/default.nix index 49a63b616c75..461fda45d4c1 100644 --- a/pkgs/development/tools/ocaml/cppo/default.nix +++ b/pkgs/development/tools/ocaml/cppo/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, ocaml, findlib}: let pname = "cppo"; - version = "0.9.4"; + version = "1.1.2"; webpage = "http://mjambon.com/${pname}.html"; in assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://mjambon.com/releases/${pname}/${name}.tar.gz"; - sha256 = "1m7cbja7cf74l45plqnmjrjjz55v8x65rvx0ikk9mg1ak8lcmvxa"; + sha256 = "1pfzch4ys5gjac2lrkqq0gzmm5plkq2jl17b2m3n06kmwashqplp"; }; buildInputs = [ ocaml findlib ]; diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 4c0176de7e88..a9673be26ee3 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -5,11 +5,11 @@ let in stdenv.mkDerivation { - name = "ocaml-findlib-1.4.1"; + name = "ocaml-findlib-1.5.3"; src = fetchurl { - url = http://download.camlcity.org/download/findlib-1.4.1.tar.gz; - sha256 = "0cdbr716r5686zvf86b9zm5ikdz0dw727m67b1f4rjjisp5v2zyf"; + url = http://download.camlcity.org/download/findlib-1.5.3.tar.gz; + sha256 = "1kw2siv4pc8q060m9xpgxvjs07ic1kiphyxmkwcz6nyb91p8286r"; }; buildInputs = [m4 ncurses ocaml]; @@ -42,8 +42,8 @@ stdenv.mkDerivation { mkdir -p $OCAMLFIND_DESTDIR fi } - - envHooks=(''${envHooks[@]} addOCamlPath) + + envHooks+=(addOCamlPath) ''; meta = { diff --git a/pkgs/development/tools/ocaml/findlib/install_topfind.patch b/pkgs/development/tools/ocaml/findlib/install_topfind.patch index 4729885bcefe..f152feaaecfb 100644 --- a/pkgs/development/tools/ocaml/findlib/install_topfind.patch +++ b/pkgs/development/tools/ocaml/findlib/install_topfind.patch @@ -1,12 +1,11 @@ ---- findlib-1.3.3/src/findlib/Makefile -+++ findlib-1.3.3/src/findlib/Makefile -@@ -82,7 +82,7 @@ clean: +--- findlib-1.5.3/src/findlib/Makefile 2014-09-16 13:21:46.000000000 +0200 ++++ findlib-1.5.3/src/findlib/Makefile.new 2014-10-01 14:30:54.141082521 +0200 +@@ -89,7 +89,7 @@ install: all mkdir -p "$(prefix)$(OCAML_SITELIB)/$(NAME)" mkdir -p "$(prefix)$(OCAMLFIND_BIN)" - test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_CORE_STDLIB)" + test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_SITELIB)" - files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib.cmxa findlib.a META` && \ + files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib.cmxa findlib.a findlib.cmxs META` && \ cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)" f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \ - diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff b/pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff index ee39855fec9d..e6fc96038ff8 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff +++ b/pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff @@ -3,7 +3,7 @@ @@ -1,6 +1,6 @@ # Where binaries are installed: --BINDIR := /usr/local/bin +-BINDIR := `dirname \`which ocamlc\`` +BINDIR := $(out)/bin #### diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix index a7167d0c2262..9989afdefc4d 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix @@ -1,28 +1,28 @@ -{stdenv, fetchurl, ocaml, findlib, ocaml_lwt, menhir, ocsigen_deriving}: +{stdenv, fetchurl, ocaml, findlib, ocaml_lwt, menhir, ocsigen_deriving, camlp4, + cmdliner, tyxml, reactivedata}: stdenv.mkDerivation { - name = "js_of_ocaml"; + name = "js_of_ocaml-2.5"; src = fetchurl { - url = https://github.com/ocsigen/js_of_ocaml/archive/2.2.tar.gz; - sha256 = "1cp81gpvyxgvzxg0vzyl8aa2zvcixp6m433w8zjifrg6vb7lhp97"; + url = https://github.com/ocsigen/js_of_ocaml/archive/2.5.tar.gz; + sha256 = "1prm08nf8szmd3p13ysb0yx1cy6lr671bnwsp25iny8hfbs39sjv"; }; - buildInputs = [ocaml findlib ocaml_lwt menhir ocsigen_deriving]; + buildInputs = [ocaml findlib menhir ocsigen_deriving + cmdliner tyxml camlp4 reactivedata]; + propagatedBuildInputs = [ ocaml_lwt ]; patches = [ ./Makefile.conf.diff ]; createFindlibDestdir = true; - - meta = { + meta = with stdenv.lib; { homepage = http://ocsigen.org/js_of_ocaml/; description = "Compiler of OCaml bytecode to Javascript. It makes it possible to run Ocaml programs in a Web browser"; - license = "LGPL"; + license = licenses.lgpl2; platforms = ocaml.meta.platforms; maintainers = [ - stdenv.lib.maintainers.gal_bolle + maintainers.gal_bolle ]; }; - - } diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index 30fabf193620..b20354e76b2f 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -1,19 +1,23 @@ -{stdenv, fetchurl, ocaml, findlib, yojson, menhir}: +{stdenv, fetchurl, ocaml, findlib, yojson, menhir +, withEmacsMode ? false, emacs}: assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00"; stdenv.mkDerivation { - name = "merlin-1.7.1"; + name = "merlin-2.0"; src = fetchurl { - url = https://github.com/the-lambda-church/merlin/archive/v1.7.1.tar.gz; - sha256 = "c3b60c7b3fddaa2860e0d8ac0d4fed2ed60e319875734c7ac1a93df524c67aff"; + url = https://github.com/the-lambda-church/merlin/archive/v2.0.tar.gz; + sha256 = "1khvmncj6gfk9p5wl07gp6ii9csc5s1bcv892lkfpfbnsspis7cp"; }; - buildInputs = [ ocaml findlib yojson menhir ]; + buildInputs = [ ocaml findlib yojson menhir ] + ++ stdenv.lib.optional withEmacsMode emacs; + preConfigure = "mkdir -p $out/bin"; prefixKey = "--prefix "; + configureFlags = stdenv.lib.optional withEmacsMode "--enable-compiled-emacs-mode"; meta = with stdenv.lib; { description = "An editor-independent tool to ease the development of programs in OCaml"; diff --git a/pkgs/development/tools/ocaml/oasis/default.nix b/pkgs/development/tools/ocaml/oasis/default.nix index a5260b499c45..29507f49c186 100644 --- a/pkgs/development/tools/ocaml/oasis/default.nix +++ b/pkgs/development/tools/ocaml/oasis/default.nix @@ -1,19 +1,19 @@ -{stdenv, fetchurl, ocaml, findlib, ocaml_data_notation, ocaml_typeconv, +{stdenv, fetchurl, ocaml, findlib, ocaml_data_notation, ocaml_typeconv, camlp4, ocamlmod, ocamlify, ounit, expect}: stdenv.mkDerivation { - name = "ocaml-oasis-0.4.1"; + name = "ocaml-oasis-0.4.5"; src = fetchurl { - url = http://forge.ocamlcore.org/frs/download.php/1355/oasis-0.4.1.tar.gz; - sha256 = "1lsnw9f1jh6106kphxg40qp0sia6cbkbb9ahs5y6ifnfkmllkjhj"; + url = http://forge.ocamlcore.org/frs/download.php/1475/oasis-0.4.5.tar.gz; + sha256 = "0i1fifzig2slhb07d1djx6i690b8ys0avsx6ssnihisw841sc8v6"; }; createFindlibDestdir = true; buildInputs = [ - ocaml findlib ocaml_typeconv ocamlmod ocamlify ounit + ocaml findlib ocaml_typeconv ocamlmod ocamlify ounit camlp4 ]; propagatedBuildInputs = [ ocaml_data_notation ]; @@ -22,13 +22,13 @@ stdenv.mkDerivation { buildPhase = "ocaml setup.ml -build"; installPhase = "ocaml setup.ml -install"; - meta = { + meta = with stdenv.lib; { homepage = http://oasis.forge.ocamlcore.org/; description = "Configure, build and install system for OCaml projects"; - license = stdenv.lib.licenses.lgpl21; + license = licenses.lgpl21; platforms = ocaml.meta.platforms; - maintainers = with stdenv.lib.maintainers; [ - z77z + maintainers = with maintainers; [ + vbgl z77z ]; }; } diff --git a/pkgs/development/tools/ocaml/ocamlscript/Makefile.patch b/pkgs/development/tools/ocaml/ocamlscript/Makefile.patch new file mode 100644 index 000000000000..4fc887c070d7 --- /dev/null +++ b/pkgs/development/tools/ocaml/ocamlscript/Makefile.patch @@ -0,0 +1,70 @@ +--- a/Makefile 2012-02-04 01:24:21.000000000 +0000 ++++ b/Makefile 2014-10-29 14:42:08.690188302 +0000 +@@ -4,6 +4,8 @@ + version.ml pipeline.mli pipeline.ml common.mli common.ml \ + utils.mli utils.ml ocaml.mli ocaml.ml + ++CAMLP4 := $(shell ocamlfind query camlp4) ++ + STDBIN = $(shell dirname `which ocamlfind`) + ifndef PREFIX + PREFIX = $(shell dirname $(STDBIN)) +@@ -15,7 +17,7 @@ + endif + export BINDIR + +-PACKS = unix str ++PACKS = unix str findlib + PP = camlp4o -I . -parser pa_tryfinally.cmo -parser pa_opt.cmo + export PP + +@@ -36,11 +38,11 @@ + + common: version.ml + ocamlc -pp 'camlp4orf -loc _loc' -c \ +- -I +camlp4 pa_opt310.ml && \ ++ -I $(CAMLP4) pa_opt310.ml && \ + cp pa_opt310.cmo pa_opt.cmo && \ + cp pa_opt310.cmi pa_opt.cmi + ocamlc -pp 'camlp4orf -loc _loc' -c \ +- -I +camlp4 pa_tryfinally310.ml && \ ++ -I $(CAMLP4) pa_tryfinally310.ml && \ + cp pa_tryfinally310.cmo pa_tryfinally.cmo && \ + cp pa_tryfinally310.cmi pa_tryfinally.cmi + +--- a/main.ml 2014-11-08 09:05:12.516401313 +0000 ++++ b/main.ml 2014-11-08 09:09:59.801311230 +0000 +@@ -250,9 +250,15 @@ + Sys.getcwd ()) + | `File script_name -> "", get_dir script_name in + ++ let findlibdir = ++ Filename.( ++ concat (Findlib.package_directory "findlib") parent_dir_name ++ ) in ++ + let file, oc = Filename.open_temp_file "meta" ".ml" in + fprintf oc "\ + #%i %S;; ++#directory \"%s\";; + #use \"topfind\";; + #require \"ocamlscript\";; + Ocamlscript.Common.verbose := %s;; +@@ -261,7 +267,7 @@ + open Ocamlscript;; + open Utils;; + #%i %S;;\n" +- pos source verbose script_dir extra_args trash pos source; ++ pos source findlibdir verbose script_dir extra_args trash pos source; + + List.iter (output_line oc) lines; + +@@ -544,6 +550,7 @@ + exit compilation_status + + let _ = ++ Findlib.init (); + try main () + with Failure s -> + eprintf "ocamlscript: %s\n%!" s; + diff --git a/pkgs/development/tools/ocaml/ocamlscript/default.nix b/pkgs/development/tools/ocaml/ocamlscript/default.nix new file mode 100644 index 000000000000..1b37c21fdfa7 --- /dev/null +++ b/pkgs/development/tools/ocaml/ocamlscript/default.nix @@ -0,0 +1,26 @@ +{stdenv, fetchurl, ocaml, findlib, camlp4}: +stdenv.mkDerivation { + name = "ocamlscript-2.0.3"; + src = fetchurl { + url = http://mjambon.com/releases/ocamlscript/ocamlscript-2.0.3.tar.gz; + sha256 = "1v1i24gijxwris8w4hi95r9swld6dm7jbry0zp72767a3g5ivlrd"; + }; + + propagatedBuildInputs = [ ocaml findlib camlp4 ]; + + patches = [ ./Makefile.patch ]; + + buildFlags = "PREFIX=$(out)"; + installFlags = "PREFIX=$(out)"; + + preInstall = "mkdir $out/bin"; + createFindlibDestdir = true; + + meta = with stdenv.lib; { + homepage = http://martin.jambon.free.fr/ocamlscript.html; + license = licenses.boost; + platforms = ocaml.meta.platforms; + description = "Natively-compiled OCaml scripts"; + maintainers = [ maintainers.vbgl ]; + }; +} diff --git a/pkgs/development/tools/ocaml/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix new file mode 100644 index 000000000000..4970d641643f --- /dev/null +++ b/pkgs/development/tools/ocaml/ocp-build/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, ocaml, findlib, ncurses }: + +stdenv.mkDerivation { + + name = "ocp-build-1.99.8-beta"; + + src = fetchurl { + url = "https://github.com/OCamlPro/ocp-build/archive/ocp-build.1.99.8-beta.tar.gz"; + sha256 = "06qh8v7k5m52xbivas08lblspsnvdl0vd7ghfj6wvpnfl8qvqabn"; + }; + + buildInputs = [ ocaml findlib ncurses ]; + + patches = [ ./fix-for-no-term.patch ]; + + # In the Nix sandbox, the TERM variable is unset and stty does not + # work. In such a case, ocp-build crashes due to a bug. The + # ./fix-for-no-term.patch fixes this bug in the source code and hence + # also in the final installed version of ocp-build. However, it does not + # fix the bug in the precompiled bootstrap version of ocp-build that is + # used during the compilation process. In order to bypass the bug until + # it's also fixed upstream, we simply set TERM to some valid entry in the + # terminfo database during the bootstrap. + TERM = "xterm"; + + meta = with stdenv.lib; { + homepage = "http://typerex.ocamlpro.com/ocp-build.html"; + description = "A build tool for OCaml"; + longDescription = '' + ocp-build is a build system for OCaml application, based on simple + descriptions of packages. ocp-build combines the descriptions of + packages, and optimize the parallel compilation of files depending on + the number of cores and the automatically-infered dependencies + between source files. + ''; + license = licenses.gpl3; + platforms = ocaml.meta.platforms; + maintainers = [ maintainers.jirkamarsik ]; + }; +} diff --git a/pkgs/development/tools/ocaml/ocp-build/fix-for-no-term.patch b/pkgs/development/tools/ocaml/ocp-build/fix-for-no-term.patch new file mode 100644 index 000000000000..8ce83d095fb3 --- /dev/null +++ b/pkgs/development/tools/ocaml/ocp-build/fix-for-no-term.patch @@ -0,0 +1,11 @@ +--- ocp-build-ocp-build.1.99.8-beta/src/ocp-build/buildTerm.ml 2014-10-27 13:54:37.532023502 +0100 ++++ ocp-build-ocp-build.1.99.8-beta/src/ocp-build/buildTerm.ml.new 2014-10-27 13:54:43.397099033 +0100 +@@ -49,7 +49,7 @@ + | _ -> failwith "stty" + end + | _ -> raise Not_found +- with Unix.Unix_error _ | End_of_file | Failure _ -> ++ with Unix.Unix_error _ | End_of_file | Failure _ | Not_found -> + try + (* shell envvar *) + int_of_string (Sys.getenv "COLUMNS") diff --git a/pkgs/development/tools/ocaml/ocp-indent/default.nix b/pkgs/development/tools/ocaml/ocp-indent/default.nix new file mode 100644 index 000000000000..d50e003f8474 --- /dev/null +++ b/pkgs/development/tools/ocaml/ocp-indent/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, ocaml, findlib, ocpBuild, opam, cmdliner }: + +let inherit (stdenv.lib) getVersion versionAtLeast; in + +assert versionAtLeast (getVersion ocaml) "3.12.1"; +assert versionAtLeast (getVersion ocpBuild) "1.99.3-beta"; + +stdenv.mkDerivation { + + name = "ocp-indent-1.4.2b"; + + src = fetchurl { + url = "https://github.com/OCamlPro/ocp-indent/archive/1.4.2b.tar.gz"; + sha256 = "1p0n2zcl5kf543x2xlqrz1aa51f0dqal8l392sa41j6wx82j0gpb"; + }; + + buildInputs = [ ocaml findlib ocpBuild opam cmdliner ]; + + createFindlibDestdir = true; + + # The supplied installer uses opam-installer which breaks when run + # normally since it tries to `mkdir $HOME`. However, we can use + # `opam-installer --script` to get the shell script that performs only + # the installation and just run that. Furthermore, we do the same that is + # done by pkgs/development/ocaml-modules/react and rename the paths meant + # for opam-installer so that they are in line with the other OCaml + # libraries in Nixpkgs. + installPhase = '' + opam-installer --script --prefix=$out ocp-indent.install \ + | sed s!lib/ocp-indent!lib/ocaml/${getVersion ocaml}/site-lib/ocp-indent! \ + | sh + ''; + + meta = with stdenv.lib; { + homepage = "http://typerex.ocamlpro.com/ocp-indent.html"; + description = "A customizable tool to indent OCaml code"; + license = licenses.gpl3; + platforms = ocaml.meta.platforms; + maintainers = [ maintainers.jirkamarsik ]; + }; +} diff --git a/pkgs/development/tools/ocaml/opam/1.2.0-src_ext-Makefile.patch b/pkgs/development/tools/ocaml/opam/1.2.0-src_ext-Makefile.patch new file mode 100644 index 000000000000..523d0f6524e7 --- /dev/null +++ b/pkgs/development/tools/ocaml/opam/1.2.0-src_ext-Makefile.patch @@ -0,0 +1,11 @@ +--- opam-1.2.0/src_ext/Makefile 2014-10-15 21:32:13.000000000 -0400 ++++ opam-1.2.0/src_ext/Makefile.new 2014-10-29 17:37:00.785365601 -0400 +@@ -51,7 +51,7 @@ archives: $(SRC_EXTS:=.download) + [ -e $(notdir $(URL_$*)) ] || $(FETCH) $(URL_$*) + $(MD5CHECK) $(notdir $(URL_$*)) $(MD5_$*) + +-%.stamp: %.download ++%.stamp: + mkdir -p tmp + cd tmp && tar xf$(if $(patsubst %.tar.gz,,$(URL_$*)),j,z) ../$(notdir $(URL_$*)) + rm -rf $* diff --git a/pkgs/development/tools/ocaml/opam/1.2.0.nix b/pkgs/development/tools/ocaml/opam/1.2.0.nix new file mode 100644 index 000000000000..9081bcbcb09a --- /dev/null +++ b/pkgs/development/tools/ocaml/opam/1.2.0.nix @@ -0,0 +1,79 @@ +{ stdenv, fetchgit, fetchurl, ocaml, unzip, ncurses, curl }: + +# Opam 1.2.0 only works with ocaml >= 3.12.1 according to ./configure +assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12.1"; + +let + srcs = { + cudf = fetchurl { + url = "https://gforge.inria.fr/frs/download.php/file/33593/cudf-0.7.tar.gz"; + sha256 = "92c8a9ed730bbac73f3513abab41127d966c9b9202ab2aaffcd02358c030a701"; + }; + extlib = fetchurl { + url = "http://ocaml-extlib.googlecode.com/files/extlib-1.5.3.tar.gz"; + sha256 = "c095eef4202a8614ff1474d4c08c50c32d6ca82d1015387785cf03d5913ec021"; + }; + ocaml_re = fetchurl { + url = "https://github.com/ocaml/ocaml-re/archive/ocaml-re-1.2.0.tar.gz"; + sha256 = "a34dd9d6136731436a963bbab5c4bbb16e5d4e21b3b851d34887a3dec451999f"; + }; + ocamlgraph = fetchurl { + url = "http://ocamlgraph.lri.fr/download/ocamlgraph-1.8.5.tar.gz"; + sha256 = "d167466435a155c779d5ec25b2db83ad851feb42ebc37dca8ffa345ddaefb82f"; + }; + dose3 = fetchurl { + url = "https://gforge.inria.fr/frs/download.php/file/33677/dose3-3.2.2.tar.gz"; + sha256 = "a30a189f9f298ed1de96d7098440c951f3df2c8da626f7f37f38cbfddefc909c"; + }; + cmdliner = fetchurl { + url = "http://erratique.ch/software/cmdliner/releases/cmdliner-0.9.4.tbz"; + sha256 = "ecb65e2cfd984ec07e97a78f334a80cda41fb8f8bb5e37c41fd33e6a0e2e69ef"; + }; + uutf = fetchurl { + url = "http://erratique.ch/software/uutf/releases/uutf-0.9.3.tbz"; + sha256 = "1f364f89b1179e5182a4d3ad8975f57389d45548735d19054845e06a27107877"; + }; + jsonm = fetchurl { + url = "http://erratique.ch/software/jsonm/releases/jsonm-0.9.1.tbz"; + sha256 = "3fd4dca045d82332da847e65e981d8b504883571d299a3f7e71447d46bc65f73"; + }; + opam = fetchurl { + url = "https://github.com/ocaml/opam/archive/1.2.0.zip"; + sha256 = "b78bb9570fbd1dae50583792525a3dd612f8f90db367771fabd7bf4571ba25f7"; + }; + }; +in +stdenv.mkDerivation rec { + name = "opam-1.2.0"; + + buildInputs = [ unzip curl ncurses ocaml ]; + + src = srcs.opam; + + postUnpack = '' + ln -sv ${srcs.cudf} $sourceRoot/src_ext/${srcs.cudf.name} + ln -sv ${srcs.extlib} $sourceRoot/src_ext/${srcs.extlib.name} + ln -sv ${srcs.ocaml_re} $sourceRoot/src_ext/${srcs.ocaml_re.name} + ln -sv ${srcs.ocamlgraph} $sourceRoot/src_ext/${srcs.ocamlgraph.name} + ln -sv ${srcs.dose3} $sourceRoot/src_ext/${srcs.dose3.name} + ln -sv ${srcs.cmdliner} $sourceRoot/src_ext/${srcs.cmdliner.name} + ln -sv ${srcs.uutf} $sourceRoot/src_ext/${srcs.uutf.name} + ln -sv ${srcs.jsonm} $sourceRoot/src_ext/${srcs.jsonm.name} + ''; + + patches = [ ./1.2.0-src_ext-Makefile.patch ]; + + postConfigure = "make lib-ext"; + + # Dirty, but apparently ocp-build requires a TERM + makeFlags = ["TERM=screen"]; + + doCheck = false; + + meta = { + maintainers = [ stdenv.lib.maintainers.henrytill ]; + description = "A package manager for OCaml"; + homepage = "http://opam.ocamlpro.com/"; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index 1b99c4d4d43b..10025ff8a96b 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "1.14"; + version = "1.15"; name = "utop-${version}"; src = fetchurl { - url = https://github.com/diml/utop/archive/1.14.tar.gz; - sha256 = "17dqinvdrpba2fjs7sl6gxs47rrx6j8a5bbjhc7flp6bdls898zk"; + url = https://github.com/diml/utop/archive/1.15.tar.gz; + sha256 = "106v0x6sa2x10zgmjf73mpzws7xiqanxswivd00iqnpc0bcpkmrr"; }; buildInputs = [ ocaml findlib makeWrapper]; diff --git a/pkgs/development/tools/parsing/alex/2.3.1.nix b/pkgs/development/tools/parsing/alex/2.3.1.nix deleted file mode 100644 index 83138e2e0ffd..000000000000 --- a/pkgs/development/tools/parsing/alex/2.3.1.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ cabal, perl }: - -cabal.mkDerivation (self: { - pname = "alex"; - version = "2.3.1"; - sha256 = "cdd42fd992a72fedeff1f38debc21aa315d90dc070f0945d7819c0bccd549a44"; - isLibrary = false; - isExecutable = true; - buildTools = [ perl ]; - doCheck = false; - patches = [ ./adapt-crazy-perl-regex-for-cpp-4.8.0.patch ]; - meta = { - homepage = "http://www.haskell.org/alex/"; - description = "Alex is a tool for generating lexical analysers in Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/tools/parsing/alex/2.3.2.nix b/pkgs/development/tools/parsing/alex/2.3.2.nix deleted file mode 100644 index 0bc13d160170..000000000000 --- a/pkgs/development/tools/parsing/alex/2.3.2.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ cabal, perl }: - -cabal.mkDerivation (self: { - pname = "alex"; - version = "2.3.2"; - sha256 = "6715a4c27b15a74d8f31cbb6a7d654b9cb6766d74980c75b65dee7c627049f43"; - isLibrary = false; - isExecutable = true; - buildTools = [ perl ]; - doCheck = false; - patches = [ ./adapt-crazy-perl-regex-for-cpp-4.8.0.patch ]; - meta = { - homepage = "http://www.haskell.org/alex/"; - description = "Alex is a tool for generating lexical analysers in Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/tools/parsing/alex/2.3.3.nix b/pkgs/development/tools/parsing/alex/2.3.3.nix deleted file mode 100644 index ccef30058c50..000000000000 --- a/pkgs/development/tools/parsing/alex/2.3.3.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ cabal, perl }: - -cabal.mkDerivation (self: { - pname = "alex"; - version = "2.3.3"; - sha256 = "338fc492a1fddd6c528d0eb89857cadab211cb42680aeee1f9702bbfa7c5e1c8"; - isLibrary = false; - isExecutable = true; - buildTools = [ perl ]; - doCheck = false; - patches = [ ./adapt-crazy-perl-regex-for-cpp-4.8.0.patch ]; - meta = { - homepage = "http://www.haskell.org/alex/"; - description = "Alex is a tool for generating lexical analysers in Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/tools/parsing/alex/3.0.1.nix b/pkgs/development/tools/parsing/alex/3.0.1.nix deleted file mode 100644 index 7dc18c63c915..000000000000 --- a/pkgs/development/tools/parsing/alex/3.0.1.nix +++ /dev/null @@ -1,21 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, perl, QuickCheck }: - -cabal.mkDerivation (self: { - pname = "alex"; - version = "3.0.1"; - sha256 = "1w7s9kzgr4kfh6cyhb4qkvxwy9gcw3xa1d2k5dy575k3wk73awkj"; - isLibrary = false; - isExecutable = true; - buildDepends = [ QuickCheck ]; - buildTools = [ perl ]; - doCheck = false; - meta = { - homepage = "http://www.haskell.org/alex/"; - description = "Alex is a tool for generating lexical analysers in Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/tools/parsing/alex/3.0.2.nix b/pkgs/development/tools/parsing/alex/3.0.2.nix deleted file mode 100644 index c18c5d89d1be..000000000000 --- a/pkgs/development/tools/parsing/alex/3.0.2.nix +++ /dev/null @@ -1,21 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, perl, QuickCheck }: - -cabal.mkDerivation (self: { - pname = "alex"; - version = "3.0.2"; - sha256 = "0r1i10i9svnd0ayd229d8hgndgc6q8ghabw6zzghwviw5hs36zlr"; - isLibrary = false; - isExecutable = true; - buildDepends = [ QuickCheck ]; - buildTools = [ perl ]; - doCheck = false; - meta = { - homepage = "http://www.haskell.org/alex/"; - description = "Alex is a tool for generating lexical analysers in Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/tools/parsing/alex/3.0.5.nix b/pkgs/development/tools/parsing/alex/3.0.5.nix deleted file mode 100644 index af32598ee473..000000000000 --- a/pkgs/development/tools/parsing/alex/3.0.5.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ cabal, fetchpatch, perl, QuickCheck }: - -cabal.mkDerivation (self: { - pname = "alex"; - version = "3.0.5"; - sha256 = "0ncnp7cl7dlfcrwzzcp8j59i9j5r66wim1yib9g3b3jkl0bn8cn3"; - isLibrary = false; - isExecutable = true; - buildDepends = [ QuickCheck ]; - buildTools = [ perl ]; - patches = [ (fetchpatch { url="http://github.com/simonmar/alex/pull/21.patch"; sha256="050psfwmjlxhyxiy65jsn3v6b9rnfzy8x5q9mmhzwbirqwi0zkfm"; }) ]; - meta = { - homepage = "http://www.haskell.org/alex/"; - description = "Alex is a tool for generating lexical analysers in Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix index 8842c8723b1e..5be797507c02 100644 --- a/pkgs/development/tools/parsing/byacc/default.nix +++ b/pkgs/development/tools/parsing/byacc/default.nix @@ -8,9 +8,9 @@ stdenv.mkDerivation { sha256 = "1rbzx5ipkvih9rjfdfv6310wcr6mxjbdlsh9zcv5aaz6yxxxil7c"; }; - meta = { + meta = { description = "Berkeley YACC"; homepage = http://dickey.his.com/byacc/byacc.html; - license = "public domain"; + license = stdenv.lib.licenses.publicDomain; }; } diff --git a/pkgs/development/tools/parsing/flex/2.5.35.nix b/pkgs/development/tools/parsing/flex/2.5.35.nix index 8047080a125d..14209225bc61 100644 --- a/pkgs/development/tools/parsing/flex/2.5.35.nix +++ b/pkgs/development/tools/parsing/flex/2.5.35.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation { }; meta = { + branch = "2.5.35"; homepage = http://flex.sourceforge.net/; description = "A fast lexical analyser generator"; }; diff --git a/pkgs/development/tools/parsing/hammer/default.nix b/pkgs/development/tools/parsing/hammer/default.nix new file mode 100644 index 000000000000..7dbbf10b486c --- /dev/null +++ b/pkgs/development/tools/parsing/hammer/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchgit, glib, pkgconfig, python, scons, pythonPackages }: + +stdenv.mkDerivation rec { + name = "hammer-${version}"; + version = "e7aa734"; + + src = fetchgit { + url = "git://github.com/UpstandingHackers/hammer"; + sha256 = "1v8f2a6bgjgdkhbqz751bqjlwb9lmqn5x63xcskwcl2b9n36vqi9"; + rev = "e7aa73446e23f4af2fce5f88572aae848f212c16"; + }; + + buildInputs = [ glib pkgconfig python scons ]; + buildPhase = "scons prefix=$out"; + installPhase = "scons prefix=$out install"; + + meta = with stdenv.lib; { + description = "Hammer is a parsing library"; + longDescription = "Hammer is a parsing library. Like many modern parsing libraries, + it provides a parser combinator interface for writing grammars + as inline domain-specific languages, but Hammer also provides a + variety of parsing backends. It's also bit-oriented rather than + character-oriented, making it ideal for parsing binary data such + as images, network packets, audio, and executables."; + homepage = https://github.com/UpstandingHackers/hammer; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} \ No newline at end of file diff --git a/pkgs/development/tools/parsing/happy/1.18.10.nix b/pkgs/development/tools/parsing/happy/1.18.10.nix deleted file mode 100644 index 187fd3628e83..000000000000 --- a/pkgs/development/tools/parsing/happy/1.18.10.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl, perl }: - -cabal.mkDerivation (self: { - pname = "happy"; - version = "1.18.10"; - sha256 = "0jq6p5vvdh4wbam80q2d6j2fa6bmbgnbmqk1w9904x06g7vj1jf1"; - isLibrary = false; - isExecutable = true; - buildDepends = [ mtl ]; - buildTools = [ perl ]; - meta = { - homepage = "http://www.haskell.org/happy/"; - description = "Happy is a parser generator for Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/tools/parsing/happy/1.18.4.nix b/pkgs/development/tools/parsing/happy/1.18.4.nix deleted file mode 100644 index c7e3f919568b..000000000000 --- a/pkgs/development/tools/parsing/happy/1.18.4.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ cabal, mtl, perl }: - -cabal.mkDerivation (self: { - pname = "happy"; - version = "1.18.4"; - sha256 = "909bec4541a92d3765e74756f752514d2d03ec7a5d3e74c18268a57fe7ffa832"; - isLibrary = false; - isExecutable = true; - buildDepends = [ mtl ]; - buildTools = [ perl ]; - patches = [ ./adapt-crazy-perl-regex-for-cpp-4.8.0.patch ]; - meta = { - homepage = "http://www.haskell.org/happy/"; - description = "Happy is a parser generator for Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/tools/parsing/happy/1.18.5.nix b/pkgs/development/tools/parsing/happy/1.18.5.nix deleted file mode 100644 index f66f20893516..000000000000 --- a/pkgs/development/tools/parsing/happy/1.18.5.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ cabal, mtl, perl }: - -cabal.mkDerivation (self: { - pname = "happy"; - version = "1.18.5"; - sha256 = "91e1c29ac42bc5cabcac2c2e28e693fc59fbdf30636e5c52cb51b779a74d755e"; - isLibrary = false; - isExecutable = true; - buildDepends = [ mtl ]; - buildTools = [ perl ]; - patches = [ ./adapt-crazy-perl-regex-for-cpp-4.8.0.patch ]; - meta = { - homepage = "http://www.haskell.org/happy/"; - description = "Happy is a parser generator for Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/tools/parsing/happy/1.18.6.nix b/pkgs/development/tools/parsing/happy/1.18.6.nix deleted file mode 100644 index 7919908681e1..000000000000 --- a/pkgs/development/tools/parsing/happy/1.18.6.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ cabal, mtl, perl }: - -cabal.mkDerivation (self: { - pname = "happy"; - version = "1.18.6"; - sha256 = "0q6dnwihi1q761qdq0hhi733nh5d53xz6frwmr7slpvrp6v8y344"; - isLibrary = false; - isExecutable = true; - buildDepends = [ mtl ]; - buildTools = [ perl ]; - patches = [ ./adapt-crazy-perl-regex-for-cpp-4.8.0.patch ]; - meta = { - homepage = "http://www.haskell.org/happy/"; - description = "Happy is a parser generator for Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/tools/parsing/happy/1.18.9.nix b/pkgs/development/tools/parsing/happy/1.18.9.nix deleted file mode 100644 index 4ad9bf546b5f..000000000000 --- a/pkgs/development/tools/parsing/happy/1.18.9.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl, perl }: - -cabal.mkDerivation (self: { - pname = "happy"; - version = "1.18.9"; - sha256 = "12k1rg7dqa02az9d1zasdnp51zs4h30kpi5lyqsw3jxfp09cad3x"; - isLibrary = false; - isExecutable = true; - buildDepends = [ mtl ]; - buildTools = [ perl ]; - meta = { - homepage = "http://www.haskell.org/happy/"; - description = "Happy is a parser generator for Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/tools/parsing/happy/1.19.4.nix b/pkgs/development/tools/parsing/happy/default.nix index 979d4bc52e37..979d4bc52e37 100644 --- a/pkgs/development/tools/parsing/happy/1.19.4.nix +++ b/pkgs/development/tools/parsing/happy/default.nix diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix index 247daacf1617..0ae6cf92b4ef 100644 --- a/pkgs/development/tools/parsing/ragel/default.nix +++ b/pkgs/development/tools/parsing/ragel/default.nix @@ -1,42 +1,26 @@ -{stdenv, composableDerivation, fetchurl, transfig, texLive}: +{stdenv, fetchurl, transfig, texLiveAggregationFun, texLive, texLiveExtra, ghostscript +, build-manual ? false +}: -let - version = "6.3"; +stdenv.mkDerivation rec { name = "ragel-${version}"; -in + version = "6.9"; -composableDerivation.composableDerivation {} { - inherit name; src = fetchurl { - url = "http://www.complang.org/ragel/${name}.tar.gz"; - sha256 = "018cedc8a68be85cda330fc53d0bb8a1ca6ad39b1cf790eed0311e7baa5a2520"; + url = "http://www.colm.net/wp-content/uploads/2014/10/${name}.tar.gz"; + sha256 = "02k6rwh8cr95f1p5sjjr3wa6dilg06572xz1v71dk8awmc7vw1vf"; }; - flags = { - doc = { - # require fig2dev & pdflatex (see README) - buildInputs = [transfig texLive]; - # use post* because default values of buildPhase is empty. - postBuild = '' - pushd doc - make - popd - ''; - postInstall = '' - pushd doc - make install - popd - ''; - }; - }; - - cfg = { - docSupport = false; - }; - - meta = { + buildInputs = stdenv.lib.optional build-manual [ transfig ghostscript (texLiveAggregationFun { paths=[ texLive texLiveExtra ]; }) ]; + + preConfigure = stdenv.lib.optional build-manual '' + sed -i "s/build_manual=no/build_manual=yes/g" DIST + ''; + + meta = with stdenv.lib; { homepage = http://www.complang.org/ragel; description = "State machine compiler"; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; + maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/development/tools/parsing/re2c/default.nix index 5ff4f8ec9db7..4176182ab621 100644 --- a/pkgs/development/tools/parsing/re2c/default.nix +++ b/pkgs/development/tools/parsing/re2c/default.nix @@ -1,12 +1,12 @@ -{stdenv, fetchurl }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "re2c-${version}"; - version = "0.13.7.4"; + version = "0.13.7.5"; src = fetchurl { url = "mirror://sourceforge/re2c/re2c/${version}/${name}.tar.gz"; - sha256 = "0j42s2gpz0rgiadwyb7ksqgc7i02l0q2qnmiyaj5f1w5rfa2c7yy"; + sha256 = "0qdly4493d4p6jif0anf79c8h6ylc34aw622zk4n8icyax8gv2nm"; }; meta = { diff --git a/pkgs/development/tools/phantomjs/default.nix b/pkgs/development/tools/phantomjs/default.nix index 6fc53595efbd..17837933eae6 100644 --- a/pkgs/development/tools/phantomjs/default.nix +++ b/pkgs/development/tools/phantomjs/default.nix @@ -3,7 +3,7 @@ assert stdenv.lib.elem stdenv.system [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; stdenv.mkDerivation rec { - name = "phantomjs-1.9.7"; + name = "phantomjs-1.9.8"; # I chose to use the binary build for now. # The source version is quite nasty to compile @@ -13,18 +13,18 @@ stdenv.mkDerivation rec { src = if stdenv.system == "i686-linux" then fetchurl { url = "https://bitbucket.org/ariya/phantomjs/downloads/${name}-linux-i686.tar.bz2"; - sha256 = "1ffd5544wnkww5cgwsims4bk4bymvm6pm19p32nbhwabxqhbnj9a"; + sha256 = "11fzmssz9pqf3arh4f36w06sl2nyz8l9h8iyxyd7w5aqnq5la0j1"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "https://bitbucket.org/ariya/phantomjs/downloads/${name}-linux-x86_64.tar.bz2"; - sha256 = "06mhvj8rx298j0mrijw48zfm28hqgy81vdr1vv0jp4ncxbvijfs7"; + sha256 = "0fhnqxxsxhy125fmif1lwgnlhfx908spy7fx9mng4w72320n5nd1"; } else # x86_64-darwin fetchurl { url = "https://bitbucket.org/ariya/phantomjs/downloads/${name}-macosx.zip"; - sha256 = "0vsagvx181gnypi6kgmxp4br6hnvd81vyy3cbz5pxccdys7iywvj"; + sha256 = "0j0aq8dgzmb210xdrh0v3d4nblskl3zsckl8bzf1a603wcx085cg"; }; buildInputs = if stdenv.isDarwin then [ unzip ] else []; diff --git a/pkgs/development/tools/profiling/EZTrace/default.nix b/pkgs/development/tools/profiling/EZTrace/default.nix new file mode 100644 index 000000000000..2c9b435682de --- /dev/null +++ b/pkgs/development/tools/profiling/EZTrace/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, autoconf, libelf, gfortran, zlib, binutils }: + +stdenv.mkDerivation rec { + version = "1.0.6"; + name = "EZTrace-${version}"; + + src = fetchurl { + url = "http://gforge.inria.fr/frs/download.php/file/34082/eztrace-${version}.tar.gz"; + sha256 = "06q5y9qmdn1h0wjmy28z6gwswskmph49j7simfqcqwv05gvd9svr"; + }; + + # Goes past the rpl_malloc linking failure + preConfigure = '' + export ac_cv_func_malloc_0_nonnull=yes + ''; + + buildInputs = [ autoconf libelf gfortran zlib binutils ]; + + meta = { + description = "Tool that aims at generating automatically execution trace from HPC programs"; + license = stdenv.lib.licenses.cecill-b; + maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; + }; +} diff --git a/pkgs/development/tools/pydb/default.nix b/pkgs/development/tools/pydb/default.nix index baa816589cab..1b5a2ca674f4 100644 --- a/pkgs/development/tools/pydb/default.nix +++ b/pkgs/development/tools/pydb/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation { description = "Python debugger with GDB-like commands and Emacs bindings"; homepage = http://bashdb.sourceforge.net/pydb/; license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/tools/quilt/default.nix b/pkgs/development/tools/quilt/default.nix index 7ac4f6d39b7d..1fd70730265a 100644 --- a/pkgs/development/tools/quilt/default.nix +++ b/pkgs/development/tools/quilt/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { and more. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix new file mode 100644 index 000000000000..2847db3ec5aa --- /dev/null +++ b/pkgs/development/tools/rust/racer/default.nix @@ -0,0 +1,30 @@ +{stdenv, fetchgit, rust, makeWrapper }: + +let + rustSrc = rust.src; +in + +stdenv.mkDerivation rec { + #TODO add emacs support + name = "racer-git-2014-11-24"; + src = fetchgit { + url = https://github.com/phildawes/racer; + rev = "50655ffd509bea09ea9b310970dedfeaf5a33cf3"; + sha256 = "0bd456i4nz12z39ljnw1kjg8mcflvm7rjql2r80fb038c7rd6xi1"; + }; + + buildInputs = [ rust makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + cp -p bin/racer $out/bin/ + wrapProgram $out/bin/racer --set RUST_SRC_PATH "${rustSrc}/src" + ''; + + meta = with stdenv.lib; { + description = "A utility intended to provide rust code completion for editors and IDEs."; + homepage = https://github.com/phildawes/racer; + license = stdenv.lib.licenses.mit; + maintainers = [ maintainers.jagajaga ]; + }; +} diff --git a/pkgs/development/tools/selenium/selendroid/default.nix b/pkgs/development/tools/selenium/selendroid/default.nix new file mode 100644 index 000000000000..e34e479e938a --- /dev/null +++ b/pkgs/development/tools/selenium/selendroid/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, makeWrapper, jdk, selenium-server-standalone }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "selendroid-standalone-${version}"; + version = "0.11.0"; + + src = fetchurl { + url = "https://github.com/selendroid/selendroid/releases/download/${version}/selendroid-standalone-${version}-with-dependencies.jar"; + sha256 = "1p6k974pr2634q1g65wx243cxdqhac63x8w2gsmh6vnni0818clk"; + }; + + unpackPhase = "true"; + + buildInputs = [ jdk makeWrapper ]; + + installPhase = '' + mkdir -p $out/share/lib/selendroid + cp $src $out/share/lib/selendroid/${name}.jar + makeWrapper ${jdk}/bin/java $out/bin/selendroid \ + --add-flags "-jar $out/share/lib/selendroid/${name}.jar" + makeWrapper ${jdk}/bin/java $out/bin/selendroid-selenium \ + --add-flags "-Dfile.encoding=UTF-8" \ + --add-flags "-cp \"$out/share/lib/selendroid/${name}.jar:${selenium-server-standalone}/share/lib/${selenium-server-standalone.name}/${selenium-server-standalone.name}.jar\"" \ + --add-flags "org.openqa.grid.selenium.GridLauncher" + ''; + + meta = { + homepage = https://code.google.com/p/selenium; + description = "Test automation for native or hybrid Android apps and the mobile web."; + maintainers = with maintainers; [ offline ]; + platforms = platforms.all; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix index efb1e85c2d73..0c3331653078 100644 --- a/pkgs/development/tools/selenium/server/default.nix +++ b/pkgs/development/tools/selenium/server/default.nix @@ -1,27 +1,52 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, makeWrapper, jre, jdk, gcc, xlibs +, chromedriver, chromeSupport ? true }: -stdenv.mkDerivation rec { +with stdenv.lib; + +let + arch = if stdenv.system == "x86_64-linux" then "amd64" + else if stdenv.system == "i686-linux" then "i386" + else ""; + +in stdenv.mkDerivation rec { name = "selenium-server-standalone-${version}"; - version = "2.39.0"; + version = "2.44.0"; src = fetchurl { - url = "https://selenium.googlecode.com/files/${name}.jar"; - sha256 = "11ixh5x5f9kia2va8wssd3n7y57dkv3snw6xvk85y4qhzg64b65f"; + url = "http://selenium-release.storage.googleapis.com/2.44/selenium-server-standalone-2.44.0.jar"; + sha256 = "1n53pyrxpmfh9lvr68d1l9rsiw7qr36farirpl3ivkyvnpm5iwm5"; }; - unpack = ""; + unpackPhase = "true"; + + buildInputs = [ jre makeWrapper ]; + + # Patch launcher binaries for opera + patchPhase = optionalString (arch!="") '' + cp $src $TMPDIR/${name}.jar + export src=$TMPDIR/${name}.jar + + ${jdk}/bin/jar xf $src launchers/launcher-linux-amd64 + patchelf \ + --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-rpath "${gcc.gcc}/lib/:${gcc.gcc}/lib64:${xlibs.libX11}/lib" \ + launchers/launcher-linux-${arch} + ${jdk}/bin/jar uf $src launchers/launcher-linux-${arch} + ''; - buildCommand = '' + installPhase = '' mkdir -p $out/share/lib/${name} cp $src $out/share/lib/${name}/${name}.jar + makeWrapper ${jre}/bin/java $out/bin/selenium-server \ + --add-flags "-jar $out/share/lib/${name}/${name}.jar" \ + --add-flags ${optionalString chromeSupport "-Dwebdriver.chrome.driver=${chromedriver}/bin/chromedriver"} ''; - meta = with stdenv.lib; { + meta = { homepage = https://code.google.com/p/selenium; - description = "Selenium Server for remote WebDriver."; - maintainers = [ maintainers.coconnor ]; + description = "Selenium Server for remote WebDriver"; + maintainers = with maintainers; [ coconnor offline ]; platforms = platforms.all; - hydraPlatforms = []; license = licenses.asl20; }; } diff --git a/pkgs/development/tools/slimerjs/default.nix b/pkgs/development/tools/slimerjs/default.nix index c155cd309443..39e2daf6b3ab 100644 --- a/pkgs/development/tools/slimerjs/default.nix +++ b/pkgs/development/tools/slimerjs/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, fetchgit, zip, unzip, xulrunner, bash}: +{stdenv, fetchurl, fetchgit, zip, unzip, firefox, bash}: let s = # Generated upstream information rec { @@ -31,9 +31,10 @@ stdenv.mkDerivation { cp LICENSE README* "$out/share/doc/slimerjs" cp -r * "$out/lib/slimerjs" echo '#!${bash}/bin/bash' >> "$out/bin/slimerjs" - echo 'export SLIMERJSLAUNCHER=${xulrunner}/bin/xulrunner' >> "$out/bin/slimerjs" + echo 'export SLIMERJSLAUNCHER=${firefox}/bin/firefox' >> "$out/bin/slimerjs" echo "'$out/lib/slimerjs/slimerjs' \"\$@\"" >> "$out/bin/slimerjs" chmod a+x "$out/bin/slimerjs" + sed -e 's@MaxVersion=32[.]@MaxVersion=33.@' -i "$out/lib/slimerjs/application.ini" ''; meta = { inherit (s) version; diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index bd9ccf4947ba..5e15ef64cb2f 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dpkg, curl, libarchive, openssl, ruby, rubyLibs, libiconv +{ stdenv, fetchurl, dpkg, curl, libarchive, openssl, ruby, rubyLibs, libiconvOrLibc , libxml2, libxslt }: assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { # libiconv: iconv rm opt/vagrant/embedded/bin/iconv - ln -s ${libiconv}/bin/iconv opt/vagrant/embedded/bin + ln -s ${libiconvOrLibc}/bin/iconv opt/vagrant/embedded/bin # libxml: xml2-config, xmlcatalog, xmllint rm opt/vagrant/embedded/bin/{xml2-config,xmlcatalog,xmllint} diff --git a/pkgs/development/tools/winpdb/default.nix b/pkgs/development/tools/winpdb/default.nix new file mode 100644 index 000000000000..fd6e0a991387 --- /dev/null +++ b/pkgs/development/tools/winpdb/default.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchurl, buildPythonPackage, wxPython, makeDesktopItem }: + +buildPythonPackage rec { + name = "winpdb-1.4.8"; + namePrefix = ""; + + src = fetchurl { + url = "https://winpdb.googlecode.com/files/${name}.tar.gz"; + sha256 = "0vkpd24r40j928vc04c721innv0168sbllg97v4zw10adm24d8fs"; + }; + + propagatedBuildInputs = [ wxPython ]; + + desktopItem = makeDesktopItem { + name = "winpdb"; + exec = "winpdb"; + icon = "winpdb"; + comment = "Platform independend Python debugger"; + desktopName = "Winpdb"; + genericName = "Python Debugger"; + categories = "Application;Development;Debugger;"; + }; + + # Don't call gnome-terminal with "--disable-factory" flag, which is + # unsupported since GNOME >= 3.10. Apparently, debian also does this fix: + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=757718 + postPatch = '' + sed -i "s/--disable-factory//" rpdb2.py + ''; + + postInstall = '' + mkdir -p "$out"/share/applications + cp "$desktopItem"/share/applications/* "$out"/share/applications/ + + mkdir -p "$out"/share/icons + cp artwork/winpdb-icon.svg "$out"/share/icons/winpdb.svg + ''; + + meta = with stdenv.lib; { + description = "Platform independent Python debugger"; + longDescription = '' + Winpdb is a platform independent GPL Python debugger with support for + multiple threads, namespace modification, embedded debugging, encrypted + communication and is up to 20 times faster than pdb. + ''; + homepage = http://winpdb.org/; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index deb5188750ae..f796567b5556 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, openssl, python, zlib, v8, utillinux, http-parser, c-ares, pkgconfig, runCommand, which }: +{ stdenv, fetchurl, openssl, python, zlib, v8, utillinux, http-parser, c-ares +, pkgconfig, runCommand, which, unstableVersion ? false +}: let dtrace = runCommand "dtrace-native" {} '' @@ -6,17 +8,20 @@ let ln -sv /usr/sbin/dtrace $out/bin ''; - version = "0.10.32"; + version = if unstableVersion then "0.11.13" else "0.10.32"; # !!! Should we also do shared libuv? deps = { - inherit openssl zlib http-parser; - cares = c-ares; + inherit openssl zlib; # disabled system v8 because v8 3.14 no longer receives security fixes # we fall back to nodejs' internal v8 copy which receives backports for now # inherit v8 - }; + } // (stdenv.lib.optionalAttrs (!stdenv.isDarwin) { + inherit http-parser; + }) + # Node 0.11 has patched c-ares, won't compile with system's version + // (if unstableVersion then {} else { cares = c-ares; }); sharedConfigureFlags = name: [ "--shared-${name}" @@ -30,7 +35,9 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz"; - sha256 = "040g0gh2nl593ml1fcqp68vxa5kj7aiw1nqirda1c69d7l70s4n2"; + sha256 = if unstableVersion + then "1642zj3sajhqflfhb8fsvy84w9mm85wagm8w8300gydd2q6fkmhm" + else "040g0gh2nl593ml1fcqp68vxa5kj7aiw1nqirda1c69d7l70s4n2"; }; configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps); diff --git a/pkgs/development/web/nodejs/setup-hook.sh b/pkgs/development/web/nodejs/setup-hook.sh index 41a9746ba424..e1f4d9089f38 100644 --- a/pkgs/development/web/nodejs/setup-hook.sh +++ b/pkgs/development/web/nodejs/setup-hook.sh @@ -2,4 +2,4 @@ addNodePath () { addToSearchPath NODE_PATH $1/lib/node_modules } -envHooks=(${envHooks[@]} addNodePath) +envHooks+=(addNodePath) diff --git a/pkgs/development/web/remarkjs/default.nix b/pkgs/development/web/remarkjs/default.nix index 089876173344..153b165da1e5 100644 --- a/pkgs/development/web/remarkjs/default.nix +++ b/pkgs/development/web/remarkjs/default.nix @@ -14,11 +14,11 @@ let in stdenv.mkDerivation rec { name = "remarkjs-${version}"; - version = "0.6.5"; + version = "0.7.0"; src = fetchurl { url = "https://github.com/gnab/remark/archive/v${version}.tar.gz"; - sha256 = "1bh3hmhq99qqd3qg747xwjqkyppc9vf3b5nhi56556rwc02cn17p"; + sha256 = "1a2il6aa0g9cnig56ykmq8lr626pbxlsllk6js41h6gcn214rw60"; }; buildInputs = with nodePackages; [ @@ -58,7 +58,7 @@ in stdenv.mkDerivation rec { meta = { homepage = http://remarkjs.com; - description = "A simple, in-browser, markdown-driven slideshow tool."; + description = "A simple, in-browser, markdown-driven slideshow tool"; maintainers = [ stdenv.lib.maintainers.rickynils ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.mit; diff --git a/pkgs/development/web/twitter-bootstrap/default.nix b/pkgs/development/web/twitter-bootstrap/default.nix index 9df7e3126d55..1057e9708654 100644 --- a/pkgs/development/web/twitter-bootstrap/default.nix +++ b/pkgs/development/web/twitter-bootstrap/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchgit, lessc, closurecompiler }: +{ stdenv, fetchFromGitHub, lessc, closurecompiler }: stdenv.mkDerivation rec { name = "twitter-bootstrap-${version}"; version = "2.3.2"; - src = fetchgit { - url = https://github.com/twitter/bootstrap.git; - rev = "refs/tags/v${version}"; - sha256 = "093z4yxqhrr30vna67ksxz3bq146q2xr05hinh78pg2ls88k77la"; + src = fetchFromGitHub { + owner = "twitter"; + repo = "bootstrap"; + rev = "v${version}"; + sha256 = "0b4dsk9sqlkwwfgqqjlgi6p05qz2jssmmz4adm83f31sx70lgh4g"; }; buildInputs = [ lessc closurecompiler ]; diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index 7c8c2bd23776..5d50d25194a3 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -6,13 +6,16 @@ let py = pythonPackages; - version = "2.0.29"; + version = "2.0.31"; in stdenv.mkDerivation rec { name = "anki-${version}"; src = fetchurl { - url = "http://ankisrs.net/download/mirror/${name}.tgz"; - sha256 = "12qw0as5cdgh4hi0vyl0zpdzha93x8rid5xrhpjgiyj5s9fisf40"; + urls = [ + "http://ankisrs.net/download/mirror/${name}.tgz" + "http://ankisrs.net/download/mirror/archive/${name}.tgz" + ]; + sha256 = "0bxy4pq9yq78g0ffnlkpqj91ri0w4xqgv8mqksddn02v4llrd5jb"; }; pythonPath = [ pyqt4 py.pysqlite py.sqlalchemy py.pyaudio ] diff --git a/pkgs/games/asc/default.nix b/pkgs/games/asc/default.nix index 41c527f462ce..5243316734e3 100644 --- a/pkgs/games/asc/default.nix +++ b/pkgs/games/asc/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-fpermissive"; # I'm too lazy to catch all gcc47-related problems buildInputs = [ - SDL SDL_image SDL_mixer SDL_sound libsigcxx physfs boost boost.lib expat + SDL SDL_image SDL_mixer SDL_sound libsigcxx physfs boost expat freetype libjpeg wxGTK lua perl pkgconfig zlib zip bzip2 libpng ]; diff --git a/pkgs/games/astromenace/default.nix b/pkgs/games/astromenace/default.nix index a2897a795e84..76aed3f2cc6a 100644 --- a/pkgs/games/astromenace/default.nix +++ b/pkgs/games/astromenace/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Hardcore 3D space shooter with spaceship upgrade possibilities."; + description = "Hardcore 3D space shooter with spaceship upgrade possibilities"; homepage = http://www.viewizard.com/; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/games/beret/default.nix b/pkgs/games/beret/default.nix index a92fe4d7c672..b36ec6a43f69 100644 --- a/pkgs/games/beret/default.nix +++ b/pkgs/games/beret/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { src = fetchurl { url = https://gitorious.org/beret/beret/archive-tarball/ae029777; name = "beret-1.2.0.tar.gz"; - sha256 = "0md00ipacvz5mq8q83h7xbzycnwympr06pc1n5c351swjvyw0ysx"; + sha256 = "1rx9z72id1810fgv8mizk8qxwd1kh5xi07fdhmjc62mh3fn38szc"; }; installPhase = '' diff --git a/pkgs/games/blackshades/default.nix b/pkgs/games/blackshades/default.nix index 61e8571c4766..42a1b19c4d7a 100644 --- a/pkgs/games/blackshades/default.nix +++ b/pkgs/games/blackshades/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://icculus.org/blackshades/; description = "Protect the VIP"; - license = "free"; + license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/games/bsdgames/default.nix b/pkgs/games/bsdgames/default.nix index 882f5f3cde6b..0709692552c2 100644 --- a/pkgs/games/bsdgames/default.nix +++ b/pkgs/games/bsdgames/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.t2-project.org/packages/bsd-games.html"; description = "Ports of all the games from NetBSD-current that are free"; - license = "free"; + license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/games/chocolate-doom/default.nix b/pkgs/games/chocolate-doom/default.nix index 157d1b42af62..75cee19c6805 100644 --- a/pkgs/games/chocolate-doom/default.nix +++ b/pkgs/games/chocolate-doom/default.nix @@ -1,12 +1,12 @@ { stdenv, autoconf, automake, pkgconfig, SDL, SDL_mixer, SDL_net, fetchurl }: stdenv.mkDerivation rec { - name = "chocolate-doom-2.0.0"; + name = "chocolate-doom-2.1.0"; src = fetchurl { - url = https://github.com/chocolate-doom/chocolate-doom/archive/chocolate-doom-2.0.0.tar.gz; - sha256 = "1n9lkx97h987bq8z586jgissdhs07xyfr0xfdk7m2wpw4yhw10k1"; + url = "https://github.com/chocolate-doom/chocolate-doom/archive/${name}.tar.gz"; + sha256 = "1qwnc5j3n99jk35c487mxsij04m4kpkqzkbrb8qwqlsnqllyh1s1"; }; - buildInputs = [ autoconf autoconf automake pkgconfig SDL SDL_mixer SDL_net ]; + buildInputs = [ autoconf automake pkgconfig SDL SDL_mixer SDL_net ]; patchPhase = '' sed -e 's#/games#/bin#g' -i src{,/setup}/Makefile.am ./autogen.sh --prefix=$out @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { homepage = http://chocolate-doom.org/; description = "A Doom source port that accurately reproduces the experience of Doom as it was played in the 1990s"; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ MP2E ]; }; } diff --git a/pkgs/games/chocolate-doom/master.nix b/pkgs/games/chocolate-doom/master.nix deleted file mode 100644 index f0dc62aaaae7..000000000000 --- a/pkgs/games/chocolate-doom/master.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, autoconf, automake, pkgconfig, SDL, SDL_mixer, SDL_net, git, fetchgit }: - -stdenv.mkDerivation rec { - name = "chocolate-doom-20140902"; - src = fetchgit { - url = git://github.com/fragglet/chocolate-doom.git; - rev = "204814c7bb16a8ad45435a15328072681978ea57"; - sha256 = "1xcdxpkgb9dk3zwqf4xcr3qn7dh5rx6hmniky67imbvi1h74p587"; - }; - buildInputs = [ autoconf autoconf automake pkgconfig SDL SDL_mixer SDL_net git ]; - patchPhase = '' - sed -e 's#/games#/bin#g' -i src{,/setup}/Makefile.am - ./autogen.sh --prefix=$out - ''; - - enableParallelBuilding = true; - - meta = { - homepage = http://chocolate-doom.org/; - description = "A Doom source port that accurately reproduces the experience of Doom as it was played in the 1990s"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ MP2E ]; - }; -} diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index 6cb48d85f852..7f971150c675 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -1,24 +1,53 @@ -{ stdenv, fetchurl, sqlite, lua, which, zlib, pkgconfig, dejavu_fonts, - libpng, perl, SDL, SDL_image, ncurses, mesa}: +{ stdenv, fetchurl, which, sqlite, lua5_1, perl, zlib, pkgconfig, ncurses +, dejavu_fonts, libpng, SDL, SDL_image, mesa, freetype +, tileMode ? true +}: +let version = "0.15.2"; +in stdenv.mkDerivation rec { - name = "crawl-0.14.1"; - src = fetchurl { - url = "http://downloads.sourceforge.net/project/crawl-ref/Stone%20Soup/0.14.1/stone_soup-0.14.1-nodeps.tar.xz"; - sha256 = "91726d0224b93ba26b5d4bd3762bc5aabe1f02974ea6c937be89dc6c6ab7a4dd"; - }; + name = "crawl-${version}" + (if tileMode then "-tiles" else ""); + src = fetchurl { + url = "mirror://sourceforge/crawl-ref/Stone%20Soup/${version}/stone_soup-${version}-nodeps.tar.xz"; + sha256 = "1qi1g8w0sxmwrv96hnay20gpwp1xn2xcq1cw9iwn1yq112484fp9"; + }; - patches = [ ./makefile_fonts.patch ./makefile_sqlite.patch - ./makefile_rltiles.patch ./makefile_rltiles2.patch - ./makefile_misc.patch ./makefile_prefix.patch - ]; + patches = [ ./makefile_fonts.patch ./makefile_sqlite.patch ]; - buildInputs = [stdenv pkgconfig lua zlib sqlite which libpng perl SDL - dejavu_fonts SDL_image ncurses mesa]; + nativeBuildInputs = [ pkgconfig which perl ]; - preBuild = "cd source"; + # Still unstable with luajit + buildInputs = [ lua5_1 zlib sqlite ncurses ] + ++ stdenv.lib.optionals tileMode + [ libpng SDL SDL_image freetype mesa ]; - makeFlags = "TILES=y"; + preBuild = '' + cd source + # Related to issue #1963 + sed -i 's/-fuse-ld=gold//g' Makefile + for i in util/*.pl; do + patchShebangs $i + done + patchShebangs util/gen-mi-enum + ''; - inherit dejavu_fonts sqlite SDL_image SDL; + makeFlags = [ "prefix=$(out)" "FORCE_CC=gcc" "FORCE_CXX=g++" "HOSTCXX=g++" + "SAVEDIR=~/.crawl" "sqlite=${sqlite}" ] + ++ stdenv.lib.optionals tileMode [ "TILES=y" "dejavu_fonts=${dejavu_fonts}" ]; + + postInstall = if tileMode then "mv $out/bin/crawl $out/bin/crawl-tiles" else ""; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Open-source, single-player, role-playing roguelike game"; + longDescription = '' + Open-source, single-player, role-playing roguelike game of exploration and + treasure-hunting in dungeons filled with dangerous and unfriendly monsters + in a quest to rescue the mystifyingly fabulous Orb of Zot. + ''; + platforms = platforms.linux; + license = with licenses; [ gpl2Plus bsd2 bsd3 mit licenses.zlib cc0 ]; + maintainers = [ maintainers.abbradar ]; + }; } diff --git a/pkgs/games/crawl/makefile_misc.patch b/pkgs/games/crawl/makefile_misc.patch deleted file mode 100644 index 3849e79234b0..000000000000 --- a/pkgs/games/crawl/makefile_misc.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- old/source/Makefile 2014-05-05 23:22:48.051952484 +0200 -+++ new/source/Makefile 2014-05-05 23:20:46.576617833 +0200 -@@ -71,6 +71,9 @@ - - GAME = crawl - -+ -+CFLAGS := $(NIX_CFLAGS_COMPILE) -+ - # Disable GNU Make implicit rules and variables. Leaving them enabled will slow - # down MinGW and Cygwin builds by a very VERY noticeable degree. Besides, we have - # _explicit_ rules defined for everything. So we don't need them. -@@ -979,7 +983,7 @@ - ifdef ANDROID - CFLAGS := $(CFOPTIMIZE) $(CFOTHERS) $(CFWARN) $(CFLAGS) - else --CFLAGS := $(CFOPTIMIZE) $(CFOTHERS) $(CFWARN) -+CFLAGS := $(CFOPTIMIZE) $(CFOTHERS) $(CFWARN) $(CFLAGS) - endif - CFLAGS_L := $(CFOPTIMIZE_L) $(DEFINES_L) $(CFWARN_L) $(INCLUDES_L) $(CFOTHERS_L) - ALL_CFLAGS := $(CFLAGS) $(CFLAGS_L) -@@ -1392,7 +1396,7 @@ - $(RM) -r $(DOXYGEN_HTML_GEN) - - $(GAME): $(OBJECTS) $(EXTRA_OBJECTS) $(CONTRIB_LIBS) dat/dlua/tags.lua -- +$(QUIET_LINK)$(CXX) $(LDFLAGS) $(EXTRA_OBJECTS) $(OBJECTS) -o $(GAME) $(LIBS) -+ g++ $(LDFLAGS) $(EXTRA_OBJECTS) $(OBJECTS) -o $(GAME) $(LIBS) - - debug: all - debug-lite: all -@@ -1492,7 +1496,7 @@ - $(QUIET_GEN)util/gen-luatags.pl - - mi-enum.h: mon-info.h util/gen-mi-enum -- $(QUIET_GEN)util/gen-mi-enum -+ perl util/gen-mi-enum - - $(RLTILES)/dc-unrand.txt: art-data.h - diff --git a/pkgs/games/crawl/makefile_prefix.patch b/pkgs/games/crawl/makefile_prefix.patch deleted file mode 100644 index 869d703b125d..000000000000 --- a/pkgs/games/crawl/makefile_prefix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- old/source/Makefile 2014-05-06 08:52:24.752163702 +0200 -+++ new/source/Makefile 2014-05-06 09:08:01.992018819 +0200 -@@ -344,7 +344,7 @@ - endif - - chroot_prefix := --prefix := -+prefix := $(out) - - ifeq ($(patsubst %/local,%,$(patsubst %/,%,$(prefix))),/usr) - FHS := yes diff --git a/pkgs/games/crawl/makefile_rltiles.patch b/pkgs/games/crawl/makefile_rltiles.patch deleted file mode 100644 index e08859c989b3..000000000000 --- a/pkgs/games/crawl/makefile_rltiles.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- old/source/rltiles/Makefile 2014-04-17 10:17:31.596400123 +0000 -+++ new/source/rltiles/Makefile 2014-04-17 14:36:07.263108690 +0000 -@@ -20,7 +20,8 @@ - - ifdef TILES - ifndef CONTRIB_SDL -- SDL_CFLAGS := $(shell sdl-config --cflags 2> /dev/null || echo "-I../contrib/install/$(ARCH)/include/SDL") -+ SDL_CFLAGS := $(shell sdl-config --cflags 2> /dev/null) -+ SDL_IMG_CFLAGS := $(shell pkg-config --cflags-only-I SDL_image 2> /dev/null) - SDL_LDFLAGS := $(shell sdl-config --libs 2> /dev/null && echo "-lSDL_image" || echo "../contrib/install/$(ARCH)/lib/libSDL.a ../contrib/install/$(ARCH)/lib/libSDLmain.a ../contrib/install/$(ARCH)/lib/libSDL_image.a") - else - SDL_CFLAGS := -I../contrib/install/$(ARCH)/include/SDL -@@ -35,7 +36,7 @@ - PNG_LIB := ../contrib/install/$(ARCH)/lib/libpng.a ../contrib/install/$(ARCH)/lib/libz.a - endif - -- CFLAGS += $(SDL_CFLAGS) $(PNG_INCLUDE) -+ CFLAGS += $(SDL_CFLAGS) $(SDL_IMG_CFLAGS) $(PNG_INCLUDE) -I$(SDL_image)/include -I$(SDL)/include - LDFLAGS += $(SDL_LDFLAGS) $(PNG_LIB) - - CFLAGS += -DUSE_TILE diff --git a/pkgs/games/crawl/makefile_rltiles2.patch b/pkgs/games/crawl/makefile_rltiles2.patch deleted file mode 100644 index 2508ad0a54ca..000000000000 --- a/pkgs/games/crawl/makefile_rltiles2.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- old/source/rltiles/Makefile 2014-05-05 23:22:48.054952469 +0200 -+++ new/source/rltiles/Makefile 2014-05-05 22:45:07.742667726 +0200 -@@ -142,6 +128,6 @@ - $(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -MMD -c $< -o $@ - - $(TILEGEN): $(OBJECTS) -- $(QUIET_HOSTLINK)$(HOSTCXX) $(OBJECTS) -o $@ $(LDFLAGS) -+ g++ $(OBJECTS) -o $@ $(LDFLAGS) - - .PHONY: all clean distclean diff --git a/pkgs/games/crawl/makefile_sdlimg.patch b/pkgs/games/crawl/makefile_sdlimg.patch deleted file mode 100644 index e6c7101de720..000000000000 --- a/pkgs/games/crawl/makefile_sdlimg.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- old/source/Makefile 2014-04-14 13:00:22.331058910 +0000 -+++ new/source/Makefile 2014-04-14 13:02:11.102204544 +0000 -@@ -672,6 +672,7 @@ - FREETYPE_LDFLAGS := $(shell $(PKGCONFIG) freetype2 --libs-only-L) $(shell $(PKGCONFIG) freetype2 --libs-only-l) - - SDL_INCLUDE := $(shell $(PKGCONFIG) sdl --cflags-only-I) -+SDL_IMG_INCLUDE := $(shell $(PKGCONFIG) SDL_image --cflags-only-I) - SDL_CFLAGS := $(shell $(PKGCONFIG) sdl --cflags-only-other) - SDL_LDFLAGS := $(shell $(PKGCONFIG) sdl --libs-only-L) $(shell $(PKGCONFIG) sdl --libs-only-l) - -@@ -694,7 +695,7 @@ - endif - - DEFINES_L += $(PNG_CFLAGS) $(FREETYPE_CFLAGS) $(SDL_CFLAGS) --INCLUDES_L += $(PNG_INCLUDE) $(FREETYPE_INCLUDE) $(SDL_INCLUDE) -+INCLUDES_L += $(PNG_INCLUDE) $(FREETYPE_INCLUDE) $(SDL_INCLUDE) $(SDL_IMG_INCLUDE) - - endif # TILES - diff --git a/pkgs/games/d1x-rebirth/default.nix b/pkgs/games/d1x-rebirth/default.nix index ca348592d1d2..ab8c76680d40 100644 --- a/pkgs/games/d1x-rebirth/default.nix +++ b/pkgs/games/d1x-rebirth/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.dxx-rebirth.com/; description = "Source Port of the Descent 1 engine"; - license = "BSD"; # Parallax license, like BSD I think + license = stdenv.lib.licenses.mit; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [viric]; }; diff --git a/pkgs/games/d2x-rebirth/default.nix b/pkgs/games/d2x-rebirth/default.nix index 644c27035996..58df972257e5 100644 --- a/pkgs/games/d2x-rebirth/default.nix +++ b/pkgs/games/d2x-rebirth/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.dxx-rebirth.com/; description = "Source Port of the Descent 2 engine"; - license = "BSD"; # Parallax license, like BSD I think + license = stdenv.lib.licenses.mit; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [viric]; }; diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index 6e53aff65a57..ac037efe88a3 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -1,19 +1,41 @@ -{ stdenv, fetchurl, SDL, SDL_image, SDL_ttf, gtk, glib, mesa, openal, glibc, libsndfile -, copyDataDirectory ? false }: +{ stdenv, fetchgit, fetchurl, cmake, glew, ncurses +, SDL, SDL_image, SDL_ttf, gtk2, glib +, mesa, openal, pango, atk, gdk_pixbuf, glibc, libsndfile }: + +let + baseVersion = "40"; + patchVersion = "18"; + srcs = { + df_unfuck = fetchgit { + url = "https://github.com/svenstaro/dwarf_fortress_unfuck"; + rev = "f7ef8d4fa92bcbbf8e4790056c6c3668e3c3b20b"; + sha256 = "0kpb3gzjllvi1lahhi74cp2ny1dl7kvnhdlca7i2yxkmyzaaj9qy"; + }; + + df = fetchurl { + url = "http://www.bay12games.com/dwarves/df_${baseVersion}_${patchVersion}_linux.tar.bz2"; + sha256 = "0l29dn24xhkyj8fvmz8318i5sz2wpl420mwy1ccpdd3yfd3hrjmb"; + }; + }; + +in assert stdenv.system == "i686-linux"; stdenv.mkDerivation rec { - name = "dwarf-fortress-0.34.11"; + name = "dwarf-fortress-0.${baseVersion}.${patchVersion}"; - src = fetchurl { - url = "http://www.bay12games.com/dwarves/df_34_11_linux.tar.bz2"; - sha256 = "1qk9vmdxzs0li81c8bglpj3m7aw9k71x1slf58hv2bz7hdndl3kj"; - }; - phases = "unpackPhase patchPhase installPhase"; + buildInputs = [ SDL SDL_image SDL_ttf gtk2 glib glew mesa ncurses openal glibc libsndfile pango atk cmake gdk_pixbuf]; + src = "${srcs.df_unfuck} ${srcs.df}"; + phases = "unpackPhase patchPhase configurePhase buildPhase installPhase"; - /* :TODO: Game options should be configurable by patching the default configuration files */ + sourceRoot = "git-export"; + + cmakeFlags = [ + "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include" + "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2}/lib/gtk-2.0/include" + ]; permission = ./df_permission; @@ -21,72 +43,56 @@ stdenv.mkDerivation rec { set -x mkdir -p $out/bin mkdir -p $out/share/df_linux - cp -r * $out/share/df_linux + cd ../../ + cp -r ./df_linux/* $out/share/df_linux + rm $out/share/df_linux/libs/lib* + patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.gcc.gcc stdenv.glibc ]}:$out/share/df_linux/libs" $out/share/df_linux/libs/Dwarf_Fortress + cp -f ./git-export/build/libgraphics.so $out/share/df_linux/libs/libgraphics.so + cp $permission $out/share/df_linux/nix_permission patchelf --set-interpreter ${glibc}/lib/ld-linux.so.2 $out/share/df_linux/libs/Dwarf_Fortress - ln -s ${libsndfile}/lib/libsndfile.so $out/share/df_linux/libs/ cat > $out/bin/dwarf-fortress << EOF - #!${stdenv.shell} - export DF_DIR="\$HOME/.config/df_linux" - if [ -n "\$XDG_DATA_HOME" ] - then export DF_DIR="\$XDG_DATA_HOME/df_linux" - fi - - # Recreate a directory structure reflecting the original - # distribution in the user directory (for modding support) - ${if copyDataDirectory then '' - if [ ! -d "\$DF_DIR" ]; - then - mkdir -p \$DF_DIR - cp -r $out/share/df_linux/* \$DF_DIR/ - chmod -R u+rw \$DF_DIR/ + #!${stdenv.shell} + + set -ex + + export DF_DIR="\$HOME/.config/df_linux" + if [ -n "\$XDG_DATA_HOME" ] + then export DF_DIR="\$XDG_DATA_HOME/df_linux" fi - '' else '' - # Link in the static stuff - mkdir -p \$DF_DIR - ln -sf $out/share/df_linux/libs \$DF_DIR/ - ln -sf $out/share/df_linux/raw \$DF_DIR/ - ln -sf $out/share/df_linux/df \$DF_DIR/ - - # Delete old data directory - rm -rf \$DF_DIR/data - - # Link in the static data directory - mkdir \$DF_DIR/data - for i in $out/share/df_linux/data/* - do - ln -s \$i \$DF_DIR/data/ - done - # index initial_movies, announcement, dipscript and help files are as of 0.31.16 opened in read/write mode instead of read-only mode - # this is a hack to work around this - # Should I just apply this to the whole data directory? - for i in index initial_movies announcement dipscript help - do - rm \$DF_DIR/data/\$i - cp -rf $out/share/df_linux/data/\$i \$DF_DIR/data/ - chmod -R u+w \$DF_DIR/data/\$i + if [[ ! -d "\$DF_DIR" ]]; then + mkdir -p "\$DF_DIR" + ln -s $out/share/df_linux/raw "\$DF_DIR/raw" + ln -s $out/share/df_linux/libs "\$DF_DIR/libs" + mkdir -p "\$DF_DIR/data/init" + cp -rn $out/share/df_linux/data/init "\$DF_DIR/data/" + fi + + for link in announcement art dipscript help index initial_movies movies shader.fs shader.vs sound speech; do + cp -r $out/share/df_linux/data/\$link "\$DF_DIR/data/\$link" + chmod -R u+rw "\$DF_DIR/data/\$link" done - # link in persistant data - mkdir -p \$DF_DIR/save - ln -s \$DF_DIR/save \$DF_DIR/data/ - ''} + # now run Dwarf Fortress! + export LD_LIBRARY_PATH=\${stdenv.gcc}/lib:${SDL}/lib:${SDL_image}/lib/:${SDL_ttf}/lib/:${gtk2}/lib/:${glib}/lib/:${mesa}/lib/:${openal}/lib/:${libsndfile}/lib:\$DF_DIR/df_linux/libs/ + + export SDL_DISABLE_LOCK_KEYS=1 # Work around for bug in Debian/Ubuntu SDL patch. + #export SDL_VIDEO_CENTERED=1 # Centre the screen. Messes up resizing. - # now run Dwarf Fortress! - export LD_LIBRARY_PATH=\$DF_DIR/df_linux/libs/:${SDL}/lib:${SDL_image}/lib/:${SDL_ttf}/lib/:${gtk}/lib/:${glib}/lib/:${mesa}/lib/:${openal}/lib/ - \$DF_DIR/df "\$@" + cd \$DF_DIR + $out/share/df_linux/libs/Dwarf_Fortress "$@" EOF chmod +x $out/bin/dwarf-fortress ''; meta = { - description = "control a dwarven outpost or an adventurer in a randomly generated, persistent world"; - homepage = http://www.bay12games.com/dwarves; - license = "unfree-redistributable"; - maintainers = [stdenv.lib.maintainers.roconnor]; + description = "A single-player fantasy game with a randomly generated adventure world"; + homepage = http://www.bay12games.com/dwarves; + license = stdenv.lib.licenses.unfreeRedistributable; + maintainers = with stdenv.lib.maintainers; [ roconnor the-kenny ]; }; } diff --git a/pkgs/games/dwarf-fortress/df2014.nix b/pkgs/games/dwarf-fortress/df2014.nix deleted file mode 100644 index 64a3e5bc9755..000000000000 --- a/pkgs/games/dwarf-fortress/df2014.nix +++ /dev/null @@ -1,110 +0,0 @@ -{ stdenv, fetchgit, fetchurl, cmake, glew, ncurses, SDL, SDL_image, SDL_ttf, gtk2, glib, mesa, openal, pango, atk, gdk_pixbuf, glibc, libsndfile - , copyDataDirectory ? true }: - -/* set copyDataDirectory as true by default since df 40 does not seem to run without it */ - -let - - srcs = { - df_unfuck = fetchgit { - url = "https://github.com/svenstaro/dwarf_fortress_unfuck"; - rev = "044b266ce3e03b54a4228d51d6b75d70963debc9"; - sha256 = "0xc839zmg1bqyrdirhy2ixm8i58q7nwhyi86h60qmrfdg3bsnnpr"; - }; - - df = fetchurl { - url = "http://www.bay12games.com/dwarves/df_40_13_linux.tar.bz2"; - sha256 = "1azsxgjc1fh8i041p6i7dmvdk0v3xpmhg44lmimlrs78a08h4z61"; - }; - }; - -in - -assert stdenv.system == "i686-linux"; - -stdenv.mkDerivation rec { - name = "dwarf-fortress-0.40.13"; - - - buildInputs = [ SDL SDL_image SDL_ttf gtk2 glib glew mesa ncurses openal glibc libsndfile pango atk cmake gdk_pixbuf]; - src = "${srcs.df_unfuck} ${srcs.df}"; - phases = "unpackPhase patchPhase configurePhase buildPhase installPhase"; - - sourceRoot = "git-export"; - - cmakeFlags = [ - "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include" - "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2}/lib/gtk-2.0/include" - ]; - - /* :TODO: Game options should be configurable by patching the default configuration files */ - - permission = ./df_permission; - - installPhase = '' - set -x - mkdir -p $out/bin - mkdir -p $out/share/df_linux - cd ../../ - cp -r ./df_linux/* $out/share/df_linux - rm $out/share/df_linux/libs/lib* - patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.gcc.gcc stdenv.glibc ]}:$out/share/df_linux/libs" $out/share/df_linux/libs/Dwarf_Fortress - cp -f ./git-export/build/libgraphics.so $out/share/df_linux/libs/libgraphics.so - - cp $permission $out/share/df_linux/nix_permission - - patchelf --set-interpreter ${glibc}/lib/ld-linux.so.2 $out/share/df_linux/libs/Dwarf_Fortress - - cat > $out/bin/dwarf-fortress << EOF - #!${stdenv.shell} - export DF_DIR="\$HOME/.config/df_linux" - if [ -n "\$XDG_DATA_HOME" ] - then export DF_DIR="\$XDG_DATA_HOME/df_linux" - fi - - # Recreate a directory structure reflecting the original - # distribution in the user directory (for modding support) - ${if copyDataDirectory then '' - if [ ! -d "\$DF_DIR" ]; - then - mkdir -p \$DF_DIR - cp -r $out/share/df_linux/* \$DF_DIR/ - chmod -R u+rw \$DF_DIR/ - fi - '' else '' - # Link in the static stuff - mkdir -p \$DF_DIR - ln -sf $out/share/df_linux/libs \$DF_DIR/ - ln -sf $out/share/df_linux/raw \$DF_DIR/ - ln -sf $out/share/df_linux/df \$DF_DIR/ - - # Delete old data directory - rm -rf \$DF_DIR/data - - # Link in the static data directory - mkdir \$DF_DIR/data - for i in $out/share/df_linux/data/* - do - ln -s \$i \$DF_DIR/data/ - done - - # link in persistant data - mkdir -p \$DF_DIR/save - ln -s \$DF_DIR/save \$DF_DIR/data/ - ''} - - # now run Dwarf Fortress! - export LD_LIBRARY_PATH=\${stdenv.gcc}/lib:${SDL}/lib:${SDL_image}/lib/:${SDL_ttf}/lib/:${gtk2}/lib/:${glib}/lib/:${mesa}/lib/:${openal}/lib/:${libsndfile}/lib:$DF_DIR/df_linux/libs/ - \$DF_DIR/df "\$@" - EOF - - chmod +x $out/bin/dwarf-fortress - ''; - - meta = { - description = "control a dwarven outpost or an adventurer in a randomly generated, persistent world"; - homepage = http://www.bay12games.com/dwarves; - license = "unfree-redistributable"; - maintainers = [stdenv.lib.maintainers.roconnor]; - }; -} diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index 4f1b126ac47e..1d93b24d38ab 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -2,18 +2,18 @@ stdenv.mkDerivation rec { name = "eduke32-20130303-3542"; - + src = fetchurl { url = http://dukeworld.duke4.net/eduke32/synthesis/20130303-3542/eduke32_src_20130303-3542.tar.bz2; sha256 = "0v1q2bkmpnac5l9x97nnlhrrb95518vmhxx48zv3ncvmpafl1mqc"; }; - + buildInputs = [ SDL SDL_mixer libvorbis mesa gtk pkgconfig libvpx flac ] ++ stdenv.lib.optional (stdenv.system == "i686-linux") nasm; - + NIX_CFLAGS_COMPILE = "-I${SDL}/include/SDL"; NIX_LDFLAGS = "-L${SDL}/lib -lgcc_s"; - + desktopItem = makeDesktopItem { name = "eduke32"; exec = "eduke32-wrapper"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { preConfigure = '' sed -i -e "s|/usr/bin/sdl-config|${SDL}/bin/sdl-config|" build/Makefile.shared ''; - + buildPhase = '' make OPTLEVEL=0 ''; @@ -34,34 +34,34 @@ stdenv.mkDerivation rec { installPhase = '' # Install binaries mkdir -p $out/bin - cp eduke32 mapster32 $out/bin - + cp eduke32 mapster32 $out/bin + # Make wrapper script cat > $out/bin/eduke32-wrapper <<EOF #!/bin/sh - + if [ "$EDUKE32_DATA_DIR" = "" ] - then + then EDUKE32_DATA_DIR=/var/lib/games/eduke32 fi if [ "$EDUKE32_GRP_FILE" = "" ] then EDUKE32_GRP_FILE=\$EDUKE32_DATA_DIR/DUKE3D.GRP fi - + cd \$EDUKE32_DATA_DIR - eduke32 -g \$EDUKE32_GRP_FILE + eduke32 -g \$EDUKE32_GRP_FILE EOF chmod 755 $out/bin/eduke32-wrapper - + # Install desktop item mkdir -p $out/share/applications cp ${desktopItem}/share/applications/* $out/share/applications ''; - + meta = { description = "Enhanched port of Duke Nukem 3D for various platforms"; - license = "GPLv2+ and BUILD license"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://eduke32.com; maintainers = [ stdenv.lib.maintainers.sander ]; }; diff --git a/pkgs/games/eternity-engine/default.nix b/pkgs/games/eternity-engine/default.nix index 2e04c76a990c..f9ff7a5ae0c2 100644 --- a/pkgs/games/eternity-engine/default.nix +++ b/pkgs/games/eternity-engine/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { homepage = http://doomworld.com/eternity; description = "New school Doom port by James Haley"; license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ MP2E ]; }; } diff --git a/pkgs/games/fairymax/default.nix b/pkgs/games/fairymax/default.nix new file mode 100644 index 000000000000..85fbd2d6a3b0 --- /dev/null +++ b/pkgs/games/fairymax/default.nix @@ -0,0 +1,40 @@ +{stdenv, fetchurl}: +stdenv.mkDerivation rec { + name = "fairymax-${version}"; + version = "4.8"; + src = fetchurl { + url = "http://home.hccnet.nl/h.g.muller/fmax4_8w.c"; + sha256 = "01vxhpa4z0613mkgkzmsln293wxmyp5kdzil93cd1ik51q4gwjca"; + }; + ini = fetchurl { + url = "http://home.hccnet.nl/h.g.muller/fmax.ini"; + sha256 = "1zwx70g3gspbqx1zf9gm1may8jrli9idalvskxbdg33qgjys47cn"; + }; + unpackPhase = '' + cp ${src} fairymax.c + cp ${ini} fmax.ini + ''; + buildPhase = '' + gcc *.c -o fairymax -DINI_FILE='"'"$out/share/fairymax/fmax.ini"'"' + ''; + installPhase = '' + mkdir -p "$out"/{bin,share/fairymax} + cp fairymax "$out/bin" + cp fmax.ini "$out/share/fairymax" + ''; + meta = { + inherit version; + description = ''A small chess engine supporting fairy pieces''; + longDescription = '' + A version of micro-Max that reads the piece description + from a file fmax.ini, so that arbitrary fairy pieces can be + implemented. This version (4.8J) supports up to 15 piece types, + and board sizes upto 12x8 board. A Linux port exists in the + format of a debian package. + ''; + license = stdenv.lib.licenses.free ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + homepage = "http://home.hccnet.nl/h.g.muller/dwnldpage.html"; + }; +} diff --git a/pkgs/games/fish-fillets-ng/default.nix b/pkgs/games/fish-fillets-ng/default.nix new file mode 100644 index 000000000000..e9d6ce9655bb --- /dev/null +++ b/pkgs/games/fish-fillets-ng/default.nix @@ -0,0 +1,26 @@ +{stdenv, fetchurl, SDL, lua5_1, pkgconfig, SDL_mixer, SDL_image, SDL_ttf}: +stdenv.mkDerivation rec { + name = "fish-fillets-ng-${version}"; + version = "1.0.1"; + src = fetchurl { + url = "mirror://sourceforge/fillets/fillets-ng-${version}.tar.gz"; + sha256 = "1nljp75aqqb35qq3x7abhs2kp69vjcj0h1vxcpdyn2yn2nalv6ij"; + }; + data = fetchurl { + url = "mirror://sourceforge/fillets/fillets-ng-data-${version}.tar.gz"; + sha256 = "169p0yqh2gxvhdilvjc2ld8aap7lv2nhkhkg4i1hlmgc6pxpkjgh"; + }; + buildInputs = [SDL lua5_1 pkgconfig SDL_mixer SDL_image SDL_ttf]; + postInstall='' + mkdir -p "$out/share/games/fillets-ng/" + tar -xf ${data} -C "$out/share/games/fillets-ng/" --strip-components=1 + ''; + meta = { + inherit version; + description = ''A puzzle game''; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + homepage = "http://fillets.sourceforge.net/"; + }; +} diff --git a/pkgs/games/fsg/default.nix b/pkgs/games/fsg/default.nix index a4579ad2ae36..12182b8712c5 100644 --- a/pkgs/games/fsg/default.nix +++ b/pkgs/games/fsg/default.nix @@ -45,6 +45,7 @@ stdenv.mkDerivation { ''; meta = { - description = "Falling Sand Game - a cellular automata engine tuned towards the likes of Falling Sand"; + description = "Cellular automata engine tuned towards the likes of Falling Sand"; + maintainers = [stdenv.lib.maintainers.raskin]; }; } diff --git a/pkgs/games/globulation/default.nix b/pkgs/games/globulation/default.nix index 7ac83d512b30..ed134bcf3c92 100644 --- a/pkgs/games/globulation/default.nix +++ b/pkgs/games/globulation/default.nix @@ -1,80 +1,50 @@ -x@{builderDefsPackage - , mesa, SDL, scons, SDL_ttf, SDL_image, zlib, SDL_net, speex, libvorbis - , libogg, boost, fribidi, bsdiff - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; - - buildInputs = [ boost.lib ] - ++ map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="glob2"; - version="0.9.4"; - patchlevel="4"; - name="${baseName}-${version}.${patchlevel}"; - url="mirror://savannah/glob2/${version}/${name}.tar.gz"; - hash="1f0l2cqp2g3llhr9jl6jj15k0wb5q8n29vqj99xy4p5hqs78jk8g"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; - }; - - tutorial4patch = a.fetchurl { +{ stdenv, fetchurl, mesa, SDL, scons, SDL_ttf, SDL_image, zlib, SDL_net +, speex, libvorbis, libogg, boost, fribidi, bsdiff +}: +let + version = "0.9.4"; + patchlevel = "4"; + tutorial4patch = fetchurl { url = "http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=34;filename=tutorial-part4.map.bspatch;att=1;bug=595448"; name = "globulation2-tutorial4-map-patch-debian.bspatch"; sha256 = "d3511ac0f822d512c42abd34b3122f2990862d3d0af6ce464ff372f5bd7f35e9"; }; +in +stdenv.mkDerivation rec { + name = "glob2-${version}.${patchlevel}"; - inherit (sourceInfo) name version; - inherit buildInputs; - - /* doConfigure should be removed if not needed */ - phaseNames = ["doUnpack" "doPatch" "doBspatch" "workaroundScons" "doScons"]; + src = fetchurl { + url = "mirror://savannah/glob2/${version}/${name}.tar.gz"; + sha256 = "1f0l2cqp2g3llhr9jl6jj15k0wb5q8n29vqj99xy4p5hqs78jk8g"; + }; - patches = [./header-order.patch]; + patches = [ ./header-order.patch ]; - doBspatch = a.fullDepEntry '' + postPatch = '' cp campaigns/tutorial-part4.map{,.orig} bspatch campaigns/tutorial-part4.map{.orig,} ${tutorial4patch} - '' ["minInit" "doUnpack" "addInputs"]; + sed -i -e "s@env = Environment()@env = Environment( ENV = os.environ )@" SConstruct + ''; - # FIXME - # I officially fail to understand what goes on, but that seems to work - # too well not to use. Yes, it is ugly, I know... - workaroundScons = a.fullDepEntry '' - echo '#! ${a.stdenv.shell}' >> o - echo 'g++ -o "$@"' >> o - chmod a+x o - export PATH="$PATH:$PWD" - '' ["minInit"]; + buildInputs = [ mesa SDL scons SDL_ttf SDL_image zlib SDL_net speex libvorbis libogg boost fribidi bsdiff ]; - sconsFlags = [ - "DATADIR=$out/share/globulation2/glob2" - "BINDIR=$out/bin" - "INSTALLDIR=$out/share/globulation2" - ]; + buildPhase = '' + scons + ''; + + installPhase = '' + scons install \ + BINDIR=$out/bin \ + INSTALLDIR=$out/share/globulation2 \ + DATADIR=$out/share/globulation2/glob2 + ''; - meta = { + meta = with stdenv.lib; { description = "RTS without micromanagement"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; - license = a.lib.licenses.gpl3; - }; - passthru = { - updateInfo = { - downloadPage = "http://globulation2.org/wiki/Download_and_Install"; - }; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.linux; + license = licenses.gpl3; }; -}) x + passthru.updateInfo.downloadPage = "http://globulation2.org/wiki/Download_and_Install"; +} diff --git a/pkgs/games/hawkthorne/default.nix b/pkgs/games/hawkthorne/default.nix index 4a99ec447640..e720211da30e 100644 --- a/pkgs/games/hawkthorne/default.nix +++ b/pkgs/games/hawkthorne/default.nix @@ -1,13 +1,13 @@ { fetchgit, stdenv, love, curl, zip }: stdenv.mkDerivation rec { - version = "0.9.1"; + version = "0.12.1"; name = "hawkthorne-${version}"; src = fetchgit { url = "https://github.com/hawkthorne/hawkthorne-journey.git"; - rev = "e48b5eef0058f63bb8ee746bc00b47b3e03f0854"; - sha256 = "0rvcpv8fsi450xs2cglv4w6m5iqbhsr2n09pcvhh0krhg7xay538"; + rev = "610b9b3907b2a1b21da2ae926e4c7c4c9e19959b"; + sha256 = "0n2fkk34wr3kyzfhz2mbrzn94vjivblqk2xaid5mj7ls0ymxbmgd"; }; buildInputs = [ diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix new file mode 100644 index 000000000000..3dbc86a73784 --- /dev/null +++ b/pkgs/games/hedgewars/default.nix @@ -0,0 +1,69 @@ +{ SDL_image, SDL_ttf, SDL_net, fpc, qt4 , ghc, ffmpeg, freeglut, network, vector +, stdenv, makeWrapper, fetchurl, cmake, pkgconfig, lua5_1, SDL, SDL_mixer +, utf8String, bytestringShow, hslogger, random, dataenc, zlib, libpng, mesa +}: + +stdenv.mkDerivation rec { + version = "0.9.20.5"; + name = "hedgewars-${version}"; + src = fetchurl { + url = "http://download.gna.org/hedgewars/hedgewars-src-${version}.tar.bz2"; + sha256 = "1k5dq14s9pshrqlz8vnix237bcapfif4k3rc4yj4cmwdx1pqkl56"; + }; + + buildInputs = [ + SDL_ttf SDL_net network vector utf8String bytestringShow hslogger random + cmake pkgconfig lua5_1 SDL SDL_mixer SDL_image fpc qt4 ghc ffmpeg freeglut + dataenc makeWrapper + ]; + + patches = [ ./fix-ghc-7.8-build-failure.diff ]; + + preBuild = '' + export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${SDL_image}/lib + -rpath ${SDL_mixer}/lib + -rpath ${SDL_net}/lib + -rpath ${SDL_ttf}/lib + -rpath ${SDL}/lib + -rpath ${libpng}/lib + -rpath ${lua5_1}/lib + -rpath ${mesa}/lib + -rpath ${zlib}/lib + " + ''; + + postInstall = '' + wrapProgram $out/bin/hwengine --prefix LD_LIBRARY_PATH : $LD_LIBRARY_PATH:${mesa}/lib/:${freeglut}/lib + ''; + + meta = with stdenv.lib; { + description = "Turn-based strategy artillery game similiar to Worms"; + homepage = http://hedgewars.org/; + license = licenses.gpl2; + longDescription = '' + Each player controls a team of several hedgehogs. During the course of + the game, players take turns with one of their hedgehogs. They then use + whatever tools and weapons are available to attack and kill the + opponents' hedgehogs, thereby winning the game. Hedgehogs may move + around the terrain in a variety of ways, normally by walking and jumping + but also by using particular tools such as the "Rope" or "Parachute", to + move to otherwise inaccessible areas. Each turn is time-limited to + ensure that players do not hold up the game with excessive thinking or + moving. + + A large variety of tools and weapons are available for players during + the game: Grenade, Cluster Bomb, Bazooka, UFO, Homing Bee, Shotgun, + Desert Eagle, Fire Punch, Baseball Bat, Dynamite, Mine, Rope, Pneumatic + pick, Parachute. Most weapons, when used, cause explosions that deform + the terrain, removing circular chunks. The landscape is an island + floating on a body of water, or a restricted cave with water at the + bottom. A hedgehog dies when it enters the water (either by falling off + the island, or through a hole in the bottom of it), it is thrown off + either side of the arena or when its health is reduced, typically from + contact with explosions, to zero (the damage dealt to the attacked + hedgehog or hedgehogs after a player's or CPU turn is shown only when + all movement on the battlefield has ceased).''; + maintainers = maintainers.kragniz; + platforms = platforms.all; + }; +} diff --git a/pkgs/games/hedgewars/fix-ghc-7.8-build-failure.diff b/pkgs/games/hedgewars/fix-ghc-7.8-build-failure.diff new file mode 100644 index 000000000000..7974c6797fc5 --- /dev/null +++ b/pkgs/games/hedgewars/fix-ghc-7.8-build-failure.diff @@ -0,0 +1,16 @@ +## fix-ghc-7.8-build-failure.diff [diff] +diff --git a/gameServer/Actions.hs b/gameServer/Actions.hs +index 2cebe4f..355ee26 100644 +--- a/gameServer/Actions.hs ++++ b/gameServer/Actions.hs +@@ -562,7 +562,7 @@ processAction (AddClient cl) = do + si <- gets serverInfo + newClId <- io $ do + ci <- addClient rnc cl +- _ <- Exception.mask (forkIO . clientRecvLoop (clientSocket cl) (coreChan si) (sendChan cl) ci) ++ _ <- Exception.mask (\x -> forkIO $ clientRecvLoop (clientSocket cl) (coreChan si) (sendChan cl) ci x) + + infoM "Clients" (show ci ++ ": New client. Time: " ++ show (connectTime cl)) + + + diff --git a/pkgs/games/hexen/default.nix b/pkgs/games/hexen/default.nix index c97ba4d5bf4e..9e8d3ce0b8e7 100644 --- a/pkgs/games/hexen/default.nix +++ b/pkgs/games/hexen/default.nix @@ -12,6 +12,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.libsdl.org/projects/hexen/; description = "Port of Raven Software's popular Hexen 3-D shooter game"; - license = "free"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/games/keen4/default.nix b/pkgs/games/keen4/default.nix index 4d6189603a97..562df3ac1b60 100644 --- a/pkgs/games/keen4/default.nix +++ b/pkgs/games/keen4/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { dist = fetchurl { url = http://tarballs.nixos.org/keen4.zip; - md5 = "ffcdd9e3bce224d92797166bc3f56f1c"; + sha256 = "12rnc9ksl7v6l8wsxvr26ylkafzq80dbsa7yafzw9pqc8pafkhx1"; }; buildInputs = [unzip]; diff --git a/pkgs/games/klavaro/default.nix b/pkgs/games/klavaro/default.nix index c7b40db5caff..48b25d99492e 100644 --- a/pkgs/games/klavaro/default.nix +++ b/pkgs/games/klavaro/default.nix @@ -1,20 +1,24 @@ -{ stdenv, fetchurl, pkgconfig, intltool, curl, gtk, gtkdatabox }: +{ stdenv, fetchurl, makeWrapper, pkgconfig, intltool, curl, gtk3 }: stdenv.mkDerivation rec { - name = "klavaro-2.00"; + name = "klavaro-3.01"; src = fetchurl { url = "mirror://sourceforge/klavaro/${name}.tar.bz2"; - sha256 = "1w94r7r132sg7554xhcgvymxxxgfas99lkgv6j3nmxa8m2fzhwlq"; + sha256 = "11ay04lg362bh2di6y5r9g58bgmgbpwwnrbsa7bda4wiq8idawgd"; }; - buildInputs = [ pkgconfig intltool curl gtk gtkdatabox ]; + buildInputs = [ makeWrapper pkgconfig intltool curl gtk3 ]; + + postInstall = '' + wrapProgram $out/bin/klavaro \ + --prefix LD_LIBRARY_PATH : $out/lib + ''; meta = { description = "Just another free touch typing tutor program"; - + homepage = http://klavaro.sourceforge.net/; license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix new file mode 100644 index 000000000000..298417971488 --- /dev/null +++ b/pkgs/games/megaglest/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchgit, cmake, git, curl, SDL, xercesc, openal, lua +, libjpeg, wxGTK, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng +, fontconfig, freetype, xlibs, makeWrapper, bash, which, gnome3, mesa_glu +, mesa_drivers }: +let + version = "3.9.2"; + lib-env = buildEnv { + name = "megaglest-lib-env"; + paths = [ SDL xlibs.libSM xlibs.libICE xlibs.libX11 xlibs.libXext + xercesc openal libvorbis lua libjpeg libpng curl fontconfig ftgl freetype + stdenv.gcc.gcc glew mesa_glu mesa_drivers wxGTK ]; + }; + path-env = buildEnv { + name = "megaglest-path-env"; + paths = [ bash which gnome3.zenity ]; + }; +in +stdenv.mkDerivation { + name = "megaglest-${version}"; + + src = fetchgit { + url = "git://github.com/MegaGlest/megaglest-source"; + rev = "refs/tags/${version}"; + sha256 = "0jdgcpsv16vdxkwym7pw764pggifn4g98f3dzg615xl9h4wkymm0"; + }; + + buildInputs = [ cmake git curl SDL xercesc openal lua libjpeg wxGTK + cppunit ftgl glew libogg libvorbis makeWrapper mesa_glu mesa_drivers ]; + + configurePhase = '' + cmake -DCMAKE_INSTALL_PREFIX=$out -DBUILD_MEGAGLEST_TESTS=ON + ''; + + postInstall = '' + for i in $out/bin/*; do + wrapProgram $i \ + --prefix LD_LIBRARY_PATH ":" "${lib-env}/lib" \ + --prefix PATH ":" "${path-env}/bin" + done + ''; + + meta = { + description = "MegaGlest is an entertaining free (freeware and free software) and open source cross-platform 3D real-time strategy (RTS) game"; + license = stdenv.lib.licenses.gpl3; + homepage = "http://megaglest.org/"; + maintainers = [ stdenv.lib.maintainers.matejc ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index 9f79dd70c6a0..3198ad785f09 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, jre, libX11, libXext, libXcursor, libXrandr, libXxf86vm -, mesa, openal, alsaOss }: +, mesa, openal, alsaOss, pulseaudioSupport ? false, pulseaudio }: assert jre ? architecture; @@ -23,7 +23,8 @@ stdenv.mkDerivation { # wrapper for minecraft export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${jre}/lib/${jre.architecture}/:${libX11}/lib/:${libXext}/lib/:${libXcursor}/lib/:${libXrandr}/lib/:${libXxf86vm}/lib/:${mesa}/lib/:${openal}/lib/ - ${alsaOss}/bin/aoss ${jre}/bin/java -jar $out/minecraft.jar + ${if pulseaudioSupport then "${pulseaudio}/bin/padsp" else "${alsaOss}/bin/aoss" } \ + ${jre}/bin/java -jar $out/minecraft.jar EOF chmod +x $out/bin/minecraft @@ -33,6 +34,6 @@ stdenv.mkDerivation { description = "A sandbox-building game"; homepage = http://www.minecraft.net; maintainers = [ stdenv.lib.maintainers.page ]; - license = "unfree-redistributable"; + license = stdenv.lib.licenses.unfreeRedistributable; }; } diff --git a/pkgs/games/mnemosyne/default.nix b/pkgs/games/mnemosyne/default.nix index 1d23640ce8b1..4d4eb7659e19 100644 --- a/pkgs/games/mnemosyne/default.nix +++ b/pkgs/games/mnemosyne/default.nix @@ -26,8 +26,8 @@ in buildPythonPackage rec { ''; installCommand = "python setup.py install --prefix=$out"; meta = { - homepage = "http://mnemosyne-proj.org/"; - description = "Spaced-repetition software."; + homepage = http://mnemosyne-proj.org/; + description = "Spaced-repetition software"; longDescription = '' The Mnemosyne Project has two aspects: diff --git a/pkgs/games/n2048/default.nix b/pkgs/games/n2048/default.nix new file mode 100644 index 000000000000..f5ff0b4690e9 --- /dev/null +++ b/pkgs/games/n2048/default.nix @@ -0,0 +1,35 @@ +{stdenv, fetchurl, ncurses}: +let + s = + rec { + baseName = "n2048"; + version = "0.1"; + name = "${baseName}-${version}"; + url = "http://www.dettus.net/n2048/${baseName}_v${version}.tar.gz"; + sha256 = "184z2rr0rnj4p740qb4mzqr6kgd76ynb5gw9bj8hrfshcxdcg1kk"; + }; + buildInputs = [ + ncurses + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchurl { + inherit (s) url sha256; + }; + makeFlags = [ + ''DESTDIR=$(out)'' + ]; + preInstall = '' + mkdir -p "$out"/{share/man,bin} + ''; + meta = { + inherit (s) version; + description = ''Console implementation of 2048 game''; + license = stdenv.lib.licenses.bsd2; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + homepage = "http://www.dettus.net/n2048/"; + }; +} diff --git a/pkgs/games/odamex/default.nix b/pkgs/games/odamex/default.nix new file mode 100644 index 000000000000..f24e6155ec60 --- /dev/null +++ b/pkgs/games/odamex/default.nix @@ -0,0 +1,25 @@ +{ stdenv, cmake, fetchurl, pkgconfig, SDL, SDL_mixer, SDL_net }: + +stdenv.mkDerivation rec { + name = "odamex-0.7.0"; + src = fetchurl { + url = http://downloads.sourceforge.net/odamex/odamex-src-0.7.0.tar.bz2; + sha256 = "0cb6p58yv55kdyfj7s9n9xcwpvxrj8nyc6brw9jvwlc5n4y3cd5a"; + }; + + cmakeFlags = '' + -DCMAKE_BUILD_TYPE=Release + ''; + + buildInputs = [ cmake pkgconfig SDL SDL_mixer SDL_net ]; + + enableParallelBuilding = true; + + meta = { + homepage = http://odamex.net/; + description = "A client/server port for playing old-school Doom online"; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ MP2E ]; + }; +} diff --git a/pkgs/games/onscripter-en/default.nix b/pkgs/games/onscripter-en/default.nix new file mode 100644 index 000000000000..1d0bf636e2e9 --- /dev/null +++ b/pkgs/games/onscripter-en/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl +, libpng, libjpeg, libogg, libvorbis, freetype, smpeg +, SDL, SDL_image, SDL_mixer, SDL_ttf }: + + +stdenv.mkDerivation rec { + name = "onscripter-en-20110930"; + + src = fetchurl { + url = "http://unclemion.com/dev/attachments/download/36/${name}-src.tar.bz2"; + sha256 = "1kzm6d894c0ihgkwhd03x3kaqqz0sb6kf0r86xrrz12y309zfam6"; + }; + + buildInputs = [ libpng libjpeg libogg libvorbis freetype smpeg + SDL SDL_image SDL_mixer SDL_ttf + ]; + + configureFlags = [ "--no-werror" ]; + + # Without this libvorbisfile.so is not getting linked properly for some reason. + NIX_CFLAGS_LINK = [ "-lvorbisfile" ]; + + preBuild = '' + sed -i 's/.dll//g' Makefile + ''; + + meta = with stdenv.lib; { + description = "Japanese visual novel scripting engine"; + homepage = "http://dev.haeleth.net/onscripter.shtml"; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = maintainers.abbradar; + }; +} diff --git a/pkgs/games/openra/default.nix b/pkgs/games/openra/default.nix index 35057a5de75c..b666ac2ecca8 100644 --- a/pkgs/games/openra/default.nix +++ b/pkgs/games/openra/default.nix @@ -3,7 +3,7 @@ }: let - version = "20140608"; + version = "20141029"; in stdenv.mkDerivation rec { name = "openra-${version}"; @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { src = fetchurl { name = "${name}.tar.gz"; url = "https://github.com/OpenRA/OpenRA/archive/release-${version}.tar.gz"; - sha256 = "0k7siysxb2nk7zzrl7vz1cwky4nla46ixzgxgc8rq6ilmlidh96b"; + sha256 = "082rwcy866k636s4qhbry3ja2p81mdz58bh1dw2mic5mv2q6p67r"; }; dontStrip = true; diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index be011f2497ee..a1af42814d12 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "openttd-${version}"; - version = "1.4.3"; + version = "1.4.4"; src = fetchurl { url = "http://binaries.openttd.org/releases/${version}/${name}-source.tar.xz"; - sha256 = "1pb3vzmqkzxdrrrxvrji66bjiz5bx7n6c6d1pkqnjkc6p7fvpg0i"; + sha256 = "1xykqb5bx2dzffxhvm4cbn1nf72f7zcdz8hy25i5wky4hfw31x3h"; }; buildInputs = [ SDL libpng pkgconfig xz zlib freetype fontconfig ]; diff --git a/pkgs/games/performous/default.nix b/pkgs/games/performous/default.nix new file mode 100644 index 000000000000..ff4f370f04a6 --- /dev/null +++ b/pkgs/games/performous/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, gettext +, glibmm, libxmlxx, pango, librsvg +, SDL2, glew, boost, libav, portaudio +}: + +stdenv.mkDerivation { + name = "performous-1.0"; + + meta = with stdenv.lib; { + description = "Karaoke, band and dancing game"; + homepage = "http://performous.org/"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ iyzsong ]; + }; + + src = fetchFromGitHub { + owner = "performous"; + repo = "performous"; + rev = "1.0"; + sha256 = "1wgydwnhadrjkj3mjzrhppfmphrxnqfljs361206imirmvs7s15l"; + }; + + nativeBuildInputs = [ cmake pkgconfig gettext ]; + + buildInputs = [ + glibmm libxmlxx pango librsvg + SDL2 glew boost libav portaudio + ]; +} diff --git a/pkgs/games/pingus/default.nix b/pkgs/games/pingus/default.nix index af635379ac8a..43cdc2031bf5 100644 --- a/pkgs/games/pingus/default.nix +++ b/pkgs/games/pingus/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, scons, SDL, SDL_image, boost, libpng, SDL_mixer, pkgconfig , mesa}: let - buildInputs = [scons SDL SDL_image boost boost.lib libpng SDL_mixer pkgconfig mesa]; + buildInputs = [scons SDL SDL_image boost libpng SDL_mixer pkgconfig mesa]; s = # Generated upstream information rec { baseName="pingus"; diff --git a/pkgs/games/quake3/demo/default.nix b/pkgs/games/quake3/demo/default.nix index 99c07a9a7e04..a25a7caa8c18 100644 --- a/pkgs/games/quake3/demo/default.nix +++ b/pkgs/games/quake3/demo/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation { # This is needed for pak0.pk3. demo = fetchurl { url = http://tarballs.nixos.org/linuxq3ademo-1.11-6.x86.gz.sh; - md5 = "484610c1ce34272223a52ec331c99d5d"; + sha256 = "1v54a1hx1bczk9hgn9qhx8vixsy7xn7wj2pylhfjsybfkgvf7pk4"; }; # This is needed for the additional pak?.pk3 files. update = fetchurl { url = http://tarballs.nixos.org/linuxq3apoint-1.31.x86.run; - md5 = "2620b9eefb6d0775f766b6570870157a"; + sha256 = "1kp689452zb8jhd67ghisz2055pqxy9awz4vi0hq5qmp7xrp1x58"; }; # Don't rebuild if the inputs change, since the output is guaranteed diff --git a/pkgs/games/quake3/game/default.nix b/pkgs/games/quake3/game/default.nix index 596ba595d813..cbcc8c290f81 100644 --- a/pkgs/games/quake3/game/default.nix +++ b/pkgs/games/quake3/game/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, x11, SDL, mesa, openal }: +{ lib, stdenv, fetchurl, x11, SDL, mesa, openal, gcc46 }: stdenv.mkDerivation { name = "ioquake3-1.36"; - + src = fetchurl { url = http://ioquake3.org/files/1.36/ioquake3-1.36.tar.bz2; # calls itself "1.34-rc3" sha256 = "008vah60z0n9h1qp373xbqvhwfbyywbbhd1np0h0yw66g0qzchzv"; }; patchFlags = "-p0"; - + patches = [ # Fix for compiling on gcc 4.2. (fetchurl { @@ -19,10 +19,10 @@ stdenv.mkDerivation { # Do an exit() instead of _exit(). This is nice for gcov. # Upstream also seems to do this. - ./exit.patch + ./exit.patch ]; - - buildInputs = [x11 SDL mesa openal]; + + buildInputs = [ x11 SDL mesa openal gcc46 ]; # Fix building on GCC 4.6. NIX_CFLAGS_COMPILE = "-Wno-error"; @@ -33,6 +33,8 @@ stdenv.mkDerivation { installFlags="COPYDIR=$out" ''; - meta.broken = true; - + meta = { + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.eelco ]; + }; } diff --git a/pkgs/games/sdlmame/default.nix b/pkgs/games/sdlmame/default.nix index acc724490181..8488d357fc5a 100644 --- a/pkgs/games/sdlmame/default.nix +++ b/pkgs/games/sdlmame/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://sdlmame.lngn.net; - description = "A port of the popular Multiple Arcade Machine Emulator using SDL with OpenGL support."; + description = "A port of the popular Multiple Arcade Machine Emulator using SDL with OpenGL support"; license = "MAME"; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.linux; diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix index 403fc88cb4ad..e913b0bb2a8a 100644 --- a/pkgs/games/simutrans/default.nix +++ b/pkgs/games/simutrans/default.nix @@ -94,7 +94,7 @@ let ''; homepage = http://www.simutrans.com/; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ stdenv.lib.maintainers.kkallio ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/games/soi/default.nix b/pkgs/games/soi/default.nix index a61d2f370d04..7fd13ccab3b0 100644 --- a/pkgs/games/soi/default.nix +++ b/pkgs/games/soi/default.nix @@ -2,9 +2,9 @@ x@{builderDefsPackage , mesa, SDL, cmake, eigen , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) @@ -35,8 +35,8 @@ rec { setVars = a.noDepEntry '' export EIGENDIR=${a.eigen}/include/eigen2 - ''; - + ''; + meta = { description = "A physics-based puzzle game"; maintainers = with a.lib.maintainers; @@ -45,7 +45,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "free-noncopyleft"; + license = a.lib.licenses.free; broken = true; }; passthru = { diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix index 1c26dde00a94..f77166721866 100644 --- a/pkgs/games/spring/default.nix +++ b/pkgs/games/spring/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { "-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON" "-DPREFER_STATIC_LIBS:BOOL=OFF"]; - buildInputs = [ cmake lzma boost boost.lib libdevil zlib p7zip openal libvorbis freetype SDL + buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL xlibs.libX11 xlibs.libXcursor mesa glew asciidoc libxslt docbook_xsl curl makeWrapper docbook_xsl_ns systemd ] ++ stdenv.lib.optional withAI jdk @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram "$out/bin/spring" \ - --prefix LD_LIBRARY_PATH : "${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib::${systemd}/lib" + --prefix LD_LIBRARY_PATH : "${stdenv.gcc.gcc}/lib::${systemd}/lib" ''; meta = with stdenv.lib; { @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { description = "A powerful real-time strategy (RTS) game engine"; license = licenses.gpl2; maintainers = [ maintainers.phreedom maintainers.qknight maintainers.iElectric ]; - platforms = platforms.mesaPlatforms; + platforms = platforms.linux; }; } diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix index 5305759369b7..bbcbd1920e9d 100644 --- a/pkgs/games/spring/springlobby.nix +++ b/pkgs/games/spring/springlobby.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake wxGTK openal pkgconfig curl gettext libtorrentRasterbar - boost boost.lib libpng libX11 libnotify gtk doxygen makeWrapper + boost libpng libX11 libnotify gtk doxygen makeWrapper ]; prePatch = '' diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix index 9104bb40f777..41742da6b4ec 100644 --- a/pkgs/games/steam/default.nix +++ b/pkgs/games/steam/default.nix @@ -1,11 +1,13 @@ {stdenv, fetchurl}: -stdenv.mkDerivation { - name = "steam-1.0.0.48"; +stdenv.mkDerivation rec { + name = "${program}-${version}"; + program = "steam"; + version = "1.0.0.49"; src = fetchurl { - url = http://repo.steampowered.com/steam/pool/steam/s/steam/steam_1.0.0.48.tar.gz; - sha256 = "08y5qf75ssk4fnazyv2yz1c5zs7gjiwigaibv8yz1gbr290r0b52"; + url = "http://repo.steampowered.com/steam/pool/steam/s/steam/${program}_${version}.tar.gz"; + sha256 = "1c1gl5pwvb5gnnnqf5d9hpcjnfjjgmn4lgx8v0fbx1am5xf3p2gx"; }; installPhase = '' @@ -18,5 +20,6 @@ stdenv.mkDerivation { description = "A digital distribution platform"; homepage = http://store.steampowered.com/; license = stdenv.lib.licenses.unfree; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; }; } diff --git a/pkgs/games/stuntrally/default.nix b/pkgs/games/stuntrally/default.nix index 7b258deef8a9..d9de1254915a 100644 --- a/pkgs/games/stuntrally/default.nix +++ b/pkgs/games/stuntrally/default.nix @@ -1,46 +1,37 @@ -{ fetchgit, stdenv, cmake, boost, ogre, mygui, ois, SDL, libvorbis, pkgconfig +{ fetchgit, stdenv, cmake, boost, ogre, mygui, ois, SDL2, libvorbis, pkgconfig , makeWrapper, enet, libXcursor }: stdenv.mkDerivation rec { - name = "stunt-rally-1.8"; + name = "stunt-rally-${version}"; + version = "2.5"; src = fetchgit { url = git://github.com/stuntrally/stuntrally.git; - rev = "refs/tags/1.8"; - sha256 = "0p8p83xx8q33kymsqnmxqca4jdfyg9rwrsac790z56gdbc7gnahm"; + rev = "refs/tags/${version}"; + sha256 = "0zyzkac11dv9c1rxknydkisg2iw1rmi72psidl7jmq8v3rrqxk4r"; }; tracks = fetchgit { url = git://github.com/stuntrally/tracks.git; - rev = "refs/tags/1.8"; - sha256 = "1gcrs21nn0v3hvhrw8dc0wh1knn5qh66cjx7a1igiciiadmi2s3l"; + rev = "refs/tags/${version}"; + sha256 = "1j237dbhd1ik5mj8whbvlff5da9vzzgiskcj5nzfpw1vb1jpdjvd"; }; - patchPhase = '' - sed -i 's/materials/materials material_templates/' data/CMakeLists.txt - ''; - preConfigure = '' - mkdir data/tracks - cp -R $tracks/* data/tracks + cp -R ${tracks} data/tracks + chmod u+rwX -R data ''; - buildInputs = [ cmake boost ogre mygui ois SDL libvorbis pkgconfig makeWrapper enet - libXcursor + buildInputs = [ cmake boost ogre mygui ois SDL2 libvorbis pkgconfig + makeWrapper enet libXcursor ]; - # I think they suppose cmake should give them OGRE_PLUGIN_DIR defined, but - # the cmake code I saw is not ready for that. Therefore, we use the env var. - postInstall = '' - wrapProgram $out/bin/stuntrally --set OGRE_PLUGIN_DIR ${ogre}/lib/OGRE - wrapProgram $out/bin/sr-editor --set OGRE_PLUGIN_DIR ${ogre}/lib/OGRE - ''; - enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { description = "Stunt Rally game with Track Editor, based on VDrift and OGRE"; homepage = http://code.google.com/p/vdrift-ogre/; - license = stdenv.lib.licenses.gpl3Plus; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/games/tcl2048/default.nix b/pkgs/games/tcl2048/default.nix index 01ffd27d5bb4..fac28ce2fd94 100644 --- a/pkgs/games/tcl2048/default.nix +++ b/pkgs/games/tcl2048/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { meta = { homepage = https://github.com/dbohdan/2048-tcl; - description = "The game of 2048 implemented in Tcl."; + description = "The game of 2048 implemented in Tcl"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/games/thePenguinMachine/default.nix b/pkgs/games/thePenguinMachine/default.nix index 04438cf70add..e1a87f225385 100644 --- a/pkgs/games/thePenguinMachine/default.nix +++ b/pkgs/games/thePenguinMachine/default.nix @@ -38,8 +38,6 @@ stdenv.mkDerivation { ''; meta = { - description = " - The Penguin Machine - an Incredible Machine clone. -"; + description = "An Incredible Machine clone"; }; } diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix index f175894dfe74..11b04a3e7425 100644 --- a/pkgs/games/tibia/default.nix +++ b/pkgs/games/tibia/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; assert stdenv.isi686; stdenv.mkDerivation { - name = "tibia-10.57"; + name = "tibia-10.64"; src = fetchurl { - url = http://static.tibia.com/download/tibia1057.tgz; - sha256 = "1bhfrz66n1cvvy11ybr3yfn3i3vr98nnp3q11gssk8nby5bqm2fi"; + url = http://static.tibia.com/download/tibia1064.tgz; + sha256 = "0g3hg65aclbhdm3sfpxxzyc4cdv1q6i2mzzgq2h8bpyc1m3in1j9"; }; shell = stdenv.shell; @@ -53,5 +53,6 @@ stdenv.mkDerivation { homepage = "http://tibia.com"; license = stdenv.lib.licenses.unfree; platforms = ["i686-linux"]; + maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; }; } diff --git a/pkgs/games/typespeed/default.nix b/pkgs/games/typespeed/default.nix index 169c74621d73..4e99eff00651 100644 --- a/pkgs/games/typespeed/default.nix +++ b/pkgs/games/typespeed/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { configureFlags = "--datadir=\${out}/share/"; meta = { - description = "A curses based typing game."; + description = "A curses based typing game"; homepage = http://typespeed.sourceforge.net/; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.auntie ]; diff --git a/pkgs/games/ut2004demo/default.nix b/pkgs/games/ut2004demo/default.nix index 04efc0049dd0..a828d22ca0b0 100644 --- a/pkgs/games/ut2004demo/default.nix +++ b/pkgs/games/ut2004demo/default.nix @@ -8,7 +8,7 @@ let { name = "ut2004-demo-3120"; src = fetchurl { url = http://ftp.gameaholic.com/pub/demos/ut2004-lnx-demo-3120.run.bz2; - md5 = "da200b043add9d083f6aa7581e6829f0"; + sha256 = "1lravfkb1gsallqqird5dcbz42vwjg36m1qk76nmmnyyyghwqnli"; }; builder = ./builder.sh; }; diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index c1c1b5b07567..bcd3f3a453a7 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf pango gettext zlib - boost boost.lib fribidi cmake freetype libpng pkgconfig lua + boost fribidi cmake freetype libpng pkgconfig lua dbus fontconfig libtool ]; cmakeFlags = [ "-DENABLE_STRICT_COMPILATION=FALSE" ]; # newer gcc problems http://gna.org/bugs/?21030 diff --git a/pkgs/games/xboard/default.nix b/pkgs/games/xboard/default.nix index 97414c07bda7..61329389d168 100644 --- a/pkgs/games/xboard/default.nix +++ b/pkgs/games/xboard/default.nix @@ -5,11 +5,11 @@ let s = # Generated upstream information rec { baseName="xboard"; - version="4.7.3"; + version="4.8.0"; name="${baseName}-${version}"; - hash="1amy9krr0qkvcc7gnp3i9x9ma91fc5cq8hy3gdc7rmfsaczv1l3z"; - url="http://ftp.gnu.org/gnu/xboard/xboard-4.7.3.tar.gz"; - sha256="1amy9krr0qkvcc7gnp3i9x9ma91fc5cq8hy3gdc7rmfsaczv1l3z"; + hash="05rdj0nyirc4g1qi5hhrjy45y52ihp1j3ldq2c5bwrz0gzy4i3y8"; + url="http://ftp.gnu.org/gnu/xboard/xboard-4.8.0.tar.gz"; + sha256="05rdj0nyirc4g1qi5hhrjy45y52ihp1j3ldq2c5bwrz0gzy4i3y8"; }; buildInputs = [ libX11 xproto libXt libXaw libSM libICE libXmu diff --git a/pkgs/games/xmoto/src-for-default.nix b/pkgs/games/xmoto/src-for-default.nix index 60de24e16c73..beb3f6af1645 100644 --- a/pkgs/games/xmoto/src-for-default.nix +++ b/pkgs/games/xmoto/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="0.5.10"; - name="xmoto-0.5.10"; - hash="07lyvwb8v75hzp4iqvnxzabzrmwkd3ignfzpm4dgr9asd3j3h91d"; + version="0.5.11"; + name="xmoto-0.5.11"; + hash="1ci6r8zd0l7z28cy92ddf9dmqbdqwinz2y1cny34c61b57wsd155"; url="http://download.tuxfamily.org/xmoto/xmoto/${version}/xmoto-${version}-src.tar.gz"; - advertisedUrl="http://download.tuxfamily.org/xmoto/xmoto/0.5.10/xmoto-0.5.10-src.tar.gz"; + advertisedUrl="http://download.tuxfamily.org/xmoto/xmoto/0.5.11/xmoto-0.5.11-src.tar.gz"; } diff --git a/pkgs/games/xsnow/default.nix b/pkgs/games/xsnow/default.nix new file mode 100644 index 000000000000..68b77dd091b6 --- /dev/null +++ b/pkgs/games/xsnow/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, libXt, libXpm, libXext, imake }: + +stdenv.mkDerivation rec { + + version = "1.42"; + name = "xsnow"; + + src = fetchurl { + url = "http://dropmix.xs4all.nl/rick/Xsnow/xsnow-${version}.tar.gz"; + sha256 = "06jnbp88wc9i9dbmy7kggplw4hzlx2bhghxijmlhkjlizgqwimyh"; + }; + + buildInputs = [ + libXt libXpm libXext imake + ]; + + buildPhase = '' + xmkmf + make + ''; + + installPhase = '' + mkdir -p $out/bin $out/share/man/man1 + cp xsnow $out/bin/ + cp xsnow.1 $out/share/man/man1/ + ''; + + meta = { + description = "An X-windows application that will let it snow on the root, in between and on windows"; + homepage = http://dropmix.xs4all.nl/rick/Xsnow/; + license = stdenv.lib.licenses.unfree; + maintainers = [ stdenv.lib.maintainers.robberer ]; + }; +} diff --git a/pkgs/games/xsokoban/default.nix b/pkgs/games/xsokoban/default.nix index b8c6096b756f..8cdf07bb3063 100644 --- a/pkgs/games/xsokoban/default.nix +++ b/pkgs/games/xsokoban/default.nix @@ -1,8 +1,8 @@ -a : -let +a : +let fetchurl = a.fetchurl; - version = a.lib.attrByPath ["version"] "3.3c" a; + version = a.lib.attrByPath ["version"] "3.3c" a; buildInputs = with a; [ a.libX11 a.xproto a.libXpm a.libXt ]; @@ -35,15 +35,17 @@ rec { sed -e 's/getpass[(][^)]*[)]/PASSWORD/' -i main.c sed -e '/if [(]owner[)]/iowner=1;' -i main.c '') ["minInit" "doUnpack"]; - + preBuild = a.fullDepEntry ('' sed -e "s@/usr/local/@$out/@" -i Makefile - sed -e "s@ /bin/@ @" -i Makefile + sed -e "s@ /bin/@ @" -i Makefile mkdir -p $out/bin $out/share $out/man/man1 $out/lib '') ["minInit" "doConfigure" "defEnsureDir"]; name = "xsokoban-" + version; meta = { description = "X sokoban"; + license = a.stdenv.lib.licenses.publicDomain; + maintainers = [ a.stdenv.lib.maintainers.raskin ]; }; } diff --git a/pkgs/games/zangband/default.nix b/pkgs/games/zangband/default.nix index b94633d8d3a6..d7b1c1880769 100644 --- a/pkgs/games/zangband/default.nix +++ b/pkgs/games/zangband/default.nix @@ -1,8 +1,8 @@ -a : -let +a : +let fetchurl = a.fetchurl; - version = a.lib.attrByPath ["version"] "2.7.3" a; + version = a.lib.attrByPath ["version"] "2.7.3" a; buildInputs = with a; [ ncurses flex bison autoconf automake m4 ]; @@ -17,7 +17,7 @@ rec { configureFlags = []; preConfigure = a.fullDepEntry ('' - chmod a+rwX -R . + chmod a+rwX -R . sed -re 's/ch(own|grp|mod)/true/' -i lib/*/makefile.zb makefile.in sed -e '/FIXED_PATHS/d' -i src/z-config.h ./bootstrap @@ -42,7 +42,7 @@ rec { done mkdir -p lib/user lib/save for i in lib/*/*.raw; do - test -L "$i" && rm "$i"; + test -L "$i" && rm "$i"; done for i in $(find lib -type l); do if ! test -e $(readlink "$i"); then rm "$i"; fi; done; export ANGBAND_PATH="$PWD" @@ -53,10 +53,10 @@ rec { /* doConfigure should be removed if not needed */ phaseNames = ["preConfigure" "doConfigure" "doMakeInstall" "postInstall"]; - + name = "zangband-" + version; meta = { description = "rogue-like game"; - license = "non-free"; # Basically "not for commercial profit" + license = a.lib.licenses.unfree; }; } diff --git a/pkgs/misc/apulse/default.nix b/pkgs/misc/apulse/default.nix new file mode 100644 index 000000000000..1a249cc6a2c2 --- /dev/null +++ b/pkgs/misc/apulse/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, alsaLib, cmake, pkgconfig, glib }: + +stdenv.mkDerivation rec { + name = "apulse-${version}"; + version = "0.1.4"; + + src = fetchFromGitHub { + owner = "i-rinat"; + repo = "apulse"; + rev = "v${version}"; + sha256 = "115z5a0n8lkcqfgz0cgvjw3p7d0nvzfxzd9g0h137ziflyx3ysh1"; + }; + + buildInputs = + [ alsaLib cmake pkgconfig glib ]; + + meta = with stdenv.lib; { + description = "PulseAudio emulation for ALSA"; + homepage = "https://github.com/i-rinat/apulse"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.jagajaga ]; + }; +} diff --git a/pkgs/misc/beep/default.nix b/pkgs/misc/beep/default.nix index b5e4adfa0b91..ce097bd5f231 100644 --- a/pkgs/misc/beep/default.nix +++ b/pkgs/misc/beep/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { name = "beep-1.3"; src = fetchurl { url = http://www.johnath.com/beep/beep-1.3.tar.gz; - md5 = "49c340ceb95dbda3f97b2daafac7892a"; + sha256 = "0bgch6jq5cahakk3kbr9549iysf2dik09afixxy5brbxk1xfzb2r"; }; makeFlags = "INSTALL_DIR=\${out}/bin/ MAN_DIR=\${out}/man/man1/"; @@ -20,5 +20,6 @@ stdenv.mkDerivation { description = "The advanced PC speaker beeper"; homepage = http://www.johnath.com/beep/; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index bb1f60ed5db0..0f99902badb7 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl , dbus, libusb, acl }: -let version = "1.5.4"; in +let version = "1.7.5"; in stdenv.mkDerivation { name = "cups-${version}"; @@ -9,8 +9,8 @@ stdenv.mkDerivation { passthru = { inherit version; }; src = fetchurl { - url = "http://ftp.easysw.com/pub/cups/${version}/cups-${version}-source.tar.bz2"; - md5 = "de3006e5cf1ee78a9c6145ce62c4e982"; + url = "https://www.cups.org/software/${version}/cups-${version}-source.tar.bz2"; + sha256 = "00mx4rpiqw9cwx46bd3hd5lcgmcxy63zfnmkr02smanv8xl4rjqq"; }; buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb ] diff --git a/pkgs/misc/cups/drivers/cups-bjnp/default.nix b/pkgs/misc/cups/drivers/cups-bjnp/default.nix index 1ed74c574355..aa75012a8bc9 100644 --- a/pkgs/misc/cups/drivers/cups-bjnp/default.nix +++ b/pkgs/misc/cups/drivers/cups-bjnp/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, cups}: stdenv.mkDerivation rec { - name = "cups-bjnp-1.2.1"; + name = "cups-bjnp-1.2.2"; src = fetchurl { url = "mirror://sourceforge/cups-bjnp/${name}.tar.gz"; - sha256 = "0fjpp0mmmwfcr790hfjs0brsxxb7dz7v2xab6wc30rwzkqmgz95x"; + sha256 = "0sb0vm1sf8ismzd9ba33qswxmsirj2z1b7lnyrc9v5ixm7q0bnrm"; }; preConfigure = ''configureFlags="--with-cupsbackenddir=$out/lib/cups/backend"''; diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix new file mode 100644 index 000000000000..31ef0bc0efcd --- /dev/null +++ b/pkgs/misc/cups/filters.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, pkgconfig, cups, poppler, fontconfig +, libjpeg, libpng, perl, ijs, qpdf, dbus }: + +stdenv.mkDerivation rec { + name = "cups-filters-${version}"; + version = "1.0.61"; + + src = fetchurl { + url = "http://openprinting.org/download/cups-filters/${name}.tar.xz"; + sha256 = "1bq48nnrarlbf6qc93bz1n5wlh6j420gppbck3r45sinwhz5wa7m"; + }; + + buildInputs = [ + pkgconfig cups poppler fontconfig libjpeg libpng perl + ijs qpdf dbus + ]; + + preBuild = '' + substituteInPlace Makefile --replace "/etc/rc.d" "$out/etc/rc.d" + ''; + configureFlags = "--with-pdftops=pdftops --enable-imagefilters"; + makeFlags = "CUPS_SERVERBIN=$(out)/lib/cups CUPS_DATADIR=$(out)/share/cups CUPS_SERVERROOT=$(out)/etc/cups"; + + meta = { + homepage = http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters; + description = "Backends, filters, and other software that was once part of the core CUPS distribution but is no longer maintained by Apple Inc"; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/misc/cups/pdf-filter.nix b/pkgs/misc/cups/pdf-filter.nix deleted file mode 100644 index e99ad03212c2..000000000000 --- a/pkgs/misc/cups/pdf-filter.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, cups, poppler }: - -stdenv.mkDerivation { - name = "cups-pdf-filter-${cups.version}"; - - inherit (cups) src; - - buildInputs = [ pkgconfig cups poppler ]; - - preConfigure = '' - sed -e 's@\.\./cups/$(LIBCUPS)@@' -e 's@$(LIBCUPSIMAGE)@@' -i filter/Makefile - ''; - - NIX_LDFLAGS="-L${cups}/lib"; - - configureFlags = '' - --localstatedir=/var --enable-dbus - --enable-image --with-pdftops=pdftops''; - - buildPhase = '' - cd filter - make pdftops - ''; - - installPhase = '' - mkdir -pv $out/lib/cups/filter $out/share/cups/mime - cp -v pdftops $out/lib/cups/filter - echo >$out/share/cups/mime/pdftops.convs 'application/pdf application/vnd.cups-postscript 66 pdftops' - ''; - - - meta = { - homepage = http://www.cups.org/; - description = "Image and pdf filters for CUPS"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.urkud ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/misc/drivers/foomatic-filters/default.nix b/pkgs/misc/drivers/foomatic-filters/default.nix index ffc5e093c218..bdba1eb7b817 100644 --- a/pkgs/misc/drivers/foomatic-filters/default.nix +++ b/pkgs/misc/drivers/foomatic-filters/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, perl, cups, dbus }: +{ stdenv, fetchurl, pkgconfig, perl, cups, dbus, enscript }: stdenv.mkDerivation rec { name = "foomatic-filters-4.0.17"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1qrkgbm5jay2r7sh9qbyf0aiyrsl1mdc844hxf7fhw95a0zfbqm2"; }; - buildInputs = [ pkgconfig perl cups dbus ]; + buildInputs = [ pkgconfig perl cups dbus enscript ]; preConfigure = '' diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index a4d2ca621a1c..4fa35c8b8128 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -118,8 +118,10 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Print, scan and fax HP drivers for Linux"; homepage = http://hplipopensource.com/; - license = if withPlugin then licenses.unfree else "free"; # MIT/BSD/GPL + license = if withPlugin + then licenses.unfree + else with licenses; [ mit bsd2 gpl2Plus ]; platforms = platforms.linux; - maintainers = with maintainers; [ ttuegel ]; + maintainers = with maintainers; [ ttuegel jgeerds ]; }; } diff --git a/pkgs/misc/drivers/xboxdrv/default.nix b/pkgs/misc/drivers/xboxdrv/default.nix index 7164f7d6f15f..a40dd0bd31dc 100644 --- a/pkgs/misc/drivers/xboxdrv/default.nix +++ b/pkgs/misc/drivers/xboxdrv/default.nix @@ -18,9 +18,8 @@ in stdenv.mkDerivation { buildInputs = [ scons libX11 pkgconfig libusb1 boost glib dbus_glib]; meta = with stdenv.lib; { - homepage = "http://pingus.seul.org/~grumbel/xboxdrv/"; - description = - "Xbox/Xbox360 (and more) gamepad driver for Linux that works in userspace."; + homepage = http://pingus.seul.org/~grumbel/xboxdrv/; + description = "Xbox/Xbox360 (and more) gamepad driver for Linux that works in userspace"; license = licenses.gpl3Plus; maintainers = [ maintainers.fuuzetsu ]; }; diff --git a/pkgs/misc/drivers/xwiimote/default.nix b/pkgs/misc/drivers/xwiimote/default.nix new file mode 100644 index 000000000000..75e071a05ef1 --- /dev/null +++ b/pkgs/misc/drivers/xwiimote/default.nix @@ -0,0 +1,24 @@ +{ stdenv, udev, ncurses, pkgconfig, fetchurl, bluez }: + +stdenv.mkDerivation rec { + name = "xwiimote"; + src = fetchurl { + url = "https://github.com/dvdhrm/xwiimote/releases/download/xwiimote-2/xwiimote-2.tar.xz"; + sha256 = "1g9cbhblll47l300zr999xr51x2g98y49l222f77fhswd12kjzhd"; + }; + + buildInputs = [ udev ncurses pkgconfig bluez ]; + + configureFlags = "--with-doxygen=no"; + + meta = { + homepage = http://dvdhrm.github.io/xwiimote; + description = "Userspace utilities to control connected Nintendo Wii Remotes"; + platforms = stdenv.lib.platforms.linux; + }; + + postInstallPhase = '' + mkdir -p "$out/etc/X11/xorg.conf.d/" + cp "res/50-xorg-fix-xwiimote.conf" "$out/etc/X11/xorg.conf.d/50-fix-xwiimote.conf" + ''; +} diff --git a/pkgs/misc/emulators/atari800/default.nix b/pkgs/misc/emulators/atari800/default.nix index 5b1576bd97ca..c2a4c7d3d8b8 100644 --- a/pkgs/misc/emulators/atari800/default.nix +++ b/pkgs/misc/emulators/atari800/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; rom = fetchurl { url = mirror://sourceforge/atari800/xf25.zip; - md5 = "4dc3b6b4313e9596c4d474785a37b94d"; + sha256 = "12jbawxs04i0wm3910n7f3phsybdp8nndxc0xlsnzp8k0k8hmblq"; }; buildInputs = [unzip zlib SDL]; configureFlags = "--target=sdl"; diff --git a/pkgs/misc/emulators/darcnes/default.nix b/pkgs/misc/emulators/darcnes/default.nix index 15ab18495d27..12c76c89790a 100644 --- a/pkgs/misc/emulators/darcnes/default.nix +++ b/pkgs/misc/emulators/darcnes/default.nix @@ -2,7 +2,7 @@ assert stdenv.system == "i686-linux"; -stdenv.mkDerivation { +stdenv.mkDerivation { name = "darcnes-9b0401"; src = fetchurl { url = http://www.dridus.com/~nyef/darcnes/download/dn9b0401.tgz; @@ -22,7 +22,7 @@ stdenv.mkDerivation { homepage = http://www.dridus.com/~nyef/darcnes/; description = "Multi-System emulator, specially for NES"; /* Prohibited commercial use, credit required. */ - license = "free"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix index bf03e1e52aa9..275e6f065200 100644 --- a/pkgs/misc/emulators/dolphin-emu/default.nix +++ b/pkgs/misc/emulators/dolphin-emu/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ stdenv pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib + buildInputs = [ pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib gettext libpthreadstubs libXrandr libXext readline openal libXdmcp portaudio SDL wxGTK30 pulseaudio ]; @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { homepage = http://dolphin-emu.org/; description = "Gamecube/Wii/Triforce emulator for x86_64 and ARM"; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ MP2E ]; }; } diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index cf7cd5416901..becf5e60db6c 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -4,11 +4,11 @@ , pulseaudio ? null }: stdenv.mkDerivation rec { - name = "dolphin-emu-20141002"; + name = "dolphin-emu-20141201"; src = fetchgit { url = git://github.com/dolphin-emu/dolphin.git; - rev = "ed7f0739ae31c07c31d013964986c549317aba6e"; - sha256 = "01qwlkh3c0ij97zycq0v4kclxmnlbwcc1bmvjzl4cbczhxbbx4hk"; + rev = "54f1e3a3c148d36e694d8bb08d282225bdcb3440"; + sha256 = "1i0ps3ayga6m4v0jyflv2x6rr3cjrym0laafjdslggqkk04b2vjp"; fetchSubmodules = false; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ stdenv pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib + buildInputs = [ pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib gettext libpthreadstubs libXrandr libXext readline openal git libXdmcp portaudio SDL wxGTK30 pulseaudio ]; @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { homepage = http://dolphin-emu.org/; description = "Gamecube/Wii/Triforce emulator for x86_64 and ARM"; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ MP2E ]; }; } diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/misc/emulators/ppsspp/default.nix index 4c49e1e3af2d..732500be0fcf 100644 --- a/pkgs/misc/emulators/ppsspp/default.nix +++ b/pkgs/misc/emulators/ppsspp/default.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { homepage = "http://www.ppsspp.org/"; - description = "A PSP emulator, the Qt4 version."; + description = "A PSP emulator, the Qt4 version"; license = licenses.gpl2Plus; maintainers = [ maintainers.fuuzetsu ]; platforms = platforms.linux ++ platforms.darwin ++ platforms.cygwin; diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index db412eb883de..5da82ab3452d 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -9,7 +9,7 @@ let stdenv.lib.makeOverridable stdenv.mkDerivation rec { name = "libretro-${core}-${version}"; - version = "20140902"; + version = "20141109"; inherit src; buildInputs = [ makeWrapper retroarch zlib ] ++ a.extraBuildInputs or []; @@ -33,7 +33,7 @@ let inherit description; homepage = "http://www.libretro.com/"; license = licenses.gpl3Plus; - maintainers = [ maintainers.edwtjo ]; + maintainers = [ maintainers.edwtjo maintainers.MP2E ]; platforms = platforms.linux; }; } // a); @@ -53,8 +53,8 @@ in core = "4do"; src = fetchRetro { repo = core + "-libretro"; - rev = "961812bc421f3fbfd83ea211783bb511a0b6d31c"; - sha256 = "0217iq8sj8gn161c3mj632csl1da8ir2ffxxdillpcddv6ppsayl"; + rev = "be95d71e0a7f9cd5f378b9a9793ef38a16d81f26"; + sha256 = "0s8fs42xa01c2qaznhnlvi4syafgyzrw8lzz8l5lipyrzrawj9dm"; }; description = "Port of 4DO/libfreedo to libretro"; }).override { @@ -65,30 +65,32 @@ in core = "bsnes-mercury"; src = fetchRetro { repo = core; - rev = "cc44e91bfba6f7b3d1d3d51a9fa28b39a579f5e0"; - sha256 = "0nzwjrbfvzywsimrvp4vbpj7zxf9iwpghd9z7f9f1q027l0vj42f"; + rev = "41e0425b5e13be15c46be847ea00c757f241ab58"; + sha256 = "0i6lvf6m702pam8jngg9arcysmwm6g4cv83n987h9c0ny3lf0n90"; }; description = "Fork of bsnes with HLE DSP emulation restored"; }).override { buildPhase = "make && cd out"; }; - desmume = mkLibRetroCore rec { + desmume = (mkLibRetroCore rec { core = "desmume"; src = fetchRetro { - repo = core + "-libretro"; - rev = "1dd58e4a9fa375b6909cd8718165a429d4b8bd6d"; - sha256 = "137bw9316qxm8s6p0bzyvk39dv5b5bn60fgllmyj9z5y8x5lrc9l"; + repo = core; + rev = "4aefde628b35cda78a2bdf47f2f0a565c0a386a0"; + sha256 = "0rkf4vdjlqj850b28drjm4w3vq0jj02ipsbfhpr23i79n4r2pi5a"; }; description = "libretro wrapper for desmume NDS emulator"; + }).override { + configurePhase = "cd desmume"; }; fceumm = mkLibRetroCore rec { core = "fceumm"; src = fetchRetro { repo = "libretro-" + core; - rev = "17e081541c9d36d0658e7139afa5b085aa0316c9"; - sha256 = "0cn74z976rgjh7hf0yb1sdjlm347157893s2z397rgjvks8xssb0"; + rev = "1655de8b6ca8ad36287e04ac6179e6618521d41f"; + sha256 = "0v4kais1qhbc0nxaarc99cx3vnc5sgr2yp4ajh97wb90srsdkh46"; }; description = "FCEUmm libretro port"; }; @@ -97,8 +99,8 @@ in core = "fba"; src = fetchRetro { repo = core + "-libretro"; - rev = "da6355526a9b02a642447994414baababe904c1e"; - sha256 = "14kba506m9dnldmkpq3vgw416pm7cgc167hgm3f0l59ylp2592ff"; + rev = "586ea5e4a1bd61f3d209dfbf18bca66b1bbb92cc"; + sha256 = "0cqaqxirf5l1i4fwcdsjd7nnzb3xgfr5k9vdlj9y9k4viffd6drd"; }; description = "Port of Final Burn Alpha to libretro"; }).override { @@ -113,8 +115,8 @@ in core = "gambatte"; src = fetchRetro { repo = core + "-libretro"; - rev = "267a4e09bf8f0877483abdffde6295f29d7235ee"; - sha256 = "1swx3mjb6qmlg6grcakhl17vrmy4vdvimxkv5gbv6gnj5riya4vl"; + rev = "3283b2943a9164d3bb88bd62a20f74e33fffc058"; + sha256 = "0yl03zrb09n1w5ija38z7vi7vvaqdmy65v397g3bfm99rrl8g2kw"; }; description = "Gambatte libretro port"; }).override { @@ -125,18 +127,30 @@ in core = "genesis-plus-gx"; src = fetchRetro { repo = "Genesis-Plus-GX"; - rev = "c0015e27e3ae607ea0490b2accfe31097ef3cbce"; - sha256 = "1k4b5wib7nqzk53qwvhkh4a70gc4pq7vkrpvmfzp5f2c4vrbw1i7"; + rev = "67d86709a279422f2c3c769ac910682df29397db"; + sha256 = "18m03yjakjg2hcasrjqyz54r55vrn8wwq768zhk6x8gdnnhqc1hy"; }; description = "Enhanced Genesis Plus libretro port"; }; + mednafen-pce-fast = (mkLibRetroCore rec { + core = "mednafen-pce-fast"; + src = fetchRetro { + repo = "beetle-pce-fast-libretro"; + rev = "a26abf39887bb994f9b3e7645e46e6455e992729"; + sha256 = "0iws9fyw7m6wpr9vly66nzrfmiafrb96bnxidb1mdqgnldkwh8zi"; + }; + description = "Port of Mednafen's PC Engine core to libretro"; + }).override { + buildPhase = "make"; + }; + mupen64plus = (mkLibRetroCore rec { core = "mupen64plus"; src = fetchRetro { repo = core + "-libretro"; - rev = "2251b3aba2a5bb233ff49dd9b6472f2c0feb9b83"; - sha256 = "04g93kj6n5vddbzfb30d8n711kg0yxfnl5v567aa854misn6gfxd"; + rev = "fc97025211c82e4298034b9a7fe9f0a074c9eef7"; + sha256 = "04dq7rygfk47bix18a12cajb2k1k3absk5jmykcbg8znvcnlf4pi"; }; description = "Libretro port of Mupen64 Plus, GL only"; @@ -145,12 +159,24 @@ in buildPhase = "make WITH_DYNAREC=${if stdenv.system == "x86_64-linux" then "x86_64" else "x86"}"; }; + nestopia = (mkLibRetroCore rec { + core = "nestopia"; + src = fetchRetro { + repo = core; + rev = "d3d9ed1b3f8e32e8cbf90e72e8ed37d9fe1624c3"; + sha256 = "081dhxgr05m1warqga3fxmdnzyaa9c9bjw1b6glbsdgbl9iq4wq9"; + }; + description = "nestopia undead libretro port"; + }).override { + buildPhase = "cd libretro && make"; + }; + picodrive = (mkLibRetroCore rec { core = "picodrive"; src = fetchRetro { repo = core; - rev = "d84817550ac064fbba7ee718fb3baeda7d5546da"; - sha256 = "17zh9m2v7h1cifzz8dcwqm4wn94zyhz6g85gf0aw6xylxahza627"; + rev = "54c1a1e8c284ede3e0da887ec4ce088f78f7fc30"; + sha256 = "0qd3daxgq5jdp46gff6ih65nnksil8j26v0wdf798mignknq4p44"; }; description = "Fast MegaDrive/MegaCD/32X emulator"; @@ -164,8 +190,8 @@ in core = "prboom"; src = fetchRetro { repo = "libretro-" + core; - rev = "de2f0a0fab1a73a28cd501fdb9291ffc7dc357f5"; - sha256 = "01gxa6hh9vijic2n44q1lndhdyw0kdpmajabs0nizn7bni51b29c"; + rev = "5adbe263ce9771c8c5e007f94cfbb193979158ac"; + sha256 = "0yj8fy3ax52k9kmsf70g57dh889m80hjc3wqz9f3fp6xyxzpvz1j"; }; description = "Prboom libretro port"; }).override { @@ -176,13 +202,24 @@ in core = "ppsspp"; src = fetchRetro { repo = "libretro-" + core; - rev = "6ee828171218b26e124c5e8fa7877e6ee1d5ff79"; - sha256 = "1559d4k3h0a2dv3684j4w924p2dg8z2j1fwhy7w9mhb5z4kddjhk"; + rev = "a4956befd41f388ebfc28ea555e0f9325b76c1d3"; + sha256 = "0v91i6257b7rpdlylcswcxfkan6knswb166ia5y4yr8pldc1kbj6"; }; description = "ppsspp libretro port"; - extraBuildInputs = [ mesa ffmpeg ]; - }).override{ + }).override { + buildPhase = "cd libretro && make"; + }; + + quicknes = (mkLibRetroCore rec { + core = "quicknes"; + src = fetchRetro { + repo = "QuickNES_Core"; + rev = "06f83f603c52ad8fae197beca6fdf241ed338dc3"; + sha256 = "065yy5jm0b43xdn0dswp06h2b11dzvbyrsyjvigrax5mjy5mi6wd"; + }; + description = "QuickNES libretro port"; + }).override { buildPhase = "cd libretro && make"; }; @@ -190,22 +227,34 @@ in core = "scummvm"; src = fetchRetro { repo = core; - rev = "c00247171ba8201614e85556c638b8825dc9f225"; - sha256 = "1wir3x928b37va6gn14bmwsydkpk4afma5hppmbivw4qp8mj25pa"; + rev = "7dc8e24f1759dfca852014451dfca9103d8b1f04"; + sha256 = "12ya5g6d1bpsf332w5h49jjcxbr3dbjqiaddd3p7s6gzlyzzg1xf"; }; description = "Libretro port of ScummVM"; extraBuildInputs = [ fluidsynth libjpeg libvorbis mesa SDL ]; }).override { - buildPhase = "cd backends/platform/libretro/build/;make"; + buildPhase = "cd backends/platform/libretro/build && make"; + }; + + snes9x = (mkLibRetroCore rec { + core = "snes9x"; + src = fetchRetro { + repo = core; + rev = "e57447bbfd5daf62a00e1a31cfa400b419fe7963"; + sha256 = "06p7m8whazy9gih968f4nzdsp66n1fg6q3g2lbwwzj6izlli5cyg"; + }; + description = " Port of SNES9x git to libretro"; + }).override { + buildPhase = "cd libretro && make"; }; snes9x-next = mkLibRetroCore rec { core = "snes9x-next"; src = fetchRetro { repo = core; - rev = "461d92be09e1857d215f51aeea448a8e180bbfdd"; - sha256 = "0ci453qsyrv3brmy2szngis2xyvxilcv9yhc2qjz285mirg6fj57"; + rev = "8fd34aeadf421c758702d820dedb58a4d10b01a2"; + sha256 = "0vwg6qkpdqzkb4cvk50czl5g69qg8n5s2fhi9rvaq383ngv6sdsh"; }; description = "Optimized port/rewrite of SNES9x 1.52+ to Libretro"; }; @@ -214,22 +263,33 @@ in core = "stella"; src = fetchRetro { repo = core + "-libretro"; - rev = "c7ee7ca7e8a29c986f49306c75832972f5749f72"; - sha256 = "15wy9h3a2qk66lh8x40b3a9il0zkdflqil1h51zjmhq2zzsq8p95"; + rev = "31a455828e8f72c53283cb782e799ce54e4f1ee6"; + sha256 = "0ab7prnc2igbmzlh6gh7ln25c6767w4ypgskl1xsbn93k2dwzkpx"; }; description = "Port of Stella to libretro"; }).override { buildPhase = "make"; }; + vba-m = (mkLibRetroCore rec { + core = "vbam"; + src = fetchRetro { + repo = core + "-libretro"; + rev = "9b851867cffab8416edd89d8fe92bbad7f82810e"; + sha256 = "1n6wgxwcg7xm3vy0xigr1qbjkyxj5b2ih1pqpifjx83c47a9m9ka"; + }; + description = "vanilla VBA-M libretro port"; + }).override { + buildPhase = "cd src/libretro && make"; + }; + vba-next = mkLibRetroCore rec { core = "vba-next"; src = fetchRetro { repo = core; - rev = "fb095107f83df5f93b8ba4833eaf43901f42c0c0"; - sha256 = "0fvq1dfll27vjbmyh4qsp2nw166jsd91sjmf1sl84z56ab3q3iw8"; + rev = "97a74706f57a9d01c02cb764b5140185308f80c8"; + sha256 = "0m80bd843pvagbggi5xxnwljaijl97lcqml76n62zx4rzx8256y7"; }; - description = "VBA-M libretro port"; + description = "VBA-M libretro port with modifications for speed"; }; - -} \ No newline at end of file +} diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index d110f2b789e2..aa17bac73430 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -1,31 +1,32 @@ -{ stdenv, fetchgit, pkgconfig, which -, SDL, mesa, alsaLib -, libXxf86vm, libXinerama, libXv -}: +{ stdenv, fetchgit, pkgconfig, ffmpeg, mesa, nvidia_cg_toolkit +, freetype, libxml2, libv4l, coreutils, python34, which, udev, alsaLib +, libX11, libXext, libXxf86vm, libXdmcp, SDL, pulseaudio ? null }: stdenv.mkDerivation rec { - name = "retroarch-bare-0.9.9.7"; + name = "retroarch-bare-${version}"; + version = "20141109"; src = fetchgit { - url = "https://github.com/libretro/RetroArch.git"; - rev = "ea0c4880556e0f9d1fe8253ddc713bc743b00e1b"; - sha256 = "1jhyh7f8ijy67fxslxqsp8pjl2lwayjljp06hp4n5cn33yajpbd7"; + url = git://github.com/libretro/RetroArch.git; + rev = "88b21b87e7554860f4b252bc59ac99fa4032393e"; + sha256 = "0w2diklpv7wl6bmdw4msn90qn7f650q789crdawn63nbqg0rj8a2"; }; - buildInputs = [ - pkgconfig which SDL mesa alsaLib - libXxf86vm libXinerama libXv - ]; + buildInputs = [ pkgconfig ffmpeg mesa nvidia_cg_toolkit freetype libxml2 libv4l coreutils + python34 which udev alsaLib libX11 libXext libXxf86vm libXdmcp SDL pulseaudio ]; - preConfigure = '' - configureFlags="--global-config-dir=$out/etc" + patchPhase = '' + export GLOBAL_CONFIG_DIR=$out/etc + sed -e 's#/bin/true#${coreutils}/bin/true#' -i qb/qb.libs.sh ''; - meta = { - description = "Modular multi-system game/emulator system"; - homepage = "http://www.libretro.com/"; - license = stdenv.lib.licenses.gpl3Plus; + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = http://libretro.org/; + description = "Multi-platform emulator frontend for libretro cores"; + license = licenses.gpl3; platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ iyzsong ]; + maintainers = with maintainers; [ MP2E ]; }; } diff --git a/pkgs/misc/emulators/retroarch/master.nix b/pkgs/misc/emulators/retroarch/master.nix deleted file mode 100644 index 2efb43e5d5ee..000000000000 --- a/pkgs/misc/emulators/retroarch/master.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchgit, pkgconfig, ffmpeg, mesa, nvidia_cg_toolkit -, freetype, libxml2, libv4l, coreutils, python34, which, udev, alsaLib -, libX11, libXext, libXxf86vm, libXdmcp, SDL, pulseaudio ? null }: - -stdenv.mkDerivation rec { - name = "retroarch-bare-${version}"; - version = "20140902"; - - src = fetchgit { - url = git://github.com/libretro/RetroArch.git; - rev = "0856091296c2e47409f36e13007805d71db69483"; - sha256 = "152dfp6jd7yzvasqrqw4ydjbdcwq4khisia2dax3gydvxkq87nl4"; - }; - - buildInputs = [ pkgconfig ffmpeg mesa nvidia_cg_toolkit freetype libxml2 libv4l coreutils - python34 which udev alsaLib libX11 libXext libXxf86vm libXdmcp SDL pulseaudio ]; - - patchPhase = '' - export GLOBAL_CONFIG_DIR=$out/etc - sed -e 's#/bin/true#${coreutils}/bin/true#' -i qb/qb.libs.sh - ''; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = http://libretro.org/; - description = "Multi-platform emulator frontend for libretro cores"; - license = licenses.gpl3; - maintainers = with maintainers; [ MP2E ]; - }; -} diff --git a/pkgs/misc/emulators/retroarch/xbmc-advanced-launchers.nix b/pkgs/misc/emulators/retroarch/xbmc-advanced-launchers.nix index ec539cb43f95..3ff15aa1258a 100644 --- a/pkgs/misc/emulators/retroarch/xbmc-advanced-launchers.nix +++ b/pkgs/misc/emulators/retroarch/xbmc-advanced-launchers.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { anglescry advanced launcher for XBMC since device input is caught by both XBMC and the retroarch process. ''; - license = "GPL-3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/misc/emulators/stella/default.nix index 768d018ba51b..d26b5281efa5 100644 --- a/pkgs/misc/emulators/stella/default.nix +++ b/pkgs/misc/emulators/stella/default.nix @@ -1,14 +1,13 @@ -{ stdenv, fetchurl, pkgconfig -, SDL2 }: +{ stdenv, fetchurl, pkgconfig, SDL2 }: stdenv.mkDerivation rec { name = "stella-${version}"; - version = "4.0"; + version = "4.2"; src = fetchurl { url = "http://downloads.sourceforge.net/project/stella/stella/${version}/${name}-src.tar.gz"; - sha256 = "1j96sj2qflq3agb7fvb08ih3pxy8nsvlkwj40q3n00q9k884ad5w"; + sha256 = "0aikd7l5ill0vl5q06dg1wly8v9vav7wd78yjm6rmikd0cd2irzh"; }; buildInputs = with stdenv.lib; diff --git a/pkgs/misc/emulators/wine/unstable.nix b/pkgs/misc/emulators/wine/unstable.nix index 36437c4e57bf..aa99d696f5f2 100644 --- a/pkgs/misc/emulators/wine/unstable.nix +++ b/pkgs/misc/emulators/wine/unstable.nix @@ -7,12 +7,12 @@ assert stdenv.isLinux; assert stdenv.gcc.gcc != null; let - version = "1.7.28"; + version = "1.7.30"; name = "wine-${version}"; src = fetchurl { url = "mirror://sourceforge/wine/${name}.tar.bz2"; - sha256 = "04r3zk3dz2vzly2a4nqbcvppjs5iy3lq5ibx3wfrf877p5bz3hv7"; + sha256 = "0v08w2av46y4wxrl8q4k9fhbi2cgawjaxclahqnpfw098bqcmxqh"; }; gecko = fetchurl { diff --git a/pkgs/misc/frescobaldi/default.nix b/pkgs/misc/frescobaldi/default.nix new file mode 100644 index 000000000000..36b6b770bdad --- /dev/null +++ b/pkgs/misc/frescobaldi/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, pythonPackages, lilypond, pyqt4 }: + +pythonPackages.buildPythonPackage rec { + name = "frescobaldi-${version}"; + version = "2.0.16"; + + src = fetchurl { + url = "https://github.com/wbsoft/frescobaldi/releases/download/" + + "v2.0.16/${name}.tar.gz"; + sha256 = "12pabvq5b2lq84q3kx8lh02zh6ali6v4wnin2k2ycnm45mk9ms6q"; + }; + + propagatedBuildInputs = with pythonPackages; [ lilypond + pyqt4 poppler-qt4 ]; + + patches = [ ./setup.cfg.patch ./python-path.patch ]; + + meta = with stdenv.lib; { + homepage = http://frescobaldi.org/; + description = ''Frescobaldi is a LilyPond sheet music text editor''; + longDescription = '' + Powerful text editor with syntax highlighting and automatic completion, + Music view with advanced Point & Click, Midi player to proof-listen + LilyPond-generated MIDI files, Midi capturing to enter music, + Powerful Score Wizard to quickly setup a music score, Snippet Manager + to store and apply text snippets, templates or scripts, Use multiple + versions of LilyPond, automatically selects the correct version, Built-in + LilyPond documentation browser and built-in User Guide, Smart + layout-control functions like coloring specific objects in the PDF, + MusicXML import, Modern user iterface with configurable colors, + fonts and keyboard shortcuts + ''; + license = licenses.gpl2Plus; + maintainers = [ maintainers.sepi ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/misc/frescobaldi/python-path.patch b/pkgs/misc/frescobaldi/python-path.patch new file mode 100644 index 000000000000..6c54d9f208ec --- /dev/null +++ b/pkgs/misc/frescobaldi/python-path.patch @@ -0,0 +1,11 @@ +diff -u frescobaldi-2.0.16.old/frescobaldi frescobaldi-2.0.16/frescobaldi +--- frescobaldi-2.0.16/frescobaldi 2014-10-24 11:29:28.705687224 +0200 ++++ frescobaldi-2.0.16.new/frescobaldi 2014-10-24 11:31:08.086444793 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/env python + import sys + import frescobaldi_app.main + import app +Common subdirectories: frescobaldi-2.0.16/frescobaldi_app and frescobaldi-2.0.16.new/frescobaldi_app +Common subdirectories: frescobaldi-2.0.16/macosx and frescobaldi-2.0.16.new/macosx diff --git a/pkgs/misc/frescobaldi/setup.cfg.patch b/pkgs/misc/frescobaldi/setup.cfg.patch new file mode 100644 index 000000000000..502cdd61966d --- /dev/null +++ b/pkgs/misc/frescobaldi/setup.cfg.patch @@ -0,0 +1,13 @@ +Common subdirectories: frescobaldi-2.0.16.old/build and frescobaldi-2.0.16/build +Common subdirectories: frescobaldi-2.0.16.old/frescobaldi_app and frescobaldi-2.0.16/frescobaldi_app +Common subdirectories: frescobaldi-2.0.16.old/macosx and frescobaldi-2.0.16/macosx +diff -u frescobaldi-2.0.16.old/setup.cfg frescobaldi-2.0.16/setup.cfg +--- frescobaldi-2.0.16.old/setup.cfg 2012-02-05 07:08:24.000000000 +0100 ++++ frescobaldi-2.0.16/setup.cfg 2014-10-24 15:08:48.141335620 +0200 +@@ -1,6 +1,2 @@ +-[bdist_wininst] +-bitmap=frescobaldi-wininst.bmp +-install-script=frescobaldi-wininst.py +- + [sdist] + force-manifest=1 diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index b8c879d598ba..9e753d8f8302 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -3,70 +3,19 @@ , libiconvOrEmpty , x11Support ? false, x11 ? null , cupsSupport ? false, cups ? null -, gnuFork ? true }: assert x11Support -> x11 != null; assert cupsSupport -> cups != null; -let - meta_common = { - homepage = "http://www.gnu.org/software/ghostscript/"; - description = "PostScript interpreter (GNU version)"; - - longDescription = '' - Ghostscript is the name of a set of tools that provides (i) an - interpreter for the PostScript language and the PDF file format, - (ii) a set of C procedures (the Ghostscript library) that - implement the graphics capabilities that appear as primitive - operations in the PostScript language, and (iii) a wide variety - of output drivers for various file formats and printers. - ''; - - license = stdenv.lib.licenses.gpl3Plus; - - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.viric ]; - }; - - gnuForkSrc = rec { - name = "ghostscript-9.04.1"; - src = fetchurl { - url = "mirror://gnu/ghostscript/gnu-${name}.tar.bz2"; - sha256 = "0zqa6ggbkdqiszsywgrra4ij0sddlmrfa50bx2mh568qid4ga0a2"; - }; - - meta = meta_common; - patches = [ ./purity.patch ]; - }; +stdenv.mkDerivation rec { + name = "ghostscript-9.15"; - mainlineSrc = rec { - name = "ghostscript-9.06"; - src = fetchurl { - url = "http://downloads.ghostscript.com/public/${name}.tar.bz2"; - sha256 = "014f10rxn4ihvcr1frby4szd1jvkrwvmdhnbivpp55c9fssx3b05"; - }; - meta = meta_common // { - homepage = "http://www.ghostscript.com/"; - description = "PostScript interpreter (mainline version)"; - }; - - preConfigure = '' - rm -R libpng jpeg lcms{,2} tiff freetype jbig2dec expat openjpeg - - substituteInPlace base/unix-aux.mak --replace "INCLUDE=/usr/include" "INCLUDE=/no-such-path" - sed "s@if ( test -f \$(INCLUDE)[^ ]* )@if ( true )@" -i base/unix-aux.mak - ''; - patches = []; + src = fetchurl { + url = "http://downloads.ghostscript.com/public/${name}.tar.bz2"; + sha256 = "0p1isp6ssfay141klirn7n9s8b546vcz6paksfmksbwy0ljsypg6"; }; - variant = if gnuFork then gnuForkSrc else mainlineSrc; - -in - -stdenv.mkDerivation rec { - inherit (variant) name src meta; - fonts = [ (fetchurl { url = "mirror://sourceforge/gs-fonts/ghostscript-fonts-std-8.11.tar.gz"; @@ -91,34 +40,56 @@ stdenv.mkDerivation rec { # [] # maybe sometimes jpeg2000 support ; - CFLAGS = "-fPIC"; - NIX_LDFLAGS = - "-lz -rpath${ if stdenv.isDarwin then " " else "="}${freetype}/lib"; + patches = [ ./urw-font-files.patch ]; - patches = variant.patches ++ [ ./urw-font-files.patch ]; - - preConfigure = '' - # "ijs" is impure: it contains symlinks to /usr/share/automake etc.! - rm -rf ijs/ltmain.sh - - # Don't install stuff in the Cups store path. - makeFlagsArray=(CUPSSERVERBIN=$out/lib/cups CUPSSERVERROOT=$out/etc/cups CUPSDATA=$out/share/cups) - '' + stdenv.lib.optionalString (variant ? preConfigure) variant.preConfigure; + makeFlags = [ "cups_serverroot=$(out)" "cups_serverbin=$(out)/lib/cups" ]; configureFlags = - [ "--with-system-libtiff" + [ "--with-system-libtiff" "--disable-sse2" + "--enable-dynamic" (if x11Support then "--with-x" else "--without-x") - (if cupsSupport then "--enable-cups --with-install-cups" else "--disable-cups") + (if cupsSupport then "--enable-cups" else "--disable-cups") ]; doCheck = true; installTargets="install soinstall"; - # ToDo: web says the fonts should be already included + #CFLAGS = "-fPIC"; + #NIX_LDFLAGS = + # "-lz -rpath${ if stdenv.isDarwin then " " else "="}${freetype}/lib"; + + preConfigure = '' + rm -rf jpeg libpng zlib jasper expat tiff lcms{,2} jbig2dec openjpeg freetype cups/libs + + sed "s@if ( test -f \$(INCLUDE)[^ ]* )@if ( true )@; s@INCLUDE=/usr/include@INCLUDE=/no-such-path@" -i base/unix-aux.mak + ''; + postInstall = '' + # ToDo: web says the fonts should be already included for i in $fonts; do (cd $out/share/ghostscript && tar xvfz $i) done + + rm -rf $out/lib/cups/filter/{gstopxl,gstoraster} ''; + + meta = { + homepage = "http://www.ghostscript.com/"; + description = "PostScript interpreter (mainline version)"; + + longDescription = '' + Ghostscript is the name of a set of tools that provides (i) an + interpreter for the PostScript language and the PDF file format, + (ii) a set of C procedures (the Ghostscript library) that + implement the graphics capabilities that appear as primitive + operations in the PostScript language, and (iii) a wide variety + of output drivers for various file formats and printers. + ''; + + license = stdenv.lib.licenses.gpl3Plus; + + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.viric ]; + }; } diff --git a/pkgs/misc/ghostscript/purity.patch b/pkgs/misc/ghostscript/purity.patch deleted file mode 100644 index 1c92ecf593a7..000000000000 --- a/pkgs/misc/ghostscript/purity.patch +++ /dev/null @@ -1,26 +0,0 @@ -Don't look for files under `/usr/include' since we don't have that directory -under NixOS. - ---- gnu-ghostscript-8.64.0/base/unix-aux.mak 2009-04-19 19:00:20.000000000 +0200 -+++ gnu-ghostscript-8.64.0/base/unix-aux.mak 2009-04-27 11:58:31.000000000 +0200 -@@ -103,13 +103,13 @@ $(MKROMFS_XE): $(GLSRC)mkromfs.c $(MKROM - # The "else true;" is required because Ultrix's implementation of sh -e - # terminates execution of a command if any error occurs, even if the command - # traps the error with ||. --INCLUDE=/usr/include -+INCLUDE=/no-such-path - $(gconfig__h): $(UNIX_AUX_MAK) $(ECHOGS_XE) - $(ECHOGS_XE) -w $(gconfig__h) -x 2f2a -s This file was generated automatically by unix-aux.mak. -s -x 2a2f -- if ( test -f $(INCLUDE)/dirent.h ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_DIRENT_H; else true; fi -- if ( test -f $(INCLUDE)/ndir.h ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_NDIR_H; else true; fi -- if ( test -f $(INCLUDE)/sys/dir.h ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_SYS_DIR_H; else true; fi -- if ( test -f $(INCLUDE)/sys/ndir.h ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_SYS_NDIR_H; else true; fi -- if ( test -f $(INCLUDE)/sys/time.h ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_SYS_TIME_H; else true; fi -- if ( test -f $(INCLUDE)/sys/times.h ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_SYS_TIMES_H; else true; fi -+ if ( true ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_DIRENT_H; else true; fi -+ if ( true ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_NDIR_H; else true; fi -+ if ( true ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_SYS_DIR_H; else true; fi -+ if ( true ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_SYS_NDIR_H; else true; fi -+ if ( true ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_SYS_TIME_H; else true; fi -+ if ( true ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_SYS_TIMES_H; else true; fi - if ( test -f $(JSRCDIR)/jmemsys.h); then true; else $(ECHOGS_XE) -a $(gconfig__h) -x 23 define DONT_HAVE_JMEMSYS_H; fi diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix index 3f1c1a9a57b1..3dd3f4378def 100644 --- a/pkgs/misc/lilypond/default.nix +++ b/pkgs/misc/lilypond/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec{ - majorVersion="2.16"; + majorVersion="2.18"; minorVersion="2"; version="${majorVersion}.${minorVersion}"; name = "lilypond-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec{ src = fetchurl { url = "http://download.linuxaudio.org/lilypond/sources/v${majorVersion}/lilypond-${version}.tar.gz"; - sha256 = "1jx11bk3rk3w7bnh0829yy280627ywsvwg6fhdm0fqwkiz7jchqz"; + sha256 = "01xs9x2wjj7w9appaaqdhk15r1xvvdbz9qwahzhppfmhclvp779j"; }; preConfigure='' diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix index 1c0dc0cbfe9b..7d37576e4cdb 100644 --- a/pkgs/misc/my-env/default.nix +++ b/pkgs/misc/my-env/default.nix @@ -72,20 +72,21 @@ mkDerivation { phases = [ "buildPhase" "fixupPhase" ]; setupNew = substituteAll { src = ../../stdenv/generic/setup.sh; - initialPath= (import ../../stdenv/common-path.nix) { inherit pkgs; }; inherit gcc; }; - buildPhase = '' + buildPhase = let + initialPath = import ../../stdenv/common-path.nix { inherit pkgs; }; + in '' set -x mkdir -p "$out/dev-envs" "$out/nix-support" "$out/bin" s="$out/nix-support/setup-new-modified" - cp "$setupNew" "$s" # shut some warning up.., do not use set -e sed -e 's@set -e@@' \ -e 's@assertEnvExists\s\+NIX_STORE@:@' \ -e 's@trap.*@@' \ - -i "$s" + -e '1i initialPath="${toString initialPath}"' \ + "$setupNew" > "$s" cat >> "$out/dev-envs/''${name/env-/}" << EOF nativeBuildInputs="$nativeBuildInputs" propagatedBuildInputs="$propagatedBuildInputs2" @@ -131,7 +132,7 @@ mkDerivation { echo "\$tmp/script"; source "\$tmp/script"; fi - rm -fr "\$tmp" + ${pkgs.coreutils}/bin/rm -fr "\$tmp" ${extraCmds} nix_cleanup() { diff --git a/pkgs/misc/sails/default.nix b/pkgs/misc/sails/default.nix new file mode 100644 index 000000000000..ab68dc69015d --- /dev/null +++ b/pkgs/misc/sails/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, cmake, pkgconfig, gtk3, librsvg }: + +stdenv.mkDerivation rec { + version = "0.1.1"; + name = "sails-${version}"; + src = fetchurl { + url = "https://github.com/kragniz/sails/archive/v${version}.tar.gz"; + sha256 = "0k55ib6cb78filgq3yrdib69qrzsny0209bq6h0v1yigry0sa62v"; + }; + + buildInputs = [ cmake pkgconfig gtk3 librsvg ]; + + meta = with stdenv.lib; { + description = "Simulator for autonomous sailing boats"; + homepage = https://github.com/kragniz/sails; + license = licenses.gpl3; + longDescription = '' + Sails is a simulator designed to test the AI of autonomous sailing + robots. It emulates the basic physics of sailing a small single sail + boat''; + maintainers = maintainers.kragniz; + platforms = platforms.all; + }; +} diff --git a/pkgs/misc/screensavers/rss-glx/default.nix b/pkgs/misc/screensavers/rss-glx/default.nix index bc1504ab2e9b..a41fe5afb9ee 100644 --- a/pkgs/misc/screensavers/rss-glx/default.nix +++ b/pkgs/misc/screensavers/rss-glx/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { src = fetchurl { url = mirror://sourceforge/rss-glx/rss-glx_0.8.1.tar.bz2; - md5 = "a2bdf0e10ee4e89c8975f313c5c0ba6f"; + sha256 = "1fs2xavyf9i6vcdmdnpyi9rbnrg05ldd49bvlcwpn5igv2g400yg"; }; buildInputs = [x11 mesa pkgconfig imagemagick libtiff bzip2]; diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix index 7e750d9c9b37..1e7d908fd955 100644 --- a/pkgs/misc/screensavers/xlockmore/default.nix +++ b/pkgs/misc/screensavers/xlockmore/default.nix @@ -2,23 +2,20 @@ stdenv.mkDerivation rec { - name = "xlockmore-5.43"; + name = "xlockmore-5.45"; src = fetchurl { url = "http://www.tux.org/~bagleyd/xlock/${name}/${name}.tar.bz2"; - sha256 = "1l36n8x51j7lwdalv6yi37cil290vzd3djjqydhsm0pnm8hiz499"; + sha256 = "1xqm61bbfn5q056w57vp16gvai8nqpcw570ysxlm5h46nh6ai0bz"; }; # Optionally, it can use GTK+. buildInputs = [ pam x11 ]; - # The `xlock' program needs to be linked against Glibc's - # `libgcrypt', which contains `crypt(3)'. - patches = [ ./makefile-libcrypt.patch ]; - # Don't try to install `xlock' setuid. Password authentication works # fine via PAM without super user privileges. configureFlags = - " --with-crypt" # TODO: set --enable-appdefaultdir to a suitable value + " --with-crypt" + + " --enable-appdefaultdir=$out/share/X11/app-defaults" + " --disable-setuid" + " --without-editres" + " --without-xpm" @@ -38,9 +35,15 @@ stdenv.mkDerivation rec { + " --without-gtk" + (if pam != null then " --enable-pam --enable-bad-pam" else " --disable-pam"); - meta = { + preConfigure = '' + configureFlags+=" --enable-appdefaultdir=$out/share/X11/app-defaults" + ''; + + meta = with stdenv.lib; { description = "Screen locker for the X Window System"; - homepage = "http://www.tux.org/~bagleyd/xlockmore.html"; - license = "GPL"; + homepage = http://www.tux.org/~bagleyd/xlockmore.html; + license = licenses.gpl2; + maintainers = with maintainers; [ pSub ]; + platforms = platforms.linux; }; } diff --git a/pkgs/misc/screensavers/xlockmore/makefile-libcrypt.patch b/pkgs/misc/screensavers/xlockmore/makefile-libcrypt.patch deleted file mode 100644 index df31a00a13b8..000000000000 --- a/pkgs/misc/screensavers/xlockmore/makefile-libcrypt.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xlockmore-5.24/modes/Makefile.in 2007-01-22 23:02:07.000000000 +0100 -+++ xlockmore-5.24/modes/Makefile.in 2008-02-11 17:24:34.000000000 +0100 -@@ -326,7 +326,7 @@ CFLAGS = @CFLAGS@ - CXXFLAGS = @CXXFLAGS@ - #CFLAGS = -O - #CFLAGS = -g --XLOCKLDFLAGS = @XLOCKLDFLAGS@ $(CHECKLDFLAG) -+XLOCKLDFLAGS = @XLOCKLDFLAGS@ $(CHECKLDFLAG) -lcrypt - XLIBS = @XLIBS@ - XLOCKLIBS = $(MODULELIB) @XLOCKLIBS@ - diff --git a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix index c3d846c566ce..100b280ef576 100644 --- a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix +++ b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix @@ -2,12 +2,12 @@ cmake, dbus_glib, glib, gtk, gdk_pixbuf, pkgconfig, xorg }: stdenv.mkDerivation rec { - version = "1.4.5"; + version = "1.4.6"; name = "oxygen-gtk2-${version}"; src = fetchurl { url = "mirror://kde/stable/oxygen-gtk2/${version}/src/${name}.tar.bz2"; - sha256 = "00ykq4aafakdkvww7kz84bvg9wc2gdji4m7z87f49hj1jxm84v2v"; + sha256 = "09mz4szsz3yswbj0nbw6qzlc5bc4id0f9r6ifm60b5nc8x1l72d2"; }; buildInputs = [ cmake dbus_glib glib gtk gdk_pixbuf diff --git a/pkgs/misc/themes/gtk3/oxygen-gtk3/default.nix b/pkgs/misc/themes/gtk3/oxygen-gtk3/default.nix index 34141c91f91f..2cceee62447d 100644 --- a/pkgs/misc/themes/gtk3/oxygen-gtk3/default.nix +++ b/pkgs/misc/themes/gtk3/oxygen-gtk3/default.nix @@ -2,12 +2,12 @@ , cmake, dbus_glib, glib, gtk3, gdk_pixbuf, pkgconfig, xorg }: stdenv.mkDerivation rec { - version = "1.4.0"; + version = "1.4.1"; name = "oxygen-gtk3-${version}"; src = fetchurl { url = "mirror://kde/stable/oxygen-gtk3/${version}/src/${name}.tar.bz2"; - sha256 = "d119bcc94ffc04b67e7d238fc922b37f2904447085a06758451b8c0b0302ab80"; + sha256 = "0pd7wjzh5xgd24yg6b2avaiz1aq6rmh13d7c0jclffkmhmy24r0f"; }; buildInputs = [ cmake dbus_glib glib gtk3 gdk_pixbuf diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 8dd17c074a7a..af75adf2976d 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1,12 +1,8 @@ -{ fetchurl, bash, stdenv, python, cmake, vim, perl, ruby, unzip, which, fetchgit, clang }: +# TODO check that no license information gets lost +{ fetchurl, bash, stdenv, python, cmake, vim, perl, ruby, unzip, which, fetchgit, fetchzip, llvmPackages, zip }: /* -About Vim and plugins -===================== -Let me tell you how Vim plugins work, so that you can decide on how to orginize -your setup. - -typical plugin files: +Typical plugin files: plugin/P1.vim autoload/P1.vim @@ -18,64 +14,24 @@ Traditionally plugins were installed into ~/.vim/* so it was your task to keep t of which files belong to what plugin. Now this problem is "fixed" by nix which assembles your profile for you. - Vim offers the :h rtp setting which works for most plugins. Thus adding adding this to your .vimrc should make most plugins work: - set rtp+=~/.nix-profile/vim-plugins/YouCompleteMe - " or for p in ["YouCompleteMe"] | exec 'set rtp+=~/.nix-profile/vim-plugins/'.p | endfor - -Its what pathogen, vundle, vim-addon-manager (VAM) use. - -VAM's benefits: -- allows activating plugins at runtime, eg when you need them. (works around - some au command hooks, eg required for TheNerdTree plugin) -- VAM checkous out all sources (vim.sf.net, git, mercurial, ...) -- runs :helptags on update/installation only. Obviously it cannot do that on - store paths. -- it reads addon-info.json files which can declare dependencies by name - (without version) - -VAM is made up of -- the code loading plugins -- an optional pool (github.com/MarcWeber/vim-addon-manager-known-repositories) - -That pool probably is the best source to automatically derive plugin -information from or to lookup about how to get data from www.vim.org. - -I'm not sure we should package them all. Most of them are not used much. -You need your .vimrc anyway, and then VAM gets the job done ? - -How to install VAM? eg provide such a bash function: - - vim-install-vam () { - mkdir -p ~/.vim/vim-addons && git clone --depth=1 git://github.com/MarcWeber/vim-addon-manager.git ~/.vim/vim-addons/vim-addon-manager && cat >> ~/.vimrc <<EOF - set nocompatible - set hidden - filetype indent plugin on | syn on - fun ActivateAddons() - let g:vim_addon_manager = {} - let g:vim_addon_manager.log_to_buf =1 - set runtimepath+=~/.vim/vim-addons/vim-addon-manager - call vam#ActivateAddons([]) - endf - call ActivateAddons() - EOF - } + set rtp+=~/.nix-profile/share/vim-plugins/youcompleteme + " or for p in ["youcompleteme"] | exec 'set rtp+=~/.nix-profile/share/vim-plugins/'.p | endfor -Marc Weber thinks that having no plugins listed might be better than having -outdated ones. +Its what pathogen, vundle, vim-addon-manager (VAM) and others use. +Learn about some differences by visiting http://vim-wiki.mawercer.de/wiki/topic/vim%20plugin%20managment.html. -So which plugins to add here according to what Marc Weber thinks is best? -Complicated plugins requiring dependencies, such as YouCompleteMe. -Then its best to symlink ~/.nix-profile/vim-plugins/YouCompleteMe to -~/.vim/{vim-addons,bundle} or whatever plugin management solution you use. - -If you feel differently change the comments and proceed. +If you want Nix to create a .vimrc for you have a look at vimrc in all-packages.nix. +It also contains VAM code illustrating how to make VAM find plugins in arbitrary locations */ # provide a function creating tag files for vim help documentation (doc/*.txt) -let vimHelpTags = '' + +let rtpPath = "share/vim-plugins"; + + vimHelpTags = '' vimHelpTags(){ if [ -d "$1/doc" ]; then ${vim}/bin/vim -N -u NONE -i NONE -n -e -s -c "helptags $1/doc" +quit! @@ -83,102 +39,189 @@ let vimHelpTags = '' } ''; - # install a simple standard vim plugin - simpleDerivation = a@{name, src, path, buildPhase ? "", ...} : stdenv.mkDerivation (a // { - inherit buildPhase; - - installPhase = '' - target=$out/share/vim-plugins/${path} - mkdir -p $out/share/vim-plugins - cp -r . $target - ${vimHelpTags} - vimHelpTags $target - ''; - }); - -in rec - -{ - - vimAddonNix = { - # github.com/MarcWeber/vim-addon-nix provides some additional support for - # editing .nix files + addRtp = path: derivation: + derivation // { rtp = "${derivation}/${path}"; }; + + buildVimPlugin = a@{ + name, + namePrefix ? "vimplugin-", + src, + buildPhase ? "", + path ? (builtins.parseDrvName name).name, + ... + }: + addRtp "${rtpPath}/${path}" (stdenv.mkDerivation (a // { + name = namePrefix + name; + + inherit buildPhase; + + installPhase = '' + target=$out/${rtpPath}/${path} + mkdir -p $out/${rtpPath} + cp -r . $target + ${vimHelpTags} + vimHelpTags $target + ''; + })); + +in + +# The attr names in this set should be equal to names used in the vim-pi project [1] so that +# VAM's dependencies work. How to find the name? +# * http://vam.mawercer.de/ or VAM's +# * grep vim-pi +# * use VAM's completion or :AddonsInfo command +# +# How to create derivations? Experimental derivation creation is provided by VAM, example usage: +# call nix#ExportPluginsForNix({'path_to_nixpkgs': '/etc/nixos/nixpkgs', 'names': ["vim-addon-manager", "vim-addon-nix"], 'cache_file': 'cache'}) +# +# [1] https://bitbucket.org/vimcommunity/vim-pi +/* + Some of the plugin definitions below are generated the following VimL command + provided by vim-addon-manager. + + " Copy /tmp/tmp.vim file and run: :source /tmp/tmp.vim + call nix#ExportPluginsForNix({ + \ 'path_to_nixpkgs': '/etc/nixos/nixpkgs', + \ 'cache_file': '/tmp/vim2nix-cache', + \ 'names': [ + \ "vim-addon-syntax-checker", + \ "vim-addon-other", + \ "vim-addon-local-vimrc", + \ "snipmate", + \ "vim-snippets", + \ "vim-addon-mru", + \ "vim-addon-commenting", + \ "vim-addon-sql", + \ "vim-addon-async", + \ "vim-addon-toggle-buffer", + \ "vim-addon-mw-utils", + \ "matchit.zip", + \ "vim-addon-xdebug", + \ "vim-addon-php-manual", + \ "sourcemap.vim", + \ "vim-iced-coffee-script", + \ "ctrlp", + \ "commentary", + \ "Colour_Sampler_Pack", + \ "Solarized", + \ "vim-coffee-script", + \ "vim-easy-align", + \ "Tagbar", + \ "Tabular", + \ "table-mode", + \ "Syntastic", + \ "vim-signature", + \ "surround", + \ "Supertab", + \ "rust", + \ "rainbow_parentheses", + \ "pathogen", + \ "quickfixstatus", + \ "The_NERD_Commenter", + \ "The_NERD_tree", + \ "vim-latex-live-preview", + \ "Hoogle", + \ "Gundo", + \ "vim-gitgutter", + \ "Gist", + \ "ghcmod", + \ "fugitive", + \ "extradite", + \ "vim-airline", + \ "VimOutliner", + \ "vim2hs", + \ "undotree", + \ "UltiSnips", + \ "wombat256", + \ "vundle", + \ "WebAPI", + \ "YankRing", + \ "vim-addon-manager", + \ "vim-addon-nix", + \ "YUNOcommit" + \ ], + \ }) + +# TODO: think about how to add license information? +*/ - # This is a placeholder, because I think you always should be using latest - # git version. It also depends on some additional plugins (see addon-info.json) - }; +rec { + inherit rtpPath; - YouCompleteMe = stdenv.mkDerivation { + a = buildVimPlugin { + name = "a-git-2010-11-06"; src = fetchgit { - url = "https://github.com/Valloric/YouCompleteMe.git"; - rev = "a2cae90f7ba1746bf1209edd6739f87d5914b375"; - sha256 = "1yxrxskxnr2da5awm59ra4s9wg67rimcbazvln9bayg9saxs540d"; + url = "https://github.com/vim-scripts/a.vim.git"; + rev = "2cbe946206ec622d9d8cf2c99317f204c4d41885"; + sha256 = "ca0982873ed81e7f6545a6623b735104c574fe580d5f21b0aa3dc1557edac240"; }; + meta = { + homepage = https://github.com/vim-scripts/a.vim; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; - name = "youcompleteme-20140929"; # commit date - buildInputs = [ python cmake clang.clang ]; - - configurePhase = ":"; - - buildPhase = '' - patchShebangs . - - target=$out/share/vim-plugins/YouCompleteMe - mkdir -p $target - cp -a ./ $target - - mkdir $target/build - cd $target/build - cmake -G "Unix Makefiles" . $target/third_party/ycmd/cpp -DPYTHON_LIBRARIES:PATH=${python}/lib/libpython2.7.so -DPYTHON_INCLUDE_DIR:PATH=${python}/include/python2.7 -DUSE_CLANG_COMPLETER=ON -DUSE_SYSTEM_LIBCLANG=ON - make ycm_support_libs -j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}} - ${bash}/bin/bash $target/install.sh --clang-completer --system-libclang + airline = vim-airline; - ${vimHelpTags} - vimHelpTags $target - ''; + align = buildVimPlugin { + name = "align-git-2012-08-07"; + src = fetchgit { + url = "https://github.com/vim-scripts/align.git"; + rev = "787662fe90cd057942bc5b682fd70c87e1a9dd77"; + sha256 = "f7b5764357370f03546556bd45558837f3790b0e86afadb63cd04d714a668a29"; + }; + meta = { + homepage = https://github.com/vim-scripts/align; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; - # TODO: implement proper install phase rather than keeping everything in store - # TODO: support llvm based C completion, See README of git repository - installPhase = ":"; + alternative = a; # backwards compat, added 2014-10-21 + calendar = buildVimPlugin { + name = "calendar-git-2014-10-19"; + src = fetchgit { + url = "https://github.com/itchyny/calendar.vim.git"; + rev = "44890a96d80bcd5fe62307e4bcb4d4085010e324"; + sha256 = "55f38e3e0af0f95229c654420c332668f93ac941f044c0573c7f1b26030e9202"; + }; meta = { - description = "fastest non utf-8 aware word and C completion engine for Vim"; - homepage = http://github.com/Valloric/YouCompleteMe; - license = stdenv.lib.licenses.gpl3; - maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = stdenv.lib.platforms.linux; + homepage = https://github.com/itchyny/calendar.vim; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; }; }; - syntastic = simpleDerivation rec { - version = "3.4.0"; - name = "vim-syntastic-${version}"; + coffee-script = vim-coffee-script; - src = fetchurl { - url = "https://github.com/scrooloose/syntastic/archive/${version}.tar.gz"; - sha256 = "0h8vfs6icpfwc41qx6n6rc1m35haxp2gaswg9fhcki2w2ikp6knb"; - }; + coffeeScript = coffee-script; # backwards compat, added 2014-10-18 - path = "syntastic"; - }; + colors-solarized = Solarized; + + colorsamplerpack = Colour_Sampler_Pack; - coffeeScript = simpleDerivation { - name = "vim-coffee-script-v002"; + Colour_Sampler_Pack = buildVimPlugin { + name = "Colour_Sampler_Pack"; src = fetchurl { - url = "https://github.com/vim-scripts/vim-coffee-script/archive/v002.tar.gz"; - sha256 = "1xln6i6jbbihcyp5bsdylr2146y41hmp2xf7wi001g2ymj1zdsc0"; + url = "http://www.vim.org/scripts/download_script.php?src_id=18915"; + name = "ColorSamplerPack.zip"; + sha256 = "1wsrb3vpqn9fncnalfpvc8r92wk1mcskm4shb3s2h9x5dyihf2rd"; + }; + buildInputs = [ unzip ]; + dependencies = []; + meta = { + url = "http://www.vim.org/scripts/script.php?script_id=625"; }; - path = "vim-coffee-script"; }; - command_T = simpleDerivation rec { + command-t = buildVimPlugin rec { version = "1.8"; - name = "vim-command-t-${version}"; - src = fetchurl { + name = "command-t-${version}"; + src = fetchzip { + inherit name; url = "https://github.com/wincent/Command-T/archive/${version}.tar.gz"; - sha256 = "ad8664292e6eee40fbe195d856d20d93a8630e8c0149317ad72cc39423630800"; + sha256 = "186qz1smf7w91r68p724whg6d821f7ph6ks63l2vkhff8f9qqhrc"; }; - path = "Command-T"; buildInputs = [ perl ruby ]; buildPhase = '' pushd ruby/command-t @@ -188,14 +231,50 @@ in rec ''; }; - eighties = simpleDerivation rec { + command_T = command-t; # backwards compat, added 2014-10-18 + + commentary = buildVimPlugin { + name = "commentary"; + src = fetchgit { + url = "git://github.com/tpope/vim-commentary"; + rev = "401dbd8abee69defe66acf5e9ccc85e2746c27e2"; + sha256 = "3deec79d6c40a6c91fa504423f38c9f6a9e3495804f1996e2420d0ad34fe2da8"; + }; + dependencies = []; + }; + + ctrlp = buildVimPlugin { + name = "ctrlp"; + src = fetchgit { + url = "git://github.com/kien/ctrlp.vim"; + rev = "b5d3fe66a58a13d2ff8b6391f4387608496a030f"; + sha256 = "41f7884973770552395b96f8693da70999dc815462d4018c560d3ff6be462e76"; + }; + dependencies = []; + }; + + easy-align = vim-easy-align; + + easymotion = buildVimPlugin { + name = "easymotion-git-2014-09-29"; + src = fetchgit { + url = "https://github.com/lokaltog/vim-easymotion.git"; + rev = "868cd71710a48e8ec8acffeabd1eebfb10812c77"; + sha256 = "13c8b93c257fcbb0f6e0eb197700b4f8cbe4cf4846d29f1aba65f625202b9d77"; + }; + meta = { + homepage = https://github.com/lokaltog/vim-easymotion; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + eighties = buildVimPlugin rec { version = "1.0.4"; - name = "vim-eighties-${version}"; + name = "eighties-${version}"; src = fetchurl { url = "https://github.com/justincampbell/vim-eighties/archive/${version}.tar.gz"; sha256 = "0cjd9hbg2qd7jjkvyi15f9ysp7m3aa2sg8nvbf80yb890rfkwaqr"; }; - path = "eighties"; meta = with stdenv.lib; { description = "Automatically resizes your windows to 80 characters"; homepage = https://github.com/justincampbell/vim-eighties; @@ -205,455 +284,1081 @@ in rec }; }; - golang = simpleDerivation { - name = "vim-golang-20131127"; + extradite = buildVimPlugin { + name = "extradite"; + src = fetchgit { + url = "git://github.com/int3/vim-extradite"; + rev = "af4f3a51b6b654d655121b93c0cd9d8fe9a0c85d"; + sha256 = "d1d29cfbc654134be383747f2cd6b14b7a87de75f997af6a041f14d7ef61ade6"; + }; + dependencies = []; + }; + + fugitive = buildVimPlugin { + name = "fugitive"; + src = fetchgit { + url = "git://github.com/tpope/vim-fugitive"; + rev = "0374322ba5d85ae44dd9dc44ef31ca015a59097e"; + sha256 = "3bb09693726c4f9fc1695bc8b40c45d64a6a0f1d9a4243b4a79add841013ad6c"; + }; + dependencies = []; + }; + + ghc-mod-vim = ghcmod; + + ghcmod = buildVimPlugin { + name = "ghcmod"; + src = fetchgit { + url = "git://github.com/eagletmt/ghcmod-vim"; + rev = "d5c6c7f3c85608b5b76dc3e7e001f60b86c32cb9"; + sha256 = "ab56d470ea18da3fae021e22bba14460505e61a94f8bf707778dff5eec51cd6d"; + }; + dependencies = []; + }; + + Gist = buildVimPlugin { + name = "Gist"; + src = fetchgit { + url = "git://github.com/mattn/gist-vim"; + rev = "d609d93472db9cf45bd701bebe51adc356631547"; + sha256 = "e5cabc03d5015c589a32f11c654ab9fbd1e91d26ba01f4b737685be81852c511"; + }; + buildInputs = [ zip ]; + dependencies = []; + }; + + gist-vim = Gist; + + gitgutter = vim-gitgutter; + + golang = buildVimPlugin { + name = "golang-git-2014-08-06"; src = fetchgit { url = "https://github.com/jnwhiteh/vim-golang.git"; - rev = "832d64e5a813511ed52217aa24f0255c49671bab"; - sha256 = "6858eb674be132477c5dc7f7d3cbe550371f90d1aba480547a614965412a7b3c"; + rev = "e6d0c6a72a66af2674b96233c4747661e0f47a8c"; + sha256 = "1231a2eff780dbff4f885fcb4f656f7dd70597e1037ca800470de03bf0c5e7af"; + }; + meta = { + homepage = https://github.com/jnwhiteh/vim-golang; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; }; - path = "golang"; - meta = with stdenv.lib; { - description = "Vim plugins for Go"; - homepage = https://github.com/jnwhiteh/vim-golang; - license = licenses.publicDomain; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; + }; + + Gundo = buildVimPlugin { + name = "Gundo"; + src = fetchgit { + url = "https://bitbucket.org/sjl/gundo.vim"; + rev = ""; + sha256 = ""; }; + dependencies = []; }; - ipython = simpleDerivation { - name = "vim-ipython-ff8f88f3fe518851a91dc88aaa5a75f8f352a960"; - src = fetchurl { - url = "https://github.com/ivanov/vim-ipython/archive/ff8f88f3fe518851a91dc88aaa5a75f8f352a960.tar.gz"; - sha256 = "0hlx526dm8amrvh41kwnmgvvdzs6sh5yc5sfq4nk1zjkfcp1ah5j"; + gundo = Gundo; + + hardtime = buildVimPlugin { + name = "hardtime-git-2014-10-21"; + src = fetchgit { + url = "https://github.com/takac/vim-hardtime.git"; + rev = "b401c72528d1c23e4cc9bc9585fda4361d0199bf"; + sha256 = "65e4bda7531076147fc46f496c8e56c740d1fcf8fe85c18cb2d2070d0c3803cd"; + }; + meta = { + homepage = https://github.com/takac/vim-hardtime; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; }; - path = "ipython"; - meta = with stdenv.lib; { - description = "A two-way integration between vim and iPython"; - homepage = https://github.com/ivanov/vim-ipython; - repositories.git = https://github.com/ivanov/vim-ipython.git; - license = licenses.publicDomain; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; + }; + + haskellconceal = buildVimPlugin { + name = "haskellconceal-git-2014-08-07"; + src = fetchgit { + url = "https://github.com/twinside/vim-haskellconceal.git"; + rev = "1d85e8f10b675d38ec117368ec8032f486c27f98"; + sha256 = "8ae762939ea435333031a094f3c63e6edd534ac849f0008fa0440440f1f2f633"; + }; + meta = { + homepage = https://github.com/twinside/vim-haskellconceal; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; }; }; - taglist = simpleDerivation { - name = "vim-taglist-4.6"; - meta = with stdenv.lib; { - description = "Source code browser plugin"; - homepage = "http://www.vim.org/scripts/script.php?script_id=273"; - license = licenses.gpl3; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; + haskellConceal = haskellconceal; # backwards compat, added 2014-10-18 + + hasksyn = buildVimPlugin { + name = "hasksyn-git-2014-09-03"; + src = fetchgit { + url = "https://github.com/travitch/hasksyn.git"; + rev = "c434040bf13a17ca20a551223021b3ace7e453b9"; + sha256 = "b1a735928aeca7011b83133959d59b9c95ab8535fd00ce9968fae4c3b1381931"; + }; + meta = { + homepage = https://github.com/travitch/hasksyn; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; }; - src = fetchurl { - url = "http://www.vim.org/scripts/download_script.php?src_id=19574"; - name = "taglist_46.zip"; - sha256 = "18cbv462vwg7vip2p99qlahm99hswav96cj4ki227kyi05q2lkjj"; + }; + + hdevtools = buildVimPlugin { + name = "hdevtools-git-2012-12-29"; + src = fetchgit { + url = "https://github.com/bitc/vim-hdevtools.git"; + rev = "474947c52ff9c93dd36f3c49de90bd9a78f0baa1"; + sha256 = "bf5f096b665c51ce611c6c1bfddc3267c4b2f94af84b04482b07272a6a5a92f3"; + }; + meta = { + homepage = https://github.com/bitc/vim-hdevtools; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; }; - setSourceRoot = '' - export sourceRoot=taglist - mkdir taglist - mv doc taglist - mv plugin taglist - ''; - buildInputs = [ unzip ]; - path = "taglist"; }; - tagbar = simpleDerivation rec { - version = "2.6.1"; - name = "vim-tagbar-${version}"; + hier = buildVimPlugin { + name = "hier-git-2011-08-27"; + src = fetchgit { + url = "https://github.com/jceb/vim-hier.git"; + rev = "0b8c365263551a67404ebd7e528c55e17c1d3de7"; + sha256 = "f62836545abfe379f9c5410da28409947407cd282ef784b2db89aed0756a1785"; + }; + buildInputs = [ vim ]; + meta = { + homepage = https://github.com/jceb/vim-hier; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; - meta = with stdenv.lib; { - description = "A vim plugin for browsing the tags of source code files"; - homepage = https://github.com/majutsushi/tagbar; - license = licenses.gpl3; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; + Hoogle = buildVimPlugin { + name = "Hoogle"; + src = fetchgit { + url = "git://github.com/Twinside/vim-hoogle"; + rev = "81f28318b0d4174984c33df99db7752891c5c4e9"; + sha256 = "0f96f3badb6218cac87d0f7027ff032ecc74f08ad3ada542898278ce11cbd5a0"; }; + dependencies = []; + }; - src = fetchurl { - url = "https://github.com/majutsushi/tagbar/archive/v${version}.tar.gz"; - sha256 = "c061a7e0a45a166f4558b31e6c47b9fd701f5fa1319527b65a268ea054dea5fb"; + hoogle = Hoogle; + + idris-vim = buildVimPlugin { + name = "idris-vim-git-2014-10-14"; + src = fetchgit { + url = "https://github.com/idris-hackers/idris-vim.git"; + rev = "78730e511cae0a067f79da1168466601553f619b"; + sha256 = "47638b25fa53203e053e27ec6f135fd63ae640edbe37e62d7450a8c434a4cc6b"; + }; + meta = { + homepage = https://github.com/idris-hackers/idris-vim; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; }; + }; - path = "tagbar"; + ipython = buildVimPlugin { + name = "ipython-git-2014-07-17"; + src = fetchgit { + url = "https://github.com/ivanov/vim-ipython.git"; + rev = "9ce4f201ce26e9f01d56a6040ddf9255aab27272"; + sha256 = "444dede544f9b519143ecc3a6cdfef0c4c32043fc3cd69f92fdcd86c1010e824"; + }; + meta = { + homepage = https://github.com/ivanov/vim-ipython; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; }; - xdebug = simpleDerivation { - name = "vim-xdebug-a4980fa65f7f159780593ee37c178281691ba2c4"; - src = fetchurl { - url = "https://github.com/joonty/vim-xdebug/archive/a4980fa65f7f159780593ee37c178281691ba2c4.tar.gz"; - sha256 = "1348gzp0zhc2wifvs5vmf92m9y8ik8ldnvy7bawsxahy8hmhiksk"; + latex-box = buildVimPlugin { + name = "latex-box-git-2014-10-05"; + src = fetchgit { + url = "https://github.com/latex-box-team/latex-box.git"; + rev = "3e000fb161bdf6efe7aef517aef276554aeabb65"; + sha256 = "462803aceec5904943074e11888482ef6c49c8a5e26d6728ebcb2c4f5dbbb6a4"; + }; + meta = { + homepage = https://github.com/latex-box-team/latex-box; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; }; - path = "xdebug"; - postInstall = false; }; - vimshell = simpleDerivation rec { - version = "9.2"; - name = "vimshell-${version}"; + latex-live-preview = vim-latex-live-preview; - meta = with stdenv.lib; { - description = "An extreme shell that doesn't depend on external shells and is written completely in Vim script"; - homepage = https://github.com/Shougo/vimshell.vim; - repositories.git = https://github.com/Shougo/vimshell.vim.git; - license = licenses.gpl3; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; + lushtags = buildVimPlugin { + name = "lushtags-git-2013-12-27"; + src = fetchgit { + url = "https://github.com/bitc/lushtags.git"; + rev = "429fab3b748ae04ee5de0cbf75d947f15441e798"; + sha256 = "5170019fbe64b15be30a0ba82e6b01364d115ccad6ef690a6df86f73af22a0a7"; + }; + meta = { + homepage = https://github.com/bitc/lushtags; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; }; + }; + matchit.zip = buildVimPlugin { + name = "matchit.zip"; src = fetchurl { - url = "https://github.com/Shougo/vimshell.vim/archive/ver.${version}.tar.gz"; - sha256 = "1pbwxdhpv6pr09b6hwkgy7grpmpwlqpsgsawl38r40q6yib8zb4a"; + url = "http://www.vim.org/scripts/download_script.php?src_id=8196"; + name = "matchit.zip"; + sha256 = "1bbm8j1bhb70kagwdimwy9vcvlrz9ax5bk2a7wrmn4cy87f9xj4l"; }; + buildInputs = [ unzip ]; + dependencies = []; + meta = { + url = "http://www.vim.org/scripts/script.php?script_id=39"; + }; + }; - buildInputs = [ vimproc ]; + neco-ghc = buildVimPlugin { + name = "neco-ghc-git-2014-10-17"; + src = fetchgit { + url = "https://github.com/eagletmt/neco-ghc.git"; + rev = "fffdf57dcb312f874a43a202157b5efecfe3d9de"; + sha256 = "464b24e3151ebaf0e95c25f09cb047e2542d5dd9100087e538d0a5e46bd0e638"; + }; + meta = { + homepage = https://github.com/eagletmt/neco-ghc; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; - preBuild = '' - sed -ie '1 i\ - set runtimepath+=${vimproc}/share/vim-plugins/vimproc\ - ' autoload/vimshell.vim - ''; + necoGhc = neco-ghc; # backwards compat, added 2014-10-18 - path = "vimshell"; + neocomplete = buildVimPlugin { + name = "neocomplete-git-2014-11-18"; + src = fetchgit { + url = "https://github.com/Shougo/neocomplete.vim.git"; + rev = "26aef680ece29047089e7540b78696f1e6336be2"; + sha256 = "42734ddb29f6661de687e0d18c5ddbd443adc6d2f69fe8e44d0e47473f1bc0ae"; + }; + meta = { + homepage = https://github.com/Shougo/neocomplete.vim; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; }; - vimproc = simpleDerivation rec { - version = "7788b5f934bc7460c1e9134b51fe5690b21de83c"; - name = "vimproc-${version}"; - - meta = with stdenv.lib; { - description = "An asynchronous execution library for Vim"; - homepage = https://github.com/Shougo/vimproc.vim; - repositories.git = https://github.com/Shougo/vimproc.vim.git; - license = licenses.gpl3; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; + neosnippet = buildVimPlugin { + name = "neosnippet-git-2014-11-18"; + src = fetchgit { + url = "https://github.com/Shougo/neosnippet.vim.git"; + rev = "811176b29b1a60a164c9878f8dcbe4a680ee32e5"; + sha256 = "903b6fa01511e319e5ce3efa3a7007047512f5f7ee7d61b69cd4a324420cf718"; + }; + meta = { + homepage = https://github.com/Shougo/neosnippet.vim; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; }; + }; + neosnippet-snippets = buildVimPlugin { + name = "neosnippet-snippets-git-2014-11-17"; src = fetchgit { - url = "https://github.com/Shougo/vimproc.vim.git"; - rev = "${version}"; - sha256 = "0ahmnzccf5rv8rwg7b6pfgxh8pcmq955aznjv64slyh0mjqmh6jl"; + url = "https://github.com/Shougo/neosnippet-snippets.git"; + rev = "a15cdc307a62d64c3510b4a1097a8bd174746894"; + sha256 = "8d69b93163dd93474422bf4f362130151f25e2c9fad3500ba170161c24bf5bce"; }; + meta = { + homepage = https://github.com/Shougo/neosnippet-snippets; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; - buildInputs = [ which ]; + nerdcommenter = The_NERD_Commenter; + + nerdtree = The_NERD_tree; + + pathogen = buildVimPlugin { + name = "pathogen"; + src = fetchgit { + url = "git://github.com/tpope/vim-pathogen"; + rev = "91e6378908721d20514bbe5d18d292a0a15faf0c"; + sha256 = "24c1897d6b58576b2189c90050a7f8ede72a51343c752e9d030e833dbe5cac6f"; + }; + dependencies = []; + }; + + quickfixstatus = buildVimPlugin { + name = "quickfixstatus"; + src = fetchgit { + url = "git://github.com/dannyob/quickfixstatus"; + rev = "fd3875b914fc51bbefefa8c4995588c088163053"; + sha256 = "7b6831d5da1c23d95f3158c67e4376d32c2f62ab2e30d02d3f3e14dcfd867d9b"; + }; + dependencies = []; + }; + + quickrun = buildVimPlugin { + name = "quickrun-git-2014-10-08"; + src = fetchgit { + url = "https://github.com/thinca/vim-quickrun.git"; + rev = "ae97cef42ae142306e9431dce9ab97c4353e5254"; + sha256 = "3219fadb3732c895c82b8bcff1d6e86f0917cd5ac7bf34180c27bb3f75ed1787"; + }; + meta = { + homepage = https://github.com/thinca/vim-quickrun; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + racer = buildVimPlugin { + name = "racer-git-2014-11-24"; + src = fetchgit { + url = https://github.com/phildawes/racer; + rev = "50655ffd509bea09ea9b310970dedfeaf5a33cf3"; + sha256 = "0bd456i4nz12z39ljnw1kjg8mcflvm7rjql2r80fb038c7rd6xi1"; + }; buildPhase = '' - sed -i 's/vimproc_mac\.so/vimproc_unix\.so/' autoload/vimproc.vim - make -f make_unix.mak + find . -type f -not -name 'racer.vim' -exec rm -rf {} \; + mkdir plugin + mv ./editors/racer.vim plugin/racer.vim + rm -rf editors images src ''; + meta = { + homepage = https://github.com/phildawes/racer; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; - path = "vimproc"; + rainbow_parentheses = buildVimPlugin { + name = "rainbow_parentheses"; + src = fetchgit { + url = "git://github.com/kien/rainbow_parentheses.vim"; + rev = "eb8baa5428bde10ecc1cb14eed1d6e16f5f24695"; + sha256 = "47975a426d06f41811882691d8a51f32bc72f590477ed52b298660486b2488e3"; + }; + dependencies = []; }; - colorsamplerpack = simpleDerivation rec { - version = "2012.10.28"; - name = "vim-colorsamplerpack-${version}"; + rust = buildVimPlugin { + name = "rust"; + src = fetchgit { + url = "git://github.com/wting/rust.vim"; + rev = "0cf510adc5a83ad4c256f576fd36b38c74349d43"; + sha256 = "839f4ea2e045fc41fa2292882576237dc36d714bd78e46728c6696c44d2851d8"; + }; + dependencies = []; + }; - setSourceRoot = "sourceRoot=."; - src = fetchurl { - url = "http://www.vim.org/scripts/download_script.php?src_id=18915"; - name = "colorsamplerpack.zip"; - sha256 = "1wsrb3vpqn9fncnalfpvc8r92wk1mcskm4shb3s2h9x5dyihf2rd"; + shabadou = buildVimPlugin { + name = "shabadou-git-2014-07-27"; + src = fetchgit { + url = "https://github.com/osyo-manga/shabadou.vim.git"; + rev = "c5af30bb0c028d53cfd89e00cab636c844034a9a"; + sha256 = "392efa8a5e725219e478b571d9a30ddba88d47662467ed3123a168e8b55c4de6"; + }; + meta = { + homepage = https://github.com/osyo-manga/shabadou.vim; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; }; + }; - buildInputs = [ unzip ]; + signature = vim-signature; - path = "colorsamplerpack"; + snipmate = buildVimPlugin { + name = "snipmate"; + src = fetchgit { + url = "git://github.com/garbas/vim-snipmate"; + rev = "e6eb057a58e2fe98137997157d0eff9d1a975888"; + sha256 = "4d8f9091b92a75f21d96a6f6a862aa4ad5671ab8317ceef4498eeb14a1524190"; + }; + dependencies = ["vim-addon-mw-utils" "tlib"]; }; - yankring = simpleDerivation rec { - version = "18.0"; - name = "vim-yankring-${version}"; + Solarized = buildVimPlugin { + name = "Solarized"; + src = fetchgit { + url = "git://github.com/altercation/vim-colors-solarized"; + rev = "528a59f26d12278698bb946f8fb82a63711eec21"; + sha256 = "a1b2ef696eee94dafa76431c31ee260acdd13a7cf87939f27eca431d5aa5a315"; + }; + dependencies = []; + }; - setSourceRoot = "sourceRoot=."; - src = fetchurl { - url = "http://www.vim.org/scripts/download_script.php?src_id=20842"; - name = "yankring_180.zip"; - sha256 = "0bsq4pxagy12jqxzs7gcf25k5ahwif13ayb9k8clyhm0jjdkf0la"; + sourcemap.vim = buildVimPlugin { + name = "sourcemap.vim"; + src = fetchgit { + url = "git://github.com/chikatoike/sourcemap.vim"; + rev = "0dd82d40faea2fdb0771067f46c01deb41610ba1"; + sha256 = "a08c77aea39be4a0a980d62673d1d17fecc518a8aeb9101210e453aaacb78fbd"; }; + dependencies = []; + }; - buildInputs = [ unzip ]; + stylish-haskell = buildVimPlugin { + name = "stylish-haskell-git-2014-07-14"; + src = fetchgit { + url = "https://github.com/nbouscal/vim-stylish-haskell.git"; + rev = "453fd203aee3d7305ea8e4088ff53bd1f5933d75"; + sha256 = "c0e5010e1e8e56b179ce500387afb569f051c45b37ce92feb4350f293df96a8c"; + }; + meta = { + homepage = https://github.com/nbouscal/vim-stylish-haskell; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + stylishHaskell = stylish-haskell; # backwards compat, added 2014-10-18 - path = "yankring"; + Supertab = buildVimPlugin { + name = "Supertab"; + src = fetchgit { + url = "git://github.com/ervandew/supertab"; + rev = "fd4e0d06c2b1d9bff2eef1d15e7895b3b4da7cd7"; + sha256 = "5919521b95519d4baa8ed146c340ca739fa7f31dfd305c74ca0ace324ba93d74"; + }; + dependencies = []; }; - ctrlp = simpleDerivation rec { - version = "1.79"; - name = "vim-ctrlp-${version}"; + supertab = Supertab; - setSourceRoot = "sourceRoot=."; - src = fetchurl { - url = "http://www.vim.org/scripts/download_script.php?src_id=19448"; - name = "ctrlp_180.zip"; - sha256 = "1x9im8g0g27mxc3c9k7v0jg5bb1dmnbjygmqif5bizab5g69n2mi"; + surround = buildVimPlugin { + name = "surround"; + src = fetchgit { + url = "git://github.com/tpope/vim-surround"; + rev = "fa433e0b7330753688f715f3be5d10dc480f20e5"; + sha256 = "5f01daf72d23fc065f4e4e8eac734275474f32bfa276a9d90ce0d20dfe24058d"; }; + dependencies = []; + }; - buildInputs = [ unzip ]; + Syntastic = buildVimPlugin { + name = "Syntastic"; + src = fetchgit { + url = "git://github.com/scrooloose/syntastic"; + rev = "e4c94d67a9ba7f35397b4a2f0daa8f346a84a8b9"; + sha256 = "366b5568ddf0db0e35a19bbd3ae4d0dc4accaefe5fdd14159540d26a76e3a96e"; + }; + dependencies = []; + }; + + syntastic = Syntastic; + + table-mode = buildVimPlugin { + name = "table-mode"; + src = fetchgit { + url = "git://github.com/dhruvasagar/vim-table-mode"; + rev = "ea78f6256513b4b853ea01b55b18baf0f9d99f8c"; + sha256 = "570a9660b17489ec6a976d878aec45470bc91c8da41f0e3ab8f09962683b2da7"; + }; + dependencies = []; + }; + + tabmerge = buildVimPlugin { + name = "tabmerge-git-2010-10-17"; + src = fetchgit { + url = "https://github.com/vim-scripts/tabmerge.git"; + rev = "074e5f06f26e7108a0570071a0f938a821768c06"; + sha256 = "b84501b0fc5cd51bbb58f12f4c2b3a7c97b03fe2a76446b56a2c111bd4f7335f"; + }; + meta = { + homepage = https://github.com/vim-scripts/tabmerge; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; - path = "ctrlp"; + Tabular = buildVimPlugin { + name = "Tabular"; + src = fetchgit { + url = "git://github.com/godlygeek/tabular"; + rev = "60f25648814f0695eeb6c1040d97adca93c4e0bb"; + sha256 = "28c860ad621587f2c3213fae47d1a3997746527c17d51e9ab94c209eb7bfeb0f"; + }; + dependencies = []; + }; + + tabular = Tabular; + + Tagbar = buildVimPlugin { + name = "Tagbar"; + src = fetchgit { + url = "git://github.com/majutsushi/tagbar"; + rev = "5283bc834a8c39b058d5eef1173e323b23b04fa0"; + sha256 = "ed2bcbbb9caf476251cbbe650fc685b9e781390f9966f0c75ff02da0677deb1c"; + }; + dependencies = []; }; - alternate = stdenv.mkDerivation rec { - version = "2.18"; - name = "vim-a-${version}"; + tagbar = Tagbar; + taglist = buildVimPlugin { + name = "taglist-4.6"; + meta = with stdenv.lib; { + description = "Source code browser plugin"; + homepage = "http://www.vim.org/scripts/script.php?script_id=273"; + license = licenses.gpl3; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.unix; + }; src = fetchurl { - url = "http://www.vim.org/scripts/download_script.php?src_id=7218"; - name = "a.vim"; - sha256 = "1q22vfkv60sshp9yj3mmfc8azavgzz7rpmaf72iznzq4wccy6gac"; - }; - unpackPhase = ":"; - installPhase = '' - mkdir -p $out/share/vim-plugins/vim-a - cp ${src} $out/share/vim-plugins/vim-a/a.vim + url = "http://www.vim.org/scripts/download_script.php?src_id=19574"; + name = "taglist_46.zip"; + sha256 = "18cbv462vwg7vip2p99qlahm99hswav96cj4ki227kyi05q2lkjj"; + }; + setSourceRoot = '' + export sourceRoot=taglist + mkdir taglist + mv doc taglist + mv plugin taglist ''; + buildInputs = [ unzip ]; }; - vundle = simpleDerivation { - name = "vundle-vim-git-0b28e334"; + The_NERD_Commenter = buildVimPlugin { + name = "The_NERD_Commenter"; src = fetchgit { - url = "https://github.com/gmarik/Vundle.vim.git"; - rev = "0b28e334e65b6628b0a61c412fcb45204a2f2bab"; - sha256 = "9681d471d1391626cb9ad22b2b469003d9980cd23c5c3a8d34666376447e6204"; + url = "git://github.com/scrooloose/nerdcommenter"; + rev = "6549cfde45339bd4f711504196ff3e8b766ef5e6"; + sha256 = "ef270ae5617237d68b3d618068e758af8ffd8d3ba27a3799149f7a106cfd178e"; + }; + dependencies = []; + }; + + The_NERD_tree = buildVimPlugin { + name = "The_NERD_tree"; + src = fetchgit { + url = "git://github.com/scrooloose/nerdtree"; + rev = "f8fd2ecce20f5005e6313ce57d6d2a209890c946"; + sha256 = "b86f8923d4068add210101d34c5272b575dcb1c1352992ee878af59db581fd75"; + }; + dependencies = []; + }; + + thumbnail = buildVimPlugin { + name = "thumbnail-git-2014-07-24"; + src = fetchgit { + url = "https://github.com/itchyny/thumbnail.vim.git"; + rev = "e59a1791862ed470510a58456cc001226e177a39"; + sha256 = "f36d915804e36b5f2dcea7db481da97ec60d0c90df87599a5d5499e649d97f66"; }; - path = "vundle"; + meta = { + homepage = https://github.com/itchyny/thumbnail.vim; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + tlib = buildVimPlugin { + name = "tlib"; + src = fetchgit { + url = "git://github.com/tomtom/tlib_vim"; + rev = "88c5a2427e12397f9b5b1819e3d80c2eebe2c411"; + sha256 = "6cbbeb7fcda26028f73836ce3bae880db3e250cf8289804e6e28cb914854b7de"; + }; + dependencies = []; + }; + + tmux-navigator = buildVimPlugin { + name = "tmux-navigator-git-2014-09-09"; + src = fetchgit { + url = "https://github.com/christoomey/vim-tmux-navigator.git"; + rev = "195cdf087fea7beaf6274d0a655d157dfab3130c"; + sha256 = "4235c2bfb64a9094b854cdd7303a64bbb994717f24704911c4b358b2373dfaa9"; + }; + meta = { + homepage = https://github.com/christoomey/vim-tmux-navigator; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; }; - tslime = simpleDerivation { - name = "tslime-vim-git-e801a32b"; + tmuxNavigator = tmux-navigator; # backwards compat, added 2014-10-18 + + tslime = buildVimPlugin { + name = "tslime-git-2014-06-12"; src = fetchgit { url = "https://github.com/jgdavey/tslime.vim.git"; rev = "e801a32b27d83cb5d91afbf7c3d71bb6220f32bd"; sha256 = "47fb7165c1dcc444285cdff6fa89bbd4ace82ca79ec14ba0da6091c5f78d1251"; }; - path = "tslime"; + meta = { + homepage = https://github.com/jgdavey/tslime.vim; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; }; - supertab = simpleDerivation { - name = "supertab-git-23db5585"; + UltiSnips = buildVimPlugin { + name = "UltiSnips"; src = fetchgit { - url = "https://github.com/ervandew/supertab.git"; - rev = "23db558596d4a73e4afa8fbedcde23b95bf72251"; - sha256 = "21fa675969f4cfd2686ab3b63cba632fa55d62481e61d36193403bea9c02ebde"; - }; - path = "supertab"; - buildInputs = [ vim ]; + url = "git://github.com/sirver/ultisnips"; + rev = "cb8536d7240f5f458c292f8aa38fc50278222fe8"; + sha256 = "95bc88fc3dae45896893797cff9bb697f3701572c27442898c661d004b50be16"; + }; + dependencies = []; }; - fugitive = simpleDerivation { - name = "vim-fugitive-git-90ee6fb5"; + undotree = buildVimPlugin { + name = "undotree"; src = fetchgit { - url = "https://github.com/tpope/vim-fugitive.git"; - rev = "90ee6fb5d255d14d9f12f2469f92ee50149f5b44"; - sha256 = "0297512f7fee62af601a99a68617591ecb2e244475ff0d79ebee9c7e6eff2eaf"; - }; - path = "fugitive"; + url = "git://github.com/mbbill/undotree"; + rev = "88e4a9bc2f7916f24441faf884853a01ba11d294"; + sha256 = "ad55b88db051f57d0c7ddc226a7b7778daab58fa67dc8ac1d78432c0e7d38520"; + }; + dependencies = []; }; - extradite = simpleDerivation { - name = "vim-extradite-git-af4f3a51"; + vim-addon-actions = buildVimPlugin { + name = "vim-addon-actions"; src = fetchgit { - url = "https://github.com/int3/vim-extradite.git"; - rev = "af4f3a51b6b654d655121b93c0cd9d8fe9a0c85d"; - sha256 = "d1d29cfbc654134be383747f2cd6b14b7a87de75f997af6a041f14d7ef61ade6"; - }; - path = "extradite"; + url = "git://github.com/MarcWeber/vim-addon-actions"; + rev = "a5d20500fb8812958540cf17862bd73e7af64936"; + sha256 = "d2c3eb7a1f29e7233c6fcf3b02d07efebe8252d404ee593419ad399a5fdf6383"; + }; + dependencies = ["vim-addon-mw-utils" "tlib"]; }; - nerdtree = simpleDerivation { - name = "nerdtree-git-4f1e6ecb"; + vim-addon-async = buildVimPlugin { + name = "vim-addon-async"; src = fetchgit { - url = "https://github.com/scrooloose/nerdtree.git"; - rev = "4f1e6ecb057fc0bac189171c1430d71ef25f6bb1"; - sha256 = "67ff2e7b9a7f39e58e9e334b1b79343a4c11aae10a657ab4fece289d8fe59300"; - }; - path = "nerdtree"; + url = "git://github.com/MarcWeber/vim-addon-async"; + rev = "dadc96e188f1cdacbac62129eb29a1eacfed792c"; + sha256 = "27f941e21a8ca5940bd20914e2a9e3809e554f3ef2c27b3bafb9a153107a5d07"; + }; + dependencies = ["vim-addon-signs"]; }; - airline = simpleDerivation { - name = "vim-airline-git-2114e702"; + vim-addon-background-cmd = buildVimPlugin { + name = "vim-addon-background-cmd"; src = fetchgit { - url = "https://github.com/bling/vim-airline.git"; - rev = "2114e7025188a941e5c63b1f942d576adb98d8a4"; - sha256 = "b6fc4d0545f8b7e107c5f80b94cf536a2b1fdd55d9f2484a29a007911e96130f"; - }; - path = "airline"; + url = "git://github.com/MarcWeber/vim-addon-background-cmd"; + rev = "14df72660a95804a57c02b9ff0ae3198608e2491"; + sha256 = "5c2ece1f3ff7653eb7c1b40180554e8e89e5ae43d67e7cc159d95c0156135687"; + }; + dependencies = ["vim-addon-mw-utils"]; }; - ultisnips = simpleDerivation { - name = "ultisnips-git-279d6e63"; + vim-addon-commenting = buildVimPlugin { + name = "vim-addon-commenting"; src = fetchgit { - url = "https://github.com/SirVer/ultisnips.git"; - rev = "279d6e63c9a8dbaa20ffc43c3c5f057dfc8f1121"; - sha256 = "f8d93849ef2bce798aa599ba860694ced37d12450010a48dd6bd3004bc52b503"; - }; - path = "ultisnips"; + url = "git://github.com/MarcWeber/vim-addon-commenting"; + rev = "b7cf748ac1c9bf555cbd347589e3b7196030d20b"; + sha256 = "4ad7d5f6669f0a1b4a24c9ce3649c030d7d3fc8588de4d4d6c3269140fbe9b3e"; + }; + dependencies = []; }; - align = simpleDerivation { - name = "align-git-787662fe"; + vim-addon-completion = buildVimPlugin { + name = "vim-addon-completion"; src = fetchgit { - url = "https://github.com/vim-scripts/Align.git"; - rev = "787662fe90cd057942bc5b682fd70c87e1a9dd77"; - sha256 = "f7b5764357370f03546556bd45558837f3790b0e86afadb63cd04d714a668a29"; - }; - path = "align"; + url = "git://github.com/MarcWeber/vim-addon-completion"; + rev = "80f717d68df5b0d7b32228229ddfd29c3e86e435"; + sha256 = "c8c0af8760f2622c4caef371482916861f68a850eb6a7cd746fe8c9ab405c859"; + }; + dependencies = ["tlib"]; }; - gundo = simpleDerivation { - name = "gundo-git-f443470b"; + vim-addon-errorformats = buildVimPlugin { + name = "vim-addon-errorformats"; src = fetchgit { - url = "https://github.com/vim-scripts/Gundo.git"; - rev = "f443470b96364c24a775629418a6b2562ec9173e"; - sha256 = "b7a949167e59c936d6eae0d23635b87491b2cd2f46a197683b171d30165a90f9"; - }; - path = "gundo"; + url = "git://github.com/MarcWeber/vim-addon-errorformats"; + rev = "dcbb203ad5f56e47e75fdee35bc92e2ba69e1d28"; + sha256 = "a1260206545d5ae17f2e6b3319f5cf1808b74e792979b1c6667d75974cc53f95"; + }; + dependencies = []; }; - commentary = simpleDerivation { - name = "vim-commentary-git-8b4df6ca"; + vim-addon-goto-thing-at-cursor = buildVimPlugin { + name = "vim-addon-goto-thing-at-cursor"; src = fetchgit { - url = "https://github.com/tpope/vim-commentary.git"; - rev = "8b4df6ca0ba9cd117d97a8fd26b44b2439d5e3f1"; - sha256 = "5496ed31706552957d4caa76669ecd04e9b2853cf7a7e40bd0164726b21fcca0"; - }; - path = "commentary"; + url = "git://github.com/MarcWeber/vim-addon-goto-thing-at-cursor"; + rev = "f052e094bdb351829bf72ae3435af9042e09a6e4"; + sha256 = "34658ac99d9a630db9c544b3dfcd2c3df69afa5209e27558cc022b7afc2078ea"; + }; + dependencies = ["tlib"]; }; - tabular = simpleDerivation { - name = "tabular-git-60f25648"; + vim-addon-local-vimrc = buildVimPlugin { + name = "vim-addon-local-vimrc"; src = fetchgit { - url = "https://github.com/godlygeek/tabular.git"; - rev = "60f25648814f0695eeb6c1040d97adca93c4e0bb"; - sha256 = "28c860ad621587f2c3213fae47d1a3997746527c17d51e9ab94c209eb7bfeb0f"; - }; - path = "tabular"; + url = "git://github.com/MarcWeber/vim-addon-local-vimrc"; + rev = "7689b55ee86dd6046923fd28ceab49da3881abfe"; + sha256 = "f11d13676e2fdfcc9cabc991577f0b2e85909665b6f245aa02f21ff78d6a8556"; + }; + dependencies = []; }; - vim2hs = simpleDerivation { - name = "vim2hs-git-f2afd557"; + vim-addon-manager = buildVimPlugin { + name = "vim-addon-manager"; src = fetchgit { - url = "https://github.com/dag/vim2hs.git"; - rev = "f2afd55704bfe0a2d66e6b270d247e9b8a7b1664"; - sha256 = "485fc58595bb4e50f2239bec5a4cbb0d8f5662aa3f744e42c110cd1d66b7e5b0"; - }; - path = "vim2hs"; + url = "git://github.com/MarcWeber/vim-addon-manager"; + rev = "d6de0d52bfe338eb373a4908b51b0eb89eaf42b0"; + sha256 = "4becba76d3389e4ace9e01c4393bc7bf38767eecf9eee239689054b9ee0c1fc9"; + }; + dependencies = []; }; - hasksyn = simpleDerivation { - name = "hasksyn-git-175cd460"; + vim-addon-mru = buildVimPlugin { + name = "vim-addon-mru"; src = fetchgit { - url = "https://github.com/travitch/hasksyn.git"; - rev = "175cd4605afa5d9b9c75758112c8159fd118c631"; - sha256 = "3488e38d1f45a9a3363da62c1c946591621151a0a9cdaedd22b3fe8f666bbdb9"; - }; - path = "hasksyn"; + url = "git://github.com/MarcWeber/vim-addon-mru"; + rev = "e41e39bd9d1bf78ccfd8d5e1bc05ae5e1026c2bb"; + sha256 = "15b70f796f28cbd999060fea7f47408fa8a6cb176cd4915b9cc3dc6c53eed960"; + }; + dependencies = ["vim-addon-other" "vim-addon-mw-utils"]; }; - haskellConceal = simpleDerivation { - name = "vim-haskellConceal-git-73a8d712"; + vim-addon-mw-utils = buildVimPlugin { + name = "vim-addon-mw-utils"; src = fetchgit { - url = "https://github.com/begriffs/vim-haskellConceal.git"; - rev = "73a8d712d3342b2ffdc087b12924f1cf81053860"; - sha256 = "be60ca030e2d39e972a8c71c0ab3b75b893589d26d5dd78a20cd6779f1f5cfa8"; - }; - path = "haskellConceal"; + url = "git://github.com/MarcWeber/vim-addon-mw-utils"; + rev = "0c5612fa31ee434ba055e21c76f456244b3b5109"; + sha256 = "4e1b6d1b59050f1063e58ef4bee9e9603616ad184cd9ef7466d0ec3d8e22b91c"; + }; + dependencies = []; }; - ghcmod = simpleDerivation { - name = "ghcmod-vim-git-0c4e9428"; + vim-addon-nix = buildVimPlugin { + name = "vim-addon-nix"; src = fetchgit { - url = "https://github.com/eagletmt/ghcmod-vim.git"; - rev = "0c4e94281e57c475752e799adc261f7d5e4ab124"; - sha256 = "f6a085f7b8198747fae3fff0bc38e4d030e5c97aaeb84958fbf96fa658bbe862"; - }; - path = "ghcmod"; + url = "git://github.com/MarcWeber/vim-addon-nix"; + rev = "7b0a376bb1797fef8da2dc14e768f318bcb671e8"; + sha256 = "c2b0f6f50083063b5e801b872f38d4f00307fe5d7a4f3977a108e5cd10c1c410"; + }; + dependencies = ["vim-addon-completion" "vim-addon-goto-thing-at-cursor" "vim-addon-errorformats" "vim-addon-actions" "vim-addon-mw-utils" "tlib"]; }; - necoGhc = simpleDerivation { - name = "neco-ghc-git-0311f31b"; + vim-addon-other = buildVimPlugin { + name = "vim-addon-other"; src = fetchgit { - url = "https://github.com/eagletmt/neco-ghc.git"; - rev = "0311f31b3acaccec5b651ae7089d627a3a49239b"; - sha256 = "302f29f54c56e9cee647745a8355aeafe323c4efe2f3593d5e4f586acc1c06a5"; - }; - path = "neco-ghc"; + url = "git://github.com/MarcWeber/vim-addon-other"; + rev = "f78720c9cb5bf871cabb13c7cbf94378dbf0163b"; + sha256 = "43f027e4b7576031072515c23c2b09f7f2c8bba7ee43a1e2041a4371bd954d1b"; + }; + dependencies = ["vim-addon-actions" "vim-addon-mw-utils"]; }; - hoogle = simpleDerivation { - name = "vim-hoogle-git-81f28318"; + vim-addon-php-manual = buildVimPlugin { + name = "vim-addon-php-manual"; src = fetchgit { - url = "https://github.com/Twinside/vim-hoogle.git"; - rev = "81f28318b0d4174984c33df99db7752891c5c4e9"; - sha256 = "0f96f3badb6218cac87d0f7027ff032ecc74f08ad3ada542898278ce11cbd5a0"; - }; - path = "hoogle"; + url = "git://github.com/MarcWeber/vim-addon-php-manual"; + rev = "e09ccdce3d2132771d0bd32884553207cc7122d0"; + sha256 = "b2f44be3a1ceca9de7789ea9b5fd36035b720ea529f4301f3771b010d1e453c2"; + }; + dependencies = []; }; - hdevtools = simpleDerivation { - name = "vim-hdevtools-git-474947c5"; + vim-addon-signs = buildVimPlugin { + name = "vim-addon-signs"; src = fetchgit { - url = "https://github.com/bitc/vim-hdevtools.git"; - rev = "474947c52ff9c93dd36f3c49de90bd9a78f0baa1"; - sha256 = "bf5f096b665c51ce611c6c1bfddc3267c4b2f94af84b04482b07272a6a5a92f3"; - }; - path = "hdevtools"; + url = "git://github.com/MarcWeber/vim-addon-signs"; + rev = "17a49f293d18174ff09d1bfff5ba86e8eee8e8ae"; + sha256 = "a9c03a32e758d51106741605188cb7f00db314c73a26cae75c0c9843509a8fb8"; + }; + dependencies = []; }; - stylishHaskell = simpleDerivation { - name = "vim-stylish-haskell-git-453fd203"; + vim-addon-sql = buildVimPlugin { + name = "vim-addon-sql"; src = fetchgit { - url = "https://github.com/nbouscal/vim-stylish-haskell.git"; - rev = "453fd203aee3d7305ea8e4088ff53bd1f5933d75"; - sha256 = "c0e5010e1e8e56b179ce500387afb569f051c45b37ce92feb4350f293df96a8c"; - }; - path = "stylish-haskell"; + url = "git://github.com/MarcWeber/vim-addon-sql"; + rev = "05b8a0c211f1ae4c515c64e91dec555cdf20d90b"; + sha256 = "a1334ae694e0a03229bacc8ba7e08e7223df240244c7378e3f1bd91d74e957c2"; + }; + dependencies = ["vim-addon-completion" "vim-addon-background-cmd" "tlib"]; + }; + + vim-addon-syntax-checker = buildVimPlugin { + name = "vim-addon-syntax-checker"; + src = fetchgit { + url = "git://github.com/MarcWeber/vim-addon-syntax-checker"; + rev = "8eb7217e636ca717d4de5cd03cc0180c5b66ae77"; + sha256 = "aef048e664653b5007df71ac24ed34ec55d8938c763d3f80885a122e445a9b3d"; + }; + dependencies = ["vim-addon-mw-utils" "tlib"]; + }; + + vim-addon-toggle-buffer = buildVimPlugin { + name = "vim-addon-toggle-buffer"; + src = fetchgit { + url = "git://github.com/MarcWeber/vim-addon-toggle-buffer"; + rev = "a1b38b9c5709cba666ed2d84ef06548f675c6b0b"; + sha256 = "672166ecfe0599177afb56b444366f587f77e9659c256ac4e41ee45cb2df6055"; + }; + dependencies = ["vim-addon-mw-utils" "tlib"]; + }; + + vim-addon-xdebug = buildVimPlugin { + name = "vim-addon-xdebug"; + src = fetchgit { + url = "git://github.com/MarcWeber/vim-addon-xdebug"; + rev = "45f26407305b4ce6f8f5f37d2b5e6e4354104172"; + sha256 = "0a7bf2caf36772c94bd25bfbf46bf628623809c9cfab447ff788eb74149464ef"; + }; + dependencies = ["WebAPI" "vim-addon-mw-utils" "vim-addon-signs" "vim-addon-async"]; + }; + + vim-airline = buildVimPlugin { + name = "vim-airline"; + src = fetchgit { + url = "git://github.com/bling/vim-airline"; + rev = "256dec6800342c121c1b26dabc06dafb0c91edca"; + sha256 = "9bb684da91bffc80d8489210fc74476895be81772b1d1370ee0b9a9ec7469750"; + }; + dependencies = []; + }; + + vim-coffee-script = buildVimPlugin { + name = "vim-coffee-script"; + src = fetchgit { + url = "git://github.com/kchmck/vim-coffee-script"; + rev = "827e4a38b07479433b619091469a7495a392df8a"; + sha256 = "89ee4c7cce9f3310be502df6b2dd2e70a715c0b06882afc9c8169fbf58b207d0"; + }; + dependencies = []; + }; + + vim-easy-align = buildVimPlugin { + name = "vim-easy-align"; + src = fetchgit { + url = "git://github.com/junegunn/vim-easy-align"; + rev = "2595ebf9333f3598502276b29f78ad39965bc595"; + sha256 = "1223b587c515169d4b735bf56f109f7bfc4f7c1327e76865f498309f7472ef78"; + }; + dependencies = []; + }; + + vim-gitgutter = buildVimPlugin { + name = "vim-gitgutter"; + src = fetchgit { + url = "git://github.com/airblade/vim-gitgutter"; + rev = "39f011909620e0c7ae555efdace20c3963ac88af"; + sha256 = "585c367c8cf72d7ef511b3beca3d1eae1d68bbd61b9a8d4dc7aea6e0caa4813a"; + }; + dependencies = []; + }; + + vim-iced-coffee-script = buildVimPlugin { + name = "vim-iced-coffee-script"; + src = fetchgit { + url = "git://github.com/noc7c9/vim-iced-coffee-script"; + rev = "e42e0775fa4b1f8840c55cd36ac3d1cedbc1dea2"; + sha256 = "c7859591975a51a1736f99a433d7ca3e7638b417340a0472a63995e16d8ece93"; + }; + dependencies = ["vim-coffee-script"]; + }; + + vim-latex-live-preview = buildVimPlugin { + name = "vim-latex-live-preview"; + src = fetchgit { + url = "git://github.com/xuhdev/vim-latex-live-preview"; + rev = "18625ceca4de5984f3df50cdd0202fc13eb9e37c"; + sha256 = "261852d3830189a50176f997a4c6b4ec7e25893c5b7842a3eb57eb7771158722"; + }; + dependencies = []; + }; + + vim-signature = buildVimPlugin { + name = "vim-signature"; + src = fetchgit { + url = "git://github.com/kshenoy/vim-signature"; + rev = "29fc095535c4a3206d3194305739b33cd72ffad2"; + sha256 = "46101330cd291dd819552ba1f47571342fe671d6985d06897c34465b87fd7bc4"; + }; + dependencies = []; + }; + + vim-snippets = buildVimPlugin { + name = "vim-snippets"; + src = fetchgit { + url = "git://github.com/honza/vim-snippets"; + rev = "d05ca095ef93e256b45accb1e4b56ae3c44af125"; + sha256 = "1685ebe317ad1029bfc25e06c8f14cc3c14db887a7e1d743378c3748e416ac77"; + }; + dependencies = []; + }; + + vim2hs = buildVimPlugin { + name = "vim2hs"; + src = fetchgit { + url = "git://github.com/dag/vim2hs"; + rev = "f2afd55704bfe0a2d66e6b270d247e9b8a7b1664"; + sha256 = "485fc58595bb4e50f2239bec5a4cbb0d8f5662aa3f744e42c110cd1d66b7e5b0"; + }; + dependencies = []; + }; + + VimOutliner = buildVimPlugin { + name = "VimOutliner"; + src = fetchgit { + url = "git://github.com/vimoutliner/vimoutliner"; + rev = "91dccce033ca3924ad47831d29cd93fccc546013"; + sha256 = "c6dd19df1432908574e84a339a15076ddf8bfd6dfd2544b220928c29d9f752d3"; + }; + dependencies = []; }; - wombat256 = simpleDerivation { - name = "wombat256-vim-git-8734ba45"; + vimproc = buildVimPlugin { + name = "vimproc-git-2014-10-03"; src = fetchgit { - url = "https://github.com/vim-scripts/wombat256.vim.git"; - rev = "8734ba45dcf5e38c4d2686b35c94f9fcb30427e2"; - sha256 = "2feb7d57ab0a9f2ea44ccd606e540db64ab3285956398a50ecc562d7b8dbcd05"; + url = "https://github.com/shougo/vimproc.vim.git"; + rev = "3e055023dfab4f5a4dfa05a834f9d0cb7294a82e"; + sha256 = "63c2786897e8315eed2473822879b7ceb847e6021695a861892d7b9ab15a69fb"; }; - path = "wombat256"; + buildInputs = [ which ]; + + buildPhase = '' + sed -i 's/vimproc_mac\.so/vimproc_unix\.so/' autoload/vimproc.vim + make -f make_unix.mak + ''; + + meta = { + homepage = https://github.com/shougo/vimproc.vim; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + vimshell = buildVimPlugin rec { + version = "9.2"; + name = "vimshell-${version}"; + + meta = with stdenv.lib; { + description = "An extreme shell that doesn't depend on external shells and is written completely in Vim script"; + homepage = https://github.com/Shougo/vimshell.vim; + repositories.git = https://github.com/Shougo/vimshell.vim.git; + license = licenses.gpl3; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.unix; + }; + + src = fetchurl { + url = "https://github.com/Shougo/vimshell.vim/archive/ver.${version}.tar.gz"; + sha256 = "1pbwxdhpv6pr09b6hwkgy7grpmpwlqpsgsawl38r40q6yib8zb4a"; + }; + + buildInputs = [ vimproc ]; + + preBuild = '' + sed -ie '1 i\ + set runtimepath+=${vimproc}/${rtpPath}/vimproc\ + ' autoload/vimshell.vim + ''; }; - tmuxNavigator = simpleDerivation { - name = "vim-tmux-navigator-git-3de98bfc"; + vundle = buildVimPlugin { + name = "vundle"; src = fetchgit { - url = "https://github.com/christoomey/vim-tmux-navigator.git"; - rev = "3de98bfcee1289ce8edc6daf9a18f243180c7168"; - sha256 = "3843f92e0a21fe5ccf613f8a561abd06c822b2ee98bd82c98937548144e4e8df"; + url = "git://github.com/gmarik/vundle"; + rev = "0b28e334e65b6628b0a61c412fcb45204a2f2bab"; + sha256 = "9681d471d1391626cb9ad22b2b469003d9980cd23c5c3a8d34666376447e6204"; + }; + dependencies = []; + }; + + watchdogs = buildVimPlugin { + name = "watchdogs-git-2014-10-18"; + src = fetchgit { + url = "https://github.com/osyo-manga/vim-watchdogs.git"; + rev = "ad222796eb88b44954340c19c39938046af26e05"; + sha256 = "4c621ac2834864cf0c46f776029837913e1ba0c725a12d7cb24bf92e04ed1279"; }; - path = "tmux-navigator"; + meta = { + homepage = https://github.com/osyo-manga/vim-watchdogs; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; }; - pathogen = simpleDerivation { - name = "vim-pathogen-git-3de98bfc"; + WebAPI = buildVimPlugin { + name = "WebAPI"; src = fetchgit { - url = "https://github.com/tpope/vim-pathogen.git"; - rev = "91e6378908721d20514bbe5d18d292a0a15faf0c"; - sha256 = "24c1897d6b58576b2189c90050a7f8ede72a51343c752e9d030e833dbe5cac6f"; + url = "git://github.com/mattn/webapi-vim"; + rev = "a7789abffe936db56e3152e23733847f94755753"; + sha256 = "455b84d9fd13200ff5ced5d796075f434a7fb9c00f506769174579266ae2be80"; + }; + buildInputs = [ zip ]; + dependencies = []; + }; + + webapi-vim = WebAPI; + + wombat256 = buildVimPlugin { + name = "wombat256"; + src = fetchurl { + url = "http://www.vim.org/scripts/download_script.php?src_id=13400"; + name = "wombat256mod.vim"; + sha256 = "1san0jg9sfm6chhnr1wc5nhczlp11ibca0v7i4gf68h9ick9mysn"; + }; + buildInputs = [ unzip ]; + dependencies = []; + meta = { + url = "http://www.vim.org/scripts/script.php?script_id=2465"; + }; + }; + + xdebug = buildVimPlugin { + name = "xdebug-git-2012-08-15"; + src = fetchgit { + url = "https://github.com/joonty/vim-xdebug.git"; + rev = "a4980fa65f7f159780593ee37c178281691ba2c4"; + sha256 = "1ccb0e63eaf68548feb1c37b09c07c84b6bea9b350c4257549f091aa414601e2"; }; - path = "pathogen"; + postInstall = false; + meta = { + homepage = https://github.com/joonty/vim-xdebug; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + YankRing = buildVimPlugin { + name = "YankRing"; + src = fetchurl { + url = "http://www.vim.org/scripts/download_script.php?src_id=20842"; + name = "yankring_180.zip"; + sha256 = "0bsq4pxagy12jqxzs7gcf25k5ahwif13ayb9k8clyhm0jjdkf0la"; + }; + buildInputs = [ unzip ]; + dependencies = []; + meta = { + url = "http://www.vim.org/scripts/script.php?script_id=1234"; + }; }; - vimoutliner = simpleDerivation { - name = "vimoutliner-git-dce383e7"; + yankring = YankRing; + + YouCompleteMe = addRtp "${rtpPath}/youcompleteme" (stdenv.mkDerivation { src = fetchgit { - url = "https://github.com/vimoutliner/vimoutliner"; - rev = "2fc82976683c8770bece157ae3ada55251b6ddeb"; - sha256 = "dce383e7842c42bcfa8e7c3329fa426cb0fb05786d40a733da705c03aabd196b"; + url = "https://github.com/Valloric/YouCompleteMe.git"; + rev = "87b42c689391b69968950ae99c3aaacf2e14c329"; + sha256 = "1f3pywv8bsqyyakvyarg7z9m73gmvp1lfbfp2f2jj73jmmlzb2kv"; }; - path = "vimoutliner"; + + name = "vimplugin-youcompleteme-2014-10-06"; + + buildInputs = [ python cmake llvmPackages.clang ]; + + configurePhase = ":"; + + buildPhase = '' + patchShebangs . + + target=$out/${rtpPath}/youcompleteme + mkdir -p $target + cp -a ./ $target + + mkdir $target/build + cd $target/build + cmake -G "Unix Makefiles" . $target/third_party/ycmd/cpp -DPYTHON_LIBRARIES:PATH=${python}/lib/libpython2.7.so -DPYTHON_INCLUDE_DIR:PATH=${python}/include/python2.7 -DUSE_CLANG_COMPLETER=ON -DUSE_SYSTEM_LIBCLANG=ON + make ycm_support_libs -j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}} + ${bash}/bin/bash $target/install.sh --clang-completer --system-libclang + + ${vimHelpTags} + vimHelpTags $target + ''; + + # TODO: implement proper install phase rather than keeping everything in store + # TODO: support llvm based C completion, See README of git repository + installPhase = ":"; + + meta = { + description = "fastest non utf-8 aware word and C completion engine for Vim"; + homepage = http://github.com/Valloric/YouCompleteMe; + license = stdenv.lib.licenses.gpl3; + maintainers = [stdenv.lib.maintainers.marcweber]; + platforms = stdenv.lib.platforms.linux; + }; + }); + + youcompleteme = YouCompleteMe; + + YUNOcommit = buildVimPlugin { + name = "YUNOcommit"; + src = fetchgit { + url = "git://github.com/esneide/YUNOcommit.vim"; + rev = "10e0d674bfba05e88359dbe0ded4eb1d806b1342"; + sha256 = "8efe7129ccc1cd13a09ffd4b5f8abe1fca12c434768ff57b865844cf40d49b41"; + }; + dependencies = []; }; } diff --git a/pkgs/misc/vim-plugins/vimrc.nix b/pkgs/misc/vim-plugins/vimrc.nix new file mode 100644 index 000000000000..4e97d7f1d549 --- /dev/null +++ b/pkgs/misc/vim-plugins/vimrc.nix @@ -0,0 +1,203 @@ +{stdenv, vimPlugins, vim_configurable, buildEnv, writeText, writeScriptBin}: + + /* usage example:: + let vimrcConfig = { + + # If you like pathogen use such + pathogen.knownPlugins = vimPlugins; # optional + pathogen.pluginNames = ["vim-addon-nix"]; + + # If you like VAM use such: + vam.knownPlugins = vimPlugins; # optional + vam.pluginDictionaries = [ + # load always + { name = "youcompleteme"; } + { names = ["youcompleteme" "foo"]; } + # only load when opening a .php file + { name = "phpCompletion"; ft_regex = "^php\$"; } + { name = "phpCompletion"; filename_regex = "^.php\$"; } + + # provide plugin which can be loaded manually: + { name = "phpCompletion"; tag = "lazy"; } + ]; + + # if you like NeoBundle or Vundle provide an implementation + + # add custom .vimrc lines like this: + customRC = '' + set hidden + ''; + }; + in vim_configurable.customize { name = "vim-with-plugins"; inherit vimrcConfig; }; + + */ + +let + inherit (stdenv) lib; + + findDependenciesRecursively = {knownPlugins, names}: + + let depsOf = name: (builtins.getAttr name knownPlugins).dependencies or []; + + recurseNames = path: names: lib.concatMap (name: recurse ([name]++path)) names; + + recurse = path: + let name = builtins.head path; + in if builtins.elem name (builtins.tail path) + then throw "recursive vim dependencies" + else [name] ++ recurseNames path (depsOf name); + + in lib.uniqList { inputList = recurseNames [] names; }; + + vimrcFile = { + vam ? null, + pathogen ? null, + customRC ? "" + }: + + let + /* pathogen mostly can set &rtp at startup time. Its used very commonly. + */ + pathogenImpl = lib.optionalString (pathogen != null) + (let + knownPlugins = pathogen.knownPlugins or vimPlugins; + + plugins = map (name: knownPlugins.${name}) (findDependenciesRecursively { inherit knownPlugins; names = pathogen.pluginNames; }); + + pluginsEnv = buildEnv { + name = "pathogen-plugin-env"; + paths = map (x: "${x}/${vimPlugins.rtpPath}") plugins; + }; + in + '' + let &rtp.=(empty(&rtp)?"":',')."${vimPlugins.pathogen.rtp}" + execute pathogen#infect('${pluginsEnv}/{}') + ''); + + /* + vim-addon-manager = VAM + + * maps names to plugin location + + * manipulates &rtp at startup time + or when Vim has been running for a while + + * can activate plugins laziy (eg when loading a specific filetype) + + * knows about vim plugin dependencies (addon-info.json files) + + * still is minimalistic (only loads one file), the "check out" code it also + has only gets loaded when a plugin is requested which is not found on disk + yet + + */ + vamImpl = lib.optionalString (vam != null) + (let + knownPlugins = vam.knownPlugins or vimPlugins; + + toNames = x: + if builtins.isString x then [x] + else (lib.optional (x ? name) x.name) + ++ (x.names or []); + + names = findDependenciesRecursively { inherit knownPlugins; names = lib.concatMap toNames vam.pluginDictionaries; }; + + # Vim almost reads JSON, so eventually JSON support should be added to Nix + # TODO: proper quoting + toNix = x: + if (builtins.isString x) then "'${x}'" + else if builtins.isAttrs x && builtins ? out then toNix "${x}" # a derivation + else if builtins.isAttrs x then "{${lib.concatStringsSep ", " (lib.mapAttrsToList (n: v: "${toNix n}: ${toNix v}") x)}}" + else if builtins.isList x then "[${lib.concatMapStringsSep ", " toNix x}]" + else throw "turning ${lib.showVal x} into a VimL thing not implemented yet"; + + in assert builtins.hasAttr "vim-addon-manager" knownPlugins; + '' + let g:nix_plugin_locations = {} + ${lib.concatMapStrings (name: '' + let g:nix_plugin_locations['${name}'] = "${knownPlugins.${name}.rtp}" + '') names} + let g:nix_plugin_locations['vim-addon-manager'] = "${vimPlugins."vim-addon-manager".rtp}" + + let g:vim_addon_manager = {} + + if exists('g:nix_plugin_locations') + " nix managed config + + " override default function making VAM aware of plugin locations: + fun! NixPluginLocation(name) + let path = get(g:nix_plugin_locations, a:name, "") + return path == "" ? vam#DefaultPluginDirFromName(a:name) : path + endfun + let g:vim_addon_manager.plugin_dir_by_name = 'NixPluginLocation' + " tell Vim about VAM: + let &rtp.=(empty(&rtp)?"":','). g:nix_plugin_locations['vim-addon-manager'] + else + " standalone config + + let &rtp.=(empty(&rtp)?"":',').c.plugin_root_dir.'/vim-addon-manager' + if !isdirectory(c.plugin_root_dir.'/vim-addon-manager/autoload') + " checkout VAM + execute '!git clone --depth=1 git://github.com/MarcWeber/vim-addon-manager ' + \ shellescape(c.plugin_root_dir.'/vim-addon-manager', 1) + endif + endif + + " tell vam about which plugins to load when: + let l = [] + ${lib.concatMapStrings (p: "call add(l, ${toNix p})\n") vam.pluginDictionaries} + call vam#Scripts(l, {}) + ''); + + # somebody else could provide these implementations + vundleImpl = ""; + + neobundleImpl = ""; + + + in writeText "vimrc" '' + " minimal setup, generated by NIX + set nocompatible + filetype indent plugin on | syn on + + ${vamImpl} + ${pathogenImpl} + ${vundleImpl} + ${neobundleImpl} + + ${customRC} + ''; + +in + +rec { + inherit vimrcFile; + + # shell script with custom name passing [-u vimrc] [-U gvimrc] to vim + vimWithRC = {vimExecutable, name ? null, vimrcFile ? null, gvimrcFile ? null}: + let rcOption = o: file: stdenv.lib.optionalString (file != null) "-${o} ${file}"; + in writeScriptBin (if name == null then "vim" else name) '' + #!/bin/sh + exec ${vimExecutable} ${rcOption "u" vimrcFile} ${rcOption "U" gvimrcFile} "$@" + ''; + + # add a customize option to a vim derivation + makeCustomizable = vim: vim // { + customize = {name, vimrcConfig}: vimWithRC { + vimExecutable = "${vim}/bin/vim"; + inherit name; + vimrcFile = vimrcFile vimrcConfig; + }; + }; + + # test cases: + test_vim_with_vim_addon_nix_using_vam = vim_configurable.customize { + name = "vim-with-vim-addon-nix-using-vam"; + vimrcConfig.vam.pluginDictionaries = [{name = "vim-addon-nix"; }]; + }; + + test_vim_with_vim_addon_nix_using_pathogen = vim_configurable.customize { + name = "vim-with-vim-addon-nix-using-pathogen"; + vimrcConfig.pathogen.pluginNames = [ "vim-addon-nix" ]; + }; +} diff --git a/pkgs/os-specific/darwin/otool/default.nix b/pkgs/os-specific/darwin/otool/default.nix index e0793664a9c8..671e51542d06 100644 --- a/pkgs/os-specific/darwin/otool/default.nix +++ b/pkgs/os-specific/darwin/otool/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Object file displaying tool"; homepage = https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man1/otool.1.html; - # TODO license = with licenses; [ apsl20 gpl2Plus ]; + license = with licenses; [ apsl20 gpl2Plus ]; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.darwin; diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index 8048419a93ba..e1ae7a6d4d49 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "apparmor-${version}"; - version = "2.8.3"; + version = "2.8.4"; src = fetchurl { url = "http://launchpad.net/apparmor/2.8/${version}/+download/${name}.tar.gz"; - sha256 = "0zjwhkq9wh76m59zmrzfp68sjy4fnz4h23r7asxyaw6inrzwmhl4"; + sha256 = "1mki4c44ljmr7dpn55grzn33929kdjx149jx00s80yp1war83jwq"; }; buildInputs = [ diff --git a/pkgs/os-specific/linux/ati-drivers/builder.sh b/pkgs/os-specific/linux/ati-drivers/builder.sh index c91274c50bf1..325fb869a707 100644 --- a/pkgs/os-specific/linux/ati-drivers/builder.sh +++ b/pkgs/os-specific/linux/ati-drivers/builder.sh @@ -264,7 +264,7 @@ if test -z "$libsOnly"; then cp $BIN/* $out/bin for prog in $BIN/*; do patchelf --set-interpreter $(echo $glibc/lib/ld-linux*.so.2) $out/bin/$(basename $prog) - wrapProgram $out/bin/$(basename $prog) --prefix LD_LIBRARY_PATH : $out/lib:$LD_LIBRARY_PATH + wrapProgram $out/bin/$(basename $prog) --prefix LD_LIBRARY_PATH : $out/lib:$gcc/lib:$qt4/lib:$LD_LIBRARY_PATH done } diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index 45452c1ea6d2..11657d342917 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -3,6 +3,7 @@ , libXxf86vm, xf86vidmodeproto # for fglrx_gamma , xorg, makeWrapper, glibc, patchelf , unzip +, qt4 # for amdcccle , # Whether to build the libraries only (i.e. not the kernel module or # driver utils). Used to support 32-bit binaries on 64-bit # Linux. @@ -53,6 +54,7 @@ stdenv.mkDerivation { patchelf unzip mesa + qt4 ]; inherit libsOnly; @@ -74,13 +76,13 @@ stdenv.mkDerivation { # appear in /run/opengl-driver/lib which get's added to LD_LIBRARY_PATH extraDRIlibs = [ xorg.libXext ]; - inherit mesa; # only required to build examples + inherit mesa qt4; # only required to build examples and amdcccle meta = with stdenv.lib; { description = "ATI drivers"; homepage = http://support.amd.com/us/gpudownload/Pages/index.aspx; license = licenses.unfree; - maintainers = with maintainers; [marcweber offline]; + maintainers = with maintainers; [ marcweber offline jgeerds ]; platforms = platforms.linux; hydraPlatforms = []; }; diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix index 42aff7fa1263..05b9eb9e56fa 100644 --- a/pkgs/os-specific/linux/audit/default.nix +++ b/pkgs/os-specific/linux/audit/default.nix @@ -5,11 +5,11 @@ assert enablePython -> python != null; stdenv.mkDerivation rec { - name = "audit-2.4"; + name = "audit-2.4.1"; src = fetchurl { url = "http://people.redhat.com/sgrubb/audit/${name}.tar.gz"; - sha256 = "16z9iyi7yzkbyczrkmk9g0i3mlivr7l4p0hgyrz4f04xmzkkjpbf"; + sha256 = "09ihn392pmac1pyjrs22966csia83yr84hq5ri6sybwj1vx4d4q5"; }; buildInputs = [ openldap ] diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index f7b2a984e406..8407f270f484 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl, kernel }: +assert stdenv.lib.versionOlder kernel.version "3.17"; + let base = "batman-adv-2014.3.0"; in stdenv.mkDerivation rec { diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix index dc83ecae6e2d..e8be1b6b0e66 100644 --- a/pkgs/os-specific/linux/bluez/bluez5.nix +++ b/pkgs/os-specific/linux/bluez/bluez5.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, pkgconfig, dbus, glib, alsaLib, python, pythonPackages, pythonDBus, readline, libsndfile, udev, libical, - systemd }: + systemd, enableWiimote ? false }: assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "bluez-5.23"; + name = "bluez-5.25"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/${name}.tar.xz"; - sha256 = "1hgj6ymha75r79fvlh2h27j7gci0q7apczfffwm3kpf8ga6x7ayd"; + sha256 = "0c7xs4imwfgyx59qxbinfi403vhki1n8src1g87qlqz28lzjz9jw"; }; pythonPath = with pythonPackages; @@ -38,7 +38,8 @@ stdenv.mkDerivation rec { "--with-systemdsystemunitdir=$(out)/etc/systemd/system" "--with-systemduserunitdir=$(out)/etc/systemd/user" "--with-udevdir=$(out)/lib/udev" - ]; + ] ++ + stdenv.lib.optional enableWiimote [ "--enable-wiimote" ]; # Work around `make install' trying to create /var/lib/bluetooth. installFlags = "statedir=$(TMPDIR)/var/lib/bluetooth"; diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index 3b876322f1f6..23e5171d1780 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -24,7 +24,11 @@ stdenv.mkDerivation rec { # gstreamer gst_plugins_base ]; - configureFlags = "--localstatedir=/var --enable-cups"; + configureFlags = [ + "--localstatedir=/var" + "--enable-cups" + "--with-systemdunitdir=$(out)/etc/systemd/system" + ]; # Work around `make install' trying to create /var/lib/bluetooth. installFlags = "statedir=$(TMPDIR)/var/lib/bluetooth"; diff --git a/pkgs/os-specific/linux/bridge-utils/add-ip6-header.patch b/pkgs/os-specific/linux/bridge-utils/add-ip6-header.patch new file mode 100644 index 000000000000..c9149bfec386 --- /dev/null +++ b/pkgs/os-specific/linux/bridge-utils/add-ip6-header.patch @@ -0,0 +1,11 @@ +diff --git a/libbridge/libbridge.h b/libbridge/libbridge.h +index 39964f2..dd14bae 100644 +--- a/libbridge/libbridge.h ++++ b/libbridge/libbridge.h +@@ -20,6 +20,7 @@ + #define _LIBBRIDGE_H + + #include <sys/socket.h> ++#include <netinet/in.h> + #include <linux/if.h> + #include <linux/if_bridge.h> diff --git a/pkgs/os-specific/linux/bridge-utils/default.nix b/pkgs/os-specific/linux/bridge-utils/default.nix index 029f7ed6e29c..2fdf728ef4e1 100644 --- a/pkgs/os-specific/linux/bridge-utils/default.nix +++ b/pkgs/os-specific/linux/bridge-utils/default.nix @@ -1,19 +1,24 @@ -{ stdenv, fetchurl, autoconf, automake }: +{ stdenv, fetchurl, autoreconfHook }: -let +stdenv.mkDerivation rec { name = "bridge-utils-1.5"; -in -stdenv.mkDerivation { - inherit name; src = fetchurl { url = "mirror://sourceforge/bridge/${name}.tar.gz"; sha256 = "42f9e5fb8f6c52e63a98a43b81bd281c227c529f194913e1c51ec48a393b6688"; }; - buildInputs = [ autoconf automake ]; + # Remove patch once the kernel headers are updated + patches = [ ./add-ip6-header.patch ]; - preConfigure = "autoreconf"; + buildInputs = [ autoreconfHook ]; + + postInstall = '' + # The bridge utils build does not fail even if the brctl binary + # is not build. This test ensures that we fail if we don't produce a brctl + # binary. + test -f $out/sbin/brctl + ''; meta = { description = "http://sourceforge.net/projects/bridge/"; diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index 1ed13c2e4501..e88b41a36ae7 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -1,25 +1,25 @@ { stdenv, fetchurl, kernel }: let - version = "6_30_223_141"; + version = "6.30.223.248"; in stdenv.mkDerivation { name = "broadcom-sta-${version}-${kernel.version}"; src = if stdenv.system == "i686-linux" then ( fetchurl { - url = "http://www.broadcom.com/docs/linux_sta/hybrid-v35-nodebug-pcoem-${version}.tar.gz"; - sha256 = "19wra62dpm0x0byksh871yxr128b4v13kzkzqv56igjfpzv36z6m"; + url = http://www.broadcom.com/docs/linux_sta/hybrid-v35-nodebug-pcoem-6_30_223_248.tar.gz; + sha256 = "1bd13pq5hj4yzp32rx71sg1i5wkzdsg1s32xsywb48lw88x595mi"; } ) else ( fetchurl { - url = "http://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-${version}.tar.gz"; - sha256 = "0jlvch7d3khmmg5kp80x4ka33hidj8yykqjcqq6j56z2g6wb4dsz"; + url = http://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_223_248.tar.gz; + sha256 = "08ihbhwnqpnazskw9rlrk0alanp4x70kl8bsy2vg962iq334r69x"; } ); patches = [ - ./linux-recent.patch ./license.patch ./cfg80211_ibss_joined-channel-parameter.patch + ./netdev-3.17.patch ]; makeFlags = "KBASE=${kernel.dev}/lib/modules/${kernel.modDirVersion}"; @@ -42,7 +42,7 @@ stdenv.mkDerivation { meta = { description = "Kernel module driver for some Broadcom's wireless cards"; homepage = http://www.broadcom.com/support/802.11/linux_sta.php; - license = "unfree-redistributable"; + license = stdenv.lib.licenses.unfreeRedistributable; maintainers = with stdenv.lib.maintainers; [ phreedom vcunat ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/os-specific/linux/broadcom-sta/linux-recent.patch b/pkgs/os-specific/linux/broadcom-sta/linux-recent.patch deleted file mode 100644 index 97a331a2bd73..000000000000 --- a/pkgs/os-specific/linux/broadcom-sta/linux-recent.patch +++ /dev/null @@ -1,126 +0,0 @@ ---- a/src/wl/sys/wl_linux.c 2013-08-01 08:52:22.000000000 +0200 -+++ b/src/wl/sys/wl_linux.c 2013-09-13 14:25:36.463020788 +0200 -@@ -910,7 +910,11 @@ - pci_set_drvdata(pdev, NULL); - } - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0) - static struct pci_driver wl_pci_driver = { -+#else -+static struct pci_driver wl_pci_driver __refdata = { -+#endif - name: "wl", - probe: wl_pci_probe, - suspend: wl_suspend, -@@ -3235,7 +3239,7 @@ - void - wl_tkip_printstats(wl_info_t *wl, bool group_key) - { --#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14) && LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) - char debug_buf[512]; - int idx; - if (wl->tkipmodops) { -@@ -3408,6 +3412,7 @@ - return 0; - } - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) - static int - wl_proc_read(char *buffer, char **start, off_t offset, int length, int *eof, void *data) - { -@@ -3462,19 +3467,90 @@ - return length; - } - -+#else -+ -+static int -+wl_proc_read(struct seq_file *seq, void *offset) -+{ -+ wl_info_t * wl = (wl_info_t *)seq->private; -+ int bcmerror, to_user; -+ -+ WL_LOCK(wl); -+ bcmerror = wlc_ioctl(wl->wlc, WLC_GET_MONITOR, &to_user, sizeof(int), NULL); -+ WL_UNLOCK(wl); -+ -+ seq_printf(seq, "%d\n", to_user); -+ return bcmerror; -+} -+ -+static ssize_t wl_proc_write(struct file *file, const char __user *buff, -+ size_t length, loff_t *ppos) -+{ -+ struct seq_file *seq = file->private_data; -+ wl_info_t * wl = (wl_info_t *)seq->private; -+ int bcmerror, from_user = 0; -+ -+ if (length != 1) { -+ WL_ERROR(("%s: Invalid data length\n", __FUNCTION__)); -+ return -EIO; -+ } -+ -+ if (copy_from_user(&from_user, buff, 1)) { -+ WL_ERROR(("%s: copy from user failed\n", __FUNCTION__)); -+ return -EFAULT; -+ } -+ -+ if (from_user >= 0x30) -+ from_user -= 0x30; -+ -+ WL_LOCK(wl); -+ bcmerror = wlc_ioctl(wl->wlc, WLC_SET_MONITOR, &from_user, sizeof(int), NULL); -+ WL_UNLOCK(wl); -+ -+ if (bcmerror < 0) { -+ WL_ERROR(("%s: SET_MONITOR failed with %d\n", __FUNCTION__, bcmerror)); -+ return -EIO; -+ } -+ *ppos += length; -+ return length; -+} -+ -+static int wl_proc_open(struct inode *inode, struct file *file) -+{ -+ return single_open(file, wl_proc_read, PDE_DATA(inode)); -+} -+ -+static const struct file_operations wl_proc_fops = { -+ .owner = THIS_MODULE, -+ .open = wl_proc_open, -+ .read = seq_read, -+ .write = wl_proc_write, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+#endif -+ - static int - wl_reg_proc_entry(wl_info_t *wl) - { - char tmp[32]; - sprintf(tmp, "%s%d", HYBRID_PROC, wl->pub->unit); -- if ((wl->proc_entry = create_proc_entry(tmp, 0644, NULL)) == NULL) { -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) -+ wl->proc_entry = create_proc_entry(tmp, 0644, NULL); -+ if (wl->proc_entry) { -+ wl->proc_entry->read_proc = wl_proc_read; -+ wl->proc_entry->write_proc = wl_proc_write; -+ wl->proc_entry->data = wl; -+ } -+#else -+ wl->proc_entry = proc_create_data(tmp, 0644, NULL, &wl_proc_fops, wl); -+#endif -+ if (!wl->proc_entry) { - WL_ERROR(("%s: create_proc_entry %s failed\n", __FUNCTION__, tmp)); - ASSERT(0); - return -1; - } -- wl->proc_entry->read_proc = wl_proc_read; -- wl->proc_entry->write_proc = wl_proc_write; -- wl->proc_entry->data = wl; - return 0; - } - #ifdef WLOFFLD diff --git a/pkgs/os-specific/linux/broadcom-sta/netdev-3.17.patch b/pkgs/os-specific/linux/broadcom-sta/netdev-3.17.patch new file mode 100644 index 000000000000..5a33cef7370a --- /dev/null +++ b/pkgs/os-specific/linux/broadcom-sta/netdev-3.17.patch @@ -0,0 +1,15 @@ +diff -Naur a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c +--- a/src/wl/sys/wl_linux.c 2014-06-26 06:42:08.000000000 -0400 ++++ b/src/wl/sys/wl_linux.c 2014-10-13 12:00:04.446122588 -0400 +@@ -1307,7 +1307,11 @@ + dev->priv = priv_link; + #else + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0) ++ dev = alloc_netdev(sizeof(priv_link_t), intf_name, NET_NAME_UNKNOWN, ether_setup); ++#else + dev = alloc_netdev(sizeof(priv_link_t), intf_name, ether_setup); ++#endif + if (!dev) { + WL_ERROR(("wl%d: %s: alloc_netdev failed\n", + (wl->pub)?wl->pub->unit:wlif->subunit, __FUNCTION__)); diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 98fedb2d3f4f..34eb19380d4a 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { }; configurePhase = '' + export KCONFIG_NOTIMESTAMP=1 make defconfig ${configParser} cat << EOF | parseconfig diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix index ce609c5be476..0183a606b2e1 100644 --- a/pkgs/os-specific/linux/cifs-utils/default.nix +++ b/pkgs/os-specific/linux/cifs-utils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "cifs-utils-6.3"; + name = "cifs-utils-6.4"; src = fetchurl { url = "ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/${name}.tar.bz2"; - sha256 = "0nrpd3ibzfhdxgq1pw0jhzx163z5jvq4qcjxl35qlqj74lm3pxzz"; + sha256 = "1qz6d2xg4z1if0hy7qwyzgcr59l0alkhci6gxgjdldglda967z1q"; }; makeFlags = "root_sbindir=$(out)/sbin"; diff --git a/pkgs/os-specific/linux/conntrack-tools/default.nix b/pkgs/os-specific/linux/conntrack-tools/default.nix new file mode 100644 index 000000000000..51358628ff1e --- /dev/null +++ b/pkgs/os-specific/linux/conntrack-tools/default.nix @@ -0,0 +1,24 @@ +{ fetchurl, stdenv, flex, bison, pkgconfig, libmnl, libnfnetlink +, libnetfilter_conntrack, libnetfilter_queue, libnetfilter_cttimeout +, libnetfilter_cthelper }: + +stdenv.mkDerivation rec { + name = "conntrack-tools-${version}"; + version = "1.4.2"; + + src = fetchurl { + url = "http://www.netfilter.org/projects/conntrack-tools/files/${name}.tar.bz2"; + sha256 = "e5c423dc077f9ca8767eaa6cf40446943905711c6a8fe27f9cc1977d4d6aa11e"; + }; + + buildInputs = [ libmnl libnfnetlink libnetfilter_conntrack libnetfilter_queue + libnetfilter_cttimeout libnetfilter_cthelper ]; + nativeBuildInputs = [ flex bison pkgconfig ]; + + meta = with stdenv.lib; { + homepage = http://conntrack-tools.netfilter.org/; + description = "Connection tracking userspace tools"; + platforms = platforms.linux; + license = licenses.gpl2Plus; + }; +} diff --git a/pkgs/os-specific/linux/cpupower/default.nix b/pkgs/os-specific/linux/cpupower/default.nix index bf6e8c36f3df..269729917dd1 100644 --- a/pkgs/os-specific/linux/cpupower/default.nix +++ b/pkgs/os-specific/linux/cpupower/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = with stdenv.lib; { - description = "Tool to examine and tune power saving features."; + description = "Tool to examine and tune power saving features"; homepage = https://www.kernel.org.org/; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/eudev/default.nix b/pkgs/os-specific/linux/eudev/default.nix new file mode 100644 index 000000000000..d9ffbfa622e6 --- /dev/null +++ b/pkgs/os-specific/linux/eudev/default.nix @@ -0,0 +1,31 @@ +{stdenv, fetchurl, pkgconfig, glib, gperf}: +let + s = # Generated upstream information + rec { + baseName="eudev"; + version="2.1.1"; + name="${baseName}-${version}"; + url="http://dev.gentoo.org/~blueness/eudev/eudev-${version}.tar.gz"; + sha256="0shf5vqiz9fdxl95aa1a8vh0xjxwim3psc39wr2xr8lnahf11vva"; + }; + buildInputs = [ + glib pkgconfig gperf + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchurl { + inherit (s) url sha256; + }; + meta = { + inherit (s) version; + description = ''An udev fork by Gentoo''; + license = stdenv.lib.licenses.gpl2Plus ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + homepage = ''http://www.gentoo.org/proj/en/eudev/''; + downloadPage = ''http://dev.gentoo.org/~blueness/eudev/''; + updateWalker = true; + }; +} diff --git a/pkgs/os-specific/linux/fatrace/default.nix b/pkgs/os-specific/linux/fatrace/default.nix new file mode 100644 index 000000000000..c6e52934a774 --- /dev/null +++ b/pkgs/os-specific/linux/fatrace/default.nix @@ -0,0 +1,31 @@ +{stdenv, fetchurl, python3}: + +stdenv.mkDerivation rec { + version = "0.9"; + name = "fatrace-${version}"; + + src = fetchurl { + url = "https://launchpad.net/fatrace/trunk/${version}/+download/${name}.tar.bz2"; + sha256 = "c028d822ffde68805e5d1f62c4e2d0f4b3d4ae565802cc9468c82b25b92e68cd"; + }; + + buildInputs = [ python3 ]; + + makeFlagsArray = "PREFIX=$(out)"; + + meta = with stdenv.lib; { + description = "Report system-wide file access events"; + homepage = https://launchpad.net/fatrace/; + license = with licenses; gpl3Plus; + longDescription = '' + fatrace reports file access events from all running processes. + Its main purpose is to find processes which keep waking up the disk + unnecessarily and thus prevent some power saving. + + Requires a Linux kernel with the FANOTIFY configuration option enabled. + Enabling X86_MSR is also recommended for power-usage-report on x86. + ''; + maintainers = with maintainers; [ nckx ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index ec9b3537fad8..eb8e7cf390ae 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.14"; + version="0.9.16"; name="${baseName}-${version}"; - hash="0mwlvxl4fcfqvw7scldh4wz0i3b22cf5a2aglaxc9i1c3jld3w9l"; - url="http://softlayer-ams.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.14-rc1.tar.bz2"; - sha256="0mwlvxl4fcfqvw7scldh4wz0i3b22cf5a2aglaxc9i1c3jld3w9l"; + hash="1213ln6rqb1w0ba98zwi5p40f7gzpz4rqn621zz72v0z1q1vfkrp"; + url="mirror://sourceforge/project/firejail/firejail/firejail-0.9.16-rc1.tar.bz2"; + sha256="1213ln6rqb1w0ba98zwi5p40f7gzpz4rqn621zz72v0z1q1vfkrp"; }; buildInputs = [ ]; @@ -25,6 +25,10 @@ stdenv.mkDerivation { sed -e '/ \/run/iif(vrcs!=NULL){symlink(vrcs, "/var/run/current-system")\;free(vrcs)\;}' -i ./src/firejail/fs_var.c ''; + preBuild = '' + sed -e "s@/etc/@$out/etc/@g" -i Makefile + ''; + meta = { inherit (s) version; description = ''Namespace-based sandboxing tool for Linux''; diff --git a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix b/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix index 9d31fde2f0f8..701b9742b6a6 100644 --- a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix +++ b/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "b43-fwcutter-018"; + name = "b43-fwcutter-019"; src = fetchurl { url = "http://bues.ch/b43/fwcutter/${name}.tar.bz2"; - sha256 = "13v34pa0y1jf4hkhsh3zagyb7s8b8ymplffaayscwsd3s7f6kc2p"; + sha256 = "1ki1f5fy3yrw843r697f8mqqdz0pbsbqnvg4yzkhibpn1lqqbsnn"; }; patches = [ ./no-root-install.patch ]; @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { meta = { description = "Firmware extractor for cards supported by the b43 kernel module"; homepage = http://wireless.kernel.org/en/users/Drivers/b43; - license = "free-non-copyleft"; + license = stdenv.lib.licenses.free; }; } - 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 04823ffeda0c..2868be73d390 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -17,7 +17,8 @@ let { name = "intelwimax"; sha256 = "1avls6sx0pbsffrcs267r2r2rqlx2xrv8j9znc7ix1bi8g4fx91v"; } { name = "ipw2x00"; sha256 = "19zqc30hsz7snw020izm81qbap3xsygggnmbspxndw7jihz0amjs"; } { name = "ivtv"; sha256 = "1f2004lpw5nr9rxj3cl4ba0jdm51wkvsrbiy4drakawpjwh5y4qw"; } - { name = "iwlwifi"; sha256 = "1538r751mx8nhg3xibnnrhnflvf3kl5y9rnm7rpl4wyrfgx61amd"; } + # Disabled as it is packaged separately + #{ name = "iwlwifi"; sha256 = "1538r751mx8nhg3xibnnrhnflvf3kl5y9rnm7rpl4wyrfgx61amd"; } { name = "libertas"; sha256 = "0svkqlsiqgmh970r38nh0c1pjx41zdfql2k2k5djw99fscjklacd"; } { name = "linux"; sha256 = "0j62v6vbh2287j3x5c9i0xspmhyh5k1z8dyajgix7k37xi4jvpy2"; } { name = "linux-nonfree"; sha256 = "1f5x72rzicivwm0sn9l6wjkx7z9a0b8n6c9m60xrqg36ly7mizzp"; } diff --git a/pkgs/os-specific/linux/firmware/iwlegacy/default.nix b/pkgs/os-specific/linux/firmware/iwlegacy/default.nix new file mode 100644 index 000000000000..48472c96659c --- /dev/null +++ b/pkgs/os-specific/linux/firmware/iwlegacy/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl }: + +let + packages = [ + # Kernel 2.6.28+ + { name = "4965-ucode-228.61.2.24"; sha256 = "1n5af3cci0v40w4gr0hplqr1lfvhghlbzdbf60d6185vpcny2l5m"; } + + # Kernel 2.6.29+ + { name = "3945-ucode-15.32.2.9"; sha256 = "0baf07lblwsq841zdcj9hicf11jiq06sz041qcybc6l8yyhhcqjk"; } + ]; + + fetchPackage = + { name, sha256 }: fetchurl { + name = "iwlwifi-${name}.tgz"; + url = "http://wireless.kernel.org/en/users/Drivers/iwlegacy?action=AttachFile&do=get&target=iwlwifi-${name}.tgz"; + inherit sha256; + }; + + srcs = map fetchPackage packages; + +in stdenv.mkDerivation { + name = "iwlegacy"; + inherit srcs; + + unpackPhase = '' + mkdir -p ./firmware + ''; + + buildPhase = '' + for src in $srcs; do + tar zxf $src + done + ''; + + installPhase = '' + mkdir -p $out/lib/firmware + cp -r iwlwifi-*/*.ucode "$out/lib/firmware/" + ''; + + meta = { + description = "Binary firmware collection from intel"; + homepage = http://wireless.kernel.org/en/users/Drivers/iwlwifi; + license = stdenv.lib.licenses.unfreeRedistributableFirmware; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ ttuegel ]; + }; +} diff --git a/pkgs/os-specific/linux/firmware/iwlwifi/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi/default.nix new file mode 100644 index 000000000000..f6df3bb50f42 --- /dev/null +++ b/pkgs/os-specific/linux/firmware/iwlwifi/default.nix @@ -0,0 +1,82 @@ +{ stdenv, fetchurl }: + +let + packages = [ + # Kernel 2.6.29+ + { name = "5150-ucode-8.24.2.2"; sha256 = "1y8cah9xa8a9c7alh220cvmncjmwnacdz0kwsvg9lqr4cvzyclyj"; } + + # Kernel 2.6.30+ + { name = "6000-ucode-9.221.4.1"; sha256 = "0sw3v9807agx4mxdrfgsw7f195gs1f4zscnzcgpc8gb664r6413z"; } + + # Kernel 2.6.37+ + { name = "6050-ucode-41.28.5.1"; sha256 = "1i10rfn3kc07s2iqz79wvsrblhm360yz6v231dcz8sabvcyrlzar"; } + { name = "100-ucode-39.31.5.1"; sha256 = "1jvzdaiklnw613c4drkjkcdlnnk6c9kk7f0jqdxfkgppydwssnc2"; } + + # Kernel 2.6.38+ + { name = "5000-ucode-8.83.5.1-1"; sha256 = "0pkzr4gflp3j0jm4rw66jypk3xn4bvpgdsnxjqwanyd64aj6naxg"; } + + # Kernel 3.2+ + { name = "6000g2b-ucode-18.168.6.1"; sha256 = "1shby6s9h4kfwmvg89505p61yq88ml1qccvw8h2m4l63a9mwg0qn"; } + { name = "6000g2a-ucode-18.168.6.1"; sha256 = "1sdv4lkpfd87c95zbk8wgn0b4l4nbwkb0b4iwvrzpnmdarbn3wm7"; } + { name = "1000-ucode-39.31.5.1"; sha256 = "0w69hfpwx79cph0517a6mkhsk51li2l0yhfr1jddmj3i4ny1y3zd"; } + { name = "135-ucode-18.168.6.1"; sha256 = "1dvyzwkyzsmvlp13z84g2lzkr0w0p8mj7c98fwh3pwv0cmglf04c"; } + { name = "105-ucode-18.168.6.1"; sha256 = "11z67ippn4hlmsnyv1lxknysrl3m5v908i9wf1nkm7kxw76biz04"; } + { name = "2000-ucode-18.168.6.1"; sha256 = "0ax98hlmz11hqi0k81j5cizp2hwaah7j6s3hw7jdfsmwpzy9lwrm"; } + { name = "2030-ucode-18.168.6.1"; sha256 = "0b69jpb46fk63ybyyb8lbh99j1d29ayp8fl98l18iqy3q7mx4ry8"; } + + # Kernel 3.10+ + { name = "7260-ucode-22.1.7.0"; sha256 = "0m31p98zwr70k3b9akha0d8n7x9ym43yg992jk8zd94159g37k0y"; } + { name = "3160-ucode-22.1.7.0"; sha256 = "0qfm854xv6dc6kqj0vym1avrirrshnxp9yqnlx356zvfnqyx4l33"; } + + # Kernel 3.13+ + { name = "7260-ucode-22.24.8.0"; sha256 = "1zvw5dj3kv7rdnypcmp6na8mlfw735nzahy8qz35zrmda8b6gvqi"; } + { name = "3160-ucode-22.24.8.0"; sha256 = "1jv3bhds3a3y2r719fqpc5cwb674hm3lwq9df11i6473f0xjs224"; } + { name = "7265-ucode-22.24.8.0"; sha256 = "1pvmc58gyr62akzdj8gx02y3i3d67zwawm8zdvpg2q615721wjp9"; } + + # Kernel 3.14.9+ + { name = "7260-ucode-25.228.9.0"; sha256 = "0ppx9lpkc2l9aggdadw4y2cpdz5zqyckshzhlb1qj60jbajiny36"; } + { name = "3160-ucode-25.228.9.0"; sha256 = "125kh5p21bx808l2al8v9a1g63396d1a1chf4amqa9zrp2aajmk8"; } + { name = "7265-ucode-25.228.9.0"; sha256 = "1dv9bai1s6vdigsahbrxjwlndnp2dsgkqz8j7021d34s99kbi6z8"; } + + # Kernel 3.17+ + { name = "7260-ucode-23.10.10.0"; sha256 = "0n8blgwj3765zyripgbawbi3h97qyficdv72mmzf8hznk30p6kxg"; } + { name = "3160-ucode-23.10.10.0"; sha256 = "0332j710495980avzvhjixnr6f4f8v0srpnqn05x1q0c9sw6n7pp"; } + # Bad archive, assumed a problem with the served blob + #{ name = "7265-ucode-23.10.10.0"; sha256 = "1v2q9b3dah1p4mnmvv1blvi9awjcbiafmjyll5hi1hr6p28xwhva"; } + ]; + + fetchPackage = + { name, sha256 }: fetchurl { + name = "iwlwifi-${name}.tgz"; + url = "http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=iwlwifi-${name}.tgz"; + inherit sha256; + }; + + srcs = map fetchPackage packages; + +in stdenv.mkDerivation { + name = "iwlwifi"; + inherit srcs; + + unpackPhase = '' + mkdir -p ./firmware + ''; + + buildPhase = '' + for src in $srcs; do + tar zxf $src + done + ''; + + installPhase = '' + mkdir -p $out/lib/firmware + cp -r iwlwifi-*/*.ucode "$out/lib/firmware/" + ''; + + meta = { + description = "Binary firmware collection from intel"; + homepage = http://wireless.kernel.org/en/users/Drivers/iwlwifi; + license = stdenv.lib.licenses.unfreeRedistributableFirmware; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index c98930314954..690b7dcc40f2 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix @@ -18,10 +18,10 @@ in stdenv.mkDerivation { cp -R hardfp/opt/vc/* $out cp opt/vc/LICENCE $out/share/raspberrypi ''; - + meta = { description = "Firmware for the Raspberry Pi board"; homepage = https://github.com/raspberrypi; - license = "non-free"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix index a8988f0a4529..f8081127d515 100644 --- a/pkgs/os-specific/linux/hostapd/default.nix +++ b/pkgs/os-specific/linux/hostapd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "hostapd-${version}"; - version = "2.1"; + version = "2.3"; src = fetchurl { url = "http://hostap.epitest.fi/releases/${name}.tar.gz"; - sha256 = "121gpcs1ws7m2v8jk091jhmz3pm2xmhwkv96gqkyb4k0bgsi0waw"; + sha256 = "1pxlkfj1r2k5lxph2x9l02jrn652b3whcfh6l604rbbghxv2nk69"; }; buildInputs = [ libnl openssl pkgconfig ]; diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index cf602a46f81d..d6b3231ec460 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -1,27 +1,29 @@ -{ fetchurl, stdenv, flex, bison, db, iptables, pkgconfig }: +{ fetchgit, stdenv, flex, bison, db, iptables, pkgconfig }: stdenv.mkDerivation rec { - name = "iproute2-3.16.0"; + name = "iproute2-3.17.0"; - src = fetchurl { - url = "mirror://kernel/linux/utils/net/iproute2/${name}.tar.xz"; - sha256 = "0ybv29m88lccpfrh2dgiqash4c3gfvwwpx9kakvnc8c71rn8l2hz"; + src = fetchgit { + url = "git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"; + rev = "refs/tags/v3.17.0"; + sha256 = "113ayyy7cjxn0bf67fh4is4z0jysgif016kv7ig0jp6r68xp2spa"; }; - patch = [ - ./vpnc.patch - ./device-checking.patch # Remove after 3.16.0 - ]; + patch = [ ./vpnc.patch ]; - preConfigure = - '' - patchShebangs ./configure - sed -e '/ARPDDIR/d' -i Makefile - ''; + preConfigure = '' + patchShebangs ./configure + sed -e '/ARPDDIR/d' -i Makefile + ''; - makeFlags = "DESTDIR= LIBDIR=$(out)/lib SBINDIR=$(out)/sbin" - + " CONFDIR=$(out)/etc DOCDIR=$(out)/share/doc/${name}" - + " MANDIR=$(out)/share/man"; + makeFlags = [ + "DESTDIR=" + "LIBDIR=$(out)/lib" + "SBINDIR=$(out)/sbin" + "CONFDIR=$(out)/etc" + "DOCDIR=$(out)/share/doc/${name}" + "MANDIR=$(out)/share/man" + ]; buildInputs = [ db iptables ]; nativeBuildInputs = [ bison flex pkgconfig ]; @@ -31,10 +33,11 @@ stdenv.mkDerivation rec { # Get rid of useless TeX/SGML docs. postInstall = "rm -rf $out/share/doc"; - meta = { + meta = with stdenv.lib; { homepage = http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2; description = "A collection of utilities for controlling TCP/IP networking and traffic control in Linux"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = platforms.linux; + license = licenses.gpl2; + maintainers = with maintainers; [ eelco wkennington ]; }; } diff --git a/pkgs/os-specific/linux/iproute/device-checking.patch b/pkgs/os-specific/linux/iproute/device-checking.patch deleted file mode 100644 index a55423be38c3..000000000000 --- a/pkgs/os-specific/linux/iproute/device-checking.patch +++ /dev/null @@ -1,32 +0,0 @@ -From f1b66ff83a0babbe99fef81b3a960d7a4ce8dbc6 Mon Sep 17 00:00:00 2001 -From: vadimk <vadim4j@gmail.com> -Date: Sat, 30 Aug 2014 15:06:00 +0300 -Subject: ip link: Remove unnecessary device checking - -The real checking is performed later in iplink_modify(..) func which -checks device existence if NLM_F_CREATE flag is set. - -Also it fixes the case when impossible to add veth link which was -caused by 9a02651a87 (ip: check for missing dev arg when doing VF rate) -because these devices are not exist yet. - -Signed-off-by: Vadim Kochan <vadim4j@gmail.com> -Acked-by: Oliver Hartkopp <socketcan@hartkopp.net> -Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> - -diff --git a/ip/iplink.c b/ip/iplink.c -index 1a907d9..ea06871 100644 ---- a/ip/iplink.c -+++ b/ip/iplink.c -@@ -593,8 +593,6 @@ int iplink_parse(int argc, char **argv, struct iplink_req *req, - duparg2("dev", *argv); - *dev = *argv; - dev_index = ll_name_to_index(*dev); -- if (dev_index == 0) -- invarg("Unknown device", *argv); - } - argc--; argv++; - } --- -cgit v0.10.1 - diff --git a/pkgs/os-specific/linux/kernel-headers/3.7.nix b/pkgs/os-specific/linux/kernel-headers/3.7.nix index e6fbf9bb9bc1..9bf189c40eda 100644 --- a/pkgs/os-specific/linux/kernel-headers/3.7.nix +++ b/pkgs/os-specific/linux/kernel-headers/3.7.nix @@ -4,7 +4,7 @@ assert cross == null -> stdenv.isLinux; let - version = "3.7.1"; + version = "3.12.6"; kernelHeadersBaseConfig = if cross == null @@ -18,7 +18,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.bz2"; - sha256 = "1bb1dxj1i6j7pj926kfy6pz58kw03swyyikl9f3fq3jnswispaj2"; + sha256 = "1qh6f1az0flfrbkdjx1i9r7yf31ad0gxigax91nd33z2jmd6h4df"; }; targetConfig = if cross != null then cross.config else null; diff --git a/pkgs/os-specific/linux/kernel/3.17-buildfix.patch b/pkgs/os-specific/linux/kernel/3.17-buildfix.patch deleted file mode 100644 index 234f0ac749f6..000000000000 --- a/pkgs/os-specific/linux/kernel/3.17-buildfix.patch +++ /dev/null @@ -1,62 +0,0 @@ -From Shea Levy <> -Subject [PATCH 1/1] usb: gadget: Remove use of PWD in Makefiles -Date Thu, 28 Aug 2014 01:30:46 -0400 - -Using PWD breaks out-of-tree builds in certain circumstances [1], and -other kernel Makefiles use relative paths just fine. - -[1]: https://bugzilla.kernel.org/show_bug.cgi?id=83251 - -Signed-off-by: Shea Levy <shea@shealevy.com> ---- - drivers/usb/gadget/Makefile | 2 +- - drivers/usb/gadget/function/Makefile | 4 ++-- - drivers/usb/gadget/legacy/Makefile | 6 +++--- - 3 files changed, 6 insertions(+), 6 deletions(-) -diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile -index a186afe..9add915 100644 ---- a/drivers/usb/gadget/Makefile -+++ b/drivers/usb/gadget/Makefile -@@ -3,7 +3,7 @@ - # - subdir-ccflags-$(CONFIG_USB_GADGET_DEBUG) := -DDEBUG - subdir-ccflags-$(CONFIG_USB_GADGET_VERBOSE) += -DVERBOSE_DEBUG --ccflags-y += -I$(PWD)/drivers/usb/gadget/udc -+ccflags-y += -Idrivers/usb/gadget/udc - - obj-$(CONFIG_USB_LIBCOMPOSITE) += libcomposite.o - libcomposite-y := usbstring.o config.o epautoconf.o -diff --git a/drivers/usb/gadget/function/Makefile b/drivers/usb/gadget/function/Makefile -index 6d91f21..83ae106 100644 ---- a/drivers/usb/gadget/function/Makefile -+++ b/drivers/usb/gadget/function/Makefile -@@ -2,8 +2,8 @@ - # USB peripheral controller drivers - # - --ccflags-y := -I$(PWD)/drivers/usb/gadget/ --ccflags-y += -I$(PWD)/drivers/usb/gadget/udc/ -+ccflags-y := -Idrivers/usb/gadget/ -+ccflags-y += -Idrivers/usb/gadget/udc/ - - # USB Functions - usb_f_acm-y := f_acm.o -diff --git a/drivers/usb/gadget/legacy/Makefile b/drivers/usb/gadget/legacy/Makefile -index a11aad5..edba2d1 100644 ---- a/drivers/usb/gadget/legacy/Makefile -+++ b/drivers/usb/gadget/legacy/Makefile -@@ -2,9 +2,9 @@ - # USB gadget drivers - # - --ccflags-y := -I$(PWD)/drivers/usb/gadget/ --ccflags-y += -I$(PWD)/drivers/usb/gadget/udc/ --ccflags-y += -I$(PWD)/drivers/usb/gadget/function/ -+ccflags-y := -Idrivers/usb/gadget/ -+ccflags-y += -Idrivers/usb/gadget/udc/ -+ccflags-y += -Idrivers/usb/gadget/function/ - - g_zero-y := zero.o - g_audio-y := audio.o --- -2.1.0 \ No newline at end of file diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index d5c754eebc7b..48493044065c 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -59,6 +59,7 @@ with stdenv.lib; ''} SCSI_LOWLEVEL y # enable lots of SCSI devices SCSI_LOWLEVEL_PCMCIA y + SCSI_SAS_ATA y # added to enable detection of hard drive SPI y # needed for many devices SPI_MASTER y WAN y @@ -66,7 +67,7 @@ with stdenv.lib; # Networking options. IP_PNP n ${optionalString (versionOlder version "3.13") '' - IPV6_PRIVACY y + IPV6_PRIVACY y ''} NETFILTER_ADVANCED y IP_VS_PROTO_TCP y @@ -76,6 +77,9 @@ with stdenv.lib; IP_DCCP_CCID3 n # experimental CLS_U32_PERF y CLS_U32_MARK y + ${optionalString (stdenv.system == "x86_64-linux") '' + BPF_JIT y + ''} # Wireless networking. CFG80211_WEXT? y # Without it, ipw2200 drivers don't build @@ -174,6 +178,12 @@ with stdenv.lib; CIFS_XATTR y CIFS_POSIX y CIFS_FSCACHE y + ${optionalString (versionAtLeast version "3.12") '' + CEPH_FSCACHE y + ''} + ${optionalString (versionAtLeast version "3.14") '' + CEPH_FS_POSIX_ACL y + ''} # Security related features. STRICT_DEVMEM y # Filter access to /dev/mem @@ -238,6 +248,7 @@ with stdenv.lib; MTRR_SANITIZER y NET_FC y # Fibre Channel driver support PPP_MULTILINK y # PPP multilink support + PPP_FILTER y REGULATOR y # Voltage and Current Regulator Support ${optionalString (versionAtLeast version "3.6") '' RC_DEVICES? y # Enable IR devices @@ -307,6 +318,10 @@ with stdenv.lib; ${optionalString (!stdenv.is64bit) '' HIGHMEM64G? y # We need 64 GB (PAE) support for Xen guest support. ''} + ${optionalString (versionAtLeast version "3.9" && stdenv.is64bit) '' + VFIO_PCI_VGA y + ''} + VIRT_DRIVERS y # Media support. ${optionalString (versionAtLeast version "3.6") '' @@ -332,14 +347,20 @@ with stdenv.lib; TRANSPARENT_HUGEPAGE_ALWAYS? n TRANSPARENT_HUGEPAGE_MADVISE? y - # zram support (e.g for in-memory compressed swap) + # zram support (e.g for in-memory compressed swap). ${optionalString (versionAtLeast version "3.4") '' ZSMALLOC y ''} ZRAM m - + ${optionalString (versionAtLeast version "3.17") "NFC? n"} + # Enable firmware loading via udev. Only needed for non-declarative + # firmware in /root/test-firmware. + ${optionalString (versionAtLeast version "3.17") '' + FW_LOADER_USER_HELPER_FALLBACK y + ''} + ${kernelPlatform.kernelExtraConfig or ""} ${extraConfig} '' diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index a7913fea091c..88e00e2f3bda 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.56"; + version = "3.10.61"; extraMeta.branch = "3.10"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "02q0rda1dsapfi2d3nz398fhlk0gvr2q6mj6jcck2izcxzqhsz9a"; + sha256 = "1pxkm4ix1051qma535087zkshwmwhirb73wyfhqaqrxp4177rja2"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index b0da31ff0748..8c68a09a5359 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.12.29"; + version = "3.12.33"; extraMeta.branch = "3.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1ckzd9s64iahlnv7wh687m827f94q8hw0s4h8s69ijhay6igqqzm"; + sha256 = "18vrlrda8xa6j7771x8bwl7vrhvi2kmrp91nlwhkqr4siwkh0jxp"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix index b3d7fb1e7f33..c301a312112e 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix @@ -1,12 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.14.20"; + version = "3.14.25"; + # Remember to update grsecurity! extraMeta.branch = "3.14"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "090i8drjwhxawn7jfg9mrmvqik13j58v0hb272b457k48qyc070y"; + sha256 = "07zwiywmijg5z8iy628w9f8rhi8j4hjd3raczq9pm7dqryayyaj2"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.15.nix b/pkgs/os-specific/linux/kernel/linux-3.15.nix deleted file mode 100644 index cb2463ebfdc8..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-3.15.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl, ... } @ args: - -import ./generic.nix (args // rec { - version = "3.15.10"; - extraMeta.branch = "3.15"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1x057a1pfr4rqzmjdb3x1bwwl6gzr6im8dg8f6anwz9fnps6vv5d"; - }; - - features.iwlwifi = true; - features.efiBootStub = true; - features.needsCifsUtils = true; - features.canDisableNetfilterConntrackHelpers = true; - features.netfilterRPFilter = true; -} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-3.16.nix b/pkgs/os-specific/linux/kernel/linux-3.16.nix index 06079716a81a..6997d51a0f1a 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.16.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.16.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.16.4"; + version = "3.16.7"; extraMeta.branch = "3.16"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0x8jh9j7kdfbxcf3f69p28j5dwjjdxf92sjnlhk3mp016yv02i99"; + sha256 = "0vm3ahw6wzq72z6jim05pcj9gzjw8jc4r1dr5wnfl810nib89pbk"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.17.nix b/pkgs/os-specific/linux/kernel/linux-3.17.nix index 736973d3c4d9..cc77f4409db9 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.17.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.17.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.17"; - modDirVersion = "3.17.0"; + version = "3.17.4"; + # Remember to update grsecurity! extraMeta.branch = "3.17"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0lb2yyh3j932789jq4gxx9xshgy6rfdnl3lm8yr43kaz7k4kw5gm"; + sha256 = "0ayh9y58iv38h76jl2r77856af2cazzkwcdhjqmccibajjf42maa"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index 13205e048ca6..ee7bd59f2556 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.62"; + version = "3.2.64"; extraMeta.branch = "3.2"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1yrmar14p5y9xaj9df388xwjmwz8fnsxnid6rkxxk7dni5di8nqf"; + sha256 = "0niw4pbfc5dd46wzgvfnza8isyl01v1lva4njlwnrzag6x9fj0qp"; }; # We don't provide these patches if grsecurity is enabled, because diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index 30bb873501b8..868918ef9459 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.4.103"; + version = "3.4.104"; extraMeta.branch = "3.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1ldga9l7dydwv5zvl3xgk8833cjv73yasyy2qmgimkbs03s8q4ig"; + sha256 = "0xf2w4lccws2pps89hmh7ry8n43wr9p65yvdajba4qfxxy5jvx4b"; }; kernelPatches = args.kernelPatches ++ diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index ebbdd79ba167..69cefcda698f 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,17 +1,15 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.17-rc2"; - modDirVersion = "3.17.0-rc2"; - extraMeta.branch = "3.17"; + version = "3.18-rc7"; + modDirVersion = "3.18.0-rc7"; + extraMeta.branch = "3.18"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/testing/linux-${version}.tar.xz"; - sha256 = "094r4kqp7bj1wcdfsgdmv73law4zb7d0sd8lw82v3rz944mlm9y3"; + sha256 = "1zq7jd33jq4ibvjdsj8cm4zlgjag7j8r7w7ajmzivr7npdb9fvvk"; }; - kernelPatches = args.kernelPatches ++ [ { name = "3.17-buildfix.patch"; patch = ./3.17-buildfix.patch; } ]; - features.iwlwifi = true; features.efiBootStub = true; features.needsCifsUtils = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 52d003a2970b..182414720111 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -60,17 +60,17 @@ rec { }; grsecurity_stable = grsecPatch - { kversion = "3.14.19"; - revision = "201409282024"; + { kversion = "3.14.25"; + revision = "201411260106"; branch = "stable"; - sha256 = "05xjfllw6kx6y2cs0pwvlp5cpspqb7nf7kgfzk2z5gd04vc8ywqm"; + sha256 = "19131hkbf8zrqq31iiw99hslb5g29yqfl67jzlc4y4c8092s7fdm"; }; grsecurity_unstable = grsecPatch - { kversion = "3.16.3"; - revision = "201409282025"; + { kversion = "3.17.4"; + revision = "201411260107"; branch = "test"; - sha256 = "14vzg513xkqa71hp9drs2z9smamhxh87fxxyfjdbi3k93cbvkk22"; + sha256 = "1ynwmgm5c2fcd2dr76s3sqap3bv9b04p7qvf92pa1p4hgj2lva2n"; }; grsec_fix_path = diff --git a/pkgs/os-specific/linux/kernel/update.sh b/pkgs/os-specific/linux/kernel/update.sh new file mode 100755 index 000000000000..d9db7f9f916c --- /dev/null +++ b/pkgs/os-specific/linux/kernel/update.sh @@ -0,0 +1,62 @@ +#!/usr/bin/env bash +set -e + +# Get the latest versions from kernel.org +LINUXSED='s/.*linux-\([0-9]\+\(.[0-9]\+\)*\).*/\1/p' +KDATA="$(curl -s https://www.kernel.org | sed -n -e '/Download complete/p')" +VERSIONS=($(sed -n -e $LINUXSED <<< "$KDATA" | sort -Vr)) + +# Remove mainline version if there is a stable update +# Note due to sorting these two will always exist at the bottom +if grep -q "^${VERSIONS[1]}" <<< "${VERSIONS[0]}"; then + VERSIONS=(${VERSIONS[@]:0:1} ${VERSIONS[@]:2}) +fi + +# Inspect each file and see if it has the latest version +NIXPKGS="$(git rev-parse --show-toplevel)" +ls $NIXPKGS/pkgs/os-specific/linux/kernel | while read FILE; do + KERNEL="$(sed -n $LINUXSED <<< "$FILE")" + [ -z "$KERNEL" ] && continue + + # Find the matching new kernel version + MATCHING="" + for V in "${VERSIONS[@]}"; do + if grep -q "^$KERNEL" <<< "$V"; then + MATCHING="$V" + break + fi + done + if [ -z "$MATCHING" ]; then + echo "Out-of-support $KERNEL" + continue + fi + + # Inspect the nix expression to check for changes + DATA="$(<$NIXPKGS/pkgs/os-specific/linux/kernel/$FILE)" + URL="$(sed -n -e 's/.*url = "\(.*\)";.*/\1/p' <<< "$DATA" | sed -e "s/\${version}/$MATCHING/g")" + OLDVER=$(sed -n -e 's/.*version = "\(.*\)".*/\1/p' <<< "$DATA") + if [ "$OLDVER" = "$V" ]; then + echo "No updates for $KERNEL" + continue + fi + + # Download the new file for the hash + if ! HASH="$(nix-prefetch-url $URL 2>/dev/null)"; then + echo "Failed to get hash of $URL" + continue + fi + sed -i "s/sha256 = \".*\"/sha256 = \"$HASH\"/g" $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE + + # Rewrite the expression + sed -i -e '/version = /d' -e '/modDirVersion = /d' $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE + if grep -q '^[0-9]\+.[0-9]\+$' <<< "$V"; then + sed -i "\#import ./generic.nix (args // rec {#a \ modDirVersion = \"${V}.0\";" $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE + fi + sed -i "\#import ./generic.nix (args // rec {#a \ version = \"$V\";" $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE + + # Commit the changes + git add -u $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE + git commit -m "kernel: $OLDVER -> $V" >/dev/null 2>&1 + + echo "Updated $OLDVER -> $V" +done diff --git a/pkgs/os-specific/linux/ktap/default.nix b/pkgs/os-specific/linux/ktap/default.nix index a82804cb8379..b91fc871350a 100644 --- a/pkgs/os-specific/linux/ktap/default.nix +++ b/pkgs/os-specific/linux/ktap/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "A lightweight script-based dynamic tracing tool for Linux."; + description = "A lightweight script-based dynamic tracing tool for Linux"; homepage = "http://www.ktap.org"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/os-specific/linux/libnl/3.2.19.nix b/pkgs/os-specific/linux/libnl/3.2.19.nix deleted file mode 100644 index ea508c088e76..000000000000 --- a/pkgs/os-specific/linux/libnl/3.2.19.nix +++ /dev/null @@ -1,20 +0,0 @@ - -{stdenv, fetchurl, bison, flex}: - -stdenv.mkDerivation rec { - name = "libnl-3.2.19"; - - src = fetchurl { - url = "${meta.homepage}files/${name}.tar.gz"; - sha256 = "12q97cw680hg4rylyd8j3d7azwwia4ndsv3kybd1ajp8hjni39ip"; - }; - - buildInputs = [ bison flex ]; - - meta = { - homepage = "http://www.infradead.org/~tgr/libnl/"; - description = "Linux NetLink interface library"; - maintainers = [ stdenv.lib.maintainers.urkud ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/os-specific/linux/libnl/default.nix b/pkgs/os-specific/linux/libnl/default.nix index 093a00ed9a5c..fe844226a645 100644 --- a/pkgs/os-specific/linux/libnl/default.nix +++ b/pkgs/os-specific/linux/libnl/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, bison, flex}: stdenv.mkDerivation rec { - name = "libnl-3.2.23"; + name = "libnl-3.2.25"; src = fetchurl { url = "${meta.homepage}files/${name}.tar.gz"; - sha256 = "1czj2bpb799bih6ighqwbvv9pvbpcw7vmccv9cwavfwcmalwvhlc"; + sha256 = "1icfrv8yihcb74as1gcgmp0wfpdq632q2zvbvqqvjms9cy87bswb"; }; buildInputs = [ bison flex ]; diff --git a/pkgs/os-specific/linux/light/default.nix b/pkgs/os-specific/linux/light/default.nix new file mode 100644 index 000000000000..5ca9f69f879a --- /dev/null +++ b/pkgs/os-specific/linux/light/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + version = "0.9"; + name = "light-${version}"; + src = fetchurl { + url = "https://github.com/haikarainen/light/archive/v${version}.tar.gz"; + sha256 = "1dnzkkg307izvw76gvzsl2vpxd2a1grxg5h82ix505rb9nnmn0d6"; + }; + + installPhase = "mkdir -p $out/bin; cp light $out/bin/"; + + meta = { + description = "GNU/Linux application to control backlights"; + homepage = https://haikarainen.github.io/light/; + license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ puffnfresh ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/lightum/default.nix b/pkgs/os-specific/linux/lightum/default.nix new file mode 100644 index 000000000000..fea188f89491 --- /dev/null +++ b/pkgs/os-specific/linux/lightum/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchgit, libX11, libXScrnSaver, libXext, glib, dbus, pkgconfig, systemd }: + +stdenv.mkDerivation { + name = "lightum"; + src = fetchgit { + url = https://github.com/poliva/lightum; + rev = "123e6babe0669b23d4c1dfa5511088608ff2baa8"; + sha256 = "1r8c9mb82qgs8i7dczqx8fc7xrbn413b59xkqgjh4z1pfy75sl79"; + }; + + buildInputs = [ + dbus + glib + libX11 + libXScrnSaver + libXext + pkgconfig + systemd + ]; + + installPhase = '' + make install prefix=$out bindir=$out/bin docdir=$out/share/doc \ + mandir=$out/share/man INSTALL="install -c" INSTALLDATA="install -c -m 644" + ''; + + meta = { + description = "MacBook automatic light sensor daemon"; + homepage = https://github.com/poliva/lightum; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [ puffnfresh ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/lockdep/default.nix b/pkgs/os-specific/linux/lockdep/default.nix index 1554715a613c..6fa59e4ae5fb 100644 --- a/pkgs/os-specific/linux/lockdep/default.nix +++ b/pkgs/os-specific/linux/lockdep/default.nix @@ -2,11 +2,12 @@ stdenv.mkDerivation rec { name = "lockdep-${version}"; - version = "3.16.1"; + version = "3.17"; + fullver = "3.17.0"; # The library ver is 3.17.0, but the kernel is 3.17 src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0wbxqlmk7w9047ir51dsz6vi7ww0hpycgrb43mk2a189xaldsdxy"; + sha256 = "0lb2yyh3j932789jq4gxx9xshgy6rfdnl3lm8yr43kaz7k4kw5gm"; }; preConfigure = "cd tools/lib/lockdep"; @@ -16,7 +17,7 @@ stdenv.mkDerivation rec { cp -R include/liblockdep $out/include make install DESTDIR=$out prefix="" - substituteInPlace $out/bin/lockdep --replace "./liblockdep.so" "$out/lib/liblockdep.so.$version" + substituteInPlace $out/bin/lockdep --replace "./liblockdep.so" "$out/lib/liblockdep.so.$fullver" ''; meta = { diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index 4794cd8f96c3..315265f82033 100644 --- a/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/pkgs/os-specific/linux/lttng-modules/default.nix @@ -1,16 +1,18 @@ { stdenv, fetchurl, kernel }: +assert stdenv.lib.versionAtLeast kernel.version "3.4"; # fails on 3.2 +assert builtins.substring 0 4 kernel.version != "3.12"; + stdenv.mkDerivation rec { - pname = "lttng-modules-2.4.1"; + pname = "lttng-modules-${version}"; name = "${pname}-${kernel.version}"; + version = "2.6.0-rc1"; # "git describe bf2ba318fff" src = fetchurl { - url = "https://lttng.org/files/lttng-modules/${pname}.tar.bz2"; - sha256 = "1qn1qm8lwqw9ri9wfkf6k3d58gl9rwffmpbpkwx21v1fw95zi92k"; + url = "https://github.com/lttng/lttng-modules/archive/v${version}.tar.gz"; + sha256 = "01gha02ybbzr86v6s6bqn649jiw5k89kb363b9s1iv8igrdlzhl1"; }; - patches = [ ./lttng-fix-build-error-on-linux-3.2.patch ]; - preConfigure = '' export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" export INSTALL_MOD_PATH="$out" @@ -23,10 +25,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Linux kernel modules for LTTng tracing"; homepage = http://lttng.org/; - # TODO license = with licenses; [ lgpl21 gpl2 mit ]; + license = with licenses; [ lgpl21 gpl2 mit ]; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; - broken = true; }; } diff --git a/pkgs/os-specific/linux/lttng-modules/lttng-fix-build-error-on-linux-3.2.patch b/pkgs/os-specific/linux/lttng-modules/lttng-fix-build-error-on-linux-3.2.patch deleted file mode 100644 index dfe6d21be841..000000000000 --- a/pkgs/os-specific/linux/lttng-modules/lttng-fix-build-error-on-linux-3.2.patch +++ /dev/null @@ -1,33 +0,0 @@ -When building against linux 3.2, we get this build error: - - building /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/lttng-probe-ext3.o - CC [M] /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/lttng-probe-ext3.o - In file included from /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/lttng-events.h:759:0, - from /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/define_trace.h:148, - from /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/ext3.h:868, - from /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/lttng-probe-ext3.c:48: - /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/../instrumentation/events/lttng-module/ext3.h: In function '__event_probe__ext3__page_op': - /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/../instrumentation/events/lttng-module/ext3.h:240:1: error: dereferencing pointer to incomplete type - /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/../instrumentation/events/lttng-module/ext3.h:240:1: error: dereferencing pointer to incomplete type - /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/../instrumentation/events/lttng-module/ext3.h:240:1: error: dereferencing pointer to incomplete type - /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/../instrumentation/events/lttng-module/ext3.h: In function '__event_probe__ext3_invalidatepage': - /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/../instrumentation/events/lttng-module/ext3.h:298:1: error: dereferencing pointer to incomplete type - /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/../instrumentation/events/lttng-module/ext3.h:298:1: error: dereferencing pointer to incomplete type - /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/../instrumentation/events/lttng-module/ext3.h:298:1: error: dereferencing pointer to incomplete type - -because a check for existing ext3/*h files in the kernel build tree is skipped -for linux < 3.4. Fix it by extending the ext3_dep_check thing to also be run -when building against linux >= 3.2 (not only linux >= 3.4). - -diff -uNr lttng-modules-2.2.0.orig/probes/Makefile lttng-modules-2.2.0/probes/Makefile ---- lttng-modules-2.2.0.orig/probes/Makefile 2013-06-19 03:22:44.000000000 +0200 -+++ lttng-modules-2.2.0/probes/Makefile 2013-07-06 13:22:15.902957717 +0200 -@@ -59,7 +59,7 @@ - ext3_dep_check = $(wildcard $(ext3_dep)) - ext3 = $(shell \ - if [ $(VERSION) -ge 3 -a $(PATCHLEVEL) -ge 1 ] ; then \ -- if [ $(VERSION) -ge 3 -a $(PATCHLEVEL) -ge 4 -a \ -+ if [ $(VERSION) -ge 3 -a $(PATCHLEVEL) -ge 2 -a \ - -z "$(ext3_dep_check)" ] ; then \ - echo "warn" ; \ - exit ; \ diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 12305687c299..79e65fdb613d 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "lxc-1.0.3"; + name = "lxc-1.0.6"; src = fetchurl { url = "http://github.com/lxc/lxc/archive/${name}.tar.gz"; - sha256 = "04k45jgj2i501yhm467s1a1yk7h7q0fjhspys158w1a2m1hari4z"; + sha256 = "075i5h136b3dnf8nk6mpailz6i18yv1zcsj0jdpr9kg2i6d1ksia"; }; buildInputs = [ libcap apparmor perl docbook2x gnutls autoreconfHook pkgconfig ]; @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { preConfigure = '' export XML_CATALOG_FILES=${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml substituteInPlace doc/rootfs/Makefile.am --replace '@LXCROOTFSMOUNT@' '$out/lib/lxc/rootfs' + substituteInPlace configure.ac --replace '$sysconfdir/' '/etc/' + substituteInPlace configure.ac --replace '$${sysconfdir}/' '/etc/' ''; configureFlags = [ diff --git a/pkgs/os-specific/linux/macchanger/default.nix b/pkgs/os-specific/linux/macchanger/default.nix new file mode 100644 index 000000000000..1bbad958bfd0 --- /dev/null +++ b/pkgs/os-specific/linux/macchanger/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl }: + +let + pname = "macchanger"; + version = "1.6.0"; +in + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + src = fetchurl { + url = "mirror://gnu/${pname}/${name}.tar.gz"; + sha256 = "31534f138f1d21fa247be74ba6bef3fbfa47bbcd5033e99bd10c432fe58e51f7"; + }; + + meta = { + description = "A utility for viewing/manipulating the MAC address of network interfaces"; + maintainer = with stdenv.lib.maintainers; [ joachifm ]; + license = with stdenv.lib.licenses; gpl2Plus; + homepage = "https://www.gnu.org/software/macchanger"; + platform = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/os-specific/linux/module-init-tools/default.nix b/pkgs/os-specific/linux/module-init-tools/default.nix index 240150b09ddb..4877a2c77946 100644 --- a/pkgs/os-specific/linux/module-init-tools/default.nix +++ b/pkgs/os-specific/linux/module-init-tools/default.nix @@ -12,7 +12,10 @@ stdenv.mkDerivation { # Upstream forgot to include the generated manpages. Thankfully # the Gentoo people fixed this for us :-) (fetchurl { - url = mirror://gentoo/distfiles/module-init-tools-3.16-man.tar.bz2; + urls = [ + mirror://gentoo/distfiles/module-init-tools-3.16-man.tar.bz2 + http://mirror.meleeweb.net/pub/linux/gentoo/distfiles/module-init-tools-3.16-man.tar.bz2 + ]; sha256 = "1j1nzi87kgsh4scl645fhwhjvljxj83cmdasa4n4p5krhasgw358"; }) ]; diff --git a/pkgs/os-specific/linux/netatop/default.nix b/pkgs/os-specific/linux/netatop/default.nix index c77faa6a9e70..3d6b6faccca1 100644 --- a/pkgs/os-specific/linux/netatop/default.nix +++ b/pkgs/os-specific/linux/netatop/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl, kernel, zlib }: +assert stdenv.lib.versionOlder kernel.version "3.17"; + stdenv.mkDerivation { name = "netatop-${kernel.version}-0.3"; diff --git a/pkgs/os-specific/linux/nvidia-x11/builder-legacy.sh b/pkgs/os-specific/linux/nvidia-x11/builder-legacy173.sh index 7d39dd311897..7d39dd311897 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder-legacy.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder-legacy173.sh diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh index 4291116f4ef4..4291116f4ef4 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix index 0014a5d2ee53..9182139c0a83 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, kernel, xlibs, zlib, gtk, atk, pango, glib, gdk_pixbuf}: -let +let versionNumber = "173.14.39"; @@ -8,9 +8,9 @@ in stdenv.mkDerivation { name = "nvidia-x11-${versionNumber}-${kernel.version}"; - - builder = ./builder-legacy.sh; - + + builder = ./builder-legacy173.sh; + src = if stdenv.system == "i686-linux" then fetchurl { diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/legacy340.nix index c89846db72cf..ad0c0c0b367a 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy340.nix @@ -12,26 +12,29 @@ assert (!libsOnly) -> kernel != null; let - versionNumber = "340.32"; - + versionNumber = "340.58"; + /* This branch is needed for G8x, G9x, and GT2xx GPUs, and motherboard chipsets based on them. + Ongoing support for new Linux kernels and X servers, as well as fixes for critical bugs, + will be included in 340.* legacy releases through the end of 2019. + */ inherit (stdenv.lib) makeLibraryPath; in stdenv.mkDerivation { name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}"; - builder = ./builder.sh; + builder = ./builder-legacy340.sh; src = if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "1xcm8czz4bmnlzkl3al58flw6jmbrg1y77cxjjdjqcsvbk1qj10x"; + sha256 = "0nzvfqn3cv2n486i38r3badd5jlmfv7x6k9s47calrqnd3q8zi3w"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "1nfrpx73817y1z0wkqqh02xjg65r0f05h9801mqm8ki2gxqv9vq0"; + sha256 = "0h78wmb1yyr1xah6x22ifk9gzd2jvg3vhhg091nvyhcvpmbjq806"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; diff --git a/pkgs/os-specific/linux/pam_ldap/default.nix b/pkgs/os-specific/linux/pam_ldap/default.nix index 2be869e73e3a..1eee7dbdac2b 100644 --- a/pkgs/os-specific/linux/pam_ldap/default.nix +++ b/pkgs/os-specific/linux/pam_ldap/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://www.padl.com/download/${name}.tar.gz"; - md5 = "c0ad81e9d9712ddc6599a6e7a1688778"; + sha256 = "1l0mlwvas9dnsfcgbszbzq3bzhdkibn1c3x15fczq3i82faf5g5a"; }; preInstall = " diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix index 83f0dc1e82d2..5646ba89f662 100644 --- a/pkgs/os-specific/linux/pax-utils/default.nix +++ b/pkgs/os-specific/linux/pax-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pax-utils-${version}"; - version = "0.8.1"; + version = "0.9.2"; src = fetchurl { url = "http://dev.gentoo.org/~vapier/dist/${name}.tar.xz"; - sha256 = "1fgm70s52x48dxjihs0rcwmpfsi2dxbjzcilxy9fzg0i39dz4kw4"; + sha256 = "1pmlpjhr2475h5v90abmsfgr37r3b6c4mknhzswbgcb10vgh322p"; }; makeFlags = [ diff --git a/pkgs/os-specific/linux/paxctl/default.nix b/pkgs/os-specific/linux/paxctl/default.nix index 148048f6505b..8402b952ff77 100644 --- a/pkgs/os-specific/linux/paxctl/default.nix +++ b/pkgs/os-specific/linux/paxctl/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { "MANDIR=share/man/man1" ]; + setupHook = ./setup-hook.sh; + meta = with stdenv.lib; { description = "A tool for controlling PaX flags on a per binary basis"; homepage = "https://pax.grsecurity.net"; diff --git a/pkgs/os-specific/linux/paxctl/setup-hook.sh b/pkgs/os-specific/linux/paxctl/setup-hook.sh new file mode 100644 index 000000000000..11a6bb9910f9 --- /dev/null +++ b/pkgs/os-specific/linux/paxctl/setup-hook.sh @@ -0,0 +1,8 @@ +# PaX-mark binaries. +paxmark() { + local flags="$1" + shift + + paxctl -c "$@" + paxctl -zex -${flags} "$@" +} diff --git a/pkgs/os-specific/linux/prl-tools/autostart.desktop b/pkgs/os-specific/linux/prl-tools/autostart.desktop new file mode 100644 index 000000000000..b8eb27fdd992 --- /dev/null +++ b/pkgs/os-specific/linux/prl-tools/autostart.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Version=@version@ +Encoding=UTF-8 +Name=@description@ +Type=Application +Exec=@exec@ +X-KDE-autostart-phase=1 +GenericName[en_US]= diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix new file mode 100644 index 000000000000..bd73bc77c82e --- /dev/null +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -0,0 +1,197 @@ +{ stdenv, lib, requireFile, makeWrapper, substituteAll, p7zip +, gawk, utillinux, xorg, glib, dbus_glib, zlib +, kernel ? null, libsOnly ? false +}: + +assert (!libsOnly) -> kernel != null; + +let xorgFullVer = (builtins.parseDrvName xorg.xorgserver.name).version; + xorgVer = lib.concatStringsSep "." (lib.take 2 (lib.splitString "." xorgFullVer)); + x64 = if stdenv.system == "x86_64-linux" then true + else if stdenv.system == "i686-linux" then false + else abort "Parallels Tools for Linux only support {x86-64,i686}-linux targets"; + # We autostart user services by ourselves, because prlcc uses hardcoded paths. + autostart = [ { exec = "prlcc"; + description = "Parallels Control Center"; + } + { exec = "prldhd"; + description = "Parallels Control Center"; # not a mistake + } + { exec = "prl_wmouse_d"; + description = "Parallels Walking Mouse Daemon"; + } + { exec = "prlcp"; + description = "Parallels CopyPaste Tool"; + } + { exec = "prlsga"; + description = "Parallels Shared Guest Applications Tool"; + } + { exec = "prlshprof"; + description = "Parallels Shared Profile Tool"; + } + ]; +in +stdenv.mkDerivation rec { + version = "10.0.2.27712"; + name = "prl-tools-${version}"; + + src = requireFile rec { + name = "prl-tools-lin.iso"; + sha256 = "07960jvyv7gihjlg922znjm6db6l6bd23x9mg6ympwibzf2mylmx"; + message = '' + Please, place Parallel Tools for Linux image into Nix store + using either + nix-store --add-fixed sha256 ${name} + or + nix-prefetch-url file://path/to/${name} + ''; + }; + + # also maybe python2 to generate xorg.conf + nativeBuildInputs = [ p7zip ] ++ lib.optionals (!libsOnly) [ makeWrapper ]; + + inherit libsOnly; + + unpackPhase = '' + 7z x $src + export sourceRoot=. + if test -z "$libsOnly"; then + ( cd kmods; tar -xaf prl_mod.tar.gz ) + fi + ( cd tools; tar -xaf prltools${if x64 then ".x64" else ""}.tar.gz ) + ''; + + kernelVersion = if libsOnly then "" else (builtins.parseDrvName kernel.name).version; + kernelDir = if libsOnly then "" else "${kernel.dev}/lib/modules/${kernelVersion}"; + scriptPath = lib.concatStringsSep ":" (lib.optionals (!libsOnly) [ "${utillinux}/bin" "${gawk}/bin" ]); + + buildPhase = '' + if test -z "$libsOnly"; then + ( # kernel modules + cd kmods + make -f Makefile.kmods \ + KSRC=$kernelDir/source \ + HEADERS_CHECK_DIR=$kernelDir/source \ + KERNEL_DIR=$kernelDir/build \ + SRC=$kernelDir/build \ + KVER=$kernelVersion + ) + + # Xorg config (maybe would be useful for other versions) + #python2 installer/xserver-config.py xorg ${xorgVer} /dev/null parallels.conf + fi + ''; + + libPath = with xorg; + stdenv.lib.makeLibraryPath ([ stdenv.gcc.gcc libXrandr libXext libX11 libXcomposite libXinerama ] + ++ lib.optionals (!libsOnly) [ libXi glib dbus_glib zlib ]); + + desktops = map (x: substituteAll ({ + src = ./autostart.desktop; + name = x.exec + ".desktop"; + version = version; + } // x)) autostart; + + installPhase = '' + if test -z "$libsOnly"; then + ( # kernel modules + cd kmods + mkdir -p $out/lib/modules/${kernelVersion}/extra + cp prl_eth/pvmnet/prl_eth.ko $out/lib/modules/${kernelVersion}/extra + cp prl_tg/Toolgate/Guest/Linux/prl_tg/prl_tg.ko $out/lib/modules/${kernelVersion}/extra + cp prl_fs/SharedFolders/Guest/Linux/prl_fs/prl_fs.ko $out/lib/modules/${kernelVersion}/extra + cp prl_fs_freeze/Snapshot/Guest/Linux/prl_freeze/prl_fs_freeze.ko $out/lib/modules/${kernelVersion}/extra + ) + fi + + ( # tools + cd tools + mkdir -p $out/lib + + if test -z "$libsOnly"; then + # install binaries + for i in bin/* sbin/prl_nettool sbin/prl_snapshot; do + install -Dm755 $i $out/$i + done + # other binaries + for i in xorg.7.1/usr/bin/*; do + cp $i $out/bin + done + + for i in $out/bin/* $out/sbin/*; do + patchelf \ + --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-rpath "$out/lib:$libPath" \ + $i + done + + mkdir -p $out/bin + install -Dm755 ../installer/prlfsmountd.sh $out/sbin/prlfsmountd + wrapProgram $out/sbin/prlfsmountd \ + --prefix PATH ':' "$scriptPath" + + for i in lib/*.a; do + cp $i $out/lib + done + + for i in xorg.7.1/usr/lib/libprl_wmouse_watcher.*; do + cp $i $out/lib + done + + mkdir -p $out/lib/udev/rules.d + for i in *.rules; do + sed 's,/bin/bash,${stdenv.shell},g' $i > $out/lib/udev/rules.d/$i + done + + mkdir -p $out/share/autostart + for i in $desktops; do + cat $i | sed "s,^Exec=,Exec=$out/bin/," > $out/share/autostart/$(basename $i) + done + + ( + cd xorg.${xorgVer} + # Install the X modules. + ( + cd x-server/modules + for i in */*; do + install -Dm755 $i $out/lib/xorg/modules/$i + done + ) + ( + cd usr/lib + libGLXname=$(echo libglx.so*) + install -Dm755 $libGLXname $out/lib/xorg/modules/extensions/$libGLXname + ln -s $libGLXname $out/lib/xorg/modules/extensions/libglx.so + ln -s $libGLXname $out/lib/xorg/modules/extensions/libglx.so.1 + ) + ) + fi + + for i in xorg.7.1/usr/lib/libGL.*; do + cp $i $out/lib + done + + cd $out + find -name \*.so\* -type f -exec \ + patchelf --set-rpath "$out/lib:$libPath" {} \; + + cd lib + libGLname=$(echo libGL.so*) + ln -s $libGLname libGL.so + ln -s $libGLname libGL.so.1 + ) + ''; + + dontStrip = true; + dontPatchELF = true; + + meta = with stdenv.lib; { + description = "Parallels Tools for Linux guests"; + homepage = http://parallels.com; + platforms = platforms.linux; + license = licenses.unfree; + # I was making this package blindly and requesting testing from the real user, + # so I can't even test it by myself and won't provide future updates. + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix index cd8a8eaec133..bfcb99b7e78a 100644 --- a/pkgs/os-specific/linux/procps-ng/default.nix +++ b/pkgs/os-specific/linux/procps-ng/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation { - name = "procps-3.3.9"; + name = "procps-3.3.10"; src = fetchurl { - url = mirror://sourceforge/procps-ng/procps-ng-3.3.9.tar.xz; - sha256 = "0qw69v7wx8hilwylyk9455k3h1xg8sc13vxh0pvdss7rml7wpw00"; + url = mirror://sourceforge/procps-ng/procps-ng-3.3.10.tar.xz; + sha256 = "013z4rzy3p5m1zp6mmynpblv0c6zlcn91pw4k2vymz2djyc6ybm0"; }; buildInputs = [ ncurses ]; @@ -18,6 +18,9 @@ stdenv.mkDerivation { CC = stdenv.cross.config + "-gcc"; }; + # Too red + configureFlags = [ "--disable-modern-top" ]; + meta = { homepage = http://sourceforge.net/projects/procps-ng/; description = "Utilities that give information about processes using the /proc filesystem"; diff --git a/pkgs/os-specific/linux/s6-linux-utils/default.nix b/pkgs/os-specific/linux/s6-linux-utils/default.nix index 0f0967079dfb..b7a546a3ea06 100644 --- a/pkgs/os-specific/linux/s6-linux-utils/default.nix +++ b/pkgs/os-specific/linux/s6-linux-utils/default.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchurl, skalibs }: +{ stdenv +, fetchurl +, skalibs +, skarnetConfCompile +}: let @@ -13,39 +17,13 @@ in stdenv.mkDerivation rec { sha256 = "1s17g03z5hfpiz32g001g5wyamyvn9l36fr2csk3k7r0jkqfnl0d"; }; - buildInputs = [ skalibs ]; + buildInputs = [ skalibs skarnetConfCompile ]; sourceRoot = "admin/${name}"; - configurePhase = '' - pushd conf-compile - - printf "$out/bin" > conf-install-command - printf "$out/include" > conf-install-include - printf "$out/lib" > conf-install-library - printf "$out/lib" > conf-install-library.so - - # let nix builder strip things, cross-platform - truncate --size 0 conf-stripbins - truncate --size 0 conf-striplibs - - printf "${skalibs}/sysdeps" > import - printf "%s" "${skalibs}/include" > path-include - printf "%s" "${skalibs}/lib" > path-library - - rm -f flag-slashpackage - touch flag-allstatic - - popd - ''; - - preBuild = '' - patchShebangs src/sys - ''; - meta = { homepage = http://www.skarnet.org/software/s6-linux-utils/; - description = "A set of minimalistic Linux-specific system utilities."; + description = "A set of minimalistic Linux-specific system utilities"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.isc; }; diff --git a/pkgs/os-specific/linux/sdparm/default.nix b/pkgs/os-specific/linux/sdparm/default.nix index 2a796c1b3a9e..30943d8cd413 100644 --- a/pkgs/os-specific/linux/sdparm/default.nix +++ b/pkgs/os-specific/linux/sdparm/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation { meta = { homepage = http://sg.danny.cz/sg/sdparm.html; description = "A utility to access SCSI device parameters"; - license = "free"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 944fb6ff554c..7f1dad248e6f 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "1qqzyj2if5wai4jiwml4i8s6v8k7hbi7jmiph800lhkk5j8s72l9"; }; - patches = [ ./install_prefix.patch ./const.patch ]; + patches = [ ./install_prefix.patch ./const.patch ./kernel-3.16.patch ./kernel-3.17.patch ]; buildInputs = [ perl autoconf automake libtool ]; diff --git a/pkgs/os-specific/linux/spl/git.nix b/pkgs/os-specific/linux/spl/git.nix index d3ed285ccfef..93629495164b 100644 --- a/pkgs/os-specific/linux/spl/git.nix +++ b/pkgs/os-specific/linux/spl/git.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "0mcivbddms8kbapbs9x6achqyvh5i6h1rd2b3jm8g5yjn0flc5gl"; }; - patches = [ ./install_prefix.patch ./const.patch ]; + patches = [ ./install_prefix.patch ./const.patch ./kernel-3.16.patch ./kernel-3.17.patch ]; buildInputs = [ perl autoconf automake libtool ]; diff --git a/pkgs/os-specific/linux/spl/kernel-3.16.patch b/pkgs/os-specific/linux/spl/kernel-3.16.patch new file mode 100644 index 000000000000..25641c7a384f --- /dev/null +++ b/pkgs/os-specific/linux/spl/kernel-3.16.patch @@ -0,0 +1,34 @@ +From e3020723dc43af2bc22af0d68571a61daf9b44d0 Mon Sep 17 00:00:00 2001 +From: Turbo Fredriksson <turbo@bayour.com> +Date: Sun, 14 Sep 2014 15:47:22 +0000 +Subject: [PATCH] Linux 3.16 compat: smp_mb__after_clear_bit() + +The smp_mb__{before,after}_clear_bit functions have been renamed +smp_mb__{before,after}_atomic. Rather than adding a compatibility +function to handle this the code has been updated to use smp_wmb(). + +This has the advantage of being a stable functionally equivalent +interface. On many architectures smp_mb__after_clear_bit() expands +to smp_wmb(). Others might be able to do something slightly more +efficient but this will be safe and correct on all of them. + +Signed-off-by: Turbo Fredriksson <turbo@bayour.com> +Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> +Closes #386 +--- + module/spl/spl-kmem.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/module/spl/spl-kmem.c b/module/spl/spl-kmem.c +index 6de513e..79954eb 100644 +--- a/module/spl/spl-kmem.c ++++ b/module/spl/spl-kmem.c +@@ -2365,7 +2365,7 @@ spl_kmem_cache_reap_now(spl_kmem_cache_t *skc, int count) + + spl_slab_reclaim(skc, count, 1); + clear_bit(KMC_BIT_REAPING, &skc->skc_flags); +- smp_mb__after_clear_bit(); ++ smp_wmb(); + wake_up_bit(&skc->skc_flags, KMC_BIT_REAPING); + out: + atomic_dec(&skc->skc_ref); diff --git a/pkgs/os-specific/linux/spl/kernel-3.17.patch b/pkgs/os-specific/linux/spl/kernel-3.17.patch new file mode 100644 index 000000000000..f5ce2c8805d8 --- /dev/null +++ b/pkgs/os-specific/linux/spl/kernel-3.17.patch @@ -0,0 +1,175 @@ +From 2fc44f66ec9b83069593d87cf311069458c0d5ae Mon Sep 17 00:00:00 2001 +From: Ned Bass <bass6@llnl.gov> +Date: Fri, 8 Aug 2014 17:41:22 -0700 +Subject: [PATCH] Linux 3.17 compat: remove wait_on_bit action function + +Linux kernel 3.17 removes the action function argument from +wait_on_bit(). Add autoconf test and compatibility macro to support +the new interface. + +The former "wait_on_bit" interface required an 'action' function to +be provided which does the actual waiting. There were over 20 such +functions in the kernel, many of them identical, though most cases +can be satisfied by one of just two functions: one which uses +io_schedule() and one which just uses schedule(). This API change +was made to consolidate all of those redundant wait functions. + +References: torvalds/linux@7431620 + +Signed-off-by: Ned Bass <bass6@llnl.gov> +Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> +Closes #378 +--- + config/spl-build.m4 | 26 ++++++++++++++++++++++++++ + include/linux/Makefile.am | 1 + + include/linux/wait_compat.h | 45 +++++++++++++++++++++++++++++++++++++++++++++ + include/sys/types.h | 1 + + module/spl/spl-kmem.c | 11 ++--------- + 5 files changed, 75 insertions(+), 9 deletions(-) + create mode 100644 include/linux/wait_compat.h + +diff --git a/config/spl-build.m4 b/config/spl-build.m4 +index eef5233..2514d8c 100644 +--- a/config/spl-build.m4 ++++ b/config/spl-build.m4 +@@ -94,6 +94,7 @@ AC_DEFUN([SPL_AC_CONFIG_KERNEL], [ + SPL_AC_2ARGS_VFS_GETATTR + SPL_AC_USLEEP_RANGE + SPL_AC_KMEM_CACHE_ALLOCFLAGS ++ SPL_AC_WAIT_ON_BIT + ]) + + AC_DEFUN([SPL_AC_MODULE_SYMVERS], [ +@@ -2570,3 +2571,28 @@ AC_DEFUN([SPL_AC_KMEM_CACHE_ALLOCFLAGS], [ + ]) + ]) + ]) ++ ++dnl # ++dnl # 3.17 API change, ++dnl # wait_on_bit() no longer requires an action argument. The former ++dnl # "wait_on_bit" interface required an 'action' function to be provided ++dnl # which does the actual waiting. There were over 20 such functions in the ++dnl # kernel, many of them identical, though most cases can be satisfied by one ++dnl # of just two functions: one which uses io_schedule() and one which just ++dnl # uses schedule(). This API change was made to consolidate all of those ++dnl # redundant wait functions. ++dnl # ++AC_DEFUN([SPL_AC_WAIT_ON_BIT], [ ++ AC_MSG_CHECKING([whether wait_on_bit() takes an action]) ++ SPL_LINUX_TRY_COMPILE([ ++ #include <linux/wait.h> ++ ],[ ++ int (*action)(void *) = NULL; ++ wait_on_bit(NULL, 0, action, 0); ++ ],[ ++ AC_MSG_RESULT(yes) ++ AC_DEFINE(HAVE_WAIT_ON_BIT_ACTION, 1, [yes]) ++ ],[ ++ AC_MSG_RESULT(no) ++ ]) ++]) +diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am +index 59f2ec5..ec7023d 100644 +--- a/include/linux/Makefile.am ++++ b/include/linux/Makefile.am +@@ -17,6 +17,7 @@ KERNEL_H = \ + $(top_srcdir)/include/linux/sysctl_compat.h \ + $(top_srcdir)/include/linux/time_compat.h \ + $(top_srcdir)/include/linux/uaccess_compat.h \ ++ $(top_srcdir)/include/linux/wait_compat.h \ + $(top_srcdir)/include/linux/zlib_compat.h + + USER_H = +diff --git a/include/linux/wait_compat.h b/include/linux/wait_compat.h +new file mode 100644 +index 0000000..66f9a9a +--- /dev/null ++++ b/include/linux/wait_compat.h +@@ -0,0 +1,45 @@ ++/*****************************************************************************\ ++ * Copyright (C) 2007-2014 Lawrence Livermore National Security, LLC. ++ * Copyright (C) 2007 The Regents of the University of California. ++ * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER). ++ * Written by Brian Behlendorf <behlendorf1@llnl.gov>. ++ * UCRL-CODE-235197 ++ * ++ * This file is part of the SPL, Solaris Porting Layer. ++ * For details, see <http://zfsonlinux.org/>. ++ * ++ * The SPL is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License as published by the ++ * Free Software Foundation; either version 2 of the License, or (at your ++ * option) any later version. ++ * ++ * The SPL is distributed in the hope that it will be useful, but WITHOUT ++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ++ * for more details. ++ * ++ * You should have received a copy of the GNU General Public License along ++ * with the SPL. If not, see <http://www.gnu.org/licenses/>. ++\*****************************************************************************/ ++ ++#ifndef _SPL_WAIT_COMPAT_H ++#define _SPL_WAIT_COMPAT_H ++ ++ ++#ifndef HAVE_WAIT_ON_BIT_ACTION ++# define spl_wait_on_bit(word, bit, mode) wait_on_bit(word, bit, mode) ++#else ++ ++static inline int ++spl_bit_wait(void *word) ++{ ++ schedule(); ++ return 0; ++} ++ ++#define spl_wait_on_bit(word, bit, mode) \ ++ wait_on_bit(word, bit, spl_bit_wait, mode) ++ ++#endif /* HAVE_WAIT_ON_BIT_ACTION */ ++ ++#endif /* SPL_WAIT_COMPAT_H */ +diff --git a/include/sys/types.h b/include/sys/types.h +index decb6bb..fcec0fa 100644 +--- a/include/sys/types.h ++++ b/include/sys/types.h +@@ -43,6 +43,7 @@ + #include <linux/zlib_compat.h> + #include <linux/mm_compat.h> + #include <linux/delay.h> ++#include <linux/wait_compat.h> + + #ifndef HAVE_UINTPTR_T + typedef unsigned long uintptr_t; +diff --git a/module/spl/spl-kmem.c b/module/spl/spl-kmem.c +index 0a9d775..6de513e 100644 +--- a/module/spl/spl-kmem.c ++++ b/module/spl/spl-kmem.c +@@ -1900,13 +1900,6 @@ spl_cache_grow_wait(spl_kmem_cache_t *skc) + return !test_bit(KMC_BIT_GROWING, &skc->skc_flags); + } + +-static int +-spl_cache_reclaim_wait(void *word) +-{ +- schedule(); +- return 0; +-} +- + /* + * No available objects on any slabs, create a new slab. Note that this + * functionality is disabled for KMC_SLAB caches which are backed by the +@@ -1928,8 +1921,8 @@ spl_cache_grow(spl_kmem_cache_t *skc, int flags, void **obj) + * then return so the local magazine can be rechecked for new objects. + */ + if (test_bit(KMC_BIT_REAPING, &skc->skc_flags)) { +- rc = wait_on_bit(&skc->skc_flags, KMC_BIT_REAPING, +- spl_cache_reclaim_wait, TASK_UNINTERRUPTIBLE); ++ rc = spl_wait_on_bit(&skc->skc_flags, KMC_BIT_REAPING, ++ TASK_UNINTERRUPTIBLE); + SRETURN(rc ? rc : -EAGAIN); + } + diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 0e62ab86f6d5..1398b91303bc 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.89"; + version = "0.1.91"; name="${baseName}-${version}"; url="https://github.com/draios/sysdig/archive/${version}.tar.gz"; - sha256 = "06g0s38xvsmi8m80719m4h3h4by8q12imlp4k8sixhw06k959mhw"; + sha256 = "0a34zinw54nkxawby847yzc3wzbw4dgi849pvwyd28391pxpxayy"; }; buildInputs = [ cmake zlib luajit diff --git a/pkgs/os-specific/linux/sysfsutils/default.nix b/pkgs/os-specific/linux/sysfsutils/default.nix index bf6dafae10ac..99e6c4ff3802 100644 --- a/pkgs/os-specific/linux/sysfsutils/default.nix +++ b/pkgs/os-specific/linux/sysfsutils/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { filesystem in Linux kernel versions 2.5+ that exposes a system's device tree. ''; - license = "GPL-v2 / LGPL-v2.1"; + license = with stdenv.lib.licenses; [ gpl2 lgpl21 ]; }; } diff --git a/pkgs/os-specific/linux/sysklogd/default.nix b/pkgs/os-specific/linux/sysklogd/default.nix index 979bfa1d0bf3..b7bbdee369a1 100644 --- a/pkgs/os-specific/linux/sysklogd/default.nix +++ b/pkgs/os-specific/linux/sysklogd/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "sysklogd-1.5"; + name = "sysklogd-1.5.1"; src = fetchurl { - url = http://www.infodrom.org/projects/sysklogd/download/sysklogd-1.5.tar.gz; - sha256 = "0wxpkrznqwz4dy11k90s2sqszwp7d4mlc0ag8288wa193plvhsb1"; + url = http://www.infodrom.org/projects/sysklogd/download/sysklogd-1.5.1.tar.gz; + sha256 = "00f2wy6f0qng7qzga4iicyzl9j8b7mp6mrpfky5jxj93ms2w2rji"; }; patches = [ ./systemd.patch ]; diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix index 734613c44ac8..93e5d591a9d9 100644 --- a/pkgs/os-specific/linux/syslinux/default.nix +++ b/pkgs/os-specific/linux/syslinux/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, nasm, perl, libuuid }: stdenv.mkDerivation rec { - name = "syslinux-6.02"; + name = "syslinux-6.03"; src = fetchurl { url = "mirror://kernel/linux/utils/boot/syslinux/${name}.tar.xz"; - sha256 = "0y2ld2s64s6vc5pf8rj36w71rq2cfax3c1iafp0w1qbjpxy1p8xg"; + sha256 = "03l5iifwlg1wyb4yh98i0b7pd4j55a1c9y74q1frs47a5dnrilr6"; }; patches = [ ./perl-deps.patch ]; diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix index 7944f612fb05..69940ceb1328 100644 --- a/pkgs/os-specific/linux/sysstat/default.nix +++ b/pkgs/os-specific/linux/sysstat/default.nix @@ -15,14 +15,8 @@ stdenv.mkDerivation rec { export PATH_CHKCONFIG=/no-such-program export BZIP=${bzip2}/bin/bzip2 export SYSTEMCTL=systemctl - makeFlagsArray=(SYSCONFIG_DIR=$out/etc CHOWN=true IGNORE_MAN_GROUP=y CHOWN=true) - installFlagsArray=(SA_DIR=$TMPDIR/dummy) - # Note: --enable-install-cron actually installs systemd units. - configureFlagsArray+=(--with-systemdsystemunitdir=$out/lib/systemd/system --enable-install-cron) - ''; - - preInstall = '' - mkdir -p $out/lib/systemd/system + makeFlagsArray=(DESTDIR=$out SYSCONFIG_DIR=$out/etc IGNORE_MAN_GROUP=y CHOWN=true) + installTargets="install_base install_nls install_man" ''; meta = { diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 3445c3cd2dd3..2df23cf0e16e 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -1,9 +1,8 @@ { stdenv, fetchurl, pkgconfig, intltool, gperf, libcap, dbus, kmod , xz, pam, acl, cryptsetup, libuuid, m4, utillinux -, glib, kbd, libxslt, coreutils, libgcrypt, sysvtools, docbook_xsl +, glib, kbd, libxslt, coreutils, libgcrypt, sysvtools , kexectools, libmicrohttpd, linuxHeaders , pythonPackages ? null, pythonSupport ? false -, autoreconfHook }: assert stdenv.isLinux; @@ -11,25 +10,27 @@ assert stdenv.isLinux; assert pythonSupport -> pythonPackages != null; stdenv.mkDerivation rec { - version = "212"; + version = "217"; name = "systemd-${version}"; src = fetchurl { url = "http://www.freedesktop.org/software/systemd/${name}.tar.xz"; - sha256 = "1hpjcc42svrs06q3isjm3m5aphgkpfdylmvpnif71zh46ys0cab5"; + sha256 = "163l1y4p2a564d4ynfq3k3xf53j2v5s81blb6cvpn1y7rpxyccd0"; }; patches = [ # These are all changes between upstream and - # https://github.com/edolstra/systemd/tree/nixos-v212. + # https://github.com/edolstra/systemd/tree/nixos-v216. ./fixes.patch + # Fixes systemd-journald so that it does not get killed + # by systemd-journal-flush starting too quickly + ./systemd-journald-type-notify.patch ]; buildInputs = [ pkgconfig intltool gperf libcap kmod xz pam acl - /* cryptsetup */ libuuid m4 glib libxslt libgcrypt docbook_xsl + /* cryptsetup */ libuuid m4 glib libxslt libgcrypt libmicrohttpd linuxHeaders - autoreconfHook ] ++ stdenv.lib.optionals pythonSupport [pythonPackages.python pythonPackages.lxml]; configureFlags = @@ -45,9 +46,23 @@ stdenv.mkDerivation rec { "--with-dbussessionservicedir=$(out)/share/dbus-1/services" "--with-firmware-path=/root/test-firmware:/run/current-system/firmware" "--with-tty-gid=3" # tty in NixOS has gid 3 - "--disable-networkd" # enable/use eventually "--enable-compat-libs" # get rid of this eventually "--disable-tests" + + "--disable-hostnamed" + "--enable-networkd" + "--disable-sysusers" + "--disable-timedated" + "--enable-timesyncd" + "--disable-readahead" + "--disable-firstboot" + "--disable-localed" + "--enable-resolved" + "--disable-split-usr" + + "--with-sysvinit-path=" + "--with-sysvrcnd-path=" + "--with-rc-local-script-path-stop=/etc/halt.local" ]; preConfigure = @@ -88,6 +103,8 @@ stdenv.mkDerivation rec { # currently running systemd (/run/current-system/systemd) so # that we don't use an obsolete/garbage-collected release agent. "-USYSTEMD_CGROUP_AGENT_PATH" "-DSYSTEMD_CGROUP_AGENT_PATH=\"/run/current-system/systemd/lib/systemd/systemd-cgroups-agent\"" + + "-USYSTEMD_BINARY_PATH" "-DSYSTEMD_BINARY_PATH=\"/run/current-system/systemd/lib/systemd/systemd\"" ]; # Use /var/lib/udev rather than /etc/udev for the generated hardware @@ -104,9 +121,14 @@ stdenv.mkDerivation rec { "pamconfdir=$(out)/etc/pam.d" ]; - # Get rid of configuration-specific data. postInstall = '' + # sysinit.target: Don't depend on + # systemd-tmpfiles-setup.service. This interferes with NixOps's + # send-keys feature (since sshd.service depends indirectly on + # sysinit.target). + mv $out/lib/systemd/system/sysinit.target.wants/systemd-tmpfiles-setup-dev.service $out/lib/systemd/system/multi-user.target.wants/ + mkdir -p $out/example/systemd mv $out/lib/{modules-load.d,binfmt.d,sysctl.d,tmpfiles.d} $out/example mv $out/lib/systemd/{system,user} $out/example/systemd diff --git a/pkgs/os-specific/linux/systemd/fixes.patch b/pkgs/os-specific/linux/systemd/fixes.patch index 72cf0e92bb84..ff31b4a75d48 100644 --- a/pkgs/os-specific/linux/systemd/fixes.patch +++ b/pkgs/os-specific/linux/systemd/fixes.patch @@ -1,72 +1,5 @@ -diff --git a/Makefile.am b/Makefile.am -index 3d9e5c1..46487f6 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1095,7 +1095,7 @@ BUILT_SOURCES += \ - - src/shared/errno-list.txt: - $(AM_V_at)$(MKDIR_P) $(dir $@) -- $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include errno.h - < /dev/null | $(AWK) '/^#define[ \t]+E[^ _]+[ \t]+[0-9]/ { print $$2; }' > $@ -+ $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include errno.h - < /dev/null | $(AWK) '/^#define[ \t]+E[^ _]+[ \t]+/ { print $$2; }' > $@ - - src/shared/errno-from-name.gperf: src/shared/errno-list.txt - $(AM_V_at)$(MKDIR_P) $(dir $@) -@@ -1107,7 +1107,7 @@ src/shared/errno-from-name.h: src/shared/errno-from-name.gperf - - src/shared/errno-to-name.h: src/shared/errno-list.txt - $(AM_V_at)$(MKDIR_P) $(dir $@) -- $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const errno_names[] = { "} { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' < $< > $@ -+ $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const errno_names[] = { "} !/EDEADLOCK/ && !/EWOULDBLOCK/ && !/ENOTSUP/ { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' < $< > $@ - - src/shared/af-list.txt: - $(AM_V_at)$(MKDIR_P) $(dir $@) -@@ -1707,7 +1707,9 @@ dist_tmpfiles_DATA += \ - endif - - SYSINIT_TARGET_WANTS += \ -- systemd-tmpfiles-setup-dev.service \ -+ systemd-tmpfiles-setup-dev.service -+ -+MULTI_USER_TARGET_WANTS += \ - systemd-tmpfiles-setup.service - - dist_zshcompletion_DATA += \ -@@ -1961,6 +1963,7 @@ systemd_cgls_SOURCES = \ - src/cgls/cgls.c - - systemd_cgls_LDADD = \ -+ libsystemd-internal.la \ - libsystemd-shared.la - - # ------------------------------------------------------------------------------ -diff --git a/TODO b/TODO -index e2ca1e6..d7efdd5 100644 ---- a/TODO -+++ b/TODO -@@ -1,4 +1,6 @@ - Bugfixes: -+* Should systemctl status \* work on all unit types, not just .service? -+ - * enabling an instance unit creates a pointless link, and - the unit will be started with getty@getty.service: - $ systemctl enable getty@.service -diff --git a/rules/42-usb-hid-pm.rules b/rules/42-usb-hid-pm.rules -index c675b5b..4c300da 100644 ---- a/rules/42-usb-hid-pm.rules -+++ b/rules/42-usb-hid-pm.rules -@@ -12,10 +12,6 @@ ACTION=="add", SUBSYSTEM=="usb", ATTR{product}=="QEMU USB Mouse", ATTR{serial}!= - ACTION=="add", SUBSYSTEM=="usb", ATTR{product}=="QEMU USB Tablet", ATTR{serial}!="1", TEST=="power/control", ATTR{power/control}="auto" - ACTION=="add", SUBSYSTEM=="usb", ATTR{product}=="QEMU USB Keyboard", ATTR{serial}!="1", TEST=="power/control", ATTR{power/control}="auto" - --# Catch-all for Avocent HID devices. Keyed off interface in order to only --# trigger on HID class devices. --ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="0624", ATTR{bInterfaceClass}=="03", TEST=="../power/control", ATTR{../power/control}="auto" -- - # Dell DRAC 4 - ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="413c", ATTR{idProduct}=="2500", TEST=="power/control", ATTR{power/control}="auto" - diff --git a/rules/99-systemd.rules.in b/rules/99-systemd.rules.in -index db72373..2875958 100644 +index e30d9a8..a3d399b 100644 --- a/rules/99-systemd.rules.in +++ b/rules/99-systemd.rules.in @@ -14,10 +14,6 @@ KERNEL=="vport*", TAG+="systemd" @@ -80,583 +13,11 @@ index db72373..2875958 100644 # Ignore raid devices that are not yet assembled and started SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="md*", TEST!="md/array_state", ENV{SYSTEMD_READY}="0" SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="md*", ATTR{md/array_state}=="|clear|inactive", ENV{SYSTEMD_READY}="0" -@@ -43,7 +39,7 @@ SUBSYSTEM=="net", KERNEL!="lo", TAG+="systemd", ENV{SYSTEMD_ALIAS}+="/sys/subsys - SUBSYSTEM=="bluetooth", TAG+="systemd", ENV{SYSTEMD_ALIAS}+="/sys/subsystem/bluetooth/devices/%k" - - SUBSYSTEM=="bluetooth", TAG+="systemd", ENV{SYSTEMD_WANTS}+="bluetooth.target" --ENV{ID_SMARTCARD_READER}=="*?", TAG+="systemd", ENV{SYSTEMD_WANTS}+="smartcard.target" -+ENV{ID_SMARTCARD_READER}=="?*", TAG+="systemd", ENV{SYSTEMD_WANTS}+="smartcard.target" - SUBSYSTEM=="sound", KERNEL=="card*", TAG+="systemd", ENV{SYSTEMD_WANTS}+="sound.target" - - SUBSYSTEM=="printer", TAG+="systemd", ENV{SYSTEMD_WANTS}+="printer.target" -diff --git a/src/cgls/cgls.c b/src/cgls/cgls.c -index b8e275d..1840594 100644 ---- a/src/cgls/cgls.c -+++ b/src/cgls/cgls.c -@@ -35,6 +35,10 @@ - #include "build.h" - #include "output-mode.h" - #include "fileio.h" -+#include "sd-bus.h" -+#include "bus-util.h" -+#include "bus-error.h" -+#include "unit-name.h" - - static bool arg_no_pager = false; - static bool arg_kernel_threads = false; -@@ -127,6 +131,7 @@ int main(int argc, char *argv[]) { - int r = 0, retval = EXIT_FAILURE; - int output_flags; - char _cleanup_free_ *root = NULL; -+ _cleanup_bus_unref_ sd_bus *bus = NULL; - - log_parse_environment(); - log_open(); -@@ -151,6 +156,12 @@ int main(int argc, char *argv[]) { - arg_all * OUTPUT_SHOW_ALL | - (arg_full > 0) * OUTPUT_FULL_WIDTH; - -+ r = bus_open_transport(BUS_TRANSPORT_LOCAL, NULL, false, &bus); -+ if (r < 0) { -+ log_error("Failed to create bus connection: %s", strerror(-r)); -+ goto finish; -+ } -+ - if (optind < argc) { - int i; - -@@ -189,8 +200,52 @@ int main(int argc, char *argv[]) { - } else { - if (arg_machine) { - char *m; -+ const char *cgroup; -+ _cleanup_free_ char *scope = NULL; -+ _cleanup_free_ char *path = NULL; -+ _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; -+ _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; -+ - m = strappenda("/run/systemd/machines/", arg_machine); -- r = parse_env_file(m, NEWLINE, "CGROUP", &root, NULL); -+ r = parse_env_file(m, NEWLINE, "SCOPE", &scope, NULL); -+ if (r < 0) { -+ log_error("Failed to get machine path: %s", strerror(-r)); -+ goto finish; -+ } -+ -+ path = unit_dbus_path_from_name(scope); -+ if (!path) { -+ r = log_oom(); -+ goto finish; -+ } -+ -+ r = sd_bus_get_property( -+ bus, -+ "org.freedesktop.systemd1", -+ path, -+ "org.freedesktop.systemd1.Scope", -+ "ControlGroup", -+ &error, -+ &reply, -+ "s"); -+ -+ if (r < 0) { -+ log_error("Failed to query ControlGroup: %s", bus_error_message(&error, -r)); -+ goto finish; -+ } -+ -+ r = sd_bus_message_read(reply, "s", &cgroup); -+ if (r < 0) { -+ bus_log_parse_error(r); -+ goto finish; -+ } -+ -+ root = strdup(cgroup); -+ if (!root) { -+ r = log_oom(); -+ goto finish; -+ } -+ - } else - r = cg_get_root_path(&root); - if (r < 0) { -diff --git a/src/core/cgroup.c b/src/core/cgroup.c -index 3dd4c91..4201e1e 100644 ---- a/src/core/cgroup.c -+++ b/src/core/cgroup.c -@@ -871,7 +871,7 @@ int manager_setup_cgroup(Manager *m) { - safe_close(m->pin_cgroupfs_fd); - - m->pin_cgroupfs_fd = open(path, O_RDONLY|O_CLOEXEC|O_DIRECTORY|O_NOCTTY|O_NONBLOCK); -- if (r < 0) { -+ if (m->pin_cgroupfs_fd < 0) { - log_error("Failed to open pin file: %m"); - return -errno; - } -diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c -index 775825b..5b1c4e3 100644 ---- a/src/core/dbus-cgroup.c -+++ b/src/core/dbus-cgroup.c -@@ -173,6 +173,7 @@ int bus_cgroup_set_property( - - if (mode != UNIT_CHECK) { - c->cpu_accounting = b; -+ u->cgroup_realized_mask &= ~CGROUP_CPUACCT; - unit_write_drop_in_private(u, mode, name, b ? "CPUAccounting=yes" : "CPUAccounting=no"); - } - -@@ -192,6 +193,7 @@ int bus_cgroup_set_property( - - if (mode != UNIT_CHECK) { - c->cpu_shares = ul; -+ u->cgroup_realized_mask &= ~CGROUP_CPU; - unit_write_drop_in_private_format(u, mode, name, "CPUShares=%lu", ul); - } - -@@ -206,6 +208,7 @@ int bus_cgroup_set_property( - - if (mode != UNIT_CHECK) { - c->blockio_accounting = b; -+ u->cgroup_realized_mask &= ~CGROUP_BLKIO; - unit_write_drop_in_private(u, mode, name, b ? "BlockIOAccounting=yes" : "BlockIOAccounting=no"); - } - -@@ -225,6 +228,7 @@ int bus_cgroup_set_property( - - if (mode != UNIT_CHECK) { - c->blockio_weight = ul; -+ u->cgroup_realized_mask &= ~CGROUP_BLKIO; - unit_write_drop_in_private_format(u, mode, name, "BlockIOWeight=%lu", ul); - } - -@@ -294,6 +298,8 @@ int bus_cgroup_set_property( - cgroup_context_free_blockio_device_bandwidth(c, a); - } - -+ u->cgroup_realized_mask &= ~CGROUP_BLKIO; -+ - f = open_memstream(&buf, &size); - if (!f) - return -ENOMEM; -@@ -375,6 +381,8 @@ int bus_cgroup_set_property( - cgroup_context_free_blockio_device_weight(c, c->blockio_device_weights); - } - -+ u->cgroup_realized_mask &= ~CGROUP_BLKIO; -+ - f = open_memstream(&buf, &size); - if (!f) - return -ENOMEM; -@@ -398,6 +406,7 @@ int bus_cgroup_set_property( - - if (mode != UNIT_CHECK) { - c->memory_accounting = b; -+ u->cgroup_realized_mask &= ~CGROUP_MEMORY; - unit_write_drop_in_private(u, mode, name, b ? "MemoryAccounting=yes" : "MemoryAccounting=no"); - } - -@@ -412,6 +421,7 @@ int bus_cgroup_set_property( - - if (mode != UNIT_CHECK) { - c->memory_limit = limit; -+ u->cgroup_realized_mask &= ~CGROUP_MEMORY; - unit_write_drop_in_private_format(u, mode, name, "%s=%" PRIu64, name, limit); - } - -@@ -433,6 +443,7 @@ int bus_cgroup_set_property( - char *buf; - - c->device_policy = p; -+ u->cgroup_realized_mask &= ~CGROUP_DEVICE; - - buf = strappenda("DevicePolicy=", policy); - unit_write_drop_in_private(u, mode, name, buf); -@@ -511,6 +522,8 @@ int bus_cgroup_set_property( - cgroup_context_free_device_allow(c, c->device_allow); - } - -+ u->cgroup_realized_mask &= ~CGROUP_DEVICE; -+ - f = open_memstream(&buf, &size); - if (!f) - return -ENOMEM; -diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c -index 13b3d0d..37d4154 100644 ---- a/src/core/dbus-execute.c -+++ b/src/core/dbus-execute.c -@@ -842,7 +842,7 @@ int bus_exec_context_set_transient_property( - strv_free(c->environment); - c->environment = e; - -- joined = strv_join(c->environment, " "); -+ joined = strv_join_quoted(c->environment); - if (!joined) - return -ENOMEM; - -diff --git a/src/core/job.c b/src/core/job.c -index 35a9de6..dc4f441 100644 ---- a/src/core/job.c -+++ b/src/core/job.c -@@ -1060,6 +1060,9 @@ int job_coldplug(Job *j) { - if (r < 0) - return r; - -+ if (j->state == JOB_WAITING) -+ job_add_to_run_queue(j); -+ - if (j->begin_usec == 0 || j->unit->job_timeout == 0) - return 0; - -diff --git a/src/core/killall.c b/src/core/killall.c -index 57ed41c..eab48f7 100644 ---- a/src/core/killall.c -+++ b/src/core/killall.c -@@ -168,7 +168,7 @@ static int killall(int sig, Set *pids, bool send_sighup) { - continue; - - if (sig == SIGKILL) { -- _cleanup_free_ char *s; -+ _cleanup_free_ char *s = NULL; - - get_process_comm(pid, &s); - log_notice("Sending SIGKILL to PID "PID_FMT" (%s).", pid, strna(s)); -diff --git a/src/core/machine-id-setup.c b/src/core/machine-id-setup.c -index d459afe..2a58e48 100644 ---- a/src/core/machine-id-setup.c -+++ b/src/core/machine-id-setup.c -@@ -93,32 +93,9 @@ static int generate(char id[34], const char *root) { - } - } - -- /* If that didn't work, see if we are running in qemu/kvm and a -- * machine ID was passed in via -uuid on the qemu/kvm command -- * line */ -- -- r = detect_vm(&vm_id); -- if (r > 0 && streq(vm_id, "kvm")) { -- char uuid[37]; -- -- fd = open("/sys/class/dmi/id/product_uuid", O_RDONLY|O_CLOEXEC|O_NOCTTY|O_NOFOLLOW); -- if (fd >= 0) { -- k = loop_read(fd, uuid, 36, false); -- safe_close(fd); -- -- if (k >= 36) { -- r = shorten_uuid(id, uuid); -- if (r >= 0) { -- log_info("Initializing machine ID from KVM UUID."); -- return 0; -- } -- } -- } -- } -- -- /* If that didn't work either, see if we are running in a -- * container, and a machine ID was passed in via -- * $container_uuid the way libvirt/LXC does it */ -+ /* If that didn't work, see if we are running in a container, -+ * and a machine ID was passed in via $container_uuid the way -+ * libvirt/LXC does it */ - r = detect_container(NULL); - if (r > 0) { - _cleanup_free_ char *e = NULL; -@@ -133,6 +110,30 @@ static int generate(char id[34], const char *root) { - } - } - } -+ -+ } else { -+ /* If we are not running in a container, see if we are -+ * running in qemu/kvm and a machine ID was passed in -+ * via -uuid on the qemu/kvm command line */ -+ -+ r = detect_vm(&vm_id); -+ if (r > 0 && streq(vm_id, "kvm")) { -+ char uuid[37]; -+ -+ fd = open("/sys/class/dmi/id/product_uuid", O_RDONLY|O_CLOEXEC|O_NOCTTY|O_NOFOLLOW); -+ if (fd >= 0) { -+ k = loop_read(fd, uuid, 36, false); -+ safe_close(fd); -+ -+ if (k >= 36) { -+ r = shorten_uuid(id, uuid); -+ if (r >= 0) { -+ log_info("Initializing machine ID from KVM UUID."); -+ return 0; -+ } -+ } -+ } -+ } - } - - /* If that didn't work, generate a random machine id */ -diff --git a/src/core/main.c b/src/core/main.c -index 41605ee..c65701d 100644 ---- a/src/core/main.c -+++ b/src/core/main.c -@@ -1840,6 +1840,7 @@ finish: - if (reexecute) { - const char **args; - unsigned i, args_size; -+ sigset_t ss; - - /* Close and disarm the watchdog, so that the new - * instance can reinitialize it, but doesn't get -@@ -1883,7 +1884,7 @@ finish: - char_array_0(sfd); - - i = 0; -- args[i++] = SYSTEMD_BINARY_PATH; -+ args[i++] = "/run/current-system/systemd/lib/systemd/systemd"; - if (switch_root_dir) - args[i++] = "--switched-root"; - args[i++] = arg_running_as == SYSTEMD_SYSTEM ? "--system" : "--user"; -@@ -1923,6 +1924,13 @@ finish: - args[i++] = NULL; - assert(i <= args_size); - -+ /* reenable any blocked signals, especially important -+ * if we switch from initial ramdisk to init=... */ -+ reset_all_signal_handlers(); -+ -+ assert_se(sigemptyset(&ss) == 0); -+ assert_se(sigprocmask(SIG_SETMASK, &ss, NULL) == 0); -+ - if (switch_root_init) { - args[0] = switch_root_init; - execv(args[0], (char* const*) args); -diff --git a/src/core/manager.c b/src/core/manager.c -index 224106c..7342095 100644 ---- a/src/core/manager.c -+++ b/src/core/manager.c -@@ -422,7 +422,7 @@ int manager_new(SystemdRunningAs running_as, Manager **_m) { - return -ENOMEM; - - #ifdef ENABLE_EFI -- if (detect_container(NULL) <= 0) -+ if (running_as == SYSTEMD_SYSTEM && detect_container(NULL) <= 0) - boot_timestamps(&m->userspace_timestamp, &m->firmware_timestamp, &m->loader_timestamp); - #endif - -@@ -2129,9 +2129,6 @@ int manager_serialize(Manager *m, FILE *f, FDSet *fds, bool switching_root) { - if (u->id != t) - continue; - -- if (!unit_can_serialize(u)) -- continue; -- - /* Start marker */ - fputs(u->id, f); - fputc('\n', f); -diff --git a/src/core/namespace.c b/src/core/namespace.c -index 9f15211..e41cf5b 100644 ---- a/src/core/namespace.c -+++ b/src/core/namespace.c -@@ -42,6 +42,7 @@ - #include "mkdir.h" - #include "dev-setup.h" - #include "def.h" -+#include "label.h" - - typedef enum MountMode { - /* This is ordered by priority! */ -@@ -68,6 +69,7 @@ static int append_mounts(BindMount **p, char **strv, MountMode mode) { - STRV_FOREACH(i, strv) { - - (*p)->ignore = false; -+ (*p)->done = false; - - if ((mode == INACCESSIBLE || mode == READONLY || mode == READWRITE) && (*i)[0] == '-') { - (*p)->ignore = true; -@@ -217,7 +219,10 @@ static int mount_dev(BindMount *m) { - goto fail; - } - -+ label_context_set(d, st.st_mode); - r = mknod(dn, st.st_mode, st.st_rdev); -+ label_context_clear(); -+ - if (r < 0) { - r = -errno; - goto fail; -@@ -350,7 +355,7 @@ int setup_namespace( - private_dev; - - if (n > 0) { -- m = mounts = (BindMount *) alloca(n * sizeof(BindMount)); -+ m = mounts = (BindMount *) alloca0(n * sizeof(BindMount)); - r = append_mounts(&m, read_write_dirs, READWRITE); - if (r < 0) - return r; -diff --git a/src/core/service.c b/src/core/service.c -index ae3695a..6b3aa45 100644 ---- a/src/core/service.c -+++ b/src/core/service.c -@@ -1096,11 +1096,6 @@ static int service_verify(Service *s) { - return -EINVAL; - } - -- if (s->type == SERVICE_ONESHOT && s->restart != SERVICE_RESTART_NO) { -- log_error_unit(UNIT(s)->id, "%s has Restart setting other than no, which isn't allowed for Type=oneshot services. Refusing.", UNIT(s)->id); -- return -EINVAL; -- } -- - if (s->type == SERVICE_DBUS && !s->bus_name) { - log_error_unit(UNIT(s)->id, "%s is of type D-Bus but no D-Bus service name has been specified. Refusing.", UNIT(s)->id); - return -EINVAL; -diff --git a/src/core/socket.c b/src/core/socket.c -index 7c18a2b..1a560a6 100644 ---- a/src/core/socket.c -+++ b/src/core/socket.c -@@ -663,16 +663,25 @@ static int instance_from_socket(int fd, unsigned nr, char **instance) { - int k; - - k = getpeercred(fd, &ucred); -- if (k < 0) -+ if (k == -ENODATA) { -+ /* This handles the case where somebody is -+ * connecting from another pid/uid namespace -+ * (e.g. from outside of our container). */ -+ if (asprintf(&r, -+ "%u-unknown", -+ nr) < 0) -+ return -ENOMEM; -+ } -+ else if (k < 0) - return k; -- -- if (asprintf(&r, -- "%u-%lu-%lu", -- nr, -- (unsigned long) ucred.pid, -- (unsigned long) ucred.uid) < 0) -- return -ENOMEM; -- -+ else { -+ if (asprintf(&r, -+ "%u-%lu-%lu", -+ nr, -+ (unsigned long) ucred.pid, -+ (unsigned long) ucred.uid) < 0) -+ return -ENOMEM; -+ } - break; - } - -@@ -1242,6 +1251,8 @@ static int socket_spawn(Socket *s, ExecCommand *c, pid_t *_pid) { - NULL, - s->exec_runtime, - &pid); -+ if (r < 0) -+ goto fail; - - strv_free(argv); - if (r < 0) -@@ -1497,6 +1508,12 @@ static void socket_enter_running(Socket *s, int cfd) { - } - - if (!pending) { -+ if (!UNIT_ISSET(s->service)) { -+ log_error_unit(UNIT(s)->id, "%s: service to activate vanished, refusing activation.", UNIT(s)->id); -+ r = -ENOENT; -+ goto fail; -+ } -+ - r = manager_add_job(UNIT(s)->manager, JOB_START, UNIT_DEREF(s->service), JOB_REPLACE, true, &error, NULL); - if (r < 0) - goto fail; -diff --git a/src/core/timer.c b/src/core/timer.c -index 6c85304..720b8af 100644 ---- a/src/core/timer.c -+++ b/src/core/timer.c -@@ -111,6 +111,23 @@ static int timer_add_default_dependencies(Timer *t) { - return unit_add_two_dependencies_by_name(UNIT(t), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_SHUTDOWN_TARGET, NULL, true); - } - -+static void update_stampfile(Timer *t, usec_t timestamp) { -+ _cleanup_close_ int fd = -1; -+ -+ mkdir_parents_label(t->stamp_path, 0755); -+ -+ /* Update the file atime + mtime, if we can */ -+ fd = open(t->stamp_path, O_WRONLY|O_CREAT|O_TRUNC|O_CLOEXEC, 0644); -+ if (fd >= 0) { -+ struct timespec ts[2]; -+ -+ timespec_store(&ts[0], timestamp); -+ ts[1] = ts[0]; -+ -+ futimens(fd, ts); -+ } -+} -+ - static int timer_setup_persistent(Timer *t) { - int r; - -@@ -131,7 +148,7 @@ static int timer_setup_persistent(Timer *t) { - - e = getenv("XDG_DATA_HOME"); - if (e) -- t->stamp_path = strjoin(e, "/systemd/timers/", UNIT(t)->id, NULL); -+ t->stamp_path = strjoin(e, "/systemd/timers/stamp-", UNIT(t)->id, NULL); - else { - - _cleanup_free_ char *h = NULL; -@@ -496,22 +513,8 @@ static void timer_enter_running(Timer *t) { - - dual_timestamp_get(&t->last_trigger); - -- if (t->stamp_path) { -- _cleanup_close_ int fd = -1; -- -- mkdir_parents_label(t->stamp_path, 0755); -- -- /* Update the file atime + mtime, if we can */ -- fd = open(t->stamp_path, O_WRONLY|O_CREAT|O_TRUNC|O_CLOEXEC, 0644); -- if (fd >= 0) { -- struct timespec ts[2]; -- -- timespec_store(&ts[0], t->last_trigger.realtime); -- ts[1] = ts[0]; -- -- futimens(fd, ts); -- } -- } -+ if (t->stamp_path) -+ update_stampfile(t, t->last_trigger.realtime); - - timer_set_state(t, TIMER_RUNNING); - return; -@@ -539,6 +542,11 @@ static int timer_start(Unit *u) { - - if (stat(t->stamp_path, &st) >= 0) - t->last_trigger.realtime = timespec_load(&st.st_atim); -+ else if (errno == ENOENT) -+ /* The timer has never run before, -+ * make sure a stamp file exists. -+ */ -+ update_stampfile(t, now(CLOCK_REALTIME)); - } - - t->result = TIMER_SUCCESS; -diff --git a/src/core/transaction.c b/src/core/transaction.c -index d00f427..2befc32 100644 ---- a/src/core/transaction.c -+++ b/src/core/transaction.c -@@ -378,7 +378,7 @@ static int transaction_verify_order_one(Transaction *tr, Job *j, Job *from, unsi - "Found dependency on %s/%s", - k->unit->id, job_type_to_string(k->type)); - -- if (!delete && -+ if (!delete && hashmap_get(tr->jobs, k->unit) && - !unit_matters_to_anchor(k->unit, k)) { - /* Ok, we can drop this one, so let's - * do so. */ diff --git a/src/core/umount.c b/src/core/umount.c -index d1258f0..0311812 100644 +index cffa453..4d1a9ff 100644 --- a/src/core/umount.c +++ b/src/core/umount.c -@@ -404,6 +404,8 @@ static int mount_points_list_umount(MountPoint **head, bool *changed, bool log_e +@@ -385,6 +385,8 @@ static int mount_points_list_umount(MountPoint **head, bool *changed, bool log_e * anyway, since we are running from it. They have * already been remounted ro. */ if (path_equal(m->path, "/") @@ -665,926 +26,34 @@ index d1258f0..0311812 100644 #ifndef HAVE_SPLIT_USR || path_equal(m->path, "/usr") #endif -diff --git a/src/core/unit.c b/src/core/unit.c -index 153b79b..ed52694 100644 ---- a/src/core/unit.c -+++ b/src/core/unit.c -@@ -2287,25 +2287,25 @@ bool unit_can_serialize(Unit *u) { - } - - int unit_serialize(Unit *u, FILE *f, FDSet *fds, bool serialize_jobs) { -- ExecRuntime *rt; - int r; - - assert(u); - assert(f); - assert(fds); - -- if (!unit_can_serialize(u)) -- return 0; -- -- r = UNIT_VTABLE(u)->serialize(u, f, fds); -- if (r < 0) -- return r; -+ if (unit_can_serialize(u)) { -+ ExecRuntime *rt; - -- rt = unit_get_exec_runtime(u); -- if (rt) { -- r = exec_runtime_serialize(rt, u, f, fds); -+ r = UNIT_VTABLE(u)->serialize(u, f, fds); - if (r < 0) - return r; -+ -+ rt = unit_get_exec_runtime(u); -+ if (rt) { -+ r = exec_runtime_serialize(rt, u, f, fds); -+ if (r < 0) -+ return r; -+ } - } - - dual_timestamp_serialize(f, "inactive-exit-timestamp", &u->inactive_exit_timestamp); -@@ -2367,17 +2367,14 @@ void unit_serialize_item(Unit *u, FILE *f, const char *key, const char *value) { - } - - int unit_deserialize(Unit *u, FILE *f, FDSet *fds) { -- size_t offset; - ExecRuntime **rt = NULL; -+ size_t offset; - int r; - - assert(u); - assert(f); - assert(fds); - -- if (!unit_can_serialize(u)) -- return 0; -- - offset = UNIT_VTABLE(u)->exec_runtime_offset; - if (offset > 0) - rt = (ExecRuntime**) ((uint8_t*) u + offset); -@@ -2487,24 +2484,34 @@ int unit_deserialize(Unit *u, FILE *f, FDSet *fds) { - if (!s) - return -ENOMEM; - -- free(u->cgroup_path); -- u->cgroup_path = s; -+ if (u->cgroup_path) { -+ void *p; - -+ p = hashmap_remove(u->manager->cgroup_unit, u->cgroup_path); -+ log_info("Removing cgroup_path %s from hashmap (%p)", -+ u->cgroup_path, p); -+ free(u->cgroup_path); -+ } -+ -+ u->cgroup_path = s; - assert(hashmap_put(u->manager->cgroup_unit, s, u) == 1); -+ - continue; - } - -- if (rt) { -- r = exec_runtime_deserialize_item(rt, u, l, v, fds); -+ if (unit_can_serialize(u)) { -+ if (rt) { -+ r = exec_runtime_deserialize_item(rt, u, l, v, fds); -+ if (r < 0) -+ return r; -+ if (r > 0) -+ continue; -+ } -+ -+ r = UNIT_VTABLE(u)->deserialize_item(u, l, v, fds); - if (r < 0) - return r; -- if (r > 0) -- continue; - } -- -- r = UNIT_VTABLE(u)->deserialize_item(u, l, v, fds); -- if (r < 0) -- return r; - } - } - -diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c -index 75d56dd..be8fb2f 100644 ---- a/src/cryptsetup/cryptsetup-generator.c -+++ b/src/cryptsetup/cryptsetup-generator.c -@@ -29,6 +29,7 @@ - #include "mkdir.h" - #include "strv.h" - #include "fileio.h" -+#include "path-util.h" - - static const char *arg_dest = "/tmp"; - static bool arg_enabled = true; -@@ -144,16 +145,19 @@ static int create_disk( - if (!uu) - return log_oom(); - -- if (is_device_path(uu)) { -- _cleanup_free_ char *dd; -+ if (!path_equal(uu, "/dev/null")) { - -- dd = unit_name_from_path(uu, ".device"); -- if (!dd) -- return log_oom(); -+ if (is_device_path(uu)) { -+ _cleanup_free_ char *dd; - -- fprintf(f, "After=%1$s\nRequires=%1$s\n", dd); -- } else -- fprintf(f, "RequiresMountsFor=%s\n", password); -+ dd = unit_name_from_path(uu, ".device"); -+ if (!dd) -+ return log_oom(); -+ -+ fprintf(f, "After=%1$s\nRequires=%1$s\n", dd); -+ } else -+ fprintf(f, "RequiresMountsFor=%s\n", password); -+ } - } - } - -@@ -287,7 +291,7 @@ static int parse_proc_cmdline_item(const char *key, const char *value) { - } else if (STR_IN_SET(key, "luks.key", "rd.luks.key") && value) { - - free(arg_keyfile); -- arg_keyfile = strdup(key); -+ arg_keyfile = strdup(value); - if (!arg_keyfile) - return log_oom(); - -diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c -index 9b9074c..ad6c76c 100644 ---- a/src/cryptsetup/cryptsetup.c -+++ b/src/cryptsetup/cryptsetup.c -@@ -88,6 +88,13 @@ static int parse_one_option(const char *option) { - return 0; - } - -+ if (arg_key_size % 8) { -+ log_error("size= not a multiple of 8, ignoring."); -+ return 0; -+ } -+ -+ arg_key_size /= 8; -+ - } else if (startswith(option, "key-slot=")) { - - arg_type = CRYPT_LUKS1; -@@ -404,7 +411,7 @@ static int attach_luks_or_plain(struct crypt_device *cd, - /* for CRYPT_PLAIN limit reads - * from keyfile to key length, and - * ignore keyfile-size */ -- arg_keyfile_size = arg_key_size / 8; -+ arg_keyfile_size = arg_key_size; - - /* In contrast to what the name - * crypt_setup() might suggest this -@@ -567,7 +574,7 @@ int main(int argc, char *argv[]) { - else - until = 0; - -- arg_key_size = (arg_key_size > 0 ? arg_key_size : 256); -+ arg_key_size = (arg_key_size > 0 ? arg_key_size : (256 / 8)); - - if (key_file) { - struct stat st; diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c -index 18f2aca..2a2b1ea 100644 +index 70a5918..1926e52 100644 --- a/src/fsck/fsck.c +++ b/src/fsck/fsck.c -@@ -285,7 +285,7 @@ int main(int argc, char *argv[]) { - - type = udev_device_get_property_value(udev_device, "ID_FS_TYPE"); - if (type) { -- const char *checker = strappenda("/sbin/fsck.", type); -+ const char *checker = strappenda("/run/current-system/sw/sbin/fsck.", type); - r = access(checker, X_OK); - if (r < 0) { - if (errno == ENOENT) { -@@ -302,7 +302,7 @@ int main(int argc, char *argv[]) { +@@ -315,8 +315,7 @@ int main(int argc, char *argv[]) { return EXIT_FAILURE; } - cmdline[i++] = "/sbin/fsck"; +- cmdline[i++] = arg_repair; + cmdline[i++] = "/run/current-system/sw/sbin/fsck"; - cmdline[i++] = "-a"; cmdline[i++] = "-T"; - cmdline[i++] = "-l"; -diff --git a/src/getty-generator/getty-generator.c b/src/getty-generator/getty-generator.c -index 6a4aa2c..700e90a 100644 ---- a/src/getty-generator/getty-generator.c -+++ b/src/getty-generator/getty-generator.c -@@ -72,7 +72,7 @@ static int add_serial_getty(const char *tty) { - - log_debug("Automatically adding serial getty for /dev/%s.", tty); - -- n = unit_name_replace_instance("serial-getty@.service", tty); -+ n = unit_name_from_path_instance("serial-getty", tty, ".service"); - if (!n) - return log_oom(); - -@@ -86,7 +86,7 @@ static int add_container_getty(const char *tty) { - - log_debug("Automatically adding container getty for /dev/pts/%s.", tty); - -- n = unit_name_replace_instance("container-getty@.service", tty); -+ n = unit_name_from_path_instance("container-getty", tty, ".service"); - if (!n) - return log_oom(); - -diff --git a/src/journal/catalog.c b/src/journal/catalog.c -index 3ed0b7e..02dedc4 100644 ---- a/src/journal/catalog.c -+++ b/src/journal/catalog.c -@@ -103,7 +103,7 @@ static int finish_item( - const char *payload) { - - ssize_t offset; -- CatalogItem *i; -+ _cleanup_free_ CatalogItem *i = NULL; - int r; - - assert(h); -@@ -126,13 +126,14 @@ static int finish_item( - i->offset = htole64((uint64_t) offset); - - r = hashmap_put(h, i, i); -- if (r == EEXIST) { -+ if (r == -EEXIST) { - log_warning("Duplicate entry for " SD_ID128_FORMAT_STR ".%s, ignoring.", - SD_ID128_FORMAT_VAL(id), language ? language : "C"); -- free(i); - return 0; -- } -+ } else if (r < 0) -+ return r; - -+ i = NULL; - return 0; - } - -@@ -383,8 +384,8 @@ error: - int catalog_update(const char* database, const char* root, const char* const* dirs) { - _cleanup_strv_free_ char **files = NULL; - char **f; -- Hashmap *h; - struct strbuf *sb = NULL; -+ _cleanup_hashmap_free_free_ Hashmap *h = NULL; - _cleanup_free_ CatalogItem *items = NULL; - CatalogItem *i; - Iterator j; -@@ -406,13 +407,17 @@ int catalog_update(const char* database, const char* root, const char* const* di - } - - STRV_FOREACH(f, files) { -- log_debug("reading file '%s'", *f); -- catalog_import_file(h, sb, *f); -+ log_debug("Reading file '%s'", *f); -+ r = catalog_import_file(h, sb, *f); -+ if (r < 0) { -+ log_error("Failed to import file '%s': %s.", -+ *f, strerror(-r)); -+ goto finish; -+ } - } - - if (hashmap_size(h) <= 0) { - log_info("No items in catalog."); -- r = 0; - goto finish; - } else - log_debug("Found %u items in catalog.", hashmap_size(h)); -@@ -443,11 +448,7 @@ int catalog_update(const char* database, const char* root, const char* const* di - log_debug("%s: wrote %u items, with %zu bytes of strings, %ld total size.", - database, n, sb->len, r); - -- r = 0; -- - finish: -- if (h) -- hashmap_free_free(h); - if (sb) - strbuf_cleanup(sb); - -diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c -index f2f1f35..fd9d2a8 100644 ---- a/src/journal/journal-file.c -+++ b/src/journal/journal-file.c -@@ -274,12 +274,6 @@ static int journal_file_verify_header(JournalFile *f) { - !VALID64(le64toh(f->header->entry_array_offset))) - return -ENODATA; - -- if (le64toh(f->header->data_hash_table_offset) < le64toh(f->header->header_size) || -- le64toh(f->header->field_hash_table_offset) < le64toh(f->header->header_size) || -- le64toh(f->header->tail_object_offset) < le64toh(f->header->header_size) || -- le64toh(f->header->entry_array_offset) < le64toh(f->header->header_size)) -- return -ENODATA; -- - if (f->writable) { - uint8_t state; - sd_id128_t machine_id; -diff --git a/src/journal/journal-remote-parse.c b/src/journal/journal-remote-parse.c -index 142de0e..239ff38 100644 ---- a/src/journal/journal-remote-parse.c -+++ b/src/journal/journal-remote-parse.c -@@ -40,7 +40,7 @@ void source_free(RemoteSource *source) { - - static int get_line(RemoteSource *source, char **line, size_t *size) { - ssize_t n, remain; -- char *c; -+ char *c = NULL; - char *newbuf = NULL; - size_t newsize = 0; - -@@ -49,7 +49,9 @@ static int get_line(RemoteSource *source, char **line, size_t *size) { - assert(source->filled <= source->size); - assert(source->buf == NULL || source->size > 0); - -- c = memchr(source->buf, '\n', source->filled); -+ if (source->buf) -+ c = memchr(source->buf, '\n', source->filled); -+ - if (c != NULL) - goto docopy; - -diff --git a/src/journal/journald-kmsg.c b/src/journal/journald-kmsg.c -index 35948ea..48725e4 100644 ---- a/src/journal/journald-kmsg.c -+++ b/src/journal/journald-kmsg.c -@@ -152,7 +152,7 @@ static void dev_kmsg_record(Server *s, char *p, size_t l) { - /* Did we lose any? */ - if (serial > *s->kernel_seqnum) - server_driver_message(s, SD_MESSAGE_JOURNAL_MISSED, "Missed %"PRIu64" kernel messages", -- serial - *s->kernel_seqnum - 1); -+ serial - *s->kernel_seqnum); - - /* Make sure we never read this one again. Note that - * we always store the next message serial we expect -diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c -index 6da81e7..b6f8e7e 100644 ---- a/src/journal/journald-server.c -+++ b/src/journal/journald-server.c -@@ -67,6 +67,7 @@ - #define DEFAULT_SYNC_INTERVAL_USEC (5*USEC_PER_MINUTE) - #define DEFAULT_RATE_LIMIT_INTERVAL (30*USEC_PER_SEC) - #define DEFAULT_RATE_LIMIT_BURST 1000 -+#define DEFAULT_MAX_FILE_USEC USEC_PER_MONTH - - #define RECHECK_AVAILABLE_SPACE_USEC (30*USEC_PER_SEC) - -@@ -1473,6 +1474,8 @@ int server_init(Server *s) { - s->forward_to_syslog = true; - s->forward_to_wall = true; - -+ s->max_file_usec = DEFAULT_MAX_FILE_USEC; -+ - s->max_level_store = LOG_DEBUG; - s->max_level_syslog = LOG_DEBUG; - s->max_level_kmsg = LOG_NOTICE; -diff --git a/src/journal/microhttpd-util.c b/src/journal/microhttpd-util.c -index f693e0f..9a8d5c6 100644 ---- a/src/journal/microhttpd-util.c -+++ b/src/journal/microhttpd-util.c -@@ -129,7 +129,7 @@ void log_func_gnutls(int level, const char *message) { - if (0 <= level && level < (int) ELEMENTSOF(log_level_map)) - ourlevel = log_level_map[level]; - else -- level = LOG_DEBUG; -+ ourlevel = LOG_DEBUG; - - log_meta(ourlevel, NULL, 0, NULL, "gnutls: %s", message); - } -diff --git a/src/journal/test-catalog.c b/src/journal/test-catalog.c -index b087a8b..967ab67 100644 ---- a/src/journal/test-catalog.c -+++ b/src/journal/test-catalog.c -@@ -157,7 +157,8 @@ int main(int argc, char *argv[]) { - - setlocale(LC_ALL, "de_DE.UTF-8"); - -- log_set_max_level(LOG_DEBUG); -+ log_parse_environment(); -+ log_open(); - - test_catalog_file_lang(); - -diff --git a/src/libsystemd/sd-rtnl/rtnl-message.c b/src/libsystemd/sd-rtnl/rtnl-message.c -index 84a8ffa..e79b318 100644 ---- a/src/libsystemd/sd-rtnl/rtnl-message.c -+++ b/src/libsystemd/sd-rtnl/rtnl-message.c -@@ -335,24 +335,28 @@ int sd_rtnl_message_link_get_flags(sd_rtnl_message *m, unsigned *flags) { - /* If successful the updated message will be correctly aligned, if - unsuccessful the old message is untouched. */ - static int add_rtattr(sd_rtnl_message *m, unsigned short type, const void *data, size_t data_length) { -- uint32_t rta_length, message_length; -+ uint32_t rta_length; -+ size_t message_length, padding_length; - struct nlmsghdr *new_hdr; - struct rtattr *rta; - char *padding; - unsigned i; -+ int offset; - - assert(m); - assert(m->hdr); - assert(!m->sealed); - assert(NLMSG_ALIGN(m->hdr->nlmsg_len) == m->hdr->nlmsg_len); -- assert(!data || data_length > 0); -- assert(data || m->n_containers < RTNL_CONTAINER_DEPTH); -+ assert(!data || data_length); -+ -+ /* get offset of the new attribute */ -+ offset = m->hdr->nlmsg_len; - - /* get the size of the new rta attribute (with padding at the end) */ - rta_length = RTA_LENGTH(data_length); - - /* get the new message size (with padding at the end) */ -- message_length = m->hdr->nlmsg_len + RTA_ALIGN(rta_length); -+ message_length = offset + RTA_ALIGN(rta_length); - - /* realloc to fit the new attribute */ - new_hdr = realloc(m->hdr, message_length); -@@ -361,32 +365,35 @@ static int add_rtattr(sd_rtnl_message *m, unsigned short type, const void *data, - m->hdr = new_hdr; - - /* get pointer to the attribute we are about to add */ -- rta = (struct rtattr *) ((uint8_t *) m->hdr + m->hdr->nlmsg_len); -+ rta = (struct rtattr *) ((uint8_t *) m->hdr + offset); - - /* if we are inside containers, extend them */ - for (i = 0; i < m->n_containers; i++) -- GET_CONTAINER(m, i)->rta_len += message_length - m->hdr->nlmsg_len; -+ GET_CONTAINER(m, i)->rta_len += message_length - offset; - - /* fill in the attribute */ - rta->rta_type = type; - rta->rta_len = rta_length; -- if (!data) { -- /* this is the start of a new container */ -- m->container_offsets[m->n_containers ++] = m->hdr->nlmsg_len; -- } else { -+ if (data) - /* we don't deal with the case where the user lies about the type - * and gives us too little data (so don't do that) -- */ -+ */ - padding = mempcpy(RTA_DATA(rta), data, data_length); -- /* make sure also the padding at the end of the message is initialized */ -- memzero(padding, -- (uint8_t *) m->hdr + message_length - (uint8_t *) padding); -+ else { -+ /* if no data was passed, make sure we still initialize the padding -+ note that we can have data_length > 0 (used by some containers) */ -+ padding = RTA_DATA(rta); -+ data_length = 0; - } - -+ /* make sure also the padding at the end of the message is initialized */ -+ padding_length = (uint8_t*)m->hdr + message_length - (uint8_t*)padding; -+ memzero(padding, padding_length); -+ - /* update message size */ - m->hdr->nlmsg_len = message_length; - -- return 0; -+ return offset; - } - - int sd_rtnl_message_append_string(sd_rtnl_message *m, unsigned short type, const char *data) { -@@ -761,22 +768,29 @@ int sd_rtnl_message_open_container(sd_rtnl_message *m, unsigned short type) { - - assert_return(m, -EINVAL); - assert_return(!m->sealed, -EPERM); -+ assert_return(m->n_containers < RTNL_CONTAINER_DEPTH, -ERANGE); - - sd_rtnl_message_get_type(m, &rtm_type); - -+ int r = -ENOTSUP; -+ - if (rtnl_message_type_is_link(rtm_type)) { - - if ((type == IFLA_LINKINFO && m->n_containers == 0) || - (type == IFLA_INFO_DATA && m->n_containers == 1 && - GET_CONTAINER(m, 0)->rta_type == IFLA_LINKINFO)) -- return add_rtattr(m, type, NULL, 0); -+ r = add_rtattr(m, type, NULL, 0); - else if (type == VETH_INFO_PEER && m->n_containers == 2 && - GET_CONTAINER(m, 1)->rta_type == IFLA_INFO_DATA && - GET_CONTAINER(m, 0)->rta_type == IFLA_LINKINFO) -- return add_rtattr(m, type, NULL, sizeof(struct ifinfomsg)); -+ r= add_rtattr(m, type, NULL, sizeof(struct ifinfomsg)); - } - -- return -ENOTSUP; -+ if (r < 0) return r; -+ -+ m->container_offsets[m->n_containers ++] = r; -+ -+ return 0; - } - - int sd_rtnl_message_close_container(sd_rtnl_message *m) { -diff --git a/src/libudev/libudev-monitor.c b/src/libudev/libudev-monitor.c -index ba1b04d..85b1e40 100644 ---- a/src/libudev/libudev-monitor.c -+++ b/src/libudev/libudev-monitor.c -@@ -108,15 +108,13 @@ static struct udev_monitor *udev_monitor_new(struct udev *udev) - - /* we consider udev running when /dev is on devtmpfs */ - static bool udev_has_devtmpfs(struct udev *udev) { -- struct file_handle *h; -+ union file_handle_union h = { .handle.handle_bytes = MAX_HANDLE_SZ, }; - int mount_id; - _cleanup_fclose_ FILE *f = NULL; - char line[LINE_MAX], *e; - int r; - -- h = alloca(MAX_HANDLE_SZ); -- h->handle_bytes = MAX_HANDLE_SZ; -- r = name_to_handle_at(AT_FDCWD, "/dev", h, &mount_id, 0); -+ r = name_to_handle_at(AT_FDCWD, "/dev", &h.handle, &mount_id, 0); - if (r < 0) - return false; - -diff --git a/src/login/70-uaccess.rules b/src/login/70-uaccess.rules -index e1cf897..57f619d 100644 ---- a/src/login/70-uaccess.rules -+++ b/src/login/70-uaccess.rules -@@ -12,7 +12,7 @@ ENV{MAJOR}=="", GOTO="uaccess_end" - SUBSYSTEM=="usb", ENV{ID_USB_INTERFACES}=="*:060101:*", TAG+="uaccess" - - # Digicams with proprietary protocol --ENV{ID_GPHOTO2}=="*?", TAG+="uaccess" -+ENV{ID_GPHOTO2}=="?*", TAG+="uaccess" - - # SCSI and USB scanners - ENV{libsane_matched}=="yes", TAG+="uaccess" -@@ -49,13 +49,13 @@ SUBSYSTEM=="drm", KERNEL=="card*|renderD*", TAG+="uaccess" - SUBSYSTEM=="misc", KERNEL=="kvm", TAG+="uaccess" - - # smart-card readers --ENV{ID_SMARTCARD_READER}=="*?", TAG+="uaccess" -+ENV{ID_SMARTCARD_READER}=="?*", TAG+="uaccess" - - # (USB) authentication devices --ENV{ID_SECURITY_TOKEN}=="*?", TAG+="uaccess" -+ENV{ID_SECURITY_TOKEN}=="?*", TAG+="uaccess" - - # PDA devices --ENV{ID_PDA}=="*?", TAG+="uaccess" -+ENV{ID_PDA}=="?*", TAG+="uaccess" - - # Programmable remote control - ENV{ID_REMOTE_CONTROL}=="1", TAG+="uaccess" -@@ -64,10 +64,10 @@ ENV{ID_REMOTE_CONTROL}=="1", TAG+="uaccess" - SUBSYSTEM=="input", ENV{ID_INPUT_JOYSTICK}=="?*", TAG+="uaccess" - - # color measurement devices --ENV{COLOR_MEASUREMENT_DEVICE}=="*?", TAG+="uaccess" -+ENV{COLOR_MEASUREMENT_DEVICE}=="?*", TAG+="uaccess" - - # DDC/CI device, usually high-end monitors such as the DreamColor --ENV{DDC_DEVICE}=="*?", TAG+="uaccess" -+ENV{DDC_DEVICE}=="?*", TAG+="uaccess" - - # media player raw devices (for user-mode drivers, Android SDK, etc.) - SUBSYSTEM=="usb", ENV{ID_MEDIA_PLAYER}=="?*", TAG+="uaccess" -diff --git a/src/login/logind-acl.c b/src/login/logind-acl.c -index dc86f0f..4bbeb64 100644 ---- a/src/login/logind-acl.c -+++ b/src/login/logind-acl.c -@@ -279,7 +279,9 @@ int devnode_acl_all(struct udev *udev, - - log_debug("Fixing up ACLs at %s for seat %s", n, seat); - k = devnode_acl(n, flush, del, old_uid, add, new_uid); -- if (k < 0) -+ if (k == -ENOENT) -+ log_debug("Device %s disappeared while setting ACLs", n); -+ else if (k < 0) - r = k; - } -diff --git a/src/login/logind-action.c b/src/login/logind-action.c -index 1928f43..d69c7ad 100644 ---- a/src/login/logind-action.c -+++ b/src/login/logind-action.c -@@ -79,14 +79,12 @@ int manager_handle_action( - return 0; - } - -- /* If we have more than one or no displays connected, -- * don't react to lid closing. The no display case we -- * treat like this under the assumption that there is -- * no modern drm driver available. */ -+ /* If we have more than one display connected, -+ * don't react to lid closing. */ - n = manager_count_displays(m); - if (n < 0) - log_warning("Display counting failed: %s", strerror(-n)); -- else if (n != 1) { -+ else if (n > 1) { - log_debug("Ignoring lid switch request, %i displays connected.", n); - return 0; - } -diff --git a/src/login/logind-seat.c b/src/login/logind-seat.c -index 3f5efdc..1ee6ced 100644 ---- a/src/login/logind-seat.c -+++ b/src/login/logind-seat.c -@@ -275,8 +275,13 @@ int seat_switch_to(Seat *s, unsigned int num) { - if (!num) - return -EINVAL; - -- if (num >= s->position_count || !s->positions[num]) -+ if (num >= s->position_count || !s->positions[num]) { -+ /* allow switching to unused VTs to trigger auto-activate */ -+ if (seat_has_vts(s) && num < 64) -+ return chvt(num); -+ - return -EINVAL; -+ } - - return session_activate(s->positions[num]); - } -diff --git a/src/login/logind-session.c b/src/login/logind-session.c -index 4ca6b5d..02a780d 100644 ---- a/src/login/logind-session.c -+++ b/src/login/logind-session.c -@@ -213,7 +213,6 @@ int session_save(Session *s) { - - if (s->scope) - fprintf(f, "SCOPE=%s\n", s->scope); -- - if (s->scope_job) - fprintf(f, "SCOPE_JOB=%s\n", s->scope_job); - -@@ -229,17 +228,54 @@ int session_save(Session *s) { - if (s->display) - fprintf(f, "DISPLAY=%s\n", s->display); - -- if (s->remote_host) -- fprintf(f, "REMOTE_HOST=%s\n", s->remote_host); -+ if (s->remote_host) { -+ _cleanup_free_ char *escaped; -+ -+ escaped = cescape(s->remote_host); -+ if (!escaped) { -+ r = -ENOMEM; -+ goto finish; -+ } -+ -+ fprintf(f, "REMOTE_HOST=%s\n", escaped); -+ } -+ -+ if (s->remote_user) { -+ _cleanup_free_ char *escaped; -+ -+ escaped = cescape(s->remote_user); -+ if (!escaped) { -+ r = -ENOMEM; -+ goto finish; -+ } -+ -+ fprintf(f, "REMOTE_USER=%s\n", escaped); -+ } -+ -+ if (s->service) { -+ _cleanup_free_ char *escaped; - -- if (s->remote_user) -- fprintf(f, "REMOTE_USER=%s\n", s->remote_user); -+ escaped = cescape(s->service); -+ if (!escaped) { -+ r = -ENOMEM; -+ goto finish; -+ } -+ -+ fprintf(f, "SERVICE=%s\n", escaped); -+ } - -- if (s->service) -- fprintf(f, "SERVICE=%s\n", s->service); -+ if (s->desktop) { -+ _cleanup_free_ char *escaped; - -- if (s->desktop) -- fprintf(f, "DESKTOP=%s\n", s->desktop); -+ -+ escaped = cescape(s->desktop); -+ if (!escaped) { -+ r = -ENOMEM; -+ goto finish; -+ } -+ -+ fprintf(f, "DESKTOP=%s\n", escaped); -+ } - - if (s->seat && seat_has_vts(s->seat)) - fprintf(f, "VTNR=%u\n", s->vtnr); -@@ -972,6 +1008,10 @@ void session_mute_vt(Session *s) { - if (vt < 0) - return; - -+ r = fchown(vt, s->user->uid, -1); -+ if (r < 0) -+ goto error; -+ - r = ioctl(vt, KDSKBMODE, K_OFF); - if (r < 0) - goto error; -@@ -1026,6 +1066,8 @@ void session_restore_vt(Session *s) { - mode.mode = VT_AUTO; - ioctl(vt, VT_SETMODE, &mode); - -+ fchown(vt, 0, -1); -+ - s->vtfd = safe_close(s->vtfd); - } - -diff --git a/src/login/org.freedesktop.login1.policy.in b/src/login/org.freedesktop.login1.policy.in -index b96d32d..b8e90f1 100644 ---- a/src/login/org.freedesktop.login1.policy.in -+++ b/src/login/org.freedesktop.login1.policy.in -@@ -254,7 +254,7 @@ - <defaults> - <allow_any>auth_admin_keep</allow_any> - <allow_inactive>auth_admin_keep</allow_inactive> -- <allow_active>auth_admin_keep</allow_active> -+ <allow_active>yes</allow_active> - </defaults> - <annotate key="org.freedesktop.policykit.imply">org.freedesktop.login1.hibernate</annotate> - </action> -diff --git a/src/login/pam-module.c b/src/login/pam-module.c -index 9873dd5..1259457 100644 ---- a/src/login/pam-module.c -+++ b/src/login/pam-module.c -@@ -475,7 +475,7 @@ _public_ PAM_EXTERN int pam_sm_open_session( - } - - if (session_fd >= 0) { -- session_fd = dup(session_fd); -+ session_fd = fcntl(session_fd, F_DUPFD_CLOEXEC, 3); - if (session_fd < 0) { - pam_syslog(handle, LOG_ERR, "Failed to dup session fd: %m"); - return PAM_SESSION_ERR; -diff --git a/src/machine/machine.c b/src/machine/machine.c -index 9a5cc9a..de701ad 100644 ---- a/src/machine/machine.c -+++ b/src/machine/machine.c -@@ -123,17 +123,42 @@ int machine_save(Machine *m) { - "NAME=%s\n", - m->name); - -- if (m->unit) -- fprintf(f, "SCOPE=%s\n", m->unit); /* We continue to call this "SCOPE=" because it is internal only, and we want to stay compatible with old files */ -+ if (m->unit) { -+ _cleanup_free_ char *escaped; -+ -+ escaped = cescape(m->unit); -+ if (!escaped) { -+ r = -ENOMEM; -+ goto finish; -+ } -+ -+ fprintf(f, "SCOPE=%s\n", escaped); /* We continue to call this "SCOPE=" because it is internal only, and we want to stay compatible with old files */ -+ } - - if (m->scope_job) - fprintf(f, "SCOPE_JOB=%s\n", m->scope_job); - -- if (m->service) -- fprintf(f, "SERVICE=%s\n", m->service); -+ if (m->service) { -+ _cleanup_free_ char *escaped; - -- if (m->root_directory) -- fprintf(f, "ROOT=%s\n", m->root_directory); -+ escaped = cescape(m->service); -+ if (!escaped) { -+ r = -ENOMEM; -+ goto finish; -+ } -+ fprintf(f, "SERVICE=%s\n", escaped); -+ } -+ -+ if (m->root_directory) { -+ _cleanup_free_ char *escaped; -+ -+ escaped = cescape(m->root_directory); -+ if (!escaped) { -+ r = -ENOMEM; -+ goto finish; -+ } -+ fprintf(f, "ROOT=%s\n", escaped); -+ } - - if (!sd_id128_equal(m->id, SD_ID128_NULL)) - fprintf(f, "ID=" SD_ID128_FORMAT_STR "\n", SD_ID128_FORMAT_VAL(m->id)); -@@ -330,16 +355,18 @@ static int machine_stop_scope(Machine *m) { - if (!m->unit) - return 0; - -- r = manager_stop_unit(m->manager, m->unit, &error, &job); -- if (r < 0) { -- log_error("Failed to stop machine scope: %s", bus_error_message(&error, r)); -- return r; -+ if (!m->registered) { -+ r = manager_stop_unit(m->manager, m->unit, &error, &job); -+ if (r < 0) { -+ log_error("Failed to stop machine scope: %s", bus_error_message(&error, r)); -+ return r; -+ } - } - - free(m->scope_job); - m->scope_job = job; - -- return r; -+ return 0; - } - - int machine_stop(Machine *m) { -@@ -415,6 +442,8 @@ int machine_kill(Machine *m, KillWho who, int signo) { - - if (kill(m->leader, signo) < 0) - return -errno; -+ -+ return 0; - } - - /* Otherwise make PID 1 do it for us, for the entire cgroup */ -diff --git a/src/machine/machine.h b/src/machine/machine.h -index f4aefc5..de3536d 100644 ---- a/src/machine/machine.h -+++ b/src/machine/machine.h -@@ -72,6 +72,7 @@ struct Machine { - - bool in_gc_queue:1; - bool started:1; -+ bool registered:1; - - sd_bus_message *create_message; - -diff --git a/src/machine/machined-dbus.c b/src/machine/machined-dbus.c -index 9473105..154a335 100644 ---- a/src/machine/machined-dbus.c -+++ b/src/machine/machined-dbus.c -@@ -241,6 +241,7 @@ static int method_create_or_register_machine(Manager *manager, sd_bus_message *m - m->leader = leader; - m->class = c; - m->id = id; -+ m->registered = true; - - if (!isempty(service)) { - m->service = strdup(service); + /* diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index 9a9ed9d..c3e6d23 100644 +index b6d9bc6..04fbe57 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -769,6 +769,15 @@ static int setup_resolv_conf(const char *dest) { - return 0; - } - -+static char* id128_format_as_uuid(sd_id128_t id, char s[37]) { -+ -+ snprintf(s, 37, -+ "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x", -+ SD_ID128_FORMAT_VAL(id)); -+ -+ return s; -+} -+ - static int setup_boot_id(const char *dest) { - _cleanup_free_ char *from = NULL, *to = NULL; - sd_id128_t rnd = {}; -@@ -794,10 +803,7 @@ static int setup_boot_id(const char *dest) { - return r; - } - -- snprintf(as_uuid, sizeof(as_uuid), -- "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x", -- SD_ID128_FORMAT_VAL(rnd)); -- char_array_0(as_uuid); -+ id128_format_as_uuid(rnd, as_uuid); - - r = write_string_file(from, as_uuid); - if (r < 0) { -@@ -2378,7 +2384,7 @@ static int change_uid_gid(char **_home) { - _cleanup_fclose_ FILE *f = NULL; - _cleanup_close_ int fd = -1; - unsigned n_uids = 0; -- size_t sz, l; -+ size_t sz = 0, l; - uid_t uid; - gid_t gid; - pid_t pid; -@@ -2667,6 +2673,7 @@ int main(int argc, char *argv[]) { +@@ -758,7 +758,7 @@ static int mount_binds(const char *dest, + * and char devices. */ + if (S_ISDIR(source_st.st_mode)) { + r = mkdir_label(where, 0755); +- if (r < 0) { ++ if (r < 0 && r != -EEXIST) { + log_error("Failed to create mount point %s: %s", where, strerror(-r)); + + return r; +@@ -3073,6 +3073,7 @@ int main(int argc, char *argv[]) { goto finish; } } else { @@ -1592,7 +61,7 @@ index 9a9ed9d..c3e6d23 100644 const char *p; p = strappenda(arg_directory, -@@ -2676,6 +2683,7 @@ int main(int argc, char *argv[]) { +@@ -3082,6 +3083,7 @@ int main(int argc, char *argv[]) { goto finish; } @@ -1600,510 +69,11 @@ index 9a9ed9d..c3e6d23 100644 } } else { char template[] = "/tmp/nspawn-root-XXXXXX"; -@@ -2748,8 +2756,6 @@ int main(int argc, char *argv[]) { - goto finish; - } - -- sd_notify(0, "READY=1"); -- - assert_se(sigemptyset(&mask) == 0); - sigset_add_many(&mask, SIGCHLD, SIGWINCH, SIGTERM, SIGINT, -1); - assert_se(sigprocmask(SIG_BLOCK, &mask, NULL) == 0); -@@ -2966,7 +2972,9 @@ int main(int argc, char *argv[]) { - } - - if (!sd_id128_equal(arg_uuid, SD_ID128_NULL)) { -- if (asprintf((char**)(envp + n_env++), "container_uuid=" SD_ID128_FORMAT_STR, SD_ID128_FORMAT_VAL(arg_uuid)) < 0) { -+ char as_uuid[37]; -+ -+ if (asprintf((char**)(envp + n_env++), "container_uuid=%s", id128_format_as_uuid(arg_uuid, as_uuid)) < 0) { - log_oom(); - goto child_fail; - } -@@ -3086,6 +3094,8 @@ int main(int argc, char *argv[]) { - if (r < 0) - goto finish; - -+ sd_notify(0, "READY=1"); -+ - /* Notify the child that the parent is ready with all - * its setup, and thtat the child can now hand over - * control to the code to run inside the container. */ -@@ -3136,6 +3146,10 @@ int main(int argc, char *argv[]) { - - if (!arg_quiet) - log_info("Container %s is being rebooted.", arg_machine); -+ if (getenv("EXIT_ON_REBOOT") != 0) { -+ r = 10; -+ break; -+ } - continue; - } else if (status.si_code == CLD_KILLED || - status.si_code == CLD_DUMPED) { -diff --git a/src/nss-myhostname/netlink.c b/src/nss-myhostname/netlink.c -index d61ecdf..228a3a4 100644 ---- a/src/nss-myhostname/netlink.c -+++ b/src/nss-myhostname/netlink.c -@@ -112,6 +112,10 @@ static int read_reply(int fd, struct address **list, unsigned *n_list) { - ifaddrmsg->ifa_scope == RT_SCOPE_NOWHERE) - continue; - -+ if (ifaddrmsg->ifa_family == AF_INET6 && -+ ifaddrmsg->ifa_scope == RT_SCOPE_LINK) -+ continue; -+ - if (ifaddrmsg->ifa_flags & IFA_F_DEPRECATED) - continue; - -diff --git a/src/python-systemd/_reader.c b/src/python-systemd/_reader.c -index 059b904..9a19a10 100644 ---- a/src/python-systemd/_reader.c -+++ b/src/python-systemd/_reader.c -@@ -902,7 +902,6 @@ static PyObject* get_catalog(PyObject *self, PyObject *args) { - sd_id128_t id; - _cleanup_free_ char *msg = NULL; - -- assert(!self); - assert(args); - - if (!PyArg_ParseTuple(args, "z:get_catalog", &id_)) -diff --git a/src/python-systemd/journal.py b/src/python-systemd/journal.py -index 9c7e004..dd1f229 100644 ---- a/src/python-systemd/journal.py -+++ b/src/python-systemd/journal.py -@@ -293,7 +293,7 @@ class Reader(_Reader): - monotonic = monotonic.totalseconds() - monotonic = int(monotonic * 1000000) - if isinstance(bootid, _uuid.UUID): -- bootid = bootid.get_hex() -+ bootid = bootid.hex - return super(Reader, self).seek_monotonic(monotonic, bootid) - - def log_level(self, level): -@@ -314,7 +314,7 @@ class Reader(_Reader): - Equivalent to add_match(MESSAGE_ID=`messageid`). - """ - if isinstance(messageid, _uuid.UUID): -- messageid = messageid.get_hex() -+ messageid = messageid.hex - self.add_match(MESSAGE_ID=messageid) - - def this_boot(self, bootid=None): -@@ -346,7 +346,7 @@ class Reader(_Reader): - - def get_catalog(mid): - if isinstance(mid, _uuid.UUID): -- mid = mid.get_hex() -+ mid = mid.hex - return _get_catalog(mid) - - def _make_line(field, value): -diff --git a/src/readahead/readahead-common.c b/src/readahead/readahead-common.c -index 5ffa88b..49679fc 100644 ---- a/src/readahead/readahead-common.c -+++ b/src/readahead/readahead-common.c -@@ -75,7 +75,7 @@ int fs_on_ssd(const char *p) { - if (major(st.st_dev) == 0) { - _cleanup_fclose_ FILE *f = NULL; - int mount_id; -- struct file_handle *h; -+ union file_handle_union h = { .handle.handle_bytes = MAX_HANDLE_SZ, }; - - /* Might be btrfs, which exposes "ssd" as mount flag if it is on ssd. - * -@@ -83,9 +83,7 @@ int fs_on_ssd(const char *p) { - * and then lookup the mount ID in mountinfo to find - * the mount options. */ - -- h = alloca(MAX_HANDLE_SZ); -- h->handle_bytes = MAX_HANDLE_SZ; -- r = name_to_handle_at(AT_FDCWD, p, h, &mount_id, AT_SYMLINK_FOLLOW); -+ r = name_to_handle_at(AT_FDCWD, p, &h.handle, &mount_id, AT_SYMLINK_FOLLOW); - if (r < 0) - return false; - -diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c -index d27b1b7..905a2e1 100644 ---- a/src/shared/conf-parser.c -+++ b/src/shared/conf-parser.c -@@ -336,8 +336,8 @@ int config_parse(const char *unit, - if (!f) { - f = ours = fopen(filename, "re"); - if (!f) { -- log_error("Failed to open configuration file '%s': %m", filename); -- return -errno; -+ log_full(errno == ENOENT ? LOG_DEBUG : LOG_ERR, "Failed to open configuration file '%s': %m", filename); -+ return errno == ENOENT ? 0 : -errno; - } - } - -diff --git a/src/shared/generator.c b/src/shared/generator.c -index 6110303..e679cb1 100644 ---- a/src/shared/generator.c -+++ b/src/shared/generator.c -@@ -48,7 +48,7 @@ int generator_write_fsck_deps( - const char *checker; - int r; - -- checker = strappenda("/sbin/fsck.", fstype); -+ checker = strappenda("/run/current-system/sw/sbin/fsck.", fstype); - r = access(checker, X_OK); - if (r < 0) { - log_warning("Checking was requested for %s, but %s cannot be used: %m", what, checker); -diff --git a/src/shared/install.c b/src/shared/install.c -index 7409046..4517c9c 100644 ---- a/src/shared/install.c -+++ b/src/shared/install.c -@@ -560,7 +560,7 @@ int unit_file_mask( - unsigned *n_changes) { - - char **i; -- _cleanup_free_ char *prefix; -+ _cleanup_free_ char *prefix = NULL; - int r; - - assert(scope >= 0); -diff --git a/src/shared/log.c b/src/shared/log.c -index a4b3b68..890a9fa 100644 ---- a/src/shared/log.c -+++ b/src/shared/log.c -@@ -878,6 +878,9 @@ void log_parse_environment(void) { - if (l == 5 && startswith(w, "debug")) { - log_set_max_level(LOG_DEBUG); - break; -+ } else if (l == 5 && startswith(w, "quiet")) { -+ log_set_max_level(LOG_WARNING); -+ break; - } - } - } -diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c -index 9d14933..b0b66f6 100644 ---- a/src/shared/logs-show.c -+++ b/src/shared/logs-show.c -@@ -547,7 +547,9 @@ static int output_export( - startswith(data, "_BOOT_ID=")) - continue; - -- if (!utf8_is_printable(data, length)) { -+ if (utf8_is_printable_newline(data, length, false)) -+ fwrite(data, length, 1, f); -+ else { - const char *c; - uint64_t le64; - -@@ -562,8 +564,7 @@ static int output_export( - le64 = htole64(length - (c - (const char*) data) - 1); - fwrite(&le64, sizeof(le64), 1, f); - fwrite(c + 1, length - (c - (const char*) data) - 1, 1, f); -- } else -- fwrite(data, length, 1, f); -+ } - - fputc('\n', f); - } -diff --git a/src/shared/unit-name.c b/src/shared/unit-name.c -index 6c167b4..d0e71f2 100644 ---- a/src/shared/unit-name.c -+++ b/src/shared/unit-name.c -@@ -332,7 +332,7 @@ char *unit_name_path_unescape(const char *f) { - } - - bool unit_name_is_template(const char *n) { -- const char *p; -+ const char *p, *e; - - assert(n); - -@@ -340,11 +340,15 @@ bool unit_name_is_template(const char *n) { - if (!p) - return false; - -- return p[1] == '.'; -+ e = strrchr(p+1, '.'); -+ if (!e) -+ return false; -+ -+ return e == p + 1; - } - - bool unit_name_is_instance(const char *n) { -- const char *p; -+ const char *p, *e; - - assert(n); - -@@ -352,7 +356,11 @@ bool unit_name_is_instance(const char *n) { - if (!p) - return false; - -- return p[1] != '.'; -+ e = strrchr(p+1, '.'); -+ if (!e) -+ return false; -+ -+ return e > p + 1; - } - - char *unit_name_replace_instance(const char *f, const char *i) { -diff --git a/src/shared/utf8.c b/src/shared/utf8.c -index 0b524d8..c559c13 100644 ---- a/src/shared/utf8.c -+++ b/src/shared/utf8.c -@@ -136,7 +136,7 @@ int utf8_encoded_to_unichar(const char *str) { - return unichar; - } - --bool utf8_is_printable(const char* str, size_t length) { -+bool utf8_is_printable_newline(const char* str, size_t length, bool newline) { - const uint8_t *p; - - assert(str); -@@ -145,7 +145,8 @@ bool utf8_is_printable(const char* str, size_t length) { - int encoded_len = utf8_encoded_valid_unichar((const char *)p); - int val = utf8_encoded_to_unichar((const char*)p); - -- if (encoded_len < 0 || val < 0 || is_unicode_control(val)) -+ if (encoded_len < 0 || val < 0 || is_unicode_control(val) || -+ (!newline && val == '\n')) - return false; - - length -= encoded_len; -diff --git a/src/shared/utf8.h b/src/shared/utf8.h -index c0eb73a..c087995 100644 ---- a/src/shared/utf8.h -+++ b/src/shared/utf8.h -@@ -31,7 +31,10 @@ const char *utf8_is_valid(const char *s) _pure_; - char *ascii_is_valid(const char *s) _pure_; - char *utf8_escape_invalid(const char *s); - --bool utf8_is_printable(const char* str, size_t length) _pure_; -+bool utf8_is_printable_newline(const char* str, size_t length, bool newline) _pure_; -+_pure_ static inline bool utf8_is_printable(const char* str, size_t length) { -+ return utf8_is_printable_newline(str, length, true); -+} - - char *utf16_to_utf8(const void *s, size_t length); - -diff --git a/src/shared/util.c b/src/shared/util.c -index ffe6624..2a2b2b2 100644 ---- a/src/shared/util.c -+++ b/src/shared/util.c -@@ -166,19 +166,19 @@ int close_nointr(int fd) { - - assert(fd >= 0); - r = close(fd); -- -- /* Just ignore EINTR; a retry loop is the wrong -- * thing to do on Linux. -- * -- * http://lkml.indiana.edu/hypermail/linux/kernel/0509.1/0877.html -- * https://bugzilla.gnome.org/show_bug.cgi?id=682819 -- * http://utcc.utoronto.ca/~cks/space/blog/unix/CloseEINTR -- * https://sites.google.com/site/michaelsafyan/software-engineering/checkforeintrwheninvokingclosethinkagain -- */ -- if (_unlikely_(r < 0 && errno == EINTR)) -- return 0; -- else if (r >= 0) -+ if (r >= 0) - return r; -+ else if (errno == EINTR) -+ /* -+ * Just ignore EINTR; a retry loop is the wrong -+ * thing to do on Linux. -+ * -+ * http://lkml.indiana.edu/hypermail/linux/kernel/0509.1/0877.html -+ * https://bugzilla.gnome.org/show_bug.cgi?id=682819 -+ * http://utcc.utoronto.ca/~cks/space/blog/unix/CloseEINTR -+ * https://sites.google.com/site/michaelsafyan/software-engineering/checkforeintrwheninvokingclosethinkagain -+ */ -+ return 0; - else - return -errno; - } -@@ -195,7 +195,13 @@ int safe_close(int fd) { - - if (fd >= 0) { - PROTECT_ERRNO; -- assert_se(close_nointr(fd) == 0); -+ -+ /* The kernel might return pretty much any error code -+ * via close(), but the fd will be closed anyway. The -+ * only condition we want to check for here is whether -+ * the fd was invalid at all... */ -+ -+ assert_se(close_nointr(fd) != -EBADF); - } - - return -1; -@@ -1365,7 +1371,7 @@ bool ignore_file(const char *filename) { - assert(filename); - - if (endswith(filename, "~")) -- return false; -+ return true; - - return ignore_file_allow_backup(filename); - } -@@ -1495,6 +1501,7 @@ bool fstype_is_network(const char *fstype) { - static const char table[] = - "cifs\0" - "smbfs\0" -+ "sshfs\0" - "ncpfs\0" - "ncp\0" - "nfs\0" -@@ -1581,8 +1588,9 @@ int read_one_char(FILE *f, char *ret, usec_t t, bool *need_nl) { - if (fd_wait_for_event(fileno(f), POLLIN, t) <= 0) - return -ETIMEDOUT; - -+ errno = 0; - if (!fgets(line, sizeof(line), f)) -- return -EIO; -+ return errno ? -errno : -EIO; - - truncate_nl(line); - -@@ -5327,6 +5335,9 @@ bool string_is_safe(const char *p) { - if (*t > 0 && *t < ' ') - return false; - -+ if (*t == 127) -+ return false; -+ - if (strchr("\\\"\'", *t)) - return false; - } -@@ -5343,10 +5354,14 @@ bool string_has_cc(const char *p) { - - assert(p); - -- for (t = p; *t; t++) -+ for (t = p; *t; t++) { - if (*t > 0 && *t < ' ' && *t != '\t') - return true; - -+ if (*t == 127) -+ return true; -+ } -+ - return false; - } - -@@ -6391,3 +6406,19 @@ void hexdump(FILE *f, const void *p, size_t s) { - s -= 16; - } - } -+ -+int update_reboot_param_file(const char *param) -+{ -+ int r = 0; -+ -+ if (param) { -+ -+ r = write_string_file(REBOOT_PARAM_FILE, param); -+ if (r < 0) -+ log_error("Failed to write reboot param to " -+ REBOOT_PARAM_FILE": %s", strerror(-r)); -+ } else -+ unlink(REBOOT_PARAM_FILE); -+ -+ return r; -+} -diff --git a/src/shared/util.h b/src/shared/util.h -index 90464c9..122ac91 100644 ---- a/src/shared/util.h -+++ b/src/shared/util.h -@@ -22,6 +22,7 @@ - ***/ - - #include <alloca.h> -+#include <fcntl.h> - #include <inttypes.h> - #include <time.h> - #include <sys/time.h> -@@ -922,3 +923,10 @@ uint64_t physical_memory(void); - char* mount_test_option(const char *haystack, const char *needle); - - void hexdump(FILE *f, const void *p, size_t s); -+ -+union file_handle_union { -+ struct file_handle handle; -+ char padding[sizeof(struct file_handle) + MAX_HANDLE_SZ]; -+}; -+ -+int update_reboot_param_file(const char *param); -diff --git a/src/shared/virt.c b/src/shared/virt.c -index ec2ddcf..f03e790 100644 ---- a/src/shared/virt.c -+++ b/src/shared/virt.c -@@ -149,7 +149,7 @@ static int detect_vm_dmi(const char **_id) { - - /* Returns a short identifier for the various VM implementations */ - int detect_vm(const char **id) { -- _cleanup_free_ char *hvtype = NULL, *cpuinfo_contents = NULL; -+ _cleanup_free_ char *domcap = NULL, *cpuinfo_contents = NULL; - static thread_local int cached_found = -1; - static thread_local const char *cached_id = NULL; - const char *_id = NULL; -@@ -163,17 +163,37 @@ int detect_vm(const char **id) { - return cached_found; - } - -- /* Try high-level hypervisor sysfs file first: -+ /* Try xen capabilities file first, if not found try high-level hypervisor sysfs file: - * -- * https://bugs.freedesktop.org/show_bug.cgi?id=61491 */ -- r = read_one_line_file("/sys/hypervisor/type", &hvtype); -+ * https://bugs.freedesktop.org/show_bug.cgi?id=77271 */ -+ r = read_one_line_file("/proc/xen/capabilities", &domcap); - if (r >= 0) { -- if (streq(hvtype, "xen")) { -+ char *cap, *i = domcap; -+ -+ while ((cap = strsep(&i, ","))) -+ if (streq(cap, "control_d")) -+ break; -+ -+ if (!i) { - _id = "xen"; - r = 1; -- goto finish; - } -- } else if (r != -ENOENT) -+ -+ goto finish; -+ -+ } else if (r == -ENOENT) { -+ _cleanup_free_ char *hvtype = NULL; -+ -+ r = read_one_line_file("/sys/hypervisor/type", &hvtype); -+ if (r >= 0) { -+ if (streq(hvtype, "xen")) { -+ _id = "xen"; -+ r = 1; -+ goto finish; -+ } -+ } else if (r != -ENOENT) -+ return r; -+ } else - return r; - - /* this will set _id to "other" and return 0 for unknown hypervisors */ diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c -index 0887bc3..d02ee2b 100644 +index 28eaa6a..6292c09 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c -@@ -461,7 +461,7 @@ static int output_units_list(const UnitInfo *unit_infos, unsigned c) { - } - - if (circle_len > 0) -- printf("%s%s%s", on_circle, circle ? draw_special_char(DRAW_BLACK_CIRCLE) : " ", off_circle); -+ printf("%s%s%s ", on_circle, circle ? draw_special_char(DRAW_BLACK_CIRCLE) : " ", off_circle); - - printf("%s%-*s%s %s%-*s%s %s%-*s %-*s%s %-*s", - on_active, id_len, id, off_active, -@@ -2561,7 +2561,7 @@ static int start_unit_one( +@@ -2651,7 +2651,7 @@ static int start_unit_one( log_debug("Adding %s to the set", p); r = set_consume(s, p); @@ -2112,523 +82,6 @@ index 0887bc3..d02ee2b 100644 return log_oom(); } -@@ -4240,7 +4240,7 @@ static int show_all( - _cleanup_free_ UnitInfo *unit_infos = NULL; - const UnitInfo *u; - unsigned c; -- int r; -+ int r, ret = 0; - - r = get_unit_list(bus, NULL, NULL, &unit_infos, 0, &reply); - if (r < 0) -@@ -4262,9 +4262,11 @@ static int show_all( - r = show_one(verb, bus, p, show_properties, new_line, ellipsized); - if (r < 0) - return r; -+ else if (r > 0 && ret == 0) -+ ret = r; - } - -- return 0; -+ return ret; - } - - static int show_system_status(sd_bus *bus) { -@@ -4386,7 +4388,12 @@ static int show(sd_bus *bus, char **args) { - } - } - -- show_one(args[0], bus, unit, show_properties, &new_line, &ellipsized); -+ r = show_one(args[0], bus, unit, show_properties, -+ &new_line, &ellipsized); -+ if (r < 0) -+ return r; -+ else if (r > 0 && ret == 0) -+ ret = r; - } - - if (!strv_isempty(patterns)) { -@@ -4403,7 +4410,12 @@ static int show(sd_bus *bus, char **args) { - if (!unit) - return log_oom(); - -- show_one(args[0], bus, unit, show_properties, &new_line, &ellipsized); -+ r = show_one(args[0], bus, unit, show_properties, -+ &new_line, &ellipsized); -+ if (r < 0) -+ return r; -+ else if (r > 0 && ret == 0) -+ ret = r; - } - } - } -@@ -5403,15 +5415,15 @@ static int systemctl_help(void) { - " otherwise restart if active\n" - " isolate NAME Start one unit and stop all others\n" - " kill NAME... Send signal to processes of a unit\n" -- " is-active NAME... Check whether units are active\n" -- " is-failed NAME... Check whether units are failed\n" -- " status [NAME...|PID...] Show runtime status of one or more units\n" -- " show [NAME...|JOB...] Show properties of one or more\n" -+ " is-active PATTERN... Check whether units are active\n" -+ " is-failed PATTERN... Check whether units are failed\n" -+ " status [PATTERN...|PID...] Show runtime status of one or more units\n" -+ " show [PATTERN...|JOB...] Show properties of one or more\n" - " units/jobs or the manager\n" -- " cat NAME... Show files and drop-ins of one or more units\n" -+ " cat PATTERN... Show files and drop-ins of one or more units\n" - " set-property NAME ASSIGNMENT... Sets one or more properties of a unit\n" -- " help NAME...|PID... Show manual for one or more units\n" -- " reset-failed [NAME...] Reset failed state for all, one, or more\n" -+ " help PATTERN...|PID... Show manual for one or more units\n" -+ " reset-failed [PATTERN...] Reset failed state for all, one, or more\n" - " units\n" - " list-dependencies [NAME] Recursively show units which are required\n" - " or wanted by this unit or by which this\n" -@@ -5973,13 +5985,10 @@ static int halt_parse_argv(int argc, char *argv[]) { - } - } - -- if (arg_action == ACTION_REBOOT && argc == optind + 1) { -- r = write_string_file(REBOOT_PARAM_FILE, argv[optind]); -- if (r < 0) { -- log_error("Failed to write reboot param to " -- REBOOT_PARAM_FILE": %s", strerror(-r)); -+ if (arg_action == ACTION_REBOOT && (argc == optind || argc == optind + 1)) { -+ r = update_reboot_param_file(argc == optind + 1 ? argv[optind] : NULL); -+ if (r < 0) - return r; -- } - } else if (optind < argc) { - log_error("Too many arguments."); - return -EINVAL; -diff --git a/src/test/test-udev.c b/src/test/test-udev.c -index b064744..b057cc8 100644 ---- a/src/test/test-udev.c -+++ b/src/test/test-udev.c -@@ -155,9 +155,8 @@ int main(int argc, char *argv[]) { - } - } - -- err = udev_event_execute_rules(event, rules, &sigmask_orig); -- if (err == 0) -- udev_event_execute_run(event, NULL); -+ udev_event_execute_rules(event, rules, &sigmask_orig); -+ udev_event_execute_run(event, NULL); - out: - if (event != NULL && event->fd_signal >= 0) - close(event->fd_signal); -diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c -index 33e7cbc..04b472d 100644 ---- a/src/tmpfiles/tmpfiles.c -+++ b/src/tmpfiles/tmpfiles.c -@@ -217,19 +217,16 @@ static bool unix_socket_alive(const char *fn) { - } - - static int dir_is_mount_point(DIR *d, const char *subdir) { -- struct file_handle *h; -+ union file_handle_union h = { .handle.handle_bytes = MAX_HANDLE_SZ }; - int mount_id_parent, mount_id; - int r_p, r; - -- h = alloca(MAX_HANDLE_SZ); -- -- h->handle_bytes = MAX_HANDLE_SZ; -- r_p = name_to_handle_at(dirfd(d), ".", h, &mount_id_parent, 0); -+ r_p = name_to_handle_at(dirfd(d), ".", &h.handle, &mount_id_parent, 0); - if (r_p < 0) - r_p = -errno; - -- h->handle_bytes = MAX_HANDLE_SZ; -- r = name_to_handle_at(dirfd(d), subdir, h, &mount_id, 0); -+ h.handle.handle_bytes = MAX_HANDLE_SZ; -+ r = name_to_handle_at(dirfd(d), subdir, &h.handle, &mount_id, 0); - if (r < 0) - r = -errno; - -diff --git a/src/tty-ask-password-agent/tty-ask-password-agent.c b/src/tty-ask-password-agent/tty-ask-password-agent.c -index 1d067af..3203474 100644 ---- a/src/tty-ask-password-agent/tty-ask-password-agent.c -+++ b/src/tty-ask-password-agent/tty-ask-password-agent.c -@@ -432,7 +432,7 @@ static int wall_tty_block(void) { - - r = get_ctty_devnr(0, &devnr); - if (r < 0) -- return -r; -+ return r; - - if (asprintf(&p, "/run/systemd/ask-password-block/%u:%u", major(devnr), minor(devnr)) < 0) - return -ENOMEM; -diff --git a/src/udev/accelerometer/accelerometer.c b/src/udev/accelerometer/accelerometer.c -index 925d38d..32adf27 100644 ---- a/src/udev/accelerometer/accelerometer.c -+++ b/src/udev/accelerometer/accelerometer.c -@@ -180,7 +180,7 @@ get_prev_orientation(struct udev_device *dev) - return string_to_orientation(value); - } - --#define SET_AXIS(axis, code_) if (ev[i].code == code_) { if (got_##axis == 0) { axis = ev[i].value; got_##axis = true; } } -+#define READ_AXIS(axis, var) { memzero(&abs_info, sizeof(abs_info)); r = ioctl(fd, EVIOCGABS(axis), &abs_info); if (r < 0) return; var = abs_info.value; } - - /* accelerometers */ - static void test_orientation(struct udev *udev, -@@ -189,10 +189,9 @@ static void test_orientation(struct udev *udev, - { - OrientationUp old, new; - _cleanup_close_ int fd = -1; -- struct input_event ev[64]; -- bool got_syn = false; -- bool got_x = false, got_y = false, got_z = false; -+ struct input_absinfo abs_info; - int x = 0, y = 0, z = 0; -+ int r; - char text[64]; - - old = get_prev_orientation(dev); -@@ -201,30 +200,10 @@ static void test_orientation(struct udev *udev, - if (fd < 0) - return; - -- while (1) { -- int i, r; -- -- r = read(fd, ev, sizeof(struct input_event) * 64); -- -- if (r < (int) sizeof(struct input_event)) -- return; -- -- for (i = 0; i < r / (int) sizeof(struct input_event); i++) { -- if (got_syn) { -- if (ev[i].type == EV_ABS) { -- SET_AXIS(x, ABS_X); -- SET_AXIS(y, ABS_Y); -- SET_AXIS(z, ABS_Z); -- } -- } -- if (ev[i].type == EV_SYN && ev[i].code == SYN_REPORT) -- got_syn = true; -- if (got_x && got_y && got_z) -- goto read_dev; -- } -- } -+ READ_AXIS(ABS_X, x); -+ READ_AXIS(ABS_Y, y); -+ READ_AXIS(ABS_Z, z); - --read_dev: - new = orientation_calc(old, x, y, z); - snprintf(text, sizeof(text), - "ID_INPUT_ACCELEROMETER_ORIENTATION=%s", orientation_to_string(new)); -diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c -index 5bb6b02..b31ad80 100644 ---- a/src/udev/net/link-config.c -+++ b/src/udev/net/link-config.c -@@ -184,7 +184,7 @@ failure: - } - - static bool enable_name_policy(void) { -- _cleanup_free_ char *line; -+ _cleanup_free_ char *line = NULL; - char *w, *state; - int r; - size_t l; -@@ -391,7 +391,9 @@ int link_config_apply(link_config_ctx *ctx, link_config *config, struct udev_dev - case MACPOLICY_PERSISTENT: - if (!mac_is_permanent(device)) { - r = get_mac(device, false, &generated_mac); -- if (r < 0) -+ if (r == -ENOENT) -+ break; -+ else if (r < 0) - return r; - mac = &generated_mac; - } -@@ -399,7 +401,9 @@ int link_config_apply(link_config_ctx *ctx, link_config *config, struct udev_dev - case MACPOLICY_RANDOM: - if (!mac_is_random(device)) { - r = get_mac(device, true, &generated_mac); -- if (r < 0) -+ if (r == -ENOENT) -+ break; -+ else if (r < 0) - return r; - mac = &generated_mac; - } -diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c -index 5998be2..5213a4a 100644 ---- a/src/udev/udev-event.c -+++ b/src/udev/udev-event.c -@@ -771,18 +771,17 @@ static int rename_netif(struct udev_event *event) - log_error("error changing net interface name %s to %s: %s", - oldname, name, strerror(-r)); - else -- print_kmsg("renamed network interface %s to %s", oldname, name); -+ print_kmsg("renamed network interface %s to %s\n", oldname, name); - - return r; - } - --int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules, const sigset_t *sigmask) -+void udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules, const sigset_t *sigmask) - { - struct udev_device *dev = event->dev; -- int err = 0; - - if (udev_device_get_subsystem(dev) == NULL) -- return -1; -+ return; - - if (streq(udev_device_get_action(dev), "remove")) { - udev_device_read_db(dev, NULL); -@@ -816,9 +815,10 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules, - event->name != NULL && !streq(event->name, udev_device_get_sysname(dev))) { - char syspath[UTIL_PATH_SIZE]; - char *pos; -+ int r; - -- err = rename_netif(event); -- if (err == 0) { -+ r = rename_netif(event); -+ if (r >= 0) { - log_debug("renamed netif to '%s'", event->name); - - /* remember old name */ -@@ -881,7 +881,6 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules, - udev_device_unref(event->dev_db); - event->dev_db = NULL; - } -- return err; - } - - void udev_event_execute_run(struct udev_event *event, const sigset_t *sigmask) -diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c -index 2630264..17f47f2 100644 ---- a/src/udev/udev-rules.c -+++ b/src/udev/udev-rules.c -@@ -2555,10 +2555,15 @@ int udev_rules_apply_static_dev_perms(struct udev_rules *rules) - struct stat stats; - - /* we assure, that the permissions tokens are sorted before the static token */ -+ - if (mode == 0 && uid == 0 && gid == 0 && tags == NULL) - goto next; - - strscpyl(device_node, sizeof(device_node), "/dev/", rules_str(rules, cur->key.value_off), NULL); -+ if (stat(device_node, &stats) != 0) -+ break; -+ if (!S_ISBLK(stats.st_mode) && !S_ISCHR(stats.st_mode)) -+ break; - - /* export the tags to a directory as symlinks, allowing otherwise dead nodes to be tagged */ - if (tags) { -@@ -2588,11 +2593,6 @@ int udev_rules_apply_static_dev_perms(struct udev_rules *rules) - if (mode == 0 && uid == 0 && gid == 0) - break; - -- if (stat(device_node, &stats) != 0) -- break; -- if (!S_ISBLK(stats.st_mode) && !S_ISCHR(stats.st_mode)) -- break; -- - if (mode == 0) { - if (gid > 0) - mode = 0660; -diff --git a/src/udev/udev.h b/src/udev/udev.h -index 936adfb..62538bc 100644 ---- a/src/udev/udev.h -+++ b/src/udev/udev.h -@@ -84,7 +84,7 @@ int udev_event_apply_subsys_kernel(struct udev_event *event, const char *string, - int udev_event_spawn(struct udev_event *event, - const char *cmd, char **envp, const sigset_t *sigmask, - char *result, size_t ressize); --int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules, const sigset_t *sigset); -+void udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules, const sigset_t *sigset); - void udev_event_execute_run(struct udev_event *event, const sigset_t *sigset); - int udev_build_argv(struct udev *udev, char *cmd, int *argc, char *argv[]); - -diff --git a/src/udev/udevadm-test.c b/src/udev/udevadm-test.c -index 6cd311b..6a2f548 100644 ---- a/src/udev/udevadm-test.c -+++ b/src/udev/udevadm-test.c -@@ -43,7 +43,6 @@ static int adm_test(struct udev *udev, int argc, char *argv[]) - _cleanup_udev_device_unref_ struct udev_device *dev = NULL; - _cleanup_udev_event_unref_ struct udev_event *event = NULL; - sigset_t mask, sigmask_orig; -- int err; - int rc = 0, c; - - static const struct option options[] = { -@@ -139,18 +138,16 @@ static int adm_test(struct udev *udev, int argc, char *argv[]) - goto out; - } - -- err = udev_event_execute_rules(event, rules, &sigmask_orig); -+ udev_event_execute_rules(event, rules, &sigmask_orig); - - udev_list_entry_foreach(entry, udev_device_get_properties_list_entry(dev)) - printf("%s=%s\n", udev_list_entry_get_name(entry), udev_list_entry_get_value(entry)); - -- if (err == 0) { -- udev_list_entry_foreach(entry, udev_list_get_entry(&event->run_list)) { -- char program[UTIL_PATH_SIZE]; -+ udev_list_entry_foreach(entry, udev_list_get_entry(&event->run_list)) { -+ char program[UTIL_PATH_SIZE]; - -- udev_event_apply_format(event, udev_list_entry_get_name(entry), program, sizeof(program)); -- printf("run: '%s'\n", program); -- } -+ udev_event_apply_format(event, udev_list_entry_get_name(entry), program, sizeof(program)); -+ printf("run: '%s'\n", program); - } - out: - if (event != NULL && event->fd_signal >= 0) -diff --git a/src/udev/udevd.c b/src/udev/udevd.c -index f21c227..93afca1 100644 ---- a/src/udev/udevd.c -+++ b/src/udev/udevd.c -@@ -288,10 +288,9 @@ static void worker_new(struct event *event) - udev_event->exec_delay = exec_delay; - - /* apply rules, create node, symlinks */ -- err = udev_event_execute_rules(udev_event, rules, &sigmask_orig); -+ udev_event_execute_rules(udev_event, rules, &sigmask_orig); - -- if (err == 0) -- udev_event_execute_run(udev_event, &sigmask_orig); -+ udev_event_execute_run(udev_event, &sigmask_orig); - - /* apply/restore inotify watch */ - if (err == 0 && udev_event->inotify_watch) { -diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c -index 0f2b706..645b1e6 100644 ---- a/src/vconsole/vconsole-setup.c -+++ b/src/vconsole/vconsole-setup.c -@@ -180,6 +180,10 @@ static int font_load(const char *vc, const char *font, const char *map, const ch - */ - static void font_copy_to_all_vcs(int fd) { - struct vt_stat vcs = {}; -+ unsigned char map8[E_TABSZ]; -+ unsigned short map16[E_TABSZ]; -+ struct unimapdesc unimapd; -+ struct unipair unipairs[USHRT_MAX]; - int i, r; - - /* get active, and 16 bit mask of used VT numbers */ -@@ -209,17 +213,35 @@ static void font_copy_to_all_vcs(int fd) { - cfo.op = KD_FONT_OP_COPY; - cfo.height = vcs.v_active-1; /* tty1 == index 0 */ - ioctl(vcfd, KDFONTOP, &cfo); -+ -+ /* copy map of 8bit chars */ -+ if (ioctl(fd, GIO_SCRNMAP, map8) >= 0) -+ ioctl(vcfd, PIO_SCRNMAP, map8); -+ -+ /* copy map of 8bit chars -> 16bit Unicode values */ -+ if (ioctl(fd, GIO_UNISCRNMAP, map16) >= 0) -+ ioctl(vcfd, PIO_UNISCRNMAP, map16); -+ -+ /* copy unicode translation table */ -+ /* unimapd is a ushort count and a pointer to an -+ array of struct unipair { ushort, ushort } */ -+ unimapd.entries = unipairs; -+ unimapd.entry_ct = USHRT_MAX; -+ if (ioctl(fd, GIO_UNIMAP, &unimapd) >= 0) { -+ struct unimapinit adv = { 0, 0, 0 }; -+ -+ ioctl(vcfd, PIO_UNIMAPCLR, &adv); -+ ioctl(vcfd, PIO_UNIMAP, &unimapd); -+ } - } - } - - int main(int argc, char **argv) { - const char *vc; -- char *vc_keymap = NULL; -- char *vc_keymap_toggle = NULL; -- char *vc_font = NULL; -- char *vc_font_map = NULL; -- char *vc_font_unimap = NULL; -- int fd = -1; -+ _cleanup_free_ char -+ *vc_keymap = NULL, *vc_keymap_toggle = NULL, -+ *vc_font = NULL, *vc_font_map = NULL, *vc_font_unimap = NULL; -+ _cleanup_close_ int fd = -1; - bool utf8; - pid_t font_pid = 0, keymap_pid = 0; - bool font_copy = false; -@@ -241,12 +263,12 @@ int main(int argc, char **argv) { - fd = open_terminal(vc, O_RDWR|O_CLOEXEC); - if (fd < 0) { - log_error("Failed to open %s: %m", vc); -- goto finish; -+ return EXIT_FAILURE; - } - - if (!is_vconsole(fd)) { - log_error("Device %s is not a virtual console.", vc); -- goto finish; -+ return EXIT_FAILURE; - } - - utf8 = is_locale_utf8(); -@@ -281,27 +303,27 @@ int main(int argc, char **argv) { - else - disable_utf8(fd); - -- r = EXIT_FAILURE; -- if (keymap_load(vc, vc_keymap, vc_keymap_toggle, utf8, &keymap_pid) >= 0 && -- font_load(vc, vc_font, vc_font_map, vc_font_unimap, &font_pid) >= 0) -- r = EXIT_SUCCESS; -- --finish: -- if (keymap_pid > 0) -- wait_for_terminate_and_warn(KBD_LOADKEYS, keymap_pid); -+ r = font_load(vc, vc_font, vc_font_map, vc_font_unimap, &font_pid); -+ if (r < 0) { -+ log_error("Failed to start " KBD_SETFONT ": %s", strerror(-r)); -+ return EXIT_FAILURE; -+ } - -- if (font_pid > 0) { -+ if (font_pid > 0) - wait_for_terminate_and_warn(KBD_SETFONT, font_pid); -- if (font_copy) -- font_copy_to_all_vcs(fd); -+ -+ r = keymap_load(vc, vc_keymap, vc_keymap_toggle, utf8, &keymap_pid); -+ if (r < 0) { -+ log_error("Failed to start " KBD_LOADKEYS ": %s", strerror(-r)); -+ return EXIT_FAILURE; - } - -- free(vc_keymap); -- free(vc_font); -- free(vc_font_map); -- free(vc_font_unimap); -+ if (keymap_pid > 0) -+ wait_for_terminate_and_warn(KBD_LOADKEYS, keymap_pid); - -- safe_close(fd); -+ /* Only copy the font when we started setfont successfully */ -+ if (font_copy && font_pid > 0) -+ font_copy_to_all_vcs(fd); - -- return r; -+ return EXIT_SUCCESS; - } -diff --git a/tmpfiles.d/systemd.conf b/tmpfiles.d/systemd.conf -index 7c6d6b9..c470045 100644 ---- a/tmpfiles.d/systemd.conf -+++ b/tmpfiles.d/systemd.conf -@@ -23,6 +23,6 @@ d /run/systemd/machines 0755 root root - - d /run/systemd/shutdown 0755 root root - - - m /var/log/journal 2755 root systemd-journal - - --m /var/log/journal/%m 2755 root systemd-journal - - -+Z /var/log/journal/%m 2755 root systemd-journal - - - m /run/log/journal 2755 root systemd-journal - - --m /run/log/journal/%m 2755 root systemd-journal - - -+Z /run/log/journal/%m 2755 root systemd-journal - - diff --git a/units/console-getty.service.m4.in b/units/console-getty.service.m4.in index 8ac51a4..cae9fb5 100644 --- a/units/console-getty.service.m4.in @@ -2654,19 +107,19 @@ index 4f7794b..bad2a9a 100644 Restart=always RestartSec=0 diff --git a/units/emergency.service.in b/units/emergency.service.in -index 94c090f..0d20640 100644 +index 18973e7..3a99660 100644 --- a/units/emergency.service.in +++ b/units/emergency.service.in -@@ -15,7 +15,6 @@ Before=shutdown.target +@@ -16,7 +16,6 @@ Before=shutdown.target [Service] Environment=HOME=/root WorkingDirectory=/root -ExecStartPre=-/bin/plymouth quit - ExecStartPre=-/bin/echo -e 'Welcome to emergency mode! After logging in, type "journalctl -xb" to view\\nsystem logs, "systemctl reboot" to reboot, "systemctl default" to try again\\nto boot into default mode.' - ExecStart=-/sbin/sulogin - ExecStopPost=@SYSTEMCTL@ --fail --no-block default + ExecStartPre=-/bin/echo -e 'Welcome to emergency mode! After logging in, type "journalctl -xb" to view\\nsystem logs, "systemctl reboot" to reboot, "systemctl default" or ^D to\\ntry again to boot into default mode.' + ExecStart=-/bin/sh -c "/sbin/sulogin; @SYSTEMCTL@ --fail --no-block default" + Type=idle diff --git a/units/getty@.service.m4 b/units/getty@.service.m4 -index aa853b8..8bcc647 100644 +index 46164ab..f194a31 100644 --- a/units/getty@.service.m4 +++ b/units/getty@.service.m4 @@ -23,11 +23,12 @@ IgnoreOnIsolate=yes @@ -2685,23 +138,23 @@ index aa853b8..8bcc647 100644 Restart=always RestartSec=0 diff --git a/units/kmod-static-nodes.service.in b/units/kmod-static-nodes.service.in -index 368f980..d0c1bd2 100644 +index 0934a87..7e30c9e 100644 --- a/units/kmod-static-nodes.service.in +++ b/units/kmod-static-nodes.service.in @@ -10,7 +10,6 @@ Description=Create list of required static device nodes for the current kernel DefaultDependencies=no Before=sysinit.target systemd-tmpfiles-setup-dev.service - ConditionCapability=CAP_MKNOD + ConditionCapability=CAP_SYS_MODULE -ConditionPathExists=/lib/modules/%v/modules.devname [Service] Type=oneshot diff --git a/units/local-fs.target b/units/local-fs.target -index ae3cedc..0e36840 100644 +index d2e5429..d26984b 100644 --- a/units/local-fs.target +++ b/units/local-fs.target -@@ -13,3 +13,5 @@ DefaultDependencies=no - Conflicts=shutdown.target +@@ -13,3 +13,5 @@ Conflicts=shutdown.target + After=local-fs-pre.target OnFailure=emergency.target OnFailureJobMode=replace-irreversibly + @@ -2718,47 +171,43 @@ index 43ffa5c..156a681 100644 + [Install] WantedBy=multi-user.target -diff --git a/units/rescue.service.m4.in b/units/rescue.service.m4.in -index 552ef89..af3915f 100644 ---- a/units/rescue.service.m4.in -+++ b/units/rescue.service.m4.in +diff --git a/units/rescue.service.in b/units/rescue.service.in +index fc93f1e..3c87cf8 100644 +--- a/units/rescue.service.in ++++ b/units/rescue.service.in @@ -16,7 +16,6 @@ Before=shutdown.target [Service] Environment=HOME=/root WorkingDirectory=/root -ExecStartPre=-/bin/plymouth quit - ExecStartPre=-/bin/echo -e 'Welcome to rescue mode! Type "systemctl default" or ^D to enter default mode.\\nType "journalctl -xb" to view system logs. Type "systemctl reboot" to reboot.' - ExecStart=-/sbin/sulogin - ExecStopPost=-@SYSTEMCTL@ --fail --no-block default + ExecStartPre=-/bin/echo -e 'Welcome to emergency mode! After logging in, type "journalctl -xb" to view\\nsystem logs, "systemctl reboot" to reboot, "systemctl default" or ^D to\\nboot into default mode.' + ExecStart=-/bin/sh -c "/sbin/sulogin; @SYSTEMCTL@ --fail --no-block default" + Type=idle diff --git a/units/serial-getty@.service.m4 b/units/serial-getty@.service.m4 -index 4ac51e7..96daa5c 100644 +index 4522d0d..96daa5c 100644 --- a/units/serial-getty@.service.m4 +++ b/units/serial-getty@.service.m4 -@@ -22,10 +22,8 @@ Before=getty.target +@@ -22,7 +22,6 @@ Before=getty.target IgnoreOnIsolate=yes [Service] -ExecStart=-/sbin/agetty --keep-baud 115200,38400,9600 %I $TERM Type=idle Restart=always --RestartSec=0 UtmpIdentifier=%I - TTYPath=/dev/%I - TTYReset=yes diff --git a/units/sysinit.target b/units/sysinit.target -index 8f4fb8f..e0f0147 100644 +index ec33503..4ac47b9 100644 --- a/units/sysinit.target +++ b/units/sysinit.target -@@ -9,6 +9,5 @@ +@@ -9,5 +9,4 @@ Description=System Initialization Documentation=man:systemd.special(7) Conflicts=emergency.service emergency.target -Wants=local-fs.target swap.target -After=local-fs.target swap.target emergency.service emergency.target +After=emergency.service emergency.target - RefuseManualStart=yes diff --git a/units/systemd-backlight@.service.in b/units/systemd-backlight@.service.in -index e945d87..77728f2 100644 +index ecf3de4..7e83446 100644 --- a/units/systemd-backlight@.service.in +++ b/units/systemd-backlight@.service.in @@ -19,3 +19,4 @@ Type=oneshot @@ -2767,7 +216,7 @@ index e945d87..77728f2 100644 ExecStop=@rootlibexecdir@/systemd-backlight save %i +X-RestartIfChanged=false diff --git a/units/systemd-journal-flush.service.in b/units/systemd-journal-flush.service.in -index 503e8a6..fe23b8b 100644 +index 699670b..2612220 100644 --- a/units/systemd-journal-flush.service.in +++ b/units/systemd-journal-flush.service.in @@ -10,8 +10,9 @@ Description=Trigger Flushing of Journal to Persistent Storage @@ -2776,16 +225,16 @@ index 503e8a6..fe23b8b 100644 Requires=systemd-journald.service -After=systemd-journald.service local-fs.target remote-fs.target +After=systemd-journald.service - Before=systemd-user-sessions.service + Before=systemd-user-sessions.service systemd-tmpfiles-setup.service +RequiresMountsFor=/var/log/journal [Service] - ExecStart=@rootbindir@/systemctl kill --kill-who=main --signal=SIGUSR1 systemd-journald.service + ExecStart=@rootbindir@/journalctl --flush diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in -index de93879..c9a49f3 100644 +index 4de38fa..4b6daea 100644 --- a/units/systemd-journald.service.in +++ b/units/systemd-journald.service.in -@@ -25,3 +25,8 @@ WatchdogSec=1min +@@ -26,3 +26,8 @@ WatchdogSec=1min # Increase the default a bit in order to allow many simultaneous # services being run since we keep one fd open per service. LimitNOFILE=16384 @@ -2794,20 +243,8 @@ index de93879..c9a49f3 100644 +# journald to stop logging (see +# https://bugs.freedesktop.org/show_bug.cgi?id=56043). +X-RestartIfChanged=no -diff --git a/units/systemd-nspawn@.service.in b/units/systemd-nspawn@.service.in -index ff36e90..e373628 100644 ---- a/units/systemd-nspawn@.service.in -+++ b/units/systemd-nspawn@.service.in -@@ -11,6 +11,7 @@ Documentation=man:systemd-nspawn(1) - - [Service] - ExecStart=@bindir@/systemd-nspawn --quiet --keep-unit --boot --link-journal=guest --directory=/var/lib/container/%i -+KillMode=mixed - Type=notify - - [Install] diff --git a/units/systemd-random-seed.service.in b/units/systemd-random-seed.service.in -index 1879b2f..9b895b9 100644 +index b55844b..3ef9fc6 100644 --- a/units/systemd-random-seed.service.in +++ b/units/systemd-random-seed.service.in @@ -19,3 +19,4 @@ Type=oneshot @@ -2816,7 +253,7 @@ index 1879b2f..9b895b9 100644 ExecStop=@rootlibexecdir@/systemd-random-seed save +X-RestartIfChanged=false diff --git a/units/systemd-rfkill@.service.in b/units/systemd-rfkill@.service.in -index 9d264a2..c505535 100644 +index 0e9851b..9f8fa0d 100644 --- a/units/systemd-rfkill@.service.in +++ b/units/systemd-rfkill@.service.in @@ -19,3 +19,4 @@ Type=oneshot @@ -2825,28 +262,28 @@ index 9d264a2..c505535 100644 ExecStop=@rootlibexecdir@/systemd-rfkill save %I +X-RestartIfChanged=false diff --git a/units/systemd-tmpfiles-setup.service.in b/units/systemd-tmpfiles-setup.service.in -index 01043b7..507f820 100644 +index e895cda..194146f 100644 --- a/units/systemd-tmpfiles-setup.service.in +++ b/units/systemd-tmpfiles-setup.service.in -@@ -12,7 +12,7 @@ DefaultDependencies=no - Wants=local-fs.target +@@ -11,7 +11,7 @@ Documentation=man:tmpfiles.d(5) man:systemd-tmpfiles(8) + DefaultDependencies=no Conflicts=shutdown.target - After=systemd-readahead-collect.service systemd-readahead-replay.service local-fs.target + After=local-fs.target systemd-sysusers.service -Before=sysinit.target shutdown.target +Before=shutdown.target - ConditionDirectoryNotEmpty=|/usr/lib/tmpfiles.d - ConditionDirectoryNotEmpty=|/lib/tmpfiles.d - ConditionDirectoryNotEmpty=|/usr/local/lib/tmpfiles.d + RefuseManualStop=yes + + [Service] diff --git a/units/systemd-update-utmp.service.in b/units/systemd-update-utmp.service.in -index da7dda7..e638145 100644 +index 163eccd..7357c12 100644 --- a/units/systemd-update-utmp.service.in +++ b/units/systemd-update-utmp.service.in @@ -11,7 +11,7 @@ Documentation=man:systemd-update-utmp.service(8) man:utmp(5) DefaultDependencies=no RequiresMountsFor=/var/log/wtmp Conflicts=shutdown.target --After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-remount-fs.service systemd-tmpfiles-setup.service auditd.service -+After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-remount-fs.service auditd.service +-After=systemd-remount-fs.service systemd-tmpfiles-setup.service auditd.service ++After=systemd-remount-fs.service auditd.service Before=sysinit.target shutdown.target [Service] diff --git a/pkgs/os-specific/linux/systemd/systemd-journald-type-notify.patch b/pkgs/os-specific/linux/systemd/systemd-journald-type-notify.patch new file mode 100644 index 000000000000..820b23fbfa28 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/systemd-journald-type-notify.patch @@ -0,0 +1,35 @@ +From a87a38c20196a4aeb56b6ba71d688eefd0b21c30 Mon Sep 17 00:00:00 2001 +From: Michal Schmidt <mschmidt@redhat.com> +Date: Tue, 4 Nov 2014 20:28:08 +0100 +Subject: [PATCH] units: make systemd-journald.service Type=notify + +It already calls sd_notify(), so it looks like an oversight. + +Without it, its ordering to systemd-journal-flush.service is +non-deterministic and the SIGUSR1 from flushing may kill journald before +it has its signal handlers set up. + +https://bugs.freedesktop.org/show_bug.cgi?id=85871 +https://bugzilla.redhat.com/show_bug.cgi?id=1159641 +--- +(foutrelis: dropped systemd-journald-audit.socket from Sockets= in order to + apply to systemd 217) + + units/systemd-journald.service.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in +index 7ee67fd..8d380c8 100644 +--- a/units/systemd-journald.service.in ++++ b/units/systemd-journald.service.in +@@ -14,6 +14,7 @@ After=systemd-journald.socket systemd-journald-dev-log.socket systemd-journald-a + Before=sysinit.target + + [Service] ++Type=notify + Sockets=systemd-journald.socket systemd-journald-dev-log.socket + ExecStart=@rootlibexecdir@/systemd-journald + Restart=always +-- +2.1.3 + diff --git a/pkgs/os-specific/linux/udisks-glue/default.nix b/pkgs/os-specific/linux/udisks-glue/default.nix index 9f99d5e9f209..2dfc8f1b5207 100644 --- a/pkgs/os-specific/linux/udisks-glue/default.nix +++ b/pkgs/os-specific/linux/udisks-glue/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation { description = "A tool to associate udisks events to user-defined actions"; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [pSub]; - license = "free"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/os-specific/linux/udisks/1-default.nix b/pkgs/os-specific/linux/udisks/1-default.nix index 09731d54ab75..780eeb68d1df 100644 --- a/pkgs/os-specific/linux/udisks/1-default.nix +++ b/pkgs/os-specific/linux/udisks/1-default.nix @@ -3,14 +3,19 @@ , libxslt, docbook_xsl, utillinux }: stdenv.mkDerivation rec { - name = "udisks-1.0.4"; + name = "udisks-1.0.5"; src = fetchurl { url = "http://hal.freedesktop.org/releases/${name}.tar.gz"; - sha256 = "1xgqifddwaavmjc8c30i0mdffyirsld7c6qhfyjw7f9khwv8jjw5"; + sha256 = "0wbg3jrv8limdgvcygf4dqin3y6d30y9pcmmk711vq571vmq5v7j"; }; - patches = [ ./purity.patch ./no-pci-db.patch ./cve-2014-0004.patch ]; + patches = [ ./purity.patch ./no-pci-db.patch ]; + + preConfigure = + '' + configureFlagsArray+=(--with-systemdsystemunitdir=$out/lib/systemd/system) + ''; postPatch = '' diff --git a/pkgs/os-specific/linux/upstart/default.nix b/pkgs/os-specific/linux/upstart/default.nix index 6ad255caef45..1b3366f86f8d 100644 --- a/pkgs/os-specific/linux/upstart/default.nix +++ b/pkgs/os-specific/linux/upstart/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://upstart.ubuntu.com/download/${version}/${name}.tar.gz"; - md5 = "870920a75f8c13f3a3af4c35916805ac"; + sha256 = "01w4ab6nlisz5blb0an1sxjkndwikr7sjp0cmz4lg00g3n7gahmx"; }; buildInputs = [ pkgconfig dbus libnih ]; diff --git a/pkgs/os-specific/linux/usermount/default.nix b/pkgs/os-specific/linux/usermount/default.nix index 9bf8692d1ce9..6f96445ef5ea 100644 --- a/pkgs/os-specific/linux/usermount/default.nix +++ b/pkgs/os-specific/linux/usermount/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { homepage = https://github.com/tom5760/usermount; - description = "A simple tool to automatically mount removable drives using UDisks2 and D-Bus."; + description = "A simple tool to automatically mount removable drives using UDisks2 and D-Bus"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix index c220d2d2dd0c..0455c2b8626a 100644 --- a/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/pkgs/os-specific/linux/v4l-utils/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://linuxtv.org/projects.php; description = "V4L utils and libv4l, that provides common image formats regardless of the v4l device"; - license = "free"; # The libs are of LGPLv2.1+, some other pieces are GPL. + license = stdenv.lib.licenses.free; # The libs are of LGPLv2.1+, some other pieces are GPL. maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 937f65089e97..988242e3c42c 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -5,13 +5,13 @@ assert readlineSupport -> readline != null; stdenv.mkDerivation rec { - version = "2.2"; + version = "2.3"; name = "wpa_supplicant-${version}"; src = fetchurl { url = "http://hostap.epitest.fi/releases/${name}.tar.gz"; - sha256 = "1vf8jc4yyksbxf86narvsli3vxfbm8nbnim2mdp66nd6d3yvin70"; + sha256 = "0skvkl6c10ls4s48b2wmf47h9j1y40nlzxnzn8hyaw2j0prmpapa"; }; extraConfig = @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { echo "$extraConfig" >> .config cat .config substituteInPlace Makefile --replace /usr/local $out + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo "${libnl}"/include/libnl*/)" ''; buildInputs = [ openssl dbus_libs libnl ] @@ -38,7 +39,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - patches = [ ./libnl.patch ]; + patches = []; postInstall = '' mkdir -p $out/share/man/man5 $out/share/man/man8 diff --git a/pkgs/os-specific/linux/wpa_supplicant/libnl.patch b/pkgs/os-specific/linux/wpa_supplicant/libnl.patch deleted file mode 100644 index 477f8dd55f69..000000000000 --- a/pkgs/os-specific/linux/wpa_supplicant/libnl.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up wpa_supplicant-1.0-rc2/src/drivers/drivers.mak.foo wpa_supplicant-1.0-rc2/src/drivers/drivers.mak ---- wpa_supplicant-1.0-rc2/src/drivers/drivers.mak.foo 2012-03-02 16:11:43.176448714 -0600 -+++ wpa_supplicant-1.0-rc2/src/drivers/drivers.mak 2012-03-02 16:12:29.759866341 -0600 -@@ -48,7 +48,7 @@ NEED_RFKILL=y - ifdef CONFIG_LIBNL32 - DRV_LIBS += -lnl-3 - DRV_LIBS += -lnl-genl-3 -- DRV_CFLAGS += -DCONFIG_LIBNL20 -I/usr/include/libnl3 -+ DRV_CFLAGS += -DCONFIG_LIBNL20 `pkg-config --cflags libnl-3.0` - else - ifdef CONFIG_LIBNL_TINY - DRV_LIBS += -lnl-tiny - diff --git a/pkgs/os-specific/linux/x86info/default.nix b/pkgs/os-specific/linux/x86info/default.nix index eaec63f98bfc..54bd33cc92fd 100644 --- a/pkgs/os-specific/linux/x86info/default.nix +++ b/pkgs/os-specific/linux/x86info/default.nix @@ -9,7 +9,12 @@ stdenv.mkDerivation rec { sha256 = "0a4lzka46nabpsrg3n7akwr46q38f96zfszd73xcback1s2hjc7y"; }; - preConfigure = "patchShebangs ."; + preConfigure = '' + patchShebangs . + + # ignore warnings + sed -i 's/-Werror -Wall//' Makefile + ''; buildInputs = [ pciutils python ]; diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix index 4d5f585e7d7b..2d3dc4888a3a 100644 --- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix +++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix @@ -3,11 +3,11 @@ , ncurses, pkgconfig, randrproto, xorgserver, xproto, udev, libXinerama, pixman }: stdenv.mkDerivation rec { - name = "xf86-input-wacom-0.26.1"; + name = "xf86-input-wacom-0.27.0"; src = fetchurl { url = "mirror://sourceforge/linuxwacom/${name}.tar.bz2"; - sha256 = "1qlls71k10igjx9c5lwqa6cdl31ncpdkzirpl85acpmqbqc63qh8"; + sha256 = "0hpc0waa91d34h2fw1sjhxzn2xya51627jrps9rw4a2zb5hh6a6i"; }; buildInputs = [ inputproto libX11 libXext libXi libXrandr libXrender diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 0242c586cea5..a5b8429c03a0 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -8,7 +8,11 @@ stdenv.mkDerivation { sha256 = "06rrip9fxn13x6qnyp6br68r9pcygb95lld25hnnj88m2vagvg19"; }; - patches = [ ./mount_zfs_prefix.patch ./nix-build.patch ]; + patches = [ + ./mount_zfs_prefix.patch + ./nix-build.patch # Remove in >=0.6.4 + ./remove-lock-checks.patch # Remove in >=0.6.4 + ]; buildInputs = [ spl perl autoconf automake libtool zlib libuuid coreutils ]; @@ -16,34 +20,53 @@ stdenv.mkDerivation { NIX_CFLAGS_LINK = "-lgcc_s"; preConfigure = '' - ./autogen.sh + substituteInPlace ./module/zfs/zfs_ctldir.c --replace "umount -t zfs" "${utillinux}/bin/umount -t zfs" + substituteInPlace ./module/zfs/zfs_ctldir.c --replace "mount -t zfs" "${utillinux}/bin/mount -t zfs" + substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/umount" "${utillinux}/bin/umount" + substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/mount" "${utillinux}/bin/mount" + substituteInPlace ./udev/rules.d/* --replace "/lib/udev/vdev_id" "$out/lib/udev/vdev_id" + substituteInPlace ./cmd/ztest/ztest.c --replace "/usr/sbin/ztest" "$out/sbin/ztest" + substituteInPlace ./cmd/ztest/ztest.c --replace "/usr/sbin/zdb" "$out/sbin/zdb" + substituteInPlace ./config/user-systemd.m4 --replace "/usr/lib/modules-load.d" "$out/etc/modules-load.d" + substituteInPlace ./config/zfs-build.m4 --replace "\$sysconfdir/init.d" "$out/etc/init.d" + substituteInPlace ./etc/zfs/Makefile.am --replace "\$(sysconfdir)" "$out/etc" + substituteInPlace ./cmd/zed/Makefile.am --replace "\$(sysconfdir)" "$out/etc" - substituteInPlace ./module/zfs/zfs_ctldir.c --replace "umount -t zfs" "${utillinux}/bin/umount -t zfs" - substituteInPlace ./module/zfs/zfs_ctldir.c --replace "mount -t zfs" "${utillinux}/bin/mount -t zfs" - substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/umount" "${utillinux}/bin/umount" - substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/mount" "${utillinux}/bin/mount" - substituteInPlace ./udev/rules.d/* --replace "/lib/udev/vdev_id" "$out/lib/udev/vdev_id" - substituteInPlace ./cmd/ztest/ztest.c --replace "/usr/sbin/ztest" "$out/sbin/ztest" - substituteInPlace ./cmd/ztest/ztest.c --replace "/usr/sbin/zdb" "$out/sbin/zdb" + ./autogen.sh ''; configureFlags = [ - "--disable-systemd" + "--enable-systemd" "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source" "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "--with-spl=${spl}/libexec/spl" "--with-dracutdir=$(out)/lib/dracut" "--with-udevdir=$(out)/lib/udev" + "--with-systemdunitdir=$(out)/etc/systemd/system" + "--with-systemdpresetdir=$(out)/etc/systemd/system-preset" + "--sysconfdir=/etc" + "--localstatedir=/var" ]; enableParallelBuilding = true; + # Remove provided services as they are buggy + postInstall = '' + rm $out/etc/systemd/system/zfs-import-*.service + + sed -i '/zfs-import-scan.service/d' $out/etc/systemd/system/* + + for i in $out/etc/systemd/system/*; do + substituteInPlace $i --replace "zfs-import-cache.service" "zfs-import.target" + done + ''; + meta = { description = "ZFS Filesystem Linux Kernel module"; longDescription = '' ZFS is a filesystem that combines a logical volume manager with a Copy-On-Write filesystem with data integrity detection and repair, - snapshotting, cloning, block devices, deduplication, and more. + snapshotting, cloning, block devices, deduplication, and more. ''; homepage = http://zfsonlinux.org/; license = stdenv.lib.licenses.cddl; diff --git a/pkgs/os-specific/linux/zfs/git.nix b/pkgs/os-specific/linux/zfs/git.nix index e88cb9d6130a..e5002bbbb3f3 100644 --- a/pkgs/os-specific/linux/zfs/git.nix +++ b/pkgs/os-specific/linux/zfs/git.nix @@ -17,28 +17,47 @@ stdenv.mkDerivation { NIX_CFLAGS_LINK = "-lgcc_s"; preConfigure = '' - ./autogen.sh + substituteInPlace ./module/zfs/zfs_ctldir.c --replace "umount -t zfs" "${utillinux}/bin/umount -t zfs" + substituteInPlace ./module/zfs/zfs_ctldir.c --replace "mount -t zfs" "${utillinux}/bin/mount -t zfs" + substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/umount" "${utillinux}/bin/umount" + substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/mount" "${utillinux}/bin/mount" + substituteInPlace ./udev/rules.d/* --replace "/lib/udev/vdev_id" "$out/lib/udev/vdev_id" + substituteInPlace ./cmd/ztest/ztest.c --replace "/usr/sbin/ztest" "$out/sbin/ztest" + substituteInPlace ./cmd/ztest/ztest.c --replace "/usr/sbin/zdb" "$out/sbin/zdb" + substituteInPlace ./config/user-systemd.m4 --replace "/usr/lib/modules-load.d" "$out/etc/modules-load.d" + substituteInPlace ./config/zfs-build.m4 --replace "\$sysconfdir/init.d" "$out/etc/init.d" + substituteInPlace ./etc/zfs/Makefile.am --replace "\$(sysconfdir)" "$out/etc" + substituteInPlace ./cmd/zed/Makefile.am --replace "\$(sysconfdir)" "$out/etc" - substituteInPlace ./module/zfs/zfs_ctldir.c --replace "umount -t zfs" "${utillinux}/bin/umount -t zfs" - substituteInPlace ./module/zfs/zfs_ctldir.c --replace "mount -t zfs" "${utillinux}/bin/mount -t zfs" - substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/umount" "${utillinux}/bin/umount" - substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/mount" "${utillinux}/bin/mount" - substituteInPlace ./udev/rules.d/* --replace "/lib/udev/vdev_id" "$out/lib/udev/vdev_id" - substituteInPlace ./cmd/ztest/ztest.c --replace "/usr/sbin/ztest" "$out/sbin/ztest" - substituteInPlace ./cmd/ztest/ztest.c --replace "/usr/sbin/zdb" "$out/sbin/zdb" + ./autogen.sh ''; configureFlags = [ - "--disable-systemd" + "--enable-systemd" "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source" "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "--with-spl=${spl_git}/libexec/spl" "--with-dracutdir=$(out)/lib/dracut" "--with-udevdir=$(out)/lib/udev" + "--with-systemdunitdir=$(out)/etc/systemd/system" + "--with-systemdpresetdir=$(out)/etc/systemd/system-preset" + "--sysconfdir=/etc" + "--localstatedir=/var" ]; enableParallelBuilding = true; + # Remove provided services as they are buggy + postInstall = '' + rm $out/etc/systemd/system/zfs-import-*.service + + sed -i '/zfs-import-scan.service/d' $out/etc/systemd/system/* + + for i in $out/etc/systemd/system/*; do + substituteInPlace $i --replace "zfs-import-cache.service" "zfs-import.target" + done + ''; + meta = { description = "ZFS Filesystem Linux Kernel module"; longDescription = '' diff --git a/pkgs/os-specific/linux/zfs/remove-lock-checks.patch b/pkgs/os-specific/linux/zfs/remove-lock-checks.patch new file mode 100644 index 000000000000..1261b49ee1d4 --- /dev/null +++ b/pkgs/os-specific/linux/zfs/remove-lock-checks.patch @@ -0,0 +1,64 @@ +diff --git a/module/zfs/zfs_vnops.c b/module/zfs/zfs_vnops.c +index 33f9e0e..2f55e56 100644 +--- a/module/zfs/zfs_vnops.c ++++ b/module/zfs/zfs_vnops.c +@@ -474,15 +474,6 @@ zfs_read(struct inode *ip, uio_t *uio, int ioflag, cred_t *cr) + } + + /* +- * Check for mandatory locks +- */ +- if (mandatory_lock(ip) && +- !lock_may_read(ip, uio->uio_loffset, uio->uio_resid)) { +- ZFS_EXIT(zsb); +- return (SET_ERROR(EAGAIN)); +- } +- +- /* + * If we're in FRSYNC mode, sync out this znode before reading it. + */ + if (ioflag & FRSYNC || zsb->z_os->os_sync == ZFS_SYNC_ALWAYS) +@@ -651,15 +642,6 @@ zfs_write(struct inode *ip, uio_t *uio, int ioflag, cred_t *cr) + } + + /* +- * Check for mandatory locks before calling zfs_range_lock() +- * in order to prevent a deadlock with locks set via fcntl(). +- */ +- if (mandatory_lock(ip) && !lock_may_write(ip, woff, n)) { +- ZFS_EXIT(zsb); +- return (SET_ERROR(EAGAIN)); +- } +- +- /* + * Pre-fault the pages to ensure slow (eg NFS) pages + * don't hold up txg. + * Skip this if uio contains loaned arc_buf. +diff --git a/module/zfs/zfs_znode.c b/module/zfs/zfs_znode.c +index 90dbfd3..f02c021 100644 +--- a/module/zfs/zfs_znode.c ++++ b/module/zfs/zfs_znode.c +@@ -1546,7 +1546,6 @@ zfs_trunc(znode_t *zp, uint64_t end) + int + zfs_freesp(znode_t *zp, uint64_t off, uint64_t len, int flag, boolean_t log) + { +- struct inode *ip = ZTOI(zp); + dmu_tx_t *tx; + zfs_sb_t *zsb = ZTOZSB(zp); + zilog_t *zilog = zsb->z_log; +@@ -1567,15 +1566,6 @@ zfs_freesp(znode_t *zp, uint64_t off, uint64_t len, int flag, boolean_t log) + goto out; + } + +- /* +- * Check for any locks in the region to be freed. +- */ +- if (ip->i_flock && mandatory_lock(ip)) { +- uint64_t length = (len ? len : zp->z_size - off); +- if (!lock_may_write(ip, off, length)) +- return (SET_ERROR(EAGAIN)); +- } +- + if (len == 0) { + error = zfs_trunc(zp, off); + } else { diff --git a/pkgs/servers/amqp/qpid-cpp/default.nix b/pkgs/servers/amqp/qpid-cpp/default.nix index 6a71994091d0..69c0a3dff41c 100644 --- a/pkgs/servers/amqp/qpid-cpp/default.nix +++ b/pkgs/servers/amqp/qpid-cpp/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1c03yi19d5h5h78h37add9csmy0mzvvmvn7zkcalwszabdhsb5yk"; }; - buildInputs = [ cmake python boost boost.lib libuuid ruby ]; + buildInputs = [ cmake python boost libuuid ruby ]; # the subdir managementgen wants to install python stuff in ${python} and # the installation tries to create some folders in /var diff --git a/pkgs/servers/beanstalkd/default.nix b/pkgs/servers/beanstalkd/default.nix index 264e6ff749a5..cea7ca0b337f 100644 --- a/pkgs/servers/beanstalkd/default.nix +++ b/pkgs/servers/beanstalkd/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://kr.github.io/beanstalkd/; - description = "Beanstalk is a simple, fast work queue."; + description = "A simple, fast work queue"; license = licenses.mit; maintainers = [ maintainers.zimbatm ]; platforms = platforms.all; diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix index 9b9655053693..9b17551a8cbb 100644 --- a/pkgs/servers/bird/default.nix +++ b/pkgs/servers/bird/default.nix @@ -1,19 +1,20 @@ { stdenv, fetchurl, flex, bison, readline }: stdenv.mkDerivation rec { - name = "bird-1.4.4"; + name = "bird-1.4.5"; src = fetchurl { url = "ftp://bird.network.cz/pub/bird/${name}.tar.gz"; - sha256 = "0dh14zi3v1j0iwxxcyfymfdyaxxmilfbf3bc4mwj682jb3x6ll7g"; + sha256 = "1z4z7zmx3054zxi4q6a7095s267mw8ky628gir2n5xy5ch65yj7z"; }; buildInputs = [ flex bison readline ]; meta = { - description = ""; + description = "BIRD Internet Routing Daemon"; homepage = http://bird.network.cz; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/servers/brickd/default.nix b/pkgs/servers/brickd/default.nix new file mode 100644 index 000000000000..a99c8c5a6f95 --- /dev/null +++ b/pkgs/servers/brickd/default.nix @@ -0,0 +1,60 @@ +{ stdenv, fetchgit, libusb, pkgconfig, pmutils, udev} : + +let + +version = "2.1.1"; +daemonlib = fetchgit { + url = "https://github.com/Tinkerforge/daemonlib.git"; + rev = "refs/tags/brickd-${version}"; + sha256 = "097kaz7d0rzg0ijvcna3y620k3m5fgxpqsac5gbhah8pd7vlj1a4"; + }; + +in + +stdenv.mkDerivation rec { + name = "brickd-${version}"; + + src = fetchgit { + url = "git://github.com/Tinkerforge/brickd.git"; + rev = "refs/tags/v${version}"; + sha256 = "08g587bgx628g5vykh482wxiw0z98fmq4lf5ka6aw0v8l9gim9yf"; + }; + + buildInputs = [ libusb pkgconfig pmutils udev ]; + + # shell thing didn't work so i replaced it using nix + prePatch = '' + substituteInPlace src/brickd/Makefile --replace 'PKG_CONFIG := $(shell which pkg-config 2> /dev/null)' "PKG_CONFIG := $pkgconfig/bin/pkg_config"; + ''; + + buildPhase = '' + export + # build the brickd binary + mkdir src/daemonlib + cp -r ${daemonlib}/* src/daemonlib + cd src/brickd + make + + # build and execute the unit tests + cd ../tests + make + for i in array_test base58_test node_test putenv_test queue_test sha1_test; do + echo "running unit test $i:" + ./$i + done + ''; + + installPhase = '' + cd ../brickd + mkdir -p $out/bin + cp brickd $out/bin/brickd + ''; + + meta = { + homepage = http://www.tinkerforge.com/; + description = "A daemon (or service on Windows) that acts as a bridge between the Bricks/Bricklets and the API bindings for the different programming languages"; + maintainers = [ stdenv.lib.maintainers.qknight ]; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/servers/computing/storm/default.nix b/pkgs/servers/computing/storm/default.nix index 88837f9bb427..cab91409654d 100644 --- a/pkgs/servers/computing/storm/default.nix +++ b/pkgs/servers/computing/storm/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { meta = { homepage = "http://storm-project.net"; description = "Distributed realtime computation system"; - license = "Eclipse Public License 1.0"; + license = stdenv.lib.licenses.epl10; maintainers = [ lib.maintainers.vizanto ]; }; } diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index 9244ee2f2cf5..49a3dac14ea4 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ , ruby, rubyLibs, nodejs }: let - version = "0.4.0"; + version = "0.4.1"; in with lib; diff --git a/pkgs/servers/consul/deps.nix b/pkgs/servers/consul/deps.nix index c6e7cb735fe5..fcfc3e911ec8 100644 --- a/pkgs/servers/consul/deps.nix +++ b/pkgs/servers/consul/deps.nix @@ -16,8 +16,8 @@ let src = fetchFromGitHub { owner = "armon"; repo = "consul-api"; - rev = "045662de1042be0662fe4a1e21b57c8f7669261a"; - sha256 = "1cdf9mpfa97qwzc0nz0788d97xmwh08dsvqmkmijrdm2a6c07q1r"; + rev = "1b81c8e0c4cbf1d382310e4c0dc11221632e79d1"; + sha256 = "0fgawc1si0hn41kfr9sq351jccy8y5ac83l437vnshj60i9q9s6w"; }; } { @@ -52,8 +52,8 @@ let src = fetchFromGitHub { owner = "hashicorp"; repo = "consul"; - rev = "e1d87dee26c05cea64342fadd2a728894b764aec"; - sha256 = "0y05pjvvxlamf74s15pcgv48xyd6116m5lyyd7jkh28lb3l2fykf"; + rev = "v0.4.1"; + sha256 = "0fqrhmzi0jbbwylv7c1l0ywqr67aqlv6s891f4inp0y4abd7shc7"; }; } { @@ -66,6 +66,15 @@ let }; } { + root = "github.com/hashicorp/go-msgpack"; + src = fetchFromGitHub { + owner = "hashicorp"; + repo = "go-msgpack"; + rev = "71c2886f5a673a35f909803f38ece5810165097b"; + sha256 = "157f24xnkhclrjwwa1b7lmpj112ynlbf7g1cfw0c657iqny5720j"; + }; + } + { root = "github.com/hashicorp/go-syslog"; src = fetchFromGitHub { owner = "hashicorp"; @@ -79,8 +88,8 @@ let src = fetchFromGitHub { owner = "hashicorp"; repo = "golang-lru"; - rev = "4dfff096c4973178c8f35cf6dd1a732a0a139370"; - sha256 = "16x78183xzk9bjn7il71l3mff3rqjwc88q9fpbj5i65kvl5ws9di"; + rev = "253b2dc1ca8bae42c3b5b6e53dd2eab1a7551116"; + sha256 = "01vdya86x4fylzwapnz6p3wkb8y17sfvbss656sixc37iirrhqr2"; }; } { @@ -88,8 +97,8 @@ let src = fetchFromGitHub { owner = "hashicorp"; repo = "hcl"; - rev = "9b5d9eb9b09475889ae49a4a613c60280875b3d1"; - sha256 = "02x5by78a3bblzqnhl9dm98wz61h0vkk1wcw7mx6480a7qj5jx3m"; + rev = "e51eabcdf801f663738fa12f4340fbad13062738"; + sha256 = "09d047lg6py9waqd6zwb0c9id8hya4xv2cg7yi9jbx8kwq31s75l"; }; } { @@ -97,8 +106,8 @@ let src = fetchFromGitHub { owner = "hashicorp"; repo = "logutils"; - rev = "8e0820fe7ac5eb2b01626b1d99df47c5449eb2d8"; - sha256 = "033rbkc066g657r0dnzysigjz2bs4biiz0kmiypd139d34jvslwz"; + rev = "23b0af5510a2d1442103ef83ffcf53eb82f3debc"; + sha256 = "018bfknmc2qdk0br1ri6dgd45sx308j3qd77sxnzxsyaivw1mm0d"; }; } { @@ -106,8 +115,8 @@ let src = fetchFromGitHub { owner = "hashicorp"; repo = "memberlist"; - rev = "def5afe3702fce72d72922fb44ef2b8e5608b205"; - sha256 = "1ch8c160nkqb79ql59vgpnf9kfq2v38xjrprvfv4hmnpmf6yx6i2"; + rev = "16d947e2d4b3f1fe508ee1d9b6ec34b8fd2e96d8"; + sha256 = "0xagvyyfl37r0n6s67m1dmrahaxf4gprnfkm12x9jcpp5rbq7jjq"; }; } { @@ -115,8 +124,8 @@ let src = fetchFromGitHub { owner = "hashicorp"; repo = "raft"; - rev = "35f5fa082f5a064595d84715b0cf8821f002e9ac"; - sha256 = "0s5qhs19n0rxdhsxw77q5sjw4hrkfggxz3w0p3szcd8rsnpfswkg"; + rev = "cc9710ab540985954a67c108f414aa3152f5916f"; + sha256 = "1v4hib68gaicaqcx3iyclxbp5p3g750rayh8f35sh5fwbklqw1qi"; }; } { @@ -124,8 +133,8 @@ let src = fetchFromGitHub { owner = "hashicorp"; repo = "raft-mdb"; - rev = "95d26447c3c54581de2bb102ecc3344079b234bd"; - sha256 = "1fqf7s2snzbjzxy1k04wdfkqsrxddp6iz72b9hxz9jmgx3l7nl2z"; + rev = "6f52d0ce62a34e3f5bd29aa4d7068030d700d94a"; + sha256 = "0pchi88ib7nzz6rdc91dpxq1k3q2021m8245v0yqh0ilbvvvyj7i"; }; } { @@ -142,8 +151,8 @@ let src = fetchFromGitHub { owner = "hashicorp"; repo = "terraform"; - rev = "v0.2.2"; - sha256 = "05hy9vq8b05nxbmm277ll6p7ncjhxifnqii8y1dralz5x3cw27r3"; + rev = "v0.3.1"; + sha256 = "0z6r9dbqrzxaw4b1vbr14ci85jgz6qrq8p36ylcyabzfvwbxrl1m"; }; } { @@ -151,8 +160,8 @@ let src = fetchFromGitHub { owner = "hashicorp"; repo = "yamux"; - rev = "35417c7dfab4085d7c921b33e4d5ea6cf9ceef65"; - sha256 = "02pk30dgjmp0zz5g3dcll6lf7izmpfh6fw2rp13al7771vaziqyl"; + rev = "9feabe6854fadca1abec9cd3bd2a613fe9a34000"; + sha256 = "03lgbhwhiqk6rivc5cl6zxph5n2pdbdz95h0x7m0ngp3yk3aqgan"; }; } { @@ -169,8 +178,8 @@ let src = fetchFromGitHub { owner = "miekg"; repo = "dns"; - rev = "5cdb7e11a3f60c88cf2dbce42866e7b42c74b394"; - sha256 = "0glzs9r2i5vrncb3skdl987mdzqj2w86fqr5aj64lqgp7ghwj6hw"; + rev = "dc30c7cd4ed2fc8af73d49da4ee285404958b8bd"; + sha256 = "1pqdgjz0qwbbfgya2brsvhj88jp6rmprjwzgjsjnnv9nxwfsbb5s"; }; } { @@ -178,8 +187,8 @@ let src = fetchFromGitHub { owner = "mitchellh"; repo = "cli"; - rev = "bfacda5ba006a32b10ddfe2abad56c11661573eb"; - sha256 = "0lzvsya04nh7m804azanhs28vsk4g8knw3yay2yx4wffikbkjbgk"; + rev = "e3c2e3d39391e9beb9660ccd6b4bd9a2f38dd8a0"; + sha256 = "1fwf7wmlhri19bl2yyjd4zlgndgwwqrdry45clpszzjsr8b5wfgm"; }; } { @@ -205,8 +214,8 @@ let src = fetchFromGitHub { owner = "ugorji"; repo = "go"; - rev = "e906e395b9d45d3230e800c8ad1f92f99764e753"; - sha256 = "0dqzbxa4ziw10sa5ksl8sfzm0rhrddp6gs732zs9bjkq4rl50j89"; + rev = "a7f0616e8cd41d08149bec05c87524abe4e0520e"; + sha256 = "1sxbsvfb46gp6jpb8wy9z6329g2zzbm07xnzml627dsvwdcxvy4q"; }; } ]; diff --git a/pkgs/servers/corosync/default.nix b/pkgs/servers/corosync/default.nix new file mode 100644 index 000000000000..f4ceca5f386d --- /dev/null +++ b/pkgs/servers/corosync/default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchurl, makeWrapper, pkgconfig, nss, nspr, libqb +, dbus ? null +, librdmacm ? null, libibverbs ? null +, libstatgrab ? null +, net_snmp ? null +}: + +with stdenv.lib; +stdenv.mkDerivation rec { + name = "corosync-2.3.4"; + + src = fetchurl { + url = "http://build.clusterlabs.org/corosync/releases/${name}.tar.gz"; + sha256 = "1m276b060fjghr93hdzfag81whi5ph65dc2ka8ln1igm3kxr7bix"; + }; + + buildInputs = [ + makeWrapper pkgconfig nss nspr libqb + dbus librdmacm libibverbs libstatgrab net_snmp + ]; + + # Remove when rdma libraries gain pkgconfig support + ibverbs_CFLAGS = optionalString (libibverbs != null) + "-I${libibverbs}/include/infiniband"; + ibverbs_LIBS = optionalString (libibverbs != null) "-libverbs"; + rdmacm_CFLAGS = optionalString (librdmacm != null) + "-I${librdmacm}/include/rdma"; + rdmacm_LIBS = optionalString (librdmacm != null) "-lrdmacm"; + + configureFlags = [ + "--enable-watchdog" + "--enable-qdevices" + ] ++ optional (dbus != null) "--enable-dbus" + ++ optional (librdmacm != null && libibverbs != null) "--enable-rdma" + ++ optional (libstatgrab != null) "--enable-monitoring" + ++ optional (net_snmp != null) "--enable-snmp"; + + postInstall = '' + wrapProgram $out/bin/corosync-blackbox \ + --prefix PATH ":" "$out/sbin:${libqb}/sbin" + ''; + + meta = { + homepage = http://corosync.org/; + description = "A Group Communication System with features for implementing high availability within applications"; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix index 8b4903c86022..ea91993e7231 100644 --- a/pkgs/servers/etcd/default.nix +++ b/pkgs/servers/etcd/default.nix @@ -1,11 +1,11 @@ { stdenv, lib, go, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "0.4.3"; + version = "0.5.0-alpha.4"; name = "etcd-${version}"; src = import ./deps.nix { - inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub; + inherit stdenv lib fetchFromGitHub; }; buildInputs = [ go ]; diff --git a/pkgs/servers/etcd/deps.nix b/pkgs/servers/etcd/deps.nix index e9fd4a50d3e0..1cd8309ad5d0 100644 --- a/pkgs/servers/etcd/deps.nix +++ b/pkgs/servers/etcd/deps.nix @@ -1,4 +1,5 @@ -{ stdenv, lib, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: +# This file was generated by go2nix. +{ stdenv, lib, fetchFromGitHub }: let goDeps = [ @@ -7,35 +8,8 @@ let src = fetchFromGitHub { owner = "coreos"; repo = "etcd"; - rev = "9970141f76241c909977af7bafe7b6f2c4923de8"; - sha256 = "1bva46gfy4rkfw8k8pb3lsfzfg16csds01f0nvfrkh99pr7sp0sy"; - }; - } - { - root = "github.com/stathat/go"; - src = fetchFromGitHub { - owner = "stathat"; - repo = "go"; - rev = "01d012b9ee2ecc107cb28b6dd32d9019ed5c1d77"; - sha256 = "0mrn70wjfcs4rfkmga3hbfqmbjk33skcsc8pyqxp02bzpwdpc4bi"; - }; - } - { - root = "github.com/stretchr/objx"; - src = fetchFromGitHub { - owner = "stretchr"; - repo = "objx"; - rev = "cbeaeb16a013161a98496fad62933b1d21786672"; - sha256 = "1xn7iibjik77h6h0jilfvcjkkzaqz45baf44p3rb2i03hbmkqkp1"; - }; - } - { - root = "github.com/stretchr/testify"; - src = fetchFromGitHub { - owner = "stretchr"; - repo = "testify"; - rev = "3e03dde72495487a4deb74152ac205d0619fbc8d"; - sha256 = "1xd9sbi6y68cfwkxgybcz0dbfx4r6jmxq51wjj6six3wm9p7m8ls"; + rev = "d01d6119e54f729f54e9776ad5729277fcf38668"; + sha256 = "0h9d6rc8yx7vyv2ggvzsddyng03pjhyb7avm9wrc805qr7p8nhns"; }; } ]; diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix index 62fbd3337f7a..17325ccb2914 100644 --- a/pkgs/servers/gpsd/default.nix +++ b/pkgs/servers/gpsd/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { buildPhase = '' patchShebangs . mkdir -p "$out" - sed -e "s|python_lib_dir = .*|python_lib_dir = \"$out/lib/${pythonFull.python.libPrefix}/site-packages\"|" -i SConstruct + sed -e "s|python_lib_dir = .*|python_lib_dir = \"$out/lib/${pythonFull.libPrefix}/site-packages\"|" -i SConstruct scons prefix="$out" leapfetch=no gpsd_user=${gpsdUser} gpsd_group=${gpsdGroup} \ systemd=yes udevdir="$out/lib/udev" chrpath=no ''; diff --git a/pkgs/servers/hbase/default.nix b/pkgs/servers/hbase/default.nix new file mode 100644 index 000000000000..de5be18713ed --- /dev/null +++ b/pkgs/servers/hbase/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, jre, makeWrapper }: +stdenv.mkDerivation { + name = "hbase-0.98.8"; + src = fetchurl { + url = http://mirror.gopotato.co.uk/apache/hbase/stable/hbase-0.98.8-hadoop2-bin.tar.gz; + sha256 = "0nvxaqpw8v2hg6mn2p2zxj3y6r4dj4xzxmp8rfmv6m6algn5apv6"; + }; + buildInputs = [ makeWrapper ]; + installPhase = '' + mkdir -p $out + cp -R * $out + ''; + meta = with stdenv.lib; { + description = "A distributed, scalable, big data store"; + homepage = https://hbase.apache.org; + license = licenses.asl20; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/servers/http/apache-httpd/2.2.nix b/pkgs/servers/http/apache-httpd/2.2.nix index eb9c6846089c..2af7b761c24a 100644 --- a/pkgs/servers/http/apache-httpd/2.2.nix +++ b/pkgs/servers/http/apache-httpd/2.2.nix @@ -40,6 +40,10 @@ stdenv.mkDerivation rec { ${if sslSupport then "--enable-ssl --with-ssl=${openssl}" else ""} ${if ldapSupport then "--enable-ldap --enable-authnz-ldap" else ""} --with-mpm=${mpm} + --enable-cache + --enable-disk-cache + --enable-file-cache + --enable-mem-cache ''; enableParallelBuilding = true; diff --git a/pkgs/servers/http/apache-modules/mod_evasive/default.nix b/pkgs/servers/http/apache-modules/mod_evasive/default.nix index 129f44ab502f..c89e4100d38b 100644 --- a/pkgs/servers/http/apache-modules/mod_evasive/default.nix +++ b/pkgs/servers/http/apache-modules/mod_evasive/default.nix @@ -1,4 +1,10 @@ -{ stdenv, fetchurl, apacheHttpd }: +{ lib, stdenv, fetchurl, apacheHttpd }: + +if lib.versionAtLeast (lib.getVersion apacheHttpd) "2.4" then + + throw "mod_evasive is not supported on Apache httpd 2.4" + +else stdenv.mkDerivation { name = "mod_evasive-1.10.1"; diff --git a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix index 5fdf74551723..e70c3105408f 100644 --- a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix @@ -1,13 +1,21 @@ { stdenv, fetchurl, apacheHttpd }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "mod_fastcgi-2.4.6"; src = fetchurl { - url = "http://www.fastcgi.com/dist/mod_fastcgi-2.4.6.tar.gz"; + url = "http://www.fastcgi.com/dist/${name}.tar.gz"; sha256 = "12g6vcfl9jl8rqf8lzrkdxg2ngca310d3d6an563xqcgrkp8ga55"; }; + patches = + [ (fetchurl { + name = "compile-against-apache24.diff"; + url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/compile-against-apache24.diff?h=packages/mod_fastcgi&id=81c7cb99d15682df3bdb1edcaeea5259e9e43a42"; + sha256 = "000qvrf5jb979i37rimrdivcgjijcffgrpkx38c0rn62z9jz61g4"; + }) + ]; + buildInputs = [ apacheHttpd ]; preBuild = '' diff --git a/pkgs/servers/http/apache-modules/mod_python/default.nix b/pkgs/servers/http/apache-modules/mod_python/default.nix index b36327ff5205..08f5d7456840 100644 --- a/pkgs/servers/http/apache-modules/mod_python/default.nix +++ b/pkgs/servers/http/apache-modules/mod_python/default.nix @@ -1,29 +1,26 @@ -{stdenv, fetchurl, apacheHttpd, python}: +{ stdenv, fetchurl, apacheHttpd, python }: -stdenv.mkDerivation { - name = "mod_python-3.3.1"; +stdenv.mkDerivation rec { + name = "mod_python-3.5.0"; src = fetchurl { - url = mirror://apache/httpd/modpython/mod_python-3.3.1.tgz; - sha256 = "0sss2xi6l1a2z8y6ji0cp8vgyvnhq8zrg0ilkvpj1mygbzyk28xd"; + url = "http://dist.modpython.org/dist/${name}.tgz"; + sha256 = "146apll3yfqk05s8fkf4acmxzqncl08bgn4rv0c1rd4qxmc91w0f"; }; - patches = [ - ./install.patch - - # See http://bugs.gentoo.org/show_bug.cgi?id=230211 - (fetchurl { - url = "http://bugs.gentoo.org/attachment.cgi?id=160400"; - sha256 = "0yx6x9c5rg5kn6y8vsi4xj3nvg016rrfk553ca1bw796v383xkyj"; - }) - ]; + patches = [ ./install.patch ]; preInstall = '' installFlags="LIBEXECDIR=$out/modules $installFlags" - mkdir -p $out/modules + mkdir -p $out/modules $out/bin ''; passthru = { inherit apacheHttpd; }; - - buildInputs = [apacheHttpd python]; + + buildInputs = [ apacheHttpd python ]; + + meta = { + homepage = http://modpython.org/; + description = "An Apache module that embeds the Python interpreter within the server"; + }; } diff --git a/pkgs/servers/http/apache-modules/mod_python/install.patch b/pkgs/servers/http/apache-modules/mod_python/install.patch index 28a36edbc237..29667e11ed8e 100644 --- a/pkgs/servers/http/apache-modules/mod_python/install.patch +++ b/pkgs/servers/http/apache-modules/mod_python/install.patch @@ -1,20 +1,12 @@ -diff -rc mod_python-3.1.4-orig/dist/Makefile.in mod_python-3.1.4/dist/Makefile.in -*** mod_python-3.1.4-orig/dist/Makefile.in 2005-01-29 22:25:28.000000000 +0100 ---- mod_python-3.1.4/dist/Makefile.in 2006-01-15 12:07:40.000000000 +0100 -*************** -*** 34,40 **** - install_py_lib: mod_python src - @cd src; $(MAKE) psp_parser.c - if test -z "$(DESTDIR)" ; then \ -! $(PYTHON_BIN) setup.py install --optimize 2 --force ; \ - else \ - $(PYTHON_BIN) setup.py install --optimize 2 --force --root $(DESTDIR) ; \ - fi ---- 34,40 ---- - install_py_lib: mod_python src - @cd src; $(MAKE) psp_parser.c - if test -z "$(DESTDIR)" ; then \ -! $(PYTHON_BIN) setup.py install --optimize 2 --force --prefix $(out) ; \ - else \ - $(PYTHON_BIN) setup.py install --optimize 2 --force --root $(DESTDIR) ; \ - fi +diff -ru -x '*~' mod_python-3.5.0-orig/dist/Makefile.in mod_python-3.5.0/dist/Makefile.in +--- mod_python-3.5.0-orig/dist/Makefile.in 2013-11-12 04:21:34.000000000 +0100 ++++ mod_python-3.5.0/dist/Makefile.in 2014-11-07 11:28:24.466377733 +0100 +@@ -34,7 +34,7 @@ + install_py_lib: mod_python src + @cd src; $(MAKE) psp_parser.c + if test -z "$(DESTDIR)" ; then \ +- $(PYTHON_BIN) setup.py install --optimize 2 --force ; \ ++ $(PYTHON_BIN) setup.py install --optimize 2 --force --prefix $(out) ; \ + else \ + $(PYTHON_BIN) setup.py install --optimize 2 --force --root $(DESTDIR) ; \ + fi diff --git a/pkgs/servers/http/apache-modules/tomcat-connectors/builder.sh b/pkgs/servers/http/apache-modules/tomcat-connectors/builder.sh deleted file mode 100644 index 52efe537c9bd..000000000000 --- a/pkgs/servers/http/apache-modules/tomcat-connectors/builder.sh +++ /dev/null @@ -1,8 +0,0 @@ -source $stdenv/setup - -tar xfvz $src -cd tomcat-connectors-*-src/native -./configure --with-apxs=$apacheHttpd/bin/apxs --with-java-home=$jdk -make -mkdir -p $out/modules -cp apache-2.0/mod_jk.so $out/modules diff --git a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix index 7f764ef5ebcc..0e908acd74b3 100644 --- a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix +++ b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix @@ -1,14 +1,21 @@ -{stdenv, fetchurl, apacheHttpd, jdk}: +{ stdenv, fetchurl, apacheHttpd, jdk }: -stdenv.mkDerivation { - name = "tomcat-connectors-1.2.32"; - builder = ./builder.sh; +stdenv.mkDerivation rec { + name = "tomcat-connectors-1.2.40"; src = fetchurl { - url = http://archive.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.32-src.tar.gz; - sha256 = "1dim62warzy1hqvc7cvnqsbq475sr6vpgwd6gfmddmkgw155saji"; + url = "http://www.apache.si/tomcat/tomcat-connectors/jk/${name}-src.tar.gz"; + sha256 = "0pbh6s19ba5k2kahiiqgx8lz8v4fjllzn0w6hjd08x7z9my38pl9"; }; - inherit apacheHttpd; - buildInputs = [apacheHttpd jdk]; + configureFlags = "--with-apxs=${apacheHttpd}/bin/apxs --with-java-home=${jdk}"; + + sourceRoot = "${name}-src/native"; + + installPhase = '' + mkdir -p $out/modules + cp apache-2.0/mod_jk.so $out/modules + ''; + + buildInputs = [ apacheHttpd jdk ]; } diff --git a/pkgs/servers/http/couchdb/default.nix b/pkgs/servers/http/couchdb/default.nix index 0b5244a5974f..0e7146175446 100644 --- a/pkgs/servers/http/couchdb/default.nix +++ b/pkgs/servers/http/couchdb/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "couchdb-${version}"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { url = "mirror://apache/couchdb/source/${version}/apache-${name}.tar.gz"; - sha256 = "0m4k7i3gibzzcabssysv42rmdr89myppc6765xr0jggwkwdxgxmx"; + sha256 = "09w6ijj9l5jzh81nvc3hrlqp345ajg3haj353g9kxkik6wbinq2s"; }; buildInputs = [ erlang icu openssl spidermonkey curl help2man sphinx which diff --git a/pkgs/servers/http/jetty/9.2.nix b/pkgs/servers/http/jetty/9.2.nix new file mode 100644 index 000000000000..41afc9b40af8 --- /dev/null +++ b/pkgs/servers/http/jetty/9.2.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "jetty-9.2.5"; + + src = fetchurl { + url = "http://eclipse.org/downloads/download.php?file=/jetty/stable-9/dist/jetty-distribution-9.2.5.v20141112.tar.gz&r=1"; + name = "jetty-distribution-9.2.5.v20141112.tar.gz"; + sha256 = "1azqhvvqm9il5n07vms5vv27vr3qhmsy44nmqcgsaggq7p37swf1"; + }; + + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + mkdir -p $out + mv etc lib modules start.jar $out + ''; + + meta = { + description = "A Web server and javax.servlet container"; + + homepage = http://www.eclipse.org/jetty/; + + maintainers = [ stdenv.lib.maintainers.shlevy ]; + + platforms = stdenv.lib.platforms.all; + + license = [ stdenv.lib.licenses.asl20 stdenv.lib.licenses.epl10 ]; + }; +} diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix index d9166382be35..f691f362bb24 100644 --- a/pkgs/servers/http/jetty/default.nix +++ b/pkgs/servers/http/jetty/default.nix @@ -8,6 +8,6 @@ stdenv.mkDerivation { src = fetchurl { url = mirror://sourceforge/jetty/jetty-5.1.4.zip; - md5 = "5d16bb1ea4a62dff93c0b7f7de00430f"; + sha256 = "1lzvsrlybrf3zzzv4hi2v82qzpkfkib3xbwwlya8c08gf0360mrk"; }; } diff --git a/pkgs/servers/http/joseki/default.nix b/pkgs/servers/http/joseki/default.nix index f42ae81a700d..59f9fd8624d1 100644 --- a/pkgs/servers/http/joseki/default.nix +++ b/pkgs/servers/http/joseki/default.nix @@ -2,9 +2,9 @@ x@{builderDefsPackage , unzip , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) @@ -47,13 +47,13 @@ rec { phaseNames = ["doDeploy" "fixScripts"]; fixScripts = a.doPatchShebangs ''$TARGET/bin''; - + doDeploy = a.fullDepEntry ('' ${a.lib.concatStringsSep ";" (map (y : "unzip ${y}") tarballFiles)} for i in */; do cp -rTf $i merged; done cd merged - - for i in "lib/"jsp-*/*.jar; do + + for i in "lib/"jsp-*/*.jar; do ln -s "''${i#lib/}" "lib" || true done @@ -67,7 +67,7 @@ rec { ls "lib/"tdb-[0-9]*.jar | sort | tac | tail -n +2 ls "lib/"jetty-[0-9]*.jar | sort | tac | tail -n +2 ls "lib/"jetty-util-[0-9]*.jar | sort | tac | tail -n +2 - ) | + ) | xargs -I @@ mv @@ lib/obsolete mv lib/slf4j-simple-*.jar lib/obsolete @@ -106,8 +106,7 @@ rec { raskin ]; hydraPlatforms = []; # Builder is just unpacking/mixing what is needed - license = "free"; # mix of packages under different licenses + license = a.lib.licenses.free; # mix of packages under different licenses homepage = "http://openjena.org/"; }; }) x - diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix index e5c9b9b9456f..1d2887bcc210 100644 --- a/pkgs/servers/http/nginx/default.nix +++ b/pkgs/servers/http/nginx/default.nix @@ -112,7 +112,7 @@ stdenv.mkDerivation rec { ++ optional (elem stdenv.system (with platforms; linux ++ freebsd)) "--with-file-aio"; - additionalFlags = optionalString stdenv.isDarwin "-Wno-error=deprecated-declarations"; + additionalFlags = optionalString stdenv.isDarwin "-Wno-error=deprecated-declarations -Wno-error=conditional-uninitialized"; preConfigure = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2}/include/libxml2 $additionalFlags" diff --git a/pkgs/servers/http/nginx/unstable.nix b/pkgs/servers/http/nginx/unstable.nix new file mode 100644 index 000000000000..a946672f9a7e --- /dev/null +++ b/pkgs/servers/http/nginx/unstable.nix @@ -0,0 +1,132 @@ +{ stdenv, fetchurl, fetchFromGitHub, openssl, zlib, pcre, libxml2, libxslt, expat +, gd, geoip, luajit +, rtmp ? false +, fullWebDAV ? false +, syslog ? false +, moreheaders ? false +, echo ? false +, ngx_lua ? false }: + +with stdenv.lib; + +let + version = "1.7.7"; + mainSrc = fetchurl { + url = "http://nginx.org/download/nginx-${version}.tar.gz"; + sha256 = "1lmzq36ysi0hwvqpiaz0dpmwvdwbrn9aw1rm1xcabkl2g855l0by"; + }; + + rtmp-ext = fetchFromGitHub { + owner = "arut"; + repo = "nginx-rtmp-module"; + rev = "v1.1.5"; + sha256 = "1d9ws4prxz22yq3nhh5h18jrs331zivrdh784l6wznc1chg3gphn"; + }; + + dav-ext = fetchFromGitHub { + owner = "arut"; + repo = "nginx-dav-ext-module"; + rev = "v0.0.3"; + sha256 = "1qck8jclxddncjad8yv911s9z7lrd58bp96jf13m0iqk54xghx91"; + }; + + syslog-ext = fetchFromGitHub { + owner = "yaoweibin"; + repo = "nginx_syslog_patch"; + rev = "v0.25"; + sha256 = "0734f884838wcjyrrddn8wzj834wid1zffrk093jrx18447cryxl"; + }; + + moreheaders-ext = fetchFromGitHub { + owner = "openresty"; + repo = "headers-more-nginx-module"; + rev = "v0.25"; + sha256 = "1d71y1i0smi4gkzz731fhn58gr03b3s6jz6ipnfzxxaizmgxm3rb"; + }; + + echo-ext = fetchFromGitHub { + owner = "openresty"; + repo = "echo-nginx-module"; + rev = "v0.56"; + sha256 = "03vaf1ffhkj2s089f90h45n079h3zw47h6y5zpk752f4ydiagpgd"; + }; + + develkit-ext = fetchFromGitHub { + owner = "simpl"; + repo = "ngx_devel_kit"; + rev = "v0.2.19"; + sha256 = "1cqcasp4lc6yq5pihfcdw4vp4wicngvdc3nqg3bg52r63c1qrz76"; + }; + + lua-ext = fetchFromGitHub { + owner = "openresty"; + repo = "lua-nginx-module"; + rev = "v0.9.12"; + sha256 = "0r07q1n3nvi7m3l8zk7nfk0z9kjhqknav61ys9lshh2ylsmz1lf4"; + }; + +in + +stdenv.mkDerivation rec { + name = "nginx-${version}"; + src = mainSrc; + + buildInputs = + [ openssl zlib pcre libxml2 libxslt gd geoip + ] ++ optional fullWebDAV expat + ++ optional ngx_lua luajit; + + LUAJIT_LIB = if ngx_lua then "${luajit}/lib" else ""; + LUAJIT_INC = if ngx_lua then "${luajit}/include/luajit-2.0" else ""; + + patches = if syslog then [ "${syslog-ext}/syslog-1.5.6.patch" ] else []; + + configureFlags = [ + "--with-http_ssl_module" + "--with-http_spdy_module" + "--with-http_realip_module" + "--with-http_addition_module" + "--with-http_xslt_module" + "--with-http_image_filter_module" + "--with-http_geoip_module" + "--with-http_sub_module" + "--with-http_dav_module" + "--with-http_flv_module" + "--with-http_mp4_module" + "--with-http_gunzip_module" + "--with-http_gzip_static_module" + "--with-http_auth_request_module" + "--with-http_random_index_module" + "--with-http_secure_link_module" + "--with-http_degradation_module" + "--with-http_stub_status_module" + "--with-ipv6" + # Install destination problems + # "--with-http_perl_module" + ] ++ optional rtmp "--add-module=${rtmp-ext}" + ++ optional fullWebDAV "--add-module=${dav-ext}" + ++ optional syslog "--add-module=${syslog-ext}" + ++ optional moreheaders "--add-module=${moreheaders-ext}" + ++ optional echo "--add-module=${echo-ext}" + ++ optional ngx_lua "--add-module=${develkit-ext} --add-module=${lua-ext}" + ++ optional (elem stdenv.system (with platforms; linux ++ freebsd)) "--with-file-aio"; + + + additionalFlags = optionalString stdenv.isDarwin "-Wno-error=deprecated-declarations"; + + preConfigure = '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2}/include/libxml2 $additionalFlags" + ''; + + postInstall = '' + mv $out/sbin $out/bin + ''; + + meta = { + description = "A reverse proxy and lightweight webserver"; + homepage = http://nginx.org; + license = licenses.bsd2; + platforms = platforms.all; + maintainers = with maintainers; [ thoughtpolice raskin ]; + }; +} diff --git a/pkgs/servers/http/nginx/unstable.upstream b/pkgs/servers/http/nginx/unstable.upstream new file mode 100644 index 000000000000..7bb025499592 --- /dev/null +++ b/pkgs/servers/http/nginx/unstable.upstream @@ -0,0 +1,8 @@ +url http://nginx.org/en/download.html +version_link '.*-([0-9]+[.][0-9]+([.][0-9]+)*)[.]tar[.][a-z0-9]*$' + +do_overwrite() { + ensure_hash + set_var_value version "$CURRENT_VERSION" + set_var_value sha256 "$CURRENT_HASH" +} diff --git a/pkgs/servers/http/thttpd/default.nix b/pkgs/servers/http/thttpd/default.nix index 0bb3d96b37b7..53a7f916c9ac 100644 --- a/pkgs/servers/http/thttpd/default.nix +++ b/pkgs/servers/http/thttpd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "thttpd-${version}"; - version = "2.25b"; + version = "2.26"; src = fetchurl { url = "http://acme.com/software/thttpd/${name}.tar.gz"; - sha256 = "0q13sfkh6amn5wk0ccbmxq3mnhlm8g5pnyk910fa5xngn449nw87"; + sha256 = "1dybhpyfrly0m285cdn9jah397bqzylrwzi26gin2h451z3gdcqm"; }; prePatch = '' diff --git a/pkgs/servers/http/tomcat/recent.nix b/pkgs/servers/http/tomcat/recent.nix index 0d11ba7a1046..02be47a60221 100644 --- a/pkgs/servers/http/tomcat/recent.nix +++ b/pkgs/servers/http/tomcat/recent.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://tomcat.apache.org/; description = "An implementation of the Java Servlet and JavaServer Pages technologies"; + platforms = with stdenv.lib.platforms; all; }; } diff --git a/pkgs/servers/http/winstone/default.nix b/pkgs/servers/http/winstone/default.nix index 8991a220a76d..6a92c0a228af 100644 --- a/pkgs/servers/http/winstone/default.nix +++ b/pkgs/servers/http/winstone/default.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://winstone.sourceforge.net/"; - description = "A simple Java Servlet container."; + homepage = http://winstone.sourceforge.net/; + description = "A simple Java Servlet container"; license = stdenv.lib.licenses.cddl; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.rickynils ]; diff --git a/pkgs/servers/icecast/default.nix b/pkgs/servers/icecast/default.nix index 8b940fdb0cfc..6b8a75e6901a 100644 --- a/pkgs/servers/icecast/default.nix +++ b/pkgs/servers/icecast/default.nix @@ -1,28 +1,28 @@ {stdenv, fetchurl , libxml2, libxslt, curl -, libvorbis, libtheora, speex, libkate }: +, libvorbis, libtheora, speex, libkate, libopus }: stdenv.mkDerivation rec { - name = "icecast-2.3.3"; + name = "icecast-2.4.0"; src = fetchurl { url = "http://downloads.xiph.org/releases/icecast/${name}.tar.gz"; - sha256 = "0vf38mk13z1czpbj0g8va4rzjf201slqmiwcs8y9i6iwz3shc78v"; + sha256 = "0chg8v3c0wkbakjcw73rsfccx13f28arrmmbz9p5fsmiw5bykdqp"; }; - buildInputs = [ libxml2 libxslt curl libvorbis libtheora speex libkate ]; + buildInputs = [ libxml2 libxslt curl libvorbis libtheora speex libkate libopus ]; meta = { description = "Server software for streaming multimedia"; longDescription = '' - Icecast is a streaming media server which currently supports Ogg Vorbis and MP3 - audio streams. It can be used to create an Internet radio station or a - privately running jukebox and many things in between. It is very versatile in - that new formats can be added relatively easily and supports open standards for - commuincation and interaction. + Icecast is a streaming media server which currently supports + Ogg (Vorbis and Theora), Opus, WebM and MP3 audio streams. + It can be used to create an Internet radio station or a privately + running jukebox and many things in between. It is very versatile + in that new formats can be added relatively easily and supports + open standards for commuincation and interaction. ''; - homepage = http://www.icecast.org; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/servers/mail/dovecot/2.2.x.nix b/pkgs/servers/mail/dovecot/2.2.x.nix index 0c12b6ba3dbd..c9776b34b9de 100644 --- a/pkgs/servers/mail/dovecot/2.2.x.nix +++ b/pkgs/servers/mail/dovecot/2.2.x.nix @@ -2,14 +2,14 @@ , inotifyTools, clucene_core_2, sqlite }: stdenv.mkDerivation rec { - name = "dovecot-2.2.13"; + name = "dovecot-2.2.15"; buildInputs = [perl openssl bzip2 zlib openldap clucene_core_2 sqlite] ++ stdenv.lib.optionals (stdenv.isLinux) [ systemd pam inotifyTools ]; src = fetchurl { url = "http://dovecot.org/releases/2.2/${name}.tar.gz"; - sha256 = "1klxbnlgqvq4v2inp18yv3x04xp0vf8nr67ci1k3yww1mb9g6g0k"; + sha256 = "17rr7krfvyk706j12y9wy6nf7wh5vppqjrgxjdf66z9nw9lpf3ni"; }; preConfigure = '' diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index 522d0b60f00c..7c442bf8c7ec 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -22,10 +22,10 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = "http://www.postfix.org/"; + homepage = http://www.postfix.org/; description = '' A free implementation of the server-side SMTP protocol as defined by - RFC 5321, with some additional standard extensions. + RFC 5321, with some additional standard extensions ''; license = stdenv.lib.licenses.isc; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/servers/mail/postfix/2.11.nix b/pkgs/servers/mail/postfix/2.11.nix index 3651b1b74a48..5cb22ff936e1 100644 --- a/pkgs/servers/mail/postfix/2.11.nix +++ b/pkgs/servers/mail/postfix/2.11.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "postfix-${version}"; - version = "2.11.1"; + version = "2.11.3"; src = fetchurl { url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${name}.tar.gz"; - sha256 = "1ql9cifjcfhfi81lrf6zvk0r3spgcp01xwna16a7k9cm7fkrhzs8"; + sha256 = "1hq213s36wp94q72ciix5pi2rcd4901mjg7nx6m1n9jndrp19r84"; }; patches = [ ./postfix-2.11.0.patch ]; diff --git a/pkgs/servers/mediatomb/default.nix b/pkgs/servers/mediatomb/default.nix index d88e1dd9e141..4d3ef231af3f 100644 --- a/pkgs/servers/mediatomb/default.nix +++ b/pkgs/servers/mediatomb/default.nix @@ -1,28 +1,27 @@ -{ stdenv, fetchurl -, sqlite, expat, spidermonkey, taglib, libexif, curl, ffmpeg, file }: +{ stdenv, fetchgit +, sqlite, expat, mp4v2, flac, spidermonkey, taglib, libexif, curl, ffmpeg, file +, pkgconfig, autoreconfHook }: stdenv.mkDerivation rec { name = "mediatomb-${version}"; version = "0.12.1"; - src = fetchurl { - url = "mirror://sourceforge/mediatomb/${name}.tar.gz"; - sha256 = "1k8i5zvgik7cad7znd8358grzwh62frpqww1a5rwkldrlws3q5ii"; + src = fetchgit { + url = meta.repositories.git; + rev = "7ab761696354868bd5d67ff4f2d849994e4c98e2"; + sha256 = "7b51d488ac0b93c7720f8f8373970884a55b0879b1f6941873e916f41177d062"; }; - patches = [ ./zmm_new.patch ]; - - buildInputs = [ sqlite expat spidermonkey taglib libexif curl ffmpeg file ]; - - configureFlags = [ "--enable-inotify" ]; + buildInputs = [ sqlite expat spidermonkey taglib libexif curl ffmpeg file mp4v2 flac + pkgconfig autoreconfHook ]; meta = with stdenv.lib; { homepage = http://mediatomb.cc; + repositories.git = git://mediatomb.git.sourceforge.net/gitroot/mediatomb/mediatomb; description = "UPnP MediaServer with a web user interface"; license = licenses.gpl2; maintainers = [ maintainers.phreedom ]; platforms = platforms.linux; - broken = true; }; } diff --git a/pkgs/servers/mediatomb/zmm_new.patch b/pkgs/servers/mediatomb/zmm_new.patch deleted file mode 100644 index 5238b42035bf..000000000000 --- a/pkgs/servers/mediatomb/zmm_new.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -rc mediatomb-0.12.1.old/src/zmm/object.h mediatomb-0.12.1/src/zmm/object.h -*** mediatomb-0.12.1.old/src/zmm/object.h 2010-03-25 07:58:08.000000000 -0700 ---- mediatomb-0.12.1/src/zmm/object.h 2013-02-15 17:57:02.000000000 -0800 -*************** -*** 33,38 **** ---- 33,39 ---- - #define __ZMM_OBJECT_H__ - - #include <new> // for size_t -+ #include <stddef.h> - #include "atomic.h" - - namespace zmm diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index b45bef0cce8c..74033be8cf86 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, cyrus_sasl, libevent}: stdenv.mkDerivation rec { - name = "memcached-1.4.17"; + name = "memcached-1.4.20"; src = fetchurl { url = "http://memcached.org/files/${name}.tar.gz"; - sha1 = "2b4fc706d39579cf355e3358cfd27b44d40bd79c"; + sha256 = "0620llasj8xgffk6hk2ml15z0c5i34455wwg60i1a2zdir023l95"; }; buildInputs = [cyrus_sasl libevent]; diff --git a/pkgs/servers/monitoring/bosun/default.nix b/pkgs/servers/monitoring/bosun/default.nix new file mode 100644 index 000000000000..dfbf8d1b9272 --- /dev/null +++ b/pkgs/servers/monitoring/bosun/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchgit, fetchurl, go }: +let + go-fs = fetchgit { + url = git://github.com/rakyll/statik.git; + rev = "f19d7c21cd036701d42ec176b13e0946cc9591b0"; + sha256 = "0vaa8xzkmj1dgiayg7ccrniapz4f4rhsizx2hybyc5rgmalfj9ac"; + }; + +in stdenv.mkDerivation rec { + name = "bosun-${version}"; + version = "20141119233013"; + src = fetchurl { + url = "https://github.com/bosun-monitor/bosun/archive/${version}.tar.gz"; + sha256 = "0l16g073ixk42g3jz1r0lhmvssc0k8s1vnr9pvgxs897rzpdjjm1"; + }; + buildInputs = [ go ]; + + sourceRoot = "."; + + buildPhase = '' + mkdir -p src/github.com/bosun-monitor + mv bosun-${version} src/github.com/bosun-monitor/bosun + + mkdir -p src/github.com/rakyll + ln -s ${go-fs} src/github.com/rakyll/statik + + export GOPATH=$PWD + go build -v -o bosun src/github.com/bosun-monitor/bosun/main.go + ''; + + installPhase = '' + mkdir -p $out/bin + cp bosun $out/bin + ''; + + meta = with stdenv.lib; { + description = "Time series alerting framework"; + longDescription = '' + An advanced, open-source monitoring and alerting system by Stack Exchange. + ''; + homepage = http://bosun.org; + license = licenses.mit; + platforms = ["x86_64-linux"]; + }; +} diff --git a/pkgs/servers/monitoring/bosun/scollector.nix b/pkgs/servers/monitoring/bosun/scollector.nix new file mode 100644 index 000000000000..137b59714c1b --- /dev/null +++ b/pkgs/servers/monitoring/bosun/scollector.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchgit, fetchurl, go }: +let + +in stdenv.mkDerivation rec { + name = "scollector-20141119233025"; + src = fetchurl { + url = https://github.com/bosun-monitor/scollector/archive/20141119233025.tar.gz; + sha256 = "13f7hg4mswcdl76ksx8ds3297rslsswb1hq327b3xm1wyr42k6wa"; + }; + buildInputs = [ go ]; + + sourceRoot = "."; + + buildPhase = '' + mkdir -p src/github.com/bosun-monitor + mv scollector-20141119233025 src/github.com/bosun-monitor/scollector + + export GOPATH=$PWD + go build -v -o scollector src/github.com/bosun-monitor/scollector/main.go + ''; + + installPhase = '' + mkdir -p $out/bin + cp scollector $out/bin + ''; + + meta = with stdenv.lib; { + description = "Collect system information and store it in OpenTSDB or Bosun"; + homepage = http://bosun.org/scollector; + license = licenses.mit; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index 0ce58e640158..b671fbf877ac 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "2.0.21"; + version = "2.0.25"; name = "munin-${version}"; src = fetchurl { url = "https://github.com/munin-monitoring/munin/archive/${version}.tar.gz"; - sha256 = "18ipk8n78iik07190h9r8mj5209ha6yhbiw7da0l4khw0y00cvf8"; + sha256 = "1ig67l3p5fnx44fcvbbinajxlin9i7g9cbac93h2hcvb2qhzzzra"; }; buildInputs = [ @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { perl perlPackages.ModuleBuild perlPackages.HTMLTemplate + perlPackages.NetCIDR perlPackages.NetSSLeay perlPackages.NetServer perlPackages.Log4Perl @@ -107,7 +108,7 @@ stdenv.mkDerivation rec { wrapProgram "$file" \ --set PERL5LIB "$out/lib/perl5/site_perl:${rrdtool}/lib/perl:${with perlPackages; stdenv.lib.makePerlPath [ Log4Perl IOSocketInet6 Socket6 URI DBFile DateManip - HTMLTemplate FileCopyRecursive FCGI NetSNMP NetServer + HTMLTemplate FileCopyRecursive FCGI NetCIDR NetSNMP NetServer ListMoreUtils TimeHiRes DBDPg LWPUserAgent ]}" done diff --git a/pkgs/servers/monitoring/net-snmp/default.nix b/pkgs/servers/monitoring/net-snmp/default.nix index 30317d25cff7..9e3ebc3795d8 100644 --- a/pkgs/servers/monitoring/net-snmp/default.nix +++ b/pkgs/servers/monitoring/net-snmp/default.nix @@ -26,7 +26,8 @@ stdenv.mkDerivation rec { "--with-persistent-directory=/var/lib/net-snmp" ]; - buildInputs = [ autoreconfHook file openssl perl unzip ]; + buildInputs = [ autoreconfHook file perl unzip ]; + propagatedBuildInputs = [ openssl ]; enableParallelBuilding = true; diff --git a/pkgs/servers/monitoring/riemann/default.nix b/pkgs/servers/monitoring/riemann/default.nix index 5278e5438133..95b433abbf5c 100644 --- a/pkgs/servers/monitoring/riemann/default.nix +++ b/pkgs/servers/monitoring/riemann/default.nix @@ -17,10 +17,8 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "http://riemann.io/"; - description = '' - A network monitoring system. - ''; + homepage = http://riemann.io/; + description = "A network monitoring system"; license = licenses.epl10; platforms = platforms.all; maintainers = [ maintainers.rickynils ]; diff --git a/pkgs/servers/monitoring/zabbix/2.2.nix b/pkgs/servers/monitoring/zabbix/2.2.nix index 424001ea377b..df9da3c467b1 100644 --- a/pkgs/servers/monitoring/zabbix/2.2.nix +++ b/pkgs/servers/monitoring/zabbix/2.2.nix @@ -1,5 +1,10 @@ { stdenv, fetchurl, pkgconfig, postgresql, curl, openssl, zlib, gettext -, enableJabber ? false, minmay ? null }: +, net_snmp , libssh2, openldap +, enableJabber ? false, minmay ? null +, enableSnmp ? false +, enableSsh ? false +, enableLdap ? false +}: assert enableJabber -> minmay != null; @@ -38,7 +43,11 @@ in "--with-postgresql" "--with-libcurl" "--with-gettext" - ] ++ stdenv.lib.optional enableJabber "--with-jabber=${minmay}"; + ] + ++ stdenv.lib.optional enableJabber "--with-jabber=${minmay}" + ++ stdenv.lib.optional enableSnmp "--with-net-snmp" + ++ stdenv.lib.optional enableSsh "--with-ssh2=${libssh2}" + ++ stdenv.lib.optional enableLdap "--with-ldap=${openldap}"; postPatch = '' sed -i -e 's/iksemel/minmay/g' configure src/libs/zbxmedia/jabber.c @@ -48,7 +57,10 @@ in -e 's/iks/mmay/g' -e 's/IKS/MMAY/g' src/libs/zbxmedia/jabber.c ''; - buildInputs = [ pkgconfig postgresql curl openssl zlib ]; + buildInputs = [ pkgconfig postgresql curl openssl zlib ] + ++ stdenv.lib.optional enableSnmp net_snmp + ++ stdenv.lib.optional enableSsh libssh2 + ++ stdenv.lib.optional enableLdap openldap; postInstall = '' diff --git a/pkgs/servers/monitoring/zabbix/default.nix b/pkgs/servers/monitoring/zabbix/default.nix index 1e46ffdbc85b..ca4df9ce340a 100644 --- a/pkgs/servers/monitoring/zabbix/default.nix +++ b/pkgs/servers/monitoring/zabbix/default.nix @@ -2,11 +2,11 @@ let - version = "1.8.20"; + version = "1.8.21"; src = fetchurl { url = "mirror://sourceforge/zabbix/zabbix-${version}.tar.gz"; - sha256 = "0psdvzg5c3yhdqqmy5m1b0j3nrvcshjywhl56igy0j8vj16zxi86"; + sha256 = "1ssqi31blkl1lyv9vjrsrrn494grdng187s8xwfv79adk2w94paw"; }; preConfigure = diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index c8a6434cac3e..6c5f6b0ca4fa 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, systemd +{ stdenv, fetchurl, pkgconfig, glib, systemd, boost , alsaSupport ? true, alsaLib , flacSupport ? true, flac , vorbisSupport ? true, libvorbis @@ -18,22 +18,23 @@ , mpg123Support ? true, mpg123 , aacSupport ? true, faad2 , pulseaudioSupport ? true, pulseaudio +, icuSupport ? true, icu }: let - opt = stdenv.lib.optional; - mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}"; + major = "0.19"; + minor = "5"; in stdenv.mkDerivation rec { - name = "mpd-0.18.12"; + name = "mpd-${major}.${minor}"; src = fetchurl { - url = "http://www.musicpd.org/download/mpd/stable/${name}.tar.gz"; - sha256 = "09qphjcpqcs2jn5d8ga1skhif2mj5qk1ix9li76z2gyq3lf0rpz6"; + url = "http://www.musicpd.org/download/mpd/${major}/${name}.tar.gz"; + sha256 = "09rhppfspzhx7jjz3rv8b71gasrkg6i9l25xm94l9sf36jgd2m33"; }; - buildInputs = [ pkgconfig glib ] + buildInputs = [ pkgconfig glib boost ] ++ opt stdenv.isLinux systemd ++ opt (stdenv.isLinux && alsaSupport) alsaLib ++ opt flacSupport flac @@ -55,7 +56,8 @@ in stdenv.mkDerivation rec { ++ opt mpg123Support mpg123 ++ opt aacSupport faad2 ++ opt zipSupport zziplib - ++ opt pulseaudioSupport pulseaudio; + ++ opt pulseaudioSupport pulseaudio + ++ opt icuSupport icu; configureFlags = [ (mkFlag (!stdenv.isDarwin && alsaSupport) "alsa") @@ -79,6 +81,7 @@ in stdenv.mkDerivation rec { (mkFlag aacSupport "aac") (mkFlag pulseaudioSupport "pulse") (mkFlag stdenv.isDarwin "osx") + (mkFlag icuSupport "icu") "--enable-debug" ] ++ opt stdenv.isLinux @@ -92,7 +95,7 @@ in stdenv.mkDerivation rec { description = "A flexible, powerful daemon for playing music"; homepage = http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki; license = licenses.gpl2; - maintainers = with maintainers; [ astsmtl ]; + maintainers = with maintainers; [ astsmtl fuuzetsu ]; platforms = platforms.unix; longDescription = '' diff --git a/pkgs/servers/nosql/apache-jena/binary.nix b/pkgs/servers/nosql/apache-jena/binary.nix index b7132d2ea99e..d46b87d2dc1a 100644 --- a/pkgs/servers/nosql/apache-jena/binary.nix +++ b/pkgs/servers/nosql/apache-jena/binary.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="apache-jena"; - version="2.12.0"; + version = "2.12.1"; name="${baseName}-${version}"; - url="http://archive.apache.org/dist/jena/binaries/apache-jena-2.12.0.tar.gz"; - sha256="02fzn5j7yllp9g6lfnncpdgc1wbljvfk6s6fgaypq8p0vx5zallc"; + url="http://archive.apache.org/dist/jena/binaries/apache-jena-${version}.tar.gz"; + sha256 = "0jvk538hlwab7gy5150av4whfsm54kkx3q8r2ypjf7rwhy5aggav"; }; buildInputs = [ makeWrapper diff --git a/pkgs/servers/nosql/cassandra/default.nix b/pkgs/servers/nosql/cassandra/default.nix index 1413888f3f1b..fd263cad5d5a 100644 --- a/pkgs/servers/nosql/cassandra/default.nix +++ b/pkgs/servers/nosql/cassandra/default.nix @@ -35,8 +35,8 @@ in stdenv.mkDerivation rec { ''; meta = { - homepage = "http://cassandra.apache.org/"; - description = "Apache Cassandra™ is a massively scalable open source NoSQL database."; + homepage = http://cassandra.apache.org/; + description = "A massively scalable open source NoSQL database"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.asl20; }; diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index 651b84b7afea..02cdc02cd4d8 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.4"; +let version = "2.6.5"; system-libraries = [ "pcre" "boost" @@ -13,7 +13,7 @@ let version = "2.6.4"; # "v8" ] ++ optionals (!stdenv.isDarwin) [ "tcmalloc" ]; buildInputs = [ - sasl boost boost.lib gperftools pcre snappy + sasl boost gperftools pcre snappy libyamlcpp sasl openssl libpcap ]; @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://downloads.mongodb.org/src/mongodb-src-r${version}.tar.gz"; - sha256 = "1h4rrgcb95234ryjma3fjg50qsm1bnxjx5ib0c3p9nzmc2ji2m07"; + sha256 = "0v58kyp4cj4yag0djnswfiifrcll5y7x772y99b3afg89xicpmjm"; }; nativeBuildInputs = [ scons ]; diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 1a44aa6a804f..e733ef3d009e 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "redis-2.8.9"; + name = "redis-2.8.17"; src = fetchurl { url = "http://download.redis.io/releases/${name}.tar.gz"; - sha256 = "7834c37f2ff186c46aef8e4a066dfbf1d6772a285aa31c19c58162f264f1007f"; + sha256 = "19rnwapbsvfhd9pwdjdshrpqimf1ms0pzakvgnjrywkijmiwrisk"; }; makeFlags = "PREFIX=$(out)"; diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix index 79fd61390e46..1c8eac99737c 100644 --- a/pkgs/servers/nosql/rethinkdb/default.nix +++ b/pkgs/servers/nosql/rethinkdb/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, which, protobuf, gperftools, boost, zlib, curl, python, m4 }: stdenv.mkDerivation rec { - name = "rethinkdb-1.14.1"; + name = "rethinkdb-1.15.2"; src = fetchurl { url = "http://download.rethinkdb.com/dist/${name}.tgz"; - sha256 = "0brsbb289hcsmipma4rsgrkqpqagwff2y6w46dvb25n95id65hx8"; + sha256 = "1fpx9apqm62i332q2isanpdql8gwwab4qxwzrspqwgcka9zd6gy3"; }; preConfigure = '' @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { configureFlags = "--lib-path ${gperftools}/lib"; - buildInputs = [ protobuf boost boost.lib zlib curl ]; + buildInputs = [ protobuf boost zlib curl ]; nativeBuildInputs = [ which m4 python ]; diff --git a/pkgs/servers/openafs-client/I5558c64760e4cad2bd3dc648067d81020afc69b6.patch b/pkgs/servers/openafs-client/I5558c64760e4cad2bd3dc648067d81020afc69b6.patch new file mode 100644 index 000000000000..d8f922aba374 --- /dev/null +++ b/pkgs/servers/openafs-client/I5558c64760e4cad2bd3dc648067d81020afc69b6.patch @@ -0,0 +1,48 @@ +From: Marc Dionne <marc.dionne@your-file-system.com> +Date: Thu, 25 Sep 2014 10:52:12 +0000 (-0300) +Subject: Linux 3.17: Deal with d_splice_alias errors +X-Git-Url: http://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=af7f1d59135526ea584a4403b6400106dc92a992;hp=880401913d6190054bb0511093606a206b16326c + +Linux 3.17: Deal with d_splice_alias errors + +In 3.17 the logic in d_splice_alias has changed. Of interest to +us is the fact that it will now return an EIO error if it finds +an existing connected directory for the dentry, where it would +previously have added a new alias for it. As a result the end +user can get EIO errors when accessing any file in a volume +if the volume was first accessed through a different path (ex: +RO path vs RW path). + +This commit just restores the old behaviour, adding the directory +alias manually in the error case, which is what older versions +of d_splice_alias used to do. + +Change-Id: I5558c64760e4cad2bd3dc648067d81020afc69b6 +--- + +diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c +index e03187f..0cdd9e0 100644 +--- a/src/afs/LINUX/osi_vnodeops.c ++++ b/src/afs/LINUX/osi_vnodeops.c +@@ -1593,9 +1593,18 @@ afs_linux_lookup(struct inode *dip, struct dentry *dp) + /* It's ok for the file to not be found. That's noted by the caller by + * seeing that the dp->d_inode field is NULL. + */ +- if (!code || code == ENOENT) +- return newdp; +- else ++ if (!code || code == ENOENT) { ++ /* ++ * d_splice_alias can return an error (EIO) if there is an existing ++ * connected directory alias for this dentry. ++ */ ++ if (!IS_ERR(newdp)) ++ return newdp; ++ else { ++ d_add(dp, ip); ++ return NULL; ++ } ++ } else + return ERR_PTR(afs_convert_code(code)); + } + diff --git a/pkgs/servers/openafs-client/If1fd9d27f795dee4b5aa2152dd09e0540d643a69.patch b/pkgs/servers/openafs-client/If1fd9d27f795dee4b5aa2152dd09e0540d643a69.patch new file mode 100644 index 000000000000..f8844915f85c --- /dev/null +++ b/pkgs/servers/openafs-client/If1fd9d27f795dee4b5aa2152dd09e0540d643a69.patch @@ -0,0 +1,55 @@ +From 880401913d6190054bb0511093606a206b16326c Mon Sep 17 00:00:00 2001 +From: Marc Dionne <marc.dionne@your-file-system.com> +Date: Tue, 9 Sep 2014 10:39:55 -0300 +Subject: [PATCH] Linux 3.17: No more typedef for ctl_table + +The typedef has been removed so we need to use the structure +directly. + +Note that the API for register_sysctl_table has also changed +with 3.17, but it reverted back to a form that existed +before and the configure tests handle it correctly. + +Change-Id: If1fd9d27f795dee4b5aa2152dd09e0540d643a69 +--- + src/afs/LINUX/osi_sysctl.c | 4 ++-- + src/cf/linux-test4.m4 | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/afs/LINUX/osi_sysctl.c b/src/afs/LINUX/osi_sysctl.c +index a8f7fac..834e8ad 100644 +--- a/src/afs/LINUX/osi_sysctl.c ++++ b/src/afs/LINUX/osi_sysctl.c +@@ -34,7 +34,7 @@ extern afs_int32 afs_pct2; + #ifdef CONFIG_SYSCTL + static struct ctl_table_header *afs_sysctl = NULL; + +-static ctl_table afs_sysctl_table[] = { ++static struct ctl_table afs_sysctl_table[] = { + { + #if defined(STRUCT_CTL_TABLE_HAS_CTL_NAME) + #if defined(CTL_UNNUMBERED) +@@ -234,7 +234,7 @@ static ctl_table afs_sysctl_table[] = { + {0} + }; + +-static ctl_table fs_sysctl_table[] = { ++static struct ctl_table fs_sysctl_table[] = { + { + #if defined(STRUCT_CTL_TABLE_HAS_CTL_NAME) + #if defined(CTL_UNNUMBERED) +diff --git a/src/cf/linux-test4.m4 b/src/cf/linux-test4.m4 +index dad91d9..228b491 100644 +--- a/src/cf/linux-test4.m4 ++++ b/src/cf/linux-test4.m4 +@@ -395,7 +395,7 @@ AC_DEFUN([LINUX_REGISTER_SYSCTL_TABLE_NOFLAG], [ + AC_CHECK_LINUX_BUILD([whether register_sysctl_table has an insert_at_head argument], + [ac_cv_linux_register_sysctl_table_noflag], + [#include <linux/sysctl.h>], +- [ctl_table *t; register_sysctl_table (t);], ++ [struct ctl_table *t; register_sysctl_table (t);], + [REGISTER_SYSCTL_TABLE_NOFLAG], + [define if register_sysctl_table has no insert_at head flag], + []) +-- +1.7.1 diff --git a/pkgs/servers/openafs-client/default.nix b/pkgs/servers/openafs-client/default.nix index 4b5eb80b9741..4f4ec5cbc069 100644 --- a/pkgs/servers/openafs-client/default.nix +++ b/pkgs/servers/openafs-client/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation { patches = [ ./f3c0f74186f4a323ffc5f125d961fe384d396cac.patch ./ae86b07f827d6f3e2032a412f5f6cb3951a27d2d.patch + ./I5558c64760e4cad2bd3dc648067d81020afc69b6.patch + ./If1fd9d27f795dee4b5aa2152dd09e0540d643a69.patch ]; buildInputs = [ autoconf automake flex yacc ncurses perl which ]; diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index de262af095cb..5e0bc4f60f1b 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -3,7 +3,8 @@ , bluez, sbc, udev, libcap, json_c , jackaudioSupport ? false, jack2 ? null , x11Support ? false, xlibs -, useSystemd ? false, systemd ? null }: +, useSystemd ? false, systemd ? null +, ossWrapper ? false }: assert jackaudioSupport -> jack2 != null; @@ -49,11 +50,13 @@ stdenv.mkDerivation rec { "--disable-solaris" "--disable-jack" "--disable-oss-output" - "--disable-oss-wrapper" + ] ++ stdenv.lib.optional (!ossWrapper) "--disable-oss-wrapper" ++ + [ "--localstatedir=/var" "--sysconfdir=/etc" "--with-access-group=audio" - ] ++ stdenv.lib.optional jackaudioSupport "--enable-jack" + ] + ++ stdenv.lib.optional jackaudioSupport "--enable-jack" ++ stdenv.lib.optional stdenv.isDarwin "--with-mac-sysroot=/"; enableParallelBuilding = true; diff --git a/pkgs/servers/rippled/default.nix b/pkgs/servers/rippled/default.nix index d930c5b6a976..ca0a331e3212 100644 --- a/pkgs/servers/rippled/default.nix +++ b/pkgs/servers/rippled/default.nix @@ -1,20 +1,22 @@ -{ stdenv, fetchurl, scons, pkgconfig, openssl, protobuf, boost, zlib}: +{ stdenv, fetchFromGitHub, scons, pkgconfig, openssl, protobuf, boost, zlib}: stdenv.mkDerivation rec { name = "rippled-${version}"; - version = "0.23.0"; + version = "0.26.0"; - src = fetchurl { - url = "https://github.com/ripple/rippled/archive/${version}.tar.gz"; - sha256 = "0js734sk11jn19fyp403mk6p62azlc6s9kyhr5jfg466fiak537p"; + src = fetchFromGitHub { + owner = "ripple"; + repo = "rippled"; + rev = "0.26.2"; + sha256 = "06hcc3nnzp9f6j00890f41rrn4djwlcwkzmqnw4yra74sswgji5y"; }; - patches = [ ./scons-env.patch ]; + postPatch = '' + sed -i -e "s@ENV = dict.*@ENV = os.environ@g" SConstruct + ''; buildInputs = [ scons pkgconfig openssl protobuf boost zlib ]; - RIPPLED_BOOST_HOME = boost.out; - RIPPLED_ZLIB_HOME = zlib.out; buildPhase = "scons build/rippled"; installPhase = '' diff --git a/pkgs/servers/rippled/scons-env.patch b/pkgs/servers/rippled/scons-env.patch deleted file mode 100644 index 5b80e77bb2e0..000000000000 --- a/pkgs/servers/rippled/scons-env.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/SConstruct b/SConstruct -index 8ba8bbd..95eab3b 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -24,6 +24,8 @@ USING_CLANG = OSX or os.environ.get('CC', None) == 'clang' - # - BOOST_HOME = os.environ.get("RIPPLED_BOOST_HOME", None) - -+ZLIB_HOME = os.environ.get("RIPPLED_ZLIB_HOME", None) -+ - - if OSX or Ubuntu or Debian or Archlinux: - CTAGS = 'ctags' -@@ -36,7 +38,7 @@ else: - # scons tools - # - --HONOR_ENVS = ['CC', 'CXX', 'PATH'] -+HONOR_ENVS = ['CC', 'CXX', 'PATH', 'PKG_CONFIG_PATH'] - - env = Environment( - tools = ['default', 'protoc'], -@@ -156,8 +158,8 @@ INCLUDE_PATHS = [ - 'build/proto' - ] - --# if BOOST_HOME: --# INCLUDE_PATHS.append(BOOST_HOME) -+if BOOST_HOME: -+ INCLUDE_PATHS.append("%s/include" % BOOST_HOME) - - #------------------------------------------------------------------------------- - # -@@ -261,7 +263,11 @@ env.Append( - # such, as installed into `/usr/lib/` - if BOOST_HOME is not None: - env.Prepend( -- LIBPATH = ["%s/stage/lib" % BOOST_HOME]) -+ LIBPATH = ["%s/lib" % BOOST_HOME]) -+ -+if ZLIB_HOME is not None: -+ env.Prepend( -+ LIBPATH = ["%s/lib" % ZLIB_HOME]) - - if not OSX: - env.Append(LINKFLAGS = [ diff --git a/pkgs/servers/s6/default.nix b/pkgs/servers/s6/default.nix index 045e31207ba0..491dc625cf21 100644 --- a/pkgs/servers/s6/default.nix +++ b/pkgs/servers/s6/default.nix @@ -1,4 +1,9 @@ -{stdenv, fetchurl, skalibs, execline}: +{ stdenv +, execline +, fetchurl +, skalibs +, skarnetConfCompile +}: let @@ -13,43 +18,18 @@ in stdenv.mkDerivation rec { sha256 = "0djxdd3d3mlp63sjqqs0ilf8p68m86c1s98d82fl0kgaaibpsikp"; }; - buildInputs = [ skalibs execline ]; + buildInputs = [ skalibs execline skarnetConfCompile ]; sourceRoot = "admin/${name}"; - configurePhase = '' - pushd conf-compile - - printf "$out/bin" > conf-install-command - printf "$out/include" > conf-install-include - printf "$out/lib" > conf-install-library - printf "$out/lib" > conf-install-library.so - printf "$out/sysdeps" > conf-install-sysdeps - - # let nix builder strip things, cross-platform - truncate --size 0 conf-stripbins - truncate --size 0 conf-striplibs - - printf "${skalibs}/sysdeps" > import - printf "%s\n%s" "${skalibs}/include" "${execline}/include" > path-include - printf "%s\n%s" "${skalibs}/lib" "${execline}/lib" > path-library - - rm -f flag-slashpackage - touch flag-allstatic - - popd - ''; - preBuild = '' substituteInPlace "src/daemontools-extras/s6-log.c" \ --replace '"execlineb"' '"${execline}/bin/execlineb"' - - patchShebangs src/sys ''; meta = { homepage = http://www.skarnet.org/software/s6/; - description = "skarnet.org's small & secure supervision software suite."; + description = "skarnet.org's small & secure supervision software suite"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.isc; }; diff --git a/pkgs/servers/search/elasticsearch/default.nix b/pkgs/servers/search/elasticsearch/default.nix index 1cac6642484d..29ffee2f73a3 100644 --- a/pkgs/servers/search/elasticsearch/default.nix +++ b/pkgs/servers/search/elasticsearch/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "elasticsearch-1.3.2"; + name = "elasticsearch-1.3.4"; src = fetchurl { url = "https://download.elasticsearch.org/elasticsearch/elasticsearch/${name}.tar.gz"; - sha256 = "191fk7pbsxvihwj86b935d5b9n55h6q9gnpql68vfzjgvfjd09bm"; + sha256 = "0c6klwag17npmr1f0zv4syn0d9ir3zm595x3vb42ni4b72f65bqq"; }; patches = [ ./es-home.patch ]; diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix index ae93d1a4b5f7..6a0693ef1f50 100644 --- a/pkgs/servers/search/elasticsearch/plugins.nix +++ b/pkgs/servers/search/elasticsearch/plugins.nix @@ -4,11 +4,11 @@ with pkgs.lib; let esPlugin = a@{ - pluginName, + pluginName, installPhase ? '' mkdir -p $out/bin ES_HOME=$out ${elasticsearch}/bin/elasticsearch-plugin --install ${pluginName} --url file://$src - '', + '', ... }: stdenv.mkDerivation (a // { @@ -70,4 +70,25 @@ in { platforms = elasticsearch.meta.platforms; }; }; + + elasticsearch_river_twitter = esPlugin rec { + name = pname + "-" + version; + pname = "elasticsearch-river-twitter"; + pluginName = "elasticsearch/" + pname + "/" + version; + version = "2.3.0"; + + src = fetchurl { + url = "http://download.elasticsearch.org/elasticsearch/${pname}/${name}.zip"; + sha256 = "1lxxh1r61r15mzqyl0li37kcnn3vvpklnbfyys0kd6a1l82f0qvj"; + }; + + meta = { + homepage = "https://github.com/elasticsearch/elasticsearch-river-twitter"; + description = "Twitter River Plugin for ElasticSearch"; + license = licenses.asl20; + maintainers = [ maintainers.edwtjo ]; + platforms = elasticsearch.meta.platforms; + }; + + }; } diff --git a/pkgs/servers/search/solr/default.nix b/pkgs/servers/search/solr/default.nix index 443e7af71ad7..a5dbaa1731de 100644 --- a/pkgs/servers/search/solr/default.nix +++ b/pkgs/servers/search/solr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "solr-${version}"; - version = "4.7.0"; + version = "4.10.2"; src = fetchurl { url = "mirror://apache/lucene/solr/${version}/solr-${version}.tgz"; - sha256 = "0qm3pnhpfqjxdl0xiwffrcchp79q3ja5w5d278bkkxglc2y1y4xc"; + sha256 = "07wwfgwcca3ndjrkfk7qyc4q8bdhwr0s6h4ijl4sqdy65aqcc6qh"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index a1d9940c8871..c4a5fcc4284e 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "Cross-Platform Scalable FREE Multi-Protocol Soft Switch"; homepage = http://freeswitch.org/; - license = "MPL1.1"; + license = stdenv.lib.licenses.mpl11; maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 0efdd542fa4e..04f820223731 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mariadb-${version}"; - version = "10.0.13"; + version = "10.0.14"; src = fetchurl { url = "https://downloads.mariadb.org/interstitial/mariadb-${version}/source/mariadb-${version}.tar.gz"; - sha256 = "039wz89vs03a27anpshj5xaqknm7cqi7mrypvwingqkq26ns0mhs"; + sha256 = "07g3w841q8qw0mwi6grk65a2iky9x3axpxkb4c2a72i7pd7cl3mc"; }; buildInputs = [ cmake ncurses openssl bison boost libxml2 judy libevent groff ] diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix index 7266727fdad8..5c57ae87d202 100644 --- a/pkgs/servers/sql/mysql/5.5.x.nix +++ b/pkgs/servers/sql/mysql/5.5.x.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "mysql-${version}"; - version = "5.5.39"; + version = "5.5.40"; src = fetchurl { - url = "http://cdn.mysql.com/Downloads/MySQL-5.5/${name}.tar.gz"; - sha256 = "0qj8bc83v6vf8jyn4ag179nclpn6ilw4h4xqb50zz9jd0c5s14qq"; + url = "http://mysql.mirrors.pair.com/Downloads/MySQL-5.5/${name}.tar.gz"; + sha256 = "0q29nzmmxm78b89qjfzgm93r0glaam3xw3zfx1k8ihii39v22dsd"; }; preConfigure = stdenv.lib.optional stdenv.isDarwin '' @@ -21,7 +21,22 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - cmakeFlags = "-DWITH_SSL=yes -DWITH_READLINE=yes -DWITH_EMBEDDED_SERVER=yes -DWITH_ZLIB=yes -DINSTALL_SCRIPTDIR=bin -DHAVE_IPV6=yes"; + cmakeFlags = [ + "-DWITH_SSL=yes" + "-DWITH_READLINE=yes" + "-DWITH_EMBEDDED_SERVER=yes" + "-DWITH_ZLIB=yes" + "-DHAVE_IPV6=yes" + "-DINSTALL_DOCDIR=share/doc/mysql" + "-DINSTALL_DOCREADMEDIR=share/doc/mysql" + "-DINSTALL_INCLUDEDIR=include/mysql" + "-DINSTALL_INFODIR=share/doc/mysql" + "-DINSTALL_MANDIR=share/man" + "-DINSTALL_MYSQLSHAREDIR=share/mysql" + "-DINSTALL_MYSQLPLUGINDIR=lib/mysql/plugin" + "-DINSTALL_SCRIPTDIR=bin" + "-DINSTALL_SUPPORTFILESDIR=share/mysql" + ]; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; @@ -30,7 +45,8 @@ stdenv.mkDerivation rec { ''; postInstall = '' sed -i -e "s|basedir=\"\"|basedir=\"$out\"|" $out/bin/mysql_install_db - rm -rf $out/mysql-test $out/sql-bench + rm -r $out/mysql-test $out/sql-bench $out/data + rm $out/share/man/man1/mysql-test-run.pl.1 ''; passthru.mysqlVersion = "5.5"; diff --git a/pkgs/servers/sql/mysql/jdbc/default.nix b/pkgs/servers/sql/mysql/jdbc/default.nix index 7fde706479d6..59643fa3e000 100644 --- a/pkgs/servers/sql/mysql/jdbc/default.nix +++ b/pkgs/servers/sql/mysql/jdbc/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, ant, unzip}: stdenv.mkDerivation { - name = "mysql-connector-java-5.1.31"; + name = "mysql-connector-java-5.1.32"; builder = ./builder.sh; src = fetchurl { - url = http://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-java-5.1.31.zip; - sha256 = "1j6jvpadlib2hb6n3kh7s9ygjyqvi5gawrmnk1dsvvdcbkk1v871"; + url = http://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-java-5.1.32.zip; + sha256 = "11vjwws1pa8fdwn86rrmqdwsq3ld3sh2r0pp4lpr2gxw0w18ykc7"; }; buildInputs = [ unzip ant ]; diff --git a/pkgs/servers/sql/oracle-xe/default.nix b/pkgs/servers/sql/oracle-xe/default.nix index 57ff50175bb5..cd333152a2ae 100644 --- a/pkgs/servers/sql/oracle-xe/default.nix +++ b/pkgs/servers/sql/oracle-xe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, requireFile, patchelf, rpm, cpio, libaio }: +{ stdenv, makeWrapper, requireFile, patchelf, rpmextract, libaio }: assert stdenv.system == "x86_64-linux"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { unpackCmd = '' (mkdir -p "${name}" && cd "${name}" && - ${rpm}/bin/rpm2cpio "$curSrc" | ${cpio}/bin/cpio -id) + ${rpmextract}/bin/rpmextract "$curSrc") ''; buildPhase = let diff --git a/pkgs/servers/sql/pgpool/default.nix b/pkgs/servers/sql/pgpool/default.nix new file mode 100644 index 000000000000..194f4b2bcb34 --- /dev/null +++ b/pkgs/servers/sql/pgpool/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, postgresql }: + +stdenv.mkDerivation rec { + name = "pgpool-II-3.4.0"; + + src = fetchurl { + url = "http://www.pgpool.net/download.php?f=${name}.tar.gz"; + sha256 = "1aind5rbdld5ip92xlh4f6dgvdc4zxzgzi5n33xbvdrsrvagbc4j"; + }; + + buildInputs = [ postgresql ]; + + meta = with stdenv.lib; { + homepage = http://pgpool.net/mediawiki/index.php; + description = "a middleware that works between postgresql servers and postgresql clients."; + license = licenses.free; + platforms = platforms.unix; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix index 4807052478c0..b4611a4bb10c 100644 --- a/pkgs/servers/sql/postgresql/8.4.x.nix +++ b/pkgs/servers/sql/postgresql/8.4.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, ncurses, readline }: -let version = "8.4.21"; in +let version = "8.4.22"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "388f67e59f2a16c27e84f50656f5d755adf3d0a883138366d091aa0c727c1e2c"; + sha256 = "09iqr9sldiq7jz1rdnywp2wv36lxy5m8kch3vpchd1s4fz75c7aw"; }; buildInputs = [ zlib ncurses readline ]; diff --git a/pkgs/servers/sql/postgresql/9.4.x.nix b/pkgs/servers/sql/postgresql/9.4beta2.nix index 2608dcae5042..2608dcae5042 100644 --- a/pkgs/servers/sql/postgresql/9.4.x.nix +++ b/pkgs/servers/sql/postgresql/9.4beta2.nix diff --git a/pkgs/servers/sql/postgresql/9.4beta3.nix b/pkgs/servers/sql/postgresql/9.4beta3.nix new file mode 100644 index 000000000000..d446a4ab75b7 --- /dev/null +++ b/pkgs/servers/sql/postgresql/9.4beta3.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchurl, zlib, readline, libossp_uuid }: + +with stdenv.lib; + +let version = "9.4beta3"; in + +stdenv.mkDerivation rec { + name = "postgresql-${version}"; + + src = fetchurl { + url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; + sha256 = "0pdawsmrzwgf2c4g18xlgzv6q34kd8q2p1nxag0xaw4sbdmdilas"; + }; + + buildInputs = [ zlib readline ] ++ optionals (!stdenv.isDarwin) [ libossp_uuid ]; + + enableParallelBuilding = true; + + makeFlags = [ "world" ]; + + configureFlags = optional (!stdenv.isDarwin) + '' + --with-ossp-uuid + ''; + + patches = [ ./disable-resolve_symlinks-94.patch ./less-is-more.patch ]; + + installTargets = [ "install-world" ]; + + LC_ALL = "C"; + + passthru = { + inherit readline; + psqlSchema = "9.4"; + }; + + meta = { + homepage = http://www.postgresql.org/ ; + description = "A powerful, open source object-relational database system"; + license = stdenv.lib.licenses.postgresql; + maintainers = with stdenv.lib.maintainers; [ aristid ocharles ]; + hydraPlatforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/servers/squid/squids.nix b/pkgs/servers/squid/squids.nix index a6552738ea6d..859cf703d0e3 100644 --- a/pkgs/servers/squid/squids.nix +++ b/pkgs/servers/squid/squids.nix @@ -40,10 +40,10 @@ rec { }; squid34 = squid30.merge rec { - name = "squid-3.4.5"; + name = "squid-3.4.9"; src = args.fetchurl { url = "http://www.squid-cache.org/Versions/v3/3.4/${name}.tar.bz2"; - sha256 = "1d17l27bszdxnvdr78l7yry8ka38cq7g4774m5876q25ny1q1bmr"; + sha256 = "0rnf0awf54mpbwnx45r5rivgz260jn20hacspbjf2yb6xnzzzwj2"; }; buildInputs = [openldap pam db cyrus_sasl libcap expat libxml2 libtool openssl]; diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index 8aa15ee9f82f..27958494d174 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "unifi-controller-${version}"; - version = "3.2.1"; + version = "3.2.7"; src = fetchurl { url = "http://dl.ubnt.com/unifi/${version}/UniFi.unix.zip"; - sha256 = "0x7s5k9wxkw0rcs4c2mdrmmjpcfmbh5pvvpj8brrwnkgx072n53c"; + sha256 = "12g9x1k0l89rdlaw260561m17yc0bkp62prg3y05z6gbs7khh2xh"; }; buildInputs = [ unzip ]; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 5dd7c0fa75dd..efe35b42b40d 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -435,11 +435,11 @@ let }) // {inherit bdftopcf mkfontdir ;}; fontsproto = (mkDerivation "fontsproto" { - name = "fontsproto-2.1.2"; + name = "fontsproto-2.1.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/fontsproto-2.1.2.tar.bz2; - sha256 = "1ab8mbqxdwvdz4k5x4xb9c4n5w7i1xw276cbpk4z7a1nlpjrg746"; + url = mirror://xorg/individual/proto/fontsproto-2.1.3.tar.bz2; + sha256 = "1f2sdsd74y34nnaf4m1zlcbhyv8xb6irnisc99f84c4ivnq4d415"; }; buildInputs = [pkgconfig ]; }) // {inherit ;}; @@ -705,11 +705,11 @@ let }) // {inherit fixesproto libX11 xextproto xproto ;}; libXfont = (mkDerivation "libXfont" { - name = "libXfont-1.4.8"; + name = "libXfont-1.5.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXfont-1.4.8.tar.bz2; - sha256 = "01fh2hnnaby8x6mv57x78nsqwhls70gwykldzd8b43vrpzzd8s2m"; + url = mirror://xorg/individual/lib/libXfont-1.5.0.tar.bz2; + sha256 = "0py2c498lrq6wrj9al6nj57v2ypid9cz0zzhc0hjndgrmp254g1s"; }; buildInputs = [pkgconfig libfontenc fontsproto freetype xproto xtrans zlib ]; }) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;}; @@ -1185,31 +1185,31 @@ let }) // {inherit python ;}; xcbutil = (mkDerivation "xcbutil" { - name = "xcb-util-0.3.9"; + name = "xcb-util-0.4.0"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/xcb-util-0.3.9.tar.bz2; - sha256 = "1i0qbhqkcdlbbsj7ifkyjsffl61whj24d3zlg5pxf3xj1af2a4f6"; + url = http://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2; + sha256 = "1sahmrgbpyki4bb72hxym0zvxwnycmswsxiisgqlln9vrdlr9r26"; }; buildInputs = [pkgconfig gperf m4 libxcb xproto ]; }) // {inherit gperf m4 libxcb xproto ;}; xcbutilimage = (mkDerivation "xcbutilimage" { - name = "xcb-util-image-0.3.9"; + name = "xcb-util-image-0.4.0"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/xcb-util-image-0.3.9.tar.bz2; - sha256 = "1pr1l1nkg197gyl9d0fpwmn72jqpxjfgn9y13q4gawg1m873qnnk"; + url = http://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.bz2; + sha256 = "1z1gxacg7q4cw6jrd26gvi5y04npsyavblcdad1xccc8swvnmf9d"; }; buildInputs = [pkgconfig gperf m4 libxcb xcbutil xproto ]; }) // {inherit gperf m4 libxcb xcbutil xproto ;}; xcbutilkeysyms = (mkDerivation "xcbutilkeysyms" { - name = "xcb-util-keysyms-0.3.9"; + name = "xcb-util-keysyms-0.4.0"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.3.9.tar.bz2; - sha256 = "0vjwk7vrcfnlhiadv445c6skfxmdrg5v4qf81y8s2s5xagqarqbv"; + url = http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2; + sha256 = "1nbd45pzc1wm6v5drr5338j4nicbgxa5hcakvsvm5pnyy47lky0f"; }; buildInputs = [pkgconfig gperf m4 libxcb xproto ]; }) // {inherit gperf m4 libxcb xproto ;}; @@ -1415,11 +1415,11 @@ let }) // {inherit inputproto xorgserver xproto ;}; xf86inputsynaptics = (mkDerivation "xf86inputsynaptics" { - name = "xf86-input-synaptics-1.7.6"; + name = "xf86-input-synaptics-1.8.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-synaptics-1.7.6.tar.bz2; - sha256 = "0ls8f7gy92f54hdqsa19vypg0xm496jrgdhdn4qphycxwn3gwkbm"; + url = mirror://xorg/individual/driver/xf86-input-synaptics-1.8.1.tar.bz2; + sha256 = "16phzd7yhl4wns957c35qz2nahmjvnlx05jf975s524qkvrdlkyp"; }; buildInputs = [pkgconfig inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ]; }) // {inherit inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ;}; @@ -1475,11 +1475,11 @@ let }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videoati = (mkDerivation "xf86videoati" { - name = "xf86-video-ati-7.4.0"; + name = "xf86-video-ati-7.5.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-ati-7.4.0.tar.bz2; - sha256 = "1nbnvxlyn75bcf23m39p7yw80kilgdxmjdvzgcs3walshnlhq8wn"; + url = mirror://xorg/individual/driver/xf86-video-ati-7.5.0.tar.bz2; + sha256 = "0dkrw036ikym8aacl43lnf04q0wbms5498xg5b3l16ngnq36ygpc"; }; buildInputs = [pkgconfig fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; }) // {inherit fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; @@ -1555,14 +1555,14 @@ let }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videointel = (mkDerivation "xf86videointel" { - name = "xf86-video-intel-2.21.15"; + name = "xf86-video-intel-2.99.916"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-intel-2.21.15.tar.bz2; - sha256 = "1z6ncmpszmwqi9xr590c4kp4gjjf7mndcr56r35x2bx7h87i8nkx"; + url = mirror://xorg/individual/driver/xf86-video-intel-2.99.916.tar.bz2; + sha256 = "00gd3v3xgrmj8aliwjxkml13gfqvcbjazb6l5m1wkry39agq36j0"; }; - buildInputs = [pkgconfig dri2proto fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto xorgserver xproto libXrender libXvMC ]; - }) // {inherit dri2proto fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto xorgserver xproto libXrender libXvMC ;}; + buildInputs = [pkgconfig dri2proto dri3proto fontsproto glamoregl libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXvMC ]; + }) // {inherit dri2proto dri3proto fontsproto glamoregl libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXvMC ;}; xf86videomach64 = (mkDerivation "xf86videomach64" { name = "xf86-video-mach64-6.9.4"; @@ -1615,11 +1615,11 @@ let }) // {inherit fontsproto randrproto renderproto videoproto xorgserver xproto ;}; xf86videonouveau = (mkDerivation "xf86videonouveau" { - name = "xf86-video-nouveau-1.0.10"; + name = "xf86-video-nouveau-1.0.11"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-nouveau-1.0.10.tar.bz2; - sha256 = "17fvjplzfx86099sqys0bfl8lfbmjz8li84kzj2x95mf1cbb7fn1"; + url = mirror://xorg/individual/driver/xf86-video-nouveau-1.0.11.tar.bz2; + sha256 = "0j3847rnffy81iaxxi6vnd8saadrc9jahfmckr0sjgkzg2rf4kzq"; }; buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; }) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; @@ -1805,11 +1805,11 @@ let }) // {inherit ;}; xfs = (mkDerivation "xfs" { - name = "xfs-1.1.3"; + name = "xfs-1.1.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xfs-1.1.3.tar.bz2; - sha256 = "1dwnf5gncpnjsbh9bdrc665kfnclhzzcpwpfnprvrnq4mlr4mx3v"; + url = mirror://xorg/individual/app/xfs-1.1.4.tar.bz2; + sha256 = "1ylz4r7adf567rnlbb52yi9x3qi4pyv954kkhm7ld4f0fkk7a2x4"; }; buildInputs = [pkgconfig libXfont xproto xtrans ]; }) // {inherit libXfont xproto xtrans ;}; @@ -1845,11 +1845,11 @@ let }) // {inherit ;}; xinit = (mkDerivation "xinit" { - name = "xinit-1.3.3"; + name = "xinit-1.3.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xinit-1.3.3.tar.bz2; - sha256 = "1bq0mqy7y305g2rds1g5443f3d2kgxzafqhmiyabbmg3ws6qgckl"; + url = mirror://xorg/individual/app/xinit-1.3.4.tar.bz2; + sha256 = "1cq2g469mb2cfgr8k57960yrn90bl33vfqri4pdh2zm0jxrqvn3m"; }; buildInputs = [pkgconfig libX11 xproto ]; }) // {inherit libX11 xproto ;}; @@ -1985,14 +1985,14 @@ let }) // {inherit ;}; xorgserver = (mkDerivation "xorgserver" { - name = "xorg-server-1.14.7"; + name = "xorg-server-1.16.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.14.7.tar.bz2; - sha256 = "07s54g9q1bry1050dsa7x6hy55yjvq9sxs6ks89pc8l6mnk6zxpw"; + url = mirror://xorg/individual/xserver/xorg-server-1.16.1.tar.bz2; + sha256 = "0q706wdbwipyfcvywl7apih3p5mrms3p0wr1hdj5jyzvr5p7qrzl"; }; - buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ]; - }) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ;}; + buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libxshmfence libXt ]; + }) // {inherit renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libxshmfence libXt ;}; xorgsgmldoctools = (mkDerivation "xorgsgmldoctools" { name = "xorg-sgml-doctools-1.11"; @@ -2085,11 +2085,11 @@ let }) // {inherit libX11 xbitmaps libXcursor libXmu ;}; xtrans = (mkDerivation "xtrans" { - name = "xtrans-1.3.4"; + name = "xtrans-1.3.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/xtrans-1.3.4.tar.bz2; - sha256 = "0fjq9xa37k1czkidj3c5sads51gibrjvrxz9ag3hh9fmxzilwk85"; + url = mirror://xorg/individual/lib/xtrans-1.3.5.tar.bz2; + sha256 = "00c3ph17acnsch3gbdmx33b9ifjnl5w7vx8hrmic1r1cjcv3pgdd"; }; buildInputs = [pkgconfig ]; }) // {inherit ;}; diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list index 84795ed980b3..703c920c98ea 100644 --- a/pkgs/servers/x11/xorg/extra.list +++ b/pkgs/servers/x11/xorg/extra.list @@ -1,8 +1,8 @@ http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.bz2 http://xcb.freedesktop.org/dist/libxcb-1.11.tar.bz2 http://xcb.freedesktop.org/dist/xcb-proto-1.11.tar.bz2 -http://xcb.freedesktop.org/dist/xcb-util-0.3.9.tar.bz2 -http://xcb.freedesktop.org/dist/xcb-util-image-0.3.9.tar.bz2 -http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.3.9.tar.bz2 +http://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2 +http://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.bz2 +http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2 diff --git a/pkgs/servers/x11/xorg/old.list b/pkgs/servers/x11/xorg/old.list index 19cf79ca796b..2c2d6e0e4c4f 100644 --- a/pkgs/servers/x11/xorg/old.list +++ b/pkgs/servers/x11/xorg/old.list @@ -2,8 +2,8 @@ mirror://xorg/individual/app/twm-1.0.8.tar.bz2 mirror://xorg/individual/app/xclock-1.0.7.tar.bz2 mirror://xorg/individual/app/xdm-1.1.11.tar.bz2 mirror://xorg/individual/app/xeyes-1.1.1.tar.bz2 -mirror://xorg/individual/app/xfs-1.1.3.tar.bz2 -mirror://xorg/individual/app/xinit-1.3.3.tar.bz2 +mirror://xorg/individual/app/xfs-1.1.4.tar.bz2 +mirror://xorg/individual/app/xinit-1.3.4.tar.bz2 mirror://xorg/individual/app/xmessage-1.0.4.tar.bz2 mirror://xorg/individual/lib/libXp-1.0.2.tar.bz2 mirror://xorg/individual/lib/libXxf86misc-1.0.3.tar.bz2 diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 93afa06a7f24..a29d184e48c6 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -69,12 +69,15 @@ in }; libX11 = attrs: attrs // { - preConfigure = setMalloc0ReturnsNullCrossCompiling; + preConfigure = setMalloc0ReturnsNullCrossCompiling + '' + sed 's,^as_dummy.*,as_dummy="\$PATH",' -i configure + ''; postInstall = '' # Remove useless DocBook XML files. rm -rf $out/share/doc ''; + CPP = stdenv.lib.optionalString stdenv.isDarwin "clang -E -"; }; libXfont = attrs: attrs // { @@ -99,8 +102,11 @@ in # Note: most of these are in Requires.private, so maybe builder.sh # should propagate them automatically. libXt = attrs: attrs // { - preConfigure = setMalloc0ReturnsNullCrossCompiling; + preConfigure = setMalloc0ReturnsNullCrossCompiling + '' + sed 's,^as_dummy.*,as_dummy="\$PATH",' -i configure + ''; propagatedBuildInputs = [ xorg.libSM ]; + CPP = stdenv.lib.optionalString stdenv.isDarwin "clang -E -"; }; # See https://bugs.freedesktop.org/show_bug.cgi?id=47792 @@ -178,7 +184,7 @@ in }; xf86inputsynaptics = attrs: attrs // { - buildInputs = attrs.buildInputs ++ [args.mtdev]; + buildInputs = attrs.buildInputs ++ [args.mtdev args.libevdev]; installFlags = "sdkdir=\${out}/include/xorg configdir=\${out}/share/X11/xorg.conf.d"; }; @@ -248,7 +254,7 @@ in dmxproto /*libdmx not used*/ xf86vidmodeproto recordproto libXext pixman libXfont damageproto xcmiscproto bigreqsproto - libpciaccess inputproto xextproto randrproto renderproto + libpciaccess inputproto xextproto randrproto renderproto presentproto dri2proto kbproto xineramaproto resourceproto scrnsaverproto videoproto ]; commonPatches = [ ./xorgserver-xkbcomp-path.patch ]; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 1cc028e60d76..d3a2f1b45f96 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -41,7 +41,7 @@ mirror://xorg/X11R7.7/src/everything/font-mutt-misc-1.0.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-schumacher-misc-1.1.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-screen-cyrillic-1.0.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-sony-misc-1.0.3.tar.bz2 -mirror://xorg/X11R7.7/src/everything/fontsproto-2.1.2.tar.bz2 +mirror://xorg/X11R7.7/src/everything/fontsproto-2.1.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-sun-misc-1.0.3.tar.bz2 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 @@ -68,7 +68,7 @@ mirror://xorg/individual/lib/libXdamage-1.1.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXdmcp-1.1.1.tar.bz2 mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2 mirror://xorg/individual/lib/libXfixes-5.0.1.tar.bz2 -mirror://xorg/individual/lib/libXfont-1.4.8.tar.bz2 +mirror://xorg/individual/lib/libXfont-1.5.0.tar.bz2 mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2 mirror://xorg/individual/lib/libXi-1.7.4.tar.bz2 mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2 @@ -119,14 +119,14 @@ mirror://xorg/individual/driver/xf86-input-evdev-2.8.4.tar.bz2 mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2 mirror://xorg/individual/driver/xf86-input-keyboard-1.8.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-mouse-1.9.1.tar.bz2 -mirror://xorg/individual/driver/xf86-input-synaptics-1.7.6.tar.bz2 +mirror://xorg/individual/driver/xf86-input-synaptics-1.8.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.0.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-void-1.4.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ast-0.98.0.tar.bz2 -mirror://xorg/individual/driver/xf86-video-ati-7.4.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-ati-7.5.0.tar.bz2 mirror://xorg/individual/driver/glamor-egl-0.6.0.tar.bz2 -mirror://xorg/individual/driver/xf86-video-nouveau-1.0.10.tar.bz2 +mirror://xorg/individual/driver/xf86-video-nouveau-1.0.11.tar.bz2 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-dummy-0.3.7.tar.bz2 mirror://xorg/individual/driver/xf86-video-fbdev-0.4.4.tar.bz2 @@ -134,7 +134,7 @@ mirror://xorg/individual/driver/xf86-video-geode-2.11.16.tar.bz2 mirror://xorg/individual/driver/xf86-video-glide-1.2.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-glint-1.2.8.tar.bz2 mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2 -mirror://xorg/individual/driver/xf86-video-intel-2.21.15.tar.bz2 +mirror://xorg/individual/driver/xf86-video-intel-2.99.916.tar.bz2 mirror://xorg/individual/driver/xf86-video-mach64-6.9.4.tar.bz2 mirror://xorg/individual/driver/xf86-video-mga-1.6.3.tar.bz2 mirror://xorg/individual/driver/xf86-video-modesetting-0.9.0.tar.bz2 @@ -171,7 +171,7 @@ mirror://xorg/X11R7.7/src/everything/xlsatoms-1.1.1.tar.bz2 mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2 mirror://xorg/individual/app/xmodmap-1.0.8.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-docs-1.7.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.14.7.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.16.1.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 @@ -181,7 +181,7 @@ mirror://xorg/individual/app/xrdb-1.1.0.tar.bz2 mirror://xorg/individual/app/xrefresh-1.0.5.tar.bz2 mirror://xorg/individual/app/xset-1.2.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/xsetroot-1.1.0.tar.bz2 -mirror://xorg/individual/lib/xtrans-1.3.4.tar.bz2 +mirror://xorg/individual/lib/xtrans-1.3.5.tar.bz2 mirror://xorg/individual/app/xvinfo-1.1.2.tar.bz2 mirror://xorg/individual/app/xwd-1.0.6.tar.bz2 mirror://xorg/individual/app/xwininfo-1.1.3.tar.bz2 diff --git a/pkgs/servers/x11/xorg/unichrome/default.nix b/pkgs/servers/x11/xorg/unichrome/default.nix index bc1ebf4eb43e..b9cedfc4679f 100644 --- a/pkgs/servers/x11/xorg/unichrome/default.nix +++ b/pkgs/servers/x11/xorg/unichrome/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { homepage = "http://unichrome.sourceforge.net/"; description = "Xorg video driver for the S3 Unichrome family of integrated graphics devices"; - license = "free"; + license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; broken = true; diff --git a/pkgs/servers/x11/xorg/xf86-video-intel-testing.nix b/pkgs/servers/x11/xorg/xf86-video-intel-testing.nix deleted file mode 100644 index bee394e99638..000000000000 --- a/pkgs/servers/x11/xorg/xf86-video-intel-testing.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libdrm, udev, xorg }: - -with xorg; - -(stdenv.mkDerivation ({ - name = "xf86-video-intel-2.99.912"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-intel-2.99.912.tar.bz2; - sha256 = "00cmvs5jxaqnl1pwqvj1rwir4kbvf5qfng89cjn4rwsr5m4zr3vw"; - }; - buildInputs = [pkgconfig dri2proto fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes libXinerama xorgserver xproto libXrandr libXrender libXtst libXvMC ]; -})) // {inherit dri2proto fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes libXinerama xorgserver xproto libXrandr libXrender libXtst libXvMC ;} - diff --git a/pkgs/servers/xinetd/default.nix b/pkgs/servers/xinetd/default.nix index c841f8431deb..34e67e171f4a 100644 --- a/pkgs/servers/xinetd/default.nix +++ b/pkgs/servers/xinetd/default.nix @@ -12,6 +12,6 @@ stdenv.mkDerivation rec { description = "Secure replacement for inetd"; platforms = stdenv.lib.platforms.linux; homepage = http://xinetd.org; - license = "free"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix new file mode 100644 index 000000000000..1d85984a7b95 --- /dev/null +++ b/pkgs/servers/xmpp/prosody/default.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchurl, lua5, luasocket, luasec, luaexpat, luafilesystem, luabitop, libidn, openssl, makeWrapper, fetchhg }: + +let + libs = [ luasocket luasec luaexpat luafilesystem luabitop ]; + getPath = lib : type : "${lib}/lib/lua/${lua5.luaversion}/?.${type};${lib}/share/lua/${lua5.luaversion}/?.${type}"; + getLuaPath = lib : getPath lib "lua"; + getLuaCPath = lib : getPath lib "so"; + luaPath = stdenv.lib.concatStringsSep ";" (map getLuaPath libs); + luaCPath = stdenv.lib.concatStringsSep ";" (map getLuaCPath libs); +in + +stdenv.mkDerivation rec { + version = "0.9.6"; + name = "prosody-${version}"; + src = fetchurl { + url = "http://prosody.im/downloads/source/${name}.tar.gz"; + sha256 = "1rs0aqn1rkddgfq9pm7mi7xm5lbvxjpf8d8ijc085fc90zwqq8bm"; + }; + + communityModules = fetchhg { + url = "http://prosody-modules.googlecode.com/hg/"; + rev = "4b55110b0aa8"; + sha256 = "0010x2rl9f9ihy2nwqan2jdlz25433srj2zna1xh10490mc28hij"; + }; + + buildInputs = [ lua5 luasocket luasec luaexpat luabitop libidn openssl makeWrapper ]; + + configureFlags = [ + "--ostype=linux" + "--with-lua-include=${lua5}/include" + "--with-lua=${lua5}" + ]; + + postInstall = '' + cp $communityModules/mod_websocket/mod_websocket.lua $out/lib/prosody/modules/ + wrapProgram $out/bin/prosody \ + --set LUA_PATH '"${luaPath};"' \ + --set LUA_CPATH '"${luaCPath};"' + wrapProgram $out/bin/prosodyctl \ + --add-flags '--config "/etc/prosody/prosody.cfg.lua"' \ + --set LUA_PATH '"${luaPath};"' \ + --set LUA_CPATH '"${luaCPath};"' + ''; + + meta = { + description = "Open-source XMPP application server written in Lua"; + license = stdenv.lib.licenses.mit; + homepage = http://www.prosody.im; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.flosse ]; + }; +} diff --git a/pkgs/shells/bash/bash-4.2-patches.nix b/pkgs/shells/bash/bash-4.2-patches.nix index 0941252ef3ee..8ec6bf738352 100644 --- a/pkgs/shells/bash/bash-4.2-patches.nix +++ b/pkgs/shells/bash/bash-4.2-patches.nix @@ -52,4 +52,6 @@ patch: [ (patch "049" "03jipi8qz5baf1dyhld7yvazkkad7lz5czchrjsrnglzvm6df74h") (patch "050" "19lb9nh0x5siwf21xkga3khy5pa3srfrlx97mby4cfz8am2bh68s") (patch "051" "0705948wzi27zxphkh5vx4n62i671afyrb4qx276n49sq9xk859y") +(patch "052" "036wc4azli48ri7641fflxh6j95fnsma2167hbn80v7p91qzm67h") +(patch "053" "1pnkzx8bj8rz219wk8kxs8iga1k2wn13g1yvg3dci19qakbr7ri0") ] diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 03ecc290d14c..d165f2f386a1 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "fish-${version}"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { url = "http://fishshell.com/files/${version}/${name}.tar.gz"; - sha256 = "0i7h3hx8iszli3d4kphw79sz9m07f2lc2c9hr9smdps5s7wpllmg"; + sha256 = "b7e4d3c3d55fc3859edcb20462fcf0d14ab26e920eddcd503072e8105284d924"; }; buildInputs = [ ncurses ]; diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 349d1719e567..9887e8f1b6f4 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -2,11 +2,11 @@ let - version = "5.0.6"; + version = "5.0.7"; documentation = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.bz2"; - sha256 = "1mngi85q56szzlrdzv60vg7wl03lih8vlnl800gwr0i6d1laawxj"; + sha256 = "1wgw16r7z6k3mbr94mwfc8f13yc4ds2d9qk41hvsiv6rm5dnds23"; }; in @@ -16,7 +16,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}.tar.bz2"; - sha256 = "0ic86y35v82d87ixjzdb6zrnzf002b7gn573jnva6cqm2jdm1jl4"; + sha256 = "1cq4cz7ngvmbg399dva3g6njcz5d92gprmyi2swqc0klh7g2fkjl"; }; buildInputs = [ ncurses coreutils pcre ]; diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 09c92b552d48..cf95a5edfadf 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -8,14 +8,14 @@ rec { # Override the compiler in stdenv for specific packages. - overrideGCC = stdenv: gcc: stdenv.override { inherit gcc; }; + overrideGCC = stdenv: gcc: stdenv.override { allowedRequisites = null; inherit gcc; }; # Add some arbitrary packages to buildInputs for specific packages. # Used to override packages in stdenv like Make. Should not be used # for other dependencies. overrideInStdenv = stdenv: pkgs: - stdenv.override (prev: { extraBuildInputs = prev.extraBuildInputs or [] ++ pkgs; }); + stdenv.override (prev: { allowedRequisites = null; extraBuildInputs = prev.extraBuildInputs or [] ++ pkgs; }); # Override the setup script of stdenv. Useful for testing new @@ -285,18 +285,16 @@ rec { }; - /* Modify a stdenv so that it uses the Gold linker. FIXME: should - use -fuse-ld=gold instead, but then the ld-wrapper won't be - invoked. */ - useGoldLinker = stdenv: - let - binutils = stdenv.gcc.binutils; - binutils' = pkgs.runCommand "${binutils.name}-gold" { } - '' - mkdir -p $out/bin - ln -s ${binutils}/bin/* $out/bin/ - ln -sfn ${binutils}/bin/ld.gold $out/bin/ld - ''; # */ - in overrideGCC stdenv (stdenv.gcc.override { binutils = binutils'; }); + /* Modify a stdenv so that it uses the Gold linker. */ + useGoldLinker = stdenv: stdenv // + { mkDerivation = args: stdenv.mkDerivation (args // { + NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_COMPILE or "") + " -fuse-ld=gold"; + }); + }; + dropCxx = drv: drv.override { + stdenv = if pkgs.stdenv.isDarwin + then pkgs.allStdenvs.stdenvDarwinNaked + else pkgs.stdenv; + }; } diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix new file mode 100644 index 000000000000..45d417cdce73 --- /dev/null +++ b/pkgs/stdenv/darwin/default.nix @@ -0,0 +1,43 @@ +{ stdenv, pkgs, config +, haveLibCxx ? true +, useClang33 ? true }: + +import ../generic rec { + inherit config; + + preHook = + '' + export NIX_ENFORCE_PURITY= + export NIX_IGNORE_LD_THROUGH_GCC=1 + export NIX_DONT_SET_RPATH=1 + export NIX_NO_SELF_RPATH=1 + ${import ./prehook.nix} + ''; + + initialPath = (import ../common-path.nix) {pkgs = pkgs;}; + + system = stdenv.system; + + gcc = import ../../build-support/gcc-wrapper { + nativeTools = false; + nativeLibc = true; + inherit stdenv; + extraPackages = stdenv.lib.optional haveLibCxx pkgs.libcxx; + binutils = import ../../build-support/native-darwin-cctools-wrapper {inherit stdenv;}; + gcc = if useClang33 then pkgs.clang_33.gcc else pkgs.clang.gcc; + coreutils = pkgs.coreutils; + shell = pkgs.bash + "/bin/sh"; + }; + + shell = pkgs.bash + "/bin/sh"; + + fetchurlBoot = stdenv.fetchurlBoot; + + overrides = pkgs_: { + inherit gcc; + inherit (gcc) binutils; + inherit (pkgs) + gzip bzip2 xz bash coreutils diffutils findutils gawk + gnumake gnused gnutar gnugrep gnupatch perl libcxx libcxxabi; + }; +} diff --git a/pkgs/stdenv/darwin/prehook.nix b/pkgs/stdenv/darwin/prehook.nix new file mode 100644 index 000000000000..f38cd517f00e --- /dev/null +++ b/pkgs/stdenv/darwin/prehook.nix @@ -0,0 +1,9 @@ +'' + dontFixLibtool=1 + stripAllFlags=" " # the Darwin "strip" command doesn't know "-s" + xargsFlags=" " + export MACOSX_DEPLOYMENT_TARGET=10.9 + export SDKROOT=$(/usr/bin/xcrun --sdk macosx10.9 --show-sdk-path 2> /dev/null || true) + export NIX_CFLAGS_COMPILE+=" --sysroot=/var/empty -idirafter $SDKROOT/usr/include -F$SDKROOT/System/Library/Frameworks -Wno-multichar -Wno-deprecated-declarations" + export NIX_LDFLAGS_AFTER+=" -L$SDKROOT/usr/lib" +'' diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix index 47d1fb6d9f75..de0042a9adb6 100644 --- a/pkgs/stdenv/default.nix +++ b/pkgs/stdenv/default.nix @@ -5,7 +5,7 @@ # Posix utilities, the GNU C compiler, and so on. On other systems, # we use the native C library. -{ system, allPackages ? import ../.., platform, config }: +{ system, allPackages ? import ../.., platform, config, lib }: rec { @@ -28,14 +28,34 @@ rec { # The Nix build environment. stdenvNix = import ./nix { + inherit config lib; + stdenv = stdenvNative; + pkgs = stdenvNativePkgs; + }; + + stdenvDarwin = import ./darwin { + inherit config; + stdenv = stdenvNative; + pkgs = stdenvNativePkgs; + }; + + stdenvDarwinNaked = import ./darwin { + inherit config; + stdenv = stdenvNative; + pkgs = stdenvNativePkgs; + haveLibCxx = false; + }; + + stdenvDarwin33 = import ./darwin { inherit config; stdenv = stdenvNative; pkgs = stdenvNativePkgs; + useClang33 = true; }; # Linux standard environment. - stdenvLinux = (import ./linux { inherit system allPackages platform config;}).stdenvLinux; + stdenvLinux = (import ./linux { inherit system allPackages platform config lib; }).stdenvLinux; # Select the appropriate stdenv for the platform `system'. @@ -47,7 +67,7 @@ rec { if system == "armv7l-linux" then stdenvLinux else if system == "mips64el-linux" then stdenvLinux else if system == "powerpc-linux" then /* stdenvLinux */ stdenvNative else - if system == "x86_64-darwin" then stdenvNix else + if system == "x86_64-darwin" then stdenvDarwin else if system == "x86_64-solaris" then stdenvNix else stdenvNative; } diff --git a/pkgs/stdenv/generic/builder.sh b/pkgs/stdenv/generic/builder.sh index 60360e7b8256..a46c46c2db50 100644 --- a/pkgs/stdenv/generic/builder.sh +++ b/pkgs/stdenv/generic/builder.sh @@ -6,16 +6,12 @@ done mkdir $out -echo "$preHook" > $out/setup +echo "export SHELL=$shell" > $out/setup +echo "initialPath=\"$initialPath\"" >> $out/setup +echo "defaultNativeBuildInputs=\"$defaultNativeBuildInputs\"" >> $out/setup +echo "$preHook" >> $out/setup cat "$setup" >> $out/setup -sed -e "s^@initialPath@^$initialPath^g" \ - -e "s^@gcc@^$gcc^g" \ - -e "s^@shell@^$shell^g" \ - -e "s^@needsPax@^$needsPax^g" \ - < $out/setup > $out/setup.tmp -mv $out/setup.tmp $out/setup - # Allow the user to install stdenv using nix-env and get the packages # in stdenv. mkdir $out/nix-support diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 399843c27603..f41515154c65 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -1,7 +1,7 @@ let lib = import ../../../lib; in lib.makeOverridable ( { system, name ? "stdenv", preHook ? "", initialPath, gcc, shell -, extraAttrs ? {}, overrides ? (pkgs: {}), config +, allowedRequisites ? null, extraAttrs ? {}, overrides ? (pkgs: {}), config , # The `fetchurl' to use for downloading curl and its dependencies # (see all-packages.nix). @@ -10,8 +10,6 @@ let lib = import ../../../lib; in lib.makeOverridable ( , setupScript ? ./setup.sh , extraBuildInputs ? [] - -, skipPaxMarking ? false }: let @@ -23,7 +21,7 @@ let # {pkgs, ...}: # { # allowUnfree = false; - # allowUnfreePredicate = (x: pkgs.lib.hasPrefix "flashplayero-" x.name); + # allowUnfreePredicate = (x: pkgs.lib.hasPrefix "flashplayer-" x.name); # } allowUnfreePredicate = config.allowUnfreePredicate or (x: false); @@ -36,108 +34,108 @@ let { nixpkgs.config.allow${unfreeOrBroken} = true; } in configuration.nix to override this. If you use Nix standalone, you can add { allow${unfreeOrBroken} = true; } - to ~/.nixpkgs/config.nix. - ''; + to ~/.nixpkgs/config.nix.''; unsafeGetAttrPos = builtins.unsafeGetAttrPos or (n: as: null); + isUnfree = licenses: lib.lists.any (l: + !l.free or true || l == "unfree" || l == "unfree-redistributable") licenses; + + defaultNativeBuildInputs = extraBuildInputs ++ + [ ../../build-support/setup-hooks/move-docs.sh + ../../build-support/setup-hooks/compress-man-pages.sh + ../../build-support/setup-hooks/strip.sh + ../../build-support/setup-hooks/patch-shebangs.sh + ../../build-support/setup-hooks/move-sbin.sh + ../../build-support/setup-hooks/move-lib64.sh + gcc + ]; + + # Add a utility function to produce derivations that use this + # stdenv and its shell. + mkDerivation = attrs: + let + pos = + if attrs.meta.description or null != null then + unsafeGetAttrPos "description" attrs.meta + else + unsafeGetAttrPos "name" attrs; + pos' = if pos != null then "‘" + pos.file + ":" + toString pos.line + "’" else "«unknown-file»"; + in + if !allowUnfree && isUnfree (lib.lists.toList attrs.meta.license or []) && !allowUnfreePredicate attrs then + throw '' + Package ‘${attrs.name}’ in ${pos'} has an unfree license, refusing to evaluate. + ${forceEvalHelp "Unfree"}'' + else if !allowBroken && attrs.meta.broken or false then + throw '' + Package ‘${attrs.name}’ in ${pos'} is marked as broken, refusing to evaluate. + ${forceEvalHelp "Broken"}'' + else if !allowBroken && attrs.meta.platforms or null != null && !lib.lists.elem result.system attrs.meta.platforms then + throw '' + Package ‘${attrs.name}’ in ${pos'} is not supported on ‘${result.system}’, refusing to evaluate. + ${forceEvalHelp "Broken"}'' + else + lib.addPassthru (derivation ( + (removeAttrs attrs ["meta" "passthru" "crossAttrs"]) + // (let + buildInputs = attrs.buildInputs or []; + nativeBuildInputs = attrs.nativeBuildInputs or []; + propagatedBuildInputs = attrs.propagatedBuildInputs or []; + propagatedNativeBuildInputs = attrs.propagatedNativeBuildInputs or []; + crossConfig = attrs.crossConfig or null; + in + { + builder = attrs.realBuilder or shell; + args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)]; + stdenv = result; + system = result.system; + userHook = config.stdenv.userHook or null; + __ignoreNulls = true; + + # Inputs built by the cross compiler. + buildInputs = if crossConfig != null then buildInputs else []; + propagatedBuildInputs = if crossConfig != null then propagatedBuildInputs else []; + # Inputs built by the usual native compiler. + nativeBuildInputs = nativeBuildInputs ++ (if crossConfig == null then buildInputs else []); + propagatedNativeBuildInputs = propagatedNativeBuildInputs ++ + (if crossConfig == null then propagatedBuildInputs else []); + }))) ( + { + # The meta attribute is passed in the resulting attribute set, + # but it's not part of the actual derivation, i.e., it's not + # passed to the builder and is not a dependency. But since we + # include it in the result, it *is* available to nix-env for + # queries. We also a meta.position attribute here to + # identify the source location of the package. + meta = attrs.meta or {} // (if pos != null then { + position = pos.file + ":" + (toString pos.line); + } else {}); + passthru = attrs.passthru or {}; + } // + # Pass through extra attributes that are not inputs, but + # should be made available to Nix expressions using the + # derivation (e.g., in assertions). + (attrs.passthru or {})); + # The stdenv that we are producing. result = - - derivation { + derivation ( + (if isNull allowedRequisites then {} else { allowedRequisites = allowedRequisites ++ defaultNativeBuildInputs; }) // + { inherit system name; builder = shell; args = ["-e" ./builder.sh]; - /* TODO: special-cased @var@ substitutions are ugly. - However, using substituteAll* from setup.sh seems difficult, - as setup.sh can't be directly sourced. - Suggestion: split similar utility functions into a separate script. - */ setup = setupScript; - inherit preHook initialPath gcc shell; - - # Whether we should run paxctl to pax-mark binaries - needsPax = result.isLinux && !skipPaxMarking; - - propagatedUserEnvPkgs = [gcc] ++ - lib.filter lib.isDerivation initialPath; - } + inherit preHook initialPath shell defaultNativeBuildInputs; + }) // rec { - meta = { - description = "The default build environment for Unix packages in Nixpkgs"; - }; - - # Add a utility function to produce derivations that use this - # stdenv and its shell. - mkDerivation = attrs: - let - pos = - if attrs.meta.description or null != null then - unsafeGetAttrPos "description" attrs.meta - else - unsafeGetAttrPos "name" attrs; - pos' = if pos != null then "‘" + pos.file + ":" + toString pos.line + "’" else "«unknown-file»"; - in - if !allowUnfree && (let l = lib.lists.toList attrs.meta.license or []; in lib.lists.elem "unfree" l || lib.lists.elem "unfree-redistributable" l) && !(allowUnfreePredicate attrs) then - throw '' - Package ‘${attrs.name}’ in ${pos'} has an unfree license, refusing to evaluate. - ${forceEvalHelp "Unfree"}'' - else if !allowBroken && attrs.meta.broken or false then - throw '' - Package ‘${attrs.name}’ in ${pos'} is marked as broken, refusing to evaluate. - ${forceEvalHelp "Broken"}'' - else if !allowBroken && attrs.meta.platforms or null != null && !lib.lists.elem result.system attrs.meta.platforms then - throw '' - Package ‘${attrs.name}’ in ${pos'} is not supported on ‘${result.system}’, refusing to evaluate. - ${forceEvalHelp "Broken"}'' - else - lib.addPassthru (derivation ( - (removeAttrs attrs ["meta" "passthru" "crossAttrs"]) - // (let - buildInputs = attrs.buildInputs or []; - nativeBuildInputs = attrs.nativeBuildInputs or []; - propagatedBuildInputs = attrs.propagatedBuildInputs or []; - propagatedNativeBuildInputs = attrs.propagatedNativeBuildInputs or []; - crossConfig = attrs.crossConfig or null; - in - { - builder = attrs.realBuilder or shell; - args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)]; - stdenv = result; - system = result.system; - userHook = config.stdenv.userHook or null; - __ignoreNulls = true; - - # Inputs built by the cross compiler. - buildInputs = if crossConfig != null then buildInputs ++ extraBuildInputs else []; - propagatedBuildInputs = if crossConfig != null then propagatedBuildInputs else []; - # Inputs built by the usual native compiler. - nativeBuildInputs = nativeBuildInputs ++ (if crossConfig == null then buildInputs ++ extraBuildInputs else []); - propagatedNativeBuildInputs = propagatedNativeBuildInputs ++ - (if crossConfig == null then propagatedBuildInputs else []); - }))) ( - { - # The meta attribute is passed in the resulting attribute set, - # but it's not part of the actual derivation, i.e., it's not - # passed to the builder and is not a dependency. But since we - # include it in the result, it *is* available to nix-env for - # queries. We also a meta.position attribute here to - # identify the source location of the package. - meta = attrs.meta or {} // (if pos != null then { - position = pos.file + ":" + (toString pos.line); - } else {}); - passthru = attrs.passthru or {}; - } // - # Pass through extra attributes that are not inputs, but - # should be made available to Nix expressions using the - # derivation (e.g., in assertions). - (attrs.passthru or {})); + meta.description = "The default build environment for Unix packages in Nixpkgs"; # Utility flags to test the type of platform. isDarwin = system == "x86_64-darwin"; @@ -163,7 +161,8 @@ let isBSD = system == "i686-freebsd" || system == "x86_64-freebsd" || system == "i686-openbsd" - || system == "x86_64-openbsd"; + || system == "x86_64-openbsd" + || system == "x86_64-darwin"; isi686 = system == "i686-linux" || system == "i686-gnu" || system == "i686-freebsd" @@ -184,6 +183,12 @@ let isArm = system == "armv5tel-linux" || system == "armv6l-linux" || system == "armv7l-linux"; + isBigEndian = system == "powerpc-linux"; + + # Whether we should run paxctl to pax-mark binaries. + needsPax = isLinux; + + inherit mkDerivation; # For convenience, bring in the library functions in lib/ so # packages don't have to do that themselves. @@ -192,6 +197,8 @@ let inherit fetchurlBoot; inherit overrides; + + inherit gcc; } # Propagate any extra attributes. For instance, we use this to diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index c3b9033b49a6..904cc13e06c7 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -1,18 +1,80 @@ -# Run the named hook, either by calling the function with that name or -# by evaluating the variable with that name. This allows convenient -# setting of hooks both from Nix expressions (as attributes / -# environment variables) and from shell scripts (as functions). +set -e +set -o pipefail + +: ${outputs:=out} + + +###################################################################### +# Hook handling. + + +# Run all hooks with the specified name in the order in which they +# were added, stopping if any fails (returns a non-zero exit +# code). The hooks for <hookName> are the shell function or variable +# <hookName>, and the values of the shell array ‘<hookName>Hooks’. runHook() { local hookName="$1" + shift + local var="$hookName" + if [[ "$hookName" =~ Hook$ ]]; then var+=s; else var+=Hooks; fi + eval "local -a dummy=(\"\${$var[@]}\")" + for hook in "_callImplicitHook 0 $hookName" "${dummy[@]}"; do + if ! _eval "$hook" "$@"; then return 1; fi + done + return 0 +} + + +# Run all hooks with the specified name, until one succeeds (returns a +# zero exit code). If none succeed, return a non-zero exit code. +runOneHook() { + local hookName="$1" + shift + local var="$hookName" + if [[ "$hookName" =~ Hook$ ]]; then var+=s; else var+=Hooks; fi + eval "local -a dummy=(\"\${$var[@]}\")" + for hook in "_callImplicitHook 1 $hookName" "${dummy[@]}"; do + if _eval "$hook" "$@"; then + return 0 + fi + done + return 1 +} + + +# Run the named hook, either by calling the function with that name or +# by evaluating the variable with that name. This allows convenient +# setting of hooks both from Nix expressions (as attributes / +# environment variables) and from shell scripts (as functions). If you +# want to allow multiple hooks, use runHook instead. +_callImplicitHook() { + local def="$1" + local hookName="$2" case "$(type -t $hookName)" in (function|alias|builtin) $hookName;; (file) source $hookName;; (keyword) :;; - (*) eval "${!hookName}";; + (*) if [ -z "${!hookName}" ]; then return "$def"; else eval "${!hookName}"; fi;; esac } +# A function wrapper around ‘eval’ that ensures that ‘return’ inside +# hooks exits the hook, not the caller. +_eval() { + local code="$1" + shift + if [ "$(type -t $code)" = function ]; then + eval "$code \"\$@\"" + else + eval "$code" + fi +} + + +###################################################################### +# Error handling. + exitHandler() { exitCode=$? set +e @@ -40,7 +102,7 @@ exitHandler() { if [ -n "$succeedOnFailure" ]; then echo "build failed with exit code $exitCode (ignored)" mkdir -p "$out/nix-support" - echo -n $exitCode > "$out/nix-support/failed" + printf "%s" $exitCode > "$out/nix-support/failed" exit 0 fi @@ -55,7 +117,7 @@ trap "exitHandler" EXIT ###################################################################### -# Helper functions that might be useful in setup hooks. +# Helper functions. addToSearchPathWithCustomDelimiter() { @@ -74,12 +136,23 @@ addToSearchPath() { } -###################################################################### -# Initialisation. +ensureDir() { + echo "warning: ‘ensureDir’ is deprecated; use ‘mkdir’ instead" >&2 + local dir + for dir in "$@"; do + if ! [ -x "$dir" ]; then mkdir -p "$dir"; fi + done +} -set -e -[ -z $NIX_GCC ] && NIX_GCC=@gcc@ +installBin() { + mkdir -p $out/bin + cp "$@" $out/bin +} + + +###################################################################### +# Initialisation. # Wildcard expansions that don't match should expand to an empty list. @@ -90,7 +163,7 @@ shopt -s nullglob # Set up the initial path. PATH= -for i in $NIX_GCC @initialPath@; do +for i in $initialPath; do if [ "$i" = / ]; then i=; fi addToSearchPath PATH $i/bin addToSearchPath PATH $i/sbin @@ -101,37 +174,14 @@ if [ "$NIX_DEBUG" = 1 ]; then fi -# Execute the pre-hook. -export SHELL=@shell@ -export CONFIG_SHELL="$SHELL" -if [ -z "$shell" ]; then export shell=@shell@; fi -runHook preHook - - # Check that the pre-hook initialised SHELL. if [ -z "$SHELL" ]; then echo "SHELL not set"; exit 1; fi -# Hack: run gcc's setup hook. -envHooks=() -crossEnvHooks=() -if [ -f $NIX_GCC/nix-support/setup-hook ]; then - source $NIX_GCC/nix-support/setup-hook -fi - -# Ensure that the given directories exists. -ensureDir() { - echo "warning: ‘ensureDir’ is deprecated; use ‘mkdir’ instead" >&2 - local dir - for dir in "$@"; do - if ! [ -x "$dir" ]; then mkdir -p "$dir"; fi - done -} - -installBin() { - mkdir -p $out/bin - cp "$@" $out/bin -} +# Execute the pre-hook. +export CONFIG_SHELL="$SHELL" +if [ -z "$shell" ]; then export shell=$SHELL; fi +runHook preHook # Allow the caller to augment buildInputs (it's not always possible to @@ -154,6 +204,10 @@ findInputs() { eval $var="'${!var} $pkg '" + if [ -f $pkg ]; then + source $pkg + fi + if [ -f $pkg/nix-support/setup-hook ]; then source $pkg/nix-support/setup-hook fi @@ -166,19 +220,19 @@ findInputs() { } crossPkgs="" -for i in $buildInputs $propagatedBuildInputs; do +for i in $buildInputs $defaultBuildInputs $propagatedBuildInputs; do findInputs $i crossPkgs propagated-build-inputs done nativePkgs="" -for i in $nativeBuildInputs $propagatedNativeBuildInputs; do +for i in $nativeBuildInputs $defaultNativeBuildInputs $propagatedNativeBuildInputs; do findInputs $i nativePkgs propagated-native-build-inputs done # Set the relevant environment variables to point to the build inputs # found above. -addToNativeEnv() { +_addToNativeEnv() { local pkg=$1 if [ -d $1/bin ]; then @@ -186,16 +240,14 @@ addToNativeEnv() { fi # Run the package-specific hooks set by the setup-hook scripts. - for i in "${envHooks[@]}"; do - $i $pkg - done + runHook envHook "$pkg" } for i in $nativePkgs; do - addToNativeEnv $i + _addToNativeEnv $i done -addToCrossEnv() { +_addToCrossEnv() { local pkg=$1 # Some programs put important build scripts (freetype-config and similar) @@ -206,13 +258,11 @@ addToCrossEnv() { fi # Run the package-specific hooks set by the setup-hook scripts. - for i in "${crossEnvHooks[@]}"; do - $i $pkg - done + runHook crossEnvHook "$pkg" } for i in $crossPkgs; do - addToCrossEnv $i + _addToCrossEnv $i done @@ -273,41 +323,10 @@ fi export NIX_BUILD_CORES -###################################################################### -# Misc. helper functions. - - -stripDirs() { - local dirs="$1" - local stripFlags="$2" - local dirsNew= - - for d in ${dirs}; do - if [ -d "$prefix/$d" ]; then - dirsNew="${dirsNew} $prefix/$d " - fi - done - dirs=${dirsNew} - - if [ -n "${dirs}" ]; then - header "stripping (with flags $stripFlags) in $dirs" - find $dirs -type f -print0 | xargs -0 ${xargsFlags:--r} strip $commonStripFlags $stripFlags || true - stopNest - fi -} - -# PaX-mark binaries -paxmark() { - local flags="$1" - shift - - if [ -z "@needsPax@" ]; then - return - fi +# Dummy implementation of the paxmark function. On Linux, this is +# overwritten by paxctl's setup hook. +paxmark() { true; } - paxctl -c "$@" - paxctl -zex -${flags} "$@" -} ###################################################################### # Textual substitution functions. @@ -322,7 +341,7 @@ substitute() { local n p pattern replacement varName content # a slightly hacky way to keep newline at the end - content="$(cat $input; echo -n X)" + content="$(cat "$input"; printf "%s" X)" content="${content%X}" for ((n = 2; n < ${#params[*]}; n += 1)); do @@ -350,8 +369,7 @@ substitute() { content="${content//"$pattern"/$replacement}" done - # !!! This doesn't work properly if $content is "-n". - echo -n "$content" > "$output".tmp + printf "%s" "$content" > "$output".tmp if [ -x "$output" ]; then chmod +x "$output".tmp; fi mv -f "$output".tmp "$output" } @@ -439,39 +457,45 @@ stripHash() { } -unpackFile() { - curSrc="$1" - local cmd +unpackCmdHooks+=(_defaultUnpack) +_defaultUnpack() { + local fn="$1" - header "unpacking source archive $curSrc" 3 + if [ -d "$fn" ]; then - case "$curSrc" in - *.tar.xz | *.tar.lzma) - # Don't rely on tar knowing about .xz. - xz -d < $curSrc | tar xf - - ;; - *.tar | *.tar.* | *.tgz | *.tbz2) - # GNU tar can automatically select the decompression method - # (info "(tar) gzip"). - tar xf $curSrc - ;; - *.zip) - unzip -qq $curSrc - ;; - *) - if [ -d "$curSrc" ]; then - stripHash $curSrc - cp -prd --no-preserve=timestamps $curSrc $strippedName - else - if [ -z "$unpackCmd" ]; then - echo "source archive $curSrc has unknown type" - exit 1 - fi - runHook unpackCmd - fi - ;; - esac + stripHash "$fn" + # We can't preserve hardlinks because they may have been introduced by + # store optimization, which might break things in the build + cp -pr --reflink=auto --no-preserve=timestamps "$fn" $strippedName + + else + + case "$fn" in + *.tar.xz | *.tar.lzma) + # Don't rely on tar knowing about .xz. + xz -d < "$fn" | tar xf - + ;; + *.tar | *.tar.* | *.tgz | *.tbz2) + # GNU tar can automatically select the decompression method + # (info "(tar) gzip"). + tar xf "$fn" + ;; + *) + return 1 + ;; + esac + fi +} + + +unpackFile() { + curSrc="$1" + header "unpacking source archive $curSrc" 3 + if ! runOneHook unpackCmd "$curSrc"; then + echo "do not know how to unpack source archive $curSrc" + exit 1 + fi stopNest } @@ -505,7 +529,7 @@ unpackPhase() { # Find the source directory. if [ -n "$setSourceRoot" ]; then - runHook setSourceRoot + runOneHook setSourceRoot elif [ -z "$sourceRoot" ]; then sourceRoot= for i in *; do @@ -549,7 +573,7 @@ patchPhase() { for i in $patches; do header "applying patch $i" 3 local uncompress=cat - case $i in + case "$i" in *.gz) uncompress="gzip -d" ;; @@ -564,7 +588,7 @@ patchPhase() { ;; esac # "2>&1" is a hack to make patch fail if the decompressor fails (nonexistent patch, etc.) - $uncompress < $i 2>&1 | patch ${patchFlags:--p1} + $uncompress < "$i" 2>&1 | patch ${patchFlags:--p1} stopNest done @@ -654,80 +678,6 @@ checkPhase() { } -patchELF() { - # Patch all ELF executables and shared libraries. - header "patching ELF executables and libraries" - if [ -e "$prefix" ]; then - find "$prefix" \( \ - \( -type f -a -name "*.so*" \) -o \ - \( -type f -a -perm +0100 \) \ - \) -print -exec patchelf --shrink-rpath '{}' \; - fi - stopNest -} - - -patchShebangs() { - # Rewrite all script interpreter file names (`#! /path') under the - # specified directory tree to paths found in $PATH. E.g., - # /bin/sh will be rewritten to /nix/store/<hash>-some-bash/bin/sh. - # /usr/bin/env gets special treatment so that ".../bin/env python" is - # rewritten to /nix/store/<hash>/bin/python. - # Interpreters that are already in the store are left untouched. - header "patching script interpreter paths" - local dir="$1" - local f - local oldPath - local newPath - local arg0 - local args - local oldInterpreterLine - local newInterpreterLine - - find "$dir" -type f -perm +0100 | while read f; do - if [ "$(head -1 "$f" | head -c +2)" != '#!' ]; then - # missing shebang => not a script - continue - fi - - oldInterpreterLine=$(head -1 "$f" | tail -c +3) - read -r oldPath arg0 args <<< "$oldInterpreterLine" - - if $(echo "$oldPath" | grep -q "/bin/env$"); then - # Check for unsupported 'env' functionality: - # - options: something starting with a '-' - # - environment variables: foo=bar - if $(echo "$arg0" | grep -q -- "^-.*\|.*=.*"); then - echo "unsupported interpreter directive \"$oldInterpreterLine\" (set dontPatchShebangs=1 and handle shebang patching yourself)" - exit 1 - fi - newPath="$(command -v "$arg0" || true)" - else - if [ "$oldPath" = "" ]; then - # If no interpreter is specified linux will use /bin/sh. Set - # oldpath="/bin/sh" so that we get /nix/store/.../sh. - oldPath="/bin/sh" - fi - newPath="$(command -v "$(basename "$oldPath")" || true)" - args="$arg0 $args" - fi - - newInterpreterLine="$newPath $args" - - if [ -n "$oldPath" -a "${oldPath:0:${#NIX_STORE}}" != "$NIX_STORE" ]; then - if [ -n "$newPath" -a "$newPath" != "$oldPath" ]; then - echo "$f: interpreter directive changed from \"$oldInterpreterLine\" to \"$newInterpreterLine\"" - # escape the escape chars so that sed doesn't interpret them - escapedInterpreterLine=$(echo "$newInterpreterLine" | sed 's|\\|\\\\|g') - sed -i -e "1 s|.*|#\!$escapedInterpreterLine|" "$f" - fi - fi - done - - stopNest -} - - installPhase() { runHook preInstall @@ -743,74 +693,22 @@ installPhase() { } -# The fixup phase performs generic, package-independent, Nix-related -# stuff, like running patchelf and setting the -# propagated-build-inputs. It should rarely be overriden. +# The fixup phase performs generic, package-independent stuff, like +# stripping binaries, running patchelf and setting +# propagated-build-inputs. fixupPhase() { - runHook preFixup - # Make sure everything is writable so "strip" et al. work. - if [ -e "$prefix" ]; then chmod -R u+w "$prefix"; fi - - # Put man/doc/info under $out/share. - forceShare=${forceShare:=man doc info} - if [ -n "$forceShare" ]; then - for d in $forceShare; do - if [ -d "$prefix/$d" ]; then - if [ -d "$prefix/share/$d" ]; then - echo "both $d/ and share/$d/ exists!" - else - echo "fixing location of $d/ subdirectory" - mkdir -p $prefix/share - if [ -w $prefix/share ]; then - mv -v $prefix/$d $prefix/share - ln -sv share/$d $prefix - fi - fi - fi - done; - fi - - if [ -z "$dontGzipMan" ]; then - echo "gzipping man pages" - GLOBIGNORE=.:..:*.gz:*.bz2 - for f in "$out"/share/man/*/* "$out"/share/man/*/*/*; do - if [ -f "$f" -a ! -L "$f" ]; then - if gzip -c -n "$f" > "$f".gz; then - rm "$f" - else - rm "$f".gz - fi - fi - done - for f in "$out"/share/man/*/* "$out"/share/man/*/*/*; do - if [ -L "$f" -a -f `readlink -f "$f"`.gz ]; then - ln -sf `readlink "$f"`.gz "$f".gz && rm "$f" - fi - done - unset GLOBIGNORE - fi - - # TODO: strip _only_ ELF executables, and return || fail here... - if [ -z "$dontStrip" ]; then - stripDebugList=${stripDebugList:-lib lib32 lib64 libexec bin sbin} - if [ -n "$stripDebugList" ]; then - stripDirs "$stripDebugList" "${stripDebugFlags:--S}" - fi - - stripAllList=${stripAllList:-} - if [ -n "$stripAllList" ]; then - stripDirs "$stripAllList" "${stripAllFlags:--s}" - fi - fi + for output in $outputs; do + if [ -e "${!output}" ]; then chmod -R u+w "${!output}"; fi + done - if [ "$havePatchELF" = 1 -a -z "$dontPatchELF" ]; then - patchELF "$prefix" - fi + runHook preFixup - if [ -z "$dontPatchShebangs" ]; then - patchShebangs "$prefix" - fi + # Apply fixup to each output. + local output + for output in $outputs; do + prefix=${!output} runHook fixupOutput + done if [ -n "$propagatedBuildInputs" ]; then mkdir -p "$out/nix-support" @@ -935,7 +833,6 @@ genericBuild() { # Execute the post-hooks. -for i in "${postHooks[@]}"; do $i; done runHook postHook diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 6f8b42c2266a..76849c2c61ab 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -7,12 +7,10 @@ # The function defaults are for easy testing. { system ? builtins.currentSystem , allPackages ? import ../../top-level/all-packages.nix -, platform ? null, config ? {} }: +, platform ? null, config ? {}, lib ? (import ../../../lib) }: rec { - lib = import ../../../lib; - bootstrapFiles = if system == "i686-linux" then import ./bootstrap/i686.nix else if system == "x86_64-linux" then import ./bootstrap/x86_64.nix @@ -26,7 +24,6 @@ rec { commonPreHook = '' export NIX_ENFORCE_PURITY=1 - havePatchELF=1 ${if system == "x86_64-linux" then "NIX_LIB64_IN_SELF_RPATH=1" else ""} ${if system == "mips64el-linux" then "NIX_LIB32_IN_SELF_RPATH=1" else ""} ''; @@ -66,28 +63,16 @@ rec { }; - # A helper function to call gcc-wrapper. - wrapGCC = - { gcc, libc, binutils, coreutils, name }: - - lib.makeOverridable (import ../../build-support/gcc-wrapper) { - nativeTools = false; - nativeLibc = false; - inherit gcc binutils coreutils libc name; - stdenv = stage0.stdenv; - }; - - # This function builds the various standard environments used during # the bootstrap. In all stages, we build an stdenv and the package # set that can be built with that stdenv. stageFun = - {gcc, extraAttrs ? {}, overrides ? (pkgs: {}), extraPath ? []}: + {gccPlain, glibc, binutils, coreutils, name, overrides ? (pkgs: {}), extraBuildInputs ? []}: let thisStdenv = import ../generic { - inherit system config; + inherit system config extraBuildInputs; name = "stdenv-linux-boot"; preHook = '' @@ -97,15 +82,33 @@ rec { ${commonPreHook} ''; shell = "${bootstrapTools}/bin/sh"; - initialPath = [bootstrapTools] ++ extraPath; + initialPath = [bootstrapTools]; fetchurlBoot = import ../../build-support/fetchurl { stdenv = stage0.stdenv; curl = bootstrapTools; }; - inherit gcc; - # Having the proper 'platform' in all the stdenvs allows getting proper - # linuxHeaders for example. - extraAttrs = extraAttrs // { inherit platform; }; + + gcc = if isNull gccPlain + then "/no-such-path" + else lib.makeOverridable (import ../../build-support/gcc-wrapper) { + nativeTools = false; + nativeLibc = false; + gcc = gccPlain; + libc = glibc; + inherit binutils coreutils; + name = name; + stdenv = stage0.stdenv; + }; + + extraAttrs = { + # Having the proper 'platform' in all the stdenvs allows getting proper + # linuxHeaders for example. + inherit platform; + + # stdenv.glibc is used by GCC build to figure out the system-level + # /usr/include directory. + inherit glibc; + }; overrides = pkgs: (overrides pkgs) // { fetchurl = thisStdenv.fetchurlBoot; }; }; @@ -120,7 +123,11 @@ rec { # Build a dummy stdenv with no GCC or working fetchurl. This is # because we need a stdenv to build the GCC wrapper and fetchurl. stage0 = stageFun { - gcc = "/no-such-path"; + gccPlain = null; + glibc = null; + binutils = null; + coreutils = null; + name = null; overrides = pkgs: { # The Glibc include directory cannot have the same prefix as the @@ -151,17 +158,23 @@ rec { # simply re-export those packages in the middle stage(s) using the # overrides attribute and the inherit syntax. stage1 = stageFun { - gcc = wrapGCC { - gcc = bootstrapTools; - libc = stage0.pkgs.glibc; - binutils = bootstrapTools; - coreutils = bootstrapTools; - name = "bootstrap-gcc-wrapper"; - }; + gccPlain = bootstrapTools; + inherit (stage0.pkgs) glibc; + binutils = bootstrapTools; + coreutils = bootstrapTools; + name = "bootstrap-gcc-wrapper"; + # Rebuild binutils to use from stage2 onwards. overrides = pkgs: { binutils = pkgs.binutils.override { gold = false; }; inherit (stage0.pkgs) glibc; + + # A threaded perl build needs glibc/libpthread_nonshared.a, + # which is not included in bootstrapTools, so disable threading. + # This is not an issue for the final stdenv, because this perl + # won't be included in the final stdenv and won't be exported to + # top-level pkgs as an override either. + perl = pkgs.perl.override { enableThreading = false; }; }; }; @@ -169,13 +182,12 @@ rec { # 2nd stdenv that contains our own rebuilt binutils and is used for # compiling our own Glibc. stage2 = stageFun { - gcc = wrapGCC { - gcc = bootstrapTools; - libc = stage1.pkgs.glibc; - binutils = stage1.pkgs.binutils; - coreutils = bootstrapTools; - name = "bootstrap-gcc-wrapper"; - }; + gccPlain = bootstrapTools; + inherit (stage1.pkgs) glibc; + binutils = stage1.pkgs.binutils; + coreutils = bootstrapTools; + name = "bootstrap-gcc-wrapper"; + overrides = pkgs: { inherit (stage1.pkgs) perl binutils paxctl; # This also contains the full, dynamically linked, final Glibc. @@ -187,15 +199,13 @@ rec { # one uses the rebuilt Glibc from stage2. It still uses the recent # binutils and rest of the bootstrap tools, including GCC. stage3 = stageFun { - gcc = wrapGCC { - gcc = bootstrapTools; - libc = stage2.pkgs.glibc; - binutils = stage2.pkgs.binutils; - coreutils = bootstrapTools; - name = "bootstrap-gcc-wrapper"; - }; + gccPlain = bootstrapTools; + inherit (stage2.pkgs) glibc binutils; + coreutils = bootstrapTools; + name = "bootstrap-gcc-wrapper"; + overrides = pkgs: { - inherit (stage2.pkgs) binutils glibc perl; + inherit (stage2.pkgs) binutils glibc perl patchelf linuxHeaders; # Link GCC statically against GMP etc. This makes sense because # these builds of the libraries are only used by GCC, so it # reduces the size of the stdenv closure. @@ -204,33 +214,38 @@ rec { mpc = pkgs.mpc.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; }; isl = pkgs.isl.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; }; cloog = pkgs.cloog.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; }; - ppl = pkgs.ppl.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; }; - }; - extraAttrs = { - glibc = stage2.pkgs.glibc; # Required by gcc47 build + gccPlain = pkgs.gcc.gcc; }; - extraPath = [ stage2.pkgs.paxctl ]; + extraBuildInputs = [ stage2.pkgs.patchelf stage2.pkgs.paxctl ]; }; # Construct a fourth stdenv that uses the new GCC. But coreutils is # still from the bootstrap tools. stage4 = stageFun { - gcc = wrapGCC { - gcc = stage3.pkgs.gcc.gcc; - libc = stage3.pkgs.glibc; - binutils = stage3.pkgs.binutils; - coreutils = bootstrapTools; - name = ""; - }; - extraPath = [ stage3.pkgs.xz ]; + inherit (stage3.pkgs) gccPlain glibc binutils; + coreutils = bootstrapTools; + name = ""; + overrides = pkgs: { # Zlib has to be inherited and not rebuilt in this stage, # because gcc (since JAR support) already depends on zlib, and # then if we already have a zlib we want to use that for the # other purposes (binutils and top-level pkgs) too. - inherit (stage3.pkgs) gettext gnum4 gmp perl glibc zlib; + inherit (stage3.pkgs) gettext gnum4 gmp perl glibc zlib linuxHeaders; + + gcc = lib.makeOverridable (import ../../build-support/gcc-wrapper) { + nativeTools = false; + nativeLibc = false; + gcc = stage4.stdenv.gcc.gcc; + libc = stage4.pkgs.glibc; + inherit (stage4.pkgs) binutils coreutils; + name = ""; + stdenv = stage4.stdenv; + shell = stage4.pkgs.bash + "/bin/bash"; + }; }; + extraBuildInputs = [ stage3.pkgs.patchelf stage3.pkgs.xz ]; }; @@ -253,17 +268,13 @@ rec { ''; initialPath = - ((import ../common-path.nix) {pkgs = stage4.pkgs;}) - ++ [stage4.pkgs.patchelf stage4.pkgs.paxctl ]; + ((import ../common-path.nix) {pkgs = stage4.pkgs;}); + + extraBuildInputs = [ stage4.pkgs.patchelf stage4.pkgs.paxctl ]; - shell = stage4.pkgs.bash + "/bin/bash"; + gcc = stage4.pkgs.gcc; - gcc = (wrapGCC rec { - gcc = stage4.stdenv.gcc.gcc; - libc = stage4.pkgs.glibc; - inherit (stage4.pkgs) binutils coreutils; - name = ""; - }).override { inherit shell; }; + shell = gcc.shell; inherit (stage4.stdenv) fetchurlBoot; @@ -273,12 +284,18 @@ rec { shellPackage = stage4.pkgs.bash; }; + allowedRequisites = with stage4.pkgs; + [ gzip bzip2 xz bash binutils coreutils diffutils findutils gawk + glibc gnumake gnused gnutar gnugrep gnupatch patchelf attr acl + paxctl zlib pcre linuxHeaders ed gcc gcc.gcc libsigsegv + ]; + overrides = pkgs: { inherit gcc; inherit (stage4.pkgs) gzip bzip2 xz bash binutils coreutils diffutils findutils gawk glibc gnumake gnused gnutar gnugrep gnupatch patchelf - attr acl paxctl zlib; + attr acl paxctl zlib pcre; }; }; diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index 715bc02758bc..213f844365e1 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -22,9 +22,7 @@ rec { ${prehookBase} export NIX_DONT_SET_RPATH=1 export NIX_NO_SELF_RPATH=1 - dontFixLibtool=1 - stripAllFlags=" " # the Darwin "strip" command doesn't know "-s" - xargsFlags=" " + ${import ../darwin/prehook.nix} ''; prehookFreeBSD = '' @@ -35,9 +33,6 @@ rec { alias sed=gsed export MAKE=gmake shopt -s expand_aliases - - # Filter out stupid GCC warnings (in gcc-wrapper). - export NIX_GCC_NEEDS_GREP=1 ''; prehookOpenBSD = '' @@ -52,9 +47,6 @@ rec { export MAKE=gmake shopt -s expand_aliases - - # Filter out stupid GCC warnings (in gcc-wrapper). - export NIX_GCC_NEEDS_GREP=1 ''; prehookNetBSD = '' @@ -65,9 +57,6 @@ rec { alias tar=gtar export MAKE=gmake shopt -s expand_aliases - - # Filter out stupid GCC warnings (in gcc-wrapper). - export NIX_GCC_NEEDS_GREP=1 ''; prehookCygwin = '' diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix index a496a819a6df..476e0eae3970 100644 --- a/pkgs/stdenv/nix/default.nix +++ b/pkgs/stdenv/nix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, config }: +{ stdenv, pkgs, config, lib }: import ../generic rec { inherit config; @@ -7,18 +7,7 @@ import ../generic rec { '' export NIX_ENFORCE_PURITY=1 export NIX_IGNORE_LD_THROUGH_GCC=1 - '' + (if stdenv.isDarwin then '' - export NIX_ENFORCE_PURITY= - export NIX_DONT_SET_RPATH=1 - export NIX_NO_SELF_RPATH=1 - dontFixLibtool=1 - stripAllFlags=" " # the Darwin "strip" command doesn't know "-s" - xargsFlags=" " - export MACOSX_DEPLOYMENT_TARGET=10.6 - export SDKROOT=$(/usr/bin/xcrun --show-sdk-path 2> /dev/null || true) - export NIX_CFLAGS_COMPILE+=" --sysroot=/var/empty -idirafter $SDKROOT/usr/include -F$SDKROOT/System/Library/Frameworks -Wno-multichar -Wno-deprecated-declarations" - export NIX_LDFLAGS_AFTER+=" -L$SDKROOT/usr/lib" - '' else ""); + ''; initialPath = (import ../common-path.nix) {pkgs = pkgs;}; @@ -29,11 +18,7 @@ import ../generic rec { nativePrefix = stdenv.lib.optionalString stdenv.isSunOS "/usr"; nativeLibc = true; inherit stdenv; - binutils = - if stdenv.isDarwin then - import ../../build-support/native-darwin-cctools-wrapper {inherit stdenv;} - else - pkgs.binutils; + binutils = pkgs.binutils; gcc = pkgs.gcc.gcc; coreutils = pkgs.coreutils; shell = pkgs.bash + "/bin/sh"; diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix index f3b5208de871..1d5c2a129c04 100644 --- a/pkgs/tools/X11/bumblebee/default.nix +++ b/pkgs/tools/X11/bumblebee/default.nix @@ -1,54 +1,82 @@ # The bumblebee package allows a program to be rendered on an -# dedicated video card by spawning an additional X11 server -# and streaming the results via VirtualGL to the primary server. +# dedicated video card by spawning an additional X11 server and +# streaming the results via VirtualGL or primus to the primary server. # The package is rather chaotic; it's also quite recent. # As it may change a lot, some of the hacks in this nix expression # will hopefully not be needed in the future anymore. -# To test: make sure that the 'bbswitch' kernel module is installed, -# then run 'bumblebeed' as root and 'optirun glxgears' as user. +# To test: +# 1. make sure that the 'bbswitch' kernel module is installed, +# 2. then run 'bumblebeed' as root +# 3. Then either 'optirun glxinfo' or 'primusrun glxinfo' as user. +# +# The glxinfo output should indicate the NVidia driver is being used +# and all expected extensions are supported. +# # To use at startup, see hardware.bumblebee options. # This nix expression supports for now only the native nvidia driver. # It should not be hard to generalize this approach to support the -# nouveau driver as well (parameterize commonEnv over the module -# package, and parameterize the two wrappers as well) +# nouveau driver as well (parameterize hostEnv, i686Env over the +# module package, and parameterize the two wrappers as well) { stdenv, fetchurl, pkgconfig, help2man , libX11, glibc, glib, libbsd , makeWrapper, buildEnv, module_init_tools -, linuxPackages, virtualgl, xorg, xkeyboard_config +, xorg, xkeyboard_config +, nvidia_x11, virtualgl +# The below should only be non-null in a x86_64 system. On a i686 +# system the above nvidia_x11 and virtualgl will be the i686 packages. +# TODO: Confusing. Perhaps use "SubArch" instead of i686? +, nvidia_x11_i686 ? null +, virtualgl_i686 ? null }: - +with stdenv.lib; let version = "3.2.1"; name = "bumblebee-${version}"; - # isolated X11 environment with the nvidia module - # it should include all components needed for bumblebeed and + # Isolated X11 environment without the acceleration driver module. + # Includes the rest of the components needed for bumblebeed and # optirun to spawn the second X server and to connect to it. - commonEnv = buildEnv { + x11Env = buildEnv { name = "bumblebee-env"; paths = [ module_init_tools - - linuxPackages.nvidia_x11 xorg.xorgserver xorg.xrandr xorg.xrdb xorg.setxkbmap xorg.libX11 xorg.libXext + xorg.xf86inputevdev + ]; + }; + # The environment for the host architecture. + hostEnv = buildEnv { + name = "bumblebee-x64-env"; + paths = [ + nvidia_x11 virtualgl ]; - - # the nvidia GLX module overwrites the one of xorgserver, - # thus nvidia_x11 must be before xorgserver in the paths. - ignoreCollisions = true; }; + # The environment for the sub architecture, i686, if there is one + i686Env = if virtualgl_i686 != null + then buildEnv { + name = "bumblebee-i686-env"; + paths = [ + nvidia_x11_i686 + virtualgl_i686 + ]; + } + else null; + + allEnvs = [hostEnv] ++ optional (i686Env != null) i686Env; + ldPathString = makeLibraryPath allEnvs; + in stdenv.mkDerivation { inherit name; @@ -63,6 +91,7 @@ in stdenv.mkDerivation { # Substitute the path to the actual modinfo program in module.c. # Note: module.c also calls rmmod and modprobe, but those just have to # be in PATH, and thus no action for them is required. + substituteInPlace src/module.c \ --replace "/sbin/modinfo" "${module_init_tools}/sbin/modinfo" @@ -75,26 +104,38 @@ in stdenv.mkDerivation { # Note that it has several runtime dependencies. buildInputs = [ stdenv makeWrapper pkgconfig help2man libX11 glib libbsd ]; + # The order of LDPATH is very specific: First X11 then the host + # environment then the optional sub architecture paths. + # + # The order for MODPATH is the opposite: First the environment that + # includes the acceleration driver. As this is used for the X11 + # server, which runs under the host architecture, this does not + # include the sub architecture components. configureFlags = [ "--with-udev-rules=$out/lib/udev/rules.d" "CONF_DRIVER=nvidia" "CONF_DRIVER_MODULE_NVIDIA=nvidia" - "CONF_LDPATH_NVIDIA=${commonEnv}/lib" - "CONF_MODPATH_NVIDIA=${commonEnv}/lib/xorg/modules" + "CONF_LDPATH_NVIDIA=${x11Env}/lib:${ldPathString}" + "CONF_MODPATH_NVIDIA=${hostEnv}/lib/xorg/modules,${x11Env}/lib/xorg/modules" ]; # create a wrapper environment for bumblebeed and optirun postInstall = '' wrapProgram "$out/sbin/bumblebeed" \ - --prefix PATH : "${commonEnv}/sbin:${commonEnv}/bin:\$PATH" \ - --prefix LD_LIBRARY_PATH : "${commonEnv}/lib:\$LD_LIBRARY_PATH" \ + --prefix PATH : "${x11Env}/sbin:${x11Env}/bin:${hostEnv}/bin:\$PATH" \ + --prefix LD_LIBRARY_PATH : "${x11Env}/lib:${hostEnv}/lib:\$LD_LIBRARY_PATH" \ + --set FONTCONFIG_FILE "/etc/fonts/fonts.conf" \ --set XKB_BINDIR "${xorg.xkbcomp}/bin" \ --set XKB_DIR "${xkeyboard_config}/etc/X11/xkb" wrapProgram "$out/bin/optirun" \ - --prefix PATH : "${commonEnv}/sbin:${commonEnv}/bin" \ - --prefix LD_LIBRARY_PATH : "${commonEnv}/lib" \ - ''; + --prefix PATH : "${hostEnv}/bin" + '' + (if i686Env == null + then "" + else '' + makeWrapper "$out/bin/.optirun-wrapped" "$out/bin/optirun32" \ + --prefix PATH : "${i686Env}/bin" + ''); meta = { homepage = http://github.com/Bumblebee-Project/Bumblebee; diff --git a/pkgs/tools/X11/primus/builder.sh b/pkgs/tools/X11/primus/builder.sh new file mode 100644 index 000000000000..3c6b6afdc09f --- /dev/null +++ b/pkgs/tools/X11/primus/builder.sh @@ -0,0 +1,12 @@ +source $stdenv/setup + +cp -r $src src +cd src + +export LIBDIR=$out/lib +export PRIMUS_libGLa=$nvidia/lib/libGL.so +export PRIMUS_libGLd=$mesa/lib/libGL.so +export PRIMUS_LOAD_GLOBAL=$mesa/lib/libglapi.so + +make +ln -s $LIBDIR/libGL.so.1 $LIBDIR/libGL.so diff --git a/pkgs/tools/X11/primus/default.nix b/pkgs/tools/X11/primus/default.nix new file mode 100644 index 000000000000..f457d25fe1b9 --- /dev/null +++ b/pkgs/tools/X11/primus/default.nix @@ -0,0 +1,40 @@ +# For a 64bit + 32bit system the LD_LIBRARY_PATH must contain both the 32bit and 64bit primus +# libraries. Providing a different primusrun for each architecture will not work as expected. EG: +# Using steam under wine can involve both 32bit and 64bit process. All of which inherit the +# same LD_LIBRARY_PATH. +# Other distributions do the same. +{ stdenv +, primusLib +, writeScript +, primusLib_i686 ? null +}: +with stdenv.lib; +let + version = "1.0.0748176"; + 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 + exec "$@" +''; +in +stdenv.mkDerivation { + name = "primus-${version}"; + builder = writeScript "builder" + '' + source $stdenv/setup + mkdir -p $out/bin + cp ${primusrun} $out/bin/primusrun + ''; + + meta = { + homepage = https://github.com/amonakov/primus; + description = "Faster OpenGL offloading for Bumblebee"; + maintainer = maintainers.coconnor; + }; +} diff --git a/pkgs/tools/X11/primus/lib.nix b/pkgs/tools/X11/primus/lib.nix new file mode 100644 index 000000000000..fb18907c50ff --- /dev/null +++ b/pkgs/tools/X11/primus/lib.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchgit +, x11, mesa +, nvidia +}: +let + version = "1.0.0748176"; +in +stdenv.mkDerivation { + name = "primus-lib-${version}"; + src = fetchgit { + url = git://github.com/amonakov/primus.git; + rev = "074817614c014e3a99259388cb18fd54648b659a"; + sha256 = "0mrh432md6zrm16avxyk57mgszrqpgwdjahspchvlaccqxp3x82v"; + }; + + inherit nvidia mesa; + + buildInputs = [ x11 mesa ]; + builder = ./builder.sh; +} diff --git a/pkgs/tools/X11/sselp/default.nix b/pkgs/tools/X11/sselp/default.nix new file mode 100644 index 000000000000..6ef7128dd4ca --- /dev/null +++ b/pkgs/tools/X11/sselp/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, libX11 }: + +stdenv.mkDerivation rec { + version = "0.2"; + name = "sselp-${version}"; + + src = fetchurl { + url = "http://dl.suckless.org/tools/${name}.tar.gz"; + sha256 = "08mqp00lrh1chdrbs18qr0xv63h866lkmfj87kfscwdm1vn9a3yd"; + }; + + buildInputs = [ libX11 ]; + + patchPhase = '' + sed -i "s@/usr/local@$out@g" config.mk + sed -i "s@/usr/X11R6/include@${libX11}/include@g" config.mk + sed -i "s@/usr/X11R6/lib@${libX11}/lib@g" config.mk + ''; + + meta = { + homepage = "http://tools.suckless.org/sselp"; + description = "Prints the X selection to stdout, usefull in scripts"; + license = stdenv.lib.licenses.mit; + maintainers = [stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/X11/virtualgl/default.nix b/pkgs/tools/X11/virtualgl/default.nix index 3ae0920b9a72..ceeadbaafaa7 100644 --- a/pkgs/tools/X11/virtualgl/default.nix +++ b/pkgs/tools/X11/virtualgl/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.virtualgl.org/; description = "X11 GL rendering in a remote computer with full 3D hw acceleration"; - license = "free"; # many parts under different free licenses + license = stdenv.lib.licenses.free; # many parts under different free licenses }; } diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index 52ddb5a0f6b1..a0b3283bb04c 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "xdg-utils-1.1.0-rc1"; - + src = fetchurl { url = "http://portland.freedesktop.org/download/${name}.tar.gz"; sha256 = "00lisw4x43sp189lb7dz46j2l09y5v2fijk3d0sxx3mvwj55a1bv"; @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { postInstall = '' substituteInPlace $out/bin/xdg-mime --replace /usr/bin/file ${file}/bin/file ''; - + meta = { homepage = http://portland.freedesktop.org/wiki/; description = "A set of command line tools that assist applications with a variety of desktop integration tasks"; - license = "free"; + license = stdenv.lib.licenses.free; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/X11/xdotool/default.nix b/pkgs/tools/X11/xdotool/default.nix index c0acb2f70c84..9224c3b2d9cd 100644 --- a/pkgs/tools/X11/xdotool/default.nix +++ b/pkgs/tools/X11/xdotool/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, libX11, perl, libXtst, xextproto, libXi }: +{ stdenv, fetchurl, libX11, perl, libXtst, xextproto, libXi, libXinerama }: -let version = "2.20101012.3049"; in +let version = "2.20110530.1"; in stdenv.mkDerivation { name = "xdotool-${version}"; src = fetchurl { url = "http://semicomplete.googlecode.com/files/xdotool-${version}.tar.gz"; - sha256 = "0amkb1zvdk0gj7va3rjw9arbyj8pgprkdik05yl6rghq21q076ls"; + sha256 = "0rxggg1cy7nnkwidx8x2w3c5f3pk6dh2b6q0q7hp069r3n5jrd77"; }; - buildInputs = [ libX11 perl libXtst xextproto libXi ]; + buildInputs = [ libX11 perl libXtst xextproto libXi libXinerama ]; configurePhase = '' export makeFlags="PREFIX=$out"; diff --git a/pkgs/tools/X11/xlaunch/default.nix b/pkgs/tools/X11/xlaunch/default.nix index b97c9def8227..06dfd28b7399 100644 --- a/pkgs/tools/X11/xlaunch/default.nix +++ b/pkgs/tools/X11/xlaunch/default.nix @@ -3,57 +3,61 @@ # !!! What does this package do, and does it belong in Nixpkgs? stdenv.mkDerivation { - name = "xlaunch"; - inherit xorgserver; - buildCommand = " - cat << EOF > realizeuid.c - #include <sys/types.h> - #include <unistd.h> - #include <stdio.h> - int main(int argc, char ** argv, char ** envp) - { - uid_t a,b,c; - int i; - char *nargv[10000]; - char arg1 [10]; - nargv[0]=argv[0]; - for (i=1; i<=argc; i++){ - nargv[i+1]=argv[i]; - } - nargv[1]=arg1; - getresuid (&a,&b,&c); - snprintf(arg1,8,\"%d\",a); - setresuid(c,c,c); - execve(\"\$out/libexec/xlaunch\", nargv, envp); - } + name = "xlaunch"; + inherit xorgserver; + buildCommand = " + cat << EOF > realizeuid.c + #include <sys/types.h> + #include <unistd.h> + #include <stdio.h> + int main(int argc, char ** argv, char ** envp) + { + uid_t a,b,c; + int i; + char *nargv[10000]; + char arg1 [10]; + nargv[0]=argv[0]; + for (i=1; i<=argc; i++){ + nargv[i+1]=argv[i]; + } + nargv[1]=arg1; + getresuid (&a,&b,&c); + snprintf(arg1,8,\"%d\",a); + setresuid(c,c,c); + execve(\"\$out/libexec/xlaunch\", nargv, envp); + } EOF - mkdir -p \$out/bin - mkdir -p \$out/libexec - gcc realizeuid.c -o \$out/bin/xlaunch - echo '#! ${stdenv.shell} - USER=\$(egrep '\\''^[-a-z0-9A-Z_]*:[^:]*:'\\''\$1'\\'':'\\'' /etc/passwd | sed -e '\\''s/:.*//'\\'' ) - shift - case \"\$1\" in - :*) export _display=\"\$1\"; - shift - esac - _display=\${_display:-:0} - _display=\${_display#:} - echo Using :\$_display - if [ -n \"\$DO_X_RESET\" ]; then - RESET_OPTION=\"-once\" - else - RESET_OPTION=\"-noreset\" - fi; - XCMD=\"\$(egrep \"^Environment=\" /etc/systemd/system/display-manager.service | sed -e \"s/Environment=/ export /\" | sed -e '\\''s/#.*//'\\'' ; echo export _XARGS_=\\\$\\( grep xserver_arguments \\\$SLIM_CFGFILE \\| sed -e s/xserver_arguments// \\| sed -e s/:0/:\${_display}/ \\| sed -e s/vt7/vt\$((7+_display))/ \\) ; echo ${xorgserver}/bin/X \\\$_XARGS_ \$RESET_OPTION )\" - PRE_XCMD=\"\$(egrep \"^ExecStartPre=\" /etc/systemd/system/display-manager.service | sed -e \"\s/ExecStartPre=//\")\" - echo \"\$PRE_XCMD\" - echo \"\$PRE_XCMD\" | bash - echo \"\$XCMD\" - echo \"\$XCMD\" | bash & - while ! test -e /tmp/.X11-unix/X\$_display &>/dev/null ; do sleep 0.5; done - su -l \${USER:-identityless-shelter} -c \"DISPLAY=:\$_display \$*\"; - ' >\$out/libexec/xlaunch - chmod a+x \$out/libexec/xlaunch - "; + mkdir -p \$out/bin + mkdir -p \$out/libexec + gcc realizeuid.c -o \$out/bin/xlaunch + echo '#! ${stdenv.shell} + USER=\$(egrep '\\''^[-a-z0-9A-Z_]*:[^:]*:'\\''\$1'\\'':'\\'' /etc/passwd | sed -e '\\''s/:.*//'\\'' ) + shift + case \"\$1\" in + :*) export _display=\"\$1\"; + shift + esac + _display=\${_display:-:0} + _display=\${_display#:} + echo Using :\$_display + if [ -n \"\$DO_X_RESET\" ]; then + RESET_OPTION=\"-once\" + else + RESET_OPTION=\"-noreset\" + fi; + XCMD=\"\$(egrep \"^Environment=\" /etc/systemd/system/display-manager.service | sed -e \"s/Environment=/ export /\" | sed -e '\\''s/#.*//'\\'' ; echo export _XARGS_=\\\$\\( grep xserver_arguments \\\$SLIM_CFGFILE \\| sed -e s/xserver_arguments// \\| sed -e s/:0/:\${_display}/ \\| sed -e s/vt7/vt\$((7+_display))/ \\) ; echo ${xorgserver}/bin/X \\\$_XARGS_ \$RESET_OPTION )\" + PRE_XCMD=\"\$(egrep \"^ExecStartPre=\" /etc/systemd/system/display-manager.service | sed -e \"\s/ExecStartPre=//\")\" + echo \"\$PRE_XCMD\" + echo \"\$PRE_XCMD\" | bash + echo \"\$XCMD\" + echo \"\$XCMD\" | bash & + while ! test -e /tmp/.X11-unix/X\$_display &>/dev/null ; do sleep 0.5; done + su -l \${USER:-identityless-shelter} -c \"DISPLAY=:\$_display \$*\"; + ' >\$out/libexec/xlaunch + chmod a+x \$out/libexec/xlaunch + "; + meta = { + description = ''Wrapper to parse NixOS-specific X environment and launch a custom X session''; + maintainers = [ stdenv.lib.maintainers.raskin ]; + }; } diff --git a/pkgs/tools/X11/xmacro/default.nix b/pkgs/tools/X11/xmacro/default.nix index 12bb2903107c..ca010063cb19 100644 --- a/pkgs/tools/X11/xmacro/default.nix +++ b/pkgs/tools/X11/xmacro/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { src = fetchurl { url = mirror://sourceforge/xmacro/xmacro-pre0.3-20000911.tar.gz; - md5 = "d2956b82f3d5380e58a75ccc721fb746"; + sha256 = "04gzgxhp8bx98zrcvmsm7mn72r9g9588skbf64cqvkp4yz6kfqhb"; }; preBuild = '' diff --git a/pkgs/tools/X11/xvkbd/default.nix b/pkgs/tools/X11/xvkbd/default.nix new file mode 100644 index 000000000000..37af62e8cdfa --- /dev/null +++ b/pkgs/tools/X11/xvkbd/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, imake, libXt, libXaw, libXtst, libXi, libXpm, xextproto, gccmakedep, Xaw3d }: + +stdenv.mkDerivation rec { + name = "xvkbd-${version}"; + version = "3.5"; + src = fetchurl { + url = "http://homepage3.nifty.com/tsato/xvkbd/xvkbd-${version}.tar.gz"; + sha256 = "1vlg5gl1bflx80prvwg6glw0g4fvbi6k3cy0pya0h7cz6nxbs6c8"; + }; + + buildInputs = [ imake libXt libXaw libXtst xextproto libXi Xaw3d libXpm gccmakedep ]; + installTargets = [ "install" "install.man" ]; + preBuild = '' + makeFlagsArray=( BINDIR=$out/bin XAPPLOADDIR=$out/etc/X11/app-defaults MANPATH=$out/man ) + ''; + configurePhase = '' xmkmf -a ''; + + meta = with stdenv.lib; { + description = "virtual keyboard for X window system"; + longDescription = '' + xvkbd is a virtual (graphical) keyboard program for X Window System which provides + facility to enter characters onto other clients (softwares) by clicking on a + keyboard displayed on the screen. + ''; + homepage = http://homepage3.nifty.com/tsato/xvkbd/; + license = licenses.gpl2Plus; + maintainers = [ maintainers.bennofs ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index a25303190145..9b9ae350d2c9 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -2,12 +2,12 @@ pythonPackages.buildPythonPackage rec { name = "awscli-${version}"; - version = "1.2.13"; + version = "1.5.5"; namePrefix = ""; src = fetchurl { url = "https://github.com/aws/aws-cli/archive/${version}.tar.gz"; - sha256 = "1mpy1q9y5qiq1fr2xc98sn1njx0p0b1g21p0rdh4ccsf9w7i0rpb"; + sha256 = "1xqaav4g07jzv8i4hkf52dimgmc0zv0fj9rbvz5kiln8470qzifw"; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/admin/sec/default.nix b/pkgs/tools/admin/sec/default.nix index d8c60c0ec3c8..41c83344c14a 100644 --- a/pkgs/tools/admin/sec/default.nix +++ b/pkgs/tools/admin/sec/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://simple-evcorr.sourceforge.net/"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; description = "Simple Event Correlator"; maintainers = [ stdenv.lib.maintainers.tv ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/archivers/atool/default.nix b/pkgs/tools/archivers/atool/default.nix index 1db7a7a42ebc..7e2934a8f88a 100644 --- a/pkgs/tools/archivers/atool/default.nix +++ b/pkgs/tools/archivers/atool/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, perl}: +{stdenv, fetchurl, perl, bash}: stdenv.mkDerivation rec { name = "atool-0.39.0"; @@ -8,6 +8,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ perl ]; + configureScript = "${bash}/bin/bash configure"; meta = { homepage = http://www.nongnu.org/atool; diff --git a/pkgs/tools/archivers/cromfs/default.nix b/pkgs/tools/archivers/cromfs/default.nix index fdba02d12b72..342c975fa1f5 100644 --- a/pkgs/tools/archivers/cromfs/default.nix +++ b/pkgs/tools/archivers/cromfs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, fuse, perl }: stdenv.mkDerivation rec { - name = "cromfs-1.5.10.1"; + name = "cromfs-1.5.10.2"; src = fetchurl { url = "http://bisqwit.iki.fi/src/arch/${name}.tar.bz2"; - sha256 = "0fg6vnbxr5jk4gqj31yqc9fj1gp3bj955qhxav28nvc6sbql7ac2"; + sha256 = "0xy2x1ws1qqfp7hfj6yzm80zhrxzmhn0w2yns77im1lmd2h18817"; }; patchPhase = ''sed -i 's@/bin/bash@/bin/sh@g' configure''; diff --git a/pkgs/tools/archivers/dar/default.nix b/pkgs/tools/archivers/dar/default.nix index 17b0b77f8724..f964aded2a42 100644 --- a/pkgs/tools/archivers/dar/default.nix +++ b/pkgs/tools/archivers/dar/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib, bzip2, openssl, attr, lzo, libgcrypt, e2fsprogs }: stdenv.mkDerivation rec { - name = "dar-2.4.11"; + name = "dar-2.4.15"; src = fetchurl { url = "mirror://sourceforge/dar/${name}.tar.gz"; - sha256 = "0psahvnrkljqg9507dk0vq05w8vilpm98igjrcjkqdirqcfd2py1"; + sha256 = "1x694g7yhach8swkjwbkdryp74r3rh0d2lrsa8mnf0azp0mrj1ln"; }; buildInputs = [ zlib bzip2 openssl lzo libgcrypt ] diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index cd0cea13a14d..0bf1ec736fca 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { description = "A port of the 7-zip archiver"; # license = stdenv.lib.licenses.lgpl21Plus; + "unRAR restriction" platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.raskin ]; }; } diff --git a/pkgs/tools/archivers/rpmextract/default.nix b/pkgs/tools/archivers/rpmextract/default.nix new file mode 100644 index 000000000000..c5f982c955cc --- /dev/null +++ b/pkgs/tools/archivers/rpmextract/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, rpm, cpio, substituteAll }: + +stdenv.mkDerivation rec { + name = "rpmextract"; + + buildCommand = '' + install -Dm755 $script $out/bin/rpmextract + ''; + + script = substituteAll { + src = ./rpmextract.sh; + inherit rpm cpio; + }; + + meta = with stdenv.lib; { + description = "Script to extract RPM archives"; + platforms = platforms.all; + license = licenses.gpl2; + maintainers = maintainers.abbradar; + }; +} diff --git a/pkgs/tools/archivers/rpmextract/rpmextract.sh b/pkgs/tools/archivers/rpmextract/rpmextract.sh new file mode 100644 index 000000000000..04f57f6e6045 --- /dev/null +++ b/pkgs/tools/archivers/rpmextract/rpmextract.sh @@ -0,0 +1,10 @@ +#!/bin/sh -e + +if [ "$1" = "" ]; then + echo "usage: rpmextract package_name..." 1>&2 + exit 1 +fi + +for i in "$@"; do + @rpm@/bin/rpm2cpio "$i" | @cpio@/bin/cpio -idv +done diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/tools/archivers/sharutils/default.nix index f19564e4ad91..281a148a5ca4 100644 --- a/pkgs/tools/archivers/sharutils/default.nix +++ b/pkgs/tools/archivers/sharutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext }: +{ stdenv, fetchurl, gettext, coreutils }: stdenv.mkDerivation rec { name = "sharutils-4.11.1"; @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { '' # Fix for building on Glibc 2.16. Won't be needed once the # gnulib in sharutils is updated. - sed -i '/gets is a security hole/d' lib/stdio.in.h + sed -i ${stdenv.lib.optionalString (stdenv.isBSD && stdenv.gcc.nativeTools) "''"} '/gets is a security hole/d' lib/stdio.in.h ''; # GNU Gettext is needed on non-GNU platforms. - buildInputs = [ gettext ]; + buildInputs = [ gettext coreutils ]; doCheck = true; diff --git a/pkgs/tools/archivers/unarj/default.nix b/pkgs/tools/archivers/unarj/default.nix index 0852674e8c89..546f398bec3a 100644 --- a/pkgs/tools/archivers/unarj/default.nix +++ b/pkgs/tools/archivers/unarj/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "unarj-2.63a"; - + src = fetchurl { url = http://www.ibiblio.org/pub/Linux/utils/compress/unarj-2.63a.tar.gz; sha256 = "0j4sn57fq2p23pcq4ck06pm618q4vq09wgm89ilfn4c9l9x2ky1k"; @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { description = "Unarchiver of ARJ files"; - license = "free"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix index f939c968c44d..0466b817f1b6 100644 --- a/pkgs/tools/archivers/unzip/default.nix +++ b/pkgs/tools/archivers/unzip/default.nix @@ -1,14 +1,21 @@ { stdenv, fetchurl, bzip2 , enableNLS ? false, libnatspec }: -stdenv.mkDerivation ({ +stdenv.mkDerivation { name = "unzip-6.0"; - + src = fetchurl { url = mirror://sourceforge/infozip/unzip60.tar.gz; sha256 = "0dxx11knh3nk95p2gg2ak777dd11pr7jx5das2g49l262scrcv83"; }; + patches = stdenv.lib.optional enableNLS + (fetchurl { + url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-arch/unzip/files/unzip-6.0-natspec.patch?revision=1.1"; + name = "unzip-6.0-natspec.patch"; + sha256 = "67ab260ae6adf8e7c5eda2d1d7846929b43562943ec4aff629bd7018954058b1"; + }); + nativeBuildInputs = [ bzip2 ]; buildInputs = [ bzip2 ] ++ stdenv.lib.optional enableNLS libnatspec; @@ -24,19 +31,12 @@ stdenv.mkDerivation ({ installFlags = "prefix=$(out)"; + setupHook = ./setup-hook.sh; + meta = { homepage = http://www.info-zip.org; description = "An extraction utility for archives compressed in .zip format"; - license = "free"; # http://www.info-zip.org/license.html + license = stdenv.lib.licenses.free; # http://www.info-zip.org/license.html platforms = stdenv.lib.platforms.all; }; -} // (if enableNLS then { - patches = - [ ( fetchurl { - url = - "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-arch/unzip/files/unzip-6.0-natspec.patch?revision=1.1"; - name = "unzip-6.0-natspec.patch"; - sha256 = "67ab260ae6adf8e7c5eda2d1d7846929b43562943ec4aff629bd7018954058b1"; - }) - ]; -} else {})) +} diff --git a/pkgs/tools/archivers/unzip/setup-hook.sh b/pkgs/tools/archivers/unzip/setup-hook.sh new file mode 100644 index 000000000000..4055d2fab512 --- /dev/null +++ b/pkgs/tools/archivers/unzip/setup-hook.sh @@ -0,0 +1,5 @@ +unpackCmdHooks+=(_tryUnzip) +_tryUnzip() { + if ! [[ "$curSrc" =~ \.zip$ ]]; then return 1; fi + unzip -qq "$curSrc" +} diff --git a/pkgs/tools/archivers/xarchive/default.nix b/pkgs/tools/archivers/xarchive/default.nix index 2b60bef197ab..ed60e3147a8f 100644 --- a/pkgs/tools/archivers/xarchive/default.nix +++ b/pkgs/tools/archivers/xarchive/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "A GTK+ front-end for command line archiving tools"; - mainatainers = [ stdenv.lib.maintainers.iElectric ]; + maintainers = [ stdenv.lib.maintainers.iElectric ]; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix index 9bf9ee0d2245..6bcddfa72f1b 100644 --- a/pkgs/tools/audio/gvolicon/default.nix +++ b/pkgs/tools/audio/gvolicon/default.nix @@ -4,8 +4,8 @@ stdenv.mkDerivation { name = "gvolicon"; src = fetchgit { url = "https://github.com/Unia/gvolicon"; - rev = "26343415de836e0b05aa0b480c0c69cc2ed9e419"; - sha256 = "68858840a45b5f74803e85116c6219f805d6d944c00354662889549910856cdd"; + rev = "c04cafb88124e1e5edc61dd52f76bf13381d5167"; + sha256 = "31cf770dca0d216e3108b258b4c150cbeb3b127002d53fd6ddddfcf9e3e293aa"; }; buildInputs = [ pkgconfig makeWrapper alsaLib gnome3.gtk ]; @@ -18,10 +18,10 @@ stdenv.mkDerivation { ''; meta = { - description = "A simple and lightweight volume icon that sits in your system tray."; + description = "A simple and lightweight volume icon that sits in your system tray"; homepage = https://github.com/Unia/gvolicon; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.bennofs ]; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix new file mode 100644 index 000000000000..30b608c5ba4d --- /dev/null +++ b/pkgs/tools/audio/liquidsoap/full.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, which, pkgconfig +, ocaml, ocamlPackages +, libao, portaudio, alsaLib, pulseaudio, jack2 +, libsamplerate, libmad, taglib, lame, libogg +, libvorbis, speex, libtheora, libopus, fdk_aac +, faad2, flac, ladspaH, ffmpeg, frei0r, dssi +, }: + +let + version = "1.1.1"; + + packageFilters = map (p: "-e '/ocaml-${p}/d'" ) + [ "gstreamer" "shine" "aacplus" "schroedinger" + "voaacenc" "soundtouch" "gavl" "lo" + ]; +in +stdenv.mkDerivation { + name = "liquidsoap-full-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/project/savonet/liquidsoap/${version}/liquidsoap-${version}-full.tar.gz"; + sha256 = "1w1grgja5yibph90vsxj7ffkpz1sgzmr54jj52s8889dpy609wqa"; + }; + + preConfigure = "sed ${toString packageFilters} PACKAGES.default > PACKAGES"; + configureFlags = [ "--localstatedir=/var" ]; + + buildInputs = + [ which ocaml ocamlPackages.findlib pkgconfig + libao portaudio alsaLib pulseaudio jack2 + libsamplerate libmad taglib lame libogg + libvorbis speex libtheora libopus fdk_aac + faad2 flac ladspaH ffmpeg frei0r dssi + ocamlPackages.xmlm ocamlPackages.ocaml_pcre + ocamlPackages.camomile + ]; + + meta = with stdenv.lib; { + description = "Swiss-army knife for multimedia streaming"; + homepage = http://liquidsoap.fm/; + maintainers = with maintainers; [ emery ]; + license = licenses.gpl2; + platform = ocaml.meta.platforms; + }; +} diff --git a/pkgs/tools/audio/mpdcron/default.nix b/pkgs/tools/audio/mpdcron/default.nix index 61553566d6c9..c8f485ed5daf 100644 --- a/pkgs/tools/audio/mpdcron/default.nix +++ b/pkgs/tools/audio/mpdcron/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, autoconf, automake, libtool, pkgconfig, glib, libdaemon -, mpd_clientlib, curl, sqlite, ruby, rubyLibs, libnotify }: +, mpd_clientlib, curl, sqlite, ruby, rubyLibs, libnotify, haskellPackages }: stdenv.mkDerivation rec { version = "20130809"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; meta = { - description = "A cron like daemon for mpd."; + description = "A cron like daemon for mpd"; homepage = http://alip.github.io/mpdcron/; license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; unix; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ autoconf automake libtool pkgconfig glib libdaemon + [ autoconf automake libtool pkgconfig glib libdaemon haskellPackages.pandoc mpd_clientlib curl sqlite ruby rubyLibs.nokogiri libnotify ]; preConfigure = '' diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix new file mode 100644 index 000000000000..500c8add4c63 --- /dev/null +++ b/pkgs/tools/audio/pasystray/default.nix @@ -0,0 +1,27 @@ +{stdenv, fetchurl, unzip, autoconf, automake, pkgconfig, gnome_icon_theme, avahi, gtk3, libnotify, pulseaudio, x11}: + +stdenv.mkDerivation rec { + name = "pasystray-0.4.0"; + + src = fetchurl { + url = "https://github.com/christophgysin/pasystray/archive/${name}.zip"; + sha256 = "1gpb7yqcxqglv50iqbkg2lg3r0z07jm4ir2zqmvns6sgddks590w"; + }; + + buildInputs = [ unzip autoconf automake pkgconfig gnome_icon_theme avahi gtk3 libnotify pulseaudio x11 ]; + + preConfigure = '' + aclocal + autoconf + autoheader + automake --add-missing + ''; + + meta = with stdenv.lib; { + description = "PulseAudio system tray"; + homepage = "https://github.com/christophgysin/pasystray"; + license = licenses.lgpl21Plus; + maintainers = [ maintainers.exlevan ]; + platfoms = platforms.linux; + }; +} diff --git a/pkgs/tools/audio/volumeicon/default.nix b/pkgs/tools/audio/volumeicon/default.nix index 0de3af28c19e..92091c18df35 100644 --- a/pkgs/tools/audio/volumeicon/default.nix +++ b/pkgs/tools/audio/volumeicon/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 pkgconfig intltool alsaLib ]; meta = with stdenv.lib; { - description = "A lightweight volume control that sits in your systray."; - homepage = "http://softwarebakery.com/maato/volumeicon.html"; + description = "A lightweight volume control that sits in your systray"; + homepage = http://softwarebakery.com/maato/volumeicon.html; platforms = pkgs.lib.platforms.linux; maintainers = with maintainers; [ bobvanderlinden ]; license = pkgs.lib.licenses.gpl3; diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix new file mode 100644 index 000000000000..5ac59327c4b1 --- /dev/null +++ b/pkgs/tools/backup/bareos/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchgit, pkgconfig, nettools, gettext, readline, openssl, python +, ncurses ? null +, sqlite ? null, postgresql ? null, mysql ? null, libcap ? null +, zlib ? null, lzo ? null, acl ? null, ceph ? null +}: + +assert sqlite != null || postgresql != null || mysql != null; + +with stdenv.lib; +stdenv.mkDerivation rec { + name = "bareos-${version}"; + version = "14.2.1"; + + src = fetchgit { + url = "git://github.com/bareos/bareos"; + rev = "refs/tags/Release/${version}"; + sha256 = "0m7v1szi45m71zjhj3inn5hh9f4529slhiihm88rfw8006aqb6ly"; + }; + + buildInputs = [ + pkgconfig nettools gettext readline openssl python + ncurses sqlite postgresql mysql libcap zlib lzo acl ceph + ]; + + configureFlags = [ + "--exec-prefix=\${out}" + "--with-openssl=${openssl}" + "--with-python=${python}" + "--with-readline=${readline}" + "--enable-ndmp" + "--enable-lmdb" + ] ++ optional (sqlite != null) "--with-sqlite3=${sqlite}" + ++ optional (postgresql != null) "--with-postgresql=${postgresql}" + ++ optional (mysql != null) "--with-mysql=${mysql}"; + + meta = with stdenv.lib; { + homepage = http://www.bareos.org/; + description = "a fork of the bacula project."; + license = licenses.agpl3; + platforms = platforms.unix; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index 0f8c46e2dc31..41e40e799547 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -2,14 +2,14 @@ , lockfile, setuptools }: let - version = "0.6.24"; + version = "0.6.25"; in stdenv.mkDerivation { name = "duplicity-${version}"; src = fetchurl { url = "http://code.launchpad.net/duplicity/0.6-series/${version}/+download/duplicity-${version}.tar.gz"; - sha256 = "0l14nrhbgkyjgvh339bbhnm6hrdwrjadphq1jmpi0mcgcdbdfh8x"; + sha256 = "098p5j7clbaya3yq7q05n6xv7h1qs8iffxwvlisyfpqwpi5g8i5c"; }; installPhase = '' diff --git a/pkgs/tools/backup/duply/default.nix b/pkgs/tools/backup/duply/default.nix index 4fbf871efaf8..52074db4ba20 100644 --- a/pkgs/tools/backup/duply/default.nix +++ b/pkgs/tools/backup/duply/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation { - name = "duply-1.7.3"; + name = "duply-1.9.1"; src = fetchurl { - url = "mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/1.7.x/duply_1.7.3.tgz"; - sha256 = "1lq5gwz69l8g4ki4anvmjdngbs9nin124j1zb9kbcnqj0s5jkbp0"; + url = "mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/1.9.x/duply_1.9.1.tgz"; + sha256 = "1igg8nc0i1xn8k1xxmphsg019b1yx8ln86hhqm6f4pd565d1rwg5"; }; buildInputs = [ txt2man makeWrapper ]; diff --git a/pkgs/tools/backup/httrack/default.nix b/pkgs/tools/backup/httrack/default.nix index fc5b83305224..c09ee6a52f79 100644 --- a/pkgs/tools/backup/httrack/default.nix +++ b/pkgs/tools/backup/httrack/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, zlib, openssl }: stdenv.mkDerivation rec { - version = "3.48.19"; + version = "3.48.20"; name = "httrack-${version}"; src = fetchurl { url = "http://mirror.httrack.com/httrack-${version}.tar.gz"; - sha256 = "1zlayvl6x0ck1g5rvmj7cc88w0an5f4y93r3g5l10hhhl87cvw0n"; + sha256 = "129cpf324ihqxc8mvvkqjfanl17g60zfiqy1zx8ri56dkrg52mii"; }; buildInputs = [ zlib openssl ]; diff --git a/pkgs/tools/backup/rdiff-backup/default.nix b/pkgs/tools/backup/rdiff-backup/default.nix index 58affe10e4e1..47db1a5d4b27 100644 --- a/pkgs/tools/backup/rdiff-backup/default.nix +++ b/pkgs/tools/backup/rdiff-backup/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation { python ./setup.py install --prefix=$out sed -i $out/bin/rdiff-backup -e \ "/import sys/ asys.path += [ \"$out/lib/python2.7/site-packages/\" ]" + sed -i $out/bin/rdiff-backup-statistics -e \ + "/import .*sys/ asys.path += [ \"$out/lib/python2.7/site-packages/\" ]" ''; buildInputs = [ python librsync gnused ]; @@ -21,6 +23,7 @@ stdenv.mkDerivation { description = "backup system trying to combine best a mirror and an incremental backup system"; homepage = http://rdiff-backup.nongnu.org/; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.all; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/tools/backup/rsnapshot/git.nix b/pkgs/tools/backup/rsnapshot/git.nix new file mode 100644 index 000000000000..d1025a11d29c --- /dev/null +++ b/pkgs/tools/backup/rsnapshot/git.nix @@ -0,0 +1,52 @@ +{ fetchFromGitHub, stdenv, writeText, perl, openssh, rsync, logger, + configFile ? "/etc/rsnapshot.conf" }: + +let patch = writeText "rsnapshot-config.patch" '' +--- rsnapshot-program.pl 2013-10-05 20:31:08.715991442 +0200 ++++ rsnapshot-program.pl 2013-10-05 20:31:42.496193633 +0200 +@@ -383,7 +383,7 @@ + } + + # set global variable +- $config_file = $default_config_file; ++ $config_file = '${configFile}'; + } + + # accepts no args +''; +in +stdenv.mkDerivation rec { + name = "rsnapshot-1.4git"; + src = fetchFromGitHub { + owner = "DrHyde"; + repo = "rsnapshot"; + rev = "1047cbb57937c29233388e2fcd847fecd3babe74"; + sha256 = "173y9q89dp4zf7nysqhjp3i2m086n7qdpawb9vx0ml5zha6mxf2p"; + }; + + propagatedBuildInputs = [perl openssh rsync logger]; + + patchPhase = '' + substituteInPlace "Makefile.in" --replace \ + "/usr/bin/pod2man" "${perl}/bin/pod2man" + patch -p0 <${patch} + ''; + + # I still think this is a good idea, but it currently fails in the chroot because it checks + # that things are writable and so on. + #checkPhase = '' + # if [ -f "${configFile}" ] + # then + # ${perl}/bin/perl -w ./rsnapshot configtest + # else + # echo File "${configFile}" does not exist, not checking + # fi + #''; + + meta = with stdenv.lib; { + description = "A filesystem snapshot utility for making backups of local and remote systems"; + homepage = http://rsnapshot.org/; + license = stdenv.lib.licenses.gpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/bluetooth/obexd/default.nix b/pkgs/tools/bluetooth/obexd/default.nix index 47db0877dd20..f900a81caa0e 100644 --- a/pkgs/tools/bluetooth/obexd/default.nix +++ b/pkgs/tools/bluetooth/obexd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, dbus, openobex, bluez, libical }: stdenv.mkDerivation rec { - name = "obexd-0.47"; + name = "obexd-0.48"; src = fetchurl { - url = "mirror://kernel/linux/bluetooth/${name}.tar.gz"; - sha256 = "15zw008098qr5az9y1c010yv8gkw1f6hi3mnfcvpmwxwh23kfh4i"; + url = "mirror://kernel/linux/bluetooth/${name}.tar.bz2"; + sha256 = "1i20dnibvnq9lnkkhajr5xx3kxlwf9q5c4jm19kyb0q1klzgzlb8"; }; buildInputs = [ glib dbus.libs openobex bluez libical ]; diff --git a/pkgs/tools/bluetooth/openobex/default.nix b/pkgs/tools/bluetooth/openobex/default.nix index fc4d8611f877..7baf1ac3ed98 100644 --- a/pkgs/tools/bluetooth/openobex/default.nix +++ b/pkgs/tools/bluetooth/openobex/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { patchPhase = '' sed -i "s!/lib/udev!$out/lib/udev!" udev/CMakeLists.txt + sed -i "/if ( PKGCONFIG_UDEV_FOUND )/,/endif ( PKGCONFIG_UDEV_FOUND )/d" udev/CMakeLists.txt ''; meta = { diff --git a/pkgs/tools/cd-dvd/xorriso/default.nix b/pkgs/tools/cd-dvd/xorriso/default.nix index 218ea9a1e7ff..c5595fab2e0b 100644 --- a/pkgs/tools/cd-dvd/xorriso/default.nix +++ b/pkgs/tools/cd-dvd/xorriso/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libcdio, zlib, bzip2, readline, acl, attr }: stdenv.mkDerivation rec { - name = "xorriso-1.3.4"; + name = "xorriso-1.3.8"; src = fetchurl { url = "mirror://gnu/xorriso/${name}.tar.gz"; - sha256 = "0wvxbvkpdydcbmqi9xz7nv8cna6vp9726ahmmxxyx56cz4xifr4x"; + sha256 = "0zhhj9lr9z7hnb2alac54mc28w1l0mbanphhpmy3ylsi8rih84lh"; }; doCheck = true; diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index 55fca6ca3cb9..256f574c2e0c 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation { sharedLibrary = !stdenv.isDarwin && !(stdenv ? isDietLibC) && !(stdenv ? isStatic) && stdenv.system != "i686-cygwin" && !linkStatic; + patchPhase = stdenv.lib.optionalString stdenv.isDarwin "substituteInPlace Makefile --replace 'CC=gcc' 'CC=clang'"; + preConfigure = "substituteInPlace Makefile --replace '$(PREFIX)/man' '$(PREFIX)/share/man'"; makeFlags = if linkStatic then "LDFLAGS=-static" else ""; diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index cc304d9aa1e5..196fce0d98ac 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, less }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "gzip-1.6"; diff --git a/pkgs/tools/compression/lbzip2/default.nix b/pkgs/tools/compression/lbzip2/default.nix new file mode 100644 index 000000000000..73bc987908d7 --- /dev/null +++ b/pkgs/tools/compression/lbzip2/default.nix @@ -0,0 +1,18 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "lbzip2-2.5"; + + src = fetchurl { + url = "http://archive.lbzip2.org/${name}.tar.gz"; + sha256 = "1sahaqc5bw4i0iyri05syfza4ncf5cml89an033fspn97klmxis6"; + }; + + meta = with stdenv.lib; { + homepage = http://lbzip2.org/; + description = "parallel bzip2 compression utility"; + license = licenses.gpl3; + maintainers = maintainers.abbradar; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix index 2c6907fa373e..b3d407c98ef1 100644 --- a/pkgs/tools/compression/lzip/default.nix +++ b/pkgs/tools/compression/lzip/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, texinfo }: stdenv.mkDerivation rec { - name = "lzip-1.15"; + name = "lzip-1.16"; buildInputs = [ texinfo ]; src = fetchurl { url = "mirror://savannah/lzip/${name}.tar.gz"; - sha256 = "1dh5vmj5apizfawnsm50y7z064yx7cz3313przph16gwd3dgrlvw"; + sha256 = "0l9724rw1l3hg2ldr3n7ihqich4m9nc6y7l302bvdj4jmxdw530j"; }; configureFlags = "CPPFLAGS=-DNDEBUG CFLAGS=-O3 CXXFLAGS=-O3"; diff --git a/pkgs/tools/compression/ncompress/default.nix b/pkgs/tools/compression/ncompress/default.nix index 937cf9875132..3d3ad80e25de 100644 --- a/pkgs/tools/compression/ncompress/default.nix +++ b/pkgs/tools/compression/ncompress/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://ncompress.sourceforge.net/; - license = "public domain"; + license = stdenv.lib.licenses.publicDomain; description = "A fast, simple LZW file compressor"; }; } diff --git a/pkgs/tools/compression/pbzip2/default.nix b/pkgs/tools/compression/pbzip2/default.nix index b180ad61c75f..3c442e221397 100644 --- a/pkgs/tools/compression/pbzip2/default.nix +++ b/pkgs/tools/compression/pbzip2/default.nix @@ -1,14 +1,14 @@ {stdenv, fetchurl, bzip2}: -let name = "pbzip2"; - version = "1.0.5"; +let major = "1.1"; + version = "${major}.9"; in -stdenv.mkDerivation { - name = name + "-" + version; +stdenv.mkDerivation rec { + name = "pbzip2-${version}"; src = fetchurl { - url = "http://compression.ca/${name}/${name}-${version}.tar.gz"; - sha256 = "0vc9r6b2djhpwslavi2ykv6lk8pwf4lqb107lmapw2q8d658qpa1"; + url = "https://launchpad.net/pbzip2/${major}/${version}/+download/${name}.tar.gz"; + sha256 = "1i7rql77ac33lz7lzrjyl9b16mqizmdkb8hv295a493f7vh1nhmx"; }; buildInputs = [ bzip2 ]; @@ -16,11 +16,11 @@ stdenv.mkDerivation { make install PREFIX=$out ''; - meta = { + meta = with stdenv.lib; { homepage = http://compression.ca/pbzip2/; description = "A parallel implementation of bzip2 for multi-core machines"; - license = "free"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = licenses.bsd2; + maintainers = with maintainers; [viric]; + platforms = with platforms; linux; }; } diff --git a/pkgs/tools/compression/pxz/_SC_ARG_MAX.patch b/pkgs/tools/compression/pxz/_SC_ARG_MAX.patch new file mode 100644 index 000000000000..fac8f1fc147c --- /dev/null +++ b/pkgs/tools/compression/pxz/_SC_ARG_MAX.patch @@ -0,0 +1,36 @@ +From b8f9827fc4de9296c7a6f5e6fdac46e070cd6cb4 Mon Sep 17 00:00:00 2001 +From: Igor Pashev <pashev.igor@gmail.com> +Date: Sat, 1 Nov 2014 18:10:05 +0300 +Subject: [PATCH] Fixed crash on Linux when stack size is unlimited + +--- + pxz.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/pxz.c b/pxz.c +index 9cb843e..52713e2 100644 +--- a/pxz.c ++++ b/pxz.c +@@ -65,7 +65,7 @@ FILE **ftemp; + char str[0x100]; + char buf[BUFFSIZE]; + char *xzcmd; +-size_t xzcmd_max; ++const size_t xzcmd_max = 10240; + + unsigned opt_complevel = 6, opt_stdout, opt_keep, opt_threads, opt_verbose; + unsigned opt_force, opt_stdout; +@@ -243,9 +243,12 @@ int main( int argc, char **argv ) { + lzma_filter filters[LZMA_FILTERS_MAX + 1]; + lzma_options_lzma lzma_options; + +- xzcmd_max = sysconf(_SC_ARG_MAX); + page_size = sysconf(_SC_PAGE_SIZE); + xzcmd = malloc(xzcmd_max); ++ if (!xzcmd) { ++ fprintf(stderr, "Failed to allocate %lu bytes for xz command.\n", xzcmd_max); ++ return -1; ++ } + snprintf(xzcmd, xzcmd_max, XZ_BINARY); + + parse_args(argc, argv); diff --git a/pkgs/tools/compression/pxz/default.nix b/pkgs/tools/compression/pxz/default.nix new file mode 100644 index 000000000000..07c3e205a982 --- /dev/null +++ b/pkgs/tools/compression/pxz/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchgit, xz, lzma }: + +let name = "pxz"; + version = "4.999.9beta+git"; +in +stdenv.mkDerivation { + name = name + "-" + version; + + src = fetchgit { + url = "https://github.com/jnovy/pxz.git"; + rev = "ae808463c2950edfdedb8fb49f95006db0a18667"; + sha256 = "0na2kw8cf0qd8l1aywlv9m3xrxnqlcwxfdwp3f7x9vxwqx3k32kc"; + }; + + buildInputs = [ lzma ]; + + patches = [ ./_SC_ARG_MAX.patch ]; + + buildPhase = '' + gcc -o pxz pxz.c -llzma \ + -fopenmp -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -O2 \ + -DPXZ_BUILD_DATE=\"nixpkgs\" \ + -DXZ_BINARY=\"${xz}/bin/xz\" \ + -DPXZ_VERSION=\"${version}\" + ''; + + installPhase = '' + mkdir -p $out/bin $out/share/man/man1 + cp pxz $out/bin + cp pxz.1 $out/share/man/man1 + ''; + + meta = { + homepage = "https://jnovy.fedorapeople.org/pxz/"; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = with stdenv.lib.maintainers; [pashev]; + description = ''Parallel XZ is a compression utility that takes advantage of + running LZMA compression of different parts of an input file on multiple + cores and processors simultaneously. Its primary goal is to utilize all + resources to speed up compression time with minimal possible influence + on compression ratio''; + }; +} diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index e1d7c26fa430..70c3f260e3c8 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/tools/compression/xz/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "xz-5.0.5"; + name = "xz-5.0.7"; src = fetchurl { url = "http://tukaani.org/xz/${name}.tar.bz2"; - sha256 = "1404i59bp6rzxya0br1q9njdv32z4sggyfrkjr7vq695hk94hv0n"; + sha256 = "05nnxl19a49h15lxzpn3fd76izrycnr7qaf9qvd408yz973iv1g8"; }; doCheck = true; # In stdenv-linux, prevent a dependency on bootstrap-tools. - preHook = "unset CONFIG_SHELL"; + preConfigure = "unset CONFIG_SHELL"; meta = { homepage = http://tukaani.org/xz/; diff --git a/pkgs/tools/compression/zdelta/default.nix b/pkgs/tools/compression/zdelta/default.nix index a07deac41486..db47cf71910c 100644 --- a/pkgs/tools/compression/zdelta/default.nix +++ b/pkgs/tools/compression/zdelta/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { builder = ./builder.sh; src = fetchurl { url = "${meta.homepage}/downloads/${name}.tar.gz"; - md5 = "c69583a64f42f69a39e297d0d27d77e5"; + sha256 = "0k6y0r9kv5qiglnr2j4a0yvfynjkvm0pyv8ly28j0pr3w6rbxrh3"; }; meta = { diff --git a/pkgs/tools/compression/zsync/default.nix b/pkgs/tools/compression/zsync/default.nix index 3732e5b17565..4606d5bf79bd 100644 --- a/pkgs/tools/compression/zsync/default.nix +++ b/pkgs/tools/compression/zsync/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://zsync.moria.org.uk/; description = "File distribution system using the rsync algorithm"; - license = "free"; + license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; all; }; diff --git a/pkgs/tools/filesystems/bcache-tools/bcache-udev-modern.patch b/pkgs/tools/filesystems/bcache-tools/bcache-udev-modern.patch new file mode 100644 index 000000000000..c6cf79785b73 --- /dev/null +++ b/pkgs/tools/filesystems/bcache-tools/bcache-udev-modern.patch @@ -0,0 +1,52 @@ +This patch does two things: +1) Drops probe-bcache, so now new util-linux detecting functionality is used. +2) Drops bcache-register, using kmod (built in udev) and moving registering device + into rule using 'sh'. +This reduces things that need to be present in initrd, replacing them with already +existing functionality and reducing overall initrd size. + +diff --git a/69-bcache.rules b/69-bcache.rules +index 5d28e70..6a52893 100644 +--- a/69-bcache.rules ++++ b/69-bcache.rules +@@ -10,15 +10,11 @@ KERNEL=="fd*|sr*", GOTO="bcache_end" + # It recognised bcache (util-linux 2.24+) + ENV{ID_FS_TYPE}=="bcache", GOTO="bcache_backing_found" + # It recognised something else; bail +-ENV{ID_FS_TYPE}=="?*", GOTO="bcache_backing_end" +- +-# Backing devices: scan, symlink, register +-IMPORT{program}="probe-bcache -o udev $tempnode" +-ENV{ID_FS_TYPE}!="bcache", GOTO="bcache_backing_end" +-ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}" ++GOTO="bcache_backing_end" + + LABEL="bcache_backing_found" +-RUN+="bcache-register $tempnode" ++RUN{builtin}+="kmod load bcache" ++RUN+="/bin/sh -c 'echo $tempnode > /sys/fs/bcache/register_quiet'" + LABEL="bcache_backing_end" + + # Cached devices: symlink +diff --git a/Makefile b/Makefile +index 3f8d87b..15638a7 100644 +--- a/Makefile ++++ b/Makefile +@@ -9,7 +9,7 @@ all: make-bcache probe-bcache bcache-super-show + + install: make-bcache probe-bcache bcache-super-show + $(INSTALL) -m0755 make-bcache bcache-super-show $(DESTDIR)${PREFIX}/sbin/ +- $(INSTALL) -m0755 probe-bcache bcache-register $(DESTDIR)$(UDEVLIBDIR)/ ++# $(INSTALL) -m0755 probe-bcache bcache-register $(DESTDIR)$(UDEVLIBDIR)/ + $(INSTALL) -m0644 69-bcache.rules $(DESTDIR)$(UDEVLIBDIR)/rules.d/ + $(INSTALL) -m0644 -- *.8 $(DESTDIR)${PREFIX}/share/man/man8/ + $(INSTALL) -D -m0755 initramfs/hook $(DESTDIR)/usr/share/initramfs-tools/hooks/bcache +diff --git a/bcache-register b/bcache-register +index 9b592bc..75b4faf 100755 +--- a/bcache-register ++++ b/bcache-register +@@ -1,4 +1,3 @@ + #!/bin/sh +-/sbin/modprobe -qba bcache + test -f /sys/fs/bcache/register_quiet && echo "$1" > /sys/fs/bcache/register_quiet + diff --git a/pkgs/tools/filesystems/bcache-tools/default.nix b/pkgs/tools/filesystems/bcache-tools/default.nix index 161383cb9de5..a4b1363d841d 100644 --- a/pkgs/tools/filesystems/bcache-tools/default.nix +++ b/pkgs/tools/filesystems/bcache-tools/default.nix @@ -19,10 +19,10 @@ stdenv.mkDerivation rec { -e "/INSTALL.*initcpio\/install/d" \ -e "/INSTALL.*dracut\/module-setup.sh/d" \ -i Makefile - - sed -e "s|/sbin/modprobe|${kmod}/sbin/modprobe|" -i bcache-register ''; + patches = [ ./bcache-udev-modern.patch ]; + preBuild = '' export makeFlags="$makeFlags PREFIX=\"$out\" UDEVLIBDIR=\"$out/lib/udev/\""; ''; diff --git a/pkgs/tools/filesystems/btrfsprogs/3.16.nix b/pkgs/tools/filesystems/btrfsprogs/3.16.nix new file mode 100644 index 000000000000..e1d4b8bd31cf --- /dev/null +++ b/pkgs/tools/filesystems/btrfsprogs/3.16.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, attr, acl, zlib, libuuid, e2fsprogs, lzo +, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }: + +let version = "3.16"; in + +stdenv.mkDerivation rec { + name = "btrfs-progs-${version}"; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; + sha256 = "0phbrgipl04q8cdj9nnshik7b6p2bg51jxb3l1gvfc04dkgm2xls"; + }; + + buildInputs = [ + attr acl zlib libuuid e2fsprogs lzo + asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt + ]; + + # for btrfs to get the rpath to libgcc_s, needed for pthread_cancel to work + NIX_CFLAGS_LINK = "-lgcc_s"; + + makeFlags = "prefix=$(out)"; + + meta = with stdenv.lib; { + description = "Utilities for the btrfs filesystem"; + homepage = https://btrfs.wiki.kernel.org/; + license = licenses.gpl2; + maintainers = with maintainers; [ raskin wkennington ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix index 619b4b9ff925..2fa815102439 100644 --- a/pkgs/tools/filesystems/btrfsprogs/default.nix +++ b/pkgs/tools/filesystems/btrfsprogs/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, attr, acl, zlib, libuuid, e2fsprogs, lzo , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }: -let version = "3.16.1"; in +let version = "3.17.2"; in stdenv.mkDerivation rec { name = "btrfs-progs-${version}"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "103ff31fn6x1r6y79hdzv5lqls68wqxmikwsl6q8mxllb5rqrwlk"; + sha256 = "1ijn8kd13hliqph9vijfl9zzvnkb6d6i7fqggbiwjvhslhjcgv2h"; }; buildInputs = [ diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index c68eaab14d16..76e7b8eaea0a 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -14,22 +14,21 @@ let in stdenv.mkDerivation rec { name="ceph-${version}"; - version="0.85"; + version="0.88"; src = fetchgit { url = "git://github.com/ceph/ceph.git"; - rev = "refs/tags/v0.85"; - sha256 = "0g98cgrs3gfsc8azg3k0n61bgna2w906qm69j4qbjkb61l83ld1z"; + rev = "refs/tags/v${version}"; + sha256 = "1wf77mlx94h2mn75qqgb37xbdagl7zh0b579qh7gc1z4wcb8b8h0"; }; patches = [ - ./0001-Cleanup-boost-optionals.patch # Remove in 0.86 ./0001-Makefile-env-Don-t-force-sbin.patch ]; nativeBuildInputs = [ autoconf automake makeWrapper pkgconfig libtool which ]; buildInputs = [ - boost boost.lib btrfsProgs cryptopp curl expat fcgi fuse gperftools keyutils + boost btrfsProgs cryptopp curl expat fcgi fuse gperftools keyutils libatomic_ops leveldb libaio libedit libuuid linuxHeaders openssl python snappy udev xfsprogs.lib xz zfs ]; diff --git a/pkgs/tools/filesystems/duperemove/default.nix b/pkgs/tools/filesystems/duperemove/default.nix new file mode 100644 index 000000000000..087012d62a1f --- /dev/null +++ b/pkgs/tools/filesystems/duperemove/default.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, fetchurl, libgcrypt, pkgconfig, glib, linuxHeaders }: + +stdenv.mkDerivation rec { + name = "duperemove-${version}"; + version = "0.09.beta2"; + + src = fetchurl { + url = "https://github.com/markfasheh/duperemove/archive/v${version}.tar.gz"; + sha256 = "0rn7lf9rjf4ypgfwms2y7b459rri4rfn809h6wx8xl9nbm5niil4"; + }; + + buildInputs = [ libgcrypt pkgconfig glib linuxHeaders ]; + + makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; + + meta = { + description = "A simple tool for finding duplicated extents and submitting them for deduplication"; + homepage = https://github.com/markfasheh/duperemove; + license = lib.licenses.gpl2; + + maintainers = [ lib.maintainers.bluescreen303 ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index 69f3f7ef1efd..a101958d8284 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -1,18 +1,18 @@ {stdenv, fetchurl, fuse, bison, flex_2_5_35, openssl, python, ncurses, readline, - autoconf, automake, libtool, pkgconfig, zlib, libaio}: + autoconf, automake, libtool, pkgconfig, zlib, libaio, libxml2}: let s = # Generated upstream information rec { baseName="glusterfs"; - version="3.5.2"; + version="3.6.0"; name="${baseName}-${version}"; - hash="1hvns9islr5jcy0r1cw5890ra246y12pl5nlhl3bvmhglrkv8n7g"; - url="http://download.gluster.org/pub/gluster/glusterfs/3.5/3.5.2/glusterfs-3.5.2.tar.gz"; - sha256="1hvns9islr5jcy0r1cw5890ra246y12pl5nlhl3bvmhglrkv8n7g"; + hash="1c4lscqc5kvn5yj5pspvml59n1czspfqqdwhz73hbjd5lbqak9ml"; + url="http://download.gluster.org/pub/gluster/glusterfs/3.6/3.6.0/glusterfs-3.6.0.tar.gz"; + sha256="1c4lscqc5kvn5yj5pspvml59n1czspfqqdwhz73hbjd5lbqak9ml"; }; buildInputs = [ fuse bison flex_2_5_35 openssl python ncurses readline - autoconf automake libtool pkgconfig zlib libaio + autoconf automake libtool pkgconfig zlib libaio libxml2 ]; in stdenv.mkDerivation diff --git a/pkgs/tools/filesystems/grive/default.nix b/pkgs/tools/filesystems/grive/default.nix index 559e2ae4c513..c6d2776f437a 100644 --- a/pkgs/tools/filesystems/grive/default.nix +++ b/pkgs/tools/filesystems/grive/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "f2b978cc93a2d16262c7b78c62019b2a58044eaef4ca95feaa74dfd4dfcbfa36"; }; - buildInputs = [cmake libgcrypt json_c curl expat stdenv binutils boost boost.lib]; + buildInputs = [cmake libgcrypt json_c curl expat stdenv binutils boost]; # work around new binutils headers, see # http://stackoverflow.com/questions/11748035/binutils-bfd-h-wants-config-h-now diff --git a/pkgs/tools/filesystems/ifuse/default.nix b/pkgs/tools/filesystems/ifuse/default.nix new file mode 100644 index 000000000000..942b6272071c --- /dev/null +++ b/pkgs/tools/filesystems/ifuse/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, usbmuxd, fuse, gnutls, libgcrypt, + libplist, libimobiledevice }: + +stdenv.mkDerivation rec { + name = "ifuse-1.1.3"; + + nativeBuildInputs = [ pkgconfig fuse libplist usbmuxd gnutls libgcrypt libimobiledevice ]; + + src = fetchurl { + url = "${meta.homepage}/downloads/${name}.tar.bz2"; + sha256 = "1p9a4n36jb194cnp6v57cz2bggwbywaz8pbpb95ch83pzdkdx257"; + }; + + meta = { + homepage = http://www.libimobiledevice.org; + license = stdenv.lib.licenses.lgpl21Plus; + description = "A fuse filesystem implementation to access the contents of iOS devices"; + longDescription = '' + Mount directories of an iOS device locally using fuse. By default the media + directory is mounted, options allow to also mount the sandbox container of an + app, an app's documents folder or even the root filesystem on jailbroken + devices.''; + inherit (usbmuxd.meta) platforms maintainers; + }; +} diff --git a/pkgs/tools/filesystems/jfsrec/default.nix b/pkgs/tools/filesystems/jfsrec/default.nix deleted file mode 100644 index 5b5e7c8808e1..000000000000 --- a/pkgs/tools/filesystems/jfsrec/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, boost }: - -stdenv.mkDerivation { - name = "jfsrec-0-pre-svn-7"; - - src = fetchurl { - url = mirror://sourceforge/jfsrec/jfsrec-svn-7.tar.gz; - sha256 = "163z6ljr05vw2k5mj4fim2nlg4khjyibrii95370pvn474mg28vg"; - }; - - patches = [ ./jfsrec-gcc-4.3.patch ]; - buildInputs = [ boost ]; - - preConfigure = - '' - sed -e '/[#]include [<]config.h[>]/a\#include <string.h>' -i src/unicode_to_utf8.cpp - ''; - - meta = { - description = "JFS recovery tool"; - homepage = http://jfsrec.sourceforge.net/; - }; -} diff --git a/pkgs/tools/filesystems/jfsrec/jfsrec-gcc-4.3.patch b/pkgs/tools/filesystems/jfsrec/jfsrec-gcc-4.3.patch deleted file mode 100644 index 063a7c24813b..000000000000 --- a/pkgs/tools/filesystems/jfsrec/jfsrec-gcc-4.3.patch +++ /dev/null @@ -1,24 +0,0 @@ -Taken from Archlinux, although this solves the build in gcc 4.4, not 4.3. -http://aur.archlinux.org/packages/jfsrec-svn/jfsrec-svn/jfsrec-gcc-4.3.patch -diff -uBdr jfsrec/src/device.cpp jfsrec-build/src/device.cpp ---- jfsrec/src/device.cpp 2009-12-01 18:34:03.860437077 +0100 -+++ jfsrec-build/src/device.cpp 2009-12-01 18:39:48.297067088 +0100 -@@ -20,6 +20,7 @@ - //Parts of the code in this file was originally taken from JFS's xpeek (debugfs_jfs) - - #include "device.h" -+#include <stdio.h> - #ifdef __linux__ - #include <linux/fs.h> - #include <sys/ioctl.h> -diff -uBdr jfsrec/src/unicode_to_utf8.cpp jfsrec-build/src/unicode_to_utf8.cpp ---- jfsrec/src/unicode_to_utf8.cpp 2009-12-01 18:34:03.860437077 +0100 -+++ jfsrec-build/src/unicode_to_utf8.cpp 2009-12-01 18:39:43.501626737 +0100 -@@ -8,6 +8,7 @@ - */ - #include <config.h> - #include "unicode_to_utf8.h" -+#include <string.h> - #define JFS_PATH_MAX 4096 - - /* diff --git a/pkgs/tools/filesystems/jmtpfs/default.nix b/pkgs/tools/filesystems/jmtpfs/default.nix index 5ee793977071..86dad1cc0fa4 100644 --- a/pkgs/tools/filesystems/jmtpfs/default.nix +++ b/pkgs/tools/filesystems/jmtpfs/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ autoconf automake file fuse libmtp pkgconfig unzip ]; meta = { - description = "A FUSE filesystem for MTP devices like Android phones."; + description = "A FUSE filesystem for MTP devices like Android phones"; homepage = https://github.com/JasonFerrara/jmtpfs; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.coconnor ]; diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix index 850e16812488..61afe6ffb90c 100644 --- a/pkgs/tools/filesystems/netatalk/default.nix +++ b/pkgs/tools/filesystems/netatalk/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, db, libgcrypt, avahi, libiconv, pam, openssl }: +{ fetchurl, stdenv, pkgconfig, db, libgcrypt, avahi, libiconvOrEmpty, pam, openssl }: stdenv.mkDerivation rec { name = "netatalk-3.1.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1d8dc8ysslkis4yl1xab1w9p0pz7a1kg0i6fds4wxsp4fhb6wqhq"; }; - buildInputs = [ pkgconfig db libgcrypt avahi libiconv pam openssl ]; + buildInputs = [ pkgconfig db libgcrypt avahi pam openssl ] ++ libiconvOrEmpty; configureFlags = [ "--with-bdb=${db}" diff --git a/pkgs/tools/filesystems/nilfs-utils/default.nix b/pkgs/tools/filesystems/nilfs-utils/default.nix index db1b3fcf44e5..3eee59d458d3 100644 --- a/pkgs/tools/filesystems/nilfs-utils/default.nix +++ b/pkgs/tools/filesystems/nilfs-utils/default.nix @@ -1,52 +1,38 @@ -x@{builderDefsPackage - , libuuid - , ...}: -builderDefsPackage -(a : +{ stdenv, fetchurl, libuuid, libselinux }: let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; - - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { - version = "2.0.19"; - url = "http://www.nilfs.org/download/nilfs-utils-${version}.tar.bz2"; - hash = "0q9cb6ny0ah1s9rz1rgqka1pxdm3xvg0ywcqyhzcz4yhamfhg100"; + version = "2.2.2"; + url = "http://nilfs.sourceforge.net/download/nilfs-utils-${version}.tar.bz2"; + sha256 = "1w2i5wy290y03hg72lhkrnmfhap04ki0kkv5m8q60a2frbv6ydql"; baseName = "nilfs-utils"; name = "${baseName}-${version}"; }; in -rec { - src = a.fetchurl { +stdenv.mkDerivation rec { + src = fetchurl { url = sourceInfo.url; - sha256 = sourceInfo.hash; + sha256 = sourceInfo.sha256; }; inherit (sourceInfo) name version; - inherit buildInputs; - - /* doConfigure should be removed if not needed */ - phaseNames = ["doFixPaths" "doConfigure" "doMakeInstall"]; + buildInputs = [libuuid libselinux]; - doFixPaths = a.fullDepEntry ('' - sed -e '/sysconfdir=\/etc/d; /sbindir=\/sbin/d' -i configure - sed -e 's@/sbin/@'"$out"'/sbin/@' -i ./sbin/mount/cleaner_ctl.c - '') ["doUnpack" "minInit"]; + preConfigure = '' + sed -e '/sysconfdir=\/etc/d; ' -i configure + sed -e "s@sbindir=/sbin@sbindir=$out/sbin@" -i configure + sed -e 's@/sbin/@'"$out"'/sbin/@' -i ./lib/cleaner*.c + ''; meta = { description = "NILFS utilities"; - maintainers = with a.lib.maintainers; + maintainers = with stdenv.lib.maintainers; [ raskin ]; - platforms = with a.lib.platforms; + platforms = with stdenv.lib.platforms; linux; + downloadPage = "http://nilfs.sourceforge.net/en/download.html"; + updateWalker = true; + inherit version; }; - passthru = { - updateInfo = { - downloadPage = "http://www.nilfs.org/download/?C=M;O=D"; - }; - }; -}) x - +} diff --git a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix new file mode 100644 index 000000000000..44333b519cbe --- /dev/null +++ b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix @@ -0,0 +1,54 @@ +{ stdenv, fetchurl, buildPythonPackage, pykickstart, pyparted, pyblock +, libselinux, cryptsetup, multipath_tools, lsof, utillinux +, useNixUdev ? true, udev ? null +# This is only used when useNixUdev is false +, udevSoMajor ? 1 +}: + +assert useNixUdev -> udev != null; + +buildPythonPackage rec { + name = "blivet-${version}"; + version = "0.17-1"; + + src = fetchurl { + url = "https://git.fedorahosted.org/cgit/blivet.git/snapshot/" + + "${name}.tar.bz2"; + sha256 = "1k3mws2q0ryb7422mml6idmaasz2i2v6ngyvg6d976dx090qnmci"; + }; + + postPatch = '' + sed -i -e 's|"multipath"|"${multipath_tools}/sbin/multipath"|' \ + blivet/devicelibs/mpath.py blivet/devices.py + sed -i -e '/"wipefs"/ { + s|wipefs|${utillinux}/sbin/wipefs| + s/-f/--force/ + }' blivet/formats/__init__.py + sed -i -e 's|"lsof"|"${lsof}/bin/lsof"|' blivet/formats/fs.py + sed -i -r -e 's|"(u?mount)"|"${utillinux}/bin/\1"|' blivet/util.py + sed -i '/pvscan/s/, *"--cache"//' blivet/devicelibs/lvm.py + '' + (if useNixUdev then '' + sed -i -e '/find_library/,/find_library/ { + c libudev = "${udev}/lib/libudev.so.1" + }' blivet/pyudev.py + '' else '' + sed -i \ + -e '/^somajor *=/s/=.*/= ${toString udevSoMajor}/p' \ + -e 's|common =.*|& + ["/lib/x86_64-linux-gnu", "/lib/i686-linux-gnu"]|' \ + blivet/pyudev.py + ''); + + propagatedBuildInputs = [ + pykickstart pyparted pyblock libselinux cryptsetup + ] ++ stdenv.lib.optional useNixUdev udev; + + # tests are currently _heavily_ broken upstream + doCheck = false; + + meta = { + homepage = "https://fedoraproject.org/wiki/Blivet"; + description = "Module for management of a system's storage configuration"; + license = [ "GPLv2+" "LGPLv2.1+" ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix new file mode 100644 index 000000000000..c612512b8cc9 --- /dev/null +++ b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, devicemapper, libgcrypt, libuuid, pkgconfig, popt +, enablePython ? true, python ? null +}: + +assert enablePython -> python != null; + +stdenv.mkDerivation rec { + name = "cryptsetup-1.6.3"; + + src = fetchurl { + url = "http://cryptsetup.googlecode.com/files/${name}.tar.bz2"; + sha256 = "1n1qk5chyjspbiianrdb55fhb4wl0vfyqz2br05vfb24v4qlgbx2"; + }; + + configureFlags = [ "--enable-cryptsetup-reencrypt" ] + ++ stdenv.lib.optional enablePython "--enable-python"; + + buildInputs = [ devicemapper libgcrypt libuuid pkgconfig popt ] + ++ stdenv.lib.optional enablePython python; + + meta = { + homepage = http://code.google.com/p/cryptsetup/; + description = "LUKS for dm-crypt"; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [ viric chaoflow ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/tools/filesystems/nixpart/0.4/default.nix b/pkgs/tools/filesystems/nixpart/0.4/default.nix new file mode 100644 index 000000000000..9ea2f9bfdc77 --- /dev/null +++ b/pkgs/tools/filesystems/nixpart/0.4/default.nix @@ -0,0 +1,76 @@ +{ stdenv, fetchurl, python, buildPythonPackage +# Propagated to blivet +, useNixUdev ? true, udevSoMajor ? null +# Propagated dependencies +, pkgs, urlgrabber +}: + +let + blivet = import ./blivet.nix { + inherit stdenv fetchurl buildPythonPackage; + inherit pykickstart pyparted pyblock cryptsetup multipath_tools; + inherit useNixUdev udevSoMajor; + inherit (pkgs) lsof utillinux udev; + libselinux = pkgs.libselinux.override { enablePython = true; }; + }; + + cryptsetup = import ./cryptsetup.nix { + inherit stdenv fetchurl python; + inherit (pkgs) pkgconfig libgcrypt libuuid popt; + devicemapper = lvm2; + }; + + dmraid = import ./dmraid.nix { + inherit stdenv fetchurl; + devicemapper = lvm2; + }; + + lvm2 = import ./lvm2.nix { + inherit stdenv fetchurl; + inherit (pkgs) pkgconfig utillinux udev coreutils; + }; + + multipath_tools = import ./multipath-tools.nix { + inherit stdenv fetchurl lvm2; + inherit (pkgs) readline udev libaio gzip; + }; + + parted = import ./parted.nix { + inherit stdenv fetchurl; + inherit (pkgs) utillinux readline libuuid gettext check; + devicemapper = lvm2; + }; + + pyblock = import ./pyblock.nix { + inherit stdenv fetchurl python lvm2 dmraid; + }; + + pykickstart = import ./pykickstart.nix { + inherit stdenv fetchurl python buildPythonPackage urlgrabber; + }; + + pyparted = import ./pyparted.nix { + inherit stdenv fetchurl python buildPythonPackage parted; + inherit (pkgs) pkgconfig e2fsprogs; + }; + +in buildPythonPackage rec { + name = "nixpart-${version}"; + version = "0.4.1"; + + src = fetchurl { + url = "https://github.com/aszlig/nixpart/archive/v${version}.tar.gz"; + sha256 = "0avwd8p47xy9cydlbjxk8pj8q75zyl68gw2w6fnkk78dcb1a3swp"; + }; + + propagatedBuildInputs = [ blivet ]; + + doCheck = false; + + meta = { + description = "NixOS storage manager/partitioner"; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = [ stdenv.lib.maintainers.aszlig ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix b/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix new file mode 100644 index 000000000000..35efa8533ab1 --- /dev/null +++ b/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, devicemapper }: + +stdenv.mkDerivation rec { + name = "dmraid-1.0.0.rc15"; + + src = fetchurl { + url = "http://people.redhat.com/~heinzm/sw/dmraid/src/old/${name}.tar.bz2"; + sha256 = "01bcaq0sc329ghgj7f182xws7jgjpdc41bvris8fsiprnxc7511h"; + }; + + preConfigure = "cd */"; + + buildInputs = [ devicemapper ]; + + meta = { + description = "Old-style RAID configuration utility"; + longDescritipn = '' + Old RAID configuration utility (still under development, though). + It is fully compatible with modern kernels and mdadm recognizes + its volumes. May be needed for rescuing an older system or nuking + the metadata when reformatting. + ''; + maintainers = [ stdenv.lib.maintainers.raskin ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix b/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix new file mode 100644 index 000000000000..9e2b0c900794 --- /dev/null +++ b/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix @@ -0,0 +1,58 @@ +{ stdenv, fetchurl, pkgconfig, udev, utillinux, coreutils }: + +let + v = "2.02.106"; +in + +stdenv.mkDerivation { + name = "lvm2-${v}"; + + src = fetchurl { + url = "ftp://sources.redhat.com/pub/lvm2/releases/LVM2.${v}.tgz"; + sha256 = "0nr833bl0q4zq52drjxmmpf7bs6kqxwa5kahwwxm9411khkxz0vc"; + }; + + configureFlags = + "--disable-readline --enable-udev_rules --enable-udev_sync --enable-pkgconfig --enable-applib"; + + buildInputs = [ pkgconfig udev ]; + + preConfigure = + '' + substituteInPlace scripts/lvmdump.sh \ + --replace /usr/bin/tr ${coreutils}/bin/tr + substituteInPlace scripts/lvm2_activation_generator_systemd_red_hat.c \ + --replace /usr/sbin/lvm $out/sbin/lvm \ + --replace /usr/bin/udevadm ${udev}/bin/udevadm + + sed -i /DEFAULT_SYS_DIR/d Makefile.in + sed -i /DEFAULT_PROFILE_DIR/d conf/Makefile.in + ''; + + enableParallelBuilding = true; + + #patches = [ ./purity.patch ]; + + # To prevent make install from failing. + preInstall = "installFlags=\"OWNER= GROUP= confdir=$out/etc\""; + + # Install systemd stuff. + #installTargets = "install install_systemd_generators install_systemd_units install_tmpfiles_configuration"; + + postInstall = + '' + substituteInPlace $out/lib/udev/rules.d/13-dm-disk.rules \ + --replace $out/sbin/blkid ${utillinux}/sbin/blkid + + # Systemd stuff + mkdir -p $out/etc/systemd/system $out/lib/systemd/system-generators + cp scripts/blk_availability_systemd_red_hat.service $out/etc/systemd/system + cp scripts/lvm2_activation_generator_systemd_red_hat $out/lib/systemd/system-generators + ''; + + meta = { + homepage = http://sourceware.org/lvm2/; + descriptions = "Tools to support Logical Volume Management (LVM) on Linux"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix b/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix new file mode 100644 index 000000000000..90722d74ace1 --- /dev/null +++ b/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, lvm2, libaio, gzip, readline, udev }: + +stdenv.mkDerivation rec { + name = "multipath-tools-0.4.9"; + + src = fetchurl { + url = "http://christophe.varoqui.free.fr/multipath-tools/${name}.tar.bz2"; + sha256 = "04n7kazp1zrlqfza32phmqla0xkcq4zwn176qff5ida4a60whi4d"; + }; + + sourceRoot = "."; + + buildInputs = [ lvm2 libaio readline ]; + + preBuild = + '' + makeFlagsArray=(GZIP="${gzip}/bin/gzip -9 -c" prefix=$out mandir=$out/share/man/man8 man5dir=$out/share/man/man5 LIB=lib) + + substituteInPlace multipath/Makefile --replace /etc $out/etc + substituteInPlace kpartx/Makefile --replace /etc $out/etc + + substituteInPlace kpartx/kpartx.rules --replace /sbin/kpartx $out/sbin/kpartx + substituteInPlace kpartx/kpartx_id --replace /sbin/dmsetup ${lvm2}/sbin/dmsetup + + substituteInPlace libmultipath/defaults.h --replace /lib/udev/scsi_id ${udev}/lib/udev/scsi_id + substituteInPlace libmultipath/hwtable.c --replace /lib/udev/scsi_id ${udev}/lib/udev/scsi_id + ''; + + meta = { + description = "Tools for the Linux multipathing driver"; + homepage = http://christophe.varoqui.free.fr/; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/filesystems/nixpart/0.4/parted.nix b/pkgs/tools/filesystems/nixpart/0.4/parted.nix new file mode 100644 index 000000000000..01b9f391a443 --- /dev/null +++ b/pkgs/tools/filesystems/nixpart/0.4/parted.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchurl, devicemapper, libuuid, gettext, readline +, utillinux, check, enableStatic ? false, hurd ? null }: + +stdenv.mkDerivation rec { + name = "parted-3.1"; + + src = fetchurl { + url = "mirror://gnu/parted/${name}.tar.xz"; + sha256 = "05fa4m1bky9d13hqv91jlnngzlyn7y4rnnyq6d86w0dg3vww372y"; + }; + + buildInputs = [ libuuid ] + ++ stdenv.lib.optional (readline != null) readline + ++ stdenv.lib.optional (gettext != null) gettext + ++ stdenv.lib.optional (devicemapper != null) devicemapper + ++ stdenv.lib.optional (hurd != null) hurd + ++ stdenv.lib.optional doCheck check; + + configureFlags = + (if (readline != null) + then [ "--with-readline" ] + else [ "--without-readline" ]) + ++ stdenv.lib.optional (devicemapper == null) "--disable-device-mapper" + ++ stdenv.lib.optional enableStatic "--enable-static"; + + doCheck = true; + + preCheck = + stdenv.lib.optionalString doCheck + # The `t0400-loop-clobber-infloop.sh' test wants `mkswap'. + "export PATH=\"${utillinux}/sbin:$PATH\""; + + meta = { + description = "Create, destroy, resize, check, and copy partitions"; + + longDescription = '' + GNU Parted is an industrial-strength package for creating, destroying, + resizing, checking and copying partitions, and the file systems on + them. This is useful for creating space for new operating systems, + reorganising disk usage, copying data on hard disks and disk imaging. + + It contains a library, libparted, and a command-line frontend, parted, + which also serves as a sample implementation and script backend. + ''; + + homepage = http://www.gnu.org/software/parted/; + license = stdenv.lib.licenses.gpl3Plus; + + maintainers = [ + # Add your name here! + stdenv.lib.maintainers.ludo + ]; + + # GNU Parted requires libuuid, which is part of util-linux-ng. + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix b/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix new file mode 100644 index 000000000000..2ce126d7169f --- /dev/null +++ b/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, python, lvm2, dmraid }: + +stdenv.mkDerivation rec { + name = "pyblock-${version}"; + version = "0.53"; + + src = fetchurl rec { + url = "http://pkgs.fedoraproject.org/repo/pkgs/python-pyblock/" + + "${name}.tar.bz2/${md5}/${name}.tar.bz2"; + md5 = "f6d33a8362dee358517d0a9e2ebdd044"; + }; + + postPatch = '' + sed -i -e 's|/usr/include/python|${python}/include/python|' \ + -e 's/-Werror *//' -e 's|/usr/|'"$out"'/|' Makefile + ''; + + buildInputs = [ python lvm2 dmraid ]; + + makeFlags = [ + "USESELINUX=0" + "SITELIB=$(out)/lib/${python.libPrefix}/site-packages" + ]; + + meta = { + description = "Interface for working with block devices"; + license = stdenv.lib.licenses.gpl2Plus; + }; +} diff --git a/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix b/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix new file mode 100644 index 000000000000..7bc3f54c2363 --- /dev/null +++ b/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix @@ -0,0 +1,30 @@ +{ stdenv, python, buildPythonPackage, fetchurl, urlgrabber }: + +buildPythonPackage rec { + name = "pykickstart-${version}"; + version = "1.99.39"; + + src = fetchurl rec { + url = "http://pkgs.fedoraproject.org/repo/pkgs/pykickstart/" + + "${name}.tar.gz/${md5}/${name}.tar.gz"; + md5 = "d249f60aa89b1b4facd63f776925116d"; + }; + + postPatch = '' + sed -i -e "s/for tst in tstList/for tst in sorted(tstList, \ + key=lambda m: m.__name__)/" tests/baseclass.py + ''; + + propagatedBuildInputs = [ urlgrabber ]; + + checkPhase = '' + export PYTHONPATH="$PYTHONPATH:." + ${python}/bin/${python.executable} tests/baseclass.py -vv + ''; + + meta = { + homepage = "http://fedoraproject.org/wiki/Pykickstart"; + description = "Read and write Fedora kickstart files"; + license = stdenv.lib.licenses.gpl2Plus; + }; +} diff --git a/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix b/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix new file mode 100644 index 000000000000..67f318c863e1 --- /dev/null +++ b/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, pkgconfig, python, buildPythonPackage, parted, e2fsprogs }: + +buildPythonPackage rec { + name = "pyparted-${version}"; + version = "3.10"; + + src = fetchurl { + url = "https://fedorahosted.org/releases/p/y/pyparted/${name}.tar.gz"; + sha256 = "17wq4invmv1nfazaksf59ymqyvgv3i8h4q03ry2az0s9lldyg3dv"; + }; + + postPatch = '' + sed -i -e 's|/sbin/mke2fs|${e2fsprogs}&|' tests/baseclass.py + sed -i -e ' + s|e\.path\.startswith("/tmp/temp-device-")|"temp-device-" in e.path| + ' tests/test__ped_ped.py + '' + stdenv.lib.optionalString stdenv.isi686 '' + # remove some integers in this test case which overflow on 32bit systems + sed -i -r -e '/class *UnitGetSizeTestCase/,/^$/{/[0-9]{11}/d}' \ + tests/test__ped_ped.py + ''; + + preConfigure = '' + PATH="${parted}/sbin:$PATH" + ''; + + buildInputs = [ pkgconfig ]; + + propagatedBuildInputs = [ parted ]; + + checkPhase = '' + patchShebangs Makefile + make test PYTHON=${python.executable} + ''; + + meta = { + homepage = "https://fedorahosted.org/pyparted/"; + description = "Python interface for libparted"; + license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/filesystems/nixpart/default.nix b/pkgs/tools/filesystems/nixpart/default.nix index 633f04320c37..895ae99c3093 100644 --- a/pkgs/tools/filesystems/nixpart/default.nix +++ b/pkgs/tools/filesystems/nixpart/default.nix @@ -1,29 +1,21 @@ -{ stdenv, fetchurl, buildPythonPackage, blivet -# Propagated to blivet -, useNixUdev ? null, udevSoMajor ? null -}: +{ stdenv, fetchurl, buildPythonPackage, blivet }: -let - blivetOverrides = stdenv.lib.filterAttrs (k: v: v != null) { - inherit useNixUdev udevSoMajor; - }; -in buildPythonPackage rec { +buildPythonPackage rec { name = "nixpart-${version}"; - version = "0.4.1"; + version = "1.0.0"; src = fetchurl { url = "https://github.com/aszlig/nixpart/archive/v${version}.tar.gz"; sha256 = "0avwd8p47xy9cydlbjxk8pj8q75zyl68gw2w6fnkk78dcb1a3swp"; }; - propagatedBuildInputs = [ (blivet.override blivetOverrides) ]; - - doCheck = false; + propagatedBuildInputs = [ blivet ]; meta = { description = "NixOS storage manager/partitioner"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.aszlig ]; platforms = stdenv.lib.platforms.linux; + broken = true; }; } diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix index bec5592ccaed..a016627b7a47 100644 --- a/pkgs/tools/filesystems/squashfs/default.nix +++ b/pkgs/tools/filesystems/squashfs/default.nix @@ -1,17 +1,18 @@ -{ stdenv, fetchurl, zlib, xz }: +{ stdenv, fetchgit, zlib, xz }: stdenv.mkDerivation rec { - name = "squashfs-4.2"; + name = "squashfs-4.4dev"; - src = fetchurl { - url = mirror://sourceforge/squashfs/squashfs4.2.tar.gz; - sha256 = "15if08j0pl5hmnz9pwshwrp4fjp0jsm9larjxmjvdnr2m5d1kq6r"; + src = fetchgit { + url = https://github.com/plougher/squashfs-tools.git; + sha256 = "059pa2shdysr3zfmwrhq28s12zbi5nyzbpzyaf5lmspgfh1493ks"; + rev = "9c1db6d13a51a2e009f0027ef336ce03624eac0d"; }; buildInputs = [ zlib xz ]; preBuild = "cd squashfs-tools"; - + NIX_LDFLAGS = "-lgcc_s"; # for pthread_cancel installFlags = "INSTALL_DIR=\${out}/bin"; @@ -21,5 +22,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://squashfs.sourceforge.net/; description = "Tool for creating and unpacking squashfs filesystems"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix index e33f46ea9ccd..8b0b3a9898b2 100644 --- a/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/pkgs/tools/filesystems/yandex-disk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, writeText, zlib, rpm, cpio, patchelf, which }: +{ stdenv, fetchurl, writeText, zlib, rpmextract, patchelf, which }: assert stdenv.isLinux; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { mkdir -pv unpacked cd unpacked - ${rpm}/bin/rpm2cpio $src | ${cpio}/bin/cpio -imd + ${rpmextract}/bin/rpmextract $src cp -r -t $out/bin usr/bin/* cp -r -t $out/share usr/share/* diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 5109bb45e30c..6cab550d82b5 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -32,6 +32,7 @@ rec { /* doConfigure should be removed if not needed */ phaseNames = ["setVars" "doUnpack" "fixPaths" "extractTexinfoTex" + "fixEpsWrite" "doConfigure" "dumpRealVars" "doMakeInstall" "fixPathsResult" "fixInfoDir"]; @@ -58,6 +59,10 @@ rec { cp texinfo-*/doc/texinfo.tex doc/ '' ["minInit" "addInputs" "doUnpack"]; + fixEpsWrite = a.fullDepEntry '' + sed -e 's@epswrite@eps2write@g' -i runlabel.in + '' ["minInit" "addInputs" "doUnpack"]; + meta = { inherit (s) version; description = "A tool for programming graphics intended to replace Metapost"; diff --git a/pkgs/tools/graphics/dcraw/default.nix b/pkgs/tools/graphics/dcraw/default.nix index 72b50bd4e773..5dcac6a02159 100644 --- a/pkgs/tools/graphics/dcraw/default.nix +++ b/pkgs/tools/graphics/dcraw/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.cybercom.net/~dcoffin/dcraw/; description = "Decoder for many camera raw picture formats"; - license = "free"; + license = stdenv.lib.licenses.free; platforms = with stdenv.lib.platforms; allBut cygwin; maintainers = [ stdenv.lib.maintainers.urkud ]; }; diff --git a/pkgs/tools/graphics/dmtx-utils/default.nix b/pkgs/tools/graphics/dmtx-utils/default.nix new file mode 100644 index 000000000000..0fe473f5d634 --- /dev/null +++ b/pkgs/tools/graphics/dmtx-utils/default.nix @@ -0,0 +1,29 @@ +{stdenv, fetchurl, libdmtx, pkgconfig}: +let + s = # Generated upstream information + rec { + baseName="dmtx-utils"; + version="0.7.4"; + name="${baseName}-${version}"; + hash="1di8ymlziy9856abd6rb72z0zqzmrff4r3vql0q9r5sk5ax4s417"; + url="mirror://sourceforge/project/libdmtx/libdmtx/0.7.4/dmtx-utils-0.7.4.tar.gz"; + sha256="1di8ymlziy9856abd6rb72z0zqzmrff4r3vql0q9r5sk5ax4s417"; + }; + buildInputs = [ + libdmtx pkgconfig + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchurl { + inherit (s) url sha256; + }; + meta = { + inherit (s) version; + description = "Data matrix command-line utilities"; + license = stdenv.lib.licenses.lgpl2 ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/graphics/dmtx-utils/default.upstream b/pkgs/tools/graphics/dmtx-utils/default.upstream new file mode 100644 index 000000000000..8768681642e5 --- /dev/null +++ b/pkgs/tools/graphics/dmtx-utils/default.upstream @@ -0,0 +1,4 @@ +url http://sourceforge.net/projects/libdmtx/files/libdmtx/ +SF_version_dir +version_link 'dmtx-utils-.*[.]tar[.][a-z0-9]+/download$' +SF_redirect diff --git a/pkgs/tools/graphics/dmtx/default.nix b/pkgs/tools/graphics/dmtx/default.nix deleted file mode 100644 index 30b3baa4690b..000000000000 --- a/pkgs/tools/graphics/dmtx/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -args : -let - lib = args.lib; - fetchurl = args.fetchurl; - - version = lib.attrByPath ["version"] "0.7.4" args; - buildInputs = with args; [ - libpng libtiff libjpeg librsvg imagemagick pkgconfig - zlib libX11 bzip2 libtool freetype fontconfig - ghostscript jasper xz - ]; -in -rec { - src = fetchurl { - url = "mirror://sourceforge/libdmtx/libdmtx-${version}.tar.bz2"; - sha256 = "0xnxx075ycy58n92yfda2z9zgd41h3d4ik5d9l197lzsqim5hb5n"; - }; - - inherit buildInputs; - configureFlags = []; - - /* doConfigure should be specified separately */ - phaseNames = ["doConfigure" "doMakeInstall"]; - - name = "dmtx-" + version; - meta = { - description = "DataMatrix (2D bar code) processing tools"; - maintainers = [args.lib.maintainers.raskin]; - platforms = args.lib.platforms.linux; - }; -} diff --git a/pkgs/tools/graphics/enblend-enfuse/default.nix b/pkgs/tools/graphics/enblend-enfuse/default.nix index ac49a3c13a34..6b65d3df0d3f 100644 --- a/pkgs/tools/graphics/enblend-enfuse/default.nix +++ b/pkgs/tools/graphics/enblend-enfuse/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1b7r1nnwaind0344ckwggy0ghl0ipbk9jzylsxcjfl05rnasw00w"; }; - buildInputs = [ boost boost.lib freeglut glew gsl lcms2 libpng libtiff libxmi mesa vigra ]; + buildInputs = [ boost freeglut glew gsl lcms2 libpng libtiff libxmi mesa vigra ]; nativeBuildInputs = [ perl pkgconfig ]; diff --git a/pkgs/tools/graphics/exiftags/default.nix b/pkgs/tools/graphics/exiftags/default.nix index 531e17b92cbb..ea729d71be25 100644 --- a/pkgs/tools/graphics/exiftags/default.nix +++ b/pkgs/tools/graphics/exiftags/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { homepage = http://johnst.org/sw/exiftags/; description = "Displays EXIF data from JPEG files"; - license = "free"; + license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [viric]; }; } diff --git a/pkgs/tools/graphics/gifsicle/default.nix b/pkgs/tools/graphics/gifsicle/default.nix index 5216c1999e4d..3e3bab809607 100644 --- a/pkgs/tools/graphics/gifsicle/default.nix +++ b/pkgs/tools/graphics/gifsicle/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation { - name = "gifsicle-1.84"; + name = "gifsicle-1.86"; src = fetchurl { - url = http://www.lcdf.org/gifsicle/gifsicle-1.84.tar.gz; - sha256 = "1ymk7lkk50fds6090icnjg69dswzz5zyiirq2ws23aagw3l46z86"; + url = http://www.lcdf.org/gifsicle/gifsicle-1.86.tar.gz; + sha256 = "153knkff04wh1szbmqklyq371m9whib007j0lq0dwh4jc5g6s15h"; }; buildInputs = optional gifview [ xproto libXt libX11 ]; diff --git a/pkgs/tools/graphics/graphviz/2.0.nix b/pkgs/tools/graphics/graphviz/2.0.nix index 07fbbc967d91..fcc06871ef15 100644 --- a/pkgs/tools/graphics/graphviz/2.0.nix +++ b/pkgs/tools/graphics/graphviz/2.0.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { meta = { description = "A program for visualising graphs"; homepage = http://www.graphviz.org/; + branch = "2.0"; }; } diff --git a/pkgs/tools/graphics/graphviz/2.32.nix b/pkgs/tools/graphics/graphviz/2.32.nix index 0a86a8924174..801795397014 100644 --- a/pkgs/tools/graphics/graphviz/2.32.nix +++ b/pkgs/tools/graphics/graphviz/2.32.nix @@ -57,5 +57,6 @@ stdenv.mkDerivation rec { hydraPlatforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; maintainers = with stdenv.lib.maintainers; [ simons bjornfor raskin ]; inherit version; + branch = "2.32"; }; } diff --git a/pkgs/tools/graphics/jhead/default.nix b/pkgs/tools/graphics/jhead/default.nix index c497d60aef9a..ee44ff975bb3 100644 --- a/pkgs/tools/graphics/jhead/default.nix +++ b/pkgs/tools/graphics/jhead/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.sentex.net/~mwandel/jhead/; description = "Exif Jpeg header manipulation tool"; - license = "free"; + license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [viric]; }; } diff --git a/pkgs/tools/graphics/kst/default.nix b/pkgs/tools/graphics/kst/default.nix new file mode 100644 index 000000000000..147206644277 --- /dev/null +++ b/pkgs/tools/graphics/kst/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, cmake, pkgconfig +, qt5, gsl, getdata, netcdf, muparser, matio +}: +stdenv.mkDerivation rec { + name = "Kst-2.0.8"; + src = fetchurl { + url = "mirror://sourceforge/kst/${name}.tar.gz"; + sha256 = "1ihqmwqw0h2p7hn5shd8iwb0gd4axybs60lgw22ijxqh6wzgvyyf"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ qt5 gsl getdata netcdf muparser matio ]; + + cmakeFlags = "-Dkst_qt5=1 -Dkst_release=1"; + + postInstall = '' + mkdir -p $out + for d in bin lib share + do + cp -r INSTALLED/$d $out/ + done + ''; + + meta = with stdenv.lib; { + description = "Real-time large-dataset viewing and plotting tool"; + homepage = https://kst-plot.kde.org/; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = [ maintainers.vbgl ]; + }; +} diff --git a/pkgs/tools/graphics/logstalgia/default.nix b/pkgs/tools/graphics/logstalgia/default.nix index 9ab36b582eb9..ef825bcca454 100644 --- a/pkgs/tools/graphics/logstalgia/default.nix +++ b/pkgs/tools/graphics/logstalgia/default.nix @@ -3,16 +3,18 @@ stdenv.mkDerivation rec { name = "logstalgia-${version}"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { url = "https://github.com/acaudwell/Logstalgia/releases/download/${name}/${name}.tar.gz"; - sha256 = "0hm4fcakz05j95kb9f14qpspb31xi07paka390dz3g5k980hm9sc"; + sha256 = "0d2zhn0q26rv2nb3hdbg0mb69l66g8pkys5is6rb0r6f5is986x8"; }; buildInputs = [ glew SDL ftgl pkgconfig libpng libjpeg pcre SDL_image mesa boost glm ]; + NIX_CFLAGS_COMPILE = "-std=c++11"; # fix build with glm >= 0.9.6.0 + meta = with stdenv.lib; { homepage = http://code.google.com/p/logstalgia; description = "Website traffic visualization tool"; diff --git a/pkgs/tools/graphics/optipng/default.nix b/pkgs/tools/graphics/optipng/default.nix index 1984ab7b1de8..bc1f86e36612 100644 --- a/pkgs/tools/graphics/optipng/default.nix +++ b/pkgs/tools/graphics/optipng/default.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "optipng-0.7.4"; + name = "optipng-0.7.5"; src = fetchurl { url = "mirror://sourceforge/optipng/${name}.tar.gz"; - sha256 = "1zrphbz17rhhfl1l95q5s979rrhifbwczl2xj1fdrnq5jid5s2sj"; + sha256 = "17b197437z5wn29llpwklk7ihgx8bhc913gvjf4zyb81idwlprbl"; }; buildInputs = [ libpng ]; diff --git a/pkgs/tools/graphics/pngcheck/default.nix b/pkgs/tools/graphics/pngcheck/default.nix new file mode 100644 index 000000000000..160badaf668b --- /dev/null +++ b/pkgs/tools/graphics/pngcheck/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, zlib }: + +stdenv.mkDerivation rec { + name = "pngcheck-2.3.0"; + + src = fetchurl { + url = "mirror://sourceforge/png-mng/${name}.tar.gz"; + sha256 = "0pzkj1bb4kdybk6vbfq9s0wzdm5szmrgixkas3xmbpv4mhws1w3p"; + }; + + # configurePhase = '' + # sed -i s,/usr,$out, Makefile + # ''; + + makefile = "Makefile.unx"; + makeFlags = "ZPATH=${zlib}/lib"; + + buildInputs = [ zlib ]; + + installPhase = '' + mkdir -p $out/bin/ + cp pngcheck $out/bin/pngcheck + ''; + + meta = { + homepage = http://pmt.sourceforge.net/pngcrush; + description = "Verifies the integrity of PNG, JNG and MNG files"; + license = stdenv.lib.licenses.free; + platforms = with stdenv.lib.platforms; linux; + maintainers = with stdenv.lib.maintainers; [ the-kenny ]; + }; +} diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix index 0419732949d8..79902582ff41 100644 --- a/pkgs/tools/graphics/pngcrush/default.nix +++ b/pkgs/tools/graphics/pngcrush/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://pmt.sourceforge.net/pngcrush; description = "A PNG optimizer"; - license = "free"; + license = stdenv.lib.licenses.free; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; diff --git a/pkgs/tools/graphics/povray/default.nix b/pkgs/tools/graphics/povray/default.nix index b4a1d1a7d67a..2ee419a0512f 100644 --- a/pkgs/tools/graphics/povray/default.nix +++ b/pkgs/tools/graphics/povray/default.nix @@ -1,6 +1,5 @@ -{stdenv, fetchgit, autoconf, automake, boost149, zlib, libpng, libjpeg, libtiff}: +{stdenv, fetchgit, autoconf, automake, boost, zlib, libpng, libjpeg, libtiff}: -let boost = boost149; in stdenv.mkDerivation { name = "povray-3.7"; @@ -24,7 +23,7 @@ stdenv.mkDerivation { sed -i -e 's/^povgroup.*/povgroup=nogroup/' Makefile.{am,in} ''; - configureFlags = "COMPILED_BY='nix' --with-boost-libdir=${boost}/lib --with-boost-includedir=${boost}/include"; + configureFlags = [ "COMPILED_BY='nix'" ]; preInstall = '' mkdir "$TMP/bin" @@ -34,10 +33,10 @@ stdenv.mkDerivation { PATH="$TMP/bin:$PATH" done ''; - + meta = { homepage = http://www.povray.org/; description = "Persistence of Vision Raytracer"; - license = "free"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/tools/graphics/qrcode/default.nix b/pkgs/tools/graphics/qrcode/default.nix new file mode 100644 index 000000000000..e5bc5517b89e --- /dev/null +++ b/pkgs/tools/graphics/qrcode/default.nix @@ -0,0 +1,34 @@ +{stdenv, fetchgit}: +let + s = + rec { + baseName = "qrcode"; + date = "2014-01-01"; + version = "git-${date}"; + name = "${baseName}-${version}"; + url = "https://github.com/qsantos/qrcode"; + rev = "2843cbada3b768f60ee1ae13c65160083558cc03"; + sha256 = "0x321xhzxk6ldvpr2090w14khj9n2gfay9db5vvvli16affpcrvb"; + }; + buildInputs = [ + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchgit { + inherit (s) rev url sha256; + }; + installPhase = '' + mkdir -p "$out"/{bin,share/doc/qrcode} + cp qrcode "$out/bin" + cp DOCUMENTATION LICENCE "$out/share/doc/qrcode" + ''; + meta = { + inherit (s) version; + description = ''A small QR-code tool''; + license = stdenv.lib.licenses.gpl3Plus; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/graphics/quirc/default.nix b/pkgs/tools/graphics/quirc/default.nix new file mode 100644 index 000000000000..cab02f6573d1 --- /dev/null +++ b/pkgs/tools/graphics/quirc/default.nix @@ -0,0 +1,39 @@ +{stdenv, fetchgit, SDL_gfx, SDL, libjpeg, pkgconfig}: +let + s = + rec { + date = "2014-11-01"; + version = "git-${date}"; + baseName = "quirc"; + name = "${baseName}-${version}"; + url = "https://github.com/dlbeer/quirc"; + rev = "3a3df0d1d6adc59fdc2cadecfaed91650b84cacb"; + sha256 = "0wk2lmnw1k6m12dxs5a684mrm05x362h5kr3dwkfj8pyvdw3am18"; + }; + buildInputs = [ + SDL SDL_gfx libjpeg pkgconfig + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchgit { + inherit (s) url sha256 rev; + }; + NIX_CFLAGS_COMPILE="-I${SDL}/include/SDL"; + configurePhase = '' + sed -e 's/-[og] root//g' -i Makefile + ''; + preInstall = '' + mkdir -p "$out"/{bin,lib,include} + find . -maxdepth 1 -type f -perm +111 -exec cp '{}' "$out"/bin ';' + ''; + makeFlags = "PREFIX=$(out)"; + meta = { + inherit (s) version; + description = ''A small QR code decoding library''; + license = stdenv.lib.licenses.isc; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/graphics/scrot/default.nix b/pkgs/tools/graphics/scrot/default.nix index e5f2ca83a9b0..411e2fb45c87 100644 --- a/pkgs/tools/graphics/scrot/default.nix +++ b/pkgs/tools/graphics/scrot/default.nix @@ -13,5 +13,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://linuxbrit.co.uk/scrot/; description = "A command-line screen capture utility"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/graphics/transfig/default.nix b/pkgs/tools/graphics/transfig/default.nix index cf3722bbf1f6..f540029cbc73 100644 --- a/pkgs/tools/graphics/transfig/default.nix +++ b/pkgs/tools/graphics/transfig/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { builder = ./builder.sh; src = fetchurl { url = ftp://ftp.tex.ac.uk/pub/archive/graphics/transfig/transfig.3.2.4.tar.gz; - md5 = "742de0f7a3cae74d247bbd0c70dd9dd7"; + sha256 = "0429snhp5acbz61pvblwlrwv8nxr6gf12p37f9xxwrkqv4ir7dd4"; }; buildInputs = [zlib libjpeg libpng imake]; diff --git a/pkgs/tools/graphics/welkin/default.nix b/pkgs/tools/graphics/welkin/default.nix index 23c5ec11aaad..3d1a2aa5bdc0 100644 --- a/pkgs/tools/graphics/welkin/default.nix +++ b/pkgs/tools/graphics/welkin/default.nix @@ -2,9 +2,9 @@ x@{builderDefsPackage , jre , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ ["jre"]; buildInputs = map (n: builtins.getAttr n x) @@ -39,7 +39,7 @@ rec { sed -e 's@[.]/lib/welkin[.]jar@"'"$out"'/share/welkin/lib/welkin.jar"@' -i "$out/share/welkin/welkin.sh" chmod a+x "$out/bin/welkin" '' ["minInit" "defEnsureDir"]; - + meta = { description = "An RDF visualizer"; maintainers = with a.lib.maintainers; @@ -47,7 +47,7 @@ rec { raskin ]; hydraPlatforms = []; - license = "free-noncopyleft"; + license = a.lib.licenses.free; }; passthru = { updateInfo = { @@ -55,4 +55,3 @@ rec { }; }; }) x - diff --git a/pkgs/tools/graphics/zxing/default.nix b/pkgs/tools/graphics/zxing/default.nix new file mode 100644 index 000000000000..6834150f4775 --- /dev/null +++ b/pkgs/tools/graphics/zxing/default.nix @@ -0,0 +1,34 @@ +{stdenv, fetchurl, openjre, jre ? openjre}: +stdenv.mkDerivation rec { + name = "zxing-${version}"; + version = "3.1.0"; + # Maven builds are hard to get right + core_jar = fetchurl { + url = "http://repo1.maven.org/maven2/com/google/zxing/core/${version}/core-${version}.jar"; + sha256 = "199l4xvlcpafqn69r3k9qjpqkw9lvkl02hzpm0ackvdhl7vk42zh"; + }; + javase_jar = fetchurl { + url = "http://repo1.maven.org/maven2/com/google/zxing/javase/${version}/javase-${version}.jar"; + sha256 = "0fzxvvf5dqyrs5m9rqw4ffm9h1s27bi7q3jb1dam34s80q2rp2zq"; + }; + inherit jre; + unpackPhase = ''true''; + installPhase = '' + mkdir -p "$out/lib/java" "$out/bin" + cp "${core_jar}" "${javase_jar}" "$out/lib/java" + substituteAll "${./java-zxing.sh}" "$out/bin/java-zxing" + substituteAll "${./zxing-cmdline-runner.sh}" "$out/bin/zxing-cmdline-runner" + substituteAll "${./zxing-cmdline-encoder.sh}" "$out/bin/zxing-cmdline-encoder" + substituteAll "${./zxing.sh}" "$out/bin/zxing" + chmod a+x "$out/bin"/* + cd "$out/lib/java"; for i in *.jar; do mv "$i" "''${i#*-}"; done + ''; + meta = { + inherit version; + description = ''1D and 2D code reading library''; + license = stdenv.lib.licenses.asl20; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + homepage = "https://github.com/zxing/zxing"; + }; +} diff --git a/pkgs/tools/graphics/zxing/java-zxing.sh b/pkgs/tools/graphics/zxing/java-zxing.sh new file mode 100644 index 000000000000..bee3ac9e27a6 --- /dev/null +++ b/pkgs/tools/graphics/zxing/java-zxing.sh @@ -0,0 +1,3 @@ +#! /bin/sh + +@jre@/bin/java -cp @out@/lib/java/core-@version@.jar:@out@/lib/java/javase-@version@.jar "$@" diff --git a/pkgs/tools/graphics/zxing/zxing-cmdline-encoder.sh b/pkgs/tools/graphics/zxing/zxing-cmdline-encoder.sh new file mode 100644 index 000000000000..a17ba49cecf0 --- /dev/null +++ b/pkgs/tools/graphics/zxing/zxing-cmdline-encoder.sh @@ -0,0 +1,3 @@ +#! /bin/sh + +java-zxing com.google.zxing.client.j2se.CommandLineEncoder "$@" diff --git a/pkgs/tools/graphics/zxing/zxing-cmdline-runner.sh b/pkgs/tools/graphics/zxing/zxing-cmdline-runner.sh new file mode 100644 index 000000000000..cb2a25dc03f7 --- /dev/null +++ b/pkgs/tools/graphics/zxing/zxing-cmdline-runner.sh @@ -0,0 +1,3 @@ +#! /bin/sh + +java-zxing com.google.zxing.client.j2se.CommandLineRunner "$@" diff --git a/pkgs/tools/graphics/zxing/zxing.sh b/pkgs/tools/graphics/zxing/zxing.sh new file mode 100644 index 000000000000..ca6ac60bab69 --- /dev/null +++ b/pkgs/tools/graphics/zxing/zxing.sh @@ -0,0 +1,18 @@ +#! /bin/sh +choice="$1"; +shift +case "$choice" in + encode | create | write | CommandLineEncoder) + zxing-cmdline-encoder "$@"; + ;; + decode | read | run | CommandLineRunner) + zxing-cmdline-runner "$@"; + ;; + help | usage | --help | --usage | -h) + zxing read; + zxing write; + ;; + *) + zxing read "$choice" "$@" + ;; +esac diff --git a/pkgs/tools/inputmethods/fcitx/default.nix b/pkgs/tools/inputmethods/fcitx/default.nix index 28f6c97949b5..a8b3089c58ac 100644 --- a/pkgs/tools/inputmethods/fcitx/default.nix +++ b/pkgs/tools/inputmethods/fcitx/default.nix @@ -5,7 +5,8 @@ }: stdenv.mkDerivation rec { - name = "fcitx-4.2.8.5"; + name = "fcitx-${version}"; + version = "4.2.8.5"; src = fetchurl { url = "http://download.fcitx-im.org/fcitx/${name}_dict.tar.xz"; diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix new file mode 100644 index 000000000000..8bbd28f82a31 --- /dev/null +++ b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, cmake, fcitx, gtk3, isocodes }: + +stdenv.mkDerivation rec { + name = "fcitx-configtool-0.4.8"; + + meta = with stdenv.lib; { + description = "GTK-based config tool for Fcitx"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ cdepillabout ]; + }; + + src = fetchurl { + url = "http://download.fcitx-im.org/fcitx-configtool/${name}.tar.xz"; + sha256 = "1vaim0namw58bfafbvws1vgd4010p19zwqfbx6bd1zi5sgchdg0f"; + }; + + buildInputs = [ fcitx cmake isocodes pkgconfig gtk3 ]; +} + diff --git a/pkgs/tools/inputmethods/fcitx/wrapper.nix b/pkgs/tools/inputmethods/fcitx/wrapper.nix new file mode 100644 index 000000000000..d4efb3326969 --- /dev/null +++ b/pkgs/tools/inputmethods/fcitx/wrapper.nix @@ -0,0 +1,35 @@ +{ stdenv, buildEnv, fcitx, makeWrapper, plugins }: + +# This is based on the pidgin-with-plugins package. +# Users should be able to configure what plugins are used +# by putting the following in their /etc/nixos/configuration.nix: +# environment.systemPackages = with pkgs; [ +# (fcitx-with-plugins.override { plugins = [ fcitx-anthy ]; }) +# ] +# Or, a normal user could use it by putting the following in his +# ~/.nixpkgs/config.nix: +# packageOverrides = pkgs: with pkgs; rec { +# (fcitx-with-plugins.override { plugins = [ fcitx-anthy ]; }) +# } + +let +drv = buildEnv { + name = "fcitx-with-plugins-" + (builtins.parseDrvName fcitx.name).version; + + paths = [ fcitx ] ++ plugins; + + postBuild = '' + # TODO: This could be avoided if buildEnv could be forced to create all directories + if [ -L $out/bin ]; then + rm $out/bin + mkdir $out/bin + for i in ${fcitx}/bin/*; do + ln -s $i $out/bin + done + fi + wrapProgram $out/bin/fcitx \ + --set FCITXDIR "$out/" + ''; + }; +in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; }) + diff --git a/pkgs/tools/inputmethods/uim/default.nix b/pkgs/tools/inputmethods/uim/default.nix index b8ee95fae92c..1da552a46e2c 100644 --- a/pkgs/tools/inputmethods/uim/default.nix +++ b/pkgs/tools/inputmethods/uim/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, intltool, pkgconfig, qt4, gtk2, gtk3, kdelibs, cmake, ... }: +{stdenv, fetchurl, intltool, pkgconfig, qt4, gtk2, gtk3, kdelibs, cmake, anthy, ... }: stdenv.mkDerivation rec { version = "1.8.6"; @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { gtk3 kdelibs cmake + anthy ]; patches = [ ./immodules_cache.patch ]; @@ -26,6 +27,7 @@ stdenv.mkDerivation rec { "--with-qt4-immodule" "--with-skk" "--with-x" + "--with-anthy-utf8" ]; dontUseCmakeConfigure = true; diff --git a/pkgs/tools/misc/abduco/default.nix b/pkgs/tools/misc/abduco/default.nix index a3f5c4a1d61e..e5db7f26ef6f 100644 --- a/pkgs/tools/misc/abduco/default.nix +++ b/pkgs/tools/misc/abduco/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "abduco-0.1"; + name = "abduco-0.2"; meta = { homepage = http://brain-dump.org/projects/abduco; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://www.brain-dump.org/projects/abduco/${name}.tar.gz"; - sha256 = "b4ef297cb7cc81170dc7edf75385cb1c55e024a52f90c1dd0bc0e9862e6f39b5"; + sha256 = "04hrlxb02h2j8vxjnj263slyzxgkf7sncxfm0iwds5097f85mdy8"; }; configFile = optionalString (conf!=null) (writeText "config.def.h" conf); diff --git a/pkgs/tools/misc/aws-mturk-clt/default.nix b/pkgs/tools/misc/aws-mturk-clt/default.nix index d2d29aae785d..4db4f3b1672b 100644 --- a/pkgs/tools/misc/aws-mturk-clt/default.nix +++ b/pkgs/tools/misc/aws-mturk-clt/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "aws-mturk-clt-1.3.0"; - + src = fetchurl { url = "http://mturk.s3.amazonaws.com/CLTSource/${name}.tar.gz"; sha256 = "06p0cbb5afmqjjlibbw9gb08jp270c7j57lhnf9ld50sm1z021ln"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://requester.mturk.com/developer; description = "Command line tools for interacting with the Amazon Mechanical Turk"; - license = "unfree-redistributable"; # Amazon http://aws.amazon.com/asl/ + license = stdenv.lib.licenses.amazonsl; longDescription = '' diff --git a/pkgs/tools/misc/bmon/default.nix b/pkgs/tools/misc/bmon/default.nix index 4a1a272cc0fe..1a24ba700513 100644 --- a/pkgs/tools/misc/bmon/default.nix +++ b/pkgs/tools/misc/bmon/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "bmon-${version}"; - version = "3.5"; + version = "3.6"; src = fetchFromGitHub { owner = "tgraf"; repo = "bmon"; rev = "v${version}"; - sha256 = "0k6cwprwnrnilbs2fgkx7z9mg6rr11wf6djq6pjfc7fjn2fjvybi"; + sha256 = "16qwazays2j448kmfckv6wvh4rhmhc9q4vp1s75hm9z02cmhvk8q"; }; buildInputs = [ autoconf automake pkgconfig ncurses confuse libnl ]; diff --git a/pkgs/tools/misc/byobu/default.nix b/pkgs/tools/misc/byobu/default.nix index 909e44d98098..ca9a9453dbfc 100644 --- a/pkgs/tools/misc/byobu/default.nix +++ b/pkgs/tools/misc/byobu/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "byobu-5.68"; + name = "byobu-5.87"; src = fetchurl { - url = "https://launchpad.net/byobu/trunk/5.68/+download/byobu_5.68.orig.tar.gz"; - sha256 = "1xf2m18zx3075c0qvx4fzvn5afm274j5dl0jps7p2lbaq4k1lyhm"; + url = "https://launchpad.net/byobu/trunk/5.87/+download/byobu_5.87.orig.tar.gz"; + sha256 = "08v9y5hxb92caf5zp83fiq0jfwi167vw1ylf42s65x1ng8rvryqh"; }; doCheck = true; diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index 71ec1276c7c9..9f91a1acc608 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -3,11 +3,11 @@ , automake, autoconf, libtool, gtk_doc, which, gobjectIntrospection }: stdenv.mkDerivation rec { - name = "colord-1.1.7"; + name = "colord-1.2.3"; src = fetchurl { url = "http://www.freedesktop.org/software/colord/releases/${name}.tar.xz"; - sha256 = "295395526ee0be30917ae9c352e68bfeb20c7fc266a605725bef969f20547f44"; + sha256 = "1z3l6hb3b08fixfra6m887a2j3lvhib6vp798ik16jfh375gr490"; }; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 8844fe9c57cc..5be34ad5f310 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -10,16 +10,14 @@ assert selinuxSupport -> libselinux != null && libsepol != null; with { inherit (stdenv.lib) optional optionals optionalString optionalAttrs; }; let - self = stdenv.mkDerivation (rec { - name = "coreutils-8.21"; + self = stdenv.mkDerivation rec { + name = "coreutils-8.23"; src = fetchurl { url = "mirror://gnu/coreutils/${name}.tar.xz"; - sha256 = "064f512185iysqqcvhnhaf3bfmzrvcgs7n405qsyp99zmfyl9amd"; + sha256 = "0bdq6yggyl7nkc2pbl6pxhhyx15nyqhz3ds6rfn448n6rxdwlhzc"; }; - patches = [ ./help2man.patch ]; - nativeBuildInputs = [ perl ]; buildInputs = [ gmp ] ++ optional aclSupport acl @@ -64,6 +62,8 @@ let NIX_LDFLAGS = optionalString selinuxSupport "-lsepol"; + makeFlags = optionalString stdenv.isDarwin "CFLAGS=-D_FORTIFY_SOURCE=0"; + meta = { homepage = http://www.gnu.org/software/coreutils/; description = "The basic file, shell and text manipulation utilities of the GNU operating system"; @@ -77,11 +77,9 @@ let license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ ]; + maintainers = [ stdenv.lib.maintainers.eelco ]; }; - } // optionalAttrs stdenv.isDarwin { - makeFlags = "CFLAGS=-D_FORTIFY_SOURCE=0"; - }); + }; in self // stdenv.lib.optionalAttrs (stdenv.system == "armv7l-linux" || stdenv.isSunOS) { diff --git a/pkgs/tools/misc/coreutils/gets-undeclared.patch b/pkgs/tools/misc/coreutils/gets-undeclared.patch deleted file mode 100644 index b6cdc77caa84..000000000000 --- a/pkgs/tools/misc/coreutils/gets-undeclared.patch +++ /dev/null @@ -1,71 +0,0 @@ -This patch is needed to allow builds with newer versions of -the GNU libc (2.16+). - - -commit 66712c23388e93e5c518ebc8515140fa0c807348 -Author: Eric Blake <eblake@redhat.com> -Date: Thu Mar 29 13:30:41 2012 -0600 - - stdio: don't assume gets any more - - Gnulib intentionally does not have a gets module, and now that C11 - and glibc have dropped it, we should be more proactive about warning - any user on a platform that still has a declaration of this dangerous - interface. - - * m4/stdio_h.m4 (gl_STDIO_H, gl_STDIO_H_DEFAULTS): Drop gets - support. - * modules/stdio (Makefile.am): Likewise. - * lib/stdio-read.c (gets): Likewise. - * tests/test-stdio-c++.cc: Likewise. - * m4/warn-on-use.m4 (gl_WARN_ON_USE_PREPARE): Fix comment. - * lib/stdio.in.h (gets): Make warning occur in more places. - * doc/posix-functions/gets.texi (gets): Update documentation. - Reported by Christer Solskogen. - - Signed-off-by: Eric Blake <eblake@redhat.com> - -diff --git a/lib/stdio.in.h b/lib/stdio.in.h -index aa7b599..c377b6e 100644 ---- a/lib/stdio.in.h -+++ b/lib/stdio.in.h -@@ -698,22 +698,11 @@ _GL_WARN_ON_USE (getline, "getline is unportable - " - # endif - #endif - --#if @GNULIB_GETS@ --# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@ --# if !(defined __cplusplus && defined GNULIB_NAMESPACE) --# undef gets --# define gets rpl_gets --# endif --_GL_FUNCDECL_RPL (gets, char *, (char *s) _GL_ARG_NONNULL ((1))); --_GL_CXXALIAS_RPL (gets, char *, (char *s)); --# else --_GL_CXXALIAS_SYS (gets, char *, (char *s)); --# undef gets --# endif --_GL_CXXALIASWARN (gets); - /* It is very rare that the developer ever has full control of stdin, -- so any use of gets warrants an unconditional warning. Assume it is -- always declared, since it is required by C89. */ -+ so any use of gets warrants an unconditional warning; besides, C11 -+ removed it. */ -+#undef gets -+#if HAVE_RAW_DECL_GETS - _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); - #endif - -@@ -1053,9 +1042,9 @@ _GL_WARN_ON_USE (snprintf, "snprintf is unportable - " - # endif - #endif - --/* Some people would argue that sprintf should be handled like gets -- (for example, OpenBSD issues a link warning for both functions), -- since both can cause security holes due to buffer overruns. -+/* Some people would argue that all sprintf uses should be warned about -+ (for example, OpenBSD issues a link warning for it), -+ since it can cause security holes due to buffer overruns. - However, we believe that sprintf can be used safely, and is more - efficient than snprintf in those safe cases; and as proof of our - belief, we use sprintf in several gnulib modules. So this header diff --git a/pkgs/tools/misc/coreutils/help2man.patch b/pkgs/tools/misc/coreutils/help2man.patch deleted file mode 100644 index 9f3cbaa40ff1..000000000000 --- a/pkgs/tools/misc/coreutils/help2man.patch +++ /dev/null @@ -1,40 +0,0 @@ -Although the above man pages depend on src/md5sum.c as a shared -source, the build of the man pages directly requires their own -executables to exist. - -* man/local.mk (man/sha1sum.1): Change the dependency from -'src/md5sum' to 'src/sha1sum'. -(man/sha224sum.1): s/md5sum/sha224sum/ -(man/sha256sum.1): s/md5sum/sha256sum/ -(man/sha384sum.1): s/md5sum/sha384sum/ -(man/sha512sum.1): s/md5sum/sha512sum/ - -Reported by Pádraig Brady in -http://lists.gnu.org/archive/html/coreutils/2013-11/msg00006.html ---- - man/local.mk | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/man/local.mk b/man/local.mk -index 266b780..45dbcb9 100644 ---- a/man/local.mk -+++ b/man/local.mk -@@ -131,11 +131,11 @@ man/rm.1: src/rm - man/rmdir.1: src/rmdir - man/runcon.1: src/runcon - man/seq.1: src/seq --man/sha1sum.1: src/md5sum --man/sha224sum.1: src/md5sum --man/sha256sum.1: src/md5sum --man/sha384sum.1: src/md5sum --man/sha512sum.1: src/md5sum -+man/sha1sum.1: src/sha1sum -+man/sha224sum.1: src/sha224sum -+man/sha256sum.1: src/sha256sum -+man/sha384sum.1: src/sha384sum -+man/sha512sum.1: src/sha512sum - man/shred.1: src/shred - man/shuf.1: src/shuf - man/sleep.1: src/sleep --- -1.8.3.1 diff --git a/pkgs/tools/misc/datamash/default.nix b/pkgs/tools/misc/datamash/default.nix new file mode 100644 index 000000000000..dabf843fc83b --- /dev/null +++ b/pkgs/tools/misc/datamash/default.nix @@ -0,0 +1,18 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "datamash-${version}"; + version = "1.0.6"; + + src = fetchurl { + url = "http://ftp.gnu.org/gnu/datamash/${name}.tar.gz"; + sha256 = "0154c25c45b5506b6d618ca8e18d0ef093dac47946ac0df464fb21e77b504118"; + }; + + meta = { + description = "GNU datamash"; + homepage = http://www.gnu.org/software/datamash/; + platforms = stdenv.lib.platforms.all; + }; + +} diff --git a/pkgs/tools/misc/dbacl/default.nix b/pkgs/tools/misc/dbacl/default.nix index f433db68a640..fd0f647bf5df 100644 --- a/pkgs/tools/misc/dbacl/default.nix +++ b/pkgs/tools/misc/dbacl/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "dbacl-1.14"; src = fetchurl { url = "http://www.lbreyer.com/gpl/${name}.tar.gz"; - md5 = "85bfd88bc20f326dc0f31e794948e21c"; + sha256 = "0224g6x71hyvy7jikfxmgcwww1r5lvk0jx36cva319cb9nmrbrq7"; }; meta = { diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index 43be10ee74d2..834dfcb7e3a4 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -32,13 +32,13 @@ in stdenv.mkDerivation { - name = "debootstrap-1.0.63"; + name = "debootstrap-1.0.64"; src = fetchurl { # git clone git://git.debian.org/d-i/debootstrap.git # I'd like to use the source. However it's lacking the lanny script ? (still true?) - url = http://ftp.de.debian.org/debian/pool/main/d/debootstrap/debootstrap_1.0.63.tar.xz; - sha256 = "1maavqg3qjfrmmh76zbl3fwy1hmws93qgwqrw9vh1dffjxgngvcw"; + url = http://ftp.de.debian.org/debian/pool/main/d/debootstrap/debootstrap_1.0.64.tar.xz; + sha256 = "0yrdgggqgb7g1h677zipaxs17iyw4fmnmhh0l5n17d8x39pqjkd8"; }; buildInputs = [ dpkg gettext gawk perl ]; diff --git a/pkgs/tools/misc/dvtm/default.nix b/pkgs/tools/misc/dvtm/default.nix index 22bea399f033..29cd3b524172 100644 --- a/pkgs/tools/misc/dvtm/default.nix +++ b/pkgs/tools/misc/dvtm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "dvtm-0.12"; + name = "dvtm-0.13"; meta = { description = "Dynamic virtual terminal manager"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/${name}.tar.gz"; - sha256 = "0qcwsxhg738rq3bh4yid15nz2rrjc9k7ay6c1qv15c3gkw86zc3f"; + sha256 = "0s15i3ilrfh069m3qimam25w56flmm65c34ima5y3f50kmyblpaj"; }; buildInputs = [ ncurses ]; diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix index 36d49ce9b235..2ced43d29cb4 100644 --- a/pkgs/tools/misc/ethtool/default.nix +++ b/pkgs/tools/misc/ethtool/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "ethtool-3.15"; + name = "ethtool-3.16"; src = fetchurl { url = "mirror://kernel/software/network/ethtool/${name}.tar.xz"; - sha256 = "16kgw9y4fisldf1z6zpw3v965cc8nram0dycacwkc0js4l76klw8"; + sha256 = "11m2ghjgnbjbvxamgjkr94cw9sz1znla8rkw923svhq4m4zxvq6n"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix index ba0784138b31..6bfb1852f870 100644 --- a/pkgs/tools/misc/execline/default.nix +++ b/pkgs/tools/misc/execline/default.nix @@ -1,4 +1,8 @@ -{stdenv, fetchurl, skalibs}: +{ stdenv +, fetchurl +, skalibs +, skarnetConfCompile +}: let @@ -13,40 +17,13 @@ in stdenv.mkDerivation rec { sha256 = "1br3qzif166kbp4k813ljbyq058p7mfsp2lj88n8vi4dmj935nzg"; }; - buildInputs = [ skalibs ]; + buildInputs = [ skalibs skarnetConfCompile ]; sourceRoot = "admin/${name}"; - configurePhase = '' - pushd conf-compile - - printf "$out/bin" > conf-install-command - printf "$out/include" > conf-install-include - printf "$out/lib" > conf-install-library - printf "$out/lib" > conf-install-library.so - printf "$out/sysdeps" > conf-install-sysdeps - - printf "${skalibs}/sysdeps" > import - printf "${skalibs}/include" > path-include - printf "${skalibs}/lib" > path-library - - # let nix builder strip things, cross-platform - truncate --size 0 conf-stripbins - truncate --size 0 conf-striplibs - - rm -f flag-slashpackage - touch flag-allstatic - - popd - ''; - - preBuild = '' - patchShebangs src/sys - ''; - meta = { homepage = http://skarnet.org/software/execline/; - description = "A small scripting language, to be used in place of a shell in non-interactive scripts."; + description = "A small scripting language, to be used in place of a shell in non-interactive scripts"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.isc; }; diff --git a/pkgs/tools/misc/fasd/default.nix b/pkgs/tools/misc/fasd/default.nix index 1cbbb9720c9a..54edaaa033a4 100644 --- a/pkgs/tools/misc/fasd/default.nix +++ b/pkgs/tools/misc/fasd/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/clvv/fasd"; description = "quick command-line access to files and directories for POSIX shells"; - license = "free"; # https://github.com/clvv/fasd/blob/master/LICENSE + license = stdenv.lib.licenses.free; # https://github.com/clvv/fasd/blob/master/LICENSE longDescription = '' Fasd is a command-line productivity booster. diff --git a/pkgs/tools/misc/figlet/default.nix b/pkgs/tools/misc/figlet/default.nix index 7f22a35e8de1..99c7a056051d 100644 --- a/pkgs/tools/misc/figlet/default.nix +++ b/pkgs/tools/misc/figlet/default.nix @@ -16,9 +16,9 @@ stdenv.mkDerivation { makeFlags="DESTDIR=$out/bin MANDIR=$out/man/man6 DEFAULTFONTDIR=$out/share/figlet" ''; - meta = { + meta = { description = "Program for making large letters out of ordinary text"; homepage = http://www.figlet.org/; - license = "AFL-2.1"; + license = stdenv.lib.licenses.afl21; }; } diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix index c4e74359b15b..b514f1c920f2 100644 --- a/pkgs/tools/misc/flashrom/default.nix +++ b/pkgs/tools/misc/flashrom/default.nix @@ -11,12 +11,12 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libftdi pciutils ]; - makeFlags = ["PREFIX=$out"]; + preConfigure = "export PREFIX=$out"; meta = { homepage = "http://www.flashrom.org"; description = "Utility for reading, writing, erasing and verifying flash ROM chips"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.funfunctor ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/misc/getopt/default.nix b/pkgs/tools/misc/getopt/default.nix index 41bc2ffc99df..ed4cde69eda7 100644 --- a/pkgs/tools/misc/getopt/default.nix +++ b/pkgs/tools/misc/getopt/default.nix @@ -5,6 +5,9 @@ stdenv.mkDerivation { builder = ./builder.sh; src = fetchurl { url = http://tarballs.nixos.org/getopt-1.1.4.tar.gz; - md5 = "02188ca68da27c4175d6e9f3da732101"; + sha256 = "1arvjfzw6p310zbgv629w5hkyslrj44imf3r3s2r4ry2jfcks221"; }; + preBuild = '' + export buildFlags=CC="$CC" # for darwin + ''; } diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix index 4f4931e004f2..ae437b3c3e78 100644 --- a/pkgs/tools/misc/grub/default.nix +++ b/pkgs/tools/misc/grub/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { src = fetchurl { url = ftp://alpha.gnu.org/gnu/grub/grub-0.97.tar.gz; - md5 = "cd3f3eb54446be6003156158d51f4884"; + sha256 = "02r6b52r0nsp6ryqfiqchnl7r1d9smm80sqx24494gmx5p8ia7af"; }; # Lots of patches from Gentoo, in particular splash screen support diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix new file mode 100644 index 000000000000..9f897d7e93a2 --- /dev/null +++ b/pkgs/tools/misc/grub/trusted.nix @@ -0,0 +1,26 @@ +{stdenv, fetchgit, autoconf, automake, buggyBiosCDSupport ? true}: + +stdenv.mkDerivation { + name = "trustedGRUB-1.1.5"; + + src = fetchgit { + url = "https://github.com/ts468/TrustedGRUB"; + rev = "954941c17e14c8f7b18e6cd3043ef5f946866f1c"; + sha256 = "30c21765dc44f02275e66220d6724ec9cd45496226ca28c6db59a9147aa22685"; + }; + + # Autoconf/automake required for the splashimage patch. + buildInputs = [autoconf automake]; + + preConfigure = '' + autoreconf + ''; + + meta = { + homepage = "http://sourceforge.net/projects/trustedgrub/"; + repositories.git = https://github.com/ts468/TrustedGRUB; + description = "Legacy GRUB bootloader extended with TCG support"; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ tstrobel ]; + }; +} diff --git a/pkgs/tools/misc/gummiboot/default.nix b/pkgs/tools/misc/gummiboot/default.nix index 2d0b0015f9dc..376550200620 100644 --- a/pkgs/tools/misc/gummiboot/default.nix +++ b/pkgs/tools/misc/gummiboot/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = http://pkgs.fedoraproject.org/repo/pkgs/gummiboot/gummiboot-45.tar.xz/5d4957390e959cb9f325b87712ddd3f1/gummiboot-45.tar.xz; - md5 = "5d4957390e959cb9f325b87712ddd3f1"; + sha256 = "15227d6abi90vg7rs234fm13af511nsd6dv87c3jvsjhgb9ib0hm"; }; meta = { diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 5cdc468c2a5a..bcfca5fddb5d 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -7,12 +7,12 @@ , enableShared ? true }: stdenv.mkDerivation rec { - version = "1.8.13"; - name = "hdf5-${version}-patch1"; + version = "1.8.14"; + name = "hdf5-${version}"; src = fetchurl { - url = "http://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-${version}.tar.gz"; - sha256 = "1h9qdl321gzm3ihdhlijbl9sh9qcdrw94j7izg64yfqhxj7b7xl2"; - }; + url = "http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-${version}/src/hdf5-${version}.tar.gz"; + sha256 = "0f86gv32pjrrphvamgims1dd7f3bp46hjarbcdy8k4gmyzpgxghx"; + }; passthru = { mpiSupport = (mpi != null); diff --git a/pkgs/tools/misc/i3minator/default.nix b/pkgs/tools/misc/i3minator/default.nix index 08e012128c24..02b804936549 100644 --- a/pkgs/tools/misc/i3minator/default.nix +++ b/pkgs/tools/misc/i3minator/default.nix @@ -32,7 +32,7 @@ in buildPythonPackage rec { project is inspired by tmuxinator and uses i3-py. ''; homepage = https://github.com/carlesso/i3minator; - license = "WTFPL"; # http://sam.zoy.org/wtfpl/ + license = stdenv.lib.licenses.wtfpl; maintainers = with maintainers; [ iElectric ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix new file mode 100644 index 000000000000..1f1302698c19 --- /dev/null +++ b/pkgs/tools/misc/ipxe/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchgit, perl, cdrkit, syslinux }: + +let + date = "20141124"; + rev = "5cbdc41778622c07429e00f5aee383b575532bf0"; +in + +stdenv.mkDerivation { + name = "ipxe-${date}-${builtins.substring 0 7 rev}"; + + buildInputs = [ perl cdrkit syslinux ]; + + src = fetchgit { + url = git://git.ipxe.org/ipxe.git; + sha256 = "22f427df9141a2bbb319b51bdca4f2b7d3a4cbb5d1b2dcb35a43460eac59d305"; + inherit rev; + }; + + sourceRoot = "git-export/src"; + + makeFlags = + [ "ECHO_E_BIN_ECHO=echo" "ECHO_E_BIN_ECHO_E=echo" # No /bin/echo here. + "ISOLINUX_BIN_LIST=${syslinux}/share/syslinux/isolinux.bin" + ]; + + installPhase = + '' + mkdir $out + cp bin/ipxe.dsk bin/ipxe.usb bin/ipxe.iso bin/ipxe.lkrn $out + ''; + + meta = with stdenv.lib; + { description = "Network boot firmware"; + homepage = http://ipxe.org/; + license = licenses.gpl2; + maintainers = with maintainers; [ emery ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/misc/ised/default.nix b/pkgs/tools/misc/ised/default.nix index 96acc6c8ab93..7d0963c2bb0f 100644 --- a/pkgs/tools/misc/ised/default.nix +++ b/pkgs/tools/misc/ised/default.nix @@ -1,42 +1,17 @@ -x@{builderDefsPackage - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchurl }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="ised"; - version = "2.6.0"; - name="${baseName}-${version}"; - url="mirror://sourceforge/project/ised/${name}.tar.bz2"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; +stdenv.mkDerivation rec { + name = "ised-${version}"; + version = "2.6.0"; + src = fetchurl { + url = "mirror://sourceforge/project/ised/${name}.tar.bz2"; sha256 = "0rf9brqkrad8f3czpfc1bxq9ybv3nxci9276wdxas033c82cqkjs"; }; - inherit (sourceInfo) name version; - inherit buildInputs; - - /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "doMakeInstall"]; - meta = { description = "A numeric sequence editor"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; - license = a.lib.licenses.gpl3Plus; - inherit version; + maintainers = with stdenv.lib.maintainers; [ raskin ]; + platforms = with stdenv.lib.platforms; linux; + license = stdenv.lib.licenses.gpl3Plus; }; -}) x - +} diff --git a/pkgs/tools/misc/jdiskreport/default.nix b/pkgs/tools/misc/jdiskreport/default.nix index 2fa712239314..08fbba873e5b 100644 --- a/pkgs/tools/misc/jdiskreport/default.nix +++ b/pkgs/tools/misc/jdiskreport/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.jgoodies.com/freeware/jdiskreport/; description = "A graphical utility to visualize disk usage"; - license = "unfree-redistributable"; #TODO freedist, libs under BSD-3 + license = stdenv.lib.licenses.unfreeRedistributable; #TODO freedist, libs under BSD-3 }; } diff --git a/pkgs/tools/misc/kermit/default.nix b/pkgs/tools/misc/kermit/default.nix index ee521f047006..3b2e71fd01c1 100644 --- a/pkgs/tools/misc/kermit/default.nix +++ b/pkgs/tools/misc/kermit/default.nix @@ -1,13 +1,14 @@ -{stdenv, fetchurl, ncurses}: -stdenv.mkDerivation { - name = "kermit-8.0.211"; +{ stdenv, fetchurl, ncurses, glibc }: + +stdenv.mkDerivation rec { + name = "kermit-9.0.302"; src = fetchurl { - url = ftp://kermit.columbia.edu/kermit/archives/cku211.tar.gz; - sha256 = "14xsmdlsk2pgsp51l7lxwncgljwvgm446a4m6nk488shj94cvrrr"; + url = ftp://ftp.kermitproject.org/kermit/archives/cku302.tar.gz; + sha256 = "0487mh6s99ijqf1pfmbm302pa5i4pzmm8s439hdl1ffs5g8jqpqd"; }; - buildInputs = [ ncurses ]; + buildInputs = [ ncurses glibc ]; unpackPhase = '' mkdir -p src @@ -17,19 +18,21 @@ stdenv.mkDerivation { patchPhase = '' sed -i -e 's@-I/usr/include/ncurses@@' \ - -e 's@-lncurses@-lncurses -lresolv -lcrypt@' \ -e 's@/usr/local@'"$out"@ makefile ''; - buildPhase = "make -f makefile linux"; + + buildPhase = "make -f makefile linux LNKFLAGS='-lcrypt -lresolv'"; + installPhase = '' mkdir -p $out/bin mkdir -p $out/man/man1 make -f makefile install ''; - meta = { - homepage = "http://www.columbia.edu/kermit/ck80.html"; + meta = with stdenv.lib; { + homepage = http://www.kermitproject.org/ck90.html; description = "Portable Scriptable Network and Serial Communication Software"; - license = "free non-commercial"; #Kermit http://www.columbia.edu/kermit/ckfaq.html#license + license = licenses.bsd3; + maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix index 6d03b09c588f..39987a3b605a 100644 --- a/pkgs/tools/misc/lbdb/default.nix +++ b/pkgs/tools/misc/lbdb/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { name = "lbdb-${version}"; src = fetchurl { url = "http://www.spinnaker.de/debian/lbdb_${version}.tar.gz"; - md5 = "a8e65f1400c90818ff324dc4fd67eba2"; + sha256 = "1279ssfrh4cqrjzq5q47xbdlw5qx3aazxjshi86ljm4cw6xxvgar"; }; buildInputs = [ perl ] ++ stdenv.lib.optional (!stdenv.isDarwin) finger_bsd; diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix index 48e31246426a..615063bbbcc8 100644 --- a/pkgs/tools/misc/less/default.nix +++ b/pkgs/tools/misc/less/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "less-468"; + name = "less-470"; src = fetchurl { url = "http://www.greenwoodsoftware.com/less/${name}.tar.gz"; - sha256 = "1s36hppwcrvf2csw5xyjrbkyyfgshqp5vfg32ms480hdn76bbs28"; + sha256 = "1vw6bp9wkr2ymvhmf0ikrv8m1zm5ww78s48ny7ks0zjf2i8xr4gi"; }; # Look for ‘sysless’ in /etc. diff --git a/pkgs/tools/misc/logstash/contrib.nix b/pkgs/tools/misc/logstash/contrib.nix new file mode 100644 index 000000000000..c019803f9035 --- /dev/null +++ b/pkgs/tools/misc/logstash/contrib.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, fetchzip }: + +# Note that plugins are supposed to be installed as: +# $path/logstash/{inputs,codecs,filters,outputs}/*.rb +stdenv.mkDerivation rec { + version = "1.4.2"; + name = "logstash-contrib-${version}"; + + src = fetchzip { + url = "http://download.elasticsearch.org/logstash/logstash/logstash-contrib-${version}.tar.gz"; + sha256 = "1yj8sf3b526gixh3c6zhgkfpg4f0c72p1lzhfhdx8b3lw7zjkj0k"; + }; + + dontBuild = true; + dontPatchELF = true; + dontStrip = true; + dontPatchShebangs = true; + + installPhase = '' + mkdir -p $out/logstash + cp -r lib/* $out + ''; + + meta = with lib; { + description = "Community-maintained logstash plugins"; + homepage = https://github.com/elasticsearch/logstash-contrib; + license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.unix; + maintainers = with maintainers; [ cstrahan ]; + }; +} diff --git a/pkgs/tools/misc/mdbtools/git.nix b/pkgs/tools/misc/mdbtools/git.nix index b97af331093b..11b5520c7bb2 100644 --- a/pkgs/tools/misc/mdbtools/git.nix +++ b/pkgs/tools/misc/mdbtools/git.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchgit, glib, readline, bison, flex, pkgconfig, - libiconv, autoconf, automake, libtool, which, txt2man, gnome_doc_utils, + libiconvOrEmpty, autoconf, automake, libtool, which, txt2man, gnome_doc_utils, scrollkeeper}: stdenv.mkDerivation { @@ -12,8 +12,10 @@ stdenv.mkDerivation { name = "mdbtools-git-export"; }; - buildInputs = [glib readline bison flex pkgconfig libiconv autoconf automake - libtool which txt2man gnome_doc_utils scrollkeeper ]; + buildInputs = [ + glib readline bison flex pkgconfig autoconf automake + libtool which txt2man gnome_doc_utils scrollkeeper + ] ++ libiconvOrEmpty; preConfigure = '' sed -e 's@static \(GHashTable [*]mdb_backends;\)@\1@' -i src/libmdb/backend.c diff --git a/pkgs/tools/misc/megacli/default.nix b/pkgs/tools/misc/megacli/default.nix index 7fd6ce966d6d..2d45bee49076 100644 --- a/pkgs/tools/misc/megacli/default.nix +++ b/pkgs/tools/misc/megacli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rpm, cpio, ncurses, patchelf, makeWrapper, requireFile, unzip }: +{ stdenv, rpmextract, ncurses, patchelf, makeWrapper, requireFile, unzip }: assert stdenv.system == "x86_64-linux"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "11jzvh25mlygflazd37gi05xv67im4rgq7sbs5nwgw3gxdh4xfjj"; }; - buildInputs = [rpm cpio ncurses unzip makeWrapper]; + buildInputs = [rpmextract ncurses unzip makeWrapper]; libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.gcc stdenv.gcc.libc ncurses ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cd $out unzip ${src} - rpm2cpio linux/MegaCli-8.07.07-1.noarch.rpm | cpio -idmv + rpmextract linux/MegaCli-8.07.07-1.noarch.rpm ${patchelf}/bin/patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" --set-rpath ${libPath}:$out/opt/lsi/3rdpartylibs/x86_64:$out/opt/lsi/3rdpartylibs:${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib opt/MegaRAID/MegaCli/MegaCli64 wrapProgram $out/opt/MegaRAID/MegaCli/MegaCli64 --set LD_LIBRARY_PATH $out/opt/lsi/3rdpartylibs/x86_64 ln -s $out/opt/MegaRAID/MegaCli/MegaCli64 $out/bin/MegaCli64 diff --git a/pkgs/tools/misc/mssys/default.nix b/pkgs/tools/misc/mssys/default.nix index 6d3634ea7af9..3e37009c723b 100644 --- a/pkgs/tools/misc/mssys/default.nix +++ b/pkgs/tools/misc/mssys/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { src = fetchurl { url = mirror://sourceforge/ms-sys/ms-sys-2.1.3.tgz; - md5 = "6fad0a69ac89440ad4f696dbbbf11497"; + sha256 = "05djdqp7gqfrfb4czrmbgxgd8qr0h3781gzqvsp3qhfx6ay37z0p"; }; buildInputs = [gettext]; diff --git a/pkgs/tools/misc/mysql2pgsql/default.nix b/pkgs/tools/misc/mysql2pgsql/default.nix index 0dad6c2d33f3..ce4f8728a808 100644 --- a/pkgs/tools/misc/mysql2pgsql/default.nix +++ b/pkgs/tools/misc/mysql2pgsql/default.nix @@ -20,9 +20,9 @@ stdenv.mkDerivation { mv {,$out/bin/}mysql2psql ''; - meta = { + meta = { description = "converts mysql dump files to psql loadable files "; homepage = http://pgfoundry.org/projects/mysql2pgsql/; - license = "BSD-Original"; + license = stdenv.lib.licenses.bsdOriginal; }; } diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix new file mode 100644 index 000000000000..868e993737b0 --- /dev/null +++ b/pkgs/tools/misc/opentsdb/default.nix @@ -0,0 +1,184 @@ +{ stdenv, autoconf, automake, curl, fetchurl, jdk, jre, makeWrapper, nettools, python }: +with stdenv.lib; +let + thirdPartyDeps = { + guava = { + "guava-18.0.jar" = fetchurl { + url = http://repo1.maven.org/maven2/com/google/guava/guava/18.0/guava-18.0.jar; + md5 = "947641f6bb535b1d942d1bc387c45290"; + }; + }; + gwt = { + "gwt-dev-2.6.0.jar" = fetchurl { + url = http://central.maven.org/maven2/com/google/gwt/gwt-dev/2.6.0/gwt-dev-2.6.0.jar; + md5 = "23d8bf52709230c2c7e6dd817261f9ee"; + }; + "gwt-user-2.6.0.jar" = fetchurl { + url = http://repo1.maven.org/maven2/com/google/gwt/gwt-user/2.6.0/gwt-user-2.6.0.jar; + md5 = "99226fc2764f2b8fd6db6e05d0847659"; + }; + }; + hamcrest = { + "hamcrest-core-1.3.jar" = fetchurl { + url = http://central.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar; + md5 = "6393363b47ddcbba82321110c3e07519"; + }; + }; + hbase = { + "asynchbase-1.6.0.jar" = fetchurl { + url = http://central.maven.org/maven2/org/hbase/asynchbase/1.6.0/asynchbase-1.6.0.jar; + md5 = "6738dd73fd48d30cbf5c78f62bc18852"; + }; + }; + jackson = { + "jackson-annotations-2.4.3.jar" = fetchurl { + url = http://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.4.3/jackson-annotations-2.4.3.jar; + md5 = "31ef4fa866f9d24960a6807c9c299e98"; + }; + "jackson-core-2.4.3.jar" = fetchurl { + url = http://central.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/2.4.3/jackson-core-2.4.3.jar; + md5 = "750ef3d86f04fe0d6d14d6ae904a6d2d"; + }; + "jackson-databind-2.4.3.jar" = fetchurl { + url = http://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.4.3/jackson-databind-2.4.3.jar; + md5 = "4fcb9f74280eaa21de10191212c65b11"; + }; + }; + javassist = { + "javassist-3.18.1-GA.jar" = fetchurl { + url = http://central.maven.org/maven2/org/javassist/javassist/3.18.1-GA/javassist-3.18.1-GA.jar; + md5 = "5bb83868c87334320562af7eded65cc2"; + }; + }; + junit = { + "junit-4.11.jar" = fetchurl { + url = http://repo1.maven.org/maven2/junit/junit/4.11/junit-4.11.jar; + md5 = "3c42be5ea7cbf3635716abbb429cb90d"; + }; + }; + logback = { + "logback-classic-1.0.13.jar" = fetchurl { + url = https://opentsdb.googlecode.com/files/logback-classic-1.0.13.jar; + md5 = "b4dc8eb42150aafd6d9fd3d211807621"; + }; + "logback-core-1.0.13.jar" = fetchurl { + url = https://opentsdb.googlecode.com/files/logback-core-1.0.13.jar; + md5 = "3d5f8ce8dca36e493d39177b71958bd4"; + }; + }; + mockito = { + "mockito-1.9.0.jar" = fetchurl { + url = https://opentsdb.googlecode.com/files/mockito-1.9.0.jar; + md5 = "cab21b44958a173a5b1d55a6aff0ab54"; + }; + "mockito-core-1.9.5.jar" = fetchurl { + url = https://opentsdb.googlecode.com/files/mockito-core-1.9.5.jar; + md5 = "98f3076e2a691d1ac291624e5a46b80b"; + }; + }; + netty = { + "netty-3.9.4.Final.jar" = fetchurl { + url = http://central.maven.org/maven2/io/netty/netty/3.9.4.Final/netty-3.9.4.Final.jar; + md5 = "b3701ef46c7518d0d63705e2f092dbe5"; + }; + }; + objenesis = { + "objenesis-1.3.jar" = fetchurl { + url = http://repo1.maven.org/maven2/org/objenesis/objenesis/1.3/objenesis-1.3.jar; + md5 = "2d649907bd6203f2661f70d430a6ade8"; + }; + }; + powermock = { + "powermock-mockito-release-full-1.5.4-full.jar" = fetchurl { + url = http://repo1.maven.org/maven2/org/powermock/powermock-mockito-release-full/1.5.4/powermock-mockito-release-full-1.5.4-full.jar; + md5 = "5dee1dce6952bb7338d4d053157ae647"; + }; + }; + protobuf = { + "protobuf-java-2.5.0.jar" = fetchurl { + url = http://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.jar; + md5 = "a44473b98947e2a54c54e0db1387d137"; + }; + }; + slf4j = { + "log4j-over-slf4j-1.7.7.jar" = fetchurl { + url = http://repo1.maven.org/maven2/org/slf4j/log4j-over-slf4j/1.7.7/log4j-over-slf4j-1.7.7.jar; + md5 = "93ab42a5216afd683c35988c6b6fc3d8"; + }; + "slf4j-api-1.7.7.jar" = fetchurl { + url = http://repo1.maven.org/maven2/org/slf4j/slf4j-api/1.7.7/slf4j-api-1.7.7.jar; + md5 = "ca4280bf93d64367723ae5c8d42dd0b9"; + }; + }; + suasync = { + "suasync-1.4.0.jar" = fetchurl { + url = https://opentsdb.googlecode.com/files/suasync-1.4.0.jar; + md5 = "289ce3f3e6a9bb17857981eacf6d74b6"; + }; + }; + validation-api = { + "validation-api-1.0.0.GA.jar" = fetchurl { + url = http://repo1.maven.org/maven2/javax/validation/validation-api/1.0.0.GA/validation-api-1.0.0.GA.jar; + md5 = "40c1ee909493066397a6d4d9f8d375d8"; + }; + "validation-api-1.0.0.GA-sources.jar" = fetchurl { + url = http://repo1.maven.org/maven2/javax/validation/validation-api/1.0.0.GA/validation-api-1.0.0.GA-sources.jar; + md5 = "f816682933b59c5ffe32bdb4ab4bf628"; + }; + }; + zookeeper = { + "zookeeper-3.3.6.jar" = fetchurl { + url = https://opentsdb.googlecode.com/files/zookeeper-3.3.6.jar; + md5 = "02786e11c19d1671640992f1bda4a858"; + }; + }; + }; + +in stdenv.mkDerivation rec { + name = "opentsdb-2.1.0-rc1"; + + src = fetchurl { + url = https://github.com/OpenTSDB/opentsdb/archive/v2.1.0RC1.tar.gz; + sha256 = "01li02j8kjanmas2gxkcz3gsn54nyfyvqdylxz3fqqjgg6y7hrm7"; + }; + + buildInputs = [ autoconf automake curl jdk makeWrapper nettools python ]; + + configurePhase = '' + echo > build-aux/fetchdep.sh.in + ./bootstrap + mkdir build + cd build + ../configure --prefix=$out + patchShebangs ./build-aux/ + ''; + + buildPhase = + concatStringsSep + "\n" + (mapAttrsToList + (folder: jars: + "mkdir -p third_party/${folder}\n" + + (concatStringsSep + "\n" + (mapAttrsToList + (jar: src: + "ln -s ${src} third_party/${folder}/${jar}") + jars))) + thirdPartyDeps); + + installPhase = '' + make install + wrapProgram $out/bin/tsdb \ + --set JAVA_HOME "${jre}" \ + --set JAVA "${jre}/bin/java" + ''; + + meta = with stdenv.lib; { + description = "Time series database with millisecond precision"; + homepage = http://opentsdb.net; + license = licenses.lgpl21Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = [ maintainers.ocharles ]; + }; +} diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix new file mode 100644 index 000000000000..b91e6bcb3138 --- /dev/null +++ b/pkgs/tools/misc/ostree/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk_doc, gobjectIntrospection +, libgsystem, xz, e2fsprogs, libsoup, gpgme +}: + +stdenv.mkDerivation { + name = "ostree-2014.11"; + + meta = with stdenv.lib; { + description = "Git for operating system binaries"; + homepage = "http://live.gnome.org/OSTree/"; + license = licenses.lgpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ iyzsong ]; + }; + + src = fetchFromGitHub { + owner = "GNOME"; + repo = "ostree"; + rev = "v2014.11"; + sha256 = "152s94r744lyz64syagha2c4y4afblc178lr9mkk8h2d4xvp6nf5"; + }; + + nativeBuildInputs = [ + autoreconfHook pkgconfig gtk_doc gobjectIntrospection + ]; + + buildInputs = [ libgsystem xz e2fsprogs libsoup gpgme ]; + + preAutoreconf = '' + mkdir m4 + gtkdocize + ''; +} diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 60ca3adf29ef..61745c8bf490 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl }: stdenv.mkDerivation rec { - name = "parallel-20140922"; + name = "parallel-20141122"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "0hxx1h2ba6y2y1vy02r2hzndid2b469hj08f0vlmpjqw5g4f52a5"; + sha256 = "1kpd4ayd4lb867nfnpkam4b3mh86jl6cdy386x1rich938gbrg38"; }; patchPhase = diff --git a/pkgs/tools/misc/parcellite/default.nix b/pkgs/tools/misc/parcellite/default.nix index d516e50124c8..0f85a47b9e1b 100644 --- a/pkgs/tools/misc/parcellite/default.nix +++ b/pkgs/tools/misc/parcellite/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk2 }: stdenv.mkDerivation rec { - name = "parcellite-1.1.7"; + name = "parcellite-1.1.9"; src = fetchurl { url = "mirror://sourceforge/parcellite/${name}.tar.gz"; - sha256 = "0pszw3yd4a08p6jsz7asayr7jir08bxbwvfb16k01cj7ya4kf3w7"; + sha256 = "1m0igxny8f8hlbwcbsr4vg08808sqwy05h61ia2bxsrf122rba6b"; }; buildInputs = [ pkgconfig intltool gtk2 ]; diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix index 01b9f391a443..0763532260a9 100644 --- a/pkgs/tools/misc/parted/default.nix +++ b/pkgs/tools/misc/parted/default.nix @@ -1,20 +1,26 @@ -{ stdenv, fetchurl, devicemapper, libuuid, gettext, readline +{ stdenv, fetchurl, devicemapper, libuuid, gettext, readline, perl, python , utillinux, check, enableStatic ? false, hurd ? null }: stdenv.mkDerivation rec { - name = "parted-3.1"; + name = "parted-3.2"; src = fetchurl { url = "mirror://gnu/parted/${name}.tar.xz"; - sha256 = "05fa4m1bky9d13hqv91jlnngzlyn7y4rnnyq6d86w0dg3vww372y"; + sha256 = "1r3qpg3bhz37mgvp9chsaa3k0csby3vayfvz8ggsqz194af5i2w5"; }; + patches = stdenv.lib.optional doCheck ./gpt-unicode-test-fix.patch; + + postPatch = stdenv.lib.optionalString doCheck '' + patchShebangs tests + ''; + buildInputs = [ libuuid ] ++ stdenv.lib.optional (readline != null) readline ++ stdenv.lib.optional (gettext != null) gettext ++ stdenv.lib.optional (devicemapper != null) devicemapper ++ stdenv.lib.optional (hurd != null) hurd - ++ stdenv.lib.optional doCheck check; + ++ stdenv.lib.optionals doCheck [ check perl python ]; configureFlags = (if (readline != null) diff --git a/pkgs/tools/misc/parted/gpt-unicode-test-fix.patch b/pkgs/tools/misc/parted/gpt-unicode-test-fix.patch new file mode 100644 index 000000000000..470188bf55e5 --- /dev/null +++ b/pkgs/tools/misc/parted/gpt-unicode-test-fix.patch @@ -0,0 +1,38 @@ +From Ludo's suggestion at: + + http://debbugs.gnu.org/cgi/bugreport.cgi?msg=8;bug=18258 + +diff --git a/tests/.t0251-gpt-unicode.sh.swp b/tests/.t0251-gpt-unicode.sh.swp +deleted file mode 100644 +index b41c337..0000000 +Binary files a/tests/.t0251-gpt-unicode.sh.swp and /dev/null differ +diff --git a/tests/t0251-gpt-unicode.sh b/tests/t0251-gpt-unicode.sh +index c845950..fa63a72 100755 +--- a/tests/t0251-gpt-unicode.sh ++++ b/tests/t0251-gpt-unicode.sh +@@ -22,7 +22,24 @@ dev=loop-file + # create zeroed device + truncate -s 10m $dev || fail=1 + +-export LC_ALL=C.UTF-8 ++found_locale=no ++for locale in en_US de_DE fr_FR es_ES ++do ++ LC_ALL="$locale.UTF-8" ++ export LC_ALL ++ ++ # In a UTF-8 locale, the string below prints as 4 characters. ++ if [ `printf 'foo\341\264\244' | wc -m` -eq 4 ]; then ++ found_locale=yes ++ break ++ fi ++done ++ ++if [ "$found_locale" != "yes" ]; then ++ echo "no valid UTF-8 locale found; skipping" >&2 ++ exit 77 ++fi ++ + # create gpt label with named partition + part_name=$(printf 'foo\341\264\244') + parted -s $dev mklabel gpt mkpart primary ext2 1MiB 2MiB name 1 $part_name > empty 2>&1 || fail=1 diff --git a/pkgs/tools/misc/pastebinit/default.nix b/pkgs/tools/misc/pastebinit/default.nix index cf41de29c500..fd5004302dff 100644 --- a/pkgs/tools/misc/pastebinit/default.nix +++ b/pkgs/tools/misc/pastebinit/default.nix @@ -1,17 +1,15 @@ -{ stdenv, fetchurl, python3Packages }: +{ stdenv, fetchurl, python3 }: -python3Packages.buildPythonPackage rec { +stdenv.mkDerivation rec { version = "1.4.1"; name = "pastebinit-${version}"; src = fetchurl { url = "https://launchpad.net/pastebinit/trunk/${version}/+download/${name}.tar.bz2"; - md5 = "b771872a9483cf92be90a3e4420fd3c9"; + sha256 = "1rl854izwn1fpaaib6zj7a1a9bis8n7w4zfxcapgfffj37zj0dy2"; }; - configurePhase = "export DETERMINISTIC_BUILD=1"; - - buildPhase = ""; + buildInputs = [ python3 ]; installPhase = '' mkdir -p $out/bin @@ -21,8 +19,6 @@ python3Packages.buildPythonPackage rec { substituteInPlace $out/bin/pastebinit --replace "'/etc/pastebin.d" "'$out/etc/pastebin.d" ''; - doCheck = false; - meta = with stdenv.lib; { homepage = https://launchpad.net/pastebinit; description = "A software that lets you send anything you want directly to a pastebin from the command line"; diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix new file mode 100644 index 000000000000..42882c2701a7 --- /dev/null +++ b/pkgs/tools/misc/pipelight/default.nix @@ -0,0 +1,97 @@ +{ stdenv, fetchurl, fetchgit, autoconf, automake, wineUnstable, perl, xlibs + , gnupg, gcc48_multi, mesa, curl, bash, cacert, cabextract, utillinux, attr + }: + +let + wine_patches_version = "1.7.30"; + wine_hash = "0v08w2av46y4wxrl8q4k9fhbi2cgawjaxclahqnpfw098bqcmxqh"; + + wine_patches = fetchgit { + url = "git://github.com/compholio/wine-compholio.git"; + rev = "refs/tags/v${wine_patches_version}"; + sha256 = "02i0bpxxiyxavlcd5qm7wv0q4bm9bxr3ng3w2k234ww7cyndm0ws"; + }; + + wine_custom = + stdenv.lib.overrideDerivation wineUnstable (args: rec { + name = "wine-${wine_patches_version}"; + version = "${wine_patches_version}"; + src = null; + srcs = [ + (fetchurl { + url = "mirror://sourceforge/wine/${name}.tar.bz2"; + sha256 = wine_hash; + }) + wine_patches ]; + sourceRoot = "./${name}"; + buildInputs = args.buildInputs ++ [ + autoconf perl utillinux automake attr + ]; + nativeBuildInputs = args.nativeBuildInputs ++ [ + autoconf perl utillinux automake attr + ]; + postPatch = '' + export wineDir=$(pwd) + patchShebangs $wineDir/tools/ + chmod u+w $wineDir/../git-export/debian/tools/ + patchShebangs $wineDir/../git-export/debian/tools/ + chmod -R +rwx ../git-export/ + make -C ../git-export/patches DESTDIR=$wineDir install + ''; + }); + + mozillaPluginPath = "/lib/mozilla/plugins"; + + +in stdenv.mkDerivation rec { + + version = "0.2.7.3"; + + name = "pipelight-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/mmueller2012/pipelight/get/v${version}.tar.gz"; + sha256 = "0lifgs3aakyxfk6r2f2p27z0iqzgz1dinqfgwx3vdh3l93s8aifv"; + }; + + buildInputs = [ wine_custom xlibs.libX11 gcc48_multi mesa curl ]; + propagatedbuildInputs = [ curl cabextract ]; + + patches = [ ./pipelight.patch ]; + + configurePhase = '' + patchShebangs . + ./configure \ + --prefix=$out \ + --moz-plugin-path=$out/${mozillaPluginPath} \ + --wine-path=${wine_custom} \ + --gpg-exec=${gnupg}/bin/gpg2 \ + --bash-interp=${bash}/bin/bash \ + --downloader=${curl}/bin/curl + $configureFlags + ''; + + passthru = { + mozillaPlugin = mozillaPluginPath; + wine = wine_custom; + }; + + postInstall = '' + $out/bin/pipelight-plugin --create-mozilla-plugins + ''; + + preFixup = '' + substituteInPlace $out/share/pipelight/install-dependency \ + --replace cabextract ${cabextract}/bin/cabextract + ''; + + enableParallelBuilding = true; + + meta = { + homepage = "http://pipelight.net/"; + licenses = with stdenv.lib.licenses; [ mpl11 gpl2 lgpl21 ]; + description = "A wrapper for using Windows plugins in Linux browsers"; + maintainers = with stdenv.lib.maintainers; [skeidel]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/tools/misc/pipelight/pipelight.patch b/pkgs/tools/misc/pipelight/pipelight.patch new file mode 100644 index 000000000000..bde6ecf943d9 --- /dev/null +++ b/pkgs/tools/misc/pipelight/pipelight.patch @@ -0,0 +1,122 @@ +diff -urN pipelight.old/bin/pipelight-plugin.in pipelight.new/bin/pipelight-plugin.in +--- pipelight.old/bin/pipelight-plugin.in 2014-07-19 22:53:02.000000000 +0200 ++++ pipelight.new/bin/pipelight-plugin.in 2014-07-27 00:02:39.275834030 +0200 +@@ -92,7 +92,7 @@ + PLUGIN_PATH=$(realpath "$PLUGIN_PATH") + + # Global installation +- if [ $(/usr/bin/id -u) -eq 0 ]; then ++ if [ $(id -u) -eq 0 ]; then + INSTALLDIR="$PLUGIN_PATH" + + # Use environment variable (only if it doesn't point to the global directory) +@@ -594,7 +594,7 @@ + fi + + # Ensure the signature is valid, extract the content +- if ! @@GPG@@ --batch --no-default-keyring --keyring "$PIPELIGHT_SHARE_PATH/sig-install-dependency.gpg" --decrypt "$tmpfile" > "$decfile"; then ++ if ! @@GPG@@ --homedir /tmp --batch --no-default-keyring --keyring "$PIPELIGHT_SHARE_PATH/sig-install-dependency.gpg" --decrypt "$tmpfile" > "$decfile"; then + rm "$tmpfile" + rm "$decfile" + echo "" +@@ -630,24 +630,10 @@ + return 0 + } + +-# Use fetch on FreeBSD if wget is not available +-if command -v wget >/dev/null 2>&1; then +- download_file() +- { +- wget -O "$1" "$2" +- } +-elif command -v fetch >/dev/null 2>&1; then +- download_file() +- { +- fetch -o "$1" "$2" +- } +-else +- download_file() +- { +- echo "ERROR: Could neither find wget nor fetch. Unable to download file!" >&2 +- return 1 +- } +-fi ++download_file() ++{ ++ curl --cacert /etc/ssl/certs/ca-bundle.crt -o "$1" "$2" ++} + + # Use shasum instead of sha256sum on MacOS / *BSD + if ! command -v sha256sum >/dev/null 2>&1 && command -v shasum >/dev/null 2>&1; then +diff -urN pipelight.old/configure pipelight.new/configure +--- pipelight.old/configure 2014-07-19 22:53:02.000000000 +0200 ++++ pipelight.new/configure 2014-07-26 23:52:13.690881447 +0200 +@@ -66,12 +66,8 @@ + datadir="" + libdir="" + mandir="" +-bash_interp="$(which bash)" +-if which gpg &> /dev/null; then +- gpg_exec="$(which gpg)" +-else +- gpg_exec="/usr/bin/gpg" +-fi ++bash_interp=bash ++gpg_exec=gpg2 + moz_plugin_path="" + gcc_runtime_dlls="" + so_mode="0644" +diff -urN pipelight.old/share/install-dependency pipelight.new/share/install-dependency +--- pipelight.old/share/install-dependency 2014-07-19 22:53:02.000000000 +0200 ++++ pipelight.new/share/install-dependency 2014-07-26 23:26:18.431938546 +0200 +@@ -734,42 +734,14 @@ + return 0 + } + +-# Use fetch on FreeBSD if wget is not available +-if command -v wget >/dev/null 2>&1; then +- download_file() +- { +- wget -O "$1" "$2" +- } +- get_download_size() +- { +- local filesize="$(wget -O- "$1" --spider --server-response 2>&1 | sed -ne '/Content-Length/{s/.*: //;p}')" +- local re='^[0-9]+$' +- if [[ "$filesize" -ne "0" ]] && [[ "$filesize" =~ $re ]]; then +- echo "$(($filesize/(1024*1024)))" +- else +- echo "N/A" +- fi +- } +-elif command -v fetch >/dev/null 2>&1; then +- download_file() +- { +- fetch -o "$1" "$2" +- } +- get_download_size() +- { +- echo "N/A" +- } +-else +- download_file() +- { +- echo "ERROR: Could neither find wget nor fetch. Unable to download file!" >&2 +- return 1 +- } +- get_download_size() +- { +- echo "N/A" +- } +-fi ++download_file() ++{ ++ curl --cacert /etc/ssl/certs/ca-bundle.crt -o "$1" "$2" ++} ++get_download_size() ++{ ++ echo "N/A" ++} + + # Use shasum instead of sha256sum on MacOS / *BSD + if ! command -v sha256sum >/dev/null 2>&1 && command -v shasum >/dev/null 2>&1; then diff --git a/pkgs/tools/misc/pk2cmd/default.nix b/pkgs/tools/misc/pk2cmd/default.nix index 909ed0856bb9..3501090c63c8 100644 --- a/pkgs/tools/misc/pk2cmd/default.nix +++ b/pkgs/tools/misc/pk2cmd/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.microchip.com/pickit2; - license = "nonfree"; #MicroChip-PK2 + license = stdenv.lib.licenses.unfree; #MicroChip-PK2 description = "Microchip PIC programming software for the PICKit2 programmer"; }; } diff --git a/pkgs/tools/misc/plowshare/default.nix b/pkgs/tools/misc/plowshare/default.nix index df5c8a77e829..79cb29b20ca3 100644 --- a/pkgs/tools/misc/plowshare/default.nix +++ b/pkgs/tools/misc/plowshare/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { name = "plowshare4-${version}"; - version = "20140714.0x5s0zn8"; + version = "1.1.0"; src = fetchgit { url = "https://code.google.com/p/plowshare/"; - rev = "0b67463ca8684c3e9c93bd8164c461a41538e99f"; - sha256 = "0x5s0zn88w2h0740n4yms6fhwbb19kjwbhaj3k9wrnz4m3112s1m"; + rev = "87bd955e681ddda05009ca8594d727260989d5ed"; + sha256 = "0cbsnalmr6fa1ijsn1j1p9fdqi3ii96bx3xabgvvbbqkl7q938f9"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/pv/default.nix b/pkgs/tools/misc/pv/default.nix index 0af7143a320a..a94cdea1339f 100644 --- a/pkgs/tools/misc/pv/default.nix +++ b/pkgs/tools/misc/pv/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.ivarch.com/programs/pv; description = "Tool for monitoring the progress of data through a pipeline"; - license = "Artistic-2"; + license = stdenv.lib.licenses.artistic2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; all; }; diff --git a/pkgs/tools/misc/rcm/default.nix b/pkgs/tools/misc/rcm/default.nix new file mode 100644 index 000000000000..7fa9eb0e34f6 --- /dev/null +++ b/pkgs/tools/misc/rcm/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "rcm-1.2.3"; + + src = fetchurl { + url = https://thoughtbot.github.io/rcm/dist/rcm-1.2.3.tar.gz; + sha256 = "0gwpclbc152jkclj3w83s2snx3dcgljwr75q1z8czl3yar7d8bsh"; + }; + + meta = { + description = "Management Suite for Dotfiles"; + homepage = https://github.com/thoughtbot/rcm; + license = stdenv.lib.licenses.bsd3; + }; +} \ No newline at end of file diff --git a/pkgs/tools/misc/rlwrap/default.nix b/pkgs/tools/misc/rlwrap/default.nix index ace42e41887f..ee330c0bee53 100644 --- a/pkgs/tools/misc/rlwrap/default.nix +++ b/pkgs/tools/misc/rlwrap/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, readline }: stdenv.mkDerivation rec { - name = "rlwrap-0.41"; + name = "rlwrap-0.42"; src = fetchurl { url = "http://utopia.knoware.nl/~hlub/uck/rlwrap/${name}.tar.gz"; - sha256 = "02n22yy9wgz1cj59is17j0my17y7146ghkng381yxx4dnr3pcj9l"; + sha256 = "0i3yz303wscrysyzpdq04h4nrl9ajz9dbwi80risdl5rkm3dhw2s"; }; buildInputs = [ readline ]; diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix index f8e7dfaddc9e..650886351e6b 100644 --- a/pkgs/tools/misc/s6-portable-utils/default.nix +++ b/pkgs/tools/misc/s6-portable-utils/default.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchurl, skalibs }: +{ stdenv +, fetchurl +, skalibs +, skarnetConfCompile +}: let @@ -13,41 +17,17 @@ in stdenv.mkDerivation rec { sha256 = "040nmls7qbgw8yn502lym4kgqh5zxr2ks734bqajpi2ricnasvhl"; }; - buildInputs = [ skalibs ]; + buildInputs = [ skalibs skarnetConfCompile ]; sourceRoot = "admin/${name}"; - configurePhase = '' - pushd conf-compile - - printf "$out/bin" > conf-install-command - printf "$out/libexec" > conf-install-libexec - - # let nix builder strip things, cross-platform - truncate --size 0 conf-stripbins - truncate --size 0 conf-striplibs - - printf "${skalibs}/sysdeps" > import - printf "%s" "${skalibs}/include" > path-include - printf "%s" "${skalibs}/lib" > path-library - - rm -f flag-slashpackage - touch flag-allstatic - - popd - ''; - - preBuild = '' - patchShebangs src/sys - ''; - preInstall = '' mkdir -p "$out/libexec" ''; meta = { homepage = http://www.skarnet.org/software/s6-portable-utils/; - description = "A set of tiny general Unix utilities optimized for simplicity and small size."; + description = "A set of tiny general Unix utilities optimized for simplicity and small size"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.isc; }; diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index 6e3f8edbb9ca..daf9d3444009 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; preConfigure = '' - configureFlags="--enable-telnet --enable-pam --infodir=$out/share/info --mandir=$out/share/man --with-sys-screenrc=/etc/screenrc" + configureFlags="--enable-telnet --enable-pam --infodir=$out/share/info --mandir=$out/share/man --with-sys-screenrc=/etc/screenrc --enable-colors256" sed -i -e "s|/usr/local|/non-existent|g" -e "s|/usr|/non-existent|g" configure Makefile.in */Makefile.in ''; diff --git a/pkgs/tools/misc/screenfetch/default.nix b/pkgs/tools/misc/screenfetch/default.nix index 826f4e4d869f..442922b78054 100644 --- a/pkgs/tools/misc/screenfetch/default.nix +++ b/pkgs/tools/misc/screenfetch/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { ''; meta = { - description = "Fetches system/theme information in terminal for Linux desktop screenshots."; + description = "Fetches system/theme information in terminal for Linux desktop screenshots"; longDescription = '' screenFetch is a "Bash Screenshot Information Tool". This handy Bash script can be used to generate one of those nifty terminal theme diff --git a/pkgs/tools/misc/sutils/default.nix b/pkgs/tools/misc/sutils/default.nix index 53945113e7f2..d0576cc069a7 100644 --- a/pkgs/tools/misc/sutils/default.nix +++ b/pkgs/tools/misc/sutils/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { prePatch = ''sed -i "s@/usr/local@$out@" Makefile''; meta = { - description = "Small command-line utilities."; + description = "Small command-line utilities"; homepage = https://github.com/baskerville/sutils; maintainers = [ stdenv.lib.maintainers.meisternu ]; license = "Custom"; diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index 823374771696..7180665bd3d5 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ncurses, libevent, pkgconfig, makeWrapper}: +{stdenv, fetchurl, ncurses, libevent, pkgconfig}: stdenv.mkDerivation rec { pname = "tmux"; @@ -12,13 +12,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ncurses libevent makeWrapper ]; + buildInputs = [ ncurses libevent ]; postInstall = '' mkdir -p $out/etc/bash_completion.d cp -v examples/bash_completion_tmux.sh $out/etc/bash_completion.d/tmux - wrapProgram $out/bin/tmux --prefix TERMINFO : $out/share/terminfo ''; meta = { @@ -36,7 +35,7 @@ stdenv.mkDerivation rec { * Interactive menus to select windows, sessions or clients. * Change the current window by searching for text in the target. * Terminal locking, manually or after a timeout. - * A clean, easily extended, BSD-licensed codebase, under active development. + * A clean, easily extended, BSD-licensed codebase, under active development. ''; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/tools/misc/umlet/default.nix b/pkgs/tools/misc/umlet/default.nix new file mode 100644 index 000000000000..2ab345b6ebe2 --- /dev/null +++ b/pkgs/tools/misc/umlet/default.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchurl, jre, unzip }: + +stdenv.mkDerivation rec { + major = "13"; + minor = "1"; + version = "${major}.${minor}"; + name = "umlet-${version}"; + + src = fetchurl { + url = "http://www.umlet.com/umlet_${major}_${minor}/umlet_${version}.zip"; + sha256 = "0s10cmx0m5vbjj6y6gn007vzx1k5dlccgafccixl43q68dva3n3a"; + }; + + buildInputs = [ unzip ]; + + installPhase = '' + mkdir -p "$out/bin" + mkdir -p "$out/lib" + + cp -R * "$out/lib" + + cat > "$out/bin/umlet" << EOF + #!${stdenv.shell} + + programDir="$out/lib" + cd "\$programDir" + if [ \$# -eq 1 ] + then "${jre}/bin/java" -jar "\$programDir/umlet.jar" -filename="\$1" + else "${jre}/bin/java" -jar "\$programDir/umlet.jar" "\$@" + fi + + EOF + chmod a+x "$out/bin/umlet" + ''; + + meta = with stdenv.lib; { + description = "Free, open-source UML tool with a simple user interface"; + longDescription = '' + UMLet is a free, open-source UML tool with a simple user interface: + draw UML diagrams fast, produce sequence and activity diagrams from + plain text, export diagrams to eps, pdf, jpg, svg, and clipboard, + share diagrams using Eclipse, and create new, custom UML elements. + UMLet runs stand-alone or as Eclipse plug-in on Windows, OS X and + Linux. + ''; + homepage = http://www.umlet.com; + license = licenses.gpl3; + maintainers = [ maintainers.DamienCassou ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/misc/units/default.nix b/pkgs/tools/misc/units/default.nix index 84f0f63bd252..85d3049b2707 100644 --- a/pkgs/tools/misc/units/default.nix +++ b/pkgs/tools/misc/units/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "units-2.10"; + name = "units-2.11"; src = fetchurl { - url = mirror://gnu/units/units-2.10.tar.gz; - sha256 = "0fa4bk5aqyis5zisz6l8mqqk76njj6zgx3pbrjp5kvraz1dz78lc"; + url = mirror://gnu/units/units-2.11.tar.gz; + sha256 = "1gjs3wc212aaiq4r76hx9nl1h3fa39n0ljwl9420d6ixl3rdmdjk"; }; meta = { diff --git a/pkgs/tools/misc/venus/default.nix b/pkgs/tools/misc/venus/default.nix index b7f2be179c47..4206f468ec76 100644 --- a/pkgs/tools/misc/venus/default.nix +++ b/pkgs/tools/misc/venus/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { doCheck = true; checkPhase = "python runtests.py"; - buildInputs = [ python python.modules.bsddb python.modules.ssl libxslt + buildInputs = [ python python.modules.bsddb libxslt libxml2 pythonPackages.genshi pythonPackages.lxml makeWrapper ]; installPhase = '' diff --git a/pkgs/tools/misc/w3c-css-validator/default.nix b/pkgs/tools/misc/w3c-css-validator/default.nix index f08fe87202f0..3c7aa5261a24 100644 --- a/pkgs/tools/misc/w3c-css-validator/default.nix +++ b/pkgs/tools/misc/w3c-css-validator/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, sourceFromHead, apacheAnt, tomcat, jre }: -let +let sources = [ (fetchurl { @@ -69,7 +69,7 @@ stdenv.mkDerivation { homepage = http://dev.w3.org/cvsweb/2002/css-validator/; # dependencies ship their own license files # I think all .java files are covered by this license (?) - license = "w3c"; # http://www.w3.org/Consortium/Legal/ + license = stdenv.lib.licenses.w3c; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; broken = true; diff --git a/pkgs/tools/misc/xdaliclock/default.nix b/pkgs/tools/misc/xdaliclock/default.nix index df1a7eedeffd..7d731650288c 100644 --- a/pkgs/tools/misc/xdaliclock/default.nix +++ b/pkgs/tools/misc/xdaliclock/default.nix @@ -3,9 +3,9 @@ x@{builderDefsPackage , libSM, libXext , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) @@ -35,7 +35,7 @@ rec { '' ["minInit" "defEnsureDir"]; goSrcDir = "cd X11"; - + meta = { description = "A clock application that morphs digits when they are changed"; maintainers = with a.lib.maintainers; @@ -44,7 +44,7 @@ rec { ]; platforms = with a.lib.platforms; linux ++ freebsd; - license = "free"; #TODO BSD on Gentoo, looks like MIT + license = a.lib.licenses.free; #TODO BSD on Gentoo, looks like MIT downloadPage = "http://www.jwz.org/xdaliclock/"; inherit version; updateWalker = true; diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index bf23fbcf2cf1..88d6ff1ff06d 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, python, zip }: let - version = "2014.09.19"; + version = "2014.11.27"; in stdenv.mkDerivation rec { name = "youtube-dl-${version}"; src = fetchurl { url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "0xyn9rszvv0k0rqgwqzr69bk4n2crfxkwmmi8k26aw52yggba24k"; + sha256 = "0bmjlp3jk5nd2i9jpbqbv2smh5rdxcjajv7fccfinmi6v2bjm1aa"; }; buildInputs = [ python ]; @@ -26,8 +26,9 @@ stdenv.mkDerivation rec { homepage = "http://rg3.github.com/youtube-dl/"; repositories.git = https://github.com/rg3/youtube-dl.git; description = "Command-line tool to download videos from YouTube.com and other sites"; + license = stdenv.lib.licenses.unlicense; platforms = with stdenv.lib.platforms; linux ++ darwin; - maintainers = with stdenv.lib.maintainers; [ bluescreen303 simons phreedom ]; + maintainers = with stdenv.lib.maintainers; [ bluescreen303 simons phreedom AndersonTorres ]; }; } diff --git a/pkgs/tools/misc/yubico-piv-tool/default.nix b/pkgs/tools/misc/yubico-piv-tool/default.nix new file mode 100644 index 000000000000..f2821135cf6f --- /dev/null +++ b/pkgs/tools/misc/yubico-piv-tool/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, pkgconfig, openssl, pcsclite }: + +stdenv.mkDerivation rec { + name = "yubico-piv-tool-0.1.2"; + + src = fetchurl { + url = "https://developers.yubico.com/yubico-piv-tool/Releases/${name}.tar.gz"; + sha256 = "0sqakrlw4j60xhlmp2fq6ccj3lqf13kwvmahsrj3xr5qdi7h0fza"; + }; + + buildInputs = [ pkgconfig openssl pcsclite ]; + + configureFlags = [ "--with-backend=pcsc" ]; + + meta = with stdenv.lib; { + homepage = https://developers.yubico.com/yubico-piv-tool/; + description = ""; + maintainers = with maintainers; [ wkennington ]; + license = licenses.bsd2; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/misc/yubikey-personalization-gui/default.nix b/pkgs/tools/misc/yubikey-personalization-gui/default.nix new file mode 100644 index 000000000000..d0ffcc0d69e4 --- /dev/null +++ b/pkgs/tools/misc/yubikey-personalization-gui/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, pkgconfig, yubikey-personalization, qt, libyubikey }: + +stdenv.mkDerivation rec { + name = "yubikey-personalization-gui-3.1.16"; + + src = fetchurl { + url = "https://developers.yubico.com/yubikey-personalization-gui/Releases/${name}.tar.gz"; + sha256 = "0sdiy2jn0anjvhnz47mrkblhh3paf0gmbgdmrkm21kws4f6sb4kh"; + }; + + buildInputs = [ pkgconfig yubikey-personalization qt libyubikey ]; + + configurePhase = '' + qmake + ''; + + installPhase = '' + mkdir -p $out/bin + cp build/release/yubikey-personalization-gui $out/bin + ''; + + meta = with stdenv.lib; { + homepage = https://developers.yubico.com/yubikey-personalization-gui; + description = "a QT based cross-platform utility designed to facilitate reconfiguration of the Yubikey"; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/tools/misc/yubikey-personalization/default.nix b/pkgs/tools/misc/yubikey-personalization/default.nix new file mode 100644 index 000000000000..aa26167825bc --- /dev/null +++ b/pkgs/tools/misc/yubikey-personalization/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, libusb, libyubikey, json_c }: + +stdenv.mkDerivation rec { + name = "yubikey-personalization-${version}"; + version = "1.16.1"; + + src = fetchurl { + url = "https://developers.yubico.com/yubikey-personalization/Releases/ykpers-${version}.tar.gz"; + sha256 = "1zivikg1ndxziwdmy2x66f9x0jxwbl0km4vxr5wgjsk94q6h45li"; + }; + + buildInputs = [ pkgconfig libusb libyubikey json_c ]; + + configureFlags = [ + "--with-backend=libusb-1.0" + ]; + + meta = with stdenv.lib; { + homepage = https://developers.yubico.com/yubikey-personalization; + description = "a library and command line tool to personalize YubiKeys"; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/tools/networking/autossh/default.nix b/pkgs/tools/networking/autossh/default.nix index 94c466612ef5..8c85d99f2173 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.4c"; + name = "autossh-1.4d"; src = fetchurl { - url = "http://www.harding.motd.ca/autossh/autossh-1.4c.tgz"; - sha256 = "07gxqxfsk24msd0py0hirvmlblh9iyxkcrq86bwbsils81mbmjkg"; + url = "http://www.harding.motd.ca/autossh/autossh-1.4d.tgz"; + sha256 = "05nwvqfyk0kbalwabj4z3xx11i0qdqg6xadzk17ckr5xb3j8y000"; }; buildInputs = [ openssh ]; diff --git a/pkgs/tools/networking/badvpn/default.nix b/pkgs/tools/networking/badvpn/default.nix index 64f669a480e2..e11d454154b6 100644 --- a/pkgs/tools/networking/badvpn/default.nix +++ b/pkgs/tools/networking/badvpn/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cmake, openssl, nss, pkgconfig, nspr, bash}: +{stdenv, fetchurl, cmake, openssl, nss, pkgconfig, nspr, bash, debug ? false}: let s = # Generated upstream information rec { @@ -12,6 +12,7 @@ let buildInputs = [ cmake openssl nss pkgconfig nspr ]; + compileFlags = "-O3 ${stdenv.lib.optionalString (!debug) "-DNDEBUG"}"; in stdenv.mkDerivation { inherit (s) name version; @@ -23,6 +24,7 @@ stdenv.mkDerivation { preConfigure = '' find . -name '*.sh' -exec sed -e 's@#!/bin/sh@${stdenv.shell}@' -i '{}' ';' find . -name '*.sh' -exec sed -e 's@#!/bin/bash@${bash}/bin/bash@' -i '{}' ';' + cmakeFlagsArray=("-DCMAKE_BUILD_TYPE=" "-DCMAKE_C_FLAGS=${compileFlags}"); ''; meta = { diff --git a/pkgs/tools/networking/bully/default.nix b/pkgs/tools/networking/bully/default.nix index f667d772ac44..6c090a7ec1f6 100644 --- a/pkgs/tools/networking/bully/default.nix +++ b/pkgs/tools/networking/bully/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Retrieve WPA/WPA2 passphrase from a WPS enabled access point."; - homepage = "https://github.com/bdpurcell/bully"; + description = "Retrieve WPA/WPA2 passphrase from a WPS enabled access point"; + homepage = https://github.com/bdpurcell/bully; maintainers = [ stdenv.lib.maintainers.edwtjo ]; license = stdenv.lib.licenses.gpl3; }; diff --git a/pkgs/tools/networking/cadaver/default.nix b/pkgs/tools/networking/cadaver/default.nix index a37bf2d0a56d..a6752606da69 100644 --- a/pkgs/tools/networking/cadaver/default.nix +++ b/pkgs/tools/networking/cadaver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, openssl }: stdenv.mkDerivation rec { name = "cadaver-0.23.3"; @@ -8,6 +8,9 @@ stdenv.mkDerivation rec { sha256 = "1jizq69ifrjbjvz5y79wh1ny94gsdby4gdxwjad4bfih6a5fck7x"; }; + buildInputs = [openssl]; + configureFlags = ["--with-ssl"]; + meta = with stdenv.lib; { description = "A command-line WebDAV client for Unix"; homepage = http://www.webdav.org/cadaver; diff --git a/pkgs/tools/networking/ccnet/default.nix b/pkgs/tools/networking/ccnet/default.nix index 8896156bd1c5..a967e8b27351 100644 --- a/pkgs/tools/networking/ccnet/default.nix +++ b/pkgs/tools/networking/ccnet/default.nix @@ -26,8 +26,8 @@ stdenv.mkDerivation rec meta = { - homepage = "https://github.com/haiwen/ccnet"; - description = "A framework for writing networked applications in C."; + homepage = https://github.com/haiwen/ccnet; + description = "A framework for writing networked applications in C"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.calrama ]; diff --git a/pkgs/tools/networking/cjdns/builder.sh b/pkgs/tools/networking/cjdns/builder.sh deleted file mode 100644 index c2e3701c0468..000000000000 --- a/pkgs/tools/networking/cjdns/builder.sh +++ /dev/null @@ -1,9 +0,0 @@ -source $stdenv/setup - -unpackPhase -cd git-export - -bash do - -mkdir -p $out/sbin -cp cjdroute $out/sbin diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index c56faac690c3..1fed2caa68d9 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -1,30 +1,39 @@ -{ stdenv, fetchgit, nodejs, which, python27 }: +{ stdenv, fetchFromGitHub, nodejs, which, python27, utillinux }: let - date = "20140922"; - rev = "5ebca772b0582173127e8c1e61ee235c5ab3fb50"; + version = "12"; # see ${src}/util/version/Version.h + date = "20141121"; in stdenv.mkDerivation { - name = "cjdns-${date}-${stdenv.lib.strings.substring 0 7 rev}"; + name = "cjdns-${version}-${date}"; - src = fetchgit { - url = "https://github.com/cjdelisle/cjdns.git"; - inherit rev; - sha256 = "04abf73f4aede12c35b70ae09a367b3d6352a63f818185f788ed13356d06197a"; + src = fetchFromGitHub { + owner = "cjdelisle"; + repo = "cjdns"; + rev = "f176d2c0271d764412bd13c7adf7ea475fa25e0f"; + sha256 = "02vp917pr0kkcg41ani2azfbmdv1rjghmlrc7nc07ckkcqg6sk0y"; }; - buildInputs = [ which python27 nodejs]; - - patches = [ ./makekey.patch ]; + buildInputs = [ which python27 nodejs ] ++ + # for flock + stdenv.lib.optional stdenv.isLinux [ utillinux ]; buildPhase = "bash do"; - installPhase = "installBin cjdroute makekey"; + installPhase = '' + installBin cjdroute makekeys privatetopublic publictoip6 + sed -i 's,/usr/bin/env node,'$(type -P node), \ + $(find contrib -name "*.js") + sed -i 's,/usr/bin/env python,'$(type -P python), \ + $(find contrib -type f) + mkdir -p $out/share/cjdns + cp -R contrib node_build node_modules $out/share/cjdns/ + ''; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/cjdelisle/cjdns; description = "Encrypted networking for regular people"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ viric emery ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl3; + maintainers = with maintainers; [ viric emery ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/cjdns/makekey.patch b/pkgs/tools/networking/cjdns/makekey.patch deleted file mode 100644 index fcce5e3e728e..000000000000 --- a/pkgs/tools/networking/cjdns/makekey.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff --git a/contrib/c/makekey.c b/contrib/c/makekey.c -new file mode 100644 -index 0000000..c7184e5 ---- /dev/null -+++ b/contrib/c/makekey.c -@@ -0,0 +1,46 @@ -+/* vim: set expandtab ts=4 sw=4: */ -+/* -+ * You may redistribute this program and/or modify it under the terms of -+ * the GNU General Public License as published by the Free Software Foundation, -+ * either version 3 of the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program. If not, see <http://www.gnu.org/licenses/>. -+ */ -+#include "crypto/random/Random.h" -+#include "memory/MallocAllocator.h" -+#include "crypto/AddressCalc.h" -+#include "util/AddrTools.h" -+#include "util/Hex.h" -+ -+#include "crypto_scalarmult_curve25519.h" -+ -+#include <stdio.h> -+ -+int main(int argc, char** argv) -+{ -+ struct Allocator* alloc = MallocAllocator_new(1<<22); -+ struct Random* rand = Random_new(alloc, NULL, NULL); -+ -+ uint8_t privateKey[32]; -+ uint8_t publicKey[32]; -+ uint8_t ip[16]; -+ uint8_t hexPrivateKey[65]; -+ -+ for (;;) { -+ Random_bytes(rand, privateKey, 32); -+ crypto_scalarmult_curve25519_base(publicKey, privateKey); -+ if (AddressCalc_addressForPublicKey(ip, publicKey)) { -+ Hex_encode(hexPrivateKey, 65, privateKey, 32); -+ printf(hexPrivateKey); -+ return 0; -+ } -+ } -+ return 0; -+} -+ -diff --git a/node_build/make.js b/node_build/make.js -index 5e51645..11465e3 100644 ---- a/node_build/make.js -+++ b/node_build/make.js -@@ -339,6 +339,7 @@ Builder.configure({ - builder.buildExecutable('contrib/c/privatetopublic.c'); - builder.buildExecutable('contrib/c/sybilsim.c'); - builder.buildExecutable('contrib/c/makekeys.c'); -+ builder.buildExecutable('contrib/c/makekey.c'); - - builder.buildExecutable('crypto/random/randombytes.c'); - diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index e12db01ae726..85b935ebd767 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -13,11 +13,11 @@ assert scpSupport -> libssh2 != null; assert c-aresSupport -> c-ares != null; stdenv.mkDerivation rec { - name = "curl-7.38.0"; + name = "curl-7.39.0"; src = fetchurl { url = "http://curl.haxx.se/download/${name}.tar.bz2"; - sha256 = "1flybwbdahx0sm9ipgp9k60wlrpkrmfflk1zf5j4w6mak4gd8nq3"; + sha256 = "1q545q853i2dadz6kiybq6613bk0ncs6dp81nc0rgkc7f1p5c8mj"; }; # Zlib and OpenSSL must be propagated because `libcurl.la' contains diff --git a/pkgs/tools/networking/cutter/default.nix b/pkgs/tools/networking/cutter/default.nix index 5d383f072102..ad7d25404069 100644 --- a/pkgs/tools/networking/cutter/default.nix +++ b/pkgs/tools/networking/cutter/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://www.digitage.co.uk/digitage/files/cutter/${name}.tgz"; - md5 = "50093db9b64277643969ee75b83ebbd1"; + sha256 = "05cn22wi70l9ybhmzw0sy3fd6xxz0lq49fws4zxzm2i0qb3zmx2d"; }; installPhase = '' diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix index 8ff45e733fb9..04ab3a0a4172 100644 --- a/pkgs/tools/networking/dd-agent/default.nix +++ b/pkgs/tools/networking/dd-agent/default.nix @@ -2,14 +2,14 @@ , makeWrapper }: stdenv.mkDerivation rec { - version = "4.3.1"; + version = "4.4.0"; name = "dd-agent-${version}"; src = fetchFromGitHub { owner = "DataDog"; repo = "dd-agent"; rev = version; - sha256 = "0z6b1s30fyd9ldahizrjwcxx7c7dd74xsqy19j3qykrb25j9cvmn"; + sha256 = "0z2gysr5g66rfd86k2ngwcm59k9y2zmrvmy22aaz2rky20z28xkx"; }; buildInputs = [ python unzip makeWrapper pythonPackages.psycopg2 ]; diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix index 07925ca110df..91cd8274039e 100644 --- a/pkgs/tools/networking/dhcp/default.nix +++ b/pkgs/tools/networking/dhcp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "dhcp-${version}"; - version = "4.3.0"; + version = "4.3.1"; src = fetchurl { url = "http://ftp.isc.org/isc/dhcp/${version}/${name}.tar.gz"; - sha256 = "12mydvj6x3zcl3gla06bywfkkrgg03g66fijs94mwb7kbiym3dm7"; + sha256 = "1w4s7sni1m9223ya8m2a64lr62845c6xlraprjf8zfx6lylbqv16"; }; patches = diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 3a6249744f3d..927d60e81249 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, udev }: stdenv.mkDerivation rec { - name = "dhcpcd-6.4.7"; + name = "dhcpcd-6.5.1"; src = fetchurl { - url = "http://roy.marples.name/downloads/dhcpcd/${name}.tar.bz2"; - sha256 = "11z14nxk91g232zk4j17b822b7lvrzaa9kaxz0n6nhvihsb8025v"; + url = "mirror://roy/dhcpcd/${name}.tar.bz2"; + sha256 = "0y0falxxlahr2i630ydraq4ldr7d5mg8ar0s5np5ddl76w58dlrp"; }; patches = [ /* ./lxc_ro_promote_secondaries.patch */ ]; diff --git a/pkgs/tools/networking/dnscrypt-proxy/default.nix b/pkgs/tools/networking/dnscrypt-proxy/default.nix new file mode 100644 index 000000000000..50c8dae902cf --- /dev/null +++ b/pkgs/tools/networking/dnscrypt-proxy/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, libsodium }: + +stdenv.mkDerivation rec { + name = "dnscrypt-proxy-1.4.1"; + + src = fetchurl { + url = "http://download.dnscrypt.org/dnscrypt-proxy/${name}.tar.bz2"; + sha256 = "00cf5c520c8a5a71ad4916b33aa0c8f9f55434039304f4ba10d7fffc620563f8"; + }; + + buildInputs = [ libsodium ]; + + meta = { + description = "A tool for securing communications between a client and a DNS resolver"; + homepage = http://dnscrypt.org/; + license = with stdenv.lib.licenses; [ isc ]; + maintainers = with stdenv.lib.maintainers; [ joachifm ]; + platform = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index 3cfc902711ea..4ae571f99e03 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -1,11 +1,11 @@ { pkgconfig, dbus_libs, nettle, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dnsmasq-2.71"; + name = "dnsmasq-2.72"; src = fetchurl { url = "http://www.thekelleys.org.uk/dnsmasq/${name}.tar.xz"; - sha256 = "1fpzpzja7qr8b4kfdhh4i4sijp62c634yf0xvq2n4p7d5xbzn6a9"; + sha256 = "1c80hq09hfm8cp5pirfb8wdlc7dqkp7zzmbmdaradcvlblzx42vx"; }; # Can't rely on make flags because of space in one of the parameters diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix index 1f7c8a449f3d..c9b0101a7e6c 100644 --- a/pkgs/tools/networking/dropbear/default.nix +++ b/pkgs/tools/networking/dropbear/default.nix @@ -2,11 +2,11 @@ sftpPath ? "/var/run/current-system/sw/libexec/sftp-server" }: stdenv.mkDerivation rec { - name = "dropbear-2013.62"; + name = "dropbear-2014.66"; src = fetchurl { url = "http://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2"; - sha256 = "1ylz0zd68cxdgs4x4cpc2y8h75395y10bxb1qflv0m6cpc166rf6"; + sha256 = "0xmbcjm2pbhih459667wy8acs4nax4amvzwqwfxw0z2i19ky4gxb"; }; dontDisableStatic = enableStatic; diff --git a/pkgs/tools/networking/fdm/default.nix b/pkgs/tools/networking/fdm/default.nix index a6700284af56..7a9e3fc0d1d9 100644 --- a/pkgs/tools/networking/fdm/default.nix +++ b/pkgs/tools/networking/fdm/default.nix @@ -1,54 +1,45 @@ -x@{builderDefsPackage +{ stdenv, fetchurl , openssl, tdb, zlib, flex, bison - , ...}: -builderDefsPackage -(a : + }: let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; - - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + buildInputs = [ openssl tdb zlib flex bison ]; sourceInfo = rec { baseName="fdm"; - version="1.7"; + version = "1.7"; name="${baseName}-${version}"; url="mirror://sourceforge/${baseName}/${baseName}/${name}.tar.gz"; - hash="0apg1jasn4m5j3vh0v9lr2l3lyzy35av1ylxr0wf8k0j9w4p8i28"; + sha256 = "0apg1jasn4m5j3vh0v9lr2l3lyzy35av1ylxr0wf8k0j9w4p8i28"; }; in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; +stdenv.mkDerivation { + src = fetchurl { + inherit (sourceInfo) url sha256; }; inherit (sourceInfo) name version; inherit buildInputs; - phaseNames = ["doConfigure" "fixInstall" "doMakeInstall"]; - makeFlags = ["PREFIX=$out"]; - fixInstall = a.fullDepEntry ('' + preBuild = '' + export makeFlags="$makeFlags PREFIX=$out" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Dbool=int" + sed -i */Makefile -i Makefile -e 's@ -g bin @ @' sed -i */Makefile -i Makefile -e 's@ -o root @ @' sed -i GNUmakefile -e 's@ -g $(BIN_OWNER) @ @' sed -i GNUmakefile -e 's@ -o $(BIN_GROUP) @ @' sed -i */Makefile -i Makefile -i GNUmakefile -e 's@-I-@@g' - '') ["minInit" "doUnpack"]; + ''; meta = { description = "Mail fetching and delivery tool - should do the job of getmail and procmail"; - maintainers = with a.lib.maintainers; + maintainers = with stdenv.lib.maintainers; [ raskin ]; - platforms = with a.lib.platforms; + platforms = with stdenv.lib.platforms; linux; + homepage = "http://fdm.sourceforge.net/"; + inherit (sourceInfo) version; + updateWalker = true; }; - passthru = { - updateInfo = { - downloadPage = "http://fdm.sourceforge.net/"; - }; - }; -}) x - +} diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix new file mode 100644 index 000000000000..be6d1658d3e5 --- /dev/null +++ b/pkgs/tools/networking/flannel/default.nix @@ -0,0 +1,30 @@ +{ stdenv, lib, go, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: + +stdenv.mkDerivation rec { + version = "0.1.0"; + name = "flannel-${version}"; + + src = import ./deps.nix { + inherit stdenv lib fetchFromGitHub; + }; + + buildInputs = [ go ]; + + buildPhase = '' + export GOPATH=$src + go build -v -o flannel github.com/coreos/flannel + ''; + + installPhase = '' + mkdir -p $out/bin + mv flannel $out/bin/flannel + ''; + + meta = with stdenv.lib; { + description = "Flannel is an etcd backed network fabric for containers"; + homepage = https://github.com/coreos/flannel; + license = licenses.asl20; + maintainers = with maintainers; [ offline ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/networking/flannel/deps.nix b/pkgs/tools/networking/flannel/deps.nix new file mode 100644 index 000000000000..3af2404ba784 --- /dev/null +++ b/pkgs/tools/networking/flannel/deps.nix @@ -0,0 +1,28 @@ +# This file was generated by go2nix. +{ stdenv, lib, fetchFromGitHub }: + +let + goDeps = [ + { + root = "github.com/coreos/flannel"; + src = fetchFromGitHub { + owner = "coreos"; + repo = "flannel"; + rev = "cd584fa5e1545ae86c965588e81ceb24455e980d"; + sha256 = "1f7x6a2c8ix6j5y1r0dq56b58bl2rs2ycbdqb9fz5zv1zk2w20rd"; + }; + } + ]; + +in + +stdenv.mkDerivation rec { + name = "go-deps"; + + buildCommand = + lib.concatStrings + (map (dep: '' + mkdir -p $out/src/`dirname ${dep.root}` + ln -s ${dep.src} $out/src/${dep.root} + '') goDeps); +} diff --git a/pkgs/tools/networking/fping/default.nix b/pkgs/tools/networking/fping/default.nix index c71f6b040843..ab935dc11118 100644 --- a/pkgs/tools/networking/fping/default.nix +++ b/pkgs/tools/networking/fping/default.nix @@ -12,5 +12,6 @@ stdenv.mkDerivation rec { homepage = "http://fping.org/"; description = "Send ICMP echo probes to network hosts"; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; + platforms = with stdenv.lib.platforms; all; }; } diff --git a/pkgs/tools/networking/gvpe/default.nix b/pkgs/tools/networking/gvpe/default.nix index 7fdb548e7b05..952771318be6 100644 --- a/pkgs/tools/networking/gvpe/default.nix +++ b/pkgs/tools/networking/gvpe/default.nix @@ -2,7 +2,7 @@ a : let s = import ./src-for-default.nix; buildInputs = with a; [ - openssl gmp + openssl gmp zlib ]; in rec { diff --git a/pkgs/tools/networking/gvpe/src-for-default.nix b/pkgs/tools/networking/gvpe/src-for-default.nix index 88264c5d7715..3db30de0bdd9 100644 --- a/pkgs/tools/networking/gvpe/src-for-default.nix +++ b/pkgs/tools/networking/gvpe/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="2.24"; - name="gvpe-2.24"; - hash="1szwia7n24fx9n40yvmdidna55b97459ccq6d2c4863q4pfkqpjy"; - url="mirror://gnu/gvpe/gvpe-${version}.tar.gz"; - advertisedUrl="http://ftp.gnu.org/gnu/gvpe/gvpe-2.24.tar.gz"; + version="2.25"; + name="gvpe-2.25"; + hash="1gsipcysvsk80gvyn9jnk9g0xg4ng9yd5zp066jnmpgs52d2vhvk"; + url="http://ftp.gnu.org/gnu/gvpe/gvpe-${version}.tar.gz"; + advertisedUrl="http://ftp.gnu.org/gnu/gvpe/gvpe-2.25.tar.gz"; } diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix new file mode 100644 index 000000000000..a02616860387 --- /dev/null +++ b/pkgs/tools/networking/i2pd/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, boost, cryptopp }: + +stdenv.mkDerivation rec { + + name = "i2pd-${version}"; + version = "0.4.0"; + + src = fetchurl { + url = "https://github.com/PrivacySolutions/i2pd/archive/${version}.tar.gz"; + sha256 = "1gab0ams8bwkiwq0wjiclkm5ms5m5p3x06gzhi2dpdc6vbdkzmlp"; + }; + + buildInputs = [ boost cryptopp ]; + installPhase = '' + install -D i2p $out/bin/i2p + ''; + + meta = with stdenv.lib; { + homepage = "https://track.privacysolutions.no/projects/i2pd"; + description = "Minimal I2P router written in C++"; + licenses = licenses.gpl2; + maintainers = with maintainers; [ edwtjo ]; + platform = platforms.linux; + }; +} \ No newline at end of file diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix index ce90bed30106..a821684e5b4b 100644 --- a/pkgs/tools/networking/inadyn/default.nix +++ b/pkgs/tools/networking/inadyn/default.nix @@ -1,17 +1,22 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, gnutls }: -stdenv.mkDerivation rec { - name = "inadyn-1.98.1"; +let + ver = "1.99.10"; +in +stdenv.mkDerivation { + name = "inadyn-${ver}"; src = fetchurl { - url = "https://github.com/downloads/troglobit/inadyn/${name}.tar.bz2"; - sha256 = "1qkwmln9ccqbs5cldwximi1maapvzkm7mssxgff71n981d8ad83j"; + url = "https://github.com/troglobit/inadyn/archive/${ver}.tar.gz"; + sha256 = "0m3qnnq99siwf1ybcvbzdawk68lxf61vd13fw1f2ssl2m07hfxg3"; }; preConfigure = '' export makeFlags=prefix=$out ''; + buildInputs = [ gnutls ]; + meta = { homepage = http://inadyn.sourceforge.net/; description = "Free dynamic DNS client"; diff --git a/pkgs/tools/networking/iodine/default.nix b/pkgs/tools/networking/iodine/default.nix index f6be163bb839..6b07d5bd2f12 100644 --- a/pkgs/tools/networking/iodine/default.nix +++ b/pkgs/tools/networking/iodine/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://code.kryo.se/iodine/; description = "Tool to tunnel IPv4 data through a DNS server"; - license = "ISC"; + license = stdenv.lib.licenses.isc; }; } diff --git a/pkgs/tools/networking/iperf/3.nix b/pkgs/tools/networking/iperf/3.nix index 3a9d49f8330e..e8b3c79d5ccf 100644 --- a/pkgs/tools/networking/iperf/3.nix +++ b/pkgs/tools/networking/iperf/3.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "iperf-3.0.8"; + name = "iperf-3.0.9"; src = fetchurl { url = "http://downloads.es.net/pub/iperf/${name}.tar.gz"; - sha256 = "81b8d91159862896c57f9b90a006e8b5dc22bd94175d97bd0db50b0ae2c1a78e"; + sha256 = "0n94d6n4nm9b88qyv1pqasrvxqc8kyqvqsdra1rr6syj60mrl920"; }; postInstall = '' diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix index 2d3ffb2cb0a8..021f470af241 100644 --- a/pkgs/tools/networking/isync/default.nix +++ b/pkgs/tools/networking/isync/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { license = [ "GPLv2+" ]; maintainers = with stdenv.lib.maintainers; [ the-kenny viric ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix index 51ab3478ac93..9901a1e2a967 100644 --- a/pkgs/tools/networking/lftp/default.nix +++ b/pkgs/tools/networking/lftp/default.nix @@ -1,11 +1,14 @@ { stdenv, fetchurl, gnutls, pkgconfig, readline, zlib }: stdenv.mkDerivation rec { - name = "lftp-4.5.2"; + name = "lftp-4.6.0"; src = fetchurl { - url = "http://lftp.yar.ru/ftp/${name}.tar.gz"; - sha256 = "106llhq9lgvdxlf4r1p94r66fcy5ywfdfvins4dfn9irg0k5gzyv"; + urls = [ + "http://lftp.yar.ru/ftp/${name}.tar.bz2" + "http://lftp.yar.ru/ftp/old/${name}.tar.bz2" + ]; + sha256 = "1liry2icaqyn9zlp7w6sykp3nyqsn172xnqglhvr6awz23r3b1fr"; }; patches = [ ./no-gets.patch ]; diff --git a/pkgs/tools/networking/mailsend/default.nix b/pkgs/tools/networking/mailsend/default.nix new file mode 100644 index 000000000000..a2579c559301 --- /dev/null +++ b/pkgs/tools/networking/mailsend/default.nix @@ -0,0 +1,34 @@ +{stdenv, fetchurl, openssl}: +let + s = # Generated upstream information + rec { + baseName="mailsend"; + version="1.17b15"; + name="${baseName}-${version}"; + hash="0sxjrv9yn2xyjak9si0gw2zalsrfqqcvz0indq9ap5fyalj1pjvk"; + url="https://github.com/muquit/mailsend/archive/1.17b15.tar.gz"; + sha256="0sxjrv9yn2xyjak9si0gw2zalsrfqqcvz0indq9ap5fyalj1pjvk"; + }; + buildInputs = [ + openssl + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchurl { + inherit (s) url sha256; + }; + configureFlags = [ + "--with-openssl=${openssl}" + ]; + meta = { + inherit (s) version; + description = ''CLI email sending tool''; + license = stdenv.lib.licenses.bsd3 ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + homepage = "https://github.com/muquit/mailsend"; + downloadPage = "https://github.com/muquit/mailsend/releases"; + }; +} diff --git a/pkgs/tools/networking/mailsend/default.upstream b/pkgs/tools/networking/mailsend/default.upstream new file mode 100644 index 000000000000..3d9862a3de21 --- /dev/null +++ b/pkgs/tools/networking/mailsend/default.upstream @@ -0,0 +1,3 @@ +url "https://github.com/muquit/mailsend/releases" +ensure_choice +version '.*/([0-9][0-9.a-z]*)[.]tar[.].*' '\1' diff --git a/pkgs/tools/networking/megatools/default.nix b/pkgs/tools/networking/megatools/default.nix index 5c1910f1d6eb..2fa8ca33e86b 100644 --- a/pkgs/tools/networking/megatools/default.nix +++ b/pkgs/tools/networking/megatools/default.nix @@ -1,30 +1,30 @@ -{ stdenv, fetchurl, glib, curl, pkgconfig, fuse, glib_networking, makeWrapper -, gsettings_desktop_schemas }: +{ stdenv, fetchurl, pkgconfig, glib, fuse, curl, glib_networking, gsettings_desktop_schemas +, makeWrapper }: stdenv.mkDerivation rec { - name = "megatools-1.9.91"; + name = "megatools-${version}"; + version = "1.9.93"; src = fetchurl { url = "http://megatools.megous.com/builds/${name}.tar.gz"; - sha256 = "0hb83wqsn6mggcmk871hl8cski5x0hxz9dhaka42115s4mdfbl1i"; + sha256 = "0xm57pgjvfifq1j5lyvrcs6x0vxhqzr399s7paj4g7nspj0dbll9"; }; - buildInputs = [ glib curl pkgconfig fuse makeWrapper ]; + buildInputs = [ pkgconfig glib fuse curl makeWrapper ]; postInstall = '' - for a in $out/bin/*; do - wrapProgram "$a" \ + for i in $(find $out/bin/ -type f); do + wrapProgram "$i" \ --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share" - done ''; - meta = { + meta = with stdenv.lib; { description = "Command line client for Mega.co.nz"; homepage = http://megatools.megous.com/; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.viric ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2Plus; + maintainers = [ maintainers.viric maintainers.AndersonTorres ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/nc6/default.nix b/pkgs/tools/networking/nc6/default.nix index 348fc2e26a64..9c0979294715 100644 --- a/pkgs/tools/networking/nc6/default.nix +++ b/pkgs/tools/networking/nc6/default.nix @@ -4,7 +4,10 @@ stdenv.mkDerivation { name = "nc6-1.0"; src = fetchurl { - url = ftp://ftp.deepspace6.net/pub/ds6/sources/nc6/nc6-1.0.tar.bz2; + urls = [ + ftp://ftp.deepspace6.net/pub/ds6/sources/nc6/nc6-1.0.tar.bz2 + http://fossies.org/linux/privat/nc6-1.0.tar.bz2 + ]; sha256 = "01l28zv1yal58ilfnz6albdzqqxzsx3a58vmc14r9gv0bahffdgb"; }; diff --git a/pkgs/tools/networking/ndjbdns/default.nix b/pkgs/tools/networking/ndjbdns/default.nix index e2dc1fd1eafd..2a7e996f8db2 100644 --- a/pkgs/tools/networking/ndjbdns/default.nix +++ b/pkgs/tools/networking/ndjbdns/default.nix @@ -11,7 +11,10 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig systemd ]; meta = with stdenv.lib; { - description = "N-DJBDNS is a brand new release of the Djbdns. Djbdns is a fully‐fledged Domain Name System(DNS), originally written by the eminent author of qmail, Dr. D J Bernstein."; + description = "A brand new release of the Djbdns"; + longDescription = '' + Djbdns is a fully‐fledged Domain Name System(DNS), originally written by the eminent author of qmail, Dr. D J Bernstein. + ''; homepage = http://pjp.dgplug.org/ndjbdns/; license = licenses.gpl2; maintainers = [ maintainers.msackman ]; diff --git a/pkgs/tools/networking/netboot/default.nix b/pkgs/tools/networking/netboot/default.nix index dbf393094c8e..0f75bd44d69b 100644 --- a/pkgs/tools/networking/netboot/default.nix +++ b/pkgs/tools/networking/netboot/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/netboot/${name}.tar.gz"; sha256 = "09w09bvwgb0xzn8hjz5rhi3aibysdadbg693ahn8rylnqfq4hwg0"; }; - + buildInputs = [ yacc lzo db4 ]; meta = with stdenv.lib; { description = "Mini PXE server"; maintainers = [ maintainers.raskin ]; platforms = ["x86_64-linux"]; - license = "free-noncopyleft"; + license = stdenv.lib.licenses.free; }; } \ No newline at end of file diff --git a/pkgs/tools/networking/netcat-openbsd/default.nix b/pkgs/tools/networking/netcat-openbsd/default.nix index c7bbf3892d29..e71abcd8a2c8 100644 --- a/pkgs/tools/networking/netcat-openbsd/default.nix +++ b/pkgs/tools/networking/netcat-openbsd/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { srcs = [ (fetchurl { url = "mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_1.105.orig.tar.gz"; - md5 = "7e67b22f1ad41a1b7effbb59ff28fca1"; + sha256 = "07i1vcz8ycnfwsvz356rqmim8akfh8yhjzmhc5mqf5hmdkk3yra0"; }) (fetchurl { url = "mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_1.105-7.debian.tar.gz"; - md5 = "e914f8eb7eda5c75c679dd77787ac76b"; + sha256 = "0qxkhbwcifrps34s5mzzg79cmkvz3f96gphd3pl978pygwr5krzf"; }) ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://packages.debian.org/netcat-openbsd"; - description = "TCP/IP swiss army knife. OpenBSD variant."; + description = "TCP/IP swiss army knife, OpenBSD variant"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/networking/netcat/default.nix b/pkgs/tools/networking/netcat/default.nix index 94ae6ea0630c..5ad5540438c7 100644 --- a/pkgs/tools/networking/netcat/default.nix +++ b/pkgs/tools/networking/netcat/default.nix @@ -4,6 +4,6 @@ stdenv.mkDerivation { name = "netcat-gnu-0.7.1"; src = fetchurl { url = mirror://sourceforge/netcat/netcat-0.7.1.tar.bz2; - md5 = "0a29eff1736ddb5effd0b1ec1f6fe0ef"; + sha256 = "1frjcdkhkpzk0f84hx6hmw5l0ynpmji8vcbaxg8h5k2svyxz0nmm"; }; } diff --git a/pkgs/tools/networking/nethogs/default.nix b/pkgs/tools/networking/nethogs/default.nix index 9747dc587711..3b22458ebe3f 100644 --- a/pkgs/tools/networking/nethogs/default.nix +++ b/pkgs/tools/networking/nethogs/default.nix @@ -31,6 +31,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; homepage = http://nethogs.sourceforge.net/; platforms = platforms.linux; - maintainers = with maintainers; [ wizeman ]; }; } diff --git a/pkgs/tools/networking/netkit/tftp/default.nix b/pkgs/tools/networking/netkit/tftp/default.nix index 7288bb7e39b1..858683e3374c 100644 --- a/pkgs/tools/networking/netkit/tftp/default.nix +++ b/pkgs/tools/networking/netkit/tftp/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Netkit TFTP client and server"; homepage = "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"; - license = "BSD-Original"; + license = stdenv.lib.licenses.bsdOriginal; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index 850981c5d338..d289695398cd 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pn}/${major}/${name}.tar.xz"; - sha256 = "1sx97cp9nb5p82kg2dl6dmqri7wichpjqchhx7bk77limngby7jq"; + sha256 = "1jz0vawfixzm892m6plrzhsybgdxwv96pfwld9p85lb7wshykzj6"; }; buildInputs = [ diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 20102aedeb91..ed4b3812e282 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "network-manager-${version}"; - version = "0.9.8.8"; + version = "0.9.8.10"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/0.9/NetworkManager-${version}.tar.xz"; - sha256 = "0mbsl6x3aavdnam8i87p0zz8fvvgi96g199s35wgg5r8rplks2la"; + sha256 = "0wn9qh8r56r8l19dqr68pdl1rv3zg1dv47rfy6fqa91q7li2fk86"; }; preConfigure = '' @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { inherit avahi dnsmasq ppp bind; glibc = stdenv.gcc.libc; }) + ./libnl-3.2.25.patch ]; preInstall = @@ -63,10 +64,14 @@ stdenv.mkDerivation rec { # FIXME: Workaround until NixOS' dbus+systemd supports at_console policy substituteInPlace $out/etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf --replace 'at_console="true"' 'group="networkmanager"' + # rename to network-manager to be in style + mv $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/network-manager.service + echo "Alias=NetworkManager.service" >> $out/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service + # systemd in NixOS doesn't use `systemctl enable`, so we need to establish # aliases ourselves. ln -s $out/etc/systemd/system/NetworkManager-dispatcher.service $out/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service - ln -s $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service + ln -s $out/etc/systemd/system/network-manager.service $out/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/network-manager/libnl-3.2.25.patch b/pkgs/tools/networking/network-manager/libnl-3.2.25.patch new file mode 100644 index 000000000000..17c2966b7064 --- /dev/null +++ b/pkgs/tools/networking/network-manager/libnl-3.2.25.patch @@ -0,0 +1,61 @@ +diff --git a/src/nm-netlink-monitor.c b/src/nm-netlink-monitor.c +index ba8053e..5ac39d3 100644 +--- a/src/nm-netlink-monitor.c ++++ b/src/nm-netlink-monitor.c +@@ -177,40 +177,15 @@ link_msg_handler (struct nl_object *obj, void *arg) + static int + event_msg_recv (struct nl_msg *msg, void *arg) + { +- struct nl_sock *nlh = arg; +- struct nlmsghdr *hdr = nlmsg_hdr (msg); + struct ucred *creds = nlmsg_get_creds (msg); +- const struct sockaddr_nl *snl; +- guint32 local_port; +- gboolean accept_msg = FALSE; +- +- /* Only messages sent from the kernel */ +- if (!creds || creds->uid != 0) { +- nm_log_dbg (LOGD_HW, "ignoring netlink message from UID %d", +- creds ? creds->uid : -1); +- return NL_SKIP; +- } +- +- snl = nlmsg_get_src (msg); +- g_assert (snl); +- +- /* Accept any messages from the kernel */ +- if (hdr->nlmsg_pid == 0 || snl->nl_pid == 0) +- accept_msg = TRUE; + +- /* And any multicast message directed to our netlink PID, since multicast +- * currently requires CAP_ADMIN to use. +- */ +- local_port = nl_socket_get_local_port (nlh); +- if ((hdr->nlmsg_pid == local_port) && snl->nl_groups) +- accept_msg = TRUE; +- +- if (accept_msg == FALSE) { +- nm_log_dbg (LOGD_HW, "ignoring netlink message from PID %d (local PID %d, multicast %d)", +- hdr->nlmsg_pid, +- local_port, +- (hdr->nlmsg_flags & NLM_F_MULTI)); +- return NL_SKIP; ++ if (!creds || creds->pid || creds->uid || creds->gid) { ++ if (creds) ++ nm_log_dbg (LOGD_HW, "netlink: received non-kernel message (pid %d uid %d gid %d)", ++ creds->pid, creds->uid, creds->gid); ++ else ++ nm_log_dbg (LOGD_HW, "netlink: received message without credentials"); ++ return NL_STOP; + } + + return NL_OK; +@@ -285,7 +260,7 @@ nlh_setup (struct nl_sock *nlh, + { + int err; + +- nl_socket_modify_cb (nlh, NL_CB_MSG_IN, NL_CB_CUSTOM, event_msg_recv, cb_data); ++ nl_socket_modify_cb (nlh, NL_CB_MSG_IN, NL_CB_CUSTOM, event_msg_recv, NULL); + + if (valid_func) + nl_socket_modify_cb (nlh, NL_CB_VALID, NL_CB_CUSTOM, valid_func, cb_data); diff --git a/pkgs/tools/networking/network-manager/nixos-purity.patch b/pkgs/tools/networking/network-manager/nixos-purity.patch index 5736009571e7..505dd8b2b3c4 100644 --- a/pkgs/tools/networking/network-manager/nixos-purity.patch +++ b/pkgs/tools/networking/network-manager/nixos-purity.patch @@ -28,36 +28,6 @@ index 237661f..48bc33f 100644 NULL }; const char **path = dhcpcd_paths; -diff --git a/src/dns-manager/nm-dns-dnsmasq.c b/src/dns-manager/nm-dns-dnsmasq.c -index 8e216f4..6e00210 100644 ---- a/src/dns-manager/nm-dns-dnsmasq.c -+++ b/src/dns-manager/nm-dns-dnsmasq.c -@@ -52,9 +52,7 @@ static inline const char * - find_dnsmasq (void) - { - static const char *paths[] = { -- "/usr/local/sbin/dnsmasq", -- "/usr/sbin/dnsmasq", -- "/sbin/dnsmasq", -+ "@dnsmasq@/bin/dnsmasq", - NULL - }; - const char **binary = paths; -diff --git a/src/dnsmasq-manager/nm-dnsmasq-manager.c b/src/dnsmasq-manager/nm-dnsmasq-manager.c -index ca2f9dc..ce718d0 100644 ---- a/src/dnsmasq-manager/nm-dnsmasq-manager.c -+++ b/src/dnsmasq-manager/nm-dnsmasq-manager.c -@@ -170,9 +170,7 @@ static inline const char * - nm_find_dnsmasq (void) - { - static const char *dnsmasq_binary_paths[] = { -- "/usr/local/sbin/dnsmasq", -- "/usr/sbin/dnsmasq", -- "/sbin/dnsmasq", -+ "@dnsmasq@/bin/dnsmasq", - NULL - }; - diff --git a/src/nm-device.c b/src/nm-device.c index 1dc94ee..e60f3c8 100644 --- a/src/nm-device.c diff --git a/pkgs/tools/networking/nylon/default.nix b/pkgs/tools/networking/nylon/default.nix index 9050423cfafb..9a9d41ed6a48 100644 --- a/pkgs/tools/networking/nylon/default.nix +++ b/pkgs/tools/networking/nylon/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation { meta = { homepage = http://monkey.org/~marius/nylon; description = "Proxy server, supporting SOCKS 4 and 5, as well as a mirror mode"; - license = "free"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/tools/networking/nzbget/default.nix index ec14b8ee99a3..aacc7ee68853 100644 --- a/pkgs/tools/networking/nzbget/default.nix +++ b/pkgs/tools/networking/nzbget/default.nix @@ -2,11 +2,11 @@ , gnutls, libgcrypt }: stdenv.mkDerivation rec { - name = "nzbget-13.0"; + name = "nzbget-14.1"; src = fetchurl { url = "mirror://sourceforge/nzbget/${name}.tar.gz"; - sha256 = "13lgwwrdv6ds25kj6hj0b5laqaf739n7l3j530x3640zyd254vv6"; + sha256 = "062bvf0r290qi3xgbvvwgxxmnka7raa71dz9fg1mq0zpc5mq2sx1"; }; buildInputs = [ pkgconfig libxml2 ncurses libsigcxx libpar2 gnutls libgcrypt ]; @@ -15,9 +15,10 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lz"; - meta = { + meta = with stdenv.lib; { homepage = http://nzbget.sourceforge.net/; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; description = "A command line tool for downloading files from news servers"; + maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/tools/networking/openresolv/default.nix index b81c46c0b616..ee5241bfcad8 100644 --- a/pkgs/tools/networking/openresolv/default.nix +++ b/pkgs/tools/networking/openresolv/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "openresolv-3.5.7"; src = fetchurl { - url = "http://roy.marples.name/downloads/openresolv/${name}.tar.bz2"; + url = "mirror://roy/openresolv/${name}.tar.bz2"; sha256 = "14n51wqnh49zdvx11l79s3fh1jhg7kg9cfny5vk7zsix78spmyx7"; }; diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index a894de647588..05b97bdcaacb 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { - name = "openssh-6.6p1"; + name = "openssh-6.7p1"; src = fetchurl { url = "http://ftp.nluug.nl/pub/OpenBSD/OpenSSH/portable/${name}.tar.gz"; - sha256 = "1fq3w86q05y5nn6z878wm312k0svaprw8k007188fd259dkg1ha8"; + sha256 = "01smf9pvn2sk5qs80gkmc9acj07ckawi1b3xxyysp3c5mr73ky5j"; }; prePatch = stdenv.lib.optionalString hpnSupport @@ -31,17 +31,7 @@ stdenv.mkDerivation rec { export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s" ''; - patches = [ - ./locale_archive.patch - (fetchurl { - name = "CVE-2014-2653.patch"; - url = "http://anonscm.debian.org/gitweb/?p=pkg-ssh/openssh.git;a=blobdiff_plain;" - + "f=sshconnect.c;h=324f5e0a396a4da9885d121bbbef87f6ccf2b149;" - + "hp=87c3770c0fd5c7ff41227c45b4528985eaea54a6;hb=63d5fa28e16d96db6bac2dbe3fcecb65328f8966;" - + "hpb=9cbb60f5e4932634db04c330c88abc49cc5567bd"; - sha256 = "160c434igl2r8q4cavhdlwvnbqizx444sjrhg98f997pyhz524h9"; - }) - ]; + patches = [ ./locale_archive.patch ]; buildInputs = [ zlib openssl libedit pkgconfig pam ] ++ stdenv.lib.optional withKerberos [ kerberos ]; @@ -64,6 +54,8 @@ stdenv.mkDerivation rec { mkdir -p $out/empty ''; + enableParallelBuilding = true; + postInstall = '' # Install ssh-copy-id, it's very useful. @@ -80,7 +72,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://www.openssh.org/"; description = "An implementation of the SSH protocol"; - license = "bsd"; # multi BSD GPL-2 + license = stdenv.lib.licenses.bsd2; platforms = platforms.unix; maintainers = with maintainers; [ eelco ]; }; diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index 591bf26ff0b6..9dd16be41546 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchurl, iproute, lzo, openssl, pam, systemd }: +{ stdenv, fetchurl, iproute, lzo, openssl, pam, systemd, pkgconfig }: with stdenv.lib; stdenv.mkDerivation rec { - name = "openvpn-2.3.4"; + name = "openvpn-2.3.6"; src = fetchurl { url = "http://swupdate.openvpn.net/community/releases/${name}.tar.gz"; - sha256 = "0nn8rrh6jadsydnym69r4s7rm6jzsgxb6p23yb9ai3sn91gnsl5g"; + sha256 = "09jvxr4wcsmk55gqv3cblm60kzs9ripv9h4y50d1lbn177zx5bkv"; }; patches = optional stdenv.isLinux ./systemd-notify.patch; - buildInputs = [ iproute lzo openssl pam ] ++ optional stdenv.isLinux systemd; + buildInputs = [ iproute lzo openssl pam pkgconfig ] ++ optional stdenv.isLinux systemd; configureFlags = '' --enable-password-save diff --git a/pkgs/tools/networking/openvpn/update-resolv-conf.nix b/pkgs/tools/networking/openvpn/update-resolv-conf.nix new file mode 100644 index 000000000000..37d38555e618 --- /dev/null +++ b/pkgs/tools/networking/openvpn/update-resolv-conf.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchgit, makeWrapper, openresolv, coreutils }: + +stdenv.mkDerivation rec { + name = "update-resolv-conf"; + + src = fetchgit { + url = https://github.com/masterkorp/openvpn-update-resolv-conf/; + rev = "dd968419373bce71b22bbd26de962e89eb470670"; + sha256 = "dd0e3ea3661253d565bda876eb52a3f8461a3fc8237a81c40809c2071f83add1"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + install -Dm555 update-resolv-conf.sh $out/libexec/openvpn/update-resolv-conf + sed -i 's,^\(RESOLVCONF=\).*,\1resolvconf,' $out/libexec/openvpn/update-resolv-conf + + wrapProgram $out/libexec/openvpn/update-resolv-conf \ + --prefix PATH : ${coreutils}/bin:${openresolv}/sbin + ''; + + meta = with stdenv.lib; { + description = "Script to update your /etc/resolv.conf with DNS settings that come from the received push dhcp-options"; + homepage = https://github.com/masterkorp/openvpn-update-resolv-conf/; + maintainer = maintainers.abbradar; + license = licenses.gpl2; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/networking/p2p/azureus/default.nix b/pkgs/tools/networking/p2p/azureus/default.nix index ffa360f3de4b..246a32f134c2 100644 --- a/pkgs/tools/networking/p2p/azureus/default.nix +++ b/pkgs/tools/networking/p2p/azureus/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { builder = ./builder.sh; src = fetchurl { url = http://tarballs.nixos.org/Azureus2.3.0.6.jar; - md5 = "84f85b144cdc574338c2c84d659ca620"; + sha256 = "1hwrh3n0b0jbpsdk15zrs7pw175418phhmg6pn4xi1bvilxq1wrd"; }; # buildInputs = [unzip]; inherit jdk swt; diff --git a/pkgs/tools/networking/p2p/libtorrent/git.nix b/pkgs/tools/networking/p2p/libtorrent/git.nix new file mode 100644 index 000000000000..9a46740de51b --- /dev/null +++ b/pkgs/tools/networking/p2p/libtorrent/git.nix @@ -0,0 +1,28 @@ +{ stdenv, autoconf, automake, cppunit, fetchFromGitHub, pkgconfig, openssl, libsigcxx, libtool, zlib }: + +stdenv.mkDerivation { + name = "libtorrent-git"; + + src = fetchFromGitHub rec { + owner = "rakshasa"; + repo = "libtorrent"; + rev = "c60d2b9475804e41649356fa0301e9f770798f8d"; + sha256 = "1x78g5yd4q0ksdsw91awz2a1ax8zyfy5b53gbbil4fpjy96vb577"; + }; + + buildInputs = [ autoconf automake cppunit pkgconfig openssl libsigcxx libtool zlib ]; + + configureFlags = "--disable-dependency-tracking --enable-aligned"; + + preConfigure = '' + ./autogen.sh + ''; + + meta = with stdenv.lib; { + homepage = "http://libtorrent.rakshasa.no/"; + description = "A BitTorrent library written in C++ for *nix, with a focus on high performance and good code"; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = with maintainers; [ codyopel ]; + }; +} \ No newline at end of file diff --git a/pkgs/tools/networking/p2p/rtorrent/git.nix b/pkgs/tools/networking/p2p/rtorrent/git.nix new file mode 100644 index 000000000000..6320a75f726a --- /dev/null +++ b/pkgs/tools/networking/p2p/rtorrent/git.nix @@ -0,0 +1,63 @@ +{ stdenv, autoconf, automake, cppunit, curl, fetchFromGitHub +, fetchurl, libsigcxx, libtool, libtorrent-git, ncurses, openssl +, pkgconfig, zlib, xmlrpc_c +, colorSupport ? false +}: + +# NOTICE: changes since 0.9.4 break the current configuration syntax, an +# example configuration file using the latest changes can be found at +# https://github.com/codyopel/dotfiles/blob/master/dotfiles/rtorrent.rc + +stdenv.mkDerivation { + name = "rtorrent-git"; + + src = fetchFromGitHub { + owner = "rakshasa"; + repo = "rtorrent"; + rev = "7537a3c2a91d0915f1c4c89b01cd583629dc5fd4"; + sha256 = "1xnyjjff575jfq9c542yq3rr9q03z5x6xbg84d000wkjphbq7h7q"; + }; + + buildInputs = [ + autoconf + automake + cppunit + libtorrent-git + ncurses + pkgconfig + libsigcxx + libtool + curl + zlib + openssl + xmlrpc_c + ]; + + configureFlags = "--with-xmlrpc-c"; + + # Optional patch adds support for custom configurable colors + # https://github.com/Chlorm/chlorm_overlay/blob/master/net-p2p/rtorrent/README.md + + patches = stdenv.lib.optional colorSupport (fetchurl { + url = "https://gist.githubusercontent.com/codyopel/a816c2993f8013b5f4d6/raw/b952b32da1dcf14c61820dfcf7df00bc8918fec4/rtorrent-color.patch"; + sha256 = "00gcl7yq6261rrfzpz2k8bd7mffwya0ifji1xqcvhfw50syk8965"; + }); + + preConfigure = '' + ./autogen.sh + ''; + + # postInstall = '' + # mkdir -p $out/share/man/man1 $out/share/rtorrent + # mv doc/rtorrent.1 $out/share/man/man1/rtorrent.1 + # mv doc/rtorrent.rc $out/share/rtorrent/rtorrent.rc + # ''; + + meta = with stdenv.lib; { + homepage = "http://libtorrent.rakshasa.no/"; + description = "An ncurses client for libtorrent, ideal for use with screen or dtach"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ codyopel ]; + }; +} \ No newline at end of file diff --git a/pkgs/tools/networking/p2p/seeks/default.nix b/pkgs/tools/networking/p2p/seeks/default.nix index 8c707e2fcc72..91dcf1bbd007 100644 --- a/pkgs/tools/networking/p2p/seeks/default.nix +++ b/pkgs/tools/networking/p2p/seeks/default.nix @@ -1,28 +1,44 @@ -{ fetchurl, stdenv, zlib, docbook2x, pcre, curl, libxml2, libevent, perl -, pkgconfig, protobuf, tokyocabinet, tokyotyrant, opencv +{ fetchgit, stdenv, zlib, docbook2x, pcre, curl, libxml2, libevent, perl +, pkgconfig, protobuf, tokyocabinet, tokyotyrant, opencv, autoconf, automake +, libtool, seeks_confDir ? "" }: -let version = "0.4.1"; in stdenv.mkDerivation { - name = "seeks-${version}"; + name = "seeks-0.4.1"; - src = fetchurl { - url = "mirror://sourceforge/seeks/hippy/seeks-${version}.tar.gz"; - sha256 = "1ppbbjw1zffxxhyvy64xwsff9xlw9wigqb7qwq5iw5mhbblz545q"; + src = fetchgit { + url = "git://github.com/beniz/seeks.git"; + rev = "1168b3a2f3111c3fca31dd961135194c3e8df5fd"; + sha256 = "159k9fk1ry8cybrq38jxm1qyxks9hlkfz624hzwxlzah6xb2j8a4"; }; buildInputs = [ zlib docbook2x pcre curl libxml2 libevent perl pkgconfig - protobuf tokyocabinet tokyotyrant opencv + protobuf tokyocabinet tokyotyrant opencv autoconf automake libtool ]; configureFlags = [ # Enable the built-in web server providing a web search interface. - # See <http://www.seeks-project.info/wiki/index.php/Seeks_On_Web>. "--enable-httpserv-plugin=yes" "--with-libevent=${libevent}" ]; + preConfigure = '' + ./autogen.sh + ''; + + postInstall = stdenv.lib.optionalString (seeks_confDir != "") '' + ln -svf ${seeks_confDir}/config $out/etc/seeks/config + ln -svf ${seeks_confDir}/cf-config $out/etc/seeks/cf-config + ln -svf ${seeks_confDir}/httpserv-config $out/etc/seeks/httpserv-config + ln -svf ${seeks_confDir}/img-websearch-config $out/etc/seeks/img-websearch-config + ln -svf ${seeks_confDir}/lsh-config $out/etc/seeks/lsh-config + ln -svf ${seeks_confDir}/query-capture-config $out/etc/seeks/query-capture-config + ln -svf ${seeks_confDir}/udb-service-config $out/etc/seeks/udb-service-config + ln -svf ${seeks_confDir}/uri-capture-config $out/etc/seeks/uri-capture-config + ln -svf ${seeks_confDir}/websearch-config $out/etc/seeks/websearch-config + ''; + # FIXME: Test suite needs <https://code.google.com/p/googletest/>. doCheck = false; @@ -44,8 +60,10 @@ stdenv.mkDerivation { homepage = http://www.seeks-project.info/; - maintainers = [ stdenv.lib.maintainers.ludo ]; + maintainers = [ + stdenv.lib.maintainers.ludo + stdenv.lib.maintainers.matejc + ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice - hydraPlatforms = []; }; } diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index 76a4a0eae62d..e82b7b8050ef 100644 --- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -66,9 +66,7 @@ buildPythonPackage { ''; homepage = http://allmydata.org/; - - # TODO license = [ lib.licenses.gpl2Plus /* or */ "TGPPLv1+" ]; - + license = [ lib.licenses.gpl2Plus /* or */ "TGPPLv1+" ]; maintainers = [ lib.maintainers.simons ]; platforms = lib.platforms.gnu; # arbitrary choice }; diff --git a/pkgs/tools/networking/par2cmdline/default.nix b/pkgs/tools/networking/par2cmdline/default.nix index c94ab37f1ea9..bb5bee8868f9 100644 --- a/pkgs/tools/networking/par2cmdline/default.nix +++ b/pkgs/tools/networking/par2cmdline/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { src = fetchurl { url = mirror://sourceforge/parchive/par2cmdline-0.4.tar.gz; - md5 = "1551b63e57e3c232254dc62073b723a9"; + sha256 = "0xznx4vgf9nd0ijm2xi2zrb42wb891ypa948z54q5jkvrzdvfcly"; }; patches = [ diff --git a/pkgs/tools/networking/plasma-nm/default.nix b/pkgs/tools/networking/plasma-nm/default.nix index 42c5ab3973a5..5d07e6c26ec4 100644 --- a/pkgs/tools/networking/plasma-nm/default.nix +++ b/pkgs/tools/networking/plasma-nm/default.nix @@ -2,15 +2,15 @@ let pname = "plasma-nm"; - version = "0.9.3.3"; + version = "0.9.3.4"; name = "${pname}-${version}"; in stdenv.mkDerivation { inherit name; src = fetchurl { - url = "mirror://kde/unstable/${pname}/${name}.tar.xz"; - sha256 = "099cbe86eb989c4fda8cdcc0f8721dc3350cc6735c3f50bcdd94661e5930e326"; + url = "mirror://kde/stable/${pname}/${name}.tar.xz"; + sha256 = "0xj14isvjq8ll70b6q66n8adm8ff4j9ng195ndk2gmavjf6bb751"; }; buildInputs = [ @@ -27,6 +27,6 @@ stdenv.mkDerivation { description = "Plasma applet written in QML for managing network connections"; license = licenses.lgpl21; inherit (kdelibs.meta) platforms; - maintainers = [ maintainers.jgeerds ]; + maintainers = with maintainers; [ jgeerds ]; }; } diff --git a/pkgs/tools/networking/radvd/default.nix b/pkgs/tools/networking/radvd/default.nix index b1c116266f2f..4929b93ab0f3 100644 --- a/pkgs/tools/networking/radvd/default.nix +++ b/pkgs/tools/networking/radvd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libdaemon, bison, flex, check }: stdenv.mkDerivation rec { - name = "radvd-2.7"; + name = "radvd-2.8"; src = fetchurl { url = "http://www.litech.org/radvd/dist/${name}.tar.xz"; - sha256 = "09rzw96cjkzywadxmhbhaw52ahawzjp3pv7pblcsnb0mrwaawny0"; + sha256 = "1y8d8k457apc5wrzc80sdkbvwynvvax31z5rh9ca9bsd0jr4240a"; }; buildInputs = [ pkgconfig libdaemon bison flex check ]; diff --git a/pkgs/tools/networking/s3sync/default.nix b/pkgs/tools/networking/s3sync/default.nix index 8390c70a4d3b..1ab3e062ca00 100644 --- a/pkgs/tools/networking/s3sync/default.nix +++ b/pkgs/tools/networking/s3sync/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "s3sync-1.2.6"; - + src = fetchurl { url = http://s3.amazonaws.com/ServEdge_pub/s3sync/s3sync.tar.gz; # !!! sha256 = "19467mgym0da0hifhkcbivccdima7gkaw3k8q760ilfbwgwxcn7f"; @@ -24,6 +24,6 @@ stdenv.mkDerivation { meta = { homepage = http://s3sync.net/; description = "Command-line tools to manipulate Amazon S3 buckets"; - license = "free-non-copyleft"; # some custom as-is in file headers + license = stdenv.lib.licenses.free; # some custom as-is in file headers }; } diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/tools/networking/s6-dns/default.nix index 3165434de3da..16467e84a1e7 100644 --- a/pkgs/tools/networking/s6-dns/default.nix +++ b/pkgs/tools/networking/s6-dns/default.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchurl, skalibs }: +{ stdenv +, fetchurl +, skalibs +, skarnetConfCompile +}: let @@ -13,39 +17,13 @@ in stdenv.mkDerivation rec { sha256 = "1r82l5fnz2rrwm5wq2sldqp74lk9fifr0d8hyq98xdyh24hish68"; }; - buildInputs = [ skalibs ]; + buildInputs = [ skalibs skarnetConfCompile ]; sourceRoot = "web/${name}"; - configurePhase = '' - pushd conf-compile - - printf "$out/bin" > conf-install-command - printf "$out/include" > conf-install-include - printf "$out/lib" > conf-install-library - printf "$out/lib" > conf-install-library.so - - # let nix builder strip things, cross-platform - truncate --size 0 conf-stripbins - truncate --size 0 conf-striplibs - - printf "${skalibs}/sysdeps" > import - printf "%s" "${skalibs}/include" > path-include - printf "%s" "${skalibs}/lib" > path-library - - rm -f flag-slashpackage - touch flag-allstatic - - popd - ''; - - preBuild = '' - patchShebangs src/sys - ''; - meta = { homepage = http://www.skarnet.org/software/s6-dns/; - description = "A suite of DNS client programs and libraries for Unix systems."; + description = "A suite of DNS client programs and libraries for Unix systems"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.isc; }; diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix index 3d5e3e048110..a4482bb71c3f 100644 --- a/pkgs/tools/networking/s6-networking/default.nix +++ b/pkgs/tools/networking/s6-networking/default.nix @@ -3,6 +3,7 @@ , fetchurl , s6Dns , skalibs +, skarnetConfCompile }: let @@ -18,44 +19,13 @@ in stdenv.mkDerivation rec { sha256 = "1np9m2j1i2450mbcjvpbb56kv3wc2fbyvmv2a039q61j2lk6vjz7"; }; - buildInputs = [ skalibs s6Dns execline ]; + buildInputs = [ skalibs s6Dns execline skarnetConfCompile ]; sourceRoot = "net/${name}"; - configurePhase = '' - pushd conf-compile - - printf "$out/bin" > conf-install-command - printf "$out/include" > conf-install-include - printf "$out/lib" > conf-install-library - printf "$out/lib" > conf-install-library.so - - # let nix builder strip things, cross-platform - truncate --size 0 conf-stripbins - truncate --size 0 conf-striplibs - - printf "${skalibs}/sysdeps" > import - - rm -f path-include - rm -f path-library - for dep in "${execline}" "${s6Dns}" "${skalibs}"; do - printf "%s\n" "$dep/include" >> path-include - printf "%s\n" "$dep/lib" >> path-library - done - - rm -f flag-slashpackage - touch flag-allstatic - - popd - ''; - - preBuild = '' - patchShebangs src/sys - ''; - meta = { homepage = http://www.skarnet.org/software/s6-networking/; - description = "A suite of small networking utilities for Unix systems."; + description = "A suite of small networking utilities for Unix systems"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.isc; }; diff --git a/pkgs/tools/networking/siege/default.nix b/pkgs/tools/networking/siege/default.nix index c88557262b25..48e2fc5ef787 100644 --- a/pkgs/tools/networking/siege/default.nix +++ b/pkgs/tools/networking/siege/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl }: stdenv.mkDerivation rec { - name = "siege-3.0.6"; + name = "siege-3.0.8"; src = fetchurl { - url = "http://www.joedog.org/pub/siege/${name}.tar.gz"; - sha256 = "0nwcj2s804z7yd20pa0cl010m0qgf22a02305i9jwxynwdj9kdvq"; + url = "http://download.joedog.org/siege/${name}.tar.gz"; + sha256 = "15xj0cl64mzf89i0jknqg37rkrcaqmgs4755l74b4nmp4bky7ddq"; }; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; diff --git a/pkgs/tools/networking/snx/default.nix b/pkgs/tools/networking/snx/default.nix deleted file mode 100644 index b4cdd0d0b99a..000000000000 --- a/pkgs/tools/networking/snx/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, libX11, pam, gcc33 }: - -let - # The proper value for this offset can be found at the top of the snx_install script. - archiveOffset = "78"; - libraryPath = stdenv.lib.makeSearchPath "lib" [libX11 pam gcc33.gcc]; -in -stdenv.mkDerivation rec { - name = "snx-800007027"; - - src = fetchurl { - url = "https://remote.us.publicisgroupe.net/CSHELL/snx_install.sh"; - sha256 = "1yq0r8gb6jw5pyfrw3wxvplrxxfhbhgm9ph4gyd754fyn52iwgxv"; - }; - - buildInputs = [makeWrapper]; - - unpackPhase = '' - tail -n +${archiveOffset} ${src} | bunzip2 -c - | tar xfvp - - ''; - - buildPhase = '' - patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" snx - ''; - - installPhase = '' - mkdir -p "$out/sbin" "$out/libexec" - mv snx "$out/libexec/" - makeWrapper "$out/libexec/snx" "$out/sbin/snx" --prefix LD_LIBRARY_PATH ":" "${libraryPath}" - ''; - - meta = { - homepage = "https://www.checkpoint.com/"; - description = "Check Point SSL Network Extender"; - license = "unknown"; - }; -} diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index 9358b9aaa2fb..a41bc5e5b8f0 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -1,24 +1,26 @@ -{ stdenv, fetchurl, gmp, autoreconfHook, gettext, pkgconfig }: +{ stdenv, fetchurl, gmp, pkgconfig, python }: stdenv.mkDerivation rec { - name = "strongswan-5.2.0"; + name = "strongswan-5.2.1"; src = fetchurl { url = "http://download.strongswan.org/${name}.tar.bz2"; - sha256 = "1ki6v9c54ykppqnj3prgh62na97yajnvnm2zr1gjxzv05syk035h"; + sha256 = "05cjjd7gg65bl6fswj2r2i13nn1nk4x86s06y75gwfdvnlrsnlga"; }; - patches = [ ./respect-path.patch ./no-hardcoded-sysconfdir.patch ]; + dontPatchELF = true; - buildInputs = [ gmp autoreconfHook gettext pkgconfig ]; + buildInputs = [ gmp pkgconfig python ]; - configureFlags = [ "--enable-swanctl" ]; + configureFlags = [ "--enable-swanctl" "--enable-cmd" ]; + + NIX_LDFLAGS = "-lgcc_s" ; meta = { maintainers = [ stdenv.lib.maintainers.shlevy ]; description = "OpenSource IPsec-based VPN Solution"; homepage = https://www.strongswan.org; license = stdenv.lib.licenses.gpl2Plus; - inherit (stdenv.gcc.clang.meta) platforms; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/tools/networking/strongswan/no-hardcoded-sysconfdir.patch b/pkgs/tools/networking/strongswan/no-hardcoded-sysconfdir.patch deleted file mode 100644 index b186b21a5dd9..000000000000 --- a/pkgs/tools/networking/strongswan/no-hardcoded-sysconfdir.patch +++ /dev/null @@ -1,145 +0,0 @@ -commit 8e2b65ebf597a4d48daa3308aa032962110ad8f6 -Author: Shea Levy <shea@shealevy.com> -Date: Tue Sep 30 15:14:47 2014 -0400 - - Allow specifying the ipsec.conf location in strongswan.conf - -diff --git a/conf/options/starter.opt b/conf/options/starter.opt -index 4e6574d..6d7162a 100644 ---- a/conf/options/starter.opt -+++ b/conf/options/starter.opt -@@ -3,3 +3,6 @@ starter.load = - - starter.load_warning = yes - Disable charon plugin load option warning. -+ -+starter.config_file = ${sysconfdir}/ipsec.conf -+ Location of the ipsec.conf conf file -diff --git a/src/starter/starter.c b/src/starter/starter.c -index 5c84593..1f365cc 100644 ---- a/src/starter/starter.c -+++ b/src/starter/starter.c -@@ -488,7 +488,8 @@ int main (int argc, char **argv) - } - if (!config_file) - { -- config_file = CONFIG_FILE; -+ config_file = lib->settings->get_str(lib->settings, "starter.config_file", -+ CONFIG_FILE); - } - - init_log("ipsec_starter"); - -commit 8b839cec684e26ed96f3d891b3ae3565558b2cff -Author: Shea Levy <shea@shealevy.com> -Date: Tue Sep 30 15:11:03 2014 -0400 - - Allow specifying the ipsec.secrets location in strongswan.conf - -diff --git a/conf/plugins/stroke.opt b/conf/plugins/stroke.opt -index 2cfc2c6..b3ca2b7 100644 ---- a/conf/plugins/stroke.opt -+++ b/conf/plugins/stroke.opt -@@ -11,5 +11,8 @@ charon.plugins.stroke.prevent_loglevel_changes = no - charon.plugins.stroke.socket = unix://${piddir}/charon.ctl - Socket provided by the stroke plugin. - -+charon.plugins.stroke.secrets_file = ${sysconfdir}/ipsec.secrets -+ Location of the ipsec.secrets conf file -+ - charon.plugins.stroke.timeout = 0 - Timeout in ms for any stroke command. Use 0 to disable the timeout. -diff --git a/src/libcharon/plugins/stroke/stroke_cred.c b/src/libcharon/plugins/stroke/stroke_cred.c -index f908219..673e492 100644 ---- a/src/libcharon/plugins/stroke/stroke_cred.c -+++ b/src/libcharon/plugins/stroke/stroke_cred.c -@@ -67,6 +67,7 @@ struct private_stroke_cred_t { - /** - * credentials - */ -+ char *secrets_file; - mem_cred_t *creds; - - /** -@@ -1297,7 +1298,7 @@ METHOD(stroke_cred_t, reread, void, - if (msg->reread.flags & REREAD_SECRETS) - { - DBG1(DBG_CFG, "rereading secrets"); -- load_secrets(this, NULL, SECRETS_FILE, 0, prompt); -+ load_secrets(this, NULL, this->secrets_file, 0, prompt); - } - if (msg->reread.flags & REREAD_CACERTS) - { -@@ -1370,6 +1371,9 @@ stroke_cred_t *stroke_cred_create() - .cachecrl = _cachecrl, - .destroy = _destroy, - }, -+ .secrets_file = lib->settings->get_str(lib->settings, -+ "%s.plugins.stroke.secrets_file", SECRETS_FILE, -+ lib->ns), - .creds = mem_cred_create(), - ); - -@@ -1380,7 +1384,7 @@ stroke_cred_t *stroke_cred_create() - FALSE, lib->ns); - - load_certs(this); -- load_secrets(this, NULL, SECRETS_FILE, 0, NULL); -+ load_secrets(this, NULL, this->secrets_file, 0, NULL); - - return &this->public; - } -diff --git a/src/starter/starter.c b/src/starter/starter.c -index 71f33ae..5c84593 100644 ---- a/src/starter/starter.c -+++ b/src/starter/starter.c -@@ -263,8 +263,11 @@ static void generate_selfcert() - { - struct stat stb; - -+ const char *secrets_file = lib->settings->get_str(lib->settings, -+ "charon.plugins.stroke.secrets_file", SECRETS_FILE); -+ - /* if ipsec.secrets file is missing then generate RSA default key pair */ -- if (stat(SECRETS_FILE, &stb) != 0) -+ if (stat(secrets_file, &stb) != 0) - { - mode_t oldmask; - FILE *f; -@@ -302,7 +305,7 @@ static void generate_selfcert() - /* ipsec.secrets is root readable only */ - oldmask = umask(0066); - -- f = fopen(SECRETS_FILE, "w"); -+ f = fopen(secrets_file, "w"); - if (f) - { - fprintf(f, "# /etc/ipsec.secrets - strongSwan IPsec secrets file\n"); -@@ -310,7 +313,7 @@ static void generate_selfcert() - fprintf(f, ": RSA myKey.der\n"); - fclose(f); - } -- ignore_result(chown(SECRETS_FILE, uid, gid)); -+ ignore_result(chown(secrets_file, uid, gid)); - umask(oldmask); - } - } - -commit 5f2ca3b99b40c47a9b59c7cc75655e5dd041787e -Author: Shea Levy <shea@shealevy.com> -Date: Tue Sep 30 14:31:50 2014 -0400 - - Allow specifying the path to strongswan.conf in the STRONGSWAN_CONF env var - -diff -Naur a/src/libstrongswan/library.c b/src/libstrongswan/library.c ---- a/src/libstrongswan/library.c 2014-06-05 03:50:30.000000000 -0400 -+++ b/src/libstrongswan/library.c 2014-09-30 15:25:27.927757711 -0400 -@@ -307,7 +307,7 @@ - #ifdef STRONGSWAN_CONF - if (!settings) - { -- settings = STRONGSWAN_CONF; -+ settings = getenv("STRONGSWAN_CONF") ?: STRONGSWAN_CONF; - } - #endif - this->public.settings = settings_create(settings); diff --git a/pkgs/tools/networking/strongswan/no-sysconfdir-write.patch b/pkgs/tools/networking/strongswan/no-sysconfdir-write.patch deleted file mode 100644 index afa85ce1d751..000000000000 --- a/pkgs/tools/networking/strongswan/no-sysconfdir-write.patch +++ /dev/null @@ -1,36 +0,0 @@ -commit 0de10fe4950672053fe2b242bcec064e9e88c880 -Author: Shea Levy <shea@shealevy.com> -Date: Fri Sep 19 14:32:22 2014 -0400 - - Don't fail to install if sysconfdir isn't writable - -diff --git a/conf/Makefile.am b/conf/Makefile.am -index 373be16..85b7b0e 100644 ---- a/conf/Makefile.am -+++ b/conf/Makefile.am -@@ -152,9 +152,9 @@ maintainer-clean-local: - rm -f $(confsnippets) default.conf plugins/*.conf plugins/*.tmp - - install-data-local: $(plugins_install_src) -- test -e "$(DESTDIR)${strongswanconfdir}" || $(INSTALL) -d "$(DESTDIR)$(strongswanconfdir)" -- test -e "$(DESTDIR)${strongswanddir}" || $(INSTALL) -d "$(DESTDIR)$(strongswanddir)" -- test -e "$(DESTDIR)${charonconfdir}" || $(INSTALL) -d "$(DESTDIR)$(charonconfdir)" -+ test -e "$(DESTDIR)${strongswanconfdir}" || $(INSTALL) -d "$(DESTDIR)$(strongswanconfdir)" || true -+ test -e "$(DESTDIR)${strongswanddir}" || $(INSTALL) -d "$(DESTDIR)$(strongswanddir)" || true -+ test -e "$(DESTDIR)${charonconfdir}" || $(INSTALL) -d "$(DESTDIR)$(charonconfdir)" || true - test -e "$(DESTDIR)$(strongswanconfdir)/strongswan.conf" || $(INSTALL) -m 644 $(srcdir)/strongswan.conf $(DESTDIR)$(strongswanconfdir)/strongswan.conf || true - for f in $(options_install_src); do \ - name=`basename $$f`; \ -diff --git a/src/swanctl/Makefile.am b/src/swanctl/Makefile.am -index 385737a..912fdf8 100644 ---- a/src/swanctl/Makefile.am -+++ b/src/swanctl/Makefile.am -@@ -54,7 +54,7 @@ maintainer-clean-local: - cd $(srcdir) && rm -f swanctl.conf swanctl.conf.5.main - - install-data-local: swanctl.conf -- test -e "$(DESTDIR)$(swanctldir)" || $(INSTALL) -d "$(DESTDIR)$(swanctldir)" -+ test -e "$(DESTDIR)$(swanctldir)" || $(INSTALL) -d "$(DESTDIR)$(swanctldir)" || true - test -e "$(DESTDIR)$(swanctldir)/x509" || $(INSTALL) -d "$(DESTDIR)$(swanctldir)/x509" || true - test -e "$(DESTDIR)$(swanctldir)/x509ca" || $(INSTALL) -d "$(DESTDIR)$(swanctldir)/x509ca" || true - test -e "$(DESTDIR)$(swanctldir)/x509aa" || $(INSTALL) -d "$(DESTDIR)$(swanctldir)/x509aa" || true diff --git a/pkgs/tools/networking/strongswan/respect-path.patch b/pkgs/tools/networking/strongswan/respect-path.patch deleted file mode 100644 index 82f6a356b85a..000000000000 --- a/pkgs/tools/networking/strongswan/respect-path.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit 09c4ae5b7bcd7057bede788f02c1d2d30aeeacda -Author: Shea Levy <shea@shealevy.com> -Date: Thu Sep 18 02:00:03 2014 -0400 - - ipsec script: just append to PATH if already set - -diff --git a/src/ipsec/_ipsec.in b/src/ipsec/_ipsec.in -index e6725d0..82041f4 100644 ---- a/src/ipsec/_ipsec.in -+++ b/src/ipsec/_ipsec.in -@@ -15,7 +15,7 @@ - # for more details. - - # define a minimum PATH environment in case it is not set --PATH="/sbin:/bin:/usr/sbin:/usr/bin:@IPSEC_SBINDIR@:@IPSEC_BINDIR@" -+PATH="${PATH:-/sbin:/bin:/usr/sbin:/usr/bin}:@IPSEC_SBINDIR@:@IPSEC_BINDIR@" - export PATH - - # set daemon name diff --git a/pkgs/tools/networking/stun/default.nix b/pkgs/tools/networking/stun/default.nix index 795c0cfc8ccb..ce7a4dd64340 100644 --- a/pkgs/tools/networking/stun/default.nix +++ b/pkgs/tools/networking/stun/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = { description = "Stun server and test client"; homepage = http://sourceforge.net/projects/stun/; - license = "Vovida 1.0"; # See any header file. + license = stdenv.lib.licenses.vsl10; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index 15bd74ea387d..039f9bc09139 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -2,11 +2,12 @@ stdenv.mkDerivation rec { name = "stunnel-${version}"; - version = "5.03"; + version = "5.05"; src = fetchurl { url = "http://www.stunnel.org/downloads/${name}.tar.gz"; - sha256 = "00yx7r46rad3yhdqfwk4grqs87wc6fiq055i91pnwxgscsa3c7ls"; + # SHA256 provided by upstream. + sha256 = "c7e1653345150db7e48d00e1129cf571c7c85de8e7e1aa70b21cf1d76b1e31ef"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/networking/swaks/default.nix b/pkgs/tools/networking/swaks/default.nix new file mode 100644 index 000000000000..0743a5c62f7e --- /dev/null +++ b/pkgs/tools/networking/swaks/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, perl, perlPackages, makeWrapper }: + +stdenv.mkDerivation rec { + name = "swaks-${version}"; + version = "20130209.0"; + + src = fetchurl { + url = "http://www.jetmore.org/john/code/swaks/files/${name}.tar.gz"; + sha256 = "0z0zsjminrdjpn6a8prjdwilnr27piibh78gc5ppg0nadljnf28b"; + }; + + buildInputs = [ perl makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + mv swaks $out/bin/ + + wrapProgram $out/bin/swaks --set PERL5LIB \ + "${with perlPackages; stdenv.lib.makePerlPath [ + NetSSLeay AuthenSASL NetDNS IOSocketInet6 + ]}" + ''; + + meta = with stdenv.lib; { + homepage = "http://www.jetmore.org/john/code/swaks/"; + description = '' + A featureful, flexible, scriptable, transaction-oriented SMTP test tool + ''; + license = licenses.gpl2; + maintainers = with maintainers; [ rickynils ]; + platforms = platforms.all; + }; + +} diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index 2db270c3f666..6744fb7c5515 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libpcap, enableStatic ? false }: stdenv.mkDerivation rec { - name = "tcpdump-4.5.1"; + name = "tcpdump-4.6.2"; src = fetchurl { url = "http://www.tcpdump.org/release/${name}.tar.gz"; - sha256 = "15hb7zkzd66nag102qbv100hcnf7frglbkylmr8adwr8f5jkkaql"; + sha256 = "1f701387jyxq7rjhv4hiig3b3g55m4b4403rd0zncv1sx3cf8kjj"; }; buildInputs = [ libpcap ]; diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix index 030cb30a1502..037fddac4d5c 100644 --- a/pkgs/tools/networking/tinc/pre.nix +++ b/pkgs/tools/networking/tinc/pre.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }: stdenv.mkDerivation rec { - name = "tinc-1.1pre38d7e73"; + name = "tinc-1.1pref57d53c"; src = fetchgit { url = "git://tinc-vpn.org/tinc"; - rev = "38d7e730e619a8b86dfbf68d77773564595f12a1"; - sha256 = "0xac1jm6x9lkybd6sz8lfcdrb8h69kh1ckg35ag1rssr45hxikbz"; + rev = "f57d53c3ad9af89489e15a8cfd94b56937bf3179"; + sha256 = "0yangrl5krygdk8djryq50qfvxn0ng9zh3aj81q6shaji7gcgiyb"; }; buildInputs = [ autoreconfHook texinfo ncurses readline zlib lzo openssl ]; diff --git a/pkgs/tools/networking/traceroute/default.nix b/pkgs/tools/networking/traceroute/default.nix index 3300d12ebfa3..0762254b706f 100644 --- a/pkgs/tools/networking/traceroute/default.nix +++ b/pkgs/tools/networking/traceroute/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { description = "Tracks the route taken by packets over an IP network"; license = stdenv.lib.licenses.gpl2; maintainers = [ maintainers.koral ]; - platforms = platforms.all; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix index 1be71942e70a..4ad9c7cebadc 100644 --- a/pkgs/tools/networking/urlwatch/default.nix +++ b/pkgs/tools/networking/urlwatch/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python3Packages }: python3Packages.buildPythonPackage rec { - name = "urlwatch-1.16"; + name = "urlwatch-1.17"; src = fetchurl { url = "http://thp.io/2008/urlwatch/${name}.tar.gz"; - sha256 = "0yf1m909awfm06z7xwn20qxbbgslb1vjwwb6rygp6bn7sq022f1f"; + sha256 = "1xl8gi01bfbrg2mchns9cgagpxjjsig1x4kis3isqgfg4k0h8vq0"; }; patchPhase = '' diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index 27d7fe2572a0..27aa9b1775a6 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, gettext, perl, LWP, gnutls ? null }: +{ stdenv, fetchurl, gettext, libidn +, perl, perlPackages, LWP, python3 +, gnutls ? null }: stdenv.mkDerivation rec { - name = "wget-1.15"; + name = "wget-1.16"; src = fetchurl { url = "mirror://gnu/wget/${name}.tar.xz"; - sha256 = "1yw0sk4mrs7bvga3c79rkbhxivmw8cs3b5wq3cglp1f9ai1mz2ni"; + sha256 = "1rxhr3jmgbwryzl51di4avqxw9m9j1z2aak8q1npns0p184xsqcj"; }; - patches = stdenv.lib.optional stdenv.isDarwin ./iri-test.patch; - preConfigure = stdenv.lib.optionalString doCheck - '' for i in "doc/texi2pod.pl" "tests/run-px" "util/rmold.pl" + '' for i in "doc/texi2pod.pl" "util/rmold.pl" do sed -i "$i" -e 's|/usr/bin.*perl|${perl}/bin/perl|g' done @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ gettext ]; - buildInputs = - stdenv.lib.optionals doCheck [ perl LWP ] + buildInputs = [ libidn ] + ++ stdenv.lib.optionals doCheck [ perl perlPackages.IOSocketSSL LWP python3 ] ++ stdenv.lib.optional (gnutls != null) gnutls; configureFlags = @@ -33,9 +33,9 @@ stdenv.mkDerivation rec { then "--with-ssl=gnutls" else "--without-ssl"; - doCheck = (perl != null); + doCheck = (perl != null && python3 != null); - meta = { + meta = with stdenv.lib; { description = "Tool for retrieving files using HTTP, HTTPS, and FTP"; longDescription = @@ -45,11 +45,11 @@ stdenv.mkDerivation rec { scripts, cron jobs, terminals without X-Windows support, etc. ''; - license = stdenv.lib.licenses.gpl3Plus; + license = licenses.gpl3Plus; homepage = http://www.gnu.org/software/wget/; - maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ fpletz ]; + platforms = platforms.all; }; } diff --git a/pkgs/tools/networking/wget/iri-test.patch b/pkgs/tools/networking/wget/iri-test.patch deleted file mode 100644 index c1f798ce3726..000000000000 --- a/pkgs/tools/networking/wget/iri-test.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -r --unified a/wget-1.14/tests/run-px b/wget-1.14/tests/run-px ---- a/tests/run-px 2012-06-16 11:58:11.000000000 +0100 -+++ b/tests/run-px 2013-11-02 14:06:14.000000000 +0000 -@@ -48,7 +48,7 @@ - 'Test-idn-robots-utf8.px', - 'Test-iri.px', - 'Test-iri-percent.px', -- 'Test-iri-disabled.px', -+ #'Test-iri-disabled.px', - 'Test-iri-forced-remote.px', - 'Test-iri-list.px', - 'Test-k.px', diff --git a/pkgs/tools/package-management/cabal-install/0.10.2.nix b/pkgs/tools/package-management/cabal-install/0.10.2.nix deleted file mode 100644 index 3d7b2d72d719..000000000000 --- a/pkgs/tools/package-management/cabal-install/0.10.2.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, Cabal, filepath, HTTP, network, random, time, zlib }: - -cabal.mkDerivation (self: { - pname = "cabal-install"; - version = "0.10.2"; - sha256 = "05gmgxdlymp66c87szx1vq6hlraispdh6pm0n85s74yihjwwhmv3"; - isLibrary = false; - isExecutable = true; - buildDepends = [ Cabal filepath HTTP network random time zlib ]; - meta = { - homepage = "http://www.haskell.org/cabal/"; - description = "The command-line interface for Cabal and Hackage"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = with self.stdenv.lib.maintainers; [ simons ]; - }; -}) diff --git a/pkgs/tools/package-management/cabal-install/0.14.0.nix b/pkgs/tools/package-management/cabal-install/0.14.0.nix deleted file mode 100644 index c5a67e61999c..000000000000 --- a/pkgs/tools/package-management/cabal-install/0.14.0.nix +++ /dev/null @@ -1,26 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, Cabal, filepath, HTTP, mtl, network, random, time, zlib }: - -cabal.mkDerivation (self: { - pname = "cabal-install"; - version = "0.14.0"; - sha256 = "1n2vvlmfgfrj3z4ag5bj278vmdh6fw7xb0ixbxxxcngzd41bbwpl"; - isLibrary = false; - isExecutable = true; - buildDepends = [ - Cabal filepath HTTP mtl network random time zlib - ]; - postInstall = '' - mkdir $out/etc - mv bash-completion $out/etc/bash_completion.d - ''; - meta = { - homepage = "http://www.haskell.org/cabal/"; - description = "The command-line interface for Cabal and Hackage"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/tools/package-management/cabal-install/0.6.2.nix b/pkgs/tools/package-management/cabal-install/0.6.2.nix deleted file mode 100644 index 3c79857f6e78..000000000000 --- a/pkgs/tools/package-management/cabal-install/0.6.2.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, Cabal, filepath, HTTP, network, random, zlib }: - -cabal.mkDerivation (self: { - pname = "cabal-install"; - version = "0.6.2"; - sha256 = "d8ea91bd0a2a624ab1cf52ddfe48cef02b532bb5e2fcda3fd72ca51efc04b41a"; - isLibrary = false; - isExecutable = true; - buildDepends = [ Cabal filepath HTTP network random zlib ]; - meta = { - homepage = "http://www.haskell.org/cabal/"; - description = "The command-line interface for Cabal and Hackage"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = with self.stdenv.lib.maintainers; [ simons ]; - }; -}) diff --git a/pkgs/tools/package-management/cabal-install/0.8.0.nix b/pkgs/tools/package-management/cabal-install/0.8.0.nix deleted file mode 100644 index d27fbbca7d47..000000000000 --- a/pkgs/tools/package-management/cabal-install/0.8.0.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, Cabal, filepath, HTTP, network, random, time, zlib }: - -cabal.mkDerivation (self: { - pname = "cabal-install"; - version = "0.8.0"; - sha256 = "6d16618ff454f8d732cad64a53b767b5b6bb95ba4970b260a40e8f467035493c"; - isLibrary = false; - isExecutable = true; - buildDepends = [ Cabal filepath HTTP network random time zlib ]; - meta = { - homepage = "http://www.haskell.org/cabal/"; - description = "The command-line interface for Cabal and Hackage"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = with self.stdenv.lib.maintainers; [ simons ]; - }; -}) diff --git a/pkgs/tools/package-management/cabal-install/0.8.2.nix b/pkgs/tools/package-management/cabal-install/0.8.2.nix deleted file mode 100644 index 6f8881b504bd..000000000000 --- a/pkgs/tools/package-management/cabal-install/0.8.2.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, Cabal, filepath, HTTP, network, random, time, zlib }: - -cabal.mkDerivation (self: { - pname = "cabal-install"; - version = "0.8.2"; - sha256 = "8f896ab46ec6c578f620ce4150f7cd04a2088be793113b33cc570b13b6b86e0b"; - isLibrary = false; - isExecutable = true; - buildDepends = [ Cabal filepath HTTP network random time zlib ]; - meta = { - homepage = "http://www.haskell.org/cabal/"; - description = "The command-line interface for Cabal and Hackage"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = with self.stdenv.lib.maintainers; [ simons ]; - }; -}) diff --git a/pkgs/tools/package-management/cabal-install/1.16.0.2.nix b/pkgs/tools/package-management/cabal-install/1.16.0.2.nix index 84dc12d3145e..d4a709ab13ba 100644 --- a/pkgs/tools/package-management/cabal-install/1.16.0.2.nix +++ b/pkgs/tools/package-management/cabal-install/1.16.0.2.nix @@ -15,6 +15,9 @@ cabal.mkDerivation (self: { mkdir $out/etc mv bash-completion $out/etc/bash_completion.d ''; + patchPhase = '' + sed -i -e 's|random .*1.1,|random,|' cabal-install.cabal + ''; meta = { homepage = "http://www.haskell.org/cabal/"; description = "The command-line interface for Cabal and Hackage"; diff --git a/pkgs/tools/package-management/cabal-install/1.18.0.3.nix b/pkgs/tools/package-management/cabal-install/1.18.0.3.nix index 52db3a6faf40..e391d80420dc 100644 --- a/pkgs/tools/package-management/cabal-install/1.18.0.3.nix +++ b/pkgs/tools/package-management/cabal-install/1.18.0.3.nix @@ -22,6 +22,9 @@ cabal.mkDerivation (self: { mkdir $out/etc mv bash-completion $out/etc/bash_completion.d ''; + patchPhase = '' + sed -i -e 's|random .*1.1,|random,|' cabal-install.cabal + ''; meta = { homepage = "http://www.haskell.org/cabal/"; description = "The command-line interface for Cabal and Hackage"; diff --git a/pkgs/tools/package-management/cabal-install/1.20.0.3.nix b/pkgs/tools/package-management/cabal-install/1.20.0.3.nix index 8c136dc9dbb0..1a18222ed6bc 100644 --- a/pkgs/tools/package-management/cabal-install/1.20.0.3.nix +++ b/pkgs/tools/package-management/cabal-install/1.20.0.3.nix @@ -22,6 +22,9 @@ cabal.mkDerivation (self: { mkdir $out/etc mv bash-completion $out/etc/bash_completion.d ''; + patchPhase = '' + sed -i -e 's|random .*1.1,|random,|' cabal-install.cabal + ''; meta = { homepage = "http://www.haskell.org/cabal/"; description = "The command-line interface for Cabal and Hackage"; diff --git a/pkgs/tools/package-management/checkinstall/default.nix b/pkgs/tools/package-management/checkinstall/default.nix index 1320720ed170..dc3373c3b6fc 100644 --- a/pkgs/tools/package-management/checkinstall/default.nix +++ b/pkgs/tools/package-management/checkinstall/default.nix @@ -32,6 +32,9 @@ stdenv.mkDerivation { # Fix a `conflicting types for 'readlink'' error since Glibc 2.19 ./readlink-types.patch + + # Fix BuildRoot handling in RPM builds. + ./set-buildroot.patch ] ++ stdenv.lib.optional (stdenv.system == "x86_64-linux") diff --git a/pkgs/tools/package-management/checkinstall/set-buildroot.patch b/pkgs/tools/package-management/checkinstall/set-buildroot.patch new file mode 100644 index 000000000000..58840f491ecf --- /dev/null +++ b/pkgs/tools/package-management/checkinstall/set-buildroot.patch @@ -0,0 +1,15 @@ +https://build.opensuse.org/package/view_file/openSUSE:13.1/checkinstall/checkinstall-set_buildroot.patch + +Index: checkinstall +=================================================================== +--- a/checkinstall 2009-12-26 20:17:24.000000000 +0100 ++++ b/checkinstall 2011-01-31 18:17:56.171593541 +0100 +@@ -2463,7 +2463,7 @@ cd "$DIRECTORIO_FUENTE" + + echo + echogn "Building RPM package..." +-$RPMBUILD -bb ${RPM_TARGET_FLAG}${ARCHITECTURE} "$SPEC_PATH" &> ${TMP_DIR}/rpmbuild.log ++$RPMBUILD --buildroot ${BUILDROOT} -bb ${RPM_TARGET_FLAG}${ARCHITECTURE} "$SPEC_PATH" &> ${TMP_DIR}/rpmbuild.log + okfail + + if [ $? -gt 0 ]; then diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 6631214f39ab..55f5b0aedc9c 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -66,6 +66,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { + # due to builder args bug; see + # https://github.com/NixOS/nix/commit/b224ac15201c57b40ea855f5a98b1bd166c1c7f6 + broken = stdenv.isDarwin; description = "Powerful package manager that makes package management reliable and reproducible"; longDescription = '' Nix is a powerful package manager for Linux and other Unix systems that diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index a9f87c8ccf3b..be370808d1e2 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, perl, curl, bzip2, sqlite, openssl ? null -, pkgconfig, boehmgc, perlPackages +, pkgconfig, boehmgc, perlPackages, bash , storeDir ? "/nix/store" , stateDir ? "/nix/var" }: stdenv.mkDerivation rec { - name = "nix-1.8pre3843_3f8576"; + name = "nix-1.8pre3919_f43a8ed"; src = fetchurl { - url = "http://hydra.nixos.org/build/15588665/download/4/${name}.tar.xz"; - sha256 = "23befe1b5ecff38cc1088b98f221893f87d47e3335b381090ce13e9dd6c6eb87"; + url = http://hydra.nixos.org/build/17676230/download/4/nix-1.8pre3919_f43a8ed.tar.xz; + sha256 = "6837adca17a1571fb82f7db0f21230577ff5d3d9b2a5ae1e465862033c6fded4"; }; nativeBuildInputs = [ perl pkgconfig ]; @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { postUnpack = '' export CPATH="${bzip2}/include" export LIBRARY_PATH="${bzip2}/lib" + export CXXFLAGS="-O3 -Wno-error=reserved-user-defined-literal" ''; configureFlags = @@ -34,7 +35,7 @@ stdenv.mkDerivation rec { --with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix} --disable-init-state --enable-gc - CFLAGS=-O3 CXXFLAGS=-O3 + CFLAGS=-O3 ''; makeFlags = "profiledir=$(out)/etc/profile.d"; diff --git a/pkgs/tools/package-management/nox/default.nix b/pkgs/tools/package-management/nox/default.nix index a25ef6e95800..1345cfe502f6 100644 --- a/pkgs/tools/package-management/nox/default.nix +++ b/pkgs/tools/package-management/nox/default.nix @@ -1,17 +1,16 @@ -{ lib, pythonPackages, git, fetchgit, makeWrapper, nix }: +{ lib, pythonPackages, fetchurl, makeWrapper, nix }: pythonPackages.buildPythonPackage rec { - name = "nox-0.0.1"; + name = "nox-${version}"; + version = "0.0.1"; namePrefix = ""; - src = fetchgit { - url = "git://github.com/madjar/nox.git"; - rev = "088249aa766c9fa929aa08a60f1a7eb41008da40"; - sha256 = "0dscnmhm1va2h0jz7hh60nvjwxv5a92n5pp8c0g7hz76g67mi5xs"; - leaveDotGit = true; # required by pbr + src = fetchurl { + url = "https://pypi.python.org/packages/source/n/nix-nox/nix-nox-${version}.tar.gz"; + sha256 = "1s1jhickdhym70qrb5h4qxq1mvkpwgdppqpfb2jnpfaf1az6c207"; }; - buildInputs = [ git pythonPackages.pbr makeWrapper ]; + buildInputs = [ pythonPackages.pbr makeWrapper ]; pythonPath = with pythonPackages; [ dogpile_cache diff --git a/pkgs/tools/package-management/opkg-utils/default.nix b/pkgs/tools/package-management/opkg-utils/default.nix new file mode 100644 index 000000000000..9a197ca763a4 --- /dev/null +++ b/pkgs/tools/package-management/opkg-utils/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchgit }: + +stdenv.mkDerivation rec { + name = "opkg-utils-20141030"; + + # No releases, only a git tree + src = fetchgit { + url = "git://git.yoctoproject.org/opkg-utils"; + rev = "762d9dadce548108d4204c2113461a7dd6f57e60"; + sha256 = "a450643fa1353b872166a3d462297fb2eb240554eed7a9186645ffd72b353417"; + }; + + preBuild = '' + makeFlagsArray+=(PREFIX="$out") + ''; + + meta = with stdenv.lib; { + description = "Helper scripts for use with the opkg package manager"; + homepage = http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix index 6708cd1fbd18..67c4578ac9ae 100644 --- a/pkgs/tools/package-management/opkg/default.nix +++ b/pkgs/tools/package-management/opkg/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, curl, gpgme }: stdenv.mkDerivation rec { - version = "0.2.2"; + version = "0.2.4"; name = "opkg-${version}"; src = fetchurl { url = "http://downloads.yoctoproject.org/releases/opkg/opkg-${version}.tar.gz"; - sha256 = "0ax10crp2grrpl20gl5iqfw37d5qz6h790lyyv2ali45agklqmda"; + sha256 = "11ih8lay1v7sk5czk3m3cfqil4cp8s7pfz60xnddy7nqazjcfh0g"; }; buildInputs = [ pkgconfig curl gpgme ]; diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix new file mode 100644 index 000000000000..5348b579cd75 --- /dev/null +++ b/pkgs/tools/security/afl/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, bash }: + +stdenv.mkDerivation rec { + name = "afl-${version}"; + version = "0.85b"; + + src = fetchurl { + url = "http://lcamtuf.coredump.cx/afl/releases/${name}.tgz"; + sha256 = "010sgsjxb76bsqaw7sa5mm9r4avpf4c0bw9q2898bymfqisji033"; + }; + + buildPhase = "make PREFIX=$out"; + installPhase = "make install PREFIX=$out"; + + meta = { + description = "Powerful fuzzer via genetic algorithms and instrumentation"; + longDescription = '' + American fuzzy lop is a fuzzer that employs a novel type of + compile-time instrumentation and genetic algorithms to + automatically discover clean, interesting test cases that + trigger new internal states in the targeted binary. This + substantially improves the functional coverage for the fuzzed + code. The compact synthesized corpora produced by the tool are + also useful for seeding other, more labor or resource-intensive + testing regimes down the road. + ''; + homepage = "http://lcamtuf.coredump.cx/afl/"; + license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + }; +} diff --git a/pkgs/tools/security/aide/default.nix b/pkgs/tools/security/aide/default.nix new file mode 100644 index 000000000000..c1b6fe197a15 --- /dev/null +++ b/pkgs/tools/security/aide/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, flex, bison, libmhash, zlib, acl, attr, libselinux }: +stdenv.mkDerivation rec { + name = "aide-${version}"; + version = "0.16a2"; + + src = fetchurl { + url = "mirror://sourceforge/aide/devel/0.16a2/aide-${version}.tar.gz"; + sha256 = "11qvp6l2x4ajq9485lmg722gfdikh8r2wqfw17m0jm68df0m295m"; + }; + + buildInputs = [ flex bison libmhash zlib acl attr libselinux ]; + + + configureFlags = [ + "--with-posix-acl" + "--with-selinux" + "--with-xattr" + ]; + + meta = with stdenv.lib; { + homepage = "http://aide.sourceforge.net/"; + description = "Advanced Intrusion Detection Environment (AIDE) is a file and directory integrity checker"; + license = licenses.free; + maintainers = [ maintainers.tstrobel ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/security/apg/default.nix b/pkgs/tools/security/apg/default.nix index 2190a1ffbe63..24d88517b6a4 100644 --- a/pkgs/tools/security/apg/default.nix +++ b/pkgs/tools/security/apg/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "apg-2.2.3"; + name = "apg-2.3.0b"; src = fetchurl { url = "http://www.adel.nursat.kz/apg/download/${name}.tar.gz"; - sha256 = "1fkxpaifv925i385krsyslrig42ksws5y19hfq5asn1rwv6zmjb9"; + sha256 = "14lbq81xrcsmpk1b9qmqyz7n6ypf08zcxvcvp6f7ybcyf0lj1rfi"; }; configurePhase = '' substituteInPlace Makefile --replace /usr/local "$out" diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index 7dc13b3d11b2..1a76008f8894 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -1,19 +1,22 @@ -{ stdenv, fetchurl, zlib, bzip2, libiconv, libxml2, openssl, ncurses, curl }: +{ stdenv, fetchurl, zlib, bzip2, libiconvOrNull, libxml2, openssl, ncurses, curl }: stdenv.mkDerivation rec { name = "clamav-${version}"; - version = "0.98.4"; + version = "0.98.5"; src = fetchurl { url = "mirror://sourceforge/clamav/clamav-${version}.tar.gz"; - sha256 = "071yzamalj3rf7kl2jvc35ipnk1imdkq5ylbb8whyxfgmd3nf06k"; + sha256 = "0kdaimnbbb0hymg7d15a3iwk17r8555nyzr3d1j96cwhzbakfbww"; }; - buildInputs = [ zlib bzip2 libiconv libxml2 openssl ncurses curl ]; + buildInputs = [ zlib bzip2 libxml2 openssl ncurses curl ] + ++ stdenv.lib.optional (libiconvOrNull != null) libiconvOrNull; configureFlags = [ "--with-zlib=${zlib}" "--with-libbz2-prefix=${bzip2}" - "--with-iconv-dir=${libiconv}" + ] ++ (stdenv.lib.optional (libiconvOrNull != null) + "--with-iconv-dir=${libiconvOrNull}") + ++ [ "--with-xml=${libxml2}" "--with-openssl=${openssl}" "--with-libncurses-prefix=${ncurses}" diff --git a/pkgs/tools/security/eid-viewer/default.nix b/pkgs/tools/security/eid-viewer/default.nix new file mode 100644 index 000000000000..cb8b9db908bd --- /dev/null +++ b/pkgs/tools/security/eid-viewer/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, jre, makeWrapper, pcsclite }: + +stdenv.mkDerivation rec { + # TODO: find out what the version components actually mean, if anything: + package = "eid-viewer-4.0.7-195"; + build = "tcm406-258907"; + name = "${package}-${build}"; + + src = fetchurl { + url = "http://eid.belgium.be/en/binaries/${package}.src.tar_${build}.gz"; + sha256 = "e263e6751ef7c185e278a607fdc46c207306d9a56c6ddb2ce6f58fb4464a2893"; + }; + + buildInputs = [ jre makeWrapper pcsclite ]; + + unpackPhase = "tar -xzf ${src} --strip-components=1"; + + preConfigure = '' + substituteInPlace eid-viewer.sh.in --replace "exec java" "exec ${jre}/bin/java" + ''; + + postInstall = '' + wrapProgram $out/bin/eid-viewer --suffix LD_LIBRARY_PATH : ${pcsclite}/lib + ''; + + meta = with stdenv.lib; { + description = "Belgian electronic identity card (eID) viewer"; + homepage = http://eid.belgium.be/en/using_your_eid/installing_the_eid_software/linux/; + license = with licenses; lgpl3; + longDescription = '' + A simple, graphical Java application to view, print and save data from + Belgian electronic identity cards. Independent of the eid-mw package, + which is required to actually use your eID for authentication or signing. + ''; + maintainers = with maintainers; [ nckx ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index 6b5c69c3d2e2..b77f16947723 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, python, pythonPackages, unzip, systemd, gamin }: -let version = "0.9"; in +let version = "0.9.1"; in pythonPackages.buildPythonPackage { name = "fail2ban-${version}"; @@ -9,7 +9,7 @@ pythonPackages.buildPythonPackage { src = fetchurl { url = "https://github.com/fail2ban/fail2ban/zipball/${version}"; name = "fail2ban-${version}.zip"; - sha256 = "0dawl0vvdvpnkg1hc4l0c8sj8ikcr2l48d6khfx0174nq8yfcg93"; + sha256 = "0lk720r212mbpk1654qihyxcj5wmglzkg7v4pyiy5qq9qy58jmyr"; }; buildInputs = [ unzip ]; diff --git a/pkgs/tools/security/gnupg1/default.nix b/pkgs/tools/security/gnupg/1.nix index 53f784396a72..3675c8bc390f 100644 --- a/pkgs/tools/security/gnupg1/default.nix +++ b/pkgs/tools/security/gnupg/1.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, readline, bzip2 }: stdenv.mkDerivation rec { - name = "gnupg-1.4.17"; + name = "gnupg-1.4.18"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "0nvv1bd8v13gh2m1429azws7ks0ix9y1yv87ak9k9i1dsqcrvpg6"; + sha256 = "1233bppjvdpbbl425ii6l7xvgy0879ghhnmwrph5b6c4g3dgvddp"; }; buildInputs = [ readline bzip2 ]; diff --git a/pkgs/tools/security/gnupg1compat/default.nix b/pkgs/tools/security/gnupg/1compat.nix index 9bd71467f0ea..9bd71467f0ea 100644 --- a/pkgs/tools/security/gnupg1compat/default.nix +++ b/pkgs/tools/security/gnupg/1compat.nix diff --git a/pkgs/tools/security/gnupg/default.nix b/pkgs/tools/security/gnupg/20.nix index 45a25d7e2422..58a7cb7e34c0 100644 --- a/pkgs/tools/security/gnupg/default.nix +++ b/pkgs/tools/security/gnupg/20.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { patchPhase = '' find tests -type f | xargs sed -e 's@/bin/pwd@${coreutils}&@g' -i + patch gl/stdint_.h < ${./clang.patch} ''; configureFlags = diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix new file mode 100644 index 000000000000..e1f849560c8e --- /dev/null +++ b/pkgs/tools/security/gnupg/21.nix @@ -0,0 +1,33 @@ +{ 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 +}: + +with stdenv.lib; +stdenv.mkDerivation rec { + name = "gnupg-2.1.0"; + + src = fetchurl { + url = "mirror://gnupg/gnupg/${name}.tar.bz2"; + sha256 = "12q5shx6ldqad3rky154nv8f2cy57sxy9idivz93ggqm1bsw7a0n"; + }; + + patches = [ ./socket-activate.patch ]; + + buildInputs = [ + pkgconfig libgcrypt libassuan libksba npth + readline libusb gnutls adns openldap zlib bzip2 + autoreconfHook gettext + ]; + + configureFlags = + optional (pinentry != null) "--with-pinentry-pgm=${pinentry}/bin/pinentry"; + + meta = with stdenv.lib; { + homepage = http://gnupg.org; + description = "a complete and free implementation of the OpenPGP standard"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ wkennington ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/security/gnupg/clang.patch b/pkgs/tools/security/gnupg/clang.patch new file mode 100644 index 000000000000..842785e5c932 --- /dev/null +++ b/pkgs/tools/security/gnupg/clang.patch @@ -0,0 +1,13 @@ +diff --git a/gl/stdint_.h b/gl/stdint_.h +index bc27595..303e81a 100644 +--- a/gl/stdint_.h ++++ b/gl/stdint_.h +@@ -62,7 +62,7 @@ + int{8,16,32,64}_t, uint{8,16,32,64}_t and __BIT_TYPES_DEFINED__. + <inttypes.h> also defines intptr_t and uintptr_t. */ + # define _GL_JUST_INCLUDE_ABSOLUTE_INTTYPES_H +-# include <inttypes.h> ++// # include <inttypes.h> + # undef _GL_JUST_INCLUDE_ABSOLUTE_INTTYPES_H + #elif @HAVE_SYS_INTTYPES_H@ + /* Solaris 7 <sys/inttypes.h> has the types except the *_fast*_t types, and diff --git a/pkgs/tools/security/gnupg/socket-activate.patch b/pkgs/tools/security/gnupg/socket-activate.patch new file mode 100644 index 000000000000..02aa0652e039 --- /dev/null +++ b/pkgs/tools/security/gnupg/socket-activate.patch @@ -0,0 +1,180 @@ +From 8fde13d07c0059040ed531ca3ac365f5780ff240 Mon Sep 17 00:00:00 2001 +From: Shea Levy <shea@shealevy.com> +Date: Tue, 18 Nov 2014 14:34:53 -0500 +Subject: [PATCH] gpg-agent: Enable socket activation + +This allows gpg-agent to be managed by tools such as systemd or launchd +--- + agent/gpg-agent.c | 62 ++++++++++++++++++++++++++++++++++++------------------ + doc/gpg-agent.texi | 21 +++++++++++++++++- + 2 files changed, 61 insertions(+), 22 deletions(-) + +diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c +index 5960fe3..2f06982 100644 +--- a/agent/gpg-agent.c ++++ b/agent/gpg-agent.c +@@ -124,7 +124,9 @@ enum cmd_and_opt_values + oPuttySupport, + oDisableScdaemon, + oDisableCheckOwnSocket, +- oWriteEnvFile ++ oWriteEnvFile, ++ oAgentFD, ++ oSSHAgentFD + }; + + +@@ -138,6 +140,8 @@ static ARGPARSE_OPTS opts[] = { + { 301, NULL, 0, N_("@Options:\n ") }, + + { oDaemon, "daemon", 0, N_("run in daemon mode (background)") }, ++ { oAgentFD, "agent-fd", 1, "@" }, ++ { oSSHAgentFD, "ssh-agent-fd", 1, "@" }, + { oServer, "server", 0, N_("run in server mode (foreground)") }, + { oVerbose, "verbose", 0, N_("verbose") }, + { oQuiet, "quiet", 0, N_("be somewhat more quiet") }, +@@ -596,6 +600,31 @@ parse_rereadable_options (ARGPARSE_ARGS *pargs, int reread) + return 1; /* handled */ + } + ++/* Handle agent socket(s) */ ++static void ++handle_agent_socks(int fd, int fd_ssh) ++{ ++#ifndef HAVE_W32_SYSTEM ++ if (chdir("/")) ++ { ++ log_error ("chdir to / failed: %s\n", strerror (errno)); ++ exit (1); ++ } ++ ++ { ++ struct sigaction sa; ++ ++ sa.sa_handler = SIG_IGN; ++ sigemptyset (&sa.sa_mask); ++ sa.sa_flags = 0; ++ sigaction (SIGPIPE, &sa, NULL); ++ } ++#endif /*!HAVE_W32_SYSTEM*/ ++ ++ log_info ("%s %s started\n", strusage(11), strusage(13) ); ++ handle_connections (fd, fd_ssh); ++ assuan_sock_close (fd); ++} + + /* The main entry point. */ + int +@@ -612,6 +641,8 @@ main (int argc, char **argv ) + int default_config =1; + int pipe_server = 0; + int is_daemon = 0; ++ int fd_agent = GNUPG_INVALID_FD; ++ int fd_ssh_agent = GNUPG_INVALID_FD; + int nodetach = 0; + int csh_style = 0; + char *logfile = NULL; +@@ -819,6 +850,8 @@ main (int argc, char **argv ) + case oSh: csh_style = 0; break; + case oServer: pipe_server = 1; break; + case oDaemon: is_daemon = 1; break; ++ case oAgentFD: fd_agent = pargs.r.ret_int; break; ++ case oSSHAgentFD: fd_ssh_agent = pargs.r.ret_int; break; + + case oDisplay: default_display = xstrdup (pargs.r.ret_str); break; + case oTTYname: default_ttyname = xstrdup (pargs.r.ret_str); break; +@@ -904,7 +937,8 @@ main (int argc, char **argv ) + bind_textdomain_codeset (PACKAGE_GT, "UTF-8"); + #endif + +- if (!pipe_server && !is_daemon && !gpgconf_list) ++ if (!pipe_server && !is_daemon && !gpgconf_list && ++ fd_agent == GNUPG_INVALID_FD) + { + /* We have been called without any options and thus we merely + check whether an agent is already running. We do this right +@@ -1054,6 +1088,10 @@ main (int argc, char **argv ) + agent_deinit_default_ctrl (ctrl); + xfree (ctrl); + } ++ else if (fd_agent != GNUPG_INVALID_FD) ++ { ++ handle_agent_socks(fd_agent, fd_ssh_agent); ++ } + else if (!is_daemon) + ; /* NOTREACHED */ + else +@@ -1238,26 +1276,8 @@ main (int argc, char **argv ) + log_set_prefix (NULL, oldflags | JNLIB_LOG_RUN_DETACHED); + opt.running_detached = 1; + } +- +- if (chdir("/")) +- { +- log_error ("chdir to / failed: %s\n", strerror (errno)); +- exit (1); +- } +- +- { +- struct sigaction sa; +- +- sa.sa_handler = SIG_IGN; +- sigemptyset (&sa.sa_mask); +- sa.sa_flags = 0; +- sigaction (SIGPIPE, &sa, NULL); +- } + #endif /*!HAVE_W32_SYSTEM*/ +- +- log_info ("%s %s started\n", strusage(11), strusage(13) ); +- handle_connections (fd, opt.ssh_support ? fd_ssh : GNUPG_INVALID_FD); +- assuan_sock_close (fd); ++ handle_agent_socks(fd, opt.ssh_support ? fd_ssh : GNUPG_INVALID_FD); + } + + return 0; +diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi +index a4079d7..1556e54 100644 +--- a/doc/gpg-agent.texi ++++ b/doc/gpg-agent.texi +@@ -43,7 +43,15 @@ + .IR file ] + .RI [ options ] + .B \-\-daemon +-.RI [ command_line ] ++.br ++.B gpg-agent ++.RB [ \-\-homedir ++.IR dir ] ++.RB [ \-\-options ++.IR file ] ++.RI [ options ] ++.B \-\-agent-fd ++.IR fd + @end ifset + + @mansect description +@@ -186,6 +194,11 @@ Yet another way is creating + a new process as a child of gpg-agent: @code{gpg-agent --daemon + /bin/sh}. This way you get a new shell with the environment setup + properly; if you exit from this shell, gpg-agent terminates as well. ++ ++@item --agent-fd @var{fd} ++@opindex agent-fd ++Start the gpg-agent using @var{fd} as the listening socket. This is useful for ++socket activation a la systemd and launchd. + @end table + + @mansect options +@@ -532,6 +545,12 @@ Ignore requests to change the current @code{tty} or X window system's + @code{DISPLAY} variable respectively. This is useful to lock the + pinentry to pop up at the @code{tty} or display you started the agent. + ++@item --ssh-agent-fd @var{fd} ++@opindex ssh-agent-fd ++ ++When starting the agent with @option{--agent-fd}, use this to pass in a socket ++to be used for the OpenSSH agent protocol. ++ + @anchor{option --enable-ssh-support} + @item --enable-ssh-support + @opindex enable-ssh-support diff --git a/pkgs/tools/security/mbox/default.nix b/pkgs/tools/security/mbox/default.nix new file mode 100644 index 000000000000..732cf7046610 --- /dev/null +++ b/pkgs/tools/security/mbox/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, openssl, which }: + +stdenv.mkDerivation { + name = "mbox-20140526"; + + src = fetchFromGitHub { + owner = "tsgates"; + repo = "mbox"; + rev = "a131424b6cb577e1c916bd0e8ffb2084a5f73048"; + sha256 = "06qggqxnzcxnc34m6sbafxwr2p64x65m9zm5wp7pwyarcckhh2hd"; + }; + + buildInputs = [ openssl which ]; + + preConfigure = '' + cd src + cp {.,}configsbox.h + ''; + + doCheck = true; + checkPhase = '' + rm tests/test-*vim.sh tests/test-pip.sh + + patchShebangs ./; dontPatchShebags=1 + sed -i 's|^/bin/||' tests/test-fileops.sh + + ./testall.sh + ''; + + meta = with stdenv.lib; + { description = "Lightweight sandboxing mechanism that any user can use without special privileges"; + homepage = http://pdos.csail.mit.edu/mbox/; + maintainers = with maintainers; [ emery ]; + license = licenses.bsd3; + platforms = [ "x86_64-linux" ]; + }; + +} diff --git a/pkgs/tools/security/meo/default.nix b/pkgs/tools/security/meo/default.nix index 051b6579f17a..be678b18dda0 100644 --- a/pkgs/tools/security/meo/default.nix +++ b/pkgs/tools/security/meo/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildFlags = "QMAKE=qmake"; - buildInputs = [ openssl pcre qt4 boost boost.lib pkcs11helper ]; + buildInputs = [ openssl pcre qt4 boost pkcs11helper ]; preConfigure = '' sed -i s,-mt$,, meo-gui/meo-gui.pro diff --git a/pkgs/tools/security/mkrand/default.nix b/pkgs/tools/security/mkrand/default.nix new file mode 100644 index 000000000000..5d1cfdd40232 --- /dev/null +++ b/pkgs/tools/security/mkrand/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "mkrand-0.1.0"; + + src = fetchurl { + url = "https://github.com/mknight-tag/MKRAND/releases/download/v0.1.0/mkrand-0.1.0.tar.gz"; + sha256 = "1irwyv2j5c3606k3qbq77yrd65y27rcq3jdlp295rz875q8iq9fs"; + }; + + doCheck = true; + + meta = { + description = "A Digital Random Bit Generator"; + longDescription = "MKRAND is a utility for generating random information."; + homepage = https://github.com/mknight-tag/MKRAND/; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.all; + }; + } diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index 56964c1f6923..61e4989f6cbd 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -32,8 +32,8 @@ stdenv.mkDerivation rec { ]; meta = { - description = "A free and open source utility for network discovery and security auditing."; - homepage = "http://www.nmap.org"; + description = "A free and open source utility for network discovery and security auditing"; + homepage = http://www.nmap.org; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ mornfall thoughtpolice ]; diff --git a/pkgs/tools/security/oath-toolkit/default.nix b/pkgs/tools/security/oath-toolkit/default.nix index 80ab866e1f3f..8f96a5067d12 100644 --- a/pkgs/tools/security/oath-toolkit/default.nix +++ b/pkgs/tools/security/oath-toolkit/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pam }: stdenv.mkDerivation rec { - name = "oath-toolkit-2.0.2"; + name = "oath-toolkit-2.4.1"; src = fetchurl { url = "mirror://savannah/oath-toolkit/${name}.tar.gz"; - sha256 = "0i2rf5j83kb8h3sd9lsm0a46zq805kzagvccc4rk7879lg1fnl99"; + sha256 = "094vbq66sn5f2dsy14hajpsfdnaivjxf70xzs91nrsq0q75l5ylv"; }; buildInputs = [ pam ]; diff --git a/pkgs/tools/security/opencryptoki/default.nix b/pkgs/tools/security/opencryptoki/default.nix new file mode 100644 index 000000000000..9ea9c2f4892b --- /dev/null +++ b/pkgs/tools/security/opencryptoki/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, openssl, trousers, automake, autoconf, libtool, bison, flex }: + +stdenv.mkDerivation rec { + version = "3.2"; + name = "opencryptoki-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/opencryptoki/opencryptoki/v${version}/opencryptoki-v${version}.tgz"; + sha256 = "06r6zp299vxdspl6k65myzgjv0bihg7kc500v7s4jd3mcrkngd6h"; + }; + + buildInputs = [ automake autoconf libtool openssl trousers bison flex ]; + + preConfigure = '' + substituteInPlace configure.in --replace "chown" "true" + substituteInPlace configure.in --replace "chgrp" "true" + sh bootstrap.sh --prefix=$out + ''; + + configureFlags = [ "--disable-ccatok" "--disable-icatok" ]; + + makeFlags = "DESTDIR=$(out)"; + + # work around the build script of opencryptoki + postInstall = '' + cp -r $out/$out/* $out + rm -r $out/nix + ''; + + meta = with stdenv.lib; { + description = "PKCS#11 implementation for Linux"; + homepage = http://opencryptoki.sourceforge.net/; + license = licenses.cpl10; + maintainers = [ maintainers.tstrobel ]; + platforms = platforms.unix; + }; +} + diff --git a/pkgs/tools/security/p0f/default.nix b/pkgs/tools/security/p0f/default.nix index 377639ce2e60..117f1e016ac6 100644 --- a/pkgs/tools/security/p0f/default.nix +++ b/pkgs/tools/security/p0f/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "p0f-${version}"; - version = "3.06b"; + version = "3.07b"; src = fetchurl { url = "http://lcamtuf.coredump.cx/p0f3/releases/${name}.tgz"; - sha256 = "1rydqvr78a3rjp9iwfbw4bs7jfb4p22962makdgw8yjmw8dr6lfi"; + sha256 = "18hbkwvh8maswhka0cyq0rwznz8yacnf4h1jmvb8krz0695rmz2w"; }; buildInputs = [ libpcap ]; diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index feb16ce13c5b..0b6a87126616 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -1,12 +1,11 @@ { stdenv, fetchurl, pkgconfig, udev, dbus_libs, perl }: stdenv.mkDerivation rec { - version = "1.8.12"; - name = "pcsclite-${version}"; + name = "pcsclite-1.8.13"; src = fetchurl { - url = "https://alioth.debian.org/frs/download.php/file/3991/pcsc-lite-${version}.tar.bz2"; - sha256 = "1ihsqyiygkyhid739zcvaizyd7q9qm76lqb7lzjrm5ak9k4l2l4l"; + url = "https://alioth.debian.org/frs/download.php/file/4126/pcsc-lite-1.8.13.tar.bz2"; + sha256 = "0fxwzckbjsckfp1f01yp3x6y1wlaaivhy12a5hka6qwdh1z085gk"; }; # The OS should care on preparing the drivers into this location diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 038044ad6810..9dfd7ff9052a 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -6,11 +6,11 @@ assert useGtk || useNcurses || useQt4; stdenv.mkDerivation rec { - name = "pinentry-0.8.3"; + name = "pinentry-0.8.4"; src = fetchurl { url = "mirror://gnupg/pinentry/${name}.tar.bz2"; - sha256 = "1bd047crf7xb8g61mval8v6qww98rddlsw2dz6j8h8qbnl4hp2sn"; + sha256 = "04jnlfncj9d5rg0j4gmsi2l1q9q7c6gjbvxfnfh3nx6b8szv779m"; }; buildInputs = let opt = stdenv.lib.optional; in [] diff --git a/pkgs/tools/security/pwgen/default.nix b/pkgs/tools/security/pwgen/default.nix index be96510eca0d..b793219f6497 100644 --- a/pkgs/tools/security/pwgen/default.nix +++ b/pkgs/tools/security/pwgen/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "pwgen-2.06"; + name = "pwgen-2.07"; src = fetchurl { - url = mirror://sourceforge/pwgen/pwgen-2.06.tar.gz; - sha256 = "0m1lhkcyizisksr1vlqysjkickrca9qwqkkx6vkv4zhg7ag8qnb1"; + url = mirror://sourceforge/pwgen/pwgen-2.07.tar.gz; + sha256 = "0mhmw700kkh238fzivcwnwi94bj9f3h36yfh3k3j2v19b0zmjx7b"; }; meta = { description = "Password generator which creates passwords which can be easily memorized by a human"; diff --git a/pkgs/tools/security/rng-tools/default.nix b/pkgs/tools/security/rng-tools/default.nix index 446e25772f17..989b84ef957f 100644 --- a/pkgs/tools/security/rng-tools/default.nix +++ b/pkgs/tools/security/rng-tools/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "rng-tools-4"; + name = "rng-tools-5"; src = fetchurl { url = "mirror://sourceforge/gkernel/${name}.tar.gz"; - sha256 = "15f17j3lxn1v2mhdxvy3pahz41hn1vlnnm81c0qyh19c4bady6xp"; + sha256 = "13h7lc8wl9khhvkr0i3bl5j9bapf8anhqis1lcnwxg1vc2v058b0"; }; meta = { diff --git a/pkgs/tools/security/simple-tpm-pk11/default.nix b/pkgs/tools/security/simple-tpm-pk11/default.nix new file mode 100644 index 000000000000..811618d66028 --- /dev/null +++ b/pkgs/tools/security/simple-tpm-pk11/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchgit, trousers, openssl, opencryptoki, automake, autoconf, libtool }: + +stdenv.mkDerivation rec { + name = "simple-tpm-pk11-2014-09-25"; + + src = fetchgit { + url = "https://github.com/ThomasHabets/simple-tpm-pk11"; + rev = "f26f10e11344560ff6e1479e6795dc0e5dc49a26"; + sha256 = "8c9501ceed0557113ce3facf7b22b8baf6f32ebb092008c089b80334ed03cec9"; + }; + + buildInputs = [ trousers openssl opencryptoki automake autoconf libtool ]; + + preConfigure = "sh bootstrap.sh"; + + meta = with stdenv.lib; { + description = "Simple PKCS11 provider for TPM chips"; + longDescription = '' + A simple library for using the TPM chip to secure SSH keys. + ''; + homepage = https://github.com/ThomasHabets/simple-tpm-pk11; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib; [ maintainers.tstrobel ]; + platforms = platforms.unix; + }; +} + diff --git a/pkgs/tools/security/ssdeep/default.nix b/pkgs/tools/security/ssdeep/default.nix index c5c474417046..fd97a6e618d5 100644 --- a/pkgs/tools/security/ssdeep/default.nix +++ b/pkgs/tools/security/ssdeep/default.nix @@ -2,17 +2,13 @@ stdenv.mkDerivation rec { name = "ssdeep-${version}"; - version = "2.10"; + version = "2.11"; src = fetchurl { url = "mirror://sourceforge/ssdeep/${name}.tar.gz"; - sha256 = "1p7dgchq8hgadnxz5qh95ay17k5j74l4qyd15wspc54lb603p2av"; + sha256 = "1izzkvrng4cc2p8gxp3w32k1v60l2yaq2y2hkifgq9s1yh30xk42"; }; - postFixup = stdenv.lib.optionalString stdenv.isLinux '' - patchelf --set-rpath "$(patchelf --print-rpath $out/bin/ssdeep):$out/lib" $out/bin/ssdeep - ''; - meta = { description = "A program for calculating fuzzy hashes"; homepage = "http://www.ssdeep.sf.net"; diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 167c369e3bb9..1448aa93c7d7 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - name = "sudo-1.8.10p3"; + name = "sudo-1.8.11"; src = fetchurl { urls = [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz" "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz" ]; - sha256 = "002l6h27pnhb77b65frhazbhknsxvrsnkpi43j7i0qw1lrgi7nkf"; + sha256 = "0if82pvmz7m3qkj3sc9yy8mpcd7lmbn0mhrgnd1zpszvnpkps5x3"; }; configureFlags = [ diff --git a/pkgs/tools/security/thc-hydra/default.nix b/pkgs/tools/security/thc-hydra/default.nix index 71f7d25155f3..8b65b27b66bd 100644 --- a/pkgs/tools/security/thc-hydra/default.nix +++ b/pkgs/tools/security/thc-hydra/default.nix @@ -3,10 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "hydra-7.5"; + name = "thc-hydra-${version}"; + version = "7.5"; src = fetchurl { - url = "http://www.thc.org/releases/${name}.tar.gz"; + url = "http://www.thc.org/releases/hydra-${version}.tar.gz"; sha256 = "1dhavbn2mcm6c2c1qw29ipbpmczax3vhhlxzwn49c8cq471yg4vj"; }; diff --git a/pkgs/tools/security/tmin/default.nix b/pkgs/tools/security/tmin/default.nix new file mode 100644 index 000000000000..2c16e936a695 --- /dev/null +++ b/pkgs/tools/security/tmin/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, bash }: + +stdenv.mkDerivation rec { + name = "tmin-${version}"; + version = "0.05"; + + src = fetchurl { + url = "https://tmin.googlecode.com/files/${name}.tar.gz"; + sha256 = "0166kcfs4b0da4hs2aqyn41f5l09i8rwxpi20k7x17qsxbmjbpd5"; + }; + + buildPhase = '' + gcc -O3 -funroll-loops -fno-strict-aliasing -Wno-pointer-sign tmin.c -o tmin + ''; + installPhase = "mkdir -p $out/bin && mv tmin $out/bin"; + + meta = { + description = "Fuzzing tool test-case optimizer"; + homepage = "https://code.google.com/p/tmin"; + license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + }; +} diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 3318d0c1102d..8eddc992f9ff 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libevent, openssl, zlib }: stdenv.mkDerivation rec { - name = "tor-0.2.4.23"; + name = "tor-0.2.5.10"; src = fetchurl { url = "https://archive.torproject.org/tor-package-archive/${name}.tar.gz"; - sha256 = "0a8l6d82hk4wbn7nlphd3c1maxhgdli8338wbg5r9dk6zcy7k8q5"; + sha256 = "0fx8qnwh2f8ykfx0np4hyznjfi4xfy96z59pk96y3zyjvjjh5pdk"; }; buildInputs = [ libevent openssl zlib ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { license="mBSD"; - maintainers = with stdenv.lib.maintainers; [ phreedom ludo ]; + maintainers = with stdenv.lib.maintainers; [ phreedom ludo doublec ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice }; } diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix index f220a46bddcf..15660630201d 100644 --- a/pkgs/tools/security/tor/torbrowser.nix +++ b/pkgs/tools/security/tor/torbrowser.nix @@ -20,18 +20,18 @@ let in stdenv.mkDerivation rec { name = "tor-browser-${version}"; - version = "3.6.2"; + version = "4.0.1"; src = fetchurl { url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${bits}-${version}_en-US.tar.xz"; sha256 = if bits == "64" then - "1rfv59k9mia6hr1z1k4im20dy59ir7i054cgf78sfj1zsh08q7hf" else - "1klkk1k5r51pcx44r1z3sw08fqcl2f2v5iblf4yh83js482c37r8"; + "1cz36g7jfcz8xs7sa2fl44g1bxlrl0psbsx5hig6j5ydsl87vyak" else + "135ya109skzd4x8zhmsiwjg6d533yijbdrscm36lsplgcf7dx8l3"; }; patchPhase = '' patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" Browser/firefox - patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" Tor/tor + patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" Browser/TorBrowser/Tor/tor ''; doCheck = true; @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { echo "Checking firefox..." LD_LIBRARY_PATH=${ldLibraryPath} Browser/firefox --help 1> /dev/null echo "Checking tor..." - LD_LIBRARY_PATH=${torEnv}/lib:Tor Tor/tor --help 1> /dev/null + LD_LIBRARY_PATH=${torEnv}/lib:Browser/TorBrowser/Tor Browser/TorBrowser/Tor/tor --help 1> /dev/null ''; installPhase = '' @@ -50,13 +50,13 @@ in stdenv.mkDerivation rec { cp -R * $out/share/tor-browser cat > "$out/bin/tor-browser" << EOF - export HOME="\$HOME/.torbrowser" + export HOME="\$HOME/.torbrowser4" if [ ! -d \$HOME ]; then - mkdir -p \$HOME && cp -R $out/share/tor-browser/Data \$HOME/ && chmod -R +w \$HOME + mkdir -p \$HOME && cp -R $out/share/tor-browser/Browser/TorBrowser/Data \$HOME/ && chmod -R +w \$HOME echo "pref(\"extensions.torlauncher.tordatadir_path\", \"\$HOME/Data/Tor/\");" >> \ ~/Data/Browser/profile.default/preferences/extension-overrides.js fi - export LD_LIBRARY_PATH=${ldLibraryPath}:$out/share/tor-browser/Tor + export LD_LIBRARY_PATH=${ldLibraryPath}:$out/share/tor-browser/Browser/TorBrowser/Tor $out/share/tor-browser/Browser/firefox -no-remote -profile ~/Data/Browser/profile.default "$@" EOF chmod +x $out/bin/tor-browser @@ -68,6 +68,6 @@ in stdenv.mkDerivation rec { description = "Tor Browser Bundle for GNU/Linux, everything you need to safely browse the Internet"; homepage = https://www.torproject.org/; platforms = ["i686-linux" "x86_64-linux"]; - maintainers = [ maintainers.offline maintainers.matejc ]; + maintainers = [ maintainers.offline maintainers.matejc maintainers.doublec ]; }; } diff --git a/pkgs/tools/security/tor/torsocks.nix b/pkgs/tools/security/tor/torsocks.nix index f8e76c4e83b1..7db547bbe1ca 100644 --- a/pkgs/tools/security/tor/torsocks.nix +++ b/pkgs/tools/security/tor/torsocks.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { homepage = http://code.google.com/p/torsocks/; repositories.git = https://git.torproject.org/torsocks.git; license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.phreedom ]; }; } diff --git a/pkgs/tools/security/tpm-quote-tools/default.nix b/pkgs/tools/security/tpm-quote-tools/default.nix index c178d401154f..b294c1c9feb8 100644 --- a/pkgs/tools/security/tpm-quote-tools/default.nix +++ b/pkgs/tools/security/tpm-quote-tools/default.nix @@ -11,9 +11,12 @@ stdenv.mkDerivation { buildInputs = [ trousers openssl ]; meta = with stdenv.lib; { - description = ''The TPM Quote Tools is a collection of programs that provide support - for TPM based attestation using the TPM quote mechanism. The manual - page for tpm_quote_tools provides a usage overview.''; + description = "A collection of programs that provide support for TPM based attestation using the TPM quote mechanism"; + longDescription = '' + The TPM Quote Tools is a collection of programs that provide support + for TPM based attestation using the TPM quote mechanism. The manual + page for tpm_quote_tools provides a usage overview. + ''; homepage = http://tpmquotetools.sourceforge.net/; license = licenses.bsd3; maintainers = [ maintainers.ak ]; diff --git a/pkgs/tools/security/tpm-tools/default.nix b/pkgs/tools/security/tpm-tools/default.nix index 6e7ff75a6a48..a17bff9e32c8 100644 --- a/pkgs/tools/security/tpm-tools/default.nix +++ b/pkgs/tools/security/tpm-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, trousers, openssl }: +{ stdenv, fetchurl, trousers, openssl, opencryptoki }: let version = "1.3.8"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "10za1gi89vi9m2lmm7jfzs281h55x1sbbm2bdgdh692ljpq4zsv6"; }; - buildInputs = [ trousers openssl ]; + buildInputs = [ trousers openssl opencryptoki ]; meta = with stdenv.lib; { description = "Management tools for TPM hardware"; diff --git a/pkgs/tools/security/trousers/default.nix b/pkgs/tools/security/trousers/default.nix index fe797291f9ea..70f11c39d6fc 100644 --- a/pkgs/tools/security/trousers/default.nix +++ b/pkgs/tools/security/trousers/default.nix @@ -1,23 +1,19 @@ { stdenv, fetchurl, openssl }: -let - ver_maj = "0.3.11"; - ver_min = "2"; -in stdenv.mkDerivation rec { - name = "trousers-${ver_maj}.${ver_min}"; + name = "trousers-${version}"; + version = "0.3.13"; src = fetchurl { - url = "mirror://sourceforge/trousers/trousers/${ver_maj}/${name}.tar.gz"; - sha256 = "1m9qi4452jr5yy4y9zyfi5ndwam5krq7ny8z2q3f91v1hcjgk5la"; + url = "mirror://sourceforge/trousers/trousers/${version}/${name}.tar.gz"; + sha256 = "1lvnla1c1ig2w3xvvrqg2w9qm7a1ygzy1j2gg8j7p8c87i58x45v"; }; buildInputs = [ openssl ]; - patches = [ # ./double-installed-man-page.patch - ./disable-install-rule.patch - ./allow-non-tss-config-file-owner.patch - ]; + patches = [ ./allow-non-tss-config-file-owner.patch ]; + + configureFlags = [ "--disable-usercheck" ]; NIX_CFLAGS_COMPILE = "-DALLOW_NON_TSS_CONFIG_FILE"; NIX_LDFLAGS = "-lgcc_s"; diff --git a/pkgs/tools/security/trousers/disable-install-rule.patch b/pkgs/tools/security/trousers/disable-install-rule.patch deleted file mode 100644 index 698beac9ffde..000000000000 --- a/pkgs/tools/security/trousers/disable-install-rule.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- trousers-0.3.11/dist/Makefile.in 2013-08-14 06:49:37.597558787 +0200 -+++ trousers-0.3.11/dist/Makefile.in 2013-08-14 06:50:07.134510774 +0200 -@@ -363,16 +363,16 @@ - uninstall uninstall-am uninstall-hook - - install: install-exec-hook -- if test ! -e ${DESTDIR}/@sysconfdir@/tcsd.conf; then mkdir -p ${DESTDIR}/@sysconfdir@ && cp tcsd.conf ${DESTDIR}/@sysconfdir@; fi -- /bin/chown tss:tss ${DESTDIR}/@sysconfdir@/tcsd.conf || true -- /bin/chmod 0600 ${DESTDIR}/@sysconfdir@/tcsd.conf -+# echo if test ! -e ${DESTDIR}/@sysconfdir@/tcsd.conf; then mkdir -p ${DESTDIR}/@sysconfdir@ && cp tcsd.conf ${DESTDIR}/@sysconfdir@; fi -+ echo /bin/chown tss:tss ${DESTDIR}/@sysconfdir@/tcsd.conf || true -+ echo /bin/chmod 0600 ${DESTDIR}/@sysconfdir@/tcsd.conf - - install-exec-hook: -- /usr/sbin/groupadd tss || true -- /usr/sbin/useradd -r tss -g tss || true -- /bin/sh -c 'if [ ! -e ${DESTDIR}/@localstatedir@/lib/tpm ];then mkdir -p ${DESTDIR}/@localstatedir@/lib/tpm; fi' -- /bin/chown tss:tss ${DESTDIR}/@localstatedir@/lib/tpm || true -- /bin/chmod 0700 ${DESTDIR}/@localstatedir@/lib/tpm -+ echo /usr/sbin/groupadd tss || true -+ echo /usr/sbin/useradd -r tss -g tss || true -+ echo /bin/sh -c 'if [ ! -e ${DESTDIR}/@localstatedir@/lib/tpm ];then mkdir -p ${DESTDIR}/@localstatedir@/lib/tpm; fi' -+ echo /bin/chown tss:tss ${DESTDIR}/@localstatedir@/lib/tpm || true -+ echo /bin/chmod 0700 ${DESTDIR}/@localstatedir@/lib/tpm - - uninstall-hook: - /usr/sbin/userdel tss || true diff --git a/pkgs/tools/security/trousers/double-installed-man-page.patch b/pkgs/tools/security/trousers/double-installed-man-page.patch deleted file mode 100644 index 6b40716120ea..000000000000 --- a/pkgs/tools/security/trousers/double-installed-man-page.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- trousers-0.3.11/man/man3/Makefile.am 2013-08-14 04:57:47.018494495 +0200 -+++ trousers-0.3.11/man/man3/Makefile.am 2013-08-14 04:58:10.353453471 +0200 -@@ -75,7 +75,6 @@ - Tspi_TPM_TakeOwnership.3 \ - Tspi_TPM_GetAuditDigest.3 \ - Tspi_TPM_OwnerGetSRKPubKey.3 \ -- Tspi_TPM_Quote.3 \ - Tspi_TPM_CMKSetRestrictions.3 - if TSS_BUILD_DAA - man3_MANS += Tspi_DAA_IssueCredential.3 \ ---- trousers-0.3.11/man/man3/Makefile.in 2013-08-14 05:06:25.029490899 +0200 -+++ trousers-0.3.11/man/man3/Makefile.in 2013-08-14 05:06:43.153457942 +0200 -@@ -243,7 +243,7 @@ - Tspi_TPM_PcrExtend.3 Tspi_TPM_Quote.3 Tspi_TPM_SelfTestFull.3 \ - Tspi_TPM_SetStatus.3 Tspi_TPM_StirRandom.3 \ - Tspi_TPM_TakeOwnership.3 Tspi_TPM_GetAuditDigest.3 \ -- Tspi_TPM_OwnerGetSRKPubKey.3 Tspi_TPM_Quote.3 \ -+ Tspi_TPM_OwnerGetSRKPubKey.3 \ - Tspi_TPM_CMKSetRestrictions.3 $(am__append_1) - EXTRA_DIST = $(man3_MANS) - all: all-am ---- trousers-0.3.11/man/man3/Makefile 2013-08-14 05:07:05.686414845 +0200 -+++ trousers-0.3.11/man/man3/Makefile 2013-08-14 05:07:23.233381327 +0200 -@@ -243,7 +243,7 @@ - Tspi_TPM_PcrExtend.3 Tspi_TPM_Quote.3 Tspi_TPM_SelfTestFull.3 \ - Tspi_TPM_SetStatus.3 Tspi_TPM_StirRandom.3 \ - Tspi_TPM_TakeOwnership.3 Tspi_TPM_GetAuditDigest.3 \ -- Tspi_TPM_OwnerGetSRKPubKey.3 Tspi_TPM_Quote.3 \ -+ Tspi_TPM_OwnerGetSRKPubKey.3 \ - Tspi_TPM_CMKSetRestrictions.3 $(am__append_1) - EXTRA_DIST = $(man3_MANS) - all: all-am diff --git a/pkgs/tools/security/volatility/default.nix b/pkgs/tools/security/volatility/default.nix index 41e227cee7e3..6aa3a9d5ea11 100644 --- a/pkgs/tools/security/volatility/default.nix +++ b/pkgs/tools/security/volatility/default.nix @@ -2,11 +2,12 @@ buildPythonPackage rec { namePrefix = ""; - name = "volatility-2.3.1"; + name = "volatility-2.4"; + src = fetchurl { - url = "http://volatility.googlecode.com/files/${name}.tar.gz"; - sha256 = "bb1411fc671e0bf550a31e534fb1991b2f940f1dce1ebe4ce2fb627aec40726c"; + url = "http://downloads.volatilityfoundation.org/releases/2.4/${name}.tar.gz"; + sha256 = "1wffrkvj2lrkqhwamyix9fy05y6g6w8h1sz2iqlm6i6ag7yxykv8"; }; doCheck = false; @@ -17,6 +18,6 @@ buildPythonPackage rec { homepage = https://code.google.com/p/volatility; description = "advanced memory forensics framework"; maintainers = with maintainers; [ bosu ]; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/security/wipe/default.nix b/pkgs/tools/security/wipe/default.nix new file mode 100644 index 000000000000..a7c337dc1222 --- /dev/null +++ b/pkgs/tools/security/wipe/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "wipe-${version}"; + version = "2.3.1"; + + src = fetchurl { + url = "mirror://sourceforge/wipe/${version}/${name}.tar.bz2"; + sha256 = "180snqvh6k6il6prb19fncflf2jcvkihlb4w84sbndcv1wvicfa6"; + }; + + patches = [ ./fix-install.patch ]; + + meta = with stdenv.lib; { + description = "Secure file wiping utility"; + homepage = http://wipe.sourceforge.net/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.abbradar ]; + }; +} diff --git a/pkgs/tools/security/wipe/fix-install.patch b/pkgs/tools/security/wipe/fix-install.patch new file mode 100644 index 000000000000..2df3a1eec6a0 --- /dev/null +++ b/pkgs/tools/security/wipe/fix-install.patch @@ -0,0 +1,18 @@ +diff -ru3 wipe-2.3.1/Makefile.in wipe-2.3.1-new/Makefile.in +--- wipe-2.3.1/Makefile.in 2009-11-02 00:11:30.000000000 +0300 ++++ wipe-2.3.1-new/Makefile.in 2014-10-18 02:51:10.088966232 +0400 +@@ -60,12 +60,12 @@ + $(INSTALL_BIN) -d $(bindir) + $(INSTALL_BIN) -s $(BIN_OUT) $(bindir) + $(INSTALL) -d $(mandir)/man1 +- $(INSTALL) -o root -m 0644 wipe.1 $(mandir)/man1/ ++ $(INSTALL) -m 0644 wipe.1 $(mandir)/man1/ + rm -rf $(datadir)/doc/wipe* + $(INSTALL) -d $(datadir)/doc/wipe + + for file in $(DOCS); do \ +- $(INSTALL) -o root -m 0644 $$file $(datadir)/doc/wipe/; \ ++ $(INSTALL) -m 0644 $$file $(datadir)/doc/wipe/; \ + done + + install_home: $(BIN_OUT) diff --git a/pkgs/tools/system/acct/default.nix b/pkgs/tools/system/acct/default.nix index 0bea6bec3547..c99d20d7953e 100644 --- a/pkgs/tools/system/acct/default.nix +++ b/pkgs/tools/system/acct/default.nix @@ -1,16 +1,16 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "acct-6.6.1"; + name = "acct-6.6.2"; src = fetchurl { url = "mirror://gnu/acct/${name}.tar.gz"; - sha256 = "1jzz601cavml7894fjalw661gz28ia35002inw990agr3rhiaiam"; + sha256 = "0081hzkcxw9aslpsakridj15m0wbnkdhm210fzbg021vi4pppm4f"; }; doCheck = true; - meta = { + meta = with stdenv.lib; { description = "GNU Accounting Utilities, login and process accounting utilities"; longDescription = '' @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { execution statistics. ''; - license = stdenv.lib.licenses.gpl3Plus; + license = licenses.gpl3Plus; homepage = http://www.gnu.org/software/acct/; - maintainers = [ ]; - platforms = with stdenv.lib.platforms; allBut cygwin; + maintainers = with maintainers; [ pSub ]; + platforms = with platforms; allBut cygwin; }; } diff --git a/pkgs/tools/system/ansible/default.nix b/pkgs/tools/system/ansible/default.nix index 4491bf7e4841..fd17cef8f1ca 100644 --- a/pkgs/tools/system/ansible/default.nix +++ b/pkgs/tools/system/ansible/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pythonPackages, python }: pythonPackages.buildPythonPackage rec { - version = "1.7.1"; + version = "1.7.2"; name = "ansible-${version}"; namePrefix = ""; src = fetchurl { url = "http://releases.ansible.com/ansible/ansible-${version}.tar.gz"; - sha1 = "4f4be4d45f28f52e4ab0c063efb66c7b9f482a51"; + sha256 = "1b4qhh6a8z18q7lfa7laxb3p0f7sacvv7nlbr2lix0vznhbffz51"; }; prePatch = '' diff --git a/pkgs/tools/system/at/default.nix b/pkgs/tools/system/at/default.nix index 5108174c8870..9a6e610389bb 100644 --- a/pkgs/tools/system/at/default.nix +++ b/pkgs/tools/system/at/default.nix @@ -1,12 +1,12 @@ { fetchurl, stdenv, bison, flex, pam, sendmailPath ? "/var/setuid-wrappers/sendmail" }: stdenv.mkDerivation { - name = "at-3.1.15"; + name = "at-3.1.16"; src = fetchurl { # Debian is apparently the last location where it can be found. - url = mirror://debian/pool/main/a/at/at_3.1.15.orig.tar.gz; - sha256 = "1z7pgglr0zmwapb4sc1bdb3z0hgig1asyzqv4gs5xafmjd94za03"; + url = mirror://debian/pool/main/a/at/at_3.1.16.orig.tar.gz; + sha256 = "1hfmnhgi95vsfaa69qlakpwd22al0m0rhqms6sawxvaldafgb6nb"; }; patches = [ ./install.patch ]; diff --git a/pkgs/tools/system/augeas/default.nix b/pkgs/tools/system/augeas/default.nix new file mode 100644 index 000000000000..e6b09932f867 --- /dev/null +++ b/pkgs/tools/system/augeas/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, pkgconfig, readline, libxml2 }: + +stdenv.mkDerivation rec { + name = "augeas-${version}"; + version = "1.2.0"; + + src = fetchurl { + url = "http://download.augeas.net/${name}.tar.gz"; + sha256 = "1q41yilxc0nvjz5h9phm38k2b73k2v0b9jg11y92228bps7b5bpl"; + }; + + buildInputs = [ pkgconfig readline libxml2 ]; + + meta = with stdenv.lib; { + description = "Configuration editing tool."; + license = licenses.lgpl2; + homepage = http://augeas.net/; + maintainers = with maintainers; [offline]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/tools/system/cron/default.nix b/pkgs/tools/system/cron/default.nix index 0cf29a67b9da..e465b16b614a 100644 --- a/pkgs/tools/system/cron/default.nix +++ b/pkgs/tools/system/cron/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "cron-4.1"; src = fetchurl { url = ftp://ftp.isc.org/isc/cron/cron_4.1.shar; - md5 = "5e1be9dbde66295821ac7899f2e1f561"; + sha256 = "16n3dras4b1jh7g958nz1k54pl9pg5fwb3fvjln8z67varvq6if4"; }; unpackCmd = "(mkdir cron && cd cron && sh $curSrc)"; diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix index e247c84dcf90..a164a26fbcd6 100644 --- a/pkgs/tools/system/ddrescue/default.nix +++ b/pkgs/tools/system/ddrescue/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, lzip }: stdenv.mkDerivation rec { - name = "ddrescue-1.18.1"; + name = "ddrescue-1.19"; src = fetchurl { url = "mirror://gnu/ddrescue/${name}.tar.lz"; - sha256 = "1ad1ifby89wys8lxh4d24y5lih6hkz54jhv6sf6bs1i7sd7lnqaq"; + sha256 = "1f278w7i9sx45jk6fsw1kyzx743k3alx1c4w1q8sk05ckafhr3gd"; }; buildInputs = [ lzip ]; diff --git a/pkgs/tools/system/fakechroot/default.nix b/pkgs/tools/system/fakechroot/default.nix index a652a1e84ef4..5827a11714d6 100644 --- a/pkgs/tools/system/fakechroot/default.nix +++ b/pkgs/tools/system/fakechroot/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/dex4er/fakechroot/archive/${version}.tar.gz"; - md5 = "e614f62972efa4654fc780ae7e4affad"; + sha256 = "0z4cxj4lb8cfb63sw82dbc31hf082fv3hshbmhk49cqkc0f673q3"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index 8f94b21a7712..c07d5d988054 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -1,12 +1,12 @@ { fetchurl, stdenv, libgcrypt, readline }: stdenv.mkDerivation rec { - version = "1.4.5"; + version = "1.4.6"; name = "freeipmi-${version}"; src = fetchurl { url = "mirror://gnu/freeipmi/${name}.tar.gz"; - sha256 = "033zakrk3kvi4y41kslicr90b3yb2kj052cl6nbja7ybn70y9nkz"; + sha256 = "1br68qlg0hw6mc4v64hliqydl83qg2ldfxc50yi4xvca6wll6h3f"; }; buildInputs = [ libgcrypt readline ]; diff --git a/pkgs/tools/system/ioping/default.nix b/pkgs/tools/system/ioping/default.nix index 588da0624ce6..932b68197ce6 100644 --- a/pkgs/tools/system/ioping/default.nix +++ b/pkgs/tools/system/ioping/default.nix @@ -10,15 +10,16 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="ioping"; - version = "0.8"; + version = "0.9"; name="${baseName}-${version}"; - url="http://ioping.googlecode.com/files/${name}.tar.gz"; + url="https://docs.google.com/uc?id=0B_PlDc2qaehFWWtLZ3Z3N1ltdm8&export=download"; }; in rec { src = a.fetchurl { url = sourceInfo.url; - sha256 = "0j7yal61nby1lkg9wnr6lxfljbd7wl3n0z8khqwvc9lf57bxngz2"; + name = "${sourceInfo.name}.tar.gz"; + sha256 = "0pbp7b3304y9yyv2w41l3898h5q8w77hnnnq1vz8qz4qfl4467lm"; }; inherit (sourceInfo) name version; @@ -39,7 +40,7 @@ rec { platforms = with a.lib.platforms; linux; license = a.lib.licenses.gpl3Plus; - downloadPage = "http://code.google.com/p/ioping/downloads/list"; + homepage = "http://code.google.com/p/ioping/"; inherit version; }; }) x diff --git a/pkgs/tools/system/ioping/default.upstream b/pkgs/tools/system/ioping/default.upstream deleted file mode 100644 index e51cb487852d..000000000000 --- a/pkgs/tools/system/ioping/default.upstream +++ /dev/null @@ -1,5 +0,0 @@ -url http://code.google.com/p/ioping/downloads/list -version_link '[.]tar[.][a-z0-9]+$' -process 'code[.]google[.]com//' '' - -do_overwrite() { do_overwrite_just_version; } diff --git a/pkgs/tools/system/ipmitool/default.nix b/pkgs/tools/system/ipmitool/default.nix index 6fa374ebe55a..027017247b74 100644 --- a/pkgs/tools/system/ipmitool/default.nix +++ b/pkgs/tools/system/ipmitool/default.nix @@ -2,14 +2,14 @@ let pkgname = "ipmitool"; - version = "1.8.13"; + version = "1.8.14"; in stdenv.mkDerivation { name = "${pkgname}-${version}"; src = fetchurl { url = "mirror://sourceforge/${pkgname}/${pkgname}-${version}.tar.gz"; - sha256 = "0drkfa1spqh1vlzrx7jwm3cw1qar46a9xvqsgycn92ylgsr395n1"; + sha256 = "1avlb0lwqncd28hp6p5w3rkcnhgy84rgv1jdgkyy0gzqhx2wx6zy"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/tools/system/ipmiutil/default.nix index 46c36926c366..c19b6007f018 100644 --- a/pkgs/tools/system/ipmiutil/default.nix +++ b/pkgs/tools/system/ipmiutil/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { baseName = "ipmiutil"; - version = "2.9.4"; + version = "2.9.5"; name = "${baseName}-${version}"; src = fetchurl { url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz"; - sha256 = "1pmpmpc0wymnw8i2rxnyq3v2y7p8930b2rb8nw5w60x2vf15wlaa"; + sha256 = "1rnv72qfrijcm0kiy2lsbdckjxnxdma8sf8y6y6iypp75rcg007b"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/system/logcheck/default.nix b/pkgs/tools/system/logcheck/default.nix index 88c9a4eecd1f..9934175ae3b6 100644 --- a/pkgs/tools/system/logcheck/default.nix +++ b/pkgs/tools/system/logcheck/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { _name = "logcheck"; - version = "1.3.16"; + version = "1.3.17"; name = "${_name}-${version}"; src = fetchurl { url = "mirror://debian/pool/main/l/${_name}/${_name}_${version}.tar.xz"; - sha256 = "1rmq4s2fj86226ncw2kdjvjbi29375gd7vdq62fsbjxm4m6nzsiy"; + sha256 = "0fphzaljc9ddv1x6l3zdf9cbarqgzpdqaqwm3plmarcc7qrgrly2"; }; preConfigure = '' diff --git a/pkgs/tools/system/lshw/default.nix b/pkgs/tools/system/lshw/default.nix index ccda9be9f03f..e9d8e8aabd90 100644 --- a/pkgs/tools/system/lshw/default.nix +++ b/pkgs/tools/system/lshw/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { ${if withGUI then "make DESTDIR=$out install-gui" else ""} mv $out/usr/* $out rmdir $out/usr + mv $out/sbin $out/bin ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/tools/system/monit/default.nix index 41a94ff2f2e3..1b15fbbb6281 100644 --- a/pkgs/tools/system/monit/default.nix +++ b/pkgs/tools/system/monit/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, openssl, bison, flex, pam, usePAM ? stdenv.isLinux }: stdenv.mkDerivation rec { - name = "monit-5.8.1"; + name = "monit-5.10"; src = fetchurl { url = "${meta.homepage}dist/${name}.tar.gz"; - sha256 = "1rbhr3aff8pbiz60r73607hci4yngv5xq1b6yjx9xhks4mwlnpm2"; + sha256 = "0lwlils6b59kr6zg328q113c7mrpggqydpq4l6j52sqv3dd1b49p"; }; nativeBuildInputs = [ bison flex ]; diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index 25201ba97abc..fb3b6c5b9c61 100644 --- a/pkgs/tools/system/pciutils/default.nix +++ b/pkgs/tools/system/pciutils/default.nix @@ -8,11 +8,11 @@ let }; in stdenv.mkDerivation rec { - name = "pciutils-3.2.1"; # with database from 2013-11-10 + name = "pciutils-3.3.0"; # with database from 2014-11-10 src = fetchurl { - url = "mirror://kernel/software/utils/pciutils/${name}.tar.bz2"; - sha256 = "1pnwwc4sq0q7zz3mw2rsrc9j5rxwpdvxirqjmxcd0brf0hcjpm8j"; + url = "mirror://kernel/software/utils/pciutils/${name}.tar.xz"; + sha256 = "008kh33kbpkk1wr9srrapw93imqx7l4djglrdkfxwvy6ppa9acs1"; }; buildInputs = [ pkgconfig zlib kmod which ]; @@ -26,8 +26,12 @@ stdenv.mkDerivation rec { # Get rid of update-pciids as it won't work. postInstall = "rm $out/sbin/update-pciids $out/man/man8/update-pciids.8"; - meta = { - homepage = http://mj.ucw.cz/pciutils.shtml; + meta = with stdenv.lib; { + homepage = http://mj.ucw.cz/pciutils.html; description = "A collection of programs for inspecting and manipulating configuration of PCI devices"; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = [ maintainers.vcunat ]; # not really, but someone should watch it }; } + diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix new file mode 100644 index 000000000000..3eaa85e41eaa --- /dev/null +++ b/pkgs/tools/system/proot/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchgit, talloc }: + +stdenv.mkDerivation rec { + name = "proot-${version}"; + version = "4.0.3"; + + src = fetchgit { + url = "git://github.com/cedric-vincent/proot.git"; + rev = "refs/tags/v${version}"; + sha256 = "95a52b2fa47b2891eb2c6b6b0e14d42f6d48f6fd5181e359b007831f1a046e84"; + }; + + buildInputs = [ talloc ]; + + preBuild = '' + substituteInPlace GNUmakefile --replace "/usr/local" "$out" + ''; + + sourceRoot = "git-export/src"; + + meta = with stdenv.lib; { + homepage = http://proot.me; + description = "User-space implementation of chroot, mount --bind and binfmt_misc"; + platforms = platforms.linux; + license = licenses.gpl2; + maintainers = [ maintainers.ianwookim ]; + }; +} + diff --git a/pkgs/tools/system/runit/Makefile.patch b/pkgs/tools/system/runit/Makefile.patch new file mode 100644 index 000000000000..43257728e928 --- /dev/null +++ b/pkgs/tools/system/runit/Makefile.patch @@ -0,0 +1,11 @@ +diff -ur admin.orig/runit-2.1.2/src/Makefile admin/runit-2.1.2/src/Makefile +--- admin.orig/runit-2.1.2/src/Makefile 2014-08-10 20:22:35.000000000 +0200 ++++ admin/runit-2.1.2/src/Makefile 2014-10-15 13:04:02.892937939 +0200 +@@ -234,7 +234,6 @@ + + hasshsgr.h: chkshsgr choose compile hasshsgr.h1 hasshsgr.h2 load \ + tryshsgr.c warn-shsgr +- ./chkshsgr || ( cat warn-shsgr; exit 1 ) + ./choose clr tryshsgr hasshsgr.h1 hasshsgr.h2 > hasshsgr.h + + haswaitp.h: choose compile haswaitp.h1 haswaitp.h2 load trywaitp.c diff --git a/pkgs/tools/system/runit/default.nix b/pkgs/tools/system/runit/default.nix new file mode 100644 index 000000000000..28a0fa52d277 --- /dev/null +++ b/pkgs/tools/system/runit/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "runit-${version}"; + version = "2.1.2"; + + src = fetchurl { + url = "http://smarden.org/runit/${name}.tar.gz"; + sha256 = "065s8w62r6chjjs6m9hapcagy33m75nlnxb69vg0f4ngn061dl3g"; + }; + + phases = [ "unpackPhase" "patchPhase" "buildPhase" "checkPhase" "installPhase" ]; + + patches = [ ./Makefile.patch ]; + + buildPhase = '' + cd ${name} + make -C 'src' + ''; + + checkPhase = '' + make -C 'src' check + ''; + + installPhase = '' + mkdir -p $out/bin + for f in $(cat package/commands); do + mv src/$f $out/bin/ + done + ''; + + meta = with stdenv.lib; { + description = "UNIX init scheme with service supervision"; + license = licenses.bsd3; + homePage = "http://smarden.org/runit"; + maintainers = with maintainers; [ rickynils ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/system/safe-rm/default.nix b/pkgs/tools/system/safe-rm/default.nix new file mode 100644 index 000000000000..1cd7743e152a --- /dev/null +++ b/pkgs/tools/system/safe-rm/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchgit, perl, coreutils }: + +stdenv.mkDerivation rec { + name = "safe-rm-${version}"; + version = "0.11"; + + src = fetchgit { + url = "https://gitorious.org/safe-rm/mainline.git"; + rev = "refs/tags/${name}"; + sha256 = "1csnqq22pfbg9dwhv13x60jih0gn07bn5rwg2nhi0dsslzk4l496"; + }; + + propagatedBuildInputs = [ perl coreutils ]; + + postFixup = '' + sed -e 's@/bin/rm@${coreutils}/bin/rm@' -i $out/bin/safe-rm + ''; + + installPhase = '' + mkdir -p $out/bin + cp safe-rm $out/bin + + mkdir -p $out/share/man/man1 + pod2man safe-rm > $out/share/man/man1/safe-rm.1 + ''; + + meta = with stdenv.lib; { + description = "Tool intended to prevent the accidental deletion of important files"; + homepage = https://launchpad.net/safe-rm; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = [ maintainers.koral ]; + }; +} diff --git a/pkgs/tools/system/sleuthkit/default.nix b/pkgs/tools/system/sleuthkit/default.nix index 016e2ccda37c..872dbf0c20e7 100644 --- a/pkgs/tools/system/sleuthkit/default.nix +++ b/pkgs/tools/system/sleuthkit/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { description = "A forensic/data recovery tool"; maintainers = [ stdenv.lib.maintainers.raskin ]; platforms = stdenv.lib.platforms.linux; - license = "IBM Public License"; + license = stdenv.lib.licenses.ipl10; inherit version; }; } diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index 0290d1961ce5..87f19640f7ff 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -9,11 +9,11 @@ let }; in stdenv.mkDerivation rec { - name = "smartmontools-6.2"; + name = "smartmontools-6.3"; src = fetchurl { url = "mirror://sourceforge/smartmontools/${name}.tar.gz"; - sha256 = "0nq6jvfh8nqwfrvp6fb6qs2rdydi3i9xgpi7p7vb83xvg42ncvs8"; + sha256 = "06gy71jh2d3gcfmlbbrsqw7215knkfq59q3j6qdxfrar39fhcxx7"; }; patchPhase = '' diff --git a/pkgs/tools/system/syslog-ng-incubator/default.nix b/pkgs/tools/system/syslog-ng-incubator/default.nix index 34a0f15ec1db..004b2b58fa37 100644 --- a/pkgs/tools/system/syslog-ng-incubator/default.nix +++ b/pkgs/tools/system/syslog-ng-incubator/default.nix @@ -1,26 +1,25 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, glib, syslogng -, eventlog, perl, python, yacc, riemann_c_client, libivykis, protobufc }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, syslogng +, eventlog, perl, python, yacc, riemann_c_client, libivykis, protobufc +}: stdenv.mkDerivation rec { name = "syslog-ng-incubator-${version}"; + version = "141106-54179c5"; - version = "0.3.3"; - - src = fetchurl { - url = "https://github.com/balabit/syslog-ng-incubator/archive/${name}.tar.gz"; - sha256 = "1yx2gdq1vhrcp113hxgl66z5df4ya9nznvq00nvy4v9yn8wf9fb8"; + src = fetchFromGitHub { + owner = "balabit"; + repo = "syslog-ng-incubator"; + rev = "54179c5f733487fe97ee856bc27130d0b09f3d5a"; + sha256 = "1y099f7pdan1441ycycd67igcwbla2m2cgnxjfvdw76llvi35sam"; }; buildInputs = [ - autoconf automake libtool pkgconfig glib syslogng eventlog perl python + autoreconfHook pkgconfig glib syslogng eventlog perl python yacc riemann_c_client libivykis protobufc ]; - preConfigure = "autoreconf -i"; - configureFlags = [ "--without-ivykis" - "--with-riemann" "--with-module-dir=$(out)/lib/syslog-ng" ]; diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index a62f81052bad..cec906e1f439 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -1,16 +1,17 @@ -{ stdenv, fetchurl, eventlog, pkgconfig, glib, python, systemd, perl }: +{ stdenv, fetchurl, eventlog, pkgconfig, glib, python, systemd, perl +, riemann_c_client, protobufc, yacc }: stdenv.mkDerivation rec { name = "syslog-ng-${version}"; - version = "3.5.6"; + version = "3.6.1"; src = fetchurl { url = "http://www.balabit.com/downloads/files?path=/syslog-ng/sources/${version}/source/syslog-ng_${version}.tar.gz"; - sha256 = "19i1idklpgn6mz0mg7194by5fjgvvh5n4v2a0rr1z0778l2038kc"; + sha256 = "1s3lsxk2pky3jkfamkw5ivpxq2kazikcvdgpmxiyn5w10dwkd0m7"; }; - buildInputs = [ eventlog pkgconfig glib python systemd perl ]; + buildInputs = [ eventlog pkgconfig glib python systemd perl riemann_c_client protobufc yacc ]; configureFlags = [ "--enable-dynamic-linking" diff --git a/pkgs/tools/system/tree/default.nix b/pkgs/tools/system/tree/default.nix index e108589aaefe..165eb316a928 100644 --- a/pkgs/tools/system/tree/default.nix +++ b/pkgs/tools/system/tree/default.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation { prefix=$out MANDIR=$out/share/man/man1 ${systemFlags} + CC="cc" ) ''; diff --git a/pkgs/tools/text/discount/default.nix b/pkgs/tools/text/discount/default.nix new file mode 100644 index 000000000000..ff846ac0933d --- /dev/null +++ b/pkgs/tools/text/discount/default.nix @@ -0,0 +1,19 @@ +{stdenv, fetchurl}: +stdenv.mkDerivation rec { + version = "2.1.6"; + name = "discount-${version}"; + + src = fetchurl { + url = "http://www.pell.portland.or.us/~orc/Code/discount/discount-${version}.tar.bz2"; + sha256 = "15h726m5yalq15hkxxfw4bxwd6wkwkan5q7s80pgi1z32ygb4avh"; + }; + patches = ./fix-configure-path.patch; + configureScript = "./configure.sh"; + + meta = with stdenv.lib; { + description = "Implementation of Markdown markup language in C"; + homepage = "http://www.pell.portland.or.us/~orc/Code/discount/"; + license = licenses.bsd3; + maintainers = [ maintainers.shell ]; + }; +} diff --git a/pkgs/tools/text/discount/fix-configure-path.patch b/pkgs/tools/text/discount/fix-configure-path.patch new file mode 100644 index 000000000000..045b369b4b69 --- /dev/null +++ b/pkgs/tools/text/discount/fix-configure-path.patch @@ -0,0 +1,12 @@ +diff -rupN discount-2.1.6-original/configure.inc discount-2.1.6/configure.inc +--- discount-2.1.6-original/configure.inc 2014-10-10 15:34:24.158325345 +0100 ++++ discount-2.1.6/configure.inc 2014-10-10 15:34:33.553325321 +0100 +@@ -32,7 +32,7 @@ + # this preamble code is executed when this file is sourced and it picks + # interesting things off the command line. + # +-ac_default_path="/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin" ++ac_default_path=$PATH + + ac_standard="--src=DIR where the source lives (.) + --prefix=DIR where to install the final product (/usr/local) diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/tools/text/dos2unix/default.nix index 6851ca896783..9e21bd2f8fa7 100644 --- a/pkgs/tools/text/dos2unix/default.nix +++ b/pkgs/tools/text/dos2unix/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, perl, gettext }: stdenv.mkDerivation { - name = "dos2unix-6.0.6"; + name = "dos2unix-7.0"; src = fetchurl { - url = http://waterlan.home.xs4all.nl/dos2unix/dos2unix-6.0.6.tar.gz; - sha256 = "0xnj4gmav1ypkgwmqldnq41b6l3cg08dyngkbygn9vrhlvlx9fwa"; + url = http://waterlan.home.xs4all.nl/dos2unix/dos2unix-7.0.tar.gz; + sha256 = "0az7nkgddnmimb88sj004klszbvkir02f4zlnij8drc6b80gw6jm"; }; configurePhase = '' diff --git a/pkgs/tools/text/enca/default.nix b/pkgs/tools/text/enca/default.nix index 14014d06052d..043f7cf5a12b 100644 --- a/pkgs/tools/text/enca/default.nix +++ b/pkgs/tools/text/enca/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libiconvOrNull, recode }: stdenv.mkDerivation rec { - name = "enca-1.15"; + name = "enca-1.16"; src = fetchurl { - url = "http://dl.cihar.com/enca/${name}.tar.bz2"; - sha256 = "1iibfl2s420x7bc1hvxr1ys4cpz579brg2m2ln4rp677azmrr8mv"; + url = "http://dl.cihar.com/enca/${name}.tar.xz"; + sha256 = "0hg7ggldam66l9j53nlrvi2lv1k99r2qfk6dh23vg6mi05cph7bw"; }; buildInputs = [ recode libiconvOrNull ]; diff --git a/pkgs/tools/text/gist/default.nix b/pkgs/tools/text/gist/default.nix new file mode 100644 index 000000000000..1ac9901a8e17 --- /dev/null +++ b/pkgs/tools/text/gist/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, fetchurl +, makeWrapper +, ruby +, rake +}: + +let version = "v4.3.0"; +in stdenv.mkDerivation rec { + name = "gist-${version}"; + + src = fetchurl { + url = "https://github.com/defunkt/gist/archive/${version}.tar.gz"; + sha256 = "92b91ffe07cc51ca8576b091e7123b851ee0d7d2d3f0e21d18b19d8bd8f9aa47"; + }; + + buildInputs = [ rake makeWrapper ]; + + installPhase = '' + rake install prefix=$out + + wrapProgram $out/bin/gist \ + --prefix PATH : ${ruby}/bin \ + ''; + + meta = { + homepage = "http://defunkt.io/gist/"; + description = "upload code to https://gist.github.com (or github enterprise)"; + platforms = stdenv.lib.platforms.all; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index 6e83bd357b27..8be986e0cbb7 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -1,21 +1,18 @@ -{ stdenv, fetchurl, pcre, libiconv ? null }: +{ stdenv, fetchurl, pcre, libiconvOrNull }: -let version = "2.14"; in +let version = "2.20"; in stdenv.mkDerivation { name = "gnugrep-${version}"; src = fetchurl { url = "mirror://gnu/grep/grep-${version}.tar.xz"; - sha256 = "1qbjb1l7f9blckc5pqy8jlf6482hpx4awn2acmhyf5mv9wfq03p7"; + sha256 = "0rcs0spsxdmh6yz8y4frkqp6f5iw19mdbdl9s2v6956hq0mlbbzh"; }; - buildInputs = [ pcre ] - ++ stdenv.lib.optional (libiconv != null) libiconv; + buildInputs = [ pcre libiconvOrNull ]; - patches = [ ./test-localeconv.patch ]; - - NIX_LDFLAGS = stdenv.lib.optionalString (libiconv != null) "-L${libiconv}/lib -liconv"; + NIX_LDFLAGS = stdenv.lib.optionalString (libiconvOrNull != null) "-L${libiconvOrNull}/lib -liconv"; doCheck = !stdenv.isDarwin; @@ -25,6 +22,18 @@ stdenv.mkDerivation { export MKDIR_P="mkdir -p" ''; + # Fix reference to sh in bootstrap-tools, and invoke grep via + # absolute path rather than looking at argv[0]. + postInstall = + '' + rm $out/bin/egrep $out/bin/fgrep + echo "#! /bin/sh" > $out/bin/egrep + echo "exec $out/bin/grep -E \"\$@\"" >> $out/bin/egrep + echo "#! /bin/sh" > $out/bin/fgrep + echo "exec $out/bin/grep -F \"\$@\"" >> $out/bin/fgrep + chmod +x $out/bin/egrep $out/bin/fgrep + ''; + meta = { homepage = http://www.gnu.org/software/grep/; description = "GNU implementation of the Unix grep command"; @@ -37,7 +46,7 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ ]; + maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/text/gnugrep/test-localeconv.patch b/pkgs/tools/text/gnugrep/test-localeconv.patch deleted file mode 100644 index f5efaf222217..000000000000 --- a/pkgs/tools/text/gnugrep/test-localeconv.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- grep-2.14/gnulib-tests/test-localeconv.c.orig 2013-02-15 18:41:50.213433059 +0000 -+++ grep-2.14/gnulib-tests/test-localeconv.c 2013-02-15 18:50:33.964751303 +0000 -@@ -37,13 +37,13 @@ - - ASSERT (STREQ (l->decimal_point, ".")); - ASSERT (STREQ (l->thousands_sep, "")); --#if !defined __FreeBSD__ -+#if !(defined __FreeBSD__ || defined __sun) - ASSERT (STREQ (l->grouping, "")); - #endif - - ASSERT (STREQ (l->mon_decimal_point, "")); - ASSERT (STREQ (l->mon_thousands_sep, "")); --#if !defined __FreeBSD__ -+#if !(defined __FreeBSD__ || defined __sun) - ASSERT (STREQ (l->mon_grouping, "")); - #endif - ASSERT (STREQ (l->positive_sign, "")); diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix index 97cc3c611733..90beca862c03 100644 --- a/pkgs/tools/text/groff/default.nix +++ b/pkgs/tools/text/groff/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ghostscript, perl, groff }: stdenv.mkDerivation rec { - name = "groff-1.22.2"; + name = "groff-1.22.3"; src = fetchurl { url = "mirror://gnu/groff/${name}.tar.gz"; - sha256 = "0xi07nhj5vdgax37rj25mwxzdmsz1ifx50hjgc6hqbkpqkd6821q"; + sha256 = "1998v2kcs288d3y7kfxpvl369nqi06zbbvjzafyvyl3pr7bajj1s"; }; buildInputs = [ ghostscript ]; @@ -28,11 +28,20 @@ stdenv.mkDerivation rec { ''; }; - meta = { - homepage = "http://www.gnu.org/software/groff/"; + postInstall = '' + # Remove example output with (random?) colors to + # avoid non-determinism in the output + rm $out/share/doc/${name}/examples/hdtbl/*color*ps + # Remove creation date + find $out/share/doc/${name} -type f -print0 | xargs -0 sed -i -e 's/%%CreationDate: .*//' + ''; + + meta = with stdenv.lib; { + homepage = http://www.gnu.org/software/groff/; description = "GNU Troff, a typesetting package that reads plain text and produces formatted output"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.all; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = with maintainers; [ pSub ]; longDescription = '' groff is the GNU implementation of troff, a document formatting diff --git a/pkgs/tools/text/html2text/default.nix b/pkgs/tools/text/html2text/default.nix new file mode 100644 index 000000000000..27de591d8896 --- /dev/null +++ b/pkgs/tools/text/html2text/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "html2text-1.3.2a"; + + src = fetchurl { + url = http://www.mbayer.de/html2text/downloads/html2text-1.3.2a.tar.gz; + sha256 = "000b39d5d910b867ff7e087177b470a1e26e2819920dcffd5991c33f6d480392"; + }; + + preConfigure = '' + sed -i s,/bin/echo,echo, configure + ''; + + # the --prefix has no effect + installPhase = '' + mkdir -p $out/bin $out/man/man{1,5} + cp html2text $out/bin + cp html2text.1.gz $out/man/man1 + cp html2textrc.5.gz $out/man/man5 + ''; + + meta = { + description = "html2text is a command line utility, written in C++, that converts HTML documents into plain text."; + homepage = http://www.mbayer.de/html2text/; + license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eikek ]; + }; +} diff --git a/pkgs/tools/text/numdiff/default.nix b/pkgs/tools/text/numdiff/default.nix index 9cef82e5e530..db7eeb789afb 100644 --- a/pkgs/tools/text/numdiff/default.nix +++ b/pkgs/tools/text/numdiff/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { description = '' A little program that can be used to compare putatively similar files line by line and field by field, ignoring small numeric differences - or/and different numeric formats. + or/and different numeric formats ''; homepage = http://www.nongnu.org/numdiff/; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/tools/text/peco/default.nix b/pkgs/tools/text/peco/default.nix index be49ba509200..619e1f8d9b1b 100644 --- a/pkgs/tools/text/peco/default.nix +++ b/pkgs/tools/text/peco/default.nix @@ -3,27 +3,27 @@ let go-flags = fetchgit { url = "git://github.com/jessevdk/go-flags"; - rev = "4f0ca1e2d1349e9662b633ea1b8b8d48e8a32533"; - sha256 = "5f22f4c5a0529ff0da8e507462ad910bb73c513fde49d58dd4baf7332787ca3d"; + rev = "ef51ed2000ee1721c7153e958511907b844b4a9c"; + sha256 = "1abzc7ksglicaz6g6nry006vwvflsidvyzyig85pi3p852z6sc2j"; }; go-runewidth = fetchgit { url = "git://github.com/mattn/go-runewidth"; - rev = "36f63b8223e701c16f36010094fb6e84ffbaf8e0"; - sha256 = "718e9e04659441744b8d43bd3d7e806836194cf322962712a6e019311d407ecf"; + rev = "63c378b851290989b19ca955468386485f118c65"; + sha256 = "1z5mhfrpqdssn3603vwd95w69z28igwq96lh7b9rrdcx440i822d"; }; termbox-go = fetchgit { url = "git://github.com/nsf/termbox-go"; - rev = "4e63c3a917c197694cb4fef6c55582500b3741e3"; - sha256 = "00ecc0dcf0919a42ea06fe3bd93480a17241160c434ff3872b6f5e418eb18069"; + rev = "bb19a81afd4bc2729799d1fedb19f7bd7ee284cf"; + sha256 = "1zc8pb594l16yipis6xg2ra84bg315p63wqxa5abyam1y0333sn0"; }; in stdenv.mkDerivation rec { name = "peco-${version}"; - version = "0.2.3"; + version = "0.2.10"; src = fetchgit { url = "git://github.com/peco/peco"; - rev = "b8e0c8f37d3eed68e64c931b0edb77728f3723f9"; - sha256 = "f178e01ab0536770b17eddcefd863e68c2d65b527b5da1fc3fb9efb19c12635f"; + rev = "4952013023ae1d92c10d826e6970c5a68959678d"; + sha256 = "02fwmxhaydx9m6q146amq1aw44abzisskkblmv1sjxrm37x81l31"; }; buildInputs = [ go ]; diff --git a/pkgs/tools/text/sgml/opensp/default.nix b/pkgs/tools/text/sgml/opensp/default.nix index 59b9b7bc13d1..4b807718baae 100644 --- a/pkgs/tools/text/sgml/opensp/default.nix +++ b/pkgs/tools/text/sgml/opensp/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, xmlto, docbook_xml_dtd_412, libxslt, docbook_xsl}: +{ lib, stdenv, fetchurl, xmlto, docbook_xml_dtd_412, libxslt, docbook_xsl }: stdenv.mkDerivation { name = "opensp-1.5.2"; @@ -13,8 +13,19 @@ stdenv.mkDerivation { docsrc/*.xml ''; + configureFlags = lib.optional stdenv.isDarwin [ + "--with-libintl-prefix=/usr" + "--with-libiconv-prefix=/usr" + ]; + setupHook = ./setup-hook.sh; + postFixup = '' + # Remove random ids in the release notes + sed -i -e 's/href="#idm.*"//g' $out/share/doc/OpenSP/releasenotes.html + sed -i -e 's/name="idm.*"//g' $out/share/doc/OpenSP/releasenotes.html + ''; + buildInputs = [ xmlto docbook_xml_dtd_412 libxslt docbook_xsl ]; meta = { diff --git a/pkgs/tools/text/sgml/opensp/setup-hook.sh b/pkgs/tools/text/sgml/opensp/setup-hook.sh index 2c9142da1016..5775832789a1 100644 --- a/pkgs/tools/text/sgml/opensp/setup-hook.sh +++ b/pkgs/tools/text/sgml/opensp/setup-hook.sh @@ -9,14 +9,6 @@ addSGMLCatalogs () { if test -z "$sgmlHookDone"; then sgmlHookDone=1 - # Set http_proxy and ftp_proxy to a invalid host to prevent - # xmllint and xsltproc from trying to download DTDs from the - # network even when --nonet is not given. That would be impure. - # (Note that .invalid is a reserved domain guaranteed not to - # work.) - export http_proxy=http://nodtd.invalid/ - export ftp_proxy=http://nodtd.invalid/ - export SGML_CATALOG_FILES - envHooks=(${envHooks[@]} addSGMLCatalogs) + envHooks+=(addSGMLCatalogs) fi diff --git a/pkgs/tools/text/source-highlight/default.nix b/pkgs/tools/text/source-highlight/default.nix index a7d1ddb0f3b5..d5530a3df916 100644 --- a/pkgs/tools/text/source-highlight/default.nix +++ b/pkgs/tools/text/source-highlight/default.nix @@ -12,13 +12,11 @@ stdenv.mkDerivation { sha256 = "1s49ld8cnpzhhwq0r7s0sfm3cg3nhhm0wla27lwraifrrl3y1cp1"; }; - configureFlags = [ "--with-boost=${boost}" ]; - buildInputs = [ boost ]; - enableParallelBuilding = false; + configureFlags = [ "--with-boost=${boost.lib}" ]; - doCheck = true; + enableParallelBuilding = false; meta = { description = "Source code renderer with syntax highlighting"; diff --git a/pkgs/tools/text/wgetpaste/default.nix b/pkgs/tools/text/wgetpaste/default.nix index 3c0af0157a52..235dcfe74586 100644 --- a/pkgs/tools/text/wgetpaste/default.nix +++ b/pkgs/tools/text/wgetpaste/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Command-line interface to various pastebins"; homepage = http://wgetpaste.zlin.dk/; - license = "publicDomain"; + license = stdenv.lib.licenses.publicDomain; maintainers = with stdenv.lib.maintainers; [ qknight iElectric ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/text/xml/html-xml-utils/default.nix b/pkgs/tools/text/xml/html-xml-utils/default.nix index fd5a5dc5f8e5..cabb931c4470 100644 --- a/pkgs/tools/text/xml/html-xml-utils/default.nix +++ b/pkgs/tools/text/xml/html-xml-utils/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { meta = { description = "Utilities for manipulating HTML and XML files"; homepage = http://www.w3.org/Tools/HTML-XML-utils/; - license = "free-non-copyleft"; #TODO W3C + license = stdenv.lib.licenses.w3c; }; } diff --git a/pkgs/tools/text/xml/rxp/default.nix b/pkgs/tools/text/xml/rxp/default.nix index 6ec9758ed3a2..a50e91b78668 100644 --- a/pkgs/tools/text/xml/rxp/default.nix +++ b/pkgs/tools/text/xml/rxp/default.nix @@ -1,20 +1,17 @@ {stdenv, fetchurl} : -stdenv.mkDerivation { - name = "rxp-1.2.3"; +stdenv.mkDerivation rec { + name = "rxp-${version}"; + version = "1.5.0"; + src = fetchurl { - url = http://ftp.de.debian.org/debian/pool/main/r/rxp/rxp_1.2.3.orig.tar.gz; - sha256 = "1r4khvmnl5231y37ji8f3mikxy0dhdz155wi3qihfi27mc1yv534"; + url = "mirror://debian/pool/main/r/rxp/rxp_${version}.orig.tar.gz"; + sha256 = "0y365r36wzj4xn1dzhb03spxljnrx8vwqbiwnnwz4630129gzpm6"; }; - NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE"; - installPhase = '' - mkdir -p $out/bin - cp rxp $out/bin - ''; meta = { license = stdenv.lib.licenses.gpl2Plus; - description = "a validating XML parser written in C"; - homepage = "http://www.cogsci.ed.ac.uk/~richard/rxp.html"; + description = "A validating XML parser written in C"; + homepage = http://www.cogsci.ed.ac.uk/~richard/rxp.html; }; } diff --git a/pkgs/tools/text/xml/xml2/default.nix b/pkgs/tools/text/xml/xml2/default.nix new file mode 100644 index 000000000000..89d56e030e07 --- /dev/null +++ b/pkgs/tools/text/xml/xml2/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, libxml2 }: + +stdenv.mkDerivation rec { + name = "xml2-0.5"; + + src = fetchurl { + url = "http://download.ofb.net/gale/${name}.tar.gz"; + sha256 = "01cps980m99y99cnmvydihga9zh3pvdsqag2fi1n6k2x7rfkl873"; + }; + + buildInputs = [ pkgconfig libxml2 ]; + + meta = with stdenv.lib; { + homepage = http://ofb.net/~egnor/xml2/; + description = "Tools for command line processing of XML, HTML, and CSV"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.rycee ]; + }; +} diff --git a/pkgs/tools/text/xml/xmlstarlet/default.nix b/pkgs/tools/text/xml/xmlstarlet/default.nix index aea3ab2bd968..74f7e08900a7 100644 --- a/pkgs/tools/text/xml/xmlstarlet/default.nix +++ b/pkgs/tools/text/xml/xmlstarlet/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libxml2, libxslt }: stdenv.mkDerivation rec { - name = "xmlstarlet-1.5.0"; + name = "xmlstarlet-1.6.1"; src = fetchurl { url = "mirror://sourceforge/xmlstar/${name}.tar.gz"; - sha256 = "1fmvqvzrzyfcg53j39sdz01v7klzyhd011m3y9br54525q2fvd27"; + sha256 = "1jp737nvfcf6wyb54fla868yrr39kcbijijmjpyk4lrpyg23in0m"; }; buildInputs = [ pkgconfig libxml2 libxslt ]; diff --git a/pkgs/tools/text/xml/xpf/default.nix b/pkgs/tools/text/xml/xpf/default.nix index 3ff89294ab1d..e1957333b3fb 100644 --- a/pkgs/tools/text/xml/xpf/default.nix +++ b/pkgs/tools/text/xml/xpf/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { src = fetchurl { url = http://tarballs.nixos.org/xpf-0.2.tar.gz; - md5 = "d92658828139e1495e052d0cfe25d312"; + sha256 = "0ljx91w68rnh4871c0xlq2whlmhqz8dr39wcdczfjjpniqz1fmpz"; }; buildInputs = [python libxml2]; diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix index efce7d4de812..ffd275069da4 100644 --- a/pkgs/tools/typesetting/biber/default.nix +++ b/pkgs/tools/typesetting/biber/default.nix @@ -33,7 +33,7 @@ buildPerlPackage { meta = { description = "Backend for BibLaTeX"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.ttuegel ]; }; diff --git a/pkgs/tools/typesetting/pdfgrep/default.nix b/pkgs/tools/typesetting/pdfgrep/default.nix index e05e4d16a06e..ff3bad12bc52 100644 --- a/pkgs/tools/typesetting/pdfgrep/default.nix +++ b/pkgs/tools/typesetting/pdfgrep/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "a tool to search text in PDF files"; homepage = http://pdfgrep.sourceforge.net/; - license = "free"; + license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [qknight]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/typesetting/pdftk/default.nix b/pkgs/tools/typesetting/pdftk/default.nix index c71bc3ba77c6..a2ef7716cda2 100644 --- a/pkgs/tools/typesetting/pdftk/default.nix +++ b/pkgs/tools/typesetting/pdftk/default.nix @@ -1,32 +1,40 @@ -{ fetchurl, stdenv, gcj }: +{ fetchurl, stdenv, gcj, unzip }: stdenv.mkDerivation { - name = "pdftk-1.41"; + name = "pdftk-2.02"; src = fetchurl { - url = http://www.pdfhacks.com/pdftk/pdftk-1.41.tar.bz2; - sha256 = "1vdrc3179slix6lz3gdiy53z7sh2yf9026r3xi6wdarwrcpawfrf"; + url = "https://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/pdftk-2.02-src.zip"; + sha256 = "1hdq6zm2dx2f9h7bjrp6a1hfa1ywgkwydp14i2sszjiszljnm3qi"; }; - patches = [ ./gcc-4.3.patch ./gcc-4.4.patch ]; + buildInputs = [ gcj unzip ]; - buildInputs = [ gcj ]; - - makeFlags = [ "-f" "Makefile.Generic" ]; + preBuild = '' + cd pdftk + sed -e 's@/usr/bin/@@g' -i Makefile.* + NIX_ENFORCE_PURITY= \ + make \ + LIBGCJ="${gcj.gcc}/share/java/libgcj-${gcj.gcc.version}.jar" \ + GCJ=gcj GCJH=gcjh GJAR=gjar \ + -iC ../java all + ''; - preBuild = "cd pdftk"; + # Makefile.Debian has almost fitting defaults + makeFlags = [ "-f" "Makefile.Debian" "VERSUFF=" ]; installPhase = '' mkdir -p $out/bin $out/share/man/man1 cp pdftk $out/bin - cp ../debian/pdftk.1 $out/share/man/man1 + cp ../pdftk.1 $out/share/man/man1 ''; + meta = { description = "Simple tool for doing everyday things with PDF documents"; - homepage = http://www.accesspdf.com/pdftk/; + homepage = "https://www.pdflabs.com/tools/pdftk-server/"; license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [viric]; + maintainers = with stdenv.lib.maintainers; [viric raskin]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/tools/typesetting/pdftk/gcc-4.3.patch b/pkgs/tools/typesetting/pdftk/gcc-4.3.patch deleted file mode 100644 index 05bca95f6c2f..000000000000 --- a/pkgs/tools/typesetting/pdftk/gcc-4.3.patch +++ /dev/null @@ -1,205 +0,0 @@ -Taken from gentoo portage. - -# posted to bug #251796 by <andrex@mail.ee> from Debian patches -diff -u -r pdftk-1.41.orig/java_libs/com/lowagie/bc/asn1/Makefile pdftk-1.41/java_libs/com/lowagie/bc/asn1/Makefile ---- pdftk-1.41.orig/java_libs/com/lowagie/bc/asn1/Makefile 2008-12-22 23:43:29.000000000 +0200 -+++ pdftk-1.41/java_libs/com/lowagie/bc/asn1/Makefile 2008-12-23 00:04:52.000000000 +0200 -@@ -25,8 +25,7 @@ - # the "$*" automatic variable, here - # - %.h : %.class -- $(GCJH) --classpath="." $*; -- $(RM) $< -+ $(GCJH) --classpath="$(java_libs_root):." $*; - - ## - # targets -diff -u -r pdftk-1.41.orig/java_libs/com/lowagie/text/Makefile pdftk-1.41/java_libs/com/lowagie/text/Makefile ---- pdftk-1.41.orig/java_libs/com/lowagie/text/Makefile 2008-12-22 23:43:29.000000000 +0200 -+++ pdftk-1.41/java_libs/com/lowagie/text/Makefile 2008-12-22 23:58:52.000000000 +0200 -@@ -25,13 +25,12 @@ - # the "$*" automatic variable, here - # - %.h : %.class -- $(GCJH) --classpath="." $*; -- $(RM) $< -+ $(GCJH) --classpath="$(java_libs_root):." $*; - - ## - # targets - --all : $(library) $(headers) -+all : $(library) $(headers) $(classes) - - $(library) : $(objects) - $(AR) $(ARFLAGS) $(library) $(objects); -diff -u -r pdftk-1.41.orig/java_libs/com/lowagie/text/markup/Makefile pdftk-1.41/java_libs/com/lowagie/text/markup/Makefile ---- pdftk-1.41.orig/java_libs/com/lowagie/text/markup/Makefile 2008-12-22 23:43:29.000000000 +0200 -+++ pdftk-1.41/java_libs/com/lowagie/text/markup/Makefile 2008-12-23 00:04:28.000000000 +0200 -@@ -25,8 +25,7 @@ - # the "$*" automatic variable, here - # - %.h : %.class -- $(GCJH) --classpath="." $*; -- $(RM) $< -+ $(GCJH) --classpath="$(java_libs_root):." $*; - - ## - # targets -diff -u -r pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/codec/Makefile pdftk-1.41/java_libs/com/lowagie/text/pdf/codec/Makefile ---- pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/codec/Makefile 2008-12-22 23:43:29.000000000 +0200 -+++ pdftk-1.41/java_libs/com/lowagie/text/pdf/codec/Makefile 2008-12-23 00:04:11.000000000 +0200 -@@ -25,8 +25,7 @@ - # the "$*" automatic variable, here - # - %.h : %.class -- $(GCJH) --classpath="." $*; -- $(RM) $< -+ $(GCJH) --classpath="$(java_libs_root):." $*; - - ## - # targets -diff -u -r pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/codec/postscript/Makefile pdftk-1.41/java_libs/com/lowagie/text/pdf/codec/postscript/Makefile ---- pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/codec/postscript/Makefile 2008-12-22 23:43:29.000000000 +0200 -+++ pdftk-1.41/java_libs/com/lowagie/text/pdf/codec/postscript/Makefile 2008-12-23 00:03:05.000000000 +0200 -@@ -25,8 +25,7 @@ - # the "$*" automatic variable, here - # - %.h : %.class -- $(GCJH) --classpath="." $*; -- $(RM) $< -+ $(GCJH) --classpath="$(java_libs_root):." $*; - - ## - # targets -diff -u -r pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/codec/wmf/Makefile pdftk-1.41/java_libs/com/lowagie/text/pdf/codec/wmf/Makefile ---- pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/codec/wmf/Makefile 2008-12-22 23:43:29.000000000 +0200 -+++ pdftk-1.41/java_libs/com/lowagie/text/pdf/codec/wmf/Makefile 2008-12-23 00:03:29.000000000 +0200 -@@ -25,8 +25,7 @@ - # the "$*" automatic variable, here - # - %.h : %.class -- $(GCJH) --classpath="." $*; -- $(RM) $< -+ $(GCJH) --classpath="$(java_libs_root):." $*; - - ## - # targets -diff -u -r pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/fonts/Makefile pdftk-1.41/java_libs/com/lowagie/text/pdf/fonts/Makefile ---- pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/fonts/Makefile 2008-12-22 23:43:29.000000000 +0200 -+++ pdftk-1.41/java_libs/com/lowagie/text/pdf/fonts/Makefile 2008-12-23 00:01:33.000000000 +0200 -@@ -34,8 +34,7 @@ - # the "$*" automatic variable, here - # - %.h : %.class -- $(GCJH) --classpath="." $*; -- $(RM) $< -+ $(GCJH) --classpath="$(java_libs_root):." $*; - - ## - # targets -diff -u -r pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/Makefile pdftk-1.41/java_libs/com/lowagie/text/pdf/Makefile ---- pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/Makefile 2008-12-22 23:43:29.000000000 +0200 -+++ pdftk-1.41/java_libs/com/lowagie/text/pdf/Makefile 2008-12-23 00:00:25.000000000 +0200 -@@ -25,8 +25,7 @@ - # the "$*" automatic variable, here - # - %.h : %.class -- $(GCJH) --classpath="." $*; -- $(RM) $< -+ $(GCJH) --classpath="$(java_libs_root):." $*; - - ## - # targets -diff -u -r pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/PdfEncryption.java pdftk-1.41/java_libs/com/lowagie/text/pdf/PdfEncryption.java ---- pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/PdfEncryption.java 2008-12-22 23:43:29.000000000 +0200 -+++ pdftk-1.41/java_libs/com/lowagie/text/pdf/PdfEncryption.java 2008-12-22 23:46:21.000000000 +0200 -@@ -50,7 +50,7 @@ - - package com.lowagie.text.pdf; - --import java_local.security.MessageDigest; // ssteward -+import java.security.MessageDigest; - import com.lowagie.text.ExceptionConverter; - - /** -diff -u -r pdftk-1.41.orig/java_libs/com/lowagie/text/xml/xmp/Makefile pdftk-1.41/java_libs/com/lowagie/text/xml/xmp/Makefile ---- pdftk-1.41.orig/java_libs/com/lowagie/text/xml/xmp/Makefile 2008-12-22 23:43:29.000000000 +0200 -+++ pdftk-1.41/java_libs/com/lowagie/text/xml/xmp/Makefile 2008-12-22 23:59:42.000000000 +0200 -@@ -25,8 +25,7 @@ - # the "$*" automatic variable, here - # - %.h : %.class -- $(GCJH) --classpath="." $*; -- $(RM) $< -+ $(GCJH) --classpath="$(java_libs_root):." $*; - - ## - # targets -diff -u -r pdftk-1.41.orig/java_libs/Makefile pdftk-1.41/java_libs/Makefile ---- pdftk-1.41.orig/java_libs/Makefile 2008-12-22 23:43:29.000000000 +0200 -+++ pdftk-1.41/java_libs/Makefile 2008-12-22 23:47:10.000000000 +0200 -@@ -13,13 +13,7 @@ - # append gcj flags - export GCJFLAGS+= --encoding=UTF-8 --classpath="$(java_libs_root)" - --all : libgcj_local itext -- --libgcj_local : -- $(MAKE) -C "$(java_libs_root)/gnu_local/java/security"; -- $(MAKE) -C "$(java_libs_root)/gnu_local/java/security/provider"; -- $(MAKE) -C "$(java_libs_root)/gnu/gcj/convert"; -- $(MAKE) -C "$(java_libs_root)/java_local/security"; -+all : itext - - itext : - $(MAKE) -C "$(java_libs_root)/com/lowagie/text"; -@@ -35,13 +29,7 @@ - $(MAKE) -C "$(java_libs_root)/com/lowagie/bc/asn1"; - $(MAKE) -C "$(java_libs_root)/com/lowagie/text/pdf/codec/postscript"; - --clean : libgcj_local_clean itext_clean -- --libgcj_local_clean : -- $(MAKE) -iC "$(java_libs_root)/gnu_local/java/security" clean; -- $(MAKE) -iC "$(java_libs_root)/gnu_local/java/security/provider" clean; -- $(MAKE) -iC "$(java_libs_root)/gnu/gcj/convert" clean; -- $(MAKE) -iC "$(java_libs_root)/java_local/security" clean; -+clean : itext_clean - - itext_clean : - $(MAKE) -iC "$(java_libs_root)/com/lowagie/text" clean; -diff -u -r pdftk-1.41.orig/pdftk/Makefile.Base pdftk-1.41/pdftk/Makefile.Base ---- pdftk-1.41.orig/pdftk/Makefile.Base 2008-12-22 23:43:29.000000000 +0200 -+++ pdftk-1.41/pdftk/Makefile.Base 2008-12-22 23:44:33.000000000 +0200 -@@ -31,18 +31,6 @@ - afms= $(wildcard $(java_libs_root)/com/lowagie/text/pdf/fonts/*.afm) - afm_objects= $(patsubst %.afm, %.o, $(afms)) - --# older versions of libgcj might not have the MD5 algorithm, --# so I added it here; these *_local java files were grabbed from --# libgcj CVS on March 7, 2004; diffed September 5, 2006 w/ gcc 4.1.1 --# --# gnu/gcj/convert/Input_UnicodeBig.java was grabbed March 26, 2004; diffed September 5, 2006 w/ gcc 4.1.1 --# --libgcj_local_libs = \ --$(java_libs_root)/java_local/security/security.a \ --$(java_libs_root)/gnu_local/java/security/provider/provider.a \ --$(java_libs_root)/gnu_local/java/security/security.a \ --$(java_libs_root)/gnu/gcj/convert/convert.a -- - # this must already be set according to your platform Makefile; - # we're just appending to it, here - # -diff -u -r pdftk-1.41.orig/pdftk/Makefile.Generic pdftk-1.41/pdftk/Makefile.Generic ---- pdftk-1.41.orig/pdftk/Makefile.Generic 2008-12-22 23:43:29.000000000 +0200 -+++ pdftk-1.41/pdftk/Makefile.Generic 2008-12-23 00:06:24.000000000 +0200 -@@ -28,7 +28,7 @@ - - # itext compiler flags - # -O3 might cause pdftk to segfault on cat operation (gcc 3.4.4) --export GCJFLAGS= -O2 -+export GCJFLAGS= -O2 -w - - # - export ARFLAGS= rs diff --git a/pkgs/tools/typesetting/pdftk/gcc-4.4.patch b/pkgs/tools/typesetting/pdftk/gcc-4.4.patch deleted file mode 100644 index f66c22e51060..000000000000 --- a/pkgs/tools/typesetting/pdftk/gcc-4.4.patch +++ /dev/null @@ -1,18 +0,0 @@ -Taken from gentoo portage. - -diff -NrU5 pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/PdfDate.java pdftk-1.41/java_libs/com/lowagie/text/pdf/PdfDate.java ---- pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/PdfDate.java 2009-05-18 20:49:13.000000000 -0600 -+++ pdftk-1.41/java_libs/com/lowagie/text/pdf/PdfDate.java 2009-05-18 20:51:36.000000000 -0600 -@@ -74,11 +74,11 @@ - public class PdfDate extends PdfString { - - // ssteward; static builds of pdftk (Windows, gcc 3.3.1) would - // omit this class because of its reference by reflection; - // this treatment ensures that ld will include it -- private static Class c1= gnu.java.locale.Calendar.class; -+ private static Class c1= java.util.Calendar.class; - - private static final int dateSpace[] = {Calendar.YEAR, 4, 0, Calendar.MONTH, 2, -1, Calendar.DAY_OF_MONTH, 2, 0, - Calendar.HOUR_OF_DAY, 2, 0, Calendar.MINUTE, 2, 0, Calendar.SECOND, 2, 0}; - - // constructors diff --git a/pkgs/tools/typesetting/rubber/default.nix b/pkgs/tools/typesetting/rubber/default.nix index 32545abaff2d..7c58c480a791 100644 --- a/pkgs/tools/typesetting/rubber/default.nix +++ b/pkgs/tools/typesetting/rubber/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { patchPhase = "substituteInPlace configure --replace which \"type -P\""; + postInstall = "rm $out/share/rubber/modules/etex.rub"; + meta = { description = "Wrapper for LaTeX and friends"; diff --git a/pkgs/tools/typesetting/tex/auctex/default.nix b/pkgs/tools/typesetting/tex/auctex/default.nix index b3c09952e43f..8624fdf96af7 100644 --- a/pkgs/tools/typesetting/tex/auctex/default.nix +++ b/pkgs/tools/typesetting/tex/auctex/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation ( rec { pname = "auctex"; - version = "11.87"; + version = "11.88"; name = "${pname}-${version}"; meta = { @@ -12,7 +12,7 @@ stdenv.mkDerivation ( rec { src = fetchurl { url = "mirror://gnu/${pname}/${name}.tar.gz"; - sha256 = "1wjwpmvhpj8q0zd78lj7vyzqhx4rbdhkflslylkzgnw5wllp5mb3"; + sha256 = "0gy89nzha20p6m7kpv2nl1fnsfka9scc3mw1lz66fp6czganfs3i"; }; buildInputs = [ emacs texLive ]; diff --git a/pkgs/tools/typesetting/tex/disser/default.nix b/pkgs/tools/typesetting/tex/disser/default.nix index eee695ea3e9c..cbbc3844fefb 100644 --- a/pkgs/tools/typesetting/tex/disser/default.nix +++ b/pkgs/tools/typesetting/tex/disser/default.nix @@ -2,9 +2,9 @@ x@{builderDefsPackage , unzip, texLive, texLiveCMSuper, texLiveAggregationFun , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ ["texLive" "texLiveCMSuper" "texLiveAggregationFun"]; buildInputs = map (n: builtins.getAttr n x) @@ -12,11 +12,11 @@ let ++ [(a.texLiveAggregationFun {paths=[a.texLive a.texLiveCMSuper];})]; sourceInfo = rec { baseName="disser"; - version="1.1.8"; + version="1.3.0"; name="${baseName}-${version}"; project="${baseName}"; url="mirror://sourceforge/project/${project}/${baseName}/${version}/${name}.zip"; - hash="15509hfcvkk5kfcza149c74qpamwgw88dg0ra749axs8xj8qmlw8"; + hash="1iab3va6xw53l8xzmd83kbnzqah9f6imzzfd3c2054q53p0ndlim"; }; in rec { @@ -36,7 +36,7 @@ rec { ''; makeFlags = ["DESTDIR=$out/share/texmf-dist"]; - + meta = { description = "Russian PhD thesis LaTeX package"; maintainers = with a.lib.maintainers; @@ -45,7 +45,7 @@ rec { ]; platforms = with a.lib.platforms; linux; # platform-independent - license = "free"; # LaTeX Project Public License + license = a.lib.licenses.free; # LaTeX Project Public License }; passthru = { updateInfo = { @@ -53,4 +53,3 @@ rec { }; }; }) x - diff --git a/pkgs/tools/typesetting/tex/pgf/1.x.nix b/pkgs/tools/typesetting/tex/pgf/1.x.nix index 032d9b5520e7..a26513d9f26d 100644 --- a/pkgs/tools/typesetting/tex/pgf/1.x.nix +++ b/pkgs/tools/typesetting/tex/pgf/1.x.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "pgf-1.18"; - + src = fetchurl { url = mirror://sourceforge/pgf/pgf-1.18.tar.gz; sha256 = "0s6b8rx9yfxcjjg18vx1mphnwbd28fl5lnq0dasjz40pp3ypwdjv"; @@ -13,4 +13,7 @@ stdenv.mkDerivation { mkdir -p $out/share/texmf-nix cp -prd * $out/share/texmf-nix "; + meta = { + branch = "1"; + }; } diff --git a/pkgs/tools/typesetting/tex/pgf/2.x.nix b/pkgs/tools/typesetting/tex/pgf/2.x.nix index 09ec1729cfd4..821357e72739 100644 --- a/pkgs/tools/typesetting/tex/pgf/2.x.nix +++ b/pkgs/tools/typesetting/tex/pgf/2.x.nix @@ -2,16 +2,19 @@ stdenv.mkDerivation { name = "pgf-2.00"; - + src = fetchurl { url = mirror://sourceforge/pgf/pgf-2.00.tar.gz; sha256 = "0j57niag4jb2k0iyrvjsannxljc3vkx0iag7zd35ilhiy4dh6264"; }; buildPhase = "true"; - + installPhase = " mkdir -p $out/share/texmf-nix cp -prd * $out/share/texmf-nix "; + meta = { + branch = "2"; + }; } diff --git a/pkgs/tools/typesetting/tex/pgf/3.x.nix b/pkgs/tools/typesetting/tex/pgf/3.x.nix index 9a03500bb962..5c0c387a340b 100644 --- a/pkgs/tools/typesetting/tex/pgf/3.x.nix +++ b/pkgs/tools/typesetting/tex/pgf/3.x.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { name = "pgf-3.00"; - + src = fetchurl { url = http://downloads.sourceforge.net/project/pgf/pgf/version%203.0.0/pgf_3.0.0.tds.zip; sha256 = "0kj769hyp4z2zmdv3f8xv443wcfqn5nkkbzxzqgfxjizlz81aav7"; }; - + buildInputs = [ unzip ]; # Multiple files problem @@ -18,9 +18,12 @@ stdenv.mkDerivation { ''; buildPhase = "true"; - + installPhase = " mkdir -p $out/share/texmf-nix cp -prd * $out/share/texmf-nix "; + meta = { + branch = "3"; + }; } diff --git a/pkgs/tools/typesetting/tex/tetex/clang.patch b/pkgs/tools/typesetting/tex/tetex/clang.patch new file mode 100644 index 000000000000..50d83f624437 --- /dev/null +++ b/pkgs/tools/typesetting/tex/tetex/clang.patch @@ -0,0 +1,13 @@ +diff --git a/texk/ps2pkm/type1.c b/texk/ps2pkm/type1.c +index 027bf1f..4dcbad0 100644 +--- a/texk/ps2pkm/type1.c ++++ b/texk/ps2pkm/type1.c +@@ -800,7 +800,7 @@ static void PSFakePush(Num) + static DOUBLE PSFakePop () + { + if (PSFakeTop >= 0) return(PSFakeStack[PSFakeTop--]); +- else Error0("PSFakePop : Stack empty\n"); ++ else { CC; IfTrace0(TRUE, "PSFakePop : Stack empty\n"); errflag = TRUE; return 0; } + /*NOTREACHED*/ + } + diff --git a/pkgs/tools/typesetting/tex/tetex/default.nix b/pkgs/tools/typesetting/tex/tetex/default.nix index 5cd3228aced3..173571eda23c 100644 --- a/pkgs/tools/typesetting/tex/tetex/default.nix +++ b/pkgs/tools/typesetting/tex/tetex/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { sed -i 57d texk/kpathsea/c-std.h ''; - patches = [ ./environment.patch ./getline.patch ]; + patches = [ ./environment.patch ./getline.patch ./clang.patch ]; setupHook = ./setup-hook.sh; diff --git a/pkgs/tools/typesetting/tex/tetex/setup-hook.sh b/pkgs/tools/typesetting/tex/tetex/setup-hook.sh index d79c4fae4196..9c5424e881e3 100644 --- a/pkgs/tools/typesetting/tex/tetex/setup-hook.sh +++ b/pkgs/tools/typesetting/tex/tetex/setup-hook.sh @@ -4,4 +4,4 @@ addTeXMFPath () { fi } -envHooks=(${envHooks[@]} addTeXMFPath) +envHooks+=(addTeXMFPath) diff --git a/pkgs/tools/typesetting/tex/tex4ht/default.nix b/pkgs/tools/typesetting/tex/tex4ht/default.nix index 69d02a275b34..eacd0316b464 100644 --- a/pkgs/tools/typesetting/tex/tex4ht/default.nix +++ b/pkgs/tools/typesetting/tex/tex4ht/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { cd src for f in tex4ht t4ht htcmd ; do # -DENVFILE="$out/share/texmf-nix/tex4ht/base/unix/tex4ht.env" - gcc -o $f $f.c -I${tetex}/include -L${tetex}/lib -DHAVE_DIRENT_H -DHAVE_DIRENT_H -DKPATHSEA -lkpathsea + ''${CC:-gcc} -o $f $f.c -I${tetex}/include -L${tetex}/lib -DHAVE_DIRENT_H -DHAVE_DIRENT_H -DKPATHSEA -lkpathsea done cd - ''; @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://tug.org/tex4ht/"; description = "a system to convert (La)TeX documents to HTML and various other formats"; - license = "LPPL-1.2"; # LaTeX Project Public License + license = stdenv.lib.licenses.lppl12; }; } diff --git a/pkgs/tools/typesetting/tex/texlive/aggregate.nix b/pkgs/tools/typesetting/tex/texlive/aggregate.nix index e001a36cab03..d19ff39e2a48 100644 --- a/pkgs/tools/typesetting/tex/texlive/aggregate.nix +++ b/pkgs/tools/typesetting/tex/texlive/aggregate.nix @@ -9,13 +9,15 @@ rec { phaseNames = [ "doAggregate" ]; doAggregate = fullDepEntry ('' + set +o pipefail + mkdir -p $out/bin for currentPath in ${lib.concatStringsSep " " buildInputs}; do echo Symlinking "$currentPath" find $currentPath/share/info $currentPath/share/man $(echo $currentPath/texmf*/) -type d | while read; do REPLY="''${REPLY#$currentPath}" mkdir -p $out/"$REPLY" - done + done find $currentPath/share/info $currentPath/share/man $(echo $currentPath/texmf*/) ! -type d | while read; do REPLY="''${REPLY#$currentPath}" ln -fs $currentPath/"$REPLY" $out/"$REPLY" diff --git a/pkgs/tools/typesetting/tex/texlive/beamer.nix b/pkgs/tools/typesetting/tex/texlive/beamer.nix index 8afaf7b5f3ed..f19d185572d3 100644 --- a/pkgs/tools/typesetting/tex/texlive/beamer.nix +++ b/pkgs/tools/typesetting/tex/texlive/beamer.nix @@ -20,6 +20,6 @@ rec { meta = { description = "Extra components for TeXLive: beamer class"; - maintainers = [ stdenv.lib.maintainers.mornfall ]; + maintainers = [ stdenv.lib.maintainers.mornfall stdenv.lib.maintainers.jwiegley ]; }; } diff --git a/pkgs/tools/typesetting/tex/texlive/context.nix b/pkgs/tools/typesetting/tex/texlive/context.nix index c0c702cd4189..22e0991b5cc1 100644 --- a/pkgs/tools/typesetting/tex/texlive/context.nix +++ b/pkgs/tools/typesetting/tex/texlive/context.nix @@ -1,9 +1,9 @@ args: with args; rec { - name = "context-2009.11.26"; + name = "context-2014.05.21"; src = fetchurl { - url = mirror://debian/pool/main/c/context/context_2009.11.26.orig.tar.gz; - sha256 = "1qv3h97cyhjyvivs30fz9bqr77j348azagm7ijiyfrclvjjlwav9"; + url = mirror://debian/pool/main/c/context/context_2014.05.21.20140528.orig.tar.gz; + sha256 = "1d744xrsjyl52x2xbh87k5ad826mzz8yqmhdznrmqrhk3qpjkzic"; }; buildInputs = [texLive]; diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index beb6a7f3a68c..b21c937e785f 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -1,20 +1,20 @@ args : with args; rec { src = fetchurl { - url = mirror://debian/pool/main/t/texlive-bin/texlive-bin_2014.20140528.34243.orig.tar.xz; - sha256 = "0nh8hfayyf60nm4z8zyclrbc3792c62azgsvrwxnl28iq223200s"; + url = mirror://debian/pool/main/t/texlive-bin/texlive-bin_2014.20140926.35254.orig.tar.xz; + sha256 = "1c39x059jhn5jsy6i9j3akjbkm1kmmzssy1jyi1aw20rl2vp86w3"; }; - texmfVersion = "2014.20140821"; + texmfVersion = "2014.20141024"; texmfSrc = fetchurl { url = "mirror://debian/pool/main/t/texlive-base/texlive-base_${texmfVersion}.orig.tar.xz"; - sha256 = "02qkzlhb381sybs970fgpc94nhx4jm0l3j5pv8z48l11415lvm9b"; + sha256 = "1a6968myfi81s76n9p1qljgpwia9mi55pkkz1q6lbnwybf97akj1"; }; - langTexmfVersion = "2014.20140821"; + langTexmfVersion = "2014.20141024"; langTexmfSrc = fetchurl { url = "mirror://debian/pool/main/t/texlive-lang/texlive-lang_${langTexmfVersion}.orig.tar.xz"; - sha256 = "075avhhhhzw5pbd19q659rn23rws15b5hv7nv0grd93vn3vfwdcy"; + sha256 = "1ydz5m1v40n34g1l31r3vqg74rbr01x2f80drhz4igh21fm7zzpa"; }; passthru = { inherit texmfSrc langTexmfSrc; }; @@ -22,7 +22,6 @@ rec { setupHook = ./setup-hook.sh; doMainBuild = fullDepEntry ( stdenv.lib.optionalString stdenv.isDarwin '' - export MACOSX_DEPLOYMENT_TARGET=10.9 export DYLD_LIBRARY_PATH="${poppler}/lib" '' + '' mkdir -p $out @@ -115,7 +114,8 @@ rec { buildInputs = [ zlib bzip2 ncurses libpng flex bison libX11 libICE xproto freetype t1lib gd libXaw icu ghostscript ed libXt libXpm libXmu libXext xextproto perl libSM ruby expat curl libjpeg python fontconfig xz pkgconfig - poppler libpaper graphite2 lesstif zziplib harfbuzz texinfo potrace ] + poppler libpaper graphite2 lesstif zziplib harfbuzz texinfo potrace gmp mpfr + xpdf ] ++ stdenv.lib.optionals stdenv.isDarwin [ makeWrapper ] ; @@ -145,7 +145,7 @@ rec { description = "A TeX distribution"; homepage = http://www.tug.org/texlive; license = stdenv.lib.licenses.gpl2; - maintainers = with maintainers; [ lovek323 raskin ]; + maintainers = with maintainers; [ lovek323 raskin jwiegley ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/typesetting/tex/texlive/extra.nix b/pkgs/tools/typesetting/tex/texlive/extra.nix index f47fedd927d8..59c3389d750b 100644 --- a/pkgs/tools/typesetting/tex/texlive/extra.nix +++ b/pkgs/tools/typesetting/tex/texlive/extra.nix @@ -1,11 +1,11 @@ args: with args; rec { name = "texlive-extra-2014"; - version = "2014.20140821"; + version = "2014.20141024"; src = fetchurl { url = "mirror://debian/pool/main/t/texlive-extra/texlive-extra_${version}.orig.tar.xz"; - sha256 = "1y3w8bgp85s90ng2y5dw9chrrvvdf7ibb6ynss8kycvgc0y4m6b3"; + sha256 = "190p5v6madcgkxjmfal0pcylfz88zi6yaixky0vrcz1kbvxqlcb9"; }; buildInputs = [texLive xz]; @@ -18,7 +18,7 @@ rec { meta = { description = "Extra components for TeXLive"; - maintainers = [ args.lib.maintainers.raskin ]; + maintainers = [ args.lib.maintainers.raskin args.lib.maintainers.jwiegley ]; # Actually, arch-independent.. hydraPlatforms = []; diff --git a/pkgs/tools/typesetting/tex/texlive/setup-hook.sh b/pkgs/tools/typesetting/tex/texlive/setup-hook.sh index d79c4fae4196..9c5424e881e3 100644 --- a/pkgs/tools/typesetting/tex/texlive/setup-hook.sh +++ b/pkgs/tools/typesetting/tex/texlive/setup-hook.sh @@ -4,4 +4,4 @@ addTeXMFPath () { fi } -envHooks=(${envHooks[@]} addTeXMFPath) +envHooks+=(addTeXMFPath) diff --git a/pkgs/tools/typesetting/xmlroff/default.nix b/pkgs/tools/typesetting/xmlroff/default.nix index cbbeecc96d33..5f118e636b8b 100644 --- a/pkgs/tools/typesetting/xmlroff/default.nix +++ b/pkgs/tools/typesetting/xmlroff/default.nix @@ -1,27 +1,39 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, libxslt, popt -, glib, pango, libgnomeprint, pangoxsl, gtk}: +{ stdenv, fetchurl, pkgconfig, libxml2, libxslt, popt, perl +, glib, pango, pangoxsl, gtk, libtool, autoconf, automake }: + +stdenv.mkDerivation rec { + name = "xmlroff-${version}"; + version = "0.6.2"; -stdenv.mkDerivation { - #name = "xmlroff-0.3.5"; - name = "xmlroff-0.3.98"; src = fetchurl { - url = mirror://sourceforge/xmlroff/xmlroff-0.3.98.tar.gz; - md5 = "6c1d05b6480e98870751bf9102ea68e2"; + url = "https://github.com/xmlroff/xmlroff/archive/v${version}.tar.gz"; + sha256 = "1sczn6xjczsfdxlbjqv4xqlki2a95y2s8ih2nl9v1vhqfk17fiww"; }; buildInputs = [ pkgconfig + autoconf + automake libxml2 libxslt + libtool glib pango - libgnomeprint pangoxsl gtk popt ]; - configureFlags = "--disable-pangoxsl"; + configureScript = "./autogen.sh"; + + configureFlags = "--disable-pangoxsl --disable-gp"; + + preBuild = '' + substituteInPlace tools/insert-file-as-string.pl --replace "/usr/bin/perl" "${perl}/bin/perl" + substituteInPlace Makefile --replace "docs" "" + ''; + + sourceRoot = "${name}/xmlroff/"; patches = [./xmlroff.patch]; } diff --git a/pkgs/tools/typesetting/xmlroff/xmlroff.patch b/pkgs/tools/typesetting/xmlroff/xmlroff.patch index 16bd7b0a76da..6f0246e96796 100644 --- a/pkgs/tools/typesetting/xmlroff/xmlroff.patch +++ b/pkgs/tools/typesetting/xmlroff/xmlroff.patch @@ -1,12 +1,11 @@ -diff -ruN xmlroff-0.3.98/Makefile.in xmlroff-0.3.98.new/Makefile.in ---- xmlroff-0.3.98/Makefile.in 2006-05-30 17:46:37.000000000 +0200 -+++ xmlroff-0.3.98.new/Makefile.in 2006-06-18 13:47:37.000000000 +0200 -@@ -288,7 +288,7 @@ - subdirs = @subdirs@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --SUBDIRS = pangoxsl libfo area fo datatype property expr util . examples docs -+SUBDIRS = libfo area fo datatype property expr util . examples docs - @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined - INCLUDES = \ - -DG_LOG_DOMAIN=\"libfo\" \ +--- xmlroff-0.6.2.orig/libfo/fo-libfo-basic.h ++++ xmlroff-0.6.2/libfo/fo-libfo-basic.h +@@ -11,8 +11,7 @@ + #define __FO_LIBFO_BASIC_H__ + + #include <stdio.h> +-#include <glib/gtypes.h> +-#include <glib/gerror.h> ++#include <glib.h> + + G_BEGIN_DECLS diff --git a/pkgs/tools/video/vnc2flv/default.nix b/pkgs/tools/video/vnc2flv/default.nix index f2f77bd84cd4..55f54e2cf3de 100644 --- a/pkgs/tools/video/vnc2flv/default.nix +++ b/pkgs/tools/video/vnc2flv/default.nix @@ -6,7 +6,7 @@ pythonPackages.buildPythonPackage rec { src = fetchurl { url = "http://pypi.python.org/packages/source/v/vnc2flv/${name}.tar.gz"; - md5 = "8492e46496e187b49fe5569b5639804e"; + sha256 = "14d4nm8yim0bm0nd3wyj7z4zdsg5zk3d9bhhvwdc36x03r8d0sbq"; }; # error: invalid command 'test' diff --git a/pkgs/tools/virtualization/ec2-ami-tools/default.nix b/pkgs/tools/virtualization/ec2-ami-tools/default.nix index cbe53326339a..dad581c93d06 100644 --- a/pkgs/tools/virtualization/ec2-ami-tools/default.nix +++ b/pkgs/tools/virtualization/ec2-ami-tools/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "ec2-ami-tools-${version}"; - version = "1.5.3"; + version = "1.5.6"; buildInputs = [ unzip makeWrapper ]; src = fetchurl { url = "http://s3.amazonaws.com/ec2-downloads/${name}.zip"; - sha256 = "0n184nxc57alg25h5bslg0cs1z854sf7f52a820ihxxknrq2dy6i"; + sha256 = "0227370qbm26qaqvscqxv6002bqwy2i5fdhbhpwfnbymh7jz59ks"; }; # Amazon EC2 requires that disk images are writable. If they're @@ -36,9 +36,9 @@ stdenv.mkDerivation rec { ''; # */ meta = { - homepage = http://developer.amazonwebservices.com/connect/entry.jspa?externalID=368&categoryID=88; + homepage = https://aws.amazon.com/developertools/Amazon-EC2/368; description = "Command-line tools to create and manage Amazon EC2 virtual machine images"; - license = "unfree-redistributable"; # Amazon || (Ruby GPL-2) + license = stdenv.lib.licenses.amazonsl; }; } diff --git a/pkgs/tools/virtualization/ec2-api-tools/default.nix b/pkgs/tools/virtualization/ec2-api-tools/default.nix index 34cfa662c916..5ffba07087ad 100644 --- a/pkgs/tools/virtualization/ec2-api-tools/default.nix +++ b/pkgs/tools/virtualization/ec2-api-tools/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://developer.amazonwebservices.com/connect/entry.jspa?externalID=351; description = "Command-line tools to create and manage Amazon EC2 virtual machines"; - license = "unfree-redistributable"; #Amazon + license = stdenv.lib.licenses.amazonsl; }; } diff --git a/pkgs/tools/virtualization/euca2ools/default.nix b/pkgs/tools/virtualization/euca2ools/default.nix index ae488b0f359d..84dc7c3c0719 100644 --- a/pkgs/tools/virtualization/euca2ools/default.nix +++ b/pkgs/tools/virtualization/euca2ools/default.nix @@ -10,7 +10,7 @@ pythonPackages.buildPythonPackage rec { sha256 = "caef5a3e2c9b515fd815034b5b7304acc878a0b9777ae4208dc033b0bf39da2b"; }; - pythonPath = [ pythonPackages.boto pythonPackages.m2crypto pythonPackages.ssl ]; + pythonPath = [ pythonPackages.boto pythonPackages.m2crypto ]; doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d41e9330ba1e..d4c0f841cad4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -85,7 +85,7 @@ let # Helper functions that are exported through `pkgs'. helperFunctions = stdenvAdapters // - (import ../build-support/trivial-builders.nix { inherit (pkgs) stdenv; inherit (pkgs.xorg) lndir; }); + (import ../build-support/trivial-builders.nix { inherit lib; inherit (pkgs) stdenv; inherit (pkgs.xorg) lndir; }); stdenvAdapters = import ../stdenv/adapters.nix pkgs; @@ -205,7 +205,7 @@ let allStdenvs = import ../stdenv { - inherit system platform config; + inherit system platform config lib; allPackages = args: import ./all-packages.nix ({ inherit config system; } // args); }; @@ -231,8 +231,6 @@ let else defaultStdenv; - stdenvApple = stdenvAdapters.overrideGCC allStdenvs.stdenvNative gccApple; - forceNativeDrv = drv : if crossSystem == null then drv else (drv // { crossDrv = drv.nativeDrv; }); @@ -311,7 +309,8 @@ let }; fetchgit = import ../build-support/fetchgit { - inherit stdenv git cacert; + inherit stdenv cacert; + git = gitMinimal; }; fetchgitPrivate = import ../build-support/fetchgit/private.nix { @@ -401,6 +400,10 @@ let inherit stdenv; }; + substituteAllFiles = import ../build-support/substitute-files/substitute-all-files.nix { + inherit stdenv; + }; + replaceDependency = import ../build-support/replace-dependency.nix { inherit runCommand nix lib; }; @@ -462,8 +465,12 @@ let aescrypt = callPackage ../tools/misc/aescrypt { }; + afl = callPackage ../tools/security/afl { }; + ahcpd = callPackage ../tools/networking/ahcpd { }; + aide = callPackage ../tools/security/aide { }; + aircrackng = callPackage ../tools/networking/aircrack-ng { }; airfield = callPackage ../tools/networking/airfield { }; @@ -476,6 +483,8 @@ let apt-offline = callPackage ../tools/misc/apt-offline { }; + apulse = callPackage ../misc/apulse { }; + archivemount = callPackage ../tools/filesystems/archivemount { }; arandr = callPackage ../tools/X11/arandr { }; @@ -615,6 +624,10 @@ let bitbucket-cli = pythonPackages.bitbucket-cli; + blink = callPackage ../applications/networking/instant-messengers/blink { }; + + blitz = callPackage ../development/libraries/blitz { }; + blockdiag = pythonPackages.blockdiag; bmon = callPackage ../tools/misc/bmon { }; @@ -632,6 +645,7 @@ let bsod = callPackage ../misc/emulators/bsod { }; btrfsProgs = callPackage ../tools/filesystems/btrfsprogs { }; + btrfsProgs-3_16 = callPackage ../tools/filesystems/btrfsprogs/3.16.nix { }; bwm_ng = callPackage ../tools/networking/bwm-ng { }; @@ -649,22 +663,36 @@ let consul_ui = consul.ui; + corosync = callPackage ../servers/corosync { }; + chntpw = callPackage ../tools/security/chntpw { }; coprthr = callPackage ../development/libraries/coprthr { flex = flex_2_5_35; }; - crawl = callPackage ../games/crawl { lua = lua5; }; + crawlTiles = callPackage ../games/crawl { }; + + crawl = callPackage ../games/crawl { + tileMode = false; + }; cv = callPackage ../tools/misc/cv { }; + datamash = callPackage ../tools/misc/datamash { }; + direnv = callPackage ../tools/misc/direnv { }; + discount = callPackage ../tools/text/discount { }; + ditaa = callPackage ../tools/graphics/ditaa { }; dlx = callPackage ../misc/emulators/dlx { }; + duperemove = callPackage ../tools/filesystems/duperemove { + linuxHeaders = linuxHeaders_3_14; + }; + eggdrop = callPackage ../tools/networking/eggdrop { }; enca = callPackage ../tools/text/enca { }; @@ -675,6 +703,8 @@ let fop = callPackage ../tools/typesetting/fop { }; + gist = callPackage ../tools/text/gist { }; + mcrl = callPackage ../tools/misc/mcrl { }; mcrl2 = callPackage ../tools/misc/mcrl2 { }; @@ -711,6 +741,8 @@ let bacula = callPackage ../tools/backup/bacula { }; + bareos = callPackage ../tools/backup/bareos { }; + beanstalkd = callPackage ../servers/beanstalkd { }; bgs = callPackage ../tools/X11/bgs { }; @@ -754,6 +786,8 @@ let par2Support = (config.bup.par2Support or false); }; + byzanz = callPackage ../applications/video/byzanz {}; + ori = callPackage ../tools/backup/ori { }; atool = callPackage ../tools/archivers/atool { }; @@ -768,6 +802,8 @@ let can-utils = callPackage ../os-specific/linux/can-utils { }; + caudec = callPackage ../applications/audio/caudec { }; + ccid = callPackage ../tools/security/ccid { }; ccrypt = callPackage ../tools/security/ccrypt { }; @@ -795,8 +831,6 @@ let chkrootkit = callPackage ../tools/security/chkrootkit { }; chocolateDoom = callPackage ../games/chocolate-doom { }; - # master is here because chocolateDoom v2.0 has broken netplay - chocolateDoomMaster = callPackage ../games/chocolate-doom/master.nix { }; chrony = callPackage ../tools/networking/chrony { }; @@ -808,7 +842,9 @@ let cksfv = callPackage ../tools/networking/cksfv { }; - clementine = callPackage ../applications/audio/clementine { }; + clementine = callPackage ../applications/audio/clementine { + boost = boost156; + }; ciopfs = callPackage ../tools/filesystems/ciopfs { }; @@ -948,6 +984,8 @@ let dev86 = callPackage ../development/compilers/dev86 { }; + dnscrypt-proxy = callPackage ../tools/networking/dnscrypt-proxy { }; + dnsmasq = callPackage ../tools/networking/dnsmasq { }; dnstop = callPackage ../tools/networking/dnstop { }; @@ -991,6 +1029,8 @@ let dolphinEmu = callPackage ../misc/emulators/dolphin-emu { }; dolphinEmuMaster = callPackage ../misc/emulators/dolphin-emu/master.nix { }; + doomseeker = callPackage ../applications/misc/doomseeker { }; + dropbear = callPackage ../tools/networking/dropbear { }; dtach = callPackage ../tools/misc/dtach { }; @@ -1027,6 +1067,8 @@ let edk2 = callPackage ../development/compilers/edk2 { }; + eid-viewer = callPackage ../tools/security/eid-viewer { }; + emscripten = callPackage ../development/compilers/emscripten { }; emscriptenfastcomp = callPackage ../development/compilers/emscripten-fastcomp { }; @@ -1061,7 +1103,7 @@ let evtest = callPackage ../applications/misc/evtest { }; - exempi = callPackage ../development/libraries/exempi { }; + exempi = callPackage ../development/libraries/exempi { boost = boost155; }; execline = callPackage ../tools/misc/execline { }; @@ -1089,14 +1131,24 @@ let fakechroot = callPackage ../tools/system/fakechroot { }; + fatrace = callPackage ../os-specific/linux/fatrace { }; + fcitx = callPackage ../tools/inputmethods/fcitx { }; fcitx-anthy = callPackage ../tools/inputmethods/fcitx/fcitx-anthy.nix { }; + fcitx-configtool = callPackage ../tools/inputmethods/fcitx/fcitx-configtool.nix { }; + + fcitx-with-plugins = callPackage ../tools/inputmethods/fcitx/wrapper.nix { + plugins = [ ]; + }; + fcron = callPackage ../tools/system/fcron { }; fdm = callPackage ../tools/networking/fdm {}; + flannel = callPackage ../tools/networking/flannel { }; + figlet = callPackage ../tools/misc/figlet { }; file = callPackage ../tools/misc/file { }; @@ -1152,11 +1204,15 @@ let freeipmi = callPackage ../tools/system/freeipmi {}; freetalk = callPackage ../applications/networking/instant-messengers/freetalk { - guile = guile_1_8; + automake = automake114x; }; freetds = callPackage ../development/libraries/freetds { }; + frescobaldi = callPackage ../misc/frescobaldi {}; + + frostwire = callPackage ../applications/networking/p2p/frostwire { }; + ftgl = callPackage ../development/libraries/ftgl { }; ftgl212 = callPackage ../development/libraries/ftgl/2.1.2.nix { }; @@ -1222,22 +1278,28 @@ let guile = guile_1_8; }; - gnugrep = callPackage ../tools/text/gnugrep { - libiconv = libiconvOrNull; - }; + gnugrep = callPackage ../tools/text/gnugrep { }; gnulib = callPackage ../development/tools/gnulib { }; gnupatch = callPackage ../tools/text/gnupatch { }; - gnupg1orig = callPackage ../tools/security/gnupg1 { }; + gnupg1orig = callPackage ../tools/security/gnupg/1.nix { }; - gnupg1compat = callPackage ../tools/security/gnupg1compat { }; + gnupg1compat = callPackage ../tools/security/gnupg/1compat.nix { }; # use config.packageOverrides if you prefer original gnupg1 gnupg1 = gnupg1compat; - gnupg = callPackage ../tools/security/gnupg { libusb = libusb1; }; + gnupg20 = callPackage ../tools/security/gnupg/20.nix { + libgcrypt = libgcrypt_1_6; + }; + + gnupg21 = callPackage ../tools/security/gnupg/21.nix { + libgcrypt = libgcrypt_1_6; + }; + + gnupg = gnupg20; gnuplot = callPackage ../tools/graphics/gnuplot { }; @@ -1256,7 +1318,7 @@ let googleAuthenticator = callPackage ../os-specific/linux/google-authenticator { }; - gource = callPackage ../applications/version-management/gource {}; + gource = callPackage ../applications/version-management/gource { }; gparted = callPackage ../tools/misc/gparted { }; @@ -1298,6 +1360,10 @@ let buggyBiosCDSupport = config.grub.buggyBiosCDSupport or true; }; + trustedGrub = callPackage_i686 ../tools/misc/grub/trusted.nix { + buggyBiosCDSupport = config.grub.buggyBiosCDSupport or true; + }; + grub2 = callPackage ../tools/misc/grub/2.0x.nix { }; grub2_efi = grub2.override { efiSupport = true; }; @@ -1338,7 +1404,7 @@ let gupnptools = callPackage ../tools/networking/gupnp-tools {}; gvpe = builderDefsPackage ../tools/networking/gvpe { - inherit openssl gmp nettools iproute; + inherit openssl gmp nettools iproute zlib; }; gvolicon = callPackage ../tools/audio/gvolicon {}; @@ -1353,6 +1419,8 @@ let pigz = callPackage ../tools/compression/pigz { }; + pxz = callPackage ../tools/compression/pxz { }; + haproxy = callPackage ../tools/networking/haproxy { }; haveged = callPackage ../tools/security/haveged { }; @@ -1395,12 +1463,7 @@ let httptunnel = callPackage ../tools/networking/httptunnel { }; - # FIXME: This Hydra snapshot is outdated and depends on the `nixPerl', - # which no longer exists. - # - # hydra = callPackage ../development/tools/misc/hydra { - # nix = nixUnstable; - # }; + i2pd = callPackage ../tools/networking/i2pd {}; iasl = callPackage ../development/compilers/iasl { }; @@ -1414,6 +1477,8 @@ let iftop = callPackage ../tools/networking/iftop { }; + ifuse = callPackage ../tools/filesystems/ifuse/default.nix { }; + ihaskell = callPackage ../development/tools/haskell/ihaskell/wrapper.nix { inherit (pythonPackages) ipython; inherit (haskellPackages) ihaskell ghc; @@ -1443,6 +1508,8 @@ let ipmiutil = callPackage ../tools/system/ipmiutil {}; + ipxe = callPackage ../tools/misc/ipxe { }; + ised = callPackage ../tools/misc/ised {}; isl = callPackage ../development/libraries/isl { }; @@ -1454,10 +1521,6 @@ let jdiskreport = callPackage ../tools/misc/jdiskreport { }; - jfsrec = callPackage ../tools/filesystems/jfsrec { - boost = boost144; - }; - jfsutils = callPackage ../tools/filesystems/jfsutils { }; jhead = callPackage ../tools/graphics/jhead { }; @@ -1476,24 +1539,34 @@ let jwhois = callPackage ../tools/networking/jwhois { }; + k2pdfopt = callPackage ../applications/misc/k2pdfopt { }; + kazam = callPackage ../applications/video/kazam { }; kalibrate-rtl = callPackage ../tools/misc/kalibrate-rtl { }; kexectools = callPackage ../os-specific/linux/kexectools { }; + keybase-node-client = callPackage ../applications/misc/keybase-node-client { }; + keychain = callPackage ../tools/misc/keychain { }; kibana = callPackage ../development/tools/misc/kibana { }; kismet = callPackage ../applications/networking/sniffers/kismet { }; + kst = callPackage ../tools/graphics/kst { }; + less = callPackage ../tools/misc/less { }; + liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix { }; + lockfileProgs = callPackage ../tools/misc/lockfile-progs { }; logstash = callPackage ../tools/misc/logstash { }; + logstash-contrib = callPackage ../tools/misc/logstash/contrib.nix { }; + logstash-forwarder = callPackage ../tools/misc/logstash-forwarder { }; kippo = callPackage ../servers/kippo { }; @@ -1508,6 +1581,8 @@ let mmv = callPackage ../tools/misc/mmv { }; + morituri = callPackage ../applications/audio/morituri { }; + most = callPackage ../tools/misc/most { }; multitail = callPackage ../tools/misc/multitail { }; @@ -1516,7 +1591,8 @@ let ninka = callPackage ../development/tools/misc/ninka { }; - nodejs = callPackage ../development/web/nodejs {}; + nodejs = callPackage ../development/web/nodejs { }; + nodejs-unstable = callPackage ../development/web/nodejs { unstableVersion = true; }; nodePackages = recurseIntoAttrs (import ./node-packages.nix { inherit pkgs stdenv nodejs fetchurl fetchgit; @@ -1528,6 +1604,8 @@ let ldns = callPackage ../development/libraries/ldns { }; + leafpad = callPackage ../applications/editors/leafpad { }; + lftp = callPackage ../tools/networking/lftp { }; libconfig = callPackage ../development/libraries/libconfig { }; @@ -1544,12 +1622,22 @@ let libshout = callPackage ../development/libraries/libshout { }; + libqb = callPackage ../development/libraries/libqb { }; + libqmi = callPackage ../development/libraries/libqmi { }; libmbim = callPackage ../development/libraries/libmbim { }; libtorrent = callPackage ../tools/networking/p2p/libtorrent { }; + libtorrent-git = callPackage ../tools/networking/p2p/libtorrent/git.nix { }; + + libiberty = callPackage ../development/libraries/libiberty { }; + + libibverbs = callPackage ../development/libraries/libibverbs { }; + + librdmacm = callPackage ../development/libraries/librdmacm { }; + logcheck = callPackage ../tools/system/logcheck { inherit (perlPackages) mimeConstruct; }; @@ -1580,8 +1668,12 @@ let lzop = callPackage ../tools/compression/lzop { }; + macchanger = callPackage ../os-specific/linux/macchanger { }; + maildrop = callPackage ../tools/networking/maildrop { }; + mailsend = callPackage ../tools/networking/mailsend { }; + mailpile = callPackage ../applications/networking/mailreaders/mailpile { }; mailutils = callPackage ../tools/networking/mailutils { @@ -1596,11 +1688,15 @@ let man_db = callPackage ../tools/misc/man-db { }; + mbox = callPackage ../tools/security/mbox { }; + memtest86 = callPackage ../tools/misc/memtest86 { }; memtest86plus = callPackage ../tools/misc/memtest86+ { }; - meo = callPackage ../tools/security/meo { }; + meo = callPackage ../tools/security/meo { + boost = boost155; + }; mc = callPackage ../tools/misc/mc { }; @@ -1628,7 +1724,10 @@ let mfoc = callPackage ../tools/security/mfoc { }; - minecraft = callPackage ../games/minecraft { }; + minecraft = callPackage ../games/minecraft { + pulseaudioSupport = config.pulseaudio or true; + pulseaudio = pulseaudio.override { ossWrapper = true; }; + }; minecraft-server = callPackage ../games/minecraft-server { }; @@ -1648,6 +1747,8 @@ let mkpasswd = callPackage ../tools/security/mkpasswd { }; + mkrand = callPackage ../tools/security/mkrand { }; + mktemp = callPackage ../tools/security/mktemp { }; mktorrent = callPackage ../tools/misc/mktorrent { }; @@ -1760,11 +1861,16 @@ let pa_applet = callPackage ../tools/audio/pa-applet { }; + pasystray = callPackage ../tools/audio/pasystray { + inherit (gnome3) gnome_icon_theme; + }; + pnmixer = callPackage ../tools/audio/pnmixer { }; nifskope = callPackage ../tools/graphics/nifskope { }; - nilfs_utils = callPackage ../tools/filesystems/nilfs-utils {}; + nilfs-utils = callPackage ../tools/filesystems/nilfs-utils {}; + nilfs_utils = nilfs-utils; nitrogen = callPackage ../tools/X11/nitrogen {}; @@ -1827,10 +1933,16 @@ let odt2txt = callPackage ../tools/text/odt2txt { }; + odamex = callPackage ../games/odamex { }; + offlineimap = callPackage ../tools/networking/offlineimap { inherit (pythonPackages) sqlite3; }; + opencryptoki = callPackage ../tools/security/opencryptoki { }; + + onscripter-en = callPackage ../games/onscripter-en { }; + opendbx = callPackage ../development/libraries/opendbx { }; opendkim = callPackage ../development/libraries/opendkim { }; @@ -1848,7 +1960,7 @@ let openobex = callPackage ../tools/bluetooth/openobex { }; openopc = callPackage ../tools/misc/openopc { - pythonFull = python27Full.override { + pythonFull = python27.buildEnv.override { extraLibs = [ python27Packages.pyro3 ]; }; }; @@ -1871,14 +1983,22 @@ let openssh_with_kerberos = pkgs.appendToName "with-kerberos" (openssh.override { withKerberos = true; }); - opensp = callPackage ../tools/text/sgml/opensp { }; + opensp = callPackage ../tools/text/sgml/opensp { + stdenv = if stdenv.isDarwin + then allStdenvs.stdenvDarwinNaked + else stdenv; + }; spCompat = callPackage ../tools/text/sgml/opensp/compat.nix { }; + opentracker = callPackage ../applications/networking/p2p/opentracker { }; + openvpn = callPackage ../tools/networking/openvpn { }; openvpn_learnaddress = callPackage ../tools/networking/openvpn/openvpn_learnaddress.nix { }; + update-resolv-conf = callPackage ../tools/networking/openvpn/update-resolv-conf.nix { }; + openvswitch = callPackage ../os-specific/linux/openvswitch { }; optipng = callPackage ../tools/graphics/optipng { @@ -1889,8 +2009,12 @@ let ossec = callPackage ../tools/security/ossec {}; + ostree = callPackage ../tools/misc/ostree { }; + otpw = callPackage ../os-specific/linux/otpw { }; + owncloudclient = callPackage ../applications/networking/owncloud-client { }; + p7zip = callPackage ../tools/archivers/p7zip { }; pal = callPackage ../tools/misc/pal { }; @@ -1957,6 +2081,10 @@ let briss = callPackage ../tools/graphics/briss { }; + brickd = callPackage ../servers/brickd { + libusb = libusb1; + }; + bully = callPackage ../tools/networking/bully { }; pdnsd = callPackage ../tools/networking/pdnsd { }; @@ -1992,6 +2120,8 @@ let plowshare = callPackage ../tools/misc/plowshare { }; + pngcheck = callPackage ../tools/graphics/pngcheck { }; + pngcrush = callPackage ../tools/graphics/pngcrush { }; pngnq = callPackage ../tools/graphics/pngnq { }; @@ -2024,6 +2154,8 @@ let projectm = callPackage ../applications/audio/projectm { }; + proot = callPackage ../tools/system/proot { }; + proxychains = callPackage ../tools/networking/proxychains { }; proxytunnel = callPackage ../tools/misc/proxytunnel { }; @@ -2064,6 +2196,8 @@ let qjoypad = callPackage ../tools/misc/qjoypad { }; + qpdf = callPackage ../development/libraries/qpdf { }; + qscintilla = callPackage ../development/libraries/qscintilla { qt = qt4; }; @@ -2078,6 +2212,8 @@ let privateer = callPackage ../games/privateer { }; + redmine = callPackage ../applications/version-management/redmine { }; + rtmpdump = callPackage ../tools/video/rtmpdump { }; reaverwps = callPackage ../tools/networking/reaver-wps {}; @@ -2106,7 +2242,9 @@ let reptyr = callPackage ../os-specific/linux/reptyr {}; - rdiff_backup = callPackage ../tools/backup/rdiff-backup { }; + rescuetime = callPackage ../applications/misc/rescuetime { }; + + rdiff-backup = callPackage ../tools/backup/rdiff-backup { }; rdmd = callPackage ../development/compilers/rdmd { }; @@ -2127,6 +2265,11 @@ let # GNU Inetutils. The latter is more portable. logger = inetutils; }; + rsnapshotGit = lowPrio (callPackage ../tools/backup/rsnapshot/git.nix { + # For the `logger' command, we can use either `utillinux' or + # GNU Inetutils. The latter is more portable. + logger = inetutils; + }); rlwrap = callPackage ../tools/misc/rlwrap { }; @@ -2138,10 +2281,14 @@ let rpm = callPackage ../tools/package-management/rpm { }; + rpmextract = callPackage ../tools/archivers/rpmextract { }; + rrdtool = callPackage ../tools/misc/rrdtool { }; rtorrent = callPackage ../tools/networking/p2p/rtorrent { }; + rtorrent-git = callPackage ../tools/networking/p2p/rtorrent/git.nix { }; + rubber = callPackage ../tools/typesetting/rubber { }; rxp = callPackage ../tools/text/xml/rxp { }; @@ -2170,6 +2317,8 @@ let safecopy = callPackage ../tools/system/safecopy { }; + safe-rm = callPackage ../tools/system/safe-rm { }; + salut_a_toi = callPackage ../applications/networking/instant-messengers/salut-a-toi {}; samplicator = callPackage ../tools/networking/samplicator { }; @@ -2206,6 +2355,8 @@ let siege = callPackage ../tools/networking/siege {}; + sigil = callPackage ../applications/editors/sigil { }; + silc_client = callPackage ../applications/networking/instant-messengers/silc-client { }; silc_server = callPackage ../servers/silc-server { }; @@ -2232,11 +2383,6 @@ let snort = callPackage ../applications/networking/ids/snort { }; - snx = callPackage_i686 ../tools/networking/snx { - inherit (pkgsi686Linux) pam gcc33; - inherit (pkgsi686Linux.xlibs) libX11; - }; - solr = callPackage ../servers/search/solr { }; solvespace = callPackage ../applications/graphics/solvespace { }; @@ -2249,10 +2395,14 @@ let sproxy-web = haskellPackages.callPackage ../tools/networking/sproxy-web { }; + sqliteman = callPackage ../applications/misc/sqliteman { }; + stardict = callPackage ../applications/misc/stardict/stardict.nix { inherit (gnome) libgnomeui scrollkeeper; }; + stdman = callPackage ../data/documentation/stdman { }; + storebrowse = callPackage ../tools/system/storebrowse { }; fusesmb = callPackage ../tools/filesystems/fusesmb { }; @@ -2263,10 +2413,7 @@ let socat2pre = lowPrio (callPackage ../tools/networking/socat/2.x.nix { }); - sourceHighlight = callPackage ../tools/text/source-highlight { - # Boost 1.54 causes the "test_regexranges" test to fail - boost = boost149; - }; + sourceHighlight = callPackage ../tools/text/source-highlight { }; spaceFM = callPackage ../applications/misc/spacefm { }; @@ -2300,7 +2447,7 @@ let stunnel = callPackage ../tools/networking/stunnel { }; - strongswan = callPackage ../tools/networking/strongswan { stdenv = clangStdenv; }; + strongswan = callPackage ../tools/networking/strongswan { }; su = shadow.su; @@ -2324,6 +2471,8 @@ let privoxy = callPackage ../tools/networking/privoxy { }; + swaks = callPackage ../tools/networking/swaks { }; + t1utils = callPackage ../tools/misc/t1utils { }; tarsnap = callPackage ../tools/backup/tarsnap { }; @@ -2343,8 +2492,12 @@ let # Work In Progress: it doesn't start unless running a daemon as root teamviewer8 = lowPrio (callPackage_i686 ../applications/networking/remote/teamviewer/8.nix { }); + teamviewer9 = lowPrio (callPackage_i686 ../applications/networking/remote/teamviewer/9.nix { }); + telnet = callPackage ../tools/networking/telnet { }; + tessel = callPackage ../applications/misc/tessel { }; + texmacs = callPackage ../applications/editors/texmacs { tex = texLive; /* tetex is also an option */ extraFonts = true; @@ -2369,11 +2522,15 @@ let tmux = callPackage ../tools/misc/tmux { }; + tmin = callPackage ../tools/security/tmin { }; + tor = callPackage ../tools/security/tor { }; torbutton = callPackage ../tools/security/torbutton { }; - torbrowser = callPackage ../tools/security/tor/torbrowser.nix { }; + torbrowser = callPackage ../tools/security/tor/torbrowser.nix { + stdenv = overrideGCC stdenv gcc49; + }; torsocks = callPackage ../tools/security/tor/torsocks.nix { }; @@ -2407,6 +2564,8 @@ let ufraw = callPackage ../applications/graphics/ufraw { }; + umlet = callPackage ../tools/misc/umlet { }; + unetbootin = callPackage ../tools/cd-dvd/unetbootin { }; unfs3 = callPackage ../servers/unfs3 { }; @@ -2475,10 +2634,14 @@ let testdisk = callPackage ../tools/misc/testdisk { }; + html2text = callPackage ../tools/text/html2text { }; + htmlTidy = callPackage ../tools/text/html-tidy { }; html-xml-utils = callPackage ../tools/text/xml/html-xml-utils { }; + rcm = callPackage ../tools/misc/rcm {}; + tftp_hpa = callPackage ../tools/networking/tftp-hpa {}; tigervnc = callPackage ../tools/admin/tigervnc { @@ -2526,6 +2689,8 @@ let ttmkfdir = callPackage ../tools/misc/ttmkfdir { }; + udunits = callPackage ../development/libraries/udunits { }; + uim = callPackage ../tools/inputmethods/uim { inherit (pkgs.kde4) kdelibs; }; @@ -2601,6 +2766,8 @@ let wicd = callPackage ../tools/networking/wicd { }; + wipe = callPackage ../tools/security/wipe { }; + wkhtmltopdf = callPackage ../tools/graphics/wkhtmltopdf { overrideDerivation = lib.overrideDerivation; inherit (xlibs) libX11 libXext libXrender; @@ -2657,13 +2824,15 @@ let xfsprogs = callPackage ../tools/filesystems/xfsprogs { }; - xmlroff = callPackage ../tools/typesetting/xmlroff { - inherit (gnome) libgnomeprint; - }; + xml2 = callPackage ../tools/text/xml/xml2 { }; + + xmlroff = callPackage ../tools/typesetting/xmlroff { }; xmlstarlet = callPackage ../tools/text/xml/xmlstarlet { }; - xmlto = callPackage ../tools/typesetting/xmlto { }; + xmlto = callPackage ../tools/typesetting/xmlto { + w3m = w3m.override { graphicsSupport = false; }; + }; xmltv = callPackage ../tools/misc/xmltv { }; @@ -2683,7 +2852,11 @@ let xvfb_run = callPackage ../tools/misc/xvfb-run { inherit (texFunctions) fontsConf; }; - youtubeDL = callPackage ../tools/misc/youtube-dl { }; + xvkbd = callPackage ../tools/X11/xvkbd { + inherit (xlibs) libXt libXaw libXtst xextproto libXi libXpm gccmakedep; + }; + + youtube-dl = callPackage ../tools/misc/youtube-dl { }; zbar = callPackage ../tools/graphics/zbar { pygtk = lib.overrideDerivation pygtk (x: { @@ -2706,6 +2879,8 @@ let zsync = callPackage ../tools/compression/zsync { }; + zxing = callPackage ../tools/graphics/zxing {}; + ### SHELLS @@ -2756,14 +2931,24 @@ let bigloo = callPackage ../development/compilers/bigloo { }; - chicken = callPackage ../development/compilers/chicken { }; + fetchegg = callPackage ../build-support/fetchegg { }; - ccl = builderDefsPackage ../development/compilers/ccl {}; + eggDerivation = callPackage ../development/compilers/chicken/eggDerivation.nix { }; - clang = wrapClang llvmPackages.clang; + chicken = callPackage ../development/compilers/chicken { + bootstrap-chicken = chicken.override { bootstrap-chicken = null; }; + }; - clang_34 = wrapClang llvmPackages_34.clang; - clang_33 = wrapClang (clangUnwrapped llvm_33 ../development/compilers/llvm/3.3/clang.nix); + egg2nix = callPackage ../development/tools/egg2nix { + chickenEggs = callPackage ../development/tools/egg2nix/chicken-eggs.nix { }; + }; + + ccl = callPackage ../development/compilers/ccl { }; + + clang = wrapGCC llvmPackages.clang; + + clang_34 = wrapGCC llvmPackages_34.clang; + clang_33 = wrapGCC (clangUnwrapped llvm_33 ../development/compilers/llvm/3.3/clang.nix); clangAnalyzer = callPackage ../development/tools/analysis/clang-analyzer { clang = clang_34; @@ -2771,25 +2956,24 @@ let }; clangUnwrapped = llvm: pkg: callPackage pkg { - stdenv = if stdenv.isDarwin then stdenvApple else stdenv; - inherit llvm; + inherit stdenv llvm; }; clangSelf = clangWrapSelf llvmPackagesSelf.clang; - clangWrapSelf = build: (import ../build-support/clang-wrapper) { - clang = build; + clangWrapSelf = build: (import ../build-support/gcc-wrapper) { + gcc = build; stdenv = clangStdenv; libc = glibc; binutils = binutils; - shell = bash; - inherit libcxx coreutils zlib; + inherit coreutils zlib; + extraPackages = [ libcxx ]; nativeTools = false; nativeLibc = false; }; #Use this instead of stdenv to build with clang - clangStdenv = lowPrio (stdenvAdapters.overrideGCC stdenv clang); + clangStdenv = if stdenv.isDarwin then stdenv else lowPrio (stdenvAdapters.overrideGCC stdenv clang); libcxxStdenv = stdenvAdapters.overrideGCC stdenv (clangWrapSelf llvmPackages.clang); clean = callPackage ../development/compilers/clean { }; @@ -2803,7 +2987,10 @@ let cryptol1 = lowPrio (callPackage ../development/compilers/cryptol/1.8.x.nix {}); cryptol2 = with haskellPackages_ghc763; callPackage ../development/compilers/cryptol/2.0.x.nix { Cabal = Cabal_1_18_1_3; - cabalInstall = cabalInstall_1_18_0_3; + cabalInstall = cabalInstall_1_18_0_3.override { + network = network_2_5_0_0; + HTTP = HTTP.override { network = network_2_5_0_0; }; + }; process = process_1_2_0_0; }; @@ -2823,9 +3010,7 @@ let gcc = gcc48; gcc_multi = gcc48_multi; - gcc33 = wrapGCC (import ../development/compilers/gcc/3.3 { - inherit fetchurl stdenv noSysDirs; - }); + gccApple = throw "gccApple is no longer supported"; gcc34 = wrapGCC (import ../development/compilers/gcc/3.4 { inherit fetchurl stdenv noSysDirs; @@ -2993,16 +3178,6 @@ let else null; })); - gccApple = - assert stdenv.isDarwin; - wrapGCC (makeOverridable (import ../development/compilers/gcc/4.2-apple64) { - inherit fetchurl noSysDirs; - profiledCompiler = true; - # Since it fails to build with GCC 4.6, build it with the "native" - # Apple-GCC. - stdenv = allStdenvs.stdenvNative; - }); - gfortran = gfortran48; gfortran48 = wrapGCC (gcc48.gcc.override { @@ -3142,7 +3317,6 @@ let ) haskell)); haskellPackages = haskellPackages_ghc783; - haskellPlatform = haskellPlatformPackages."2013_2_0_0"; haskellPackages_ghc6104 = haskell.packages_ghc6104; haskellPackages_ghc6123 = haskell.packages_ghc6123; @@ -3156,8 +3330,6 @@ let haskellPackages_ghcHEAD = haskell.packages_ghcHEAD; haskellPackages_ghcjs = haskell.packages_ghcjs; - haskellPlatformPackages = recurseIntoAttrs (import ../development/libraries/haskell/haskell-platform { inherit pkgs; }); - haxe = callPackage ../development/compilers/haxe { }; hhvm = callPackage ../development/compilers/hhvm { }; @@ -3196,6 +3368,7 @@ let icedtea7_jdk = callPackage ../development/compilers/icedtea rec { jdk = openjdk; jdkPath = "${openjdk}/lib/openjdk"; + giflib = giflib_5_0; } // { outputs = [ "out" ]; }; icedtea7_jre = (lib.setName "icedtea7-${lib.getVersion pkgs.icedtea7_jdk.jre}" (lib.addMetaAttrs @@ -3204,6 +3377,7 @@ let icedtea7_web = callPackage ../development/compilers/icedtea-web { jdk = "${icedtea7_jdk}/lib/icedtea"; + xulrunner = firefox; }; ikarus = callPackage ../development/compilers/ikarus { }; @@ -3238,12 +3412,16 @@ let oraclejdk7 = pkgs.oraclejdk7distro true false; + oraclejdk7psu = pkgs.oraclejdk7psu_distro true false; + oraclejdk8 = pkgs.oraclejdk8distro true false; oraclejre = lowPrio (pkgs.jdkdistro false false); oraclejre7 = lowPrio (pkgs.oraclejdk7distro false false); + oraclejre7psu = lowPrio (pkgs.oraclejdk7psu_distro false false); + oraclejre8 = lowPrio (pkgs.oraclejdk8distro false false); jrePlugin = lowPrio (pkgs.jdkdistro false true); @@ -3262,6 +3440,11 @@ let (if pluginSupport then appendToName "with-plugin" else x: x) (callPackage ../development/compilers/oraclejdk/jdk7-linux.nix { inherit installjdk; }); + oraclejdk7psu_distro = installjdk: pluginSupport: + assert supportsJDK; + (if pluginSupport then appendToName "with-plugin" else x: x) + (callPackage ../development/compilers/oraclejdk/jdk7psu-linux.nix { inherit installjdk; }); + oraclejdk8distro = installjdk: pluginSupport: assert supportsJDK; (if pluginSupport then appendToName "with-plugin" else x: x) @@ -3269,31 +3452,24 @@ let jikes = callPackage ../development/compilers/jikes { }; - juliaGit = callPackage ../development/compilers/julia/git-20131013.nix { - liblapack = liblapack.override {shared = true;}; - llvm = llvm_33; - openblas = openblas_0_2_2; - }; julia021 = callPackage ../development/compilers/julia/0.2.1.nix { liblapack = liblapack.override {shared = true;}; llvm = llvm_33; openblas = openblas_0_2_2; }; - julia030 = let + + julia033 = let liblapack = liblapack_3_5_0.override {shared = true;}; - in callPackage ../development/compilers/julia/0.3.0.nix { + in callPackage ../development/compilers/julia/0.3.3.nix { inherit liblapack; suitesparse = suitesparse.override { inherit liblapack; }; - llvm = llvm_34; - openblas = openblas_0_2_10; + llvm = llvm_33; }; - julia = julia030; + julia = julia033; - lazarus = builderDefsPackage (import ../development/compilers/fpc/lazarus.nix) { - inherit makeWrapper gtk glib pango atk gdk_pixbuf; - inherit (xlibs) libXi inputproto libX11 xproto libXext xextproto; + lazarus = callPackage ../development/compilers/fpc/lazarus.nix { fpc = fpc; }; @@ -3304,15 +3480,9 @@ let llvm_34 = llvmPackages_34.llvm; llvm_33 = llvm_v ../development/compilers/llvm/3.3/llvm.nix; - llvm_v = path: callPackage path { - stdenv = if stdenv.isDarwin then stdenvApple else stdenv; - }; + llvm_v = path: callPackage path { }; - llvmPackages = if !stdenv.isDarwin then llvmPackages_34 else llvmPackages_34 // { - # until someone solves build problems with _34 - llvm = llvm_33; - clang = clang_33; - }; + llvmPackages = llvmPackages_34; llvmPackages_34 = recurseIntoAttrs (import ../development/compilers/llvm/3.4 { inherit stdenv newScope fetchurl; @@ -3338,7 +3508,8 @@ let monoDLLFixer = callPackage ../build-support/mono-dll-fixer { }; - mozart = callPackage ../development/compilers/mozart { }; + mozart-binary = callPackage ../development/compilers/mozart/binary.nix { }; + mozart = mozart-binary; neko = callPackage ../development/compilers/neko { }; @@ -3360,7 +3531,7 @@ let ocaml_4_01_0 = callPackage ../development/compilers/ocaml/4.01.0.nix { }; - ocaml_4_02_0 = callPackage ../development/compilers/ocaml/4.02.0.nix { }; + ocaml_4_02_1 = callPackage ../development/compilers/ocaml/4.02.1.nix { }; orc = callPackage ../development/compilers/orc { }; @@ -3375,6 +3546,12 @@ let in rec { inherit ocaml; + acgtk = callPackage ../applications/science/logic/acgtk { }; + + ansiterminal = callPackage ../development/ocaml-modules/ansiterminal { }; + + bolt = callPackage ../development/ocaml-modules/bolt { }; + camlidl = callPackage ../development/tools/ocaml/camlidl { }; camlp4 = @@ -3404,6 +3581,8 @@ let camlp5_transitional = camlp5_6_transitional; + camlpdf = callPackage ../development/ocaml-modules/camlpdf { }; + calendar = callPackage ../development/ocaml-modules/calendar { }; camlzip = callPackage ../development/ocaml-modules/camlzip { }; @@ -3411,15 +3590,21 @@ let camomile_0_8_2 = callPackage ../development/ocaml-modules/camomile/0.8.2.nix { }; camomile = callPackage ../development/ocaml-modules/camomile { }; - camlimages = callPackage ../development/ocaml-modules/camlimages { + camlimages_4_0 = callPackage ../development/ocaml-modules/camlimages/4.0.nix { libpng = libpng12; giflib = giflib_4_1; }; + camlimages_4_1 = callPackage ../development/ocaml-modules/camlimages/4.1.nix {}; + camlimages = camlimages_4_1; biniou = callPackage ../development/ocaml-modules/biniou { }; ocaml_cairo = callPackage ../development/ocaml-modules/ocaml-cairo { }; + ocaml_cairo2 = callPackage ../development/ocaml-modules/ocaml-cairo2 { }; + + cil = callPackage ../development/ocaml-modules/cil { }; + cmdliner = callPackage ../development/ocaml-modules/cmdliner { }; cppo = callPackage ../development/tools/ocaml/cppo { }; @@ -3432,6 +3617,8 @@ let easy-format = callPackage ../development/ocaml-modules/easy-format { }; + eff = callPackage ../development/interpreters/eff { }; + eliom = callPackage ../development/ocaml-modules/eliom { }; findlib = callPackage ../development/tools/ocaml/findlib { }; @@ -3448,6 +3635,8 @@ let patoline = callPackage ../tools/typesetting/patoline { }; + gg = callPackage ../development/ocaml-modules/gg { }; + gmetadom = callPackage ../development/ocaml-modules/gmetadom { }; js_of_ocaml = callPackage ../development/tools/ocaml/js_of_ocaml { }; @@ -3467,6 +3656,8 @@ let lambdaTerm = callPackage ../development/ocaml-modules/lambda-term { }; + macaque = callPackage ../development/ocaml-modules/macaque { }; + menhir = callPackage ../development/ocaml-modules/menhir { }; merlin = callPackage ../development/tools/ocaml/merlin { }; @@ -3509,7 +3700,12 @@ let inherit pcre; }; + pgocaml = callPackage ../development/ocaml-modules/pgocaml {}; + ocaml_react = callPackage ../development/ocaml-modules/react { }; + reactivedata = callPackage ../development/ocaml-modules/reactivedata {}; + + ocamlscript = callPackage ../development/tools/ocaml/ocamlscript { }; ocamlsdl= callPackage ../development/ocaml-modules/ocamlsdl { }; @@ -3519,8 +3715,14 @@ let ocaml_text = callPackage ../development/ocaml-modules/ocaml-text { }; + ocpBuild = callPackage ../development/tools/ocaml/ocp-build { }; + + ocpIndent = callPackage ../development/tools/ocaml/ocp-indent { }; + ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { }; + otfm = callPackage ../development/ocaml-modules/otfm { }; + ounit = callPackage ../development/ocaml-modules/ounit { }; tyxml = callPackage ../development/ocaml-modules/tyxml { }; @@ -3567,8 +3769,12 @@ let sawja = callPackage ../development/ocaml-modules/sawja { }; uucd = callPackage ../development/ocaml-modules/uucd { }; + uucp = callPackage ../development/ocaml-modules/uucp { }; uunf = callPackage ../development/ocaml-modules/uunf { }; uutf = callPackage ../development/ocaml-modules/uutf { }; + + vg = callPackage ../development/ocaml-modules/vg { }; + xmlm = callPackage ../development/ocaml-modules/xmlm { }; yojson = callPackage ../development/ocaml-modules/yojson { }; @@ -3586,21 +3792,25 @@ let // { lablgtk = ocamlPackages_3_10_0.lablgtk_2_14; }; ocamlPackages_3_11_2 = (mkOcamlPackages ocaml_3_11_2 pkgs.ocamlPackages_3_11_2) // { lablgtk = ocamlPackages_3_11_2.lablgtk_2_14; }; - ocamlPackages_3_12_1 = mkOcamlPackages ocaml_3_12_1 pkgs.ocamlPackages_3_12_1; + ocamlPackages_3_12_1 = (mkOcamlPackages ocaml_3_12_1 pkgs.ocamlPackages_3_12_1) + // { camlimages = ocamlPackages_3_12_1.camlimages_4_0; }; ocamlPackages_4_00_1 = mkOcamlPackages ocaml_4_00_1 pkgs.ocamlPackages_4_00_1; ocamlPackages_4_01_0 = mkOcamlPackages ocaml_4_01_0 pkgs.ocamlPackages_4_01_0; - ocamlPackages_4_02_0 = mkOcamlPackages ocaml_4_02_0 pkgs.ocamlPackages_4_02_0; - ocamlPackages_latest = ocamlPackages_4_02_0; + ocamlPackages_4_02_1 = mkOcamlPackages ocaml_4_02_1 pkgs.ocamlPackages_4_02_1; + ocamlPackages_latest = ocamlPackages_4_02_1; ocaml_make = callPackage ../development/ocaml-modules/ocamlmake { }; - opa = let callPackage = newScope pkgs.ocamlPackages_4_00_1; in callPackage ../development/compilers/opa { }; + opa = callPackage ../development/compilers/opa { + ocamlPackages = ocamlPackages_4_00_1; + }; opam_1_0_0 = callPackage ../development/tools/ocaml/opam/1.0.0.nix { }; opam_1_1 = callPackage ../development/tools/ocaml/opam/1.1.nix { inherit (ocamlPackages_4_01_0) ocaml; }; - opam = opam_1_1; + opam_1_2_0 = callPackage ../development/tools/ocaml/opam/1.2.0.nix { }; + opam = opam_1_2_0; ocamlnat = let callPackage = newScope pkgs.ocamlPackages_3_12_1; in callPackage ../development/ocaml-modules/ocamlnat { }; @@ -3609,9 +3819,7 @@ let ocaml = ocaml_3_08_0; }; - roadsend = callPackage ../development/compilers/roadsend { }; - - rustc = callPackage ../development/compilers/rustc/0.11.nix {}; + rustc = callPackage ../development/compilers/rustc/0.12.nix {}; rustcMaster = callPackage ../development/compilers/rustc/head.nix {}; rust = rustc; @@ -3664,6 +3872,8 @@ let vala = callPackage ../development/compilers/vala/default.nix { }; + vala_0_26 = callPackage ../development/compilers/vala/0.26.nix { }; + visualcpp = callPackage ../development/compilers/visual-c++ { }; vs90wrapper = callPackage ../development/compilers/vs90wrapper { }; @@ -3673,28 +3883,14 @@ let win32hello = callPackage ../development/compilers/visual-c++/test { }; wrapGCCWith = gccWrapper: glibc: baseGCC: gccWrapper { - nativeTools = stdenv ? gcc && stdenv.gcc.nativeTools; - nativeLibc = stdenv ? gcc && stdenv.gcc.nativeLibc; - nativePrefix = if stdenv ? gcc then stdenv.gcc.nativePrefix else ""; - gcc = baseGCC; - libc = glibc; - shell = bash; - inherit stdenv binutils coreutils zlib; - }; - - wrapClangWith = clangWrapper: glibc: baseClang: clangWrapper { nativeTools = stdenv.gcc.nativeTools or false; nativeLibc = stdenv.gcc.nativeLibc or false; nativePrefix = stdenv.gcc.nativePrefix or ""; - clang = baseClang; + gcc = baseGCC; libc = glibc; - shell = bash; - binutils = stdenv.gcc.binutils; - inherit stdenv coreutils zlib; + inherit stdenv binutils coreutils zlib; }; - wrapClang = wrapClangWith (makeOverridable (import ../build-support/clang-wrapper)) glibc; - wrapGCC = wrapGCCWith (makeOverridable (import ../build-support/gcc-wrapper)) glibc; wrapGCCCross = @@ -3726,7 +3922,8 @@ let clisp = callPackage ../development/interpreters/clisp { }; # compatibility issues in 2.47 - at list 2.44.1 is known good - # for sbcl bootstrap + # for sbcl bootstrap. + # SBCL page recommends 2.33.2, though. Not sure when was it last tested clisp_2_44_1 = callPackage ../development/interpreters/clisp/2.44.1.nix { libsigsegv = libsigsegv_25; }; @@ -3789,7 +3986,6 @@ let lua = lua5; lua51Packages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = lua5_1; }); - lua52Packages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = lua5_2; }); luaPackages = lua52Packages; @@ -3819,8 +4015,11 @@ let pythonProtobuf = pythonPackages.protobuf; }; + mujs = callPackage ../development/interpreters/mujs { }; + nix-exec = callPackage ../development/interpreters/nix-exec { nix = nixUnstable; + git = gitMinimal; }; octave = callPackage ../development/interpreters/octave { @@ -3879,9 +4078,8 @@ let polyml = callPackage ../development/compilers/polyml { }; - pure = callPackage ../development/interpreters/pure { - llvm = llvm_33 ; - }; + pure = callPackage ../development/interpreters/pure { }; + pure-gsl = callPackage ../development/pure-modules/pure-gsl { }; python = python2; python2 = python27; @@ -3892,28 +4090,35 @@ let python2Packages = python27Packages; python3Packages = python34Packages; + python26 = callPackage ../development/interpreters/python/2.6 { + db = db47; + self = python26; + }; + python27 = callPackage ../development/interpreters/python/2.7 { + self = python27; + }; + python32 = callPackage ../development/interpreters/python/3.2 { + self = python32; + }; + python33 = callPackage ../development/interpreters/python/3.3 { + self = python33; + }; + python34 = hiPrio (callPackage ../development/interpreters/python/3.4 { + self = python34; + }); + pypy = callPackage ../development/interpreters/pypy/2.4 { + self = pypy; + }; + pythonFull = python2Full; python2Full = python27Full; - - python26 = callPackage ../development/interpreters/python/2.6 { db = db47; }; - python27 = callPackage ../development/interpreters/python/2.7 { }; - python32 = callPackage ../development/interpreters/python/3.2 { }; - python33 = callPackage ../development/interpreters/python/3.3 { }; - python34 = hiPrio (callPackage ../development/interpreters/python/3.4 { }); - - pypy = callPackage ../development/interpreters/pypy/2.4 { }; - - python26Full = callPackage ../development/interpreters/python/wrapper.nix { - extraLibs = []; - postBuild = ""; - python = python26; - inherit (python26Packages) recursivePthLoader; + python26Full = python26.override { + includeModules = true; + self = python26Full; }; - python27Full = callPackage ../development/interpreters/python/wrapper.nix { - extraLibs = []; - postBuild = ""; - python = python27; - inherit (python27Packages) recursivePthLoader; + python27Full = python27.override { + includeModules = true; + self = python27Full; }; python2nix = callPackage ../tools/package-management/python2nix { }; @@ -3922,10 +4127,10 @@ let inherit stdenv fetchurl lib; }); - pythonLinkmeWrapper = callPackage ../development/interpreters/python/python-linkme-wrapper.nix { }; - pypi2nix = python27Packages.pypi2nix; + svg2tikz = python27Packages.svg2tikz; + pyrex = pyrex095; pyrex095 = callPackage ../development/interpreters/pyrex/0.9.5.nix { }; @@ -3952,13 +4157,14 @@ let ruby_2_1_0 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.1.0.nix { }); ruby_2_1_1 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.1.1.nix { }); ruby_2_1_2 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.1.2.nix { }); + ruby_2_1_3 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.1.3.nix { }); # Ruby aliases ruby = ruby_1_9; ruby_1_8 = ruby_1_8_7; ruby_1_9 = ruby_1_9_3; ruby_2_0 = ruby_2_0_0; - ruby_2_1 = ruby_2_1_2; + ruby_2_1 = ruby_2_1_3; rubyLibs = recurseIntoAttrs (callPackage ../development/interpreters/ruby/libs.nix { }); @@ -4055,6 +4261,10 @@ let guile_ncurses = callPackage ../development/guile-modules/guile-ncurses { }; + guile-opengl = callPackage ../development/guile-modules/guile-opengl { }; + + guile-sdl = callPackage ../development/guile-modules/guile-sdl { }; + guile-xcb = callPackage ../development/guile-modules/guile-xcb { }; pharo-vm = callPackage_i686 ../development/pharo/vm { }; @@ -4070,6 +4280,8 @@ let ### DEVELOPMENT / TOOLS + augeas = callPackage ../tools/system/augeas { }; + ansible = callPackage ../tools/system/ansible { }; antlr = callPackage ../development/tools/parsing/antlr/2.7.7.nix { }; @@ -4082,6 +4294,11 @@ let astyle = callPackage ../development/tools/misc/astyle { }; + atom-shell = callPackage ../development/tools/atom-shell { + gconf = pkgs.gnome.GConf; + }; + + autobuild = callPackage ../development/tools/misc/autobuild { }; autoconf = callPackage ../development/tools/misc/autoconf { }; @@ -4111,7 +4328,7 @@ let bam = callPackage ../development/tools/build-managers/bam {}; binutils = if stdenv.isDarwin - then stdenv.gcc.binutils + then import ../build-support/native-darwin-cctools-wrapper {inherit stdenv;} else callPackage ../development/tools/misc/binutils { inherit noSysDirs; }; @@ -4182,6 +4399,8 @@ let chrpath = callPackage ../development/tools/misc/chrpath { }; + chruby = callPackage ../development/tools/misc/chruby { rubies = null; }; + "cl-launch" = callPackage ../development/tools/misc/cl-launch {}; complexity = callPackage ../development/tools/misc/complexity { }; @@ -4194,6 +4413,7 @@ let cmake = callPackage ../development/tools/build-managers/cmake { }; + cmake-3_0 = callPackage ../development/tools/build-managers/cmake/3.0.nix { }; cmake264 = callPackage ../development/tools/build-managers/cmake/264.nix { }; cmakeCurses = cmake.override { useNcurses = true; }; @@ -4254,10 +4474,12 @@ let wrapGCC (distcc.links extraConfig)) {}; distccStdenv = lowPrio (overrideGCC stdenv distccWrapper); - distccMasquerade = callPackage ../development/tools/misc/distcc/masq.nix { - gccRaw = gcc.gcc; - binutils = binutils; - }; + distccMasquerade = if stdenv.isDarwin + then null + else callPackage ../development/tools/misc/distcc/masq.nix { + gccRaw = gcc.gcc; + binutils = binutils; + }; docutils = builderDefsPackage (import ../development/tools/documentation/docutils) { inherit python pil makeWrapper; @@ -4279,8 +4501,12 @@ let emma = callPackage ../development/tools/analysis/emma { }; + eztrace = callPackage ../development/tools/profiling/EZTrace { }; + findbugs = callPackage ../development/tools/analysis/findbugs { }; + flow = callPackage ../development/tools/analysis/flow { }; + pmd = callPackage ../development/tools/analysis/pmd { }; jdepend = callPackage ../development/tools/analysis/jdepend { }; @@ -4327,6 +4553,8 @@ let ibus = callPackage ../development/libraries/ibus { }; + icmake = callPackage ../development/tools/build-managers/icmake { }; + iconnamingutils = callPackage ../development/tools/misc/icon-naming-utils { inherit (perlPackages) XMLSimple; }; @@ -4437,6 +4665,8 @@ let pstack = callPackage ../development/tools/misc/gdb/pstack.nix { }; + racerRust = callPackage ../development/tools/rust/racer { rust = rustcMaster; }; + radare = callPackage ../development/tools/analysis/radare { inherit (gnome) vte; lua = lua5; @@ -4457,10 +4687,14 @@ let ragel = callPackage ../development/tools/parsing/ragel { }; + hammer = callPackage ../development/tools/parsing/hammer { }; + re2c = callPackage ../development/tools/parsing/re2c { }; remake = callPackage ../development/tools/build-managers/remake { }; + rr = callPackage_i686 ../development/tools/analysis/rr { }; + saleae-logic = callPackage ../development/tools/misc/saleae-logic { }; # couldn't find the source yet @@ -4470,6 +4704,8 @@ let selenium-server-standalone = callPackage ../development/tools/selenium/server { }; + selendroid = callPackage ../development/tools/selenium/selendroid { }; + scons = callPackage ../development/tools/build-managers/scons { }; sbt = callPackage ../development/tools/build-managers/sbt { }; @@ -4477,6 +4713,8 @@ let sigrok-cli = callPackage ../development/tools/sigrok-cli { }; + simpleTpmPk11 = callPackage ../tools/security/simple-tpm-pk11 { }; + slimerjs = callPackage ../development/tools/slimerjs {}; sloccount = callPackage ../development/tools/misc/sloccount { }; @@ -4498,6 +4736,8 @@ let flex = flex_2_5_35; }; + sselp = callPackage ../tools/X11/sselp{ }; + stm32flash = callPackage ../development/tools/misc/stm32flash { }; strace = callPackage ../development/tools/misc/strace { }; @@ -4575,6 +4815,8 @@ let yodl = callPackage ../development/tools/misc/yodl { }; + winpdb = callPackage ../development/tools/winpdb { }; + ### DEVELOPMENT / LIBRARIES @@ -4592,7 +4834,9 @@ let adns = callPackage ../development/libraries/adns { }; - afflib = callPackage ../development/libraries/afflib {}; + afflib = callPackage ../development/libraries/afflib { + automake = automake114x; + }; agg = callPackage ../development/libraries/agg { }; @@ -4641,8 +4885,6 @@ let audiofile = callPackage ../development/libraries/audiofile { }; - babl_0_0_22 = callPackage ../development/libraries/babl/0_0_22.nix { }; - babl = callPackage ../development/libraries/babl { }; beecrypt = callPackage ../development/libraries/beecrypt { }; @@ -4651,11 +4893,12 @@ let boolstuff = callPackage ../development/libraries/boolstuff { }; - boost144 = callPackage ../development/libraries/boost/1.44.nix { }; - boost149 = callPackage ../development/libraries/boost/1.49.nix { }; boost155 = callPackage ../development/libraries/boost/1.55.nix { }; boost156 = callPackage ../development/libraries/boost/1.56.nix { }; - boost = boost155; + boost157 = callPackage ../development/libraries/boost/1.57.nix { }; + boost = boost157; + + boost_process = callPackage ../development/libraries/boost-process { }; botan = callPackage ../development/libraries/botan { }; botanUnstable = callPackage ../development/libraries/botan/unstable.nix { }; @@ -4675,6 +4918,10 @@ let capnproto = callPackage ../development/libraries/capnproto { }; + ccnx = callPackage ../development/libraries/ccnx { }; + + ndn-cxx = callPackage ../development/libraries/ndn-cxx { }; + cimg = callPackage ../development/libraries/cimg { }; scmccid = callPackage ../development/libraries/scmccid { }; @@ -4701,8 +4948,6 @@ let chromaprint = callPackage ../development/libraries/chromaprint { }; - cil = callPackage ../development/libraries/cil { }; - cilaterm = callPackage ../development/libraries/cil-aterm { stdenv = overrideInStdenv stdenv [gnumake380]; }; @@ -4754,7 +4999,7 @@ let coredumper = callPackage ../development/libraries/coredumper { }; - ctl = callPackage ../development/libraries/ctl { }; + ctl = dropCxx (callPackage ../development/libraries/ctl { }); cpp-netlib = callPackage ../development/libraries/cpp-netlib { }; @@ -4796,6 +5041,8 @@ let dhex = callPackage ../applications/editors/dhex { }; + double_conversion = callPackage ../development/libraries/double-conversion { }; + dclib = callPackage ../development/libraries/dclib { }; dillo = callPackage ../applications/networking/browsers/dillo { @@ -4804,6 +5051,8 @@ let directfb = callPackage ../development/libraries/directfb { }; + dlib = callPackage ../development/libraries/dlib { }; + dotconf = callPackage ../development/libraries/dotconf { }; dssi = callPackage ../development/libraries/dssi {}; @@ -4886,6 +5135,8 @@ let fftwSinglePrec = fftw.override { precision = "single"; }; fftwFloat = fftwSinglePrec; # the configure option is just an alias + fish-fillets-ng = callPackage ../games/fish-fillets-ng {}; + flann = callPackage ../development/libraries/flann { }; flite = callPackage ../development/libraries/flite { }; @@ -4902,11 +5153,16 @@ let cfitsio = callPackage ../development/libraries/cfitsio { }; + fontconfig_210 = callPackage ../development/libraries/fontconfig/2.10.nix { }; + fontconfig = callPackage ../development/libraries/fontconfig { }; + folly = callPackage ../development/libraries/folly { }; + makeFontsConf = let fontconfig_ = fontconfig; in {fontconfig ? fontconfig_, fontDirectories}: import ../development/libraries/fontconfig/make-fonts-conf.nix { inherit runCommand libxslt fontconfig fontDirectories; + inherit (xorg) fontbhttf; }; freealut = callPackage ../development/libraries/freealut { }; @@ -4939,14 +5195,7 @@ let gecode = callPackage ../development/libraries/gecode { }; - gegl = callPackage ../development/libraries/gegl { - # avocodec avformat librsvg - }; - - gegl_0_0_22 = callPackage ../development/libraries/gegl/0_0_22.nix { - # avocodec avformat librsvg - libpng = libpng12; - }; + gegl = callPackage ../development/libraries/gegl { }; geoclue = callPackage ../development/libraries/geoclue {}; @@ -4958,6 +5207,8 @@ let geos = callPackage ../development/libraries/geos { }; + getdata = callPackage ../development/libraries/getdata { }; + gettext = gettext_0_18; gettext_0_17 = callPackage ../development/libraries/gettext/0.17.nix { }; @@ -4967,6 +5218,8 @@ let gdal = callPackage ../development/libraries/gdal { }; + gdcm = callPackage ../development/libraries/gdcm { }; + ggz_base_libs = callPackage ../development/libraries/ggz_base_libs {}; giblib = callPackage ../development/libraries/giblib { }; @@ -5039,9 +5292,10 @@ let glpk = callPackage ../development/libraries/glpk { }; glsurf = callPackage ../applications/science/math/glsurf { - inherit (ocamlPackages) lablgl findlib camlimages ocaml_mysql mlgmp; + inherit (ocamlPackages) lablgl findlib ocaml_mysql mlgmp; libpng = libpng12; giflib = giflib_4_1; + camlimages = ocamlPackages.camlimages_4_0; }; gmime = callPackage ../development/libraries/gmime { }; @@ -5070,7 +5324,7 @@ let gperftools = callPackage ../development/libraries/gperftools { }; gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer { - callPackage = pkgs.newScope (pkgs // { libav = pkgs.libav_10; }); + callPackage = pkgs.newScope (pkgs // { inherit (pkgs) libav; }); }); gst_all = { @@ -5110,7 +5364,7 @@ let qt_gstreamer = callPackage ../development/libraries/gstreamer/legacy/qt-gstreamer {}; - qt_gstreamer1 = callPackage ../development/libraries/gstreamer/qt-gstreamer {}; + qt_gstreamer1 = callPackage ../development/libraries/gstreamer/qt-gstreamer { boost = boost156;}; gnet = callPackage ../development/libraries/gnet { }; @@ -5184,6 +5438,8 @@ let else stdenv; }; + granite = callPackage ../development/libraries/granite { }; + gtk2 = callPackage ../development/libraries/gtk+/2.x.nix { cupsSupport = config.gtk2.cups or stdenv.isLinux; }; @@ -5236,11 +5492,23 @@ let heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { }; harfbuzz = callPackage ../development/libraries/harfbuzz { }; + harfbuzz-icu = callPackage ../development/libraries/harfbuzz { + withIcu = true; + withGraphite2 = true; + }; hawknl = callPackage ../development/libraries/hawknl { }; herqq = callPackage ../development/libraries/herqq { }; + hidapi = callPackage ../development/libraries/hidapi { + libusb = libusb1; + }; + + hivex = callPackage ../development/libraries/hivex { + inherit (perlPackages) IOStringy; + }; + hspell = callPackage ../development/libraries/hspell { }; hspellDicts = callPackage ../development/libraries/hspell/dicts.nix { }; @@ -5267,7 +5535,7 @@ let ilixi = callPackage ../development/libraries/ilixi { }; - ilmbase = callPackage ../development/libraries/ilmbase { }; + ilmbase = dropCxx (callPackage ../development/libraries/ilmbase { }); imlib = callPackage ../development/libraries/imlib { libpng = libpng12; @@ -5275,6 +5543,8 @@ let imlib2 = callPackage ../development/libraries/imlib2 { }; + ijs = callPackage ../development/libraries/ijs { }; + incrtcl = callPackage ../development/libraries/incrtcl { }; indilib = callPackage ../development/libraries/indilib { }; @@ -5337,6 +5607,11 @@ let lcms2 = callPackage ../development/libraries/lcms2 { }; + ldb = callPackage ../development/libraries/ldb { + sasl = cyrus_sasl; + libgcrypt = libgcrypt_1_6; + }; + lensfun = callPackage ../development/libraries/lensfun { }; lesstif = callPackage ../development/libraries/lesstif { }; @@ -5363,6 +5638,8 @@ let usePulseAudio = config.pulseaudio or true; }; + libantlr3c = callPackage ../development/libraries/libantlr3c {}; + libarchive = callPackage ../development/libraries/libarchive { }; libass = callPackage ../development/libraries/libass { }; @@ -5375,9 +5652,9 @@ let libatomic_ops = callPackage ../development/libraries/libatomic_ops {}; - libav = libav_10; + libav = libav_11; # branch 11 is API-compatible with branch 10 libav_all = callPackage ../development/libraries/libav { }; - inherit (libav_all) libav_0_8 libav_9 libav_10; + inherit (libav_all) libav_0_8 libav_9 libav_11; libavc1394 = callPackage ../development/libraries/libavc1394 { }; @@ -5395,6 +5672,8 @@ let then libcanberra.override { gtk = null; } else libcanberra; + libcec = callPackage ../development/libraries/libcec { }; + libcello = callPackage ../development/libraries/libcello {}; libcdaudio = callPackage ../development/libraries/libcdaudio { }; @@ -5424,6 +5703,8 @@ let libctemplate = callPackage ../development/libraries/libctemplate { }; + libcouchbase = callPackage ../development/libraries/libcouchbase { }; + libcue = callPackage ../development/libraries/libcue { }; libdaemon = callPackage ../development/libraries/libdaemon { }; @@ -5445,7 +5726,7 @@ let libdc1394avt = callPackage ../development/libraries/libdc1394avt { }; - libdevil = callPackage ../development/libraries/libdevil { }; + libdevil = dropCxx (callPackage ../development/libraries/libdevil { }); libdiscid = callPackage ../development/libraries/libdiscid { }; @@ -5482,6 +5763,14 @@ let libelf = callPackage ../development/libraries/libelf { }; + libetpan = callPackage ../development/libraries/libetpan { }; + + libfaketime = callPackage ../development/libraries/libfaketime { }; + + libfakekey = callPackage ../development/libraries/libfakekey { + inherit (xlibs) libX11 libXi xextproto; + }; + libfm = callPackage ../development/libraries/libfm { }; libfm-extra = callPackage ../development/libraries/libfm { extraOnly = true; @@ -5516,6 +5805,8 @@ let libe-book = callPackage ../development/libraries/libe-book {}; + libechonest = callPackage ../development/libraries/libechonest { }; + libev = builderDefsPackage ../development/libraries/libev { }; libevent14 = callPackage ../development/libraries/libevent/1.4.nix { }; @@ -5565,12 +5856,16 @@ let libgphoto2 = callPackage ../development/libraries/libgphoto2 { }; - libgphoto2_4 = callPackage ../development/libraries/libgphoto2/2.4.nix { }; - libgpod = callPackage ../development/libraries/libgpod { inherit (pkgs.pythonPackages) mutagen; }; + libgsystem = callPackage ../development/libraries/libgsystem { }; + + libguestfs = callPackage ../development/libraries/libguestfs { + inherit (perlPackages) libintlperl GetoptLong SysVirt; + }; + libharu = callPackage ../development/libraries/libharu { }; libHX = callPackage ../development/libraries/libHX { }; @@ -5601,6 +5896,8 @@ let liblogging = callPackage ../development/libraries/liblogging { }; + libltc = callPackage ../development/libraries/libltc { }; + libmcrypt = callPackage ../development/libraries/libmcrypt {}; libmhash = callPackage ../development/libraries/libmhash {}; @@ -5613,6 +5910,8 @@ let libnatspec = callPackage ../development/libraries/libnatspec { }; + libndp = callPackage ../development/libraries/libndp { }; + libnfc = callPackage ../development/libraries/libnfc { }; libnfsidmap = callPackage ../development/libraries/libnfsidmap { }; @@ -5636,6 +5935,8 @@ let libsamplerate = callPackage ../development/libraries/libsamplerate { }; + libsieve = callPackage ../development/libraries/libsieve { }; + libspectre = callPackage ../development/libraries/libspectre { }; libgsf = callPackage ../development/libraries/libgsf { }; @@ -5667,6 +5968,8 @@ let inherit (gnome) gtkdoc; }; + libinput = callPackage ../development/libraries/libinput { }; + libiptcdata = callPackage ../development/libraries/libiptcdata { }; libjpeg_original = callPackage ../development/libraries/libjpeg { }; @@ -5677,6 +5980,8 @@ let libtool = libtool_1_5; }; + libjreen = callPackage ../development/libraries/libjreen { }; + libjson_rpc_cpp = callPackage ../development/libraries/libjson-rpc-cpp { }; libkate = callPackage ../development/libraries/libkate { }; @@ -5746,6 +6051,10 @@ let libnetfilter_conntrack = callPackage ../development/libraries/libnetfilter_conntrack { }; + libnetfilter_cthelper = callPackage ../development/libraries/libnetfilter_cthelper { }; + + libnetfilter_cttimeout = callPackage ../development/libraries/libnetfilter_cttimeout { }; + libnetfilter_queue = callPackage ../development/libraries/libnetfilter_queue { }; libnfnetlink = callPackage ../development/libraries/libnfnetlink { }; @@ -5801,6 +6110,8 @@ let libpaper = callPackage ../development/libraries/libpaper { }; + libpfm = callPackage ../development/libraries/libpfm { }; + libproxy = callPackage ../development/libraries/libproxy { stdenv = if stdenv.isDarwin then overrideGCC stdenv gcc @@ -5846,6 +6157,8 @@ let libspatialite = callPackage ../development/libraries/libspatialite { }; + libstatgrab = callPackage ../development/libraries/libstatgrab { }; + libtar = callPackage ../development/libraries/libtar { }; libtasn1 = callPackage ../development/libraries/libtasn1 { }; @@ -5858,6 +6171,8 @@ let libtommath = callPackage ../development/libraries/libtommath { }; + libtomcrypt = callPackage ../development/libraries/libtomcrypt { }; + libtorrentRasterbar = callPackage ../development/libraries/libtorrent-rasterbar { # fix "unrecognized option -arch" error stdenv = if stdenv.isDarwin @@ -5865,6 +6180,13 @@ let else stdenv; }; + libtorrentRasterbar_0_16 = callPackage ../development/libraries/libtorrent-rasterbar/0.16.nix { + # fix "unrecognized option -arch" error + stdenv = if stdenv.isDarwin + then clangStdenv + else stdenv; + }; + libtoxcore = callPackage ../development/libraries/libtoxcore { }; libtsm = callPackage ../development/libraries/libtsm { }; @@ -5877,11 +6199,13 @@ let libgeotiff = callPackage ../development/libraries/libgeotiff { }; + libu2f-host = callPackage ../development/libraries/libu2f-host { }; + libunistring = callPackage ../development/libraries/libunistring { }; libupnp = callPackage ../development/libraries/pupnp { }; - giflib = giflib_5_0; + giflib = giflib_5_1; giflib_4_1 = callPackage ../development/libraries/giflib/4.1.nix { }; giflib_5_0 = callPackage ../development/libraries/giflib/5.0.nix { }; giflib_5_1 = callPackage ../development/libraries/giflib/5.1.nix { }; @@ -5954,6 +6278,8 @@ let libxklavier = callPackage ../development/libraries/libxklavier { }; + libxls = callPackage ../development/libraries/libxls { }; + libxmi = callPackage ../development/libraries/libxmi { }; libxml2 = callPackage ../development/libraries/libxml2 { @@ -5978,7 +6304,9 @@ let libyamlcpp = callPackage ../development/libraries/libyaml-cpp { }; - libyubikey = callPackage ../development/libraries/libyubikey {}; + libykneomgr = callPackage ../development/libraries/libykneomgr { }; + + libyubikey = callPackage ../development/libraries/libyubikey { }; libzip = callPackage ../development/libraries/libzip { }; @@ -6019,6 +6347,8 @@ let lzo = callPackage ../development/libraries/lzo { }; + matio = callPackage ../development/libraries/matio { }; + mdds_0_7_1 = callPackage ../development/libraries/mdds/0.7.1.nix { }; mdds = callPackage ../development/libraries/mdds { }; @@ -6074,18 +6404,19 @@ let miro = callPackage ../applications/video/miro { inherit (pythonPackages) pywebkitgtk pysqlite pycurl mutagen; + avahi = avahi.override { + withLibdnssdCompat = true; + }; }; mkvtoolnix = callPackage ../applications/video/mkvtoolnix { }; mlt-qt4 = callPackage ../development/libraries/mlt { qt = qt4; - SDL = SDL_pulseaudio; }; mlt-qt5 = callPackage ../development/libraries/mlt { qt = qt5; - SDL = SDL_pulseaudio; }; movit = callPackage ../development/libraries/movit { }; @@ -6196,7 +6527,7 @@ let # this ctl version is needed by openexr_viewers openexr_ctl = callPackage ../development/libraries/openexr_ctl { }; - openexr = callPackage ../development/libraries/openexr { }; + openexr = dropCxx (callPackage ../development/libraries/openexr { }); openldap = callPackage ../development/libraries/openldap { stdenv = if stdenv.isDarwin @@ -6263,6 +6594,8 @@ let physfs = callPackage ../development/libraries/physfs { }; + pipelight = callPackage ../tools/misc/pipelight { }; + pkcs11helper = callPackage ../development/libraries/pkcs11helper { }; plib = callPackage ../development/libraries/plib { }; @@ -6321,7 +6654,9 @@ let qoauth = callPackage ../development/libraries/qoauth { }; - quazip = callPackage ../development/libraries/quazip { }; + quazip = callPackage ../development/libraries/quazip { + qt = qt5; + }; qt3 = callPackage ../development/libraries/qt-3 { openglSupport = mesaSupported; @@ -6393,6 +6728,8 @@ let qtLib = qt48.override { developerBuild = true; }; }; + qtkeychain = callPackage ../development/libraries/qtkeychain { }; + qtscriptgenerator = callPackage ../development/libraries/qtscriptgenerator { }; quesoglc = callPackage ../development/libraries/quesoglc { }; @@ -6426,6 +6763,8 @@ let librdf = callPackage ../development/libraries/librdf { }; + libsmf = callPackage ../development/libraries/audio/libsmf { }; + lilv = callPackage ../development/libraries/audio/lilv { }; lv2 = callPackage ../development/libraries/audio/lv2 { }; @@ -6456,7 +6795,7 @@ let openglSupport = mesaSupported; alsaSupport = (!stdenv.isDarwin); x11Support = true; - pulseaudioSupport = stdenv.isDarwin; # better go through ALSA + pulseaudioSupport = true; # resolve the unrecognized -fpascal-strings option error stdenv = if stdenv.isDarwin @@ -6464,9 +6803,6 @@ let else stdenv; }; - # Fixes major problems with choppy sound in MLT / Kdenlive / Shotcut - SDL_pulseaudio = SDL.override { pulseaudioSupport = true; }; - SDL_gfx = callPackage ../development/libraries/SDL_gfx { }; SDL_image = callPackage ../development/libraries/SDL_image { @@ -6512,6 +6848,8 @@ let skalibs = callPackage ../development/libraries/skalibs { }; + skarnetConfCompile = callPackage ../development/tools/build-managers/skarnet { }; + slang = callPackage ../development/libraries/slang { }; slibGuile = callPackage ../development/libraries/slib { @@ -6565,14 +6903,9 @@ let srtp_linphone = callPackage ../development/libraries/srtp/linphone.nix { }; - sqlite = lowPrio (callPackage ../development/libraries/sqlite { - readline = null; - ncurses = null; - }); + sqlite = lowPrio (callPackage ../development/libraries/sqlite { }); - sqliteInteractive = appendToName "interactive" (sqlite.override { - inherit readline ncurses; - }); + sqliteInteractive = appendToName "interactive" (sqlite.override { interactive = true; }); sqlcipher = lowPrio (callPackage ../development/libraries/sqlcipher { readline = null; @@ -6613,7 +6946,9 @@ let taglib_extras = callPackage ../development/libraries/taglib-extras { }; - talloc = callPackage ../development/libraries/talloc { }; + talloc = callPackage ../development/libraries/talloc { + libgcrypt = libgcrypt_1_6; + }; tclap = callPackage ../development/libraries/tclap {}; @@ -6623,7 +6958,10 @@ let tcltls = callPackage ../development/libraries/tcltls { }; - tdb = callPackage ../development/libraries/tdb { }; + tdb = callPackage ../development/libraries/tdb { + sasl = cyrus_sasl; + libgcrypt = libgcrypt_1_6; + }; tecla = callPackage ../development/libraries/tecla { }; @@ -6633,6 +6971,11 @@ let telepathy_qt = callPackage ../development/libraries/telepathy/qt { }; + tevent = callPackage ../development/libraries/tevent { + libgcrypt = libgcrypt_1_6; + sasl = cyrus_sasl; + }; + thrift = callPackage ../development/libraries/thrift { }; tinyxml = tinyxml2; @@ -6643,7 +6986,10 @@ let tnt = callPackage ../development/libraries/tnt { }; + kyotocabinet = callPackage ../development/libraries/kyotocabinet { }; + tokyocabinet = callPackage ../development/libraries/tokyo-cabinet { }; + tokyotyrant = callPackage ../development/libraries/tokyo-tyrant { }; tremor = callPackage ../development/libraries/tremor { }; @@ -6704,17 +7050,23 @@ let webkit = webkitgtk; webkitgtk = callPackage ../development/libraries/webkitgtk { - harfbuzz = harfbuzz.override { - withIcu = true; - }; + harfbuzz = harfbuzz-icu; + inherit (xorg) libpthreadstubs; + gst-plugins-base = gst_all_1.gst-plugins-base; + }; + + webkitgtk24x = callPackage ../development/libraries/webkitgtk/2.4.6.nix { + harfbuzz = harfbuzz-icu; gst-plugins-base = gst_all_1.gst-plugins-base; }; - webkitgtk2 = webkitgtk.override { + webkitgtk2 = webkitgtk24x.override { withGtk2 = true; enableIntrospection = false; }; + websocketpp = callPackage ../development/libraries/websocket++ { }; + wildmidi = callPackage ../development/libraries/wildmidi { }; wvstreams = callPackage ../development/libraries/wvstreams { }; @@ -6750,6 +7102,10 @@ let x264 = callPackage ../development/libraries/x264 { }; + x265 = callPackage ../development/libraries/x265 { }; + + x265-hg = callPackage ../development/libraries/x265/hg.nix { }; + xapian = callPackage ../development/libraries/xapian { }; xapianBindings = callPackage ../development/libraries/xapian/bindings { # TODO perl php Java, tcl, C#, python @@ -6788,12 +7144,24 @@ let xmlsec = callPackage ../development/libraries/xmlsec { }; + xlslib = callPackage ../development/libraries/xlslib { }; + xvidcore = callPackage ../development/libraries/xvidcore { }; xylib = callPackage ../development/libraries/xylib { }; yajl = callPackage ../development/libraries/yajl { }; + yubico-piv-tool = callPackage ../tools/misc/yubico-piv-tool { }; + + yubikey-personalization = callPackage ../tools/misc/yubikey-personalization { + libusb = libusb1; + }; + + yubikey-personalization-gui = callPackage ../tools/misc/yubikey-personalization-gui { + qt = qt4; + }; + zangband = builderDefsPackage (import ../games/zangband) { inherit ncurses flex bison autoconf automake m4 coreutils; }; @@ -6812,6 +7180,8 @@ let zeromq3 = callPackage ../development/libraries/zeromq/3.x.nix {}; zeromq4 = callPackage ../development/libraries/zeromq/4.x.nix {}; + cppzmq = callPackage ../development/libraries/cppzmq {}; + zziplib = callPackage ../development/libraries/zziplib { }; ### DEVELOPMENT / LIBRARIES / AGDA @@ -6851,12 +7221,16 @@ let commonsBcel = callPackage ../development/libraries/java/commons/bcel { }; + commonsBsf = callPackage ../development/libraries/java/commons/bsf { }; + commonsCompress = callPackage ../development/libraries/java/commons/compress { }; commonsFileUpload = callPackage ../development/libraries/java/commons/fileupload { }; commonsLang = callPackage ../development/libraries/java/commons/lang { }; + commonsLogging = callPackage ../development/libraries/java/commons/logging { }; + commonsIo = callPackage ../development/libraries/java/commons/io { }; commonsMath = callPackage ../development/libraries/java/commons/math { }; @@ -6891,6 +7265,8 @@ let lucene = callPackage ../development/libraries/java/lucene { }; + lucenepp = callPackage ../development/libraries/lucene++ { }; + mockobjects = callPackage ../development/libraries/java/mockobjects { }; saxon = callPackage ../development/libraries/java/saxon { }; @@ -6971,34 +7347,34 @@ let # Therefore we do not recurse into attributes here, in contrast to # python27Packages. `nix-env -iA python26Packages.nose` works # regardless. - python26Packages = import ./python-packages.nix { - inherit pkgs; + python26Packages = callPackage ./python-packages.nix { python = python26; + self = python26Packages; }; - python27Packages = lib.hiPrioSet (recurseIntoAttrs (import ./python-packages.nix { - inherit pkgs; + python27Packages = lib.hiPrioSet (recurseIntoAttrs (callPackage ./python-packages.nix { python = python27; + self = python27Packages; })); - python32Packages = import ./python-packages.nix { - inherit pkgs; + python32Packages = callPackage ./python-packages.nix { python = python32; + self = python32Packages; }; - python33Packages = recurseIntoAttrs (import ./python-packages.nix { - inherit pkgs; + python33Packages = recurseIntoAttrs (callPackage ./python-packages.nix { python = python33; + self = python33Packages; }); - python34Packages = recurseIntoAttrs (import ./python-packages.nix { - inherit pkgs; + python34Packages = recurseIntoAttrs (callPackage ./python-packages.nix { python = python34; + self = python34Packages; }); - pypyPackages = recurseIntoAttrs (import ./python-packages.nix { - inherit pkgs; + pypyPackages = recurseIntoAttrs (callPackage ./python-packages.nix { python = pypy; + self = pypyPackages; }); foursuite = callPackage ../development/python-modules/4suite { }; @@ -7035,9 +7411,7 @@ let pylint = callPackage ../development/python-modules/pylint { }; - pyopenssl = builderDefsPackage (import ../development/python-modules/pyopenssl) { - inherit python openssl; - }; + pyopenssl = pythonPackages.pyopenssl; rhpl = callPackage ../development/python-modules/rhpl { }; @@ -7081,19 +7455,19 @@ let R = callPackage ../applications/science/math/R { inherit (xlibs) libX11 libXt; texLive = texLiveAggregationFun { paths = [ texLive texLiveExtra ]; }; - withRecommendedPackages = false; + withRecommendedPackages = true; }; rWrapper = callPackage ../development/r-modules/wrapper.nix { # Those packages are usually installed as part of the R build. - recommendedPackages = with rPackages; [ MASS lattice Matrix nlme - survival boot cluster codetools foreign KernSmooth rpart class - nnet spatial mgcv ]; + 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 = []; }; - rPackages = import ../development/r-modules/cran-packages.nix { + rPackages = import ../development/r-modules { inherit pkgs; overrides = (config.rPackageOverrides or (p: {})) pkgs; }; @@ -7102,7 +7476,7 @@ let rdf4store = callPackage ../servers/http/4store { }; - apacheHttpd = pkgs.apacheHttpd_2_2; + apacheHttpd = pkgs.apacheHttpd_2_4; apacheHttpd_2_2 = callPackage ../servers/http/apache-httpd/2.2.nix { sslSupport = true; @@ -7112,6 +7486,28 @@ let sslSupport = true; }); + apacheHttpdPackagesFor = apacheHttpd: self: let callPackage = newScope self; in { + inherit apacheHttpd; + + mod_dnssd = callPackage ../servers/http/apache-modules/mod_dnssd { }; + + mod_evasive = callPackage ../servers/http/apache-modules/mod_evasive { }; + + mod_fastcgi = callPackage ../servers/http/apache-modules/mod_fastcgi { }; + + mod_python = callPackage ../servers/http/apache-modules/mod_python { }; + + mod_wsgi = callPackage ../servers/http/apache-modules/mod_wsgi { }; + + php = pkgs.php.override { inherit apacheHttpd; }; + + subversion = pkgs.subversion.override { httpServer = true; inherit apacheHttpd; }; + }; + + apacheHttpdPackages = apacheHttpdPackagesFor pkgs.apacheHttpd pkgs.apacheHttpdPackages; + apacheHttpdPackages_2_2 = apacheHttpdPackagesFor pkgs.apacheHttpd_2_2 pkgs.apacheHttpdPackages_2_2; + apacheHttpdPackages_2_4 = apacheHttpdPackagesFor pkgs.apacheHttpd_2_4 pkgs.apacheHttpdPackages_2_4; + cassandra = callPackage ../servers/nosql/cassandra { }; apache-jena = callPackage ../servers/nosql/apache-jena/binary.nix { @@ -7126,6 +7522,9 @@ let bird = callPackage ../servers/bird { }; + bosun = callPackage ../servers/monitoring/bosun {}; + scollector = callPackage ../servers/monitoring/bosun/scollector.nix {}; + couchdb = callPackage ../servers/http/couchdb { spidermonkey = spidermonkey_185; python = python27; @@ -7167,6 +7566,12 @@ let erlang = erlangR16; }; + prosody = recurseIntoAttrs ( + callPackage ../servers/xmpp/prosody { + lua5 = lua5_1; + inherit (lua51Packages) luasocket luasec luaexpat luafilesystem luabitop; + }); + elasticmq = callPackage ../servers/elasticmq { }; etcdctl = callPackage ../development/tools/etcdctl { }; @@ -7188,9 +7593,7 @@ let freeswitch = callPackage ../servers/sip/freeswitch { }; - ghostOne = callPackage ../servers/games/ghost-one { - boost = boost144.override { taggedLayout = true; }; - }; + ghostOne = callPackage ../servers/games/ghost-one { }; ircdHybrid = callPackage ../servers/irc/ircd-hybrid { }; @@ -7202,6 +7605,8 @@ let jetty61 = callPackage ../servers/http/jetty/6.1 { }; + jetty92 = callPackage ../servers/http/jetty/9.2.nix { }; + joseki = callPackage ../servers/http/joseki {}; leafnode = callPackage ../servers/news/leafnode { }; @@ -7210,19 +7615,18 @@ let mailman = callPackage ../servers/mail/mailman { }; - mediatomb = callPackage ../servers/mediatomb { }; + mediatomb = callPackage ../servers/mediatomb { + spidermonkey = spidermonkey_185; + }; memcached = callPackage ../servers/memcached {}; - mod_dnssd = callPackage ../servers/http/apache-modules/mod_dnssd/default.nix { }; - - mod_evasive = callPackage ../servers/http/apache-modules/mod_evasive { }; - - mod_python = callPackage ../servers/http/apache-modules/mod_python { }; - - mod_fastcgi = callPackage ../servers/http/apache-modules/mod_fastcgi { }; - - mod_wsgi = callPackage ../servers/http/apache-modules/mod_wsgi { }; + # Backwards compatibility. + mod_dnssd = pkgs.apacheHttpdPackages.mod_dnssd; + mod_evasive = pkgs.apacheHttpdPackages.mod_evasive; + mod_fastcgi = pkgs.apacheHttpdPackages.mod_fastcgi; + mod_python = pkgs.apacheHttpdPackages.mod_python; + mod_wsgi = pkgs.apacheHttpdPackages.mod_wsgi; mpd = callPackage ../servers/mpd { aacSupport = config.mpd.aacSupport or true; @@ -7240,7 +7644,12 @@ let nginx = callPackage ../servers/http/nginx { rtmp = true; fullWebDAV = true; - syslog = true; + syslog = false; # the patch is not found + moreheaders = true; + }; + nginxUnstable = callPackage ../servers/http/nginx/unstable.nix { + fullWebDAV = true; + syslog = false; # the patch is not found moreheaders = true; }; @@ -7292,6 +7701,7 @@ let mariadb = callPackage ../servers/sql/mariadb {}; mongodb = callPackage ../servers/nosql/mongodb { + boost = boost156; sasl = cyrus_sasl; }; @@ -7330,6 +7740,16 @@ let OVMF = callPackage ../applications/virtualization/OVMF { }; + pgpool92 = callPackage ../servers/sql/pgpool/default.nix { + postgresql = postgresql92; + }; + + pgpool93 = callPackage ../servers/sql/pgpool/default.nix { + postgresql = postgresql93; + }; + + pgpool = pgpool92; + postgresql = postgresql92; postgresql84 = callPackage ../servers/sql/postgresql/8.4.x.nix { }; @@ -7342,7 +7762,9 @@ let postgresql93 = callPackage ../servers/sql/postgresql/9.3.x.nix { }; - postgresql94 = callPackage ../servers/sql/postgresql/9.4.x.nix { }; + postgresql94beta2 = callPackage ../servers/sql/postgresql/9.4beta2.nix { }; + postgresql94beta3 = callPackage ../servers/sql/postgresql/9.4beta3.nix { }; + postgresql94 = postgresql94beta3; postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { }; @@ -7368,9 +7790,13 @@ let restund = callPackage ../servers/restund {}; - rethinkdb = callPackage ../servers/nosql/rethinkdb { }; + rethinkdb = callPackage ../servers/nosql/rethinkdb { + boost = boost155; + }; - rippled = callPackage ../servers/rippled { }; + rippled = callPackage ../servers/rippled { + boost = boost155; + }; s6 = callPackage ../servers/s6 { }; @@ -7449,13 +7875,11 @@ let xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix { inherit clangStdenv fetchurl fetchgit fetchpatch stdenv pkgconfig intltool freetype fontconfig libxslt expat libpng zlib perl mesa_drivers spice_protocol - dbus libuuid openssl gperf m4 + dbus libuuid openssl gperf m4 libevdev autoconf automake libtool xmlto asciidoc flex bison python mtdev pixman; mesa = mesa_noglu; udev = if stdenv.isLinux then udev else null; libdrm = if stdenv.isLinux then libdrm else null; - } // { - xf86videointel-testing = callPackage ../servers/x11/xorg/xf86-video-intel-testing.nix { }; }); xorgReplacements = callPackage ../servers/x11/xorg/replacements.nix { }; @@ -7555,6 +7979,8 @@ let weatherXoap = config.conky.weatherXoap or false; }; + conntrack_tools = callPackage ../os-specific/linux/conntrack-tools { }; + cpufrequtils = callPackage ../os-specific/linux/cpufrequtils { }; cryopid = callPackage ../os-specific/linux/cryopid { }; @@ -7639,6 +8065,10 @@ let then utillinux else null; + light = callPackage ../os-specific/linux/light { }; + + lightum = callPackage ../os-specific/linux/lightum { }; + e3cfsprogs = callPackage ../os-specific/linux/e3cfsprogs { }; ebtables = callPackage ../os-specific/linux/ebtables { }; @@ -7702,6 +8132,10 @@ let iw = callPackage ../os-specific/linux/iw { }; + iwlwifi = callPackage ../os-specific/linux/firmware/iwlwifi { }; + + iwlegacy = callPackage ../os-specific/linux/firmware/iwlegacy { }; + jujuutils = callPackage ../os-specific/linux/jujuutils { }; kbd = callPackage ../os-specific/linux/kbd { }; @@ -7719,7 +8153,6 @@ let libcgroup = callPackage ../os-specific/linux/libcgroup { }; libnl = callPackage ../os-specific/linux/libnl { }; - libnl_3_2_19 = callPackage ../os-specific/linux/libnl/3.2.19.nix { }; linuxConsoleTools = callPackage ../os-specific/linux/consoletools { }; @@ -7795,15 +8228,6 @@ let ]; }; - linux_3_15 = makeOverridable (import ../os-specific/linux/kernel/linux-3.15.nix) { - inherit fetchurl stdenv perl buildLinux; - kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 - ]; - }; - linux_3_16 = makeOverridable (import ../os-specific/linux/kernel/linux-3.16.nix) { inherit fetchurl stdenv perl buildLinux; kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips") @@ -7902,10 +8326,11 @@ let nvidiabl = callPackage ../os-specific/linux/nvidiabl { }; - nvidia_x11 = callPackage ../os-specific/linux/nvidia-x11 { }; + nvidia_x11 = self.nvidia_x11_legacy340; nvidia_x11_legacy173 = callPackage ../os-specific/linux/nvidia-x11/legacy173.nix { }; nvidia_x11_legacy304 = callPackage ../os-specific/linux/nvidia-x11/legacy304.nix { }; + nvidia_x11_legacy340 = callPackage ../os-specific/linux/nvidia-x11/legacy340.nix { }; openafsClient = callPackage ../servers/openafs-client { }; @@ -7929,6 +8354,8 @@ let perf = callPackage ../os-specific/linux/kernel/perf.nix { }; + prl-tools = callPackage ../os-specific/linux/prl-tools { }; + psmouse_alps = callPackage ../os-specific/linux/psmouse-alps { }; seturgent = callPackage ../os-specific/linux/seturgent { }; @@ -7946,6 +8373,7 @@ let stdenv = stdenv_32bit; inherit (gnome) libIDL; enableExtensionPack = config.virtualbox.enableExtensionPack or false; + pulseSupport = config.pulseaudio or false; }; virtualboxGuestAdditions = callPackage ../applications/virtualization/virtualbox/guest-additions { }; @@ -7956,7 +8384,7 @@ let # The current default kernel / kernel modules. linux = linuxPackages.kernel; - linuxPackages = linuxPackages_3_12; + linuxPackages = linuxPackages_3_14; # Update this when adding the newest kernel major version! linux_latest = pkgs.linux_3_17; @@ -7970,7 +8398,6 @@ let linuxPackages_3_10_tuxonice = linuxPackagesFor pkgs.linux_3_10_tuxonice linuxPackages_3_10_tuxonice; linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12); linuxPackages_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_14 linuxPackages_3_14); - linuxPackages_3_15 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_15 linuxPackages_3_15); linuxPackages_3_16 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_16 linuxPackages_3_16); linuxPackages_3_17 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_17 linuxPackages_3_17); linuxPackages_testing = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing linuxPackages_testing); @@ -8067,6 +8494,10 @@ let gocode = callPackage ../development/tools/gocode { }; + gotags = callPackage ../development/tools/gotags { }; + + golint = callPackage ../development/tools/golint { }; + gogoclient = callPackage ../os-specific/linux/gogoclient { }; nss_ldap = callPackage ../os-specific/linux/nss_ldap { }; @@ -8234,6 +8665,7 @@ let udev145 = callPackage ../os-specific/linux/udev/145.nix { }; udev = pkgs.systemd; + eudev = callPackage ../os-specific/linux/eudev {}; udisks1 = callPackage ../os-specific/linux/udisks/1-default.nix { }; udisks2 = callPackage ../os-specific/linux/udisks/2-default.nix { }; @@ -8447,7 +8879,9 @@ let kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 {}; - liberation_ttf = callPackage ../data/fonts/redhat-liberation-fonts { }; + liberation_ttf_from_source = callPackage ../data/fonts/redhat-liberation-fonts { }; + liberation_ttf_binary = callPackage ../data/fonts/redhat-liberation-fonts/binary.nix { }; + liberation_ttf = liberation_ttf_binary; libertine = builderDefsPackage (import ../data/fonts/libertine) { inherit fetchurl fontforge lib; @@ -8461,6 +8895,8 @@ let manpages = callPackage ../data/documentation/man-pages { }; + meslo-lg = callPackage ../data/fonts/meslo-lg {}; + miscfiles = callPackage ../data/misc/miscfiles { }; mobile_broadband_provider_info = callPackage ../data/misc/mobile-broadband-provider-info { }; @@ -8501,6 +8937,8 @@ let r5rs = callPackage ../data/documentation/rnrs/r5rs.nix { }; + hasklig = callPackage ../data/fonts/hasklig {}; + source-code-pro = callPackage ../data/fonts/source-code-pro {}; source-sans-pro = callPackage ../data/fonts/source-sans-pro { }; @@ -8592,6 +9030,9 @@ let alock = callPackage ../misc/screensavers/alock { }; + alpine = callPackage ../applications/networking/mailreaders/alpine {}; + realpine = callPackage ../applications/networking/mailreaders/realpine {}; + ams-lv2 = callPackage ../applications/audio/ams-lv2 { }; amsn = callPackage ../applications/networking/instant-messengers/amsn { }; @@ -8683,7 +9124,8 @@ let altcoins = recurseIntoAttrs ( (callPackage ../applications/misc/bitcoin/altcoins.nix {}) // - (callPackage ../applications/misc/bitcoin/dogecoin.nix {}) + (callPackage ../applications/misc/bitcoin/dogecoin.nix {}) // + (callPackage ../applications/misc/bitcoin/litecoin.nix {}) ); bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { }; @@ -8692,6 +9134,10 @@ let python = python34; }; + bluefish = callPackage ../applications/editors/bluefish { + gtk = gtk3; + }; + bristol = callPackage ../applications/audio/bristol { }; bspwm = callPackage ../applications/window-managers/bspwm { }; @@ -8742,16 +9188,24 @@ let channel = "stable"; pulseSupport = config.pulseaudio or true; enablePepperFlash = config.chromium.enablePepperFlash or false; - enablePepperPDF = config.chromium.enablePepperPDF or false; + enableWideVine = config.chromium.enableWideVine or false; hiDPISupport = config.chromium.hiDPISupport or false; }; + chronos = callPackage ../applications/networking/cluster/chronos { }; + chromiumBeta = lowPrio (chromium.override { channel = "beta"; }); chromiumDev = lowPrio (chromium.override { channel = "dev"; }); + chuck = callPackage ../applications/audio/chuck { }; + cinelerra = callPackage ../applications/video/cinelerra { }; + clawsMail = callPackage ../applications/networking/mailreaders/claws-mail { + enableNetworkManager = config.networking.networkmanager.enable or false; + }; + clipit = callPackage ../applications/misc/clipit { }; cmplayer = callPackage ../applications/video/cmplayer { @@ -8762,7 +9216,6 @@ let compiz = callPackage ../applications/window-managers/compiz { inherit (gnome) GConf ORBit2 metacity; - boost = boost149; # https://bugs.launchpad.net/compiz/+bug/1131864 }; coriander = callPackage ../applications/video/coriander { @@ -8846,17 +9299,19 @@ let enableXft = config.dmenu.enableXft or false; }; - dmtx = builderDefsPackage (import ../tools/graphics/dmtx) { - inherit libpng libtiff libjpeg imagemagick librsvg - pkgconfig bzip2 zlib libtool freetype fontconfig - ghostscript jasper xz; - inherit (xlibs) libX11; + dmenu2 = callPackage ../applications/misc/dmenu2 { }; + + dmtx = dmtx-utils; + + dmtx-utils = callPackage (import ../tools/graphics/dmtx-utils) { }; docker = callPackage ../applications/virtualization/docker { }; doodle = callPackage ../applications/search/doodle { }; + drumgizmo = callPackage ../applications/audio/drumgizmo { inherit (xlibs) libX11; }; + dunst = callPackage ../applications/misc/dunst { }; dvb_apps = callPackage ../applications/video/dvb-apps { }; @@ -8896,7 +9351,6 @@ let libXaw = xlibs.libXaw; Xaw3d = null; gconf = null; - librsvg = null; alsaLib = null; imagemagick = null; }; @@ -8905,9 +9359,13 @@ let withX = false; })); - emacs24Macport = lowPrio (callPackage ../applications/editors/emacs-24/macport.nix { + emacs24Macport_24_3 = lowPrio (callPackage ../applications/editors/emacs-24/macport-24.3.nix { + stdenv = pkgs.clangStdenv; + }); + emacs24Macport_24_4 = lowPrio (callPackage ../applications/editors/emacs-24/macport-24.4.nix { stdenv = pkgs.clangStdenv; }); + emacs24Macport = self.emacs24Macport_24_4; emacsPackages = emacs: self: let callPackage = newScope self; in rec { inherit emacs; @@ -8958,12 +9416,18 @@ let gist = callPackage ../applications/editors/emacs-modes/gist { }; + gitModes = callPackage ../applications/editors/emacs-modes/git-modes { }; + haskellMode = callPackage ../applications/editors/emacs-modes/haskell { }; + hsc3Mode = callPackage ../applications/editors/emacs-modes/hsc3 { }; + hol_light_mode = callPackage ../applications/editors/emacs-modes/hol_light { }; htmlize = callPackage ../applications/editors/emacs-modes/htmlize { }; + icicles = callPackage ../applications/editors/emacs-modes/icicles { }; + idris = callPackage ../applications/editors/emacs-modes/idris { }; jabber = callPackage ../applications/editors/emacs-modes/jabber { }; @@ -8984,7 +9448,7 @@ let metaweblog = callPackage ../applications/editors/emacs-modes/metaweblog { }; - notmuch = lowPrio (callPackage ../applications/networking/mailreaders/notmuch { }); + notmuch = lowPrio (pkgs.notmuch.override { inherit emacs; }); ocamlMode = callPackage ../applications/editors/emacs-modes/ocaml { }; @@ -9036,7 +9500,8 @@ let stratego = callPackage ../applications/editors/emacs-modes/stratego { }; structuredHaskellMode = callPackage ../applications/editors/emacs-modes/structured-haskell-mode { - inherit (haskellPackages) cabal haskellSrcExts; + inherit (haskellPackages) cabal ; + haskellSrcExts = haskellPackages.haskellSrcExts_1_15_0_1; }; sunriseCommander = callPackage ../applications/editors/emacs-modes/sunrise-commander { }; @@ -9098,12 +9563,16 @@ let fluidsynth = callPackage ../applications/audio/fluidsynth { }; + focuswriter = callPackage ../applications/editors/focuswriter { }; + fossil = callPackage ../applications/version-management/fossil { }; freewheeling = callPackage ../applications/audio/freewheeling { }; fribid = callPackage ../applications/networking/browsers/mozilla-plugins/fribid { }; + fritzing = callPackage ../applications/science/electronics/fritzing { }; + fvwm = callPackage ../applications/window-managers/fvwm { }; geany = callPackage ../applications/editors/geany { }; @@ -9174,12 +9643,6 @@ let filezilla = callPackage ../applications/networking/ftp/filezilla { }; - firefox13Pkgs = callPackage ../applications/networking/browsers/firefox/13.0.nix { - inherit (gnome) libIDL; - }; - - firefox13Wrapper = wrapFirefox { browser = firefox13Pkgs.firefox; }; - firefox = callPackage ../applications/networking/browsers/firefox { inherit (gnome) libIDL; inherit (pythonPackages) pysqlite; @@ -9190,8 +9653,8 @@ let firefox-bin = callPackage ../applications/networking/browsers/firefox-bin { gconf = pkgs.gnome.GConf; inherit (pkgs.gnome) libgnome libgnomeui; - inherit (pkgs.xlibs) libX11 libXScrnSaver libXext - libXinerama libXrender libXt; + inherit (pkgs.xlibs) libX11 libXScrnSaver libXcomposite libXdamage libXext + libXfixes libXinerama libXrender libXt; }; flac = callPackage ../applications/audio/flac { }; @@ -9208,6 +9671,7 @@ let }; freecad = callPackage ../applications/graphics/freecad { + boost = boost156; opencascade = opencascade_6_5; inherit (pythonPackages) matplotlib pycollada; }; @@ -9261,6 +9725,10 @@ let }); git = gitAndTools.git; gitFull = gitAndTools.gitFull; + gitMinimal = git.override { + withManual = false; + pythonSupport = false; + }; gitSVN = gitAndTools.gitSVN; gitRepo = callPackage ../applications/version-management/git-repo { @@ -9285,7 +9753,7 @@ let goffice = goffice_0_8; }; - goffice_0_8 = callPackage ../desktops/gnome-3/3.10/misc/goffice/0.8.nix { + goffice_0_8 = callPackage ../desktops/gnome-3/3.12/misc/goffice/0.8.nix { inherit (gnome2) libglade libgnomeui; gconf = gnome2.GConf; libart = gnome2.libart_lgpl; @@ -9346,6 +9814,8 @@ let inherit libgphoto2 fuse pkgconfig glib libtool; }; + gramps = callPackage ../applications/misc/gramps { }; + graphicsmagick = callPackage ../applications/graphics/graphicsmagick { }; graphicsmagick_q16 = callPackage ../applications/graphics/graphicsmagick { quantumdepth = 16; }; @@ -9354,6 +9824,7 @@ let }; gtkpod = callPackage ../applications/audio/gtkpod { + gnome = gnome3; inherit (gnome) libglade; }; @@ -9379,7 +9850,9 @@ let gqview = callPackage ../applications/graphics/gqview { }; - gmpc = callPackage ../applications/audio/gmpc { }; + gmpc = callPackage ../applications/audio/gmpc { + inherit (xlibs) libSM libICE; + }; gmtk = callPackage ../applications/networking/browsers/mozilla-plugins/gmtk { inherit (gnome) GConf; @@ -9391,9 +9864,7 @@ let libpng = libpng12; }; - gosmore = builderDefsPackage ../applications/misc/gosmore { - inherit fetchsvn curl pkgconfig libxml2 gtk; - }; + gosmore = callPackage ../applications/misc/gosmore { }; gpsbabel = callPackage ../applications/misc/gpsbabel { }; @@ -9425,7 +9896,9 @@ let fltk = fltk13; }; - hugin = callPackage ../applications/graphics/hugin { }; + hugin = callPackage ../applications/graphics/hugin { + boost = boost155; + }; hydrogen = callPackage ../applications/audio/hydrogen { }; @@ -9526,7 +9999,7 @@ let k3d = callPackage ../applications/graphics/k3d { inherit (pkgs.gnome2) gtkglext; - boost = boost149; + boost = boost155; }; keepnote = callPackage ../applications/office/keepnote { @@ -9547,6 +10020,8 @@ let koji = callPackage ../tools/package-management/koji { }; + kubernetes = callPackage ../applications/networking/cluster/kubernetes { }; + lame = callPackage ../applications/audio/lame { }; larswm = callPackage ../applications/window-managers/larswm { }; @@ -9567,12 +10042,16 @@ let lbdb = callPackage ../tools/misc/lbdb { }; + lbzip2 = callPackage ../tools/compression/lbzip2 { }; + lci = callPackage ../applications/science/logic/lci {}; ldcpp = callPackage ../applications/networking/p2p/ldcpp { inherit (gnome) libglade; }; + libowfat = callPackage ../development/libraries/libowfat { }; + librecad = callPackage ../applications/misc/librecad { }; librecad2 = callPackage ../applications/misc/librecad/2.0.nix { }; @@ -9582,6 +10061,7 @@ let inherit (gnome) GConf ORBit2 gnome_vfs; zip = zip.override { enableNLS = false; }; jdk = openjdk; + boost = boost155; fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf xorg.fontmiscmisc xorg.fontbhttf @@ -9594,7 +10074,9 @@ let }; }; - liferea = callPackage ../applications/networking/newsreaders/liferea { }; + liferea = callPackage ../applications/networking/newsreaders/liferea { + webkitgtk = webkitgtk24x; + }; lingot = callPackage ../applications/audio/lingot { inherit (gnome) libglade; @@ -9602,8 +10084,9 @@ let links = callPackage ../applications/networking/browsers/links { }; - ledger = callPackage ../applications/office/ledger/2.6.3.nix { }; - ledger3 = callPackage ../applications/office/ledger/3.0.nix { }; + ledger2 = callPackage ../applications/office/ledger/2.6.3.nix { }; + ledger3 = callPackage ../applications/office/ledger { }; + ledger = ledger3; lighttable = callPackage ../applications/editors/lighttable {}; @@ -9619,7 +10102,10 @@ let bison = bison2; }; - llpp = callPackage ../applications/misc/llpp { inherit (ocamlPackages) lablgl; }; + llpp = callPackage ../applications/misc/llpp { + inherit (ocamlPackages_4_02_1) lablgl findlib; + ocaml = ocaml_4_02_1; + }; lmms = callPackage ../applications/audio/lmms { }; @@ -9629,7 +10115,9 @@ let lxdvdrip = callPackage ../applications/video/lxdvdrip { }; - handbrake = callPackage ../applications/video/handbrake { }; + handbrake = callPackage ../applications/video/handbrake { + webkitgtk = webkitgtk24x; + }; lilyterm = callPackage ../applications/misc/lilyterm { inherit (gnome) vte; @@ -9670,7 +10158,9 @@ let mid2key = callPackage ../applications/audio/mid2key { }; - midori = callPackage ../applications/networking/browsers/midori { }; + midori = callPackage ../applications/networking/browsers/midori { + webkitgtk = webkitgtk24x; + }; midoriWrapper = wrapFirefox { browser = midori; browserName = "midori"; desktopName = "Midori"; @@ -9711,7 +10201,6 @@ let monotone = callPackage ../applications/version-management/monotone { lua = lua5; - boost = boost149; }; monotoneViz = builderDefsPackage (import ../applications/version-management/monotone-viz/mtn-head.nix) { @@ -9726,6 +10215,8 @@ let mopidy-moped = callPackage ../applications/audio/mopidy-moped { }; + mopidy-mopify = callPackage ../applications/audio/mopidy-mopify { }; + mozilla = callPackage ../applications/networking/browsers/mozilla { inherit (gnome) libIDL; }; @@ -9735,7 +10226,9 @@ let inherit (xlibs) libX11 xproto; }; - easytag = callPackage ../applications/audio/easytag { }; + easytag = callPackage ../applications/audio/easytag { + inherit (gnome3) gnome_icon_theme; + }; mp3info = callPackage ../applications/audio/mp3info { }; @@ -9776,7 +10269,7 @@ let lua = lua5_1; lua5_sockets = lua5_1_sockets; bs2bSupport = config.mpv.bs2bSupport or true; - quviSupport = config.mpv.quviSupport or false; + youtubeSupport = config.mpv.youtubeSupport or true; cacaSupport = config.mpv.cacaSupport or true; vaapiSupport = config.mpv.vaapiSupport or false; }; @@ -9809,6 +10302,9 @@ let musescore = callPackage ../applications/audio/musescore { }; mutt = callPackage ../applications/networking/mailreaders/mutt { }; + mutt-with-sidebar = callPackage ../applications/networking/mailreaders/mutt { + withSidebar = true; + }; namecoin = callPackage ../applications/misc/namecoin { }; namecoinqt = callPackage ../applications/misc/namecoin/qt.nix { }; @@ -9826,6 +10322,8 @@ let smplayer = callPackage ../applications/video/smplayer { }; + smtube = callPackage ../applications/video/smtube {}; + sup = with rubyLibs; callPackage ../applications/networking/mailreaders/sup { ruby = ruby_1_9_3.override { cursesSupport = true; @@ -9895,8 +10393,11 @@ let netsurf = recurseIntoAttrs (import ../applications/networking/browsers/netsurf { inherit pkgs; }); notmuch = callPackage ../applications/networking/mailreaders/notmuch { - # use emacsPackages.notmuch if you want emacs support + # No need to build Emacs - notmuch.el works just fine without + # byte-compilation. Use emacs24Packages.notmuch if you want to + # byte-compiled files emacs = null; + sphinx = pythonPackages.sphinx; }; nova = callPackage ../applications/virtualization/nova { }; @@ -9970,7 +10471,10 @@ let pianobooster = callPackage ../applications/audio/pianobooster { }; - picard = callPackage ../applications/audio/picard { }; + picard = callPackage ../applications/audio/picard { + python-libdiscid = pythonPackages.discid; + mutagen = pythonPackages.mutagen; + }; picocom = callPackage ../tools/misc/picocom { }; @@ -9979,17 +10483,16 @@ let gnutls = if config.pidgin.gnutls or false then gnutls else null; libgcrypt = if config.pidgin.gnutls or false then libgcrypt else null; startupnotification = libstartup_notification; + inherit (xlibs) libXext libICE libSM; }; - pidginlatex = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-latex { - imagemagick = imagemagickBig; + pidgin-with-plugins = callPackage ../applications/networking/instant-messengers/pidgin/wrapper.nix { + plugins = []; }; - pidginlatexSF = builderDefsPackage - (import ../applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix) - { - inherit pkgconfig pidgin texLive imagemagick which glib gtk; - }; + pidginlatex = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-latex { }; + + pidginlatexSF = pidginlatex; pidginmsnpecan = callPackage ../applications/networking/instant-messengers/pidgin-plugins/msn-pecan { }; @@ -9997,10 +10500,14 @@ let pidginsipe = callPackage ../applications/networking/instant-messengers/pidgin-plugins/sipe { }; + pidginwindowmerge = callPackage ../applications/networking/instant-messengers/pidgin-plugins/window-merge { }; + toxprpl = callPackage ../applications/networking/instant-messengers/pidgin-plugins/tox-prpl { }; pinfo = callPackage ../applications/misc/pinfo { }; + pinpoint = callPackage ../applications/office/pinpoint {}; + pinta = callPackage ../applications/graphics/pinta { gtksharp = gtksharp2; }; @@ -10009,6 +10516,8 @@ let inherit (xorg) libXpm; }; + pond = callPackage ../applications/networking/pond { }; + potrace = callPackage ../applications/graphics/potrace {}; posterazor = callPackage ../applications/misc/posterazor { }; @@ -10031,7 +10540,10 @@ let pythonmagick = callPackage ../applications/graphics/PythonMagick { }; - qbittorrent = callPackage ../applications/networking/p2p/qbittorrent { }; + qbittorrent = callPackage ../applications/networking/p2p/qbittorrent { + boost = boost156; + libtorrentRasterbar = libtorrentRasterbar_0_16; + }; eiskaltdcpp = callPackage ../applications/networking/p2p/eiskaltdcpp { lua5 = lua5_1; }; @@ -10039,6 +10551,8 @@ let qmmp = callPackage ../applications/audio/qmmp { }; + qrcode = callPackage ../tools/graphics/qrcode {}; + qsampler = callPackage ../applications/audio/qsampler { }; qsynth = callPackage ../applications/audio/qsynth { }; @@ -10049,6 +10563,8 @@ let qtractor = callPackage ../applications/audio/qtractor { }; + quirc = callPackage ../tools/graphics/quirc {}; + quodlibet = callPackage ../applications/audio/quodlibet { inherit (pythonPackages) mutagen; }; @@ -10106,6 +10622,14 @@ let unicode3Support = true; }; + # urxvt plugins + urxvt_perls = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-perls { }; + urxvt_tabbedex = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-tabbedex { }; + + rxvt_unicode_with-plugins = callPackage ../applications/misc/rxvt_unicode/wrapper.nix { + plugins = [ urxvt_perls urxvt_tabbedex ]; + }; + sakura = callPackage ../applications/misc/sakura { inherit (gnome) vte; }; @@ -10120,9 +10644,7 @@ let seafile-client = callPackage ../applications/networking/seafile-client { }; - seeks = callPackage ../tools/networking/p2p/seeks { - opencv = opencv_2_1; - }; + seeks = callPackage ../tools/networking/p2p/seeks { }; seg3d = callPackage ../applications/graphics/seg3d { wxGTK = wxGTK28.override { unicode = false; }; @@ -10144,6 +10666,8 @@ let skype_call_recorder = callPackage ../applications/networking/instant-messengers/skype-call-recorder { }; + slmenu = callPackage ../applications/misc/slmenu {}; + slrn = callPackage ../applications/networking/newsreaders/slrn { }; spideroak = callPackage ../applications/networking/spideroak { }; @@ -10203,13 +10727,15 @@ let smartdeblur = callPackage ../applications/graphics/smartdeblur { }; - snapper = callPackage ../tools/misc/snapper { }; + snapper = callPackage ../tools/misc/snapper { + btrfsProgs = btrfsProgs-3_16; + }; snd = callPackage ../applications/audio/snd { }; shntool = callPackage ../applications/audio/shntool { }; - sonic_visualiser = callPackage ../applications/audio/sonic-visualiser { + sonic-visualiser = callPackage ../applications/audio/sonic-visualiser { inherit (pkgs.vamp) vampSDK; inherit (pkgs.xlibs) libX11; fftw = pkgs.fftwSinglePrec; @@ -10228,11 +10754,17 @@ let apiKey = config.libspotify.apiKey or null; }; + src = callPackage ../applications/version-management/src/default.nix { + git = gitMinimal; + }; + stalonetray = callPackage ../applications/window-managers/stalonetray {}; stp = callPackage ../applications/science/logic/stp {}; - stumpwm = lispPackages.stumpwm; + stumpwm = callPackage ../applications/window-managers/stumpwm { + stumpwmContrib = callPackage ../applications/window-managers/stumpwm/contrib.nix { }; + }; sublime = callPackage ../applications/editors/sublime { }; @@ -10246,7 +10778,6 @@ let perlBindings = false; javahlBindings = false; saslSupport = false; - httpd = apacheHttpd; sasl = cyrus_sasl; }; @@ -10278,6 +10809,8 @@ let tabbed = callPackage ../applications/window-managers/tabbed { }; + tagainijisho = callPackage ../applications/office/tagainijisho {}; + tahoelafs = callPackage ../tools/networking/p2p/tahoe-lafs { inherit (pythonPackages) twisted foolscap simplejson nevow zfec pycryptopp sqlite3 darcsver setuptoolsTrial setuptoolsDarcs @@ -10359,6 +10892,13 @@ let todo-txt-cli = callPackage ../applications/office/todo.txt-cli { }; + tomahawk = callPackage ../applications/audio/tomahawk { + inherit (pkgs.kde4) kdelibs; + enableXMPP = config.tomahawk.enableXMPP or true; + enableKDE = config.tomahawk.enableKDE or false; + enableTelepathy = config.tomahawk.enableTelepathy or false; + }; + torchat = callPackage ../applications/networking/instant-messengers/torchat { wrapPython = pythonPackages.wrapPython; }; @@ -10426,11 +10966,11 @@ let vim = callPackage ../applications/editors/vim { }; - macvim = callPackage ../applications/editors/vim/macvim.nix { }; + macvim = callPackage ../applications/editors/vim/macvim.nix { stdenv = clangStdenv; }; vimHugeX = vim_configurable; - vim_configurable = callPackage ../applications/editors/vim/configurable.nix { + vim_configurable = vimrc.makeCustomizable (callPackage ../applications/editors/vim/configurable.nix { inherit (pkgs) fetchurl fetchhg stdenv ncurses pkgconfig gettext composableDerivation lib config glib gtk python perl tcl ruby; inherit (pkgs.xlibs) libX11 libXext libSM libXpm libXt libXaw libXau libXmu @@ -10445,10 +10985,12 @@ let # so that we can use gccApple if we're building on darwin inherit stdenvAdapters gccApple; - }; + }); vimNox = lowPrio (vim_configurable.override { source = "vim-nox"; }); + qpdfview = callPackage ../applications/misc/qpdfview {}; + qvim = lowPrio (callPackage ../applications/editors/vim/qvim.nix { inherit (pkgs) fetchgit stdenv ncurses pkgconfig gettext composableDerivation lib config python perl tcl ruby qt4; @@ -10464,6 +11006,10 @@ let vimpc = callPackage ../applications/audio/vimpc { }; + neovim = callPackage ../applications/editors/neovim { + inherit (lua52Packages) lpeg luaMessagePack luabitop; + }; + virtviewer = callPackage ../applications/virtualization/virt-viewer { gtkvnc = gtkvnc.override { enableGTK3 = true; }; spice_gtk = spice_gtk.override { enableGTK3 = true; }; @@ -10480,7 +11026,28 @@ let virtualgl = callPackage ../tools/X11/virtualgl { }; - bumblebee = callPackage ../tools/X11/bumblebee { }; + primus = callPackage ../tools/X11/primus { + primusLib = callPackage ../tools/X11/primus/lib.nix { + nvidia = linuxPackages.nvidia_x11; + }; + + primusLib_i686 = if system == "x86_64-linux" + then callPackage_i686 ../tools/X11/primus/lib.nix { + nvidia = pkgsi686Linux.linuxPackages.nvidia_x11.override { libsOnly = true; }; + } + else null; + }; + + bumblebee = callPackage ../tools/X11/bumblebee { + nvidia_x11 = linuxPackages.nvidia_x11; + nvidia_x11_i686 = if system == "x86_64-linux" + then pkgsi686Linux.linuxPackages.nvidia_x11.override { libsOnly = true; } + else null; + virtualgl = virtualgl; + virtualgl_i686 = if system == "x86_64-linux" + then pkgsi686Linux.virtualgl + else null; + }; vkeybd = callPackage ../applications/audio/vkeybd { inherit (xlibs) libX11; @@ -10512,7 +11079,18 @@ let weechatDevel = lowPrio (callPackage ../applications/networking/irc/weechat/devel.nix { }); - weston = callPackage ../applications/window-managers/weston { }; + westonLite = callPackage ../applications/window-managers/weston { + pango = null; + freerdp = null; + libunwind = null; + vaapi = null; + libva = null; + libwebp = null; + }; + + weston = callPackage ../applications/window-managers/weston { + freerdp = freerdpUnstable; + }; windowmaker = callPackage ../applications/window-managers/windowmaker { }; @@ -10589,14 +11167,19 @@ let ++ optional (cfg.enableFceumm or false) fceumm ++ optional (cfg.enableGambatte or false) gambatte ++ optional (cfg.enableGenesisPlusGX or false) genesis-plus-gx + ++ optional (cfg.enableMednafenPCEFast or false) mednafen-pce-fast ++ optional (cfg.enableMupen64Plus or false) mupen64plus + ++ optional (cfg.enableNestopia or false) nestopia ++ optional (cfg.enablePicodrive or false) picodrive ++ optional (cfg.enablePrboom or false) prboom ++ optional (cfg.enablePPSSPP or false) ppsspp + ++ optional (cfg.enableQuickNES or false) quicknes ++ optional (cfg.enableScummVM or false) scummvm + ++ optional (cfg.enableSnes9x or false) snes9x ++ optional (cfg.enableSnes9xNext or false) snes9x-next ++ optional (cfg.enableStella or false) stella ++ optional (cfg.enableVbaNext or false) vba-next + ++ optional (cfg.enableVbaM or false) vba-m ); wrapRetroArch = { retroarch }: import ../misc/emulators/retroarch/wrapper.nix { @@ -10609,6 +11192,7 @@ let plugins = let inherit (lib) optional; in with xbmcPlugins; ([] ++ optional (config.xbmc.enableAdvancedLauncher or false) advanced-launcher + ++ optional (config.xbmc.enableGenesis or false) genesis ++ optional (config.xbmc.enableSVTPlay or false) svtplay ); }; @@ -10719,6 +11303,27 @@ let xkb_switch = callPackage ../tools/X11/xkb-switch { }; + xmonad_log_applet_gnome2 = callPackage ../applications/window-managers/xmonad-log-applet { + desktopSupport = "gnome2"; + inherit (xfce) libxfce4util xfce4panel; + gnome2_panel = gnome2.gnome_panel; + GConf2 = gnome2.GConf; + }; + + xmonad_log_applet_gnome3 = callPackage ../applications/window-managers/xmonad-log-applet { + desktopSupport = "gnome3"; + inherit (xfce) libxfce4util xfce4panel; + gnome2_panel = gnome2.gnome_panel; + GConf2 = gnome2.GConf; + }; + + xmonad_log_applet_xfce = callPackage ../applications/window-managers/xmonad-log-applet { + desktopSupport = "xfce4"; + inherit (xfce) libxfce4util xfce4panel; + gnome2_panel = gnome2.gnome_panel; + GConf2 = gnome2.GConf; + }; + libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { }; xpra = callPackage ../tools/X11/xpra { }; @@ -10762,7 +11367,11 @@ let qgis = callPackage ../applications/gis/qgis {}; - qtbitcointrader = callPackage ../applications/misc/qtbitcointrader { }; + qtbitcointrader = callPackage ../applications/misc/qtbitcointrader { + qt = qt4; + }; + + yed = callPackage ../applications/graphics/yed {}; ykpers = callPackage ../applications/misc/ykpers {}; @@ -10774,6 +11383,7 @@ let (let callPackage = newScope pkgs.zathuraCollection; in import ../applications/misc/zathura { inherit callPackage pkgs fetchurl; + stdenv = overrideGCC stdenv gcc49; useMupdf = config.zathura.useMupdf or false; }); @@ -10785,6 +11395,13 @@ let girara = callPackage ../applications/misc/girara { gtk = gtk3; + stdenv = overrideGCC stdenv gcc49; + }; + + girara-light = callPackage ../applications/misc/girara { + gtk = gtk3; + withBuildColors = false; + ncurses = null; }; zgrviewer = callPackage ../applications/graphics/zgrviewer {}; @@ -10793,7 +11410,10 @@ let pygtk = pyGtkGlade; }; - zotero = callPackage ../applications/office/zotero { }; + zotero = callPackage ../applications/office/zotero { + inherit (gnome) libIDL; + inherit (pythonPackages) pysqlite; + }; zynaddsubfx = callPackage ../applications/audio/zynaddsubfx { }; @@ -10864,20 +11484,6 @@ let }; }; - dwarf_fortress_2014 = callPackage_i686 ../games/dwarf-fortress/df2014.nix { - SDL_image = pkgsi686Linux.SDL_image.override { - libpng = pkgsi686Linux.libpng12; - }; - }; - - dwarf_fortress_modable = appendToName "moddable" (dwarf_fortress.override { - copyDataDirectory = true; - }); - - dwarf_fortress_2014_modable = appendToName "moddable" (dwarf_fortress_2014.override { - copyDataDirectory = true; - }); - dwarf-therapist = callPackage ../games/dwarf-therapist { }; d1x_rebirth = callPackage ../games/d1x-rebirth { }; @@ -10892,6 +11498,8 @@ let exult = callPackage ../games/exult { }; + fairymax = callPackage ../games/fairymax {}; + flightgear = callPackage ../games/flightgear { }; freeciv = callPackage ../games/freeciv { }; @@ -10913,7 +11521,9 @@ let glestae = callPackage ../games/glestae {}; - globulation2 = callPackage ../games/globulation {}; + globulation2 = callPackage ../games/globulation { + boost = boost155; + }; gltron = callPackage ../games/gltron { }; @@ -10923,11 +11533,18 @@ let gtypist = callPackage ../games/gtypist { }; + hedgewars = callPackage ../games/hedgewars { + inherit (haskellPackages) ghc network vector utf8String bytestringShow + random hslogger dataenc; + }; + hexen = callPackage ../games/hexen { }; icbm3d = callPackage ../games/icbm3d { }; - ingen = callPackage ../applications/audio/ingen { }; + ingen = callPackage ../applications/audio/ingen { + boost = boost155; + }; instead = callPackage ../games/instead { lua = lua5; @@ -10945,12 +11562,16 @@ let mars = callPackage ../games/mars { }; + megaglest = callPackage ../games/megaglest {}; + micropolis = callPackage ../games/micropolis { }; mnemosyne = callPackage ../games/mnemosyne { inherit (pythonPackages) matplotlib cherrypy sqlite3; }; + n2048 = callPackage ../games/n2048 {}; + naev = callPackage ../games/naev { }; nexuiz = callPackage ../games/nexuiz { }; @@ -10969,6 +11590,8 @@ let openxcom = callPackage ../games/openxcom { }; + performous = callPackage ../games/performous { }; + pingus = callPackage ../games/pingus {}; pioneers = callPackage ../games/pioneers { }; @@ -11030,7 +11653,9 @@ let # You still can override by passing more arguments. spaceOrbit = callPackage ../games/orbit { }; - spring = callPackage ../games/spring { }; + spring = callPackage ../games/spring { + boost = boost155; + }; springLobby = callPackage ../games/spring/springlobby.nix { }; @@ -11135,6 +11760,8 @@ let xskat = callPackage ../games/xskat { }; + xsnow = callPackage ../games/xsnow { }; + xsokoban = builderDefsPackage (import ../games/xsokoban) { inherit (xlibs) libX11 xproto libXpm libXt; }; @@ -11172,16 +11799,6 @@ let enlightenment = callPackage ../desktops/enlightenment { }; - e17 = recurseIntoAttrs ( - let callPackage = newScope pkgs.e17; in - import ../desktops/e17 { inherit callPackage pkgs; } - ); - - e18 = recurseIntoAttrs ( - let callPackage = newScope pkgs.e18; in - import ../desktops/e18 { inherit callPackage pkgs; } - ); - e19 = recurseIntoAttrs ( let callPackage = newScope pkgs.e19; in import ../desktops/e19 { inherit callPackage pkgs; } @@ -11195,34 +11812,24 @@ let inherit (pkgs) libsoup libwnck gtk_doc gnome_doc_utils; }; - gnome3 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.10 { - callPackage = pkgs.newScope pkgs.gnome3; - self = pkgs.gnome3; - }); - gnome3_12 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.12 { callPackage = pkgs.newScope pkgs.gnome3_12; }); + gnome3 = gnome3_12; + gnome = recurseIntoAttrs gnome2; hsetroot = callPackage ../tools/X11/hsetroot { }; kakasi = callPackage ../tools/text/kakasi { }; - kde4 = recurseIntoAttrs pkgs.kde412; - - kde4_next = recurseIntoAttrs( lib.lowPrioSet pkgs.kde414 ); - - kde412 = kdePackagesFor (pkgs.kde412 // { - eigen = eigen2; - libusb = libusb1; - libcanberra = libcanberra_kde; - }) ../desktops/kde-4.12; + kde4 = recurseIntoAttrs pkgs.kde414; kde414 = kdePackagesFor (pkgs.kde414 // { libusb = libusb1; libcanberra = libcanberra_kde; + boost = boost156; }) ../desktops/kde-4.14; kdePackagesFor = self: dir: @@ -11239,8 +11846,6 @@ let recurseForRelease = true; - akunambol = callPackage ../applications/networking/sync/akunambol { }; - amarok = callPackage ../applications/audio/amarok { }; bangarang = callPackage ../applications/video/bangarang { }; @@ -11278,7 +11883,9 @@ let kdevelop = callPackage ../applications/editors/kdevelop { }; - kdevplatform = callPackage ../development/libraries/kdevplatform { }; + kdevplatform = callPackage ../development/libraries/kdevplatform { + boost = boost156; + }; kdiff3 = callPackage ../tools/text/kdiff3 { }; @@ -11308,7 +11915,9 @@ let libalkimia = callPackage ../development/libraries/libalkimia { }; - libktorrent = callPackage ../development/libraries/libktorrent { }; + libktorrent = callPackage ../development/libraries/libktorrent { + boost = boost156; + }; libkvkontakte = callPackage ../development/libraries/libkvkontakte { }; @@ -11332,27 +11941,46 @@ let qtcurve = callPackage ../misc/themes/qtcurve { }; - quassel = callPackage ../applications/networking/irc/quassel { dconf = gnome3.dconf; }; + quassel = callPackage ../applications/networking/irc/quassel rec { + monolithic = true; + daemon = false; + client = false; + withKDE = stdenv.isLinux; + qt = if withKDE then qt4 else qt5; # KDE supported quassel cannot build with qt5 yet (maybe in 0.12.0) + dconf = gnome3.dconf; + }; quasselWithoutKDE = (self.quassel.override { + monolithic = true; + daemon = false; + client = false; withKDE = false; + #qt = qt5; tag = "-without-kde"; }); quasselDaemon = (self.quassel.override { monolithic = false; daemon = true; + client = false; + withKDE = false; + #qt = qt5; tag = "-daemon"; }); quasselClient = (self.quassel.override { monolithic = false; + daemon = false; client = true; tag = "-client"; }); quasselClientWithoutKDE = (self.quasselClient.override { + monolithic = false; + daemon = false; + client = true; withKDE = false; + #qt = qt5; tag = "-client-without-kde"; }); @@ -11375,6 +12003,11 @@ let kwooty = callPackage ../applications/networking/newsreaders/kwooty { }; }; + pantheon = recurseIntoAttrs rec { + callPackage = newScope pkgs.pantheon; + pantheon-terminal = callPackage ../desktops/pantheon/apps/pantheon-terminal { }; + }; + redshift = callPackage ../applications/misc/redshift { inherit (xorg) libX11 libXrandr libxcb randrproto libXxf86vm xf86vidmodeproto; @@ -11400,8 +12033,9 @@ let mate-themes = callPackage ../misc/themes/mate-themes { }; xfce = xfce4_10; - xfce4_10 = recurseIntoAttrs (import ../desktops/xfce { inherit pkgs newScope; }); + xfce4_10 = recurseIntoAttrs (import ../desktops/xfce { inherit config pkgs newScope; }); + xrandr-invert-colors = callPackage ../applications/misc/xrandr-invert-colors { }; ### SCIENCE @@ -11492,6 +12126,8 @@ let sage = callPackage ../applications/science/math/sage { }; + ipopt = callPackage ../development/libraries/science/math/ipopt { }; + ### SCIENCE/MOLECULAR-DYNAMICS gromacs = callPackage ../applications/science/molecular-dynamics/gromacs { @@ -11531,17 +12167,38 @@ let mkCoqPackages_8_4 = self: let callPackage = newScope self; in { + bedrock = callPackage ../development/coq-modules/bedrock {}; + containers = callPackage ../development/coq-modules/containers {}; + coqExtLib = callPackage ../development/coq-modules/coq-ext-lib {}; + + coqeal = callPackage ../development/coq-modules/coqeal {}; + + domains = callPackage ../development/coq-modules/domains {}; + + flocq = callPackage ../development/coq-modules/flocq {}; + + heq = callPackage ../development/coq-modules/heq {}; + mathcomp = callPackage ../development/coq-modules/mathcomp {}; + paco = callPackage ../development/coq-modules/paco {}; + ssreflect = callPackage ../development/coq-modules/ssreflect {}; + tlc = callPackage ../development/coq-modules/tlc {}; + + unimath = callPackage ../development/coq-modules/unimath {}; + + ynot = callPackage ../development/coq-modules/ynot {}; + }; coqPackages = recurseIntoAttrs (mkCoqPackages_8_4 coqPackages); cvc3 = callPackage ../applications/science/logic/cvc3 {}; + cvc4 = callPackage ../applications/science/logic/cvc4 {}; ekrhyper = callPackage ../applications/science/logic/ekrhyper {}; @@ -11732,29 +12389,29 @@ let tulip = callPackage ../applications/science/misc/tulip { }; - vite = callPackage ../applications/science/misc/vite { }; + vite = enableDebugging (callPackage ../applications/science/misc/vite { }); xplanet = callPackage ../applications/science/astronomy/xplanet { }; ### SCIENCE / PHYSICS geant4 = callPackage ../development/libraries/physics/geant4 { - enableMultiThreading = true; + enableMultiThreading = true; enableG3toG4 = false; enableInventor = false; enableGDML = false; enableQT = false; enableXM = false; - enableOpenGLX11 = true; + enableOpenGLX11 = true; enableRaytracerX11 = false; - # Optional system packages, otherwise internal GEANT4 packages are used. - clhep = null; + # Optional system packages, otherwise internal GEANT4 packages are used. + clhep = null; expat = expat; - zlib = null; + zlib = null; # For enableGDML. - xercesc = null; + xercesc = null; # For enableQT. qt = null; # qt4SDK or qt5SDK @@ -11782,7 +12439,9 @@ let cups = callPackage ../misc/cups { libusb = libusb1; }; - cups_pdf_filter = callPackage ../misc/cups/pdf-filter.nix { }; + cups_filters = callPackage ../misc/cups/filters.nix { }; + + crashplan = callPackage ../applications/backup/crashplan { }; gutenprint = callPackage ../misc/drivers/gutenprint { }; @@ -11814,6 +12473,11 @@ let fakenes = callPackage ../misc/emulators/fakenes { }; + + faust = callPackage ../applications/audio/faust { }; + + faust-compiler = callPackage ../applications/audio/faust-compiler { }; + fceux = callPackage ../misc/emulators/fceux { }; foldingathome = callPackage ../misc/foldingathome { }; @@ -11833,7 +12497,6 @@ let ghostscript = callPackage ../misc/ghostscript { x11Support = false; cupsSupport = config.ghostscript.cups or (!stdenv.isDarwin); - gnuFork = config.ghostscript.gnu or false; }; ghostscriptX = appendToName "with-X" (ghostscript.override { @@ -11926,6 +12589,8 @@ let opkg = callPackage ../tools/package-management/opkg { }; + opkg-utils = callPackage ../tools/package-management/opkg-utils { }; + pgadmin = callPackage ../applications/misc/pgadmin { }; pgf = pgf2; @@ -11954,18 +12619,20 @@ let retroarchBare = callPackage ../misc/emulators/retroarch { }; - retroarchBareMaster = callPackage ../misc/emulators/retroarch/master.nix { }; - - retroarch = wrapRetroArch { retroarch = retroarchBareMaster; }; + retroarch = wrapRetroArch { retroarch = retroarchBare; }; libretro = recurseIntoAttrs (callPackage ../misc/emulators/retroarch/cores.nix { - retroarch = retroarchBareMaster; + retroarch = retroarchBare; }); rssglx = callPackage ../misc/screensavers/rss-glx { }; + runit = callPackage ../tools/system/runit { }; + xlockmore = callPackage ../misc/screensavers/xlockmore { }; + sails = callPackage ../misc/sails { }; + samsungUnifiedLinuxDriver = import ../misc/cups/drivers/samsung { inherit fetchurl stdenv; inherit cups ghostscript glibc patchelf; @@ -12020,7 +12687,7 @@ let inherit builderDefs zlib bzip2 ncurses libpng ed lesstif ruby potrace gd t1lib freetype icu perl expat curl xz pkgconfig zziplib texinfo libjpeg bison python fontconfig flex poppler libpaper graphite2 - makeWrapper; + makeWrapper gmp mpfr xpdf; inherit (xlibs) libXaw libX11 xproto libXt libXpm libXmu libXext xextproto libSM libICE; ghostscript = ghostscriptX; @@ -12032,7 +12699,7 @@ let texLiveFull = lib.setName "texlive-full" (texLiveAggregationFun { paths = [ texLive texLiveExtra lmodern texLiveCMSuper texLiveLatexXColor texLivePGF texLiveBeamer texLiveModerncv tipa tex4ht texinfo - texLiveModerntimeline ]; + texLiveModerntimeline texLiveContext ]; }); /* Look in configurations/misc/raskin.nix for usage example (around revisions @@ -12096,6 +12763,8 @@ let viewnior = callPackage ../applications/graphics/viewnior { }; + vimrc = callPackage ../misc/vim-plugins/vimrc.nix { inherit writeText; }; + vimPlugins = recurseIntoAttrs (callPackage ../misc/vim-plugins { }); vimprobable2 = callPackage ../applications/networking/browsers/vimprobable2 { @@ -12106,6 +12775,10 @@ let { browser = vimprobable2; browserName = "vimprobable2"; desktopName = "Vimprobable2"; }; + rekonqWrapper = wrapFirefox { + browser = kde4.rekonq; browserName = "rekonq"; desktopName = "Rekonq"; + }; + vimb = callPackage ../applications/networking/browsers/vimb { webkit = webkitgtk2; }; @@ -12150,10 +12823,18 @@ let saneBackends = saneBackends; }; + xwiimote = callPackage ../misc/drivers/xwiimote { + bluez = pkgs.bluez5.override { + enableWiimote = true; + }; + }; + yafc = callPackage ../applications/networking/yafc { }; yandex-disk = callPackage ../tools/filesystems/yandex-disk { }; + zdfmediathk = callPackage ../applications/video/zdfmediathk { }; + myEnvFun = import ../misc/my-env { inherit substituteAll pkgs; inherit (stdenv) mkDerivation; @@ -12213,6 +12894,11 @@ let lttngTools = lttng-tools; # added 2014-07-31 lttngUst = lttng-ust; # added 2014-07-31 jquery_ui = jquery-ui; # added 2014-09-07 + youtubeDL = youtube-dl; # added 2014-10-26 + rdiff_backup = rdiff-backup; # added 2014-11-23 + + opentsdb = callPackage ../tools/misc/opentsdb {}; + hbase = callPackage ../servers/hbase {}; }; in self; in pkgs diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index a5fc2d4db715..84d06530958f 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -23,19 +23,9 @@ ghc783Prefs = self : super : ghcHEADPrefs self super // { cabalInstall_1_20_0_3 = super.cabalInstall_1_20_0_3.override { Cabal = self.Cabal_1_20_0_2; }; codex = super.codex.override { hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_20_0_2; }; }; - MonadRandom = self.MonadRandom_0_1_13; # requires transformers >= 0.4.x - mtl = self.mtl_2_1_2; - } // (if !pkgs.stdenv.isDarwin then {} else { - # Temporary workaround for https://github.com/NixOS/nixpkgs/issues/2689 - cabal = super.cabal.override { - extension = self: super: { - noHaddock = true; - hyperlinkSource = false; - # Temporary workaround for https://github.com/NixOS/nixpkgs/issues/3540 - doCheck = false; - }; - }; - }); + MonadRandom = self.MonadRandom_0_2_0_1; # newer versions require transformers >= 0.4.x + mtl = self.mtl_2_1_3_1; + }; ghc763Prefs = self : super : ghc783Prefs self super // { aeson = self.aeson_0_7_0_4; @@ -45,22 +35,26 @@ }; }; attoparsec = self.attoparsec_0_11_3_1; - binaryConduit = super.binaryConduit.override { binary = self.binary_0_7_2_1; }; - bson = super.bson.override { dataBinaryIeee754 = self.dataBinaryIeee754.override { binary = self.binary_0_7_2_1; }; }; + binaryConduit = super.binaryConduit.override { binary = self.binary_0_7_2_2; }; + bson = super.bson.override { dataBinaryIeee754 = self.dataBinaryIeee754.override { binary = self.binary_0_7_2_2; }; }; + cabal2nix = super.cabal2nix.override { hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_18_1_3; }; }; + cabalInstall_1_16_0_2 = super.cabalInstall_1_16_0_2.override { + HTTP = self.HTTP.override { network = self.network_2_5_0_0; }; + network = self.network_2_5_0_0; + }; criterion = super.criterion.override { statistics = self.statistics.override { - vectorBinaryInstances = self.vectorBinaryInstances.override { binary = self.binary_0_7_2_1; }; + vectorBinaryInstances = self.vectorBinaryInstances.override { binary = self.binary_0_7_2_2; }; }; }; - Elm = super.Elm.override { pandoc = self.pandoc.override { zipArchive = self.zipArchive.override { binary = self.binary_0_7_2_1; }; }; }; + entropy = super.entropy.override { cabal = self.cabal.override { Cabal = self.Cabal_1_18_1_3; }; }; gloss = null; # requires base >= 4.7 - haddock = self.haddock_2_13_2; modularArithmetic = null; # requires base >= 4.7 - pipesBinary = super.pipesBinary.override { binary = self.binary_0_7_2_1; }; - rank1dynamic = super.rank1dynamic.override { binary = self.binary_0_7_2_1; }; - distributedStatic = super.distributedStatic.override { binary = self.binary_0_7_2_1; }; - networkTransport = super.networkTransport.override { binary = self.binary_0_7_2_1; }; - distributedProcess = super.distributedProcess.override { binary = self.binary_0_7_2_1; }; + pipesBinary = super.pipesBinary.override { binary = self.binary_0_7_2_2; }; + rank1dynamic = super.rank1dynamic.override { binary = self.binary_0_7_2_2; }; + distributedStatic = super.distributedStatic.override { binary = self.binary_0_7_2_2; }; + networkTransport = super.networkTransport.override { binary = self.binary_0_7_2_2; }; + distributedProcess = super.distributedProcess.override { binary = self.binary_0_7_2_2; }; scientific = self.scientific_0_2_0_2; singletons = null; # requires base >= 4.7 transformers = self.transformers_0_3_0_0; # core packagen in ghc > 7.6.x @@ -69,30 +63,23 @@ ghc742Prefs = self : super : ghc763Prefs self super // { aeson = self.aeson_0_7_0_4.override { blazeBuilder = self.blazeBuilder; }; - cabalInstall_0_14_0 = super.cabalInstall_0_14_0.override { - HTTP = self.HTTP.override { network = self.network_2_3_0_13; }; - network = self.network_2_3_0_13; - }; extensibleExceptions = null; # core package in ghc <= 7.4.x hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; - haddock = self.haddock_2_11_0; haskeline = super.haskeline.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + primitive = self.primitive_0_5_3_0; # later versions don't compile random = self.random_1_0_1_1; # requires base >= 4.6.x - shelly = self.shelly_0_15_4_1; }; ghc722Prefs = self : super : ghc742Prefs self super // { caseInsensitive = self.caseInsensitive_1_0_0_1; deepseq = self.deepseq_1_3_0_2; DrIFT = null; # doesn't compile with old GHC versions - haddock = self.haddock_2_9_4; syb = self.syb_0_4_0; }; ghc704Prefs = self : super : ghc722Prefs self super // { - binary = self.binary_0_7_2_1; # core package in ghc >= 7.2.2 + binary = self.binary_0_7_2_2; # core package in ghc >= 7.2.2 caseInsensitive = super.caseInsensitive; # undo the override from ghc 7.2.2 - haddock = self.haddock_2_9_2.override { alex = self.alex_2_3_5; }; HsSyck = self.HsSyck_0_51; jailbreakCabal = super.jailbreakCabal.override { Cabal = self.Cabal_1_16_0_3; }; random = null; # core package in ghc <= 7.0.x @@ -107,7 +94,6 @@ deepseq = self.deepseq_1_2_0_1; dlist = super.dlist.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; exceptions = null; # none of our versions compile - haddock = self.haddock_2_7_2; logict = super.logict.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; monadPar = self.monadPar_0_1_0_3; nats = null; # none of our versions compile @@ -121,6 +107,7 @@ syb = null; # core package in ghc < 7 tagged = super.tagged.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; temporary = null; # none of our versions compile + vector = super.vector_0_10_9_3; vectorAlgorithms = super.vectorAlgorithms.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; }; @@ -128,10 +115,10 @@ alex = self.alex_2_3_5.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; async = null; # none of our versions compile attoparsec = null; # none of our versions compile - binary = super.binary_0_7_2_1.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + binary = super.binary_0_7_2_2.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + cabalInstall_1_16_0_2 = super.cabalInstall_1_16_0_2; caseInsensitive = super.caseInsensitive.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; GLUT = self.GLUT_2_2_2_1; - haddock = self.haddock_2_4_2; happy = super.happy.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; hashable = super.hashable.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; hashtables = super.hashtables.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; @@ -148,6 +135,7 @@ systemFileio = super.systemFileio.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; tar = super.tar.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; text = self.text_0_11_2_3.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + tfRandom = null; # does not compile time = self.time_1_1_2_4.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; zlib = super.zlib.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; }; @@ -218,6 +206,8 @@ gmp = pkgs.gmp4; }); + ghc783Binary = lowPrio (callPackage ../development/compilers/ghc/7.8.3-binary.nix {}); + ghc6101BinaryDarwin = if stdenv.isDarwin then ghc704Binary else ghc6101Binary; ghc6121BinaryDarwin = if stdenv.isDarwin then ghc704Binary else ghc6121Binary; @@ -238,7 +228,7 @@ packages_ghc783 = packages { ghcPath = ../development/compilers/ghc/7.8.3.nix; - ghcBinary = ghc742Binary; + ghcBinary = if stdenv.isDarwin then ghc783Binary else ghc742Binary; prefFun = ghc783Prefs; }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index d139f3863201..cd0ef761c63a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -125,6 +125,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in accelerateIo = callPackage ../development/libraries/haskell/accelerate-io {}; + acmeLookofdisapproval = callPackage ../development/libraries/haskell/acme-lookofdisapproval {}; + active = callPackage ../development/libraries/haskell/active {}; ACVector = callPackage ../development/libraries/haskell/AC-Vector {}; @@ -142,9 +144,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in AES = callPackage ../development/libraries/haskell/AES {}; aeson_0_7_0_4 = callPackage ../development/libraries/haskell/aeson/0.7.0.4.nix { blazeBuilder = null; }; - aeson_0_7_0_6 = callPackage ../development/libraries/haskell/aeson/0.7.0.6.nix { blazeBuilder = null; }; - aeson_0_8_0_0 = callPackage ../development/libraries/haskell/aeson/0.8.0.0.nix { blazeBuilder = null; }; - aeson = self.aeson_0_8_0_0; + aeson_0_8_0_2 = callPackage ../development/libraries/haskell/aeson/0.8.0.2.nix { blazeBuilder = null; }; + aeson = self.aeson_0_8_0_2; aesonPretty = callPackage ../development/libraries/haskell/aeson-pretty {}; @@ -188,7 +189,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in asn1Types = callPackage ../development/libraries/haskell/asn1-types {}; - async_2_0_1_3 = callPackage ../development/libraries/haskell/async/2.0.1.3.nix {}; async_2_0_1_4 = callPackage ../development/libraries/haskell/async/2.0.1.4.nix {}; async_2_0_1_6 = callPackage ../development/libraries/haskell/async/2.0.1.6.nix {}; async = self.async_2_0_1_6; @@ -201,7 +201,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in attoparsec_0_10_4_0 = callPackage ../development/libraries/haskell/attoparsec/0.10.4.0.nix {}; attoparsec_0_11_3_1 = callPackage ../development/libraries/haskell/attoparsec/0.11.3.1.nix {}; - attoparsec_0_11_3_4 = callPackage ../development/libraries/haskell/attoparsec/0.11.3.4.nix {}; attoparsec_0_12_1_2 = callPackage ../development/libraries/haskell/attoparsec/0.12.1.2.nix {}; attoparsec = self.attoparsec_0_12_1_2; @@ -215,6 +214,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in aws = callPackage ../development/libraries/haskell/aws {}; + awsEc2 = callPackage ../development/libraries/haskell/aws-ec2 {}; + authenticate = callPackage ../development/libraries/haskell/authenticate {}; authenticateOauth = callPackage ../development/libraries/haskell/authenticate-oauth {}; @@ -245,8 +246,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in bimap = callPackage ../development/libraries/haskell/bimap {}; - binary_0_6_1_0 = callPackage ../development/libraries/haskell/binary/0.6.1.0.nix {}; - binary_0_7_2_1 = callPackage ../development/libraries/haskell/binary/0.7.2.1.nix {}; + binary_0_7_2_2 = callPackage ../development/libraries/haskell/binary/0.7.2.2.nix {}; binary = null; # core package since ghc >= 7.2.x binaryConduit = callPackage ../development/libraries/haskell/binary-conduit {}; @@ -271,6 +271,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in bitsExtras = callPackage ../development/libraries/haskell/bits-extras {}; + bitset = callPackage ../development/libraries/haskell/bitset {}; + bktrees = callPackage ../development/libraries/haskell/bktrees {}; blankCanvas = callPackage ../development/libraries/haskell/blank-canvas {}; @@ -339,11 +341,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in bzlib = callPackage ../development/libraries/haskell/bzlib {}; - c2hs = callPackage ../development/libraries/haskell/c2hs {}; + c2hs = callPackage ../development/tools/haskell/c2hs {}; - c2hsc = callPackage ../development/libraries/haskell/c2hsc {}; + c2hsc = callPackage ../development/tools/haskell/c2hsc {}; - Cabal_1_14_0 = callPackage ../development/libraries/haskell/Cabal/1.14.0.nix {}; Cabal_1_16_0_3 = callPackage ../development/libraries/haskell/Cabal/1.16.0.3.nix {}; Cabal_1_18_1_3 = callPackage ../development/libraries/haskell/Cabal/1.18.1.3.nix {}; Cabal_1_20_0_2 = callPackage ../development/libraries/haskell/Cabal/1.20.0.2.nix {}; @@ -369,7 +370,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in cassava = callPackage ../development/libraries/haskell/cassava {}; caseInsensitive_1_0_0_1 = callPackage ../development/libraries/haskell/case-insensitive/1.0.0.1.nix {}; - caseInsensitive_1_1_0_3 = callPackage ../development/libraries/haskell/case-insensitive/1.1.0.3.nix {}; caseInsensitive_1_2_0_1 = callPackage ../development/libraries/haskell/case-insensitive/1.2.0.1.nix {}; caseInsensitive = self.caseInsensitive_1_2_0_1; @@ -383,12 +383,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in certificate = callPackage ../development/libraries/haskell/certificate {}; - cgi_3001_1_7_1 = callPackage ../development/libraries/haskell/cgi/3001.1.7.1.nix {}; - cgi_3001_1_7_2 = callPackage ../development/libraries/haskell/cgi/3001.1.7.2.nix {}; - cgi_3001_1_7_3 = callPackage ../development/libraries/haskell/cgi/3001.1.7.3.nix {}; - cgi_3001_1_7_4 = callPackage ../development/libraries/haskell/cgi/3001.1.7.4.nix {}; cgi_3001_1_7_5 = callPackage ../development/libraries/haskell/cgi/3001.1.7.5.nix {}; - cgi_3001_1_8_5 = callPackage ../development/libraries/haskell/cgi/3001.1.8.5.nix {}; cgi_3001_2_0_0 = callPackage ../development/libraries/haskell/cgi/3001.2.0.0.nix {}; cgi = self.cgi_3001_2_0_0; @@ -396,12 +391,16 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in charset = callPackage ../development/libraries/haskell/charset {}; + charsetdetectAe = callPackage ../development/libraries/haskell/charsetdetect-ae {}; + Chart = callPackage ../development/libraries/haskell/Chart {}; ChartCairo = callPackage ../development/libraries/haskell/Chart-cairo {}; ChartDiagrams = callPackage ../development/libraries/haskell/Chart-diagrams {}; ChartGtk = callPackage ../development/libraries/haskell/Chart-gtk {}; - ChasingBottoms = callPackage ../development/libraries/haskell/ChasingBottoms { QuickCheck = self.QuickCheck_2_6; }; + chaselevDeque = callPackage ../development/libraries/haskell/chaselev-deque {}; + + ChasingBottoms = callPackage ../development/libraries/haskell/ChasingBottoms {}; cheapskate = callPackage ../development/libraries/haskell/cheapskate {}; @@ -435,6 +434,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in clay = callPackage ../development/libraries/haskell/clay {}; + cleanUnions = callPackage ../development/libraries/haskell/clean-unions {}; + clientsession = callPackage ../development/libraries/haskell/clientsession {}; clock = callPackage ../development/libraries/haskell/clock {}; @@ -463,9 +464,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in compactStringFix = callPackage ../development/libraries/haskell/compact-string-fix {}; - compdata = if (pkgs.stdenv.lib.versionOlder "7.8" ghc.version) - then callPackage ../development/libraries/haskell/compdata {} - else null; + compdata = callPackage ../development/libraries/haskell/compdata {}; compdataParam = callPackage ../development/libraries/haskell/compdata-param {}; @@ -499,9 +498,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in controlMonadLoop = callPackage ../development/libraries/haskell/control-monad-loop {}; - convertible_1_0_11_1 = callPackage ../development/libraries/haskell/convertible/1.0.11.1.nix {}; - convertible_1_1_0_0 = callPackage ../development/libraries/haskell/convertible/1.1.0.0.nix {}; - convertible = self.convertible_1_1_0_0; + convertible = callPackage ../development/libraries/haskell/convertible {}; continuedFractions = callPackage ../development/libraries/haskell/continued-fractions {}; @@ -561,6 +558,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in cpu = callPackage ../development/libraries/haskell/cpu {}; + daemons = callPackage ../development/libraries/haskell/daemons { }; + dataAccessor = callPackage ../development/libraries/haskell/data-accessor/data-accessor.nix {}; dataAccessorTemplate = callPackage ../development/libraries/haskell/data-accessor/data-accessor-template.nix {}; @@ -585,12 +584,16 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in dataFix = callPackage ../development/libraries/haskell/data-fix {}; + dataFlags = callPackage ../development/libraries/haskell/data-flags {}; + dataHash = callPackage ../development/libraries/haskell/data-hash {}; dataInttrie = callPackage ../development/libraries/haskell/data-inttrie {}; dataLens = callPackage ../development/libraries/haskell/data-lens {}; + dataLensFd = callPackage ../development/libraries/haskell/data-lens-fd {}; + dataLensLight = callPackage ../development/libraries/haskell/data-lens-light {}; dataLensTemplate = callPackage ../development/libraries/haskell/data-lens-template {}; @@ -615,8 +618,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in dbus = callPackage ../development/libraries/haskell/dbus {}; - deepseq_1_1_0_0 = callPackage ../development/libraries/haskell/deepseq/1.1.0.0.nix {}; - deepseq_1_1_0_2 = callPackage ../development/libraries/haskell/deepseq/1.1.0.2.nix {}; + Decimal = callPackage ../development/libraries/haskell/Decimal {}; + deepseq_1_2_0_1 = callPackage ../development/libraries/haskell/deepseq/1.2.0.1.nix {}; deepseq_1_3_0_2 = callPackage ../development/libraries/haskell/deepseq/1.3.0.2.nix {}; deepseq = null; # core package since ghc >= 7.4.x @@ -655,6 +658,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in inherit (pkgs) zlib; }; + digestPure = callPackage ../development/libraries/haskell/digest-pure {}; + digestiveFunctors = callPackage ../development/libraries/haskell/digestive-functors {}; digestiveFunctorsAeson = callPackage ../development/libraries/haskell/digestive-functors-aeson {}; @@ -679,6 +684,12 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in distributedProcess = callPackage ../development/libraries/haskell/distributed-process {}; + distributedProcessMonadControl = callPackage ../development/libraries/haskell/distributed-process-monad-control {}; + + distributedProcessP2p = callPackage ../development/libraries/haskell/distributed-process-p2p {}; + + distributedProcessPlatform = callPackage ../development/libraries/haskell/distributed-process-platform {}; + distributive = callPackage ../development/libraries/haskell/distributive {}; djinn = callPackage ../development/libraries/haskell/djinn {}; @@ -723,11 +734,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in editDistance = callPackage ../development/libraries/haskell/edit-distance {}; - editline_0_2_1_0 = callPackage ../development/libraries/haskell/editline/0.2.1.0.nix {}; - editline_0_2_1_1 = callPackage ../development/libraries/haskell/editline/0.2.1.1.nix {}; - editline = self.editline_0_2_1_1; + editline = callPackage ../development/libraries/haskell/editline {}; ekg = callPackage ../development/libraries/haskell/ekg {}; + ekgBosun = callPackage ../development/libraries/haskell/ekg-bosun {}; ekgCarbon = callPackage ../development/libraries/haskell/ekg-carbon {}; ekgCore = callPackage ../development/libraries/haskell/ekg-core {}; @@ -737,6 +747,14 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in elmServer = callPackage ../development/compilers/elm/elm-server.nix {}; + elmRepl = callPackage ../development/compilers/elm/elm-repl.nix {}; + + elmReactor = callPackage ../development/compilers/elm/elm-reactor.nix {}; + + elmGet = callPackage ../development/compilers/elm/elm-get.nix { + optparseApplicative = self.optparseApplicative_0_10_0; + }; + emailValidate = callPackage ../development/libraries/haskell/email-validate {}; enclosedExceptions = callPackage ../development/libraries/haskell/enclosed-exceptions {}; @@ -758,9 +776,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in equationalReasoning = callPackage ../development/libraries/haskell/equational-reasoning {}; - equivalence_0_2_3 = callPackage ../development/libraries/haskell/equivalence/0.2.3.nix {}; - equivalence_0_2_5 = callPackage ../development/libraries/haskell/equivalence/0.2.5.nix {}; - equivalence = self.equivalence_0_2_5; + equivalence = callPackage ../development/libraries/haskell/equivalence {}; erf = callPackage ../development/libraries/haskell/erf {}; @@ -788,7 +804,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in executablePath = callPackage ../development/libraries/haskell/executable-path {}; - Extra = callPackage ../development/libraries/haskell/Extra {}; + Extra = callPackage ../development/libraries/haskell/Extra-lib {}; fay = callPackage ../development/libraries/haskell/fay {}; @@ -802,17 +818,17 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in fileLocation = callPackage ../development/libraries/haskell/file-location {}; + fixedVector = callPackage ../development/libraries/haskell/fixed-vector {}; + fmlist = callPackage ../development/libraries/haskell/fmlist {}; ftphs = callPackage ../development/libraries/haskell/ftphs {}; extensibleEffects = callPackage ../development/libraries/haskell/extensible-effects {}; - extensibleExceptions_0_1_1_0 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.0.nix {}; - extensibleExceptions_0_1_1_2 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.2.nix {}; - extensibleExceptions_0_1_1_3 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.3.nix {}; - extensibleExceptions_0_1_1_4 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.4.nix {}; - extensibleExceptions = self.extensibleExceptions_0_1_1_4; + extensibleExceptions = callPackage ../development/libraries/haskell/extensible-exceptions {}; + + extra = callPackage ../development/libraries/haskell/extra {}; failure = callPackage ../development/libraries/haskell/failure {}; @@ -842,11 +858,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in final = callPackage ../development/libraries/haskell/final {}; - fgl_5_4_2_2 = callPackage ../development/libraries/haskell/fgl/5.4.2.2.nix {}; - fgl_5_4_2_3 = callPackage ../development/libraries/haskell/fgl/5.4.2.3.nix {}; - fgl_5_4_2_4 = callPackage ../development/libraries/haskell/fgl/5.4.2.4.nix {}; - fgl_5_5_0_1 = callPackage ../development/libraries/haskell/fgl/5.5.0.1.nix {}; - fgl = self.fgl_5_5_0_1; + fixed = callPackage ../development/libraries/haskell/fixed {}; + + fgl = callPackage ../development/libraries/haskell/fgl {}; fglVisualize = callPackage ../development/libraries/haskell/fgl-visualize {}; @@ -868,7 +882,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in freeGame = callPackage ../development/libraries/haskell/free-game {}; - fsnotify = callPackage ../development/libraries/haskell/fsnotify {}; + fsnotify = callPackage ../development/libraries/haskell/fsnotify { + hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.hfsevents; + }; freetype2 = callPackage ../development/libraries/haskell/freetype2 {}; @@ -890,6 +906,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in genericDeriving = callPackage ../development/libraries/haskell/generic-deriving {}; + GenericPretty = callPackage ../development/libraries/haskell/GenericPretty {}; + genericsSop = callPackage ../development/libraries/haskell/generics-sop {}; ghcCore = callPackage ../development/libraries/haskell/ghc-core {}; @@ -904,6 +922,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in cabal = self.cabal.override { enableLibraryProfiling = false; }; # pkg cannot be built with profiling enabled }; + ghcid = callPackage ../development/tools/haskell/ghcid {}; + ghcServer = callPackage ../development/libraries/haskell/ghc-server {}; ghcjs = callPackage ../development/tools/haskell/ghcjs { @@ -945,6 +965,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in gitlibTest = callPackage ../development/libraries/haskell/gitlib-test {}; + gl = callPackage ../development/libraries/haskell/gl {}; + glade = callPackage ../development/libraries/haskell/glade { inherit (pkgs.gnome) libglade; gtkC = pkgs.gtk; @@ -966,6 +988,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in gloss = callPackage ../development/libraries/haskell/gloss {}; + glossBanana = callPackage ../development/libraries/haskell/gloss-banana {}; + glossAccelerate = callPackage ../development/libraries/haskell/gloss-accelerate {}; glossRaster = callPackage ../development/libraries/haskell/gloss-raster {}; @@ -974,28 +998,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in glpkHs = callPackage ../development/libraries/haskell/glpk-hs {}; - GLURaw_1_3_0_0 = callPackage ../development/libraries/haskell/GLURaw/1.3.0.0.nix { OpenGLRaw = self.OpenGLRaw_1_3_0_0; }; - GLURaw_1_4_0_1 = callPackage ../development/libraries/haskell/GLURaw/1.4.0.1.nix {}; - GLURaw = self.GLURaw_1_4_0_1; + GLURaw = callPackage ../development/libraries/haskell/GLURaw {}; - GLUT_2_1_1_2 = callPackage ../development/libraries/haskell/GLUT/2.1.1.2.nix {}; - GLUT_2_1_2_1 = callPackage ../development/libraries/haskell/GLUT/2.1.2.1.nix {}; - GLUT_2_1_2_2 = callPackage ../development/libraries/haskell/GLUT/2.1.2.2.nix {}; - GLUT_2_2_2_1 = callPackage ../development/libraries/haskell/GLUT/2.2.2.1.nix { - OpenGL = self.OpenGL_2_6_0_1; - }; - GLUT_2_3_1_0 = callPackage ../development/libraries/haskell/GLUT/2.3.1.0.nix { - OpenGLRaw = self.OpenGLRaw_1_3_0_0; - OpenGL = self.OpenGL_2_6_0_1.override { OpenGLRaw = self.OpenGLRaw_1_3_0_0; GLURaw = self.GLURaw_1_3_0_0; }; - }; - GLUT_2_4_0_0 = callPackage ../development/libraries/haskell/GLUT/2.4.0.0.nix { - OpenGLRaw = self.OpenGLRaw_1_3_0_0; - OpenGL = self.OpenGL_2_8_0_0.override { OpenGLRaw = self.OpenGLRaw_1_3_0_0; GLURaw = self.GLURaw_1_3_0_0; }; - }; - GLUT_2_5_1_1 = callPackage ../development/libraries/haskell/GLUT/2.5.1.1.nix { - OpenGL = self.OpenGL_2_9_2_0; - }; - GLUT = self.GLUT_2_5_1_1; + GLUT = callPackage ../development/libraries/haskell/GLUT {}; GLUtil = callPackage ../development/libraries/haskell/GLUtil {}; @@ -1005,6 +1010,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in gnutls = callPackage ../development/libraries/haskell/gnutls { inherit (pkgs) gnutls; }; + greencard = callPackage ../development/libraries/haskell/greencard { }; + gsasl = callPackage ../development/libraries/haskell/gsasl { inherit (pkgs) gsasl; }; gtk = callPackage ../development/libraries/haskell/gtk { @@ -1031,12 +1038,14 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in graphmod = callPackage ../development/tools/haskell/graphmod {}; - graphviz = callPackage ../development/libraries/haskell/graphviz {}; + graphviz = callPackage ../development/libraries/haskell/graphviz { systemGraphviz = pkgs.graphviz; }; graphSCC = callPackage ../development/libraries/haskell/graphscc {}; graphWrapper = callPackage ../development/libraries/haskell/graph-wrapper {}; + grid = callPackage ../development/libraries/haskell/grid {}; + groom = callPackage ../development/libraries/haskell/groom {}; groups = callPackage ../development/libraries/haskell/groups {}; @@ -1045,6 +1054,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hakyll = callPackage ../development/libraries/haskell/hakyll {}; + half = callPackage ../development/libraries/haskell/half {}; + hamlet = callPackage ../development/libraries/haskell/hamlet {}; happstackServer = callPackage ../development/libraries/haskell/happstack/happstack-server.nix {}; @@ -1055,9 +1066,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in happstackFastCGI = callPackage ../development/libraries/haskell/happstack/happstack-fastcgi.nix {}; - hashable_1_1_2_5 = callPackage ../development/libraries/haskell/hashable/1.1.2.5.nix {}; - hashable_1_2_2_0 = callPackage ../development/libraries/haskell/hashable/1.2.2.0.nix {}; - hashable = self.hashable_1_2_2_0; + hashable = callPackage ../development/libraries/haskell/hashable {}; hashableExtras = callPackage ../development/libraries/haskell/hashable-extras {}; @@ -1065,6 +1074,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hashtables = callPackage ../development/libraries/haskell/hashtables {}; + hask = callPackage ../development/libraries/haskell/hask {}; + haskelldb = callPackage ../development/libraries/haskell/haskelldb {}; haskeline = callPackage ../development/libraries/haskell/haskeline {}; @@ -1086,13 +1097,11 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in haskellPackages = callPackage ../development/libraries/haskell/haskell-packages {}; - haskellSrc_1_0_1_3 = callPackage ../development/libraries/haskell/haskell-src/1.0.1.3.nix {}; - haskellSrc_1_0_1_4 = callPackage ../development/libraries/haskell/haskell-src/1.0.1.4.nix {}; - haskellSrc_1_0_1_5 = callPackage ../development/libraries/haskell/haskell-src/1.0.1.5.nix {}; - haskellSrc_1_0_1_6 = callPackage ../development/libraries/haskell/haskell-src/1.0.1.6.nix {}; - haskellSrc = self.haskellSrc_1_0_1_6; + haskellSrc = callPackage ../development/libraries/haskell/haskell-src {}; - haskellSrcExts = callPackage ../development/libraries/haskell/haskell-src-exts {}; + haskellSrcExts_1_15_0_1 = callPackage ../development/libraries/haskell/haskell-src-exts/1.15.0.1.nix {}; + haskellSrcExts_1_16_0_1 = callPackage ../development/libraries/haskell/haskell-src-exts/1.16.0.1.nix {}; + haskellSrcExts = self.haskellSrcExts_1_16_0_1; haskellSrcMeta = callPackage ../development/libraries/haskell/haskell-src-meta {}; @@ -1124,6 +1133,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hgal = callPackage ../development/libraries/haskell/hgal {}; + higherLeveldb = callPackage ../development/libraries/haskell/higher-leveldb {}; + hourglass = callPackage ../development/libraries/haskell/hourglass {}; hplayground = callPackage ../development/libraries/haskell/hplayground {}; @@ -1134,17 +1145,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in HTF = callPackage ../development/libraries/haskell/HTF {}; - HTTP_4000_0_6 = callPackage ../development/libraries/haskell/HTTP/4000.0.6.nix {}; - HTTP_4000_0_9 = callPackage ../development/libraries/haskell/HTTP/4000.0.9.nix {}; - HTTP_4000_1_1 = callPackage ../development/libraries/haskell/HTTP/4000.1.1.nix {}; - HTTP_4000_1_2 = callPackage ../development/libraries/haskell/HTTP/4000.1.2.nix {}; - HTTP_4000_2_1 = callPackage ../development/libraries/haskell/HTTP/4000.2.1.nix {}; - HTTP_4000_2_2 = callPackage ../development/libraries/haskell/HTTP/4000.2.2.nix {}; - HTTP_4000_2_3 = callPackage ../development/libraries/haskell/HTTP/4000.2.3.nix {}; - HTTP_4000_2_5 = callPackage ../development/libraries/haskell/HTTP/4000.2.5.nix {}; - HTTP_4000_2_8 = callPackage ../development/libraries/haskell/HTTP/4000.2.8.nix {}; - HTTP_4000_2_18 = callPackage ../development/libraries/haskell/HTTP/4000.2.18.nix {}; - HTTP = self.HTTP_4000_2_18; + HTTP = callPackage ../development/libraries/haskell/HTTP {}; httpAttoparsec = callPackage ../development/libraries/haskell/http-attoparsec {}; @@ -1164,13 +1165,13 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hackageDb = callPackage ../development/libraries/haskell/hackage-db {}; + handaGdata = callPackage ../development/libraries/haskell/handa-gdata {}; + haskellForMaths = callPackage ../development/libraries/haskell/HaskellForMaths {}; haxl = callPackage ../development/libraries/haskell/haxl {}; - haxr = callPackage ../development/libraries/haskell/haxr { - HTTP = self.HTTP.override { network = self.network_2_6_0_2; }; - }; + haxr = callPackage ../development/libraries/haskell/haxr {}; haxr_th = callPackage ../development/libraries/haskell/haxr-th {}; @@ -1204,7 +1205,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hi = callPackage ../development/libraries/haskell/hi {}; - hindent = callPackage ../development/libraries/haskell/hindent {}; + hindent = callPackage ../development/libraries/haskell/hindent { + haskellSrcExts = self.haskellSrcExts_1_15_0_1; + }; hint = callPackage ../development/libraries/haskell/hint {}; @@ -1226,6 +1229,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in liblapack = pkgs.liblapack.override { shared = true; }; }; + hmatrixGsl = callPackage ../development/libraries/haskell/hmatrix-gsl {}; + hmatrixSpecial = callPackage ../development/libraries/haskell/hmatrix-special {}; hoauth = callPackage ../development/libraries/haskell/hoauth {}; @@ -1244,11 +1249,21 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hoodleTypes = callPackage ../development/libraries/haskell/hoodle-types {}; - hoogle = callPackage ../development/libraries/haskell/hoogle {}; + hoogle_4_2_34 = callPackage ../development/libraries/haskell/hoogle/4.2.34.nix { haskellSrcExts = self.haskellSrcExts_1_15_0_1; }; + hoogle_4_2_36 = callPackage ../development/libraries/haskell/hoogle/4.2.36.nix {}; + hoogle = self.hoogle_4_2_36; + hoogleLocal = callPackage ../development/libraries/haskell/hoogle/local.nix {}; + hoopl = callPackage ../development/libraries/haskell/hoopl {}; + hopenssl = callPackage ../development/libraries/haskell/hopenssl {}; + hosc = callPackage ../development/libraries/haskell/hosc { + binary = self.binary_0_7_2_2; + dataBinaryIeee754 = self.dataBinaryIeee754.override { binary = self.binary_0_7_2_2; }; + }; + hostname = callPackage ../development/libraries/haskell/hostname {}; hp2anyCore = callPackage ../development/libraries/haskell/hp2any-core {}; @@ -1257,12 +1272,34 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hS3 = callPackage ../development/libraries/haskell/hS3 {}; + hsbencher = callPackage ../development/libraries/haskell/hsbencher {}; + + hsbencherFusion = callPackage ../development/libraries/haskell/hsbencher-fusion {}; + hsBibutils = callPackage ../development/libraries/haskell/hs-bibutils {}; + hsc3 = callPackage ../development/libraries/haskell/hsc3 {}; + + hsc3Dot = callPackage ../development/libraries/haskell/hsc3-dot {}; + + hsc3Process = callPackage ../development/libraries/haskell/hsc3-process {}; + + hsc3Db = callPackage ../development/libraries/haskell/hsc3-db {}; + + hsc3Lang = callPackage ../development/libraries/haskell/hsc3-lang { + hmatrixSpecial = self.hmatrixSpecial.override { + hmatrix = self.hmatrix.override { binary = self.binary_0_7_2_2; }; + hmatrixGsl = self.hmatrixGsl.override { + hmatrix = self.hmatrix.override { binary = self.binary_0_7_2_2; }; + }; + }; + }; + + hsc3Server = callPackage ../development/libraries/haskell/hsc3-server {}; + hsdns = callPackage ../development/libraries/haskell/hsdns {}; - hsemail = if (pkgs.stdenv.lib.versionOlder ghc.version "7") then null else - callPackage ../development/libraries/haskell/hsemail {}; + hsemail = callPackage ../development/libraries/haskell/hsemail {}; hslua = callPackage ../development/libraries/haskell/hslua { lua = pkgs.lua5_1; @@ -1300,12 +1337,19 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hspecMeta = callPackage ../development/libraries/haskell/hspec-meta {}; + hspecCheckers = callPackage ../development/libraries/haskell/hspec-checkers {}; + + hspecCore = callPackage ../development/libraries/haskell/hspec-core {}; + + hspecContrib = callPackage ../development/libraries/haskell/hspec-contrib {}; + + hspecDiscover = callPackage ../development/libraries/haskell/hspec-discover {}; + hstatsd = callPackage ../development/libraries/haskell/hstatsd {}; hsyslog = callPackage ../development/libraries/haskell/hsyslog {}; - html_1_0_1_2 = callPackage ../development/libraries/haskell/html/1.0.1.2.nix {}; - html = self.html_1_0_1_2; + html = callPackage ../development/libraries/haskell/html {}; htmlConduit = callPackage ../development/libraries/haskell/html-conduit {}; @@ -1321,14 +1365,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in holyProject = callPackage ../development/libraries/haskell/holy-project {}; - HUnit_1_2_0_3 = callPackage ../development/libraries/haskell/HUnit/1.2.0.3.nix {}; - HUnit_1_2_2_1 = callPackage ../development/libraries/haskell/HUnit/1.2.2.1.nix {}; - HUnit_1_2_2_3 = callPackage ../development/libraries/haskell/HUnit/1.2.2.3.nix {}; - HUnit_1_2_4_2 = callPackage ../development/libraries/haskell/HUnit/1.2.4.2.nix {}; - HUnit_1_2_4_3 = callPackage ../development/libraries/haskell/HUnit/1.2.4.3.nix {}; - HUnit_1_2_5_1 = callPackage ../development/libraries/haskell/HUnit/1.2.5.1.nix {}; - HUnit_1_2_5_2 = callPackage ../development/libraries/haskell/HUnit/1.2.5.2.nix {}; - HUnit = self.HUnit_1_2_5_2; + HUnit = callPackage ../development/libraries/haskell/HUnit {}; HUnitApprox = callPackage ../development/libraries/haskell/HUnit-approx {}; @@ -1364,9 +1401,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in imm = callPackage ../development/libraries/haskell/imm {}; - implicit = callPackage ../development/libraries/haskell/implicit { - optparseApplicative = self.optparseApplicative_0_9_1_1; - }; + implicit = callPackage ../development/libraries/haskell/implicit {}; indents = callPackage ../development/libraries/haskell/indents {}; @@ -1429,6 +1464,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in jpeg = callPackage ../development/libraries/haskell/jpeg {}; + jsFlot = callPackage ../development/libraries/haskell/js-flot {}; + + jsJquery = callPackage ../development/libraries/haskell/js-jquery {}; + json = callPackage ../development/libraries/haskell/json {}; jsonAssertions = callPackage ../development/libraries/haskell/json-assertions {}; @@ -1453,6 +1492,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in knob = callPackage ../development/libraries/haskell/knob {}; + labeledTree = callPackage ../development/libraries/haskell/labeled-tree {}; + languageC = callPackage ../development/libraries/haskell/language-c {}; languageCInline = callPackage ../development/libraries/haskell/language-c-inline {}; @@ -1463,15 +1504,18 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in languageGlsl = callPackage ../development/libraries/haskell/language-glsl {}; - languageJava_0_2_6 = callPackage ../development/libraries/haskell/language-java/0.2.6.nix {}; - languageJava_0_2_7 = callPackage ../development/libraries/haskell/language-java/0.2.7.nix {}; - languageJava = self.languageJava_0_2_7; + languageJava = callPackage ../development/libraries/haskell/language-java {}; languageJavascript = callPackage ../development/libraries/haskell/language-javascript {}; languageHaskellExtract = callPackage ../development/libraries/haskell/language-haskell-extract {}; - lambdabot = callPackage ../development/libraries/haskell/lambdabot {}; + lambdabot = callPackage ../development/libraries/haskell/lambdabot { + haskellSrcExts = self.haskellSrcExts_1_15_0_1; + hoogle = self.hoogle_4_2_34.override { + haskellSrcExts = self.haskellSrcExts_1_15_0_1; + }; + }; lambdabotWrapper = callPackage ../development/libraries/haskell/lambdabot/wrapper.nix { mueval = self.muevalWrapper.override { @@ -1485,6 +1529,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in largeword = callPackage ../development/libraries/haskell/largeword {}; + lattices = callPackage ../development/libraries/haskell/lattices {}; + lazysmallcheck = callPackage ../development/libraries/haskell/lazysmallcheck {}; lens_4_2 = callPackage ../development/libraries/haskell/lens/4.2.nix {}; @@ -1511,17 +1557,11 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in libjenkins = callPackage ../development/libraries/haskell/libjenkins {}; - libmpd_0_8_0_5 = callPackage ../development/libraries/haskell/libmpd/0.8.0.5.nix {}; - - libmpd_0_9_0_1 = callPackage ../development/libraries/haskell/libmpd/0.9.0.1.nix {}; - - libmpd = self.libmpd_0_9_0_1; + libmpd = callPackage ../development/libraries/haskell/libmpd {}; liblastfm = callPackage ../development/libraries/haskell/liblastfm {}; - libsystemdJournal = callPackage ../development/libraries/haskell/libsystemd-journal { - systemd-journal = pkgs.systemd; - }; + libsystemdJournal = callPackage ../development/libraries/haskell/libsystemd-journal {}; libxmlSax = callPackage ../development/libraries/haskell/libxml-sax {}; @@ -1531,6 +1571,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in linear = callPackage ../development/libraries/haskell/linear {}; + linuxInotify = callPackage ../development/libraries/haskell/linux-inotify {}; + List = callPackage ../development/libraries/haskell/List {}; lists = callPackage ../development/libraries/haskell/lists {}; @@ -1543,19 +1585,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in ListZipper = callPackage ../development/libraries/haskell/ListZipper {}; - # Needed for idris for now - llvmGeneral_3_3_8_2 = callPackage ../development/libraries/haskell/llvm-general/3.3.8.2.nix { - llvmConfig = pkgs.llvm_33; - llvmGeneralPure = self.llvmGeneralPure_3_3_8_2; - }; - llvmGeneral_3_4_4_0 = callPackage ../development/libraries/haskell/llvm-general/3.4.4.0.nix { - llvmConfig = pkgs.llvm; - }; - llvmGeneral = self.llvmGeneral_3_4_4_0; + llvmGeneral = callPackage ../development/libraries/haskell/llvm-general { llvmConfig = pkgs.llvm; }; - llvmGeneralPure_3_3_8_2 = callPackage ../development/libraries/haskell/llvm-general-pure/3.3.8.2.nix {}; - llvmGeneralPure_3_4_4_0 = callPackage ../development/libraries/haskell/llvm-general-pure/3.4.4.0.nix {}; - llvmGeneralPure = self.llvmGeneralPure_3_4_4_0; + llvmGeneralPure = callPackage ../development/libraries/haskell/llvm-general-pure {}; lrucache = callPackage ../development/libraries/haskell/lrucache {}; @@ -1567,20 +1599,32 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in logging = callPackage ../development/libraries/haskell/logging {}; + loggingFacade = callPackage ../development/libraries/haskell/logging-facade {}; + + loggingFacadeJournald = callPackage ../development/libraries/haskell/logging-facade-journald {}; + logict = callPackage ../development/libraries/haskell/logict {}; loop = callPackage ../development/libraries/haskell/loop {}; lushtags = callPackage ../development/libraries/haskell/lushtags {}; + lzmaConduit = callPackage ../development/libraries/haskell/lzma-conduit {}; + lzmaEnumerator = callPackage ../development/libraries/haskell/lzma-enumerator {}; maccatcher = callPackage ../development/libraries/haskell/maccatcher {}; machines = callPackage ../development/libraries/haskell/machines {}; + machinesDirectory = callPackage ../development/libraries/haskell/machines-directory {}; + + machinesIo = callPackage ../development/libraries/haskell/machines-io {}; + managed = callPackage ../development/libraries/haskell/managed {}; + mapSyntax = callPackage ../development/libraries/haskell/map-syntax {}; + markdown = callPackage ../development/libraries/haskell/markdown {}; markdownUnlit = callPackage ../development/libraries/haskell/markdown-unlit {}; @@ -1616,7 +1660,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in minioperational = callPackage ../development/libraries/haskell/minioperational {}; miniutter = callPackage ../development/libraries/haskell/miniutter { - binary = self.binary_0_7_2_1; + binary = self.binary_0_7_2_2; }; mimeMail = callPackage ../development/libraries/haskell/mime-mail {}; @@ -1657,6 +1701,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in monadLogger = callPackage ../development/libraries/haskell/monad-logger {}; + monadIO = callPackage ../development/libraries/haskell/monadIO {}; + monadPar_0_1_0_3 = callPackage ../development/libraries/haskell/monad-par/0.1.0.3.nix {}; monadPar_0_3_4_6 = callPackage ../development/libraries/haskell/monad-par/0.3.4.6.nix {}; monadPar = self.monadPar_0_3_4_6; @@ -1669,9 +1715,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in MonadPrompt = callPackage ../development/libraries/haskell/MonadPrompt {}; - MonadRandom_0_1_13 = callPackage ../development/libraries/haskell/MonadRandom/0.1.13.nix {}; MonadRandom_0_2_0_1 = callPackage ../development/libraries/haskell/MonadRandom/0.2.0.1.nix {}; - MonadRandom = self.MonadRandom_0_2_0_1; + MonadRandom_0_3 = callPackage ../development/libraries/haskell/MonadRandom/0.3.nix {}; + MonadRandom = self.MonadRandom_0_3; monadStm = callPackage ../development/libraries/haskell/monad-stm {}; @@ -1697,10 +1743,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in msgpack = callPackage ../development/libraries/haskell/msgpack {}; - mtl_1_1_0_2 = callPackage ../development/libraries/haskell/mtl/1.1.0.2.nix {}; - mtl_2_0_1_0 = callPackage ../development/libraries/haskell/mtl/2.0.1.0.nix {}; - mtl_2_1_1 = callPackage ../development/libraries/haskell/mtl/2.1.1.nix {}; - mtl_2_1_2 = callPackage ../development/libraries/haskell/mtl/2.1.2.nix {}; + mtl_2_1_3_1 = callPackage ../development/libraries/haskell/mtl/2.1.3.1.nix {}; mtl_2_2_1 = callPackage ../development/libraries/haskell/mtl/2.2.1.nix {}; mtl = null; # tightly coupled with 'transformers' which is a core package @@ -1751,22 +1794,19 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in netwire = callPackage ../development/libraries/haskell/netwire {}; - network_2_2_1_4 = callPackage ../development/libraries/haskell/network/2.2.1.4.nix {}; network_2_2_1_7 = callPackage ../development/libraries/haskell/network/2.2.1.7.nix {}; - network_2_3_0_2 = callPackage ../development/libraries/haskell/network/2.3.0.2.nix {}; - network_2_3_0_5 = callPackage ../development/libraries/haskell/network/2.3.0.5.nix {}; network_2_3_0_13 = callPackage ../development/libraries/haskell/network/2.3.0.13.nix {}; - network_2_3_1_0 = callPackage ../development/libraries/haskell/network/2.3.1.0.nix {}; - network_2_4_1_2 = callPackage ../development/libraries/haskell/network/2.4.1.2.nix {}; network_2_5_0_0 = callPackage ../development/libraries/haskell/network/2.5.0.0.nix {}; network_2_6_0_2 = callPackage ../development/libraries/haskell/network/2.6.0.2.nix {}; - network = self.network_2_5_0_0; + network = self.network_2_6_0_2; networkCarbon = callPackage ../development/libraries/haskell/network-carbon {}; networkConduit = callPackage ../development/libraries/haskell/network-conduit {}; networkConduitTls = callPackage ../development/libraries/haskell/network-conduit-tls {}; + networkData = callPackage ../development/libraries/haskell/network-data {}; + networkFancy = callPackage ../development/libraries/haskell/network-fancy {}; networkInfo = callPackage ../development/libraries/haskell/network-info {}; @@ -1805,25 +1845,19 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in OneTuple = callPackage ../development/libraries/haskell/OneTuple {}; + objective = callPackage ../development/libraries/haskell/objective {}; + ObjectName = callPackage ../development/libraries/haskell/ObjectName {}; oeis = callPackage ../development/libraries/haskell/oeis {}; + opaleye = callPackage ../development/libraries/haskell/opaleye {}; + OpenAL = callPackage ../development/libraries/haskell/OpenAL {}; - OpenGL_2_2_1_1 = callPackage ../development/libraries/haskell/OpenGL/2.2.1.1.nix {}; - OpenGL_2_2_3_0 = callPackage ../development/libraries/haskell/OpenGL/2.2.3.0.nix {}; - OpenGL_2_2_3_1 = callPackage ../development/libraries/haskell/OpenGL/2.2.3.1.nix {}; - OpenGL_2_4_0_2 = callPackage ../development/libraries/haskell/OpenGL/2.4.0.2.nix {}; - OpenGL_2_6_0_1 = callPackage ../development/libraries/haskell/OpenGL/2.6.0.1.nix {}; - OpenGL_2_8_0_0 = callPackage ../development/libraries/haskell/OpenGL/2.8.0.0.nix {}; - OpenGL_2_9_2_0 = callPackage ../development/libraries/haskell/OpenGL/2.9.2.0.nix {}; - OpenGL = self.OpenGL_2_9_2_0; + OpenGL = callPackage ../development/libraries/haskell/OpenGL {}; - OpenGLRaw_1_3_0_0 = callPackage ../development/libraries/haskell/OpenGLRaw/1.3.0.0.nix {}; - OpenGLRaw_1_4_0_0 = callPackage ../development/libraries/haskell/OpenGLRaw/1.4.0.0.nix {}; - OpenGLRaw_1_5_0_0 = callPackage ../development/libraries/haskell/OpenGLRaw/1.5.0.0.nix {}; - OpenGLRaw = self.OpenGLRaw_1_5_0_0; + OpenGLRaw = callPackage ../development/libraries/haskell/OpenGLRaw {}; opensslStreams = callPackage ../development/libraries/haskell/openssl-streams {}; @@ -1833,10 +1867,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in options = callPackage ../development/libraries/haskell/options {}; - optparseApplicative_0_9_1_1 = callPackage ../development/libraries/haskell/optparse-applicative/0.9.1.1.nix {}; optparseApplicative_0_10_0 = callPackage ../development/libraries/haskell/optparse-applicative/0.10.0.nix {}; optparseApplicative_0_11_0_1 = callPackage ../development/libraries/haskell/optparse-applicative/0.11.0.1.nix {}; - optparseApplicative = self.optparseApplicative_0_10_0; + optparseApplicative = self.optparseApplicative_0_11_0_1; pathPieces = callPackage ../development/libraries/haskell/path-pieces {}; @@ -1853,10 +1886,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in libc = pkgs.stdenv.gcc.libc; }; - parallel_1_1_0_1 = callPackage ../development/libraries/haskell/parallel/1.1.0.1.nix {}; - parallel_2_2_0_1 = callPackage ../development/libraries/haskell/parallel/2.2.0.1.nix {}; - parallel_3_1_0_1 = callPackage ../development/libraries/haskell/parallel/3.1.0.1.nix {}; - parallel_3_2_0_2 = callPackage ../development/libraries/haskell/parallel/3.2.0.2.nix {}; parallel_3_2_0_3 = callPackage ../development/libraries/haskell/parallel/3.2.0.3.nix {}; parallel_3_2_0_4 = callPackage ../development/libraries/haskell/parallel/3.2.0.4.nix {}; parallel = self.parallel_3_2_0_4; @@ -1865,12 +1894,11 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in parseargs = callPackage ../development/libraries/haskell/parseargs {}; - parsec_2_1_0_1 = callPackage ../development/libraries/haskell/parsec/2.1.0.1.nix {}; - parsec_3_1_1 = callPackage ../development/libraries/haskell/parsec/3.1.1.nix {}; - parsec_3_1_2 = callPackage ../development/libraries/haskell/parsec/3.1.2.nix {}; - parsec_3_1_3 = callPackage ../development/libraries/haskell/parsec/3.1.3.nix {}; - parsec_3_1_6 = callPackage ../development/libraries/haskell/parsec/3.1.6.nix {}; - parsec = self.parsec_3_1_6; + parsec = callPackage ../development/libraries/haskell/parsec {}; + + parsecExtra = callPackage ../development/libraries/haskell/parsec-extra {}; + + parsek = callPackage ../development/libraries/haskell/parsek {}; parsers = callPackage ../development/libraries/haskell/parsers {}; @@ -1938,6 +1966,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in pipesSafe = callPackage ../development/libraries/haskell/pipes-safe {}; + pipesShell = callPackage ../development/libraries/haskell/pipes-shell {}; + pipesText = callPackage ../development/libraries/haskell/pipes-text {}; pipesZlib = callPackage ../development/libraries/haskell/pipes-zlib {}; @@ -1946,6 +1976,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in plugins= callPackage ../development/libraries/haskell/plugins {}; + polynomialsBernstein = callPackage ../development/libraries/haskell/polynomials-bernstein {}; + polyparse = callPackage ../development/libraries/haskell/polyparse {}; pointed = callPackage ../development/libraries/haskell/pointed {}; @@ -1976,6 +2008,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in process_1_2_0_0 = callPackage ../development/libraries/haskell/process/1.2.0.0.nix {}; process = null; # core package since forever + productProfunctors = callPackage ../development/libraries/haskell/product-profunctors {}; + profiteur = callPackage ../development/tools/haskell/profiteur {}; preludeExtras = callPackage ../development/libraries/haskell/prelude-extras {}; @@ -1996,12 +2030,12 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in punycode = callPackage ../development/libraries/haskell/punycode {}; - pureCdb = callPackage ../development/libraries/haskell/pure-cdb { testSimple = null; }; + pureCdb = callPackage ../development/libraries/haskell/pure-cdb {}; primitive_0_5_0_1 = callPackage ../development/libraries/haskell/primitive/0.5.0.1.nix {}; - primitive_0_5_2_1 = callPackage ../development/libraries/haskell/primitive/0.5.2.1.nix {}; primitive_0_5_3_0 = callPackage ../development/libraries/haskell/primitive/0.5.3.0.nix {}; - primitive = self.primitive_0_5_3_0; + primitive_0_5_4_0 = callPackage ../development/libraries/haskell/primitive/0.5.4.0.nix {}; + primitive = self.primitive_0_5_4_0; probability = callPackage ../development/libraries/haskell/probability {}; @@ -2033,17 +2067,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in pwstoreFast = callPackage ../development/libraries/haskell/pwstore-fast {}; - QuickCheck_1_2_0_0 = callPackage ../development/libraries/haskell/QuickCheck/1.2.0.0.nix {}; - QuickCheck_1_2_0_1 = callPackage ../development/libraries/haskell/QuickCheck/1.2.0.1.nix {}; - QuickCheck_2_1_1_1 = callPackage ../development/libraries/haskell/QuickCheck/2.1.1.1.nix {}; - QuickCheck_2_4_0_1 = callPackage ../development/libraries/haskell/QuickCheck/2.4.0.1.nix {}; - QuickCheck_2_4_1_1 = callPackage ../development/libraries/haskell/QuickCheck/2.4.1.1.nix {}; - QuickCheck_2_4_2 = callPackage ../development/libraries/haskell/QuickCheck/2.4.2.nix {}; - QuickCheck_2_5_1_1 = callPackage ../development/libraries/haskell/QuickCheck/2.5.1.1.nix {}; - QuickCheck_2_6 = callPackage ../development/libraries/haskell/QuickCheck/2.6.nix {}; - QuickCheck_2_7_5 = callPackage ../development/libraries/haskell/QuickCheck/2.7.5.nix {}; - QuickCheck_2_7_6 = callPackage ../development/libraries/haskell/QuickCheck/2.7.6.nix {}; - QuickCheck = self.QuickCheck_2_7_6; + QuickCheck = callPackage ../development/libraries/haskell/QuickCheck {}; quickcheckAssertions = callPackage ../development/libraries/haskell/quickcheck-assertions {}; @@ -2061,7 +2085,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in random_1_0_1_1 = callPackage ../development/libraries/haskell/random/1.0.1.1.nix {}; random_1_0_1_3 = callPackage ../development/libraries/haskell/random/1.0.1.3.nix {}; - random = self.random_1_0_1_3; + random_1_1 = callPackage ../development/libraries/haskell/random/1.1.nix {}; + random = self.random_1_1; randomFu = callPackage ../development/libraries/haskell/random-fu {}; @@ -2075,6 +2100,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in Rasterific = callPackage ../development/libraries/haskell/Rasterific {}; + rawStringsQq = callPackage ../development/libraries/haskell/rawStringsQq {}; + reserve = callPackage ../development/libraries/haskell/reserve {}; rvar = callPackage ../development/libraries/haskell/rvar {}; @@ -2101,28 +2128,15 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in regexApplicative = callPackage ../development/libraries/haskell/regex-applicative {}; - regexBase_0_72_0_2 = callPackage ../development/libraries/haskell/regex-base/0.72.0.2.nix {}; - regexBase_0_93_1 = callPackage ../development/libraries/haskell/regex-base/0.93.1.nix {}; - regexBase_0_93_2 = callPackage ../development/libraries/haskell/regex-base/0.93.2.nix {}; - regexBase = self.regexBase_0_93_2; + regexBase = callPackage ../development/libraries/haskell/regex-base {}; - regexCompat_0_71_0_1 = callPackage ../development/libraries/haskell/regex-compat/0.71.0.1.nix {}; - regexCompat_0_92 = callPackage ../development/libraries/haskell/regex-compat/0.92.nix {}; - regexCompat_0_93_1 = callPackage ../development/libraries/haskell/regex-compat/0.93.1.nix {}; - regexCompat_0_95_1 = callPackage ../development/libraries/haskell/regex-compat/0.95.1.nix {}; - regexCompat = self.regexCompat_0_95_1; + regexCompat = callPackage ../development/libraries/haskell/regex-compat {}; regexCompatTdfa = callPackage ../development/libraries/haskell/regex-compat-tdfa {}; regexPcreBuiltin = callPackage ../development/libraries/haskell/regex-pcre-builtin {}; - regexPosix_0_72_0_3 = callPackage ../development/libraries/haskell/regex-posix/0.72.0.3.nix {}; - regexPosix_0_94_1 = callPackage ../development/libraries/haskell/regex-posix/0.94.1.nix {}; - regexPosix_0_94_2 = callPackage ../development/libraries/haskell/regex-posix/0.94.2.nix {}; - regexPosix_0_94_4 = callPackage ../development/libraries/haskell/regex-posix/0.94.4.nix {}; - regexPosix_0_95_1 = callPackage ../development/libraries/haskell/regex-posix/0.95.1.nix {}; - regexPosix_0_95_2 = callPackage ../development/libraries/haskell/regex-posix/0.95.2.nix {}; - regexPosix = self.regexPosix_0_95_2; + regexPosix = callPackage ../development/libraries/haskell/regex-posix {}; regexTdfa = callPackage ../development/libraries/haskell/regex-tdfa {}; @@ -2138,6 +2152,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in regularXmlpickler = callPackage ../development/libraries/haskell/regular-xmlpickler {}; + rematch = callPackage ../development/libraries/haskell/rematch {}; + remote = callPackage ../development/libraries/haskell/remote {}; repa = callPackage ../development/libraries/haskell/repa {}; @@ -2200,8 +2216,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in sbv = callPackage ../development/libraries/haskell/sbv {}; scientific_0_2_0_2 = callPackage ../development/libraries/haskell/scientific/0.2.0.2.nix {}; - scientific_0_3_3_1 = callPackage ../development/libraries/haskell/scientific/0.3.3.1.nix {}; - scientific = self.scientific_0_3_3_1; + scientific_0_3_3_2 = callPackage ../development/libraries/haskell/scientific/0.3.3.2.nix {}; + scientific = self.scientific_0_3_3_2; scotty = callPackage ../development/libraries/haskell/scotty {}; @@ -2209,6 +2225,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in scrypt = callPackage ../development/libraries/haskell/scrypt {}; + serialport = callPackage ../development/libraries/haskell/serialport {}; + securemem = callPackage ../development/libraries/haskell/securemem {}; sendfile = callPackage ../development/libraries/haskell/sendfile {}; @@ -2237,9 +2255,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in shellmate = callPackage ../development/libraries/haskell/shellmate {}; - shelly_0_15_4_1 = callPackage ../development/libraries/haskell/shelly/0.15.4.1.nix {}; - shelly_1_5_3_1 = callPackage ../development/libraries/haskell/shelly {}; - shelly = self.shelly_1_5_3_1; + shelly = callPackage ../development/libraries/haskell/shelly {}; shell-conduit = callPackage ../development/libraries/haskell/shell-conduit {}; @@ -2271,6 +2287,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in snapletAcidState = callPackage ../development/libraries/haskell/snaplet-acid-state {}; + snapErrorCollector = callPackage ../development/libraries/haskell/snap-error-collector {}; + snapletPostgresqlSimple = callPackage ../development/libraries/haskell/snaplet-postgresql-simple {}; snapletRedis = callPackage ../development/libraries/haskell/snaplet-redis {}; @@ -2281,7 +2299,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in snapCore = callPackage ../development/libraries/haskell/snap/core.nix {}; - snapCORS = callPackage ../development/libraries/haskell/snap-cors {}; + snapCors = callPackage ../development/libraries/haskell/snap-cors {}; snapLoaderDynamic = callPackage ../development/libraries/haskell/snap/loader-dynamic.nix {}; @@ -2309,6 +2327,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in srcloc = callPackage ../development/libraries/haskell/srcloc {}; + statePlus = callPackage ../development/libraries/haskell/state-plus {}; + stateref = callPackage ../development/libraries/haskell/stateref {}; statestack = callPackage ../development/libraries/haskell/statestack {}; @@ -2343,10 +2363,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in stylishHaskell = callPackage ../development/libraries/haskell/stylish-haskell {}; - syb_0_3 = callPackage ../development/libraries/haskell/syb/0.3.nix {}; - syb_0_3_3 = callPackage ../development/libraries/haskell/syb/0.3.3.nix {}; - syb_0_3_6_1 = callPackage ../development/libraries/haskell/syb/0.3.6.1.nix {}; - syb_0_3_7 = callPackage ../development/libraries/haskell/syb/0.3.7.nix {}; syb_0_4_0 = callPackage ../development/libraries/haskell/syb/0.4.0.nix {}; syb_0_4_2 = callPackage ../development/libraries/haskell/syb/0.4.2.nix {}; syb = self.syb_0_4_2; @@ -2402,7 +2418,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in sourcemap = callPackage ../development/libraries/haskell/sourcemap {}; split_0_1_4_3 = callPackage ../development/libraries/haskell/split/0.1.4.3.nix {}; - split_0_2_1_1 = callPackage ../development/libraries/haskell/split/0.2.1.1.nix {}; split_0_2_2 = callPackage ../development/libraries/haskell/split/0.2.2.nix {}; split = self.split_0_2_2; @@ -2410,11 +2425,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in stbImage = callPackage ../development/libraries/haskell/stb-image {}; - stm_2_1_1_2 = callPackage ../development/libraries/haskell/stm/2.1.1.2.nix {}; - stm_2_1_2_1 = callPackage ../development/libraries/haskell/stm/2.1.2.1.nix {}; - stm_2_2_0_1 = callPackage ../development/libraries/haskell/stm/2.2.0.1.nix {}; - stm_2_3 = callPackage ../development/libraries/haskell/stm/2.3.nix {}; - stm_2_4 = callPackage ../development/libraries/haskell/stm/2.4.nix {}; stm_2_4_2 = callPackage ../development/libraries/haskell/stm/2.4.2.nix {}; stm_2_4_3 = callPackage ../development/libraries/haskell/stm/2.4.3.nix {}; stm = self.stm_2_4_3; @@ -2425,6 +2435,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in stmContainers = callPackage ../development/libraries/haskell/stm-containers {}; + stmDelay = callPackage ../development/libraries/haskell/stm-delay {}; + STMonadTrans = callPackage ../development/libraries/haskell/STMonadTrans {}; stmStats = callPackage ../development/libraries/haskell/stm-stats {}; @@ -2519,18 +2531,12 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in terminalSize = callPackage ../development/libraries/haskell/terminal-size {}; - terminfo_0_3_2_6 = callPackage ../development/libraries/haskell/terminfo/0.3.2.6.nix { inherit (pkgs) ncurses; }; - terminfo_0_4_0_0 = callPackage ../development/libraries/haskell/terminfo/0.4.0.0.nix { inherit (pkgs) ncurses; }; - terminfo = self.terminfo_0_4_0_0; + terminfo = callPackage ../development/libraries/haskell/terminfo { inherit (pkgs) ncurses; }; testFramework = callPackage ../development/libraries/haskell/test-framework {}; testFrameworkHunit = callPackage ../development/libraries/haskell/test-framework-hunit {}; - testFrameworkQuickcheck = callPackage ../development/libraries/haskell/test-framework-quickcheck { - QuickCheck = self.QuickCheck_1_2_0_1; # doesn't support version 2.x - }; - testFrameworkQuickcheck2 = callPackage ../development/libraries/haskell/test-framework-quickcheck2 {}; testFrameworkSmallcheck = callPackage ../development/libraries/haskell/test-framework-smallcheck {}; @@ -2541,16 +2547,14 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in testingFeat = callPackage ../development/libraries/haskell/testing-feat {}; + testSimple = callPackage ../development/libraries/haskell/test-simple {}; + texmath = callPackage ../development/libraries/haskell/texmath {}; - text_0_11_0_5 = callPackage ../development/libraries/haskell/text/0.11.0.5.nix {}; - text_0_11_0_6 = callPackage ../development/libraries/haskell/text/0.11.0.6.nix {}; - text_0_11_1_5 = callPackage ../development/libraries/haskell/text/0.11.1.5.nix {}; - text_0_11_2_0 = callPackage ../development/libraries/haskell/text/0.11.2.0.nix {}; text_0_11_2_3 = callPackage ../development/libraries/haskell/text/0.11.2.3.nix {}; - text_0_11_3_1 = callPackage ../development/libraries/haskell/text/0.11.3.1.nix {}; text_1_1_1_3 = callPackage ../development/libraries/haskell/text/1.1.1.3.nix {}; - text = self.text_1_1_1_3; + text_1_2_0_0 = callPackage ../development/libraries/haskell/text/1.2.0.0.nix {}; + text = self.text_1_2_0_0; textBinary = callPackage ../development/libraries/haskell/text-binary {}; @@ -2560,8 +2564,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in textStreamDecode = callPackage ../development/libraries/haskell/text-stream-decode {}; - tfRandom = if (pkgs.stdenv.lib.versionOlder ghc.version "7") then null else - callPackage ../development/libraries/haskell/tf-random {}; + tfRandom = callPackage ../development/libraries/haskell/tf-random {}; these = callPackage ../development/libraries/haskell/these {}; @@ -2583,6 +2586,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in threads = callPackage ../development/libraries/haskell/threads {}; + threadLocalStorage = callPackage ../development/libraries/haskell/thread-local-storage {}; + + thReifyMany = callPackage ../development/libraries/haskell/th-reify-many {}; + Thrift = callPackage ../development/libraries/haskell/Thrift {}; thyme = callPackage ../development/libraries/haskell/thyme {}; @@ -2609,7 +2616,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in tostring = callPackage ../development/libraries/haskell/tostring {}; - transformers_0_2_2_0 = callPackage ../development/libraries/haskell/transformers/0.2.2.0.nix {}; transformers_0_3_0_0 = callPackage ../development/libraries/haskell/transformers/0.3.0.0.nix {}; transformers_0_4_1_0 = callPackage ../development/libraries/haskell/transformers/0.4.1.0.nix {}; transformers = null; # core package since ghc >= 7.8.x @@ -2629,12 +2635,16 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in trifecta = callPackage ../development/libraries/haskell/trifecta {}; + trivia = callPackage ../development/libraries/haskell/trivia {}; + tuple = callPackage ../development/libraries/haskell/tuple {}; twitterConduit = callPackage ../development/libraries/haskell/twitter-conduit {}; twitterTypes = callPackage ../development/libraries/haskell/twitter-types {}; + twitterTypesLens = callPackage ../development/libraries/haskell/twitter-types-lens {}; + TypeCompose = callPackage ../development/libraries/haskell/TypeCompose {}; typeEq = callPackage ../development/libraries/haskell/type-eq {}; @@ -2645,6 +2655,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in typeLevelNaturalNumber = callPackage ../development/libraries/haskell/type-level-natural-number {}; + typographyGeometry = callPackage ../development/libraries/haskell/typography-geometry {}; + tz = callPackage ../development/libraries/haskell/tz { pkgs_tzdata = pkgs.tzdata; }; @@ -2655,6 +2667,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in unboundedDelays = callPackage ../development/libraries/haskell/unbounded-delays {}; + unboundGenerics = callPackage ../development/libraries/haskell/unbound-generics {}; + + unificationFd = callPackage ../development/libraries/haskell/unification-fd {}; + unionFind = callPackage ../development/libraries/haskell/union-find {}; uniplate = callPackage ../development/libraries/haskell/uniplate {}; @@ -2677,10 +2693,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in unlambda = callPackage ../development/libraries/haskell/unlambda {}; - unorderedContainers_0_2_3_0 = callPackage ../development/libraries/haskell/unordered-containers/0.2.3.0.nix {}; - unorderedContainers_0_2_4_0 = callPackage ../development/libraries/haskell/unordered-containers/0.2.4.0.nix {}; - unorderedContainers_0_2_5_0 = callPackage ../development/libraries/haskell/unordered-containers/0.2.5.0.nix {}; - unorderedContainers = self.unorderedContainers_0_2_5_0; + unorderedContainers = callPackage ../development/libraries/haskell/unordered-containers {}; uri = callPackage ../development/libraries/haskell/uri {}; @@ -2728,10 +2741,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in vect = callPackage ../development/libraries/haskell/vect {}; - vector_0_10_0_1 = callPackage ../development/libraries/haskell/vector/0.10.0.1.nix {}; vector_0_10_9_3 = callPackage ../development/libraries/haskell/vector/0.10.9.3.nix {}; - vector_0_10_11_0 = callPackage ../development/libraries/haskell/vector/0.10.11.0.nix {}; - vector = self.vector_0_10_11_0; + vector_0_10_12_1 = callPackage ../development/libraries/haskell/vector/0.10.12.1.nix {}; + vector = self.vector_0_10_12_1; vectorAlgorithms = callPackage ../development/libraries/haskell/vector-algorithms {}; @@ -2747,15 +2759,15 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in vinyl = callPackage ../development/libraries/haskell/vinyl {}; + vkAwsRoute53 = callPackage ../development/libraries/haskell/vk-aws-route53 {}; + + vkPosixPty = callPackage ../development/libraries/haskell/vk-posix-pty {}; + void = callPackage ../development/libraries/haskell/void {}; - vty_4_7_5 = callPackage ../development/libraries/haskell/vty/4.7.5.nix {}; - vty_5_2_3 = callPackage ../development/libraries/haskell/vty/5.2.3.nix {}; - vty = self.vty_5_2_3; + vty = callPackage ../development/libraries/haskell/vty {}; - vtyUi = callPackage ../development/libraries/haskell/vty-ui { - vty = self.vty_4_7_5; - }; + vtyUi = callPackage ../development/libraries/haskell/vty-ui {}; wai = callPackage ../development/libraries/haskell/wai {}; @@ -2781,6 +2793,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in warpTls = callPackage ../development/libraries/haskell/warp-tls {}; + WAVE = callPackage ../development/libraries/haskell/WAVE {}; + wcwidth = callPackage ../development/libraries/haskell/wcwidth {}; webdriver = callPackage ../development/libraries/haskell/webdriver {}; @@ -2845,11 +2859,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in xdot = callPackage ../development/libraries/haskell/xdot {}; - xhtml_3000_2_0_1 = callPackage ../development/libraries/haskell/xhtml/3000.2.0.1.nix {}; - xhtml_3000_2_0_4 = callPackage ../development/libraries/haskell/xhtml/3000.2.0.4.nix {}; - xhtml_3000_2_0_5 = callPackage ../development/libraries/haskell/xhtml/3000.2.0.5.nix {}; - xhtml_3000_2_1 = callPackage ../development/libraries/haskell/xhtml/3000.2.1.nix {}; - xhtml = self.xhtml_3000_2_1; + xhtml = callPackage ../development/libraries/haskell/xhtml {}; xml = callPackage ../development/libraries/haskell/xml {}; @@ -2929,13 +2939,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in zippers = callPackage ../development/libraries/haskell/zippers {}; - zlib_0_5_0_0 = callPackage ../development/libraries/haskell/zlib/0.5.0.0.nix { inherit (pkgs) zlib; }; - zlib_0_5_2_0 = callPackage ../development/libraries/haskell/zlib/0.5.2.0.nix { inherit (pkgs) zlib; }; - zlib_0_5_3_1 = callPackage ../development/libraries/haskell/zlib/0.5.3.1.nix { inherit (pkgs) zlib; }; - zlib_0_5_3_3 = callPackage ../development/libraries/haskell/zlib/0.5.3.3.nix { inherit (pkgs) zlib; }; - zlib_0_5_4_0 = callPackage ../development/libraries/haskell/zlib/0.5.4.0.nix { inherit (pkgs) zlib; }; - zlib_0_5_4_1 = callPackage ../development/libraries/haskell/zlib/0.5.4.1.nix { inherit (pkgs) zlib;}; - zlib = self.zlib_0_5_4_1; + zlib = callPackage ../development/libraries/haskell/zlib { inherit (pkgs) zlib;}; zlibBindings = callPackage ../development/libraries/haskell/zlib-bindings {}; @@ -2945,9 +2949,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in # Compilers. - Agda = callPackage ../development/compilers/agda {}; - - uhc = callPackage ../development/compilers/uhc {}; + Agda = callPackage ../development/compilers/agda { haskellSrcExts = self.haskellSrcExts_1_15_0_1; }; epic = callPackage ../development/compilers/epic {}; @@ -2955,21 +2957,13 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in # Development tools. - alex_2_3_1 = callPackage ../development/tools/parsing/alex/2.3.1.nix {}; - alex_2_3_2 = callPackage ../development/tools/parsing/alex/2.3.2.nix {}; - alex_2_3_3 = callPackage ../development/tools/parsing/alex/2.3.3.nix {}; alex_2_3_5 = callPackage ../development/tools/parsing/alex/2.3.5.nix {}; - alex_3_0_1 = callPackage ../development/tools/parsing/alex/3.0.1.nix {}; - alex_3_0_2 = callPackage ../development/tools/parsing/alex/3.0.2.nix {}; - alex_3_0_5 = callPackage ../development/tools/parsing/alex/3.0.5.nix {}; alex_3_1_3 = callPackage ../development/tools/parsing/alex/3.1.3.nix {}; alex = self.alex_3_1_3; BNFC = callPackage ../development/tools/haskell/BNFC {}; - cake3 = callPackage ../development/tools/haskell/cake3 { - optparseApplicative = self.optparseApplicative_0_9_1_1; - }; + cake3 = callPackage ../development/tools/haskell/cake3 {}; oldTime_1_1_0_2 = callPackage ../development/libraries/haskell/old-time/1.1.0.2.nix {}; oldTime = null; # By default, use the built-in old-time library @@ -2977,18 +2971,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in DrIFT = callPackage ../development/tools/haskell/DrIFT {}; - haddock_2_4_2 = callPackage ../development/tools/documentation/haddock/2.4.2.nix { Cabal = null; }; - haddock_2_7_2 = callPackage ../development/tools/documentation/haddock/2.7.2.nix { alex = self.alex_2_3_5; }; - haddock_2_9_2 = callPackage ../development/tools/documentation/haddock/2.9.2.nix {}; - haddock_2_9_4 = callPackage ../development/tools/documentation/haddock/2.9.4.nix {}; - haddock_2_10_0 = callPackage ../development/tools/documentation/haddock/2.10.0.nix {}; - haddock_2_11_0 = callPackage ../development/tools/documentation/haddock/2.11.0.nix {}; - haddock_2_12_0 = callPackage ../development/tools/documentation/haddock/2.12.0.nix {}; - haddock_2_13_2 = callPackage ../development/tools/documentation/haddock/2.13.2.nix {}; - haddock_2_14_2 = callPackage ../development/tools/documentation/haddock/2.14.2.nix {}; - haddock_2_14_3 = callPackage ../development/tools/documentation/haddock/2.14.3.nix {}; - haddock_2_15_0 = callPackage ../development/tools/documentation/haddock/2.15.0.nix {}; - haddock = self.haddock_2_15_0; + haddock = callPackage ../development/tools/documentation/haddock {}; haddockApi = callPackage ../development/libraries/haskell/haddock-api {}; @@ -2996,13 +2979,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in HandsomeSoup = callPackage ../development/libraries/haskell/HandsomeSoup {}; - happy_1_18_4 = callPackage ../development/tools/parsing/happy/1.18.4.nix {}; - happy_1_18_5 = callPackage ../development/tools/parsing/happy/1.18.5.nix {}; - happy_1_18_6 = callPackage ../development/tools/parsing/happy/1.18.6.nix {}; - happy_1_18_9 = callPackage ../development/tools/parsing/happy/1.18.9.nix {}; - happy_1_18_10 = callPackage ../development/tools/parsing/happy/1.18.10.nix {}; - happy_1_19_4 = callPackage ../development/tools/parsing/happy/1.19.4.nix {}; - happy = self.happy_1_19_4; + happy = callPackage ../development/tools/parsing/happy {}; happyMeta = callPackage ../development/tools/haskell/happy-meta {}; @@ -3018,6 +2995,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hp2anyManager = callPackage ../development/tools/haskell/hp2any-manager {}; + hsb2hs = callPackage ../development/tools/haskell/hsb2hs {}; + hscolour = callPackage ../development/tools/haskell/hscolour {}; hscolourBootstrap = self.hscolour.override { cabal = self.cabal.override { @@ -3025,11 +3004,11 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hyperlinkSource = false; configureFlags = super.configureFlags or "" + pkgs.lib.optionalString (pkgs.stdenv.lib.versionOlder "6.12" ghc.version) " --ghc-option=-rtsopts"; - }; + } // pkgs.stdenv.lib.optionalAttrs (pkgs.stdenv.lib.versionOlder "7.9" ghc.version) { noHaddock = true; }; }; }; - hscope = callPackage ../development/tools/haskell/hscope { testSimple = null; }; + hscope = callPackage ../development/tools/haskell/hscope { }; hslogger = callPackage ../development/tools/haskell/hslogger {}; @@ -3053,11 +3032,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in arbtt = callPackage ../applications/misc/arbtt {}; - idris_plain = callPackage ../development/compilers/idris { - llvmGeneral = self.llvmGeneral_3_3_8_2; - llvmGeneralPure = self.llvmGeneralPure_3_3_8_2; - languageJava = self.languageJava_0_2_6; - }; + idris_plain = callPackage ../development/compilers/idris {}; idris = callPackage ../development/compilers/idris/wrapper.nix {}; @@ -3067,17 +3042,13 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in taffybar = callPackage ../applications/misc/taffybar {}; - yi = callPackage ../applications/editors/yi/yi.nix { - vty = self.vty_4_7_5; - }; + validation = callPackage ../development/libraries/haskell/validation {}; - yiContrib = callPackage ../applications/editors/yi/yi-contrib.nix {}; + vimus = callPackage ../applications/audio/vimus {}; xlsx = callPackage ../development/libraries/haskell/xlsx {}; - xmobar = callPackage ../applications/misc/xmobar { - libmpd = self.libmpd_0_8_0_5; - }; + xmobar = callPackage ../applications/misc/xmobar {}; xmonad = callPackage ../applications/window-managers/xmonad {}; @@ -3085,6 +3056,32 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in xmonadExtras = callPackage ../applications/window-managers/xmonad/xmonad-extras.nix {}; + # Yi packages + + dynamicState = callPackage ../development/libraries/haskell/dynamic-state {}; + + ooPrototypes = callPackage ../development/libraries/haskell/oo-prototypes {}; + + wordTrie = callPackage ../development/libraries/haskell/word-trie {}; + + # This is an unwrapped version of Yi, it will not behave well (no + # M-x or reload). Use ‘yiCustom’ instead. + yi = callPackage ../applications/editors/yi/yi.nix { }; + + yiCustom = callPackage ../applications/editors/yi/yi-custom.nix { + extraPackages = pkgs: []; + }; + + yiFuzzyOpen = callPackage ../development/libraries/haskell/yi-fuzzy-open {}; + + yiMonokai = callPackage ../development/libraries/haskell/yi-monokai {}; + + yiLanguage = callPackage ../development/libraries/haskell/yi-language {}; + + yiRope = callPackage ../development/libraries/haskell/yi-rope {}; + + yiSnippet = callPackage ../development/libraries/haskell/yi-snippet {}; + # Tools. cabalDb = callPackage ../development/tools/haskell/cabal-db {}; @@ -3104,20 +3101,21 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in buildCommand = '' export HOME="$TMPDIR" - ${nativePkgs.haskellPackages.cabal2nix}/bin/cabal2nix ${src + "/${name}.cabal"} --sha256=FILTERME \ - | grep -v FILTERME | sed \ - -e 's/licenses.proprietary/licenses.unfree/' \ - -e 's/{ cabal/{ cabal, cabalInstall, cabalDrvArgs ? {}, src/' \ - -e 's/cabal.mkDerivation (self: {/cabal.mkDerivation (self: cabalDrvArgs \/\/ {/' \ - -e 's/buildDepends = \[/buildDepends = \[ cabalInstall/' \ - -e 's/pname = \([^\n]*\)/pname = \1\n inherit src;\n/' > $out + ${nativePkgs.haskellPackages.cabal2nix}/bin/cabal2nix ${src} \ + | sed -e 's/licenses.proprietary/licenses.unfree/' > $out ''; } // pkgs.lib.optionalAttrs nativePkgs.stdenv.isLinux { LANG = "en_US.UTF-8"; LOCALE_ARCHIVE = "${nativePkgs.glibcLocales}/lib/locale/locale-archive"; }); - in callPackage cabalExpr ({ inherit src cabalDrvArgs; } // args); + in callPackage cabalExpr ({ + cabal = self.cabal.override { + extension = eself: esuper: { + buildDepends = [ self.cabalInstall ] ++ esuper.buildDepends; + } // cabalDrvArgs; + }; + } // args); buildLocalCabal = src: name: self.buildLocalCabalWithArgs { inherit src name; }; @@ -3138,28 +3136,16 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in cabalg = callPackage ../development/libraries/haskell/cabalg {}; - cabalInstall_0_6_2 = callPackage ../tools/package-management/cabal-install/0.6.2.nix {}; - cabalInstall_0_8_0 = callPackage ../tools/package-management/cabal-install/0.8.0.nix {}; - cabalInstall_0_8_2 = callPackage ../tools/package-management/cabal-install/0.8.2.nix {}; - cabalInstall_0_10_2 = callPackage ../tools/package-management/cabal-install/0.10.2.nix {}; - cabalInstall_0_14_0 = callPackage ../tools/package-management/cabal-install/0.14.0.nix {}; cabalInstall_1_16_0_2 = callPackage ../tools/package-management/cabal-install/1.16.0.2.nix { Cabal = self.Cabal_1_16_0_3; }; cabalInstall_1_18_0_3 = callPackage ../tools/package-management/cabal-install/1.18.0.3.nix { Cabal = self.Cabal_1_18_1_3; }; - cabalInstall_1_20_0_3 = callPackage ../tools/package-management/cabal-install/1.20.0.3.nix { Cabal = self.Cabal_1_20_0_2; }; + cabalInstall_1_20_0_3 = callPackage ../tools/package-management/cabal-install/1.20.0.3.nix { + HTTP = self.HTTP.override { network = self.network_2_5_0_0; }; + Cabal = self.Cabal_1_20_0_2; + }; cabalInstall = self.cabalInstall_1_20_0_3; - CabalGhcjs = callPackage ../development/tools/haskell/Cabal-ghcjs { - QuickCheck = self.QuickCheck_2_6; - testFrameworkQuickcheck2 = self.testFrameworkQuickcheck2.override { - QuickCheck = self.QuickCheck_2_6; - }; - }; - cabalInstallGhcjs = callPackage ../development/tools/haskell/cabal-install-ghcjs { - QuickCheck = self.QuickCheck_2_6; - testFrameworkQuickcheck2 = self.testFrameworkQuickcheck2.override { - QuickCheck = self.QuickCheck_2_6; - }; - }; + CabalGhcjs = callPackage ../development/tools/haskell/Cabal-ghcjs {}; + cabalInstallGhcjs = callPackage ../development/tools/haskell/cabal-install-ghcjs {}; codex = callPackage ../development/tools/haskell/codex {}; @@ -3200,7 +3186,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in LambdaHack = callPackage ../games/LambdaHack { vectorBinaryInstances = self.vectorBinaryInstances.override { - binary = self.binary_0_7_2_1; # the miniutter build input requires this version + binary = self.binary_0_7_2_2; # the miniutter build input requires this version }; }; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 8a44a997c071..245483e76b38 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -5,15 +5,15 @@ for each package in a separate file: the call to the function would be almost as must code as the function itself. */ -{ fetchurl, stdenv, lua, callPackage, unzip, zziplib, -pcre, oniguruma, gnulib, tre, glibc, -sqlite }: +{ fetchurl, stdenv, lua, callPackage, unzip, zziplib +, pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat +}: let - isLua51 = lua.luaversion == "5.1"; - isLua52 = lua.luaversion == "5.2"; - self = _self; - _self = with self; { + isLua51 = lua.luaversion == "5.1"; + isLua52 = lua.luaversion == "5.2"; + self = _self; + _self = with self; { inherit (stdenv.lib) maintainers; #define build lua package function @@ -23,7 +23,57 @@ let inherit lua; }; - luafilesystem = buildLuaPackage { + luabitop = buildLuaPackage rec { + version = "1.0.2"; + name = "bitop-${version}"; + src = fetchurl { + url = "http://bitop.luajit.org/download/LuaBitOp-${version}.tar.gz"; + sha256 = "16fffbrgfcw40kskh2bn9q7m3gajffwd2f35rafynlnd7llwj1qj"; + }; + + preBuild = '' + makeFlagsArray=( + INCLUDES="-I${lua}/include" + LUA="${lua}/bin/lua"); + ''; + + installPhase = '' + mkdir -p $out/lib/lua/${lua.luaversion} + install -p bit.so $out/lib/lua/${lua.luaversion} + ''; + + meta = { + homepage = "http://bitop.luajit.org"; + maintainers = with maintainers; [ flosse ]; + }; + }; + + luaexpat = buildLuaPackage rec { + version = "1.3.0"; + name = "expat-${version}"; + isLibrary = true; + src = fetchurl { + url = "https://matthewwild.co.uk/projects/luaexpat/luaexpat-${version}.tar.gz"; + sha256 = "1hvxqngn0wf5642i5p3vcyhg3pmp102k63s9ry4jqyyqc1wkjq6h"; + }; + + buildInputs = [ expat ]; + + preBuild = '' + makeFlagsArray=( + LUA_LDIR="$out/share/lua/${lua.luaversion}" + LUA_INC="-I${lua}/include" LUA_CDIR="$out/lib/lua/${lua.luaversion}" + EXPAT_INC="-I${expat}/include"); + ''; + + meta = { + homepage = "http://matthewwild.co.uk/projects/luaexpat"; + hydraPlatforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.flosse ]; + }; + }; + + luafilesystem = buildLuaPackage rec { name = "filesystem-1.6.2"; src = fetchurl { url = "https://github.com/keplerproject/luafilesystem/archive/v1_6_2.tar.gz"; @@ -36,18 +86,44 @@ let }; }; + luasec = buildLuaPackage rec { + version = "0.5"; + name = "sec-${version}"; + src = fetchurl { + url = "https://github.com/brunoos/luasec/archive/luasec-${version}.tar.gz"; + sha256 = "08rm12cr1gjdnbv2jpk7xykby9l292qmz2v0dfdlgb4jfj7mk034"; + }; + + buildInputs = [ openssl ]; + + preBuild = '' + makeFlagsArray=( + linux + LUAPATH="$out/lib/lua/${lua.luaversion}" + LUACPATH="$out/lib/lua/${lua.luaversion}" + INC_PATH="-I${lua}/include" + LIB_PATH="-L$out/lib"); + ''; + + meta = { + homepage = "https://github.com/brunoos/luasec"; + hydraPlatforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.flosse ]; + }; + }; + luasocket = buildLuaPackage rec { name = "socket-${version}"; version = "2.0.2"; src = fetchurl { - url = "http://files.luaforge.net/releases/luasocket/luasocket/luasocket-${version}/luasocket-${version}.tar.gz"; - sha256 = "19ichkbc4rxv00ggz8gyf29jibvc2wq9pqjik0ll326rrxswgnag"; + url = "http://files.luaforge.net/releases/luasocket/luasocket/luasocket-${version}/luasocket-${version}.tar.gz"; + sha256 = "19ichkbc4rxv00ggz8gyf29jibvc2wq9pqjik0ll326rrxswgnag"; }; disabled = isLua52; patchPhase = '' - sed -e "s,^INSTALL_TOP_SHARE.*,INSTALL_TOP_SHARE=$out/share/lua/${lua.luaversion}," \ - -e "s,^INSTALL_TOP_LIB.*,INSTALL_TOP_LIB=$out/lib/lua/${lua.luaversion}," \ - -i config + sed -e "s,^INSTALL_TOP_SHARE.*,INSTALL_TOP_SHARE=$out/share/lua/${lua.luaversion}," \ + -e "s,^INSTALL_TOP_LIB.*,INSTALL_TOP_LIB=$out/lib/lua/${lua.luaversion}," \ + -i config ''; meta = { homepage = "http://w3.impa.br/~diego/software/luasocket/"; @@ -142,4 +218,41 @@ let }; }; + lpeg = buildLuaPackage rec { + name = "lpeg-${version}"; + version = "0.12"; + src = fetchurl { + url = "http://www.inf.puc-rio.br/~roberto/lpeg/${name}.tar.gz"; + sha256 = "0xlbfw1w7l65a5qhnx5sfw327hkq1zcj8xmg4glfw6fj9ha4b9gg"; + }; + buildInputs = [ unzip ]; + + installPhase = '' + mkdir -p $out/lib/lua/${lua.luaversion} + install -p lpeg.so $out/lib/lua/${lua.luaversion} + install -p re.lua $out/lib/lua/${lua.luaversion} + ''; + + meta = { + homepage = "http://www.inf.puc-rio.br/~roberto/lpeg/"; + hydraPlatforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.mit; + }; + }; + + luaMessagePack = buildLuaPackage rec { + name = "lua-MessagePack-${version}"; + version = "0.3.1"; + src = fetchurl { + url = "https://github.com/fperrad/lua-MessagePack/archive/${version}.tar.gz"; + sha256 = "185mrd6bagwwm94jxzanq01l72ama3x4hf160a7yw7hgim2y5h9c"; + }; + buildInputs = [ unzip ]; + + meta = { + homepage = "http://fperrad.github.io/lua-MessagePack/index.html"; + hydraPlatforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.mit; + }; + }; }; in self diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 7e4a0fbc4555..b2ce39216cc4 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -1,6 +1,28 @@ { self, fetchurl, fetchgit ? null, lib }: { + by-spec."7f"."*" = + self.by-version."7f"."1.1.3"; + by-version."7f"."1.1.3" = lib.makeOverridable self.buildNodePackage { + name = "7f-1.1.3"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/7f/-/7f-1.1.3.tgz"; + name = "7f-1.1.3.tgz"; + sha1 = "88d2cb194fceeb96db7b24bc710b283451e7a851"; + }) + ]; + buildInputs = + (self.nativeDeps."7f" or []); + deps = { + "bits-0.1.1" = self.by-version."bits"."0.1.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "7f" ]; + }; + "7f" = self.by-version."7f"."1.1.3"; by-spec."Base64"."~0.2.0" = self.by-version."Base64"."0.2.1"; by-version."Base64"."0.2.1" = lib.makeOverridable self.buildNodePackage { @@ -21,6 +43,28 @@ ]; passthru.names = [ "Base64" ]; }; + by-spec."JSONStream"."~0.6.4" = + self.by-version."JSONStream"."0.6.4"; + by-version."JSONStream"."0.6.4" = lib.makeOverridable self.buildNodePackage { + name = "JSONStream-0.6.4"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.6.4.tgz"; + name = "JSONStream-0.6.4.tgz"; + sha1 = "4b2c8063f8f512787b2375f7ee9db69208fa2dcb"; + }) + ]; + buildInputs = + (self.nativeDeps."JSONStream" or []); + deps = { + "jsonparse-0.0.5" = self.by-version."jsonparse"."0.0.5"; + "through-2.2.7" = self.by-version."through"."2.2.7"; + }; + peerDependencies = [ + ]; + passthru.names = [ "JSONStream" ]; + }; by-spec."JSONStream"."~0.7.1" = self.by-version."JSONStream"."0.7.4"; by-version."JSONStream"."0.7.4" = lib.makeOverridable self.buildNodePackage { @@ -67,26 +111,6 @@ }; by-spec."JSONStream"."~0.8.4" = self.by-version."JSONStream"."0.8.4"; - by-spec."StringScanner"."~0.0.3" = - self.by-version."StringScanner"."0.0.3"; - by-version."StringScanner"."0.0.3" = lib.makeOverridable self.buildNodePackage { - name = "StringScanner-0.0.3"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/StringScanner/-/StringScanner-0.0.3.tgz"; - name = "StringScanner-0.0.3.tgz"; - sha1 = "bf06ecfdc90046711f4e6175549243b78ceb38aa"; - }) - ]; - buildInputs = - (self.nativeDeps."StringScanner" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "StringScanner" ]; - }; by-spec."abbrev"."1" = self.by-version."abbrev"."1.0.5"; by-version."abbrev"."1.0.5" = lib.makeOverridable self.buildNodePackage { @@ -109,6 +133,8 @@ }; by-spec."abbrev"."1.0.x" = self.by-version."abbrev"."1.0.5"; + by-spec."abbrev"."~1.0.4" = + self.by-version."abbrev"."1.0.5"; by-spec."abbrev"."~1.0.5" = self.by-version."abbrev"."1.0.5"; by-spec."accepts"."1.0.0" = @@ -133,50 +159,95 @@ ]; passthru.names = [ "accepts" ]; }; - by-spec."accepts"."~1.0.7" = - self.by-version."accepts"."1.0.7"; - by-version."accepts"."1.0.7" = lib.makeOverridable self.buildNodePackage { - name = "accepts-1.0.7"; + by-spec."accepts"."~1.1.0" = + self.by-version."accepts"."1.1.3"; + by-version."accepts"."1.1.3" = lib.makeOverridable self.buildNodePackage { + name = "accepts-1.1.3"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/accepts/-/accepts-1.0.7.tgz"; - name = "accepts-1.0.7.tgz"; - sha1 = "5b501fb4f0704309964ccdb048172541208dab1a"; + url = "http://registry.npmjs.org/accepts/-/accepts-1.1.3.tgz"; + name = "accepts-1.1.3.tgz"; + sha1 = "14d99f8ee3ea69f8709d4bd17ffe153bef0f6c6d"; }) ]; buildInputs = (self.nativeDeps."accepts" or []); deps = { - "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2"; - "negotiator-0.4.7" = self.by-version."negotiator"."0.4.7"; + "mime-types-2.0.3" = self.by-version."mime-types"."2.0.3"; + "negotiator-0.4.9" = self.by-version."negotiator"."0.4.9"; }; peerDependencies = [ ]; passthru.names = [ "accepts" ]; }; - by-spec."accepts"."~1.1.0" = - self.by-version."accepts"."1.1.1"; - by-version."accepts"."1.1.1" = lib.makeOverridable self.buildNodePackage { - name = "accepts-1.1.1"; + by-spec."accepts"."~1.1.2" = + self.by-version."accepts"."1.1.3"; + by-spec."accepts"."~1.1.3" = + self.by-version."accepts"."1.1.3"; + by-spec."acorn"."^0.8.0" = + self.by-version."acorn"."0.8.0"; + by-version."acorn"."0.8.0" = lib.makeOverridable self.buildNodePackage { + name = "acorn-0.8.0"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/acorn/-/acorn-0.8.0.tgz"; + name = "acorn-0.8.0.tgz"; + sha1 = "e07ae6721110b22878242950ae2e96658b0aac7e"; + }) + ]; + buildInputs = + (self.nativeDeps."acorn" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "acorn" ]; + }; + by-spec."acorn"."~0.9.0" = + self.by-version."acorn"."0.9.0"; + by-version."acorn"."0.9.0" = lib.makeOverridable self.buildNodePackage { + name = "acorn-0.9.0"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/acorn/-/acorn-0.9.0.tgz"; + name = "acorn-0.9.0.tgz"; + sha1 = "67728e0acad6cc61dfb901c121837694db5b926b"; + }) + ]; + buildInputs = + (self.nativeDeps."acorn" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "acorn" ]; + }; + by-spec."acorn-globals"."^1.0.0" = + self.by-version."acorn-globals"."1.0.1"; + by-version."acorn-globals"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "acorn-globals-1.0.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/accepts/-/accepts-1.1.1.tgz"; - name = "accepts-1.1.1.tgz"; - sha1 = "3b40bf6abc3fe3bc004534f4672ae1efd0063a96"; + url = "http://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.1.tgz"; + name = "acorn-globals-1.0.1.tgz"; + sha1 = "00013368c24311f9fc2c2d420df6c311b9df64d9"; }) ]; buildInputs = - (self.nativeDeps."accepts" or []); + (self.nativeDeps."acorn-globals" or []); deps = { - "mime-types-2.0.2" = self.by-version."mime-types"."2.0.2"; - "negotiator-0.4.8" = self.by-version."negotiator"."0.4.8"; + "acorn-0.8.0" = self.by-version."acorn"."0.8.0"; }; peerDependencies = [ ]; - passthru.names = [ "accepts" ]; + passthru.names = [ "acorn-globals" ]; }; + by-spec."acorn-globals"."^1.0.1" = + self.by-version."acorn-globals"."1.0.1"; by-spec."active-x-obfuscator"."0.0.1" = self.by-version."active-x-obfuscator"."0.0.1"; by-version."active-x-obfuscator"."0.0.1" = lib.makeOverridable self.buildNodePackage { @@ -198,6 +269,28 @@ ]; passthru.names = [ "active-x-obfuscator" ]; }; + by-spec."addr-to-ip-port"."^1.0.0" = + self.by-version."addr-to-ip-port"."1.4.0"; + by-version."addr-to-ip-port"."1.4.0" = lib.makeOverridable self.buildNodePackage { + name = "addr-to-ip-port-1.4.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/addr-to-ip-port/-/addr-to-ip-port-1.4.0.tgz"; + name = "addr-to-ip-port-1.4.0.tgz"; + sha1 = "9b784874d8a6a284c64d453f2c0f6430f201a8db"; + }) + ]; + buildInputs = + (self.nativeDeps."addr-to-ip-port" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "addr-to-ip-port" ]; + }; + by-spec."addr-to-ip-port"."^1.0.1" = + self.by-version."addr-to-ip-port"."1.4.0"; by-spec."addressparser"."~0.2.1" = self.by-version."addressparser"."0.2.1"; by-version."addressparser"."0.2.1" = lib.makeOverridable self.buildNodePackage { @@ -240,6 +333,28 @@ }; by-spec."adm-zip"."~0.4.3" = self.by-version."adm-zip"."0.4.4"; + by-spec."airplay-js"."^0.2.5" = + self.by-version."airplay-js"."0.2.6"; + by-version."airplay-js"."0.2.6" = lib.makeOverridable self.buildNodePackage { + name = "airplay-js-0.2.6"; + bin = false; + src = [ + (self.patchSource fetchurl { + url = "http://registry.npmjs.org/airplay-js/-/airplay-js-0.2.6.tgz"; + name = "airplay-js-0.2.6.tgz"; + sha1 = "a7038ed3559d9dd6d8c96d553b56158bf9434f7c"; + }) + ]; + buildInputs = + (self.nativeDeps."airplay-js" or []); + deps = { + "mdns-js-0.2.2" = self.by-version."mdns-js"."0.2.2"; + "plist-with-patches-0.5.1" = self.by-version."plist-with-patches"."0.5.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "airplay-js" ]; + }; by-spec."almond"."*" = self.by-version."almond"."0.3.0"; by-version."almond"."0.3.0" = lib.makeOverridable self.buildNodePackage { @@ -284,6 +399,46 @@ "amdefine" = self.by-version."amdefine"."0.1.0"; by-spec."amdefine".">=0.0.4" = self.by-version."amdefine"."0.1.0"; + by-spec."ansi"."~0.1.2" = + self.by-version."ansi"."0.1.2"; + by-version."ansi"."0.1.2" = lib.makeOverridable self.buildNodePackage { + name = "ansi-0.1.2"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ansi/-/ansi-0.1.2.tgz"; + name = "ansi-0.1.2.tgz"; + sha1 = "2627e29498f06e2a1c2ece9c21e28fd494430827"; + }) + ]; + buildInputs = + (self.nativeDeps."ansi" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "ansi" ]; + }; + by-spec."ansi"."~0.2.1" = + self.by-version."ansi"."0.2.1"; + by-version."ansi"."0.2.1" = lib.makeOverridable self.buildNodePackage { + name = "ansi-0.2.1"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ansi/-/ansi-0.2.1.tgz"; + name = "ansi-0.2.1.tgz"; + sha1 = "3ab568ec18cd0ab7753c83117d57dad684a1c017"; + }) + ]; + buildInputs = + (self.nativeDeps."ansi" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "ansi" ]; + }; by-spec."ansi"."~0.3.0" = self.by-version."ansi"."0.3.0"; by-version."ansi"."0.3.0" = lib.makeOverridable self.buildNodePackage { @@ -304,6 +459,26 @@ ]; passthru.names = [ "ansi" ]; }; + by-spec."ansi-regex"."^0.1.0" = + self.by-version."ansi-regex"."0.1.0"; + by-version."ansi-regex"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "ansi-regex-0.1.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-0.1.0.tgz"; + name = "ansi-regex-0.1.0.tgz"; + sha1 = "55ca60db6900857c423ae9297980026f941ed903"; + }) + ]; + buildInputs = + (self.nativeDeps."ansi-regex" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "ansi-regex" ]; + }; by-spec."ansi-regex"."^0.2.0" = self.by-version."ansi-regex"."0.2.1"; by-version."ansi-regex"."0.2.1" = lib.makeOverridable self.buildNodePackage { @@ -448,28 +623,28 @@ ]; passthru.names = [ "apparatus" ]; }; - by-spec."archiver"."~0.11.0" = - self.by-version."archiver"."0.11.0"; - by-version."archiver"."0.11.0" = lib.makeOverridable self.buildNodePackage { - name = "archiver-0.11.0"; + by-spec."archiver"."~0.12.0" = + self.by-version."archiver"."0.12.0"; + by-version."archiver"."0.12.0" = lib.makeOverridable self.buildNodePackage { + name = "archiver-0.12.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/archiver/-/archiver-0.11.0.tgz"; - name = "archiver-0.11.0.tgz"; - sha1 = "98177da7a6c0192b7f2798f30cd6eab8abd76690"; + url = "http://registry.npmjs.org/archiver/-/archiver-0.12.0.tgz"; + name = "archiver-0.12.0.tgz"; + sha1 = "b8ccde2508cab9092bb7106630139c0f39a280cc"; }) ]; buildInputs = (self.nativeDeps."archiver" or []); deps = { "async-0.9.0" = self.by-version."async"."0.9.0"; - "buffer-crc32-0.2.3" = self.by-version."buffer-crc32"."0.2.3"; - "glob-3.2.11" = self.by-version."glob"."3.2.11"; + "buffer-crc32-0.2.4" = self.by-version."buffer-crc32"."0.2.4"; + "glob-4.0.6" = self.by-version."glob"."4.0.6"; "lazystream-0.1.0" = self.by-version."lazystream"."0.1.0"; "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; - "readable-stream-1.0.32" = self.by-version."readable-stream"."1.0.32"; - "tar-stream-0.4.7" = self.by-version."tar-stream"."0.4.7"; + "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; + "tar-stream-1.0.2" = self.by-version."tar-stream"."1.0.2"; "zip-stream-0.4.1" = self.by-version."zip-stream"."0.4.1"; }; peerDependencies = [ @@ -496,8 +671,30 @@ ]; passthru.names = [ "archy" ]; }; - by-spec."archy"."^0.0.2" = + by-spec."archy"."0.0.2" = self.by-version."archy"."0.0.2"; + by-spec."archy"."^1.0.0" = + self.by-version."archy"."1.0.0"; + by-version."archy"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "archy-1.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/archy/-/archy-1.0.0.tgz"; + name = "archy-1.0.0.tgz"; + sha1 = "f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"; + }) + ]; + buildInputs = + (self.nativeDeps."archy" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "archy" ]; + }; + by-spec."archy"."~1.0.0" = + self.by-version."archy"."1.0.0"; by-spec."argparse"."0.1.15" = self.by-version."argparse"."0.1.15"; by-version."argparse"."0.1.15" = lib.makeOverridable self.buildNodePackage { @@ -522,6 +719,66 @@ }; by-spec."argparse"."~ 0.1.11" = self.by-version."argparse"."0.1.15"; + by-spec."array-filter"."~0.0.0" = + self.by-version."array-filter"."0.0.1"; + by-version."array-filter"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "array-filter-0.0.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz"; + name = "array-filter-0.0.1.tgz"; + sha1 = "7da8cf2e26628ed732803581fd21f67cacd2eeec"; + }) + ]; + buildInputs = + (self.nativeDeps."array-filter" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "array-filter" ]; + }; + by-spec."array-map"."~0.0.0" = + self.by-version."array-map"."0.0.0"; + by-version."array-map"."0.0.0" = lib.makeOverridable self.buildNodePackage { + name = "array-map-0.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz"; + name = "array-map-0.0.0.tgz"; + sha1 = "88a2bab73d1cf7bcd5c1b118a003f66f665fa662"; + }) + ]; + buildInputs = + (self.nativeDeps."array-map" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "array-map" ]; + }; + by-spec."array-reduce"."~0.0.0" = + self.by-version."array-reduce"."0.0.0"; + by-version."array-reduce"."0.0.0" = lib.makeOverridable self.buildNodePackage { + name = "array-reduce-0.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz"; + name = "array-reduce-0.0.0.tgz"; + sha1 = "173899d3ffd1c7d9383e4479525dbe278cab5f2b"; + }) + ]; + buildInputs = + (self.nativeDeps."array-reduce" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "array-reduce" ]; + }; by-spec."asap"."^1.0.0" = self.by-version."asap"."1.0.0"; by-version."asap"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -542,6 +799,8 @@ ]; passthru.names = [ "asap" ]; }; + by-spec."asap"."~1.0.0" = + self.by-version."asap"."1.0.0"; by-spec."ascii-json"."~0.2" = self.by-version."ascii-json"."0.2.0"; by-version."ascii-json"."0.2.0" = lib.makeOverridable self.buildNodePackage { @@ -582,6 +841,52 @@ ]; passthru.names = [ "asn1" ]; }; + by-spec."asn1.js".">=0.6.0-0 >=0.6.4-0 <0.7.0-0" = + self.by-version."asn1.js"."0.6.5"; + by-version."asn1.js"."0.6.5" = lib.makeOverridable self.buildNodePackage { + name = "asn1.js-0.6.5"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/asn1.js/-/asn1.js-0.6.5.tgz"; + name = "asn1.js-0.6.5.tgz"; + sha1 = "92219d0eeaffa92bd9c26da38f66a990b63c4579"; + }) + ]; + buildInputs = + (self.nativeDeps."asn1.js" or []); + deps = { + "bn.js-0.15.2" = self.by-version."bn.js"."0.15.2"; + }; + peerDependencies = [ + ]; + passthru.names = [ "asn1.js" ]; + }; + by-spec."asn1.js"."^0.6.0" = + self.by-version."asn1.js"."0.6.5"; + by-spec."asn1.js"."^0.6.4" = + self.by-version."asn1.js"."0.6.5"; + by-spec."asn1.js-rfc3280"."^0.5.1" = + self.by-version."asn1.js-rfc3280"."0.5.1"; + by-version."asn1.js-rfc3280"."0.5.1" = lib.makeOverridable self.buildNodePackage { + name = "asn1.js-rfc3280-0.5.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/asn1.js-rfc3280/-/asn1.js-rfc3280-0.5.1.tgz"; + name = "asn1.js-rfc3280-0.5.1.tgz"; + sha1 = "86b527b34fda63a571647c7ef54d4a680c0be122"; + }) + ]; + buildInputs = + (self.nativeDeps."asn1.js-rfc3280" or []); + deps = { + }; + peerDependencies = [ + self.by-version."asn1.js"."0.6.5" + ]; + passthru.names = [ "asn1.js-rfc3280" ]; + }; by-spec."assert"."*" = self.by-version."assert"."1.1.2"; by-version."assert"."1.1.2" = lib.makeOverridable self.buildNodePackage { @@ -666,6 +971,48 @@ ]; passthru.names = [ "assertion-error" ]; }; + by-spec."astw"."~0.0.0" = + self.by-version."astw"."0.0.0"; + by-version."astw"."0.0.0" = lib.makeOverridable self.buildNodePackage { + name = "astw-0.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/astw/-/astw-0.0.0.tgz"; + name = "astw-0.0.0.tgz"; + sha1 = "4490866a3ef116aaf91adba63ca7ddf70b6d59bd"; + }) + ]; + buildInputs = + (self.nativeDeps."astw" or []); + deps = { + "esprima-1.0.2" = self.by-version."esprima"."1.0.2"; + }; + peerDependencies = [ + ]; + passthru.names = [ "astw" ]; + }; + by-spec."astw"."~0.1.0" = + self.by-version."astw"."0.1.0"; + by-version."astw"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "astw-0.1.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/astw/-/astw-0.1.0.tgz"; + name = "astw-0.1.0.tgz"; + sha1 = "098be2758a6e9e9e15465d4fc4ba36265de11085"; + }) + ]; + buildInputs = + (self.nativeDeps."astw" or []); + deps = { + "esprima-six-0.0.3" = self.by-version."esprima-six"."0.0.3"; + }; + peerDependencies = [ + ]; + passthru.names = [ "astw" ]; + }; by-spec."astw"."~1.1.0" = self.by-version."astw"."1.1.0"; by-version."astw"."1.1.0" = lib.makeOverridable self.buildNodePackage { @@ -774,6 +1121,8 @@ self.by-version."async"."0.9.0"; by-spec."async"."^0.2.10" = self.by-version."async"."0.2.10"; + by-spec."async"."^0.9.0" = + self.by-version."async"."0.9.0"; by-spec."async"."~0.1.22" = self.by-version."async"."0.1.22"; by-spec."async"."~0.2.0" = @@ -782,18 +1131,20 @@ self.by-version."async"."0.2.10"; by-spec."async"."~0.2.7" = self.by-version."async"."0.2.10"; + by-spec."async"."~0.2.8" = + self.by-version."async"."0.2.10"; by-spec."async"."~0.2.9" = self.by-version."async"."0.2.10"; - by-spec."async"."~0.7.0" = - self.by-version."async"."0.7.0"; - by-version."async"."0.7.0" = lib.makeOverridable self.buildNodePackage { - name = "async-0.7.0"; + by-spec."async"."~0.8" = + self.by-version."async"."0.8.0"; + by-version."async"."0.8.0" = lib.makeOverridable self.buildNodePackage { + name = "async-0.8.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/async/-/async-0.7.0.tgz"; - name = "async-0.7.0.tgz"; - sha1 = "4429e0e62f5de0a54f37458c49f0b897eb52ada5"; + url = "http://registry.npmjs.org/async/-/async-0.8.0.tgz"; + name = "async-0.8.0.tgz"; + sha1 = "ee65ec77298c2ff1456bc4418a052d0f06435112"; }) ]; buildInputs = @@ -804,28 +1155,28 @@ ]; passthru.names = [ "async" ]; }; - by-spec."async"."~0.8" = - self.by-version."async"."0.8.0"; - by-version."async"."0.8.0" = lib.makeOverridable self.buildNodePackage { - name = "async-0.8.0"; + by-spec."async"."~0.9.0" = + self.by-version."async"."0.9.0"; + by-spec."async-each"."~0.1.5" = + self.by-version."async-each"."0.1.6"; + by-version."async-each"."0.1.6" = lib.makeOverridable self.buildNodePackage { + name = "async-each-0.1.6"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/async/-/async-0.8.0.tgz"; - name = "async-0.8.0.tgz"; - sha1 = "ee65ec77298c2ff1456bc4418a052d0f06435112"; + url = "http://registry.npmjs.org/async-each/-/async-each-0.1.6.tgz"; + name = "async-each-0.1.6.tgz"; + sha1 = "b67e99edcddf96541e44af56290cd7d5c6e70439"; }) ]; buildInputs = - (self.nativeDeps."async" or []); + (self.nativeDeps."async-each" or []); deps = { }; peerDependencies = [ ]; - passthru.names = [ "async" ]; + passthru.names = [ "async-each" ]; }; - by-spec."async"."~0.9.0" = - self.by-version."async"."0.9.0"; by-spec."async-some"."~1.0.1" = self.by-version."async-some"."1.0.1"; by-version."async-some"."1.0.1" = lib.makeOverridable self.buildNodePackage { @@ -848,21 +1199,20 @@ passthru.names = [ "async-some" ]; }; by-spec."aws-sdk"."*" = - self.by-version."aws-sdk"."2.0.18"; - by-version."aws-sdk"."2.0.18" = lib.makeOverridable self.buildNodePackage { - name = "aws-sdk-2.0.18"; + self.by-version."aws-sdk"."2.0.29"; + by-version."aws-sdk"."2.0.29" = lib.makeOverridable self.buildNodePackage { + name = "aws-sdk-2.0.29"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.0.18.tgz"; - name = "aws-sdk-2.0.18.tgz"; - sha1 = "aea83ffff08de9dd167f785d04b463025078c790"; + url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.0.29.tgz"; + name = "aws-sdk-2.0.29.tgz"; + sha1 = "01c8f18d43a1174637e04dad20cd04673385e18b"; }) ]; buildInputs = (self.nativeDeps."aws-sdk" or []); deps = { - "aws-sdk-apis-3.1.9" = self.by-version."aws-sdk-apis"."3.1.9"; "xml2js-0.2.6" = self.by-version."xml2js"."0.2.6"; "xmlbuilder-0.4.2" = self.by-version."xmlbuilder"."0.4.2"; }; @@ -870,7 +1220,7 @@ ]; passthru.names = [ "aws-sdk" ]; }; - "aws-sdk" = self.by-version."aws-sdk"."2.0.18"; + "aws-sdk" = self.by-version."aws-sdk"."2.0.29"; by-spec."aws-sdk".">=1.2.0 <2" = self.by-version."aws-sdk"."1.18.0"; by-version."aws-sdk"."1.18.0" = lib.makeOverridable self.buildNodePackage { @@ -893,26 +1243,6 @@ ]; passthru.names = [ "aws-sdk" ]; }; - by-spec."aws-sdk-apis".">=3.1.0 <4.0.0" = - self.by-version."aws-sdk-apis"."3.1.9"; - by-version."aws-sdk-apis"."3.1.9" = lib.makeOverridable self.buildNodePackage { - name = "aws-sdk-apis-3.1.9"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/aws-sdk-apis/-/aws-sdk-apis-3.1.9.tgz"; - name = "aws-sdk-apis-3.1.9.tgz"; - sha1 = "abd017548bb9eab0472d3c729d512aba3fc16a67"; - }) - ]; - buildInputs = - (self.nativeDeps."aws-sdk-apis" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "aws-sdk-apis" ]; - }; by-spec."aws-sign"."~0.2.0" = self.by-version."aws-sign"."0.2.0"; by-version."aws-sign"."0.2.0" = lib.makeOverridable self.buildNodePackage { @@ -1015,6 +1345,26 @@ ]; passthru.names = [ "backoff" ]; }; + by-spec."backoff"."~2.3.0" = + self.by-version."backoff"."2.3.0"; + by-version."backoff"."2.3.0" = lib.makeOverridable self.buildNodePackage { + name = "backoff-2.3.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/backoff/-/backoff-2.3.0.tgz"; + name = "backoff-2.3.0.tgz"; + sha1 = "ee7c7e38093f92e472859db635e7652454fc21ea"; + }) + ]; + buildInputs = + (self.nativeDeps."backoff" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "backoff" ]; + }; by-spec."base62"."0.1.1" = self.by-version."base62"."0.1.1"; by-version."base62"."0.1.1" = lib.makeOverridable self.buildNodePackage { @@ -1035,6 +1385,26 @@ ]; passthru.names = [ "base62" ]; }; + by-spec."base64-js"."0.0.6" = + self.by-version."base64-js"."0.0.6"; + by-version."base64-js"."0.0.6" = lib.makeOverridable self.buildNodePackage { + name = "base64-js-0.0.6"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/base64-js/-/base64-js-0.0.6.tgz"; + name = "base64-js-0.0.6.tgz"; + sha1 = "7b859f79f0bbbd55867ba67a7fab397e24a20947"; + }) + ]; + buildInputs = + (self.nativeDeps."base64-js" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "base64-js" ]; + }; by-spec."base64-js"."0.0.7" = self.by-version."base64-js"."0.0.7"; by-version."base64-js"."0.0.7" = lib.makeOverridable self.buildNodePackage { @@ -1055,6 +1425,8 @@ ]; passthru.names = [ "base64-js" ]; }; + by-spec."base64-js"."~0.0.4" = + self.by-version."base64-js"."0.0.7"; by-spec."base64-url"."1" = self.by-version."base64-url"."1.0.0"; by-version."base64-url"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -1200,6 +1572,48 @@ passthru.names = [ "bcrypt" ]; }; "bcrypt" = self.by-version."bcrypt"."0.8.0"; + by-spec."bencode"."^0.6.0" = + self.by-version."bencode"."0.6.0"; + by-version."bencode"."0.6.0" = lib.makeOverridable self.buildNodePackage { + name = "bencode-0.6.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/bencode/-/bencode-0.6.0.tgz"; + name = "bencode-0.6.0.tgz"; + sha1 = "04d6190e1d7467c56a969e1a94d1668076eac050"; + }) + ]; + buildInputs = + (self.nativeDeps."bencode" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "bencode" ]; + }; + by-spec."binary"."~0.3.0" = + self.by-version."binary"."0.3.0"; + by-version."binary"."0.3.0" = lib.makeOverridable self.buildNodePackage { + name = "binary-0.3.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/binary/-/binary-0.3.0.tgz"; + name = "binary-0.3.0.tgz"; + sha1 = "9f60553bc5ce8c3386f3b553cff47462adecaa79"; + }) + ]; + buildInputs = + (self.nativeDeps."binary" or []); + deps = { + "chainsaw-0.1.0" = self.by-version."chainsaw"."0.1.0"; + "buffers-0.1.1" = self.by-version."buffers"."0.1.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "binary" ]; + }; by-spec."bindings"."*" = self.by-version."bindings"."1.2.1"; by-version."bindings"."1.2.1" = lib.makeOverridable self.buildNodePackage { @@ -1240,6 +1654,26 @@ ]; passthru.names = [ "bindings" ]; }; + by-spec."bindings"."1.1.0" = + self.by-version."bindings"."1.1.0"; + by-version."bindings"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "bindings-1.1.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/bindings/-/bindings-1.1.0.tgz"; + name = "bindings-1.1.0.tgz"; + sha1 = "f3cc4deec19fe31f255864eb1e6ffad857266ef0"; + }) + ]; + buildInputs = + (self.nativeDeps."bindings" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "bindings" ]; + }; by-spec."bindings"."1.1.1" = self.by-version."bindings"."1.1.1"; by-version."bindings"."1.1.1" = lib.makeOverridable self.buildNodePackage { @@ -1262,8 +1696,148 @@ }; by-spec."bindings".">=1.2.1" = self.by-version."bindings"."1.2.1"; + by-spec."bindings"."~1.1.1" = + self.by-version."bindings"."1.1.1"; by-spec."bindings"."~1.2.1" = self.by-version."bindings"."1.2.1"; + by-spec."bitfield"."^0.1.0" = + self.by-version."bitfield"."0.1.0"; + by-version."bitfield"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "bitfield-0.1.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/bitfield/-/bitfield-0.1.0.tgz"; + name = "bitfield-0.1.0.tgz"; + sha1 = "b05d8b5f0d09f2df35a9db3b3a62d3808c46c457"; + }) + ]; + buildInputs = + (self.nativeDeps."bitfield" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "bitfield" ]; + }; + by-spec."bits"."~0.1.1" = + self.by-version."bits"."0.1.1"; + by-version."bits"."0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "bits-0.1.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/bits/-/bits-0.1.1.tgz"; + name = "bits-0.1.1.tgz"; + sha1 = "7082eb8b7bdf12e47b0a8cf8f7ad3af4e7053a96"; + }) + ]; + buildInputs = + (self.nativeDeps."bits" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "bits" ]; + }; + by-spec."bittorrent-dht"."^1.0.0" = + self.by-version."bittorrent-dht"."1.5.0"; + by-version."bittorrent-dht"."1.5.0" = lib.makeOverridable self.buildNodePackage { + name = "bittorrent-dht-1.5.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-1.5.0.tgz"; + name = "bittorrent-dht-1.5.0.tgz"; + sha1 = "b14b34eace8f44e795a8bad69a44b08ca485c355"; + }) + ]; + buildInputs = + (self.nativeDeps."bittorrent-dht" or []); + deps = { + "bencode-0.6.0" = self.by-version."bencode"."0.6.0"; + "buffer-equal-0.0.1" = self.by-version."buffer-equal"."0.0.1"; + "compact2string-1.3.0" = self.by-version."compact2string"."1.3.0"; + "debug-1.0.4" = self.by-version."debug"."1.0.4"; + "hat-0.0.3" = self.by-version."hat"."0.0.3"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + "k-bucket-0.4.2" = self.by-version."k-bucket"."0.4.2"; + "once-1.3.1" = self.by-version."once"."1.3.1"; + "portfinder-0.2.1" = self.by-version."portfinder"."0.2.1"; + "run-parallel-1.0.0" = self.by-version."run-parallel"."1.0.0"; + "string2compact-1.2.0" = self.by-version."string2compact"."1.2.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "bittorrent-dht" ]; + }; + by-spec."bittorrent-dht"."^2.6.4" = + self.by-version."bittorrent-dht"."2.6.4"; + by-version."bittorrent-dht"."2.6.4" = lib.makeOverridable self.buildNodePackage { + name = "bittorrent-dht-2.6.4"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-2.6.4.tgz"; + name = "bittorrent-dht-2.6.4.tgz"; + sha1 = "af090c6576f6228596fdd5c538d3439aaf50577b"; + }) + ]; + buildInputs = + (self.nativeDeps."bittorrent-dht" or []); + deps = { + "addr-to-ip-port-1.4.0" = self.by-version."addr-to-ip-port"."1.4.0"; + "bencode-0.6.0" = self.by-version."bencode"."0.6.0"; + "buffer-equal-0.0.1" = self.by-version."buffer-equal"."0.0.1"; + "compact2string-1.3.0" = self.by-version."compact2string"."1.3.0"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; + "hat-0.0.3" = self.by-version."hat"."0.0.3"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + "is-ip-1.0.0" = self.by-version."is-ip"."1.0.0"; + "k-bucket-0.4.2" = self.by-version."k-bucket"."0.4.2"; + "once-1.3.1" = self.by-version."once"."1.3.1"; + "run-parallel-1.0.0" = self.by-version."run-parallel"."1.0.0"; + "string2compact-1.2.0" = self.by-version."string2compact"."1.2.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "bittorrent-dht" ]; + }; + by-spec."bittorrent-tracker"."^2.0.0" = + self.by-version."bittorrent-tracker"."2.9.1"; + by-version."bittorrent-tracker"."2.9.1" = lib.makeOverridable self.buildNodePackage { + name = "bittorrent-tracker-2.9.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-2.9.1.tgz"; + name = "bittorrent-tracker-2.9.1.tgz"; + sha1 = "a1168960898a02bc193f95d60d07504a31154cee"; + }) + ]; + buildInputs = + (self.nativeDeps."bittorrent-tracker" or []); + deps = { + "bencode-0.6.0" = self.by-version."bencode"."0.6.0"; + "bn.js-0.15.2" = self.by-version."bn.js"."0.15.2"; + "buffer-equal-0.0.1" = self.by-version."buffer-equal"."0.0.1"; + "compact2string-1.3.0" = self.by-version."compact2string"."1.3.0"; + "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; + "extend.js-0.0.1" = self.by-version."extend.js"."0.0.1"; + "hat-0.0.3" = self.by-version."hat"."0.0.3"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + "ip-0.3.2" = self.by-version."ip"."0.3.2"; + "once-1.3.1" = self.by-version."once"."1.3.1"; + "portfinder-0.2.1" = self.by-version."portfinder"."0.2.1"; + "string2compact-1.2.0" = self.by-version."string2compact"."1.2.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "bittorrent-tracker" ]; + }; + by-spec."bittorrent-tracker"."^2.6.0" = + self.by-version."bittorrent-tracker"."2.9.1"; by-spec."bl"."^0.9.0" = self.by-version."bl"."0.9.3"; by-version."bl"."0.9.3" = lib.makeOverridable self.buildNodePackage { @@ -1279,7 +1853,7 @@ buildInputs = (self.nativeDeps."bl" or []); deps = { - "readable-stream-1.0.32" = self.by-version."readable-stream"."1.0.32"; + "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; }; peerDependencies = [ ]; @@ -1311,15 +1885,15 @@ by-spec."block-stream"."0.0.7" = self.by-version."block-stream"."0.0.7"; by-spec."bluebird".">= 1.2.1" = - self.by-version."bluebird"."2.3.4"; - by-version."bluebird"."2.3.4" = lib.makeOverridable self.buildNodePackage { - name = "bluebird-2.3.4"; + self.by-version."bluebird"."2.3.11"; + by-version."bluebird"."2.3.11" = lib.makeOverridable self.buildNodePackage { + name = "bluebird-2.3.11"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/bluebird/-/bluebird-2.3.4.tgz"; - name = "bluebird-2.3.4.tgz"; - sha1 = "9f6c0d1e41d9862bdf4b6af0a4c0a7714602cb85"; + url = "http://registry.npmjs.org/bluebird/-/bluebird-2.3.11.tgz"; + name = "bluebird-2.3.11.tgz"; + sha1 = "15bb78ed32abf27b090640c0f85e4b91f615c8b6"; }) ]; buildInputs = @@ -1350,33 +1924,71 @@ ]; passthru.names = [ "blueimp-md5" ]; }; - by-spec."body-parser"."~1.6.5" = - self.by-version."body-parser"."1.6.7"; - by-version."body-parser"."1.6.7" = lib.makeOverridable self.buildNodePackage { - name = "body-parser-1.6.7"; + by-spec."bn.js"."0.15.2" = + self.by-version."bn.js"."0.15.2"; + by-version."bn.js"."0.15.2" = lib.makeOverridable self.buildNodePackage { + name = "bn.js-0.15.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/body-parser/-/body-parser-1.6.7.tgz"; - name = "body-parser-1.6.7.tgz"; - sha1 = "82306becadf44543e826b3907eae93f0237c4e5c"; + url = "http://registry.npmjs.org/bn.js/-/bn.js-0.15.2.tgz"; + name = "bn.js-0.15.2.tgz"; + sha1 = "a83b283accdacbf28e89774747cac352216f886a"; }) ]; buildInputs = - (self.nativeDeps."body-parser" or []); + (self.nativeDeps."bn.js" or []); deps = { - "bytes-1.0.0" = self.by-version."bytes"."1.0.0"; - "depd-0.4.4" = self.by-version."depd"."0.4.4"; - "iconv-lite-0.4.4" = self.by-version."iconv-lite"."0.4.4"; - "media-typer-0.2.0" = self.by-version."media-typer"."0.2.0"; - "on-finished-2.1.0" = self.by-version."on-finished"."2.1.0"; - "qs-2.2.2" = self.by-version."qs"."2.2.2"; - "raw-body-1.3.0" = self.by-version."raw-body"."1.3.0"; - "type-is-1.3.2" = self.by-version."type-is"."1.3.2"; }; peerDependencies = [ ]; - passthru.names = [ "body-parser" ]; + passthru.names = [ "bn.js" ]; + }; + by-spec."bn.js".">=0.15.0-0 0.15.2" = + self.by-version."bn.js"."0.15.2"; + by-spec."bn.js"."^0.15.0" = + self.by-version."bn.js"."0.15.2"; + by-spec."bn.js"."^0.15.2" = + self.by-version."bn.js"."0.15.2"; + by-spec."bncode"."^0.2.3" = + self.by-version."bncode"."0.2.3"; + by-version."bncode"."0.2.3" = lib.makeOverridable self.buildNodePackage { + name = "bncode-0.2.3"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/bncode/-/bncode-0.2.3.tgz"; + name = "bncode-0.2.3.tgz"; + sha1 = "37f851dc8e47188a83fbc0f6fa4775cacc9a3296"; + }) + ]; + buildInputs = + (self.nativeDeps."bncode" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "bncode" ]; + }; + by-spec."bncode"."^0.5.2" = + self.by-version."bncode"."0.5.3"; + by-version."bncode"."0.5.3" = lib.makeOverridable self.buildNodePackage { + name = "bncode-0.5.3"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/bncode/-/bncode-0.5.3.tgz"; + name = "bncode-0.5.3.tgz"; + sha1 = "e16661697452d436bf9886238cc791b08d66a61a"; + }) + ]; + buildInputs = + (self.nativeDeps."bncode" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "bncode" ]; }; by-spec."body-parser"."~1.8.4" = self.by-version."body-parser"."1.8.4"; @@ -1400,7 +2012,35 @@ "on-finished-2.1.0" = self.by-version."on-finished"."2.1.0"; "qs-2.2.4" = self.by-version."qs"."2.2.4"; "raw-body-1.3.0" = self.by-version."raw-body"."1.3.0"; - "type-is-1.5.2" = self.by-version."type-is"."1.5.2"; + "type-is-1.5.3" = self.by-version."type-is"."1.5.3"; + }; + peerDependencies = [ + ]; + passthru.names = [ "body-parser" ]; + }; + by-spec."body-parser"."~1.9.3" = + self.by-version."body-parser"."1.9.3"; + by-version."body-parser"."1.9.3" = lib.makeOverridable self.buildNodePackage { + name = "body-parser-1.9.3"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/body-parser/-/body-parser-1.9.3.tgz"; + name = "body-parser-1.9.3.tgz"; + sha1 = "edfacd4fcfad87dfe74f861a5cc712900aef2623"; + }) + ]; + buildInputs = + (self.nativeDeps."body-parser" or []); + deps = { + "bytes-1.0.0" = self.by-version."bytes"."1.0.0"; + "depd-1.0.0" = self.by-version."depd"."1.0.0"; + "iconv-lite-0.4.5" = self.by-version."iconv-lite"."0.4.5"; + "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0"; + "on-finished-2.1.1" = self.by-version."on-finished"."2.1.1"; + "qs-2.3.3" = self.by-version."qs"."2.3.3"; + "raw-body-1.3.1" = self.by-version."raw-body"."1.3.1"; + "type-is-1.5.3" = self.by-version."type-is"."1.5.3"; }; peerDependencies = [ ]; @@ -1448,30 +2088,302 @@ ]; passthru.names = [ "boom" ]; }; - by-spec."broadway"."0.2.9" = - self.by-version."broadway"."0.2.9"; - by-version."broadway"."0.2.9" = lib.makeOverridable self.buildNodePackage { - name = "broadway-0.2.9"; + by-spec."bower"."*" = + self.by-version."bower"."1.3.12"; + by-version."bower"."1.3.12" = lib.makeOverridable self.buildNodePackage { + name = "bower-1.3.12"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/bower/-/bower-1.3.12.tgz"; + name = "bower-1.3.12.tgz"; + sha1 = "37de0edb3904baf90aee13384a1a379a05ee214c"; + }) + ]; + buildInputs = + (self.nativeDeps."bower" or []); + deps = { + "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5"; + "archy-0.0.2" = self.by-version."archy"."0.0.2"; + "bower-config-0.5.2" = self.by-version."bower-config"."0.5.2"; + "bower-endpoint-parser-0.2.2" = self.by-version."bower-endpoint-parser"."0.2.2"; + "bower-json-0.4.0" = self.by-version."bower-json"."0.4.0"; + "bower-logger-0.2.2" = self.by-version."bower-logger"."0.2.2"; + "bower-registry-client-0.2.1" = self.by-version."bower-registry-client"."0.2.1"; + "cardinal-0.4.0" = self.by-version."cardinal"."0.4.0"; + "chalk-0.5.0" = self.by-version."chalk"."0.5.0"; + "chmodr-0.1.0" = self.by-version."chmodr"."0.1.0"; + "decompress-zip-0.0.8" = self.by-version."decompress-zip"."0.0.8"; + "fstream-1.0.3" = self.by-version."fstream"."1.0.3"; + "fstream-ignore-1.0.1" = self.by-version."fstream-ignore"."1.0.1"; + "glob-4.0.6" = self.by-version."glob"."4.0.6"; + "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; + "handlebars-2.0.0" = self.by-version."handlebars"."2.0.0"; + "inquirer-0.7.1" = self.by-version."inquirer"."0.7.1"; + "insight-0.4.3" = self.by-version."insight"."0.4.3"; + "is-root-1.0.0" = self.by-version."is-root"."1.0.0"; + "junk-1.0.0" = self.by-version."junk"."1.0.0"; + "lockfile-1.0.0" = self.by-version."lockfile"."1.0.0"; + "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0"; + "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; + "mout-0.9.1" = self.by-version."mout"."0.9.1"; + "nopt-3.0.1" = self.by-version."nopt"."3.0.1"; + "opn-1.0.0" = self.by-version."opn"."1.0.0"; + "osenv-0.1.0" = self.by-version."osenv"."0.1.0"; + "p-throttler-0.1.0" = self.by-version."p-throttler"."0.1.0"; + "promptly-0.2.0" = self.by-version."promptly"."0.2.0"; + "q-1.0.1" = self.by-version."q"."1.0.1"; + "request-2.42.0" = self.by-version."request"."2.42.0"; + "request-progress-0.3.0" = self.by-version."request-progress"."0.3.0"; + "retry-0.6.0" = self.by-version."retry"."0.6.0"; + "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; + "semver-2.3.2" = self.by-version."semver"."2.3.2"; + "shell-quote-1.4.2" = self.by-version."shell-quote"."1.4.2"; + "stringify-object-1.0.0" = self.by-version."stringify-object"."1.0.0"; + "tar-fs-0.5.2" = self.by-version."tar-fs"."0.5.2"; + "tmp-0.0.23" = self.by-version."tmp"."0.0.23"; + "update-notifier-0.2.0" = self.by-version."update-notifier"."0.2.0"; + "which-1.0.7" = self.by-version."which"."1.0.7"; + }; + peerDependencies = [ + ]; + passthru.names = [ "bower" ]; + }; + "bower" = self.by-version."bower"."1.3.12"; + by-spec."bower".">=1.2.8 <2" = + self.by-version."bower"."1.3.12"; + by-spec."bower-config"."~0.5.0" = + self.by-version."bower-config"."0.5.2"; + by-version."bower-config"."0.5.2" = lib.makeOverridable self.buildNodePackage { + name = "bower-config-0.5.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/broadway/-/broadway-0.2.9.tgz"; - name = "broadway-0.2.9.tgz"; - sha1 = "887008b2257f4171089de5cb9b656969b6c8c9e8"; + url = "http://registry.npmjs.org/bower-config/-/bower-config-0.5.2.tgz"; + name = "bower-config-0.5.2.tgz"; + sha1 = "1f7d2e899e99b70c29a613e70d4c64590414b22e"; }) ]; buildInputs = - (self.nativeDeps."broadway" or []); + (self.nativeDeps."bower-config" or []); deps = { - "cliff-0.1.8" = self.by-version."cliff"."0.1.8"; - "eventemitter2-0.4.12" = self.by-version."eventemitter2"."0.4.12"; - "nconf-0.6.9" = self.by-version."nconf"."0.6.9"; - "winston-0.7.2" = self.by-version."winston"."0.7.2"; - "utile-0.2.1" = self.by-version."utile"."0.2.1"; + "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3"; + "mout-0.9.1" = self.by-version."mout"."0.9.1"; + "optimist-0.6.1" = self.by-version."optimist"."0.6.1"; + "osenv-0.0.3" = self.by-version."osenv"."0.0.3"; }; peerDependencies = [ ]; - passthru.names = [ "broadway" ]; + passthru.names = [ "bower-config" ]; + }; + by-spec."bower-config"."~0.5.2" = + self.by-version."bower-config"."0.5.2"; + by-spec."bower-endpoint-parser"."0.2.1" = + self.by-version."bower-endpoint-parser"."0.2.1"; + by-version."bower-endpoint-parser"."0.2.1" = lib.makeOverridable self.buildNodePackage { + name = "bower-endpoint-parser-0.2.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/bower-endpoint-parser/-/bower-endpoint-parser-0.2.1.tgz"; + name = "bower-endpoint-parser-0.2.1.tgz"; + sha1 = "8c4010a2900cdab07ea5d38f0bd03e9bbccef90f"; + }) + ]; + buildInputs = + (self.nativeDeps."bower-endpoint-parser" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "bower-endpoint-parser" ]; + }; + by-spec."bower-endpoint-parser"."~0.2.2" = + self.by-version."bower-endpoint-parser"."0.2.2"; + by-version."bower-endpoint-parser"."0.2.2" = lib.makeOverridable self.buildNodePackage { + name = "bower-endpoint-parser-0.2.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/bower-endpoint-parser/-/bower-endpoint-parser-0.2.2.tgz"; + name = "bower-endpoint-parser-0.2.2.tgz"; + sha1 = "00b565adbfab6f2d35addde977e97962acbcb3f6"; + }) + ]; + buildInputs = + (self.nativeDeps."bower-endpoint-parser" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "bower-endpoint-parser" ]; + }; + by-spec."bower-json"."0.4.0" = + self.by-version."bower-json"."0.4.0"; + by-version."bower-json"."0.4.0" = lib.makeOverridable self.buildNodePackage { + name = "bower-json-0.4.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/bower-json/-/bower-json-0.4.0.tgz"; + name = "bower-json-0.4.0.tgz"; + sha1 = "a99c3ccf416ef0590ed0ded252c760f1c6d93766"; + }) + ]; + buildInputs = + (self.nativeDeps."bower-json" or []); + deps = { + "deep-extend-0.2.11" = self.by-version."deep-extend"."0.2.11"; + "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3"; + "intersect-0.0.3" = self.by-version."intersect"."0.0.3"; + }; + peerDependencies = [ + ]; + passthru.names = [ "bower-json" ]; + }; + by-spec."bower-json"."~0.4.0" = + self.by-version."bower-json"."0.4.0"; + by-spec."bower-logger"."0.2.1" = + self.by-version."bower-logger"."0.2.1"; + by-version."bower-logger"."0.2.1" = lib.makeOverridable self.buildNodePackage { + name = "bower-logger-0.2.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/bower-logger/-/bower-logger-0.2.1.tgz"; + name = "bower-logger-0.2.1.tgz"; + sha1 = "0c1817c48063a88d96cc3d516c55e57fff5d9ecb"; + }) + ]; + buildInputs = + (self.nativeDeps."bower-logger" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "bower-logger" ]; + }; + by-spec."bower-logger"."~0.2.2" = + self.by-version."bower-logger"."0.2.2"; + by-version."bower-logger"."0.2.2" = lib.makeOverridable self.buildNodePackage { + name = "bower-logger-0.2.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/bower-logger/-/bower-logger-0.2.2.tgz"; + name = "bower-logger-0.2.2.tgz"; + sha1 = "39be07e979b2fc8e03a94634205ed9422373d381"; + }) + ]; + buildInputs = + (self.nativeDeps."bower-logger" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "bower-logger" ]; + }; + by-spec."bower-registry-client"."~0.2.0" = + self.by-version."bower-registry-client"."0.2.1"; + by-version."bower-registry-client"."0.2.1" = lib.makeOverridable self.buildNodePackage { + name = "bower-registry-client-0.2.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/bower-registry-client/-/bower-registry-client-0.2.1.tgz"; + name = "bower-registry-client-0.2.1.tgz"; + sha1 = "06fbff982f82a4a4045dc53ac9dcb1c43d9cd591"; + }) + ]; + buildInputs = + (self.nativeDeps."bower-registry-client" or []); + deps = { + "async-0.2.10" = self.by-version."async"."0.2.10"; + "bower-config-0.5.2" = self.by-version."bower-config"."0.5.2"; + "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3"; + "lru-cache-2.3.1" = self.by-version."lru-cache"."2.3.1"; + "request-2.27.0" = self.by-version."request"."2.27.0"; + "request-replay-0.2.0" = self.by-version."request-replay"."0.2.0"; + "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; + "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; + }; + peerDependencies = [ + ]; + passthru.names = [ "bower-registry-client" ]; + }; + by-spec."bower2nix"."*" = + self.by-version."bower2nix"."2.1.0"; + by-version."bower2nix"."2.1.0" = lib.makeOverridable self.buildNodePackage { + name = "bower2nix-2.1.0"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/bower2nix/-/bower2nix-2.1.0.tgz"; + name = "bower2nix-2.1.0.tgz"; + sha1 = "213f507a729b20a1c3cb48f995a034f9c05f53e6"; + }) + ]; + buildInputs = + (self.nativeDeps."bower2nix" or []); + deps = { + "temp-0.6.0" = self.by-version."temp"."0.6.0"; + "fs.extra-1.2.1" = self.by-version."fs.extra"."1.2.1"; + "bower-json-0.4.0" = self.by-version."bower-json"."0.4.0"; + "bower-endpoint-parser-0.2.1" = self.by-version."bower-endpoint-parser"."0.2.1"; + "bower-logger-0.2.1" = self.by-version."bower-logger"."0.2.1"; + "bower-1.3.12" = self.by-version."bower"."1.3.12"; + "argparse-0.1.15" = self.by-version."argparse"."0.1.15"; + "clone-0.1.11" = self.by-version."clone"."0.1.11"; + "semver-2.3.2" = self.by-version."semver"."2.3.2"; + "fetch-bower-2.0.0" = self.by-version."fetch-bower"."2.0.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "bower2nix" ]; + }; + "bower2nix" = self.by-version."bower2nix"."2.1.0"; + by-spec."bplist-parser"."0.0.6" = + self.by-version."bplist-parser"."0.0.6"; + by-version."bplist-parser"."0.0.6" = lib.makeOverridable self.buildNodePackage { + name = "bplist-parser-0.0.6"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/bplist-parser/-/bplist-parser-0.0.6.tgz"; + name = "bplist-parser-0.0.6.tgz"; + sha1 = "38da3471817df9d44ab3892e27707bbbd75a11b9"; + }) + ]; + buildInputs = + (self.nativeDeps."bplist-parser" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "bplist-parser" ]; + }; + by-spec."brfs"."0.0.8" = + self.by-version."brfs"."0.0.8"; + by-version."brfs"."0.0.8" = lib.makeOverridable self.buildNodePackage { + name = "brfs-0.0.8"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/brfs/-/brfs-0.0.8.tgz"; + name = "brfs-0.0.8.tgz"; + sha1 = "e4377a177638a4b0520901bb134491dd7e38a386"; + }) + ]; + buildInputs = + (self.nativeDeps."brfs" or []); + deps = { + "through-2.2.7" = self.by-version."through"."2.2.7"; + "falafel-0.1.6" = self.by-version."falafel"."0.1.6"; + "escodegen-0.0.17" = self.by-version."escodegen"."0.0.17"; + }; + peerDependencies = [ + ]; + passthru.names = [ "brfs" ]; }; by-spec."broadway"."0.2.x" = self.by-version."broadway"."0.2.10"; @@ -1523,16 +2435,38 @@ ]; passthru.names = [ "broadway" ]; }; - by-spec."browser-pack"."^3.0.0" = - self.by-version."browser-pack"."3.1.1"; - by-version."browser-pack"."3.1.1" = lib.makeOverridable self.buildNodePackage { - name = "browser-pack-3.1.1"; + by-spec."broadway"."~0.3.6" = + self.by-version."broadway"."0.3.6"; + by-spec."brorand"."^1.0.1" = + self.by-version."brorand"."1.0.5"; + by-version."brorand"."1.0.5" = lib.makeOverridable self.buildNodePackage { + name = "brorand-1.0.5"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/brorand/-/brorand-1.0.5.tgz"; + name = "brorand-1.0.5.tgz"; + sha1 = "07b54ca30286abd1718a0e2a830803efdc9bfa04"; + }) + ]; + buildInputs = + (self.nativeDeps."brorand" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "brorand" ]; + }; + by-spec."browser-pack"."^3.2.0" = + self.by-version."browser-pack"."3.2.0"; + by-version."browser-pack"."3.2.0" = lib.makeOverridable self.buildNodePackage { + name = "browser-pack-3.2.0"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/browser-pack/-/browser-pack-3.1.1.tgz"; - name = "browser-pack-3.1.1.tgz"; - sha1 = "b7600f080d2a7ef1a276ef4c0485a358ba9d1215"; + url = "http://registry.npmjs.org/browser-pack/-/browser-pack-3.2.0.tgz"; + name = "browser-pack-3.2.0.tgz"; + sha1 = "faa1cbc41487b1acc4747e373e1148adffd0e2d9"; }) ]; buildInputs = @@ -1540,7 +2474,8 @@ deps = { "JSONStream-0.8.4" = self.by-version."JSONStream"."0.8.4"; "combine-source-map-0.3.0" = self.by-version."combine-source-map"."0.3.0"; - "concat-stream-1.4.6" = self.by-version."concat-stream"."1.4.6"; + "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7"; + "defined-0.0.0" = self.by-version."defined"."0.0.0"; "through2-0.5.1" = self.by-version."through2"."0.5.1"; "umd-2.1.0" = self.by-version."umd"."2.1.0"; }; @@ -1548,16 +2483,61 @@ ]; passthru.names = [ "browser-pack" ]; }; + by-spec."browser-pack"."~2.0.0" = + self.by-version."browser-pack"."2.0.1"; + by-version."browser-pack"."2.0.1" = lib.makeOverridable self.buildNodePackage { + name = "browser-pack-2.0.1"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/browser-pack/-/browser-pack-2.0.1.tgz"; + name = "browser-pack-2.0.1.tgz"; + sha1 = "5d1c527f56c582677411c4db2a128648ff6bf150"; + }) + ]; + buildInputs = + (self.nativeDeps."browser-pack" or []); + deps = { + "JSONStream-0.6.4" = self.by-version."JSONStream"."0.6.4"; + "through-2.3.6" = self.by-version."through"."2.3.6"; + "combine-source-map-0.3.0" = self.by-version."combine-source-map"."0.3.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "browser-pack" ]; + }; + by-spec."browser-request".">= 0.2.0" = + self.by-version."browser-request"."0.3.3"; + by-version."browser-request"."0.3.3" = lib.makeOverridable self.buildNodePackage { + name = "browser-request-0.3.3"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/browser-request/-/browser-request-0.3.3.tgz"; + name = "browser-request-0.3.3.tgz"; + sha1 = "9ece5b5aca89a29932242e18bf933def9876cc17"; + }) + ]; + buildInputs = + (self.nativeDeps."browser-request" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "browser-request" ]; + }; + by-spec."browser-request"."~0.3.1" = + self.by-version."browser-request"."0.3.3"; by-spec."browser-resolve"."^1.3.0" = - self.by-version."browser-resolve"."1.3.2"; - by-version."browser-resolve"."1.3.2" = lib.makeOverridable self.buildNodePackage { - name = "browser-resolve-1.3.2"; + self.by-version."browser-resolve"."1.4.1"; + by-version."browser-resolve"."1.4.1" = lib.makeOverridable self.buildNodePackage { + name = "browser-resolve-1.4.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/browser-resolve/-/browser-resolve-1.3.2.tgz"; - name = "browser-resolve-1.3.2.tgz"; - sha1 = "028417dd85828eea872c1bbb3e6609534545d20c"; + url = "http://registry.npmjs.org/browser-resolve/-/browser-resolve-1.4.1.tgz"; + name = "browser-resolve-1.4.1.tgz"; + sha1 = "65ac7963f65bd49fa50711c877a1e273bb17a85b"; }) ]; buildInputs = @@ -1570,7 +2550,30 @@ passthru.names = [ "browser-resolve" ]; }; by-spec."browser-resolve"."^1.3.1" = - self.by-version."browser-resolve"."1.3.2"; + self.by-version."browser-resolve"."1.4.1"; + by-spec."browser-resolve"."~1.2.1" = + self.by-version."browser-resolve"."1.2.4"; + by-version."browser-resolve"."1.2.4" = lib.makeOverridable self.buildNodePackage { + name = "browser-resolve-1.2.4"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/browser-resolve/-/browser-resolve-1.2.4.tgz"; + name = "browser-resolve-1.2.4.tgz"; + sha1 = "59ae7820a82955ecd32f5fb7c468ac21c4723806"; + }) + ]; + buildInputs = + (self.nativeDeps."browser-resolve" or []); + deps = { + "resolve-0.6.3" = self.by-version."resolve"."0.6.3"; + }; + peerDependencies = [ + ]; + passthru.names = [ "browser-resolve" ]; + }; + by-spec."browser-resolve"."~1.2.2" = + self.by-version."browser-resolve"."1.2.4"; by-spec."browserchannel"."*" = self.by-version."browserchannel"."2.0.0"; by-version."browserchannel"."2.0.0" = lib.makeOverridable self.buildNodePackage { @@ -1587,8 +2590,8 @@ (self.nativeDeps."browserchannel" or []); deps = { "hat-0.0.3" = self.by-version."hat"."0.0.3"; - "connect-2.26.4" = self.by-version."connect"."2.26.4"; - "request-2.44.0" = self.by-version."request"."2.44.0"; + "connect-2.27.4" = self.by-version."connect"."2.27.4"; + "request-2.49.0" = self.by-version."request"."2.49.0"; "ascii-json-0.2.0" = self.by-version."ascii-json"."0.2.0"; }; peerDependencies = [ @@ -1597,15 +2600,15 @@ }; "browserchannel" = self.by-version."browserchannel"."2.0.0"; by-spec."browserify"."*" = - self.by-version."browserify"."5.12.1"; - by-version."browserify"."5.12.1" = lib.makeOverridable self.buildNodePackage { - name = "browserify-5.12.1"; + self.by-version."browserify"."6.3.3"; + by-version."browserify"."6.3.3" = lib.makeOverridable self.buildNodePackage { + name = "browserify-6.3.3"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/browserify/-/browserify-5.12.1.tgz"; - name = "browserify-5.12.1.tgz"; - sha1 = "54181cf6e777ad59e0fc62a62e2c7867d31603fb"; + url = "http://registry.npmjs.org/browserify/-/browserify-6.3.3.tgz"; + name = "browserify-6.3.3.tgz"; + sha1 = "d2a5031a24aec8045eb8174b501bf3f6248455d4"; }) ]; buildInputs = @@ -1613,46 +2616,45 @@ deps = { "JSONStream-0.8.4" = self.by-version."JSONStream"."0.8.4"; "assert-1.1.2" = self.by-version."assert"."1.1.2"; - "browser-pack-3.1.1" = self.by-version."browser-pack"."3.1.1"; - "browser-resolve-1.3.2" = self.by-version."browser-resolve"."1.3.2"; + "browser-pack-3.2.0" = self.by-version."browser-pack"."3.2.0"; + "browser-resolve-1.4.1" = self.by-version."browser-resolve"."1.4.1"; "browserify-zlib-0.1.4" = self.by-version."browserify-zlib"."0.1.4"; - "buffer-2.7.0" = self.by-version."buffer"."2.7.0"; + "buffer-2.8.1" = self.by-version."buffer"."2.8.1"; "builtins-0.0.7" = self.by-version."builtins"."0.0.7"; "commondir-0.0.1" = self.by-version."commondir"."0.0.1"; - "concat-stream-1.4.6" = self.by-version."concat-stream"."1.4.6"; + "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7"; "console-browserify-1.1.0" = self.by-version."console-browserify"."1.1.0"; "constants-browserify-0.0.1" = self.by-version."constants-browserify"."0.0.1"; - "crypto-browserify-3.2.5" = self.by-version."crypto-browserify"."3.2.5"; + "crypto-browserify-3.6.0" = self.by-version."crypto-browserify"."3.6.0"; "deep-equal-0.2.1" = self.by-version."deep-equal"."0.2.1"; "defined-0.0.0" = self.by-version."defined"."0.0.0"; "deps-sort-1.3.5" = self.by-version."deps-sort"."1.3.5"; - "domain-browser-1.1.2" = self.by-version."domain-browser"."1.1.2"; + "domain-browser-1.1.3" = self.by-version."domain-browser"."1.1.3"; "duplexer2-0.0.2" = self.by-version."duplexer2"."0.0.2"; "events-1.0.2" = self.by-version."events"."1.0.2"; - "glob-4.0.6" = self.by-version."glob"."4.0.6"; + "glob-4.2.2" = self.by-version."glob"."4.2.2"; "http-browserify-1.7.0" = self.by-version."http-browserify"."1.7.0"; "https-browserify-0.0.0" = self.by-version."https-browserify"."0.0.0"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; "insert-module-globals-6.1.0" = self.by-version."insert-module-globals"."6.1.0"; "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; - "labeled-stream-splicer-1.0.0" = self.by-version."labeled-stream-splicer"."1.0.0"; - "module-deps-3.5.6" = self.by-version."module-deps"."3.5.6"; + "labeled-stream-splicer-1.0.2" = self.by-version."labeled-stream-splicer"."1.0.2"; + "module-deps-3.5.10" = self.by-version."module-deps"."3.5.10"; "os-browserify-0.1.2" = self.by-version."os-browserify"."0.1.2"; "parents-0.0.3" = self.by-version."parents"."0.0.3"; "path-browserify-0.0.0" = self.by-version."path-browserify"."0.0.0"; - "process-0.7.0" = self.by-version."process"."0.7.0"; + "process-0.8.0" = self.by-version."process"."0.8.0"; "punycode-1.2.4" = self.by-version."punycode"."1.2.4"; - "querystring-es3-0.2.1-0" = self.by-version."querystring-es3"."0.2.1-0"; + "querystring-es3-0.2.1" = self.by-version."querystring-es3"."0.2.1"; "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; "resolve-0.7.4" = self.by-version."resolve"."0.7.4"; "shallow-copy-0.0.1" = self.by-version."shallow-copy"."0.0.1"; "shasum-1.0.0" = self.by-version."shasum"."1.0.0"; "shell-quote-0.0.1" = self.by-version."shell-quote"."0.0.1"; "stream-browserify-1.0.0" = self.by-version."stream-browserify"."1.0.0"; - "stream-combiner-0.0.4" = self.by-version."stream-combiner"."0.0.4"; - "string_decoder-0.0.1" = self.by-version."string_decoder"."0.0.1"; - "subarg-0.0.1" = self.by-version."subarg"."0.0.1"; - "syntax-error-1.1.1" = self.by-version."syntax-error"."1.1.1"; + "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31"; + "subarg-1.0.0" = self.by-version."subarg"."1.0.0"; + "syntax-error-1.1.2" = self.by-version."syntax-error"."1.1.2"; "through2-1.1.1" = self.by-version."through2"."1.1.1"; "timers-browserify-1.1.0" = self.by-version."timers-browserify"."1.1.0"; "tty-browserify-0.0.0" = self.by-version."tty-browserify"."0.0.0"; @@ -1666,7 +2668,241 @@ ]; passthru.names = [ "browserify" ]; }; - "browserify" = self.by-version."browserify"."5.12.1"; + "browserify" = self.by-version."browserify"."6.3.3"; + by-spec."browserify"."3.46.0" = + self.by-version."browserify"."3.46.0"; + by-version."browserify"."3.46.0" = lib.makeOverridable self.buildNodePackage { + name = "browserify-3.46.0"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/browserify/-/browserify-3.46.0.tgz"; + name = "browserify-3.46.0.tgz"; + sha1 = "dc32dd189efcb0b9e7ca88f5099b11654ab3c50f"; + }) + ]; + buildInputs = + (self.nativeDeps."browserify" or []); + deps = { + "JSONStream-0.7.4" = self.by-version."JSONStream"."0.7.4"; + "assert-1.1.2" = self.by-version."assert"."1.1.2"; + "browser-pack-2.0.1" = self.by-version."browser-pack"."2.0.1"; + "browser-resolve-1.2.4" = self.by-version."browser-resolve"."1.2.4"; + "browserify-zlib-0.1.4" = self.by-version."browserify-zlib"."0.1.4"; + "buffer-2.1.13" = self.by-version."buffer"."2.1.13"; + "builtins-0.0.7" = self.by-version."builtins"."0.0.7"; + "commondir-0.0.1" = self.by-version."commondir"."0.0.1"; + "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7"; + "console-browserify-1.0.3" = self.by-version."console-browserify"."1.0.3"; + "constants-browserify-0.0.1" = self.by-version."constants-browserify"."0.0.1"; + "crypto-browserify-1.0.9" = self.by-version."crypto-browserify"."1.0.9"; + "deep-equal-0.1.2" = self.by-version."deep-equal"."0.1.2"; + "defined-0.0.0" = self.by-version."defined"."0.0.0"; + "deps-sort-0.1.2" = self.by-version."deps-sort"."0.1.2"; + "derequire-0.8.0" = self.by-version."derequire"."0.8.0"; + "domain-browser-1.1.3" = self.by-version."domain-browser"."1.1.3"; + "duplexer-0.1.1" = self.by-version."duplexer"."0.1.1"; + "events-1.0.2" = self.by-version."events"."1.0.2"; + "glob-3.2.11" = self.by-version."glob"."3.2.11"; + "http-browserify-1.3.2" = self.by-version."http-browserify"."1.3.2"; + "https-browserify-0.0.0" = self.by-version."https-browserify"."0.0.0"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + "insert-module-globals-5.0.1" = self.by-version."insert-module-globals"."5.0.1"; + "module-deps-1.10.0" = self.by-version."module-deps"."1.10.0"; + "os-browserify-0.1.2" = self.by-version."os-browserify"."0.1.2"; + "parents-0.0.3" = self.by-version."parents"."0.0.3"; + "path-browserify-0.0.0" = self.by-version."path-browserify"."0.0.0"; + "punycode-1.2.4" = self.by-version."punycode"."1.2.4"; + "querystring-es3-0.2.0" = self.by-version."querystring-es3"."0.2.0"; + "resolve-0.6.3" = self.by-version."resolve"."0.6.3"; + "shallow-copy-0.0.1" = self.by-version."shallow-copy"."0.0.1"; + "shell-quote-0.0.1" = self.by-version."shell-quote"."0.0.1"; + "stream-browserify-0.1.3" = self.by-version."stream-browserify"."0.1.3"; + "stream-combiner-0.0.4" = self.by-version."stream-combiner"."0.0.4"; + "string_decoder-0.0.1" = self.by-version."string_decoder"."0.0.1"; + "subarg-0.0.1" = self.by-version."subarg"."0.0.1"; + "syntax-error-1.1.2" = self.by-version."syntax-error"."1.1.2"; + "through2-0.4.2" = self.by-version."through2"."0.4.2"; + "timers-browserify-1.0.3" = self.by-version."timers-browserify"."1.0.3"; + "tty-browserify-0.0.0" = self.by-version."tty-browserify"."0.0.0"; + "umd-2.0.0" = self.by-version."umd"."2.0.0"; + "url-0.10.1" = self.by-version."url"."0.10.1"; + "util-0.10.3" = self.by-version."util"."0.10.3"; + "vm-browserify-0.0.4" = self.by-version."vm-browserify"."0.0.4"; + }; + peerDependencies = [ + ]; + passthru.names = [ "browserify" ]; + }; + by-spec."browserify"."~3.19.1" = + self.by-version."browserify"."3.19.1"; + by-version."browserify"."3.19.1" = lib.makeOverridable self.buildNodePackage { + name = "browserify-3.19.1"; + bin = true; + src = [ + (self.patchSource fetchurl { + url = "http://registry.npmjs.org/browserify/-/browserify-3.19.1.tgz"; + name = "browserify-3.19.1.tgz"; + sha1 = "e4e994f7c8313432df46b1a2b029d8bab13a456b"; + }) + ]; + buildInputs = + (self.nativeDeps."browserify" or []); + deps = { + "module-deps-1.2.2" = self.by-version."module-deps"."1.2.2"; + "browser-pack-2.0.1" = self.by-version."browser-pack"."2.0.1"; + "deps-sort-0.1.2" = self.by-version."deps-sort"."0.1.2"; + "shell-quote-0.0.1" = self.by-version."shell-quote"."0.0.1"; + "through-2.3.6" = self.by-version."through"."2.3.6"; + "duplexer-0.1.1" = self.by-version."duplexer"."0.1.1"; + "stream-combiner-0.0.4" = self.by-version."stream-combiner"."0.0.4"; + "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7"; + "insert-module-globals-2.3.4" = self.by-version."insert-module-globals"."2.3.4"; + "syntax-error-0.0.1" = self.by-version."syntax-error"."0.0.1"; + "browser-resolve-1.2.4" = self.by-version."browser-resolve"."1.2.4"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + "JSONStream-0.7.4" = self.by-version."JSONStream"."0.7.4"; + "umd-2.0.0" = self.by-version."umd"."2.0.0"; + "parents-0.0.3" = self.by-version."parents"."0.0.3"; + "deep-equal-0.1.2" = self.by-version."deep-equal"."0.1.2"; + "constants-browserify-0.0.1" = self.by-version."constants-browserify"."0.0.1"; + "os-browserify-0.1.2" = self.by-version."os-browserify"."0.1.2"; + "console-browserify-1.0.3" = self.by-version."console-browserify"."1.0.3"; + "vm-browserify-0.0.4" = self.by-version."vm-browserify"."0.0.4"; + "zlib-browserify-0.0.3" = self.by-version."zlib-browserify"."0.0.3"; + "assert-1.1.2" = self.by-version."assert"."1.1.2"; + "http-browserify-1.1.0" = self.by-version."http-browserify"."1.1.0"; + "crypto-browserify-1.0.9" = self.by-version."crypto-browserify"."1.0.9"; + "util-0.10.3" = self.by-version."util"."0.10.3"; + "events-1.0.2" = self.by-version."events"."1.0.2"; + "native-buffer-browserify-2.0.17" = self.by-version."native-buffer-browserify"."2.0.17"; + "url-0.7.9" = self.by-version."url"."0.7.9"; + "https-browserify-0.0.0" = self.by-version."https-browserify"."0.0.0"; + "path-browserify-0.0.0" = self.by-version."path-browserify"."0.0.0"; + "querystring-0.2.0" = self.by-version."querystring"."0.2.0"; + "stream-browserify-0.1.3" = self.by-version."stream-browserify"."0.1.3"; + "string_decoder-0.0.1" = self.by-version."string_decoder"."0.0.1"; + "tty-browserify-0.0.0" = self.by-version."tty-browserify"."0.0.0"; + "timers-browserify-1.0.3" = self.by-version."timers-browserify"."1.0.3"; + "punycode-1.2.4" = self.by-version."punycode"."1.2.4"; + "defined-0.0.0" = self.by-version."defined"."0.0.0"; + "domain-browser-1.1.3" = self.by-version."domain-browser"."1.1.3"; + "minimist-0.0.10" = self.by-version."minimist"."0.0.10"; + }; + peerDependencies = [ + ]; + passthru.names = [ "browserify" ]; + }; + by-spec."browserify"."~3.24.1" = + self.by-version."browserify"."3.24.13"; + by-version."browserify"."3.24.13" = lib.makeOverridable self.buildNodePackage { + name = "browserify-3.24.13"; + bin = true; + src = [ + (self.patchSource fetchurl { + url = "http://registry.npmjs.org/browserify/-/browserify-3.24.13.tgz"; + name = "browserify-3.24.13.tgz"; + sha1 = "d82012886791c4b1edd36612ad508a614e9ad86e"; + }) + ]; + buildInputs = + (self.nativeDeps."browserify" or []); + deps = { + "module-deps-1.4.2" = self.by-version."module-deps"."1.4.2"; + "browser-pack-2.0.1" = self.by-version."browser-pack"."2.0.1"; + "deps-sort-0.1.2" = self.by-version."deps-sort"."0.1.2"; + "shell-quote-0.0.1" = self.by-version."shell-quote"."0.0.1"; + "through-2.3.6" = self.by-version."through"."2.3.6"; + "duplexer-0.1.1" = self.by-version."duplexer"."0.1.1"; + "stream-combiner-0.0.4" = self.by-version."stream-combiner"."0.0.4"; + "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7"; + "insert-module-globals-3.1.3" = self.by-version."insert-module-globals"."3.1.3"; + "syntax-error-0.1.0" = self.by-version."syntax-error"."0.1.0"; + "browser-resolve-1.2.4" = self.by-version."browser-resolve"."1.2.4"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + "JSONStream-0.7.4" = self.by-version."JSONStream"."0.7.4"; + "umd-2.0.0" = self.by-version."umd"."2.0.0"; + "parents-0.0.3" = self.by-version."parents"."0.0.3"; + "deep-equal-0.1.2" = self.by-version."deep-equal"."0.1.2"; + "constants-browserify-0.0.1" = self.by-version."constants-browserify"."0.0.1"; + "os-browserify-0.1.2" = self.by-version."os-browserify"."0.1.2"; + "console-browserify-1.0.3" = self.by-version."console-browserify"."1.0.3"; + "vm-browserify-0.0.4" = self.by-version."vm-browserify"."0.0.4"; + "zlib-browserify-0.0.3" = self.by-version."zlib-browserify"."0.0.3"; + "assert-1.1.2" = self.by-version."assert"."1.1.2"; + "http-browserify-1.1.0" = self.by-version."http-browserify"."1.1.0"; + "crypto-browserify-1.0.9" = self.by-version."crypto-browserify"."1.0.9"; + "util-0.10.3" = self.by-version."util"."0.10.3"; + "events-1.0.2" = self.by-version."events"."1.0.2"; + "native-buffer-browserify-2.0.17" = self.by-version."native-buffer-browserify"."2.0.17"; + "url-0.7.9" = self.by-version."url"."0.7.9"; + "https-browserify-0.0.0" = self.by-version."https-browserify"."0.0.0"; + "path-browserify-0.0.0" = self.by-version."path-browserify"."0.0.0"; + "querystring-0.2.0" = self.by-version."querystring"."0.2.0"; + "stream-browserify-0.1.3" = self.by-version."stream-browserify"."0.1.3"; + "string_decoder-0.0.1" = self.by-version."string_decoder"."0.0.1"; + "tty-browserify-0.0.0" = self.by-version."tty-browserify"."0.0.0"; + "timers-browserify-1.0.3" = self.by-version."timers-browserify"."1.0.3"; + "punycode-1.2.4" = self.by-version."punycode"."1.2.4"; + "defined-0.0.0" = self.by-version."defined"."0.0.0"; + "domain-browser-1.1.3" = self.by-version."domain-browser"."1.1.3"; + "minimist-0.0.10" = self.by-version."minimist"."0.0.10"; + "derequire-0.6.1" = self.by-version."derequire"."0.6.1"; + "commondir-0.0.1" = self.by-version."commondir"."0.0.1"; + "shallow-copy-0.0.1" = self.by-version."shallow-copy"."0.0.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "browserify" ]; + }; + by-spec."browserify-aes"."0.6.0" = + self.by-version."browserify-aes"."0.6.0"; + by-version."browserify-aes"."0.6.0" = lib.makeOverridable self.buildNodePackage { + name = "browserify-aes-0.6.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/browserify-aes/-/browserify-aes-0.6.0.tgz"; + name = "browserify-aes-0.6.0.tgz"; + sha1 = "07df03037306a94f453da08cbaf1b42afcc3b18f"; + }) + ]; + buildInputs = + (self.nativeDeps."browserify-aes" or []); + deps = { + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "browserify-aes" ]; + }; + by-spec."browserify-sign"."2.4.0" = + self.by-version."browserify-sign"."2.4.0"; + by-version."browserify-sign"."2.4.0" = lib.makeOverridable self.buildNodePackage { + name = "browserify-sign-2.4.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/browserify-sign/-/browserify-sign-2.4.0.tgz"; + name = "browserify-sign-2.4.0.tgz"; + sha1 = "55bef52192091216336db4fb0bcc88c1d8f049fd"; + }) + ]; + buildInputs = + (self.nativeDeps."browserify-sign" or []); + deps = { + "asn1.js-0.6.5" = self.by-version."asn1.js"."0.6.5"; + "asn1.js-rfc3280-0.5.1" = self.by-version."asn1.js-rfc3280"."0.5.1"; + "bn.js-0.15.2" = self.by-version."bn.js"."0.15.2"; + "elliptic-0.15.15" = self.by-version."elliptic"."0.15.15"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + "pemstrip-0.0.1" = self.by-version."pemstrip"."0.0.1"; + "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; + }; + peerDependencies = [ + ]; + passthru.names = [ "browserify-sign" ]; + }; by-spec."browserify-zlib"."^0.1.4" = self.by-version."browserify-zlib"."0.1.4"; by-version."browserify-zlib"."0.1.4" = lib.makeOverridable self.buildNodePackage { @@ -1710,27 +2946,6 @@ ]; passthru.names = [ "bson" ]; }; - by-spec."bson"."0.2.12" = - self.by-version."bson"."0.2.12"; - by-version."bson"."0.2.12" = lib.makeOverridable self.buildNodePackage { - name = "bson-0.2.12"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/bson/-/bson-0.2.12.tgz"; - name = "bson-0.2.12.tgz"; - sha1 = "78bedbef1fd1f629b1c3b8d2f2d1fd87b8d64dd2"; - }) - ]; - buildInputs = - (self.nativeDeps."bson" or []); - deps = { - "nan-1.2.0" = self.by-version."nan"."1.2.0"; - }; - peerDependencies = [ - ]; - passthru.names = [ "bson" ]; - }; by-spec."bson"."0.2.2" = self.by-version."bson"."0.2.2"; by-version."bson"."0.2.2" = lib.makeOverridable self.buildNodePackage { @@ -1793,15 +3008,15 @@ passthru.names = [ "bson" ]; }; by-spec."buffer"."^2.3.0" = - self.by-version."buffer"."2.7.0"; - by-version."buffer"."2.7.0" = lib.makeOverridable self.buildNodePackage { - name = "buffer-2.7.0"; + self.by-version."buffer"."2.8.1"; + by-version."buffer"."2.8.1" = lib.makeOverridable self.buildNodePackage { + name = "buffer-2.8.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/buffer/-/buffer-2.7.0.tgz"; - name = "buffer-2.7.0.tgz"; - sha1 = "02dfe9655c097f63e03c1b1714ca6e3d83d87bb2"; + url = "http://registry.npmjs.org/buffer/-/buffer-2.8.1.tgz"; + name = "buffer-2.8.1.tgz"; + sha1 = "6c632bf47cb7ec86509254ed42ab080937986114"; }) ]; buildInputs = @@ -1815,6 +3030,28 @@ ]; passthru.names = [ "buffer" ]; }; + by-spec."buffer"."~2.1.4" = + self.by-version."buffer"."2.1.13"; + by-version."buffer"."2.1.13" = lib.makeOverridable self.buildNodePackage { + name = "buffer-2.1.13"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/buffer/-/buffer-2.1.13.tgz"; + name = "buffer-2.1.13.tgz"; + sha1 = "c88838ebf79f30b8b4a707788470bea8a62c2355"; + }) + ]; + buildInputs = + (self.nativeDeps."buffer" or []); + deps = { + "base64-js-0.0.7" = self.by-version."base64-js"."0.0.7"; + "ieee754-1.1.4" = self.by-version."ieee754"."1.1.4"; + }; + peerDependencies = [ + ]; + passthru.names = [ "buffer" ]; + }; by-spec."buffer-crc32"."0.1.1" = self.by-version."buffer-crc32"."0.1.1"; by-version."buffer-crc32"."0.1.1" = lib.makeOverridable self.buildNodePackage { @@ -1855,16 +3092,16 @@ ]; passthru.names = [ "buffer-crc32" ]; }; - by-spec."buffer-crc32"."0.2.3" = - self.by-version."buffer-crc32"."0.2.3"; - by-version."buffer-crc32"."0.2.3" = lib.makeOverridable self.buildNodePackage { - name = "buffer-crc32-0.2.3"; + by-spec."buffer-crc32"."~0.2.1" = + self.by-version."buffer-crc32"."0.2.4"; + by-version."buffer-crc32"."0.2.4" = lib.makeOverridable self.buildNodePackage { + name = "buffer-crc32-0.2.4"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.3.tgz"; - name = "buffer-crc32-0.2.3.tgz"; - sha1 = "bb54519e95d107cbd2400e76d0cab1467336d921"; + url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.4.tgz"; + name = "buffer-crc32-0.2.4.tgz"; + sha1 = "f729c4c5d2eb39ba49f29422175cc20b0bf1b96f"; }) ]; buildInputs = @@ -1875,8 +3112,48 @@ ]; passthru.names = [ "buffer-crc32" ]; }; - by-spec."buffer-crc32"."~0.2.1" = - self.by-version."buffer-crc32"."0.2.3"; + by-spec."buffer-equal"."0.0.1" = + self.by-version."buffer-equal"."0.0.1"; + by-version."buffer-equal"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "buffer-equal-0.0.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/buffer-equal/-/buffer-equal-0.0.1.tgz"; + name = "buffer-equal-0.0.1.tgz"; + sha1 = "91bc74b11ea405bc916bc6aa908faafa5b4aac4b"; + }) + ]; + buildInputs = + (self.nativeDeps."buffer-equal" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "buffer-equal" ]; + }; + by-spec."buffer-equal"."^0.0.1" = + self.by-version."buffer-equal"."0.0.1"; + by-spec."buffers"."~0.1.1" = + self.by-version."buffers"."0.1.1"; + by-version."buffers"."0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "buffers-0.1.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"; + name = "buffers-0.1.1.tgz"; + sha1 = "b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb"; + }) + ]; + buildInputs = + (self.nativeDeps."buffers" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "buffers" ]; + }; by-spec."buffertools"."*" = self.by-version."buffertools"."2.1.2"; by-version."buffertools"."2.1.2" = lib.makeOverridable self.buildNodePackage { @@ -2020,6 +3297,26 @@ ]; passthru.names = [ "bytes" ]; }; + by-spec."bytes"."0.3.0" = + self.by-version."bytes"."0.3.0"; + by-version."bytes"."0.3.0" = lib.makeOverridable self.buildNodePackage { + name = "bytes-0.3.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/bytes/-/bytes-0.3.0.tgz"; + name = "bytes-0.3.0.tgz"; + sha1 = "78e2e0e28c7f9c7b988ea8aee0db4d5fa9941935"; + }) + ]; + buildInputs = + (self.nativeDeps."bytes" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "bytes" ]; + }; by-spec."bytes"."1" = self.by-version."bytes"."1.0.0"; by-version."bytes"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -2042,8 +3339,10 @@ }; by-spec."bytes"."1.0.0" = self.by-version."bytes"."1.0.0"; - by-spec."bytes"."~0.2.1" = + by-spec."bytes"."~0.2.0" = self.by-version."bytes"."0.2.1"; + by-spec."bytes"."~0.3.0" = + self.by-version."bytes"."0.3.0"; by-spec."callsite"."~1.0.0" = self.by-version."callsite"."1.0.0"; by-version."callsite"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -2064,6 +3363,69 @@ ]; passthru.names = [ "callsite" ]; }; + by-spec."camelcase"."^1.0.1" = + self.by-version."camelcase"."1.0.2"; + by-version."camelcase"."1.0.2" = lib.makeOverridable self.buildNodePackage { + name = "camelcase-1.0.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/camelcase/-/camelcase-1.0.2.tgz"; + name = "camelcase-1.0.2.tgz"; + sha1 = "7912eac1d496836782c976c2d73e874dc54f2eaf"; + }) + ]; + buildInputs = + (self.nativeDeps."camelcase" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "camelcase" ]; + }; + by-spec."camelcase-keys"."^1.0.0" = + self.by-version."camelcase-keys"."1.0.0"; + by-version."camelcase-keys"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "camelcase-keys-1.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz"; + name = "camelcase-keys-1.0.0.tgz"; + sha1 = "bd1a11bf9b31a1ce493493a930de1a0baf4ad7ec"; + }) + ]; + buildInputs = + (self.nativeDeps."camelcase-keys" or []); + deps = { + "camelcase-1.0.2" = self.by-version."camelcase"."1.0.2"; + "map-obj-1.0.0" = self.by-version."map-obj"."1.0.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "camelcase-keys" ]; + }; + by-spec."cardinal"."0.4.0" = + self.by-version."cardinal"."0.4.0"; + by-version."cardinal"."0.4.0" = lib.makeOverridable self.buildNodePackage { + name = "cardinal-0.4.0"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/cardinal/-/cardinal-0.4.0.tgz"; + name = "cardinal-0.4.0.tgz"; + sha1 = "7d10aafb20837bde043c45e43a0c8c28cdaae45e"; + }) + ]; + buildInputs = + (self.nativeDeps."cardinal" or []); + deps = { + "redeyed-0.4.4" = self.by-version."redeyed"."0.4.4"; + }; + peerDependencies = [ + ]; + passthru.names = [ "cardinal" ]; + }; by-spec."caseless"."~0.6.0" = self.by-version."caseless"."0.6.0"; by-version."caseless"."0.6.0" = lib.makeOverridable self.buildNodePackage { @@ -2084,16 +3446,56 @@ ]; passthru.names = [ "caseless" ]; }; + by-spec."caseless"."~0.7.0" = + self.by-version."caseless"."0.7.0"; + by-version."caseless"."0.7.0" = lib.makeOverridable self.buildNodePackage { + name = "caseless-0.7.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/caseless/-/caseless-0.7.0.tgz"; + name = "caseless-0.7.0.tgz"; + sha1 = "cbd705ae6229158bb0bc971bf7d7a04bdbd51ff8"; + }) + ]; + buildInputs = + (self.nativeDeps."caseless" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "caseless" ]; + }; + by-spec."caseless"."~0.8.0" = + self.by-version."caseless"."0.8.0"; + by-version."caseless"."0.8.0" = lib.makeOverridable self.buildNodePackage { + name = "caseless-0.8.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/caseless/-/caseless-0.8.0.tgz"; + name = "caseless-0.8.0.tgz"; + sha1 = "5bca2881d41437f54b2407ebe34888c7b9ad4f7d"; + }) + ]; + buildInputs = + (self.nativeDeps."caseless" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "caseless" ]; + }; by-spec."chai"."*" = - self.by-version."chai"."1.9.2"; - by-version."chai"."1.9.2" = lib.makeOverridable self.buildNodePackage { - name = "chai-1.9.2"; + self.by-version."chai"."1.10.0"; + by-version."chai"."1.10.0" = lib.makeOverridable self.buildNodePackage { + name = "chai-1.10.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/chai/-/chai-1.9.2.tgz"; - name = "chai-1.9.2.tgz"; - sha1 = "3f1a20f82b0b9d7437577d24d6f12b1a69d3b590"; + url = "http://registry.npmjs.org/chai/-/chai-1.10.0.tgz"; + name = "chai-1.10.0.tgz"; + sha1 = "e4031cc87654461a75943e5a35ab46eaf39c1eb9"; }) ]; buildInputs = @@ -2106,7 +3508,53 @@ ]; passthru.names = [ "chai" ]; }; - "chai" = self.by-version."chai"."1.9.2"; + "chai" = self.by-version."chai"."1.10.0"; + by-spec."chainsaw"."~0.1.0" = + self.by-version."chainsaw"."0.1.0"; + by-version."chainsaw"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "chainsaw-0.1.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz"; + name = "chainsaw-0.1.0.tgz"; + sha1 = "5eab50b28afe58074d0d58291388828b5e5fbc98"; + }) + ]; + buildInputs = + (self.nativeDeps."chainsaw" or []); + deps = { + "traverse-0.3.9" = self.by-version."traverse"."0.3.9"; + }; + peerDependencies = [ + ]; + passthru.names = [ "chainsaw" ]; + }; + by-spec."chalk"."0.5.0" = + self.by-version."chalk"."0.5.0"; + by-version."chalk"."0.5.0" = lib.makeOverridable self.buildNodePackage { + name = "chalk-0.5.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/chalk/-/chalk-0.5.0.tgz"; + name = "chalk-0.5.0.tgz"; + sha1 = "375dfccbc21c0a60a8b61bc5b78f3dc2a55c212f"; + }) + ]; + buildInputs = + (self.nativeDeps."chalk" or []); + deps = { + "ansi-styles-1.1.0" = self.by-version."ansi-styles"."1.1.0"; + "escape-string-regexp-1.0.2" = self.by-version."escape-string-regexp"."1.0.2"; + "has-ansi-0.1.0" = self.by-version."has-ansi"."0.1.0"; + "strip-ansi-0.3.0" = self.by-version."strip-ansi"."0.3.0"; + "supports-color-0.2.0" = self.by-version."supports-color"."0.2.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "chalk" ]; + }; by-spec."chalk"."^0.4.0" = self.by-version."chalk"."0.4.0"; by-version."chalk"."0.4.0" = lib.makeOverridable self.buildNodePackage { @@ -2199,6 +3647,26 @@ ]; passthru.names = [ "character-parser" ]; }; + by-spec."character-parser"."1.2.1" = + self.by-version."character-parser"."1.2.1"; + by-version."character-parser"."1.2.1" = lib.makeOverridable self.buildNodePackage { + name = "character-parser-1.2.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/character-parser/-/character-parser-1.2.1.tgz"; + name = "character-parser-1.2.1.tgz"; + sha1 = "c0dde4ab182713b919b970959a123ecc1a30fcd6"; + }) + ]; + buildInputs = + (self.nativeDeps."character-parser" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "character-parser" ]; + }; by-spec."child-process-close"."~0.1.1" = self.by-version."child-process-close"."0.1.1"; by-version."child-process-close"."0.1.1" = lib.makeOverridable self.buildNodePackage { @@ -2219,7 +3687,7 @@ ]; passthru.names = [ "child-process-close" ]; }; - by-spec."chmodr"."~0.1.0" = + by-spec."chmodr"."0.1.0" = self.by-version."chmodr"."0.1.0"; by-version."chmodr"."0.1.0" = lib.makeOverridable self.buildNodePackage { name = "chmodr-0.1.0"; @@ -2239,23 +3707,26 @@ ]; passthru.names = [ "chmodr" ]; }; + by-spec."chmodr"."~0.1.0" = + self.by-version."chmodr"."0.1.0"; by-spec."chokidar".">=0.8.2" = - self.by-version."chokidar"."0.9.0"; - by-version."chokidar"."0.9.0" = lib.makeOverridable self.buildNodePackage { - name = "chokidar-0.9.0"; + self.by-version."chokidar"."0.11.1"; + by-version."chokidar"."0.11.1" = lib.makeOverridable self.buildNodePackage { + name = "chokidar-0.11.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/chokidar/-/chokidar-0.9.0.tgz"; - name = "chokidar-0.9.0.tgz"; - sha1 = "c1ae41561dbdb89dd5fac615453d20b48a946c2f"; + url = "http://registry.npmjs.org/chokidar/-/chokidar-0.11.1.tgz"; + name = "chokidar-0.11.1.tgz"; + sha1 = "b00e01717de445783782ef5c48a803e05fed0fc4"; }) ]; buildInputs = (self.nativeDeps."chokidar" or []); deps = { - "fsevents-0.3.0" = self.by-version."fsevents"."0.3.0"; - "recursive-readdir-0.0.2" = self.by-version."recursive-readdir"."0.0.2"; + "readdirp-1.1.0" = self.by-version."readdirp"."1.1.0"; + "async-each-0.1.6" = self.by-version."async-each"."0.1.6"; + "fsevents-0.3.1" = self.by-version."fsevents"."0.3.1"; }; peerDependencies = [ ]; @@ -2282,15 +3753,15 @@ passthru.names = [ "chownr" ]; }; by-spec."clean-css"."2.2.x" = - self.by-version."clean-css"."2.2.16"; - by-version."clean-css"."2.2.16" = lib.makeOverridable self.buildNodePackage { - name = "clean-css-2.2.16"; + self.by-version."clean-css"."2.2.19"; + by-version."clean-css"."2.2.19" = lib.makeOverridable self.buildNodePackage { + name = "clean-css-2.2.19"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/clean-css/-/clean-css-2.2.16.tgz"; - name = "clean-css-2.2.16.tgz"; - sha1 = "a79f4fbd6bb8652c4d1668b44406172f180d0283"; + url = "http://registry.npmjs.org/clean-css/-/clean-css-2.2.19.tgz"; + name = "clean-css-2.2.19.tgz"; + sha1 = "b5863312e2e13fdf693e44d60b41ce45cbb6fdbd"; }) ]; buildInputs = @@ -2303,17 +3774,17 @@ passthru.names = [ "clean-css" ]; }; by-spec."clean-css"."~2.2.0" = - self.by-version."clean-css"."2.2.16"; + self.by-version."clean-css"."2.2.19"; by-spec."cli"."0.6.x" = - self.by-version."cli"."0.6.4"; - by-version."cli"."0.6.4" = lib.makeOverridable self.buildNodePackage { - name = "cli-0.6.4"; + self.by-version."cli"."0.6.5"; + by-version."cli"."0.6.5" = lib.makeOverridable self.buildNodePackage { + name = "cli-0.6.5"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/cli/-/cli-0.6.4.tgz"; - name = "cli-0.6.4.tgz"; - sha1 = "105c4e9b29ecdbc1ee0c8e418276f62d8351f88e"; + url = "http://registry.npmjs.org/cli/-/cli-0.6.5.tgz"; + name = "cli-0.6.5.tgz"; + sha1 = "f4edda12dfa8d56d726b43b0b558e089b0d2a85c"; }) ]; buildInputs = @@ -2326,6 +3797,51 @@ ]; passthru.names = [ "cli" ]; }; + by-spec."cli-color"."~0.3.2" = + self.by-version."cli-color"."0.3.2"; + by-version."cli-color"."0.3.2" = lib.makeOverridable self.buildNodePackage { + name = "cli-color-0.3.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/cli-color/-/cli-color-0.3.2.tgz"; + name = "cli-color-0.3.2.tgz"; + sha1 = "75fa5f728c308cc4ac594b05e06cc5d80daccd86"; + }) + ]; + buildInputs = + (self.nativeDeps."cli-color" or []); + deps = { + "d-0.1.1" = self.by-version."d"."0.1.1"; + "es5-ext-0.10.4" = self.by-version."es5-ext"."0.10.4"; + "memoizee-0.3.8" = self.by-version."memoizee"."0.3.8"; + "timers-ext-0.1.0" = self.by-version."timers-ext"."0.1.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "cli-color" ]; + }; + by-spec."cli-table"."^0.3.0" = + self.by-version."cli-table"."0.3.1"; + by-version."cli-table"."0.3.1" = lib.makeOverridable self.buildNodePackage { + name = "cli-table-0.3.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz"; + name = "cli-table-0.3.1.tgz"; + sha1 = "f53b05266a8b1a0b934b3d0821e6e2dc5914ae23"; + }) + ]; + buildInputs = + (self.nativeDeps."cli-table" or []); + deps = { + "colors-1.0.3" = self.by-version."colors"."1.0.3"; + }; + peerDependencies = [ + ]; + passthru.names = [ "cli-table" ]; + }; by-spec."cliff"."0.1.8" = self.by-version."cliff"."0.1.8"; by-version."cliff"."0.1.8" = lib.makeOverridable self.buildNodePackage { @@ -2366,12 +3882,54 @@ deps = { "colors-0.6.2" = self.by-version."colors"."0.6.2"; "eyes-0.1.8" = self.by-version."eyes"."0.1.8"; - "winston-0.8.0" = self.by-version."winston"."0.8.0"; + "winston-0.8.3" = self.by-version."winston"."0.8.3"; }; peerDependencies = [ ]; passthru.names = [ "cliff" ]; }; + by-spec."cliff"."~0.1.9" = + self.by-version."cliff"."0.1.9"; + by-spec."clivas"."^0.1.4" = + self.by-version."clivas"."0.1.4"; + by-version."clivas"."0.1.4" = lib.makeOverridable self.buildNodePackage { + name = "clivas-0.1.4"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/clivas/-/clivas-0.1.4.tgz"; + name = "clivas-0.1.4.tgz"; + sha1 = "e1c1e481d1273d57f1752132b0e4410a0d88235a"; + }) + ]; + buildInputs = + (self.nativeDeps."clivas" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "clivas" ]; + }; + by-spec."clone"."0.1.11" = + self.by-version."clone"."0.1.11"; + by-version."clone"."0.1.11" = lib.makeOverridable self.buildNodePackage { + name = "clone-0.1.11"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/clone/-/clone-0.1.11.tgz"; + name = "clone-0.1.11.tgz"; + sha1 = "408b7d1773eb0dfbf2ddb156c1c47170c17e3a96"; + }) + ]; + buildInputs = + (self.nativeDeps."clone" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "clone" ]; + }; by-spec."clone"."0.1.5" = self.by-version."clone"."0.1.5"; by-version."clone"."0.1.5" = lib.makeOverridable self.buildNodePackage { @@ -2412,7 +3970,7 @@ ]; passthru.names = [ "clone" ]; }; - by-spec."clone"."~0.1.5" = + by-spec."clone"."^0.1.18" = self.by-version."clone"."0.1.18"; by-version."clone"."0.1.18" = lib.makeOverridable self.buildNodePackage { name = "clone-0.1.18"; @@ -2432,6 +3990,10 @@ ]; passthru.names = [ "clone" ]; }; + by-spec."clone"."~0.1.18" = + self.by-version."clone"."0.1.18"; + by-spec."clone"."~0.1.5" = + self.by-version."clone"."0.1.18"; by-spec."clone-stats"."^0.0.1" = self.by-version."clone-stats"."0.0.1"; by-version."clone-stats"."0.0.1" = lib.makeOverridable self.buildNodePackage { @@ -2454,6 +4016,30 @@ }; by-spec."clone-stats"."~0.0.1" = self.by-version."clone-stats"."0.0.1"; + by-spec."cmd-shim"."~1.1.0" = + self.by-version."cmd-shim"."1.1.2"; + by-version."cmd-shim"."1.1.2" = lib.makeOverridable self.buildNodePackage { + name = "cmd-shim-1.1.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/cmd-shim/-/cmd-shim-1.1.2.tgz"; + name = "cmd-shim-1.1.2.tgz"; + sha1 = "e4f9198802e361e8eb43b591959ef4dc6cdb6754"; + }) + ]; + buildInputs = + (self.nativeDeps."cmd-shim" or []); + deps = { + "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; + "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3"; + }; + peerDependencies = [ + ]; + passthru.names = [ "cmd-shim" ]; + }; + by-spec."cmd-shim"."~1.1.1" = + self.by-version."cmd-shim"."1.1.2"; by-spec."cmd-shim"."~2.0.1" = self.by-version."cmd-shim"."2.0.1"; by-version."cmd-shim"."2.0.1" = lib.makeOverridable self.buildNodePackage { @@ -2469,7 +4055,7 @@ buildInputs = (self.nativeDeps."cmd-shim" or []); deps = { - "graceful-fs-3.0.2" = self.by-version."graceful-fs"."3.0.2"; + "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; }; peerDependencies = [ @@ -2566,32 +4152,8 @@ ]; passthru.names = [ "coffee-script" ]; }; - by-spec."coffee-script-redux"."=2.0.0-beta8" = - self.by-version."coffee-script-redux"."2.0.0-beta8"; - by-version."coffee-script-redux"."2.0.0-beta8" = lib.makeOverridable self.buildNodePackage { - name = "coffee-script-redux-2.0.0-beta8"; - bin = true; - src = [ - (self.patchSource fetchurl { - url = "http://registry.npmjs.org/coffee-script-redux/-/coffee-script-redux-2.0.0-beta8.tgz"; - name = "coffee-script-redux-2.0.0-beta8.tgz"; - sha1 = "0fd7b8417340dd0d339e8f6fd8b4b8716956e8d5"; - }) - ]; - buildInputs = - (self.nativeDeps."coffee-script-redux" or []); - deps = { - "StringScanner-0.0.3" = self.by-version."StringScanner"."0.0.3"; - "nopt-2.1.2" = self.by-version."nopt"."2.1.2"; - "esmangle-0.0.17" = self.by-version."esmangle"."0.0.17"; - "source-map-0.1.11" = self.by-version."source-map"."0.1.11"; - "escodegen-0.0.28" = self.by-version."escodegen"."0.0.28"; - "cscodegen-0.1.0" = self.by-version."cscodegen"."0.1.0"; - }; - peerDependencies = [ - ]; - passthru.names = [ "coffee-script-redux" ]; - }; + by-spec."coffee-script"."~1.8.0" = + self.by-version."coffee-script"."1.8.0"; by-spec."collections".">=2.0.1 <3.0.0" = self.by-version."collections"."2.0.1"; by-version."collections"."2.0.1" = lib.makeOverridable self.buildNodePackage { @@ -2613,22 +4175,22 @@ ]; passthru.names = [ "collections" ]; }; - by-spec."color"."~0.7.1" = - self.by-version."color"."0.7.1"; - by-version."color"."0.7.1" = lib.makeOverridable self.buildNodePackage { - name = "color-0.7.1"; + by-spec."color"."~0.7.3" = + self.by-version."color"."0.7.3"; + by-version."color"."0.7.3" = lib.makeOverridable self.buildNodePackage { + name = "color-0.7.3"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/color/-/color-0.7.1.tgz"; - name = "color-0.7.1.tgz"; - sha1 = "a2676f19c6ccb708b7586dc98b5c6e37dc9a199c"; + url = "http://registry.npmjs.org/color/-/color-0.7.3.tgz"; + name = "color-0.7.3.tgz"; + sha1 = "ab3ae4bc6cb8cfadb5d749c40f34aea088104f89"; }) ]; buildInputs = (self.nativeDeps."color" or []); deps = { - "color-convert-0.5.0" = self.by-version."color-convert"."0.5.0"; + "color-convert-0.5.2" = self.by-version."color-convert"."0.5.2"; "color-string-0.2.1" = self.by-version."color-string"."0.2.1"; }; peerDependencies = [ @@ -2636,15 +4198,15 @@ passthru.names = [ "color" ]; }; by-spec."color-convert"."0.5.x" = - self.by-version."color-convert"."0.5.0"; - by-version."color-convert"."0.5.0" = lib.makeOverridable self.buildNodePackage { - name = "color-convert-0.5.0"; + self.by-version."color-convert"."0.5.2"; + by-version."color-convert"."0.5.2" = lib.makeOverridable self.buildNodePackage { + name = "color-convert-0.5.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/color-convert/-/color-convert-0.5.0.tgz"; - name = "color-convert-0.5.0.tgz"; - sha1 = "4032cab2128c81670c7b394d77b6783f49caaaf7"; + url = "http://registry.npmjs.org/color-convert/-/color-convert-0.5.2.tgz"; + name = "color-convert-0.5.2.tgz"; + sha1 = "febd9efc33674df3374ff8eeaec3bc56c79a9b35"; }) ]; buildInputs = @@ -2670,7 +4232,7 @@ buildInputs = (self.nativeDeps."color-string" or []); deps = { - "color-convert-0.5.0" = self.by-version."color-convert"."0.5.0"; + "color-convert-0.5.2" = self.by-version."color-convert"."0.5.2"; }; peerDependencies = [ ]; @@ -2718,8 +4280,48 @@ }; by-spec."colors"."0.x.x" = self.by-version."colors"."0.6.2"; + by-spec."colors"."1.0.3" = + self.by-version."colors"."1.0.3"; + by-version."colors"."1.0.3" = lib.makeOverridable 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"; + }) + ]; + buildInputs = + (self.nativeDeps."colors" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "colors" ]; + }; by-spec."colors"."~0.6.2" = self.by-version."colors"."0.6.2"; + by-spec."columnify"."0.1.2" = + self.by-version."columnify"."0.1.2"; + by-version."columnify"."0.1.2" = lib.makeOverridable self.buildNodePackage { + name = "columnify-0.1.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/columnify/-/columnify-0.1.2.tgz"; + name = "columnify-0.1.2.tgz"; + sha1 = "ab1a1f1e37b26ba4b87c6920fb717fe51c827042"; + }) + ]; + buildInputs = + (self.nativeDeps."columnify" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "columnify" ]; + }; by-spec."columnify"."~1.2.1" = self.by-version."columnify"."1.2.1"; by-version."columnify"."1.2.1" = lib.makeOverridable self.buildNodePackage { @@ -2766,15 +4368,15 @@ passthru.names = [ "combine-source-map" ]; }; 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 = "combined-stream-0.0.5"; + self.by-version."combined-stream"."0.0.7"; + by-version."combined-stream"."0.0.7" = lib.makeOverridable self.buildNodePackage { + name = "combined-stream-0.0.7"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.5.tgz"; - name = "combined-stream-0.0.5.tgz"; - sha1 = "29ed76e5c9aad07c4acf9ca3d32601cce28697a2"; + url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"; + name = "combined-stream-0.0.7.tgz"; + sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; }) ]; buildInputs = @@ -2786,6 +4388,8 @@ ]; passthru.names = [ "combined-stream" ]; }; + by-spec."combined-stream"."~0.0.5" = + self.by-version."combined-stream"."0.0.7"; by-spec."commander"."0.6.1" = self.by-version."commander"."0.6.1"; by-version."commander"."0.6.1" = lib.makeOverridable self.buildNodePackage { @@ -2868,6 +4472,8 @@ ]; passthru.names = [ "commander" ]; }; + by-spec."commander"."2.0.x" = + self.by-version."commander"."2.0.0"; by-spec."commander"."2.1.0" = self.by-version."commander"."2.1.0"; by-version."commander"."2.1.0" = lib.makeOverridable self.buildNodePackage { @@ -2908,7 +4514,7 @@ ]; passthru.names = [ "commander" ]; }; - by-spec."commander"."2.x" = + by-spec."commander"."2.3.0" = self.by-version."commander"."2.3.0"; by-version."commander"."2.3.0" = lib.makeOverridable self.buildNodePackage { name = "commander-2.3.0"; @@ -2928,10 +4534,34 @@ ]; passthru.names = [ "commander" ]; }; + by-spec."commander"."2.x" = + self.by-version."commander"."2.5.0"; + by-version."commander"."2.5.0" = lib.makeOverridable self.buildNodePackage { + name = "commander-2.5.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/commander/-/commander-2.5.0.tgz"; + name = "commander-2.5.0.tgz"; + sha1 = "d777b6a4d847d423e5d475da864294ac1ff5aa9d"; + }) + ]; + buildInputs = + (self.nativeDeps."commander" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "commander" ]; + }; by-spec."commander"."~2.0.0" = self.by-version."commander"."2.0.0"; by-spec."commander"."~2.1.0" = self.by-version."commander"."2.1.0"; + by-spec."commander"."~2.3.0" = + self.by-version."commander"."2.3.0"; + by-spec."commander"."~2.5.0" = + self.by-version."commander"."2.5.0"; by-spec."commondir"."0.0.1" = self.by-version."commondir"."0.0.1"; by-version."commondir"."0.0.1" = lib.makeOverridable self.buildNodePackage { @@ -2952,6 +4582,28 @@ ]; passthru.names = [ "commondir" ]; }; + by-spec."commondir"."~0.0.1" = + self.by-version."commondir"."0.0.1"; + by-spec."compact2string"."^1.2.0" = + self.by-version."compact2string"."1.3.0"; + by-version."compact2string"."1.3.0" = lib.makeOverridable self.buildNodePackage { + name = "compact2string-1.3.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/compact2string/-/compact2string-1.3.0.tgz"; + name = "compact2string-1.3.0.tgz"; + sha1 = "5e5d32fe4d40ca853ec0f6f22f7952aa9fe36135"; + }) + ]; + buildInputs = + (self.nativeDeps."compact2string" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "compact2string" ]; + }; by-spec."component-emitter"."1.1.2" = self.by-version."component-emitter"."1.1.2"; by-version."component-emitter"."1.1.2" = lib.makeOverridable self.buildNodePackage { @@ -2987,53 +4639,96 @@ buildInputs = (self.nativeDeps."compress-commons" or []); deps = { - "buffer-crc32-0.2.3" = self.by-version."buffer-crc32"."0.2.3"; + "buffer-crc32-0.2.4" = self.by-version."buffer-crc32"."0.2.4"; "crc32-stream-0.3.1" = self.by-version."crc32-stream"."0.3.1"; - "readable-stream-1.0.32" = self.by-version."readable-stream"."1.0.32"; + "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; }; peerDependencies = [ ]; passthru.names = [ "compress-commons" ]; }; - by-spec."compressible"."~2.0.0" = - self.by-version."compressible"."2.0.0"; - by-version."compressible"."2.0.0" = lib.makeOverridable self.buildNodePackage { - name = "compressible-2.0.0"; + by-spec."compressible"."1.0.0" = + self.by-version."compressible"."1.0.0"; + by-version."compressible"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "compressible-1.0.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/compressible/-/compressible-2.0.0.tgz"; - name = "compressible-2.0.0.tgz"; - sha1 = "90086ce57102e9e2427ee945a5fb2a98dd51dfb4"; + url = "http://registry.npmjs.org/compressible/-/compressible-1.0.0.tgz"; + name = "compressible-1.0.0.tgz"; + sha1 = "f83e49c1cb61421753545125a8011d68b492427d"; }) ]; buildInputs = (self.nativeDeps."compressible" or []); deps = { - "mime-db-1.0.3" = self.by-version."mime-db"."1.0.3"; }; peerDependencies = [ ]; passthru.names = [ "compressible" ]; }; - by-spec."compression"."~1.1.0" = - self.by-version."compression"."1.1.0"; - by-version."compression"."1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "compression-1.1.0"; + by-spec."compressible"."~2.0.1" = + self.by-version."compressible"."2.0.1"; + by-version."compressible"."2.0.1" = lib.makeOverridable self.buildNodePackage { + name = "compressible-2.0.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/compression/-/compression-1.1.0.tgz"; - name = "compression-1.1.0.tgz"; - sha1 = "58243eded272fc531d7c744d8e8daa7cc0b99215"; + url = "http://registry.npmjs.org/compressible/-/compressible-2.0.1.tgz"; + name = "compressible-2.0.1.tgz"; + sha1 = "3550115793eb3435f7eb16775afe05df1a333ebc"; + }) + ]; + buildInputs = + (self.nativeDeps."compressible" or []); + deps = { + "mime-db-1.2.0" = self.by-version."mime-db"."1.2.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "compressible" ]; + }; + by-spec."compression"."1.0.0" = + self.by-version."compression"."1.0.0"; + by-version."compression"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "compression-1.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/compression/-/compression-1.0.0.tgz"; + name = "compression-1.0.0.tgz"; + sha1 = "8aeb85d48db5145d38bc8b181b6352d8eab26020"; + }) + ]; + buildInputs = + (self.nativeDeps."compression" or []); + deps = { + "bytes-0.2.1" = self.by-version."bytes"."0.2.1"; + "negotiator-0.3.0" = self.by-version."negotiator"."0.3.0"; + "compressible-1.0.0" = self.by-version."compressible"."1.0.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "compression" ]; + }; + by-spec."compression"."~1.1.2" = + self.by-version."compression"."1.1.2"; + by-version."compression"."1.1.2" = lib.makeOverridable self.buildNodePackage { + name = "compression-1.1.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/compression/-/compression-1.1.2.tgz"; + name = "compression-1.1.2.tgz"; + sha1 = "f93fb7fcdb3573ec4c7d5398984caae230e2a8d7"; }) ]; buildInputs = (self.nativeDeps."compression" or []); deps = { - "accepts-1.1.1" = self.by-version."accepts"."1.1.1"; + "accepts-1.1.3" = self.by-version."accepts"."1.1.3"; "bytes-1.0.0" = self.by-version."bytes"."1.0.0"; - "compressible-2.0.0" = self.by-version."compressible"."2.0.0"; + "compressible-2.0.1" = self.by-version."compressible"."2.0.1"; "debug-2.0.0" = self.by-version."debug"."2.0.0"; "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; "vary-1.0.0" = self.by-version."vary"."1.0.0"; @@ -3042,16 +4737,42 @@ ]; passthru.names = [ "compression" ]; }; + by-spec."compression"."~1.2.1" = + self.by-version."compression"."1.2.1"; + by-version."compression"."1.2.1" = lib.makeOverridable self.buildNodePackage { + name = "compression-1.2.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/compression/-/compression-1.2.1.tgz"; + name = "compression-1.2.1.tgz"; + sha1 = "12ebaac04d308ca6103618a9716ce5634b939e9c"; + }) + ]; + buildInputs = + (self.nativeDeps."compression" or []); + deps = { + "accepts-1.1.3" = self.by-version."accepts"."1.1.3"; + "bytes-1.0.0" = self.by-version."bytes"."1.0.0"; + "compressible-2.0.1" = self.by-version."compressible"."2.0.1"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; + "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; + "vary-1.0.0" = self.by-version."vary"."1.0.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "compression" ]; + }; by-spec."concat-stream"."^1.4.1" = - self.by-version."concat-stream"."1.4.6"; - by-version."concat-stream"."1.4.6" = lib.makeOverridable self.buildNodePackage { - name = "concat-stream-1.4.6"; + self.by-version."concat-stream"."1.4.7"; + by-version."concat-stream"."1.4.7" = lib.makeOverridable self.buildNodePackage { + name = "concat-stream-1.4.7"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/concat-stream/-/concat-stream-1.4.6.tgz"; - name = "concat-stream-1.4.6.tgz"; - sha1 = "8cb736a556a32f020f1ddc82fa3448381c5e5cce"; + url = "http://registry.npmjs.org/concat-stream/-/concat-stream-1.4.7.tgz"; + name = "concat-stream-1.4.7.tgz"; + sha1 = "0ceaa47b87a581d2a7a782b92b81d5020c3f9925"; }) ]; buildInputs = @@ -3065,10 +4786,14 @@ ]; passthru.names = [ "concat-stream" ]; }; + by-spec."concat-stream"."^1.4.5" = + self.by-version."concat-stream"."1.4.7"; + by-spec."concat-stream"."^1.4.6" = + self.by-version."concat-stream"."1.4.7"; by-spec."concat-stream"."~1.4.1" = - self.by-version."concat-stream"."1.4.6"; + self.by-version."concat-stream"."1.4.7"; by-spec."concat-stream"."~1.4.5" = - self.by-version."concat-stream"."1.4.6"; + self.by-version."concat-stream"."1.4.7"; by-spec."config"."0.4.15" = self.by-version."config"."0.4.15"; by-version."config"."0.4.15" = lib.makeOverridable self.buildNodePackage { @@ -3086,7 +4811,7 @@ deps = { "js-yaml-0.3.7" = self.by-version."js-yaml"."0.3.7"; "coffee-script-1.8.0" = self.by-version."coffee-script"."1.8.0"; - "vows-0.7.0" = self.by-version."vows"."0.7.0"; + "vows-0.8.1" = self.by-version."vows"."0.8.1"; }; peerDependencies = [ ]; @@ -3108,7 +4833,7 @@ (self.nativeDeps."config-chain" or []); deps = { "proto-list-1.2.3" = self.by-version."proto-list"."1.2.3"; - "ini-1.3.0" = self.by-version."ini"."1.3.0"; + "ini-1.3.2" = self.by-version."ini"."1.3.2"; }; peerDependencies = [ ]; @@ -3131,7 +4856,7 @@ buildInputs = (self.nativeDeps."configstore" or []); deps = { - "graceful-fs-3.0.2" = self.by-version."graceful-fs"."3.0.2"; + "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; "js-yaml-3.0.2" = self.by-version."js-yaml"."3.0.2"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "object-assign-0.3.1" = self.by-version."object-assign"."0.3.1"; @@ -3142,6 +4867,8 @@ ]; passthru.names = [ "configstore" ]; }; + by-spec."configstore"."^0.3.1" = + self.by-version."configstore"."0.3.1"; by-spec."connect"."1.x" = self.by-version."connect"."1.9.2"; by-version."connect"."1.9.2" = lib.makeOverridable self.buildNodePackage { @@ -3157,7 +4884,7 @@ buildInputs = (self.nativeDeps."connect" or []); deps = { - "qs-2.2.4" = self.by-version."qs"."2.2.4"; + "qs-2.3.3" = self.by-version."qs"."2.3.3"; "mime-1.2.11" = self.by-version."mime"."1.2.11"; "formidable-1.0.15" = self.by-version."formidable"."1.0.15"; }; @@ -3189,7 +4916,7 @@ "fresh-0.2.0" = self.by-version."fresh"."0.2.0"; "pause-0.0.1" = self.by-version."pause"."0.0.1"; "uid2-0.0.3" = self.by-version."uid2"."0.0.3"; - "debug-2.0.0" = self.by-version."debug"."2.0.0"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; "methods-0.0.1" = self.by-version."methods"."0.0.1"; "raw-body-0.0.3" = self.by-version."raw-body"."0.0.3"; "negotiator-0.3.0" = self.by-version."negotiator"."0.3.0"; @@ -3199,48 +4926,93 @@ ]; passthru.names = [ "connect" ]; }; - by-spec."connect"."2.26.4" = - self.by-version."connect"."2.26.4"; - by-version."connect"."2.26.4" = lib.makeOverridable self.buildNodePackage { - name = "connect-2.26.4"; + by-spec."connect"."2.14.5" = + self.by-version."connect"."2.14.5"; + by-version."connect"."2.14.5" = lib.makeOverridable self.buildNodePackage { + name = "connect-2.14.5"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/connect/-/connect-2.26.4.tgz"; - name = "connect-2.26.4.tgz"; - sha1 = "1ad3477cb90e590f1778ac17b51475af376bece0"; + url = "http://registry.npmjs.org/connect/-/connect-2.14.5.tgz"; + name = "connect-2.14.5.tgz"; + sha1 = "73217513152c152ebe049c499fa09211b8c476f4"; }) ]; buildInputs = (self.nativeDeps."connect" or []); deps = { "basic-auth-connect-1.0.0" = self.by-version."basic-auth-connect"."1.0.0"; - "body-parser-1.8.4" = self.by-version."body-parser"."1.8.4"; + "cookie-parser-1.0.1" = self.by-version."cookie-parser"."1.0.1"; + "cookie-signature-1.0.3" = self.by-version."cookie-signature"."1.0.3"; + "compression-1.0.0" = self.by-version."compression"."1.0.0"; + "connect-timeout-1.0.0" = self.by-version."connect-timeout"."1.0.0"; + "csurf-1.1.0" = self.by-version."csurf"."1.1.0"; + "errorhandler-1.0.0" = self.by-version."errorhandler"."1.0.0"; + "express-session-1.0.2" = self.by-version."express-session"."1.0.2"; + "fresh-0.2.2" = self.by-version."fresh"."0.2.2"; + "method-override-1.0.0" = self.by-version."method-override"."1.0.0"; + "morgan-1.0.0" = self.by-version."morgan"."1.0.0"; + "qs-0.6.6" = self.by-version."qs"."0.6.6"; + "raw-body-1.1.4" = self.by-version."raw-body"."1.1.4"; + "response-time-1.0.0" = self.by-version."response-time"."1.0.0"; + "setimmediate-1.0.1" = self.by-version."setimmediate"."1.0.1"; + "serve-index-1.0.1" = self.by-version."serve-index"."1.0.1"; + "serve-static-1.1.0" = self.by-version."serve-static"."1.1.0"; + "static-favicon-1.0.2" = self.by-version."static-favicon"."1.0.2"; + "vhost-1.0.0" = self.by-version."vhost"."1.0.0"; + "bytes-0.3.0" = self.by-version."bytes"."0.3.0"; + "pause-0.0.1" = self.by-version."pause"."0.0.1"; + "debug-0.8.1" = self.by-version."debug"."0.8.1"; + "multiparty-2.2.0" = self.by-version."multiparty"."2.2.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "connect" ]; + }; + by-spec."connect"."2.27.4" = + self.by-version."connect"."2.27.4"; + by-version."connect"."2.27.4" = lib.makeOverridable self.buildNodePackage { + name = "connect-2.27.4"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/connect/-/connect-2.27.4.tgz"; + name = "connect-2.27.4.tgz"; + sha1 = "12592c9d105326c5191176f8d57e760d6650c830"; + }) + ]; + buildInputs = + (self.nativeDeps."connect" or []); + deps = { + "basic-auth-connect-1.0.0" = self.by-version."basic-auth-connect"."1.0.0"; + "body-parser-1.9.3" = self.by-version."body-parser"."1.9.3"; "bytes-1.0.0" = self.by-version."bytes"."1.0.0"; "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; "cookie-parser-1.3.3" = self.by-version."cookie-parser"."1.3.3"; "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5"; - "compression-1.1.0" = self.by-version."compression"."1.1.0"; - "connect-timeout-1.3.0" = self.by-version."connect-timeout"."1.3.0"; - "csurf-1.6.1" = self.by-version."csurf"."1.6.1"; - "debug-2.0.0" = self.by-version."debug"."2.0.0"; - "depd-0.4.5" = self.by-version."depd"."0.4.5"; - "errorhandler-1.2.0" = self.by-version."errorhandler"."1.2.0"; - "express-session-1.8.2" = self.by-version."express-session"."1.8.2"; - "finalhandler-0.2.0" = self.by-version."finalhandler"."0.2.0"; + "compression-1.2.1" = self.by-version."compression"."1.2.1"; + "connect-timeout-1.4.0" = self.by-version."connect-timeout"."1.4.0"; + "csurf-1.6.3" = self.by-version."csurf"."1.6.3"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; + "depd-1.0.0" = self.by-version."depd"."1.0.0"; + "errorhandler-1.2.3" = self.by-version."errorhandler"."1.2.3"; + "express-session-1.9.2" = self.by-version."express-session"."1.9.2"; + "finalhandler-0.3.2" = self.by-version."finalhandler"."0.3.2"; "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; + "http-errors-1.2.7" = self.by-version."http-errors"."1.2.7"; "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0"; - "method-override-2.2.0" = self.by-version."method-override"."2.2.0"; - "morgan-1.3.2" = self.by-version."morgan"."1.3.2"; + "method-override-2.3.0" = self.by-version."method-override"."2.3.0"; + "morgan-1.4.1" = self.by-version."morgan"."1.4.1"; "multiparty-3.3.2" = self.by-version."multiparty"."3.3.2"; "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; - "qs-2.2.4" = self.by-version."qs"."2.2.4"; - "response-time-2.0.1" = self.by-version."response-time"."2.0.1"; - "serve-favicon-2.1.5" = self.by-version."serve-favicon"."2.1.5"; - "serve-index-1.2.1" = self.by-version."serve-index"."1.2.1"; - "serve-static-1.6.3" = self.by-version."serve-static"."1.6.3"; - "type-is-1.5.2" = self.by-version."type-is"."1.5.2"; + "qs-2.3.3" = self.by-version."qs"."2.3.3"; + "response-time-2.2.0" = self.by-version."response-time"."2.2.0"; + "serve-favicon-2.1.7" = self.by-version."serve-favicon"."2.1.7"; + "serve-index-1.5.1" = self.by-version."serve-index"."1.5.1"; + "serve-static-1.7.1" = self.by-version."serve-static"."1.7.1"; + "type-is-1.5.3" = self.by-version."type-is"."1.5.3"; + "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; "vhost-3.0.0" = self.by-version."vhost"."3.0.0"; "pause-0.0.1" = self.by-version."pause"."0.0.1"; }; @@ -3270,7 +5042,7 @@ "bytes-0.1.0" = self.by-version."bytes"."0.1.0"; "send-0.0.3" = self.by-version."send"."0.0.3"; "fresh-0.1.0" = self.by-version."fresh"."0.1.0"; - "debug-2.0.0" = self.by-version."debug"."2.0.0"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; }; peerDependencies = [ ]; @@ -3300,7 +5072,7 @@ "bytes-0.2.0" = self.by-version."bytes"."0.2.0"; "fresh-0.1.0" = self.by-version."fresh"."0.1.0"; "pause-0.0.1" = self.by-version."pause"."0.0.1"; - "debug-2.0.0" = self.by-version."debug"."2.0.0"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; }; peerDependencies = [ ]; @@ -3330,44 +5102,58 @@ "bytes-0.2.0" = self.by-version."bytes"."0.2.0"; "fresh-0.1.0" = self.by-version."fresh"."0.1.0"; "pause-0.0.1" = self.by-version."pause"."0.0.1"; - "debug-2.0.0" = self.by-version."debug"."2.0.0"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; }; peerDependencies = [ ]; passthru.names = [ "connect" ]; }; by-spec."connect"."~2" = - self.by-version."connect"."2.26.4"; - by-spec."connect"."~2.12.0" = - self.by-version."connect"."2.12.0"; - by-version."connect"."2.12.0" = lib.makeOverridable self.buildNodePackage { - name = "connect-2.12.0"; + self.by-version."connect"."2.27.4"; + by-spec."connect"."~2.26.0" = + self.by-version."connect"."2.26.6"; + by-version."connect"."2.26.6" = lib.makeOverridable self.buildNodePackage { + name = "connect-2.26.6"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/connect/-/connect-2.12.0.tgz"; - name = "connect-2.12.0.tgz"; - sha1 = "31d8fa0dcacdf1908d822bd2923be8a2d2a7ed9a"; + url = "http://registry.npmjs.org/connect/-/connect-2.26.6.tgz"; + name = "connect-2.26.6.tgz"; + sha1 = "94f3eef3fdeeb405806ea46dc036ee0b2acae700"; }) ]; buildInputs = (self.nativeDeps."connect" or []); deps = { - "batch-0.5.0" = self.by-version."batch"."0.5.0"; - "qs-0.6.6" = self.by-version."qs"."0.6.6"; - "cookie-signature-1.0.1" = self.by-version."cookie-signature"."1.0.1"; - "buffer-crc32-0.2.1" = self.by-version."buffer-crc32"."0.2.1"; - "cookie-0.1.0" = self.by-version."cookie"."0.1.0"; - "send-0.1.4" = self.by-version."send"."0.1.4"; - "bytes-0.2.1" = self.by-version."bytes"."0.2.1"; - "fresh-0.2.0" = self.by-version."fresh"."0.2.0"; + "basic-auth-connect-1.0.0" = self.by-version."basic-auth-connect"."1.0.0"; + "body-parser-1.8.4" = self.by-version."body-parser"."1.8.4"; + "bytes-1.0.0" = self.by-version."bytes"."1.0.0"; + "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; + "cookie-parser-1.3.3" = self.by-version."cookie-parser"."1.3.3"; + "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5"; + "compression-1.1.2" = self.by-version."compression"."1.1.2"; + "connect-timeout-1.3.0" = self.by-version."connect-timeout"."1.3.0"; + "csurf-1.6.3" = self.by-version."csurf"."1.6.3"; + "debug-2.0.0" = self.by-version."debug"."2.0.0"; + "depd-0.4.5" = self.by-version."depd"."0.4.5"; + "errorhandler-1.2.3" = self.by-version."errorhandler"."1.2.3"; + "express-session-1.8.2" = self.by-version."express-session"."1.8.2"; + "finalhandler-0.2.0" = self.by-version."finalhandler"."0.2.0"; + "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; + "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0"; + "method-override-2.2.0" = self.by-version."method-override"."2.2.0"; + "morgan-1.3.2" = self.by-version."morgan"."1.3.2"; + "multiparty-3.3.2" = self.by-version."multiparty"."3.3.2"; + "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; + "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; + "qs-2.2.4" = self.by-version."qs"."2.2.4"; + "response-time-2.0.1" = self.by-version."response-time"."2.0.1"; + "serve-favicon-2.1.7" = self.by-version."serve-favicon"."2.1.7"; + "serve-index-1.2.1" = self.by-version."serve-index"."1.2.1"; + "serve-static-1.6.4" = self.by-version."serve-static"."1.6.4"; + "type-is-1.5.3" = self.by-version."type-is"."1.5.3"; + "vhost-3.0.0" = self.by-version."vhost"."3.0.0"; "pause-0.0.1" = self.by-version."pause"."0.0.1"; - "uid2-0.0.3" = self.by-version."uid2"."0.0.3"; - "debug-0.8.1" = self.by-version."debug"."0.8.1"; - "methods-0.1.0" = self.by-version."methods"."0.1.0"; - "raw-body-1.1.2" = self.by-version."raw-body"."1.1.2"; - "negotiator-0.3.0" = self.by-version."negotiator"."0.3.0"; - "multiparty-2.2.0" = self.by-version."multiparty"."2.2.0"; }; peerDependencies = [ ]; @@ -3415,27 +5201,27 @@ passthru.names = [ "connect-flash" ]; }; by-spec."connect-jade-static"."*" = - self.by-version."connect-jade-static"."0.1.3"; - by-version."connect-jade-static"."0.1.3" = lib.makeOverridable self.buildNodePackage { - name = "connect-jade-static-0.1.3"; + self.by-version."connect-jade-static"."0.1.4"; + by-version."connect-jade-static"."0.1.4" = lib.makeOverridable self.buildNodePackage { + name = "connect-jade-static-0.1.4"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/connect-jade-static/-/connect-jade-static-0.1.3.tgz"; - name = "connect-jade-static-0.1.3.tgz"; - sha1 = "ad0e0538c9124355d6da03de13fae63f7b5e0b1b"; + url = "http://registry.npmjs.org/connect-jade-static/-/connect-jade-static-0.1.4.tgz"; + name = "connect-jade-static-0.1.4.tgz"; + sha1 = "d6cc8b768ff6e5ac26f759480e69408f64eb55e4"; }) ]; buildInputs = (self.nativeDeps."connect-jade-static" or []); deps = { - "jade-1.7.0" = self.by-version."jade"."1.7.0"; + "jade-1.8.1" = self.by-version."jade"."1.8.1"; }; peerDependencies = [ ]; passthru.names = [ "connect-jade-static" ]; }; - "connect-jade-static" = self.by-version."connect-jade-static"."0.1.3"; + "connect-jade-static" = self.by-version."connect-jade-static"."0.1.4"; by-spec."connect-mongo"."*" = self.by-version."connect-mongo"."0.4.1"; by-version."connect-mongo"."0.4.1" = lib.makeOverridable self.buildNodePackage { @@ -3458,6 +5244,27 @@ passthru.names = [ "connect-mongo" ]; }; "connect-mongo" = self.by-version."connect-mongo"."0.4.1"; + by-spec."connect-timeout"."1.0.0" = + self.by-version."connect-timeout"."1.0.0"; + by-version."connect-timeout"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "connect-timeout-1.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/connect-timeout/-/connect-timeout-1.0.0.tgz"; + name = "connect-timeout-1.0.0.tgz"; + sha1 = "12054799f90bb9566f8b274efe7842d6465d10bb"; + }) + ]; + buildInputs = + (self.nativeDeps."connect-timeout" or []); + deps = { + "debug-2.1.0" = self.by-version."debug"."2.1.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "connect-timeout" ]; + }; by-spec."connect-timeout"."~1.3.0" = self.by-version."connect-timeout"."1.3.0"; by-version."connect-timeout"."1.3.0" = lib.makeOverridable self.buildNodePackage { @@ -3481,6 +5288,30 @@ ]; passthru.names = [ "connect-timeout" ]; }; + by-spec."connect-timeout"."~1.4.0" = + self.by-version."connect-timeout"."1.4.0"; + by-version."connect-timeout"."1.4.0" = lib.makeOverridable self.buildNodePackage { + name = "connect-timeout-1.4.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/connect-timeout/-/connect-timeout-1.4.0.tgz"; + name = "connect-timeout-1.4.0.tgz"; + sha1 = "b8003ea155abd18bbdd8a19c91e5284ddc2e465e"; + }) + ]; + buildInputs = + (self.nativeDeps."connect-timeout" or []); + deps = { + "debug-2.1.0" = self.by-version."debug"."2.1.0"; + "http-errors-1.2.7" = self.by-version."http-errors"."1.2.7"; + "ms-0.6.2" = self.by-version."ms"."0.6.2"; + "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "connect-timeout" ]; + }; by-spec."connection-parse"."0.0.x" = self.by-version."connection-parse"."0.0.7"; by-version."connection-parse"."0.0.7" = lib.makeOverridable self.buildNodePackage { @@ -3524,6 +5355,26 @@ }; by-spec."console-browserify"."^1.1.0" = self.by-version."console-browserify"."1.1.0"; + by-spec."console-browserify"."~1.0.1" = + self.by-version."console-browserify"."1.0.3"; + by-version."console-browserify"."1.0.3" = lib.makeOverridable self.buildNodePackage { + name = "console-browserify-1.0.3"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/console-browserify/-/console-browserify-1.0.3.tgz"; + name = "console-browserify-1.0.3.tgz"; + sha1 = "d3898d2c3a93102f364197f8874b4f92b5286a8e"; + }) + ]; + buildInputs = + (self.nativeDeps."console-browserify" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "console-browserify" ]; + }; by-spec."constantinople"."~1.0.1" = self.by-version."constantinople"."1.0.2"; by-version."constantinople"."1.0.2" = lib.makeOverridable self.buildNodePackage { @@ -3547,22 +5398,22 @@ }; by-spec."constantinople"."~1.0.2" = self.by-version."constantinople"."1.0.2"; - by-spec."constantinople"."~2.0.0" = - self.by-version."constantinople"."2.0.1"; - by-version."constantinople"."2.0.1" = lib.makeOverridable self.buildNodePackage { - name = "constantinople-2.0.1"; + by-spec."constantinople"."~3.0.1" = + self.by-version."constantinople"."3.0.1"; + by-version."constantinople"."3.0.1" = lib.makeOverridable self.buildNodePackage { + name = "constantinople-3.0.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/constantinople/-/constantinople-2.0.1.tgz"; - name = "constantinople-2.0.1.tgz"; - sha1 = "5829f856f301a9bdb107d935f77d8eb8ccec4c79"; + url = "http://registry.npmjs.org/constantinople/-/constantinople-3.0.1.tgz"; + name = "constantinople-3.0.1.tgz"; + sha1 = "1ddf9deac0d14c4367c1d5b3f16fb2763f123108"; }) ]; buildInputs = (self.nativeDeps."constantinople" or []); deps = { - "uglify-js-2.4.15" = self.by-version."uglify-js"."2.4.15"; + "acorn-globals-1.0.1" = self.by-version."acorn-globals"."1.0.1"; }; peerDependencies = [ ]; @@ -3588,6 +5439,26 @@ ]; passthru.names = [ "constants-browserify" ]; }; + by-spec."content-disposition"."0.5.0" = + self.by-version."content-disposition"."0.5.0"; + by-version."content-disposition"."0.5.0" = lib.makeOverridable self.buildNodePackage { + name = "content-disposition-0.5.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/content-disposition/-/content-disposition-0.5.0.tgz"; + name = "content-disposition-0.5.0.tgz"; + sha1 = "4284fe6ae0630874639e44e80a418c2934135e9e"; + }) + ]; + buildInputs = + (self.nativeDeps."content-disposition" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "content-disposition" ]; + }; by-spec."convert-source-map"."~0.3.0" = self.by-version."convert-source-map"."0.3.5"; by-version."convert-source-map"."0.3.5" = lib.makeOverridable self.buildNodePackage { @@ -3728,7 +5599,29 @@ ]; passthru.names = [ "cookie-jar" ]; }; - by-spec."cookie-parser"."~1.3.2" = + by-spec."cookie-parser"."1.0.1" = + self.by-version."cookie-parser"."1.0.1"; + by-version."cookie-parser"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "cookie-parser-1.0.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/cookie-parser/-/cookie-parser-1.0.1.tgz"; + name = "cookie-parser-1.0.1.tgz"; + sha1 = "17bd622c9717cd0858a912a9fef4c0362360a7b0"; + }) + ]; + buildInputs = + (self.nativeDeps."cookie-parser" or []); + deps = { + "cookie-0.1.0" = self.by-version."cookie"."0.1.0"; + "cookie-signature-1.0.3" = self.by-version."cookie-signature"."1.0.3"; + }; + peerDependencies = [ + ]; + passthru.names = [ "cookie-parser" ]; + }; + by-spec."cookie-parser"."~1.3.3" = self.by-version."cookie-parser"."1.3.3"; by-version."cookie-parser"."1.3.3" = lib.makeOverridable self.buildNodePackage { name = "cookie-parser-1.3.3"; @@ -3750,8 +5643,6 @@ ]; passthru.names = [ "cookie-parser" ]; }; - by-spec."cookie-parser"."~1.3.3" = - self.by-version."cookie-parser"."1.3.3"; by-spec."cookie-signature"."1.0.0" = self.by-version."cookie-signature"."1.0.0"; by-version."cookie-signature"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -3812,26 +5703,6 @@ ]; passthru.names = [ "cookie-signature" ]; }; - by-spec."cookie-signature"."1.0.4" = - self.by-version."cookie-signature"."1.0.4"; - by-version."cookie-signature"."1.0.4" = lib.makeOverridable self.buildNodePackage { - name = "cookie-signature-1.0.4"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.4.tgz"; - name = "cookie-signature-1.0.4.tgz"; - sha1 = "0edd22286e3a111b9a2a70db363e925e867f6aca"; - }) - ]; - buildInputs = - (self.nativeDeps."cookie-signature" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "cookie-signature" ]; - }; by-spec."cookie-signature"."1.0.5" = self.by-version."cookie-signature"."1.0.5"; by-version."cookie-signature"."1.0.5" = lib.makeOverridable self.buildNodePackage { @@ -3852,26 +5723,6 @@ ]; passthru.names = [ "cookie-signature" ]; }; - by-spec."cookiejar"."1.3.0" = - self.by-version."cookiejar"."1.3.0"; - by-version."cookiejar"."1.3.0" = lib.makeOverridable self.buildNodePackage { - name = "cookiejar-1.3.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/cookiejar/-/cookiejar-1.3.0.tgz"; - name = "cookiejar-1.3.0.tgz"; - sha1 = "dd00b35679021e99cbd4e855b9ad041913474765"; - }) - ]; - buildInputs = - (self.nativeDeps."cookiejar" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "cookiejar" ]; - }; by-spec."cookiejar"."2.0.1" = self.by-version."cookiejar"."2.0.1"; by-version."cookiejar"."2.0.1" = lib.makeOverridable self.buildNodePackage { @@ -3913,6 +5764,95 @@ ]; passthru.names = [ "cookies" ]; }; + by-spec."cordova"."*" = + self.by-version."cordova"."4.1.3-nightly.2014.10.21"; + by-version."cordova"."4.1.3-nightly.2014.10.21" = lib.makeOverridable self.buildNodePackage { + name = "cordova-4.1.3-nightly.2014.10.21"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/cordova/-/cordova-4.1.3-nightly.2014.10.21.tgz"; + name = "cordova-4.1.3-nightly.2014.10.21.tgz"; + sha1 = "7bcaa450fb91cbe3291dbc8fe1ae64ec9412474b"; + }) + ]; + buildInputs = + (self.nativeDeps."cordova" or []); + deps = { + "cordova-lib-4.1.3-nightly.2014.10.21" = self.by-version."cordova-lib"."4.1.3-nightly.2014.10.21"; + "q-1.0.1" = self.by-version."q"."1.0.1"; + "nopt-3.0.1" = self.by-version."nopt"."3.0.1"; + "underscore-1.7.0" = self.by-version."underscore"."1.7.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "cordova" ]; + }; + "cordova" = self.by-version."cordova"."4.1.3-nightly.2014.10.21"; + by-spec."cordova-js"."3.7.2" = + self.by-version."cordova-js"."3.7.2"; + by-version."cordova-js"."3.7.2" = lib.makeOverridable self.buildNodePackage { + name = "cordova-js-3.7.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/cordova-js/-/cordova-js-3.7.2.tgz"; + name = "cordova-js-3.7.2.tgz"; + sha1 = "3535e08d9682bc130ce250fb01c797d9a7eea500"; + }) + ]; + buildInputs = + (self.nativeDeps."cordova-js" or []); + deps = { + "uglify-js-2.4.15" = self.by-version."uglify-js"."2.4.15"; + "browserify-3.46.0" = self.by-version."browserify"."3.46.0"; + "through-2.3.4" = self.by-version."through"."2.3.4"; + }; + peerDependencies = [ + ]; + passthru.names = [ "cordova-js" ]; + }; + by-spec."cordova-lib"."4.1.3-nightly.2014.10.21" = + self.by-version."cordova-lib"."4.1.3-nightly.2014.10.21"; + by-version."cordova-lib"."4.1.3-nightly.2014.10.21" = lib.makeOverridable self.buildNodePackage { + name = "cordova-lib-4.1.3-nightly.2014.10.21"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/cordova-lib/-/cordova-lib-4.1.3-nightly.2014.10.21.tgz"; + name = "cordova-lib-4.1.3-nightly.2014.10.21.tgz"; + sha1 = "0686184667fde1aa1c7c543f8485b3d7b75feba7"; + }) + ]; + buildInputs = + (self.nativeDeps."cordova-lib" or []); + deps = { + "bplist-parser-0.0.6" = self.by-version."bplist-parser"."0.0.6"; + "dep-graph-1.1.0" = self.by-version."dep-graph"."1.1.0"; + "elementtree-0.1.5" = self.by-version."elementtree"."0.1.5"; + "glob-4.0.6" = self.by-version."glob"."4.0.6"; + "mime-1.2.11" = self.by-version."mime"."1.2.11"; + "npm-1.3.4" = self.by-version."npm"."1.3.4"; + "npmconf-0.1.16" = self.by-version."npmconf"."0.1.16"; + "osenv-0.1.0" = self.by-version."osenv"."0.1.0"; + "plist-1.1.0" = self.by-version."plist"."1.1.0"; + "properties-parser-0.2.3" = self.by-version."properties-parser"."0.2.3"; + "q-1.0.1" = self.by-version."q"."1.0.1"; + "rc-0.5.2" = self.by-version."rc"."0.5.2"; + "request-2.47.0" = self.by-version."request"."2.47.0"; + "semver-2.0.11" = self.by-version."semver"."2.0.11"; + "shelljs-0.3.0" = self.by-version."shelljs"."0.3.0"; + "tar-1.0.2" = self.by-version."tar"."1.0.2"; + "underscore-1.7.0" = self.by-version."underscore"."1.7.0"; + "xcode-0.6.7" = self.by-version."xcode"."0.6.7"; + "cordova-js-3.7.2" = self.by-version."cordova-js"."3.7.2"; + "d8-0.4.4" = self.by-version."d8"."0.4.4"; + "unorm-1.3.3" = self.by-version."unorm"."1.3.3"; + }; + peerDependencies = [ + ]; + passthru.names = [ "cordova-lib" ]; + }; 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 { @@ -3948,12 +5888,14 @@ buildInputs = (self.nativeDeps."couch-login" or []); deps = { - "request-2.44.0" = self.by-version."request"."2.44.0"; + "request-2.49.0" = self.by-version."request"."2.49.0"; }; peerDependencies = [ ]; passthru.names = [ "couch-login" ]; }; + by-spec."couch-login"."~0.1.18" = + self.by-version."couch-login"."0.1.20"; by-spec."coveralls"."*" = self.by-version."coveralls"."2.11.2"; by-version."coveralls"."2.11.2" = lib.makeOverridable self.buildNodePackage { @@ -4019,6 +5961,26 @@ ]; passthru.names = [ "crc" ]; }; + by-spec."crc"."3.2.1" = + self.by-version."crc"."3.2.1"; + by-version."crc"."3.2.1" = lib.makeOverridable self.buildNodePackage { + name = "crc-3.2.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/crc/-/crc-3.2.1.tgz"; + name = "crc-3.2.1.tgz"; + sha1 = "5d9c8fb77a245cd5eca291e5d2d005334bab0082"; + }) + ]; + buildInputs = + (self.nativeDeps."crc" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "crc" ]; + }; by-spec."crc32-stream"."~0.3.1" = self.by-version."crc32-stream"."0.3.1"; by-version."crc32-stream"."0.3.1" = lib.makeOverridable self.buildNodePackage { @@ -4034,13 +5996,35 @@ buildInputs = (self.nativeDeps."crc32-stream" or []); deps = { - "readable-stream-1.0.32" = self.by-version."readable-stream"."1.0.32"; - "buffer-crc32-0.2.3" = self.by-version."buffer-crc32"."0.2.3"; + "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; + "buffer-crc32-0.2.4" = self.by-version."buffer-crc32"."0.2.4"; }; peerDependencies = [ ]; passthru.names = [ "crc32-stream" ]; }; + by-spec."create-ecdh"."1.0.0" = + self.by-version."create-ecdh"."1.0.0"; + by-version."create-ecdh"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "create-ecdh-1.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/create-ecdh/-/create-ecdh-1.0.0.tgz"; + name = "create-ecdh-1.0.0.tgz"; + sha1 = "7016bf4c68b1000d71d9ccb0112e7105789d4b1a"; + }) + ]; + buildInputs = + (self.nativeDeps."create-ecdh" or []); + deps = { + "bn.js-0.15.2" = self.by-version."bn.js"."0.15.2"; + "elliptic-0.15.15" = self.by-version."elliptic"."0.15.15"; + }; + peerDependencies = [ + ]; + passthru.names = [ "create-ecdh" ]; + }; by-spec."crossroads"."~0.12.0" = self.by-version."crossroads"."0.12.0"; by-version."crossroads"."0.12.0" = lib.makeOverridable self.buildNodePackage { @@ -4125,65 +6109,69 @@ passthru.names = [ "crypto" ]; }; by-spec."crypto-browserify"."^3.0.0" = - self.by-version."crypto-browserify"."3.2.5"; - by-version."crypto-browserify"."3.2.5" = lib.makeOverridable self.buildNodePackage { - name = "crypto-browserify-3.2.5"; + self.by-version."crypto-browserify"."3.6.0"; + by-version."crypto-browserify"."3.6.0" = lib.makeOverridable self.buildNodePackage { + name = "crypto-browserify-3.6.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.2.5.tgz"; - name = "crypto-browserify-3.2.5.tgz"; - sha1 = "26c92bba20c8bfa7c50aa71ca95972b353ebbec2"; + url = "http://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.6.0.tgz"; + name = "crypto-browserify-3.6.0.tgz"; + sha1 = "6f74a6d30cf0bd11ef5168410bbdc7a65f6d01cb"; }) ]; buildInputs = (self.nativeDeps."crypto-browserify" or []); deps = { + "browserify-aes-0.6.0" = self.by-version."browserify-aes"."0.6.0"; + "browserify-sign-2.4.0" = self.by-version."browserify-sign"."2.4.0"; + "create-ecdh-1.0.0" = self.by-version."create-ecdh"."1.0.0"; + "diffie-hellman-2.2.0" = self.by-version."diffie-hellman"."2.2.0"; "pbkdf2-compat-2.0.1" = self.by-version."pbkdf2-compat"."2.0.1"; "ripemd160-0.2.0" = self.by-version."ripemd160"."0.2.0"; - "sha.js-2.2.6" = self.by-version."sha.js"."2.2.6"; + "sha.js-2.3.0" = self.by-version."sha.js"."2.3.0"; }; peerDependencies = [ ]; passthru.names = [ "crypto-browserify" ]; }; - by-spec."cscodegen"."git://github.com/michaelficarra/cscodegen.git#73fd7202ac086c26f18c9d56f025b18b3c6f5383" = - self.by-version."cscodegen"."0.1.0"; - by-version."cscodegen"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "cscodegen-0.1.0"; - bin = true; + by-spec."crypto-browserify"."~1.0.9" = + self.by-version."crypto-browserify"."1.0.9"; + by-version."crypto-browserify"."1.0.9" = lib.makeOverridable self.buildNodePackage { + name = "crypto-browserify-1.0.9"; + bin = false; src = [ - (fetchgit { - url = "git://github.com/michaelficarra/cscodegen.git"; - rev = "73fd7202ac086c26f18c9d56f025b18b3c6f5383"; - sha256 = "cb527b00ac305ebc6ab3f59ff4e99def7646b417fdd9e35f0186c8ee41cd0829"; + (fetchurl { + url = "http://registry.npmjs.org/crypto-browserify/-/crypto-browserify-1.0.9.tgz"; + name = "crypto-browserify-1.0.9.tgz"; + sha1 = "cc5449685dfb85eb11c9828acc7cb87ab5bbfcc0"; }) ]; buildInputs = - (self.nativeDeps."cscodegen" or []); + (self.nativeDeps."crypto-browserify" or []); deps = { }; peerDependencies = [ ]; - passthru.names = [ "cscodegen" ]; + passthru.names = [ "crypto-browserify" ]; }; - by-spec."csrf"."~2.0.1" = - self.by-version."csrf"."2.0.1"; - by-version."csrf"."2.0.1" = lib.makeOverridable self.buildNodePackage { - name = "csrf-2.0.1"; + by-spec."csrf"."~2.0.2" = + self.by-version."csrf"."2.0.2"; + by-version."csrf"."2.0.2" = lib.makeOverridable self.buildNodePackage { + name = "csrf-2.0.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/csrf/-/csrf-2.0.1.tgz"; - name = "csrf-2.0.1.tgz"; - sha1 = "d673a2efb4db7d0e6805dadd838c57e30ae0ee73"; + url = "http://registry.npmjs.org/csrf/-/csrf-2.0.2.tgz"; + name = "csrf-2.0.2.tgz"; + sha1 = "d8d3f1f83705b0acc5ed8995b4eadf4a921959f5"; }) ]; buildInputs = (self.nativeDeps."csrf" or []); deps = { "rndm-1.0.0" = self.by-version."rndm"."1.0.0"; - "scmp-0.0.3" = self.by-version."scmp"."0.0.3"; + "scmp-1.0.0" = self.by-version."scmp"."1.0.0"; "uid-safe-1.0.1" = self.by-version."uid-safe"."1.0.1"; "base64-url-1.0.0" = self.by-version."base64-url"."1.0.0"; }; @@ -4273,16 +6261,38 @@ ]; passthru.names = [ "css-stringify" ]; }; - by-spec."csurf"."~1.6.1" = - self.by-version."csurf"."1.6.1"; - by-version."csurf"."1.6.1" = lib.makeOverridable self.buildNodePackage { - name = "csurf-1.6.1"; + by-spec."csurf"."1.1.0" = + self.by-version."csurf"."1.1.0"; + by-version."csurf"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "csurf-1.1.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/csurf/-/csurf-1.1.0.tgz"; + name = "csurf-1.1.0.tgz"; + sha1 = "5dd459df40df43b9eb828284d6d03132f42cb8b2"; + }) + ]; + buildInputs = + (self.nativeDeps."csurf" or []); + deps = { + "uid2-0.0.3" = self.by-version."uid2"."0.0.3"; + "scmp-0.0.3" = self.by-version."scmp"."0.0.3"; + }; + peerDependencies = [ + ]; + passthru.names = [ "csurf" ]; + }; + by-spec."csurf"."~1.6.2" = + self.by-version."csurf"."1.6.3"; + by-version."csurf"."1.6.3" = lib.makeOverridable self.buildNodePackage { + name = "csurf-1.6.3"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/csurf/-/csurf-1.6.1.tgz"; - name = "csurf-1.6.1.tgz"; - sha1 = "78da376f016bcaa48275d553d133585e478f4054"; + url = "http://registry.npmjs.org/csurf/-/csurf-1.6.3.tgz"; + name = "csurf-1.6.3.tgz"; + sha1 = "042e4d5d4ff02507f24df4fb5252393915cd6d44"; }) ]; buildInputs = @@ -4290,12 +6300,15 @@ deps = { "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5"; - "csrf-2.0.1" = self.by-version."csrf"."2.0.1"; + "csrf-2.0.2" = self.by-version."csrf"."2.0.2"; + "http-errors-1.2.7" = self.by-version."http-errors"."1.2.7"; }; peerDependencies = [ ]; passthru.names = [ "csurf" ]; }; + by-spec."csurf"."~1.6.3" = + self.by-version."csurf"."1.6.3"; by-spec."ctype"."0.5.0" = self.by-version."ctype"."0.5.0"; by-version."ctype"."0.5.0" = lib.makeOverridable self.buildNodePackage { @@ -4356,6 +6369,48 @@ ]; passthru.names = [ "cycle" ]; }; + by-spec."d"."~0.1.1" = + self.by-version."d"."0.1.1"; + by-version."d"."0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "d-0.1.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/d/-/d-0.1.1.tgz"; + name = "d-0.1.1.tgz"; + sha1 = "da184c535d18d8ee7ba2aa229b914009fae11309"; + }) + ]; + buildInputs = + (self.nativeDeps."d" or []); + deps = { + "es5-ext-0.10.4" = self.by-version."es5-ext"."0.10.4"; + }; + peerDependencies = [ + ]; + passthru.names = [ "d" ]; + }; + by-spec."d8"."0.4.4" = + self.by-version."d8"."0.4.4"; + by-version."d8"."0.4.4" = lib.makeOverridable self.buildNodePackage { + name = "d8-0.4.4"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/d8/-/d8-0.4.4.tgz"; + name = "d8-0.4.4.tgz"; + sha1 = "5989dd62b90bdd853d3978f1261a4bc76bcf6485"; + }) + ]; + buildInputs = + (self.nativeDeps."d8" or []); + deps = { + "m8-0.4.4" = self.by-version."m8"."0.4.4"; + }; + peerDependencies = [ + ]; + passthru.names = [ "d8" ]; + }; by-spec."dashdash"."1.3.2" = self.by-version."dashdash"."1.3.2"; by-version."dashdash"."1.3.2" = lib.makeOverridable self.buildNodePackage { @@ -4439,37 +6494,39 @@ passthru.names = [ "dateformat" ]; }; by-spec."dateformat"."^1.0.7-1.2.3" = - self.by-version."dateformat"."1.0.8"; - by-version."dateformat"."1.0.8" = lib.makeOverridable self.buildNodePackage { - name = "dateformat-1.0.8"; - bin = false; + self.by-version."dateformat"."1.0.11"; + by-version."dateformat"."1.0.11" = lib.makeOverridable self.buildNodePackage { + name = "dateformat-1.0.11"; + bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/dateformat/-/dateformat-1.0.8.tgz"; - name = "dateformat-1.0.8.tgz"; - sha1 = "87799a3de21bffbf028bdd7ad044981327ac0a26"; + url = "http://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz"; + name = "dateformat-1.0.11.tgz"; + sha1 = "f27cbee7a012bbfb82ea051562d3977f6093dbb1"; }) ]; buildInputs = (self.nativeDeps."dateformat" or []); deps = { + "get-stdin-3.0.2" = self.by-version."get-stdin"."3.0.2"; + "meow-2.0.0" = self.by-version."meow"."2.0.0"; }; peerDependencies = [ ]; passthru.names = [ "dateformat" ]; }; by-spec."dateformat"."~1.0.6" = - self.by-version."dateformat"."1.0.8"; + self.by-version."dateformat"."1.0.11"; by-spec."debug"."*" = - self.by-version."debug"."2.0.0"; - by-version."debug"."2.0.0" = lib.makeOverridable self.buildNodePackage { - name = "debug-2.0.0"; + self.by-version."debug"."2.1.0"; + by-version."debug"."2.1.0" = lib.makeOverridable self.buildNodePackage { + name = "debug-2.1.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/debug/-/debug-2.0.0.tgz"; - name = "debug-2.0.0.tgz"; - sha1 = "89bd9df6732b51256bc6705342bba02ed12131ef"; + url = "http://registry.npmjs.org/debug/-/debug-2.1.0.tgz"; + name = "debug-2.1.0.tgz"; + sha1 = "33ab915659d8c2cc8a41443d94d6ebd37697ed21"; }) ]; buildInputs = @@ -4521,16 +6578,38 @@ ]; passthru.names = [ "debug" ]; }; - by-spec."debug"."1.0.4" = - self.by-version."debug"."1.0.4"; - by-version."debug"."1.0.4" = lib.makeOverridable self.buildNodePackage { - name = "debug-1.0.4"; + by-spec."debug"."0.8.0" = + self.by-version."debug"."0.8.0"; + by-version."debug"."0.8.0" = lib.makeOverridable self.buildNodePackage { + name = "debug-0.8.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/debug/-/debug-1.0.4.tgz"; - name = "debug-1.0.4.tgz"; - sha1 = "5b9c256bd54b6ec02283176fa8a0ede6d154cbf8"; + url = "http://registry.npmjs.org/debug/-/debug-0.8.0.tgz"; + name = "debug-0.8.0.tgz"; + sha1 = "0541ea91f0e503fdf0c5eed418a32550234967f0"; + }) + ]; + buildInputs = + (self.nativeDeps."debug" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "debug" ]; + }; + by-spec."debug"."2" = + self.by-version."debug"."2.1.0"; + by-spec."debug"."2.0.0" = + self.by-version."debug"."2.0.0"; + by-version."debug"."2.0.0" = lib.makeOverridable self.buildNodePackage { + name = "debug-2.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/debug/-/debug-2.0.0.tgz"; + name = "debug-2.0.0.tgz"; + sha1 = "89bd9df6732b51256bc6705342bba02ed12131ef"; }) ]; buildInputs = @@ -4562,14 +6641,49 @@ ]; passthru.names = [ "debug" ]; }; + by-spec."debug"."^0.8.1" = + self.by-version."debug"."0.8.1"; + by-spec."debug"."^1.0.0" = + self.by-version."debug"."1.0.4"; + by-version."debug"."1.0.4" = lib.makeOverridable self.buildNodePackage { + name = "debug-1.0.4"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/debug/-/debug-1.0.4.tgz"; + name = "debug-1.0.4.tgz"; + sha1 = "5b9c256bd54b6ec02283176fa8a0ede6d154cbf8"; + }) + ]; + buildInputs = + (self.nativeDeps."debug" or []); + deps = { + "ms-0.6.2" = self.by-version."ms"."0.6.2"; + }; + peerDependencies = [ + ]; + passthru.names = [ "debug" ]; + }; by-spec."debug"."^1.0.2" = self.by-version."debug"."1.0.4"; + by-spec."debug"."^2.0.0" = + self.by-version."debug"."2.1.0"; + by-spec."debug"."^2.1.0" = + self.by-version."debug"."2.1.0"; + by-spec."debug"."~0.7.4" = + self.by-version."debug"."0.7.4"; by-spec."debug"."~0.8" = self.by-version."debug"."0.8.1"; - by-spec."debug"."~1.0.1" = + by-spec."debug"."~0.8.1" = + self.by-version."debug"."0.8.1"; + by-spec."debug"."~0.x" = + self.by-version."debug"."0.8.1"; + by-spec."debug"."~1.0.0" = self.by-version."debug"."1.0.4"; by-spec."debug"."~2.0.0" = self.by-version."debug"."2.0.0"; + by-spec."debug"."~2.1.0" = + self.by-version."debug"."2.1.0"; by-spec."debuglog"."^1.0.1" = self.by-version."debuglog"."1.0.1"; by-version."debuglog"."1.0.1" = lib.makeOverridable self.buildNodePackage { @@ -4590,6 +6704,33 @@ ]; passthru.names = [ "debuglog" ]; }; + by-spec."decompress-zip"."0.0.8" = + self.by-version."decompress-zip"."0.0.8"; + by-version."decompress-zip"."0.0.8" = lib.makeOverridable self.buildNodePackage { + name = "decompress-zip-0.0.8"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/decompress-zip/-/decompress-zip-0.0.8.tgz"; + name = "decompress-zip-0.0.8.tgz"; + sha1 = "4a265b22c7b209d7b24fa66f2b2dfbced59044f3"; + }) + ]; + buildInputs = + (self.nativeDeps."decompress-zip" or []); + deps = { + "q-1.0.1" = self.by-version."q"."1.0.1"; + "mkpath-0.1.0" = self.by-version."mkpath"."0.1.0"; + "binary-0.3.0" = self.by-version."binary"."0.3.0"; + "touch-0.0.2" = self.by-version."touch"."0.0.2"; + "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; + "nopt-2.2.1" = self.by-version."nopt"."2.2.1"; + "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; + }; + peerDependencies = [ + ]; + passthru.names = [ "decompress-zip" ]; + }; by-spec."deep-eql"."0.1.3" = self.by-version."deep-eql"."0.1.3"; by-version."deep-eql"."0.1.3" = lib.makeOverridable self.buildNodePackage { @@ -4653,9 +6794,29 @@ }; by-spec."deep-equal"."~0.0.0" = self.by-version."deep-equal"."0.0.0"; + by-spec."deep-equal"."~0.1.0" = + self.by-version."deep-equal"."0.1.2"; + by-version."deep-equal"."0.1.2" = lib.makeOverridable self.buildNodePackage { + name = "deep-equal-0.1.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.1.2.tgz"; + name = "deep-equal-0.1.2.tgz"; + sha1 = "b246c2b80a570a47c11be1d9bd1070ec878b87ce"; + }) + ]; + buildInputs = + (self.nativeDeps."deep-equal" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "deep-equal" ]; + }; by-spec."deep-equal"."~0.2.1" = self.by-version."deep-equal"."0.2.1"; - by-spec."deep-extend"."~0.2.11" = + by-spec."deep-extend"."~0.2.5" = self.by-version."deep-extend"."0.2.11"; by-version."deep-extend"."0.2.11" = lib.makeOverridable self.buildNodePackage { name = "deep-extend-0.2.11"; @@ -4675,8 +6836,26 @@ ]; passthru.names = [ "deep-extend" ]; }; - by-spec."deep-extend"."~0.2.5" = - self.by-version."deep-extend"."0.2.11"; + by-spec."deep-extend"."~0.3.2" = + self.by-version."deep-extend"."0.3.2"; + by-version."deep-extend"."0.3.2" = lib.makeOverridable self.buildNodePackage { + name = "deep-extend-0.3.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/deep-extend/-/deep-extend-0.3.2.tgz"; + name = "deep-extend-0.3.2.tgz"; + sha1 = "c75dff89f1c639e98438894d156c30b4f87b3a56"; + }) + ]; + buildInputs = + (self.nativeDeps."deep-extend" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "deep-extend" ]; + }; by-spec."deepmerge"."*" = self.by-version."deepmerge"."0.2.7"; by-version."deepmerge"."0.2.7" = lib.makeOverridable self.buildNodePackage { @@ -4719,7 +6898,7 @@ ]; passthru.names = [ "defaults" ]; }; - by-spec."defined"."~0.0.0" = + by-spec."defined"."0.0.0" = self.by-version."defined"."0.0.0"; by-version."defined"."0.0.0" = lib.makeOverridable self.buildNodePackage { name = "defined-0.0.0"; @@ -4739,6 +6918,8 @@ ]; passthru.names = [ "defined" ]; }; + by-spec."defined"."~0.0.0" = + self.by-version."defined"."0.0.0"; 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 { @@ -4759,25 +6940,26 @@ ]; passthru.names = [ "delayed-stream" ]; }; - by-spec."depd"."0.4.4" = - self.by-version."depd"."0.4.4"; - by-version."depd"."0.4.4" = lib.makeOverridable self.buildNodePackage { - name = "depd-0.4.4"; + by-spec."dep-graph"."1.1.0" = + self.by-version."dep-graph"."1.1.0"; + by-version."dep-graph"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "dep-graph-1.1.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/depd/-/depd-0.4.4.tgz"; - name = "depd-0.4.4.tgz"; - sha1 = "07091fae75f97828d89b4a02a2d4778f0e7c0662"; + url = "http://registry.npmjs.org/dep-graph/-/dep-graph-1.1.0.tgz"; + name = "dep-graph-1.1.0.tgz"; + sha1 = "fade86a92799a813e9b42511cdf3dfa6cc8dbefe"; }) ]; buildInputs = - (self.nativeDeps."depd" or []); + (self.nativeDeps."dep-graph" or []); deps = { + "underscore-1.2.1" = self.by-version."underscore"."1.2.1"; }; peerDependencies = [ ]; - passthru.names = [ "depd" ]; + passthru.names = [ "dep-graph" ]; }; by-spec."depd"."0.4.5" = self.by-version."depd"."0.4.5"; @@ -4799,6 +6981,26 @@ ]; passthru.names = [ "depd" ]; }; + by-spec."depd"."~1.0.0" = + self.by-version."depd"."1.0.0"; + by-version."depd"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "depd-1.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/depd/-/depd-1.0.0.tgz"; + name = "depd-1.0.0.tgz"; + sha1 = "2fda0d00e98aae2845d4991ab1bf1f2a199073d5"; + }) + ]; + buildInputs = + (self.nativeDeps."depd" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "depd" ]; + }; by-spec."deprecated"."^0.0.1" = self.by-version."deprecated"."0.0.1"; by-version."deprecated"."0.0.1" = lib.makeOverridable self.buildNodePackage { @@ -4844,6 +7046,75 @@ ]; passthru.names = [ "deps-sort" ]; }; + by-spec."deps-sort"."~0.1.1" = + self.by-version."deps-sort"."0.1.2"; + by-version."deps-sort"."0.1.2" = lib.makeOverridable self.buildNodePackage { + name = "deps-sort-0.1.2"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/deps-sort/-/deps-sort-0.1.2.tgz"; + name = "deps-sort-0.1.2.tgz"; + sha1 = "daa2fb614a17c9637d801e2f55339ae370f3611a"; + }) + ]; + buildInputs = + (self.nativeDeps."deps-sort" or []); + deps = { + "through-2.3.6" = self.by-version."through"."2.3.6"; + "JSONStream-0.6.4" = self.by-version."JSONStream"."0.6.4"; + "minimist-0.0.10" = self.by-version."minimist"."0.0.10"; + }; + peerDependencies = [ + ]; + passthru.names = [ "deps-sort" ]; + }; + by-spec."derequire"."~0.6.0" = + self.by-version."derequire"."0.6.1"; + by-version."derequire"."0.6.1" = lib.makeOverridable self.buildNodePackage { + name = "derequire-0.6.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/derequire/-/derequire-0.6.1.tgz"; + name = "derequire-0.6.1.tgz"; + sha1 = "cce8ee25380de715deb61900f0bdd38222928788"; + }) + ]; + buildInputs = + (self.nativeDeps."derequire" or []); + deps = { + "estraverse-1.5.1" = self.by-version."estraverse"."1.5.1"; + "esprima-six-0.0.3" = self.by-version."esprima-six"."0.0.3"; + "esrefactor-0.1.0" = self.by-version."esrefactor"."0.1.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "derequire" ]; + }; + by-spec."derequire"."~0.8.0" = + self.by-version."derequire"."0.8.0"; + by-version."derequire"."0.8.0" = lib.makeOverridable self.buildNodePackage { + name = "derequire-0.8.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/derequire/-/derequire-0.8.0.tgz"; + name = "derequire-0.8.0.tgz"; + sha1 = "c1f7f1da2cede44adede047378f03f444e9c4c0d"; + }) + ]; + buildInputs = + (self.nativeDeps."derequire" or []); + deps = { + "estraverse-1.5.1" = self.by-version."estraverse"."1.5.1"; + "esrefactor-0.1.0" = self.by-version."esrefactor"."0.1.0"; + "esprima-fb-3001.1.0-dev-harmony-fb" = self.by-version."esprima-fb"."3001.1.0-dev-harmony-fb"; + }; + peerDependencies = [ + ]; + passthru.names = [ "derequire" ]; + }; by-spec."destroy"."1.0.3" = self.by-version."destroy"."1.0.3"; by-version."destroy"."1.0.3" = lib.makeOverridable self.buildNodePackage { @@ -4864,7 +7135,52 @@ ]; passthru.names = [ "destroy" ]; }; - by-spec."detective"."^3.1.0" = + by-spec."detective"."^4.0.0" = + self.by-version."detective"."4.0.0"; + by-version."detective"."4.0.0" = lib.makeOverridable self.buildNodePackage { + name = "detective-4.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/detective/-/detective-4.0.0.tgz"; + name = "detective-4.0.0.tgz"; + sha1 = "9ffdb5555ddb1571fdbdc6f4ceac08e5e4cf8467"; + }) + ]; + buildInputs = + (self.nativeDeps."detective" or []); + deps = { + "acorn-0.9.0" = self.by-version."acorn"."0.9.0"; + "defined-0.0.0" = self.by-version."defined"."0.0.0"; + "escodegen-1.4.1" = self.by-version."escodegen"."1.4.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "detective" ]; + }; + by-spec."detective"."~2.1.2" = + self.by-version."detective"."2.1.2"; + by-version."detective"."2.1.2" = lib.makeOverridable self.buildNodePackage { + name = "detective-2.1.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/detective/-/detective-2.1.2.tgz"; + name = "detective-2.1.2.tgz"; + sha1 = "d22ad9f18c82efb3f55fee2e244883da6bbb8e37"; + }) + ]; + buildInputs = + (self.nativeDeps."detective" or []); + deps = { + "esprima-1.0.2" = self.by-version."esprima"."1.0.2"; + "escodegen-0.0.15" = self.by-version."escodegen"."0.0.15"; + }; + peerDependencies = [ + ]; + passthru.names = [ "detective" ]; + }; + by-spec."detective"."~3.1.0" = self.by-version."detective"."3.1.0"; by-version."detective"."3.1.0" = lib.makeOverridable self.buildNodePackage { name = "detective-3.1.0"; @@ -4952,7 +7268,7 @@ ]; passthru.names = [ "diff" ]; }; - by-spec."diff"."~1.0.3" = + by-spec."diff"."1.0.8" = self.by-version."diff"."1.0.8"; by-version."diff"."1.0.8" = lib.makeOverridable self.buildNodePackage { name = "diff-1.0.8"; @@ -4974,25 +7290,29 @@ }; by-spec."diff"."~1.0.7" = self.by-version."diff"."1.0.8"; - by-spec."director"."1.1.10" = - self.by-version."director"."1.1.10"; - by-version."director"."1.1.10" = lib.makeOverridable self.buildNodePackage { - name = "director-1.1.10"; + by-spec."diff"."~1.0.8" = + self.by-version."diff"."1.0.8"; + by-spec."diffie-hellman"."2.2.0" = + self.by-version."diffie-hellman"."2.2.0"; + by-version."diffie-hellman"."2.2.0" = lib.makeOverridable self.buildNodePackage { + name = "diffie-hellman-2.2.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/director/-/director-1.1.10.tgz"; - name = "director-1.1.10.tgz"; - sha1 = "e6c1d64f2f079216f19ea83b566035dde9901179"; + url = "http://registry.npmjs.org/diffie-hellman/-/diffie-hellman-2.2.0.tgz"; + name = "diffie-hellman-2.2.0.tgz"; + sha1 = "8072c466fbfb68e7898a84c56e53bc4e71a4c2e2"; }) ]; buildInputs = - (self.nativeDeps."director" or []); + (self.nativeDeps."diffie-hellman" or []); deps = { + "bn.js-0.15.2" = self.by-version."bn.js"."0.15.2"; + "miller-rabin-1.1.1" = self.by-version."miller-rabin"."1.1.1"; }; peerDependencies = [ ]; - passthru.names = [ "director" ]; + passthru.names = [ "diffie-hellman" ]; }; by-spec."director"."1.2.3" = self.by-version."director"."1.2.3"; @@ -5030,22 +7350,22 @@ (self.nativeDeps."dkim-signer" or []); deps = { "punycode-1.2.4" = self.by-version."punycode"."1.2.4"; - "mimelib-0.2.17" = self.by-version."mimelib"."0.2.17"; + "mimelib-0.2.18" = self.by-version."mimelib"."0.2.18"; }; peerDependencies = [ ]; passthru.names = [ "dkim-signer" ]; }; by-spec."domain-browser"."~1.1.0" = - self.by-version."domain-browser"."1.1.2"; - by-version."domain-browser"."1.1.2" = lib.makeOverridable self.buildNodePackage { - name = "domain-browser-1.1.2"; + self.by-version."domain-browser"."1.1.3"; + by-version."domain-browser"."1.1.3" = lib.makeOverridable self.buildNodePackage { + name = "domain-browser-1.1.3"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/domain-browser/-/domain-browser-1.1.2.tgz"; - name = "domain-browser-1.1.2.tgz"; - sha1 = "5a21f30a29a9891533915061426974dc2f14e56b"; + url = "http://registry.npmjs.org/domain-browser/-/domain-browser-1.1.3.tgz"; + name = "domain-browser-1.1.3.tgz"; + sha1 = "ee8b336f1c53dc990b302eac12b4c7fee24923c1"; }) ]; buildInputs = @@ -5057,15 +7377,15 @@ passthru.names = [ "domain-browser" ]; }; by-spec."domelementtype"."1" = - self.by-version."domelementtype"."1.1.1"; - by-version."domelementtype"."1.1.1" = lib.makeOverridable self.buildNodePackage { - name = "domelementtype-1.1.1"; + self.by-version."domelementtype"."1.1.3"; + by-version."domelementtype"."1.1.3" = lib.makeOverridable self.buildNodePackage { + name = "domelementtype-1.1.3"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/domelementtype/-/domelementtype-1.1.1.tgz"; - name = "domelementtype-1.1.1.tgz"; - sha1 = "7887acbda7614bb0a3dbe1b5e394f77a8ed297cf"; + url = "http://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz"; + name = "domelementtype-1.1.3.tgz"; + sha1 = "bd28773e2642881aec51544924299c5cd822185b"; }) ]; buildInputs = @@ -5076,22 +7396,22 @@ ]; passthru.names = [ "domelementtype" ]; }; - by-spec."domhandler"."2.2" = - self.by-version."domhandler"."2.2.0"; - by-version."domhandler"."2.2.0" = lib.makeOverridable self.buildNodePackage { - name = "domhandler-2.2.0"; + by-spec."domhandler"."2.3" = + self.by-version."domhandler"."2.3.0"; + by-version."domhandler"."2.3.0" = lib.makeOverridable self.buildNodePackage { + name = "domhandler-2.3.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/domhandler/-/domhandler-2.2.0.tgz"; - name = "domhandler-2.2.0.tgz"; - sha1 = "ac9febfa988034b43f78ba056ebf7bd373416476"; + url = "http://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz"; + name = "domhandler-2.3.0.tgz"; + sha1 = "2de59a0822d5027fabff6f032c2b25a2a8abe738"; }) ]; buildInputs = (self.nativeDeps."domhandler" or []); deps = { - "domelementtype-1.1.1" = self.by-version."domelementtype"."1.1.1"; + "domelementtype-1.1.3" = self.by-version."domelementtype"."1.1.3"; }; peerDependencies = [ ]; @@ -5112,7 +7432,7 @@ buildInputs = (self.nativeDeps."domutils" or []); deps = { - "domelementtype-1.1.1" = self.by-version."domelementtype"."1.1.1"; + "domelementtype-1.1.3" = self.by-version."domelementtype"."1.1.3"; }; peerDependencies = [ ]; @@ -5203,6 +7523,46 @@ }; by-spec."duplexer2"."~0.0.2" = self.by-version."duplexer2"."0.0.2"; + by-spec."editor"."0.0.4" = + self.by-version."editor"."0.0.4"; + by-version."editor"."0.0.4" = lib.makeOverridable self.buildNodePackage { + name = "editor-0.0.4"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/editor/-/editor-0.0.4.tgz"; + name = "editor-0.0.4.tgz"; + sha1 = "478920f77bca6c1c1749d5e3edde4bd5966efda8"; + }) + ]; + buildInputs = + (self.nativeDeps."editor" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "editor" ]; + }; + by-spec."editor"."0.0.5" = + self.by-version."editor"."0.0.5"; + by-version."editor"."0.0.5" = lib.makeOverridable self.buildNodePackage { + name = "editor-0.0.5"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/editor/-/editor-0.0.5.tgz"; + name = "editor-0.0.5.tgz"; + sha1 = "8c38877781f2547011c1aeffdbe50cafcc59794a"; + }) + ]; + buildInputs = + (self.nativeDeps."editor" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "editor" ]; + }; by-spec."editor"."~0.1.0" = self.by-version."editor"."0.1.0"; by-version."editor"."0.1.0" = lib.makeOverridable self.buildNodePackage { @@ -5243,6 +7603,26 @@ ]; passthru.names = [ "ee-first" ]; }; + by-spec."ee-first"."1.1.0" = + self.by-version."ee-first"."1.1.0"; + by-version."ee-first"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "ee-first-1.1.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz"; + name = "ee-first-1.1.0.tgz"; + sha1 = "6a0d7c6221e490feefd92ec3f441c9ce8cd097f4"; + }) + ]; + buildInputs = + (self.nativeDeps."ee-first" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "ee-first" ]; + }; by-spec."ejs"."0.8.3" = self.by-version."ejs"."0.8.3"; by-version."ejs"."0.8.3" = lib.makeOverridable self.buildNodePackage { @@ -5263,47 +7643,93 @@ ]; passthru.names = [ "ejs" ]; }; - by-spec."emitter-component"."0.0.6" = - self.by-version."emitter-component"."0.0.6"; - by-version."emitter-component"."0.0.6" = lib.makeOverridable self.buildNodePackage { - name = "emitter-component-0.0.6"; + by-spec."elementtree"."0.1.5" = + self.by-version."elementtree"."0.1.5"; + by-version."elementtree"."0.1.5" = lib.makeOverridable self.buildNodePackage { + name = "elementtree-0.1.5"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/emitter-component/-/emitter-component-0.0.6.tgz"; - name = "emitter-component-0.0.6.tgz"; - sha1 = "c155d82f6d0c01b5bee856d58074a4cc59795bca"; + url = "http://registry.npmjs.org/elementtree/-/elementtree-0.1.5.tgz"; + name = "elementtree-0.1.5.tgz"; + sha1 = "8d5fd80440b4be806c4a01b63914b40e0daab9ff"; }) ]; buildInputs = - (self.nativeDeps."emitter-component" or []); + (self.nativeDeps."elementtree" or []); deps = { + "sax-0.3.5" = self.by-version."sax"."0.3.5"; }; peerDependencies = [ ]; - passthru.names = [ "emitter-component" ]; + passthru.names = [ "elementtree" ]; + }; + by-spec."elliptic"."^0.15.14" = + self.by-version."elliptic"."0.15.15"; + by-version."elliptic"."0.15.15" = lib.makeOverridable self.buildNodePackage { + name = "elliptic-0.15.15"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/elliptic/-/elliptic-0.15.15.tgz"; + name = "elliptic-0.15.15.tgz"; + sha1 = "63269184a856d6e00871e84f37a8401ff84e4aea"; + }) + ]; + buildInputs = + (self.nativeDeps."elliptic" or []); + deps = { + "bn.js-0.15.2" = self.by-version."bn.js"."0.15.2"; + "brorand-1.0.5" = self.by-version."brorand"."1.0.5"; + "hash.js-0.2.1" = self.by-version."hash.js"."0.2.1"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "elliptic" ]; }; by-spec."encoding"."~0.1.7" = - self.by-version."encoding"."0.1.8"; - by-version."encoding"."0.1.8" = lib.makeOverridable self.buildNodePackage { - name = "encoding-0.1.8"; + self.by-version."encoding"."0.1.11"; + by-version."encoding"."0.1.11" = lib.makeOverridable self.buildNodePackage { + name = "encoding-0.1.11"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/encoding/-/encoding-0.1.8.tgz"; - name = "encoding-0.1.8.tgz"; - sha1 = "3c48d355f6f4da0545de88c6f2673ccf70df11e7"; + url = "http://registry.npmjs.org/encoding/-/encoding-0.1.11.tgz"; + name = "encoding-0.1.11.tgz"; + sha1 = "52c65ac15aab467f1338451e2615f988eccc0258"; }) ]; buildInputs = (self.nativeDeps."encoding" or []); deps = { - "iconv-lite-0.4.4" = self.by-version."iconv-lite"."0.4.4"; + "iconv-lite-0.4.5" = self.by-version."iconv-lite"."0.4.5"; }; peerDependencies = [ ]; passthru.names = [ "encoding" ]; }; + by-spec."end-of-stream"."^0.1.4" = + self.by-version."end-of-stream"."0.1.5"; + by-version."end-of-stream"."0.1.5" = lib.makeOverridable self.buildNodePackage { + name = "end-of-stream-0.1.5"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz"; + name = "end-of-stream-0.1.5.tgz"; + sha1 = "8e177206c3c80837d85632e8b9359dfe8b2f6eaf"; + }) + ]; + buildInputs = + (self.nativeDeps."end-of-stream" or []); + deps = { + "once-1.3.1" = self.by-version."once"."1.3.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "end-of-stream" ]; + }; by-spec."end-of-stream"."^1.0.0" = self.by-version."end-of-stream"."1.1.0"; by-version."end-of-stream"."1.1.0" = lib.makeOverridable self.buildNodePackage { @@ -5327,14 +7753,16 @@ }; by-spec."end-of-stream"."~0.1.5" = self.by-version."end-of-stream"."0.1.5"; - by-version."end-of-stream"."0.1.5" = lib.makeOverridable self.buildNodePackage { - name = "end-of-stream-0.1.5"; + by-spec."end-of-stream"."~1.0.0" = + self.by-version."end-of-stream"."1.0.0"; + by-version."end-of-stream"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "end-of-stream-1.0.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz"; - name = "end-of-stream-0.1.5.tgz"; - sha1 = "8e177206c3c80837d85632e8b9359dfe8b2f6eaf"; + url = "http://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz"; + name = "end-of-stream-1.0.0.tgz"; + sha1 = "d4596e702734a93e40e9af864319eabd99ff2f0e"; }) ]; buildInputs = @@ -5366,52 +7794,167 @@ ]; passthru.names = [ "entities" ]; }; - by-spec."envify"."^2.0.0" = - self.by-version."envify"."2.0.1"; - by-version."envify"."2.0.1" = lib.makeOverridable self.buildNodePackage { - name = "envify-2.0.1"; + by-spec."envify"."^3.0.0" = + self.by-version."envify"."3.2.0"; + by-version."envify"."3.2.0" = lib.makeOverridable self.buildNodePackage { + name = "envify-3.2.0"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/envify/-/envify-2.0.1.tgz"; - name = "envify-2.0.1.tgz"; - sha1 = "abab827e063efd8e6f4d485aa82b66688dd056b2"; + url = "http://registry.npmjs.org/envify/-/envify-3.2.0.tgz"; + name = "envify-3.2.0.tgz"; + sha1 = "dda33c49ce4cc20efd1fda60dab9dd317c38ef7c"; }) ]; buildInputs = (self.nativeDeps."envify" or []); deps = { - "xtend-2.1.2" = self.by-version."xtend"."2.1.2"; "through-2.3.6" = self.by-version."through"."2.3.6"; - "esprima-fb-3001.1.0-dev-harmony-fb" = self.by-version."esprima-fb"."3001.1.0-dev-harmony-fb"; - "jstransform-3.0.0" = self.by-version."jstransform"."3.0.0"; + "jstransform-7.0.0" = self.by-version."jstransform"."7.0.0"; }; peerDependencies = [ ]; passthru.names = [ "envify" ]; }; - by-spec."errorhandler"."~1.2.0" = - self.by-version."errorhandler"."1.2.0"; - by-version."errorhandler"."1.2.0" = lib.makeOverridable self.buildNodePackage { - name = "errorhandler-1.2.0"; + by-spec."errorhandler"."1.0.0" = + self.by-version."errorhandler"."1.0.0"; + by-version."errorhandler"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "errorhandler-1.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/errorhandler/-/errorhandler-1.0.0.tgz"; + name = "errorhandler-1.0.0.tgz"; + sha1 = "d74b37e8dc38c99afb3f5a79edcebaea022d042a"; + }) + ]; + buildInputs = + (self.nativeDeps."errorhandler" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "errorhandler" ]; + }; + by-spec."errorhandler"."~1.2.2" = + self.by-version."errorhandler"."1.2.3"; + by-version."errorhandler"."1.2.3" = lib.makeOverridable self.buildNodePackage { + name = "errorhandler-1.2.3"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/errorhandler/-/errorhandler-1.2.0.tgz"; - name = "errorhandler-1.2.0.tgz"; - sha1 = "2f89db72c150580c65e8dd5180504f5b8a398bd9"; + url = "http://registry.npmjs.org/errorhandler/-/errorhandler-1.2.3.tgz"; + name = "errorhandler-1.2.3.tgz"; + sha1 = "913bcc8cd1f10b6caeab4b38c1bc71fa3884ea52"; }) ]; buildInputs = (self.nativeDeps."errorhandler" or []); deps = { - "accepts-1.1.1" = self.by-version."accepts"."1.1.1"; + "accepts-1.1.3" = self.by-version."accepts"."1.1.3"; "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; }; peerDependencies = [ ]; passthru.names = [ "errorhandler" ]; }; + by-spec."errorhandler"."~1.2.3" = + self.by-version."errorhandler"."1.2.3"; + by-spec."es5-ext"."~0.10.2" = + self.by-version."es5-ext"."0.10.4"; + by-version."es5-ext"."0.10.4" = lib.makeOverridable self.buildNodePackage { + name = "es5-ext-0.10.4"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/es5-ext/-/es5-ext-0.10.4.tgz"; + name = "es5-ext-0.10.4.tgz"; + sha1 = "f4d7d85d45acfbe93379d4c0948fbae6466ec876"; + }) + ]; + buildInputs = + (self.nativeDeps."es5-ext" or []); + deps = { + "es6-iterator-0.1.2" = self.by-version."es6-iterator"."0.1.2"; + "es6-symbol-0.1.1" = self.by-version."es6-symbol"."0.1.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "es5-ext" ]; + }; + by-spec."es5-ext"."~0.10.4" = + self.by-version."es5-ext"."0.10.4"; + by-spec."es6-iterator"."~0.1.1" = + self.by-version."es6-iterator"."0.1.2"; + by-version."es6-iterator"."0.1.2" = lib.makeOverridable self.buildNodePackage { + name = "es6-iterator-0.1.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/es6-iterator/-/es6-iterator-0.1.2.tgz"; + name = "es6-iterator-0.1.2.tgz"; + sha1 = "a37429ead74e5c9ed95068b0dc904c568d9a9b6a"; + }) + ]; + buildInputs = + (self.nativeDeps."es6-iterator" or []); + deps = { + "d-0.1.1" = self.by-version."d"."0.1.1"; + "es5-ext-0.10.4" = self.by-version."es5-ext"."0.10.4"; + "es6-symbol-0.1.1" = self.by-version."es6-symbol"."0.1.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "es6-iterator" ]; + }; + by-spec."es6-symbol"."0.1.x" = + self.by-version."es6-symbol"."0.1.1"; + by-version."es6-symbol"."0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "es6-symbol-0.1.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/es6-symbol/-/es6-symbol-0.1.1.tgz"; + name = "es6-symbol-0.1.1.tgz"; + sha1 = "9cf7fab2edaff1b1da8fe8e68bfe3f5aca6ca218"; + }) + ]; + buildInputs = + (self.nativeDeps."es6-symbol" or []); + deps = { + "d-0.1.1" = self.by-version."d"."0.1.1"; + "es5-ext-0.10.4" = self.by-version."es5-ext"."0.10.4"; + }; + peerDependencies = [ + ]; + passthru.names = [ "es6-symbol" ]; + }; + by-spec."es6-symbol"."~0.1.1" = + self.by-version."es6-symbol"."0.1.1"; + by-spec."es6-weak-map"."~0.1.2" = + self.by-version."es6-weak-map"."0.1.2"; + by-version."es6-weak-map"."0.1.2" = lib.makeOverridable self.buildNodePackage { + name = "es6-weak-map-0.1.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/es6-weak-map/-/es6-weak-map-0.1.2.tgz"; + name = "es6-weak-map-0.1.2.tgz"; + sha1 = "bc5b5fab73f68f6f77a6b39c481fce3d7856d385"; + }) + ]; + buildInputs = + (self.nativeDeps."es6-weak-map" or []); + deps = { + "d-0.1.1" = self.by-version."d"."0.1.1"; + "es5-ext-0.10.4" = self.by-version."es5-ext"."0.10.4"; + "es6-iterator-0.1.2" = self.by-version."es6-iterator"."0.1.2"; + "es6-symbol-0.1.1" = self.by-version."es6-symbol"."0.1.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "es6-weak-map" ]; + }; by-spec."escape-html"."*" = self.by-version."escape-html"."1.0.1"; by-version."escape-html"."1.0.1" = lib.makeOverridable self.buildNodePackage { @@ -5435,7 +7978,7 @@ "escape-html" = self.by-version."escape-html"."1.0.1"; by-spec."escape-html"."1.0.1" = self.by-version."escape-html"."1.0.1"; - by-spec."escape-string-regexp"."^1.0.0" = + by-spec."escape-string-regexp"."1.0.2" = self.by-version."escape-string-regexp"."1.0.2"; by-version."escape-string-regexp"."1.0.2" = lib.makeOverridable self.buildNodePackage { name = "escape-string-regexp-1.0.2"; @@ -5455,6 +7998,53 @@ ]; passthru.names = [ "escape-string-regexp" ]; }; + by-spec."escape-string-regexp"."^1.0.0" = + self.by-version."escape-string-regexp"."1.0.2"; + by-spec."escodegen"."0.0.15" = + self.by-version."escodegen"."0.0.15"; + by-version."escodegen"."0.0.15" = lib.makeOverridable self.buildNodePackage { + name = "escodegen-0.0.15"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/escodegen/-/escodegen-0.0.15.tgz"; + name = "escodegen-0.0.15.tgz"; + sha1 = "ffda9cb26b70b34f7cc19f1d88756539afb543bd"; + }) + ]; + buildInputs = + (self.nativeDeps."escodegen" or []); + deps = { + "esprima-1.2.2" = self.by-version."esprima"."1.2.2"; + "source-map-0.1.40" = self.by-version."source-map"."0.1.40"; + }; + peerDependencies = [ + ]; + passthru.names = [ "escodegen" ]; + }; + by-spec."escodegen"."0.0.17" = + self.by-version."escodegen"."0.0.17"; + by-version."escodegen"."0.0.17" = lib.makeOverridable self.buildNodePackage { + name = "escodegen-0.0.17"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/escodegen/-/escodegen-0.0.17.tgz"; + name = "escodegen-0.0.17.tgz"; + sha1 = "1e78d17df1004fd7a88f2fed3b8b8592f3217f9c"; + }) + ]; + buildInputs = + (self.nativeDeps."escodegen" or []); + deps = { + "esprima-1.0.4" = self.by-version."esprima"."1.0.4"; + "estraverse-0.0.4" = self.by-version."estraverse"."0.0.4"; + "source-map-0.1.40" = self.by-version."source-map"."0.1.40"; + }; + peerDependencies = [ + ]; + passthru.names = [ "escodegen" ]; + }; by-spec."escodegen"."1.3.x" = self.by-version."escodegen"."1.3.3"; by-version."escodegen"."1.3.3" = lib.makeOverridable self.buildNodePackage { @@ -5479,31 +8069,30 @@ ]; passthru.names = [ "escodegen" ]; }; - by-spec."escodegen"."~ 0.0.28" = - self.by-version."escodegen"."0.0.28"; - by-version."escodegen"."0.0.28" = lib.makeOverridable self.buildNodePackage { - name = "escodegen-0.0.28"; + by-spec."escodegen"."^1.4.1" = + self.by-version."escodegen"."1.4.1"; + by-version."escodegen"."1.4.1" = lib.makeOverridable self.buildNodePackage { + name = "escodegen-1.4.1"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/escodegen/-/escodegen-0.0.28.tgz"; - name = "escodegen-0.0.28.tgz"; - sha1 = "0e4ff1715f328775d6cab51ac44a406cd7abffd3"; + url = "http://registry.npmjs.org/escodegen/-/escodegen-1.4.1.tgz"; + name = "escodegen-1.4.1.tgz"; + sha1 = "8c2562ff45da348975953e8c0a57f40848962ec7"; }) ]; buildInputs = (self.nativeDeps."escodegen" or []); deps = { - "esprima-1.0.4" = self.by-version."esprima"."1.0.4"; - "estraverse-1.3.2" = self.by-version."estraverse"."1.3.2"; + "estraverse-1.8.0" = self.by-version."estraverse"."1.8.0"; + "esutils-1.1.6" = self.by-version."esutils"."1.1.6"; + "esprima-1.2.2" = self.by-version."esprima"."1.2.2"; "source-map-0.1.40" = self.by-version."source-map"."0.1.40"; }; peerDependencies = [ ]; passthru.names = [ "escodegen" ]; }; - by-spec."escodegen"."~0.0.24" = - self.by-version."escodegen"."0.0.28"; by-spec."escodegen"."~1.1.0" = self.by-version."escodegen"."1.1.0"; by-version."escodegen"."1.1.0" = lib.makeOverridable self.buildNodePackage { @@ -5528,53 +8117,46 @@ ]; passthru.names = [ "escodegen" ]; }; - by-spec."escope"."~ 1.0.0" = - self.by-version."escope"."1.0.1"; - by-version."escope"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "escope-1.0.1"; + by-spec."escope"."~0.0.13" = + self.by-version."escope"."0.0.16"; + by-version."escope"."0.0.16" = lib.makeOverridable self.buildNodePackage { + name = "escope-0.0.16"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/escope/-/escope-1.0.1.tgz"; - name = "escope-1.0.1.tgz"; - sha1 = "59b04cdccb76555608499ed13502b9028fe73dd8"; + url = "http://registry.npmjs.org/escope/-/escope-0.0.16.tgz"; + name = "escope-0.0.16.tgz"; + sha1 = "418c7a0afca721dafe659193fd986283e746538f"; }) ]; buildInputs = (self.nativeDeps."escope" or []); deps = { - "estraverse-1.5.1" = self.by-version."estraverse"."1.5.1"; + "estraverse-1.8.0" = self.by-version."estraverse"."1.8.0"; }; peerDependencies = [ ]; passthru.names = [ "escope" ]; }; - by-spec."esmangle"."~0.0.8" = - self.by-version."esmangle"."0.0.17"; - by-version."esmangle"."0.0.17" = lib.makeOverridable self.buildNodePackage { - name = "esmangle-0.0.17"; + by-spec."esprima"."1.0.2" = + self.by-version."esprima"."1.0.2"; + by-version."esprima"."1.0.2" = lib.makeOverridable self.buildNodePackage { + name = "esprima-1.0.2"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/esmangle/-/esmangle-0.0.17.tgz"; - name = "esmangle-0.0.17.tgz"; - sha1 = "4c5c93607cde5d1276bad396e836229dba68d90c"; + url = "http://registry.npmjs.org/esprima/-/esprima-1.0.2.tgz"; + name = "esprima-1.0.2.tgz"; + sha1 = "8039bf9ceac4d9d2c15f623264fb292b5502ceaf"; }) ]; buildInputs = - (self.nativeDeps."esmangle" or []); + (self.nativeDeps."esprima" or []); deps = { - "esprima-1.0.4" = self.by-version."esprima"."1.0.4"; - "escope-1.0.1" = self.by-version."escope"."1.0.1"; - "escodegen-0.0.28" = self.by-version."escodegen"."0.0.28"; - "estraverse-1.3.2" = self.by-version."estraverse"."1.3.2"; - "source-map-0.1.40" = self.by-version."source-map"."0.1.40"; - "esshorten-0.0.2" = self.by-version."esshorten"."0.0.2"; - "optimist-0.6.1" = self.by-version."optimist"."0.6.1"; }; peerDependencies = [ ]; - passthru.names = [ "esmangle" ]; + passthru.names = [ "esprima" ]; }; by-spec."esprima"."1.2.x" = self.by-version."esprima"."1.2.2"; @@ -5596,6 +8178,10 @@ ]; passthru.names = [ "esprima" ]; }; + by-spec."esprima".">= 1.0.0" = + self.by-version."esprima"."1.2.2"; + by-spec."esprima"."^1.2.2" = + self.by-version."esprima"."1.2.2"; by-spec."esprima"."~ 1.0.2" = self.by-version."esprima"."1.0.4"; by-version."esprima"."1.0.4" = lib.makeOverridable self.buildNodePackage { @@ -5616,6 +8202,26 @@ ]; passthru.names = [ "esprima" ]; }; + by-spec."esprima"."~0.9.9" = + self.by-version."esprima"."0.9.9"; + by-version."esprima"."0.9.9" = lib.makeOverridable self.buildNodePackage { + name = "esprima-0.9.9"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/esprima/-/esprima-0.9.9.tgz"; + name = "esprima-0.9.9.tgz"; + sha1 = "1b90925c975d632d7282939c3bb9c3a423c30490"; + }) + ]; + buildInputs = + (self.nativeDeps."esprima" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "esprima" ]; + }; by-spec."esprima"."~1.0.2" = self.by-version."esprima"."1.0.4"; by-spec."esprima"."~1.0.4" = @@ -5660,40 +8266,83 @@ ]; passthru.names = [ "esprima-fb" ]; }; - by-spec."esprima-fb"."~3001.1.0-dev-harmony-fb" = + by-spec."esprima-fb"."^3001.1.0-dev-harmony-fb" = self.by-version."esprima-fb"."3001.1.0-dev-harmony-fb"; - by-spec."esshorten"."~ 0.0.2" = - self.by-version."esshorten"."0.0.2"; - by-version."esshorten"."0.0.2" = lib.makeOverridable self.buildNodePackage { - name = "esshorten-0.0.2"; + by-spec."esprima-fb"."~7001.0001.0000-dev-harmony-fb" = + self.by-version."esprima-fb"."7001.1.0-dev-harmony-fb"; + by-version."esprima-fb"."7001.1.0-dev-harmony-fb" = lib.makeOverridable self.buildNodePackage { + name = "esprima-fb-7001.1.0-dev-harmony-fb"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/esprima-fb/-/esprima-fb-7001.1.0-dev-harmony-fb.tgz"; + name = "esprima-fb-7001.1.0-dev-harmony-fb.tgz"; + sha1 = "907e20919575a667dd1b42335de00cf6646d77b3"; + }) + ]; + buildInputs = + (self.nativeDeps."esprima-fb" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "esprima-fb" ]; + }; + by-spec."esprima-six"."0.0.3" = + self.by-version."esprima-six"."0.0.3"; + by-version."esprima-six"."0.0.3" = lib.makeOverridable self.buildNodePackage { + name = "esprima-six-0.0.3"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/esprima-six/-/esprima-six-0.0.3.tgz"; + name = "esprima-six-0.0.3.tgz"; + sha1 = "8eb750435b02d3e50cf09b5736cbce4606a4399f"; + }) + ]; + buildInputs = + (self.nativeDeps."esprima-six" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "esprima-six" ]; + }; + by-spec."esprima-six"."~0.0.3" = + self.by-version."esprima-six"."0.0.3"; + by-spec."esrefactor"."~0.1.0" = + self.by-version."esrefactor"."0.1.0"; + by-version."esrefactor"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "esrefactor-0.1.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/esshorten/-/esshorten-0.0.2.tgz"; - name = "esshorten-0.0.2.tgz"; - sha1 = "28a652f1efd40c8e227f8c6de7dbe6b560ee8129"; + url = "http://registry.npmjs.org/esrefactor/-/esrefactor-0.1.0.tgz"; + name = "esrefactor-0.1.0.tgz"; + sha1 = "d142795a282339ab81e936b5b7a21b11bf197b13"; }) ]; buildInputs = - (self.nativeDeps."esshorten" or []); + (self.nativeDeps."esrefactor" or []); deps = { - "escope-1.0.1" = self.by-version."escope"."1.0.1"; - "estraverse-1.2.0" = self.by-version."estraverse"."1.2.0"; + "esprima-1.0.4" = self.by-version."esprima"."1.0.4"; + "estraverse-0.0.4" = self.by-version."estraverse"."0.0.4"; + "escope-0.0.16" = self.by-version."escope"."0.0.16"; }; peerDependencies = [ ]; - passthru.names = [ "esshorten" ]; + passthru.names = [ "esrefactor" ]; }; by-spec."estraverse".">= 0.0.2" = - self.by-version."estraverse"."1.5.1"; - by-version."estraverse"."1.5.1" = lib.makeOverridable self.buildNodePackage { - name = "estraverse-1.5.1"; + self.by-version."estraverse"."1.8.0"; + by-version."estraverse"."1.8.0" = lib.makeOverridable self.buildNodePackage { + name = "estraverse-1.8.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz"; - name = "estraverse-1.5.1.tgz"; - sha1 = "867a3e8e58a9f84618afb6c2ddbcd916b7cbaf71"; + url = "http://registry.npmjs.org/estraverse/-/estraverse-1.8.0.tgz"; + name = "estraverse-1.8.0.tgz"; + sha1 = "3f1264fb62c8500dbae5e4f73705cd576d6af428"; }) ]; buildInputs = @@ -5704,16 +8353,18 @@ ]; passthru.names = [ "estraverse" ]; }; - by-spec."estraverse"."~ 1.2.0" = - self.by-version."estraverse"."1.2.0"; - by-version."estraverse"."1.2.0" = lib.makeOverridable self.buildNodePackage { - name = "estraverse-1.2.0"; + by-spec."estraverse"."^1.5.1" = + self.by-version."estraverse"."1.8.0"; + by-spec."estraverse"."~0.0.4" = + self.by-version."estraverse"."0.0.4"; + by-version."estraverse"."0.0.4" = lib.makeOverridable self.buildNodePackage { + name = "estraverse-0.0.4"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/estraverse/-/estraverse-1.2.0.tgz"; - name = "estraverse-1.2.0.tgz"; - sha1 = "6a3dc8a46a5d6766e5668639fc782976ce5660fd"; + url = "http://registry.npmjs.org/estraverse/-/estraverse-0.0.4.tgz"; + name = "estraverse-0.0.4.tgz"; + sha1 = "01a0932dfee574684a598af5a67c3bf9b6428db2"; }) ]; buildInputs = @@ -5724,16 +8375,16 @@ ]; passthru.names = [ "estraverse" ]; }; - by-spec."estraverse"."~ 1.3.2" = - self.by-version."estraverse"."1.3.2"; - by-version."estraverse"."1.3.2" = lib.makeOverridable self.buildNodePackage { - name = "estraverse-1.3.2"; + by-spec."estraverse"."~1.5.0" = + self.by-version."estraverse"."1.5.1"; + by-version."estraverse"."1.5.1" = lib.makeOverridable self.buildNodePackage { + name = "estraverse-1.5.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/estraverse/-/estraverse-1.3.2.tgz"; - name = "estraverse-1.3.2.tgz"; - sha1 = "37c2b893ef13d723f276d878d60d8535152a6c42"; + url = "http://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz"; + name = "estraverse-1.5.1.tgz"; + sha1 = "867a3e8e58a9f84618afb6c2ddbcd916b7cbaf71"; }) ]; buildInputs = @@ -5744,10 +8395,28 @@ ]; passthru.names = [ "estraverse" ]; }; - by-spec."estraverse"."~1.3.0" = - self.by-version."estraverse"."1.3.2"; - by-spec."estraverse"."~1.5.0" = - self.by-version."estraverse"."1.5.1"; + by-spec."estraverse"."~1.8.0" = + self.by-version."estraverse"."1.8.0"; + by-spec."esutils"."^1.1.4" = + self.by-version."esutils"."1.1.6"; + by-version."esutils"."1.1.6" = lib.makeOverridable self.buildNodePackage { + name = "esutils-1.1.6"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/esutils/-/esutils-1.1.6.tgz"; + name = "esutils-1.1.6.tgz"; + sha1 = "c01ccaa9ae4b897c6d0c3e210ae52f3c7a844375"; + }) + ]; + buildInputs = + (self.nativeDeps."esutils" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "esutils" ]; + }; by-spec."esutils"."~1.0.0" = self.by-version."esutils"."1.0.0"; by-version."esutils"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -5789,46 +8458,71 @@ ]; passthru.names = [ "etag" ]; }; - by-spec."event-stream"."~0.5" = - self.by-version."event-stream"."0.5.3"; - by-version."event-stream"."0.5.3" = lib.makeOverridable self.buildNodePackage { - name = "event-stream-0.5.3"; + by-spec."etag"."~1.5.0" = + self.by-version."etag"."1.5.1"; + by-version."etag"."1.5.1" = lib.makeOverridable self.buildNodePackage { + name = "etag-1.5.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/event-stream/-/event-stream-0.5.3.tgz"; - name = "event-stream-0.5.3.tgz"; - sha1 = "b77b9309f7107addfeab63f0c0eafd8db0bd8c1c"; + url = "http://registry.npmjs.org/etag/-/etag-1.5.1.tgz"; + name = "etag-1.5.1.tgz"; + sha1 = "54c50de04ee42695562925ac566588291be7e9ea"; }) ]; buildInputs = - (self.nativeDeps."event-stream" or []); + (self.nativeDeps."etag" or []); deps = { - "optimist-0.2.8" = self.by-version."optimist"."0.2.8"; + "crc-3.2.1" = self.by-version."crc"."3.2.1"; }; peerDependencies = [ ]; - passthru.names = [ "event-stream" ]; + passthru.names = [ "etag" ]; }; - by-spec."eventemitter2"."0.4.12" = - self.by-version."eventemitter2"."0.4.12"; - by-version."eventemitter2"."0.4.12" = lib.makeOverridable self.buildNodePackage { - name = "eventemitter2-0.4.12"; + by-spec."etag"."~1.5.1" = + self.by-version."etag"."1.5.1"; + by-spec."event-emitter"."~0.3.1" = + self.by-version."event-emitter"."0.3.1"; + by-version."event-emitter"."0.3.1" = lib.makeOverridable self.buildNodePackage { + name = "event-emitter-0.3.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.12.tgz"; - name = "eventemitter2-0.4.12.tgz"; - sha1 = "6cf14249fdc8799be7416e871e73fd2bb89e35e0"; + url = "http://registry.npmjs.org/event-emitter/-/event-emitter-0.3.1.tgz"; + name = "event-emitter-0.3.1.tgz"; + sha1 = "1425ca9c5649a1a31ba835bd9dba6bfad3880238"; }) ]; buildInputs = - (self.nativeDeps."eventemitter2" or []); + (self.nativeDeps."event-emitter" or []); deps = { + "es5-ext-0.10.4" = self.by-version."es5-ext"."0.10.4"; + "d-0.1.1" = self.by-version."d"."0.1.1"; }; peerDependencies = [ ]; - passthru.names = [ "eventemitter2" ]; + passthru.names = [ "event-emitter" ]; + }; + by-spec."event-stream"."~0.5" = + self.by-version."event-stream"."0.5.3"; + by-version."event-stream"."0.5.3" = lib.makeOverridable self.buildNodePackage { + name = "event-stream-0.5.3"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/event-stream/-/event-stream-0.5.3.tgz"; + name = "event-stream-0.5.3.tgz"; + sha1 = "b77b9309f7107addfeab63f0c0eafd8db0bd8c1c"; + }) + ]; + buildInputs = + (self.nativeDeps."event-stream" or []); + deps = { + "optimist-0.2.8" = self.by-version."optimist"."0.2.8"; + }; + peerDependencies = [ + ]; + passthru.names = [ "event-stream" ]; }; by-spec."eventemitter2"."0.4.14" = self.by-version."eventemitter2"."0.4.14"; @@ -5855,15 +8549,15 @@ by-spec."eventemitter2"."~0.4.13" = self.by-version."eventemitter2"."0.4.14"; by-spec."eventemitter3"."*" = - self.by-version."eventemitter3"."0.1.5"; - by-version."eventemitter3"."0.1.5" = lib.makeOverridable self.buildNodePackage { - name = "eventemitter3-0.1.5"; + self.by-version."eventemitter3"."0.1.6"; + by-version."eventemitter3"."0.1.6" = lib.makeOverridable self.buildNodePackage { + name = "eventemitter3-0.1.6"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/eventemitter3/-/eventemitter3-0.1.5.tgz"; - name = "eventemitter3-0.1.5.tgz"; - sha1 = "fbb0655172b87911ba782bb7175409c801e5059f"; + url = "http://registry.npmjs.org/eventemitter3/-/eventemitter3-0.1.6.tgz"; + name = "eventemitter3-0.1.6.tgz"; + sha1 = "8c7ac44b87baab55cd50c828dc38778eac052ea5"; }) ]; buildInputs = @@ -5937,7 +8631,7 @@ "node-swt-0.1.1" = self.by-version."node-swt"."0.1.1"; "node-wsfederation-0.1.1" = self.by-version."node-wsfederation"."0.1.1"; "debug-0.5.0" = self.by-version."debug"."0.5.0"; - "express-3.17.6" = self.by-version."express"."3.17.6"; + "express-3.18.4" = self.by-version."express"."3.18.4"; }; peerDependencies = [ ]; @@ -5968,39 +8662,40 @@ by-spec."exit"."~0.1.1" = self.by-version."exit"."0.1.2"; by-spec."express"."*" = - self.by-version."express"."4.9.5"; - by-version."express"."4.9.5" = lib.makeOverridable self.buildNodePackage { - name = "express-4.9.5"; + self.by-version."express"."5.0.0-alpha.1"; + by-version."express"."5.0.0-alpha.1" = lib.makeOverridable self.buildNodePackage { + name = "express-5.0.0-alpha.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/express/-/express-4.9.5.tgz"; - name = "express-4.9.5.tgz"; - sha1 = "7f62aa84ac8f5e96acfb98e2944dde0bf1cf8688"; + url = "http://registry.npmjs.org/express/-/express-5.0.0-alpha.1.tgz"; + name = "express-5.0.0-alpha.1.tgz"; + sha1 = "415df02c51ae01c221362fca59b03591d956b2d7"; }) ]; buildInputs = (self.nativeDeps."express" or []); deps = { - "accepts-1.1.1" = self.by-version."accepts"."1.1.1"; + "accepts-1.1.3" = self.by-version."accepts"."1.1.3"; + "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0"; "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5"; - "debug-2.0.0" = self.by-version."debug"."2.0.0"; - "depd-0.4.5" = self.by-version."depd"."0.4.5"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; + "depd-1.0.0" = self.by-version."depd"."1.0.0"; "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; - "etag-1.4.0" = self.by-version."etag"."1.4.0"; - "finalhandler-0.2.0" = self.by-version."finalhandler"."0.2.0"; + "etag-1.5.1" = self.by-version."etag"."1.5.1"; + "finalhandler-0.3.2" = self.by-version."finalhandler"."0.3.2"; "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0"; "methods-1.1.0" = self.by-version."methods"."1.1.0"; - "on-finished-2.1.0" = self.by-version."on-finished"."2.1.0"; + "on-finished-2.1.1" = self.by-version."on-finished"."2.1.1"; "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; "path-to-regexp-0.1.3" = self.by-version."path-to-regexp"."0.1.3"; - "proxy-addr-1.0.3" = self.by-version."proxy-addr"."1.0.3"; - "qs-2.2.4" = self.by-version."qs"."2.2.4"; + "proxy-addr-1.0.4" = self.by-version."proxy-addr"."1.0.4"; + "qs-2.3.2" = self.by-version."qs"."2.3.2"; "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; - "send-0.9.3" = self.by-version."send"."0.9.3"; - "serve-static-1.6.3" = self.by-version."serve-static"."1.6.3"; - "type-is-1.5.2" = self.by-version."type-is"."1.5.2"; + "send-0.10.1" = self.by-version."send"."0.10.1"; + "serve-static-1.7.1" = self.by-version."serve-static"."1.7.1"; + "type-is-1.5.3" = self.by-version."type-is"."1.5.3"; "vary-1.0.0" = self.by-version."vary"."1.0.0"; "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2"; @@ -6010,7 +8705,7 @@ ]; passthru.names = [ "express" ]; }; - "express" = self.by-version."express"."4.9.5"; + "express" = self.by-version."express"."5.0.0-alpha.1"; by-spec."express"."2.5.11" = self.by-version."express"."2.5.11"; by-version."express"."2.5.11" = lib.makeOverridable self.buildNodePackage { @@ -6055,12 +8750,12 @@ "range-parser-0.0.4" = self.by-version."range-parser"."0.0.4"; "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; "cookie-0.0.5" = self.by-version."cookie"."0.0.5"; - "buffer-crc32-0.2.3" = self.by-version."buffer-crc32"."0.2.3"; + "buffer-crc32-0.2.4" = self.by-version."buffer-crc32"."0.2.4"; "fresh-0.1.0" = self.by-version."fresh"."0.1.0"; "methods-0.0.1" = self.by-version."methods"."0.0.1"; "send-0.1.0" = self.by-version."send"."0.1.0"; "cookie-signature-1.0.1" = self.by-version."cookie-signature"."1.0.1"; - "debug-2.0.0" = self.by-version."debug"."2.0.0"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; }; peerDependencies = [ ]; @@ -6091,43 +8786,45 @@ "methods-0.1.0" = self.by-version."methods"."0.1.0"; "send-0.1.4" = self.by-version."send"."0.1.4"; "cookie-signature-1.0.1" = self.by-version."cookie-signature"."1.0.1"; - "debug-2.0.0" = self.by-version."debug"."2.0.0"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; }; peerDependencies = [ ]; passthru.names = [ "express" ]; }; by-spec."express"."3.x" = - self.by-version."express"."3.17.6"; - by-version."express"."3.17.6" = lib.makeOverridable self.buildNodePackage { - name = "express-3.17.6"; + self.by-version."express"."3.18.4"; + by-version."express"."3.18.4" = lib.makeOverridable self.buildNodePackage { + name = "express-3.18.4"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/express/-/express-3.17.6.tgz"; - name = "express-3.17.6.tgz"; - sha1 = "e2f9a6a48b85233afc4f7b6c5cd6799c53f5f46f"; + url = "http://registry.npmjs.org/express/-/express-3.18.4.tgz"; + name = "express-3.18.4.tgz"; + sha1 = "7b40ad2c10a987692ee97a387c21593011f03712"; }) ]; buildInputs = (self.nativeDeps."express" or []); deps = { "basic-auth-1.0.0" = self.by-version."basic-auth"."1.0.0"; - "connect-2.26.4" = self.by-version."connect"."2.26.4"; + "connect-2.27.4" = self.by-version."connect"."2.27.4"; + "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0"; "commander-1.3.2" = self.by-version."commander"."1.3.2"; "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5"; - "crc-3.0.0" = self.by-version."crc"."3.0.0"; - "debug-2.0.0" = self.by-version."debug"."2.0.0"; - "depd-0.4.5" = self.by-version."depd"."0.4.5"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; + "depd-1.0.0" = self.by-version."depd"."1.0.0"; "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; + "etag-1.5.1" = self.by-version."etag"."1.5.1"; "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0"; "methods-1.1.0" = self.by-version."methods"."1.1.0"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; - "proxy-addr-1.0.3" = self.by-version."proxy-addr"."1.0.3"; + "proxy-addr-1.0.4" = self.by-version."proxy-addr"."1.0.4"; "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; - "send-0.9.3" = self.by-version."send"."0.9.3"; + "send-0.10.1" = self.by-version."send"."0.10.1"; + "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; "vary-1.0.0" = self.by-version."vary"."1.0.0"; "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2"; @@ -6137,7 +8834,7 @@ passthru.names = [ "express" ]; }; by-spec."express".">=3.0.0" = - self.by-version."express"."4.9.5"; + self.by-version."express"."5.0.0-alpha.1"; by-spec."express"."~3.1.1" = self.by-version."express"."3.1.2"; by-version."express"."3.1.2" = lib.makeOverridable self.buildNodePackage { @@ -6158,12 +8855,44 @@ "range-parser-0.0.4" = self.by-version."range-parser"."0.0.4"; "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; "cookie-0.0.5" = self.by-version."cookie"."0.0.5"; - "buffer-crc32-0.2.3" = self.by-version."buffer-crc32"."0.2.3"; + "buffer-crc32-0.2.4" = self.by-version."buffer-crc32"."0.2.4"; "fresh-0.1.0" = self.by-version."fresh"."0.1.0"; "methods-0.0.1" = self.by-version."methods"."0.0.1"; "send-0.1.0" = self.by-version."send"."0.1.0"; "cookie-signature-1.0.0" = self.by-version."cookie-signature"."1.0.0"; - "debug-2.0.0" = self.by-version."debug"."2.0.0"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "express" ]; + }; + by-spec."express"."~3.5.1" = + self.by-version."express"."3.5.3"; + by-version."express"."3.5.3" = lib.makeOverridable self.buildNodePackage { + name = "express-3.5.3"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/express/-/express-3.5.3.tgz"; + name = "express-3.5.3.tgz"; + sha1 = "af440e1ddad078934ec78241420b40bbc56dc2ad"; + }) + ]; + buildInputs = + (self.nativeDeps."express" or []); + deps = { + "connect-2.14.5" = self.by-version."connect"."2.14.5"; + "commander-1.3.2" = self.by-version."commander"."1.3.2"; + "range-parser-1.0.0" = self.by-version."range-parser"."1.0.0"; + "mkdirp-0.4.0" = self.by-version."mkdirp"."0.4.0"; + "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; + "buffer-crc32-0.2.1" = self.by-version."buffer-crc32"."0.2.1"; + "fresh-0.2.2" = self.by-version."fresh"."0.2.2"; + "methods-0.1.0" = self.by-version."methods"."0.1.0"; + "send-0.3.0" = self.by-version."send"."0.3.0"; + "cookie-signature-1.0.3" = self.by-version."cookie-signature"."1.0.3"; + "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2"; + "debug-0.8.1" = self.by-version."debug"."0.8.1"; }; peerDependencies = [ ]; @@ -6206,41 +8935,43 @@ ]; passthru.names = [ "express" ]; }; - by-spec."express"."~4.8.5" = - self.by-version."express"."4.8.8"; - by-version."express"."4.8.8" = lib.makeOverridable self.buildNodePackage { - name = "express-4.8.8"; + by-spec."express"."~4.10.3" = + self.by-version."express"."4.10.4"; + by-version."express"."4.10.4" = lib.makeOverridable self.buildNodePackage { + name = "express-4.10.4"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/express/-/express-4.8.8.tgz"; - name = "express-4.8.8.tgz"; - sha1 = "6aba348ccdfa87608040b12ca0010107a0aac28e"; + url = "http://registry.npmjs.org/express/-/express-4.10.4.tgz"; + name = "express-4.10.4.tgz"; + sha1 = "31aa70acdad6b6093945c30523df8537336deb58"; }) ]; buildInputs = (self.nativeDeps."express" or []); deps = { - "accepts-1.0.7" = self.by-version."accepts"."1.0.7"; - "buffer-crc32-0.2.3" = self.by-version."buffer-crc32"."0.2.3"; - "debug-1.0.4" = self.by-version."debug"."1.0.4"; - "depd-0.4.4" = self.by-version."depd"."0.4.4"; + "accepts-1.1.3" = self.by-version."accepts"."1.1.3"; + "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0"; + "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; + "depd-1.0.0" = self.by-version."depd"."1.0.0"; "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; - "finalhandler-0.1.0" = self.by-version."finalhandler"."0.1.0"; - "media-typer-0.2.0" = self.by-version."media-typer"."0.2.0"; + "etag-1.5.1" = self.by-version."etag"."1.5.1"; + "finalhandler-0.3.2" = self.by-version."finalhandler"."0.3.2"; + "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; + "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0"; "methods-1.1.0" = self.by-version."methods"."1.1.0"; + "on-finished-2.1.1" = self.by-version."on-finished"."2.1.1"; "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; "path-to-regexp-0.1.3" = self.by-version."path-to-regexp"."0.1.3"; - "proxy-addr-1.0.1" = self.by-version."proxy-addr"."1.0.1"; - "qs-2.2.2" = self.by-version."qs"."2.2.2"; - "range-parser-1.0.0" = self.by-version."range-parser"."1.0.0"; - "send-0.8.5" = self.by-version."send"."0.8.5"; - "serve-static-1.5.4" = self.by-version."serve-static"."1.5.4"; - "type-is-1.3.2" = self.by-version."type-is"."1.3.2"; - "vary-0.1.0" = self.by-version."vary"."0.1.0"; + "proxy-addr-1.0.4" = self.by-version."proxy-addr"."1.0.4"; + "qs-2.3.3" = self.by-version."qs"."2.3.3"; + "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; + "send-0.10.1" = self.by-version."send"."0.10.1"; + "serve-static-1.7.1" = self.by-version."serve-static"."1.7.1"; + "type-is-1.5.3" = self.by-version."type-is"."1.5.3"; + "vary-1.0.0" = self.by-version."vary"."1.0.0"; "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; - "fresh-0.2.2" = self.by-version."fresh"."0.2.2"; - "cookie-signature-1.0.4" = self.by-version."cookie-signature"."1.0.4"; "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2"; "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; }; @@ -6249,30 +8980,30 @@ passthru.names = [ "express" ]; }; by-spec."express-form"."*" = - self.by-version."express-form"."0.12.3"; - by-version."express-form"."0.12.3" = lib.makeOverridable self.buildNodePackage { - name = "express-form-0.12.3"; + self.by-version."express-form"."0.12.4"; + by-version."express-form"."0.12.4" = lib.makeOverridable self.buildNodePackage { + name = "express-form-0.12.4"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/express-form/-/express-form-0.12.3.tgz"; - name = "express-form-0.12.3.tgz"; - sha1 = "e3d944b892b621524925837bee0d658f84833139"; + url = "http://registry.npmjs.org/express-form/-/express-form-0.12.4.tgz"; + name = "express-form-0.12.4.tgz"; + sha1 = "d671fa5887acf32a005618ce8b652f67b30e2cb1"; }) ]; buildInputs = (self.nativeDeps."express-form" or []); deps = { - "validator-0.4.28" = self.by-version."validator"."0.4.28"; + "async-0.9.0" = self.by-version."async"."0.9.0"; "object-additions-0.5.1" = self.by-version."object-additions"."0.5.1"; - "async-0.7.0" = self.by-version."async"."0.7.0"; + "validator-2.1.0" = self.by-version."validator"."2.1.0"; }; peerDependencies = [ - self.by-version."express"."4.9.5" + self.by-version."express"."5.0.0-alpha.1" ]; passthru.names = [ "express-form" ]; }; - "express-form" = self.by-version."express-form"."0.12.3"; + "express-form" = self.by-version."express-form"."0.12.4"; by-spec."express-partials"."0.0.6" = self.by-version."express-partials"."0.0.6"; by-version."express-partials"."0.0.6" = lib.makeOverridable self.buildNodePackage { @@ -6293,30 +9024,27 @@ ]; passthru.names = [ "express-partials" ]; }; - by-spec."express-session"."~1.7.6" = - self.by-version."express-session"."1.7.6"; - by-version."express-session"."1.7.6" = lib.makeOverridable self.buildNodePackage { - name = "express-session-1.7.6"; + by-spec."express-session"."1.0.2" = + self.by-version."express-session"."1.0.2"; + by-version."express-session"."1.0.2" = lib.makeOverridable self.buildNodePackage { + name = "express-session-1.0.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/express-session/-/express-session-1.7.6.tgz"; - name = "express-session-1.7.6.tgz"; - sha1 = "e1c369ba2176f7afdb79e77d65dcd8c7c46e48a5"; + url = "http://registry.npmjs.org/express-session/-/express-session-1.0.2.tgz"; + name = "express-session-1.0.2.tgz"; + sha1 = "004478c742561774411ceb79733155a56b6d49eb"; }) ]; buildInputs = (self.nativeDeps."express-session" or []); deps = { - "buffer-crc32-0.2.3" = self.by-version."buffer-crc32"."0.2.3"; - "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; - "cookie-signature-1.0.4" = self.by-version."cookie-signature"."1.0.4"; - "debug-1.0.4" = self.by-version."debug"."1.0.4"; - "depd-0.4.4" = self.by-version."depd"."0.4.4"; - "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; - "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; - "uid-safe-1.0.1" = self.by-version."uid-safe"."1.0.1"; "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; + "cookie-0.1.0" = self.by-version."cookie"."0.1.0"; + "cookie-signature-1.0.3" = self.by-version."cookie-signature"."1.0.3"; + "uid2-0.0.3" = self.by-version."uid2"."0.0.3"; + "buffer-crc32-0.2.1" = self.by-version."buffer-crc32"."0.2.1"; + "debug-0.7.4" = self.by-version."debug"."0.7.4"; }; peerDependencies = [ ]; @@ -6351,6 +9079,35 @@ ]; passthru.names = [ "express-session" ]; }; + by-spec."express-session"."~1.9.2" = + self.by-version."express-session"."1.9.2"; + by-version."express-session"."1.9.2" = lib.makeOverridable self.buildNodePackage { + name = "express-session-1.9.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/express-session/-/express-session-1.9.2.tgz"; + name = "express-session-1.9.2.tgz"; + sha1 = "cb831ff8d2d9cb6e64c167f678af6f62ae6bb076"; + }) + ]; + buildInputs = + (self.nativeDeps."express-session" or []); + deps = { + "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; + "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5"; + "crc-3.2.1" = self.by-version."crc"."3.2.1"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; + "depd-1.0.0" = self.by-version."depd"."1.0.0"; + "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; + "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; + "uid-safe-1.0.1" = self.by-version."uid-safe"."1.0.1"; + "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "express-session" ]; + }; by-spec."extend"."*" = self.by-version."extend"."2.0.0"; by-version."extend"."2.0.0" = lib.makeOverridable self.buildNodePackage { @@ -6412,6 +9169,26 @@ ]; passthru.names = [ "extend" ]; }; + by-spec."extend.js"."0.0.1" = + self.by-version."extend.js"."0.0.1"; + by-version."extend.js"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "extend.js-0.0.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/extend.js/-/extend.js-0.0.1.tgz"; + name = "extend.js-0.0.1.tgz"; + sha1 = "814c453f41201a11e05ea080a4a71f016994ad0b"; + }) + ]; + buildInputs = + (self.nativeDeps."extend.js" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "extend.js" ]; + }; by-spec."extract-opts"."~2.2.0" = self.by-version."extract-opts"."2.2.0"; by-version."extract-opts"."2.2.0" = lib.makeOverridable self.buildNodePackage { @@ -6493,42 +9270,110 @@ ]; passthru.names = [ "eyes" ]; }; - by-spec."eyes".">=0.1.6" = + by-spec."eyes"."~0.1.6" = self.by-version."eyes"."0.1.8"; + by-spec."falafel"."~0.1.6" = + self.by-version."falafel"."0.1.6"; + by-version."falafel"."0.1.6" = lib.makeOverridable self.buildNodePackage { + name = "falafel-0.1.6"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/falafel/-/falafel-0.1.6.tgz"; + name = "falafel-0.1.6.tgz"; + sha1 = "3084cf3d41b59d15c813be6f259557fdc82b0660"; + }) + ]; + buildInputs = + (self.nativeDeps."falafel" or []); + deps = { + "esprima-1.0.4" = self.by-version."esprima"."1.0.4"; + }; + peerDependencies = [ + ]; + passthru.names = [ "falafel" ]; + }; by-spec."faye-websocket"."*" = - self.by-version."faye-websocket"."0.7.2"; - by-version."faye-websocket"."0.7.2" = lib.makeOverridable self.buildNodePackage { - name = "faye-websocket-0.7.2"; + self.by-version."faye-websocket"."0.8.1"; + by-version."faye-websocket"."0.8.1" = lib.makeOverridable self.buildNodePackage { + name = "faye-websocket-0.8.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.8.1.tgz"; + name = "faye-websocket-0.8.1.tgz"; + sha1 = "c1eb3f3aad85f0eb505057332690163297b0ea26"; + }) + ]; + buildInputs = + (self.nativeDeps."faye-websocket" or []); + deps = { + "websocket-driver-0.4.0" = self.by-version."websocket-driver"."0.4.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "faye-websocket" ]; + }; + "faye-websocket" = self.by-version."faye-websocket"."0.8.1"; + by-spec."faye-websocket".">= 0.4.1" = + self.by-version."faye-websocket"."0.8.1"; + by-spec."faye-websocket"."^0.7.3 || ^0.8.0" = + self.by-version."faye-websocket"."0.8.1"; + by-spec."faye-websocket"."~0.7.0" = + self.by-version."faye-websocket"."0.7.3"; + by-version."faye-websocket"."0.7.3" = lib.makeOverridable self.buildNodePackage { + name = "faye-websocket-0.7.3"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.7.2.tgz"; - name = "faye-websocket-0.7.2.tgz"; - sha1 = "799970386f87105592397434b02abfa4f07bdf70"; + url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.7.3.tgz"; + name = "faye-websocket-0.7.3.tgz"; + sha1 = "cc4074c7f4a4dfd03af54dd65c354b135132ce11"; }) ]; buildInputs = (self.nativeDeps."faye-websocket" or []); deps = { - "websocket-driver-0.3.5" = self.by-version."websocket-driver"."0.3.5"; + "websocket-driver-0.4.0" = self.by-version."websocket-driver"."0.4.0"; }; peerDependencies = [ ]; passthru.names = [ "faye-websocket" ]; }; - "faye-websocket" = self.by-version."faye-websocket"."0.7.2"; - by-spec."faye-websocket"."0.7.2" = - self.by-version."faye-websocket"."0.7.2"; + by-spec."fetch-bower".">=2 <3" = + self.by-version."fetch-bower"."2.0.0"; + by-version."fetch-bower"."2.0.0" = lib.makeOverridable self.buildNodePackage { + name = "fetch-bower-2.0.0"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/fetch-bower/-/fetch-bower-2.0.0.tgz"; + name = "fetch-bower-2.0.0.tgz"; + sha1 = "c027feb75a512001d1287bbfb3ffaafba67eb92f"; + }) + ]; + buildInputs = + (self.nativeDeps."fetch-bower" or []); + deps = { + "bower-endpoint-parser-0.2.1" = self.by-version."bower-endpoint-parser"."0.2.1"; + "bower-logger-0.2.1" = self.by-version."bower-logger"."0.2.1"; + "bower-1.3.12" = self.by-version."bower"."1.3.12"; + "glob-3.2.11" = self.by-version."glob"."3.2.11"; + }; + peerDependencies = [ + ]; + passthru.names = [ "fetch-bower" ]; + }; by-spec."fields"."~0.1.11" = - self.by-version."fields"."0.1.16"; - by-version."fields"."0.1.16" = lib.makeOverridable self.buildNodePackage { - name = "fields-0.1.16"; + self.by-version."fields"."0.1.23"; + by-version."fields"."0.1.23" = lib.makeOverridable self.buildNodePackage { + name = "fields-0.1.23"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/fields/-/fields-0.1.16.tgz"; - name = "fields-0.1.16.tgz"; - sha1 = "a6d127f93636050c7407bd7a5e26265f82f58c22"; + url = "http://registry.npmjs.org/fields/-/fields-0.1.23.tgz"; + name = "fields-0.1.23.tgz"; + sha1 = "6ad465e4294a78870aaeb4a63517576f704732f3"; }) ]; buildInputs = @@ -6542,16 +9387,36 @@ ]; passthru.names = [ "fields" ]; }; + by-spec."fifo"."^0.1.4" = + self.by-version."fifo"."0.1.4"; + by-version."fifo"."0.1.4" = lib.makeOverridable self.buildNodePackage { + name = "fifo-0.1.4"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/fifo/-/fifo-0.1.4.tgz"; + name = "fifo-0.1.4.tgz"; + sha1 = "bf42d87c0ad07b00d0949d12388f6289606ece34"; + }) + ]; + buildInputs = + (self.nativeDeps."fifo" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "fifo" ]; + }; by-spec."figures"."^1.0.1" = - self.by-version."figures"."1.3.3"; - by-version."figures"."1.3.3" = lib.makeOverridable self.buildNodePackage { - name = "figures-1.3.3"; + self.by-version."figures"."1.3.5"; + by-version."figures"."1.3.5" = lib.makeOverridable self.buildNodePackage { + name = "figures-1.3.5"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/figures/-/figures-1.3.3.tgz"; - name = "figures-1.3.3.tgz"; - sha1 = "a0952f9ba076e6be3dd5e2bad8e6a013c00d3d36"; + url = "http://registry.npmjs.org/figures/-/figures-1.3.5.tgz"; + name = "figures-1.3.5.tgz"; + sha1 = "d1a31f4e1d2c2938ecde5c06aa16134cf29f4771"; }) ]; buildInputs = @@ -6562,6 +9427,8 @@ ]; passthru.names = [ "figures" ]; }; + by-spec."figures"."^1.3.2" = + self.by-version."figures"."1.3.5"; by-spec."fileset"."0.1.x" = self.by-version."fileset"."0.1.5"; by-version."fileset"."0.1.5" = lib.makeOverridable self.buildNodePackage { @@ -6584,50 +9451,71 @@ ]; passthru.names = [ "fileset" ]; }; - by-spec."finalhandler"."0.1.0" = - self.by-version."finalhandler"."0.1.0"; - by-version."finalhandler"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "finalhandler-0.1.0"; + by-spec."finalhandler"."0.2.0" = + self.by-version."finalhandler"."0.2.0"; + by-version."finalhandler"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "finalhandler-0.2.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.1.0.tgz"; - name = "finalhandler-0.1.0.tgz"; - sha1 = "da05bbc4f5f4a30c84ce1d91f3c154007c4e9daa"; + url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz"; + name = "finalhandler-0.2.0.tgz"; + sha1 = "794082424b17f6a4b2a0eda39f9db6948ee4be8d"; }) ]; buildInputs = (self.nativeDeps."finalhandler" or []); deps = { - "debug-1.0.4" = self.by-version."debug"."1.0.4"; + "debug-2.0.0" = self.by-version."debug"."2.0.0"; "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; }; peerDependencies = [ ]; passthru.names = [ "finalhandler" ]; }; - by-spec."finalhandler"."0.2.0" = - self.by-version."finalhandler"."0.2.0"; - by-version."finalhandler"."0.2.0" = lib.makeOverridable self.buildNodePackage { - name = "finalhandler-0.2.0"; + by-spec."finalhandler"."0.3.2" = + self.by-version."finalhandler"."0.3.2"; + by-version."finalhandler"."0.3.2" = lib.makeOverridable self.buildNodePackage { + name = "finalhandler-0.3.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz"; - name = "finalhandler-0.2.0.tgz"; - sha1 = "794082424b17f6a4b2a0eda39f9db6948ee4be8d"; + url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.3.2.tgz"; + name = "finalhandler-0.3.2.tgz"; + sha1 = "7b389b0fd3647a6f90bd564e22624bf8a4a77fb5"; }) ]; buildInputs = (self.nativeDeps."finalhandler" or []); deps = { - "debug-2.0.0" = self.by-version."debug"."2.0.0"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; + "on-finished-2.1.1" = self.by-version."on-finished"."2.1.1"; }; peerDependencies = [ ]; passthru.names = [ "finalhandler" ]; }; + by-spec."find-index"."^0.1.1" = + self.by-version."find-index"."0.1.1"; + by-version."find-index"."0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "find-index-0.1.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz"; + name = "find-index-0.1.1.tgz"; + sha1 = "675d358b2ca3892d795a1ab47232f8b6e2e0dde4"; + }) + ]; + buildInputs = + (self.nativeDeps."find-index" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "find-index" ]; + }; by-spec."findit".">=1.1.0 <2.0.0" = self.by-version."findit"."1.2.0"; by-version."findit"."1.2.0" = lib.makeOverridable self.buildNodePackage { @@ -6692,6 +9580,26 @@ ]; passthru.names = [ "first-chunk-stream" ]; }; + by-spec."flagged-respawn"."~0.3.0" = + self.by-version."flagged-respawn"."0.3.1"; + by-version."flagged-respawn"."0.3.1" = lib.makeOverridable self.buildNodePackage { + name = "flagged-respawn-0.3.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/flagged-respawn/-/flagged-respawn-0.3.1.tgz"; + name = "flagged-respawn-0.3.1.tgz"; + sha1 = "397700925df6e12452202a71e89d89545fbbbe9d"; + }) + ]; + buildInputs = + (self.nativeDeps."flagged-respawn" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "flagged-respawn" ]; + }; by-spec."flatiron"."*" = self.by-version."flatiron"."0.4.2"; by-version."flatiron"."0.4.2" = lib.makeOverridable self.buildNodePackage { @@ -6717,30 +9625,8 @@ passthru.names = [ "flatiron" ]; }; "flatiron" = self.by-version."flatiron"."0.4.2"; - by-spec."flatiron"."~0.3.11" = - self.by-version."flatiron"."0.3.11"; - by-version."flatiron"."0.3.11" = lib.makeOverridable self.buildNodePackage { - name = "flatiron-0.3.11"; - bin = true; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/flatiron/-/flatiron-0.3.11.tgz"; - name = "flatiron-0.3.11.tgz"; - sha1 = "1cb0190fc2bd9d860f018e04d95fd35f9bd12555"; - }) - ]; - buildInputs = - (self.nativeDeps."flatiron" or []); - deps = { - "broadway-0.2.9" = self.by-version."broadway"."0.2.9"; - "optimist-0.6.0" = self.by-version."optimist"."0.6.0"; - "prompt-0.2.11" = self.by-version."prompt"."0.2.11"; - "director-1.1.10" = self.by-version."director"."1.1.10"; - }; - peerDependencies = [ - ]; - passthru.names = [ "flatiron" ]; - }; + by-spec."flatiron"."~0.4.2" = + self.by-version."flatiron"."0.4.2"; by-spec."follow-redirects"."0.0.3" = self.by-version."follow-redirects"."0.0.3"; by-version."follow-redirects"."0.0.3" = lib.makeOverridable self.buildNodePackage { @@ -6804,38 +9690,36 @@ passthru.names = [ "foreachasync" ]; }; by-spec."forever"."*" = - self.by-version."forever"."0.11.1"; - by-version."forever"."0.11.1" = lib.makeOverridable self.buildNodePackage { - name = "forever-0.11.1"; + self.by-version."forever"."0.13.0"; + by-version."forever"."0.13.0" = lib.makeOverridable self.buildNodePackage { + name = "forever-0.13.0"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/forever/-/forever-0.11.1.tgz"; - name = "forever-0.11.1.tgz"; - sha1 = "50ac8744c0a6e0c266524c4746397f74d6b09c5b"; + url = "http://registry.npmjs.org/forever/-/forever-0.13.0.tgz"; + name = "forever-0.13.0.tgz"; + sha1 = "30857921b37994295a23ca1266628fb3aa2c2c00"; }) ]; buildInputs = (self.nativeDeps."forever" or []); deps = { "colors-0.6.2" = self.by-version."colors"."0.6.2"; - "cliff-0.1.8" = self.by-version."cliff"."0.1.8"; - "flatiron-0.3.11" = self.by-version."flatiron"."0.3.11"; - "forever-monitor-1.2.3" = self.by-version."forever-monitor"."1.2.3"; + "cliff-0.1.9" = self.by-version."cliff"."0.1.9"; + "flatiron-0.4.2" = self.by-version."flatiron"."0.4.2"; + "forever-monitor-1.5.2" = self.by-version."forever-monitor"."1.5.2"; "nconf-0.6.9" = self.by-version."nconf"."0.6.9"; - "nssocket-0.5.1" = self.by-version."nssocket"."0.5.1"; + "nssocket-0.5.2" = self.by-version."nssocket"."0.5.2"; "optimist-0.6.1" = self.by-version."optimist"."0.6.1"; - "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0"; "timespan-2.3.0" = self.by-version."timespan"."2.3.0"; - "watch-0.8.0" = self.by-version."watch"."0.8.0"; "utile-0.2.1" = self.by-version."utile"."0.2.1"; - "winston-0.7.3" = self.by-version."winston"."0.7.3"; + "winston-0.8.3" = self.by-version."winston"."0.8.3"; }; peerDependencies = [ ]; passthru.names = [ "forever" ]; }; - "forever" = self.by-version."forever"."0.11.1"; + "forever" = self.by-version."forever"."0.13.0"; by-spec."forever-agent"."~0.2.0" = self.by-version."forever-agent"."0.2.0"; by-version."forever-agent"."0.2.0" = lib.makeOverridable self.buildNodePackage { @@ -6877,32 +9761,31 @@ passthru.names = [ "forever-agent" ]; }; by-spec."forever-monitor"."*" = - self.by-version."forever-monitor"."1.3.0"; - by-version."forever-monitor"."1.3.0" = lib.makeOverridable self.buildNodePackage { - name = "forever-monitor-1.3.0"; + self.by-version."forever-monitor"."1.5.2"; + by-version."forever-monitor"."1.5.2" = lib.makeOverridable self.buildNodePackage { + name = "forever-monitor-1.5.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/forever-monitor/-/forever-monitor-1.3.0.tgz"; - name = "forever-monitor-1.3.0.tgz"; - sha1 = "57e883da03ec0eb690ad4259afbccf22f609d52e"; + url = "http://registry.npmjs.org/forever-monitor/-/forever-monitor-1.5.2.tgz"; + name = "forever-monitor-1.5.2.tgz"; + sha1 = "279388dfa93b085363d6b28a823ef0a6aeeb35d7"; }) ]; buildInputs = (self.nativeDeps."forever-monitor" or []); deps = { - "broadway-0.2.10" = self.by-version."broadway"."0.2.10"; - "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14"; - "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0"; + "broadway-0.3.6" = self.by-version."broadway"."0.3.6"; + "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0"; "ps-tree-0.0.3" = self.by-version."ps-tree"."0.0.3"; - "watch-0.5.1" = self.by-version."watch"."0.5.1"; - "utile-0.1.7" = self.by-version."utile"."0.1.7"; + "watch-0.13.0" = self.by-version."watch"."0.13.0"; + "utile-0.2.1" = self.by-version."utile"."0.2.1"; }; peerDependencies = [ ]; passthru.names = [ "forever-monitor" ]; }; - "forever-monitor" = self.by-version."forever-monitor"."1.3.0"; + "forever-monitor" = self.by-version."forever-monitor"."1.5.2"; by-spec."forever-monitor"."1.1.0" = self.by-version."forever-monitor"."1.1.0"; by-version."forever-monitor"."1.1.0" = lib.makeOverridable self.buildNodePackage { @@ -6929,31 +9812,30 @@ ]; passthru.names = [ "forever-monitor" ]; }; - by-spec."forever-monitor"."1.2.3" = - self.by-version."forever-monitor"."1.2.3"; - by-version."forever-monitor"."1.2.3" = lib.makeOverridable self.buildNodePackage { - name = "forever-monitor-1.2.3"; + by-spec."forever-monitor"."~1.5.1" = + self.by-version."forever-monitor"."1.5.2"; + by-spec."form-data"."0.0.8" = + self.by-version."form-data"."0.0.8"; + by-version."form-data"."0.0.8" = lib.makeOverridable self.buildNodePackage { + name = "form-data-0.0.8"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/forever-monitor/-/forever-monitor-1.2.3.tgz"; - name = "forever-monitor-1.2.3.tgz"; - sha1 = "b27ac3acb6fdcc7315d6cd85830f2d004733028b"; + url = "http://registry.npmjs.org/form-data/-/form-data-0.0.8.tgz"; + name = "form-data-0.0.8.tgz"; + sha1 = "0890cd1005c5ccecc0b9d24a88052c92442d0db5"; }) ]; buildInputs = - (self.nativeDeps."forever-monitor" or []); + (self.nativeDeps."form-data" or []); deps = { - "broadway-0.2.10" = self.by-version."broadway"."0.2.10"; - "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14"; - "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0"; - "ps-tree-0.0.3" = self.by-version."ps-tree"."0.0.3"; - "watch-0.5.1" = self.by-version."watch"."0.5.1"; - "utile-0.1.7" = self.by-version."utile"."0.1.7"; + "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.2.10" = self.by-version."async"."0.2.10"; }; peerDependencies = [ ]; - passthru.names = [ "forever-monitor" ]; + passthru.names = [ "form-data" ]; }; by-spec."form-data"."0.1.3" = self.by-version."form-data"."0.1.3"; @@ -6970,7 +9852,7 @@ buildInputs = (self.nativeDeps."form-data" or []); deps = { - "combined-stream-0.0.5" = self.by-version."combined-stream"."0.0.5"; + "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"; }; @@ -6993,7 +9875,7 @@ buildInputs = (self.nativeDeps."form-data" or []); deps = { - "combined-stream-0.0.5" = self.by-version."combined-stream"."0.0.5"; + "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.2.10" = self.by-version."async"."0.2.10"; }; @@ -7016,7 +9898,7 @@ buildInputs = (self.nativeDeps."form-data" or []); deps = { - "combined-stream-0.0.5" = self.by-version."combined-stream"."0.0.5"; + "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"; }; @@ -7024,16 +9906,16 @@ ]; passthru.names = [ "form-data" ]; }; - by-spec."formatio"."~1.0" = - self.by-version."formatio"."1.0.2"; - by-version."formatio"."1.0.2" = lib.makeOverridable self.buildNodePackage { - name = "formatio-1.0.2"; + by-spec."formatio"."~1.1.1" = + self.by-version."formatio"."1.1.1"; + by-version."formatio"."1.1.1" = lib.makeOverridable self.buildNodePackage { + name = "formatio-1.1.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/formatio/-/formatio-1.0.2.tgz"; - name = "formatio-1.0.2.tgz"; - sha1 = "e7991ca144ff7d8cff07bb9ac86a9b79c6ba47ef"; + url = "http://registry.npmjs.org/formatio/-/formatio-1.1.1.tgz"; + name = "formatio-1.1.1.tgz"; + sha1 = "5ed3ccd636551097383465d996199100e86161e9"; }) ]; buildInputs = @@ -7105,26 +9987,6 @@ ]; passthru.names = [ "formidable" ]; }; - by-spec."formidable"."1.0.9" = - self.by-version."formidable"."1.0.9"; - by-version."formidable"."1.0.9" = lib.makeOverridable self.buildNodePackage { - name = "formidable-1.0.9"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/formidable/-/formidable-1.0.9.tgz"; - name = "formidable-1.0.9.tgz"; - sha1 = "419e3bccead3e8874d539f5b3e72a4c503b31a98"; - }) - ]; - buildInputs = - (self.nativeDeps."formidable" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "formidable" ]; - }; by-spec."formidable"."1.0.x" = self.by-version."formidable"."1.0.15"; by-version."formidable"."1.0.15" = lib.makeOverridable self.buildNodePackage { @@ -7271,22 +10133,22 @@ ]; passthru.names = [ "fs-extra" ]; }; - by-spec."fs-vacuum"."~1.2.1" = - self.by-version."fs-vacuum"."1.2.1"; - by-version."fs-vacuum"."1.2.1" = lib.makeOverridable self.buildNodePackage { - name = "fs-vacuum-1.2.1"; + by-spec."fs-vacuum"."~1.2.2" = + self.by-version."fs-vacuum"."1.2.2"; + by-version."fs-vacuum"."1.2.2" = lib.makeOverridable self.buildNodePackage { + name = "fs-vacuum-1.2.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/fs-vacuum/-/fs-vacuum-1.2.1.tgz"; - name = "fs-vacuum-1.2.1.tgz"; - sha1 = "1bc3c62da30d6272569b8b9089c9811abb0a600b"; + url = "http://registry.npmjs.org/fs-vacuum/-/fs-vacuum-1.2.2.tgz"; + name = "fs-vacuum-1.2.2.tgz"; + sha1 = "0e26ca2b14eb4ceb4b590a92aad585756ed18e40"; }) ]; buildInputs = (self.nativeDeps."fs-vacuum" or []); deps = { - "graceful-fs-3.0.2" = self.by-version."graceful-fs"."3.0.2"; + "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; }; peerDependencies = [ @@ -7330,7 +10192,7 @@ buildInputs = (self.nativeDeps."fs-write-stream-atomic" or []); deps = { - "graceful-fs-3.0.2" = self.by-version."graceful-fs"."3.0.2"; + "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; }; peerDependencies = [ ]; @@ -7359,43 +10221,45 @@ ]; passthru.names = [ "fs.extra" ]; }; - by-spec."fsevents"."0.3.0" = - self.by-version."fsevents"."0.3.0"; - by-version."fsevents"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "fsevents-0.3.0"; + by-spec."fs.extra".">=1.2.1 <2" = + self.by-version."fs.extra"."1.2.1"; + by-spec."fsevents"."~0.3.1" = + self.by-version."fsevents"."0.3.1"; + by-version."fsevents"."0.3.1" = lib.makeOverridable self.buildNodePackage { + name = "fsevents-0.3.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/fsevents/-/fsevents-0.3.0.tgz"; - name = "fsevents-0.3.0.tgz"; - sha1 = "90723a3d0bbab877b62d0a78db633ef2688d8a81"; + url = "http://registry.npmjs.org/fsevents/-/fsevents-0.3.1.tgz"; + name = "fsevents-0.3.1.tgz"; + sha1 = "47d60e5c28887055d7388833ea5d54d4882c8f6f"; }) ]; buildInputs = (self.nativeDeps."fsevents" or []); deps = { - "nan-1.2.0" = self.by-version."nan"."1.2.0"; + "nan-1.3.0" = self.by-version."nan"."1.3.0"; }; peerDependencies = [ ]; passthru.names = [ "fsevents" ]; }; - by-spec."fstream"."^1.0.0" = - self.by-version."fstream"."1.0.2"; - by-version."fstream"."1.0.2" = lib.makeOverridable self.buildNodePackage { - name = "fstream-1.0.2"; + by-spec."fstream"."0" = + self.by-version."fstream"."0.1.31"; + by-version."fstream"."0.1.31" = lib.makeOverridable self.buildNodePackage { + name = "fstream-0.1.31"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/fstream/-/fstream-1.0.2.tgz"; - name = "fstream-1.0.2.tgz"; - sha1 = "56930ff1b4d4d7b1a689c8656b3a11e744ab92c6"; + url = "http://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz"; + name = "fstream-0.1.31.tgz"; + sha1 = "7337f058fbbbbefa8c9f561a28cab0849202c988"; }) ]; buildInputs = (self.nativeDeps."fstream" or []); deps = { - "graceful-fs-3.0.2" = self.by-version."graceful-fs"."3.0.2"; + "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; @@ -7404,24 +10268,22 @@ ]; passthru.names = [ "fstream" ]; }; - by-spec."fstream"."^1.0.2" = - self.by-version."fstream"."1.0.2"; - by-spec."fstream"."~0.1.8" = - self.by-version."fstream"."0.1.31"; - by-version."fstream"."0.1.31" = lib.makeOverridable self.buildNodePackage { - name = "fstream-0.1.31"; + by-spec."fstream"."^1.0.0" = + self.by-version."fstream"."1.0.3"; + by-version."fstream"."1.0.3" = lib.makeOverridable self.buildNodePackage { + name = "fstream-1.0.3"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz"; - name = "fstream-0.1.31.tgz"; - sha1 = "7337f058fbbbbefa8c9f561a28cab0849202c988"; + url = "http://registry.npmjs.org/fstream/-/fstream-1.0.3.tgz"; + name = "fstream-1.0.3.tgz"; + sha1 = "5ce69767710d7a39c8cd9232470d9426790195da"; }) ]; buildInputs = (self.nativeDeps."fstream" or []); deps = { - "graceful-fs-3.0.2" = self.by-version."graceful-fs"."3.0.2"; + "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; @@ -7430,8 +10292,20 @@ ]; passthru.names = [ "fstream" ]; }; + by-spec."fstream"."^1.0.2" = + self.by-version."fstream"."1.0.3"; + by-spec."fstream"."~0.1.23" = + self.by-version."fstream"."0.1.31"; + by-spec."fstream"."~0.1.25" = + self.by-version."fstream"."0.1.31"; + by-spec."fstream"."~0.1.28" = + self.by-version."fstream"."0.1.31"; + by-spec."fstream"."~0.1.8" = + self.by-version."fstream"."0.1.31"; by-spec."fstream"."~1.0.2" = - self.by-version."fstream"."1.0.2"; + self.by-version."fstream"."1.0.3"; + by-spec."fstream"."~1.0.3" = + self.by-version."fstream"."1.0.3"; by-spec."fstream-ignore"."^1.0.0" = self.by-version."fstream-ignore"."1.0.1"; by-version."fstream-ignore"."1.0.1" = lib.makeOverridable self.buildNodePackage { @@ -7447,7 +10321,7 @@ buildInputs = (self.nativeDeps."fstream-ignore" or []); deps = { - "fstream-1.0.2" = self.by-version."fstream"."1.0.2"; + "fstream-1.0.3" = self.by-version."fstream"."1.0.3"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0"; }; @@ -7455,16 +10329,42 @@ ]; passthru.names = [ "fstream-ignore" ]; }; - by-spec."fstream-npm"."~1.0.0" = - self.by-version."fstream-npm"."1.0.0"; - by-version."fstream-npm"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "fstream-npm-1.0.0"; + by-spec."fstream-ignore"."~1.0.1" = + self.by-version."fstream-ignore"."1.0.1"; + by-spec."fstream-npm"."~0.1.3" = + self.by-version."fstream-npm"."0.1.8"; + by-version."fstream-npm"."0.1.8" = lib.makeOverridable self.buildNodePackage { + name = "fstream-npm-0.1.8"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/fstream-npm/-/fstream-npm-0.1.8.tgz"; + name = "fstream-npm-0.1.8.tgz"; + sha1 = "38a70fdeb510a443e1a5378d90413403fc724fa8"; + }) + ]; + buildInputs = + (self.nativeDeps."fstream-npm" or []); + deps = { + "fstream-ignore-1.0.1" = self.by-version."fstream-ignore"."1.0.1"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "fstream-npm" ]; + }; + by-spec."fstream-npm"."~0.1.6" = + self.by-version."fstream-npm"."0.1.8"; + by-spec."fstream-npm"."~1.0.1" = + self.by-version."fstream-npm"."1.0.1"; + by-version."fstream-npm"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "fstream-npm-1.0.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/fstream-npm/-/fstream-npm-1.0.0.tgz"; - name = "fstream-npm-1.0.0.tgz"; - sha1 = "0262c95c771d393e7cf59fcfeabce621703f3d27"; + url = "http://registry.npmjs.org/fstream-npm/-/fstream-npm-1.0.1.tgz"; + name = "fstream-npm-1.0.1.tgz"; + sha1 = "1e35c77f0fa24f5d6367e6d447ae7d6ddb482db2"; }) ]; buildInputs = @@ -7498,6 +10398,26 @@ ]; passthru.names = [ "gaze" ]; }; + by-spec."get-stdin"."*" = + self.by-version."get-stdin"."3.0.2"; + by-version."get-stdin"."3.0.2" = lib.makeOverridable self.buildNodePackage { + name = "get-stdin-3.0.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/get-stdin/-/get-stdin-3.0.2.tgz"; + name = "get-stdin-3.0.2.tgz"; + sha1 = "c1ced24b9039b38ded85bdf161e57713b6dd4abe"; + }) + ]; + buildInputs = + (self.nativeDeps."get-stdin" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "get-stdin" ]; + }; by-spec."get-stdin"."^1.0.0" = self.by-version."get-stdin"."1.0.0"; by-version."get-stdin"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -7518,6 +10438,8 @@ ]; passthru.names = [ "get-stdin" ]; }; + by-spec."get-stdin"."^3.0.0" = + self.by-version."get-stdin"."3.0.2"; by-spec."getmac"."~1.0.6" = self.by-version."getmac"."1.0.6"; by-version."getmac"."1.0.6" = lib.makeOverridable self.buildNodePackage { @@ -7560,15 +10482,15 @@ passthru.names = [ "getobject" ]; }; by-spec."git-run"."*" = - self.by-version."git-run"."0.2.0"; - by-version."git-run"."0.2.0" = lib.makeOverridable self.buildNodePackage { - name = "git-run-0.2.0"; + self.by-version."git-run"."0.3.0"; + by-version."git-run"."0.3.0" = lib.makeOverridable self.buildNodePackage { + name = "git-run-0.3.0"; bin = true; src = [ (self.patchSource fetchurl { - url = "http://registry.npmjs.org/git-run/-/git-run-0.2.0.tgz"; - name = "git-run-0.2.0.tgz"; - sha1 = "9aa3b203edbb7fcfbc06604c43454d47627d8ac0"; + url = "http://registry.npmjs.org/git-run/-/git-run-0.3.0.tgz"; + name = "git-run-0.3.0.tgz"; + sha1 = "6ac02b93a93e10803ebfec8a5703fb416cafc0b1"; }) ]; buildInputs = @@ -7581,7 +10503,27 @@ ]; passthru.names = [ "git-run" ]; }; - "git-run" = self.by-version."git-run"."0.2.0"; + "git-run" = self.by-version."git-run"."0.3.0"; + by-spec."github-url-from-git"."1.1.1" = + self.by-version."github-url-from-git"."1.1.1"; + by-version."github-url-from-git"."1.1.1" = lib.makeOverridable self.buildNodePackage { + name = "github-url-from-git-1.1.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.1.1.tgz"; + name = "github-url-from-git-1.1.1.tgz"; + sha1 = "1f89623453123ef9623956e264c60bf4c3cf5ccf"; + }) + ]; + buildInputs = + (self.nativeDeps."github-url-from-git" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "github-url-from-git" ]; + }; by-spec."github-url-from-git"."^1.3.0" = self.by-version."github-url-from-git"."1.4.0"; by-version."github-url-from-git"."1.4.0" = lib.makeOverridable self.buildNodePackage { @@ -7602,8 +10544,50 @@ ]; passthru.names = [ "github-url-from-git" ]; }; + by-spec."github-url-from-git"."~1.1.1" = + self.by-version."github-url-from-git"."1.1.1"; by-spec."github-url-from-git"."~1.4.0" = self.by-version."github-url-from-git"."1.4.0"; + by-spec."github-url-from-username-repo"."0.0.2" = + self.by-version."github-url-from-username-repo"."0.0.2"; + by-version."github-url-from-username-repo"."0.0.2" = lib.makeOverridable self.buildNodePackage { + name = "github-url-from-username-repo-0.0.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/github-url-from-username-repo/-/github-url-from-username-repo-0.0.2.tgz"; + name = "github-url-from-username-repo-0.0.2.tgz"; + sha1 = "0d9ee8e2bca36d5f065a1bcd23eb3f1fa3d636bd"; + }) + ]; + buildInputs = + (self.nativeDeps."github-url-from-username-repo" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "github-url-from-username-repo" ]; + }; + by-spec."github-url-from-username-repo"."^0.1.0" = + self.by-version."github-url-from-username-repo"."0.1.0"; + by-version."github-url-from-username-repo"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "github-url-from-username-repo-0.1.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/github-url-from-username-repo/-/github-url-from-username-repo-0.1.0.tgz"; + name = "github-url-from-username-repo-0.1.0.tgz"; + sha1 = "fe398af670692e91af7bcfc5ae1d99ff97b1df89"; + }) + ]; + buildInputs = + (self.nativeDeps."github-url-from-username-repo" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "github-url-from-username-repo" ]; + }; by-spec."github-url-from-username-repo"."^1.0.0" = self.by-version."github-url-from-username-repo"."1.0.2"; by-version."github-url-from-username-repo"."1.0.2" = lib.makeOverridable self.buildNodePackage { @@ -7628,22 +10612,44 @@ self.by-version."github-url-from-username-repo"."1.0.2"; by-spec."github-url-from-username-repo"."~1.0.2" = self.by-version."github-url-from-username-repo"."1.0.2"; + by-spec."glob"."3" = + self.by-version."glob"."3.2.11"; + by-version."glob"."3.2.11" = lib.makeOverridable self.buildNodePackage { + name = "glob-3.2.11"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/glob/-/glob-3.2.11.tgz"; + name = "glob-3.2.11.tgz"; + sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d"; + }) + ]; + buildInputs = + (self.nativeDeps."glob" or []); + deps = { + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + "minimatch-0.3.0" = self.by-version."minimatch"."0.3.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "glob" ]; + }; by-spec."glob"."3 || 4" = - self.by-version."glob"."4.0.6"; - by-version."glob"."4.0.6" = lib.makeOverridable self.buildNodePackage { - name = "glob-4.0.6"; + self.by-version."glob"."4.2.2"; + by-version."glob"."4.2.2" = lib.makeOverridable self.buildNodePackage { + name = "glob-4.2.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/glob/-/glob-4.0.6.tgz"; - name = "glob-4.0.6.tgz"; - sha1 = "695c50bdd4e2fb5c5d370b091f388d3707e291a7"; + url = "http://registry.npmjs.org/glob/-/glob-4.2.2.tgz"; + name = "glob-4.2.2.tgz"; + sha1 = "ad2b047653a58c387e15deb43a19497f83fd2a80"; }) ]; buildInputs = (self.nativeDeps."glob" or []); deps = { - "graceful-fs-3.0.2" = self.by-version."graceful-fs"."3.0.2"; + "inflight-1.0.4" = self.by-version."inflight"."1.0.4"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0"; "once-1.3.1" = self.by-version."once"."1.3.1"; @@ -7677,36 +10683,42 @@ }; by-spec."glob"."3.2.x" = self.by-version."glob"."3.2.11"; - by-version."glob"."3.2.11" = lib.makeOverridable self.buildNodePackage { - name = "glob-3.2.11"; + by-spec."glob"."3.x" = + self.by-version."glob"."3.2.11"; + by-spec."glob"."4.0.6" = + self.by-version."glob"."4.0.6"; + by-version."glob"."4.0.6" = lib.makeOverridable self.buildNodePackage { + name = "glob-4.0.6"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/glob/-/glob-3.2.11.tgz"; - name = "glob-3.2.11.tgz"; - sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d"; + url = "http://registry.npmjs.org/glob/-/glob-4.0.6.tgz"; + name = "glob-4.0.6.tgz"; + sha1 = "695c50bdd4e2fb5c5d370b091f388d3707e291a7"; }) ]; buildInputs = (self.nativeDeps."glob" or []); deps = { + "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - "minimatch-0.3.0" = self.by-version."minimatch"."0.3.0"; + "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0"; + "once-1.3.1" = self.by-version."once"."1.3.1"; }; peerDependencies = [ ]; passthru.names = [ "glob" ]; }; - by-spec."glob"."3.x" = - self.by-version."glob"."3.2.11"; by-spec."glob"."4.x" = - self.by-version."glob"."4.0.6"; + self.by-version."glob"."4.2.2"; + by-spec."glob".">=3.2.7 <4" = + self.by-version."glob"."3.2.11"; by-spec."glob"."^4.0.0" = - self.by-version."glob"."4.0.6"; + self.by-version."glob"."4.2.2"; by-spec."glob"."^4.0.2" = - self.by-version."glob"."4.0.6"; + self.by-version."glob"."4.2.2"; by-spec."glob"."^4.0.5" = - self.by-version."glob"."4.0.6"; + self.by-version."glob"."4.2.2"; by-spec."glob"."~ 3.2.1" = self.by-version."glob"."3.2.11"; by-spec."glob"."~3.1.21" = @@ -7734,35 +10746,43 @@ }; by-spec."glob"."~3.2.1" = self.by-version."glob"."3.2.11"; + by-spec."glob"."~3.2.3" = + self.by-version."glob"."3.2.11"; by-spec."glob"."~3.2.6" = self.by-version."glob"."3.2.11"; by-spec."glob"."~3.2.7" = self.by-version."glob"."3.2.11"; + by-spec."glob"."~3.2.8" = + self.by-version."glob"."3.2.11"; by-spec."glob"."~3.2.9" = self.by-version."glob"."3.2.11"; - by-spec."glob"."~4.0.5" = + by-spec."glob"."~4.0.2" = + self.by-version."glob"."4.0.6"; + by-spec."glob"."~4.0.6" = self.by-version."glob"."4.0.6"; + by-spec."glob"."~4.2.1" = + self.by-version."glob"."4.2.2"; by-spec."glob-stream"."^3.1.5" = - self.by-version."glob-stream"."3.1.15"; - by-version."glob-stream"."3.1.15" = lib.makeOverridable self.buildNodePackage { - name = "glob-stream-3.1.15"; + self.by-version."glob-stream"."3.1.17"; + by-version."glob-stream"."3.1.17" = lib.makeOverridable self.buildNodePackage { + name = "glob-stream-3.1.17"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/glob-stream/-/glob-stream-3.1.15.tgz"; - name = "glob-stream-3.1.15.tgz"; - sha1 = "084bdbe9d8203fbb48bcf05c382dbb7e6666f8f5"; + url = "http://registry.npmjs.org/glob-stream/-/glob-stream-3.1.17.tgz"; + name = "glob-stream-3.1.17.tgz"; + sha1 = "bc3093856149bf9b7454935abe523ec7ab26ec1e"; }) ]; buildInputs = (self.nativeDeps."glob-stream" or []); deps = { - "glob-4.0.6" = self.by-version."glob"."4.0.6"; + "glob-4.2.2" = self.by-version."glob"."4.2.2"; "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0"; - "ordered-read-streams-0.0.8" = self.by-version."ordered-read-streams"."0.0.8"; - "glob2base-0.0.11" = self.by-version."glob2base"."0.0.11"; + "ordered-read-streams-0.1.0" = self.by-version."ordered-read-streams"."0.1.0"; + "glob2base-0.0.12" = self.by-version."glob2base"."0.0.12"; "unique-stream-1.0.0" = self.by-version."unique-stream"."1.0.0"; - "through2-0.6.2" = self.by-version."through2"."0.6.2"; + "through2-0.6.3" = self.by-version."through2"."0.6.3"; }; peerDependencies = [ ]; @@ -7789,22 +10809,22 @@ ]; passthru.names = [ "glob-watcher" ]; }; - by-spec."glob2base"."^0.0.11" = - self.by-version."glob2base"."0.0.11"; - by-version."glob2base"."0.0.11" = lib.makeOverridable self.buildNodePackage { - name = "glob2base-0.0.11"; + by-spec."glob2base"."^0.0.12" = + self.by-version."glob2base"."0.0.12"; + by-version."glob2base"."0.0.12" = lib.makeOverridable self.buildNodePackage { + name = "glob2base-0.0.12"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/glob2base/-/glob2base-0.0.11.tgz"; - name = "glob2base-0.0.11.tgz"; - sha1 = "e56904ae5292c2d9cefbc5b97f419614fb56b660"; + url = "http://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz"; + name = "glob2base-0.0.12.tgz"; + sha1 = "9d419b3e28f12e83a362164a277055922c9c0d56"; }) ]; buildInputs = (self.nativeDeps."glob2base" or []); deps = { - "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; + "find-index-0.1.1" = self.by-version."find-index"."0.1.1"; }; peerDependencies = [ ]; @@ -7833,35 +10853,28 @@ ]; passthru.names = [ "globule" ]; }; - by-spec."graceful-fs"."2 || 3" = - self.by-version."graceful-fs"."3.0.2"; - by-version."graceful-fs"."3.0.2" = lib.makeOverridable self.buildNodePackage { - name = "graceful-fs-3.0.2"; + by-spec."got"."^0.3.0" = + self.by-version."got"."0.3.0"; + by-version."got"."0.3.0" = lib.makeOverridable self.buildNodePackage { + name = "got-0.3.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.2.tgz"; - name = "graceful-fs-3.0.2.tgz"; - sha1 = "2cb5bf7f742bea8ad47c754caeee032b7e71a577"; + url = "http://registry.npmjs.org/got/-/got-0.3.0.tgz"; + name = "got-0.3.0.tgz"; + sha1 = "888ec66ca4bc735ab089dbe959496d0f79485493"; }) ]; buildInputs = - (self.nativeDeps."graceful-fs" or []); + (self.nativeDeps."got" or []); deps = { + "object-assign-0.3.1" = self.by-version."object-assign"."0.3.1"; }; peerDependencies = [ ]; - passthru.names = [ "graceful-fs" ]; + passthru.names = [ "got" ]; }; - by-spec."graceful-fs"."3" = - self.by-version."graceful-fs"."3.0.2"; - by-spec."graceful-fs".">3.0.1 <4.0.0-0" = - self.by-version."graceful-fs"."3.0.2"; - by-spec."graceful-fs"."^3.0.0" = - self.by-version."graceful-fs"."3.0.2"; - by-spec."graceful-fs"."^3.0.2" = - self.by-version."graceful-fs"."3.0.2"; - by-spec."graceful-fs"."~1" = + by-spec."graceful-fs"."1.2" = self.by-version."graceful-fs"."1.2.3"; by-version."graceful-fs"."1.2.3" = lib.makeOverridable self.buildNodePackage { name = "graceful-fs-1.2.3"; @@ -7881,9 +10894,7 @@ ]; passthru.names = [ "graceful-fs" ]; }; - by-spec."graceful-fs"."~1.2.0" = - self.by-version."graceful-fs"."1.2.3"; - by-spec."graceful-fs"."~2.0.0" = + by-spec."graceful-fs"."2" = self.by-version."graceful-fs"."2.0.3"; by-version."graceful-fs"."2.0.3" = lib.makeOverridable self.buildNodePackage { name = "graceful-fs-2.0.3"; @@ -7903,24 +10914,64 @@ ]; passthru.names = [ "graceful-fs" ]; }; + by-spec."graceful-fs"."2 || 3" = + self.by-version."graceful-fs"."3.0.5"; + by-version."graceful-fs"."3.0.5" = lib.makeOverridable 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"; + }) + ]; + buildInputs = + (self.nativeDeps."graceful-fs" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "graceful-fs" ]; + }; + by-spec."graceful-fs"."3" = + self.by-version."graceful-fs"."3.0.5"; + by-spec."graceful-fs".">3.0.1 <4.0.0-0" = + self.by-version."graceful-fs"."3.0.5"; + by-spec."graceful-fs"."^3.0.0" = + self.by-version."graceful-fs"."3.0.5"; + by-spec."graceful-fs"."^3.0.2" = + self.by-version."graceful-fs"."3.0.5"; + by-spec."graceful-fs"."^3.0.4" = + self.by-version."graceful-fs"."3.0.5"; + by-spec."graceful-fs"."~1" = + self.by-version."graceful-fs"."1.2.3"; + by-spec."graceful-fs"."~1.2.0" = + self.by-version."graceful-fs"."1.2.3"; + by-spec."graceful-fs"."~2" = + self.by-version."graceful-fs"."2.0.3"; + by-spec."graceful-fs"."~2.0.0" = + self.by-version."graceful-fs"."2.0.3"; by-spec."graceful-fs"."~2.0.1" = self.by-version."graceful-fs"."2.0.3"; by-spec."graceful-fs"."~3.0.0" = - self.by-version."graceful-fs"."3.0.2"; + self.by-version."graceful-fs"."3.0.5"; by-spec."graceful-fs"."~3.0.1" = - self.by-version."graceful-fs"."3.0.2"; + self.by-version."graceful-fs"."3.0.5"; by-spec."graceful-fs"."~3.0.2" = - self.by-version."graceful-fs"."3.0.2"; + self.by-version."graceful-fs"."3.0.5"; + by-spec."graceful-fs"."~3.0.4" = + self.by-version."graceful-fs"."3.0.5"; by-spec."gridfs-stream"."*" = - self.by-version."gridfs-stream"."0.5.1"; - by-version."gridfs-stream"."0.5.1" = lib.makeOverridable self.buildNodePackage { - name = "gridfs-stream-0.5.1"; + self.by-version."gridfs-stream"."0.5.3"; + by-version."gridfs-stream"."0.5.3" = lib.makeOverridable self.buildNodePackage { + name = "gridfs-stream-0.5.3"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/gridfs-stream/-/gridfs-stream-0.5.1.tgz"; - name = "gridfs-stream-0.5.1.tgz"; - sha1 = "5fd94b0da4df1a602f7b0a02fb2365460d91b90c"; + url = "http://registry.npmjs.org/gridfs-stream/-/gridfs-stream-0.5.3.tgz"; + name = "gridfs-stream-0.5.3.tgz"; + sha1 = "c0896728fa3ea83f5fa3c9ced461afb7a036d149"; }) ]; buildInputs = @@ -7931,7 +10982,7 @@ ]; passthru.names = [ "gridfs-stream" ]; }; - "gridfs-stream" = self.by-version."gridfs-stream"."0.5.1"; + "gridfs-stream" = self.by-version."gridfs-stream"."0.5.3"; by-spec."growl"."1.7.x" = self.by-version."growl"."1.7.0"; by-version."growl"."1.7.0" = lib.makeOverridable self.buildNodePackage { @@ -7952,7 +11003,7 @@ ]; passthru.names = [ "growl" ]; }; - by-spec."growl"."1.8.x" = + by-spec."growl"."1.8.1" = self.by-version."growl"."1.8.1"; by-version."growl"."1.8.1" = lib.makeOverridable self.buildNodePackage { name = "growl-1.8.1"; @@ -8001,7 +11052,7 @@ "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; "lodash-0.9.2" = self.by-version."lodash"."0.9.2"; "underscore.string-2.2.1" = self.by-version."underscore.string"."2.2.1"; - "which-1.0.5" = self.by-version."which"."1.0.5"; + "which-1.0.7" = self.by-version."which"."1.0.7"; "js-yaml-2.0.5" = self.by-version."js-yaml"."2.0.5"; "exit-0.1.2" = self.by-version."exit"."0.1.2"; "getobject-0.1.0" = self.by-version."getobject"."0.1.0"; @@ -8058,7 +11109,7 @@ (self.nativeDeps."grunt-contrib-cssmin" or []); deps = { "chalk-0.4.0" = self.by-version."chalk"."0.4.0"; - "clean-css-2.2.16" = self.by-version."clean-css"."2.2.16"; + "clean-css-2.2.19" = self.by-version."clean-css"."2.2.19"; "maxmin-0.2.2" = self.by-version."maxmin"."0.2.2"; }; peerDependencies = [ @@ -8082,7 +11133,7 @@ buildInputs = (self.nativeDeps."grunt-contrib-jshint" or []); deps = { - "jshint-2.5.6" = self.by-version."jshint"."2.5.6"; + "jshint-2.5.10" = self.by-version."jshint"."2.5.10"; "hooker-0.2.3" = self.by-version."hooker"."0.2.3"; }; peerDependencies = [ @@ -8092,15 +11143,15 @@ }; "grunt-contrib-jshint" = self.by-version."grunt-contrib-jshint"."0.10.0"; by-spec."grunt-contrib-less"."*" = - self.by-version."grunt-contrib-less"."0.11.4"; - by-version."grunt-contrib-less"."0.11.4" = lib.makeOverridable self.buildNodePackage { - name = "grunt-contrib-less-0.11.4"; + self.by-version."grunt-contrib-less"."0.12.0"; + by-version."grunt-contrib-less"."0.12.0" = lib.makeOverridable self.buildNodePackage { + name = "grunt-contrib-less-0.12.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-0.11.4.tgz"; - name = "grunt-contrib-less-0.11.4.tgz"; - sha1 = "5667475ac4517f32ca623b9a4d81d6cf4aed2b51"; + url = "http://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-0.12.0.tgz"; + name = "grunt-contrib-less-0.12.0.tgz"; + sha1 = "ee6a41b5f94bbe96b5f0d86b16e061c114b954be"; }) ]; buildInputs = @@ -8117,7 +11168,7 @@ ]; passthru.names = [ "grunt-contrib-less" ]; }; - "grunt-contrib-less" = self.by-version."grunt-contrib-less"."0.11.4"; + "grunt-contrib-less" = self.by-version."grunt-contrib-less"."0.12.0"; by-spec."grunt-contrib-requirejs"."*" = self.by-version."grunt-contrib-requirejs"."0.4.4"; by-version."grunt-contrib-requirejs"."0.4.4" = lib.makeOverridable self.buildNodePackage { @@ -8187,7 +11238,7 @@ }; peerDependencies = [ self.by-version."grunt"."0.4.5" - self.by-version."karma"."0.12.24" + self.by-version."karma"."0.12.28" ]; passthru.names = [ "grunt-karma" ]; }; @@ -8237,7 +11288,7 @@ "exit-0.1.2" = self.by-version."exit"."0.1.2"; "underscore.string-2.2.1" = self.by-version."underscore.string"."2.2.1"; "getobject-0.1.0" = self.by-version."getobject"."0.1.0"; - "which-1.0.5" = self.by-version."which"."1.0.5"; + "which-1.0.7" = self.by-version."which"."1.0.7"; }; peerDependencies = [ ]; @@ -8282,7 +11333,7 @@ (self.nativeDeps."guifi-earth" or []); deps = { "coffee-script-1.8.0" = self.by-version."coffee-script"."1.8.0"; - "jade-1.7.0" = self.by-version."jade"."1.7.0"; + "jade-1.8.1" = self.by-version."jade"."1.8.1"; "q-2.0.2" = self.by-version."q"."2.0.2"; "xml2js-0.4.4" = self.by-version."xml2js"."0.4.4"; "msgpack-0.2.4" = self.by-version."msgpack"."0.2.4"; @@ -8293,38 +11344,39 @@ }; "guifi-earth" = self.by-version."guifi-earth"."0.2.1"; by-spec."gulp"."*" = - self.by-version."gulp"."3.8.8"; - by-version."gulp"."3.8.8" = lib.makeOverridable self.buildNodePackage { - name = "gulp-3.8.8"; + self.by-version."gulp"."3.8.10"; + by-version."gulp"."3.8.10" = lib.makeOverridable self.buildNodePackage { + name = "gulp-3.8.10"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/gulp/-/gulp-3.8.8.tgz"; - name = "gulp-3.8.8.tgz"; - sha1 = "0b0473e7cdfd04c785184513938397d4552cfe96"; + url = "http://registry.npmjs.org/gulp/-/gulp-3.8.10.tgz"; + name = "gulp-3.8.10.tgz"; + sha1 = "bfb8fc156be97820f02a7f8b3af61a86666f9e31"; }) ]; buildInputs = (self.nativeDeps."gulp" or []); deps = { - "archy-0.0.2" = self.by-version."archy"."0.0.2"; + "archy-1.0.0" = self.by-version."archy"."1.0.0"; "chalk-0.5.1" = self.by-version."chalk"."0.5.1"; "deprecated-0.0.1" = self.by-version."deprecated"."0.0.1"; "gulp-util-3.0.1" = self.by-version."gulp-util"."3.0.1"; - "interpret-0.3.7" = self.by-version."interpret"."0.3.7"; - "liftoff-0.12.1" = self.by-version."liftoff"."0.12.1"; + "interpret-0.3.8" = self.by-version."interpret"."0.3.8"; + "liftoff-0.13.6" = self.by-version."liftoff"."0.13.6"; "minimist-1.1.0" = self.by-version."minimist"."1.1.0"; "orchestrator-0.3.7" = self.by-version."orchestrator"."0.3.7"; "pretty-hrtime-0.2.2" = self.by-version."pretty-hrtime"."0.2.2"; - "semver-3.0.1" = self.by-version."semver"."3.0.1"; + "semver-4.1.0" = self.by-version."semver"."4.1.0"; "tildify-1.0.0" = self.by-version."tildify"."1.0.0"; - "vinyl-fs-0.3.8" = self.by-version."vinyl-fs"."0.3.8"; + "v8flags-1.0.5" = self.by-version."v8flags"."1.0.5"; + "vinyl-fs-0.3.13" = self.by-version."vinyl-fs"."0.3.13"; }; peerDependencies = [ ]; passthru.names = [ "gulp" ]; }; - "gulp" = self.by-version."gulp"."3.8.8"; + "gulp" = self.by-version."gulp"."3.8.10"; by-spec."gulp-util"."^3.0.0" = self.by-version."gulp-util"."3.0.1"; by-version."gulp-util"."3.0.1" = lib.makeOverridable self.buildNodePackage { @@ -8341,14 +11393,14 @@ (self.nativeDeps."gulp-util" or []); deps = { "chalk-0.5.1" = self.by-version."chalk"."0.5.1"; - "dateformat-1.0.8" = self.by-version."dateformat"."1.0.8"; + "dateformat-1.0.11" = self.by-version."dateformat"."1.0.11"; "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; "lodash._reinterpolate-2.4.1" = self.by-version."lodash._reinterpolate"."2.4.1"; "lodash.template-2.4.1" = self.by-version."lodash.template"."2.4.1"; "minimist-1.1.0" = self.by-version."minimist"."1.1.0"; - "multipipe-0.1.1" = self.by-version."multipipe"."0.1.1"; - "through2-0.6.2" = self.by-version."through2"."0.6.2"; - "vinyl-0.4.3" = self.by-version."vinyl"."0.4.3"; + "multipipe-0.1.2" = self.by-version."multipipe"."0.1.2"; + "through2-0.6.3" = self.by-version."through2"."0.6.3"; + "vinyl-0.4.5" = self.by-version."vinyl"."0.4.5"; }; peerDependencies = [ ]; @@ -8369,7 +11421,7 @@ buildInputs = (self.nativeDeps."gzip-size" or []); deps = { - "concat-stream-1.4.6" = self.by-version."concat-stream"."1.4.6"; + "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7"; "zlib-browserify-0.0.3" = self.by-version."zlib-browserify"."0.0.3"; }; peerDependencies = [ @@ -8391,7 +11443,7 @@ buildInputs = (self.nativeDeps."gzip-size" or []); deps = { - "concat-stream-1.4.6" = self.by-version."concat-stream"."1.4.6"; + "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7"; "browserify-zlib-0.1.4" = self.by-version."browserify-zlib"."0.1.4"; }; peerDependencies = [ @@ -8413,7 +11465,7 @@ buildInputs = (self.nativeDeps."gzip-size" or []); deps = { - "concat-stream-1.4.6" = self.by-version."concat-stream"."1.4.6"; + "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7"; "browserify-zlib-0.1.4" = self.by-version."browserify-zlib"."0.1.4"; }; peerDependencies = [ @@ -8435,7 +11487,7 @@ buildInputs = (self.nativeDeps."gzippo" or []); deps = { - "send-0.9.3" = self.by-version."send"."0.9.3"; + "send-0.10.1" = self.by-version."send"."0.10.1"; }; peerDependencies = [ ]; @@ -8464,6 +11516,28 @@ ]; passthru.names = [ "handlebars" ]; }; + by-spec."handlebars"."~2.0.0" = + self.by-version."handlebars"."2.0.0"; + by-version."handlebars"."2.0.0" = lib.makeOverridable self.buildNodePackage { + name = "handlebars-2.0.0"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/handlebars/-/handlebars-2.0.0.tgz"; + name = "handlebars-2.0.0.tgz"; + sha1 = "6e9d7f8514a3467fa5e9f82cc158ecfc1d5ac76f"; + }) + ]; + buildInputs = + (self.nativeDeps."handlebars" or []); + deps = { + "optimist-0.3.7" = self.by-version."optimist"."0.3.7"; + "uglify-js-2.3.6" = self.by-version."uglify-js"."2.3.6"; + }; + peerDependencies = [ + ]; + passthru.names = [ "handlebars" ]; + }; by-spec."has-ansi"."^0.1.0" = self.by-version."has-ansi"."0.1.0"; by-version."has-ansi"."0.1.0" = lib.makeOverridable self.buildNodePackage { @@ -8505,6 +11579,26 @@ ]; passthru.names = [ "has-color" ]; }; + by-spec."hash.js"."^0.2.0" = + self.by-version."hash.js"."0.2.1"; + by-version."hash.js"."0.2.1" = lib.makeOverridable self.buildNodePackage { + name = "hash.js-0.2.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/hash.js/-/hash.js-0.2.1.tgz"; + name = "hash.js-0.2.1.tgz"; + sha1 = "30a06810932478e53c0c4509fe7f1db62e38c6ff"; + }) + ]; + buildInputs = + (self.nativeDeps."hash.js" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "hash.js" ]; + }; by-spec."hasher"."~1.2.0" = self.by-version."hasher"."1.2.0"; by-version."hasher"."1.2.0" = lib.makeOverridable self.buildNodePackage { @@ -8568,6 +11662,12 @@ ]; passthru.names = [ "hat" ]; }; + by-spec."hat"."0.0.3" = + self.by-version."hat"."0.0.3"; + by-spec."hat"."^0.0.3" = + self.by-version."hat"."0.0.3"; + by-spec."hat"."~0.0.3" = + self.by-version."hat"."0.0.3"; by-spec."hawk"."1.1.1" = self.by-version."hawk"."1.1.1"; by-version."hawk"."1.1.1" = lib.makeOverridable self.buildNodePackage { @@ -8616,6 +11716,30 @@ ]; passthru.names = [ "hawk" ]; }; + by-spec."hawk"."~0.13.0" = + self.by-version."hawk"."0.13.1"; + by-version."hawk"."0.13.1" = lib.makeOverridable self.buildNodePackage { + name = "hawk-0.13.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/hawk/-/hawk-0.13.1.tgz"; + name = "hawk-0.13.1.tgz"; + sha1 = "3617958821f58311e4d7f6de291fca662b412ef4"; + }) + ]; + buildInputs = + (self.nativeDeps."hawk" or []); + deps = { + "hoek-0.8.5" = self.by-version."hoek"."0.8.5"; + "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 = [ + ]; + passthru.names = [ "hawk" ]; + }; by-spec."hawk"."~1.0.0" = self.by-version."hawk"."1.0.0"; by-version."hawk"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -8727,6 +11851,26 @@ ]; passthru.names = [ "hoek" ]; }; + by-spec."hoek"."0.8.x" = + self.by-version."hoek"."0.8.5"; + by-version."hoek"."0.8.5" = lib.makeOverridable self.buildNodePackage { + name = "hoek-0.8.5"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/hoek/-/hoek-0.8.5.tgz"; + name = "hoek-0.8.5.tgz"; + sha1 = "1e9fd770ef7ebe0274adfcb5b0806a025a5e4e9f"; + }) + ]; + buildInputs = + (self.nativeDeps."hoek" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "hoek" ]; + }; by-spec."hoek"."0.9.x" = self.by-version."hoek"."0.9.1"; by-version."hoek"."0.9.1" = lib.makeOverridable self.buildNodePackage { @@ -8787,24 +11931,24 @@ ]; passthru.names = [ "hooks" ]; }; - by-spec."htmlparser2"."3.7.x" = - self.by-version."htmlparser2"."3.7.3"; - by-version."htmlparser2"."3.7.3" = lib.makeOverridable self.buildNodePackage { - name = "htmlparser2-3.7.3"; + by-spec."htmlparser2"."3.8.x" = + self.by-version."htmlparser2"."3.8.2"; + by-version."htmlparser2"."3.8.2" = lib.makeOverridable self.buildNodePackage { + name = "htmlparser2-3.8.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.7.3.tgz"; - name = "htmlparser2-3.7.3.tgz"; - sha1 = "6a64c77637c08c6f30ec2a8157a53333be7cb05e"; + url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.2.tgz"; + name = "htmlparser2-3.8.2.tgz"; + sha1 = "0d6bc3471d01e9766fc2c274cbac1d55b36c009c"; }) ]; buildInputs = (self.nativeDeps."htmlparser2" or []); deps = { - "domhandler-2.2.0" = self.by-version."domhandler"."2.2.0"; + "domhandler-2.3.0" = self.by-version."domhandler"."2.3.0"; "domutils-1.5.0" = self.by-version."domutils"."1.5.0"; - "domelementtype-1.1.1" = self.by-version."domelementtype"."1.1.1"; + "domelementtype-1.1.3" = self.by-version."domelementtype"."1.1.3"; "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; "entities-1.0.0" = self.by-version."entities"."1.0.0"; }; @@ -8856,6 +12000,72 @@ ]; passthru.names = [ "http-browserify" ]; }; + by-spec."http-browserify"."~1.1.0" = + self.by-version."http-browserify"."1.1.0"; + by-version."http-browserify"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "http-browserify-1.1.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/http-browserify/-/http-browserify-1.1.0.tgz"; + name = "http-browserify-1.1.0.tgz"; + sha1 = "20d0f6fdab370d1fe778d44a7bc48ddb7260206d"; + }) + ]; + buildInputs = + (self.nativeDeps."http-browserify" or []); + deps = { + "Base64-0.2.1" = self.by-version."Base64"."0.2.1"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "http-browserify" ]; + }; + by-spec."http-browserify"."~1.3.1" = + self.by-version."http-browserify"."1.3.2"; + by-version."http-browserify"."1.3.2" = lib.makeOverridable self.buildNodePackage { + name = "http-browserify-1.3.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/http-browserify/-/http-browserify-1.3.2.tgz"; + name = "http-browserify-1.3.2.tgz"; + sha1 = "b562c34479349a690d7a6597df495aefa8c604f5"; + }) + ]; + buildInputs = + (self.nativeDeps."http-browserify" or []); + deps = { + "Base64-0.2.1" = self.by-version."Base64"."0.2.1"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "http-browserify" ]; + }; + by-spec."http-errors"."~1.2.7" = + self.by-version."http-errors"."1.2.7"; + by-version."http-errors"."1.2.7" = lib.makeOverridable self.buildNodePackage { + name = "http-errors-1.2.7"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/http-errors/-/http-errors-1.2.7.tgz"; + name = "http-errors-1.2.7.tgz"; + sha1 = "b881fa12c59b0079fd4ced456bf8dbc9610d3b78"; + }) + ]; + buildInputs = + (self.nativeDeps."http-errors" or []); + deps = { + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + "statuses-1.2.0" = self.by-version."statuses"."1.2.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "http-errors" ]; + }; by-spec."http-proxy"."1.0.2" = self.by-version."http-proxy"."1.0.2"; by-version."http-proxy"."1.0.2" = lib.makeOverridable self.buildNodePackage { @@ -8871,7 +12081,7 @@ buildInputs = (self.nativeDeps."http-proxy" or []); deps = { - "eventemitter3-0.1.5" = self.by-version."eventemitter3"."0.1.5"; + "eventemitter3-0.1.6" = self.by-version."eventemitter3"."0.1.6"; }; peerDependencies = [ ]; @@ -8947,6 +12157,8 @@ ]; passthru.names = [ "http-signature" ]; }; + by-spec."http-signature"."~0.9.11" = + self.by-version."http-signature"."0.9.11"; by-spec."https-browserify"."~0.0.0" = self.by-version."https-browserify"."0.0.0"; by-version."https-browserify"."0.0.0" = lib.makeOverridable self.buildNodePackage { @@ -9029,29 +12241,30 @@ passthru.names = [ "i18next" ]; }; "i18next" = self.by-version."i18next"."1.7.4"; - by-spec."ibrik"."~1.1.1" = - self.by-version."ibrik"."1.1.1"; - by-version."ibrik"."1.1.1" = lib.makeOverridable self.buildNodePackage { - name = "ibrik-1.1.1"; + by-spec."ibrik"."~2.0.0" = + self.by-version."ibrik"."2.0.0"; + by-version."ibrik"."2.0.0" = lib.makeOverridable self.buildNodePackage { + name = "ibrik-2.0.0"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/ibrik/-/ibrik-1.1.1.tgz"; - name = "ibrik-1.1.1.tgz"; - sha1 = "c9bd04c5137e967a2f0dbc9e4eb31dbfa04801b5"; + url = "http://registry.npmjs.org/ibrik/-/ibrik-2.0.0.tgz"; + name = "ibrik-2.0.0.tgz"; + sha1 = "89a2434f2a5c82b92166c3d97de3b5636eea2e9c"; }) ]; buildInputs = (self.nativeDeps."ibrik" or []); deps = { "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; - "coffee-script-redux-2.0.0-beta8" = self.by-version."coffee-script-redux"."2.0.0-beta8"; - "istanbul-0.2.16" = self.by-version."istanbul"."0.2.16"; - "estraverse-1.5.1" = self.by-version."estraverse"."1.5.1"; - "escodegen-1.1.0" = self.by-version."escodegen"."1.1.0"; - "which-1.0.5" = self.by-version."which"."1.0.5"; - "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; + "coffee-script-1.8.0" = self.by-version."coffee-script"."1.8.0"; + "istanbul-0.3.2" = self.by-version."istanbul"."0.3.2"; + "estraverse-1.8.0" = self.by-version."estraverse"."1.8.0"; + "which-1.0.7" = self.by-version."which"."1.0.7"; + "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "optimist-0.6.1" = self.by-version."optimist"."0.6.1"; + "esprima-1.2.2" = self.by-version."esprima"."1.2.2"; + "fileset-0.1.5" = self.by-version."fileset"."0.1.5"; }; peerDependencies = [ ]; @@ -9077,6 +12290,26 @@ ]; passthru.names = [ "iconv-lite" ]; }; + by-spec."iconv-lite"."0.4.5" = + self.by-version."iconv-lite"."0.4.5"; + by-version."iconv-lite"."0.4.5" = lib.makeOverridable self.buildNodePackage { + name = "iconv-lite-0.4.5"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.5.tgz"; + name = "iconv-lite-0.4.5.tgz"; + sha1 = "9c574b70c30d615859f2064d2be4335ad6b1a8d6"; + }) + ]; + buildInputs = + (self.nativeDeps."iconv-lite" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "iconv-lite" ]; + }; by-spec."iconv-lite"."~0.2.11" = self.by-version."iconv-lite"."0.2.11"; by-version."iconv-lite"."0.2.11" = lib.makeOverridable self.buildNodePackage { @@ -9097,8 +12330,8 @@ ]; passthru.names = [ "iconv-lite" ]; }; - by-spec."iconv-lite"."~0.4.3" = - self.by-version."iconv-lite"."0.4.4"; + by-spec."iconv-lite"."~0.4.4" = + self.by-version."iconv-lite"."0.4.5"; by-spec."ieee754"."^1.1.4" = self.by-version."ieee754"."1.1.4"; by-version."ieee754"."1.1.4" = lib.makeOverridable self.buildNodePackage { @@ -9119,6 +12352,31 @@ ]; passthru.names = [ "ieee754" ]; }; + by-spec."ieee754"."~1.1.1" = + self.by-version."ieee754"."1.1.4"; + by-spec."indent-string"."^1.1.0" = + self.by-version."indent-string"."1.2.0"; + by-version."indent-string"."1.2.0" = lib.makeOverridable self.buildNodePackage { + name = "indent-string-1.2.0"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/indent-string/-/indent-string-1.2.0.tgz"; + name = "indent-string-1.2.0.tgz"; + sha1 = "4d747797d66745bd54c6a289f5ce19f51750a4b9"; + }) + ]; + buildInputs = + (self.nativeDeps."indent-string" or []); + deps = { + "get-stdin-3.0.2" = self.by-version."get-stdin"."3.0.2"; + "minimist-1.1.0" = self.by-version."minimist"."1.1.0"; + "repeating-1.1.0" = self.by-version."repeating"."1.1.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "indent-string" ]; + }; by-spec."indexof"."0.0.1" = self.by-version."indexof"."0.0.1"; by-version."indexof"."0.0.1" = lib.makeOverridable self.buildNodePackage { @@ -9139,7 +12397,7 @@ ]; passthru.names = [ "indexof" ]; }; - by-spec."inflight"."~1.0.3" = + by-spec."inflight"."^1.0.4" = self.by-version."inflight"."1.0.4"; by-version."inflight"."1.0.4" = lib.makeOverridable self.buildNodePackage { name = "inflight-1.0.4"; @@ -9161,6 +12419,8 @@ ]; passthru.names = [ "inflight" ]; }; + by-spec."inflight"."~1.0.4" = + self.by-version."inflight"."1.0.4"; by-spec."inherits"."1" = self.by-version."inherits"."1.0.0"; by-version."inherits"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -9214,15 +12474,15 @@ by-spec."inherits"."~2.0.1" = self.by-version."inherits"."2.0.1"; by-spec."ini"."1" = - self.by-version."ini"."1.3.0"; - by-version."ini"."1.3.0" = lib.makeOverridable self.buildNodePackage { - name = "ini-1.3.0"; + self.by-version."ini"."1.3.2"; + by-version."ini"."1.3.2" = lib.makeOverridable self.buildNodePackage { + name = "ini-1.3.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/ini/-/ini-1.3.0.tgz"; - name = "ini-1.3.0.tgz"; - sha1 = "625483e56c643a7721014c76604d3353f44bd429"; + url = "http://registry.npmjs.org/ini/-/ini-1.3.2.tgz"; + name = "ini-1.3.2.tgz"; + sha1 = "9ebf4a44daf9d89acd07aab9f89a083d887f6dec"; }) ]; buildInputs = @@ -9234,9 +12494,9 @@ passthru.names = [ "ini" ]; }; by-spec."ini"."1.x.x" = - self.by-version."ini"."1.3.0"; + self.by-version."ini"."1.3.2"; by-spec."ini"."^1.2.0" = - self.by-version."ini"."1.3.0"; + self.by-version."ini"."1.3.2"; by-spec."ini"."~1.1.0" = self.by-version."ini"."1.1.0"; by-version."ini"."1.1.0" = lib.makeOverridable self.buildNodePackage { @@ -9257,46 +12517,77 @@ ]; passthru.names = [ "ini" ]; }; - by-spec."ini"."~1.2.0" = - self.by-version."ini"."1.2.1"; - by-version."ini"."1.2.1" = lib.makeOverridable self.buildNodePackage { - name = "ini-1.2.1"; + by-spec."ini"."~1.3.2" = + self.by-version."ini"."1.3.2"; + by-spec."init-package-json"."0.0.10" = + self.by-version."init-package-json"."0.0.10"; + by-version."init-package-json"."0.0.10" = lib.makeOverridable self.buildNodePackage { + name = "init-package-json-0.0.10"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/ini/-/ini-1.2.1.tgz"; - name = "ini-1.2.1.tgz"; - sha1 = "7f774e2f22752cd1dacbf9c63323df2a164ebca3"; + url = "http://registry.npmjs.org/init-package-json/-/init-package-json-0.0.10.tgz"; + name = "init-package-json-0.0.10.tgz"; + sha1 = "7baf10535227e0878105a04e44b78f132475da6a"; }) ]; buildInputs = - (self.nativeDeps."ini" or []); + (self.nativeDeps."init-package-json" or []); + deps = { + "promzard-0.2.2" = self.by-version."promzard"."0.2.2"; + "read-1.0.5" = self.by-version."read"."1.0.5"; + "read-package-json-1.2.7" = self.by-version."read-package-json"."1.2.7"; + "semver-2.3.2" = self.by-version."semver"."2.3.2"; + }; + peerDependencies = [ + ]; + passthru.names = [ "init-package-json" ]; + }; + by-spec."init-package-json"."0.0.14" = + self.by-version."init-package-json"."0.0.14"; + by-version."init-package-json"."0.0.14" = lib.makeOverridable self.buildNodePackage { + name = "init-package-json-0.0.14"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/init-package-json/-/init-package-json-0.0.14.tgz"; + name = "init-package-json-0.0.14.tgz"; + sha1 = "bd5f7b2d73b54957388cca3ce61190340c8a05b7"; + }) + ]; + buildInputs = + (self.nativeDeps."init-package-json" or []); deps = { + "promzard-0.2.2" = self.by-version."promzard"."0.2.2"; + "read-1.0.5" = self.by-version."read"."1.0.5"; + "read-package-json-1.2.7" = self.by-version."read-package-json"."1.2.7"; + "semver-2.3.2" = self.by-version."semver"."2.3.2"; + "glob-3.2.11" = self.by-version."glob"."3.2.11"; }; peerDependencies = [ ]; - passthru.names = [ "ini" ]; + passthru.names = [ "init-package-json" ]; }; - by-spec."init-package-json"."~1.1.0" = - self.by-version."init-package-json"."1.1.0"; - by-version."init-package-json"."1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "init-package-json-1.1.0"; + by-spec."init-package-json"."~1.1.2" = + self.by-version."init-package-json"."1.1.2"; + by-version."init-package-json"."1.1.2" = lib.makeOverridable self.buildNodePackage { + name = "init-package-json-1.1.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/init-package-json/-/init-package-json-1.1.0.tgz"; - name = "init-package-json-1.1.0.tgz"; - sha1 = "fea80c641974421ddd4c6169c3a911118b116d5c"; + url = "http://registry.npmjs.org/init-package-json/-/init-package-json-1.1.2.tgz"; + name = "init-package-json-1.1.2.tgz"; + sha1 = "bc6c02d1da87253141600972f0d6bdcdd016990e"; }) ]; buildInputs = (self.nativeDeps."init-package-json" or []); deps = { - "glob-4.0.6" = self.by-version."glob"."4.0.6"; + "glob-4.2.2" = self.by-version."glob"."4.2.2"; "promzard-0.2.2" = self.by-version."promzard"."0.2.2"; "read-1.0.5" = self.by-version."read"."1.0.5"; "read-package-json-1.2.7" = self.by-version."read-package-json"."1.2.7"; - "semver-4.0.3" = self.by-version."semver"."4.0.3"; + "semver-4.1.0" = self.by-version."semver"."4.1.0"; }; peerDependencies = [ ]; @@ -9323,6 +12614,61 @@ ]; passthru.names = [ "inline-source-map" ]; }; + by-spec."inquirer"."0.7.1" = + self.by-version."inquirer"."0.7.1"; + by-version."inquirer"."0.7.1" = lib.makeOverridable self.buildNodePackage { + name = "inquirer-0.7.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/inquirer/-/inquirer-0.7.1.tgz"; + name = "inquirer-0.7.1.tgz"; + sha1 = "b8acf140165bd581862ed1198fb6d26430091fac"; + }) + ]; + buildInputs = + (self.nativeDeps."inquirer" or []); + deps = { + "chalk-0.5.1" = self.by-version."chalk"."0.5.1"; + "cli-color-0.3.2" = self.by-version."cli-color"."0.3.2"; + "figures-1.3.5" = self.by-version."figures"."1.3.5"; + "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; + "mute-stream-0.0.4" = self.by-version."mute-stream"."0.0.4"; + "readline2-0.1.0" = self.by-version."readline2"."0.1.0"; + "rx-2.3.18" = self.by-version."rx"."2.3.18"; + "through-2.3.6" = self.by-version."through"."2.3.6"; + }; + peerDependencies = [ + ]; + passthru.names = [ "inquirer" ]; + }; + by-spec."inquirer"."^0.6.0" = + self.by-version."inquirer"."0.6.0"; + by-version."inquirer"."0.6.0" = lib.makeOverridable self.buildNodePackage { + name = "inquirer-0.6.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/inquirer/-/inquirer-0.6.0.tgz"; + name = "inquirer-0.6.0.tgz"; + sha1 = "614d7bb3e48f9e6a8028e94a0c38f23ef29823d3"; + }) + ]; + buildInputs = + (self.nativeDeps."inquirer" or []); + deps = { + "chalk-0.5.1" = self.by-version."chalk"."0.5.1"; + "cli-color-0.3.2" = self.by-version."cli-color"."0.3.2"; + "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; + "mute-stream-0.0.4" = self.by-version."mute-stream"."0.0.4"; + "readline2-0.1.0" = self.by-version."readline2"."0.1.0"; + "rx-2.3.18" = self.by-version."rx"."2.3.18"; + "through-2.3.6" = self.by-version."through"."2.3.6"; + }; + peerDependencies = [ + ]; + passthru.names = [ "inquirer" ]; + }; by-spec."insert-module-globals"."^6.1.0" = self.by-version."insert-module-globals"."6.1.0"; by-version."insert-module-globals"."6.1.0" = lib.makeOverridable self.buildNodePackage { @@ -9339,7 +12685,7 @@ (self.nativeDeps."insert-module-globals" or []); deps = { "JSONStream-0.7.4" = self.by-version."JSONStream"."0.7.4"; - "concat-stream-1.4.6" = self.by-version."concat-stream"."1.4.6"; + "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7"; "lexical-scope-1.1.0" = self.by-version."lexical-scope"."1.1.0"; "process-0.6.0" = self.by-version."process"."0.6.0"; "through-2.3.6" = self.by-version."through"."2.3.6"; @@ -9349,16 +12695,124 @@ ]; passthru.names = [ "insert-module-globals" ]; }; + by-spec."insert-module-globals"."~2.3.0" = + self.by-version."insert-module-globals"."2.3.4"; + by-version."insert-module-globals"."2.3.4" = lib.makeOverridable self.buildNodePackage { + name = "insert-module-globals-2.3.4"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/insert-module-globals/-/insert-module-globals-2.3.4.tgz"; + name = "insert-module-globals-2.3.4.tgz"; + sha1 = "e920cd470bcf1f47713eac6cc5cc13437e1a9e7e"; + }) + ]; + buildInputs = + (self.nativeDeps."insert-module-globals" or []); + deps = { + "commondir-0.0.1" = self.by-version."commondir"."0.0.1"; + "lexical-scope-0.0.15" = self.by-version."lexical-scope"."0.0.15"; + "process-0.5.2" = self.by-version."process"."0.5.2"; + "through-2.3.6" = self.by-version."through"."2.3.6"; + "duplexer-0.1.1" = self.by-version."duplexer"."0.1.1"; + "JSONStream-0.7.4" = self.by-version."JSONStream"."0.7.4"; + "defined-0.0.0" = self.by-version."defined"."0.0.0"; + "native-buffer-browserify-2.0.17" = self.by-version."native-buffer-browserify"."2.0.17"; + "browserify-3.24.13" = self.by-version."browserify"."3.24.13"; + }; + peerDependencies = [ + ]; + passthru.names = [ "insert-module-globals" ]; + }; + by-spec."insert-module-globals"."~3.1.2" = + self.by-version."insert-module-globals"."3.1.3"; + by-version."insert-module-globals"."3.1.3" = lib.makeOverridable self.buildNodePackage { + name = "insert-module-globals-3.1.3"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/insert-module-globals/-/insert-module-globals-3.1.3.tgz"; + name = "insert-module-globals-3.1.3.tgz"; + sha1 = "d5b80e3a9c86d2bf9a522baee3c14f00d931038a"; + }) + ]; + buildInputs = + (self.nativeDeps."insert-module-globals" or []); + deps = { + "lexical-scope-0.1.0" = self.by-version."lexical-scope"."0.1.0"; + "process-0.5.2" = self.by-version."process"."0.5.2"; + "through-2.3.6" = self.by-version."through"."2.3.6"; + "JSONStream-0.7.4" = self.by-version."JSONStream"."0.7.4"; + "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7"; + }; + peerDependencies = [ + ]; + passthru.names = [ "insert-module-globals" ]; + }; + by-spec."insert-module-globals"."~5.0.1" = + self.by-version."insert-module-globals"."5.0.1"; + by-version."insert-module-globals"."5.0.1" = lib.makeOverridable self.buildNodePackage { + name = "insert-module-globals-5.0.1"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/insert-module-globals/-/insert-module-globals-5.0.1.tgz"; + name = "insert-module-globals-5.0.1.tgz"; + sha1 = "eec9c0dfad30380e8eda313a094165dc2f2350d2"; + }) + ]; + buildInputs = + (self.nativeDeps."insert-module-globals" or []); + deps = { + "JSONStream-0.7.4" = self.by-version."JSONStream"."0.7.4"; + "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7"; + "lexical-scope-1.1.0" = self.by-version."lexical-scope"."1.1.0"; + "process-0.6.0" = self.by-version."process"."0.6.0"; + "through-2.3.6" = self.by-version."through"."2.3.6"; + }; + peerDependencies = [ + ]; + passthru.names = [ "insert-module-globals" ]; + }; + by-spec."insight"."0.4.3" = + self.by-version."insight"."0.4.3"; + by-version."insight"."0.4.3" = lib.makeOverridable self.buildNodePackage { + name = "insight-0.4.3"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/insight/-/insight-0.4.3.tgz"; + name = "insight-0.4.3.tgz"; + sha1 = "76d653c5c0d8048b03cdba6385a6948f74614af0"; + }) + ]; + buildInputs = + (self.nativeDeps."insight" or []); + deps = { + "async-0.9.0" = self.by-version."async"."0.9.0"; + "chalk-0.5.1" = self.by-version."chalk"."0.5.1"; + "configstore-0.3.1" = self.by-version."configstore"."0.3.1"; + "inquirer-0.6.0" = self.by-version."inquirer"."0.6.0"; + "lodash.debounce-2.4.1" = self.by-version."lodash.debounce"."2.4.1"; + "object-assign-1.0.0" = self.by-version."object-assign"."1.0.0"; + "os-name-1.0.1" = self.by-version."os-name"."1.0.1"; + "request-2.49.0" = self.by-version."request"."2.49.0"; + "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "insight" ]; + }; by-spec."interpret"."^0.3.2" = - self.by-version."interpret"."0.3.7"; - by-version."interpret"."0.3.7" = lib.makeOverridable self.buildNodePackage { - name = "interpret-0.3.7"; + self.by-version."interpret"."0.3.8"; + by-version."interpret"."0.3.8" = lib.makeOverridable self.buildNodePackage { + name = "interpret-0.3.8"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/interpret/-/interpret-0.3.7.tgz"; - name = "interpret-0.3.7.tgz"; - sha1 = "18727eda04d50632ffa4b5eafb342b7ff398b36e"; + url = "http://registry.npmjs.org/interpret/-/interpret-0.3.8.tgz"; + name = "interpret-0.3.8.tgz"; + sha1 = "23c65e60ed18a3e21cddccf96e8a6658548cda8b"; }) ]; buildInputs = @@ -9369,16 +12823,97 @@ ]; passthru.names = [ "interpret" ]; }; - by-spec."ipaddr.js"."0.1.2" = - self.by-version."ipaddr.js"."0.1.2"; - by-version."ipaddr.js"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "ipaddr.js-0.1.2"; + by-spec."intersect"."~0.0.3" = + self.by-version."intersect"."0.0.3"; + by-version."intersect"."0.0.3" = lib.makeOverridable self.buildNodePackage { + name = "intersect-0.0.3"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.2.tgz"; - name = "ipaddr.js-0.1.2.tgz"; - sha1 = "6a1fd3d854f5002965c34d7bbcd9b4a8d4b0467e"; + url = "http://registry.npmjs.org/intersect/-/intersect-0.0.3.tgz"; + name = "intersect-0.0.3.tgz"; + sha1 = "c1a4a5e5eac6ede4af7504cc07e0ada7bc9f4920"; + }) + ]; + buildInputs = + (self.nativeDeps."intersect" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "intersect" ]; + }; + by-spec."ip"."^0.3.0" = + self.by-version."ip"."0.3.2"; + by-version."ip"."0.3.2" = lib.makeOverridable self.buildNodePackage { + name = "ip-0.3.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ip/-/ip-0.3.2.tgz"; + name = "ip-0.3.2.tgz"; + sha1 = "7d5ed34326688b36b6ab81f1865ea8266c28f0db"; + }) + ]; + buildInputs = + (self.nativeDeps."ip" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "ip" ]; + }; + by-spec."ip-regex"."^1.0.0" = + self.by-version."ip-regex"."1.0.1"; + by-version."ip-regex"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "ip-regex-1.0.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ip-regex/-/ip-regex-1.0.1.tgz"; + name = "ip-regex-1.0.1.tgz"; + sha1 = "3f1da464e47290591023a70617e45361b41123f7"; + }) + ]; + buildInputs = + (self.nativeDeps."ip-regex" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "ip-regex" ]; + }; + by-spec."ip-set"."^1.0.0" = + self.by-version."ip-set"."1.0.0"; + by-version."ip-set"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "ip-set-1.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ip-set/-/ip-set-1.0.0.tgz"; + name = "ip-set-1.0.0.tgz"; + sha1 = "54782fb5ae37ab6e697a2b49e07748d9e069dda6"; + }) + ]; + buildInputs = + (self.nativeDeps."ip-set" or []); + deps = { + "ip-0.3.2" = self.by-version."ip"."0.3.2"; + }; + peerDependencies = [ + ]; + passthru.names = [ "ip-set" ]; + }; + by-spec."ipaddr.js"."0.1.5" = + self.by-version."ipaddr.js"."0.1.5"; + by-version."ipaddr.js"."0.1.5" = lib.makeOverridable self.buildNodePackage { + name = "ipaddr.js-0.1.5"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.5.tgz"; + name = "ipaddr.js-0.1.5.tgz"; + sha1 = "33d2693c95fbd4715165328dbfe25fb4fb5bbed8"; }) ]; buildInputs = @@ -9389,16 +12924,16 @@ ]; passthru.names = [ "ipaddr.js" ]; }; - by-spec."ipaddr.js"."0.1.3" = - self.by-version."ipaddr.js"."0.1.3"; - by-version."ipaddr.js"."0.1.3" = lib.makeOverridable self.buildNodePackage { - name = "ipaddr.js-0.1.3"; + by-spec."ipaddr.js"."^0.1.5" = + self.by-version."ipaddr.js"."0.1.6"; + by-version."ipaddr.js"."0.1.6" = lib.makeOverridable self.buildNodePackage { + name = "ipaddr.js-0.1.6"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.3.tgz"; - name = "ipaddr.js-0.1.3.tgz"; - sha1 = "27a9ca37f148d2102b0ef191ccbf2c51a8f025c6"; + url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.6.tgz"; + name = "ipaddr.js-0.1.6.tgz"; + sha1 = "8f0530b217993873025fd4b72bdfd69bc56a9a12"; }) ]; buildInputs = @@ -9425,17 +12960,17 @@ (self.nativeDeps."ironhorse" or []); deps = { "underscore-1.5.2" = self.by-version."underscore"."1.5.2"; - "winston-0.8.0" = self.by-version."winston"."0.8.0"; - "nconf-0.6.9" = self.by-version."nconf"."0.6.9"; + "winston-0.8.3" = self.by-version."winston"."0.8.3"; + "nconf-0.7.1" = self.by-version."nconf"."0.7.1"; "fs-walk-0.0.1" = self.by-version."fs-walk"."0.0.1"; "async-0.9.0" = self.by-version."async"."0.9.0"; - "express-4.9.5" = self.by-version."express"."4.9.5"; - "jade-1.7.0" = self.by-version."jade"."1.7.0"; + "express-5.0.0-alpha.1" = self.by-version."express"."5.0.0-alpha.1"; + "jade-1.8.1" = self.by-version."jade"."1.8.1"; "passport-0.2.1" = self.by-version."passport"."0.2.1"; "passport-http-0.2.2" = self.by-version."passport-http"."0.2.2"; - "js-yaml-3.2.2" = self.by-version."js-yaml"."3.2.2"; - "mongoose-3.8.17" = self.by-version."mongoose"."3.8.17"; - "gridfs-stream-0.5.1" = self.by-version."gridfs-stream"."0.5.1"; + "js-yaml-3.2.3" = self.by-version."js-yaml"."3.2.3"; + "mongoose-3.8.19" = self.by-version."mongoose"."3.8.19"; + "gridfs-stream-0.5.3" = self.by-version."gridfs-stream"."0.5.3"; "temp-0.8.1" = self.by-version."temp"."0.8.1"; "kue-0.8.9" = self.by-version."kue"."0.8.9"; "redis-0.12.1" = self.by-version."redis"."0.12.1"; @@ -9466,6 +13001,47 @@ ]; passthru.names = [ "is-array" ]; }; + by-spec."is-finite"."^1.0.0" = + self.by-version."is-finite"."1.0.0"; + by-version."is-finite"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "is-finite-1.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/is-finite/-/is-finite-1.0.0.tgz"; + name = "is-finite-1.0.0.tgz"; + sha1 = "2b1dbad1162cdca6a4dc89f12b2f3dae12393282"; + }) + ]; + buildInputs = + (self.nativeDeps."is-finite" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "is-finite" ]; + }; + by-spec."is-ip"."^1.0.0" = + self.by-version."is-ip"."1.0.0"; + by-version."is-ip"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "is-ip-1.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/is-ip/-/is-ip-1.0.0.tgz"; + name = "is-ip-1.0.0.tgz"; + sha1 = "2bb6959f797ccd6f9fdc812758bcbc87c4c59074"; + }) + ]; + buildInputs = + (self.nativeDeps."is-ip" or []); + deps = { + "ip-regex-1.0.1" = self.by-version."ip-regex"."1.0.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "is-ip" ]; + }; by-spec."is-promise"."~1" = self.by-version."is-promise"."1.0.1"; by-version."is-promise"."1.0.1" = lib.makeOverridable self.buildNodePackage { @@ -9486,6 +13062,26 @@ ]; passthru.names = [ "is-promise" ]; }; + by-spec."is-root"."~1.0.0" = + self.by-version."is-root"."1.0.0"; + by-version."is-root"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "is-root-1.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/is-root/-/is-root-1.0.0.tgz"; + name = "is-root-1.0.0.tgz"; + sha1 = "07b6c233bc394cd9d02ba15c966bd6660d6342d5"; + }) + ]; + buildInputs = + (self.nativeDeps."is-root" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "is-root" ]; + }; by-spec."is-utf8"."^0.2.0" = self.by-version."is-utf8"."0.2.0"; by-version."is-utf8"."0.2.0" = lib.makeOverridable self.buildNodePackage { @@ -9528,50 +13124,36 @@ }; by-spec."isarray"."~0.0.1" = self.by-version."isarray"."0.0.1"; - by-spec."istanbul"."*" = - self.by-version."istanbul"."0.3.2"; - by-version."istanbul"."0.3.2" = lib.makeOverridable self.buildNodePackage { - name = "istanbul-0.3.2"; - bin = true; + by-spec."isstream"."0.1.x" = + self.by-version."isstream"."0.1.0"; + by-version."isstream"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "isstream-0.1.0"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/istanbul/-/istanbul-0.3.2.tgz"; - name = "istanbul-0.3.2.tgz"; - sha1 = "e1ce9a9ec80d51dcbbeca82149f3befdc21d6835"; + url = "http://registry.npmjs.org/isstream/-/isstream-0.1.0.tgz"; + name = "isstream-0.1.0.tgz"; + sha1 = "1fc062509b8c8902ee78d0a8d015ad3251472285"; }) ]; buildInputs = - (self.nativeDeps."istanbul" or []); + (self.nativeDeps."isstream" or []); deps = { - "esprima-1.2.2" = self.by-version."esprima"."1.2.2"; - "escodegen-1.3.3" = self.by-version."escodegen"."1.3.3"; - "handlebars-1.3.0" = self.by-version."handlebars"."1.3.0"; - "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; - "nopt-3.0.1" = self.by-version."nopt"."3.0.1"; - "fileset-0.1.5" = self.by-version."fileset"."0.1.5"; - "which-1.0.5" = self.by-version."which"."1.0.5"; - "async-0.9.0" = self.by-version."async"."0.9.0"; - "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5"; - "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2"; - "resolve-0.7.4" = self.by-version."resolve"."0.7.4"; - "js-yaml-3.2.2" = self.by-version."js-yaml"."3.2.2"; - "once-1.3.1" = self.by-version."once"."1.3.1"; }; peerDependencies = [ ]; - passthru.names = [ "istanbul" ]; + passthru.names = [ "isstream" ]; }; - "istanbul" = self.by-version."istanbul"."0.3.2"; - by-spec."istanbul"."~0.2.4" = - self.by-version."istanbul"."0.2.16"; - by-version."istanbul"."0.2.16" = lib.makeOverridable self.buildNodePackage { - name = "istanbul-0.2.16"; + by-spec."istanbul"."*" = + self.by-version."istanbul"."0.3.2"; + by-version."istanbul"."0.3.2" = lib.makeOverridable self.buildNodePackage { + name = "istanbul-0.3.2"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/istanbul/-/istanbul-0.2.16.tgz"; - name = "istanbul-0.2.16.tgz"; - sha1 = "870545a0d4f4b4ce161039e9e805a98c2c700bd9"; + url = "http://registry.npmjs.org/istanbul/-/istanbul-0.3.2.tgz"; + name = "istanbul-0.3.2.tgz"; + sha1 = "e1ce9a9ec80d51dcbbeca82149f3befdc21d6835"; }) ]; buildInputs = @@ -9583,48 +13165,52 @@ "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "nopt-3.0.1" = self.by-version."nopt"."3.0.1"; "fileset-0.1.5" = self.by-version."fileset"."0.1.5"; - "which-1.0.5" = self.by-version."which"."1.0.5"; + "which-1.0.7" = self.by-version."which"."1.0.7"; "async-0.9.0" = self.by-version."async"."0.9.0"; "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5"; "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2"; "resolve-0.7.4" = self.by-version."resolve"."0.7.4"; - "js-yaml-3.2.2" = self.by-version."js-yaml"."3.2.2"; + "js-yaml-3.2.3" = self.by-version."js-yaml"."3.2.3"; + "once-1.3.1" = self.by-version."once"."1.3.1"; }; peerDependencies = [ ]; passthru.names = [ "istanbul" ]; }; + "istanbul" = self.by-version."istanbul"."0.3.2"; by-spec."istanbul"."~0.3.0" = self.by-version."istanbul"."0.3.2"; + by-spec."istanbul"."~0.3.2" = + self.by-version."istanbul"."0.3.2"; by-spec."jade"."*" = - self.by-version."jade"."1.7.0"; - by-version."jade"."1.7.0" = lib.makeOverridable self.buildNodePackage { - name = "jade-1.7.0"; + self.by-version."jade"."1.8.1"; + by-version."jade"."1.8.1" = lib.makeOverridable self.buildNodePackage { + name = "jade-1.8.1"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/jade/-/jade-1.7.0.tgz"; - name = "jade-1.7.0.tgz"; - sha1 = "fa0251e9536cd363034ea88f61e99c7e98991524"; + url = "http://registry.npmjs.org/jade/-/jade-1.8.1.tgz"; + name = "jade-1.8.1.tgz"; + sha1 = "7f28dfd42832fda613e4a28fd0febb3f423c464f"; }) ]; buildInputs = (self.nativeDeps."jade" or []); deps = { - "character-parser-1.2.0" = self.by-version."character-parser"."1.2.0"; - "commander-2.1.0" = self.by-version."commander"."2.1.0"; - "constantinople-2.0.1" = self.by-version."constantinople"."2.0.1"; + "character-parser-1.2.1" = self.by-version."character-parser"."1.2.1"; + "commander-2.5.0" = self.by-version."commander"."2.5.0"; + "constantinople-3.0.1" = self.by-version."constantinople"."3.0.1"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "monocle-1.1.51" = self.by-version."monocle"."1.1.51"; "transformers-2.1.0" = self.by-version."transformers"."2.1.0"; "void-elements-1.0.0" = self.by-version."void-elements"."1.0.0"; - "with-3.0.1" = self.by-version."with"."3.0.1"; + "with-4.0.0" = self.by-version."with"."4.0.0"; }; peerDependencies = [ ]; passthru.names = [ "jade" ]; }; - "jade" = self.by-version."jade"."1.7.0"; + "jade" = self.by-version."jade"."1.8.1"; by-spec."jade"."0.26.3" = self.by-version."jade"."0.26.3"; by-version."jade"."0.26.3" = lib.makeOverridable self.buildNodePackage { @@ -9697,7 +13283,7 @@ passthru.names = [ "jade" ]; }; by-spec."jade".">= 0.0.1" = - self.by-version."jade"."1.7.0"; + self.by-version."jade"."1.8.1"; by-spec."jade"."~0.35.0" = self.by-version."jade"."0.35.0"; by-version."jade"."0.35.0" = lib.makeOverridable self.buildNodePackage { @@ -9747,16 +13333,41 @@ passthru.names = [ "jayschema" ]; }; "jayschema" = self.by-version."jayschema"."0.3.1"; + by-spec."jfs"."*" = + self.by-version."jfs"."0.2.3"; + by-version."jfs"."0.2.3" = lib.makeOverridable self.buildNodePackage { + name = "jfs-0.2.3"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/jfs/-/jfs-0.2.3.tgz"; + name = "jfs-0.2.3.tgz"; + sha1 = "1b87551f83055e69b509fe8c3066d0c702b01574"; + }) + ]; + buildInputs = + (self.nativeDeps."jfs" or []); + deps = { + "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; + "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; + "async-0.9.0" = self.by-version."async"."0.9.0"; + "clone-0.1.18" = self.by-version."clone"."0.1.18"; + }; + peerDependencies = [ + ]; + passthru.names = [ "jfs" ]; + }; + "jfs" = self.by-version."jfs"."0.2.3"; by-spec."js-yaml"."*" = - self.by-version."js-yaml"."3.2.2"; - by-version."js-yaml"."3.2.2" = lib.makeOverridable self.buildNodePackage { - name = "js-yaml-3.2.2"; + self.by-version."js-yaml"."3.2.3"; + by-version."js-yaml"."3.2.3" = lib.makeOverridable self.buildNodePackage { + name = "js-yaml-3.2.3"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.2.2.tgz"; - name = "js-yaml-3.2.2.tgz"; - sha1 = "a34e77fe8d5e10270e225d21d07790fa17fd2927"; + url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.2.3.tgz"; + name = "js-yaml-3.2.3.tgz"; + sha1 = "a3af632d13df5bfa95f3b8f3c4b61efe212cd750"; }) ]; buildInputs = @@ -9769,7 +13380,7 @@ ]; passthru.names = [ "js-yaml" ]; }; - "js-yaml" = self.by-version."js-yaml"."3.2.2"; + "js-yaml" = self.by-version."js-yaml"."3.2.3"; by-spec."js-yaml"."0.3.x" = self.by-version."js-yaml"."0.3.7"; by-version."js-yaml"."0.3.7" = lib.makeOverridable self.buildNodePackage { @@ -9835,7 +13446,7 @@ passthru.names = [ "js-yaml" ]; }; by-spec."js-yaml"."3.x" = - self.by-version."js-yaml"."3.2.2"; + self.by-version."js-yaml"."3.2.3"; by-spec."js-yaml"."~2.0.5" = self.by-version."js-yaml"."2.0.5"; by-version."js-yaml"."2.0.5" = lib.makeOverridable self.buildNodePackage { @@ -9903,36 +13514,36 @@ by-spec."jsesc"."~0.4.3" = self.by-version."jsesc"."0.4.3"; by-spec."jshint"."*" = - self.by-version."jshint"."2.5.6"; - by-version."jshint"."2.5.6" = lib.makeOverridable self.buildNodePackage { - name = "jshint-2.5.6"; + self.by-version."jshint"."2.5.10"; + by-version."jshint"."2.5.10" = lib.makeOverridable self.buildNodePackage { + name = "jshint-2.5.10"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/jshint/-/jshint-2.5.6.tgz"; - name = "jshint-2.5.6.tgz"; - sha1 = "1685ce1f9e1c74832375d83fe89728589bd9d8c7"; + url = "http://registry.npmjs.org/jshint/-/jshint-2.5.10.tgz"; + name = "jshint-2.5.10.tgz"; + sha1 = "2fef47ee0901914e31832123d5d3f434c28060ef"; }) ]; buildInputs = (self.nativeDeps."jshint" or []); deps = { - "shelljs-0.3.0" = self.by-version."shelljs"."0.3.0"; - "underscore-1.6.0" = self.by-version."underscore"."1.6.0"; - "cli-0.6.4" = self.by-version."cli"."0.6.4"; - "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0"; - "htmlparser2-3.7.3" = self.by-version."htmlparser2"."3.7.3"; + "cli-0.6.5" = self.by-version."cli"."0.6.5"; "console-browserify-1.1.0" = self.by-version."console-browserify"."1.1.0"; "exit-0.1.2" = self.by-version."exit"."0.1.2"; - "strip-json-comments-1.0.1" = self.by-version."strip-json-comments"."1.0.1"; + "htmlparser2-3.8.2" = self.by-version."htmlparser2"."3.8.2"; + "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0"; + "shelljs-0.3.0" = self.by-version."shelljs"."0.3.0"; + "strip-json-comments-1.0.2" = self.by-version."strip-json-comments"."1.0.2"; + "underscore-1.6.0" = self.by-version."underscore"."1.6.0"; }; peerDependencies = [ ]; passthru.names = [ "jshint" ]; }; - "jshint" = self.by-version."jshint"."2.5.6"; + "jshint" = self.by-version."jshint"."2.5.10"; by-spec."jshint"."~2.5.0" = - self.by-version."jshint"."2.5.6"; + self.by-version."jshint"."2.5.10"; by-spec."json-schema"."0.2.2" = self.by-version."json-schema"."0.2.2"; by-version."json-schema"."0.2.2" = lib.makeOverridable self.buildNodePackage { @@ -9994,6 +13605,26 @@ ]; passthru.names = [ "json-stringify-safe" ]; }; + by-spec."json-stringify-safe"."~4.0.0" = + self.by-version."json-stringify-safe"."4.0.0"; + by-version."json-stringify-safe"."4.0.0" = lib.makeOverridable self.buildNodePackage { + name = "json-stringify-safe-4.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-4.0.0.tgz"; + name = "json-stringify-safe-4.0.0.tgz"; + sha1 = "77c271aaea54302e68efeaccb56abbf06a9b1a54"; + }) + ]; + buildInputs = + (self.nativeDeps."json-stringify-safe" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "json-stringify-safe" ]; + }; 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 { @@ -10118,39 +13749,80 @@ ]; passthru.names = [ "jsprim" ]; }; - by-spec."jstransform"."~3.0.0" = - self.by-version."jstransform"."3.0.0"; - by-version."jstransform"."3.0.0" = lib.makeOverridable self.buildNodePackage { - name = "jstransform-3.0.0"; + by-spec."jstransform"."^7.0.0" = + self.by-version."jstransform"."7.0.0"; + by-version."jstransform"."7.0.0" = lib.makeOverridable self.buildNodePackage { + name = "jstransform-7.0.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/jstransform/-/jstransform-3.0.0.tgz"; - name = "jstransform-3.0.0.tgz"; - sha1 = "a2591ab6cee8d97bf3be830dbfa2313b87cd640b"; + url = "http://registry.npmjs.org/jstransform/-/jstransform-7.0.0.tgz"; + name = "jstransform-7.0.0.tgz"; + sha1 = "4f5b7fd0dce2d2ba8b7d0a3190b278ee8bf68a6c"; }) ]; buildInputs = (self.nativeDeps."jstransform" or []); deps = { "base62-0.1.1" = self.by-version."base62"."0.1.1"; - "esprima-fb-3001.1.0-dev-harmony-fb" = self.by-version."esprima-fb"."3001.1.0-dev-harmony-fb"; + "esprima-fb-7001.1.0-dev-harmony-fb" = self.by-version."esprima-fb"."7001.1.0-dev-harmony-fb"; "source-map-0.1.31" = self.by-version."source-map"."0.1.31"; }; peerDependencies = [ ]; passthru.names = [ "jstransform" ]; }; + by-spec."junk"."~1.0.0" = + self.by-version."junk"."1.0.0"; + by-version."junk"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "junk-1.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/junk/-/junk-1.0.0.tgz"; + name = "junk-1.0.0.tgz"; + sha1 = "22b05ee710f40c44f82fb260602ffecd489223b8"; + }) + ]; + buildInputs = + (self.nativeDeps."junk" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "junk" ]; + }; + by-spec."k-bucket"."^0.4.2" = + self.by-version."k-bucket"."0.4.2"; + by-version."k-bucket"."0.4.2" = lib.makeOverridable self.buildNodePackage { + name = "k-bucket-0.4.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/k-bucket/-/k-bucket-0.4.2.tgz"; + name = "k-bucket-0.4.2.tgz"; + sha1 = "150ab92307e9ec818a9c4e39a5f930eb3aaaa23a"; + }) + ]; + buildInputs = + (self.nativeDeps."k-bucket" or []); + deps = { + "buffer-equal-0.0.1" = self.by-version."buffer-equal"."0.0.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "k-bucket" ]; + }; by-spec."karma"."*" = - self.by-version."karma"."0.12.24"; - by-version."karma"."0.12.24" = lib.makeOverridable self.buildNodePackage { - name = "karma-0.12.24"; + self.by-version."karma"."0.12.28"; + by-version."karma"."0.12.28" = lib.makeOverridable self.buildNodePackage { + name = "karma-0.12.28"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/karma/-/karma-0.12.24.tgz"; - name = "karma-0.12.24.tgz"; - sha1 = "edd66dd4698acb2227b2b3797467a477d951379d"; + url = "http://registry.npmjs.org/karma/-/karma-0.12.28.tgz"; + name = "karma-0.12.28.tgz"; + sha1 = "80111f75ae99c9a0b0974ad0c98e6271bc2318fc"; }) ]; buildInputs = @@ -10158,7 +13830,7 @@ deps = { "di-0.0.1" = self.by-version."di"."0.0.1"; "socket.io-0.9.17" = self.by-version."socket.io"."0.9.17"; - "chokidar-0.9.0" = self.by-version."chokidar"."0.9.0"; + "chokidar-0.11.1" = self.by-version."chokidar"."0.11.1"; "glob-3.2.11" = self.by-version."glob"."3.2.11"; "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14"; "http-proxy-0.10.4" = self.by-version."http-proxy"."0.10.4"; @@ -10171,24 +13843,24 @@ "log4js-0.6.21" = self.by-version."log4js"."0.6.21"; "useragent-2.0.10" = self.by-version."useragent"."2.0.10"; "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3"; - "connect-2.12.0" = self.by-version."connect"."2.12.0"; + "connect-2.26.6" = self.by-version."connect"."2.26.6"; "source-map-0.1.40" = self.by-version."source-map"."0.1.40"; }; peerDependencies = [ ]; passthru.names = [ "karma" ]; }; - "karma" = self.by-version."karma"."0.12.24"; + "karma" = self.by-version."karma"."0.12.28"; by-spec."karma".">=0.11.11" = - self.by-version."karma"."0.12.24"; + self.by-version."karma"."0.12.28"; by-spec."karma".">=0.12.8" = - self.by-version."karma"."0.12.24"; + self.by-version."karma"."0.12.28"; by-spec."karma".">=0.9" = - self.by-version."karma"."0.12.24"; + self.by-version."karma"."0.12.28"; by-spec."karma".">=0.9.3" = - self.by-version."karma"."0.12.24"; + self.by-version."karma"."0.12.28"; by-spec."karma"."~0.12.0" = - self.by-version."karma"."0.12.24"; + self.by-version."karma"."0.12.28"; by-spec."karma-chrome-launcher"."*" = self.by-version."karma-chrome-launcher"."0.1.5"; by-version."karma-chrome-launcher"."0.1.5" = lib.makeOverridable self.buildNodePackage { @@ -10206,37 +13878,37 @@ deps = { }; peerDependencies = [ - self.by-version."karma"."0.12.24" + self.by-version."karma"."0.12.28" ]; passthru.names = [ "karma-chrome-launcher" ]; }; "karma-chrome-launcher" = self.by-version."karma-chrome-launcher"."0.1.5"; by-spec."karma-coverage"."*" = - self.by-version."karma-coverage"."0.2.6"; - by-version."karma-coverage"."0.2.6" = lib.makeOverridable self.buildNodePackage { - name = "karma-coverage-0.2.6"; + self.by-version."karma-coverage"."0.2.7"; + by-version."karma-coverage"."0.2.7" = lib.makeOverridable self.buildNodePackage { + name = "karma-coverage-0.2.7"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/karma-coverage/-/karma-coverage-0.2.6.tgz"; - name = "karma-coverage-0.2.6.tgz"; - sha1 = "6ab53e69a03a6e0fe2a0563216895a720040fca9"; + url = "http://registry.npmjs.org/karma-coverage/-/karma-coverage-0.2.7.tgz"; + name = "karma-coverage-0.2.7.tgz"; + sha1 = "f76740b275bbf30a0ab9f41d8cf56843a0994576"; }) ]; buildInputs = (self.nativeDeps."karma-coverage" or []); deps = { "istanbul-0.3.2" = self.by-version."istanbul"."0.3.2"; - "ibrik-1.1.1" = self.by-version."ibrik"."1.1.1"; - "dateformat-1.0.8" = self.by-version."dateformat"."1.0.8"; + "ibrik-2.0.0" = self.by-version."ibrik"."2.0.0"; + "dateformat-1.0.11" = self.by-version."dateformat"."1.0.11"; "minimatch-0.3.0" = self.by-version."minimatch"."0.3.0"; }; peerDependencies = [ - self.by-version."karma"."0.12.24" + self.by-version."karma"."0.12.28" ]; passthru.names = [ "karma-coverage" ]; }; - "karma-coverage" = self.by-version."karma-coverage"."0.2.6"; + "karma-coverage" = self.by-version."karma-coverage"."0.2.7"; by-spec."karma-junit-reporter"."*" = self.by-version."karma-junit-reporter"."0.2.2"; by-version."karma-junit-reporter"."0.2.2" = lib.makeOverridable self.buildNodePackage { @@ -10255,7 +13927,7 @@ "xmlbuilder-0.4.2" = self.by-version."xmlbuilder"."0.4.2"; }; peerDependencies = [ - self.by-version."karma"."0.12.24" + self.by-version."karma"."0.12.28" ]; passthru.names = [ "karma-junit-reporter" ]; }; @@ -10277,8 +13949,8 @@ deps = { }; peerDependencies = [ - self.by-version."karma"."0.12.24" - self.by-version."mocha"."1.21.4" + self.by-version."karma"."0.12.28" + self.by-version."mocha"."2.0.1" ]; passthru.names = [ "karma-mocha" ]; }; @@ -10300,7 +13972,7 @@ deps = { }; peerDependencies = [ - self.by-version."karma"."0.12.24" + self.by-version."karma"."0.12.28" self.by-version."requirejs"."2.1.15" ]; passthru.names = [ "karma-requirejs" ]; @@ -10321,33 +13993,33 @@ buildInputs = (self.nativeDeps."karma-sauce-launcher" or []); deps = { - "wd-0.3.8" = self.by-version."wd"."0.3.8"; + "wd-0.3.11" = self.by-version."wd"."0.3.11"; "sauce-connect-launcher-0.6.1" = self.by-version."sauce-connect-launcher"."0.6.1"; "q-0.9.7" = self.by-version."q"."0.9.7"; "saucelabs-0.1.1" = self.by-version."saucelabs"."0.1.1"; }; peerDependencies = [ - self.by-version."karma"."0.12.24" + self.by-version."karma"."0.12.28" ]; passthru.names = [ "karma-sauce-launcher" ]; }; "karma-sauce-launcher" = self.by-version."karma-sauce-launcher"."0.2.10"; - by-spec."keen.io"."~0.1.2" = - self.by-version."keen.io"."0.1.2"; - by-version."keen.io"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "keen.io-0.1.2"; + by-spec."keen.io"."~0.1.3" = + self.by-version."keen.io"."0.1.3"; + by-version."keen.io"."0.1.3" = lib.makeOverridable self.buildNodePackage { + name = "keen.io-0.1.3"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/keen.io/-/keen.io-0.1.2.tgz"; - name = "keen.io-0.1.2.tgz"; - sha1 = "a55b9d1d8b4354a8845f2a224eb3a6f7271378b2"; + url = "http://registry.npmjs.org/keen.io/-/keen.io-0.1.3.tgz"; + name = "keen.io-0.1.3.tgz"; + sha1 = "5056f5c989ab14ccf62fc20ed7598115ae7d09e3"; }) ]; buildInputs = (self.nativeDeps."keen.io" or []); deps = { - "superagent-0.13.0" = self.by-version."superagent"."0.13.0"; + "superagent-0.21.0" = self.by-version."superagent"."0.21.0"; "underscore-1.5.2" = self.by-version."underscore"."1.5.2"; }; peerDependencies = [ @@ -10394,22 +14066,21 @@ ]; passthru.names = [ "kerberos" ]; }; - by-spec."kerberos"."0.0.5" = - self.by-version."kerberos"."0.0.5"; - by-version."kerberos"."0.0.5" = lib.makeOverridable self.buildNodePackage { - name = "kerberos-0.0.5"; + by-spec."kerberos"."0.0.4" = + self.by-version."kerberos"."0.0.4"; + by-version."kerberos"."0.0.4" = lib.makeOverridable self.buildNodePackage { + name = "kerberos-0.0.4"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/kerberos/-/kerberos-0.0.5.tgz"; - name = "kerberos-0.0.5.tgz"; - sha1 = "48170d7f75bc1570044aa46c501af1c87b1e7cf0"; + url = "http://registry.npmjs.org/kerberos/-/kerberos-0.0.4.tgz"; + name = "kerberos-0.0.4.tgz"; + sha1 = "11836638f729a2f6c5bae056a7d7a15898c9ba7c"; }) ]; buildInputs = (self.nativeDeps."kerberos" or []); deps = { - "nan-1.3.0" = self.by-version."nan"."1.3.0"; }; peerDependencies = [ ]; @@ -10495,7 +14166,7 @@ ]; passthru.names = [ "keypress" ]; }; - by-spec."keypress"."~0.2.1" = + by-spec."keypress"."^0.2.1" = self.by-version."keypress"."0.2.1"; by-version."keypress"."0.2.1" = lib.makeOverridable self.buildNodePackage { name = "keypress-0.2.1"; @@ -10515,6 +14186,8 @@ ]; passthru.names = [ "keypress" ]; }; + by-spec."keypress"."~0.2.1" = + self.by-version."keypress"."0.2.1"; by-spec."knockout"."~3.2.0" = self.by-version."knockout"."3.2.0"; by-version."knockout"."3.2.0" = lib.makeOverridable self.buildNodePackage { @@ -10591,15 +14264,15 @@ }; "kue" = self.by-version."kue"."0.8.9"; by-spec."labeled-stream-splicer"."^1.0.0" = - self.by-version."labeled-stream-splicer"."1.0.0"; - by-version."labeled-stream-splicer"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "labeled-stream-splicer-1.0.0"; + self.by-version."labeled-stream-splicer"."1.0.2"; + by-version."labeled-stream-splicer"."1.0.2" = lib.makeOverridable self.buildNodePackage { + name = "labeled-stream-splicer-1.0.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-1.0.0.tgz"; - name = "labeled-stream-splicer-1.0.0.tgz"; - sha1 = "cb1282bc2d8e9a4bfb3bcda184e8f017deea7c1d"; + url = "http://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-1.0.2.tgz"; + name = "labeled-stream-splicer-1.0.2.tgz"; + sha1 = "4615331537784981e8fd264e1f3a434c4e0ddd65"; }) ]; buildInputs = @@ -10613,6 +14286,27 @@ ]; passthru.names = [ "labeled-stream-splicer" ]; }; + by-spec."latest-version"."^0.2.0" = + self.by-version."latest-version"."0.2.0"; + by-version."latest-version"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "latest-version-0.2.0"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/latest-version/-/latest-version-0.2.0.tgz"; + name = "latest-version-0.2.0.tgz"; + sha1 = "adaf898d5f22380d3f9c45386efdff0a1b5b7501"; + }) + ]; + buildInputs = + (self.nativeDeps."latest-version" or []); + deps = { + "package-json-0.2.0" = self.by-version."package-json"."0.2.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "latest-version" ]; + }; by-spec."lazy"."~1.0.11" = self.by-version."lazy"."1.0.11"; by-version."lazy"."1.0.11" = lib.makeOverridable self.buildNodePackage { @@ -10648,7 +14342,7 @@ buildInputs = (self.nativeDeps."lazystream" or []); deps = { - "readable-stream-1.0.32" = self.by-version."readable-stream"."1.0.32"; + "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; }; peerDependencies = [ ]; @@ -10691,7 +14385,7 @@ deps = { "through2-0.5.1" = self.by-version."through2"."0.5.1"; "vinyl-0.2.3" = self.by-version."vinyl"."0.2.3"; - "vinyl-fs-0.3.8" = self.by-version."vinyl-fs"."0.3.8"; + "vinyl-fs-0.3.13" = self.by-version."vinyl-fs"."0.3.13"; }; peerDependencies = [ ]; @@ -10699,6 +14393,33 @@ }; "lcov-result-merger" = self.by-version."lcov-result-merger"."1.0.0"; by-spec."less"."*" = + self.by-version."less"."2.1.1"; + by-version."less"."2.1.1" = lib.makeOverridable self.buildNodePackage { + name = "less-2.1.1"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/less/-/less-2.1.1.tgz"; + name = "less-2.1.1.tgz"; + sha1 = "7ba1fd7698e7b4eb46286c3954aed43e54da41b6"; + }) + ]; + buildInputs = + (self.nativeDeps."less" or []); + deps = { + "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; + "mime-1.2.11" = self.by-version."mime"."1.2.11"; + "request-2.49.0" = self.by-version."request"."2.49.0"; + "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; + "source-map-0.1.40" = self.by-version."source-map"."0.1.40"; + "promise-6.0.1" = self.by-version."promise"."6.0.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "less" ]; + }; + "less" = self.by-version."less"."2.1.1"; + by-spec."less"."^1.7.2" = self.by-version."less"."1.7.5"; by-version."less"."1.7.5" = lib.makeOverridable self.buildNodePackage { name = "less-1.7.5"; @@ -10713,20 +14434,59 @@ buildInputs = (self.nativeDeps."less" or []); deps = { - "graceful-fs-3.0.2" = self.by-version."graceful-fs"."3.0.2"; + "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; "mime-1.2.11" = self.by-version."mime"."1.2.11"; "request-2.40.0" = self.by-version."request"."2.40.0"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; - "clean-css-2.2.16" = self.by-version."clean-css"."2.2.16"; + "clean-css-2.2.19" = self.by-version."clean-css"."2.2.19"; "source-map-0.1.40" = self.by-version."source-map"."0.1.40"; }; peerDependencies = [ ]; passthru.names = [ "less" ]; }; - "less" = self.by-version."less"."1.7.5"; - by-spec."less"."^1.7.2" = - self.by-version."less"."1.7.5"; + by-spec."lexical-scope"."~0.0.14" = + self.by-version."lexical-scope"."0.0.15"; + by-version."lexical-scope"."0.0.15" = lib.makeOverridable self.buildNodePackage { + name = "lexical-scope-0.0.15"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/lexical-scope/-/lexical-scope-0.0.15.tgz"; + name = "lexical-scope-0.0.15.tgz"; + sha1 = "ca595997aaed87b155cb041f48dc0438f48a04dc"; + }) + ]; + buildInputs = + (self.nativeDeps."lexical-scope" or []); + deps = { + "astw-0.0.0" = self.by-version."astw"."0.0.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "lexical-scope" ]; + }; + by-spec."lexical-scope"."~0.1.0" = + self.by-version."lexical-scope"."0.1.0"; + by-version."lexical-scope"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "lexical-scope-0.1.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/lexical-scope/-/lexical-scope-0.1.0.tgz"; + name = "lexical-scope-0.1.0.tgz"; + sha1 = "8f30004c80234ffac083b990079d7b267e18441b"; + }) + ]; + buildInputs = + (self.nativeDeps."lexical-scope" or []); + deps = { + "astw-0.1.0" = self.by-version."astw"."0.1.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "lexical-scope" ]; + }; by-spec."lexical-scope"."~1.1.0" = self.by-version."lexical-scope"."1.1.0"; by-version."lexical-scope"."1.1.0" = lib.makeOverridable self.buildNodePackage { @@ -10791,30 +14551,51 @@ passthru.names = [ "libyaml" ]; }; "libyaml" = self.by-version."libyaml"."0.2.5"; - by-spec."liftoff"."^0.12.0" = - self.by-version."liftoff"."0.12.1"; - by-version."liftoff"."0.12.1" = lib.makeOverridable self.buildNodePackage { - name = "liftoff-0.12.1"; + by-spec."liftoff"."^0.13.2" = + self.by-version."liftoff"."0.13.6"; + by-version."liftoff"."0.13.6" = lib.makeOverridable self.buildNodePackage { + name = "liftoff-0.13.6"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/liftoff/-/liftoff-0.12.1.tgz"; - name = "liftoff-0.12.1.tgz"; - sha1 = "bcaa49759c68396b83b984ad0b2d8cc226f9526d"; + url = "http://registry.npmjs.org/liftoff/-/liftoff-0.13.6.tgz"; + name = "liftoff-0.13.6.tgz"; + sha1 = "600e8966b92d1e0150eab5b577652569f4c7d1d8"; }) ]; buildInputs = (self.nativeDeps."liftoff" or []); deps = { "findup-sync-0.1.3" = self.by-version."findup-sync"."0.1.3"; - "resolve-0.7.4" = self.by-version."resolve"."0.7.4"; - "minimist-0.2.0" = self.by-version."minimist"."0.2.0"; + "resolve-1.0.0" = self.by-version."resolve"."1.0.0"; + "minimist-1.1.0" = self.by-version."minimist"."1.1.0"; "extend-1.3.0" = self.by-version."extend"."1.3.0"; + "flagged-respawn-0.3.1" = self.by-version."flagged-respawn"."0.3.1"; }; peerDependencies = [ ]; passthru.names = [ "liftoff" ]; }; + by-spec."lockfile"."~0.4.0" = + self.by-version."lockfile"."0.4.3"; + by-version."lockfile"."0.4.3" = lib.makeOverridable self.buildNodePackage { + name = "lockfile-0.4.3"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/lockfile/-/lockfile-0.4.3.tgz"; + name = "lockfile-0.4.3.tgz"; + sha1 = "79b965ee9b32d9dd24b59cf81205e6dcb6d3b224"; + }) + ]; + buildInputs = + (self.nativeDeps."lockfile" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "lockfile" ]; + }; by-spec."lockfile"."~1.0.0" = self.by-version."lockfile"."1.0.0"; by-version."lockfile"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -11108,6 +14889,29 @@ ]; passthru.names = [ "lodash._shimkeys" ]; }; + by-spec."lodash.debounce"."^2.4.1" = + self.by-version."lodash.debounce"."2.4.1"; + by-version."lodash.debounce"."2.4.1" = lib.makeOverridable self.buildNodePackage { + name = "lodash.debounce-2.4.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/lodash.debounce/-/lodash.debounce-2.4.1.tgz"; + name = "lodash.debounce-2.4.1.tgz"; + sha1 = "d8cead246ec4b926e8b85678fc396bfeba8cc6fc"; + }) + ]; + buildInputs = + (self.nativeDeps."lodash.debounce" or []); + deps = { + "lodash.isfunction-2.4.1" = self.by-version."lodash.isfunction"."2.4.1"; + "lodash.isobject-2.4.1" = self.by-version."lodash.isobject"."2.4.1"; + "lodash.now-2.4.1" = self.by-version."lodash.now"."2.4.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "lodash.debounce" ]; + }; by-spec."lodash.defaults"."~2.4.1" = self.by-version."lodash.defaults"."2.4.1"; by-version."lodash.defaults"."2.4.1" = lib.makeOverridable self.buildNodePackage { @@ -11153,6 +14957,26 @@ ]; passthru.names = [ "lodash.escape" ]; }; + by-spec."lodash.isfunction"."~2.4.1" = + self.by-version."lodash.isfunction"."2.4.1"; + by-version."lodash.isfunction"."2.4.1" = lib.makeOverridable self.buildNodePackage { + name = "lodash.isfunction-2.4.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-2.4.1.tgz"; + name = "lodash.isfunction-2.4.1.tgz"; + sha1 = "2cfd575c73e498ab57e319b77fa02adef13a94d1"; + }) + ]; + buildInputs = + (self.nativeDeps."lodash.isfunction" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "lodash.isfunction" ]; + }; by-spec."lodash.isobject"."~2.4.1" = self.by-version."lodash.isobject"."2.4.1"; by-version."lodash.isobject"."2.4.1" = lib.makeOverridable self.buildNodePackage { @@ -11197,6 +15021,27 @@ ]; passthru.names = [ "lodash.keys" ]; }; + by-spec."lodash.now"."~2.4.1" = + self.by-version."lodash.now"."2.4.1"; + by-version."lodash.now"."2.4.1" = lib.makeOverridable self.buildNodePackage { + name = "lodash.now-2.4.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/lodash.now/-/lodash.now-2.4.1.tgz"; + name = "lodash.now-2.4.1.tgz"; + sha1 = "6872156500525185faf96785bb7fe7fe15b562c6"; + }) + ]; + buildInputs = + (self.nativeDeps."lodash.now" or []); + deps = { + "lodash._isnative-2.4.1" = self.by-version."lodash._isnative"."2.4.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "lodash.now" ]; + }; by-spec."lodash.template"."^2.4.1" = self.by-version."lodash.template"."2.4.1"; by-version."lodash.template"."2.4.1" = lib.makeOverridable self.buildNodePackage { @@ -11303,13 +15148,33 @@ (self.nativeDeps."log4js" or []); deps = { "async-0.2.10" = self.by-version."async"."0.2.10"; - "readable-stream-1.0.32" = self.by-version."readable-stream"."1.0.32"; + "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; "semver-1.1.4" = self.by-version."semver"."1.1.4"; }; peerDependencies = [ ]; passthru.names = [ "log4js" ]; }; + by-spec."lolex"."1.1.0" = + self.by-version."lolex"."1.1.0"; + by-version."lolex"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "lolex-1.1.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/lolex/-/lolex-1.1.0.tgz"; + name = "lolex-1.1.0.tgz"; + sha1 = "5dbbbc850395e7523c74b3586f7fbd2626d25b1b"; + }) + ]; + buildInputs = + (self.nativeDeps."lolex" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "lolex" ]; + }; by-spec."longjohn"."~0.2.2" = self.by-version."longjohn"."0.2.4"; by-version."longjohn"."0.2.4" = lib.makeOverridable self.buildNodePackage { @@ -11432,8 +15297,49 @@ ]; passthru.names = [ "lru-cache" ]; }; + by-spec."lru-cache"."~2.3.0" = + self.by-version."lru-cache"."2.3.1"; + by-version."lru-cache"."2.3.1" = lib.makeOverridable self.buildNodePackage { + name = "lru-cache-2.3.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.3.1.tgz"; + name = "lru-cache-2.3.1.tgz"; + sha1 = "b3adf6b3d856e954e2c390e6cef22081245a53d6"; + }) + ]; + buildInputs = + (self.nativeDeps."lru-cache" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "lru-cache" ]; + }; by-spec."lru-cache"."~2.5.0" = self.by-version."lru-cache"."2.5.0"; + by-spec."lru-queue"."0.1" = + self.by-version."lru-queue"."0.1.0"; + by-version."lru-queue"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "lru-queue-0.1.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz"; + name = "lru-queue-0.1.0.tgz"; + sha1 = "2738bd9f0d3cf4f84490c5736c48699ac632cda3"; + }) + ]; + buildInputs = + (self.nativeDeps."lru-queue" or []); + deps = { + "es5-ext-0.10.4" = self.by-version."es5-ext"."0.10.4"; + }; + peerDependencies = [ + ]; + passthru.names = [ "lru-queue" ]; + }; by-spec."lsmod"."~0.0.3" = self.by-version."lsmod"."0.0.3"; by-version."lsmod"."0.0.3" = lib.makeOverridable self.buildNodePackage { @@ -11454,6 +15360,148 @@ ]; passthru.names = [ "lsmod" ]; }; + by-spec."ltx"."*" = + self.by-version."ltx"."0.7.2"; + by-version."ltx"."0.7.2" = lib.makeOverridable self.buildNodePackage { + name = "ltx-0.7.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ltx/-/ltx-0.7.2.tgz"; + name = "ltx-0.7.2.tgz"; + sha1 = "70a6aa8fa5fd426a422a41ba3d54a15ccdde680c"; + }) + ]; + buildInputs = + (self.nativeDeps."ltx" or []); + deps = { + "sax-0.6.1" = self.by-version."sax"."0.6.1"; + "node-expat-2.3.3" = self.by-version."node-expat"."2.3.3"; + }; + peerDependencies = [ + ]; + passthru.names = [ "ltx" ]; + }; + "ltx" = self.by-version."ltx"."0.7.2"; + by-spec."ltx"."0.x" = + self.by-version."ltx"."0.7.2"; + by-spec."ltx".">= 0.2.0" = + self.by-version."ltx"."0.7.2"; + by-spec."ltx"."^0.5.2" = + self.by-version."ltx"."0.5.2"; + by-version."ltx"."0.5.2" = lib.makeOverridable self.buildNodePackage { + name = "ltx-0.5.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ltx/-/ltx-0.5.2.tgz"; + name = "ltx-0.5.2.tgz"; + sha1 = "3a049fc30ab8982c227803a74b26c02fe225cef8"; + }) + ]; + buildInputs = + (self.nativeDeps."ltx" or []); + deps = { + "sax-0.6.1" = self.by-version."sax"."0.6.1"; + "node-expat-2.3.3" = self.by-version."node-expat"."2.3.3"; + }; + peerDependencies = [ + ]; + passthru.names = [ "ltx" ]; + }; + by-spec."ltx"."^0.7.2" = + self.by-version."ltx"."0.7.2"; + by-spec."ltx"."~0.3.2" = + self.by-version."ltx"."0.3.4"; + by-version."ltx"."0.3.4" = lib.makeOverridable self.buildNodePackage { + name = "ltx-0.3.4"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ltx/-/ltx-0.3.4.tgz"; + name = "ltx-0.3.4.tgz"; + sha1 = "3cc8d3af3cf08914383b19e8ab60b1f396e1e984"; + }) + ]; + buildInputs = + (self.nativeDeps."ltx" or []); + deps = { + "sax-0.6.1" = self.by-version."sax"."0.6.1"; + "node-expat-2.1.4" = self.by-version."node-expat"."2.1.4"; + }; + peerDependencies = [ + ]; + passthru.names = [ "ltx" ]; + }; + by-spec."ltx"."~0.3.3" = + self.by-version."ltx"."0.3.4"; + by-spec."ltx"."~0.6.0" = + self.by-version."ltx"."0.6.0"; + by-version."ltx"."0.6.0" = lib.makeOverridable self.buildNodePackage { + name = "ltx-0.6.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ltx/-/ltx-0.6.0.tgz"; + name = "ltx-0.6.0.tgz"; + sha1 = "16470236570a2c436744a3c4adb8a4b15ea1acc7"; + }) + ]; + buildInputs = + (self.nativeDeps."ltx" or []); + deps = { + "sax-0.6.1" = self.by-version."sax"."0.6.1"; + "node-expat-2.3.3" = self.by-version."node-expat"."2.3.3"; + }; + peerDependencies = [ + ]; + passthru.names = [ "ltx" ]; + }; + by-spec."ltx"."~0.x" = + self.by-version."ltx"."0.7.2"; + by-spec."m8".">= 0.4.3" = + self.by-version."m8"."0.4.4"; + by-version."m8"."0.4.4" = lib.makeOverridable self.buildNodePackage { + name = "m8-0.4.4"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/m8/-/m8-0.4.4.tgz"; + name = "m8-0.4.4.tgz"; + sha1 = "59df914d9bee2829ceac4346026abe945abed5b8"; + }) + ]; + buildInputs = + (self.nativeDeps."m8" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "m8" ]; + }; + by-spec."magnet-uri"."^2.0.1" = + self.by-version."magnet-uri"."2.0.1"; + by-version."magnet-uri"."2.0.1" = lib.makeOverridable self.buildNodePackage { + name = "magnet-uri-2.0.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/magnet-uri/-/magnet-uri-2.0.1.tgz"; + name = "magnet-uri-2.0.1.tgz"; + sha1 = "d331d3dfcd3836565ade0fc3ca315e39217bb209"; + }) + ]; + buildInputs = + (self.nativeDeps."magnet-uri" or []); + deps = { + "thirty-two-0.0.2" = self.by-version."thirty-two"."0.0.2"; + }; + peerDependencies = [ + ]; + passthru.names = [ "magnet-uri" ]; + }; + by-spec."magnet-uri"."~2.0.0" = + self.by-version."magnet-uri"."2.0.1"; by-spec."mailcomposer".">= 0.1.27" = self.by-version."mailcomposer"."0.2.12"; by-version."mailcomposer"."0.2.12" = lib.makeOverridable self.buildNodePackage { @@ -11469,7 +15517,7 @@ buildInputs = (self.nativeDeps."mailcomposer" or []); deps = { - "mimelib-0.2.17" = self.by-version."mimelib"."0.2.17"; + "mimelib-0.2.18" = self.by-version."mimelib"."0.2.18"; "mime-1.2.11" = self.by-version."mime"."1.2.11"; "he-0.3.6" = self.by-version."he"."0.3.6"; "follow-redirects-0.0.3" = self.by-version."follow-redirects"."0.0.3"; @@ -11479,6 +15527,26 @@ ]; passthru.names = [ "mailcomposer" ]; }; + by-spec."map-obj"."^1.0.0" = + self.by-version."map-obj"."1.0.0"; + by-version."map-obj"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "map-obj-1.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/map-obj/-/map-obj-1.0.0.tgz"; + name = "map-obj-1.0.0.tgz"; + sha1 = "bcbdf6756758763c182daf79e18094a2f1c85766"; + }) + ]; + buildInputs = + (self.nativeDeps."map-obj" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "map-obj" ]; + }; by-spec."marked"."*" = self.by-version."marked"."0.3.2"; by-version."marked"."0.3.2" = lib.makeOverridable self.buildNodePackage { @@ -11541,7 +15609,7 @@ (self.nativeDeps."maxmin" or []); deps = { "chalk-0.5.1" = self.by-version."chalk"."0.5.1"; - "figures-1.3.3" = self.by-version."figures"."1.3.3"; + "figures-1.3.5" = self.by-version."figures"."1.3.5"; "gzip-size-1.0.0" = self.by-version."gzip-size"."1.0.0"; "pretty-bytes-1.0.1" = self.by-version."pretty-bytes"."1.0.1"; }; @@ -11565,7 +15633,7 @@ (self.nativeDeps."maxmin" or []); deps = { "chalk-0.5.1" = self.by-version."chalk"."0.5.1"; - "figures-1.3.3" = self.by-version."figures"."1.3.3"; + "figures-1.3.5" = self.by-version."figures"."1.3.5"; "gzip-size-0.2.0" = self.by-version."gzip-size"."0.2.0"; "pretty-bytes-0.1.2" = self.by-version."pretty-bytes"."0.1.2"; }; @@ -11573,16 +15641,60 @@ ]; passthru.names = [ "maxmin" ]; }; + by-spec."mdns-js"."git+https://github.com/guerrerocarlos/node-mdns-js" = + self.by-version."mdns-js"."0.2.2"; + by-version."mdns-js"."0.2.2" = lib.makeOverridable self.buildNodePackage { + name = "mdns-js-0.2.2"; + bin = false; + src = [ + (fetchgit { + url = "https://github.com/guerrerocarlos/node-mdns-js"; + rev = "25b81ef88fa2f9ad8ebc875ac3e1d3f36a87ed61"; + sha256 = "1f6fee2a00345e9c82e0d49818f7137cf3288072bddfdc6225b738184804e103"; + }) + ]; + buildInputs = + (self.nativeDeps."mdns-js" or []); + deps = { + "debug-0.8.1" = self.by-version."debug"."0.8.1"; + "mdns-js-packet-0.1.3" = self.by-version."mdns-js-packet"."0.1.3"; + }; + peerDependencies = [ + ]; + passthru.names = [ "mdns-js" ]; + }; + by-spec."mdns-js-packet"."0.1.x" = + self.by-version."mdns-js-packet"."0.1.3"; + by-version."mdns-js-packet"."0.1.3" = lib.makeOverridable self.buildNodePackage { + name = "mdns-js-packet-0.1.3"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/mdns-js-packet/-/mdns-js-packet-0.1.3.tgz"; + name = "mdns-js-packet-0.1.3.tgz"; + sha1 = "a98ad52e1e74e96b00aab239af4354687a16db01"; + }) + ]; + buildInputs = + (self.nativeDeps."mdns-js-packet" or []); + deps = { + "debug-2.1.0" = self.by-version."debug"."2.1.0"; + "qap-3.1.2" = self.by-version."qap"."3.1.2"; + }; + peerDependencies = [ + ]; + passthru.names = [ "mdns-js-packet" ]; + }; by-spec."meat"."*" = - self.by-version."meat"."0.2.5"; - by-version."meat"."0.2.5" = lib.makeOverridable self.buildNodePackage { - name = "meat-0.2.5"; + self.by-version."meat"."0.3.2"; + by-version."meat"."0.3.2" = lib.makeOverridable self.buildNodePackage { + name = "meat-0.3.2"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/meat/-/meat-0.2.5.tgz"; - name = "meat-0.2.5.tgz"; - sha1 = "8f277ec68f51794365e271166c7b7bba8d046869"; + url = "http://registry.npmjs.org/meat/-/meat-0.3.2.tgz"; + name = "meat-0.3.2.tgz"; + sha1 = "f385317a6273c6d92d00b40de91e99554cc6f194"; }) ]; buildInputs = @@ -11599,17 +15711,17 @@ ]; passthru.names = [ "meat" ]; }; - "meat" = self.by-version."meat"."0.2.5"; - by-spec."media-typer"."0.2.0" = - self.by-version."media-typer"."0.2.0"; - by-version."media-typer"."0.2.0" = lib.makeOverridable self.buildNodePackage { - name = "media-typer-0.2.0"; + "meat" = self.by-version."meat"."0.3.2"; + by-spec."media-typer"."0.3.0" = + self.by-version."media-typer"."0.3.0"; + by-version."media-typer"."0.3.0" = lib.makeOverridable self.buildNodePackage { + name = "media-typer-0.3.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/media-typer/-/media-typer-0.2.0.tgz"; - name = "media-typer-0.2.0.tgz"; - sha1 = "d8a065213adfeaa2e76321a2b6dda36ff6335984"; + url = "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; + name = "media-typer-0.3.0.tgz"; + sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; }) ]; buildInputs = @@ -11620,25 +15732,80 @@ ]; passthru.names = [ "media-typer" ]; }; - by-spec."media-typer"."0.3.0" = - self.by-version."media-typer"."0.3.0"; - by-version."media-typer"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "media-typer-0.3.0"; + by-spec."memoizee"."0.3.x" = + self.by-version."memoizee"."0.3.8"; + by-version."memoizee"."0.3.8" = lib.makeOverridable self.buildNodePackage { + name = "memoizee-0.3.8"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; - name = "media-typer-0.3.0.tgz"; - sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; + url = "http://registry.npmjs.org/memoizee/-/memoizee-0.3.8.tgz"; + name = "memoizee-0.3.8.tgz"; + sha1 = "b5faf419f02fafe3c2cc1cf5d3907c210fc7efdc"; }) ]; buildInputs = - (self.nativeDeps."media-typer" or []); + (self.nativeDeps."memoizee" or []); deps = { + "d-0.1.1" = self.by-version."d"."0.1.1"; + "es5-ext-0.10.4" = self.by-version."es5-ext"."0.10.4"; + "es6-weak-map-0.1.2" = self.by-version."es6-weak-map"."0.1.2"; + "event-emitter-0.3.1" = self.by-version."event-emitter"."0.3.1"; + "lru-queue-0.1.0" = self.by-version."lru-queue"."0.1.0"; + "next-tick-0.2.2" = self.by-version."next-tick"."0.2.2"; + "timers-ext-0.1.0" = self.by-version."timers-ext"."0.1.0"; }; peerDependencies = [ ]; - passthru.names = [ "media-typer" ]; + passthru.names = [ "memoizee" ]; + }; + by-spec."meow"."*" = + self.by-version."meow"."2.0.0"; + by-version."meow"."2.0.0" = lib.makeOverridable self.buildNodePackage { + name = "meow-2.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/meow/-/meow-2.0.0.tgz"; + name = "meow-2.0.0.tgz"; + sha1 = "8f530a8ecf5d40d3f4b4df93c3472900fba2a8f1"; + }) + ]; + buildInputs = + (self.nativeDeps."meow" or []); + deps = { + "camelcase-keys-1.0.0" = self.by-version."camelcase-keys"."1.0.0"; + "indent-string-1.2.0" = self.by-version."indent-string"."1.2.0"; + "minimist-1.1.0" = self.by-version."minimist"."1.1.0"; + "object-assign-1.0.0" = self.by-version."object-assign"."1.0.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "meow" ]; + }; + by-spec."meow"."^1.0.0" = + self.by-version."meow"."1.0.0"; + by-version."meow"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "meow-1.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/meow/-/meow-1.0.0.tgz"; + name = "meow-1.0.0.tgz"; + sha1 = "d0ac10fe5b7a53796e7101e7068ff02ab698178b"; + }) + ]; + buildInputs = + (self.nativeDeps."meow" or []); + deps = { + "camelcase-keys-1.0.0" = self.by-version."camelcase-keys"."1.0.0"; + "indent-string-1.2.0" = self.by-version."indent-string"."1.2.0"; + "minimist-1.1.0" = self.by-version."minimist"."1.1.0"; + "object-assign-1.0.0" = self.by-version."object-assign"."1.0.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "meow" ]; }; by-spec."merge-descriptors"."0.0.2" = self.by-version."merge-descriptors"."0.0.2"; @@ -11660,6 +15827,27 @@ ]; passthru.names = [ "merge-descriptors" ]; }; + by-spec."method-override"."1.0.0" = + self.by-version."method-override"."1.0.0"; + by-version."method-override"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "method-override-1.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/method-override/-/method-override-1.0.0.tgz"; + name = "method-override-1.0.0.tgz"; + sha1 = "9e5bfbd80f3b9e043801dd3fe60bbab0f15b5f61"; + }) + ]; + buildInputs = + (self.nativeDeps."method-override" or []); + deps = { + "methods-1.1.0" = self.by-version."methods"."1.1.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "method-override" ]; + }; by-spec."method-override"."~2.2.0" = self.by-version."method-override"."2.2.0"; by-version."method-override"."2.2.0" = lib.makeOverridable self.buildNodePackage { @@ -11684,6 +15872,50 @@ ]; passthru.names = [ "method-override" ]; }; + by-spec."method-override"."~2.3.0" = + self.by-version."method-override"."2.3.0"; + by-version."method-override"."2.3.0" = lib.makeOverridable self.buildNodePackage { + name = "method-override-2.3.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/method-override/-/method-override-2.3.0.tgz"; + name = "method-override-2.3.0.tgz"; + sha1 = "fe820769594247ede8a6ca87b8eaa413084e595e"; + }) + ]; + buildInputs = + (self.nativeDeps."method-override" or []); + deps = { + "debug-2.1.0" = self.by-version."debug"."2.1.0"; + "methods-1.1.0" = self.by-version."methods"."1.1.0"; + "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; + "vary-1.0.0" = self.by-version."vary"."1.0.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "method-override" ]; + }; + by-spec."methods"."*" = + self.by-version."methods"."1.1.0"; + by-version."methods"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "methods-1.1.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/methods/-/methods-1.1.0.tgz"; + name = "methods-1.1.0.tgz"; + sha1 = "5dca4ee12df52ff3b056145986a8f01cbc86436f"; + }) + ]; + buildInputs = + (self.nativeDeps."methods" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "methods" ]; + }; by-spec."methods"."0.0.1" = self.by-version."methods"."0.0.1"; by-version."methods"."0.0.1" = lib.makeOverridable self.buildNodePackage { @@ -11746,43 +15978,49 @@ }; by-spec."methods"."1.1.0" = self.by-version."methods"."1.1.0"; - by-version."methods"."1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "methods-1.1.0"; + by-spec."methods"."1.x" = + self.by-version."methods"."1.1.0"; + by-spec."microee"."0.0.2" = + self.by-version."microee"."0.0.2"; + by-version."microee"."0.0.2" = lib.makeOverridable self.buildNodePackage { + name = "microee-0.0.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/methods/-/methods-1.1.0.tgz"; - name = "methods-1.1.0.tgz"; - sha1 = "5dca4ee12df52ff3b056145986a8f01cbc86436f"; + url = "http://registry.npmjs.org/microee/-/microee-0.0.2.tgz"; + name = "microee-0.0.2.tgz"; + sha1 = "72e80d477075e5e799470f5defea96d1dd121587"; }) ]; buildInputs = - (self.nativeDeps."methods" or []); + (self.nativeDeps."microee" or []); deps = { }; peerDependencies = [ ]; - passthru.names = [ "methods" ]; + passthru.names = [ "microee" ]; }; - by-spec."microee"."0.0.2" = - self.by-version."microee"."0.0.2"; - by-version."microee"."0.0.2" = lib.makeOverridable self.buildNodePackage { - name = "microee-0.0.2"; + by-spec."miller-rabin"."^1.1.1" = + self.by-version."miller-rabin"."1.1.1"; + by-version."miller-rabin"."1.1.1" = lib.makeOverridable self.buildNodePackage { + name = "miller-rabin-1.1.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/microee/-/microee-0.0.2.tgz"; - name = "microee-0.0.2.tgz"; - sha1 = "72e80d477075e5e799470f5defea96d1dd121587"; + url = "http://registry.npmjs.org/miller-rabin/-/miller-rabin-1.1.1.tgz"; + name = "miller-rabin-1.1.1.tgz"; + sha1 = "00e5be11698e846d7a5a185c5eced425f4379cd5"; }) ]; buildInputs = - (self.nativeDeps."microee" or []); + (self.nativeDeps."miller-rabin" or []); deps = { + "brorand-1.0.5" = self.by-version."brorand"."1.0.5"; }; peerDependencies = [ + self.by-version."bn.js"."0.15.2" ]; - passthru.names = [ "microee" ]; + passthru.names = [ "miller-rabin" ]; }; by-spec."mime"."*" = self.by-version."mime"."1.2.11"; @@ -11826,26 +16064,6 @@ ]; passthru.names = [ "mime" ]; }; - by-spec."mime"."1.2.5" = - self.by-version."mime"."1.2.5"; - by-version."mime"."1.2.5" = lib.makeOverridable self.buildNodePackage { - name = "mime-1.2.5"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/mime/-/mime-1.2.5.tgz"; - name = "mime-1.2.5.tgz"; - sha1 = "9eed073022a8bf5e16c8566c6867b8832bfbfa13"; - }) - ]; - buildInputs = - (self.nativeDeps."mime" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "mime" ]; - }; by-spec."mime"."1.2.6" = self.by-version."mime"."1.2.6"; by-version."mime"."1.2.6" = lib.makeOverridable self.buildNodePackage { @@ -11888,6 +16106,8 @@ }; by-spec."mime".">= 0.0.1" = self.by-version."mime"."1.2.11"; + by-spec."mime"."^1.2.11" = + self.by-version."mime"."1.2.11"; by-spec."mime"."~1.2.11" = self.by-version."mime"."1.2.11"; by-spec."mime"."~1.2.2" = @@ -11896,16 +16116,16 @@ self.by-version."mime"."1.2.11"; by-spec."mime"."~1.2.9" = self.by-version."mime"."1.2.11"; - by-spec."mime-db"."~1.0.1" = - self.by-version."mime-db"."1.0.3"; - by-version."mime-db"."1.0.3" = lib.makeOverridable self.buildNodePackage { - name = "mime-db-1.0.3"; + by-spec."mime-db"."1.x" = + self.by-version."mime-db"."1.2.0"; + by-version."mime-db"."1.2.0" = lib.makeOverridable self.buildNodePackage { + name = "mime-db-1.2.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/mime-db/-/mime-db-1.0.3.tgz"; - name = "mime-db-1.0.3.tgz"; - sha1 = "5680b12300b3cecea5620f20f269ee80f2632d81"; + url = "http://registry.npmjs.org/mime-db/-/mime-db-1.2.0.tgz"; + name = "mime-db-1.2.0.tgz"; + sha1 = "76b92e7ecac673f5dab066a10b66faea1be2f01f"; }) ]; buildInputs = @@ -11916,27 +16136,9 @@ ]; passthru.names = [ "mime-db" ]; }; - by-spec."mime-db"."~1.1.0" = - self.by-version."mime-db"."1.1.0"; - by-version."mime-db"."1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "mime-db-1.1.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/mime-db/-/mime-db-1.1.0.tgz"; - name = "mime-db-1.1.0.tgz"; - sha1 = "4613f418ab995450bf4bda240cd0ab38016a07a9"; - }) - ]; - buildInputs = - (self.nativeDeps."mime-db" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "mime-db" ]; - }; - by-spec."mime-types"."~1.0.0" = + by-spec."mime-db"."~1.2.0" = + self.by-version."mime-db"."1.2.0"; + by-spec."mime-types"."~1.0.1" = self.by-version."mime-types"."1.0.2"; by-version."mime-types"."1.0.2" = lib.makeOverridable self.buildNodePackage { name = "mime-types-1.0.2"; @@ -11956,51 +16158,69 @@ ]; passthru.names = [ "mime-types" ]; }; - by-spec."mime-types"."~1.0.1" = - self.by-version."mime-types"."1.0.2"; - by-spec."mime-types"."~2.0.2" = - self.by-version."mime-types"."2.0.2"; - by-version."mime-types"."2.0.2" = lib.makeOverridable self.buildNodePackage { - name = "mime-types-2.0.2"; + by-spec."mime-types"."~2.0.3" = + self.by-version."mime-types"."2.0.3"; + by-version."mime-types"."2.0.3" = lib.makeOverridable self.buildNodePackage { + name = "mime-types-2.0.3"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.2.tgz"; - name = "mime-types-2.0.2.tgz"; - sha1 = "c74b779f2896c367888622bd537aaaad4c0a2c08"; + url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.3.tgz"; + name = "mime-types-2.0.3.tgz"; + sha1 = "70b5cb5165b55dcb4972839f16d6077b0bb506f4"; }) ]; buildInputs = (self.nativeDeps."mime-types" or []); deps = { - "mime-db-1.1.0" = self.by-version."mime-db"."1.1.0"; + "mime-db-1.2.0" = self.by-version."mime-db"."1.2.0"; }; peerDependencies = [ ]; passthru.names = [ "mime-types" ]; }; by-spec."mimelib"."~0.2.15" = - self.by-version."mimelib"."0.2.17"; - by-version."mimelib"."0.2.17" = lib.makeOverridable self.buildNodePackage { - name = "mimelib-0.2.17"; + self.by-version."mimelib"."0.2.18"; + by-version."mimelib"."0.2.18" = lib.makeOverridable self.buildNodePackage { + name = "mimelib-0.2.18"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/mimelib/-/mimelib-0.2.17.tgz"; - name = "mimelib-0.2.17.tgz"; - sha1 = "6b0cb91a6451b92649e4cc98c5b64eed2d19a4aa"; + url = "http://registry.npmjs.org/mimelib/-/mimelib-0.2.18.tgz"; + name = "mimelib-0.2.18.tgz"; + sha1 = "2e631a3db449026fcb85099398b7bd750eac46a7"; }) ]; buildInputs = (self.nativeDeps."mimelib" or []); deps = { - "encoding-0.1.8" = self.by-version."encoding"."0.1.8"; + "encoding-0.1.11" = self.by-version."encoding"."0.1.11"; "addressparser-0.2.1" = self.by-version."addressparser"."0.2.1"; }; peerDependencies = [ ]; passthru.names = [ "mimelib" ]; }; + by-spec."mine"."~0.0.1" = + self.by-version."mine"."0.0.2"; + by-version."mine"."0.0.2" = lib.makeOverridable self.buildNodePackage { + name = "mine-0.0.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/mine/-/mine-0.0.2.tgz"; + name = "mine-0.0.2.tgz"; + sha1 = "77c2d327f8357352e69fc3e618f7476539fa0c40"; + }) + ]; + buildInputs = + (self.nativeDeps."mine" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "mine" ]; + }; by-spec."minilog"."~2.0.2" = self.by-version."minilog"."2.0.6"; by-version."minilog"."2.0.6" = lib.makeOverridable self.buildNodePackage { @@ -12022,44 +16242,44 @@ ]; passthru.names = [ "minilog" ]; }; - by-spec."minimatch"."0.0.x" = - self.by-version."minimatch"."0.0.5"; - by-version."minimatch"."0.0.5" = lib.makeOverridable self.buildNodePackage { - name = "minimatch-0.0.5"; + by-spec."minimatch"."0" = + self.by-version."minimatch"."0.4.0"; + by-version."minimatch"."0.4.0" = lib.makeOverridable self.buildNodePackage { + name = "minimatch-0.4.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/minimatch/-/minimatch-0.0.5.tgz"; - name = "minimatch-0.0.5.tgz"; - sha1 = "96bb490bbd3ba6836bbfac111adf75301b1584de"; + url = "http://registry.npmjs.org/minimatch/-/minimatch-0.4.0.tgz"; + name = "minimatch-0.4.0.tgz"; + sha1 = "bd2c7d060d2c8c8fd7cde7f1f2ed2d5b270fdb1b"; }) ]; buildInputs = (self.nativeDeps."minimatch" or []); deps = { - "lru-cache-1.0.6" = self.by-version."lru-cache"."1.0.6"; + "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0"; + "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0"; }; peerDependencies = [ ]; passthru.names = [ "minimatch" ]; }; - by-spec."minimatch"."0.2.x" = - self.by-version."minimatch"."0.2.14"; - by-version."minimatch"."0.2.14" = lib.makeOverridable self.buildNodePackage { - name = "minimatch-0.2.14"; + by-spec."minimatch"."0.0.x" = + self.by-version."minimatch"."0.0.5"; + by-version."minimatch"."0.0.5" = lib.makeOverridable self.buildNodePackage { + name = "minimatch-0.0.5"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz"; - name = "minimatch-0.2.14.tgz"; - sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a"; + url = "http://registry.npmjs.org/minimatch/-/minimatch-0.0.5.tgz"; + name = "minimatch-0.0.5.tgz"; + sha1 = "96bb490bbd3ba6836bbfac111adf75301b1584de"; }) ]; buildInputs = (self.nativeDeps."minimatch" or []); deps = { - "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0"; - "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0"; + "lru-cache-1.0.6" = self.by-version."lru-cache"."1.0.6"; }; peerDependencies = [ ]; @@ -12089,14 +16309,16 @@ }; by-spec."minimatch"."0.x" = self.by-version."minimatch"."0.4.0"; - by-version."minimatch"."0.4.0" = lib.makeOverridable self.buildNodePackage { - name = "minimatch-0.4.0"; + by-spec."minimatch"."1" = + self.by-version."minimatch"."1.0.0"; + by-version."minimatch"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "minimatch-1.0.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/minimatch/-/minimatch-0.4.0.tgz"; - name = "minimatch-0.4.0.tgz"; - sha1 = "bd2c7d060d2c8c8fd7cde7f1f2ed2d5b270fdb1b"; + url = "http://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz"; + name = "minimatch-1.0.0.tgz"; + sha1 = "e0dd2120b49e1b724ce8d714c520822a9438576d"; }) ]; buildInputs = @@ -12109,16 +16331,22 @@ ]; passthru.names = [ "minimatch" ]; }; - by-spec."minimatch"."1" = + by-spec."minimatch"."1.0.x" = self.by-version."minimatch"."1.0.0"; - by-version."minimatch"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "minimatch-1.0.0"; + by-spec."minimatch".">=0.2.4" = + self.by-version."minimatch"."1.0.0"; + by-spec."minimatch"."^1.0.0" = + self.by-version."minimatch"."1.0.0"; + by-spec."minimatch"."~0.2" = + self.by-version."minimatch"."0.2.14"; + by-version."minimatch"."0.2.14" = lib.makeOverridable self.buildNodePackage { + name = "minimatch-0.2.14"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz"; - name = "minimatch-1.0.0.tgz"; - sha1 = "e0dd2120b49e1b724ce8d714c520822a9438576d"; + url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz"; + name = "minimatch-0.2.14.tgz"; + sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a"; }) ]; buildInputs = @@ -12131,18 +16359,12 @@ ]; passthru.names = [ "minimatch" ]; }; - by-spec."minimatch"."1.0.x" = - self.by-version."minimatch"."1.0.0"; - by-spec."minimatch".">=0.2.4" = - self.by-version."minimatch"."1.0.0"; - by-spec."minimatch"."^1.0.0" = - self.by-version."minimatch"."1.0.0"; - by-spec."minimatch"."~0.2" = - self.by-version."minimatch"."0.2.14"; by-spec."minimatch"."~0.2.11" = self.by-version."minimatch"."0.2.14"; by-spec."minimatch"."~0.2.12" = self.by-version."minimatch"."0.2.14"; + by-spec."minimatch"."~0.2.14" = + self.by-version."minimatch"."0.2.14"; by-spec."minimatch"."~0.2.9" = self.by-version."minimatch"."0.2.14"; by-spec."minimatch"."~0.3.0" = @@ -12229,6 +16451,8 @@ ]; passthru.names = [ "minimist" ]; }; + by-spec."minimist"."~0.0.5" = + self.by-version."minimist"."0.0.10"; by-spec."minimist"."~0.0.7" = self.by-version."minimist"."0.0.10"; by-spec."minimist"."~0.2.0" = @@ -12251,6 +16475,8 @@ ]; passthru.names = [ "minimist" ]; }; + by-spec."minimist"."~1.1.0" = + self.by-version."minimist"."1.1.0"; by-spec."ministyle"."~0.1.3" = self.by-version."ministyle"."0.1.4"; by-version."ministyle"."0.1.4" = lib.makeOverridable self.buildNodePackage { @@ -12314,6 +16540,28 @@ passthru.names = [ "mkdirp" ]; }; "mkdirp" = self.by-version."mkdirp"."0.5.0"; + by-spec."mkdirp"."0" = + self.by-version."mkdirp"."0.5.0"; + by-spec."mkdirp"."0.0.x" = + self.by-version."mkdirp"."0.0.7"; + by-version."mkdirp"."0.0.7" = lib.makeOverridable self.buildNodePackage { + name = "mkdirp-0.0.7"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.0.7.tgz"; + name = "mkdirp-0.0.7.tgz"; + sha1 = "d89b4f0e4c3e5e5ca54235931675e094fe1a5072"; + }) + ]; + buildInputs = + (self.nativeDeps."mkdirp" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "mkdirp" ]; + }; by-spec."mkdirp"."0.3.0" = self.by-version."mkdirp"."0.3.0"; by-version."mkdirp"."0.3.0" = lib.makeOverridable self.buildNodePackage { @@ -12356,6 +16604,26 @@ }; by-spec."mkdirp"."0.3.x" = self.by-version."mkdirp"."0.3.5"; + by-spec."mkdirp"."0.4.0" = + self.by-version."mkdirp"."0.4.0"; + by-version."mkdirp"."0.4.0" = lib.makeOverridable self.buildNodePackage { + name = "mkdirp-0.4.0"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.4.0.tgz"; + name = "mkdirp-0.4.0.tgz"; + sha1 = "291ac2a2d43a19c478662577b5be846fe83b5923"; + }) + ]; + buildInputs = + (self.nativeDeps."mkdirp" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "mkdirp" ]; + }; by-spec."mkdirp"."0.5" = self.by-version."mkdirp"."0.5.0"; by-spec."mkdirp"."0.5.0" = @@ -12366,6 +16634,8 @@ self.by-version."mkdirp"."0.5.0"; by-spec."mkdirp".">=0.5 0" = self.by-version."mkdirp"."0.5.0"; + by-spec."mkdirp"."^0.3.5" = + self.by-version."mkdirp"."0.3.5"; by-spec."mkdirp"."^0.5.0" = self.by-version."mkdirp"."0.5.0"; by-spec."mkdirp"."~0.3.3" = @@ -12376,34 +16646,55 @@ self.by-version."mkdirp"."0.3.5"; by-spec."mkdirp"."~0.5.0" = self.by-version."mkdirp"."0.5.0"; + by-spec."mkpath"."~0.1.0" = + self.by-version."mkpath"."0.1.0"; + by-version."mkpath"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "mkpath-0.1.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/mkpath/-/mkpath-0.1.0.tgz"; + name = "mkpath-0.1.0.tgz"; + sha1 = "7554a6f8d871834cc97b5462b122c4c124d6de91"; + }) + ]; + buildInputs = + (self.nativeDeps."mkpath" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "mkpath" ]; + }; by-spec."mocha"."*" = - self.by-version."mocha"."1.21.4"; - by-version."mocha"."1.21.4" = lib.makeOverridable self.buildNodePackage { - name = "mocha-1.21.4"; + self.by-version."mocha"."2.0.1"; + by-version."mocha"."2.0.1" = lib.makeOverridable self.buildNodePackage { + name = "mocha-2.0.1"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/mocha/-/mocha-1.21.4.tgz"; - name = "mocha-1.21.4.tgz"; - sha1 = "e77d69c3773ba3e2b4fe6b628c28b5dd43880adc"; + url = "http://registry.npmjs.org/mocha/-/mocha-2.0.1.tgz"; + name = "mocha-2.0.1.tgz"; + sha1 = "5a16e88b856d0c4145d8c6888c27ebd4fab13e90"; }) ]; buildInputs = (self.nativeDeps."mocha" or []); deps = { - "commander-2.0.0" = self.by-version."commander"."2.0.0"; - "growl-1.8.1" = self.by-version."growl"."1.8.1"; - "jade-0.26.3" = self.by-version."jade"."0.26.3"; - "diff-1.0.7" = self.by-version."diff"."1.0.7"; + "commander-2.3.0" = self.by-version."commander"."2.3.0"; "debug-2.0.0" = self.by-version."debug"."2.0.0"; - "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; + "diff-1.0.8" = self.by-version."diff"."1.0.8"; + "escape-string-regexp-1.0.2" = self.by-version."escape-string-regexp"."1.0.2"; "glob-3.2.3" = self.by-version."glob"."3.2.3"; + "growl-1.8.1" = self.by-version."growl"."1.8.1"; + "jade-0.26.3" = self.by-version."jade"."0.26.3"; + "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; }; peerDependencies = [ ]; passthru.names = [ "mocha" ]; }; - "mocha" = self.by-version."mocha"."1.21.4"; + "mocha" = self.by-version."mocha"."2.0.1"; by-spec."mocha"."~1.20.1" = self.by-version."mocha"."1.20.1"; by-version."mocha"."1.20.1" = lib.makeOverridable self.buildNodePackage { @@ -12423,7 +16714,7 @@ "growl-1.7.0" = self.by-version."growl"."1.7.0"; "jade-0.26.3" = self.by-version."jade"."0.26.3"; "diff-1.0.7" = self.by-version."diff"."1.0.7"; - "debug-2.0.0" = self.by-version."debug"."2.0.0"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; "glob-3.2.3" = self.by-version."glob"."3.2.3"; }; @@ -12432,15 +16723,15 @@ passthru.names = [ "mocha" ]; }; by-spec."mocha-phantomjs"."*" = - self.by-version."mocha-phantomjs"."3.5.0"; - by-version."mocha-phantomjs"."3.5.0" = lib.makeOverridable self.buildNodePackage { - name = "mocha-phantomjs-3.5.0"; + self.by-version."mocha-phantomjs"."3.5.1"; + by-version."mocha-phantomjs"."3.5.1" = lib.makeOverridable self.buildNodePackage { + name = "mocha-phantomjs-3.5.1"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/mocha-phantomjs/-/mocha-phantomjs-3.5.0.tgz"; - name = "mocha-phantomjs-3.5.0.tgz"; - sha1 = "56fb4072122b4061b21e9c3901e35f4a7c58a93e"; + url = "http://registry.npmjs.org/mocha-phantomjs/-/mocha-phantomjs-3.5.1.tgz"; + name = "mocha-phantomjs-3.5.1.tgz"; + sha1 = "e5460eff3e859b98be73a743f11cb5cae3c58d00"; }) ]; buildInputs = @@ -12450,11 +16741,11 @@ "commander-2.0.0" = self.by-version."commander"."2.0.0"; }; peerDependencies = [ - self.by-version."phantomjs"."1.9.10" + self.by-version."phantomjs"."1.9.12" ]; passthru.names = [ "mocha-phantomjs" ]; }; - "mocha-phantomjs" = self.by-version."mocha-phantomjs"."3.5.0"; + "mocha-phantomjs" = self.by-version."mocha-phantomjs"."3.5.1"; by-spec."mocha-unfunk-reporter"."*" = self.by-version."mocha-unfunk-reporter"."0.4.0"; by-version."mocha-unfunk-reporter"."0.4.0" = lib.makeOverridable self.buildNodePackage { @@ -12481,24 +16772,24 @@ }; "mocha-unfunk-reporter" = self.by-version."mocha-unfunk-reporter"."0.4.0"; by-spec."module-deps"."^3.5.0" = - self.by-version."module-deps"."3.5.6"; - by-version."module-deps"."3.5.6" = lib.makeOverridable self.buildNodePackage { - name = "module-deps-3.5.6"; + self.by-version."module-deps"."3.5.10"; + by-version."module-deps"."3.5.10" = lib.makeOverridable self.buildNodePackage { + name = "module-deps-3.5.10"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/module-deps/-/module-deps-3.5.6.tgz"; - name = "module-deps-3.5.6.tgz"; - sha1 = "3853bb0be43b0d6632d25d96e4099abdfdf989d9"; + url = "http://registry.npmjs.org/module-deps/-/module-deps-3.5.10.tgz"; + name = "module-deps-3.5.10.tgz"; + sha1 = "2754737d4f9e52b60daa4abb242ade6c85ecde99"; }) ]; buildInputs = (self.nativeDeps."module-deps" or []); deps = { "JSONStream-0.7.4" = self.by-version."JSONStream"."0.7.4"; - "browser-resolve-1.3.2" = self.by-version."browser-resolve"."1.3.2"; - "concat-stream-1.4.6" = self.by-version."concat-stream"."1.4.6"; - "detective-3.1.0" = self.by-version."detective"."3.1.0"; + "browser-resolve-1.4.1" = self.by-version."browser-resolve"."1.4.1"; + "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7"; + "detective-4.0.0" = self.by-version."detective"."4.0.0"; "duplexer2-0.0.2" = self.by-version."duplexer2"."0.0.2"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; "minimist-0.2.0" = self.by-version."minimist"."0.2.0"; @@ -12514,6 +16805,90 @@ ]; passthru.names = [ "module-deps" ]; }; + by-spec."module-deps"."~1.10.0" = + self.by-version."module-deps"."1.10.0"; + by-version."module-deps"."1.10.0" = lib.makeOverridable self.buildNodePackage { + name = "module-deps-1.10.0"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/module-deps/-/module-deps-1.10.0.tgz"; + name = "module-deps-1.10.0.tgz"; + sha1 = "57a9cac9dbd092428ec5249f6cf37fb249d77db6"; + }) + ]; + buildInputs = + (self.nativeDeps."module-deps" or []); + deps = { + "JSONStream-0.7.4" = self.by-version."JSONStream"."0.7.4"; + "browser-resolve-1.2.4" = self.by-version."browser-resolve"."1.2.4"; + "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7"; + "detective-3.1.0" = self.by-version."detective"."3.1.0"; + "minimist-0.0.10" = self.by-version."minimist"."0.0.10"; + "parents-0.0.2" = self.by-version."parents"."0.0.2"; + "resolve-0.6.3" = self.by-version."resolve"."0.6.3"; + "through-2.3.6" = self.by-version."through"."2.3.6"; + }; + peerDependencies = [ + ]; + passthru.names = [ "module-deps" ]; + }; + by-spec."module-deps"."~1.2.2" = + self.by-version."module-deps"."1.2.2"; + by-version."module-deps"."1.2.2" = lib.makeOverridable self.buildNodePackage { + name = "module-deps-1.2.2"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/module-deps/-/module-deps-1.2.2.tgz"; + name = "module-deps-1.2.2.tgz"; + sha1 = "6e73959b7973af964de33a02437b76a8edfb2fc5"; + }) + ]; + buildInputs = + (self.nativeDeps."module-deps" or []); + deps = { + "through-2.3.6" = self.by-version."through"."2.3.6"; + "JSONStream-0.7.4" = self.by-version."JSONStream"."0.7.4"; + "browser-resolve-1.2.4" = self.by-version."browser-resolve"."1.2.4"; + "resolve-0.6.3" = self.by-version."resolve"."0.6.3"; + "detective-2.1.2" = self.by-version."detective"."2.1.2"; + "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7"; + "minimist-0.0.10" = self.by-version."minimist"."0.0.10"; + "parents-0.0.2" = self.by-version."parents"."0.0.2"; + }; + peerDependencies = [ + ]; + passthru.names = [ "module-deps" ]; + }; + by-spec."module-deps"."~1.4.0" = + self.by-version."module-deps"."1.4.2"; + by-version."module-deps"."1.4.2" = lib.makeOverridable self.buildNodePackage { + name = "module-deps-1.4.2"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/module-deps/-/module-deps-1.4.2.tgz"; + name = "module-deps-1.4.2.tgz"; + sha1 = "cc48c5f88a087c6d9ec1973167c2c9fee2f80314"; + }) + ]; + buildInputs = + (self.nativeDeps."module-deps" or []); + deps = { + "through-2.3.6" = self.by-version."through"."2.3.6"; + "JSONStream-0.7.4" = self.by-version."JSONStream"."0.7.4"; + "browser-resolve-1.2.4" = self.by-version."browser-resolve"."1.2.4"; + "resolve-0.6.3" = self.by-version."resolve"."0.6.3"; + "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7"; + "minimist-0.0.10" = self.by-version."minimist"."0.0.10"; + "parents-0.0.2" = self.by-version."parents"."0.0.2"; + "mine-0.0.2" = self.by-version."mine"."0.0.2"; + }; + peerDependencies = [ + ]; + passthru.names = [ "module-deps" ]; + }; by-spec."moment"."2.1.0" = self.by-version."moment"."2.1.0"; by-version."moment"."2.1.0" = lib.makeOverridable self.buildNodePackage { @@ -12554,16 +16929,16 @@ ]; passthru.names = [ "moment" ]; }; - by-spec."moment"."~2.8.2" = - self.by-version."moment"."2.8.3"; - by-version."moment"."2.8.3" = lib.makeOverridable self.buildNodePackage { - name = "moment-2.8.3"; + by-spec."moment"."~2.8.4" = + self.by-version."moment"."2.8.4"; + by-version."moment"."2.8.4" = lib.makeOverridable self.buildNodePackage { + name = "moment-2.8.4"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/moment/-/moment-2.8.3.tgz"; - name = "moment-2.8.3.tgz"; - sha1 = "a01427bf8910f014fc4baa1b8d96f17f7e3f29a2"; + url = "http://registry.npmjs.org/moment/-/moment-2.8.4.tgz"; + name = "moment-2.8.4.tgz"; + sha1 = "cc174aabb19223efff5699a9467805a2789838bf"; }) ]; buildInputs = @@ -12574,29 +16949,6 @@ ]; passthru.names = [ "moment" ]; }; - by-spec."mongodb"."*" = - self.by-version."mongodb"."2.0.0-alpha2"; - by-version."mongodb"."2.0.0-alpha2" = lib.makeOverridable self.buildNodePackage { - name = "mongodb-2.0.0-alpha2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/mongodb/-/mongodb-2.0.0-alpha2.tgz"; - name = "mongodb-2.0.0-alpha2.tgz"; - sha1 = "04541787b29a7db6a03ca4e44e593dd726d03d91"; - }) - ]; - buildInputs = - (self.nativeDeps."mongodb" or []); - deps = { - "mongodb-core-1.0.0-alpha9" = self.by-version."mongodb-core"."1.0.0-alpha9"; - "readable-stream-1.0.31" = self.by-version."readable-stream"."1.0.31"; - }; - peerDependencies = [ - ]; - passthru.names = [ "mongodb" ]; - }; - "mongodb" = self.by-version."mongodb"."2.0.0-alpha2"; by-spec."mongodb"."1.2.14" = self.by-version."mongodb"."1.2.14"; by-version."mongodb"."1.2.14" = lib.makeOverridable self.buildNodePackage { @@ -12662,53 +17014,29 @@ ]; passthru.names = [ "mongodb" ]; }; - by-spec."mongodb"."1.4.9" = - self.by-version."mongodb"."1.4.9"; - by-version."mongodb"."1.4.9" = lib.makeOverridable self.buildNodePackage { - name = "mongodb-1.4.9"; + by-spec."mongodb"."1.4.12" = + self.by-version."mongodb"."1.4.12"; + by-version."mongodb"."1.4.12" = lib.makeOverridable self.buildNodePackage { + name = "mongodb-1.4.12"; bin = false; src = [ (self.patchSource fetchurl { - url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.9.tgz"; - name = "mongodb-1.4.9.tgz"; - sha1 = "c30b9724248be471d30235e2d542646d3b869bc2"; + url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.12.tgz"; + name = "mongodb-1.4.12.tgz"; + sha1 = "65cdd46ec127861e941168fdccf82bf17ad71c4d"; }) ]; buildInputs = (self.nativeDeps."mongodb" or []); deps = { - "bson-0.2.12" = self.by-version."bson"."0.2.12"; - "kerberos-0.0.3" = self.by-version."kerberos"."0.0.3"; + "bson-0.2.15" = self.by-version."bson"."0.2.15"; + "kerberos-0.0.4" = self.by-version."kerberos"."0.0.4"; "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; }; peerDependencies = [ ]; passthru.names = [ "mongodb" ]; }; - by-spec."mongodb-core"."~1.0" = - self.by-version."mongodb-core"."1.0.0-alpha9"; - by-version."mongodb-core"."1.0.0-alpha9" = lib.makeOverridable self.buildNodePackage { - name = "mongodb-core-1.0.0-alpha9"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/mongodb-core/-/mongodb-core-1.0.0-alpha9.tgz"; - name = "mongodb-core-1.0.0-alpha9.tgz"; - sha1 = "895cf88ad00d20462c417cc2f59d261ec15f0c23"; - }) - ]; - buildInputs = - (self.nativeDeps."mongodb-core" or []); - deps = { - "bson-0.2.15" = self.by-version."bson"."0.2.15"; - "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; - "rimraf-2.2.6" = self.by-version."rimraf"."2.2.6"; - "kerberos-0.0.5" = self.by-version."kerberos"."0.0.5"; - }; - peerDependencies = [ - ]; - passthru.names = [ "mongodb-core" ]; - }; by-spec."mongoose"."3.6.7" = self.by-version."mongoose"."3.6.7"; by-version."mongoose"."3.6.7" = lib.makeOverridable self.buildNodePackage { @@ -12766,21 +17094,21 @@ }; "mongoose" = self.by-version."mongoose"."3.6.20"; by-spec."mongoose"."3.8.x" = - self.by-version."mongoose"."3.8.17"; - by-version."mongoose"."3.8.17" = lib.makeOverridable self.buildNodePackage { - name = "mongoose-3.8.17"; + self.by-version."mongoose"."3.8.19"; + by-version."mongoose"."3.8.19" = lib.makeOverridable self.buildNodePackage { + name = "mongoose-3.8.19"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/mongoose/-/mongoose-3.8.17.tgz"; - name = "mongoose-3.8.17.tgz"; - sha1 = "23426b3aea84255623dca28823de64a8fcd53da8"; + url = "http://registry.npmjs.org/mongoose/-/mongoose-3.8.19.tgz"; + name = "mongoose-3.8.19.tgz"; + sha1 = "53b82129c895bbb1e91094cb34d4a03920b1dcb4"; }) ]; buildInputs = (self.nativeDeps."mongoose" or []); deps = { - "mongodb-1.4.9" = self.by-version."mongodb"."1.4.9"; + "mongodb-1.4.12" = self.by-version."mongodb"."1.4.12"; "hooks-0.2.1" = self.by-version."hooks"."0.2.1"; "ms-0.1.0" = self.by-version."ms"."0.1.0"; "sliced-0.0.5" = self.by-version."sliced"."0.0.5"; @@ -12878,6 +17206,27 @@ ]; passthru.names = [ "monocle" ]; }; + by-spec."morgan"."1.0.0" = + self.by-version."morgan"."1.0.0"; + by-version."morgan"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "morgan-1.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/morgan/-/morgan-1.0.0.tgz"; + name = "morgan-1.0.0.tgz"; + sha1 = "83cf74b9f2d841901f1a9a6b8fa7a468d2e47a8d"; + }) + ]; + buildInputs = + (self.nativeDeps."morgan" or []); + deps = { + "bytes-0.2.1" = self.by-version."bytes"."0.2.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "morgan" ]; + }; by-spec."morgan"."~1.3.2" = self.by-version."morgan"."1.3.2"; by-version."morgan"."1.3.2" = lib.makeOverridable self.buildNodePackage { @@ -12901,6 +17250,50 @@ ]; passthru.names = [ "morgan" ]; }; + by-spec."morgan"."~1.4.1" = + self.by-version."morgan"."1.4.1"; + by-version."morgan"."1.4.1" = lib.makeOverridable self.buildNodePackage { + name = "morgan-1.4.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/morgan/-/morgan-1.4.1.tgz"; + name = "morgan-1.4.1.tgz"; + sha1 = "cd9600c3fa74e2fdf22ba0f1d026c20cb96f25fe"; + }) + ]; + buildInputs = + (self.nativeDeps."morgan" or []); + deps = { + "basic-auth-1.0.0" = self.by-version."basic-auth"."1.0.0"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; + "depd-1.0.0" = self.by-version."depd"."1.0.0"; + "on-finished-2.1.1" = self.by-version."on-finished"."2.1.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "morgan" ]; + }; + by-spec."mout"."~0.9.0" = + self.by-version."mout"."0.9.1"; + by-version."mout"."0.9.1" = lib.makeOverridable self.buildNodePackage { + name = "mout-0.9.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/mout/-/mout-0.9.1.tgz"; + name = "mout-0.9.1.tgz"; + sha1 = "84f0f3fd6acc7317f63de2affdcc0cee009b0477"; + }) + ]; + buildInputs = + (self.nativeDeps."mout" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "mout" ]; + }; by-spec."mpath"."0.1.1" = self.by-version."mpath"."0.1.1"; by-version."mpath"."0.1.1" = lib.makeOverridable self.buildNodePackage { @@ -13091,15 +17484,15 @@ passthru.names = [ "multiparty" ]; }; by-spec."multipipe"."^0.1.0" = - self.by-version."multipipe"."0.1.1"; - by-version."multipipe"."0.1.1" = lib.makeOverridable self.buildNodePackage { - name = "multipipe-0.1.1"; + self.by-version."multipipe"."0.1.2"; + by-version."multipipe"."0.1.2" = lib.makeOverridable self.buildNodePackage { + name = "multipipe-0.1.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/multipipe/-/multipipe-0.1.1.tgz"; - name = "multipipe-0.1.1.tgz"; - sha1 = "bc271fbb2bf3a5ed3e43cc6ba3d7dbc1c4eb07fb"; + url = "http://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz"; + name = "multipipe-0.1.2.tgz"; + sha1 = "2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"; }) ]; buildInputs = @@ -13131,7 +17524,7 @@ ]; passthru.names = [ "muri" ]; }; - by-spec."mute-stream"."~0.0.4" = + by-spec."mute-stream"."0.0.4" = self.by-version."mute-stream"."0.0.4"; by-version."mute-stream"."0.0.4" = lib.makeOverridable self.buildNodePackage { name = "mute-stream-0.0.4"; @@ -13151,6 +17544,8 @@ ]; passthru.names = [ "mute-stream" ]; }; + by-spec."mute-stream"."~0.0.4" = + self.by-version."mute-stream"."0.0.4"; by-spec."mv"."0.0.5" = self.by-version."mv"."0.0.5"; by-version."mv"."0.0.5" = lib.makeOverridable self.buildNodePackage { @@ -13172,21 +17567,21 @@ passthru.names = [ "mv" ]; }; by-spec."mz"."1" = - self.by-version."mz"."1.0.1"; - by-version."mz"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "mz-1.0.1"; + self.by-version."mz"."1.1.0"; + by-version."mz"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "mz-1.1.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/mz/-/mz-1.0.1.tgz"; - name = "mz-1.0.1.tgz"; - sha1 = "5ce1d3fe5cb3267c9c3141fb6a070f8d17f215d8"; + url = "http://registry.npmjs.org/mz/-/mz-1.1.0.tgz"; + name = "mz-1.1.0.tgz"; + sha1 = "fa63f08f20a1f6985cc1d9a33efa8db608cd6b9c"; }) ]; buildInputs = (self.nativeDeps."mz" or []); deps = { - "native-or-bluebird-1.1.1" = self.by-version."native-or-bluebird"."1.1.1"; + "native-or-bluebird-1.1.2" = self.by-version."native-or-bluebird"."1.1.2"; }; peerDependencies = [ ]; @@ -13212,16 +17607,16 @@ ]; passthru.names = [ "nan" ]; }; - by-spec."nan"."1.2.0" = - self.by-version."nan"."1.2.0"; - by-version."nan"."1.2.0" = lib.makeOverridable self.buildNodePackage { - name = "nan-1.2.0"; + by-spec."nan"."1.3.0" = + self.by-version."nan"."1.3.0"; + by-version."nan"."1.3.0" = lib.makeOverridable self.buildNodePackage { + name = "nan-1.3.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/nan/-/nan-1.2.0.tgz"; - name = "nan-1.2.0.tgz"; - sha1 = "9c4d63ce9e4f8e95de2d574e18f7925554a8a8ef"; + url = "http://registry.npmjs.org/nan/-/nan-1.3.0.tgz"; + name = "nan-1.3.0.tgz"; + sha1 = "9a5b8d5ef97a10df3050e59b2c362d3baf779742"; }) ]; buildInputs = @@ -13232,16 +17627,16 @@ ]; passthru.names = [ "nan" ]; }; - by-spec."nan"."1.3.0" = - self.by-version."nan"."1.3.0"; - by-version."nan"."1.3.0" = lib.makeOverridable self.buildNodePackage { - name = "nan-1.3.0"; + by-spec."nan".">=1.3.0" = + self.by-version."nan"."1.4.1"; + by-version."nan"."1.4.1" = lib.makeOverridable self.buildNodePackage { + name = "nan-1.4.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/nan/-/nan-1.3.0.tgz"; - name = "nan-1.3.0.tgz"; - sha1 = "9a5b8d5ef97a10df3050e59b2c362d3baf779742"; + url = "http://registry.npmjs.org/nan/-/nan-1.4.1.tgz"; + name = "nan-1.4.1.tgz"; + sha1 = "0a2bb562c558b440005b1f7eb8b31ccbdb565d5f"; }) ]; buildInputs = @@ -13252,10 +17647,48 @@ ]; passthru.names = [ "nan" ]; }; - by-spec."nan".">=1.3.0" = - self.by-version."nan"."1.3.0"; by-spec."nan"."^1.3.0" = - self.by-version."nan"."1.3.0"; + self.by-version."nan"."1.4.1"; + by-spec."nan"."~0.6.0" = + self.by-version."nan"."0.6.0"; + by-version."nan"."0.6.0" = lib.makeOverridable self.buildNodePackage { + name = "nan-0.6.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/nan/-/nan-0.6.0.tgz"; + name = "nan-0.6.0.tgz"; + sha1 = "a54ebe59717b467c77425302bd7c17574c887aaa"; + }) + ]; + buildInputs = + (self.nativeDeps."nan" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "nan" ]; + }; + by-spec."nan"."~0.7.0" = + self.by-version."nan"."0.7.1"; + by-version."nan"."0.7.1" = lib.makeOverridable self.buildNodePackage { + name = "nan-0.7.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/nan/-/nan-0.7.1.tgz"; + name = "nan-0.7.1.tgz"; + sha1 = "fc576184a1037b3e5675f2ba3740dee2044ff8f4"; + }) + ]; + buildInputs = + (self.nativeDeps."nan" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "nan" ]; + }; by-spec."nan"."~1.0.0" = self.by-version."nan"."1.0.0"; by-version."nan"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -13280,16 +17713,62 @@ self.by-version."nan"."1.1.2"; by-spec."nan"."~1.2.0" = self.by-version."nan"."1.2.0"; + by-version."nan"."1.2.0" = lib.makeOverridable self.buildNodePackage { + name = "nan-1.2.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/nan/-/nan-1.2.0.tgz"; + name = "nan-1.2.0.tgz"; + sha1 = "9c4d63ce9e4f8e95de2d574e18f7925554a8a8ef"; + }) + ]; + buildInputs = + (self.nativeDeps."nan" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "nan" ]; + }; + by-spec."nan"."~1.3.0" = + self.by-version."nan"."1.3.0"; + by-spec."nan"."~1.4.1" = + self.by-version."nan"."1.4.1"; + by-spec."native-buffer-browserify"."~2.0.0" = + self.by-version."native-buffer-browserify"."2.0.17"; + by-version."native-buffer-browserify"."2.0.17" = lib.makeOverridable self.buildNodePackage { + name = "native-buffer-browserify-2.0.17"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/native-buffer-browserify/-/native-buffer-browserify-2.0.17.tgz"; + name = "native-buffer-browserify-2.0.17.tgz"; + sha1 = "980577018c4884d169da40b47958ffac6c327d15"; + }) + ]; + buildInputs = + (self.nativeDeps."native-buffer-browserify" or []); + deps = { + "base64-js-0.0.7" = self.by-version."base64-js"."0.0.7"; + "ieee754-1.1.4" = self.by-version."ieee754"."1.1.4"; + }; + peerDependencies = [ + ]; + passthru.names = [ "native-buffer-browserify" ]; + }; + by-spec."native-buffer-browserify"."~2.0.15" = + self.by-version."native-buffer-browserify"."2.0.17"; by-spec."native-or-bluebird"."1" = - self.by-version."native-or-bluebird"."1.1.1"; - by-version."native-or-bluebird"."1.1.1" = lib.makeOverridable self.buildNodePackage { - name = "native-or-bluebird-1.1.1"; + self.by-version."native-or-bluebird"."1.1.2"; + by-version."native-or-bluebird"."1.1.2" = lib.makeOverridable self.buildNodePackage { + name = "native-or-bluebird-1.1.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/native-or-bluebird/-/native-or-bluebird-1.1.1.tgz"; - name = "native-or-bluebird-1.1.1.tgz"; - sha1 = "9131a6d6532afdfb5635f9703734cc6652c905ee"; + url = "http://registry.npmjs.org/native-or-bluebird/-/native-or-bluebird-1.1.2.tgz"; + name = "native-or-bluebird-1.1.2.tgz"; + sha1 = "3921e110232d1eb790f3dac61bb370531c7d356e"; }) ]; buildInputs = @@ -13324,6 +17803,30 @@ passthru.names = [ "natural" ]; }; by-spec."nconf"."*" = + self.by-version."nconf"."0.7.1"; + by-version."nconf"."0.7.1" = lib.makeOverridable self.buildNodePackage { + name = "nconf-0.7.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/nconf/-/nconf-0.7.1.tgz"; + name = "nconf-0.7.1.tgz"; + sha1 = "ee4b561dd979a3c58db122e38f196d49d61aeb5b"; + }) + ]; + buildInputs = + (self.nativeDeps."nconf" or []); + deps = { + "async-0.9.0" = self.by-version."async"."0.9.0"; + "ini-1.3.2" = self.by-version."ini"."1.3.2"; + "optimist-0.6.1" = self.by-version."optimist"."0.6.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "nconf" ]; + }; + "nconf" = self.by-version."nconf"."0.7.1"; + by-spec."nconf"."0.6.9" = self.by-version."nconf"."0.6.9"; by-version."nconf"."0.6.9" = lib.makeOverridable self.buildNodePackage { name = "nconf-0.6.9"; @@ -13339,16 +17842,13 @@ (self.nativeDeps."nconf" or []); deps = { "async-0.2.9" = self.by-version."async"."0.2.9"; - "ini-1.3.0" = self.by-version."ini"."1.3.0"; + "ini-1.3.2" = self.by-version."ini"."1.3.2"; "optimist-0.6.0" = self.by-version."optimist"."0.6.0"; }; peerDependencies = [ ]; passthru.names = [ "nconf" ]; }; - "nconf" = self.by-version."nconf"."0.6.9"; - by-spec."nconf"."0.6.9" = - self.by-version."nconf"."0.6.9"; by-spec."nconf"."~0.6.9" = self.by-version."nconf"."0.6.9"; by-spec."ncp"."0.2.x" = @@ -13391,16 +17891,18 @@ ]; passthru.names = [ "ncp" ]; }; - 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"; + by-spec."ncp"."~0.4.2" = + self.by-version."ncp"."0.4.2"; + by-spec."ncp"."~1.0.1" = + self.by-version."ncp"."1.0.1"; + by-version."ncp"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "ncp-1.0.1"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/ncp/-/ncp-0.6.0.tgz"; - name = "ncp-0.6.0.tgz"; - sha1 = "df8ce021e262be21b52feb3d3e5cfaab12491f0d"; + url = "http://registry.npmjs.org/ncp/-/ncp-1.0.1.tgz"; + name = "ncp-1.0.1.tgz"; + sha1 = "d15367e5cb87432ba117d2bf80fdf45aecfb4246"; }) ]; buildInputs = @@ -13411,8 +17913,6 @@ ]; passthru.names = [ "ncp" ]; }; - by-spec."ncp"."~0.4.2" = - self.by-version."ncp"."0.4.2"; by-spec."negotiator"."0.2.5" = self.by-version."negotiator"."0.2.5"; by-version."negotiator"."0.2.5" = lib.makeOverridable self.buildNodePackage { @@ -13453,16 +17953,16 @@ ]; passthru.names = [ "negotiator" ]; }; - by-spec."negotiator"."0.4.7" = - self.by-version."negotiator"."0.4.7"; - by-version."negotiator"."0.4.7" = lib.makeOverridable self.buildNodePackage { - name = "negotiator-0.4.7"; + by-spec."negotiator"."0.4.2" = + self.by-version."negotiator"."0.4.2"; + by-version."negotiator"."0.4.2" = lib.makeOverridable self.buildNodePackage { + name = "negotiator-0.4.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/negotiator/-/negotiator-0.4.7.tgz"; - name = "negotiator-0.4.7.tgz"; - sha1 = "a4160f7177ec806738631d0d3052325da42abdc8"; + url = "http://registry.npmjs.org/negotiator/-/negotiator-0.4.2.tgz"; + name = "negotiator-0.4.2.tgz"; + sha1 = "8c43ea7e4c40ddfe40c3c0234c4ef77500b8fd37"; }) ]; buildInputs = @@ -13473,16 +17973,16 @@ ]; passthru.names = [ "negotiator" ]; }; - by-spec."negotiator"."0.4.8" = - self.by-version."negotiator"."0.4.8"; - by-version."negotiator"."0.4.8" = lib.makeOverridable self.buildNodePackage { - name = "negotiator-0.4.8"; + by-spec."negotiator"."0.4.9" = + self.by-version."negotiator"."0.4.9"; + by-version."negotiator"."0.4.9" = lib.makeOverridable self.buildNodePackage { + name = "negotiator-0.4.9"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/negotiator/-/negotiator-0.4.8.tgz"; - name = "negotiator-0.4.8.tgz"; - sha1 = "96010b23b63c387f47a4bed96762a831cda39eab"; + url = "http://registry.npmjs.org/negotiator/-/negotiator-0.4.9.tgz"; + name = "negotiator-0.4.9.tgz"; + sha1 = "92e46b6db53c7e421ed64a2bc94f08be7630df3f"; }) ]; buildInputs = @@ -13516,6 +18016,68 @@ ]; passthru.names = [ "net-ping" ]; }; + by-spec."network-address"."0.0.5" = + self.by-version."network-address"."0.0.5"; + by-version."network-address"."0.0.5" = lib.makeOverridable self.buildNodePackage { + name = "network-address-0.0.5"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/network-address/-/network-address-0.0.5.tgz"; + name = "network-address-0.0.5.tgz"; + sha1 = "a400225438cacb67cd6108e8e826d5920a705dcc"; + }) + ]; + buildInputs = + (self.nativeDeps."network-address" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "network-address" ]; + }; + by-spec."next-tick"."~0.2.2" = + self.by-version."next-tick"."0.2.2"; + by-version."next-tick"."0.2.2" = lib.makeOverridable self.buildNodePackage { + name = "next-tick-0.2.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/next-tick/-/next-tick-0.2.2.tgz"; + name = "next-tick-0.2.2.tgz"; + sha1 = "75da4a927ee5887e39065880065b7336413b310d"; + }) + ]; + buildInputs = + (self.nativeDeps."next-tick" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "next-tick" ]; + }; + by-spec."nib"."*" = + self.by-version."nib"."1.0.4"; + by-version."nib"."1.0.4" = lib.makeOverridable self.buildNodePackage { + name = "nib-1.0.4"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/nib/-/nib-1.0.4.tgz"; + name = "nib-1.0.4.tgz"; + sha1 = "03d397c27a231f3c9a5a190eaa68e5d79e2f0345"; + }) + ]; + buildInputs = + (self.nativeDeps."nib" or []); + deps = { + "stylus-0.45.1" = self.by-version."stylus"."0.45.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "nib" ]; + }; + "nib" = self.by-version."nib"."1.0.4"; by-spec."nib"."0.5.0" = self.by-version."nib"."0.5.0"; by-version."nib"."0.5.0" = lib.makeOverridable self.buildNodePackage { @@ -13537,15 +18099,15 @@ passthru.names = [ "nib" ]; }; by-spec."nijs"."*" = - self.by-version."nijs"."0.0.18"; - by-version."nijs"."0.0.18" = lib.makeOverridable self.buildNodePackage { - name = "nijs-0.0.18"; + self.by-version."nijs"."0.0.22"; + by-version."nijs"."0.0.22" = lib.makeOverridable self.buildNodePackage { + name = "nijs-0.0.22"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/nijs/-/nijs-0.0.18.tgz"; - name = "nijs-0.0.18.tgz"; - sha1 = "bfdf140350d2bb3edae6b094dbc31035d6c7bec8"; + url = "http://registry.npmjs.org/nijs/-/nijs-0.0.22.tgz"; + name = "nijs-0.0.22.tgz"; + sha1 = "41f162cfd4b8e99b56da26b3170307381916718a"; }) ]; buildInputs = @@ -13558,7 +18120,7 @@ ]; passthru.names = [ "nijs" ]; }; - "nijs" = self.by-version."nijs"."0.0.18"; + "nijs" = self.by-version."nijs"."0.0.22"; by-spec."node-appc"."0.2.14" = self.by-version."node-appc"."0.2.14"; by-version."node-appc"."0.2.14" = lib.makeOverridable self.buildNodePackage { @@ -13595,28 +18157,56 @@ passthru.names = [ "node-appc" ]; }; by-spec."node-expat"."*" = - self.by-version."node-expat"."2.3.1"; - by-version."node-expat"."2.3.1" = lib.makeOverridable self.buildNodePackage { - name = "node-expat-2.3.1"; + self.by-version."node-expat"."2.3.3"; + by-version."node-expat"."2.3.3" = lib.makeOverridable self.buildNodePackage { + name = "node-expat-2.3.3"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/node-expat/-/node-expat-2.3.1.tgz"; - name = "node-expat-2.3.1.tgz"; - sha1 = "32c515a4d1cf747fb655d3ad4374696537592413"; + url = "http://registry.npmjs.org/node-expat/-/node-expat-2.3.3.tgz"; + name = "node-expat-2.3.3.tgz"; + sha1 = "fd7bfe475c9dd30b634cc1279c7a68aea900ebfa"; }) ]; buildInputs = (self.nativeDeps."node-expat" or []); deps = { "bindings-1.2.1" = self.by-version."bindings"."1.2.1"; - "nan-1.2.0" = self.by-version."nan"."1.2.0"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; + "nan-1.4.1" = self.by-version."nan"."1.4.1"; }; peerDependencies = [ ]; passthru.names = [ "node-expat" ]; }; - "node-expat" = self.by-version."node-expat"."2.3.1"; + "node-expat" = self.by-version."node-expat"."2.3.3"; + by-spec."node-expat".">=1.4.1" = + self.by-version."node-expat"."2.3.3"; + by-spec."node-expat"."~2.1.4" = + self.by-version."node-expat"."2.1.4"; + by-version."node-expat"."2.1.4" = lib.makeOverridable self.buildNodePackage { + name = "node-expat-2.1.4"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/node-expat/-/node-expat-2.1.4.tgz"; + name = "node-expat-2.1.4.tgz"; + sha1 = "e55a82249b71afbce09ffa880705ec37553c5121"; + }) + ]; + buildInputs = + (self.nativeDeps."node-expat" or []); + deps = { + "nan-0.6.0" = self.by-version."nan"."0.6.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "node-expat" ]; + }; + by-spec."node-expat"."~2.3.0" = + self.by-version."node-expat"."2.3.3"; + by-spec."node-expat"."~2.3.1" = + self.by-version."node-expat"."2.3.3"; by-spec."node-gyp"."*" = self.by-version."node-gyp"."1.0.2"; by-version."node-gyp"."1.0.2" = lib.makeOverridable self.buildNodePackage { @@ -13632,25 +18222,91 @@ buildInputs = (self.nativeDeps."node-gyp" or []); deps = { - "fstream-1.0.2" = self.by-version."fstream"."1.0.2"; - "glob-4.0.6" = self.by-version."glob"."4.0.6"; - "graceful-fs-3.0.2" = self.by-version."graceful-fs"."3.0.2"; + "fstream-1.0.3" = self.by-version."fstream"."1.0.3"; + "glob-4.2.2" = self.by-version."glob"."4.2.2"; + "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "nopt-3.0.1" = self.by-version."nopt"."3.0.1"; "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1"; "osenv-0.1.0" = self.by-version."osenv"."0.1.0"; - "request-2.44.0" = self.by-version."request"."2.44.0"; + "request-2.49.0" = self.by-version."request"."2.49.0"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; - "semver-4.0.3" = self.by-version."semver"."4.0.3"; - "tar-1.0.1" = self.by-version."tar"."1.0.1"; - "which-1.0.5" = self.by-version."which"."1.0.5"; + "semver-4.1.0" = self.by-version."semver"."4.1.0"; + "tar-1.0.3" = self.by-version."tar"."1.0.3"; + "which-1.0.7" = self.by-version."which"."1.0.7"; }; peerDependencies = [ ]; passthru.names = [ "node-gyp" ]; }; "node-gyp" = self.by-version."node-gyp"."1.0.2"; + by-spec."node-gyp"."~0.10.6" = + self.by-version."node-gyp"."0.10.10"; + by-version."node-gyp"."0.10.10" = lib.makeOverridable self.buildNodePackage { + name = "node-gyp-0.10.10"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.10.10.tgz"; + name = "node-gyp-0.10.10.tgz"; + sha1 = "74290b46b72046d648d301fae3813feb0d07edd9"; + }) + ]; + buildInputs = + (self.nativeDeps."node-gyp" or []); + deps = { + "glob-3.2.11" = self.by-version."glob"."3.2.11"; + "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3"; + "fstream-0.1.31" = self.by-version."fstream"."0.1.31"; + "minimatch-0.4.0" = self.by-version."minimatch"."0.4.0"; + "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; + "nopt-2.2.1" = self.by-version."nopt"."2.2.1"; + "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1"; + "osenv-0.1.0" = self.by-version."osenv"."0.1.0"; + "request-2.49.0" = self.by-version."request"."2.49.0"; + "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; + "semver-2.1.0" = self.by-version."semver"."2.1.0"; + "tar-0.1.20" = self.by-version."tar"."0.1.20"; + "which-1.0.7" = self.by-version."which"."1.0.7"; + }; + peerDependencies = [ + ]; + passthru.names = [ "node-gyp" ]; + }; + by-spec."node-gyp"."~0.12.2" = + self.by-version."node-gyp"."0.12.2"; + by-version."node-gyp"."0.12.2" = lib.makeOverridable self.buildNodePackage { + name = "node-gyp-0.12.2"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.12.2.tgz"; + name = "node-gyp-0.12.2.tgz"; + sha1 = "bdca7e7025feb308ddd7fd3434300e47703ec57a"; + }) + ]; + buildInputs = + (self.nativeDeps."node-gyp" or []); + deps = { + "glob-3.2.11" = self.by-version."glob"."3.2.11"; + "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3"; + "fstream-0.1.31" = self.by-version."fstream"."0.1.31"; + "minimatch-0.4.0" = self.by-version."minimatch"."0.4.0"; + "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; + "nopt-2.2.1" = self.by-version."nopt"."2.2.1"; + "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1"; + "osenv-0.1.0" = self.by-version."osenv"."0.1.0"; + "request-2.49.0" = self.by-version."request"."2.49.0"; + "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; + "semver-2.2.1" = self.by-version."semver"."2.2.1"; + "tar-0.1.20" = self.by-version."tar"."0.1.20"; + "which-1.0.7" = self.by-version."which"."1.0.7"; + }; + peerDependencies = [ + ]; + passthru.names = [ "node-gyp" ]; + }; by-spec."node-gyp"."~1.0.1" = self.by-version."node-gyp"."1.0.2"; by-spec."node-inspector"."*" = @@ -13677,7 +18333,7 @@ "ws-0.4.32" = self.by-version."ws"."0.4.32"; "opener-1.3.0" = self.by-version."opener"."1.3.0"; "yargs-1.2.6" = self.by-version."yargs"."1.2.6"; - "which-1.0.5" = self.by-version."which"."1.0.5"; + "which-1.0.7" = self.by-version."which"."1.0.7"; }; peerDependencies = [ ]; @@ -13685,28 +18341,101 @@ }; "node-inspector" = self.by-version."node-inspector"."0.7.4"; by-spec."node-protobuf"."*" = - self.by-version."node-protobuf"."1.2.1"; - by-version."node-protobuf"."1.2.1" = lib.makeOverridable self.buildNodePackage { - name = "node-protobuf-1.2.1"; + self.by-version."node-protobuf"."1.2.2"; + by-version."node-protobuf"."1.2.2" = lib.makeOverridable self.buildNodePackage { + name = "node-protobuf-1.2.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/node-protobuf/-/node-protobuf-1.2.1.tgz"; - name = "node-protobuf-1.2.1.tgz"; - sha1 = "d517eb4cdcfac002390ace6b8f0b865322eef049"; + url = "http://registry.npmjs.org/node-protobuf/-/node-protobuf-1.2.2.tgz"; + name = "node-protobuf-1.2.2.tgz"; + sha1 = "8d512499fe012358c1fd89d6b4d84ad80317acb3"; }) ]; buildInputs = (self.nativeDeps."node-protobuf" or []); deps = { "bindings-1.2.1" = self.by-version."bindings"."1.2.1"; - "nan-1.3.0" = self.by-version."nan"."1.3.0"; + "nan-1.4.1" = self.by-version."nan"."1.4.1"; }; peerDependencies = [ ]; passthru.names = [ "node-protobuf" ]; }; - "node-protobuf" = self.by-version."node-protobuf"."1.2.1"; + "node-protobuf" = self.by-version."node-protobuf"."1.2.2"; + by-spec."node-stringprep"."*" = + self.by-version."node-stringprep"."0.6.2"; + by-version."node-stringprep"."0.6.2" = lib.makeOverridable self.buildNodePackage { + name = "node-stringprep-0.6.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/node-stringprep/-/node-stringprep-0.6.2.tgz"; + name = "node-stringprep-0.6.2.tgz"; + sha1 = "c266853e5c22dfb53d99bcc68b02218c889ccdc7"; + }) + ]; + buildInputs = + (self.nativeDeps."node-stringprep" or []); + deps = { + "nan-1.2.0" = self.by-version."nan"."1.2.0"; + "bindings-1.1.1" = self.by-version."bindings"."1.1.1"; + "debug-2.0.0" = self.by-version."debug"."2.0.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "node-stringprep" ]; + }; + "node-stringprep" = self.by-version."node-stringprep"."0.6.2"; + by-spec."node-stringprep"."^0.5.2" = + self.by-version."node-stringprep"."0.5.4"; + by-version."node-stringprep"."0.5.4" = lib.makeOverridable self.buildNodePackage { + name = "node-stringprep-0.5.4"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/node-stringprep/-/node-stringprep-0.5.4.tgz"; + name = "node-stringprep-0.5.4.tgz"; + sha1 = "dd03b3d8f6f83137754cc1ea1a55675447b0ab92"; + }) + ]; + buildInputs = + (self.nativeDeps."node-stringprep" or []); + deps = { + "nan-1.2.0" = self.by-version."nan"."1.2.0"; + "bindings-1.1.1" = self.by-version."bindings"."1.1.1"; + "debug-2.0.0" = self.by-version."debug"."2.0.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "node-stringprep" ]; + }; + by-spec."node-stringprep"."~0.2.0" = + self.by-version."node-stringprep"."0.2.3"; + by-version."node-stringprep"."0.2.3" = lib.makeOverridable self.buildNodePackage { + name = "node-stringprep-0.2.3"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/node-stringprep/-/node-stringprep-0.2.3.tgz"; + name = "node-stringprep-0.2.3.tgz"; + sha1 = "deab53eacbb2744eb65a3ab76f49a53a6d7f6b1c"; + }) + ]; + buildInputs = + (self.nativeDeps."node-stringprep" or []); + deps = { + "nan-0.7.1" = self.by-version."nan"."0.7.1"; + "bindings-1.1.1" = self.by-version."bindings"."1.1.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "node-stringprep" ]; + }; + by-spec."node-stringprep"."~0.6.0" = + self.by-version."node-stringprep"."0.6.2"; + by-spec."node-stringprep"."~0.x" = + self.by-version."node-stringprep"."0.6.2"; by-spec."node-swt".">=0.1.1" = self.by-version."node-swt"."0.1.1"; by-version."node-swt"."0.1.1" = lib.makeOverridable self.buildNodePackage { @@ -13845,6 +18574,8 @@ }; by-spec."node-uuid"."1.4.1" = self.by-version."node-uuid"."1.4.1"; + by-spec."node-uuid"."^1.4.1" = + self.by-version."node-uuid"."1.4.1"; by-spec."node-uuid"."~1.4.0" = self.by-version."node-uuid"."1.4.1"; by-spec."node-uuid"."~1.4.1" = @@ -13870,6 +18601,421 @@ ]; passthru.names = [ "node-wsfederation" ]; }; + by-spec."node-xmpp"."*" = + self.by-version."node-xmpp"."1.0.0-alpha2"; + by-version."node-xmpp"."1.0.0-alpha2" = lib.makeOverridable self.buildNodePackage { + name = "node-xmpp-1.0.0-alpha2"; + bin = false; + src = [ + (self.patchSource fetchurl { + url = "http://registry.npmjs.org/node-xmpp/-/node-xmpp-1.0.0-alpha2.tgz"; + name = "node-xmpp-1.0.0-alpha2.tgz"; + sha1 = "349041a9041d3bcc608cdbf57e60f5b301e7a8c0"; + }) + ]; + buildInputs = + (self.nativeDeps."node-xmpp" or []); + deps = { + "node-expat-2.3.3" = self.by-version."node-expat"."2.3.3"; + "ltx-0.7.2" = self.by-version."ltx"."0.7.2"; + "request-2.49.0" = self.by-version."request"."2.49.0"; + "browser-request-0.3.3" = self.by-version."browser-request"."0.3.3"; + "faye-websocket-0.8.1" = self.by-version."faye-websocket"."0.8.1"; + "browserify-3.19.1" = self.by-version."browserify"."3.19.1"; + "brfs-0.0.8" = self.by-version."brfs"."0.0.8"; + "node-xmpp-component-1.0.0-alpha1" = self.by-version."node-xmpp-component"."1.0.0-alpha1"; + "node-xmpp-client-1.0.0-alpha18" = self.by-version."node-xmpp-client"."1.0.0-alpha18"; + "node-xmpp-server-1.0.0-alpha11" = self.by-version."node-xmpp-server"."1.0.0-alpha11"; + "node-xmpp-core-1.0.0-alpha11" = self.by-version."node-xmpp-core"."1.0.0-alpha11"; + }; + peerDependencies = [ + ]; + passthru.names = [ "node-xmpp" ]; + }; + "node-xmpp" = self.by-version."node-xmpp"."1.0.0-alpha2"; + by-spec."node-xmpp"."~0.15.0" = + self.by-version."node-xmpp"."0.15.0"; + by-version."node-xmpp"."0.15.0" = lib.makeOverridable self.buildNodePackage { + name = "node-xmpp-0.15.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/node-xmpp/-/node-xmpp-0.15.0.tgz"; + name = "node-xmpp-0.15.0.tgz"; + sha1 = "b4e1adf6b4ea859f0d06e12daca9f850286cbb14"; + }) + ]; + buildInputs = + (self.nativeDeps."node-xmpp" or []); + deps = { + "node-expat-2.3.3" = self.by-version."node-expat"."2.3.3"; + "ltx-0.7.2" = self.by-version."ltx"."0.7.2"; + "request-2.49.0" = self.by-version."request"."2.49.0"; + "browser-request-0.3.3" = self.by-version."browser-request"."0.3.3"; + "faye-websocket-0.8.1" = self.by-version."faye-websocket"."0.8.1"; + "browserify-3.19.1" = self.by-version."browserify"."3.19.1"; + "brfs-0.0.8" = self.by-version."brfs"."0.0.8"; + "node-xmpp-component-0.3.0" = self.by-version."node-xmpp-component"."0.3.0"; + "node-xmpp-client-0.4.0" = self.by-version."node-xmpp-client"."0.4.0"; + "node-xmpp-server-0.6.0" = self.by-version."node-xmpp-server"."0.6.0"; + "node-xmpp-core-0.5.0" = self.by-version."node-xmpp-core"."0.5.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "node-xmpp" ]; + }; + by-spec."node-xmpp-client"."*" = + self.by-version."node-xmpp-client"."1.0.0-alpha9"; + by-version."node-xmpp-client"."1.0.0-alpha9" = lib.makeOverridable self.buildNodePackage { + name = "node-xmpp-client-1.0.0-alpha9"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/node-xmpp-client/-/node-xmpp-client-1.0.0-alpha9.tgz"; + name = "node-xmpp-client-1.0.0-alpha9.tgz"; + sha1 = "5e48ce59f9ea96ff7f80dc4fff2be252ace26f24"; + }) + ]; + buildInputs = + (self.nativeDeps."node-xmpp-client" or []); + deps = { + "request-2.27.0" = self.by-version."request"."2.27.0"; + "faye-websocket-0.7.3" = self.by-version."faye-websocket"."0.7.3"; + "node-xmpp-core-1.0.0-alpha9" = self.by-version."node-xmpp-core"."1.0.0-alpha9"; + "browser-request-0.3.3" = self.by-version."browser-request"."0.3.3"; + "minimist-0.0.8" = self.by-version."minimist"."0.0.8"; + "debug-1.0.4" = self.by-version."debug"."1.0.4"; + }; + peerDependencies = [ + ]; + passthru.names = [ "node-xmpp-client" ]; + }; + "node-xmpp-client" = self.by-version."node-xmpp-client"."1.0.0-alpha9"; + by-spec."node-xmpp-client"."git+https://github.com/node-xmpp/node-xmpp-client.git" = + self.by-version."node-xmpp-client"."1.0.0-alpha18"; + by-version."node-xmpp-client"."1.0.0-alpha18" = lib.makeOverridable self.buildNodePackage { + name = "node-xmpp-client-1.0.0-alpha18"; + bin = false; + src = [ + (fetchgit { + url = "https://github.com/node-xmpp/node-xmpp-client.git"; + rev = "7a7b32a65405e087a72e37f534dfb62aa0dc005a"; + sha256 = "5744e791465babfd1c2678304c3ef08a23371f9d1f9b45364d9dfd7e7a62e1c3"; + }) + ]; + buildInputs = + (self.nativeDeps."node-xmpp-client" or []); + deps = { + "request-2.48.0" = self.by-version."request"."2.48.0"; + "faye-websocket-0.7.3" = self.by-version."faye-websocket"."0.7.3"; + "node-xmpp-core-1.0.0-alpha9" = self.by-version."node-xmpp-core"."1.0.0-alpha9"; + "browser-request-0.3.3" = self.by-version."browser-request"."0.3.3"; + "minimist-0.0.8" = self.by-version."minimist"."0.0.8"; + "debug-1.0.4" = self.by-version."debug"."1.0.4"; + }; + peerDependencies = [ + ]; + passthru.names = [ "node-xmpp-client" ]; + }; + by-spec."node-xmpp-client"."~0.4.0" = + self.by-version."node-xmpp-client"."0.4.0"; + by-version."node-xmpp-client"."0.4.0" = lib.makeOverridable self.buildNodePackage { + name = "node-xmpp-client-0.4.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/node-xmpp-client/-/node-xmpp-client-0.4.0.tgz"; + name = "node-xmpp-client-0.4.0.tgz"; + sha1 = "350def1797eaca28c592321cd16173f93167f90b"; + }) + ]; + buildInputs = + (self.nativeDeps."node-xmpp-client" or []); + deps = { + "request-2.27.0" = self.by-version."request"."2.27.0"; + "ltx-0.3.4" = self.by-version."ltx"."0.3.4"; + "faye-websocket-0.7.3" = self.by-version."faye-websocket"."0.7.3"; + "node-xmpp-core-0.5.0" = self.by-version."node-xmpp-core"."0.5.0"; + "browser-request-0.3.3" = self.by-version."browser-request"."0.3.3"; + }; + peerDependencies = [ + ]; + passthru.names = [ "node-xmpp-client" ]; + }; + by-spec."node-xmpp-component"."*" = + self.by-version."node-xmpp-component"."1.0.0-alpha1"; + by-version."node-xmpp-component"."1.0.0-alpha1" = lib.makeOverridable self.buildNodePackage { + name = "node-xmpp-component-1.0.0-alpha1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/node-xmpp-component/-/node-xmpp-component-1.0.0-alpha1.tgz"; + name = "node-xmpp-component-1.0.0-alpha1.tgz"; + sha1 = "3f85da00c05240bd48cc6c729d74875e6eb97877"; + }) + ]; + buildInputs = + (self.nativeDeps."node-xmpp-component" or []); + deps = { + "ltx-0.7.2" = self.by-version."ltx"."0.7.2"; + "node-xmpp-core-1.0.0-alpha1" = self.by-version."node-xmpp-core"."1.0.0-alpha1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "node-xmpp-component" ]; + }; + "node-xmpp-component" = self.by-version."node-xmpp-component"."1.0.0-alpha1"; + by-spec."node-xmpp-component"."git+https://github.com/node-xmpp/node-xmpp-component.git" = + self.by-version."node-xmpp-component"."1.0.0-alpha1"; + by-spec."node-xmpp-component"."~0.3.0" = + self.by-version."node-xmpp-component"."0.3.0"; + by-version."node-xmpp-component"."0.3.0" = lib.makeOverridable self.buildNodePackage { + name = "node-xmpp-component-0.3.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/node-xmpp-component/-/node-xmpp-component-0.3.0.tgz"; + name = "node-xmpp-component-0.3.0.tgz"; + sha1 = "353fb4d8250beb7f55df17805d20c81d4ea0d3c7"; + }) + ]; + buildInputs = + (self.nativeDeps."node-xmpp-component" or []); + deps = { + "ltx-0.3.4" = self.by-version."ltx"."0.3.4"; + "node-xmpp-core-0.5.0" = self.by-version."node-xmpp-core"."0.5.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "node-xmpp-component" ]; + }; + by-spec."node-xmpp-core"."*" = + self.by-version."node-xmpp-core"."1.0.0-alpha9"; + by-version."node-xmpp-core"."1.0.0-alpha9" = lib.makeOverridable self.buildNodePackage { + name = "node-xmpp-core-1.0.0-alpha9"; + bin = false; + src = [ + (self.patchSource fetchurl { + url = "http://registry.npmjs.org/node-xmpp-core/-/node-xmpp-core-1.0.0-alpha9.tgz"; + name = "node-xmpp-core-1.0.0-alpha9.tgz"; + sha1 = "64b2b41e9f59fc910c71fe648c6be2bc4ecef7f1"; + }) + ]; + buildInputs = + (self.nativeDeps."node-xmpp-core" or []); + deps = { + "node-stringprep-0.5.4" = self.by-version."node-stringprep"."0.5.4"; + "reconnect-core-0.0.1" = self.by-version."reconnect-core"."0.0.1"; + "tls-connect-0.2.2" = self.by-version."tls-connect"."0.2.2"; + "ltx-0.5.2" = self.by-version."ltx"."0.5.2"; + "debug-0.8.1" = self.by-version."debug"."0.8.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "node-xmpp-core" ]; + }; + "node-xmpp-core" = self.by-version."node-xmpp-core"."1.0.0-alpha9"; + by-spec."node-xmpp-core"."1.0.0-alpha1" = + self.by-version."node-xmpp-core"."1.0.0-alpha1"; + by-version."node-xmpp-core"."1.0.0-alpha1" = lib.makeOverridable self.buildNodePackage { + name = "node-xmpp-core-1.0.0-alpha1"; + bin = false; + src = [ + (self.patchSource fetchurl { + url = "http://registry.npmjs.org/node-xmpp-core/-/node-xmpp-core-1.0.0-alpha1.tgz"; + name = "node-xmpp-core-1.0.0-alpha1.tgz"; + sha1 = "94b1b33a0ccb84427d8b290af80e29b8dec5545f"; + }) + ]; + buildInputs = + (self.nativeDeps."node-xmpp-core" or []); + deps = { + "node-stringprep-0.6.2" = self.by-version."node-stringprep"."0.6.2"; + "reconnect-core-0.0.1" = self.by-version."reconnect-core"."0.0.1"; + "tls-connect-0.2.2" = self.by-version."tls-connect"."0.2.2"; + "ltx-0.7.2" = self.by-version."ltx"."0.7.2"; + "debug-0.8.1" = self.by-version."debug"."0.8.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "node-xmpp-core" ]; + }; + by-spec."node-xmpp-core"."^1.0.0-alpha10" = + self.by-version."node-xmpp-core"."1.0.0-alpha9"; + by-spec."node-xmpp-core"."^1.0.0-alpha6" = + self.by-version."node-xmpp-core"."1.0.0-alpha9"; + by-spec."node-xmpp-core"."^1.0.0-alpha9" = + self.by-version."node-xmpp-core"."1.0.0-alpha9"; + by-spec."node-xmpp-core"."git+https://github.com/node-xmpp/node-xmpp-core.git" = + self.by-version."node-xmpp-core"."1.0.0-alpha11"; + by-version."node-xmpp-core"."1.0.0-alpha11" = lib.makeOverridable self.buildNodePackage { + name = "node-xmpp-core-1.0.0-alpha11"; + bin = false; + src = [ + (self.patchSource fetchgit { + url = "https://github.com/node-xmpp/node-xmpp-core.git"; + rev = "f10cef6ab105c1542f698c5648c47e685adc38ad"; + sha256 = "734a4681af2078d8f3daf1e8aeb2b4121003115a804e1666e416e87b48720ebc"; + }) + ]; + buildInputs = + (self.nativeDeps."node-xmpp-core" or []); + deps = { + "node-stringprep-0.5.4" = self.by-version."node-stringprep"."0.5.4"; + "reconnect-core-0.0.1" = self.by-version."reconnect-core"."0.0.1"; + "tls-connect-0.2.2" = self.by-version."tls-connect"."0.2.2"; + "ltx-0.7.2" = self.by-version."ltx"."0.7.2"; + "debug-0.8.1" = self.by-version."debug"."0.8.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "node-xmpp-core" ]; + }; + by-spec."node-xmpp-core"."~0.5.0" = + self.by-version."node-xmpp-core"."0.5.0"; + by-version."node-xmpp-core"."0.5.0" = lib.makeOverridable self.buildNodePackage { + name = "node-xmpp-core-0.5.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/node-xmpp-core/-/node-xmpp-core-0.5.0.tgz"; + name = "node-xmpp-core-0.5.0.tgz"; + sha1 = "d3a453bf7bc029b7b5f10b1941e8a9e2952cf3db"; + }) + ]; + buildInputs = + (self.nativeDeps."node-xmpp-core" or []); + deps = { + "node-stringprep-0.2.3" = self.by-version."node-stringprep"."0.2.3"; + "tls-connect-0.2.2" = self.by-version."tls-connect"."0.2.2"; + "ltx-0.3.4" = self.by-version."ltx"."0.3.4"; + }; + peerDependencies = [ + ]; + passthru.names = [ "node-xmpp-core" ]; + }; + by-spec."node-xmpp-core"."~1.0.0-alpha10" = + self.by-version."node-xmpp-core"."1.0.0-alpha9"; + by-spec."node-xmpp-joap"."*" = + self.by-version."node-xmpp-joap"."0.0.17"; + by-version."node-xmpp-joap"."0.0.17" = lib.makeOverridable self.buildNodePackage { + name = "node-xmpp-joap-0.0.17"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/node-xmpp-joap/-/node-xmpp-joap-0.0.17.tgz"; + name = "node-xmpp-joap-0.0.17.tgz"; + sha1 = "d6d4fce1148f3fa158ed2a381787c51be3168fff"; + }) + ]; + buildInputs = + (self.nativeDeps."node-xmpp-joap" or []); + deps = { + "node-expat-2.3.3" = self.by-version."node-expat"."2.3.3"; + "node-xmpp-0.15.0" = self.by-version."node-xmpp"."0.15.0"; + "node-stringprep-0.6.2" = self.by-version."node-stringprep"."0.6.2"; + "ltx-0.6.0" = self.by-version."ltx"."0.6.0"; + "async-0.9.0" = self.by-version."async"."0.9.0"; + "toobusy-0.2.4" = self.by-version."toobusy"."0.2.4"; + "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "node-xmpp-joap" ]; + }; + "node-xmpp-joap" = self.by-version."node-xmpp-joap"."0.0.17"; + by-spec."node-xmpp-server"."*" = + self.by-version."node-xmpp-server"."1.0.0-alpha9"; + by-version."node-xmpp-server"."1.0.0-alpha9" = lib.makeOverridable self.buildNodePackage { + name = "node-xmpp-server-1.0.0-alpha9"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/node-xmpp-server/-/node-xmpp-server-1.0.0-alpha9.tgz"; + name = "node-xmpp-server-1.0.0-alpha9.tgz"; + sha1 = "1622aafddf9efde4dd9483c849d56b80e582a745"; + }) + ]; + buildInputs = + (self.nativeDeps."node-xmpp-server" or []); + deps = { + "hat-0.0.3" = self.by-version."hat"."0.0.3"; + "node-xmpp-core-1.0.0-alpha9" = self.by-version."node-xmpp-core"."1.0.0-alpha9"; + "debug-0.7.4" = self.by-version."debug"."0.7.4"; + }; + peerDependencies = [ + ]; + passthru.names = [ "node-xmpp-server" ]; + }; + "node-xmpp-server" = self.by-version."node-xmpp-server"."1.0.0-alpha9"; + by-spec."node-xmpp-server"."git+https://github.com/node-xmpp/node-xmpp-server.git" = + self.by-version."node-xmpp-server"."1.0.0-alpha11"; + by-version."node-xmpp-server"."1.0.0-alpha11" = lib.makeOverridable self.buildNodePackage { + name = "node-xmpp-server-1.0.0-alpha11"; + bin = false; + src = [ + (fetchgit { + url = "https://github.com/node-xmpp/node-xmpp-server.git"; + rev = "535abf75c95c3e500ebb14a863b81bfa4da529db"; + sha256 = "5abac2a86079c6f4ba1371a6a6455f6ae022e19965151dc0c309c875f2629eb9"; + }) + ]; + buildInputs = + (self.nativeDeps."node-xmpp-server" or []); + deps = { + "hat-0.0.3" = self.by-version."hat"."0.0.3"; + "node-xmpp-core-1.0.0-alpha9" = self.by-version."node-xmpp-core"."1.0.0-alpha9"; + "debug-0.7.4" = self.by-version."debug"."0.7.4"; + }; + peerDependencies = [ + ]; + passthru.names = [ "node-xmpp-server" ]; + }; + by-spec."node-xmpp-server"."~0.6.0" = + self.by-version."node-xmpp-server"."0.6.0"; + by-version."node-xmpp-server"."0.6.0" = lib.makeOverridable self.buildNodePackage { + name = "node-xmpp-server-0.6.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/node-xmpp-server/-/node-xmpp-server-0.6.0.tgz"; + name = "node-xmpp-server-0.6.0.tgz"; + sha1 = "66f7102d9b0c9aa34e2d37aa2f78811964f1298e"; + }) + ]; + buildInputs = + (self.nativeDeps."node-xmpp-server" or []); + deps = { + "ltx-0.3.4" = self.by-version."ltx"."0.3.4"; + "node-xmpp-core-0.5.0" = self.by-version."node-xmpp-core"."0.5.0"; + "node-xmpp-client-0.4.0" = self.by-version."node-xmpp-client"."0.4.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "node-xmpp-server" ]; + }; + by-spec."node-xmpp-serviceadmin"."*" = + self.by-version."node-xmpp-serviceadmin"."0.1.6"; + by-version."node-xmpp-serviceadmin"."0.1.6" = lib.makeOverridable self.buildNodePackage { + name = "node-xmpp-serviceadmin-0.1.6"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/node-xmpp-serviceadmin/-/node-xmpp-serviceadmin-0.1.6.tgz"; + name = "node-xmpp-serviceadmin-0.1.6.tgz"; + sha1 = "c67be0926b56b12c050d7caf8e2522b36ea84c00"; + }) + ]; + buildInputs = + (self.nativeDeps."node-xmpp-serviceadmin" or []); + deps = { + "node-xmpp-core-0.5.0" = self.by-version."node-xmpp-core"."0.5.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "node-xmpp-serviceadmin" ]; + }; + "node-xmpp-serviceadmin" = self.by-version."node-xmpp-serviceadmin"."0.1.6"; by-spec."node.extend"."1.0.0" = self.by-version."node.extend"."1.0.0"; by-version."node.extend"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -14022,6 +19168,8 @@ ]; passthru.names = [ "nopt" ]; }; + by-spec."nopt"."3.0.1" = + self.by-version."nopt"."3.0.1"; by-spec."nopt"."3.x" = self.by-version."nopt"."3.0.1"; by-spec."nopt"."~1.0.10" = @@ -14045,7 +19193,7 @@ ]; passthru.names = [ "nopt" ]; }; - by-spec."nopt"."~2.1.2" = + by-spec."nopt"."~2.1.1" = self.by-version."nopt"."2.1.2"; by-version."nopt"."2.1.2" = lib.makeOverridable self.buildNodePackage { name = "nopt-2.1.2"; @@ -14066,8 +19214,37 @@ ]; passthru.names = [ "nopt" ]; }; + by-spec."nopt"."~2.1.2" = + self.by-version."nopt"."2.1.2"; + by-spec."nopt"."~2.2.0" = + self.by-version."nopt"."2.2.1"; + by-spec."nopt"."~3.0.0" = + self.by-version."nopt"."3.0.1"; by-spec."nopt"."~3.0.1" = self.by-version."nopt"."3.0.1"; + by-spec."normalize-package-data"."^0.2.13" = + self.by-version."normalize-package-data"."0.2.13"; + by-version."normalize-package-data"."0.2.13" = lib.makeOverridable self.buildNodePackage { + name = "normalize-package-data-0.2.13"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-0.2.13.tgz"; + name = "normalize-package-data-0.2.13.tgz"; + sha1 = "50f9fd9e77b1c8411cd231db2962e73963de774d"; + }) + ]; + buildInputs = + (self.nativeDeps."normalize-package-data" or []); + deps = { + "github-url-from-git-1.1.1" = self.by-version."github-url-from-git"."1.1.1"; + "github-url-from-username-repo-0.1.0" = self.by-version."github-url-from-username-repo"."0.1.0"; + "semver-2.3.2" = self.by-version."semver"."2.3.2"; + }; + peerDependencies = [ + ]; + passthru.names = [ "normalize-package-data" ]; + }; by-spec."normalize-package-data"."^1.0.0" = self.by-version."normalize-package-data"."1.0.3"; by-version."normalize-package-data"."1.0.3" = lib.makeOverridable self.buildNodePackage { @@ -14085,7 +19262,7 @@ deps = { "github-url-from-git-1.4.0" = self.by-version."github-url-from-git"."1.4.0"; "github-url-from-username-repo-1.0.2" = self.by-version."github-url-from-username-repo"."1.0.2"; - "semver-4.0.3" = self.by-version."semver"."4.0.3"; + "semver-4.1.0" = self.by-version."semver"."4.1.0"; }; peerDependencies = [ ]; @@ -14096,15 +19273,15 @@ by-spec."normalize-package-data"."~1.0.3" = self.by-version."normalize-package-data"."1.0.3"; by-spec."npm"."*" = - self.by-version."npm"."2.1.3"; - by-version."npm"."2.1.3" = lib.makeOverridable self.buildNodePackage { - name = "npm-2.1.3"; + self.by-version."npm"."2.1.11"; + by-version."npm"."2.1.11" = lib.makeOverridable self.buildNodePackage { + name = "npm-2.1.11"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm/-/npm-2.1.3.tgz"; - name = "npm-2.1.3.tgz"; - sha1 = "f6dfc9d4bdaefe712a50bb75ae5c8bbdf2cd3a3b"; + url = "http://registry.npmjs.org/npm/-/npm-2.1.11.tgz"; + name = "npm-2.1.11.tgz"; + sha1 = "1eed4c04e4c8c745bc721baba1b4fe42f2af140c"; }) ]; buildInputs = @@ -14114,7 +19291,7 @@ "ansi-0.3.0" = self.by-version."ansi"."0.3.0"; "ansicolors-0.3.2" = self.by-version."ansicolors"."0.3.2"; "ansistyles-0.1.3" = self.by-version."ansistyles"."0.1.3"; - "archy-0.0.2" = self.by-version."archy"."0.0.2"; + "archy-1.0.0" = self.by-version."archy"."1.0.0"; "async-some-1.0.1" = self.by-version."async-some"."1.0.1"; "block-stream-0.0.7" = self.by-version."block-stream"."0.0.7"; "char-spinner-1.0.1" = self.by-version."char-spinner"."1.0.1"; @@ -14123,20 +19300,21 @@ "chownr-0.0.1" = self.by-version."chownr"."0.0.1"; "cmd-shim-2.0.1" = self.by-version."cmd-shim"."2.0.1"; "columnify-1.2.1" = self.by-version."columnify"."1.2.1"; + "config-chain-1.1.8" = self.by-version."config-chain"."1.1.8"; "dezalgo-1.0.1" = self.by-version."dezalgo"."1.0.1"; "editor-0.1.0" = self.by-version."editor"."0.1.0"; - "fs-vacuum-1.2.1" = self.by-version."fs-vacuum"."1.2.1"; + "fs-vacuum-1.2.2" = self.by-version."fs-vacuum"."1.2.2"; "fs-write-stream-atomic-1.0.2" = self.by-version."fs-write-stream-atomic"."1.0.2"; - "fstream-1.0.2" = self.by-version."fstream"."1.0.2"; - "fstream-npm-1.0.0" = self.by-version."fstream-npm"."1.0.0"; + "fstream-1.0.3" = self.by-version."fstream"."1.0.3"; + "fstream-npm-1.0.1" = self.by-version."fstream-npm"."1.0.1"; "github-url-from-git-1.4.0" = self.by-version."github-url-from-git"."1.4.0"; "github-url-from-username-repo-1.0.2" = self.by-version."github-url-from-username-repo"."1.0.2"; - "glob-4.0.6" = self.by-version."glob"."4.0.6"; - "graceful-fs-3.0.2" = self.by-version."graceful-fs"."3.0.2"; + "glob-4.2.2" = self.by-version."glob"."4.2.2"; + "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; "inflight-1.0.4" = self.by-version."inflight"."1.0.4"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - "ini-1.2.1" = self.by-version."ini"."1.2.1"; - "init-package-json-1.1.0" = self.by-version."init-package-json"."1.1.0"; + "ini-1.3.2" = self.by-version."ini"."1.3.2"; + "init-package-json-1.1.2" = self.by-version."init-package-json"."1.1.2"; "lockfile-1.0.0" = self.by-version."lockfile"."1.0.0"; "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0"; "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0"; @@ -14147,30 +19325,29 @@ "npm-cache-filename-1.0.1" = self.by-version."npm-cache-filename"."1.0.1"; "npm-install-checks-1.0.4" = self.by-version."npm-install-checks"."1.0.4"; "npm-package-arg-2.1.3" = self.by-version."npm-package-arg"."2.1.3"; - "npm-registry-client-3.2.2" = self.by-version."npm-registry-client"."3.2.2"; - "npm-user-validate-0.1.0" = self.by-version."npm-user-validate"."0.1.0"; - "npmconf-2.1.0" = self.by-version."npmconf"."2.1.0"; + "npm-registry-client-4.0.4" = self.by-version."npm-registry-client"."4.0.4"; + "npm-user-validate-0.1.1" = self.by-version."npm-user-validate"."0.1.1"; "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1"; "once-1.3.1" = self.by-version."once"."1.3.1"; - "opener-1.3.0" = self.by-version."opener"."1.3.0"; + "opener-1.4.0" = self.by-version."opener"."1.4.0"; "osenv-0.1.0" = self.by-version."osenv"."0.1.0"; "path-is-inside-1.0.1" = self.by-version."path-is-inside"."1.0.1"; "read-1.0.5" = self.by-version."read"."1.0.5"; "read-installed-3.1.3" = self.by-version."read-installed"."3.1.3"; "read-package-json-1.2.7" = self.by-version."read-package-json"."1.2.7"; - "readable-stream-1.0.32" = self.by-version."readable-stream"."1.0.32"; - "realize-package-specifier-1.1.0" = self.by-version."realize-package-specifier"."1.1.0"; - "request-2.44.0" = self.by-version."request"."2.44.0"; + "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; + "realize-package-specifier-1.3.0" = self.by-version."realize-package-specifier"."1.3.0"; + "request-2.48.0" = self.by-version."request"."2.48.0"; "retry-0.6.1" = self.by-version."retry"."0.6.1"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; - "semver-4.0.3" = self.by-version."semver"."4.0.3"; - "sha-1.2.4" = self.by-version."sha"."1.2.4"; + "semver-4.1.0" = self.by-version."semver"."4.1.0"; + "sha-1.3.0" = self.by-version."sha"."1.3.0"; "slide-1.1.6" = self.by-version."slide"."1.1.6"; "sorted-object-1.0.0" = self.by-version."sorted-object"."1.0.0"; - "tar-1.0.1" = self.by-version."tar"."1.0.1"; + "tar-1.0.3" = self.by-version."tar"."1.0.3"; "text-table-0.2.0" = self.by-version."text-table"."0.2.0"; - "uid-number-0.0.5" = self.by-version."uid-number"."0.0.5"; - "which-1.0.5" = self.by-version."which"."1.0.5"; + "uid-number-0.0.6" = self.by-version."uid-number"."0.0.6"; + "which-1.0.7" = self.by-version."which"."1.0.7"; "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1"; "write-file-atomic-1.1.0" = self.by-version."write-file-atomic"."1.1.0"; }; @@ -14178,8 +19355,136 @@ ]; passthru.names = [ "npm" ]; }; - "npm" = self.by-version."npm"."2.1.3"; - by-spec."npm-cache-filename"."^1.0.0" = + "npm" = self.by-version."npm"."2.1.11"; + by-spec."npm"."1.3.4" = + self.by-version."npm"."1.3.4"; + by-version."npm"."1.3.4" = lib.makeOverridable self.buildNodePackage { + name = "npm-1.3.4"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/npm/-/npm-1.3.4.tgz"; + name = "npm-1.3.4.tgz"; + sha1 = "1dacc91458f2197c362d774d2cbf111680f86ec2"; + }) + ]; + buildInputs = + (self.nativeDeps."npm" or []); + deps = { + "semver-2.0.11" = self.by-version."semver"."2.0.11"; + "ini-1.1.0" = self.by-version."ini"."1.1.0"; + "slide-1.1.6" = self.by-version."slide"."1.1.6"; + "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5"; + "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3"; + "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14"; + "nopt-2.1.2" = self.by-version."nopt"."2.1.2"; + "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; + "request-2.21.0" = self.by-version."request"."2.21.0"; + "which-1.0.7" = self.by-version."which"."1.0.7"; + "tar-0.1.20" = self.by-version."tar"."0.1.20"; + "fstream-0.1.31" = self.by-version."fstream"."0.1.31"; + "block-stream-0.0.7" = self.by-version."block-stream"."0.0.7"; + "inherits-1.0.0" = self.by-version."inherits"."1.0.0"; + "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; + "read-1.0.5" = self.by-version."read"."1.0.5"; + "lru-cache-2.3.1" = self.by-version."lru-cache"."2.3.1"; + "node-gyp-0.10.10" = self.by-version."node-gyp"."0.10.10"; + "fstream-npm-0.1.8" = self.by-version."fstream-npm"."0.1.8"; + "uid-number-0.0.6" = self.by-version."uid-number"."0.0.6"; + "archy-0.0.2" = self.by-version."archy"."0.0.2"; + "chownr-0.0.1" = self.by-version."chownr"."0.0.1"; + "npmlog-0.0.4" = self.by-version."npmlog"."0.0.4"; + "ansi-0.1.2" = self.by-version."ansi"."0.1.2"; + "npm-registry-client-0.2.31" = self.by-version."npm-registry-client"."0.2.31"; + "read-package-json-1.1.9" = self.by-version."read-package-json"."1.1.9"; + "read-installed-0.2.5" = self.by-version."read-installed"."0.2.5"; + "glob-3.2.11" = self.by-version."glob"."3.2.11"; + "init-package-json-0.0.10" = self.by-version."init-package-json"."0.0.10"; + "osenv-0.1.0" = self.by-version."osenv"."0.1.0"; + "lockfile-0.4.3" = self.by-version."lockfile"."0.4.3"; + "retry-0.6.1" = self.by-version."retry"."0.6.1"; + "once-1.1.1" = self.by-version."once"."1.1.1"; + "npmconf-0.1.16" = self.by-version."npmconf"."0.1.16"; + "opener-1.3.0" = self.by-version."opener"."1.3.0"; + "chmodr-0.1.0" = self.by-version."chmodr"."0.1.0"; + "cmd-shim-1.1.2" = self.by-version."cmd-shim"."1.1.2"; + "sha-1.0.1" = self.by-version."sha"."1.0.1"; + "editor-0.0.4" = self.by-version."editor"."0.0.4"; + "child-process-close-0.1.1" = self.by-version."child-process-close"."0.1.1"; + "npm-user-validate-0.0.3" = self.by-version."npm-user-validate"."0.0.3"; + }; + peerDependencies = [ + ]; + passthru.names = [ "npm" ]; + }; + by-spec."npm"."1.3.x" = + self.by-version."npm"."1.3.26"; + by-version."npm"."1.3.26" = lib.makeOverridable self.buildNodePackage { + name = "npm-1.3.26"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/npm/-/npm-1.3.26.tgz"; + name = "npm-1.3.26.tgz"; + sha1 = "bc07bf7cb58710078141c885c2d492fd570f606d"; + }) + ]; + buildInputs = + (self.nativeDeps."npm" or []); + deps = { + "semver-2.2.1" = self.by-version."semver"."2.2.1"; + "ini-1.1.0" = self.by-version."ini"."1.1.0"; + "slide-1.1.6" = self.by-version."slide"."1.1.6"; + "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5"; + "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3"; + "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14"; + "nopt-2.1.2" = self.by-version."nopt"."2.1.2"; + "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; + "request-2.30.0" = self.by-version."request"."2.30.0"; + "which-1.0.7" = self.by-version."which"."1.0.7"; + "tar-0.1.20" = self.by-version."tar"."0.1.20"; + "fstream-0.1.31" = self.by-version."fstream"."0.1.31"; + "block-stream-0.0.7" = self.by-version."block-stream"."0.0.7"; + "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; + "read-1.0.5" = self.by-version."read"."1.0.5"; + "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0"; + "node-gyp-0.12.2" = self.by-version."node-gyp"."0.12.2"; + "fstream-npm-0.1.8" = self.by-version."fstream-npm"."0.1.8"; + "uid-number-0.0.6" = self.by-version."uid-number"."0.0.6"; + "archy-0.0.2" = self.by-version."archy"."0.0.2"; + "chownr-0.0.1" = self.by-version."chownr"."0.0.1"; + "npmlog-0.0.6" = self.by-version."npmlog"."0.0.6"; + "ansi-0.2.1" = self.by-version."ansi"."0.2.1"; + "npm-registry-client-0.3.6" = self.by-version."npm-registry-client"."0.3.6"; + "read-package-json-1.1.9" = self.by-version."read-package-json"."1.1.9"; + "read-installed-0.2.5" = self.by-version."read-installed"."0.2.5"; + "glob-3.2.11" = self.by-version."glob"."3.2.11"; + "init-package-json-0.0.14" = self.by-version."init-package-json"."0.0.14"; + "osenv-0.1.0" = self.by-version."osenv"."0.1.0"; + "lockfile-0.4.3" = self.by-version."lockfile"."0.4.3"; + "retry-0.6.1" = self.by-version."retry"."0.6.1"; + "once-1.3.1" = self.by-version."once"."1.3.1"; + "npmconf-0.1.16" = self.by-version."npmconf"."0.1.16"; + "opener-1.3.0" = self.by-version."opener"."1.3.0"; + "chmodr-0.1.0" = self.by-version."chmodr"."0.1.0"; + "cmd-shim-1.1.2" = self.by-version."cmd-shim"."1.1.2"; + "sha-1.2.4" = self.by-version."sha"."1.2.4"; + "editor-0.0.5" = self.by-version."editor"."0.0.5"; + "child-process-close-0.1.1" = self.by-version."child-process-close"."0.1.1"; + "npm-user-validate-0.0.3" = self.by-version."npm-user-validate"."0.0.3"; + "github-url-from-git-1.1.1" = self.by-version."github-url-from-git"."1.1.1"; + "github-url-from-username-repo-0.0.2" = self.by-version."github-url-from-username-repo"."0.0.2"; + "text-table-0.2.0" = self.by-version."text-table"."0.2.0"; + "ansicolors-0.3.2" = self.by-version."ansicolors"."0.3.2"; + "ansistyles-0.1.3" = self.by-version."ansistyles"."0.1.3"; + "path-is-inside-1.0.1" = self.by-version."path-is-inside"."1.0.1"; + "columnify-0.1.2" = self.by-version."columnify"."0.1.2"; + }; + peerDependencies = [ + ]; + passthru.names = [ "npm" ]; + }; + by-spec."npm-cache-filename"."~1.0.1" = self.by-version."npm-cache-filename"."1.0.1"; by-version."npm-cache-filename"."1.0.1" = lib.makeOverridable self.buildNodePackage { name = "npm-cache-filename-1.0.1"; @@ -14199,8 +19504,32 @@ ]; passthru.names = [ "npm-cache-filename" ]; }; - by-spec."npm-cache-filename"."~1.0.1" = - self.by-version."npm-cache-filename"."1.0.1"; + by-spec."npm-check-updates"."*" = + self.by-version."npm-check-updates"."1.2.0"; + by-version."npm-check-updates"."1.2.0" = lib.makeOverridable self.buildNodePackage { + name = "npm-check-updates-1.2.0"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/npm-check-updates/-/npm-check-updates-1.2.0.tgz"; + name = "npm-check-updates-1.2.0.tgz"; + sha1 = "9e055cdc4a6fad8043bb95adf23eb74f5718c3ec"; + }) + ]; + buildInputs = + (self.nativeDeps."npm-check-updates" or []); + deps = { + "npm-1.3.26" = self.by-version."npm"."1.3.26"; + "commander-2.0.0" = self.by-version."commander"."2.0.0"; + "async-0.2.10" = self.by-version."async"."0.2.10"; + "read-package-json-1.1.9" = self.by-version."read-package-json"."1.1.9"; + "semver-2.2.1" = self.by-version."semver"."2.2.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "npm-check-updates" ]; + }; + "npm-check-updates" = self.by-version."npm-check-updates"."1.2.0"; by-spec."npm-install-checks"."~1.0.2" = self.by-version."npm-install-checks"."1.0.4"; by-version."npm-install-checks"."1.0.4" = lib.makeOverridable self.buildNodePackage { @@ -14217,7 +19546,7 @@ (self.nativeDeps."npm-install-checks" or []); deps = { "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1"; - "semver-4.0.3" = self.by-version."semver"."4.0.3"; + "semver-4.1.0" = self.by-version."semver"."4.1.0"; }; peerDependencies = [ ]; @@ -14238,7 +19567,7 @@ buildInputs = (self.nativeDeps."npm-package-arg" or []); deps = { - "semver-4.0.3" = self.by-version."semver"."4.0.3"; + "semver-4.1.0" = self.by-version."semver"."4.1.0"; }; peerDependencies = [ ]; @@ -14261,7 +19590,7 @@ buildInputs = (self.nativeDeps."npm-registry-client" or []); deps = { - "request-2.44.0" = self.by-version."request"."2.44.0"; + "request-2.49.0" = self.by-version."request"."2.49.0"; "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3"; "semver-2.0.11" = self.by-version."semver"."2.0.11"; "slide-1.1.6" = self.by-version."slide"."1.1.6"; @@ -14276,81 +19605,127 @@ ]; passthru.names = [ "npm-registry-client" ]; }; - by-spec."npm-registry-client"."~3.1.4" = - self.by-version."npm-registry-client"."3.1.8"; - by-version."npm-registry-client"."3.1.8" = lib.makeOverridable self.buildNodePackage { - name = "npm-registry-client-3.1.8"; + by-spec."npm-registry-client"."~0.2.27" = + self.by-version."npm-registry-client"."0.2.31"; + by-version."npm-registry-client"."0.2.31" = lib.makeOverridable self.buildNodePackage { + name = "npm-registry-client-0.2.31"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-3.1.8.tgz"; - name = "npm-registry-client-3.1.8.tgz"; - sha1 = "8cc5e0e6523683a95ba0735e53fddb5819372033"; + url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.2.31.tgz"; + name = "npm-registry-client-0.2.31.tgz"; + sha1 = "24a23e24e43246677cb485f8391829e9536563d4"; }) ]; buildInputs = (self.nativeDeps."npm-registry-client" or []); deps = { + "request-2.49.0" = self.by-version."request"."2.49.0"; + "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3"; + "semver-2.3.2" = self.by-version."semver"."2.3.2"; + "slide-1.1.6" = self.by-version."slide"."1.1.6"; "chownr-0.0.1" = self.by-version."chownr"."0.0.1"; - "graceful-fs-3.0.2" = self.by-version."graceful-fs"."3.0.2"; - "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; - "normalize-package-data-1.0.3" = self.by-version."normalize-package-data"."1.0.3"; - "npm-cache-filename-1.0.1" = self.by-version."npm-cache-filename"."1.0.1"; - "once-1.3.1" = self.by-version."once"."1.3.1"; - "request-2.44.0" = self.by-version."request"."2.44.0"; - "retry-0.6.0" = self.by-version."retry"."0.6.0"; + "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; - "semver-4.0.3" = self.by-version."semver"."4.0.3"; + "retry-0.6.0" = self.by-version."retry"."0.6.0"; + "couch-login-0.1.20" = self.by-version."couch-login"."0.1.20"; + "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "npm-registry-client" ]; + }; + by-spec."npm-registry-client"."~0.3.5" = + self.by-version."npm-registry-client"."0.3.6"; + by-version."npm-registry-client"."0.3.6" = lib.makeOverridable self.buildNodePackage { + name = "npm-registry-client-0.3.6"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.3.6.tgz"; + name = "npm-registry-client-0.3.6.tgz"; + sha1 = "c48a2a03643769acc49672860f7920ec6bffac6e"; + }) + ]; + buildInputs = + (self.nativeDeps."npm-registry-client" or []); + deps = { + "request-2.49.0" = self.by-version."request"."2.49.0"; + "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3"; + "semver-2.3.2" = self.by-version."semver"."2.3.2"; "slide-1.1.6" = self.by-version."slide"."1.1.6"; + "chownr-0.0.1" = self.by-version."chownr"."0.0.1"; + "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; + "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; + "retry-0.6.0" = self.by-version."retry"."0.6.0"; "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1"; }; peerDependencies = [ ]; passthru.names = [ "npm-registry-client" ]; }; - by-spec."npm-registry-client"."~3.2.2" = - self.by-version."npm-registry-client"."3.2.2"; - by-version."npm-registry-client"."3.2.2" = lib.makeOverridable self.buildNodePackage { - name = "npm-registry-client-3.2.2"; + by-spec."npm-registry-client"."~4.0.4" = + self.by-version."npm-registry-client"."4.0.4"; + by-version."npm-registry-client"."4.0.4" = lib.makeOverridable self.buildNodePackage { + name = "npm-registry-client-4.0.4"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-3.2.2.tgz"; - name = "npm-registry-client-3.2.2.tgz"; - sha1 = "7c4ef979cf61b411d15421a24ac2b3b846f8bd53"; + url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-4.0.4.tgz"; + name = "npm-registry-client-4.0.4.tgz"; + sha1 = "6935cde6460a3bf1cb6019d7523196e0fb96fb62"; }) ]; buildInputs = (self.nativeDeps."npm-registry-client" or []); deps = { "chownr-0.0.1" = self.by-version."chownr"."0.0.1"; - "graceful-fs-3.0.2" = self.by-version."graceful-fs"."3.0.2"; + "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7"; + "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "normalize-package-data-1.0.3" = self.by-version."normalize-package-data"."1.0.3"; - "npm-cache-filename-1.0.1" = self.by-version."npm-cache-filename"."1.0.1"; "once-1.3.1" = self.by-version."once"."1.3.1"; - "request-2.44.0" = self.by-version."request"."2.44.0"; - "retry-0.6.0" = self.by-version."retry"."0.6.0"; + "request-2.49.0" = self.by-version."request"."2.49.0"; + "retry-0.6.1" = self.by-version."retry"."0.6.1"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; - "semver-4.0.3" = self.by-version."semver"."4.0.3"; + "semver-4.1.0" = self.by-version."semver"."4.1.0"; "slide-1.1.6" = self.by-version."slide"."1.1.6"; "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1"; }; peerDependencies = [ - self.by-version."npmconf"."2.1.0" ]; passthru.names = [ "npm-registry-client" ]; }; - by-spec."npm-user-validate"."~0.1.0" = - self.by-version."npm-user-validate"."0.1.0"; - by-version."npm-user-validate"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "npm-user-validate-0.1.0"; + by-spec."npm-user-validate"."0.0.3" = + self.by-version."npm-user-validate"."0.0.3"; + by-version."npm-user-validate"."0.0.3" = lib.makeOverridable self.buildNodePackage { + name = "npm-user-validate-0.0.3"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.1.0.tgz"; - name = "npm-user-validate-0.1.0.tgz"; - sha1 = "358a5b5148ed3f79771d980388c6e34c4a61f638"; + url = "http://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.0.3.tgz"; + name = "npm-user-validate-0.0.3.tgz"; + sha1 = "818eca4312d13da648f9bc1d7f80bb4f151e0c2e"; + }) + ]; + buildInputs = + (self.nativeDeps."npm-user-validate" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "npm-user-validate" ]; + }; + by-spec."npm-user-validate"."~0.1.1" = + self.by-version."npm-user-validate"."0.1.1"; + by-version."npm-user-validate"."0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "npm-user-validate-0.1.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.1.1.tgz"; + name = "npm-user-validate-0.1.1.tgz"; + sha1 = "ea7774636c3c8fe6d01e174bd9f2ee0e22eeed57"; }) ]; buildInputs = @@ -14418,16 +19793,16 @@ ]; passthru.names = [ "npmconf" ]; }; - by-spec."npmconf"."2.0.9" = - self.by-version."npmconf"."2.0.9"; - by-version."npmconf"."2.0.9" = lib.makeOverridable self.buildNodePackage { - name = "npmconf-2.0.9"; + by-spec."npmconf"."0.1.16" = + self.by-version."npmconf"."0.1.16"; + by-version."npmconf"."0.1.16" = lib.makeOverridable self.buildNodePackage { + name = "npmconf-0.1.16"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/npmconf/-/npmconf-2.0.9.tgz"; - name = "npmconf-2.0.9.tgz"; - sha1 = "5c87e5fb308104eceeca781e3d9115d216351ef2"; + url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.16.tgz"; + name = "npmconf-0.1.16.tgz"; + sha1 = "0bdca78b8551419686b3a98004f06f0819edcd2a"; }) ]; buildInputs = @@ -14435,28 +19810,27 @@ deps = { "config-chain-1.1.8" = self.by-version."config-chain"."1.1.8"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - "ini-1.3.0" = self.by-version."ini"."1.3.0"; - "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; - "nopt-3.0.1" = self.by-version."nopt"."3.0.1"; "once-1.3.1" = self.by-version."once"."1.3.1"; - "osenv-0.1.0" = self.by-version."osenv"."0.1.0"; - "semver-4.0.3" = self.by-version."semver"."4.0.3"; - "uid-number-0.0.5" = self.by-version."uid-number"."0.0.5"; + "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; + "osenv-0.0.3" = self.by-version."osenv"."0.0.3"; + "nopt-2.2.1" = self.by-version."nopt"."2.2.1"; + "semver-2.3.2" = self.by-version."semver"."2.3.2"; + "ini-1.1.0" = self.by-version."ini"."1.1.0"; }; peerDependencies = [ ]; passthru.names = [ "npmconf" ]; }; - by-spec."npmconf".">=2.1.0-0 >=2.1.0-0 <2.2.0-0" = - self.by-version."npmconf"."2.1.0"; - by-version."npmconf"."2.1.0" = lib.makeOverridable self.buildNodePackage { - name = "npmconf-2.1.0"; + by-spec."npmconf"."2.0.9" = + self.by-version."npmconf"."2.0.9"; + by-version."npmconf"."2.0.9" = lib.makeOverridable self.buildNodePackage { + name = "npmconf-2.0.9"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/npmconf/-/npmconf-2.1.0.tgz"; - name = "npmconf-2.1.0.tgz"; - sha1 = "6dcdbd1fe3d7373b78ec74ab69e919d4954f76b0"; + url = "http://registry.npmjs.org/npmconf/-/npmconf-2.0.9.tgz"; + name = "npmconf-2.0.9.tgz"; + sha1 = "5c87e5fb308104eceeca781e3d9115d216351ef2"; }) ]; buildInputs = @@ -14464,30 +19838,28 @@ deps = { "config-chain-1.1.8" = self.by-version."config-chain"."1.1.8"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - "ini-1.3.0" = self.by-version."ini"."1.3.0"; + "ini-1.3.2" = self.by-version."ini"."1.3.2"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "nopt-3.0.1" = self.by-version."nopt"."3.0.1"; "once-1.3.1" = self.by-version."once"."1.3.1"; "osenv-0.1.0" = self.by-version."osenv"."0.1.0"; - "semver-4.0.3" = self.by-version."semver"."4.0.3"; + "semver-4.1.0" = self.by-version."semver"."4.1.0"; "uid-number-0.0.5" = self.by-version."uid-number"."0.0.5"; }; peerDependencies = [ ]; passthru.names = [ "npmconf" ]; }; - by-spec."npmconf"."^2.1.0" = - self.by-version."npmconf"."2.1.0"; - by-spec."npmconf"."~0.1.2" = - self.by-version."npmconf"."0.1.16"; - by-version."npmconf"."0.1.16" = lib.makeOverridable self.buildNodePackage { - name = "npmconf-0.1.16"; + by-spec."npmconf"."^2.0.1" = + self.by-version."npmconf"."2.1.1"; + by-version."npmconf"."2.1.1" = lib.makeOverridable self.buildNodePackage { + name = "npmconf-2.1.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.16.tgz"; - name = "npmconf-0.1.16.tgz"; - sha1 = "0bdca78b8551419686b3a98004f06f0819edcd2a"; + url = "http://registry.npmjs.org/npmconf/-/npmconf-2.1.1.tgz"; + name = "npmconf-2.1.1.tgz"; + sha1 = "a266c7e5c56695eb7f55caf3a5a7328f24510dae"; }) ]; buildInputs = @@ -14495,21 +19867,26 @@ deps = { "config-chain-1.1.8" = self.by-version."config-chain"."1.1.8"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + "ini-1.3.2" = self.by-version."ini"."1.3.2"; + "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; + "nopt-3.0.1" = self.by-version."nopt"."3.0.1"; "once-1.3.1" = self.by-version."once"."1.3.1"; - "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; - "osenv-0.0.3" = self.by-version."osenv"."0.0.3"; - "nopt-2.2.1" = self.by-version."nopt"."2.2.1"; - "semver-2.3.2" = self.by-version."semver"."2.3.2"; - "ini-1.1.0" = self.by-version."ini"."1.1.0"; + "osenv-0.1.0" = self.by-version."osenv"."0.1.0"; + "semver-4.1.0" = self.by-version."semver"."4.1.0"; + "uid-number-0.0.5" = self.by-version."uid-number"."0.0.5"; }; peerDependencies = [ ]; passthru.names = [ "npmconf" ]; }; - by-spec."npmconf"."~2.0.5" = - self.by-version."npmconf"."2.0.9"; - by-spec."npmconf"."~2.1.0" = - self.by-version."npmconf"."2.1.0"; + by-spec."npmconf"."~0.1.1" = + self.by-version."npmconf"."0.1.16"; + by-spec."npmconf"."~0.1.12" = + self.by-version."npmconf"."0.1.16"; + by-spec."npmconf"."~0.1.2" = + self.by-version."npmconf"."0.1.16"; + by-spec."npmconf"."~2.1.1" = + self.by-version."npmconf"."2.1.1"; by-spec."npmlog"."*" = self.by-version."npmlog"."0.1.1"; by-version."npmlog"."0.1.1" = lib.makeOverridable self.buildNodePackage { @@ -14533,20 +19910,62 @@ }; by-spec."npmlog"."0" = self.by-version."npmlog"."0.1.1"; + by-spec."npmlog"."0.0.4" = + self.by-version."npmlog"."0.0.4"; + by-version."npmlog"."0.0.4" = lib.makeOverridable self.buildNodePackage { + name = "npmlog-0.0.4"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/npmlog/-/npmlog-0.0.4.tgz"; + name = "npmlog-0.0.4.tgz"; + sha1 = "a12a7418606b7e0183a2851d97a8729b9a0f3837"; + }) + ]; + buildInputs = + (self.nativeDeps."npmlog" or []); + deps = { + "ansi-0.1.2" = self.by-version."ansi"."0.1.2"; + }; + peerDependencies = [ + ]; + passthru.names = [ "npmlog" ]; + }; + by-spec."npmlog"."0.0.6" = + self.by-version."npmlog"."0.0.6"; + by-version."npmlog"."0.0.6" = lib.makeOverridable self.buildNodePackage { + name = "npmlog-0.0.6"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/npmlog/-/npmlog-0.0.6.tgz"; + name = "npmlog-0.0.6.tgz"; + sha1 = "685043fe71aa1665d6e3b2acef180640caf40873"; + }) + ]; + buildInputs = + (self.nativeDeps."npmlog" or []); + deps = { + "ansi-0.2.1" = self.by-version."ansi"."0.2.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "npmlog" ]; + }; by-spec."npmlog"."0.1" = self.by-version."npmlog"."0.1.1"; by-spec."npmlog"."~0.1.1" = self.by-version."npmlog"."0.1.1"; by-spec."nssocket"."~0.5.1" = - self.by-version."nssocket"."0.5.1"; - by-version."nssocket"."0.5.1" = lib.makeOverridable self.buildNodePackage { - name = "nssocket-0.5.1"; + self.by-version."nssocket"."0.5.2"; + by-version."nssocket"."0.5.2" = lib.makeOverridable self.buildNodePackage { + name = "nssocket-0.5.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/nssocket/-/nssocket-0.5.1.tgz"; - name = "nssocket-0.5.1.tgz"; - sha1 = "11f0428335ad8d89ff9cf96ab2852a23b1b33b71"; + url = "http://registry.npmjs.org/nssocket/-/nssocket-0.5.2.tgz"; + name = "nssocket-0.5.2.tgz"; + sha1 = "7ea1d0c3106620f722cdff4ddfd5aac5b2553536"; }) ]; buildInputs = @@ -14559,6 +19978,26 @@ ]; passthru.names = [ "nssocket" ]; }; + by-spec."numeral"."^1.5.3" = + self.by-version."numeral"."1.5.3"; + by-version."numeral"."1.5.3" = lib.makeOverridable self.buildNodePackage { + name = "numeral-1.5.3"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/numeral/-/numeral-1.5.3.tgz"; + name = "numeral-1.5.3.tgz"; + sha1 = "a4c3eba68239580509f818267c77243bce43ff62"; + }) + ]; + buildInputs = + (self.nativeDeps."numeral" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "numeral" ]; + }; by-spec."oauth"."https://github.com/ciaranj/node-oauth/tarball/master" = self.by-version."oauth"."0.9.11"; by-version."oauth"."0.9.11" = lib.makeOverridable self.buildNodePackage { @@ -14568,7 +20007,7 @@ (fetchurl { url = "https://github.com/ciaranj/node-oauth/tarball/master"; name = "oauth-0.9.11.tgz"; - sha256 = "81deda1451b8103f278cbede8aab0a929a63882dbc604214fd7690d72390d083"; + sha256 = "783dead39b8df22dfff8961fcfb3e65622375d4308c12c1fbce2ae2e4da20184"; }) ]; buildInputs = @@ -14639,7 +20078,27 @@ ]; passthru.names = [ "oauth-sign" ]; }; - by-spec."object-additions".">= 0.5.0" = + by-spec."oauth-sign"."~0.5.0" = + self.by-version."oauth-sign"."0.5.0"; + by-version."oauth-sign"."0.5.0" = lib.makeOverridable self.buildNodePackage { + name = "oauth-sign-0.5.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz"; + name = "oauth-sign-0.5.0.tgz"; + sha1 = "d767f5169325620eab2e087ef0c472e773db6461"; + }) + ]; + buildInputs = + (self.nativeDeps."oauth-sign" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "oauth-sign" ]; + }; + by-spec."object-additions"."^0.5.1" = self.by-version."object-additions"."0.5.1"; by-version."object-additions"."0.5.1" = lib.makeOverridable self.buildNodePackage { name = "object-additions-0.5.1"; @@ -14659,7 +20118,7 @@ ]; passthru.names = [ "object-additions" ]; }; - by-spec."object-assign"."~0.3.1" = + by-spec."object-assign"."^0.3.0" = self.by-version."object-assign"."0.3.1"; by-version."object-assign"."0.3.1" = lib.makeOverridable self.buildNodePackage { name = "object-assign-0.3.1"; @@ -14679,6 +20138,28 @@ ]; passthru.names = [ "object-assign" ]; }; + by-spec."object-assign"."^1.0.0" = + self.by-version."object-assign"."1.0.0"; + by-version."object-assign"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "object-assign-1.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/object-assign/-/object-assign-1.0.0.tgz"; + name = "object-assign-1.0.0.tgz"; + sha1 = "e65dc8766d3b47b4b8307465c8311da030b070a6"; + }) + ]; + buildInputs = + (self.nativeDeps."object-assign" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "object-assign" ]; + }; + by-spec."object-assign"."~0.3.1" = + self.by-version."object-assign"."0.3.1"; by-spec."object-keys"."~0.4.0" = self.by-version."object-keys"."0.4.0"; by-version."object-keys"."0.4.0" = lib.makeOverridable self.buildNodePackage { @@ -14720,8 +20201,29 @@ ]; passthru.names = [ "on-finished" ]; }; - by-spec."on-finished"."~2.1.0" = - self.by-version."on-finished"."2.1.0"; + by-spec."on-finished"."2.1.1" = + self.by-version."on-finished"."2.1.1"; + by-version."on-finished"."2.1.1" = lib.makeOverridable self.buildNodePackage { + name = "on-finished-2.1.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/on-finished/-/on-finished-2.1.1.tgz"; + name = "on-finished-2.1.1.tgz"; + sha1 = "f82ca1c9e3a4f3286b1b9938610e5b8636bd3cb2"; + }) + ]; + buildInputs = + (self.nativeDeps."on-finished" or []); + deps = { + "ee-first-1.1.0" = self.by-version."ee-first"."1.1.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "on-finished" ]; + }; + by-spec."on-finished"."~2.1.1" = + self.by-version."on-finished"."2.1.1"; by-spec."on-headers"."~1.0.0" = self.by-version."on-headers"."1.0.0"; by-version."on-headers"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -14783,12 +20285,38 @@ ]; passthru.names = [ "once" ]; }; + by-spec."once"."^1.1.1" = + self.by-version."once"."1.3.1"; by-spec."once"."^1.3.0" = self.by-version."once"."1.3.1"; + by-spec."once"."^1.3.1" = + self.by-version."once"."1.3.1"; by-spec."once"."~1.1.1" = self.by-version."once"."1.1.1"; + by-spec."once"."~1.2.0" = + self.by-version."once"."1.2.0"; + by-version."once"."1.2.0" = lib.makeOverridable self.buildNodePackage { + name = "once-1.2.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/once/-/once-1.2.0.tgz"; + name = "once-1.2.0.tgz"; + sha1 = "de1905c636af874a8fba862d9aabddd1f920461c"; + }) + ]; + buildInputs = + (self.nativeDeps."once" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "once" ]; + }; by-spec."once"."~1.3.0" = self.by-version."once"."1.3.1"; + by-spec."once"."~1.3.1" = + self.by-version."once"."1.3.1"; by-spec."open"."0.0.2" = self.by-version."open"."0.0.2"; by-version."open"."0.0.2" = lib.makeOverridable self.buildNodePackage { @@ -14849,6 +20377,26 @@ ]; passthru.names = [ "opener" ]; }; + by-spec."opener"."~1.4.0" = + self.by-version."opener"."1.4.0"; + by-version."opener"."1.4.0" = lib.makeOverridable self.buildNodePackage { + name = "opener-1.4.0"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/opener/-/opener-1.4.0.tgz"; + name = "opener-1.4.0.tgz"; + sha1 = "d11f86eeeb076883735c9d509f538fe82d10b941"; + }) + ]; + buildInputs = + (self.nativeDeps."opener" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "opener" ]; + }; by-spec."openid".">=0.2.0" = self.by-version."openid"."0.5.9"; by-version."openid"."0.5.9" = lib.makeOverridable self.buildNodePackage { @@ -14869,6 +20417,26 @@ ]; passthru.names = [ "openid" ]; }; + by-spec."opn"."~1.0.0" = + self.by-version."opn"."1.0.0"; + by-version."opn"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "opn-1.0.0"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/opn/-/opn-1.0.0.tgz"; + name = "opn-1.0.0.tgz"; + sha1 = "1baa822af649a45fca744179a29a8b4c19346574"; + }) + ]; + buildInputs = + (self.nativeDeps."opn" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "opn" ]; + }; by-spec."optimist"."*" = self.by-version."optimist"."0.6.1"; by-version."optimist"."0.6.1" = lib.makeOverridable self.buildNodePackage { @@ -14937,6 +20505,8 @@ }; by-spec."optimist"."0.6.x" = self.by-version."optimist"."0.6.1"; + by-spec."optimist"."^0.6.1" = + self.by-version."optimist"."0.6.1"; by-spec."optimist"."~0.3" = self.by-version."optimist"."0.3.7"; by-version."optimist"."0.3.7" = lib.makeOverridable self.buildNodePackage { @@ -14965,15 +20535,15 @@ by-spec."optimist"."~0.6.1" = self.by-version."optimist"."0.6.1"; by-spec."options".">=0.0.5" = - self.by-version."options"."0.0.5"; - by-version."options"."0.0.5" = lib.makeOverridable self.buildNodePackage { - name = "options-0.0.5"; + self.by-version."options"."0.0.6"; + by-version."options"."0.0.6" = lib.makeOverridable self.buildNodePackage { + name = "options-0.0.6"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/options/-/options-0.0.5.tgz"; - name = "options-0.0.5.tgz"; - sha1 = "9a3806378f316536d79038038ba90ccb724816c3"; + url = "http://registry.npmjs.org/options/-/options-0.0.6.tgz"; + name = "options-0.0.6.tgz"; + sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f"; }) ]; buildInputs = @@ -15030,16 +20600,16 @@ ]; passthru.names = [ "orchestrator" ]; }; - by-spec."ordered-read-streams"."0.0.8" = - self.by-version."ordered-read-streams"."0.0.8"; - by-version."ordered-read-streams"."0.0.8" = lib.makeOverridable self.buildNodePackage { - name = "ordered-read-streams-0.0.8"; + by-spec."ordered-read-streams"."^0.1.0" = + self.by-version."ordered-read-streams"."0.1.0"; + by-version."ordered-read-streams"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "ordered-read-streams-0.1.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.0.8.tgz"; - name = "ordered-read-streams-0.0.8.tgz"; - sha1 = "fd921331b1a130b66aeef711b219aee01d89e0c5"; + url = "http://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz"; + name = "ordered-read-streams-0.1.0.tgz"; + sha1 = "fd565a9af8eb4473ba69b6ed8a34352cb552f126"; }) ]; buildInputs = @@ -15070,6 +20640,28 @@ ]; passthru.names = [ "os-browserify" ]; }; + by-spec."os-name"."^1.0.0" = + self.by-version."os-name"."1.0.1"; + by-version."os-name"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "os-name-1.0.1"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/os-name/-/os-name-1.0.1.tgz"; + name = "os-name-1.0.1.tgz"; + sha1 = "5d78a4a0d6bc96f7fce8e060fef19525422dcc8f"; + }) + ]; + buildInputs = + (self.nativeDeps."os-name" or []); + deps = { + "minimist-1.1.0" = self.by-version."minimist"."1.1.0"; + "osx-release-1.0.0" = self.by-version."osx-release"."1.0.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "os-name" ]; + }; by-spec."osenv"."0" = self.by-version."osenv"."0.1.0"; by-version."osenv"."0.1.0" = lib.makeOverridable self.buildNodePackage { @@ -15110,10 +20702,33 @@ ]; passthru.names = [ "osenv" ]; }; + by-spec."osenv"."0.1.0" = + self.by-version."osenv"."0.1.0"; by-spec."osenv"."^0.1.0" = self.by-version."osenv"."0.1.0"; by-spec."osenv"."~0.1.0" = self.by-version."osenv"."0.1.0"; + by-spec."osx-release"."^1.0.0" = + self.by-version."osx-release"."1.0.0"; + by-version."osx-release"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "osx-release-1.0.0"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/osx-release/-/osx-release-1.0.0.tgz"; + name = "osx-release-1.0.0.tgz"; + sha1 = "02bee80f3b898aaa88922d2f86e178605974beac"; + }) + ]; + buildInputs = + (self.nativeDeps."osx-release" or []); + deps = { + "minimist-1.1.0" = self.by-version."minimist"."1.1.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "osx-release" ]; + }; by-spec."owl-deepcopy"."*" = self.by-version."owl-deepcopy"."0.0.4"; by-version."owl-deepcopy"."0.0.4" = lib.makeOverridable self.buildNodePackage { @@ -15137,6 +20752,49 @@ "owl-deepcopy" = self.by-version."owl-deepcopy"."0.0.4"; by-spec."owl-deepcopy"."~0.0.1" = self.by-version."owl-deepcopy"."0.0.4"; + by-spec."p-throttler"."0.1.0" = + self.by-version."p-throttler"."0.1.0"; + by-version."p-throttler"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "p-throttler-0.1.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/p-throttler/-/p-throttler-0.1.0.tgz"; + name = "p-throttler-0.1.0.tgz"; + sha1 = "1b16907942c333e6f1ddeabcb3479204b8c417c4"; + }) + ]; + buildInputs = + (self.nativeDeps."p-throttler" or []); + deps = { + "q-0.9.7" = self.by-version."q"."0.9.7"; + }; + peerDependencies = [ + ]; + passthru.names = [ "p-throttler" ]; + }; + by-spec."package-json"."^0.2.0" = + self.by-version."package-json"."0.2.0"; + by-version."package-json"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "package-json-0.2.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/package-json/-/package-json-0.2.0.tgz"; + name = "package-json-0.2.0.tgz"; + sha1 = "0316e177b8eb149985d34f706b4a5543b274bec5"; + }) + ]; + buildInputs = + (self.nativeDeps."package-json" or []); + deps = { + "got-0.3.0" = self.by-version."got"."0.3.0"; + "registry-url-0.1.1" = self.by-version."registry-url"."0.1.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "package-json" ]; + }; by-spec."pako"."~0.2.0" = self.by-version."pako"."0.2.5"; by-version."pako"."0.2.5" = lib.makeOverridable self.buildNodePackage { @@ -15157,6 +20815,26 @@ ]; passthru.names = [ "pako" ]; }; + by-spec."parents"."0.0.2" = + self.by-version."parents"."0.0.2"; + by-version."parents"."0.0.2" = lib.makeOverridable self.buildNodePackage { + name = "parents-0.0.2"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/parents/-/parents-0.0.2.tgz"; + name = "parents-0.0.2.tgz"; + sha1 = "67147826e497d40759aaf5ba4c99659b6034d302"; + }) + ]; + buildInputs = + (self.nativeDeps."parents" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "parents" ]; + }; by-spec."parents"."^1.0.0" = self.by-version."parents"."1.0.0"; by-version."parents"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -15199,6 +20877,49 @@ ]; passthru.names = [ "parents" ]; }; + by-spec."parse-torrent"."^1.4.0" = + self.by-version."parse-torrent"."1.7.0"; + by-version."parse-torrent"."1.7.0" = lib.makeOverridable self.buildNodePackage { + name = "parse-torrent-1.7.0"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/parse-torrent/-/parse-torrent-1.7.0.tgz"; + name = "parse-torrent-1.7.0.tgz"; + sha1 = "f64d09d2efa05f7a9e89378d041a63d9ca1e47d2"; + }) + ]; + buildInputs = + (self.nativeDeps."parse-torrent" or []); + deps = { + "bencode-0.6.0" = self.by-version."bencode"."0.6.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "parse-torrent" ]; + }; + by-spec."parse-torrent"."~1.0.0" = + self.by-version."parse-torrent"."1.0.0"; + by-version."parse-torrent"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "parse-torrent-1.0.0"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/parse-torrent/-/parse-torrent-1.0.0.tgz"; + name = "parse-torrent-1.0.0.tgz"; + sha1 = "5a47a038c5db161b7b67b0534636194e1c8907a2"; + }) + ]; + buildInputs = + (self.nativeDeps."parse-torrent" or []); + deps = { + "bncode-0.5.3" = self.by-version."bncode"."0.5.3"; + "rusha-browserify-0.7.3" = self.by-version."rusha-browserify"."0.7.3"; + }; + peerDependencies = [ + ]; + passthru.names = [ "parse-torrent" ]; + }; by-spec."parseurl"."1.0.1" = self.by-version."parseurl"."1.0.1"; by-version."parseurl"."1.0.1" = lib.makeOverridable self.buildNodePackage { @@ -15284,7 +21005,7 @@ ]; passthru.names = [ "passport" ]; }; - by-spec."passport"."~0.2.0" = + by-spec."passport"."~0.2.1" = self.by-version."passport"."0.2.1"; by-spec."passport-http"."*" = self.by-version."passport-http"."0.2.2"; @@ -15493,16 +21214,171 @@ ]; passthru.names = [ "pbkdf2-compat" ]; }; + by-spec."peer-wire-protocol"."^0.7.0" = + self.by-version."peer-wire-protocol"."0.7.0"; + by-version."peer-wire-protocol"."0.7.0" = lib.makeOverridable self.buildNodePackage { + name = "peer-wire-protocol-0.7.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/peer-wire-protocol/-/peer-wire-protocol-0.7.0.tgz"; + name = "peer-wire-protocol-0.7.0.tgz"; + sha1 = "6c015abf24b4877ed9eca3822b22d996078011da"; + }) + ]; + buildInputs = + (self.nativeDeps."peer-wire-protocol" or []); + deps = { + "bitfield-0.1.0" = self.by-version."bitfield"."0.1.0"; + "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; + "bncode-0.2.3" = self.by-version."bncode"."0.2.3"; + "speedometer-0.1.3" = self.by-version."speedometer"."0.1.3"; + }; + peerDependencies = [ + ]; + passthru.names = [ "peer-wire-protocol" ]; + }; + by-spec."peer-wire-swarm"."^0.9.0" = + self.by-version."peer-wire-swarm"."0.9.2"; + by-version."peer-wire-swarm"."0.9.2" = lib.makeOverridable self.buildNodePackage { + name = "peer-wire-swarm-0.9.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/peer-wire-swarm/-/peer-wire-swarm-0.9.2.tgz"; + name = "peer-wire-swarm-0.9.2.tgz"; + sha1 = "092848005607d8ca94e69f9bc9ebe52956ec3048"; + }) + ]; + buildInputs = + (self.nativeDeps."peer-wire-swarm" or []); + deps = { + "peer-wire-protocol-0.7.0" = self.by-version."peer-wire-protocol"."0.7.0"; + "fifo-0.1.4" = self.by-version."fifo"."0.1.4"; + "once-1.3.1" = self.by-version."once"."1.3.1"; + "speedometer-0.1.3" = self.by-version."speedometer"."0.1.3"; + }; + peerDependencies = [ + ]; + passthru.names = [ "peer-wire-swarm" ]; + }; + by-spec."peer-wire-swarm"."^0.9.2" = + self.by-version."peer-wire-swarm"."0.9.2"; + by-spec."peerflix"."*" = + self.by-version."peerflix"."0.22.2"; + by-version."peerflix"."0.22.2" = lib.makeOverridable self.buildNodePackage { + name = "peerflix-0.22.2"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/peerflix/-/peerflix-0.22.2.tgz"; + name = "peerflix-0.22.2.tgz"; + sha1 = "f18fb48d31b65adb29420efa4974a7177e3dd68b"; + }) + ]; + buildInputs = + (self.nativeDeps."peerflix" or []); + deps = { + "clivas-0.1.4" = self.by-version."clivas"."0.1.4"; + "keypress-0.2.1" = self.by-version."keypress"."0.2.1"; + "mime-1.2.11" = self.by-version."mime"."1.2.11"; + "network-address-0.0.5" = self.by-version."network-address"."0.0.5"; + "numeral-1.5.3" = self.by-version."numeral"."1.5.3"; + "optimist-0.6.1" = self.by-version."optimist"."0.6.1"; + "pump-0.3.5" = self.by-version."pump"."0.3.5"; + "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; + "rc-0.4.0" = self.by-version."rc"."0.4.0"; + "read-torrent-1.1.0" = self.by-version."read-torrent"."1.1.0"; + "torrent-stream-0.16.2" = self.by-version."torrent-stream"."0.16.2"; + "windows-no-runnable-0.0.6" = self.by-version."windows-no-runnable"."0.0.6"; + "xtend-4.0.0" = self.by-version."xtend"."4.0.0"; + "airplay-js-0.2.6" = self.by-version."airplay-js"."0.2.6"; + }; + peerDependencies = [ + ]; + passthru.names = [ "peerflix" ]; + }; + "peerflix" = self.by-version."peerflix"."0.22.2"; + by-spec."peerflix-server"."*" = + self.by-version."peerflix-server"."0.0.14"; + by-version."peerflix-server"."0.0.14" = lib.makeOverridable self.buildNodePackage { + name = "peerflix-server-0.0.14"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/peerflix-server/-/peerflix-server-0.0.14.tgz"; + name = "peerflix-server-0.0.14.tgz"; + sha1 = "4f6c29886b6cead1faf8117a3e9c5346ca75b764"; + }) + ]; + buildInputs = + (self.nativeDeps."peerflix-server" or []); + deps = { + "torrent-stream-0.13.5" = self.by-version."torrent-stream"."0.13.5"; + "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; + "mime-1.2.11" = self.by-version."mime"."1.2.11"; + "pump-0.3.5" = self.by-version."pump"."0.3.5"; + "express-3.5.3" = self.by-version."express"."3.5.3"; + "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; + "socket.io-0.9.17" = self.by-version."socket.io"."0.9.17"; + "read-torrent-1.0.0" = self.by-version."read-torrent"."1.0.0"; + "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "peerflix-server" ]; + }; + "peerflix-server" = self.by-version."peerflix-server"."0.0.14"; + by-spec."pegjs"."0.6.2" = + self.by-version."pegjs"."0.6.2"; + by-version."pegjs"."0.6.2" = lib.makeOverridable self.buildNodePackage { + name = "pegjs-0.6.2"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/pegjs/-/pegjs-0.6.2.tgz"; + name = "pegjs-0.6.2.tgz"; + sha1 = "74651f8a800e444db688e4eeae8edb65637a17a5"; + }) + ]; + buildInputs = + (self.nativeDeps."pegjs" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "pegjs" ]; + }; + by-spec."pemstrip"."0.0.1" = + self.by-version."pemstrip"."0.0.1"; + by-version."pemstrip"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "pemstrip-0.0.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/pemstrip/-/pemstrip-0.0.1.tgz"; + name = "pemstrip-0.0.1.tgz"; + sha1 = "39f7071720cfa13d542c9bde75f1fa5bf9d08806"; + }) + ]; + buildInputs = + (self.nativeDeps."pemstrip" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "pemstrip" ]; + }; by-spec."phantomjs"."*" = - self.by-version."phantomjs"."1.9.10"; - by-version."phantomjs"."1.9.10" = lib.makeOverridable self.buildNodePackage { - name = "phantomjs-1.9.10"; + self.by-version."phantomjs"."1.9.12"; + by-version."phantomjs"."1.9.12" = lib.makeOverridable self.buildNodePackage { + name = "phantomjs-1.9.12"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.10.tgz"; - name = "phantomjs-1.9.10.tgz"; - sha1 = "be174e20b03f42c39beaaf84cc153fb65b225a4a"; + url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.12.tgz"; + name = "phantomjs-1.9.12.tgz"; + sha1 = "812b137654585413ecb82bf3db9dcd39d8f85f91"; }) ]; buildInputs = @@ -15510,24 +21386,24 @@ deps = { "adm-zip-0.4.4" = self.by-version."adm-zip"."0.4.4"; "kew-0.4.0" = self.by-version."kew"."0.4.0"; - "ncp-0.6.0" = self.by-version."ncp"."0.6.0"; + "ncp-1.0.1" = self.by-version."ncp"."1.0.1"; "npmconf-2.0.9" = self.by-version."npmconf"."2.0.9"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "progress-1.1.8" = self.by-version."progress"."1.1.8"; "request-2.42.0" = self.by-version."request"."2.42.0"; "request-progress-0.3.1" = self.by-version."request-progress"."0.3.1"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; - "which-1.0.5" = self.by-version."which"."1.0.5"; + "which-1.0.7" = self.by-version."which"."1.0.7"; }; peerDependencies = [ ]; passthru.names = [ "phantomjs" ]; }; - "phantomjs" = self.by-version."phantomjs"."1.9.10"; + "phantomjs" = self.by-version."phantomjs"."1.9.12"; by-spec."phantomjs"."~1.9.1" = - self.by-version."phantomjs"."1.9.10"; + self.by-version."phantomjs"."1.9.12"; by-spec."phantomjs"."~1.9.10" = - self.by-version."phantomjs"."1.9.10"; + self.by-version."phantomjs"."1.9.12"; by-spec."pkginfo"."0.2.x" = self.by-version."pkginfo"."0.2.3"; by-version."pkginfo"."0.2.3" = lib.makeOverridable self.buildNodePackage { @@ -15548,7 +21424,7 @@ ]; passthru.names = [ "pkginfo" ]; }; - by-spec."pkginfo"."0.3.0" = + by-spec."pkginfo"."0.3.x" = self.by-version."pkginfo"."0.3.0"; by-version."pkginfo"."0.3.0" = lib.makeOverridable self.buildNodePackage { name = "pkginfo-0.3.0"; @@ -15568,10 +21444,54 @@ ]; passthru.names = [ "pkginfo" ]; }; - by-spec."pkginfo"."0.3.x" = - self.by-version."pkginfo"."0.3.0"; by-spec."pkginfo"."0.x.x" = self.by-version."pkginfo"."0.3.0"; + by-spec."plc"."*" = + self.by-version."plc"."0.1.2"; + by-version."plc"."0.1.2" = lib.makeOverridable self.buildNodePackage { + name = "plc-0.1.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/plc/-/plc-0.1.2.tgz"; + name = "plc-0.1.2.tgz"; + sha1 = "a25c5e677261f7912d5d35cedfb2527315b7d329"; + }) + ]; + buildInputs = + (self.nativeDeps."plc" or []); + deps = { + "bits-0.1.1" = self.by-version."bits"."0.1.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "plc" ]; + }; + "plc" = self.by-version."plc"."0.1.2"; + by-spec."plist"."1.1.0" = + self.by-version."plist"."1.1.0"; + by-version."plist"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "plist-1.1.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/plist/-/plist-1.1.0.tgz"; + name = "plist-1.1.0.tgz"; + sha1 = "ff6708590c97cc438e7bc45de5251bd725f3f89d"; + }) + ]; + buildInputs = + (self.nativeDeps."plist" or []); + deps = { + "base64-js-0.0.6" = self.by-version."base64-js"."0.0.6"; + "xmlbuilder-2.2.1" = self.by-version."xmlbuilder"."2.2.1"; + "xmldom-0.1.19" = self.by-version."xmldom"."0.1.19"; + "util-deprecate-1.0.0" = self.by-version."util-deprecate"."1.0.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "plist" ]; + }; by-spec."plist-native"."*" = self.by-version."plist-native"."0.3.1"; by-version."plist-native"."0.3.1" = lib.makeOverridable self.buildNodePackage { @@ -15594,6 +21514,28 @@ passthru.names = [ "plist-native" ]; }; "plist-native" = self.by-version."plist-native"."0.3.1"; + by-spec."plist-with-patches"."0.5.1" = + self.by-version."plist-with-patches"."0.5.1"; + by-version."plist-with-patches"."0.5.1" = lib.makeOverridable self.buildNodePackage { + name = "plist-with-patches-0.5.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/plist-with-patches/-/plist-with-patches-0.5.1.tgz"; + name = "plist-with-patches-0.5.1.tgz"; + sha1 = "868aae2e0df8989b026562b35cbc19cfd8bb780d"; + }) + ]; + buildInputs = + (self.nativeDeps."plist-with-patches" or []); + deps = { + "xmlbuilder-0.4.3" = self.by-version."xmlbuilder"."0.4.3"; + "xmldom-0.1.19" = self.by-version."xmldom"."0.1.19"; + }; + peerDependencies = [ + ]; + passthru.names = [ "plist-with-patches" ]; + }; by-spec."policyfile"."0.0.4" = self.by-version."policyfile"."0.0.4"; by-version."policyfile"."0.0.4" = lib.makeOverridable self.buildNodePackage { @@ -15614,16 +21556,37 @@ ]; passthru.names = [ "policyfile" ]; }; + by-spec."portfinder"."^0.2.1" = + self.by-version."portfinder"."0.2.1"; + by-version."portfinder"."0.2.1" = lib.makeOverridable self.buildNodePackage { + name = "portfinder-0.2.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/portfinder/-/portfinder-0.2.1.tgz"; + name = "portfinder-0.2.1.tgz"; + sha1 = "b2b9b0164f9e17fa3a9c7db2304d0a75140c71ad"; + }) + ]; + buildInputs = + (self.nativeDeps."portfinder" or []); + deps = { + "mkdirp-0.0.7" = self.by-version."mkdirp"."0.0.7"; + }; + peerDependencies = [ + ]; + passthru.names = [ "portfinder" ]; + }; by-spec."posix"."*" = - self.by-version."posix"."1.0.3"; - by-version."posix"."1.0.3" = lib.makeOverridable self.buildNodePackage { - name = "posix-1.0.3"; + self.by-version."posix"."1.0.4"; + by-version."posix"."1.0.4" = lib.makeOverridable self.buildNodePackage { + name = "posix-1.0.4"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/posix/-/posix-1.0.3.tgz"; - name = "posix-1.0.3.tgz"; - sha1 = "f0efae90d59c56c4509c8f0ed222b421caa8188a"; + url = "http://registry.npmjs.org/posix/-/posix-1.0.4.tgz"; + name = "posix-1.0.4.tgz"; + sha1 = "628eb17c9c3299a296cf2f9fdc7cbad4fd554a56"; }) ]; buildInputs = @@ -15634,7 +21597,7 @@ ]; passthru.names = [ "posix" ]; }; - "posix" = self.by-version."posix"."1.0.3"; + "posix" = self.by-version."posix"."1.0.4"; by-spec."posix-getopt"."1.0.0" = self.by-version."posix-getopt"."1.0.0"; by-version."posix-getopt"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -15716,16 +21679,16 @@ ]; passthru.names = [ "pretty-hrtime" ]; }; - by-spec."process"."^0.7.0" = - self.by-version."process"."0.7.0"; - by-version."process"."0.7.0" = lib.makeOverridable self.buildNodePackage { - name = "process-0.7.0"; + by-spec."process"."^0.8.0" = + self.by-version."process"."0.8.0"; + by-version."process"."0.8.0" = lib.makeOverridable self.buildNodePackage { + name = "process-0.8.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/process/-/process-0.7.0.tgz"; - name = "process-0.7.0.tgz"; - sha1 = "c52208161a34adf3812344ae85d3e6150469389d"; + url = "http://registry.npmjs.org/process/-/process-0.8.0.tgz"; + name = "process-0.8.0.tgz"; + sha1 = "7bbaf7187fe6ded3fd5be0cb6103fba9cacb9798"; }) ]; buildInputs = @@ -15796,6 +21759,27 @@ ]; passthru.names = [ "progress" ]; }; + by-spec."promise"."^6.0.1" = + self.by-version."promise"."6.0.1"; + by-version."promise"."6.0.1" = lib.makeOverridable self.buildNodePackage { + name = "promise-6.0.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/promise/-/promise-6.0.1.tgz"; + name = "promise-6.0.1.tgz"; + sha1 = "d475cff81c083a27fe87ae19952b72c1a6936237"; + }) + ]; + buildInputs = + (self.nativeDeps."promise" or []); + deps = { + "asap-1.0.0" = self.by-version."asap"."1.0.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "promise" ]; + }; by-spec."promise"."~2.0" = self.by-version."promise"."2.0.0"; by-version."promise"."2.0.0" = lib.makeOverridable self.buildNodePackage { @@ -15817,16 +21801,16 @@ ]; passthru.names = [ "promise" ]; }; - by-spec."prompt"."0.2.11" = - self.by-version."prompt"."0.2.11"; - by-version."prompt"."0.2.11" = lib.makeOverridable self.buildNodePackage { - name = "prompt-0.2.11"; + by-spec."prompt"."0.2.14" = + self.by-version."prompt"."0.2.14"; + by-version."prompt"."0.2.14" = lib.makeOverridable self.buildNodePackage { + name = "prompt-0.2.14"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/prompt/-/prompt-0.2.11.tgz"; - name = "prompt-0.2.11.tgz"; - sha1 = "26d455af4b7fac15291dfcdddf2400328c1fa446"; + url = "http://registry.npmjs.org/prompt/-/prompt-0.2.14.tgz"; + name = "prompt-0.2.14.tgz"; + sha1 = "57754f64f543fd7b0845707c818ece618f05ffdc"; }) ]; buildInputs = @@ -15836,36 +21820,32 @@ "read-1.0.5" = self.by-version."read"."1.0.5"; "revalidator-0.1.8" = self.by-version."revalidator"."0.1.8"; "utile-0.2.1" = self.by-version."utile"."0.2.1"; - "winston-0.6.2" = self.by-version."winston"."0.6.2"; + "winston-0.8.3" = self.by-version."winston"."0.8.3"; }; peerDependencies = [ ]; passthru.names = [ "prompt" ]; }; - by-spec."prompt"."0.2.14" = - self.by-version."prompt"."0.2.14"; - by-version."prompt"."0.2.14" = lib.makeOverridable self.buildNodePackage { - name = "prompt-0.2.14"; + by-spec."promptly"."0.2.0" = + self.by-version."promptly"."0.2.0"; + by-version."promptly"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "promptly-0.2.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/prompt/-/prompt-0.2.14.tgz"; - name = "prompt-0.2.14.tgz"; - sha1 = "57754f64f543fd7b0845707c818ece618f05ffdc"; + url = "http://registry.npmjs.org/promptly/-/promptly-0.2.0.tgz"; + name = "promptly-0.2.0.tgz"; + sha1 = "73ef200fa8329d5d3a8df41798950b8646ca46d9"; }) ]; buildInputs = - (self.nativeDeps."prompt" or []); + (self.nativeDeps."promptly" or []); deps = { - "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0"; "read-1.0.5" = self.by-version."read"."1.0.5"; - "revalidator-0.1.8" = self.by-version."revalidator"."0.1.8"; - "utile-0.2.1" = self.by-version."utile"."0.2.1"; - "winston-0.8.0" = self.by-version."winston"."0.8.0"; }; peerDependencies = [ ]; - passthru.names = [ "prompt" ]; + passthru.names = [ "promptly" ]; }; by-spec."promzard"."~0.2.0" = self.by-version."promzard"."0.2.2"; @@ -15888,69 +21868,70 @@ ]; passthru.names = [ "promzard" ]; }; - by-spec."proto-list"."~1.2.1" = - self.by-version."proto-list"."1.2.3"; - by-version."proto-list"."1.2.3" = lib.makeOverridable self.buildNodePackage { - name = "proto-list-1.2.3"; + by-spec."properties-parser"."0.2.3" = + self.by-version."properties-parser"."0.2.3"; + by-version."properties-parser"."0.2.3" = lib.makeOverridable self.buildNodePackage { + name = "properties-parser-0.2.3"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/proto-list/-/proto-list-1.2.3.tgz"; - name = "proto-list-1.2.3.tgz"; - sha1 = "6235554a1bca1f0d15e3ca12ca7329d5def42bd9"; + url = "http://registry.npmjs.org/properties-parser/-/properties-parser-0.2.3.tgz"; + name = "properties-parser-0.2.3.tgz"; + sha1 = "f7591255f707abbff227c7b56b637dbb0373a10f"; }) ]; buildInputs = - (self.nativeDeps."proto-list" or []); + (self.nativeDeps."properties-parser" or []); deps = { }; peerDependencies = [ ]; - passthru.names = [ "proto-list" ]; + passthru.names = [ "properties-parser" ]; }; - by-spec."proxy-addr"."1.0.1" = - self.by-version."proxy-addr"."1.0.1"; - by-version."proxy-addr"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "proxy-addr-1.0.1"; + by-spec."proto-list"."~1.2.1" = + self.by-version."proto-list"."1.2.3"; + by-version."proto-list"."1.2.3" = lib.makeOverridable self.buildNodePackage { + name = "proto-list-1.2.3"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.1.tgz"; - name = "proxy-addr-1.0.1.tgz"; - sha1 = "c7c566d5eb4e3fad67eeb9c77c5558ccc39b88a8"; + url = "http://registry.npmjs.org/proto-list/-/proto-list-1.2.3.tgz"; + name = "proto-list-1.2.3.tgz"; + sha1 = "6235554a1bca1f0d15e3ca12ca7329d5def42bd9"; }) ]; buildInputs = - (self.nativeDeps."proxy-addr" or []); + (self.nativeDeps."proto-list" or []); deps = { - "ipaddr.js-0.1.2" = self.by-version."ipaddr.js"."0.1.2"; }; peerDependencies = [ ]; - passthru.names = [ "proxy-addr" ]; + passthru.names = [ "proto-list" ]; }; by-spec."proxy-addr"."~1.0.3" = - self.by-version."proxy-addr"."1.0.3"; - by-version."proxy-addr"."1.0.3" = lib.makeOverridable self.buildNodePackage { - name = "proxy-addr-1.0.3"; + self.by-version."proxy-addr"."1.0.4"; + by-version."proxy-addr"."1.0.4" = lib.makeOverridable self.buildNodePackage { + name = "proxy-addr-1.0.4"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.3.tgz"; - name = "proxy-addr-1.0.3.tgz"; - sha1 = "17d824aac844707441249da6d1ea5e889007cdd6"; + url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.4.tgz"; + name = "proxy-addr-1.0.4.tgz"; + sha1 = "51dbebbb22cc0eb04b77a76d871b75970f198cdd"; }) ]; buildInputs = (self.nativeDeps."proxy-addr" or []); deps = { "forwarded-0.1.0" = self.by-version."forwarded"."0.1.0"; - "ipaddr.js-0.1.3" = self.by-version."ipaddr.js"."0.1.3"; + "ipaddr.js-0.1.5" = self.by-version."ipaddr.js"."0.1.5"; }; peerDependencies = [ ]; passthru.names = [ "proxy-addr" ]; }; + by-spec."proxy-addr"."~1.0.4" = + self.by-version."proxy-addr"."1.0.4"; by-spec."ps-tree"."0.0.x" = self.by-version."ps-tree"."0.0.3"; by-version."ps-tree"."0.0.3" = lib.makeOverridable self.buildNodePackage { @@ -15974,6 +21955,32 @@ }; by-spec."ps-tree"."~0.0.3" = self.by-version."ps-tree"."0.0.3"; + by-spec."pump"."^0.3.1" = + self.by-version."pump"."0.3.5"; + by-version."pump"."0.3.5" = lib.makeOverridable self.buildNodePackage { + name = "pump-0.3.5"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/pump/-/pump-0.3.5.tgz"; + name = "pump-0.3.5.tgz"; + sha1 = "ae5ff8c1f93ed87adc6530a97565b126f585454b"; + }) + ]; + buildInputs = + (self.nativeDeps."pump" or []); + deps = { + "once-1.2.0" = self.by-version."once"."1.2.0"; + "end-of-stream-1.0.0" = self.by-version."end-of-stream"."1.0.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "pump" ]; + }; + by-spec."pump"."^0.3.5" = + self.by-version."pump"."0.3.5"; + by-spec."pump"."~0.3.2" = + self.by-version."pump"."0.3.5"; by-spec."punycode"."1.2.4" = self.by-version."punycode"."1.2.4"; by-version."punycode"."1.2.4" = lib.makeOverridable self.buildNodePackage { @@ -15995,15 +22002,35 @@ passthru.names = [ "punycode" ]; }; by-spec."punycode".">=0.2.0" = - self.by-version."punycode"."1.3.1"; - by-version."punycode"."1.3.1" = lib.makeOverridable self.buildNodePackage { - name = "punycode-1.3.1"; + self.by-version."punycode"."1.3.2"; + by-version."punycode"."1.3.2" = lib.makeOverridable self.buildNodePackage { + name = "punycode-1.3.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/punycode/-/punycode-1.3.1.tgz"; - name = "punycode-1.3.1.tgz"; - sha1 = "710afe5123c20a1530b712e3e682b9118fe8058e"; + url = "http://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"; + name = "punycode-1.3.2.tgz"; + sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d"; + }) + ]; + buildInputs = + (self.nativeDeps."punycode" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "punycode" ]; + }; + by-spec."punycode".">=1.0.0 <1.1.0" = + self.by-version."punycode"."1.0.0"; + by-version."punycode"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "punycode-1.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/punycode/-/punycode-1.0.0.tgz"; + name = "punycode-1.0.0.tgz"; + sha1 = "ce9e6c6e9c1db5827174fceb12ff4938700a1bd3"; }) ]; buildInputs = @@ -16039,6 +22066,26 @@ passthru.names = [ "pure" ]; }; "pure-css" = self.by-version."pure-css"."0.5.0-rc-1"; + by-spec."q"."1.0.1" = + self.by-version."q"."1.0.1"; + by-version."q"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "q-1.0.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/q/-/q-1.0.1.tgz"; + name = "q-1.0.1.tgz"; + sha1 = "11872aeedee89268110b10a718448ffb10112a14"; + }) + ]; + buildInputs = + (self.nativeDeps."q" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "q" ]; + }; by-spec."q".">= 0.0.1" = self.by-version."q"."2.0.2"; by-version."q"."2.0.2" = lib.makeOverridable self.buildNodePackage { @@ -16061,7 +22108,7 @@ ]; passthru.names = [ "q" ]; }; - by-spec."q"."~0.9.6" = + by-spec."q"."~0.9.2" = self.by-version."q"."0.9.7"; by-version."q"."0.9.7" = lib.makeOverridable self.buildNodePackage { name = "q-0.9.7"; @@ -16081,27 +22128,33 @@ ]; passthru.names = [ "q" ]; }; + by-spec."q"."~0.9.6" = + self.by-version."q"."0.9.7"; by-spec."q"."~0.9.7" = self.by-version."q"."0.9.7"; + by-spec."q"."~1.0.0" = + self.by-version."q"."1.0.1"; by-spec."q"."~1.0.1" = self.by-version."q"."1.0.1"; - by-version."q"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "q-1.0.1"; + by-spec."qap"."^3.1.2" = + self.by-version."qap"."3.1.2"; + by-version."qap"."3.1.2" = lib.makeOverridable self.buildNodePackage { + name = "qap-3.1.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/q/-/q-1.0.1.tgz"; - name = "q-1.0.1.tgz"; - sha1 = "11872aeedee89268110b10a718448ffb10112a14"; + url = "http://registry.npmjs.org/qap/-/qap-3.1.2.tgz"; + name = "qap-3.1.2.tgz"; + sha1 = "3672b8707d0b9b983b18f91fb14237de241bdba8"; }) ]; buildInputs = - (self.nativeDeps."q" or []); + (self.nativeDeps."qap" or []); deps = { }; peerDependencies = [ ]; - passthru.names = [ "q" ]; + passthru.names = [ "qap" ]; }; by-spec."qs"."0.4.2" = self.by-version."qs"."0.4.2"; @@ -16145,26 +22198,6 @@ ]; passthru.names = [ "qs" ]; }; - by-spec."qs"."0.5.2" = - self.by-version."qs"."0.5.2"; - by-version."qs"."0.5.2" = lib.makeOverridable self.buildNodePackage { - name = "qs-0.5.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/qs/-/qs-0.5.2.tgz"; - name = "qs-0.5.2.tgz"; - sha1 = "e5734acb7009fb918e800fd5c60c2f5b94a7ff43"; - }) - ]; - buildInputs = - (self.nativeDeps."qs" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "qs" ]; - }; by-spec."qs"."0.5.5" = self.by-version."qs"."0.5.5"; by-version."qs"."0.5.5" = lib.makeOverridable self.buildNodePackage { @@ -16245,16 +22278,16 @@ ]; passthru.names = [ "qs" ]; }; - by-spec."qs"."2.2.2" = - self.by-version."qs"."2.2.2"; - by-version."qs"."2.2.2" = lib.makeOverridable self.buildNodePackage { - name = "qs-2.2.2"; + by-spec."qs"."2.2.4" = + self.by-version."qs"."2.2.4"; + by-version."qs"."2.2.4" = lib.makeOverridable self.buildNodePackage { + name = "qs-2.2.4"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/qs/-/qs-2.2.2.tgz"; - name = "qs-2.2.2.tgz"; - sha1 = "dfe783f1854b1ac2b3ade92775ad03e27e03218c"; + url = "http://registry.npmjs.org/qs/-/qs-2.2.4.tgz"; + name = "qs-2.2.4.tgz"; + sha1 = "2e9fbcd34b540e3421c924ecd01e90aa975319c8"; }) ]; buildInputs = @@ -16265,16 +22298,36 @@ ]; passthru.names = [ "qs" ]; }; - by-spec."qs"."2.2.4" = - self.by-version."qs"."2.2.4"; - by-version."qs"."2.2.4" = lib.makeOverridable self.buildNodePackage { - name = "qs-2.2.4"; + by-spec."qs"."2.3.2" = + self.by-version."qs"."2.3.2"; + by-version."qs"."2.3.2" = lib.makeOverridable self.buildNodePackage { + name = "qs-2.3.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/qs/-/qs-2.2.4.tgz"; - name = "qs-2.2.4.tgz"; - sha1 = "2e9fbcd34b540e3421c924ecd01e90aa975319c8"; + url = "http://registry.npmjs.org/qs/-/qs-2.3.2.tgz"; + name = "qs-2.3.2.tgz"; + sha1 = "d45ec249e4b9b029af008829a101d5ff7e972790"; + }) + ]; + buildInputs = + (self.nativeDeps."qs" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "qs" ]; + }; + by-spec."qs"."2.3.3" = + self.by-version."qs"."2.3.3"; + by-version."qs"."2.3.3" = lib.makeOverridable self.buildNodePackage { + name = "qs-2.3.3"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/qs/-/qs-2.3.3.tgz"; + name = "qs-2.3.3.tgz"; + sha1 = "e9e85adbe75da0bbe4c8e0476a086290f863b404"; }) ]; buildInputs = @@ -16286,7 +22339,7 @@ passthru.names = [ "qs" ]; }; by-spec."qs".">= 0.4.0" = - self.by-version."qs"."2.2.4"; + self.by-version."qs"."2.3.3"; by-spec."qs"."~0.5.4" = self.by-version."qs"."0.5.6"; by-version."qs"."0.5.6" = lib.makeOverridable self.buildNodePackage { @@ -16349,16 +22402,78 @@ ]; passthru.names = [ "qs" ]; }; + by-spec."qs"."~2.3.1" = + self.by-version."qs"."2.3.3"; + by-spec."querystring".">=0.1.0 <0.2.0" = + self.by-version."querystring"."0.1.0"; + by-version."querystring"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "querystring-0.1.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/querystring/-/querystring-0.1.0.tgz"; + name = "querystring-0.1.0.tgz"; + sha1 = "cb76a26cda0a10a94163fcdb3e132827f04b7b10"; + }) + ]; + buildInputs = + (self.nativeDeps."querystring" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "querystring" ]; + }; + by-spec."querystring"."https://github.com/substack/querystring/archive/0.2.0-ie8.tar.gz" = + self.by-version."querystring"."0.2.0"; + by-version."querystring"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "querystring-0.2.0"; + bin = false; + src = [ + (fetchurl { + url = "https://github.com/substack/querystring/archive/0.2.0-ie8.tar.gz"; + name = "querystring-0.2.0.tgz"; + sha256 = "9476079402605957bae231ea3ec5ae83b454b2de68ddaa3450096821996be8f5"; + }) + ]; + buildInputs = + (self.nativeDeps."querystring" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "querystring" ]; + }; + by-spec."querystring-es3"."0.2.0" = + self.by-version."querystring-es3"."0.2.0"; + by-version."querystring-es3"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "querystring-es3-0.2.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.0.tgz"; + name = "querystring-es3-0.2.0.tgz"; + sha1 = "c365a08a69c443accfeb3a9deab35e3f0abaa476"; + }) + ]; + buildInputs = + (self.nativeDeps."querystring-es3" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "querystring-es3" ]; + }; by-spec."querystring-es3"."~0.2.0" = - self.by-version."querystring-es3"."0.2.1-0"; - by-version."querystring-es3"."0.2.1-0" = lib.makeOverridable self.buildNodePackage { - name = "querystring-es3-0.2.1-0"; + self.by-version."querystring-es3"."0.2.1"; + by-version."querystring-es3"."0.2.1" = lib.makeOverridable self.buildNodePackage { + name = "querystring-es3-0.2.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1-0.tgz"; - name = "querystring-es3-0.2.1-0.tgz"; - sha1 = "bd38cbd701040e7ef66c94a93db4a5b45be39565"; + url = "http://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz"; + name = "querystring-es3-0.2.1.tgz"; + sha1 = "9ec61f79049875707d69414596fd907a4d711e73"; }) ]; buildInputs = @@ -16389,6 +22504,27 @@ ]; passthru.names = [ "rai" ]; }; + by-spec."random-access-file"."^0.3.1" = + self.by-version."random-access-file"."0.3.1"; + by-version."random-access-file"."0.3.1" = lib.makeOverridable self.buildNodePackage { + name = "random-access-file-0.3.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/random-access-file/-/random-access-file-0.3.1.tgz"; + name = "random-access-file-0.3.1.tgz"; + sha1 = "8afffaac665de38feba00f371429648f057d5c16"; + }) + ]; + buildInputs = + (self.nativeDeps."random-access-file" or []); + deps = { + "thunky-0.1.0" = self.by-version."thunky"."0.1.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "random-access-file" ]; + }; by-spec."range-parser"."0.0.4" = self.by-version."range-parser"."0.0.4"; by-version."range-parser"."0.0.4" = lib.makeOverridable self.buildNodePackage { @@ -16429,7 +22565,7 @@ ]; passthru.names = [ "range-parser" ]; }; - by-spec."range-parser"."~1.0.0" = + by-spec."range-parser"."^1.0.0" = self.by-version."range-parser"."1.0.2"; by-version."range-parser"."1.0.2" = lib.makeOverridable self.buildNodePackage { name = "range-parser-1.0.2"; @@ -16449,9 +22585,11 @@ ]; passthru.names = [ "range-parser" ]; }; + by-spec."range-parser"."~1.0.0" = + self.by-version."range-parser"."1.0.2"; by-spec."range-parser"."~1.0.2" = self.by-version."range-parser"."1.0.2"; - by-spec."raven"."~0.7.0" = + by-spec."raven"."~0.7.2" = self.by-version."raven"."0.7.2"; by-version."raven"."0.7.2" = lib.makeOverridable self.buildNodePackage { name = "raven-0.7.2"; @@ -16495,22 +22633,22 @@ ]; passthru.names = [ "raw-body" ]; }; - by-spec."raw-body"."1.1.2" = - self.by-version."raw-body"."1.1.2"; - by-version."raw-body"."1.1.2" = lib.makeOverridable self.buildNodePackage { - name = "raw-body-1.1.2"; + by-spec."raw-body"."1.1.4" = + self.by-version."raw-body"."1.1.4"; + by-version."raw-body"."1.1.4" = lib.makeOverridable self.buildNodePackage { + name = "raw-body-1.1.4"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/raw-body/-/raw-body-1.1.2.tgz"; - name = "raw-body-1.1.2.tgz"; - sha1 = "c74b3004dea5defd1696171106ac740ec31d62be"; + url = "http://registry.npmjs.org/raw-body/-/raw-body-1.1.4.tgz"; + name = "raw-body-1.1.4.tgz"; + sha1 = "f0b5624388d031f63da07f870c86cb9ccadcb67d"; }) ]; buildInputs = (self.nativeDeps."raw-body" or []); deps = { - "bytes-0.2.1" = self.by-version."bytes"."0.2.1"; + "bytes-0.3.0" = self.by-version."bytes"."0.3.0"; }; peerDependencies = [ ]; @@ -16538,6 +22676,28 @@ ]; passthru.names = [ "raw-body" ]; }; + by-spec."raw-body"."1.3.1" = + self.by-version."raw-body"."1.3.1"; + by-version."raw-body"."1.3.1" = lib.makeOverridable self.buildNodePackage { + name = "raw-body-1.3.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/raw-body/-/raw-body-1.3.1.tgz"; + name = "raw-body-1.3.1.tgz"; + sha1 = "26a1491059086fd121942232d16758cd2817f815"; + }) + ]; + buildInputs = + (self.nativeDeps."raw-body" or []); + deps = { + "bytes-1.0.0" = self.by-version."bytes"."1.0.0"; + "iconv-lite-0.4.5" = self.by-version."iconv-lite"."0.4.5"; + }; + peerDependencies = [ + ]; + passthru.names = [ "raw-body" ]; + }; by-spec."raw-socket"."*" = self.by-version."raw-socket"."1.2.2"; by-version."raw-socket"."1.2.2" = lib.makeOverridable self.buildNodePackage { @@ -16579,6 +22739,54 @@ passthru.names = [ "rbytes" ]; }; "rbytes" = self.by-version."rbytes"."1.1.0"; + by-spec."rc"."0.5.2" = + self.by-version."rc"."0.5.2"; + by-version."rc"."0.5.2" = lib.makeOverridable self.buildNodePackage { + name = "rc-0.5.2"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/rc/-/rc-0.5.2.tgz"; + name = "rc-0.5.2.tgz"; + sha1 = "6b8e05894a158e3d4a15e7daddb970f4d15a024f"; + }) + ]; + buildInputs = + (self.nativeDeps."rc" or []); + deps = { + "minimist-0.0.10" = self.by-version."minimist"."0.0.10"; + "deep-extend-0.2.11" = self.by-version."deep-extend"."0.2.11"; + "strip-json-comments-0.1.3" = self.by-version."strip-json-comments"."0.1.3"; + "ini-1.1.0" = self.by-version."ini"."1.1.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "rc" ]; + }; + by-spec."rc"."^0.4.0" = + self.by-version."rc"."0.4.0"; + by-version."rc"."0.4.0" = lib.makeOverridable self.buildNodePackage { + name = "rc-0.4.0"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/rc/-/rc-0.4.0.tgz"; + name = "rc-0.4.0.tgz"; + sha1 = "ce24a2029ad94c3a40d09604a87227027d7210d3"; + }) + ]; + buildInputs = + (self.nativeDeps."rc" or []); + deps = { + "minimist-0.0.10" = self.by-version."minimist"."0.0.10"; + "deep-extend-0.2.11" = self.by-version."deep-extend"."0.2.11"; + "strip-json-comments-0.1.3" = self.by-version."strip-json-comments"."0.1.3"; + "ini-1.1.0" = self.by-version."ini"."1.1.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "rc" ]; + }; by-spec."rc"."~0.3.0" = self.by-version."rc"."0.3.5"; by-version."rc"."0.3.5" = lib.makeOverridable self.buildNodePackage { @@ -16602,16 +22810,16 @@ ]; passthru.names = [ "rc" ]; }; - by-spec."rc"."~0.5.0" = - self.by-version."rc"."0.5.1"; - by-version."rc"."0.5.1" = lib.makeOverridable self.buildNodePackage { - name = "rc-0.5.1"; + by-spec."rc"."~0.5.4" = + self.by-version."rc"."0.5.4"; + by-version."rc"."0.5.4" = lib.makeOverridable self.buildNodePackage { + name = "rc-0.5.4"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/rc/-/rc-0.5.1.tgz"; - name = "rc-0.5.1.tgz"; - sha1 = "b88ef9421a08151352a659e0c3a58c4b82eb7576"; + url = "http://registry.npmjs.org/rc/-/rc-0.5.4.tgz"; + name = "rc-0.5.4.tgz"; + sha1 = "14169483ccb33b2695a349dbd96ef54e4e92d54f"; }) ]; buildInputs = @@ -16627,27 +22835,27 @@ passthru.names = [ "rc" ]; }; by-spec."react"."*" = - self.by-version."react"."0.11.2"; - by-version."react"."0.11.2" = lib.makeOverridable self.buildNodePackage { - name = "react-0.11.2"; + self.by-version."react"."0.12.1"; + by-version."react"."0.12.1" = lib.makeOverridable self.buildNodePackage { + name = "react-0.12.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/react/-/react-0.11.2.tgz"; - name = "react-0.11.2.tgz"; - sha1 = "eaeb787e9b1e266a3540c07c06f4ea80fe1e3766"; + url = "http://registry.npmjs.org/react/-/react-0.12.1.tgz"; + name = "react-0.12.1.tgz"; + sha1 = "b73836f4f1888ce79c9372208398a3fb5483bc35"; }) ]; buildInputs = (self.nativeDeps."react" or []); deps = { - "envify-2.0.1" = self.by-version."envify"."2.0.1"; + "envify-3.2.0" = self.by-version."envify"."3.2.0"; }; peerDependencies = [ ]; passthru.names = [ "react" ]; }; - "react" = self.by-version."react"."0.11.2"; + "react" = self.by-version."react"."0.12.1"; by-spec."read"."1" = self.by-version."read"."1.0.5"; by-version."read"."1.0.5" = lib.makeOverridable self.buildNodePackage { @@ -16675,6 +22883,30 @@ self.by-version."read"."1.0.5"; by-spec."read"."~1.0.4" = self.by-version."read"."1.0.5"; + by-spec."read-installed"."~0.2.2" = + self.by-version."read-installed"."0.2.5"; + by-version."read-installed"."0.2.5" = lib.makeOverridable self.buildNodePackage { + name = "read-installed-0.2.5"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/read-installed/-/read-installed-0.2.5.tgz"; + name = "read-installed-0.2.5.tgz"; + sha1 = "134df8b326d8b54b11e18f7dd8c81bf5e976ef86"; + }) + ]; + buildInputs = + (self.nativeDeps."read-installed" or []); + deps = { + "semver-2.3.2" = self.by-version."semver"."2.3.2"; + "slide-1.1.6" = self.by-version."slide"."1.1.6"; + "read-package-json-1.2.7" = self.by-version."read-package-json"."1.2.7"; + "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3"; + }; + peerDependencies = [ + ]; + passthru.names = [ "read-installed" ]; + }; by-spec."read-installed"."~3.1.2" = self.by-version."read-installed"."3.1.3"; by-version."read-installed"."3.1.3" = lib.makeOverridable self.buildNodePackage { @@ -16692,11 +22924,11 @@ deps = { "debuglog-1.0.1" = self.by-version."debuglog"."1.0.1"; "read-package-json-1.2.7" = self.by-version."read-package-json"."1.2.7"; - "readdir-scoped-modules-1.0.0" = self.by-version."readdir-scoped-modules"."1.0.0"; - "semver-4.0.3" = self.by-version."semver"."4.0.3"; + "readdir-scoped-modules-1.0.1" = self.by-version."readdir-scoped-modules"."1.0.1"; + "semver-4.1.0" = self.by-version."semver"."4.1.0"; "slide-1.1.6" = self.by-version."slide"."1.1.6"; "util-extend-1.0.1" = self.by-version."util-extend"."1.0.1"; - "graceful-fs-3.0.2" = self.by-version."graceful-fs"."3.0.2"; + "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; }; peerDependencies = [ ]; @@ -16719,17 +22951,91 @@ deps = { "github-url-from-git-1.4.0" = self.by-version."github-url-from-git"."1.4.0"; "github-url-from-username-repo-1.0.2" = self.by-version."github-url-from-username-repo"."1.0.2"; - "glob-4.0.6" = self.by-version."glob"."4.0.6"; + "glob-4.2.2" = self.by-version."glob"."4.2.2"; "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0"; "normalize-package-data-1.0.3" = self.by-version."normalize-package-data"."1.0.3"; - "graceful-fs-3.0.2" = self.by-version."graceful-fs"."3.0.2"; + "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; }; peerDependencies = [ ]; passthru.names = [ "read-package-json" ]; }; + by-spec."read-package-json"."1.1.x" = + self.by-version."read-package-json"."1.1.9"; + by-version."read-package-json"."1.1.9" = lib.makeOverridable self.buildNodePackage { + name = "read-package-json-1.1.9"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.1.9.tgz"; + name = "read-package-json-1.1.9.tgz"; + sha1 = "9c319185e5f8461661c01f8d4e5e80b468aa18ee"; + }) + ]; + buildInputs = + (self.nativeDeps."read-package-json" or []); + deps = { + "glob-3.2.11" = self.by-version."glob"."3.2.11"; + "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0"; + "normalize-package-data-0.2.13" = self.by-version."normalize-package-data"."0.2.13"; + "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3"; + }; + peerDependencies = [ + ]; + passthru.names = [ "read-package-json" ]; + }; + by-spec."read-package-json"."~1.1.0" = + self.by-version."read-package-json"."1.1.9"; + by-spec."read-package-json"."~1.1.6" = + self.by-version."read-package-json"."1.1.9"; by-spec."read-package-json"."~1.2.7" = self.by-version."read-package-json"."1.2.7"; + by-spec."read-torrent"."^1.1.0" = + self.by-version."read-torrent"."1.1.0"; + by-version."read-torrent"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "read-torrent-1.1.0"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/read-torrent/-/read-torrent-1.1.0.tgz"; + name = "read-torrent-1.1.0.tgz"; + sha1 = "a34506d88b50682e01cb638576b4fccebfe706ed"; + }) + ]; + buildInputs = + (self.nativeDeps."read-torrent" or []); + deps = { + "request-2.16.6" = self.by-version."request"."2.16.6"; + "parse-torrent-1.0.0" = self.by-version."parse-torrent"."1.0.0"; + "magnet-uri-2.0.1" = self.by-version."magnet-uri"."2.0.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "read-torrent" ]; + }; + by-spec."read-torrent"."~1.0.0" = + self.by-version."read-torrent"."1.0.0"; + by-version."read-torrent"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "read-torrent-1.0.0"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/read-torrent/-/read-torrent-1.0.0.tgz"; + name = "read-torrent-1.0.0.tgz"; + sha1 = "d45427a10dbbf21479fdf7e1ce8ce4ad39770966"; + }) + ]; + buildInputs = + (self.nativeDeps."read-torrent" or []); + deps = { + "request-2.16.6" = self.by-version."request"."2.16.6"; + "parse-torrent-1.0.0" = self.by-version."parse-torrent"."1.0.0"; + "magnet-uri-2.0.1" = self.by-version."magnet-uri"."2.0.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "read-torrent" ]; + }; by-spec."readable-stream"."*" = self.by-version."readable-stream"."1.1.13"; by-version."readable-stream"."1.1.13" = lib.makeOverridable self.buildNodePackage { @@ -16755,15 +23061,15 @@ passthru.names = [ "readable-stream" ]; }; by-spec."readable-stream"."1.0" = - self.by-version."readable-stream"."1.0.32"; - by-version."readable-stream"."1.0.32" = lib.makeOverridable self.buildNodePackage { - name = "readable-stream-1.0.32"; + self.by-version."readable-stream"."1.0.33"; + by-version."readable-stream"."1.0.33" = lib.makeOverridable self.buildNodePackage { + name = "readable-stream-1.0.33"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.32.tgz"; - name = "readable-stream-1.0.32.tgz"; - sha1 = "6b44a88ba984cd0ec0834ae7d59a47c39aef48ec"; + url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz"; + name = "readable-stream-1.0.33.tgz"; + sha1 = "3a360dd66c1b1d7fd4705389860eda1d0f61126c"; }) ]; buildInputs = @@ -16802,50 +23108,36 @@ ]; passthru.names = [ "readable-stream" ]; }; - by-spec."readable-stream"."1.0.31" = - self.by-version."readable-stream"."1.0.31"; - by-version."readable-stream"."1.0.31" = lib.makeOverridable self.buildNodePackage { - name = "readable-stream-1.0.31"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz"; - name = "readable-stream-1.0.31.tgz"; - sha1 = "8f2502e0bc9e3b0da1b94520aabb4e2603ecafae"; - }) - ]; - buildInputs = - (self.nativeDeps."readable-stream" or []); - 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 = [ - ]; - passthru.names = [ "readable-stream" ]; - }; by-spec."readable-stream"."1.1" = self.by-version."readable-stream"."1.1.13"; - by-spec."readable-stream".">=1.0.28 <1.1.0-0" = - self.by-version."readable-stream"."1.0.32"; + by-spec."readable-stream".">=1.0.33-1 <1.1.0-0" = + self.by-version."readable-stream"."1.0.33"; by-spec."readable-stream".">=1.1.13-1 <1.2.0-0" = self.by-version."readable-stream"."1.1.13"; + by-spec."readable-stream"."^1.0.2" = + self.by-version."readable-stream"."1.1.13"; by-spec."readable-stream"."^1.0.27-1" = self.by-version."readable-stream"."1.1.13"; + by-spec."readable-stream"."^1.0.33" = + self.by-version."readable-stream"."1.1.13"; + by-spec."readable-stream"."^1.0.33-1" = + self.by-version."readable-stream"."1.1.13"; by-spec."readable-stream"."^1.1.13-1" = self.by-version."readable-stream"."1.1.13"; by-spec."readable-stream"."~1.0.17" = - self.by-version."readable-stream"."1.0.32"; + self.by-version."readable-stream"."1.0.33"; by-spec."readable-stream"."~1.0.2" = - self.by-version."readable-stream"."1.0.32"; + self.by-version."readable-stream"."1.0.33"; by-spec."readable-stream"."~1.0.24" = - self.by-version."readable-stream"."1.0.32"; + self.by-version."readable-stream"."1.0.33"; by-spec."readable-stream"."~1.0.26" = - self.by-version."readable-stream"."1.0.32"; - by-spec."readable-stream"."~1.0.32" = - self.by-version."readable-stream"."1.0.32"; + self.by-version."readable-stream"."1.0.33"; + by-spec."readable-stream"."~1.0.26-2" = + self.by-version."readable-stream"."1.0.33"; + by-spec."readable-stream"."~1.0.33" = + self.by-version."readable-stream"."1.0.33"; + by-spec."readable-stream"."~1.1" = + self.by-version."readable-stream"."1.1.13"; by-spec."readable-stream"."~1.1.8" = self.by-version."readable-stream"."1.1.13"; by-spec."readable-stream"."~1.1.9" = @@ -16872,15 +23164,15 @@ passthru.names = [ "readable-wrap" ]; }; by-spec."readdir-scoped-modules"."^1.0.0" = - self.by-version."readdir-scoped-modules"."1.0.0"; - by-version."readdir-scoped-modules"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "readdir-scoped-modules-1.0.0"; + self.by-version."readdir-scoped-modules"."1.0.1"; + by-version."readdir-scoped-modules"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "readdir-scoped-modules-1.0.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.0.0.tgz"; - name = "readdir-scoped-modules-1.0.0.tgz"; - sha1 = "e939de969b38b3e7dfaa14fbcfe7a2fd15a4ea37"; + url = "http://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.0.1.tgz"; + name = "readdir-scoped-modules-1.0.1.tgz"; + sha1 = "5c2a77f3e08250a8fddf53fa58cdc17900b808b9"; }) ]; buildInputs = @@ -16888,12 +23180,36 @@ deps = { "debuglog-1.0.1" = self.by-version."debuglog"."1.0.1"; "dezalgo-1.0.1" = self.by-version."dezalgo"."1.0.1"; + "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; "once-1.3.1" = self.by-version."once"."1.3.1"; }; peerDependencies = [ ]; passthru.names = [ "readdir-scoped-modules" ]; }; + by-spec."readdirp"."^1.1.0" = + self.by-version."readdirp"."1.1.0"; + by-version."readdirp"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "readdirp-1.1.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/readdirp/-/readdirp-1.1.0.tgz"; + name = "readdirp-1.1.0.tgz"; + sha1 = "6506f9d5d8bb2edc19c855a60bb92feca5fae39c"; + }) + ]; + buildInputs = + (self.nativeDeps."readdirp" or []); + deps = { + "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3"; + "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14"; + "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; + }; + peerDependencies = [ + ]; + passthru.names = [ "readdirp" ]; + }; by-spec."readdirp"."~0.2.3" = self.by-version."readdirp"."0.2.5"; by-version."readdirp"."0.2.5" = lib.makeOverridable self.buildNodePackage { @@ -16915,16 +23231,41 @@ ]; passthru.names = [ "readdirp" ]; }; - by-spec."realize-package-specifier"."~1.1.0" = - self.by-version."realize-package-specifier"."1.1.0"; - by-version."realize-package-specifier"."1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "realize-package-specifier-1.1.0"; + by-spec."readdirp"."~1.1.0" = + self.by-version."readdirp"."1.1.0"; + by-spec."readline2"."~0.1.0" = + self.by-version."readline2"."0.1.0"; + by-version."readline2"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "readline2-0.1.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/realize-package-specifier/-/realize-package-specifier-1.1.0.tgz"; - name = "realize-package-specifier-1.1.0.tgz"; - sha1 = "b6922638b7224186ae9278bdebbb63cba23a0160"; + url = "http://registry.npmjs.org/readline2/-/readline2-0.1.0.tgz"; + name = "readline2-0.1.0.tgz"; + sha1 = "6a272ef89731225b448e4c6799b6e50d5be12b98"; + }) + ]; + buildInputs = + (self.nativeDeps."readline2" or []); + deps = { + "mute-stream-0.0.4" = self.by-version."mute-stream"."0.0.4"; + "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; + "chalk-0.4.0" = self.by-version."chalk"."0.4.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "readline2" ]; + }; + by-spec."realize-package-specifier"."~1.3.0" = + self.by-version."realize-package-specifier"."1.3.0"; + by-version."realize-package-specifier"."1.3.0" = lib.makeOverridable self.buildNodePackage { + name = "realize-package-specifier-1.3.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/realize-package-specifier/-/realize-package-specifier-1.3.0.tgz"; + name = "realize-package-specifier-1.3.0.tgz"; + sha1 = "23374a84e6a9188483f346cc939eb58eec85efa5"; }) ]; buildInputs = @@ -16937,25 +23278,47 @@ ]; passthru.names = [ "realize-package-specifier" ]; }; - by-spec."recursive-readdir"."0.0.2" = - self.by-version."recursive-readdir"."0.0.2"; - by-version."recursive-readdir"."0.0.2" = lib.makeOverridable self.buildNodePackage { - name = "recursive-readdir-0.0.2"; + by-spec."reconnect-core"."https://github.com/dodo/reconnect-core/tarball/merged" = + self.by-version."reconnect-core"."0.0.1"; + by-version."reconnect-core"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "reconnect-core-0.0.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/recursive-readdir/-/recursive-readdir-0.0.2.tgz"; - name = "recursive-readdir-0.0.2.tgz"; - sha1 = "0bc47dc4838e646dccfba0507b5e57ffbff35f7c"; + url = "https://github.com/dodo/reconnect-core/tarball/merged"; + name = "reconnect-core-0.0.1.tgz"; + sha256 = "431dd7a1578061815270e4ad59c6e8b40dff6b308244973e1c11049ccbf1629b"; }) ]; buildInputs = - (self.nativeDeps."recursive-readdir" or []); + (self.nativeDeps."reconnect-core" or []); deps = { + "backoff-2.3.0" = self.by-version."backoff"."2.3.0"; }; peerDependencies = [ ]; - passthru.names = [ "recursive-readdir" ]; + passthru.names = [ "reconnect-core" ]; + }; + by-spec."redeyed"."~0.4.0" = + self.by-version."redeyed"."0.4.4"; + by-version."redeyed"."0.4.4" = lib.makeOverridable self.buildNodePackage { + name = "redeyed-0.4.4"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/redeyed/-/redeyed-0.4.4.tgz"; + name = "redeyed-0.4.4.tgz"; + sha1 = "37e990a6f2b21b2a11c2e6a48fd4135698cba97f"; + }) + ]; + buildInputs = + (self.nativeDeps."redeyed" or []); + deps = { + "esprima-1.0.4" = self.by-version."esprima"."1.0.4"; + }; + peerDependencies = [ + ]; + passthru.names = [ "redeyed" ]; }; by-spec."redis"."*" = self.by-version."redis"."0.12.1"; @@ -17103,6 +23466,49 @@ ]; passthru.names = [ "regexp-clone" ]; }; + by-spec."registry-url"."^0.1.0" = + self.by-version."registry-url"."0.1.1"; + by-version."registry-url"."0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "registry-url-0.1.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/registry-url/-/registry-url-0.1.1.tgz"; + name = "registry-url-0.1.1.tgz"; + sha1 = "1739427b81b110b302482a1c7cd727ffcc82d5be"; + }) + ]; + buildInputs = + (self.nativeDeps."registry-url" or []); + deps = { + "npmconf-2.1.1" = self.by-version."npmconf"."2.1.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "registry-url" ]; + }; + by-spec."repeating"."^1.1.0" = + self.by-version."repeating"."1.1.0"; + by-version."repeating"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "repeating-1.1.0"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/repeating/-/repeating-1.1.0.tgz"; + name = "repeating-1.1.0.tgz"; + sha1 = "1977511fd1d58075dcb6abbbb2b627edd45e41dc"; + }) + ]; + buildInputs = + (self.nativeDeps."repeating" or []); + deps = { + "is-finite-1.0.0" = self.by-version."is-finite"."1.0.0"; + "meow-1.0.0" = self.by-version."meow"."1.0.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "repeating" ]; + }; by-spec."replace"."~0.2.4" = self.by-version."replace"."0.2.10"; by-version."replace"."0.2.10" = lib.makeOverridable self.buildNodePackage { @@ -17127,44 +23533,45 @@ passthru.names = [ "replace" ]; }; by-spec."request"."2" = - self.by-version."request"."2.44.0"; - by-version."request"."2.44.0" = lib.makeOverridable self.buildNodePackage { - name = "request-2.44.0"; + self.by-version."request"."2.49.0"; + by-version."request"."2.49.0" = lib.makeOverridable self.buildNodePackage { + name = "request-2.49.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.44.0.tgz"; - name = "request-2.44.0.tgz"; - sha1 = "78d62454d68853cadfb07ad31f58b9ec98072ea8"; + url = "http://registry.npmjs.org/request/-/request-2.49.0.tgz"; + name = "request-2.49.0.tgz"; + sha1 = "0d4f6348dc3348059b553e4db60fd2478de662a7"; }) ]; buildInputs = (self.nativeDeps."request" or []); deps = { "bl-0.9.3" = self.by-version."bl"."0.9.3"; - "caseless-0.6.0" = self.by-version."caseless"."0.6.0"; + "caseless-0.8.0" = self.by-version."caseless"."0.8.0"; "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2"; - "qs-1.2.2" = self.by-version."qs"."1.2.2"; + "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0"; "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2"; "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; + "qs-2.3.3" = self.by-version."qs"."2.3.3"; "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0"; "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1"; - "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; "http-signature-0.10.0" = self.by-version."http-signature"."0.10.0"; - "oauth-sign-0.4.0" = self.by-version."oauth-sign"."0.4.0"; + "oauth-sign-0.5.0" = self.by-version."oauth-sign"."0.5.0"; "hawk-1.1.1" = self.by-version."hawk"."1.1.1"; "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0"; "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4"; + "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7"; }; peerDependencies = [ ]; passthru.names = [ "request" ]; }; by-spec."request"."2 >=2.20.0" = - self.by-version."request"."2.44.0"; + self.by-version."request"."2.49.0"; by-spec."request"."2 >=2.25.0" = - self.by-version."request"."2.44.0"; + self.by-version."request"."2.49.0"; by-spec."request"."2.16.x" = self.by-version."request"."2.16.6"; by-version."request"."2.16.6" = lib.makeOverridable self.buildNodePackage { @@ -17264,6 +23671,42 @@ ]; passthru.names = [ "request" ]; }; + by-spec."request"."2.47.0" = + self.by-version."request"."2.47.0"; + by-version."request"."2.47.0" = lib.makeOverridable self.buildNodePackage { + name = "request-2.47.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/request/-/request-2.47.0.tgz"; + name = "request-2.47.0.tgz"; + sha1 = "09e9fd1a4fed6593a805ef8202b20f0c5ecb485f"; + }) + ]; + buildInputs = + (self.nativeDeps."request" or []); + deps = { + "bl-0.9.3" = self.by-version."bl"."0.9.3"; + "caseless-0.6.0" = self.by-version."caseless"."0.6.0"; + "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2"; + "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; + "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0"; + "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2"; + "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; + "qs-2.3.3" = self.by-version."qs"."2.3.3"; + "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0"; + "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1"; + "http-signature-0.10.0" = self.by-version."http-signature"."0.10.0"; + "oauth-sign-0.4.0" = self.by-version."oauth-sign"."0.4.0"; + "hawk-1.1.1" = self.by-version."hawk"."1.1.1"; + "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0"; + "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4"; + "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7"; + }; + peerDependencies = [ + ]; + passthru.names = [ "request" ]; + }; by-spec."request"."2.9.x" = self.by-version."request"."2.9.203"; by-version."request"."2.9.203" = lib.makeOverridable self.buildNodePackage { @@ -17284,10 +23727,52 @@ ]; passthru.names = [ "request" ]; }; + by-spec."request".">= 2.9.153" = + self.by-version."request"."2.49.0"; by-spec."request"."^2.36.0" = - self.by-version."request"."2.44.0"; + self.by-version."request"."2.49.0"; + by-spec."request"."^2.40.0" = + self.by-version."request"."2.49.0"; + by-spec."request"."^2.47.0" = + self.by-version."request"."2.49.0"; + by-spec."request"."^2.48.0" = + self.by-version."request"."2.49.0"; by-spec."request"."~2" = - self.by-version."request"."2.44.0"; + self.by-version."request"."2.49.0"; + by-spec."request"."~2.16.2" = + self.by-version."request"."2.16.6"; + by-spec."request"."~2.21.0" = + self.by-version."request"."2.21.0"; + by-version."request"."2.21.0" = lib.makeOverridable self.buildNodePackage { + name = "request-2.21.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/request/-/request-2.21.0.tgz"; + name = "request-2.21.0.tgz"; + sha1 = "5728ab9c45e5a87c99daccd530298b6673a868d7"; + }) + ]; + buildInputs = + (self.nativeDeps."request" or []); + deps = { + "qs-0.6.6" = self.by-version."qs"."0.6.6"; + "json-stringify-safe-4.0.0" = self.by-version."json-stringify-safe"."4.0.0"; + "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2"; + "tunnel-agent-0.3.0" = self.by-version."tunnel-agent"."0.3.0"; + "http-signature-0.9.11" = self.by-version."http-signature"."0.9.11"; + "hawk-0.13.1" = self.by-version."hawk"."0.13.1"; + "aws-sign-0.3.0" = self.by-version."aws-sign"."0.3.0"; + "oauth-sign-0.3.0" = self.by-version."oauth-sign"."0.3.0"; + "cookie-jar-0.3.0" = self.by-version."cookie-jar"."0.3.0"; + "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; + "mime-1.2.11" = self.by-version."mime"."1.2.11"; + "form-data-0.0.8" = self.by-version."form-data"."0.0.8"; + }; + peerDependencies = [ + ]; + passthru.names = [ "request" ]; + }; by-spec."request"."~2.27.0" = self.by-version."request"."2.27.0"; by-version."request"."2.27.0" = lib.makeOverridable self.buildNodePackage { @@ -17320,12 +23805,134 @@ ]; passthru.names = [ "request" ]; }; + by-spec."request"."~2.30.0" = + self.by-version."request"."2.30.0"; + by-version."request"."2.30.0" = lib.makeOverridable 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"; + }) + ]; + buildInputs = + (self.nativeDeps."request" or []); + 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.1" = self.by-version."node-uuid"."1.4.1"; + "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.0" = self.by-version."http-signature"."0.10.0"; + "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 = [ + ]; + passthru.names = [ "request" ]; + }; by-spec."request"."~2.40.0" = self.by-version."request"."2.40.0"; by-spec."request"."~2.42.0" = self.by-version."request"."2.42.0"; - by-spec."request"."~2.44.0" = - self.by-version."request"."2.44.0"; + by-spec."request"."~2.46.0" = + self.by-version."request"."2.46.0"; + by-version."request"."2.46.0" = lib.makeOverridable self.buildNodePackage { + name = "request-2.46.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/request/-/request-2.46.0.tgz"; + name = "request-2.46.0.tgz"; + sha1 = "359195d52eaf720bc69742579d04ad6d265a8274"; + }) + ]; + buildInputs = + (self.nativeDeps."request" or []); + deps = { + "bl-0.9.3" = self.by-version."bl"."0.9.3"; + "caseless-0.6.0" = self.by-version."caseless"."0.6.0"; + "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2"; + "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; + "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0"; + "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2"; + "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; + "qs-1.2.2" = self.by-version."qs"."1.2.2"; + "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0"; + "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1"; + "http-signature-0.10.0" = self.by-version."http-signature"."0.10.0"; + "oauth-sign-0.4.0" = self.by-version."oauth-sign"."0.4.0"; + "hawk-1.1.1" = self.by-version."hawk"."1.1.1"; + "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0"; + "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4"; + }; + peerDependencies = [ + ]; + passthru.names = [ "request" ]; + }; + by-spec."request"."~2.48.0" = + self.by-version."request"."2.48.0"; + by-version."request"."2.48.0" = lib.makeOverridable self.buildNodePackage { + name = "request-2.48.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/request/-/request-2.48.0.tgz"; + name = "request-2.48.0.tgz"; + sha1 = "3ae2e091c9698282d58a0e6989ece2638f0f1f28"; + }) + ]; + buildInputs = + (self.nativeDeps."request" or []); + deps = { + "bl-0.9.3" = self.by-version."bl"."0.9.3"; + "caseless-0.7.0" = self.by-version."caseless"."0.7.0"; + "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2"; + "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; + "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0"; + "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2"; + "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; + "qs-2.3.3" = self.by-version."qs"."2.3.3"; + "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0"; + "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1"; + "http-signature-0.10.0" = self.by-version."http-signature"."0.10.0"; + "oauth-sign-0.5.0" = self.by-version."oauth-sign"."0.5.0"; + "hawk-1.1.1" = self.by-version."hawk"."1.1.1"; + "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0"; + "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4"; + "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7"; + }; + peerDependencies = [ + ]; + passthru.names = [ "request" ]; + }; + by-spec."request-progress"."0.3.0" = + self.by-version."request-progress"."0.3.0"; + by-version."request-progress"."0.3.0" = lib.makeOverridable self.buildNodePackage { + name = "request-progress-0.3.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/request-progress/-/request-progress-0.3.0.tgz"; + name = "request-progress-0.3.0.tgz"; + sha1 = "bdf2062bfc197c5d492500d44cb3aff7865b492e"; + }) + ]; + buildInputs = + (self.nativeDeps."request-progress" or []); + deps = { + "throttleit-0.0.2" = self.by-version."throttleit"."0.0.2"; + }; + peerDependencies = [ + ]; + passthru.names = [ "request-progress" ]; + }; by-spec."request-progress"."0.3.1" = self.by-version."request-progress"."0.3.1"; by-version."request-progress"."0.3.1" = lib.makeOverridable self.buildNodePackage { @@ -17347,6 +23954,27 @@ ]; passthru.names = [ "request-progress" ]; }; + by-spec."request-replay"."~0.2.0" = + self.by-version."request-replay"."0.2.0"; + by-version."request-replay"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "request-replay-0.2.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/request-replay/-/request-replay-0.2.0.tgz"; + name = "request-replay-0.2.0.tgz"; + sha1 = "9b693a5d118b39f5c596ead5ed91a26444057f60"; + }) + ]; + buildInputs = + (self.nativeDeps."request-replay" or []); + deps = { + "retry-0.6.1" = self.by-version."retry"."0.6.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "request-replay" ]; + }; by-spec."requirejs"."~2.1" = self.by-version."requirejs"."2.1.15"; by-version."requirejs"."2.1.15" = lib.makeOverridable self.buildNodePackage { @@ -17369,6 +23997,26 @@ }; by-spec."requirejs"."~2.1.0" = self.by-version."requirejs"."2.1.15"; + by-spec."resolve"."0.6.3" = + self.by-version."resolve"."0.6.3"; + by-version."resolve"."0.6.3" = lib.makeOverridable self.buildNodePackage { + name = "resolve-0.6.3"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/resolve/-/resolve-0.6.3.tgz"; + name = "resolve-0.6.3.tgz"; + sha1 = "dd957982e7e736debdf53b58a4dd91754575dd46"; + }) + ]; + buildInputs = + (self.nativeDeps."resolve" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "resolve" ]; + }; by-spec."resolve"."0.7.4" = self.by-version."resolve"."0.7.4"; by-version."resolve"."0.7.4" = lib.makeOverridable self.buildNodePackage { @@ -17413,12 +24061,54 @@ }; by-spec."resolve"."~0.3.1" = self.by-version."resolve"."0.3.1"; - by-spec."resolve"."~0.7.0" = - self.by-version."resolve"."0.7.4"; + by-spec."resolve"."~0.6.0" = + self.by-version."resolve"."0.6.3"; + by-spec."resolve"."~0.6.1" = + self.by-version."resolve"."0.6.3"; by-spec."resolve"."~0.7.1" = self.by-version."resolve"."0.7.4"; by-spec."resolve"."~0.7.2" = self.by-version."resolve"."0.7.4"; + by-spec."resolve"."~1.0.0" = + self.by-version."resolve"."1.0.0"; + by-version."resolve"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "resolve-1.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/resolve/-/resolve-1.0.0.tgz"; + name = "resolve-1.0.0.tgz"; + sha1 = "2a6e3b314dcd57c6519e8e2282af8687e8de61c6"; + }) + ]; + buildInputs = + (self.nativeDeps."resolve" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "resolve" ]; + }; + by-spec."response-time"."1.0.0" = + self.by-version."response-time"."1.0.0"; + by-version."response-time"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "response-time-1.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/response-time/-/response-time-1.0.0.tgz"; + name = "response-time-1.0.0.tgz"; + sha1 = "c2bc8d08f3c359f97eae1d6da86eead175fabdc9"; + }) + ]; + buildInputs = + (self.nativeDeps."response-time" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "response-time" ]; + }; by-spec."response-time"."~2.0.1" = self.by-version."response-time"."2.0.1"; by-version."response-time"."2.0.1" = lib.makeOverridable self.buildNodePackage { @@ -17440,6 +24130,28 @@ ]; passthru.names = [ "response-time" ]; }; + by-spec."response-time"."~2.2.0" = + self.by-version."response-time"."2.2.0"; + by-version."response-time"."2.2.0" = lib.makeOverridable self.buildNodePackage { + name = "response-time-2.2.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/response-time/-/response-time-2.2.0.tgz"; + name = "response-time-2.2.0.tgz"; + sha1 = "77ab4688cbf030e9c5f82dc1eac7fe5226d3c8eb"; + }) + ]; + buildInputs = + (self.nativeDeps."response-time" or []); + deps = { + "depd-1.0.0" = self.by-version."depd"."1.0.0"; + "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "response-time" ]; + }; by-spec."restify"."2.4.1" = self.by-version."restify"."2.4.1"; by-version."restify"."2.4.1" = lib.makeOverridable self.buildNodePackage { @@ -17492,7 +24204,7 @@ buildInputs = (self.nativeDeps."rethinkdb" or []); deps = { - "bluebird-2.3.4" = self.by-version."bluebird"."2.3.4"; + "bluebird-2.3.11" = self.by-version."bluebird"."2.3.11"; }; peerDependencies = [ ]; @@ -17519,7 +24231,7 @@ ]; passthru.names = [ "retry" ]; }; - by-spec."retry"."~0.6.0" = + by-spec."retry"."^0.6.1" = self.by-version."retry"."0.6.1"; by-version."retry"."0.6.1" = lib.makeOverridable self.buildNodePackage { name = "retry-0.6.1"; @@ -17539,6 +24251,10 @@ ]; passthru.names = [ "retry" ]; }; + by-spec."retry"."~0.6.0" = + self.by-version."retry"."0.6.1"; + by-spec."retry"."~0.6.1" = + self.by-version."retry"."0.6.1"; by-spec."revalidator"."0.1.x" = self.by-version."revalidator"."0.1.8"; by-version."revalidator"."0.1.8" = lib.makeOverridable self.buildNodePackage { @@ -17623,28 +24339,10 @@ ]; passthru.names = [ "rimraf" ]; }; - by-spec."rimraf"."2.2.6" = - self.by-version."rimraf"."2.2.6"; - by-version."rimraf"."2.2.6" = lib.makeOverridable self.buildNodePackage { - name = "rimraf-2.2.6"; - bin = true; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.6.tgz"; - name = "rimraf-2.2.6.tgz"; - sha1 = "c59597569b14d956ad29cacc42bdddf5f0ea4f4c"; - }) - ]; - buildInputs = - (self.nativeDeps."rimraf" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "rimraf" ]; - }; by-spec."rimraf"."2.x.x" = self.by-version."rimraf"."2.2.8"; + by-spec."rimraf"."^2.2.5" = + self.by-version."rimraf"."2.2.8"; by-spec."rimraf"."^2.2.8" = self.by-version."rimraf"."2.2.8"; by-spec."rimraf"."~2" = @@ -17672,8 +24370,6 @@ }; by-spec."rimraf"."~2.2.0" = self.by-version."rimraf"."2.2.8"; - by-spec."rimraf"."~2.2.2" = - self.by-version."rimraf"."2.2.8"; by-spec."rimraf"."~2.2.5" = self.by-version."rimraf"."2.2.8"; by-spec."rimraf"."~2.2.6" = @@ -17742,6 +24438,66 @@ ]; passthru.names = [ "ruglify" ]; }; + by-spec."run-parallel"."^1.0.0" = + self.by-version."run-parallel"."1.0.0"; + by-version."run-parallel"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "run-parallel-1.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/run-parallel/-/run-parallel-1.0.0.tgz"; + name = "run-parallel-1.0.0.tgz"; + sha1 = "1dd0787f994d17f8d1bbe7e910e0cc3036800cbc"; + }) + ]; + buildInputs = + (self.nativeDeps."run-parallel" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "run-parallel" ]; + }; + by-spec."rusha-browserify"."^0.7.3" = + self.by-version."rusha-browserify"."0.7.3"; + by-version."rusha-browserify"."0.7.3" = lib.makeOverridable self.buildNodePackage { + name = "rusha-browserify-0.7.3"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/rusha-browserify/-/rusha-browserify-0.7.3.tgz"; + name = "rusha-browserify-0.7.3.tgz"; + sha1 = "03b313892e287021cc2fc391e2c154fd7d79aef2"; + }) + ]; + buildInputs = + (self.nativeDeps."rusha-browserify" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "rusha-browserify" ]; + }; + by-spec."rx"."^2.2.27" = + self.by-version."rx"."2.3.18"; + by-version."rx"."2.3.18" = lib.makeOverridable self.buildNodePackage { + name = "rx-2.3.18"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/rx/-/rx-2.3.18.tgz"; + name = "rx-2.3.18.tgz"; + sha1 = "4ae726e3d770db47f070b532f9840c717b2385ba"; + }) + ]; + buildInputs = + (self.nativeDeps."rx" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "rx" ]; + }; by-spec."s3http"."*" = self.by-version."s3http"."0.0.5"; by-version."s3http"."0.0.5" = lib.makeOverridable self.buildNodePackage { @@ -17835,6 +24591,26 @@ ]; passthru.names = [ "saucelabs" ]; }; + by-spec."sax"."0.3.5" = + self.by-version."sax"."0.3.5"; + by-version."sax"."0.3.5" = lib.makeOverridable self.buildNodePackage { + name = "sax-0.3.5"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/sax/-/sax-0.3.5.tgz"; + name = "sax-0.3.5.tgz"; + sha1 = "88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d"; + }) + ]; + buildInputs = + (self.nativeDeps."sax" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "sax" ]; + }; by-spec."sax"."0.4.2" = self.by-version."sax"."0.4.2"; by-version."sax"."0.4.2" = lib.makeOverridable self.buildNodePackage { @@ -17876,15 +24652,15 @@ passthru.names = [ "sax" ]; }; by-spec."sax"."0.6.x" = - self.by-version."sax"."0.6.0"; - by-version."sax"."0.6.0" = lib.makeOverridable self.buildNodePackage { - name = "sax-0.6.0"; + self.by-version."sax"."0.6.1"; + by-version."sax"."0.6.1" = lib.makeOverridable self.buildNodePackage { + name = "sax-0.6.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/sax/-/sax-0.6.0.tgz"; - name = "sax-0.6.0.tgz"; - sha1 = "7a155519b712e3ec56f102ab984f15e15d3859f0"; + url = "http://registry.npmjs.org/sax/-/sax-0.6.1.tgz"; + name = "sax-0.6.1.tgz"; + sha1 = "563b19c7c1de892e09bfc4f2fc30e3c27f0952b9"; }) ]; buildInputs = @@ -17896,8 +24672,30 @@ passthru.names = [ "sax" ]; }; by-spec."sax".">=0.4.2" = - self.by-version."sax"."0.6.0"; - by-spec."scmp"."0.0.3" = + self.by-version."sax"."0.6.1"; + by-spec."sax"."~0.6.0" = + self.by-version."sax"."0.6.1"; + by-spec."scmp"."1.0.0" = + self.by-version."scmp"."1.0.0"; + by-version."scmp"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "scmp-1.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/scmp/-/scmp-1.0.0.tgz"; + name = "scmp-1.0.0.tgz"; + sha1 = "a0b272c3fc7292f77115646f00618b0262514e04"; + }) + ]; + buildInputs = + (self.nativeDeps."scmp" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "scmp" ]; + }; + by-spec."scmp"."~0.0.3" = self.by-version."scmp"."0.0.3"; by-version."scmp"."0.0.3" = lib.makeOverridable self.buildNodePackage { name = "scmp-0.0.3"; @@ -17918,15 +24716,15 @@ passthru.names = [ "scmp" ]; }; by-spec."selenium-webdriver"."*" = - self.by-version."selenium-webdriver"."2.43.5"; - by-version."selenium-webdriver"."2.43.5" = lib.makeOverridable self.buildNodePackage { - name = "selenium-webdriver-2.43.5"; + self.by-version."selenium-webdriver"."2.44.0"; + by-version."selenium-webdriver"."2.44.0" = lib.makeOverridable self.buildNodePackage { + name = "selenium-webdriver-2.44.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.43.5.tgz"; - name = "selenium-webdriver-2.43.5.tgz"; - sha1 = "6ac04302e3e81dfe59956454a19f90eeadfe5573"; + url = "http://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.44.0.tgz"; + name = "selenium-webdriver-2.44.0.tgz"; + sha1 = "6cc6257731cd27c6db6471092857755f99d77b57"; }) ]; buildInputs = @@ -17940,17 +24738,17 @@ ]; passthru.names = [ "selenium-webdriver" ]; }; - "selenium-webdriver" = self.by-version."selenium-webdriver"."2.43.5"; + "selenium-webdriver" = self.by-version."selenium-webdriver"."2.44.0"; by-spec."semver"."*" = - self.by-version."semver"."4.0.3"; - by-version."semver"."4.0.3" = lib.makeOverridable self.buildNodePackage { - name = "semver-4.0.3"; + self.by-version."semver"."4.1.0"; + by-version."semver"."4.1.0" = lib.makeOverridable self.buildNodePackage { + name = "semver-4.1.0"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/semver/-/semver-4.0.3.tgz"; - name = "semver-4.0.3.tgz"; - sha1 = "f79c9ba670efccc029d98a5017def64b0ce1644e"; + url = "http://registry.npmjs.org/semver/-/semver-4.1.0.tgz"; + name = "semver-4.1.0.tgz"; + sha1 = "bc80a9ff68532814362cc3cfda3c7b75ed9c321c"; }) ]; buildInputs = @@ -17961,7 +24759,7 @@ ]; passthru.names = [ "semver" ]; }; - "semver" = self.by-version."semver"."4.0.3"; + "semver" = self.by-version."semver"."4.1.0"; by-spec."semver"."1.1.0" = self.by-version."semver"."1.1.0"; by-version."semver"."1.1.0" = lib.makeOverridable self.buildNodePackage { @@ -18023,31 +24821,19 @@ passthru.names = [ "semver" ]; }; by-spec."semver"."2 >=2.2.1 || 3.x || 4" = - self.by-version."semver"."4.0.3"; + self.by-version."semver"."4.1.0"; by-spec."semver"."2 || 3 || 4" = - self.by-version."semver"."4.0.3"; - by-spec."semver"."2.x" = - self.by-version."semver"."2.3.2"; - by-spec."semver"."2.x || 3.x || 4" = - self.by-version."semver"."4.0.3"; - by-spec."semver"."4" = - self.by-version."semver"."4.0.3"; - by-spec."semver".">=2.0.10 <3.0.0" = - self.by-version."semver"."2.3.2"; - by-spec."semver"."^2.3.0" = - self.by-version."semver"."2.3.2"; - by-spec."semver"."^2.3.0 || 3.x || 4" = - self.by-version."semver"."4.0.3"; - by-spec."semver"."^3.0.1" = - self.by-version."semver"."3.0.1"; - by-version."semver"."3.0.1" = lib.makeOverridable self.buildNodePackage { - name = "semver-3.0.1"; + self.by-version."semver"."4.1.0"; + by-spec."semver"."2.0.11" = + self.by-version."semver"."2.0.11"; + by-version."semver"."2.0.11" = lib.makeOverridable self.buildNodePackage { + name = "semver-2.0.11"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/semver/-/semver-3.0.1.tgz"; - name = "semver-3.0.1.tgz"; - sha1 = "720ac012515a252f91fb0dd2e99a56a70d6cf078"; + url = "http://registry.npmjs.org/semver/-/semver-2.0.11.tgz"; + name = "semver-2.0.11.tgz"; + sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced"; }) ]; buildInputs = @@ -18058,18 +24844,16 @@ ]; passthru.names = [ "semver" ]; }; - by-spec."semver"."~1.1.4" = - self.by-version."semver"."1.1.4"; - by-spec."semver"."~2.0.5" = - self.by-version."semver"."2.0.11"; - by-version."semver"."2.0.11" = lib.makeOverridable self.buildNodePackage { - name = "semver-2.0.11"; + by-spec."semver"."2.2.x" = + self.by-version."semver"."2.2.1"; + by-version."semver"."2.2.1" = lib.makeOverridable self.buildNodePackage { + name = "semver-2.2.1"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/semver/-/semver-2.0.11.tgz"; - name = "semver-2.0.11.tgz"; - sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced"; + url = "http://registry.npmjs.org/semver/-/semver-2.2.1.tgz"; + name = "semver-2.2.1.tgz"; + sha1 = "7941182b3ffcc580bff1c17942acdf7951c0d213"; }) ]; buildInputs = @@ -18080,7 +24864,31 @@ ]; passthru.names = [ "semver" ]; }; - by-spec."semver"."~2.1.0" = + by-spec."semver"."2.x" = + self.by-version."semver"."2.3.2"; + by-spec."semver"."2.x || 3.x || 4" = + self.by-version."semver"."4.1.0"; + by-spec."semver"."4" = + self.by-version."semver"."4.1.0"; + by-spec."semver".">=2.0.10 <3.0.0" = + self.by-version."semver"."2.3.2"; + by-spec."semver".">=2.2.1 <3" = + self.by-version."semver"."2.3.2"; + by-spec."semver"."^2.2.1" = + self.by-version."semver"."2.3.2"; + by-spec."semver"."^2.3.0" = + self.by-version."semver"."2.3.2"; + by-spec."semver"."^2.3.0 || 3.x || 4" = + self.by-version."semver"."4.1.0"; + by-spec."semver"."^4.1.0" = + self.by-version."semver"."4.1.0"; + by-spec."semver"."~1.1.4" = + self.by-version."semver"."1.1.4"; + by-spec."semver"."~2.0.5" = + self.by-version."semver"."2.0.11"; + by-spec."semver"."~2.0.8" = + self.by-version."semver"."2.0.11"; + by-spec."semver"."~2.1" = self.by-version."semver"."2.1.0"; by-version."semver"."2.1.0" = lib.makeOverridable self.buildNodePackage { name = "semver-2.1.0"; @@ -18100,54 +24908,59 @@ ]; passthru.names = [ "semver" ]; }; + by-spec."semver"."~2.1.0" = + self.by-version."semver"."2.1.0"; 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"; - bin = true; + by-spec."semver"."~2.3.0" = + self.by-version."semver"."2.3.2"; + by-spec."semver"."~4.1.0" = + self.by-version."semver"."4.1.0"; + by-spec."semver-diff"."^0.1.0" = + self.by-version."semver-diff"."0.1.0"; + by-version."semver-diff"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "semver-diff-0.1.0"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/semver/-/semver-2.2.1.tgz"; - name = "semver-2.2.1.tgz"; - sha1 = "7941182b3ffcc580bff1c17942acdf7951c0d213"; + url = "http://registry.npmjs.org/semver-diff/-/semver-diff-0.1.0.tgz"; + name = "semver-diff-0.1.0.tgz"; + sha1 = "4f6057ca3eba23cc484b51f64aaf88b131a3855d"; }) ]; buildInputs = - (self.nativeDeps."semver" or []); + (self.nativeDeps."semver-diff" or []); deps = { + "semver-2.3.2" = self.by-version."semver"."2.3.2"; }; peerDependencies = [ ]; - passthru.names = [ "semver" ]; + passthru.names = [ "semver-diff" ]; }; - by-spec."semver"."~3.0.1" = - self.by-version."semver"."3.0.1"; - by-spec."semver"."~4.0.0" = - self.by-version."semver"."4.0.3"; by-spec."send"."*" = - self.by-version."send"."0.9.3"; - by-version."send"."0.9.3" = lib.makeOverridable self.buildNodePackage { - name = "send-0.9.3"; + self.by-version."send"."0.10.1"; + by-version."send"."0.10.1" = lib.makeOverridable self.buildNodePackage { + name = "send-0.10.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/send/-/send-0.9.3.tgz"; - name = "send-0.9.3.tgz"; - sha1 = "b43a7414cd089b7fbec9b755246f7c37b7b85cc0"; + url = "http://registry.npmjs.org/send/-/send-0.10.1.tgz"; + name = "send-0.10.1.tgz"; + sha1 = "7745c50ec72f115115980e8fb179aec01900e08a"; }) ]; buildInputs = (self.nativeDeps."send" or []); deps = { - "debug-2.0.0" = self.by-version."debug"."2.0.0"; - "depd-0.4.5" = self.by-version."depd"."0.4.5"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; + "depd-1.0.0" = self.by-version."depd"."1.0.0"; "destroy-1.0.3" = self.by-version."destroy"."1.0.3"; "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; - "etag-1.4.0" = self.by-version."etag"."1.4.0"; + "etag-1.5.1" = self.by-version."etag"."1.5.1"; "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; "mime-1.2.11" = self.by-version."mime"."1.2.11"; "ms-0.6.2" = self.by-version."ms"."0.6.2"; - "on-finished-2.1.0" = self.by-version."on-finished"."2.1.0"; + "on-finished-2.1.1" = self.by-version."on-finished"."2.1.1"; "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; }; peerDependencies = [ @@ -18169,7 +24982,7 @@ buildInputs = (self.nativeDeps."send" or []); deps = { - "debug-2.0.0" = self.by-version."debug"."2.0.0"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; "mime-1.2.6" = self.by-version."mime"."1.2.6"; "fresh-0.1.0" = self.by-version."fresh"."0.1.0"; "range-parser-0.0.4" = self.by-version."range-parser"."0.0.4"; @@ -18193,7 +25006,7 @@ buildInputs = (self.nativeDeps."send" or []); deps = { - "debug-2.0.0" = self.by-version."debug"."2.0.0"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; "mime-1.2.6" = self.by-version."mime"."1.2.6"; "fresh-0.1.0" = self.by-version."fresh"."0.1.0"; "range-parser-0.0.4" = self.by-version."range-parser"."0.0.4"; @@ -18217,7 +25030,7 @@ buildInputs = (self.nativeDeps."send" or []); deps = { - "debug-2.0.0" = self.by-version."debug"."2.0.0"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; "mime-1.2.11" = self.by-version."mime"."1.2.11"; "fresh-0.2.0" = self.by-version."fresh"."0.2.0"; "range-parser-0.0.4" = self.by-version."range-parser"."0.0.4"; @@ -18226,6 +25039,8 @@ ]; passthru.names = [ "send" ]; }; + by-spec."send"."0.10.1" = + self.by-version."send"."0.10.1"; by-spec."send"."0.2.0" = self.by-version."send"."0.2.0"; by-version."send"."0.2.0" = lib.makeOverridable self.buildNodePackage { @@ -18241,7 +25056,7 @@ buildInputs = (self.nativeDeps."send" or []); deps = { - "debug-2.0.0" = self.by-version."debug"."2.0.0"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; "mime-1.2.11" = self.by-version."mime"."1.2.11"; "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; @@ -18250,26 +25065,52 @@ ]; passthru.names = [ "send" ]; }; - by-spec."send"."0.8.5" = - self.by-version."send"."0.8.5"; - by-version."send"."0.8.5" = lib.makeOverridable self.buildNodePackage { - name = "send-0.8.5"; + by-spec."send"."0.3.0" = + self.by-version."send"."0.3.0"; + by-version."send"."0.3.0" = lib.makeOverridable self.buildNodePackage { + name = "send-0.3.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/send/-/send-0.8.5.tgz"; - name = "send-0.8.5.tgz"; - sha1 = "37f708216e6f50c175e74c69fec53484e2fd82c7"; + url = "http://registry.npmjs.org/send/-/send-0.3.0.tgz"; + name = "send-0.3.0.tgz"; + sha1 = "9718324634806fc75bc4f8f5e51f57d9d66606e7"; }) ]; buildInputs = (self.nativeDeps."send" or []); deps = { - "debug-1.0.4" = self.by-version."debug"."1.0.4"; - "depd-0.4.4" = self.by-version."depd"."0.4.4"; + "buffer-crc32-0.2.1" = self.by-version."buffer-crc32"."0.2.1"; + "debug-0.8.0" = self.by-version."debug"."0.8.0"; + "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; + "mime-1.2.11" = self.by-version."mime"."1.2.11"; + "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; + }; + peerDependencies = [ + ]; + passthru.names = [ "send" ]; + }; + by-spec."send"."0.9.3" = + self.by-version."send"."0.9.3"; + by-version."send"."0.9.3" = lib.makeOverridable self.buildNodePackage { + name = "send-0.9.3"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/send/-/send-0.9.3.tgz"; + name = "send-0.9.3.tgz"; + sha1 = "b43a7414cd089b7fbec9b755246f7c37b7b85cc0"; + }) + ]; + buildInputs = + (self.nativeDeps."send" or []); + deps = { + "debug-2.0.0" = self.by-version."debug"."2.0.0"; + "depd-0.4.5" = self.by-version."depd"."0.4.5"; "destroy-1.0.3" = self.by-version."destroy"."1.0.3"; "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; - "fresh-0.2.2" = self.by-version."fresh"."0.2.2"; + "etag-1.4.0" = self.by-version."etag"."1.4.0"; + "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; "mime-1.2.11" = self.by-version."mime"."1.2.11"; "ms-0.6.2" = self.by-version."ms"."0.6.2"; "on-finished-2.1.0" = self.by-version."on-finished"."2.1.0"; @@ -18279,8 +25120,6 @@ ]; passthru.names = [ "send" ]; }; - by-spec."send"."0.9.3" = - self.by-version."send"."0.9.3"; by-spec."sequence"."2.2.1" = self.by-version."sequence"."2.2.1"; by-version."sequence"."2.2.1" = lib.makeOverridable self.buildNodePackage { @@ -18324,21 +25163,21 @@ passthru.names = [ "sequencify" ]; }; by-spec."serve-favicon"."~2.1.5" = - self.by-version."serve-favicon"."2.1.5"; - by-version."serve-favicon"."2.1.5" = lib.makeOverridable self.buildNodePackage { - name = "serve-favicon-2.1.5"; + self.by-version."serve-favicon"."2.1.7"; + by-version."serve-favicon"."2.1.7" = lib.makeOverridable self.buildNodePackage { + name = "serve-favicon-2.1.7"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/serve-favicon/-/serve-favicon-2.1.5.tgz"; - name = "serve-favicon-2.1.5.tgz"; - sha1 = "8eba1830890bddbbf042e8d5c6456c7d004f6175"; + url = "http://registry.npmjs.org/serve-favicon/-/serve-favicon-2.1.7.tgz"; + name = "serve-favicon-2.1.7.tgz"; + sha1 = "7b911c0ea4c0f9a2ad686daa5222766f7bc7db79"; }) ]; buildInputs = (self.nativeDeps."serve-favicon" or []); deps = { - "etag-1.4.0" = self.by-version."etag"."1.4.0"; + "etag-1.5.1" = self.by-version."etag"."1.5.1"; "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; "ms-0.6.2" = self.by-version."ms"."0.6.2"; }; @@ -18346,6 +25185,30 @@ ]; passthru.names = [ "serve-favicon" ]; }; + by-spec."serve-favicon"."~2.1.7" = + self.by-version."serve-favicon"."2.1.7"; + by-spec."serve-index"."1.0.1" = + self.by-version."serve-index"."1.0.1"; + by-version."serve-index"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "serve-index-1.0.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/serve-index/-/serve-index-1.0.1.tgz"; + name = "serve-index-1.0.1.tgz"; + sha1 = "2782ee8ede6cccaae54957962c4715e8ce1921a6"; + }) + ]; + buildInputs = + (self.nativeDeps."serve-index" or []); + deps = { + "batch-0.5.0" = self.by-version."batch"."0.5.0"; + "negotiator-0.4.2" = self.by-version."negotiator"."0.4.2"; + }; + peerDependencies = [ + ]; + passthru.names = [ "serve-index" ]; + }; by-spec."serve-index"."~1.2.1" = self.by-version."serve-index"."1.2.1"; by-version."serve-index"."1.2.1" = lib.makeOverridable self.buildNodePackage { @@ -18361,7 +25224,7 @@ buildInputs = (self.nativeDeps."serve-index" or []); deps = { - "accepts-1.1.1" = self.by-version."accepts"."1.1.1"; + "accepts-1.1.3" = self.by-version."accepts"."1.1.3"; "batch-0.5.1" = self.by-version."batch"."0.5.1"; "debug-2.0.0" = self.by-version."debug"."2.0.0"; "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; @@ -18370,6 +25233,32 @@ ]; passthru.names = [ "serve-index" ]; }; + by-spec."serve-index"."~1.5.1" = + self.by-version."serve-index"."1.5.1"; + by-version."serve-index"."1.5.1" = lib.makeOverridable self.buildNodePackage { + name = "serve-index-1.5.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/serve-index/-/serve-index-1.5.1.tgz"; + name = "serve-index-1.5.1.tgz"; + sha1 = "11e2cec8b7cdc801a8a766ebf36c1372c956e84a"; + }) + ]; + buildInputs = + (self.nativeDeps."serve-index" or []); + deps = { + "accepts-1.1.3" = self.by-version."accepts"."1.1.3"; + "batch-0.5.1" = self.by-version."batch"."0.5.1"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; + "http-errors-1.2.7" = self.by-version."http-errors"."1.2.7"; + "mime-types-2.0.3" = self.by-version."mime-types"."2.0.3"; + "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "serve-index" ]; + }; by-spec."serve-static"."1.0.1" = self.by-version."serve-static"."1.0.1"; by-version."serve-static"."1.0.1" = lib.makeOverridable self.buildNodePackage { @@ -18391,16 +25280,38 @@ ]; passthru.names = [ "serve-static" ]; }; - by-spec."serve-static"."~1.5.3" = - self.by-version."serve-static"."1.5.4"; - by-version."serve-static"."1.5.4" = lib.makeOverridable self.buildNodePackage { - name = "serve-static-1.5.4"; + by-spec."serve-static"."1.1.0" = + self.by-version."serve-static"."1.1.0"; + by-version."serve-static"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "serve-static-1.1.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/serve-static/-/serve-static-1.1.0.tgz"; + name = "serve-static-1.1.0.tgz"; + sha1 = "454dfa05bb3ddd4e701a8915b83a278aa91c5643"; + }) + ]; + buildInputs = + (self.nativeDeps."serve-static" or []); + deps = { + "parseurl-1.0.1" = self.by-version."parseurl"."1.0.1"; + "send-0.3.0" = self.by-version."send"."0.3.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "serve-static" ]; + }; + by-spec."serve-static"."~1.6.4" = + self.by-version."serve-static"."1.6.4"; + by-version."serve-static"."1.6.4" = lib.makeOverridable self.buildNodePackage { + name = "serve-static-1.6.4"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/serve-static/-/serve-static-1.5.4.tgz"; - name = "serve-static-1.5.4.tgz"; - sha1 = "819fb37ae46bd02dd520b77fcf7fd8f5112f9782"; + url = "http://registry.npmjs.org/serve-static/-/serve-static-1.6.4.tgz"; + name = "serve-static-1.6.4.tgz"; + sha1 = "c512e4188d7a9366672db24e40d294f0c6212367"; }) ]; buildInputs = @@ -18408,25 +25319,23 @@ deps = { "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; - "send-0.8.5" = self.by-version."send"."0.8.5"; + "send-0.9.3" = self.by-version."send"."0.9.3"; "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; }; peerDependencies = [ ]; passthru.names = [ "serve-static" ]; }; - by-spec."serve-static"."~1.5.4" = - self.by-version."serve-static"."1.5.4"; - by-spec."serve-static"."~1.6.3" = - self.by-version."serve-static"."1.6.3"; - by-version."serve-static"."1.6.3" = lib.makeOverridable self.buildNodePackage { - name = "serve-static-1.6.3"; + by-spec."serve-static"."~1.7.1" = + self.by-version."serve-static"."1.7.1"; + by-version."serve-static"."1.7.1" = lib.makeOverridable self.buildNodePackage { + name = "serve-static-1.7.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/serve-static/-/serve-static-1.6.3.tgz"; - name = "serve-static-1.6.3.tgz"; - sha1 = "b214235d4d4516db050ea9f7b429b46212e79132"; + url = "http://registry.npmjs.org/serve-static/-/serve-static-1.7.1.tgz"; + name = "serve-static-1.7.1.tgz"; + sha1 = "6ea54d5ba7ef563f00e5fad25d0e4f5307e9809b"; }) ]; buildInputs = @@ -18434,13 +25343,54 @@ deps = { "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; - "send-0.9.3" = self.by-version."send"."0.9.3"; + "send-0.10.1" = self.by-version."send"."0.10.1"; "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; }; peerDependencies = [ ]; passthru.names = [ "serve-static" ]; }; + by-spec."setimmediate"."1.0.1" = + self.by-version."setimmediate"."1.0.1"; + by-version."setimmediate"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "setimmediate-1.0.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/setimmediate/-/setimmediate-1.0.1.tgz"; + name = "setimmediate-1.0.1.tgz"; + sha1 = "a9ca56ccbd6a4c3334855f060abcdece5c42ebb7"; + }) + ]; + buildInputs = + (self.nativeDeps."setimmediate" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "setimmediate" ]; + }; + by-spec."sha"."~1.0.1" = + self.by-version."sha"."1.0.1"; + by-version."sha"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "sha-1.0.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/sha/-/sha-1.0.1.tgz"; + name = "sha-1.0.1.tgz"; + sha1 = "9b87a92113103e7406f7e7ef00006f3fa1975122"; + }) + ]; + buildInputs = + (self.nativeDeps."sha" or []); + deps = { + "graceful-fs-1.2.3" = self.by-version."graceful-fs"."1.2.3"; + }; + peerDependencies = [ + ]; + passthru.names = [ "sha" ]; + }; by-spec."sha"."~1.2.1" = self.by-version."sha"."1.2.4"; by-version."sha"."1.2.4" = lib.makeOverridable self.buildNodePackage { @@ -18456,23 +25406,45 @@ buildInputs = (self.nativeDeps."sha" or []); deps = { - "graceful-fs-3.0.2" = self.by-version."graceful-fs"."3.0.2"; - "readable-stream-1.0.32" = self.by-version."readable-stream"."1.0.32"; + "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; + "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; + }; + peerDependencies = [ + ]; + passthru.names = [ "sha" ]; + }; + by-spec."sha"."~1.3.0" = + self.by-version."sha"."1.3.0"; + by-version."sha"."1.3.0" = lib.makeOverridable self.buildNodePackage { + name = "sha-1.3.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/sha/-/sha-1.3.0.tgz"; + name = "sha-1.3.0.tgz"; + sha1 = "79f4787045d0ede7327d702c25c443460dbc6764"; + }) + ]; + buildInputs = + (self.nativeDeps."sha" or []); + deps = { + "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; + "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; }; peerDependencies = [ ]; passthru.names = [ "sha" ]; }; - by-spec."sha.js"."2.2.6" = - self.by-version."sha.js"."2.2.6"; - by-version."sha.js"."2.2.6" = lib.makeOverridable self.buildNodePackage { - name = "sha.js-2.2.6"; + by-spec."sha.js"."2.3.0" = + self.by-version."sha.js"."2.3.0"; + by-version."sha.js"."2.3.0" = lib.makeOverridable self.buildNodePackage { + name = "sha.js-2.3.0"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/sha.js/-/sha.js-2.2.6.tgz"; - name = "sha.js-2.2.6.tgz"; - sha1 = "17ddeddc5f722fb66501658895461977867315ba"; + url = "http://registry.npmjs.org/sha.js/-/sha.js-2.3.0.tgz"; + name = "sha.js-2.3.0.tgz"; + sha1 = "9fbcbb99583712fd44dedeffebebe5e4617baf71"; }) ]; buildInputs = @@ -18544,6 +25516,30 @@ ]; passthru.names = [ "shell-quote" ]; }; + by-spec."shell-quote"."~1.4.1" = + self.by-version."shell-quote"."1.4.2"; + by-version."shell-quote"."1.4.2" = lib.makeOverridable self.buildNodePackage { + name = "shell-quote-1.4.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/shell-quote/-/shell-quote-1.4.2.tgz"; + name = "shell-quote-1.4.2.tgz"; + sha1 = "f132a54f2030d69280d370d4974155f85f62f67b"; + }) + ]; + buildInputs = + (self.nativeDeps."shell-quote" or []); + deps = { + "jsonify-0.0.0" = self.by-version."jsonify"."0.0.0"; + "array-filter-0.0.1" = self.by-version."array-filter"."0.0.1"; + "array-reduce-0.0.0" = self.by-version."array-reduce"."0.0.0"; + "array-map-0.0.0" = self.by-version."array-map"."0.0.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "shell-quote" ]; + }; by-spec."shelljs"."*" = self.by-version."shelljs"."0.3.0"; by-version."shelljs"."0.3.0" = lib.makeOverridable self.buildNodePackage { @@ -18565,29 +25561,95 @@ passthru.names = [ "shelljs" ]; }; "shelljs" = self.by-version."shelljs"."0.3.0"; + by-spec."shelljs"."0.3.0" = + self.by-version."shelljs"."0.3.0"; by-spec."shelljs"."0.3.x" = self.by-version."shelljs"."0.3.0"; by-spec."should"."*" = - self.by-version."should"."4.0.4"; - by-version."should"."4.0.4" = lib.makeOverridable self.buildNodePackage { - name = "should-4.0.4"; + self.by-version."should"."4.3.0"; + by-version."should"."4.3.0" = lib.makeOverridable self.buildNodePackage { + name = "should-4.3.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/should/-/should-4.0.4.tgz"; - name = "should-4.0.4.tgz"; - sha1 = "8efaa304f1f148cf3d2e955862990f9ab9ea628f"; + url = "http://registry.npmjs.org/should/-/should-4.3.0.tgz"; + name = "should-4.3.0.tgz"; + sha1 = "6fd50fadf9b54134a352f2fd74657b1e97231ad6"; }) ]; buildInputs = (self.nativeDeps."should" or []); deps = { + "should-equal-0.1.0" = self.by-version."should-equal"."0.1.0"; + "should-format-0.0.2" = self.by-version."should-format"."0.0.2"; }; peerDependencies = [ ]; passthru.names = [ "should" ]; }; - "should" = self.by-version."should"."4.0.4"; + "should" = self.by-version."should"."4.3.0"; + by-spec."should-equal"."0.1.0" = + self.by-version."should-equal"."0.1.0"; + by-version."should-equal"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "should-equal-0.1.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/should-equal/-/should-equal-0.1.0.tgz"; + name = "should-equal-0.1.0.tgz"; + sha1 = "6db4a398a0d5a1a5806350b1de8cb4e964071dab"; + }) + ]; + buildInputs = + (self.nativeDeps."should-equal" or []); + deps = { + "should-type-0.0.1" = self.by-version."should-type"."0.0.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "should-equal" ]; + }; + by-spec."should-format"."0.0.2" = + self.by-version."should-format"."0.0.2"; + by-version."should-format"."0.0.2" = lib.makeOverridable self.buildNodePackage { + name = "should-format-0.0.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/should-format/-/should-format-0.0.2.tgz"; + name = "should-format-0.0.2.tgz"; + sha1 = "5c058691a1d6177f8b8fa8b8bba0b38cc05d346f"; + }) + ]; + buildInputs = + (self.nativeDeps."should-format" or []); + deps = { + "should-type-0.0.1" = self.by-version."should-type"."0.0.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "should-format" ]; + }; + by-spec."should-type"."0.0.1" = + self.by-version."should-type"."0.0.1"; + by-version."should-type"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "should-type-0.0.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/should-type/-/should-type-0.0.1.tgz"; + name = "should-type-0.0.1.tgz"; + sha1 = "ec62a4eae75cabfab3734cd9925da49773cb9be8"; + }) + ]; + buildInputs = + (self.nativeDeps."should-type" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "should-type" ]; + }; by-spec."sigmund"."~1.0.0" = self.by-version."sigmund"."1.0.0"; by-version."sigmund"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -18675,28 +25737,29 @@ passthru.names = [ "simplesmtp" ]; }; by-spec."sinon"."*" = - self.by-version."sinon"."1.10.3"; - by-version."sinon"."1.10.3" = lib.makeOverridable self.buildNodePackage { - name = "sinon-1.10.3"; + self.by-version."sinon"."1.12.1"; + by-version."sinon"."1.12.1" = lib.makeOverridable self.buildNodePackage { + name = "sinon-1.12.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/sinon/-/sinon-1.10.3.tgz"; - name = "sinon-1.10.3.tgz"; - sha1 = "c063e0e99d8327dc199113aab52eb83a2e9e3c2c"; + url = "http://registry.npmjs.org/sinon/-/sinon-1.12.1.tgz"; + name = "sinon-1.12.1.tgz"; + sha1 = "c51a7d083e9992854bb99519faf5c25c9a04009a"; }) ]; buildInputs = (self.nativeDeps."sinon" or []); deps = { - "formatio-1.0.2" = self.by-version."formatio"."1.0.2"; + "formatio-1.1.1" = self.by-version."formatio"."1.1.1"; "util-0.10.3" = self.by-version."util"."0.10.3"; + "lolex-1.1.0" = self.by-version."lolex"."1.1.0"; }; peerDependencies = [ ]; passthru.names = [ "sinon" ]; }; - "sinon" = self.by-version."sinon"."1.10.3"; + "sinon" = self.by-version."sinon"."1.12.1"; by-spec."slasp"."*" = self.by-version."slasp"."0.0.4"; by-version."slasp"."0.0.4" = lib.makeOverridable self.buildNodePackage { @@ -18804,8 +25867,37 @@ self.by-version."slide"."1.1.6"; by-spec."slide"."~1.1.3" = self.by-version."slide"."1.1.6"; + by-spec."slide"."~1.1.4" = + self.by-version."slide"."1.1.6"; + by-spec."slide"."~1.1.5" = + self.by-version."slide"."1.1.6"; by-spec."slide"."~1.1.6" = self.by-version."slide"."1.1.6"; + by-spec."sloc"."*" = + self.by-version."sloc"."0.1.7"; + by-version."sloc"."0.1.7" = lib.makeOverridable self.buildNodePackage { + name = "sloc-0.1.7"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/sloc/-/sloc-0.1.7.tgz"; + name = "sloc-0.1.7.tgz"; + sha1 = "57dee8c946d54cea5188b70cd6549a22e0615679"; + }) + ]; + buildInputs = + (self.nativeDeps."sloc" or []); + deps = { + "commander-2.3.0" = self.by-version."commander"."2.3.0"; + "async-0.9.0" = self.by-version."async"."0.9.0"; + "cli-table-0.3.1" = self.by-version."cli-table"."0.3.1"; + "readdirp-1.1.0" = self.by-version."readdirp"."1.1.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "sloc" ]; + }; + "sloc" = self.by-version."sloc"."0.1.7"; by-spec."smartdc"."*" = self.by-version."smartdc"."7.3.0"; by-version."smartdc"."7.3.0" = lib.makeOverridable self.buildNodePackage { @@ -18954,6 +26046,8 @@ }; by-spec."socket.io"."~0.9.16" = self.by-version."socket.io"."0.9.17"; + by-spec."socket.io"."~0.9.17" = + self.by-version."socket.io"."0.9.17"; by-spec."socket.io-client"."0.9.11" = self.by-version."socket.io-client"."0.9.11"; by-version."socket.io-client"."0.9.11" = lib.makeOverridable self.buildNodePackage { @@ -19003,28 +26097,28 @@ passthru.names = [ "socket.io-client" ]; }; by-spec."sockjs"."*" = - self.by-version."sockjs"."0.3.9"; - by-version."sockjs"."0.3.9" = lib.makeOverridable self.buildNodePackage { - name = "sockjs-0.3.9"; + self.by-version."sockjs"."0.3.11"; + by-version."sockjs"."0.3.11" = lib.makeOverridable self.buildNodePackage { + name = "sockjs-0.3.11"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/sockjs/-/sockjs-0.3.9.tgz"; - name = "sockjs-0.3.9.tgz"; - sha1 = "5ae2c732dac07f6d7e9e8a9a60ec86ec4fc3ffc7"; + url = "http://registry.npmjs.org/sockjs/-/sockjs-0.3.11.tgz"; + name = "sockjs-0.3.11.tgz"; + sha1 = "936d84d00f5bfce82f939aec9a7e1c9b8b39fb17"; }) ]; buildInputs = (self.nativeDeps."sockjs" or []); deps = { - "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3"; - "faye-websocket-0.7.2" = self.by-version."faye-websocket"."0.7.2"; + "faye-websocket-0.8.1" = self.by-version."faye-websocket"."0.8.1"; + "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; }; peerDependencies = [ ]; passthru.names = [ "sockjs" ]; }; - "sockjs" = self.by-version."sockjs"."0.3.9"; + "sockjs" = self.by-version."sockjs"."0.3.11"; by-spec."sorted-object"."~1.0.0" = self.by-version."sorted-object"."1.0.0"; by-version."sorted-object"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -19067,27 +26161,6 @@ passthru.names = [ "source-map" ]; }; "source-map" = self.by-version."source-map"."0.1.40"; - by-spec."source-map"."0.1.11" = - self.by-version."source-map"."0.1.11"; - by-version."source-map"."0.1.11" = lib.makeOverridable self.buildNodePackage { - name = "source-map-0.1.11"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/source-map/-/source-map-0.1.11.tgz"; - name = "source-map-0.1.11.tgz"; - sha1 = "2eef2fd65a74c179880ae5ee6975d99ce21eb7b4"; - }) - ]; - buildInputs = - (self.nativeDeps."source-map" or []); - deps = { - "amdefine-0.1.0" = self.by-version."amdefine"."0.1.0"; - }; - peerDependencies = [ - ]; - passthru.names = [ "source-map" ]; - }; by-spec."source-map"."0.1.31" = self.by-version."source-map"."0.1.31"; by-version."source-map"."0.1.31" = lib.makeOverridable self.buildNodePackage { @@ -19134,7 +26207,7 @@ self.by-version."source-map"."0.1.40"; by-spec."source-map".">= 0.1.2" = self.by-version."source-map"."0.1.40"; - by-spec."source-map"."~ 0.1.8" = + by-spec."source-map"."^0.1.x" = self.by-version."source-map"."0.1.40"; by-spec."source-map"."~0.1.30" = self.by-version."source-map"."0.1.40"; @@ -19142,6 +26215,8 @@ self.by-version."source-map"."0.1.40"; by-spec."source-map"."~0.1.33" = self.by-version."source-map"."0.1.40"; + by-spec."source-map"."~0.1.37" = + self.by-version."source-map"."0.1.40"; by-spec."source-map"."~0.1.7" = self.by-version."source-map"."0.1.40"; by-spec."spdy"."1.7.1" = @@ -19164,6 +26239,26 @@ ]; passthru.names = [ "spdy" ]; }; + by-spec."speedometer"."^0.1.2" = + self.by-version."speedometer"."0.1.3"; + by-version."speedometer"."0.1.3" = lib.makeOverridable self.buildNodePackage { + name = "speedometer-0.1.3"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/speedometer/-/speedometer-0.1.3.tgz"; + name = "speedometer-0.1.3.tgz"; + sha1 = "90a4540e5efe50811b43f6308235c23555262047"; + }) + ]; + buildInputs = + (self.nativeDeps."speedometer" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "speedometer" ]; + }; by-spec."sprintf"."~0.1.2" = self.by-version."sprintf"."0.1.4"; by-version."sprintf"."0.1.4" = lib.makeOverridable self.buildNodePackage { @@ -19251,15 +26346,15 @@ passthru.names = [ "stack-trace" ]; }; by-spec."stackdriver-statsd-backend"."*" = - self.by-version."stackdriver-statsd-backend"."0.2.2"; - by-version."stackdriver-statsd-backend"."0.2.2" = lib.makeOverridable self.buildNodePackage { - name = "stackdriver-statsd-backend-0.2.2"; + self.by-version."stackdriver-statsd-backend"."0.2.3"; + by-version."stackdriver-statsd-backend"."0.2.3" = lib.makeOverridable self.buildNodePackage { + name = "stackdriver-statsd-backend-0.2.3"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/stackdriver-statsd-backend/-/stackdriver-statsd-backend-0.2.2.tgz"; - name = "stackdriver-statsd-backend-0.2.2.tgz"; - sha1 = "15bdc95adf083cfbfa20d7ff8f67277d7eba38f8"; + url = "http://registry.npmjs.org/stackdriver-statsd-backend/-/stackdriver-statsd-backend-0.2.3.tgz"; + name = "stackdriver-statsd-backend-0.2.3.tgz"; + sha1 = "6ffead71e5655d4d787c39da8d1c9eaaa59c91d7"; }) ]; buildInputs = @@ -19270,7 +26365,27 @@ ]; passthru.names = [ "stackdriver-statsd-backend" ]; }; - "stackdriver-statsd-backend" = self.by-version."stackdriver-statsd-backend"."0.2.2"; + "stackdriver-statsd-backend" = self.by-version."stackdriver-statsd-backend"."0.2.3"; + by-spec."static-favicon"."1.0.2" = + self.by-version."static-favicon"."1.0.2"; + by-version."static-favicon"."1.0.2" = lib.makeOverridable self.buildNodePackage { + name = "static-favicon-1.0.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/static-favicon/-/static-favicon-1.0.2.tgz"; + name = "static-favicon-1.0.2.tgz"; + sha1 = "7c15920dda2bf33f414b0e60aebbd65cdd2a1d2f"; + }) + ]; + buildInputs = + (self.nativeDeps."static-favicon" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "static-favicon" ]; + }; by-spec."statsd"."*" = self.by-version."statsd"."0.7.2"; by-version."statsd"."0.7.2" = lib.makeOverridable self.buildNodePackage { @@ -19337,6 +26452,26 @@ passthru.names = [ "statsd-librato-backend" ]; }; "statsd-librato-backend" = self.by-version."statsd-librato-backend"."0.1.3"; + by-spec."statuses"."1" = + self.by-version."statuses"."1.2.0"; + by-version."statuses"."1.2.0" = lib.makeOverridable self.buildNodePackage { + name = "statuses-1.2.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/statuses/-/statuses-1.2.0.tgz"; + name = "statuses-1.2.0.tgz"; + sha1 = "4445790d65bec29184f50d54810f67e290c1679e"; + }) + ]; + buildInputs = + (self.nativeDeps."statuses" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "statuses" ]; + }; by-spec."stream-browserify"."^1.0.0" = self.by-version."stream-browserify"."1.0.0"; by-version."stream-browserify"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -19359,6 +26494,28 @@ ]; passthru.names = [ "stream-browserify" ]; }; + by-spec."stream-browserify"."~0.1.0" = + self.by-version."stream-browserify"."0.1.3"; + by-version."stream-browserify"."0.1.3" = lib.makeOverridable self.buildNodePackage { + name = "stream-browserify-0.1.3"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/stream-browserify/-/stream-browserify-0.1.3.tgz"; + name = "stream-browserify-0.1.3.tgz"; + sha1 = "95cf1b369772e27adaf46352265152689c6c4be9"; + }) + ]; + buildInputs = + (self.nativeDeps."stream-browserify" or []); + deps = { + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + "process-0.5.2" = self.by-version."process"."0.5.2"; + }; + peerDependencies = [ + ]; + passthru.names = [ "stream-browserify" ]; + }; by-spec."stream-combiner"."~0.0.2" = self.by-version."stream-combiner"."0.0.4"; by-version."stream-combiner"."0.0.4" = lib.makeOverridable self.buildNodePackage { @@ -19531,6 +26688,49 @@ ]; passthru.names = [ "string" ]; }; + by-spec."string-length"."^0.1.2" = + self.by-version."string-length"."0.1.2"; + by-version."string-length"."0.1.2" = lib.makeOverridable self.buildNodePackage { + name = "string-length-0.1.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/string-length/-/string-length-0.1.2.tgz"; + name = "string-length-0.1.2.tgz"; + sha1 = "ab04bb33867ee74beed7fb89bb7f089d392780f2"; + }) + ]; + buildInputs = + (self.nativeDeps."string-length" or []); + deps = { + "strip-ansi-0.2.2" = self.by-version."strip-ansi"."0.2.2"; + }; + peerDependencies = [ + ]; + passthru.names = [ "string-length" ]; + }; + by-spec."string2compact"."^1.1.1" = + self.by-version."string2compact"."1.2.0"; + by-version."string2compact"."1.2.0" = lib.makeOverridable self.buildNodePackage { + name = "string2compact-1.2.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/string2compact/-/string2compact-1.2.0.tgz"; + name = "string2compact-1.2.0.tgz"; + sha1 = "ecf1fcd84c9f8fc0562f818b06422f60f588b01e"; + }) + ]; + buildInputs = + (self.nativeDeps."string2compact" or []); + deps = { + "addr-to-ip-port-1.4.0" = self.by-version."addr-to-ip-port"."1.4.0"; + "ipaddr.js-0.1.6" = self.by-version."ipaddr.js"."0.1.6"; + }; + peerDependencies = [ + ]; + passthru.names = [ "string2compact" ]; + }; by-spec."string_decoder"."~0.0.0" = self.by-version."string_decoder"."0.0.1"; by-version."string_decoder"."0.0.1" = lib.makeOverridable self.buildNodePackage { @@ -19551,7 +26751,7 @@ ]; passthru.names = [ "string_decoder" ]; }; - by-spec."string_decoder"."~0.10.x" = + by-spec."string_decoder"."~0.10.0" = self.by-version."string_decoder"."0.10.31"; by-version."string_decoder"."0.10.31" = lib.makeOverridable self.buildNodePackage { name = "string_decoder-0.10.31"; @@ -19571,6 +26771,28 @@ ]; passthru.names = [ "string_decoder" ]; }; + by-spec."string_decoder"."~0.10.x" = + self.by-version."string_decoder"."0.10.31"; + by-spec."stringify-object"."~1.0.0" = + self.by-version."stringify-object"."1.0.0"; + by-version."stringify-object"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "stringify-object-1.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/stringify-object/-/stringify-object-1.0.0.tgz"; + name = "stringify-object-1.0.0.tgz"; + sha1 = "333875ef8fd210f696d70b374146be84646bc346"; + }) + ]; + buildInputs = + (self.nativeDeps."stringify-object" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "stringify-object" ]; + }; by-spec."stringstream"."~0.0.4" = self.by-version."stringstream"."0.0.4"; by-version."stringstream"."0.0.4" = lib.makeOverridable self.buildNodePackage { @@ -19591,6 +26813,27 @@ ]; passthru.names = [ "stringstream" ]; }; + by-spec."strip-ansi"."^0.2.1" = + self.by-version."strip-ansi"."0.2.2"; + by-version."strip-ansi"."0.2.2" = lib.makeOverridable self.buildNodePackage { + name = "strip-ansi-0.2.2"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-0.2.2.tgz"; + name = "strip-ansi-0.2.2.tgz"; + sha1 = "854d290c981525fc8c397a910b025ae2d54ffc08"; + }) + ]; + buildInputs = + (self.nativeDeps."strip-ansi" or []); + deps = { + "ansi-regex-0.1.0" = self.by-version."ansi-regex"."0.1.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "strip-ansi" ]; + }; by-spec."strip-ansi"."^0.3.0" = self.by-version."strip-ansi"."0.3.0"; by-version."strip-ansi"."0.3.0" = lib.makeOverridable self.buildNodePackage { @@ -19696,15 +26939,15 @@ passthru.names = [ "strip-json-comments" ]; }; by-spec."strip-json-comments"."1.0.x" = - self.by-version."strip-json-comments"."1.0.1"; - by-version."strip-json-comments"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "strip-json-comments-1.0.1"; + self.by-version."strip-json-comments"."1.0.2"; + by-version."strip-json-comments"."1.0.2" = lib.makeOverridable self.buildNodePackage { + name = "strip-json-comments-1.0.2"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.1.tgz"; - name = "strip-json-comments-1.0.1.tgz"; - sha1 = "a91252d95ddee4ff38a66135cd6c78de5709f374"; + url = "http://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.2.tgz"; + name = "strip-json-comments-1.0.2.tgz"; + sha1 = "5a48ab96023dbac1b7b8d0ffabf6f63f1677be9f"; }) ]; buildInputs = @@ -19730,22 +26973,22 @@ buildInputs = (self.nativeDeps."strong-data-uri" or []); deps = { - "truncate-1.0.2" = self.by-version."truncate"."1.0.2"; + "truncate-1.0.4" = self.by-version."truncate"."1.0.4"; }; peerDependencies = [ ]; passthru.names = [ "strong-data-uri" ]; }; by-spec."stylus"."*" = - self.by-version."stylus"."0.49.1"; - by-version."stylus"."0.49.1" = lib.makeOverridable self.buildNodePackage { - name = "stylus-0.49.1"; + self.by-version."stylus"."0.49.3"; + by-version."stylus"."0.49.3" = lib.makeOverridable self.buildNodePackage { + name = "stylus-0.49.3"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/stylus/-/stylus-0.49.1.tgz"; - name = "stylus-0.49.1.tgz"; - sha1 = "c915495675ca77847a7d4285dd6d6572bae34448"; + url = "http://registry.npmjs.org/stylus/-/stylus-0.49.3.tgz"; + name = "stylus-0.49.3.tgz"; + sha1 = "1fbdabe479ed460872c71a6252a67f95040ba511"; }) ]; buildInputs = @@ -19753,7 +26996,7 @@ deps = { "css-parse-1.7.0" = self.by-version."css-parse"."1.7.0"; "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; - "debug-2.0.0" = self.by-version."debug"."2.0.0"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; "sax-0.5.8" = self.by-version."sax"."0.5.8"; "glob-3.2.11" = self.by-version."glob"."3.2.11"; "source-map-0.1.40" = self.by-version."source-map"."0.1.40"; @@ -19762,7 +27005,7 @@ ]; passthru.names = [ "stylus" ]; }; - "stylus" = self.by-version."stylus"."0.49.1"; + "stylus" = self.by-version."stylus"."0.49.3"; by-spec."stylus"."0.42.2" = self.by-version."stylus"."0.42.2"; by-version."stylus"."0.42.2" = lib.makeOverridable self.buildNodePackage { @@ -19780,7 +27023,7 @@ deps = { "css-parse-1.7.0" = self.by-version."css-parse"."1.7.0"; "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; - "debug-2.0.0" = self.by-version."debug"."2.0.0"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; "sax-0.5.8" = self.by-version."sax"."0.5.8"; "glob-3.2.11" = self.by-version."glob"."3.2.11"; }; @@ -19788,106 +27031,95 @@ ]; passthru.names = [ "stylus" ]; }; - by-spec."subarg"."0.0.1" = - self.by-version."subarg"."0.0.1"; - by-version."subarg"."0.0.1" = lib.makeOverridable self.buildNodePackage { - name = "subarg-0.0.1"; - bin = false; + by-spec."stylus"."0.45.x" = + self.by-version."stylus"."0.45.1"; + by-version."stylus"."0.45.1" = lib.makeOverridable self.buildNodePackage { + name = "stylus-0.45.1"; + bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/subarg/-/subarg-0.0.1.tgz"; - name = "subarg-0.0.1.tgz"; - sha1 = "3d56b07dacfbc45bbb63f7672b43b63e46368e3a"; + url = "http://registry.npmjs.org/stylus/-/stylus-0.45.1.tgz"; + name = "stylus-0.45.1.tgz"; + sha1 = "ef69f62c984a480adc0c9d4aaafb2382a389e453"; }) ]; buildInputs = - (self.nativeDeps."subarg" or []); + (self.nativeDeps."stylus" or []); deps = { - "minimist-0.0.10" = self.by-version."minimist"."0.0.10"; + "css-parse-1.7.0" = self.by-version."css-parse"."1.7.0"; + "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; + "sax-0.5.8" = self.by-version."sax"."0.5.8"; + "glob-3.2.11" = self.by-version."glob"."3.2.11"; }; peerDependencies = [ ]; - passthru.names = [ "subarg" ]; + passthru.names = [ "stylus" ]; }; - by-spec."superagent"."0.19.0" = - self.by-version."superagent"."0.19.0"; - by-version."superagent"."0.19.0" = lib.makeOverridable self.buildNodePackage { - name = "superagent-0.19.0"; + by-spec."subarg"."0.0.1" = + self.by-version."subarg"."0.0.1"; + by-version."subarg"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "subarg-0.0.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/superagent/-/superagent-0.19.0.tgz"; - name = "superagent-0.19.0.tgz"; - sha1 = "e3f0fe5c07a429779a4e201c3e7b15b6577e4fbb"; + url = "http://registry.npmjs.org/subarg/-/subarg-0.0.1.tgz"; + name = "subarg-0.0.1.tgz"; + sha1 = "3d56b07dacfbc45bbb63f7672b43b63e46368e3a"; }) ]; buildInputs = - (self.nativeDeps."superagent" or []); + (self.nativeDeps."subarg" or []); deps = { - "qs-1.2.0" = self.by-version."qs"."1.2.0"; - "formidable-1.0.14" = self.by-version."formidable"."1.0.14"; - "mime-1.2.11" = self.by-version."mime"."1.2.11"; - "component-emitter-1.1.2" = self.by-version."component-emitter"."1.1.2"; - "methods-1.0.1" = self.by-version."methods"."1.0.1"; - "cookiejar-2.0.1" = self.by-version."cookiejar"."2.0.1"; - "debug-1.0.4" = self.by-version."debug"."1.0.4"; - "reduce-component-1.0.1" = self.by-version."reduce-component"."1.0.1"; - "extend-1.2.1" = self.by-version."extend"."1.2.1"; - "form-data-0.1.3" = self.by-version."form-data"."0.1.3"; - "readable-stream-1.0.27-1" = self.by-version."readable-stream"."1.0.27-1"; + "minimist-0.0.10" = self.by-version."minimist"."0.0.10"; }; peerDependencies = [ ]; - passthru.names = [ "superagent" ]; + passthru.names = [ "subarg" ]; }; - by-spec."superagent"."~0.13.0" = - self.by-version."superagent"."0.13.0"; - by-version."superagent"."0.13.0" = lib.makeOverridable self.buildNodePackage { - name = "superagent-0.13.0"; + by-spec."subarg"."^1.0.0" = + self.by-version."subarg"."1.0.0"; + by-version."subarg"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "subarg-1.0.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/superagent/-/superagent-0.13.0.tgz"; - name = "superagent-0.13.0.tgz"; - sha1 = "ddfbfa5c26f16790f9c5bce42815ccbde2ca36f2"; + url = "http://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz"; + name = "subarg-1.0.0.tgz"; + sha1 = "f62cf17581e996b48fc965699f54c06ae268b8d2"; }) ]; buildInputs = - (self.nativeDeps."superagent" or []); + (self.nativeDeps."subarg" or []); deps = { - "qs-0.5.2" = self.by-version."qs"."0.5.2"; - "formidable-1.0.9" = self.by-version."formidable"."1.0.9"; - "mime-1.2.5" = self.by-version."mime"."1.2.5"; - "emitter-component-0.0.6" = self.by-version."emitter-component"."0.0.6"; - "methods-0.0.1" = self.by-version."methods"."0.0.1"; - "cookiejar-1.3.0" = self.by-version."cookiejar"."1.3.0"; + "minimist-1.1.0" = self.by-version."minimist"."1.1.0"; }; peerDependencies = [ ]; - passthru.names = [ "superagent" ]; + passthru.names = [ "subarg" ]; }; - by-spec."superagent"."~0.18.2" = - self.by-version."superagent"."0.18.2"; - by-version."superagent"."0.18.2" = lib.makeOverridable self.buildNodePackage { - name = "superagent-0.18.2"; + by-spec."superagent"."~0.21.0" = + self.by-version."superagent"."0.21.0"; + by-version."superagent"."0.21.0" = lib.makeOverridable self.buildNodePackage { + name = "superagent-0.21.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/superagent/-/superagent-0.18.2.tgz"; - name = "superagent-0.18.2.tgz"; - sha1 = "9afc6276a9475f4bdcd535ac6a0685ebc4b560eb"; + url = "http://registry.npmjs.org/superagent/-/superagent-0.21.0.tgz"; + name = "superagent-0.21.0.tgz"; + sha1 = "fb15027984751ee7152200e6cd21cd6e19a5de87"; }) ]; buildInputs = (self.nativeDeps."superagent" or []); deps = { - "qs-0.6.6" = self.by-version."qs"."0.6.6"; + "qs-1.2.0" = self.by-version."qs"."1.2.0"; "formidable-1.0.14" = self.by-version."formidable"."1.0.14"; "mime-1.2.11" = self.by-version."mime"."1.2.11"; "component-emitter-1.1.2" = self.by-version."component-emitter"."1.1.2"; "methods-1.0.1" = self.by-version."methods"."1.0.1"; "cookiejar-2.0.1" = self.by-version."cookiejar"."2.0.1"; - "debug-1.0.4" = self.by-version."debug"."1.0.4"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; "reduce-component-1.0.1" = self.by-version."reduce-component"."1.0.1"; "extend-1.2.1" = self.by-version."extend"."1.2.1"; "form-data-0.1.3" = self.by-version."form-data"."0.1.3"; @@ -19898,28 +27130,28 @@ passthru.names = [ "superagent" ]; }; by-spec."supertest"."*" = - self.by-version."supertest"."0.14.0"; - by-version."supertest"."0.14.0" = lib.makeOverridable self.buildNodePackage { - name = "supertest-0.14.0"; + self.by-version."supertest"."0.15.0"; + by-version."supertest"."0.15.0" = lib.makeOverridable self.buildNodePackage { + name = "supertest-0.15.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/supertest/-/supertest-0.14.0.tgz"; - name = "supertest-0.14.0.tgz"; - sha1 = "d385a8ebced95350de8bde26460d848917dee305"; + url = "http://registry.npmjs.org/supertest/-/supertest-0.15.0.tgz"; + name = "supertest-0.15.0.tgz"; + sha1 = "86118695de4be58869b3ee94c45e1d084ca7fac5"; }) ]; buildInputs = (self.nativeDeps."supertest" or []); deps = { - "superagent-0.19.0" = self.by-version."superagent"."0.19.0"; + "superagent-0.21.0" = self.by-version."superagent"."0.21.0"; "methods-1.1.0" = self.by-version."methods"."1.1.0"; }; peerDependencies = [ ]; passthru.names = [ "supertest" ]; }; - "supertest" = self.by-version."supertest"."0.14.0"; + "supertest" = self.by-version."supertest"."0.15.0"; by-spec."supports-color"."^0.2.0" = self.by-version."supports-color"."0.2.0"; by-version."supports-color"."0.2.0" = lib.makeOverridable self.buildNodePackage { @@ -19985,26 +27217,70 @@ by-spec."sylvester".">= 0.0.8" = self.by-version."sylvester"."0.0.21"; by-spec."syntax-error"."^1.1.1" = - self.by-version."syntax-error"."1.1.1"; - by-version."syntax-error"."1.1.1" = lib.makeOverridable self.buildNodePackage { - name = "syntax-error-1.1.1"; + self.by-version."syntax-error"."1.1.2"; + by-version."syntax-error"."1.1.2" = lib.makeOverridable self.buildNodePackage { + name = "syntax-error-1.1.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/syntax-error/-/syntax-error-1.1.1.tgz"; - name = "syntax-error-1.1.1.tgz"; - sha1 = "50a4f836356f3803a8e954ce5dfd4a0f95ba6a87"; + url = "http://registry.npmjs.org/syntax-error/-/syntax-error-1.1.2.tgz"; + name = "syntax-error-1.1.2.tgz"; + sha1 = "660f025b170b7eb944efc2a889d451312bcef451"; }) ]; buildInputs = (self.nativeDeps."syntax-error" or []); deps = { - "esprima-fb-3001.1.0-dev-harmony-fb" = self.by-version."esprima-fb"."3001.1.0-dev-harmony-fb"; + "acorn-0.9.0" = self.by-version."acorn"."0.9.0"; }; peerDependencies = [ ]; passthru.names = [ "syntax-error" ]; }; + by-spec."syntax-error"."~0.0.0" = + self.by-version."syntax-error"."0.0.1"; + by-version."syntax-error"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "syntax-error-0.0.1"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/syntax-error/-/syntax-error-0.0.1.tgz"; + name = "syntax-error-0.0.1.tgz"; + sha1 = "019d075348cd8c5b79f0603c73e53891a7c5235d"; + }) + ]; + buildInputs = + (self.nativeDeps."syntax-error" or []); + deps = { + "esprima-0.9.9" = self.by-version."esprima"."0.9.9"; + }; + peerDependencies = [ + ]; + passthru.names = [ "syntax-error" ]; + }; + by-spec."syntax-error"."~0.1.0" = + self.by-version."syntax-error"."0.1.0"; + by-version."syntax-error"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "syntax-error-0.1.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/syntax-error/-/syntax-error-0.1.0.tgz"; + name = "syntax-error-0.1.0.tgz"; + sha1 = "8cb515e730fe4f19d3a887035f8630e6494aac65"; + }) + ]; + buildInputs = + (self.nativeDeps."syntax-error" or []); + deps = { + "esprima-six-0.0.3" = self.by-version."esprima-six"."0.0.3"; + }; + peerDependencies = [ + ]; + passthru.names = [ "syntax-error" ]; + }; + by-spec."syntax-error"."~1.1.0" = + self.by-version."syntax-error"."1.1.2"; by-spec."tabtab"."git+https://github.com/mixu/node-tabtab.git" = self.by-version."tabtab"."0.0.2"; by-version."tabtab"."0.0.2" = lib.makeOverridable self.buildNodePackage { @@ -20049,29 +27325,52 @@ passthru.names = [ "tape" ]; }; by-spec."tar"."*" = - self.by-version."tar"."1.0.1"; - by-version."tar"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "tar-1.0.1"; + self.by-version."tar"."1.0.3"; + by-version."tar"."1.0.3" = lib.makeOverridable self.buildNodePackage { + name = "tar-1.0.3"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/tar/-/tar-1.0.1.tgz"; - name = "tar-1.0.1.tgz"; - sha1 = "6075b5a1f236defe0c7e3756d3d9b3ebdad0f19a"; + url = "http://registry.npmjs.org/tar/-/tar-1.0.3.tgz"; + name = "tar-1.0.3.tgz"; + sha1 = "15bcdab244fa4add44e4244a0176edb8aa9a2b44"; }) ]; buildInputs = (self.nativeDeps."tar" or []); deps = { "block-stream-0.0.7" = self.by-version."block-stream"."0.0.7"; - "fstream-1.0.2" = self.by-version."fstream"."1.0.2"; + "fstream-1.0.3" = self.by-version."fstream"."1.0.3"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "tar" ]; + }; + "tar" = self.by-version."tar"."1.0.3"; + by-spec."tar"."0" = + self.by-version."tar"."0.1.20"; + by-version."tar"."0.1.20" = lib.makeOverridable self.buildNodePackage { + name = "tar-0.1.20"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/tar/-/tar-0.1.20.tgz"; + name = "tar-0.1.20.tgz"; + sha1 = "42940bae5b5f22c74483699126f9f3f27449cb13"; + }) + ]; + buildInputs = + (self.nativeDeps."tar" or []); + deps = { + "block-stream-0.0.7" = self.by-version."block-stream"."0.0.7"; + "fstream-0.1.31" = self.by-version."fstream"."0.1.31"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; }; peerDependencies = [ ]; passthru.names = [ "tar" ]; }; - "tar" = self.by-version."tar"."1.0.1"; by-spec."tar"."0.1.17" = self.by-version."tar"."0.1.17"; by-version."tar"."0.1.17" = lib.makeOverridable self.buildNodePackage { @@ -20095,11 +27394,61 @@ ]; passthru.names = [ "tar" ]; }; + by-spec."tar"."1.0.2" = + self.by-version."tar"."1.0.2"; + by-version."tar"."1.0.2" = lib.makeOverridable self.buildNodePackage { + name = "tar-1.0.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/tar/-/tar-1.0.2.tgz"; + name = "tar-1.0.2.tgz"; + sha1 = "8b0f6740f9946259de26a3ed9c9a22890dff023f"; + }) + ]; + buildInputs = + (self.nativeDeps."tar" or []); + deps = { + "block-stream-0.0.7" = self.by-version."block-stream"."0.0.7"; + "fstream-1.0.3" = self.by-version."fstream"."1.0.3"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "tar" ]; + }; by-spec."tar"."^1.0.0" = - self.by-version."tar"."1.0.1"; - by-spec."tar"."~1.0.1" = - self.by-version."tar"."1.0.1"; - by-spec."tar-stream"."~0.4.0" = + self.by-version."tar"."1.0.3"; + by-spec."tar"."~0.1.17" = + self.by-version."tar"."0.1.20"; + by-spec."tar"."~0.1.19" = + self.by-version."tar"."0.1.20"; + by-spec."tar"."~1.0.3" = + self.by-version."tar"."1.0.3"; + by-spec."tar-fs"."0.5.2" = + self.by-version."tar-fs"."0.5.2"; + by-version."tar-fs"."0.5.2" = lib.makeOverridable self.buildNodePackage { + name = "tar-fs-0.5.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/tar-fs/-/tar-fs-0.5.2.tgz"; + name = "tar-fs-0.5.2.tgz"; + sha1 = "0f59424be7eeee45232316e302f66d3f6ea6db3e"; + }) + ]; + buildInputs = + (self.nativeDeps."tar-fs" or []); + deps = { + "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; + "pump-0.3.5" = self.by-version."pump"."0.3.5"; + "tar-stream-0.4.7" = self.by-version."tar-stream"."0.4.7"; + }; + peerDependencies = [ + ]; + passthru.names = [ "tar-fs" ]; + }; + by-spec."tar-stream"."^0.4.6" = self.by-version."tar-stream"."0.4.7"; by-version."tar-stream"."0.4.7" = lib.makeOverridable self.buildNodePackage { name = "tar-stream-0.4.7"; @@ -20123,6 +27472,30 @@ ]; passthru.names = [ "tar-stream" ]; }; + by-spec."tar-stream"."~1.0.0" = + self.by-version."tar-stream"."1.0.2"; + by-version."tar-stream"."1.0.2" = lib.makeOverridable self.buildNodePackage { + name = "tar-stream-1.0.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/tar-stream/-/tar-stream-1.0.2.tgz"; + name = "tar-stream-1.0.2.tgz"; + sha1 = "fd19b4a17900fa704f6a133e3045aead0562ab95"; + }) + ]; + buildInputs = + (self.nativeDeps."tar-stream" or []); + deps = { + "bl-0.9.3" = self.by-version."bl"."0.9.3"; + "end-of-stream-1.1.0" = self.by-version."end-of-stream"."1.1.0"; + "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; + "xtend-4.0.0" = self.by-version."xtend"."4.0.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "tar-stream" ]; + }; by-spec."temp"."*" = self.by-version."temp"."0.8.1"; by-version."temp"."0.8.1" = lib.makeOverridable self.buildNodePackage { @@ -20191,6 +27564,26 @@ ]; passthru.names = [ "text-table" ]; }; + by-spec."thirty-two"."~0.0.1" = + self.by-version."thirty-two"."0.0.2"; + by-version."thirty-two"."0.0.2" = lib.makeOverridable self.buildNodePackage { + name = "thirty-two-0.0.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/thirty-two/-/thirty-two-0.0.2.tgz"; + name = "thirty-two-0.0.2.tgz"; + sha1 = "4253e29d8cb058f0480267c5698c0e4927e54b6a"; + }) + ]; + buildInputs = + (self.nativeDeps."thirty-two" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "thirty-two" ]; + }; by-spec."throttleit"."~0.0.2" = self.by-version."throttleit"."0.0.2"; by-version."throttleit"."0.0.2" = lib.makeOverridable self.buildNodePackage { @@ -20211,6 +27604,26 @@ ]; passthru.names = [ "throttleit" ]; }; + by-spec."through"."2.3.4" = + self.by-version."through"."2.3.4"; + by-version."through"."2.3.4" = lib.makeOverridable self.buildNodePackage { + name = "through-2.3.4"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/through/-/through-2.3.4.tgz"; + name = "through-2.3.4.tgz"; + sha1 = "495e40e8d8a8eaebc7c275ea88c2b8fc14c56455"; + }) + ]; + buildInputs = + (self.nativeDeps."through" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "through" ]; + }; by-spec."through".">=2.2.7 <3" = self.by-version."through"."2.3.6"; by-version."through"."2.3.6" = lib.makeOverridable self.buildNodePackage { @@ -20231,6 +27644,28 @@ ]; passthru.names = [ "through" ]; }; + by-spec."through"."~2.2.0" = + self.by-version."through"."2.2.7"; + by-version."through"."2.2.7" = lib.makeOverridable self.buildNodePackage { + name = "through-2.2.7"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/through/-/through-2.2.7.tgz"; + name = "through-2.2.7.tgz"; + sha1 = "6e8e21200191d4eb6a99f6f010df46aa1c6eb2bd"; + }) + ]; + buildInputs = + (self.nativeDeps."through" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "through" ]; + }; + by-spec."through"."~2.2.7" = + self.by-version."through"."2.2.7"; by-spec."through"."~2.3.4" = self.by-version."through"."2.3.6"; by-spec."through2"."^0.5.1" = @@ -20248,7 +27683,7 @@ buildInputs = (self.nativeDeps."through2" or []); deps = { - "readable-stream-1.0.32" = self.by-version."readable-stream"."1.0.32"; + "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; "xtend-3.0.0" = self.by-version."xtend"."3.0.0"; }; peerDependencies = [ @@ -20256,21 +27691,21 @@ passthru.names = [ "through2" ]; }; by-spec."through2"."^0.6.1" = - self.by-version."through2"."0.6.2"; - by-version."through2"."0.6.2" = lib.makeOverridable self.buildNodePackage { - name = "through2-0.6.2"; + self.by-version."through2"."0.6.3"; + by-version."through2"."0.6.3" = lib.makeOverridable self.buildNodePackage { + name = "through2-0.6.3"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/through2/-/through2-0.6.2.tgz"; - name = "through2-0.6.2.tgz"; - sha1 = "53265824c555e7fcdc4111dcdc52c7de64636c75"; + url = "http://registry.npmjs.org/through2/-/through2-0.6.3.tgz"; + name = "through2-0.6.3.tgz"; + sha1 = "795292fde9f254c2a368b38f9cc5d1bd4663afb6"; }) ]; buildInputs = (self.nativeDeps."through2" or []); deps = { - "readable-stream-1.0.32" = self.by-version."readable-stream"."1.0.32"; + "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; "xtend-4.0.0" = self.by-version."xtend"."4.0.0"; }; peerDependencies = [ @@ -20314,7 +27749,7 @@ buildInputs = (self.nativeDeps."through2" or []); deps = { - "readable-stream-1.0.32" = self.by-version."readable-stream"."1.0.32"; + "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; "xtend-2.1.2" = self.by-version."xtend"."2.1.2"; }; peerDependencies = [ @@ -20323,6 +27758,28 @@ }; by-spec."through2"."~0.5.1" = self.by-version."through2"."0.5.1"; + by-spec."thunky"."^0.1.0" = + self.by-version."thunky"."0.1.0"; + by-version."thunky"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "thunky-0.1.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/thunky/-/thunky-0.1.0.tgz"; + name = "thunky-0.1.0.tgz"; + sha1 = "bf30146824e2b6e67b0f2d7a4ac8beb26908684e"; + }) + ]; + buildInputs = + (self.nativeDeps."thunky" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "thunky" ]; + }; + by-spec."thunky"."~0.1.0" = + self.by-version."thunky"."0.1.0"; by-spec."tildify"."^1.0.0" = self.by-version."tildify"."1.0.0"; by-version."tildify"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -20338,7 +27795,7 @@ buildInputs = (self.nativeDeps."tildify" or []); deps = { - "user-home-1.0.0" = self.by-version."user-home"."1.0.0"; + "user-home-1.1.0" = self.by-version."user-home"."1.1.0"; }; peerDependencies = [ ]; @@ -20365,6 +27822,51 @@ ]; passthru.names = [ "timers-browserify" ]; }; + by-spec."timers-browserify"."~1.0.1" = + self.by-version."timers-browserify"."1.0.3"; + by-version."timers-browserify"."1.0.3" = lib.makeOverridable self.buildNodePackage { + name = "timers-browserify-1.0.3"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/timers-browserify/-/timers-browserify-1.0.3.tgz"; + name = "timers-browserify-1.0.3.tgz"; + sha1 = "ffba70c9c12eed916fd67318e629ac6f32295551"; + }) + ]; + buildInputs = + (self.nativeDeps."timers-browserify" or []); + deps = { + "process-0.5.2" = self.by-version."process"."0.5.2"; + }; + peerDependencies = [ + ]; + passthru.names = [ "timers-browserify" ]; + }; + by-spec."timers-ext"."0.1" = + self.by-version."timers-ext"."0.1.0"; + by-version."timers-ext"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "timers-ext-0.1.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/timers-ext/-/timers-ext-0.1.0.tgz"; + name = "timers-ext-0.1.0.tgz"; + sha1 = "00345a2ca93089d1251322054389d263e27b77e2"; + }) + ]; + buildInputs = + (self.nativeDeps."timers-ext" or []); + deps = { + "es5-ext-0.10.4" = self.by-version."es5-ext"."0.10.4"; + "next-tick-0.2.2" = self.by-version."next-tick"."0.2.2"; + }; + peerDependencies = [ + ]; + passthru.names = [ "timers-ext" ]; + }; + by-spec."timers-ext"."0.1.x" = + self.by-version."timers-ext"."0.1.0"; by-spec."timespan"."~2.3.0" = self.by-version."timespan"."2.3.0"; by-version."timespan"."2.3.0" = lib.makeOverridable self.buildNodePackage { @@ -20386,15 +27888,15 @@ passthru.names = [ "timespan" ]; }; by-spec."timezone"."*" = - self.by-version."timezone"."0.0.34"; - by-version."timezone"."0.0.34" = lib.makeOverridable self.buildNodePackage { - name = "timezone-0.0.34"; + self.by-version."timezone"."0.0.38"; + by-version."timezone"."0.0.38" = lib.makeOverridable self.buildNodePackage { + name = "timezone-0.0.38"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/timezone/-/timezone-0.0.34.tgz"; - name = "timezone-0.0.34.tgz"; - sha1 = "be56c3259448897b7e2eab6e2aeac46d5ab718d4"; + url = "http://registry.npmjs.org/timezone/-/timezone-0.0.38.tgz"; + name = "timezone-0.0.38.tgz"; + sha1 = "76edf157e220a685fb9a6284ecdc860fcb9de608"; }) ]; buildInputs = @@ -20405,7 +27907,7 @@ ]; passthru.names = [ "timezone" ]; }; - "timezone" = self.by-version."timezone"."0.0.34"; + "timezone" = self.by-version."timezone"."0.0.38"; by-spec."tinycolor"."0.x" = self.by-version."tinycolor"."0.0.1"; by-version."tinycolor"."0.0.1" = lib.makeOverridable self.buildNodePackage { @@ -20427,15 +27929,15 @@ passthru.names = [ "tinycolor" ]; }; by-spec."titanium"."*" = - self.by-version."titanium"."3.4.0"; - by-version."titanium"."3.4.0" = lib.makeOverridable self.buildNodePackage { - name = "titanium-3.4.0"; + self.by-version."titanium"."3.4.1"; + by-version."titanium"."3.4.1" = lib.makeOverridable self.buildNodePackage { + name = "titanium-3.4.1"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/titanium/-/titanium-3.4.0.tgz"; - name = "titanium-3.4.0.tgz"; - sha1 = "5b4fca5cd15fadd187725dd46f7469eed9405683"; + url = "http://registry.npmjs.org/titanium/-/titanium-3.4.1.tgz"; + name = "titanium-3.4.1.tgz"; + sha1 = "af10520a20dfcacaadfde07a2572b82f2b9d3648"; }) ]; buildInputs = @@ -20443,7 +27945,7 @@ deps = { "async-0.2.10" = self.by-version."async"."0.2.10"; "colors-0.6.2" = self.by-version."colors"."0.6.2"; - "fields-0.1.16" = self.by-version."fields"."0.1.16"; + "fields-0.1.23" = self.by-version."fields"."0.1.23"; "humanize-0.0.9" = self.by-version."humanize"."0.0.9"; "jade-0.35.0" = self.by-version."jade"."0.35.0"; "longjohn-0.2.4" = self.by-version."longjohn"."0.2.4"; @@ -20461,7 +27963,51 @@ ]; passthru.names = [ "titanium" ]; }; - "titanium" = self.by-version."titanium"."3.4.0"; + "titanium" = self.by-version."titanium"."3.4.1"; + by-spec."tls-connect"."^0.2.2" = + self.by-version."tls-connect"."0.2.2"; + by-version."tls-connect"."0.2.2" = lib.makeOverridable self.buildNodePackage { + name = "tls-connect-0.2.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/tls-connect/-/tls-connect-0.2.2.tgz"; + name = "tls-connect-0.2.2.tgz"; + sha1 = "1d88d4f4cb829a0741b6acd05d1df73e0d566fd0"; + }) + ]; + buildInputs = + (self.nativeDeps."tls-connect" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "tls-connect" ]; + }; + by-spec."tls-connect"."~0.2.0" = + self.by-version."tls-connect"."0.2.2"; + by-spec."tls-connect"."~0.x" = + self.by-version."tls-connect"."0.2.2"; + by-spec."tmp"."0.0.23" = + self.by-version."tmp"."0.0.23"; + by-version."tmp"."0.0.23" = lib.makeOverridable self.buildNodePackage { + name = "tmp-0.0.23"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/tmp/-/tmp-0.0.23.tgz"; + name = "tmp-0.0.23.tgz"; + sha1 = "de874aa5e974a85f0a32cdfdbd74663cb3bd9c74"; + }) + ]; + buildInputs = + (self.nativeDeps."tmp" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "tmp" ]; + }; by-spec."tmp"."0.0.24" = self.by-version."tmp"."0.0.24"; by-version."tmp"."0.0.24" = lib.makeOverridable self.buildNodePackage { @@ -20484,6 +28030,122 @@ }; by-spec."tmp"."~0.0.20" = self.by-version."tmp"."0.0.24"; + by-spec."toobusy"."*" = + self.by-version."toobusy"."0.2.4"; + by-version."toobusy"."0.2.4" = lib.makeOverridable self.buildNodePackage { + name = "toobusy-0.2.4"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/toobusy/-/toobusy-0.2.4.tgz"; + name = "toobusy-0.2.4.tgz"; + sha1 = "d97a3ee760b2462388e15f8526579b4b64bb193d"; + }) + ]; + buildInputs = + (self.nativeDeps."toobusy" or []); + deps = { + "bindings-1.1.0" = self.by-version."bindings"."1.1.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "toobusy" ]; + }; + "toobusy" = self.by-version."toobusy"."0.2.4"; + by-spec."toobusy"."~0.2.4" = + self.by-version."toobusy"."0.2.4"; + by-spec."torrent-stream"."^0.16.2" = + self.by-version."torrent-stream"."0.16.2"; + by-version."torrent-stream"."0.16.2" = lib.makeOverridable self.buildNodePackage { + name = "torrent-stream-0.16.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/torrent-stream/-/torrent-stream-0.16.2.tgz"; + name = "torrent-stream-0.16.2.tgz"; + sha1 = "f6460d2e1b25371ff82f4d5391450846d78b9164"; + }) + ]; + buildInputs = + (self.nativeDeps."torrent-stream" or []); + deps = { + "bitfield-0.1.0" = self.by-version."bitfield"."0.1.0"; + "bittorrent-dht-2.6.4" = self.by-version."bittorrent-dht"."2.6.4"; + "bittorrent-tracker-2.9.1" = self.by-version."bittorrent-tracker"."2.9.1"; + "bncode-0.5.3" = self.by-version."bncode"."0.5.3"; + "compact2string-1.3.0" = self.by-version."compact2string"."1.3.0"; + "end-of-stream-0.1.5" = self.by-version."end-of-stream"."0.1.5"; + "hat-0.0.3" = self.by-version."hat"."0.0.3"; + "ip-0.3.2" = self.by-version."ip"."0.3.2"; + "ip-set-1.0.0" = self.by-version."ip-set"."1.0.0"; + "magnet-uri-2.0.1" = self.by-version."magnet-uri"."2.0.1"; + "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; + "parse-torrent-1.7.0" = self.by-version."parse-torrent"."1.7.0"; + "peer-wire-swarm-0.9.2" = self.by-version."peer-wire-swarm"."0.9.2"; + "random-access-file-0.3.1" = self.by-version."random-access-file"."0.3.1"; + "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; + "thunky-0.1.0" = self.by-version."thunky"."0.1.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "torrent-stream" ]; + }; + by-spec."torrent-stream"."~0.13.3" = + self.by-version."torrent-stream"."0.13.5"; + by-version."torrent-stream"."0.13.5" = lib.makeOverridable self.buildNodePackage { + name = "torrent-stream-0.13.5"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/torrent-stream/-/torrent-stream-0.13.5.tgz"; + name = "torrent-stream-0.13.5.tgz"; + sha1 = "13127bc81f668ad4dbd26cf3e984c3dd1cd70d40"; + }) + ]; + buildInputs = + (self.nativeDeps."torrent-stream" or []); + deps = { + "bitfield-0.1.0" = self.by-version."bitfield"."0.1.0"; + "bittorrent-dht-1.5.0" = self.by-version."bittorrent-dht"."1.5.0"; + "bittorrent-tracker-2.9.1" = self.by-version."bittorrent-tracker"."2.9.1"; + "bncode-0.5.3" = self.by-version."bncode"."0.5.3"; + "compact2string-1.3.0" = self.by-version."compact2string"."1.3.0"; + "end-of-stream-0.1.5" = self.by-version."end-of-stream"."0.1.5"; + "hat-0.0.3" = self.by-version."hat"."0.0.3"; + "ip-0.3.2" = self.by-version."ip"."0.3.2"; + "magnet-uri-2.0.1" = self.by-version."magnet-uri"."2.0.1"; + "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; + "parse-torrent-1.7.0" = self.by-version."parse-torrent"."1.7.0"; + "peer-wire-swarm-0.9.2" = self.by-version."peer-wire-swarm"."0.9.2"; + "random-access-file-0.3.1" = self.by-version."random-access-file"."0.3.1"; + "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; + "thunky-0.1.0" = self.by-version."thunky"."0.1.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "torrent-stream" ]; + }; + by-spec."touch"."0.0.2" = + self.by-version."touch"."0.0.2"; + by-version."touch"."0.0.2" = lib.makeOverridable self.buildNodePackage { + name = "touch-0.0.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/touch/-/touch-0.0.2.tgz"; + name = "touch-0.0.2.tgz"; + sha1 = "a65a777795e5cbbe1299499bdc42281ffb21b5f4"; + }) + ]; + buildInputs = + (self.nativeDeps."touch" or []); + deps = { + "nopt-1.0.10" = self.by-version."nopt"."1.0.10"; + }; + peerDependencies = [ + ]; + passthru.names = [ "touch" ]; + }; by-spec."tough-cookie".">=0.12.0" = self.by-version."tough-cookie"."0.12.1"; by-version."tough-cookie"."0.12.1" = lib.makeOverridable self.buildNodePackage { @@ -20499,7 +28161,30 @@ buildInputs = (self.nativeDeps."tough-cookie" or []); deps = { - "punycode-1.3.1" = self.by-version."punycode"."1.3.1"; + "punycode-1.3.2" = self.by-version."punycode"."1.3.2"; + }; + peerDependencies = [ + ]; + passthru.names = [ "tough-cookie" ]; + }; + by-spec."tough-cookie"."^0.12.1" = + self.by-version."tough-cookie"."0.12.1"; + 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 = "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"; + }) + ]; + buildInputs = + (self.nativeDeps."tough-cookie" or []); + deps = { + "punycode-1.3.2" = self.by-version."punycode"."1.3.2"; }; peerDependencies = [ ]; @@ -20520,8 +28205,8 @@ buildInputs = (self.nativeDeps."traceur" or []); deps = { - "commander-2.3.0" = self.by-version."commander"."2.3.0"; - "glob-4.0.6" = self.by-version."glob"."4.0.6"; + "commander-2.5.0" = self.by-version."commander"."2.5.0"; + "glob-4.2.2" = self.by-version."glob"."4.2.2"; "semver-2.3.2" = self.by-version."semver"."2.3.2"; }; peerDependencies = [ @@ -20551,16 +28236,36 @@ ]; passthru.names = [ "transformers" ]; }; + by-spec."traverse".">=0.3.0 <0.4" = + self.by-version."traverse"."0.3.9"; + by-version."traverse"."0.3.9" = lib.makeOverridable self.buildNodePackage { + name = "traverse-0.3.9"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz"; + name = "traverse-0.3.9.tgz"; + sha1 = "717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9"; + }) + ]; + buildInputs = + (self.nativeDeps."traverse" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "traverse" ]; + }; by-spec."truncate"."~1.0.2" = - self.by-version."truncate"."1.0.2"; - by-version."truncate"."1.0.2" = lib.makeOverridable self.buildNodePackage { - name = "truncate-1.0.2"; + self.by-version."truncate"."1.0.4"; + by-version."truncate"."1.0.4" = lib.makeOverridable self.buildNodePackage { + name = "truncate-1.0.4"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/truncate/-/truncate-1.0.2.tgz"; - name = "truncate-1.0.2.tgz"; - sha1 = "3221c41f6e747f83e8613f5466c8bfb596226a66"; + url = "http://registry.npmjs.org/truncate/-/truncate-1.0.4.tgz"; + name = "truncate-1.0.4.tgz"; + sha1 = "2bcfbbff4a97b9089b693c1ae37c5105ec8775aa"; }) ]; buildInputs = @@ -20692,52 +28397,32 @@ ]; passthru.names = [ "type-is" ]; }; - by-spec."type-is"."~1.3.2" = - self.by-version."type-is"."1.3.2"; - by-version."type-is"."1.3.2" = lib.makeOverridable self.buildNodePackage { - name = "type-is-1.3.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/type-is/-/type-is-1.3.2.tgz"; - name = "type-is-1.3.2.tgz"; - sha1 = "4f2a5dc58775ca1630250afc7186f8b36309d1bb"; - }) - ]; - buildInputs = - (self.nativeDeps."type-is" or []); - deps = { - "media-typer-0.2.0" = self.by-version."media-typer"."0.2.0"; - "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2"; - }; - peerDependencies = [ - ]; - passthru.names = [ "type-is" ]; - }; by-spec."type-is"."~1.5.1" = - self.by-version."type-is"."1.5.2"; - by-version."type-is"."1.5.2" = lib.makeOverridable self.buildNodePackage { - name = "type-is-1.5.2"; + self.by-version."type-is"."1.5.3"; + by-version."type-is"."1.5.3" = lib.makeOverridable self.buildNodePackage { + name = "type-is-1.5.3"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/type-is/-/type-is-1.5.2.tgz"; - name = "type-is-1.5.2.tgz"; - sha1 = "8291bbe845a904acfaffd05a41fdeb234bfa9e5f"; + url = "http://registry.npmjs.org/type-is/-/type-is-1.5.3.tgz"; + name = "type-is-1.5.3.tgz"; + sha1 = "b7fb92d0abc628393f10dd260932cca65fe9ff68"; }) ]; buildInputs = (self.nativeDeps."type-is" or []); deps = { "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0"; - "mime-types-2.0.2" = self.by-version."mime-types"."2.0.2"; + "mime-types-2.0.3" = self.by-version."mime-types"."2.0.3"; }; peerDependencies = [ ]; passthru.names = [ "type-is" ]; }; by-spec."type-is"."~1.5.2" = - self.by-version."type-is"."1.5.2"; + self.by-version."type-is"."1.5.3"; + by-spec."type-is"."~1.5.3" = + self.by-version."type-is"."1.5.3"; by-spec."typechecker"."~2.0.1" = self.by-version."typechecker"."2.0.8"; by-version."typechecker"."2.0.8" = lib.makeOverridable self.buildNodePackage { @@ -20779,15 +28464,15 @@ passthru.names = [ "typedarray" ]; }; by-spec."typescript"."*" = - self.by-version."typescript"."1.0.1"; - by-version."typescript"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "typescript-1.0.1"; + self.by-version."typescript"."1.3.0"; + by-version."typescript"."1.3.0" = lib.makeOverridable self.buildNodePackage { + name = "typescript-1.3.0"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/typescript/-/typescript-1.0.1.tgz"; - name = "typescript-1.0.1.tgz"; - sha1 = "e8eacde3084a091d3fe29b60ac5862252662a25a"; + url = "http://registry.npmjs.org/typescript/-/typescript-1.3.0.tgz"; + name = "typescript-1.3.0.tgz"; + sha1 = "b48262ac7444971b447ffc6bb56c69854eef02e1"; }) ]; buildInputs = @@ -20798,7 +28483,7 @@ ]; passthru.names = [ "typescript" ]; }; - "typescript" = self.by-version."typescript"."1.0.1"; + "typescript" = self.by-version."typescript"."1.3.0"; by-spec."uglify-js"."*" = self.by-version."uglify-js"."2.4.15"; by-version."uglify-js"."2.4.15" = lib.makeOverridable self.buildNodePackage { @@ -20868,6 +28553,8 @@ ]; passthru.names = [ "uglify-js" ]; }; + by-spec."uglify-js"."2.4.15" = + self.by-version."uglify-js"."2.4.15"; by-spec."uglify-js"."^2.4.0" = self.by-version."uglify-js"."2.4.15"; by-spec."uglify-js"."~2.2" = @@ -20921,8 +28608,6 @@ self.by-version."uglify-js"."2.3.6"; by-spec."uglify-js"."~2.4.0" = self.by-version."uglify-js"."2.4.15"; - by-spec."uglify-js"."~2.4.12" = - self.by-version."uglify-js"."2.4.15"; by-spec."uglify-to-browserify"."~1.0.0" = self.by-version."uglify-to-browserify"."1.0.2"; by-version."uglify-to-browserify"."1.0.2" = lib.makeOverridable self.buildNodePackage { @@ -20943,6 +28628,26 @@ ]; passthru.names = [ "uglify-to-browserify" ]; }; + by-spec."uid-number"."0" = + self.by-version."uid-number"."0.0.6"; + by-version."uid-number"."0.0.6" = lib.makeOverridable self.buildNodePackage { + name = "uid-number-0.0.6"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz"; + name = "uid-number-0.0.6.tgz"; + sha1 = "0ea10e8035e8eb5b8e4449f06da1c730663baa81"; + }) + ]; + buildInputs = + (self.nativeDeps."uid-number" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "uid-number" ]; + }; by-spec."uid-number"."0.0.5" = self.by-version."uid-number"."0.0.5"; by-version."uid-number"."0.0.5" = lib.makeOverridable self.buildNodePackage { @@ -20963,6 +28668,8 @@ ]; passthru.names = [ "uid-number" ]; }; + by-spec."uid-number"."0.0.6" = + self.by-version."uid-number"."0.0.6"; by-spec."uid-safe"."1.0.1" = self.by-version."uid-safe"."1.0.1"; by-version."uid-safe"."1.0.1" = lib.makeOverridable self.buildNodePackage { @@ -20978,7 +28685,7 @@ buildInputs = (self.nativeDeps."uid-safe" or []); deps = { - "mz-1.0.1" = self.by-version."mz"."1.0.1"; + "mz-1.1.0" = self.by-version."mz"."1.1.0"; "base64-url-1.0.0" = self.by-version."base64-url"."1.0.0"; }; peerDependencies = [ @@ -21007,6 +28714,8 @@ ]; passthru.names = [ "uid2" ]; }; + by-spec."uid2"."~0.0.2" = + self.by-version."uid2"."0.0.3"; by-spec."umd"."^2.1.0" = self.by-version."umd"."2.1.0"; by-version."umd"."2.1.0" = lib.makeOverridable self.buildNodePackage { @@ -21031,6 +28740,30 @@ ]; passthru.names = [ "umd" ]; }; + by-spec."umd"."~2.0.0" = + self.by-version."umd"."2.0.0"; + by-version."umd"."2.0.0" = lib.makeOverridable self.buildNodePackage { + name = "umd-2.0.0"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/umd/-/umd-2.0.0.tgz"; + name = "umd-2.0.0.tgz"; + sha1 = "749683b0d514728ae0e1b6195f5774afc0ad4f8f"; + }) + ]; + buildInputs = + (self.nativeDeps."umd" or []); + deps = { + "rfile-1.0.0" = self.by-version."rfile"."1.0.0"; + "ruglify-1.0.0" = self.by-version."ruglify"."1.0.0"; + "through-2.3.6" = self.by-version."through"."2.3.6"; + "uglify-js-2.4.15" = self.by-version."uglify-js"."2.4.15"; + }; + peerDependencies = [ + ]; + passthru.names = [ "umd" ]; + }; by-spec."umd"."~2.1.0" = self.by-version."umd"."2.1.0"; by-spec."underscore"."*" = @@ -21054,6 +28787,26 @@ passthru.names = [ "underscore" ]; }; "underscore" = self.by-version."underscore"."1.7.0"; + by-spec."underscore"."1.2.1" = + self.by-version."underscore"."1.2.1"; + by-version."underscore"."1.2.1" = lib.makeOverridable self.buildNodePackage { + name = "underscore-1.2.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/underscore/-/underscore-1.2.1.tgz"; + name = "underscore-1.2.1.tgz"; + sha1 = "fc5c6b0765673d92a2d4ac8b4dc0aa88702e2bd4"; + }) + ]; + buildInputs = + (self.nativeDeps."underscore" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "underscore" ]; + }; by-spec."underscore"."1.6.x" = self.by-version."underscore"."1.6.0"; by-version."underscore"."1.6.0" = lib.makeOverridable self.buildNodePackage { @@ -21074,6 +28827,8 @@ ]; passthru.names = [ "underscore" ]; }; + by-spec."underscore"."1.7.0" = + self.by-version."underscore"."1.7.0"; by-spec."underscore".">=1.1.7" = self.by-version."underscore"."1.7.0"; by-spec."underscore".">=1.3.1" = @@ -21188,33 +28943,33 @@ passthru.names = [ "unfunk-diff" ]; }; by-spec."ungit"."*" = - self.by-version."ungit"."0.8.3"; - by-version."ungit"."0.8.3" = lib.makeOverridable self.buildNodePackage { - name = "ungit-0.8.3"; + self.by-version."ungit"."0.8.4"; + by-version."ungit"."0.8.4" = lib.makeOverridable self.buildNodePackage { + name = "ungit-0.8.4"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/ungit/-/ungit-0.8.3.tgz"; - name = "ungit-0.8.3.tgz"; - sha1 = "93ea5734cb8408ef9ba3406102fa5254abfeaa4b"; + url = "http://registry.npmjs.org/ungit/-/ungit-0.8.4.tgz"; + name = "ungit-0.8.4.tgz"; + sha1 = "3956812e8f2005415d351a710350f88b38c2d99a"; }) ]; buildInputs = (self.nativeDeps."ungit" or []); deps = { - "express-4.8.8" = self.by-version."express"."4.8.8"; - "superagent-0.18.2" = self.by-version."superagent"."0.18.2"; + "express-4.10.4" = self.by-version."express"."4.10.4"; + "superagent-0.21.0" = self.by-version."superagent"."0.21.0"; "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; "temp-0.8.1" = self.by-version."temp"."0.8.1"; "socket.io-0.9.17" = self.by-version."socket.io"."0.9.17"; - "moment-2.8.3" = self.by-version."moment"."2.8.3"; + "moment-2.8.4" = self.by-version."moment"."2.8.4"; "async-0.9.0" = self.by-version."async"."0.9.0"; - "rc-0.5.1" = self.by-version."rc"."0.5.1"; - "uuid-1.4.1" = self.by-version."uuid"."1.4.1"; - "winston-0.7.3" = self.by-version."winston"."0.7.3"; + "rc-0.5.4" = self.by-version."rc"."0.5.4"; + "uuid-2.0.1" = self.by-version."uuid"."2.0.1"; + "winston-0.8.3" = self.by-version."winston"."0.8.3"; "passport-0.2.1" = self.by-version."passport"."0.2.1"; "passport-local-1.0.0" = self.by-version."passport-local"."1.0.0"; - "semver-3.0.1" = self.by-version."semver"."3.0.1"; + "semver-4.1.0" = self.by-version."semver"."4.1.0"; "forever-monitor-1.1.0" = self.by-version."forever-monitor"."1.1.0"; "open-0.0.5" = self.by-version."open"."0.0.5"; "optimist-0.6.1" = self.by-version."optimist"."0.6.1"; @@ -21222,25 +28977,25 @@ "signals-1.0.0" = self.by-version."signals"."1.0.0"; "hasher-1.2.0" = self.by-version."hasher"."1.2.0"; "blueimp-md5-1.1.0" = self.by-version."blueimp-md5"."1.1.0"; - "color-0.7.1" = self.by-version."color"."0.7.1"; - "keen.io-0.1.2" = self.by-version."keen.io"."0.1.2"; + "color-0.7.3" = self.by-version."color"."0.7.3"; + "keen.io-0.1.3" = self.by-version."keen.io"."0.1.3"; "getmac-1.0.6" = self.by-version."getmac"."1.0.6"; - "deep-extend-0.2.11" = self.by-version."deep-extend"."0.2.11"; + "deep-extend-0.3.2" = self.by-version."deep-extend"."0.3.2"; "raven-0.7.2" = self.by-version."raven"."0.7.2"; "knockout-3.2.0" = self.by-version."knockout"."3.2.0"; - "npm-registry-client-3.1.8" = self.by-version."npm-registry-client"."3.1.8"; - "npmconf-2.0.9" = self.by-version."npmconf"."2.0.9"; + "npm-registry-client-4.0.4" = self.by-version."npm-registry-client"."4.0.4"; + "npmconf-2.1.1" = self.by-version."npmconf"."2.1.1"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; - "body-parser-1.6.7" = self.by-version."body-parser"."1.6.7"; + "body-parser-1.9.3" = self.by-version."body-parser"."1.9.3"; "cookie-parser-1.3.3" = self.by-version."cookie-parser"."1.3.3"; - "express-session-1.7.6" = self.by-version."express-session"."1.7.6"; - "serve-static-1.5.4" = self.by-version."serve-static"."1.5.4"; + "express-session-1.9.2" = self.by-version."express-session"."1.9.2"; + "serve-static-1.7.1" = self.by-version."serve-static"."1.7.1"; }; peerDependencies = [ ]; passthru.names = [ "ungit" ]; }; - "ungit" = self.by-version."ungit"."0.8.3"; + "ungit" = self.by-version."ungit"."0.8.4"; by-spec."unique-stream"."^1.0.0" = self.by-version."unique-stream"."1.0.0"; by-version."unique-stream"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -21261,6 +29016,51 @@ ]; passthru.names = [ "unique-stream" ]; }; + by-spec."unorm"."1.3.3" = + self.by-version."unorm"."1.3.3"; + by-version."unorm"."1.3.3" = lib.makeOverridable self.buildNodePackage { + name = "unorm-1.3.3"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/unorm/-/unorm-1.3.3.tgz"; + name = "unorm-1.3.3.tgz"; + sha1 = "16a8772671ebd6f7cde6f8c5e49bb60ac47dba93"; + }) + ]; + buildInputs = + (self.nativeDeps."unorm" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "unorm" ]; + }; + by-spec."update-notifier"."0.2.0" = + self.by-version."update-notifier"."0.2.0"; + by-version."update-notifier"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "update-notifier-0.2.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/update-notifier/-/update-notifier-0.2.0.tgz"; + name = "update-notifier-0.2.0.tgz"; + sha1 = "a010c928adcf02090b8e0ce7fef6fb0a7cacc34a"; + }) + ]; + buildInputs = + (self.nativeDeps."update-notifier" or []); + deps = { + "chalk-0.5.1" = self.by-version."chalk"."0.5.1"; + "configstore-0.3.1" = self.by-version."configstore"."0.3.1"; + "latest-version-0.2.0" = self.by-version."latest-version"."0.2.0"; + "semver-diff-0.1.0" = self.by-version."semver-diff"."0.1.0"; + "string-length-0.1.2" = self.by-version."string-length"."0.1.2"; + }; + peerDependencies = [ + ]; + passthru.names = [ "update-notifier" ]; + }; by-spec."update-notifier"."~0.1.8" = self.by-version."update-notifier"."0.1.10"; by-version."update-notifier"."0.1.10" = lib.makeOverridable self.buildNodePackage { @@ -21278,7 +29078,7 @@ deps = { "chalk-0.4.0" = self.by-version."chalk"."0.4.0"; "configstore-0.3.1" = self.by-version."configstore"."0.3.1"; - "request-2.44.0" = self.by-version."request"."2.44.0"; + "request-2.49.0" = self.by-version."request"."2.49.0"; "semver-2.3.2" = self.by-version."semver"."2.3.2"; }; peerDependencies = [ @@ -21326,16 +29126,38 @@ ]; passthru.names = [ "url" ]; }; + by-spec."url"."~0.7.9" = + self.by-version."url"."0.7.9"; + by-version."url"."0.7.9" = lib.makeOverridable self.buildNodePackage { + name = "url-0.7.9"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/url/-/url-0.7.9.tgz"; + name = "url-0.7.9.tgz"; + sha1 = "1959b1a8b361fc017b59513a7c7fa9827f5e4ed0"; + }) + ]; + buildInputs = + (self.nativeDeps."url" or []); + deps = { + "querystring-0.1.0" = self.by-version."querystring"."0.1.0"; + "punycode-1.0.0" = self.by-version."punycode"."1.0.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "url" ]; + }; by-spec."user-home"."^1.0.0" = - self.by-version."user-home"."1.0.0"; - by-version."user-home"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "user-home-1.0.0"; + self.by-version."user-home"."1.1.0"; + by-version."user-home"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "user-home-1.1.0"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/user-home/-/user-home-1.0.0.tgz"; - name = "user-home-1.0.0.tgz"; - sha1 = "54ecb631e0fa420e9b0a6b946b158d137825b38b"; + url = "http://registry.npmjs.org/user-home/-/user-home-1.1.0.tgz"; + name = "user-home-1.1.0.tgz"; + sha1 = "1f4e6bce5458aeec4ac80ebcdcc66119c1070cdf"; }) ]; buildInputs = @@ -21413,6 +29235,26 @@ self.by-version."util"."0.10.3"; by-spec."util"."~0.10.1" = self.by-version."util"."0.10.3"; + by-spec."util-deprecate"."1.0.0" = + self.by-version."util-deprecate"."1.0.0"; + by-version."util-deprecate"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "util-deprecate-1.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.0.tgz"; + name = "util-deprecate-1.0.0.tgz"; + sha1 = "3007af012c140eae26de05576ec22785cac3abf2"; + }) + ]; + buildInputs = + (self.nativeDeps."util-deprecate" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "util-deprecate" ]; + }; by-spec."util-extend"."^1.0.1" = self.by-version."util-extend"."1.0.1"; by-version."util-extend"."1.0.1" = lib.makeOverridable self.buildNodePackage { @@ -21509,16 +29351,16 @@ ]; passthru.names = [ "utils-merge" ]; }; - by-spec."uuid"."1.4.1" = - self.by-version."uuid"."1.4.1"; - by-version."uuid"."1.4.1" = lib.makeOverridable self.buildNodePackage { - name = "uuid-1.4.1"; + by-spec."uuid"."~1.4.1" = + self.by-version."uuid"."1.4.2"; + by-version."uuid"."1.4.2" = lib.makeOverridable self.buildNodePackage { + name = "uuid-1.4.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/uuid/-/uuid-1.4.1.tgz"; - name = "uuid-1.4.1.tgz"; - sha1 = "a337828580d426e375b8ee11bd2bf901a596e0b8"; + url = "http://registry.npmjs.org/uuid/-/uuid-1.4.2.tgz"; + name = "uuid-1.4.2.tgz"; + sha1 = "453019f686966a6df83cdc5244e7c990ecc332fc"; }) ]; buildInputs = @@ -21529,16 +29371,16 @@ ]; passthru.names = [ "uuid" ]; }; - by-spec."uuid"."~1.4.1" = - self.by-version."uuid"."1.4.2"; - by-version."uuid"."1.4.2" = lib.makeOverridable self.buildNodePackage { - name = "uuid-1.4.2"; + by-spec."uuid"."~2.0.1" = + self.by-version."uuid"."2.0.1"; + by-version."uuid"."2.0.1" = lib.makeOverridable self.buildNodePackage { + name = "uuid-2.0.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/uuid/-/uuid-1.4.2.tgz"; - name = "uuid-1.4.2.tgz"; - sha1 = "453019f686966a6df83cdc5244e7c990ecc332fc"; + url = "http://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz"; + name = "uuid-2.0.1.tgz"; + sha1 = "c2a30dedb3e535d72ccf82e343941a50ba8533ac"; }) ]; buildInputs = @@ -21549,65 +29391,65 @@ ]; passthru.names = [ "uuid" ]; }; - by-spec."validator"."0.4.x" = - self.by-version."validator"."0.4.28"; - by-version."validator"."0.4.28" = lib.makeOverridable self.buildNodePackage { - name = "validator-0.4.28"; + by-spec."v8flags"."^1.0.1" = + self.by-version."v8flags"."1.0.5"; + by-version."v8flags"."1.0.5" = lib.makeOverridable self.buildNodePackage { + name = "v8flags-1.0.5"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/validator/-/validator-0.4.28.tgz"; - name = "validator-0.4.28.tgz"; - sha1 = "311d439ae6cf3fbe6f85da6ebaccd0c7007986f4"; + url = "http://registry.npmjs.org/v8flags/-/v8flags-1.0.5.tgz"; + name = "v8flags-1.0.5.tgz"; + sha1 = "d352362031d3286bcd906da45fe27a3b760e38e5"; }) ]; buildInputs = - (self.nativeDeps."validator" or []); + (self.nativeDeps."v8flags" or []); deps = { }; peerDependencies = [ ]; - passthru.names = [ "validator" ]; + passthru.names = [ "v8flags" ]; }; - by-spec."vargs"."~0.1.0" = - self.by-version."vargs"."0.1.0"; - by-version."vargs"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "vargs-0.1.0"; + by-spec."validator"."^2.1.0" = + self.by-version."validator"."2.1.0"; + by-version."validator"."2.1.0" = lib.makeOverridable self.buildNodePackage { + name = "validator-2.1.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/vargs/-/vargs-0.1.0.tgz"; - name = "vargs-0.1.0.tgz"; - sha1 = "6b6184da6520cc3204ce1b407cac26d92609ebff"; + url = "http://registry.npmjs.org/validator/-/validator-2.1.0.tgz"; + name = "validator-2.1.0.tgz"; + sha1 = "63276570def208adcf1c032c1f4e6a17d2bd8d8b"; }) ]; buildInputs = - (self.nativeDeps."vargs" or []); + (self.nativeDeps."validator" or []); deps = { }; peerDependencies = [ ]; - passthru.names = [ "vargs" ]; + passthru.names = [ "validator" ]; }; - by-spec."vary"."0.1.0" = - self.by-version."vary"."0.1.0"; - by-version."vary"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "vary-0.1.0"; + by-spec."vargs"."~0.1.0" = + self.by-version."vargs"."0.1.0"; + by-version."vargs"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "vargs-0.1.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/vary/-/vary-0.1.0.tgz"; - name = "vary-0.1.0.tgz"; - sha1 = "df0945899e93c0cc5bd18cc8321d9d21e74f6176"; + url = "http://registry.npmjs.org/vargs/-/vargs-0.1.0.tgz"; + name = "vargs-0.1.0.tgz"; + sha1 = "6b6184da6520cc3204ce1b407cac26d92609ebff"; }) ]; buildInputs = - (self.nativeDeps."vary" or []); + (self.nativeDeps."vargs" or []); deps = { }; peerDependencies = [ ]; - passthru.names = [ "vary" ]; + passthru.names = [ "vargs" ]; }; by-spec."vary"."~1.0.0" = self.by-version."vary"."1.0.0"; @@ -21736,6 +29578,26 @@ ]; passthru.names = [ "verror" ]; }; + by-spec."vhost"."1.0.0" = + self.by-version."vhost"."1.0.0"; + by-version."vhost"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "vhost-1.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/vhost/-/vhost-1.0.0.tgz"; + name = "vhost-1.0.0.tgz"; + sha1 = "654513f289a4f898aab745bbd633e40180c9c4c0"; + }) + ]; + buildInputs = + (self.nativeDeps."vhost" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "vhost" ]; + }; by-spec."vhost"."~3.0.0" = self.by-version."vhost"."3.0.0"; by-version."vhost"."3.0.0" = lib.makeOverridable self.buildNodePackage { @@ -21799,57 +29661,57 @@ passthru.names = [ "vinyl" ]; }; by-spec."vinyl"."^0.4.0" = - self.by-version."vinyl"."0.4.3"; - by-version."vinyl"."0.4.3" = lib.makeOverridable self.buildNodePackage { - name = "vinyl-0.4.3"; + self.by-version."vinyl"."0.4.5"; + by-version."vinyl"."0.4.5" = lib.makeOverridable self.buildNodePackage { + name = "vinyl-0.4.5"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/vinyl/-/vinyl-0.4.3.tgz"; - name = "vinyl-0.4.3.tgz"; - sha1 = "19f61a1b28e72b4c50697889dbe91d7503943ecf"; + url = "http://registry.npmjs.org/vinyl/-/vinyl-0.4.5.tgz"; + name = "vinyl-0.4.5.tgz"; + sha1 = "b1015e63bbd350d5f90e6c26b3a2e628294da8e0"; }) ]; buildInputs = (self.nativeDeps."vinyl" or []); deps = { + "clone-0.1.18" = self.by-version."clone"."0.1.18"; "clone-stats-0.0.1" = self.by-version."clone-stats"."0.0.1"; - "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; }; peerDependencies = [ ]; passthru.names = [ "vinyl" ]; }; by-spec."vinyl-fs"."^0.3.0" = - self.by-version."vinyl-fs"."0.3.8"; - by-version."vinyl-fs"."0.3.8" = lib.makeOverridable self.buildNodePackage { - name = "vinyl-fs-0.3.8"; + self.by-version."vinyl-fs"."0.3.13"; + by-version."vinyl-fs"."0.3.13" = lib.makeOverridable self.buildNodePackage { + name = "vinyl-fs-0.3.13"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.8.tgz"; - name = "vinyl-fs-0.3.8.tgz"; - sha1 = "bea09db28e558e5e903a51a5363fcdb59e5aabe4"; + url = "http://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.13.tgz"; + name = "vinyl-fs-0.3.13.tgz"; + sha1 = "3d384c5b3032e356cd388023e3a085303382ac23"; }) ]; buildInputs = (self.nativeDeps."vinyl-fs" or []); deps = { - "glob-stream-3.1.15" = self.by-version."glob-stream"."3.1.15"; + "defaults-1.0.0" = self.by-version."defaults"."1.0.0"; + "glob-stream-3.1.17" = self.by-version."glob-stream"."3.1.17"; "glob-watcher-0.0.6" = self.by-version."glob-watcher"."0.0.6"; - "graceful-fs-3.0.2" = self.by-version."graceful-fs"."3.0.2"; - "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; + "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "strip-bom-1.0.0" = self.by-version."strip-bom"."1.0.0"; - "through2-0.6.2" = self.by-version."through2"."0.6.2"; - "vinyl-0.4.3" = self.by-version."vinyl"."0.4.3"; + "through2-0.6.3" = self.by-version."through2"."0.6.3"; + "vinyl-0.4.5" = self.by-version."vinyl"."0.4.5"; }; peerDependencies = [ ]; passthru.names = [ "vinyl-fs" ]; }; by-spec."vinyl-fs"."^0.3.3" = - self.by-version."vinyl-fs"."0.3.8"; + self.by-version."vinyl-fs"."0.3.13"; by-spec."vm-browserify"."~0.0.1" = self.by-version."vm-browserify"."0.0.4"; by-version."vm-browserify"."0.0.4" = lib.makeOverridable self.buildNodePackage { @@ -21892,15 +29754,15 @@ passthru.names = [ "void-elements" ]; }; by-spec."vows".">=0.5.13" = - self.by-version."vows"."0.7.0"; - by-version."vows"."0.7.0" = lib.makeOverridable self.buildNodePackage { - name = "vows-0.7.0"; + self.by-version."vows"."0.8.1"; + by-version."vows"."0.8.1" = lib.makeOverridable self.buildNodePackage { + name = "vows-0.8.1"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/vows/-/vows-0.7.0.tgz"; - name = "vows-0.7.0.tgz"; - sha1 = "dd0065f110ba0c0a6d63e844851c3208176d5867"; + url = "http://registry.npmjs.org/vows/-/vows-0.8.1.tgz"; + name = "vows-0.8.1.tgz"; + sha1 = "e09e988ce594ca05a08d72abcca34e88db559131"; }) ]; buildInputs = @@ -21908,6 +29770,7 @@ deps = { "eyes-0.1.8" = self.by-version."eyes"."0.1.8"; "diff-1.0.8" = self.by-version."diff"."1.0.8"; + "glob-4.0.6" = self.by-version."glob"."4.0.6"; }; peerDependencies = [ ]; @@ -21976,21 +29839,22 @@ ]; passthru.names = [ "watch" ]; }; - by-spec."watch"."~0.8.0" = - self.by-version."watch"."0.8.0"; - by-version."watch"."0.8.0" = lib.makeOverridable self.buildNodePackage { - name = "watch-0.8.0"; - bin = false; + by-spec."watch"."~0.13.0" = + self.by-version."watch"."0.13.0"; + by-version."watch"."0.13.0" = lib.makeOverridable self.buildNodePackage { + name = "watch-0.13.0"; + bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/watch/-/watch-0.8.0.tgz"; - name = "watch-0.8.0.tgz"; - sha1 = "1bb0eea53defe6e621e9c8c63c0358007ecbdbcc"; + url = "http://registry.npmjs.org/watch/-/watch-0.13.0.tgz"; + name = "watch-0.13.0.tgz"; + sha1 = "fcc6d2b3f0e8c73482eb54239a19fd5bcf9a753c"; }) ]; buildInputs = (self.nativeDeps."watch" or []); deps = { + "minimist-1.1.0" = self.by-version."minimist"."1.1.0"; }; peerDependencies = [ ]; @@ -22018,26 +29882,25 @@ passthru.names = [ "wcwidth" ]; }; by-spec."wd"."~0.3.4" = - self.by-version."wd"."0.3.8"; - by-version."wd"."0.3.8" = lib.makeOverridable self.buildNodePackage { - name = "wd-0.3.8"; + self.by-version."wd"."0.3.11"; + by-version."wd"."0.3.11" = lib.makeOverridable self.buildNodePackage { + name = "wd-0.3.11"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/wd/-/wd-0.3.8.tgz"; - name = "wd-0.3.8.tgz"; - sha1 = "68c4371561ac32b986dd93f42f89072746c09c84"; + url = "http://registry.npmjs.org/wd/-/wd-0.3.11.tgz"; + name = "wd-0.3.11.tgz"; + sha1 = "522716c79a7a10e781acbb2c6cafe588f701fcc0"; }) ]; buildInputs = (self.nativeDeps."wd" or []); deps = { - "archiver-0.11.0" = self.by-version."archiver"."0.11.0"; + "archiver-0.12.0" = self.by-version."archiver"."0.12.0"; "async-0.9.0" = self.by-version."async"."0.9.0"; - "colors-0.6.2" = self.by-version."colors"."0.6.2"; "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; "q-1.0.1" = self.by-version."q"."1.0.1"; - "request-2.42.0" = self.by-version."request"."2.42.0"; + "request-2.46.0" = self.by-version."request"."2.46.0"; "underscore.string-2.3.3" = self.by-version."underscore.string"."2.3.3"; "vargs-0.1.0" = self.by-version."vargs"."0.1.0"; }; @@ -22084,7 +29947,7 @@ "kew-0.1.7" = self.by-version."kew"."0.1.7"; "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; "npmconf-0.1.16" = self.by-version."npmconf"."0.1.16"; - "phantomjs-1.9.10" = self.by-version."phantomjs"."1.9.10"; + "phantomjs-1.9.12" = self.by-version."phantomjs"."1.9.12"; "tmp-0.0.24" = self.by-version."tmp"."0.0.24"; "follow-redirects-0.0.3" = self.by-version."follow-redirects"."0.0.3"; }; @@ -22093,16 +29956,16 @@ passthru.names = [ "webdrvr" ]; }; "webdrvr" = self.by-version."webdrvr"."2.43.0-0"; - by-spec."websocket-driver".">=0.3.1" = - self.by-version."websocket-driver"."0.3.5"; - by-version."websocket-driver"."0.3.5" = lib.makeOverridable self.buildNodePackage { - name = "websocket-driver-0.3.5"; + by-spec."websocket-driver".">=0.3.6" = + self.by-version."websocket-driver"."0.4.0"; + by-version."websocket-driver"."0.4.0" = lib.makeOverridable self.buildNodePackage { + name = "websocket-driver-0.4.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.3.5.tgz"; - name = "websocket-driver-0.3.5.tgz"; - sha1 = "e3a51ff538f1653a49e62d78ecfc1eb1bde9e5a0"; + url = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.4.0.tgz"; + name = "websocket-driver-0.4.0.tgz"; + sha1 = "71fa992e5d41c2cc5e290420687d0601efd06b7a"; }) ]; buildInputs = @@ -22113,6 +29976,8 @@ ]; passthru.names = [ "websocket-driver" ]; }; + by-spec."websocket-driver".">=0.4.0" = + self.by-version."websocket-driver"."0.4.0"; by-spec."when"."~3.4.6" = self.by-version."when"."3.4.6"; by-version."when"."3.4.6" = lib.makeOverridable self.buildNodePackage { @@ -22134,15 +29999,15 @@ passthru.names = [ "when" ]; }; by-spec."which"."1" = - self.by-version."which"."1.0.5"; - by-version."which"."1.0.5" = lib.makeOverridable self.buildNodePackage { - name = "which-1.0.5"; + self.by-version."which"."1.0.7"; + by-version."which"."1.0.7" = lib.makeOverridable self.buildNodePackage { + name = "which-1.0.7"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/which/-/which-1.0.5.tgz"; - name = "which-1.0.5.tgz"; - sha1 = "5630d6819dda692f1464462e7956cb42c0842739"; + url = "http://registry.npmjs.org/which/-/which-1.0.7.tgz"; + name = "which-1.0.7.tgz"; + sha1 = "853133f40e5bd2783e51a06774959455cc8ee865"; }) ]; buildInputs = @@ -22154,9 +30019,31 @@ passthru.names = [ "which" ]; }; by-spec."which"."1.0.x" = - self.by-version."which"."1.0.5"; + self.by-version."which"."1.0.7"; by-spec."which"."~1.0.5" = - self.by-version."which"."1.0.5"; + self.by-version."which"."1.0.7"; + by-spec."which"."~1.0.7" = + self.by-version."which"."1.0.7"; + by-spec."windows-no-runnable"."~0.0.6" = + self.by-version."windows-no-runnable"."0.0.6"; + by-version."windows-no-runnable"."0.0.6" = lib.makeOverridable self.buildNodePackage { + name = "windows-no-runnable-0.0.6"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/windows-no-runnable/-/windows-no-runnable-0.0.6.tgz"; + name = "windows-no-runnable-0.0.6.tgz"; + sha1 = "91e5129088330a0fe248520cee12d1ad6bb4ddfb"; + }) + ]; + buildInputs = + (self.nativeDeps."windows-no-runnable" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "windows-no-runnable" ]; + }; by-spec."winser"."=0.1.6" = self.by-version."winser"."0.1.6"; by-version."winser"."0.1.6" = lib.makeOverridable self.buildNodePackage { @@ -22180,15 +30067,15 @@ passthru.names = [ "winser" ]; }; by-spec."winston"."*" = - self.by-version."winston"."0.8.0"; - by-version."winston"."0.8.0" = lib.makeOverridable self.buildNodePackage { - name = "winston-0.8.0"; + self.by-version."winston"."0.8.3"; + by-version."winston"."0.8.3" = lib.makeOverridable self.buildNodePackage { + name = "winston-0.8.3"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/winston/-/winston-0.8.0.tgz"; - name = "winston-0.8.0.tgz"; - sha1 = "61d0830fa699706212206b0a2b5ca69a93043668"; + url = "http://registry.npmjs.org/winston/-/winston-0.8.3.tgz"; + name = "winston-0.8.3.tgz"; + sha1 = "64b6abf4cd01adcaefd5009393b1d8e8bec19db0"; }) ]; buildInputs = @@ -22198,6 +30085,7 @@ "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.0" = self.by-version."isstream"."0.1.0"; "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0"; "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9"; }; @@ -22205,7 +30093,7 @@ ]; passthru.names = [ "winston" ]; }; - "winston" = self.by-version."winston"."0.8.0"; + "winston" = self.by-version."winston"."0.8.3"; by-spec."winston"."0.6.2" = self.by-version."winston"."0.6.2"; by-version."winston"."0.6.2" = lib.makeOverridable self.buildNodePackage { @@ -22264,18 +30152,14 @@ }; by-spec."winston"."0.8.0" = self.by-version."winston"."0.8.0"; - by-spec."winston"."0.8.x" = - self.by-version."winston"."0.8.0"; - by-spec."winston"."~0.7.2" = - self.by-version."winston"."0.7.3"; - by-version."winston"."0.7.3" = lib.makeOverridable self.buildNodePackage { - name = "winston-0.7.3"; + by-version."winston"."0.8.0" = lib.makeOverridable self.buildNodePackage { + name = "winston-0.8.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/winston/-/winston-0.7.3.tgz"; - name = "winston-0.7.3.tgz"; - sha1 = "7ae313ba73fcdc2ecb4aa2f9cd446e8298677266"; + url = "http://registry.npmjs.org/winston/-/winston-0.8.0.tgz"; + name = "winston-0.8.0.tgz"; + sha1 = "61d0830fa699706212206b0a2b5ca69a93043668"; }) ]; buildInputs = @@ -22286,15 +30170,18 @@ "cycle-1.0.3" = self.by-version."cycle"."1.0.3"; "eyes-0.1.8" = self.by-version."eyes"."0.1.8"; "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0"; - "request-2.16.6" = self.by-version."request"."2.16.6"; "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9"; }; peerDependencies = [ ]; passthru.names = [ "winston" ]; }; - by-spec."winston"."~0.7.3" = - self.by-version."winston"."0.7.3"; + by-spec."winston"."0.8.x" = + self.by-version."winston"."0.8.3"; + by-spec."winston"."~0.8.1" = + self.by-version."winston"."0.8.3"; + by-spec."winston"."~0.8.3" = + self.by-version."winston"."0.8.3"; by-spec."with"."~1.1.0" = self.by-version."with"."1.1.1"; by-version."with"."1.1.1" = lib.makeOverridable self.buildNodePackage { @@ -22337,22 +30224,23 @@ ]; passthru.names = [ "with" ]; }; - by-spec."with"."~3.0.0" = - self.by-version."with"."3.0.1"; - by-version."with"."3.0.1" = lib.makeOverridable self.buildNodePackage { - name = "with-3.0.1"; + by-spec."with"."~4.0.0" = + self.by-version."with"."4.0.0"; + by-version."with"."4.0.0" = lib.makeOverridable self.buildNodePackage { + name = "with-4.0.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/with/-/with-3.0.1.tgz"; - name = "with-3.0.1.tgz"; - sha1 = "08354da410243cf6173fb142bb04e6c66f96f854"; + url = "http://registry.npmjs.org/with/-/with-4.0.0.tgz"; + name = "with-4.0.0.tgz"; + sha1 = "7a78d6642d9b72960a71d1c0c45fd6dd1b878dc7"; }) ]; buildInputs = (self.nativeDeps."with" or []); deps = { - "uglify-js-2.4.15" = self.by-version."uglify-js"."2.4.15"; + "acorn-0.8.0" = self.by-version."acorn"."0.8.0"; + "acorn-globals-1.0.1" = self.by-version."acorn-globals"."1.0.1"; }; peerDependencies = [ ]; @@ -22441,7 +30329,7 @@ buildInputs = (self.nativeDeps."write-file-atomic" or []); deps = { - "graceful-fs-3.0.2" = self.by-version."graceful-fs"."3.0.2"; + "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; "slide-1.1.6" = self.by-version."slide"."1.1.6"; }; peerDependencies = [ @@ -22466,7 +30354,7 @@ "commander-2.1.0" = self.by-version."commander"."2.1.0"; "nan-1.0.0" = self.by-version."nan"."1.0.0"; "tinycolor-0.0.1" = self.by-version."tinycolor"."0.0.1"; - "options-0.0.5" = self.by-version."options"."0.0.5"; + "options-0.0.6" = self.by-version."options"."0.0.6"; }; peerDependencies = [ ]; @@ -22511,13 +30399,35 @@ buildInputs = (self.nativeDeps."x509" or []); deps = { - "nan-1.3.0" = self.by-version."nan"."1.3.0"; + "nan-1.4.1" = self.by-version."nan"."1.4.1"; }; peerDependencies = [ ]; passthru.names = [ "x509" ]; }; "x509" = self.by-version."x509"."0.1.4"; + by-spec."xcode"."0.6.7" = + self.by-version."xcode"."0.6.7"; + by-version."xcode"."0.6.7" = lib.makeOverridable self.buildNodePackage { + name = "xcode-0.6.7"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/xcode/-/xcode-0.6.7.tgz"; + name = "xcode-0.6.7.tgz"; + sha1 = "df11a8615e43dfa397cbf593b0fd14ebeadf4e7a"; + }) + ]; + buildInputs = + (self.nativeDeps."xcode" or []); + deps = { + "pegjs-0.6.2" = self.by-version."pegjs"."0.6.2"; + "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3"; + }; + peerDependencies = [ + ]; + passthru.names = [ "xcode" ]; + }; by-spec."xml2js"."0.2.4" = self.by-version."xml2js"."0.2.4"; by-version."xml2js"."0.2.4" = lib.makeOverridable self.buildNodePackage { @@ -22533,7 +30443,7 @@ buildInputs = (self.nativeDeps."xml2js" or []); deps = { - "sax-0.6.0" = self.by-version."sax"."0.6.0"; + "sax-0.6.1" = self.by-version."sax"."0.6.1"; }; peerDependencies = [ ]; @@ -22575,8 +30485,8 @@ buildInputs = (self.nativeDeps."xml2js" or []); deps = { - "sax-0.6.0" = self.by-version."sax"."0.6.0"; - "xmlbuilder-2.4.4" = self.by-version."xmlbuilder"."2.4.4"; + "sax-0.6.1" = self.by-version."sax"."0.6.1"; + "xmlbuilder-2.4.5" = self.by-version."xmlbuilder"."2.4.5"; }; peerDependencies = [ ]; @@ -22608,16 +30518,57 @@ ]; passthru.names = [ "xmlbuilder" ]; }; + by-spec."xmlbuilder"."0.4.x" = + self.by-version."xmlbuilder"."0.4.3"; + by-version."xmlbuilder"."0.4.3" = lib.makeOverridable self.buildNodePackage { + name = "xmlbuilder-0.4.3"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.3.tgz"; + name = "xmlbuilder-0.4.3.tgz"; + sha1 = "c4614ba74e0ad196e609c9272cd9e1ddb28a8a58"; + }) + ]; + buildInputs = + (self.nativeDeps."xmlbuilder" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "xmlbuilder" ]; + }; + by-spec."xmlbuilder"."2.2.1" = + self.by-version."xmlbuilder"."2.2.1"; + by-version."xmlbuilder"."2.2.1" = lib.makeOverridable self.buildNodePackage { + name = "xmlbuilder-2.2.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.2.1.tgz"; + name = "xmlbuilder-2.2.1.tgz"; + sha1 = "9326430f130d87435d4c4086643aa2926e105a32"; + }) + ]; + buildInputs = + (self.nativeDeps."xmlbuilder" or []); + deps = { + "lodash-node-2.4.1" = self.by-version."lodash-node"."2.4.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "xmlbuilder" ]; + }; by-spec."xmlbuilder".">=1.0.0" = - self.by-version."xmlbuilder"."2.4.4"; - by-version."xmlbuilder"."2.4.4" = lib.makeOverridable self.buildNodePackage { - name = "xmlbuilder-2.4.4"; + self.by-version."xmlbuilder"."2.4.5"; + by-version."xmlbuilder"."2.4.5" = lib.makeOverridable self.buildNodePackage { + name = "xmlbuilder-2.4.5"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.4.4.tgz"; - name = "xmlbuilder-2.4.4.tgz"; - sha1 = "6e2a84da5df79e11abb0a05bad2f0acc12e33893"; + url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.4.5.tgz"; + name = "xmlbuilder-2.4.5.tgz"; + sha1 = "0c1c27c8904162cc7f2572ab51cc2ac466007102"; }) ]; buildInputs = @@ -22629,7 +30580,7 @@ ]; passthru.names = [ "xmlbuilder" ]; }; - by-spec."xmldom"."~0.1.16" = + by-spec."xmldom"."0.1.x" = self.by-version."xmldom"."0.1.19"; by-version."xmldom"."0.1.19" = lib.makeOverridable self.buildNodePackage { name = "xmldom-0.1.19"; @@ -22649,6 +30600,8 @@ ]; passthru.names = [ "xmldom" ]; }; + by-spec."xmldom"."~0.1.16" = + self.by-version."xmldom"."0.1.19"; by-spec."xmlhttprequest"."1.4.2" = self.by-version."xmlhttprequest"."1.4.2"; by-version."xmlhttprequest"."1.4.2" = lib.makeOverridable self.buildNodePackage { @@ -22752,8 +30705,6 @@ ]; passthru.names = [ "xtend" ]; }; - by-spec."xtend"."~2.1.2" = - self.by-version."xtend"."2.1.2"; by-spec."xtend"."~3.0.0" = self.by-version."xtend"."3.0.0"; by-spec."yargs"."~1.2.1" = @@ -22814,7 +30765,7 @@ deps = { "compress-commons-0.1.6" = self.by-version."compress-commons"."0.1.6"; "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; - "readable-stream-1.0.32" = self.by-version."readable-stream"."1.0.32"; + "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; }; peerDependencies = [ ]; @@ -22841,4 +30792,6 @@ ]; passthru.names = [ "zlib-browserify" ]; }; + by-spec."zlib-browserify"."~0.0.3" = + self.by-version."zlib-browserify"."0.0.3"; } diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index 0550048a13ee..5f6761bde054 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -43,7 +43,6 @@ , "jade" , "view-helpers" , "redis" -, "mongodb" , { "mongoose": "3.6.x" } , "mongoose-schema-extend" , "connect-mongo" @@ -63,6 +62,7 @@ , "libyaml" , "i18next" , "stylus" +, "nib" , "npm" , "gridfs-stream" , "tar" @@ -126,4 +126,24 @@ , "shelljs" , "typescript" , "git-run" +, "bower" +, "bower2nix" +, "npm-check-updates" +, "node-stringprep" +, "ltx" +, "node-xmpp" +, "node-xmpp-core" +, "node-xmpp-client" +, "node-xmpp-component" +, "node-xmpp-server" +, "node-xmpp-serviceadmin" +, "node-xmpp-joap" +, "plc" +, "7f" +, "jfs" +, "toobusy" +, "cordova" +, "sloc" +, "peerflix" +, "peerflix-server" ] diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index 448904ce385a..0aa26d347535 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -3,6 +3,7 @@ rec { nativeDeps = { "node-expat" = [ pkgs.expat ]; + "node-stringprep" = [ pkgs.icu pkgs.which ]; "rbytes" = [ pkgs.openssl ]; "phantomjs" = [ pkgs.phantomjs ]; "node-protobuf" = [ pkgs.protobuf ]; @@ -20,7 +21,7 @@ rec { unpackFile ${src} chmod -R +w */ mv */ package 2>/dev/null || true - sed -i -e "s/:\s*\"latest\"/: \"*\"/" -e "s/:\s*\"\(https\?\|git\(\+\(ssh\|http\|https\)\)\?\):\/\/[^\"]*\"/: \"*\"/" package/package.json + sed -i -e "s/:\s*\"latest\"/: \"*\"/" -e "s/:\s\+\"[A-Za-z0-9_-]\+\/[A-Za-z0-9_-]\+\"/: \"*\"/" -e "s/:\s*\"\(https\?\|git\(\+\(ssh\|http\|https\)\)\?\):\/\/[^\"]*\"/: \"*\"/" package/package.json mv */ $out ''; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 452144e0087c..d02a4f69a167 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -61,7 +61,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "A module for merging hierarchies using the C3 algorithm"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -125,7 +125,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ AnyEvent JSONXS ]; meta = { description = "Communicate with the i3 window manager"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -139,7 +139,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ AnyEvent DevelGlobalDestruction FileShareDir ListMoreUtils NetAMQP Readonly namespaceclean ]; meta = { description = "An asynchronous and multi channel Perl AMQP client"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -164,7 +164,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/kazeburo/Apache-LogFormat-Compiler; description = "Compile a log format string to perl-code"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -188,7 +188,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/app-cmd; description = "Write command line apps with less suffering"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -205,6 +205,20 @@ let self = _self // overrides; _self = with self; { }; }; + Appperlbrew = buildPerlPackage { + name = "App-perlbrew-0.71"; + src = fetchurl { + url = mirror://cpan/authors/id/G/GU/GUGOD/App-perlbrew-0.71.tar.gz; + sha256 = "5e5de7c4d5235556f6cd5c5e56751fb2d73821ef58390e457db4253542224a09"; + }; + buildInputs = [ pkgs.curl IOAll PathClass TestException TestNoWarnings TestOutput TestSpec ]; + propagatedBuildInputs = [ CPANPerlReleases CaptureTiny DevelPatchPerl locallib ]; + meta = { + description = "Manage perl installations in your $HOME"; + license = stdenv.lib.licenses.mit; + }; + }; + ArrayCompare = buildPerlPackage { name = "Array-Compare-1.18"; src = fetchurl { @@ -229,7 +243,7 @@ let self = _self // overrides; _self = with self; { name = "Archive-Zip-1.16"; src = fetchurl { url = http://tarballs.nixos.org/Archive-Zip-1.16.tar.gz; - md5 = "e28dff400d07b1659d659d8dde7071f1"; + sha256 = "1ghgs64by3ybjlb0bj65kxysb03k72i7iwmw63g41bj175l44ima"; }; }; @@ -281,7 +295,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ScopeGuard ]; meta = { description = "Call methods on native types"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -309,7 +323,7 @@ let self = _self // overrides; _self = with self; { ''; homepage = http://www.aarontrevena.co.uk/opensource/autodia/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; }; @@ -323,7 +337,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Replace functions with ones that succeed or die with lexical scope"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -338,7 +352,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/autovivification/; description = "Lexically disable autovivification"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -357,7 +371,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/B-Hooks-EndOfScope; description = "Execute code after a scope finished compilation"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -370,7 +384,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ ExtUtilsDepends ]; meta = { description = "Wrap OP check callbacks"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -410,7 +424,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/ingydotnet/boolean-pm/tree; description = "Boolean support for Perl"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -432,7 +446,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ BusinessISBNData URI ]; meta = { description = "Parse and validate ISBNs"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -444,7 +458,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Data pack for Business::ISBN"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -457,7 +471,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ TieCycle ]; meta = { description = "Work with International Standard Music Numbers"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -469,7 +483,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Work with International Standard Serial Numbers"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -566,7 +580,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://metacpan.org/release/Capture-Tiny; description = "Capture STDOUT and STDERR from Perl, XS or external programs"; - license = "apache_2_0"; + license = stdenv.lib.licenses.asl20; }; }; @@ -578,7 +592,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Warns and dies noisily with stack backtraces"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -601,7 +615,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CarpAssert TestException ]; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -614,7 +628,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ TestException ]; meta = { description = "Report errors from perspective of caller of a \"clan\" of modules"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -637,7 +651,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystRuntime ClassInspector ConfigGeneral DataSerializer DataTaxi FreezeThaw HTMLParser JSONXS LWPUserAgent Moose MROCompat namespaceautoclean ParamsValidate PHPSerialization URIFind XMLSimple YAMLSyck ]; meta = { description = "Automated REST Method Dispatching"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = stdenv.lib.platforms.linux; }; }; @@ -652,7 +666,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystPluginAuthentication CatalystRuntime ClassAccessorFast DataUUID StringEscape URI ]; meta = { description = "HTTP Basic and Digest authentication"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -678,7 +692,8 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystModelDBICSchema CatalystPluginAuthentication CatalystRuntime DBIxClass ListMoreUtils Moose namespaceautoclean TryTiny ]; meta = { description = "A storage class for Catalyst Authentication using DBIx::Class"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + platforms = stdenv.lib.platforms.linux; }; }; @@ -717,7 +732,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://dev.catalyst.perl.org/; description = "Catalyst Development Tools"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = stdenv.lib.platforms.linux; }; }; @@ -731,7 +746,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Moose TextSimpleTable ]; meta = { description = "Regex DispatchType"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -761,37 +776,37 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "The Catalyst developer's manual"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; CatalystModelDBICSchema = buildPerlPackage { - name = "Catalyst-Model-DBIC-Schema-0.60"; + name = "Catalyst-Model-DBIC-Schema-0.65"; src = fetchurl { - url = mirror://cpan/authors/id/R/RK/RKITOVER/Catalyst-Model-DBIC-Schema-0.60.tar.gz; - sha256 = "176jqvrmhp0wng446m0qlmh1kgqj4z1czg6s418ffr4a7c3jqyld"; + url = mirror://cpan/authors/id/G/GB/GBJK/Catalyst-Model-DBIC-Schema-0.65.tar.gz; + sha256 = "26a911ef5ef7ffc81b6ce65c3156f71fb35083c456ad27e6d82d2dc02493eeea"; }; buildInputs = [ DBDSQLite TestException TestRequires ]; - propagatedBuildInputs = [ CarpClan CatalystComponentInstancePerContext CatalystDevel CatalystRuntime CatalystXComponentTraits DBIxClass DBIxClassCursorCached DBIxClassSchemaLoader HashMerge ListMoreUtils Moose MooseXMarkAsMethods MooseXNonMoose MooseXTypes namespaceautoclean namespaceclean TieIxHash TryTiny ]; + propagatedBuildInputs = [ CarpClan CatalystComponentInstancePerContext CatalystRuntime CatalystXComponentTraits DBIxClass DBIxClassSchemaLoader HashMerge ListMoreUtils ModuleRuntime Moose MooseXMarkAsMethods MooseXNonMoose MooseXTypes MooseXTypesLoadableClass TieIxHash TryTiny namespaceautoclean namespaceclean ]; meta = { description = "DBIx::Class::Schema Model Class"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = stdenv.lib.platforms.linux; }; }; CatalystRuntime = buildPerlPackage { - name = "Catalyst-Runtime-5.90030"; + name = "Catalyst-Runtime-5.90075"; src = fetchurl { - url = mirror://cpan/authors/id/J/JJ/JJNAPIORK/Catalyst-Runtime-5.90030.tar.gz; - sha256 = "c27357f744fa0d2f9b2682c5f86723d90de43f30cd50089306dd13eb8849eb0c"; + url = mirror://cpan/authors/id/J/JJ/JJNAPIORK/Catalyst-Runtime-5.90075.tar.gz; + sha256 = "a80ed1b1600a8ababda34bc024756a6fb0275b0fff3fa1bb17104813e3ce8752"; }; - buildInputs = [ ClassDataInheritable DataDump HTTPMessage TestException ]; - propagatedBuildInputs = [ CGISimple CatalystDispatchTypeRegex ClassC3AdoptNEXT ClassLoad DataDump DataOptList HTMLParser HTTPBody HTTPMessage HTTPRequestAsCGI LWP ListMoreUtils MROCompat Moose MooseXEmulateClassAccessorFast MooseXGetopt MooseXMethodAttributes MooseXRoleWithOverloading PathClass Plack PlackMiddlewareReverseProxy PlackTestExternalServer SafeIsa StringRewritePrefix SubExporter TaskWeaken TextSimpleTable TreeSimple TreeSimpleVisitorFactory TryTiny URI namespaceautoclean namespaceclean ]; + buildInputs = [ DataDump HTTPMessage IOstringy JSONMaybeXS TestFatal ]; + propagatedBuildInputs = [ CGISimple CGIStruct ClassC3AdoptNEXT ClassDataInheritable ClassLoad DataDump DataOptList Encode HTMLParser HTTPBody HTTPMessage HTTPRequestAsCGI HashMultiValue JSONMaybeXS LWP ListMoreUtils MROCompat ModulePluggable Moose MooseXEmulateClassAccessorFast MooseXGetopt MooseXMethodAttributes MooseXRoleWithOverloading PathClass Plack PlackMiddlewareFixMissingBodyInRedirect PlackMiddlewareMethodOverride PlackMiddlewareRemoveRedundantBody PlackMiddlewareReverseProxy PlackTestExternalServer SafeIsa StreamBuffered StringRewritePrefix SubExporter TaskWeaken TermSizeAny TextSimpleTable TreeSimple TreeSimpleVisitorFactory TryTiny URI namespaceautoclean namespaceclean ]; meta = { homepage = http://dev.catalyst.perl.org/; description = "The Catalyst Framework Runtime"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = stdenv.lib.platforms.linux; }; }; @@ -803,9 +818,10 @@ let self = _self // overrides; _self = with self; { sha256 = "0hqvckaw91q5yc25a33bp0d4qqxlgkp7rxlvi8n8svxd1406r55s"; }; propagatedBuildInputs = [ CatalystRuntime DateTime Moose namespaceautoclean ]; + doCheck = false; meta = { description = "Request logging from within Catalyst"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = stdenv.lib.platforms.linux; }; }; @@ -820,7 +836,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystPluginSession CatalystRuntime ClassInspector Moose MooseXEmulateClassAccessorFast MROCompat namespaceautoclean StringRewritePrefix TryTiny ]; meta = { description = "Infrastructure plugin for the Catalyst authentication framework"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -843,7 +859,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystPluginAuthentication CatalystRuntime SetObject UNIVERSALisa ]; meta = { description = "Role based authorization for Catalyst based on Catalyst::Plugin::Authentication"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = stdenv.lib.platforms.linux; }; }; @@ -857,8 +873,8 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestDeep TestException ]; propagatedBuildInputs = [ CatalystRuntime MROCompat TaskWeaken ]; meta = { - description = "Flexible caching support for Catalyst."; - license = "perl"; + description = "Flexible caching support for Catalyst"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -874,7 +890,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassAccessorFast HTTPMessage MROCompat ]; meta = { description = "HTTP/1.1 cache validators for Catalyst"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -912,7 +928,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystRuntime ClassDataInheritable LWP TryTiny URI ]; meta = { description = "Unicode aware Catalyst"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -937,7 +953,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystRuntime Moose MooseXEmulateClassAccessorFast MROCompat namespaceclean ObjectSignature ]; meta = { description = "Generic Session plugin - ties together server side storage and client side state required to maintain session data"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -976,7 +992,8 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystRuntime DevelStackTrace MROCompat ]; meta = { description = "Display a stack trace on the debug screen"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + platforms = stdenv.lib.platforms.linux; }; }; @@ -990,7 +1007,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystRuntime MIMETypes Moose MooseXTypes namespaceautoclean ]; meta = { description = "Make serving static pages painless"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1002,6 +1019,10 @@ let self = _self // overrides; _self = with self; { }; buildInputs = [ TestWWWMechanizeCatalyst Testuseok ]; propagatedBuildInputs = [ CatalystRuntime TextCSV XMLSimple ]; + meta = { + license = "perl"; + platforms = stdenv.lib.platforms.linux; + }; }; CatalystViewJSON = buildPerlPackage { @@ -1014,7 +1035,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystRuntime JSONAny MROCompat YAML ]; meta = { description = "JSON view for your data"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = stdenv.lib.platforms.linux; }; }; @@ -1028,7 +1049,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystRuntime ClassAccessor MROCompat PathClass TemplateToolkit TemplateTimer ]; meta = { description = "Template View Class"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = stdenv.lib.platforms.linux; }; }; @@ -1053,14 +1074,19 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ MooseXRelatedClassRoles CatalystRuntime ]; }; - CatalystTraitForRequestProxyBase = buildPerlPackage rec { + CatalystTraitForRequestProxyBase = buildPerlPackage { name = "Catalyst-TraitFor-Request-ProxyBase-0.000005"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Catalyst/${name}.tar.gz"; - sha256 = "02kir63d5cs2ipj3fn1qlmmx3gqi1xqzrxfr4pv5vjhjgsm0zgx7"; + url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-TraitFor-Request-ProxyBase-0.000005.tar.gz; + sha256 = "a7bf0faa7e12ca5df625d9f5fc710f11bfd16ba5385837e48d42b3d286c9710a"; + }; + buildInputs = [ CatalystRuntime HTTPMessage ]; + propagatedBuildInputs = [ CatalystXRoleApplicator Moose URI namespaceautoclean ]; + meta = { + description = "Replace request base with value passed by HTTP proxy"; + license = "perl"; + platforms = stdenv.lib.platforms.linux; }; - buildInputs = [ CatalystRuntime ]; - propagatedBuildInputs = [ Moose URI CatalystXRoleApplicator ]; }; CatalystXScriptServerStarman = buildPerlPackage { @@ -1073,7 +1099,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystRuntime Moose namespaceautoclean Starman ]; meta = { description = "Replace the development server with Starman"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = stdenv.lib.platforms.linux; }; }; @@ -1126,7 +1152,20 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ IOStringy ]; meta = { description = "A Simple totally OO CGI interface that is CGI.pm compliant"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + CGIStruct = buildPerlPackage { + name = "CGI-Struct-1.21"; + src = fetchurl { + url = mirror://cpan/authors/id/F/FU/FULLERMD/CGI-Struct-1.21.tar.gz; + sha256 = "d13d8da7fdcd6d906054e4760fc28a718aec91bd3cf067a58927fb7cb1c09d6c"; + }; + buildInputs = [ TestDeep ]; + meta = { + description = "Build structures from CGI data"; + license = "bsd"; }; }; @@ -1137,7 +1176,7 @@ let self = _self // overrides; _self = with self; { sha256 = "1z6fqg0yz8gay15r1iasslv8f1n1mzjkrhs47fvbj3rqz36y1cfd"; }; meta = { - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1157,23 +1196,23 @@ let self = _self // overrides; _self = with self; { sha256 = "1z6fqg0yz8gay15r1iasslv8f1n1mzjkrhs47fvbj3rqz36y1cfd"; }; meta = { - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; }; ClassAccessorGrouped = buildPerlPackage { - name = "Class-Accessor-Grouped-0.10010"; + name = "Class-Accessor-Grouped-0.10012"; src = fetchurl { - url = mirror://cpan/authors/id/R/RI/RIBASUSHI/Class-Accessor-Grouped-0.10010.tar.gz; - sha256 = "1hlfjfhagsksskv01viq1z14wlr0i4xl3nvznvq1qrnqwqxs4qi1"; + url = mirror://cpan/authors/id/R/RI/RIBASUSHI/Class-Accessor-Grouped-0.10012.tar.gz; + sha256 = "c4613ee3307939f47a9afd40e8b173f3a22f501c3b139799aa030f01b627e7fe"; }; - buildInputs = [ TestException ]; - propagatedBuildInputs = [ ClassXSAccessor ModuleRuntime SubName ]; + buildInputs = [ ClassXSAccessor DevelHide PackageStash SubName TestException ]; + propagatedBuildInputs = [ ModuleRuntime ]; meta = { description = "Lets you build groups of accessors"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1202,7 +1241,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ AlgorithmC3 ]; meta = { description = "A pragma to use the C3 method resolution order algortihm"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1217,7 +1256,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Class-C3-Adopt-NEXT; description = "Make NEXT suck less"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1230,7 +1269,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestException ]; propagatedBuildInputs = [ ClassC3 ClassInspector MROCompat ]; meta = { - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1266,7 +1305,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Get information about a class and its structure"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1305,7 +1344,7 @@ let self = _self // overrides; _self = with self; { preConfigure = "patchShebangs ."; meta = { description = "A module for creating generic methods"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1319,7 +1358,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/sartak/Class-Method-Modifiers/tree; description = "Provides Moose-like method modifiers"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1361,7 +1400,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "A working (require \"Class::Name\") and more"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1376,7 +1415,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "XS implementation of parts of Class::Load"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -1397,7 +1436,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Generate fast XS accessors without runtime compilation"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1409,7 +1448,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Recursively copy Perl datatypes"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1439,7 +1478,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Low-Level Interface to bzip2 compression library"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1475,8 +1514,8 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ CaptureTiny ]; meta = { - description = "A module to implement some of AutoConf macros in pure perl."; - license = "perl5"; + description = "A module to implement some of AutoConf macros in pure perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1487,7 +1526,7 @@ let self = _self // overrides; _self = with self; { sha256 = "07rmabdh21ljyc9yy6gpjg4w1y0lzwz8daljf0jv2g521hpdfdwr"; }; meta = { - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1501,7 +1540,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/Config-INI; description = "Simple .ini-file format"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1516,7 +1555,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/config-mvp; description = "Multivalue-property package-oriented configuration"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1530,7 +1569,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/Config-MVP-Reader-INI; description = "An MVP config reader for .ini files"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1621,50 +1660,48 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Read and write Changes files"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; CPANMeta = buildPerlPackage { - name = "CPAN-Meta-2.120921"; + name = "CPAN-Meta-2.142690"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/CPAN-Meta-2.120921.tar.gz; - sha256 = "12cprk636jaklc97vdh55yjvzcr13h3csdnv3dgna84r2jijka79"; + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/CPAN-Meta-2.142690.tar.gz; + sha256 = "495770e22e91e3d2bd04dc364f05061cabacfdce35baa3868bc0c05733d145db"; }; - propagatedBuildInputs = [ ParseCPANMeta CPANMetaYAML CPANMetaRequirements ]; + propagatedBuildInputs = [ ParseCPANMeta CPANMetaYAML CPANMetaRequirements JSONPP ]; meta = { - homepage = https://github.com/dagolden/cpan-meta; + homepage = https://github.com/Perl-Toolchain-Gang/CPAN-Meta; description = "The distribution metadata for a CPAN dist"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; CPANMetaCheck = buildPerlPackage { - name = "CPAN-Meta-Check-0.004"; + name = "CPAN-Meta-Check-0.009"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/CPAN-Meta-Check-0.004.tar.gz; - sha256 = "0ccybgfc0p41shmc6nmbg20xljq2ygfjcxmyaf6y07yk6wdcyf7s"; + url = mirror://cpan/authors/id/L/LE/LEONT/CPAN-Meta-Check-0.009.tar.gz; + sha256 = "eb2d43afd1da276e4acdebd24937f5171d0aaca8d19a5ef0c3e834b8792b7361"; }; - buildInputs = [ TestDifferences ]; + buildInputs = [ TestDeep ]; propagatedBuildInputs = [ CPANMeta CPANMetaRequirements ]; meta = { - homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Verify requirements in a CPAN::Meta object"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; CPANMetaRequirements = buildPerlPackage { - name = "CPAN-Meta-Requirements-2.125"; + name = "CPAN-Meta-Requirements-2.128"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/CPAN-Meta-Requirements-2.125.tar.gz; - sha256 = "1d6sryjkk52n4m8h7l0jc4hr9xrq2d02l8clzm48rq1h6j6q49hq"; + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/CPAN-Meta-Requirements-2.128.tar.gz; + sha256 = "ff0ae309ed76d8c7381fdb8436659a594e6884eeac1c9a742ba9aa7ee2a1d52d"; }; - buildInputs = [ TestMore ]; meta = { - homepage = https://github.com/dagolden/cpan-meta-requirements; + homepage = https://github.com/dagolden/CPAN-Meta-Requirements; description = "A set of version requirements for a CPAN dist"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1679,7 +1716,20 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/dagolden/CPAN-Meta-YAML; description = "Read and write a subset of YAML for CPAN Meta files"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + CPANPerlReleases = buildPerlPackage { + name = "CPAN-Perl-Releases-1.94"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BI/BINGOS/CPAN-Perl-Releases-1.94.tar.gz; + sha256 = "ebc70640541f5b6d1191ba7bf958d369d9e21be0908ac812663047290b95fdf2"; + }; + meta = { + homepage = https://github.com/bingos/cpan-perl-releases; + description = "Mapping Perl releases on CPAN to the location of the tarballs"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1693,7 +1743,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/cpan-uploader; description = "Upload things to the CPAN"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1770,7 +1820,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Crypt-Random-Source; description = "Get weak or strong random data from pluggable sources"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -1873,7 +1923,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Temporary changing working directory (chdir)"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1886,7 +1936,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestRequires ]; meta = { description = "Polymorphic data cloning"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -1909,7 +1959,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Pretty printing of data structures"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1965,7 +2015,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://github.com/rjbs/data-optlist; description = "Parse and validate simple name/value option pairs"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1988,7 +2038,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/data-section; description = "Read multiple hunks of data out of your DATA section"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2000,7 +2050,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Modules that serialize data structures"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2015,7 +2065,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/Data-Stream-Bulk; description = "N at a time iteration API"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2047,7 +2097,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://metacpan.org/release/Data-UUID-MT; description = "Fast random UUID generator using the Mersenne Twister algorithm"; - license = "apache_2_0"; + license = stdenv.lib.licenses.asl20; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -2110,7 +2160,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DateTimeLocale DateTimeTimeZone ParamsValidate TryTiny ]; meta = { description = "A date and time object"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -2145,7 +2195,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassFactoryUtil DateTime DateTimeFormatStrptime ParamsValidate ]; meta = { description = "Create DateTime parser classes and objects"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -2158,7 +2208,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DateTime DateTimeFormatBuilder DateTimeTimeZone ListMoreUtils TestMockTime ]; meta = { description = "DateTime::Format::Flexible - Flexibly parse strings and turn them into DateTime objects"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2171,7 +2221,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DateTime HTTPDate ]; meta = { description = "Date conversion routines"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2184,7 +2234,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DateTime DateTimeEventICal DateTimeSet DateTimeTimeZone ParamsValidate ]; meta = { description = "Parse and format iCal datetime and duration strings"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2197,7 +2247,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DateTime DateTimeFormatBuilder ]; meta = { description = "Parses ISO8601 formats"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -2213,7 +2263,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Clone DateTime DateTimeTimeZone ListMoreUtils ParamsValidate boolean ]; meta = { description = "Create machine readable date/time with natural parsing logic"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2226,7 +2276,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DateTime DateTimeFormatBuilder DateTimeTimeZone ]; meta = { description = "Parse and format PostgreSQL dates and times"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -2241,7 +2291,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DateTime DateTimeLocale DateTimeTimeZone ParamsValidate ]; meta = { description = "Parse and format strp and strf time patterns"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -2255,7 +2305,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://datetime.perl.org/; description = "Localization support for DateTime.pm"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2282,7 +2332,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassLoad ClassSingleton ParamsValidate ]; meta = { description = "Time zone object base class and factory"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2296,7 +2346,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DateTime DateTimeFormatFlexible DateTimeFormatICal DateTimeFormatNatural TimeDate ]; meta = { description = "Parse a date/time string using the best method available"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2308,8 +2358,8 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ ClassISA DevelStackTrace StringUtil TermReadKey TextTabularDisplay TieIxHash ]; meta = { - description = "Debug::ShowStuff - A collection of handy debugging routines for displaying the values of variables with a minimum of coding."; - license = "perl"; + description = "A collection of handy debugging routines for displaying the values of variables with a minimum of coding"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2322,7 +2372,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ PadWalker ]; meta = { description = "Meatier versions of C<caller>"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2335,6 +2385,20 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ IOCaptureOutput ]; }; + DevelPatchPerl = buildPerlPackage { + name = "Devel-PatchPerl-1.28"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BI/BINGOS/Devel-PatchPerl-1.28.tar.gz; + sha256 = "03085cd6a8b565a4f789c838e8208a8377e0d1aeb7f5becc3b0d3219409d6b82"; + }; + propagatedBuildInputs = [ Filepushd ]; + meta = { + homepage = https://github.com/bingos/devel-patchperl; + description = "Patch perl source a la Devel::PPPort's buildperl.pl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + DevelSizeMe = buildPerlPackage { name = "Devel-SizeMe-0.19"; src = fetchurl { @@ -2345,7 +2409,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/timbunce/devel-sizeme; description = "Unknown"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2357,7 +2421,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Print out each line before it is executed (like sh -x)"; - license = "Public Domain"; + license = stdenv.lib.licenses.publicDomain; }; }; @@ -2390,23 +2454,22 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://dbi.perl.org/; description = "Database independent interface for Perl"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; DBIxClass = buildPerlPackage { - name = "DBIx-Class-0.08250"; + name = "DBIx-Class-0.082801"; src = fetchurl { - url = mirror://cpan/authors/id/R/RI/RIBASUSHI/DBIx-Class-0.08250.tar.gz; - sha256 = "0nsqvj34klc9pf4l5kj3nqkq7agbsn11ys4115100awf7gxjbad6"; + url = mirror://cpan/authors/id/R/RI/RIBASUSHI/DBIx-Class-0.082801.tar.gz; + sha256 = "889d6f9139d8e73f5524dfa211019126042e84cb7a0ec30cd2ed7d315d73484b"; }; - patches = [ ../development/perl-modules/dbix-class-fix-tests.patch ]; - buildInputs = [ DBDSQLite PackageStash TestException TestWarn TestDeep ]; - propagatedBuildInputs = [ ClassAccessorGrouped ClassC3Componentised ClassInspector ClassMethodModifiers ConfigAny ContextPreserve DataCompare DataDumperConcise DataPage DBI DevelGlobalDestruction HashMerge ModuleFind Moo MROCompat namespaceclean PathClass ScopeGuard SQLAbstract strictures SubName TryTiny ]; + buildInputs = [ DBDSQLite PackageStash TestDeep TestException TestWarn ]; + propagatedBuildInputs = [ ClassAccessorGrouped ClassC3Componentised ClassInspector ConfigAny ContextPreserve DBI DataDumperConcise DataPage DevelGlobalDestruction HashMerge MROCompat ModuleFind Moo PathClass SQLAbstract ScopeGuard SubName TryTiny namespaceclean ]; meta = { homepage = http://www.dbix-class.org/; description = "Extensible and flexible object <-> relational mapper"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2419,7 +2482,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ TestDeep TestFatal DBIxClass LinguaENInflect StringCamelCase ]; meta = { description = "Sugar for your favorite ORM, DBIx::Class"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2433,7 +2496,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CarpClan DBIxClass ]; meta = { description = "Cursor class with built-in caching support"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2454,8 +2517,8 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ DBIxClassCandy TestDeep CarpClan DBDSQLite ]; meta = { - description = "Simplify the common case stuff for DBIx::Class."; - license = "perl5"; + description = "Simplify the common case stuff for DBIx::Class"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2468,7 +2531,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DBIxClass ]; meta = { description = "Introspect many-to-many relationships"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2482,7 +2545,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CarpClan ClassAccessorGrouped ClassC3Componentised ClassInspector ClassUnload DataDump DBIxClass HashMerge LinguaENInflectNumber LinguaENInflectPhrase LinguaENTagger ListMoreUtils MROCompat namespaceclean ScopeGuard StringCamelCase StringToIdentifierEN SubName TaskWeaken TryTiny ]; meta = { description = "Create a DBIx::Class::Schema based on a database"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2497,7 +2560,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/DBIx-Connector/; description = "Fast, safe DBI connection and transaction management"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -2540,7 +2603,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ BHooksEndOfScope BHooksOPCheck SubName ]; meta = { description = "Adding keywords to perl, in perl"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -2556,7 +2619,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ExtUtilsConfig ]; meta = { description = "Find the path to your perl"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2569,7 +2632,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ SubExporterProgressive ]; meta = { homepage = http://search.cpan.org/dist/Devel-GlobalDestruction; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2595,15 +2658,15 @@ let self = _self // overrides; _self = with self; { }; DevelStackTrace = buildPerlPackage { - name = "Devel-StackTrace-1.31"; + name = "Devel-StackTrace-1.34"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Devel-StackTrace-1.31.tar.gz; - sha256 = "0djvqfbq9ag1bpw0bcksidfy13n91xbl53py3d7w0y2323hjc957"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/Devel-StackTrace-1.34.tar.gz; + sha256 = "e882ccd7f4cbab0d0cdad53897f3f3bf29bdcf47d2bdfde1ac07f1bc7d7ebd16"; }; meta = { - homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; + homepage = http://metacpan.org/release/Devel-StackTrace; description = "An object representing a stack trace"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -2616,7 +2679,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DevelStackTrace ]; meta = { description = "Displays stack trace in HTML"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2647,7 +2710,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Keyed-Hashing for Message Authentication"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2659,7 +2722,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Keyed-Hashing for Message Authentication"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -2681,7 +2744,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ LWP ]; meta = { - description = "Perl extension for getting MD5 sums for files and urls."; + description = "Perl extension for getting MD5 sums for files and urls"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -2697,7 +2760,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Perl interface to the SHA-1 algorithm"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2712,7 +2775,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Declare version conflicts for your dist"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2727,7 +2790,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://dzil.org/; description = "Distribution builder; installer not included!"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; doCheck = false; }; @@ -2743,7 +2806,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/Dist-Zilla-PluginBundle-TestingMania/; description = "Test your dist with every testing plugin conceivable"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2756,7 +2819,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DistZilla ]; meta = { description = "Dist::Zilla with Changes check"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2770,7 +2833,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/creaktive/Dist-Zilla-Plugin-MojibakeTests; description = "Release tests for source encoding"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2784,7 +2847,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Dist-Zilla-Plugin-NoTabsTests; description = "Release tests making sure hard tabs aren't used"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2799,7 +2862,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/Dist-Zilla-Plugin-PodWeaver; description = "Weave your Pod together from configuration and Dist::Zilla"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2814,7 +2877,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/DarwinAwardWinner/Dist-Zilla-Plugin-ReadmeAnyFromPod; description = "Automatically convert POD to a README in any format for Dist::Zilla"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2829,7 +2892,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/DarwinAwardWinner/Dist-Zilla-Plugin-ReadmeMarkdownFromPod; description = "Automatically convert POD to a README.mkdn for Dist::Zilla"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2844,7 +2907,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/Dist-Zilla-Plugin-Test-CPAN-Changes/; description = "Release tests for your changelog"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2859,7 +2922,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://p3rl.org/Dist::Zilla::Plugin::Test::CPAN::Meta::JSON; description = "Release tests for your META.json"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2874,7 +2937,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Dist-Zilla-Plugin-Test-Compile/; description = "Common tests to check syntax of your modules"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2889,7 +2952,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/Dist-Zilla-Plugin-Test-DistManifest/; description = "Release tests for the manifest"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2904,7 +2967,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Dist-Zilla-Plugin-Test-EOL/; description = "Author tests making sure correct line endings are used"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -2919,7 +2982,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://metacpan.org/release/Dist-Zilla-Plugin-Test-Kwalitee; description = "Release tests for kwalitee"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2934,7 +2997,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/Dist-Zilla-Plugin-Test-MinimumVersion/; description = "Release tests for minimum required versions"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2949,7 +3012,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Dist-Zilla-Plugin-Test-Perl-Critic/; description = "Tests to check your code against best practices"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2963,7 +3026,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://github.com/rwstauner/Dist-Zilla-Plugin-Test-Pod-LinkCheck; description = "Add release tests for POD links"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2978,7 +3041,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/Dist-Zilla-Plugin-Test-Portability/; description = "Release tests for portability"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2993,7 +3056,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/Dist-Zilla-Plugin-Test-Synopsis/; description = "Release tests for synopses"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3008,7 +3071,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/Dist-Zilla-Plugin-Test-UnusedVars/; description = "Release tests for unused variables"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3023,7 +3086,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Dist-Zilla-Plugin-Test-Version/; description = "Release Test::Version tests"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -3035,7 +3098,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ EmailSimple MROCompat ]; meta = { - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3048,7 +3111,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "RFC 2822 Address Parsing"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3060,7 +3123,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Produce RFC 8822 date strings"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3073,7 +3136,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ EmailAddress ]; meta = { description = "Generate world unique message-ids"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -3087,7 +3150,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ EmailMessageID EmailMIMEContentType EmailMIMEEncodings EmailSimple MIMETypes ]; meta = { - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -3101,7 +3164,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Parse a MIME Content-Type Header"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -3114,7 +3177,7 @@ let self = _self // overrides; _self = with self; { sha256 = "0fac34g44sn0l59wim68zrhih1mvlh1rxvyn3gc5pviaiz028lyy"; }; meta = { - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -3133,16 +3196,18 @@ let self = _self // overrides; _self = with self; { }; EmailSender = buildPerlPackage { - name = "Email-Sender-1.300014"; + name = "Email-Sender-1.300016"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Sender-1.300014.tar.gz; - sha256 = "0yxqk0fjxasd7q62m65dl2n6xm4xcvfb6i1lajvwibygd9ckifw6"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Sender-1.300016.tar.gz; + sha256 = "00042de1b78fb26b2ff37bd92c0d61631810725a5235f4841e38a501a533a2a3"; }; - propagatedBuildInputs = [ CaptureTiny EmailAbstract EmailAddress EmailSimple ListMoreUtils Moose Throwable TryTiny ]; + buildInputs = [ CaptureTiny ]; + propagatedBuildInputs = [ EmailAbstract EmailAddress EmailSimple ListMoreUtils ModuleRuntime Moo MooXTypesMooseLike SubExporter Throwable TryTiny ]; meta = { - homepage = https://github.com/rjbs/email-sender; + homepage = https://github.com/rjbs/Email-Sender; description = "A library for sending email"; - license = "perl5"; + license = "perl"; + platforms = stdenv.lib.platforms.linux; }; }; @@ -3155,7 +3220,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ EmailDateFormat ]; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3170,10 +3235,10 @@ let self = _self // overrides; _self = with self; { }; Encode = buildPerlPackage { - name = "Encode-2.55"; + name = "Encode-2.63"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-2.55.tar.gz; - sha256 = "0bpnfan0034k644gz6yg9xfddmsqxr2p7vbavijwbxc5k2c2sarz"; + url = mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-2.63.tar.gz; + sha256 = "1wrqm6c194l5yjaifc6nxx2b768sph2pv4n86fgh4blls0pvs6z4"; }; }; @@ -3185,7 +3250,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "EucJP-ascii - An eucJP-open mapping"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3197,7 +3262,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Extra sets of Chinese encodings"; - license = "mit"; + license = stdenv.lib.licenses.mit; }; }; @@ -3250,7 +3315,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Safely and cleanly create closures via string eval"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3315,7 +3380,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://open-exodus.net/projects/Exporter-Declare; description = "Exporting done right"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -3328,7 +3393,7 @@ let self = _self // overrides; _self = with self; { sha256 = "01g6a2ixgdi825v0l4ny3vx4chzsfxirka741x0i057cf6y5ciir"; }; meta = { - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3349,7 +3414,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "A wrapper for perl's configuration"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3369,7 +3434,7 @@ let self = _self // overrides; _self = with self; { sha256 = "0s935hmxjl6md47i80abcfaghqwhnv0ikzzqln80w4ydhg5qn9a5"; }; meta = { - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -3383,7 +3448,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Various portability utilities for module builders"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3396,7 +3461,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ExtUtilsConfig ]; meta = { description = "Build.PL install path logic made easy"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3407,8 +3472,8 @@ let self = _self // overrides; _self = with self; { sha256 = "0j4rhx3w6nbvmxqjg6q09gm10nnpkcmqmh29cgxsfc9k14d8bb6w"; }; meta = { - description = "A tool to build C libraries."; - license = "perl"; + description = "A tool to build C libraries"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3423,7 +3488,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://metacpan.org/release/ExtUtils-MakeMaker; description = "Create a module Makefile"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3526,7 +3591,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://open-exodus.net/projects/Fennec-Lite; description = "Minimalist Fennec, the commonly used bits"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -3617,7 +3682,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ FileFindRule ParamsUtil ]; meta = { description = "Common rules for searching for Perl things"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3630,7 +3695,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ FileWhich ]; meta = { description = "Find your home and other directories on any platform"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; preCheck = "export HOME=$TMPDIR"; }; @@ -3691,7 +3756,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://metacpan.org/release/File-pushd; description = "Change directory temporarily for a limited scope"; - license = "apache"; + license = stdenv.lib.licenses.asl20; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -3715,7 +3780,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://github.com/ingydotnet/file-share-pm/tree; description = "Extend File::ShareDir to Local Libraries"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -3730,7 +3795,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassInspector ]; meta = { description = "Locate per-dist and per-module shared files"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3742,7 +3807,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Install shared files"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -3756,7 +3821,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Simple and dumb file system watcher"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3770,7 +3835,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Simple and Efficient Reading/Writing/Modifying of Complete Files"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = stdenv.lib.platforms.linux; }; }; @@ -3823,7 +3888,7 @@ let self = _self // overrides; _self = with self; { doCheck = false; meta = { description = "Extensions and convenience methods to manage background processes"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3870,7 +3935,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ GD ]; meta = { description = "Security image (captcha) generator"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3902,7 +3967,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/Getopt-Long-Descriptive; description = "Getopt::Long, but simpler and more powerful"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3930,7 +3995,7 @@ let self = _self // overrides; _self = with self; { [ ../development/perl-modules/Google-ProtocolBuffers-multiline-comments.patch ]; meta = { description = "Simple interface to Google Protocol Buffers"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4014,7 +4079,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Clone ]; meta = { description = "Recursively merge two or more hashes, simply"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4026,7 +4091,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Store multiple values per key"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4093,7 +4158,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ HTMLParser HTTPMessage URI ]; meta = { description = "Class that represents an HTML form element"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4129,7 +4194,7 @@ let self = _self // overrides; _self = with self; { description = "HTML forms using Moose"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4142,7 +4207,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ HTMLTagset ]; meta = { description = "HTML parser class"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4222,7 +4287,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Work with HTML in a DOM-like tree structure"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4235,7 +4300,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ HTMLTree XMLXPathEngine ]; meta = { description = "Add XPath support to HTML::TreeBuilder"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -4265,7 +4330,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ HTTPMessage ]; meta = { description = "HTTP Body Parser"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4278,7 +4343,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ HTTPDate HTTPMessage ]; meta = { description = "HTTP cookie jars"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4291,7 +4356,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ HTTPDate HTTPMessage LWPMediaTypes ]; meta = { description = "A simple http server class"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4303,7 +4368,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Date conversion routines"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4332,7 +4397,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ EncodeLocale HTTPDate IOHTML LWPMediaTypes URI ]; meta = { description = "HTTP style messages"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4345,7 +4410,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ HTTPMessage ]; meta = { description = "Choose a variant to serve"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4387,7 +4452,7 @@ let self = _self // overrides; _self = with self; { }; doCheck = false; meta = { - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4399,13 +4464,11 @@ let self = _self // overrides; _self = with self; { }; }; - "if" = buildPerlPackage { - name = "if-0.01000001"; + if_ = buildPerlPackage { + name = "if-0.0601"; src = fetchurl { - url = mirror://cpan/authors/id/I/IL/ILYAZ/modules/if-0.01000001.tar.gz; - sha256 = "0vb40cb20b22layp5v9xa30hmcnhxidwjkfwcrxwhrvwypy2cmgw"; - }; - meta = { + url = mirror://cpan/authors/id/I/IL/ILYAZ/modules/if-0.0601.tar.gz; + sha256 = "fb2b7329aa111a673cd22dc2889167e52058aead0de2fe0855b32dd658d5c1b7"; }; }; @@ -4418,7 +4481,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ModuleRuntime ]; meta = { description = "Import packages into other packages"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4432,7 +4495,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/ingydotnet/io-all-pm/tree; description = "IO::All of it to Graham and Damian!"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -4456,7 +4519,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "IO Interface to compressed data files/buffers"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = stdenv.lib.platforms.linux; }; doCheck = !stdenv.isDarwin; @@ -4480,7 +4543,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Open an HTML file with automatic charset detection"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4492,7 +4555,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Utilities for interactive I/O"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4532,7 +4595,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/noxxi/p5-io-socket-ssl; description = "Nearly transparent SSL encapsulation for IO::Socket::INET"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; doCheck = false; # tries to connect to facebook.com etc. }; @@ -4564,7 +4627,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/io-tiecombine; description = "Produce tied (and other) separate but combined variables"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -4588,7 +4651,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "System() and background procs w/ piping, redirs, ptys (Unix, Win32)"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = stdenv.lib.platforms.linux; }; }; @@ -4661,7 +4724,7 @@ let self = _self // overrides; _self = with self; { for immediate access from Perl. ''; - license = "Artistic"; + license = stdenv.lib.licenses.artistic2; maintainers = [ ]; }; @@ -4685,7 +4748,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Write Perl Subroutines in C"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4715,7 +4778,7 @@ let self = _self // overrides; _self = with self; { available to the Perl program as if they had been written in Perl. ''; - license = "Artistic"; + license = stdenv.lib.licenses.artistic2; maintainers = [ ]; }; @@ -4738,7 +4801,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestPod ]; meta = { description = "JSON (JavaScript Object Notation) encoder/decoder"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4751,7 +4814,21 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ JSON ]; meta = { description = "Wrapper Class for the various JSON classes"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + JSONMaybeXS = buildPerlPackage { + name = "JSON-MaybeXS-1.002005"; + src = fetchurl { + url = mirror://cpan/authors/id/E/ET/ETHER/JSON-MaybeXS-1.002005.tar.gz; + sha256 = "f576caf2b10bf3a8eedaf05c0d65e7d3deb52f9c5e1894579ff9ffe71207157f"; + }; + buildInputs = [ TestWithoutModule ]; + propagatedBuildInputs = [ JSONPP ]; + meta = { + description = "Use L<Cpanel::JSON::XS> with a fallback to L<JSON::XS> and L<JSON::PP>"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4763,7 +4840,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "JSON::XS compatible pure-Perl module"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4775,7 +4852,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Helper module in using JSON::PP in Perl 5.6"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4855,7 +4932,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ HTMLParser HTMLTagset LinguaStem /* MemoizeExpireLRU */ ]; meta = { description = "Part-of-speech tagger for English natural language processing"; - license = "gpl_3"; + license = stdenv.lib.licenses.gpl3; }; }; @@ -4886,7 +4963,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ListMoreUtils ]; meta = { description = "Combines List::Util and List::MoreUtils in one bite-sized package"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -4908,7 +4985,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Provide the stuff missing in List::Util"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4973,6 +5050,18 @@ let self = _self // overrides; _self = with self; { }; }; + locallib = buildPerlPackage { + name = "local-lib-2.000014"; + src = fetchurl { + url = mirror://cpan/authors/id/H/HA/HAARG/local-lib-2.000014.tar.gz; + sha256 = "ae63356ab780c5a3aa46287b48daea748a3dd021d9b52dff8bf480b43787fa2b"; + }; + meta = { + description = "Create and use a local lib/ for perl modules with PERL5LIB"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + LockFileSimple = buildPerlPackage rec { name = "LockFile-Simple-0.208"; src = fetchurl { @@ -4991,7 +5080,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DataDumperConcise ExporterDeclare Moo ]; meta = { description = "Simple logging interface with a contextual log"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -5006,7 +5095,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassLoad ParamsValidate ]; meta = { description = "Dispatches messages to one or more outputs"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -5039,7 +5128,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/log-dispatch-array; description = "Log events to an array (reference)"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5054,7 +5143,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/log-dispatchouli; description = "A simple wrapper around Log::Dispatch"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5068,7 +5157,7 @@ let self = _self // overrides; _self = with self; { doCheck = false; # tries to start a daemon meta = { description = "The World-Wide Web library for Perl"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; }; @@ -5081,7 +5170,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Guess media type for a file or a URL"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5098,7 +5187,7 @@ let self = _self // overrides; _self = with self; { doCheck = false; # tries to connect to https://www.apache.org/. meta = { description = "Provide https support for LWP::UserAgent"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = stdenv.lib.platforms.linux; }; }; @@ -5112,7 +5201,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ EncodeLocale FileListing HTMLParser HTTPCookies HTTPDaemon HTTPDate HTTPNegotiate HTTPMessage LWPMediaTypes NetHTTP URI WWWRobotRules ]; meta = { description = "The World-Wide Web library for Perl"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5293,7 +5382,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ AnyMoose CryptRandomSource MathRandomISAAC ]; meta = { description = "Cryptographically-secure, cross-platform replacement for rand()"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -5316,7 +5405,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ FennecLite TestException ]; meta = { description = "Tools for creating Meta objects to track custom metrics"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -5331,7 +5420,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DevelDeclare ]; meta = { description = "Basic method declarations with signatures, without source filters"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -5370,7 +5459,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Charset Information for MIME"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5391,7 +5480,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Definition of MIME types"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5405,7 +5494,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/mixin-linewise; description = "Write your linewise code for handles; this does the rest"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5419,7 +5508,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/chromatic/Modern-Perl; description = "Enable all of the features of Modern Perl with one import"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5432,21 +5521,21 @@ let self = _self // overrides; _self = with self; { buildInputs = [ CPANMeta ExtUtilsCBuilder ]; meta = { description = "Build and install Perl modules"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; ModuleBuildTiny = buildPerlModule { - name = "Module-Build-Tiny-0.026"; + name = "Module-Build-Tiny-0.039"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/Module-Build-Tiny-0.026.tar.gz; - sha256 = "9a1860325404c4ea20e2a79e7236c5ad9203ab71bacab9667044e3fad1eb31ad"; + url = mirror://cpan/authors/id/L/LE/LEONT/Module-Build-Tiny-0.039.tar.gz; + sha256 = "7d580ff6ace0cbe555bf36b86dc8ea232581530cbeaaea09bccb57b55797f11c"; }; - buildInputs = [ ExtUtilsConfig ExtUtilsHelpers ExtUtilsInstallPaths JSONPP perl ]; - propagatedBuildInputs = [ ExtUtilsConfig ExtUtilsHelpers ExtUtilsInstallPaths JSONPP ]; + buildInputs = [ ExtUtilsConfig ExtUtilsHelpers ExtUtilsInstallPaths JSONPP TestHarness perl ]; + propagatedBuildInputs = [ ExtUtilsConfig ExtUtilsHelpers ExtUtilsInstallPaths JSONPP TestHarness ]; meta = { description = "A tiny replacement for Module::Build"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5468,7 +5557,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ FileCopyRecursive CwdGuard CaptureTiny ]; meta = { description = "A Module::Build class for building XS modules"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5481,7 +5570,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://dev.perl.org/; description = "What modules shipped with versions of perl"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5493,7 +5582,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Find and use installed modules in a (sub)category"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5508,7 +5597,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Loads one of several alternate underlying implementations for a module"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -5521,7 +5610,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestPod TestPodCoverage ]; meta = { description = "Information about Perl modules"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5535,7 +5624,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ FileRemove LWPUserAgent ModuleScanDeps PARDist YAMLTiny ]; meta = { description = "Standalone, extensible Perl module installer"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5548,7 +5637,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ModuleInstall ]; meta = { description = "Declare author-only dependencies"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -5563,7 +5652,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ModuleInstall ]; meta = { description = "Designate tests only run by module authors"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -5579,7 +5668,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ParamsUtil ]; meta = { description = "Parse and examine a Perl distribution MANIFEST file"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5601,7 +5690,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ DevelFindPerl ]; meta = { description = "Get the full path to a locally installed module"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5617,7 +5706,7 @@ let self = _self // overrides; _self = with self; { ]; meta = { description = "Automatically give your module the ability to have plugins"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5639,7 +5728,22 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Runtime module handling"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + ModuleRuntimeConflicts = buildPerlPackage { + name = "Module-Runtime-Conflicts-0.001"; + src = fetchurl { + url = mirror://cpan/authors/id/E/ET/ETHER/Module-Runtime-Conflicts-0.001.tar.gz; + sha256 = "0f73d03846575dd1492d3760deeb9627afaa1f8b04d4d526b1775174201be25f"; + }; + buildInputs = [ ModuleBuildTiny ]; + propagatedBuildInputs = [ DistCheckConflicts ModuleRuntime ]; + meta = { + homepage = https://github.com/karenetheridge/Module-Runtime-Conflicts; + description = "Provide information on conflicts for Module::Runtime"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5651,7 +5755,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Recursively scan Perl code for dependencies"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5664,7 +5768,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ ModuleBuild ]; meta = { description = "Module name tools and transformations"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5690,7 +5794,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://mojolicio.us; description = "Real-time web framework"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -5704,22 +5808,24 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassMethodModifiers DevelGlobalDestruction ImportInto ModuleRuntime RoleTiny strictures ]; meta = { description = "Minimalist Object Orientation (with Moose compatiblity)"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; Moose = buildPerlPackage { - name = "Moose-2.0604"; + name = "Moose-2.1213"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOY/Moose-2.0604.tar.gz; - sha256 = "0nwvklb8dwf8lskwxik3gi9gsqzrix2jhc56zvfzlf1q5q1s07qj"; + url = mirror://cpan/authors/id/E/ET/ETHER/Moose-2.1213.tar.gz; + sha256 = "0f3b196ae67dc1daaa43c44ae7703f27c4f92c391ad3e252a90e90c50c851e03"; }; - buildInputs = [ DistCheckConflicts TestFatal TestRequires ]; - propagatedBuildInputs = [ ClassLoad ClassLoadXS DataOptList DevelGlobalDestruction DistCheckConflicts EvalClosure ListMoreUtils MROCompat PackageDeprecationManager PackageStash PackageStashXS ParamsUtil SubExporter SubName TaskWeaken TryTiny ]; + buildInputs = [ CPANMetaCheck CPANMetaRequirements DistCheckConflicts TestCleanNamespaces TestFatal TestRequires ]; + propagatedBuildInputs = [ ClassLoad ClassLoadXS DataOptList DevelGlobalDestruction DevelStackTrace DistCheckConflicts EvalClosure ListMoreUtils MROCompat ModuleRuntime ModuleRuntimeConflicts PackageDeprecationManager PackageStash PackageStashXS ParamsUtil SubExporter SubName TaskWeaken TryTiny ]; meta = { - homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; + homepage = http://moose.perl.org/; description = "A postmodern object system for Perl 5"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.eelco ]; + platforms = stdenv.lib.platforms.linux; }; }; @@ -5742,7 +5848,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Moose SyntaxKeywordJunction autobox ]; meta = { description = "Autoboxed wrappers for Native Perl datatypes"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5757,7 +5863,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/MooseX-ABC; description = "Abstract base classes for Moose"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -5784,7 +5890,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/MooseX-App-Cmd; description = "Mashes up MooseX::Getopt and App::Cmd"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -5809,7 +5915,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Moose ]; meta = { description = "Extend your attribute interfaces (deprecated)"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -5838,7 +5944,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Moose MooseXTypes MooseXTypesPathTiny TryTiny namespaceautoclean ]; meta = { description = "An abstract Moose role for setting attributes from a configfile"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -5854,7 +5960,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Moose MooseXGetopt MooseXTypesPathClass ]; meta = { description = "Role for daemonizing your Moose based application"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5868,22 +5974,22 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Moose namespaceclean ]; meta = { description = "Emulate Class::Accessor::Fast behavior using Moose attributes"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; MooseXGetopt = buildPerlPackage { - name = "MooseX-Getopt-0.50"; + name = "MooseX-Getopt-0.65"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Getopt-0.50.tar.gz; - sha256 = "0fwm5vb8z8q4b6fmf7gz4xzw5z713mmfnxzjph6vfyyymlr5bll9"; + url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Getopt-0.65.tar.gz; + sha256 = "c07c2b7312c471bf2d331025c0ad6cc02068633eda1e208cbdb5511ef5da7fda"; }; - buildInputs = [ PathClass TestCheckDeps TestFatal TestMoose TestNoWarnings TestRequires TestTrap TestWarn ]; - propagatedBuildInputs = [ GetoptLongDescriptive Moose MooseXRoleParameterized ]; + buildInputs = [ CPANMeta ModuleBuildTiny ModuleRuntime Moose PathTiny TestDeep TestFatal TestRequires TestTrap TestWarnings if_ ]; + propagatedBuildInputs = [ GetoptLongDescriptive Moose MooseXRoleParameterized TryTiny namespaceautoclean ]; meta = { - homepage = http://metacpan.org/release/MooseX-Getopt; + homepage = https://github.com/moose/MooseX-Getopt; description = "A Moose role for processing command line options"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5898,7 +6004,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/pshangov/moosex-has-options; description = "Succinct options for Moose"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -5915,7 +6021,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/kentfredric/MooseX-Has-Sugar; description = "Sugar Syntax for moose 'has' fields"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5930,7 +6036,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/karenetheridge/moosex-lazyrequire; description = "Required attributes which fail only when trying to use them"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5945,7 +6051,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/MooseX-MarkAsMethods/; description = "Mark overload code symbols as methods"; - license = "lgpl_2_1"; + license = stdenv.lib.licenses.lgpl21; }; }; @@ -5960,7 +6066,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/karenetheridge/moosex-methodattributes; description = "Code attribute introspection"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5974,7 +6080,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ListMoreUtils Moose ]; meta = { description = "Easy subclassing of non-Moose classes"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5989,7 +6095,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/moosex-oneargnew; description = "Teach ->new to accept single, non-hashref arguments"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6013,7 +6119,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DevelCaller Moose ParamsValidate SubExporter ]; meta = { description = "An extension of Params::Validate using Moose's types"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6028,7 +6134,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://github.com/sartak/MooseX-Role-Parameterized/tree; description = "Roles with composition parameters"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6043,7 +6149,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/MooseX-Role-WithOverloading; description = "Roles which support overloading"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6103,7 +6209,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Moose namespaceautoclean ]; meta = { description = "Make your object constructors blow up on unknown attributes"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -6139,7 +6245,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Organise your Moose types in libraries"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6180,20 +6286,24 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DateTime DateTimeXEasy Moose MooseXTypes MooseXTypesDateTime TimeDurationParse namespaceclean ]; meta = { description = "Extensions to MooseX::Types::DateTime"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; - MooseXTypesLoadableClass = buildPerlPackage rec { - name = "MooseX-Types-LoadableClass-0.008"; + MooseXTypesLoadableClass = buildPerlPackage { + name = "MooseX-Types-LoadableClass-0.012"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOBTFISH/MooseX-Types-LoadableClass-0.008.tar.gz; - sha256 = "0wh4zxknqv98nrmsp6yg6mazjyl3vacrgywarzjg5gks78c84i8g"; + url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-LoadableClass-0.012.tar.gz; + sha256 = "a1d2b186c2b69f416bb0c9271dc8692c2287c2f6ce144cc3b9b2c922427060df"; }; - propagatedBuildInputs = [ ClassLoad Moose MooseXTypes namespaceclean ]; + buildInputs = [ ModuleBuildTiny Moose TestFatal ]; + propagatedBuildInputs = [ ClassLoad ModuleRuntime Moose MooseXTypes namespaceautoclean ]; meta = { maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; + homepage = https://github.com/moose/MooseX-Types-LoadableClass; + description = "ClassName type constraint with coercion to load the class"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6206,7 +6316,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassMOP Moose MooseXTypes PathClass ]; meta = { description = "A Path::Class type library for Moose"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6221,7 +6331,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/karenetheridge/moosex-types-path-tiny; description = "Path::Tiny types and coercions for Moose"; - license = "apache"; + license = stdenv.lib.licenses.asl20; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -6236,7 +6346,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ MooseXTypes ParamsUtil ]; meta = { description = "Moose types that check against Perl syntax"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6251,7 +6361,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/dagolden/moosex-types-stringlike; description = "Moose type constraints for strings or string-like objects"; - license = "apache"; + license = stdenv.lib.licenses.asl20; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -6268,7 +6378,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/MooseX-Types-Structured; description = "MooseX::Types::Structured - Structured Type Constraints for Moose"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -6309,7 +6419,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ AnyMoose ]; meta = { description = "Extend attribute interfaces for Mouse"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6333,7 +6443,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Mro::* interface compatibility for Perls < 5.9.5"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6361,18 +6471,18 @@ let self = _self // overrides; _self = with self; { doCheck = false; # Test performs network access. }; - namespaceautoclean = buildPerlPackage rec { - name = "namespace-autoclean-0.13"; + namespaceautoclean = buildPerlPackage { + name = "namespace-autoclean-0.20"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOBTFISH/namespace-autoclean-0.13.tar.gz; - sha256 = "1w53k9f9zla90qdn7cyc9dx8zcv26gwy2y87gcazqsq1aj371m04"; + url = mirror://cpan/authors/id/E/ET/ETHER/namespace-autoclean-0.20.tar.gz; + sha256 = "42a199314d07b7a29044d6072529ca53037c75a43550193b1586bd19c690a05f"; }; - buildInputs = [ Moose SubName ]; - propagatedBuildInputs = [ BHooksEndOfScope ClassMOP namespaceclean ]; + buildInputs = [ ModuleBuildTiny TestRequires ]; + propagatedBuildInputs = [ BHooksEndOfScope SubIdentify namespaceclean ]; meta = { - homepage = http://metacpan.org/release/namespace-autoclean; + homepage = https://github.com/moose/namespace-autoclean; description = "Keep imports out of your namespace"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6386,7 +6496,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/namespace-clean; description = "Keep imports and functions out of your namespace"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6447,19 +6557,21 @@ let self = _self // overrides; _self = with self; { }; NetAmazonS3 = buildPerlPackage { - name = "Net-Amazon-S3-0.59"; + name = "Net-Amazon-S3-0.60"; src = fetchurl { - url = mirror://cpan/authors/id/P/PF/PFIG/Net-Amazon-S3-0.59.tar.gz; - sha256 = "94f2bd6b317a9142e400d7d17bd573dc9d22284c3ceaa4864474ba674e0e2e9f"; + url = mirror://cpan/authors/id/P/PF/PFIG/Net-Amazon-S3-0.60.tar.gz; + sha256 = "628937132268e501fb82410f96636e01b183423ea133b6c362894da109d6ac81"; }; buildInputs = [ LWP TestException ]; propagatedBuildInputs = [ DataStreamBulk DateTimeFormatHTTP DigestHMAC DigestMD5File FileFindRule HTTPDate HTTPMessage LWPUserAgentDetermined MIMETypes Moose MooseXStrictConstructor MooseXTypesDateTimeMoreCoercions PathClass RegexpCommon TermEncoding TermProgressBarSimple URI XMLLibXML JSON ]; # See https://github.com/pfig/net-amazon-s3/pull/25 patches = - [ ../development/perl-modules/net-amazon-s3-credentials-provider.patch ]; + [ ../development/perl-modules/net-amazon-s3-credentials-provider.patch + ../development/perl-modules/net-amazon-s3-moose-warning.patch + ]; meta = { description = "Use the Amazon S3 - Simple Storage Service"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = stdenv.lib.platforms.linux; }; }; @@ -6473,7 +6585,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ JSON ]; meta = { description = "Manage Amazon S3 policies for HTTP POST forms"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -6490,12 +6602,26 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassAccessor ClassDataInheritable XMLLibXML ]; meta = { description = "Advanced Message Queue Protocol (de)serialization and representation"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; }; + NetCIDR = buildPerlPackage { + name = "Net-CIDR-0.17"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MR/MRSAM/Net-CIDR-0.17.tar.gz; + sha256 = "4a968e700d382cf0946e47df420d0151fbd8e0135f037d404c7c63713b66daf0"; + }; + meta = { + description = "Manipulate IPv4/IPv6 netblocks in CIDR notation"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + platforms = stdenv.lib.platforms.unix; + maintainers = [ maintainers.bjornfor ]; + }; + }; + NetCoverArtArchive = buildPerlPackage { name = "Net-CoverArtArchive-1.02"; src = fetchurl { @@ -6507,7 +6633,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/metabrainz/CoverArtArchive; description = "Query the coverartarchive.org"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -6540,7 +6666,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Low-level HTTP connection (client)"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6574,7 +6700,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassAccessor ClassDataInheritable DigestHMAC DigestSHA1 LWPUserAgent URI ]; meta = { description = "An implementation of the OAuth protocol"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6588,7 +6714,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ AnyEventRabbitMQ ConfigAny Coro JSONXS ListMoreUtils Moose MooseXAppCmd MooseXAttributeHelpers MooseXConfigFromFile ]; meta = { description = "An Asynchronous and multi channel Perl AMQP client"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -6669,7 +6795,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://github.com/semifor/Net-Twitter-Lite; description = "A perl interface to the Twitter API"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6698,7 +6824,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ExceptionClass ]; meta = { description = "Comprehensive inside-out object support module"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -6720,6 +6846,29 @@ let self = _self // overrides; _self = with self; { }; }; + OpenGL = buildPerlPackage rec { + name = "OpenGL-0.6703"; + src = fetchurl { + url = "mirror://cpan/authors/id/C/CH/CHM/${name}.tar.gz"; + sha256 = "0k2k8zg84qj1ry77i9dvmfdfpg13s6117wy5bc4nvnzv37qcvy32"; + }; + + buildInputs = with pkgs; [ mesa mesa_glu freeglut xlibs.libX11 xlibs.libXi xlibs.libXmu xlibs.libXext xdummy ]; + + patches = [ ../development/perl-modules/perl-opengl.patch ]; + + configurePhase = '' + substituteInPlace Makefile.PL \ + --replace "@@libpaths@@" '${stdenv.lib.concatStringsSep "\n" (map (f: "-L${f}/lib") buildInputs)}' + + cp -v ${../development/perl-modules/perl-opengl-gl-extensions.txt} utils/glversion.txt + + perl Makefile.PL PREFIX=$out INSTALLDIRS=site $makeMakerFlags + ''; + + doCheck = false; + }; + NetOpenIDCommon = buildPerlPackage rec { name = "Net-OpenID-Common-1.18"; src = fetchurl { @@ -6749,22 +6898,22 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Manage deprecation warnings for your distribution"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; PackageStash = buildPerlPackage { - name = "Package-Stash-0.34"; + name = "Package-Stash-0.37"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOY/Package-Stash-0.34.tar.gz; - sha256 = "1674zs96ndq3czs6v8xkdqqz4fnka0i2835nnns9zbw2q01yirj6"; + url = mirror://cpan/authors/id/D/DO/DOY/Package-Stash-0.37.tar.gz; + sha256 = "06ab05388f9130cd377c0e1d3e3bafeed6ef6a1e22104571a9e1d7bfac787b2c"; }; buildInputs = [ DistCheckConflicts TestFatal TestRequires ]; - propagatedBuildInputs = [ DistCheckConflicts ModuleImplementation PackageDeprecationManager ]; + propagatedBuildInputs = [ DistCheckConflicts ModuleImplementation ]; meta = { homepage = http://metacpan.org/release/Package-Stash; description = "Routines for manipulating stashes"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6778,7 +6927,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/Package-Stash-XS; description = "Faster and more correct implementation of the Package::Stash API"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6800,7 +6949,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Simple, compact and correct param-checking functions"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6815,7 +6964,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Validate method/function parameters"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -6848,7 +6997,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/Perl-Toolchain-Gang/Parse-CPAN-Meta; description = "Parse META.yml and META.json CPAN metadata files"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6868,7 +7017,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Cross-platform path specification manipulation"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6883,7 +7032,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://metacpan.org/release/Path-Tiny; description = "File path utility"; - license = "apache"; + license = stdenv.lib.licenses.asl20; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -6916,7 +7065,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://perlcritic.com; description = "Critique Perl source code for best-practices"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6981,7 +7130,7 @@ let self = _self // overrides; _self = with self; { sha256 = "0yphqsgg7zrar2ywk2j2fnjxmi9rq32yf0p5ln8m9fmfx4kd84mr"; }; meta = { - description = "Simple flexible means of converting the output of PHP's serialize() into the equivalent Perl memory structure, and vice versa."; + description = "Simple flexible means of converting the output of PHP's serialize() into the equivalent Perl memory structure, and vice versa"; license = "unknown"; }; }; @@ -6997,7 +7146,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/plack/Plack; description = "Perl Superglue for Web frameworks and Web Servers (PSGI toolkit)"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7011,12 +7160,56 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassMethodModifiers DataDump FileShareDir ModuleVersions Plack TextMicroTemplate ]; meta = { description = "Display information about the current request/response"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; }; + PlackMiddlewareFixMissingBodyInRedirect = buildPerlPackage { + name = "Plack-Middleware-FixMissingBodyInRedirect-0.11"; + src = fetchurl { + url = mirror://cpan/authors/id/S/SW/SWEETKID/Plack-Middleware-FixMissingBodyInRedirect-0.11.tar.gz; + sha256 = "eb4d4232344e7da3217347b847736ea55df962d11b870a225315d9241e8fbefb"; + }; + buildInputs = [ HTTPMessage Plack ]; + propagatedBuildInputs = [ HTMLParser Plack ]; + meta = { + homepage = https://github.com/Sweet-kid/Plack-Middleware-FixMissingBodyInRedirect; + description = "Plack::Middleware which sets body for redirect response, if it's not already set"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + PlackMiddlewareMethodOverride = buildPerlModule { + name = "Plack-Middleware-MethodOverride-0.10"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DW/DWHEELER/Plack-Middleware-MethodOverride-0.10.tar.gz; + sha256 = "f8d6a33b56d69dddd5db289f855e100d86ff39099abe31ef40e2672d0dc5568d"; + }; + propagatedBuildInputs = [ Plack URI ]; + meta = { + homepage = http://search.cpan.org/dist/Plack-Middleware-MethodOverride/; + description = "Override REST methods to Plack apps via POST"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + PlackMiddlewareRemoveRedundantBody = buildPerlPackage { + name = "Plack-Middleware-RemoveRedundantBody-0.05"; + src = fetchurl { + url = mirror://cpan/authors/id/S/SW/SWEETKID/Plack-Middleware-RemoveRedundantBody-0.05.tar.gz; + sha256 = "a0676e1c792bea7f25f1d901bee59054d35012d5ea8cd42529d336143fa87cd8"; + }; + buildInputs = [ HTTPMessage Plack ]; + propagatedBuildInputs = [ Plack ]; + meta = { + homepage = https://github.com/Sweet-kid/Plack-Middleware-RemoveRedundantBody; + description = "Plack::Middleware which sets removes body for HTTP response if it's not required"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + PlackMiddlewareReverseProxy = buildPerlPackage { name = "Plack-Middleware-ReverseProxy-0.15"; src = fetchurl { @@ -7026,7 +7219,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Plack ]; meta = { description = "Supports app to run as a reverse proxy backend"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7039,7 +7232,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ HTTPMessage LWPUserAgent Plack TestTCP URI ]; meta = { description = "Run HTTP tests on external live servers"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7053,7 +7246,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Clone IOString ListMoreUtils ParamsUtil TaskWeaken ]; meta = { description = "Parse, Analyze and Manipulate Perl (without perl)"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; doCheck = false; }; @@ -7067,7 +7260,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ListMoreUtils PPI TaskWeaken ]; meta = { description = "Parse regular expressions"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7081,7 +7274,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ExceptionClass PPI Readonly TaskWeaken ]; meta = { description = "Extensions to L<PPI|PPI>"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7130,7 +7323,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ FileFindRule FileFindRulePerl PPI PPIxRegexp ParamsUtil PerlCritic ]; meta = { description = "Find a minimum required version of perl for Perl code"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7145,7 +7338,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/perl-prereqscanner; description = "A tool to scan your Perl code for its prerequisites"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7158,7 +7351,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ FileSlurp ]; meta = { description = "Parse and manipulate Perl version strings"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7181,7 +7374,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/pod-coverage-trustpod; description = "Allow a module's pod to contain Pod::Coverage hints"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7196,7 +7389,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/pod-elemental; description = "Work with nestable Pod elements"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7211,7 +7404,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/pod-elemental-perlmunger; description = "A thing that takes a string of Perl and rewrites its documentation"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7232,7 +7425,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ MixinLinewise TestDeep ]; meta = { description = "Read a POD document as a series of trivial events"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7260,7 +7453,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rwstauner/Pod-Markdown; description = "Convert POD to Markdown"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7292,7 +7485,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/pod-weaver; description = "Weave together a Pod document from an outline"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7334,7 +7527,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/Redis/; description = "Perl binding for Redis database"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -7387,7 +7580,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://jaldhar.github.com/REST-Utils; description = "Utility functions for REST applications"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -7421,7 +7614,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Moose MooseXRoleParameterized StringErrf TryTiny namespaceclean ]; meta = { description = "A thing with a message method"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7435,7 +7628,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Moose ]; meta = { description = "A thing with a list of tags"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7448,7 +7641,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestFatal ]; meta = { description = "Roles, like a nouvelle cuisine portion size slice of Moose"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7474,7 +7667,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Call isa, can, does and DOES safely on things that may not be objects"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7494,7 +7687,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Lexically-scoped resource management"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7507,7 +7700,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Scope-Upper/; description = "Act on upper scopes"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7537,7 +7730,7 @@ let self = _self // overrides; _self = with self; { sha256 = "07aiqkyi1p22drpcyrrmv7f8qq6fhrxh007achy2vryxyck1bp53"; }; meta = { - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -7560,7 +7753,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassInspector HTTPDaemon LWP TaskWeaken URI XMLParser ]; meta = { description = "Perl's Web Services Toolkit"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -7585,7 +7778,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/software-license; description = "Packages that provide templated software licenses"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7617,16 +7810,16 @@ let self = _self // overrides; _self = with self; { }; SQLAbstract = buildPerlPackage { - name = "SQL-Abstract-1.73"; + name = "SQL-Abstract-1.80"; src = fetchurl { - url = mirror://cpan/authors/id/F/FR/FREW/SQL-Abstract-1.73.tar.gz; - sha256 = "081ppyvsc66yshmfr9q9v7hp9g58725nnibd771i9g153vzs49kb"; + url = mirror://cpan/authors/id/R/RI/RIBASUSHI/SQL-Abstract-1.80.tar.gz; + sha256 = "de4d0507fca0c6340c17867abca0632017bd56594443e67ea6ace826ba9a07a2"; }; - buildInputs = [ TestException TestWarn ]; - propagatedBuildInputs = [ ClassAccessorGrouped GetoptLongDescriptive HashMerge ]; + buildInputs = [ TestDeep TestException TestWarn ]; + propagatedBuildInputs = [ HashMerge MROCompat Moo ]; meta = { description = "Generate SQL from Perl data structures"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7677,12 +7870,12 @@ let self = _self // overrides; _self = with self; { }; Starman = buildPerlModule { - name = "Starman-0.4008"; + name = "Starman-0.4010"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Starman-0.4008.tar.gz; - sha256 = "06fc3yp3nmi26d7lcfqanwwk5jxsmqmidyr8n2qfrsa0r7d07c88"; + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Starman-0.4010.tar.gz; + sha256 = "abe8e2e0519b7326d64db1e93d9c32d853a7be083792d0d7e5f5a1ddf1472d42"; }; - buildInputs = [ ModuleBuildTiny TestRequires ]; + buildInputs = [ LWP ModuleBuildTiny TestRequires ]; propagatedBuildInputs = [ DataDump HTTPDate HTTPMessage HTTPParserXS NetServer Plack TestTCP ]; doCheck = false; # binds to various TCP ports meta = { @@ -7715,7 +7908,7 @@ let self = _self // overrides; _self = with self; { meta = { #homepage = http://web-cpan.berlios.de/modules/Statistics-Descriptive/; # berlios shut down; I found no replacement description = "Module of basic descriptive statistical functions"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7745,7 +7938,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://plackperl.org; description = "Temporary buffer to save bytes"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7758,7 +7951,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit/strictures.git; description = "Turn on strict and make all warnings fatal"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7792,7 +7985,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ParamsUtil StringFormatter SubExporter ]; meta = { description = "A simple sprintf-like dialect"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7818,7 +8011,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/string-flogger; description = "String munging for loggers"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7861,7 +8054,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Rewrite strings based on a set of known prefixes"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7895,8 +8088,8 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ SubExporter SubInstall ]; meta = { - description = "A module for when strings are too long to be displayed in.."; - license = "perl"; + description = "A module for when strings are too long to be displayed in"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7910,7 +8103,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ PadWalker SubExporter TemplateToolkit ]; meta = { description = "Use TT to interpolate lexical variables"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -7924,7 +8117,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "String::Util -- String processing utilities"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7938,7 +8131,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/sub-exporter; description = "A sophisticated exporter for custom-built routines"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7951,7 +8144,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ SubExporter SubName ]; meta = { description = "Helper routines for using Sub::Exporter to build methods"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7965,7 +8158,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/sub-exporter-globexporter; description = "Export shared globs with Sub::Exporter collectors"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7978,7 +8171,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Only use Sub::Exporter if you need it"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7992,7 +8185,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/sub-exporter; description = "A sophisticated exporter for custom-built routines"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8013,7 +8206,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Install subroutines into packages easily"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8046,7 +8239,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/dagolden/sub-uplevel; description = "Apparently run a function in a higher stack frame"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8119,7 +8312,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/phaylon/syntax/wiki; description = "Activate syntax extensions"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8132,7 +8325,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ SubExporterProgressive TestRequires syntax ]; meta = { description = "Perl6 style Junction operators in Perl5"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8148,6 +8341,19 @@ let self = _self // overrides; _self = with self; { }; }; + SysVirt = buildPerlPackage rec { + name = "Sys-Virt-1.2.9"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DA/DANBERR/${name}.tar.gz"; + sha256 = "1ag55mlkbf63iq3q5mxdawf29c2nyphd52kbshnlim3lax247ml7"; + }; + propagatedBuildInputs = [XMLXPath]; + buildInputs = [TestPodCoverage TimeHiRes TestPod pkgs.pkgconfig pkgs.libvirt]; + meta = { + platforms = stdenv.lib.platforms.linux; + }; + }; + TAPParserSourceHandlerpgTAP = buildPerlModule { name = "TAP-Parser-SourceHandler-pgTAP-3.30"; src = fetchurl { @@ -8157,7 +8363,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Tap-Parser-Sourcehandler-pgTAP/; description = "Stream TAP from pgTAP test scripts"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = stdenv.lib.platforms.linux; maintainers = with maintainers; [ ocharles ]; }; @@ -8204,7 +8410,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Ensure that a platform has weaken support"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8231,7 +8437,7 @@ let self = _self // overrides; _self = with self; { meta = { maintainers = with maintainers; [ eelco ]; description = "Perl Template Toolkit Plugin for IO::All"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8283,7 +8489,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ AppConfig ]; meta = { description = "Comprehensive template processing system"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8295,7 +8501,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Detect encoding of the current terminal"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8309,7 +8515,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassMethodMaker TermReadKey ]; meta = { description = "Provide a progress meter on a standard terminal"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8322,7 +8528,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ IOInteractive TermProgressBar TestMockObject ]; meta = { description = ""; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8367,6 +8573,31 @@ let self = _self // overrides; _self = with self; { doCheck = false; }; + TermSizeAny = buildPerlPackage { + name = "Term-Size-Any-0.002"; + src = fetchurl { + url = mirror://cpan/authors/id/F/FE/FERREIRA/Term-Size-Any-0.002.tar.gz; + sha256 = "64fa5fdb1ae3a823134aaa95aec75354bc17bdd9ca12ba0a7ae34a7e51b3ded2"; + }; + propagatedBuildInputs = [ DevelHide TermSizePerl ]; + meta = { + description = "Retrieve terminal size"; + license = "perl"; + }; + }; + + TermSizePerl = buildPerlPackage { + name = "Term-Size-Perl-0.029"; + src = fetchurl { + url = mirror://cpan/authors/id/F/FE/FERREIRA/Term-Size-Perl-0.029.tar.gz; + sha256 = "8c1aaab73646ee1d233e827213ea3b5ab8afcf1d02a8f94be7aed306574875e7"; + }; + meta = { + description = "Perl extension for retrieving terminal size (Perl version)"; + license = "perl"; + }; + }; + TermVT102 = buildPerlPackage { name = "Term-VT102-0.91"; src = fetchurl { @@ -8431,7 +8662,22 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CPANMetaCheck ]; meta = { description = "Check for presence of dependencies"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + TestCleanNamespaces = buildPerlPackage { + name = "Test-CleanNamespaces-0.16"; + src = fetchurl { + url = mirror://cpan/authors/id/E/ET/ETHER/Test-CleanNamespaces-0.16.tar.gz; + sha256 = "9779378394b9be32cf04129fafe2d40d74f6f200f593f1494998bd128a6ed9fa"; + }; + buildInputs = [ ModuleRuntime TestDeep TestRequires TestTester TestWarnings if_ ]; + propagatedBuildInputs = [ FileFindRule FileFindRulePerl ModuleRuntime PackageStash SubExporter SubIdentify namespaceclean ]; + meta = { + homepage = https://github.com/karenetheridge/Test-CleanNamespaces; + description = "Check for uncleaned imports"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8443,7 +8689,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Validate your CPAN META.yml files"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -8468,7 +8714,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ TextDiff ]; meta = { description = "Test strings and data structures and show differences if not ok"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8483,7 +8729,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Test-DistManifest; description = "Author test that validates a package MANIFEST"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8496,7 +8742,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/Test-EOL; description = "Check the correct line endings in your project"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -8521,7 +8767,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://metacpan.org/release/Test-FailWarnings; description = "Add test failures if warnings are caught"; - license = "apache"; + license = stdenv.lib.licenses.asl20; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -8537,7 +8783,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/test-fatal; description = "Incredibly simple helpers for testing code with exceptions"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8552,15 +8798,21 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/kentfredric/Test-File-ShareDir; description = "Create a Fake ShareDir for your modules for testing"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; - TestHarness = buildPerlPackage rec { - name = "Test-Harness-3.17"; + TestHarness = buildPerlPackage { + name = "Test-Harness-3.33"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AN/ANDYA/${name}.tar.gz"; - sha256 = "0j390xx6an88gh49n7zz8mj1s3z0xsxc8dynfq71xf7ba7i1afhr"; + url = mirror://cpan/authors/id/L/LE/LEONT/Test-Harness-3.33.tar.gz; + sha256 = "c22e36287d5cee3c28fd2006e3c8b6e7cc76c6fc39d79c7ab74f1936d35e8fe2"; + }; + doCheck = false; # makes assumptions about path to Perl + meta = { + homepage = http://testanything.org/; + description = "Run Perl standard test scripts with statistics"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8585,7 +8837,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Traces memory leaks"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8648,20 +8900,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [TestException UNIVERSALisa UNIVERSALcan]; }; - TestMoose = buildPerlPackage { - name = "Test-Moose-2.0604"; - src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOY/Moose-2.0604.tar.gz; - sha256 = "0nwvklb8dwf8lskwxik3gi9gsqzrix2jhc56zvfzlf1q5q1s07qj"; - }; - buildInputs = [ DistCheckConflicts TestFatal TestRequires ]; - propagatedBuildInputs = [ ClassLoad ClassLoadXS DataOptList DevelGlobalDestruction DistCheckConflicts EvalClosure ListMoreUtils MROCompat PackageDeprecationManager PackageStash PackageStashXS ParamsUtil SubExporter SubName TaskWeaken TryTiny ]; - meta = { - homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; - description = "A postmodern object system for Perl 5"; - license = "perl5"; - }; - }; + TestMoose = Moose; TestMockTime = buildPerlPackage rec { name = "Test-MockTime-0.12"; @@ -8680,7 +8919,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/creaktive/Test-Mojibake; description = "Check your source for encoding misbehavior"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8695,7 +8934,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ExceptionClass TestDeep TestDifferences TestException TestWarn ]; meta = { description = "Most commonly needed test functions and features"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8707,7 +8946,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Check the presence of tabs in your project"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -8763,7 +9002,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Test-Pod/; description = "Check for POD errors in files"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8787,7 +9026,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Test-Pod-LinkCheck/; description = "Tests POD for invalid links"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8799,7 +9038,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Check file names portability"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8811,7 +9050,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Checks to see if the module can be loaded"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8826,7 +9065,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/Test-Routine; description = "Composable units of assertion"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -8851,6 +9090,19 @@ let self = _self // overrides; _self = with self; { TestSimple = null; + TestSpec = buildPerlPackage { + name = "Test-Spec-0.47"; + src = fetchurl { + url = mirror://cpan/authors/id/P/PH/PHILIP/Test-Spec-0.47.tar.gz; + sha256 = "e425c0b9efa3c7e21496d31a607d072a63e31988c3d298a8c1fd7d145cc0681e"; + }; + propagatedBuildInputs = [ PackageStash TestDeep TestTrap TieIxHash ]; + meta = { + description = "Write tests in a declarative specification style"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TestSubCalls = buildPerlPackage rec { name = "Test-SubCalls-1.09"; src = fetchurl { @@ -8868,7 +9120,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Test your SYNOPSIS code"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8880,7 +9132,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Write tests, not scripts that run them"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -8895,7 +9147,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ TestSharedFork ]; meta = { description = "Testing TCP program"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8915,7 +9167,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Unit testing without external dependencies"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -8944,21 +9196,21 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Perl extension to test methods for warnings"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; - TestWarnings = buildPerlModule { - name = "Test-Warnings-0.008"; + TestWarnings = buildPerlPackage { + name = "Test-Warnings-0.016"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Test-Warnings-0.008.tar.gz; - sha256 = "119f2a279fe7d0681dcf4517f1bcb056e4596cfbae7b9ee447118f036cf089e4"; + url = mirror://cpan/authors/id/E/ET/ETHER/Test-Warnings-0.016.tar.gz; + sha256 = "09ebc9afa29eb4d1d44fbd974dfcd52e0a2d9ce7ec3e3ee7602394157831aba9"; }; - buildInputs = [ CaptureTiny ModuleBuildTiny TestCheckDeps TestDeep TestTester pkgs.perlPackages."if" ]; + buildInputs = [ TestTester if_ ]; meta = { homepage = https://github.com/karenetheridge/Test-Warnings; description = "Test for warnings and the lack of them"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8970,7 +9222,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Test fallback behaviour in absence of modules"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -8986,7 +9238,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/petdance/test-www-mechanize; description = "Testing-specific WWW::Mechanize subclass"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -9000,7 +9252,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystRuntime LWP Moose namespaceclean TestWWWMechanize WWWMechanize ]; meta = { description = "Test::WWW::Mechanize for Catalyst"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9023,10 +9275,11 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/L/LB/LBROCARD/Test-WWW-Mechanize-PSGI-0.35.tar.gz; sha256 = "1hih8s49zf38bisvhnhzrrj0zwyiivkrbs7nmmdqm1qqy27wv7pc"; }; + buildInputs = [ TestPod ]; propagatedBuildInputs = [ Plack TestWWWMechanize TryTiny ]; meta = { description = "Test PSGI programs using WWW::Mechanize"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9063,7 +9316,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Interface to read and parse BibTeX files"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9084,7 +9337,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ AlgorithmDiff ]; meta = { description = "Perform diffs on files and record sets"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9104,7 +9357,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Framework for more readable interactive test scripts"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9127,7 +9380,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ aliased DevelPartialDump ListAllUtils Moose MooseXParamsValidate MooseXTypes MooseXTypesStructured namespaceautoclean SetObject SubExporter TestFatal ]; meta = { description = "Spy on objects to achieve test doubles (mock testing)"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -9143,7 +9396,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ FileFindRule FileFindRulePerl PerlMinimumVersion YAMLTiny ]; meta = { description = "Does your code require newer perl than you think?"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9155,7 +9408,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Micro template engine with Perl5 language"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -9193,7 +9446,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Simple eyecandy ASCII tables"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -9243,8 +9496,8 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestTester ]; propagatedBuildInputs = [ DataDump ]; meta = { - description = "Trap exit codes, exceptions, output, etc."; - license = "perl"; + description = "Trap exit codes, exceptions, output, etc"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9257,7 +9510,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/gfx/p5-Test-Vars; description = "Detects unused variables"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9272,7 +9525,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Test-Version/; description = "Check to see that version's in modules are sane"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -9284,7 +9537,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Remove leading and/or trailing whitespace from strings"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -9340,7 +9593,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Cycle through a list of values via a scalar"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9352,7 +9605,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Ordered associative arrays for Perl"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9364,7 +9617,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Ordered hashes for Perl"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9394,7 +9647,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestPod TestPodCoverage ]; meta = { description = "Rounded or exact English expression of durations"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9408,7 +9661,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ExporterLite ]; meta = { description = "Parse string that represents time duration"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9430,7 +9683,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "An N-ary tree"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9443,7 +9696,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestException ]; meta = { description = "A simple tree object"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9458,13 +9711,16 @@ let self = _self // overrides; _self = with self; { }; TryTiny = buildPerlPackage { - name = "Try-Tiny-0.12"; + name = "Try-Tiny-0.22"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOY/Try-Tiny-0.12.tar.gz; - sha256 = "0awv2w33jb1xw3bsrfwsz53dgwm8s8vnpk4ssxxp3n89i7116p2g"; + url = mirror://cpan/authors/id/D/DO/DOY/Try-Tiny-0.22.tar.gz; + sha256 = "60fba46f4693d33d54539104f9001df008dabb400b6837e9605c39a6ee6a1b19"; }; + buildInputs = [ if_ ]; meta = { - homepage = https://github.com/doy/try-tiny.git; + homepage = http://metacpan.org/release/Try-Tiny; + description = "Minimal try/catch with proper preservation of $@"; + license = stdenv.lib.licenses.mit; }; }; @@ -9485,7 +9741,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/chromatic/UNIVERSAL-isa; description = "Attempt to recover from people calling UNIVERSAL::isa as a function"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9497,7 +9753,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Require() modules from a variable"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9520,7 +9776,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Unicode Collation Algorithm"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9532,7 +9788,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Wrapper around ICU collation services"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -9548,7 +9804,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ MIMECharset ]; meta = { description = "UAX #14 Unicode Line Breaking Algorithm"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9568,7 +9824,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Uniform Resource Identifiers (absolute and relative)"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9582,7 +9838,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/URI-Find; description = "Find URIs in arbitrary text"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9595,7 +9851,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ParamsValidate URI ]; meta = { description = "Build a URI from a set of named parameters"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -9618,7 +9874,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Uniform Resource Identifiers (absolute and relative)"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9687,7 +9943,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/bestpractical/www-mechanize; description = "Handy web browsing in a Perl object"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9717,7 +9973,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ URI ]; meta = { description = "Database of robots.txt-derived permissions"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9733,6 +9989,16 @@ let self = _self // overrides; _self = with self; { doCheck = false; }; + WxGLCanvas = buildPerlPackage rec { + name = "Wx-GLCanvas-0.09"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MB/MBARBON/${name}.tar.gz"; + sha256 = "1q4gvj4gdx4l8k4mkgiix24p9mdfy1miv7abidf0my3gy2gw5lka"; + }; + propagatedBuildInputs = [ Wx OpenGL pkgs.mesa_glu ]; + doCheck = false; + }; + X11Protocol = buildPerlPackage rec { name = "X11-Protocol-0.56"; src = fetchurl { @@ -9772,7 +10038,7 @@ let self = _self // overrides; _self = with self; { doCheck = false; # requires an X server meta = { description = "XCB bindings for X"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9786,7 +10052,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ XMLTokeParser ]; meta = { description = "Recursive descent XML parsing"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9819,7 +10085,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ FileSlurp XMLLibXML ]; meta = { description = "XML::LibXML based XML::Simple clone"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9920,7 +10186,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ XMLParser ]; meta = { description = "Simplified interface to XML::Parser"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9951,7 +10217,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ ExtUtilsDepends TestFatal Testuseok ]; meta = { description = "XS pointer backed objects using sv_magic"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9964,7 +10230,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/ingydotnet/yaml-pm/tree; description = "YAML Ain't Markup Language (tm)"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9977,7 +10243,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/YAML-Syck; description = "Fast, lightweight YAML loader and dumper"; - license = "mit"; + license = stdenv.lib.licenses.mit; }; }; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 700547450ec2..ab5057010a3f 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -64,7 +64,7 @@ let self = with self; { src = pkgs.fetchurl { url = "http://xcache.lighttpd.net/pub/Releases/${version}/${name}.tar.bz2"; - md5 = "e5816d47d52be200b959bf69a673ff74"; + sha256 = "1saysvzwkfmcyg53za4j7qnranxd6871spjzfpclhdlqm043xbw6"; }; configureFlags = [ diff --git a/pkgs/top-level/python-packages-generated.nix b/pkgs/top-level/python-packages-generated.nix index bb6be68fa9a5..3876476623bc 100644 --- a/pkgs/top-level/python-packages-generated.nix +++ b/pkgs/top-level/python-packages-generated.nix @@ -62,7 +62,7 @@ in Zope Version Control ''; homepage = "http://pypi.python.org/pypi/Products.ZopeVersionControl"; - license = "ZPL"; + license = stdenv.lib.licenses.zpt20; }; }; @@ -764,7 +764,7 @@ in PlonePAS adapts the PluggableAuthService for use by Plone. ''; homepage = "http://pypi.python.org/pypi/Products.PlonePAS"; - license = "ZPL"; + license = stdenv.lib.licenses.zpt20; }; }; @@ -1487,7 +1487,7 @@ in installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - + ''; homepage = "https://code.google.com/p/feedparser/"; license = ""; @@ -1550,7 +1550,7 @@ in Automatically include ZCML ''; homepage = "http://pypi.python.org/pypi/z3c.autoinclude"; - license = "ZPL"; + license = stdenv.lib.licenses.zpt20; }; }; @@ -2552,7 +2552,7 @@ in CMFDynamicViewFTI is a product for dynamic views in CMF. ''; homepage = "http://pypi.python.org/pypi/Products.CMFDynamicViewFTI"; - license = "ZPL"; + license = stdenv.lib.licenses.zpt20; }; }; @@ -2674,7 +2674,7 @@ in Python-PostgreSQL Database Adapter ''; homepage = "http://initd.org/psycopg/"; - license = "GPL with exceptions or ZPL"; + license = with stdenv.lib.licenses; [ lgpl3Plus zpt20 ]; }; }; @@ -3078,7 +3078,7 @@ in Global way of retrieving the currently active request. ''; homepage = "http://pypi.python.org/pypi/zope.globalrequest"; - license = "ZPL"; + license = stdenv.lib.licenses.zpt20; }; }; @@ -3198,7 +3198,7 @@ in Caching infrastructure for web apps ''; homepage = "UNKNOWN"; - license = "ZPL"; + license = stdenv.lib.licenses.zpt20; }; }; @@ -3758,7 +3758,7 @@ in Zope 2 integration for zope.globalrequest ''; homepage = "http://pypi.python.org/pypi/five.globalrequest"; - license = "ZPL"; + license = stdenv.lib.licenses.zpt20; }; }; @@ -4486,7 +4486,7 @@ in Easily hook into the ZCML processing machinery ''; homepage = "UNKNOWN"; - license = "ZPL"; + license = stdenv.lib.licenses.zpt20; }; }; @@ -4526,7 +4526,7 @@ in Add test information to .egg-info ''; homepage = "http://pypi.python.org/pypi/eggtestinfo"; - license = "PSF or ZPL"; + license = with stdenv.lib.licenses; [ psfl zpt20 ]; }; }; @@ -4928,7 +4928,7 @@ in SecureMailHost is a reimplementation of the standard Zope2 MailHost with some security and usability enhancements. ''; homepage = "http://svn.plone.org/svn/collective/SecureMailHost/trunk"; - license = "ZPL"; + license = stdenv.lib.licenses.zpt20; }; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9613fe5f83fa..802f316d0260 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1,4 +1,4 @@ -{ pkgs, python }: +{ pkgs, stdenv, python, self }: with pkgs.lib; @@ -10,6 +10,10 @@ let isPyPy = python.executable == "pypy"; isPy3k = strings.substring 0 1 python.majorVersion == "3"; + callPackage = pkgs.newScope self; + + buildPythonPackage = makeOverridable (callPackage ../development/python-modules/generic { }); + # Unique python version identifier pythonName = if isPy26 then "python26" else @@ -23,33 +27,27 @@ let sqlite3 = null; curses = null; curses_panel = null; - ssl = null; crypt = null; }; + # glibcLocales doesn't build on Darwin + localePath = optionalString (! stdenv.isDarwin) "${pkgs.glibcLocales}/lib/locale/locale-archive"; + pythonPackages = modules // import ./python-packages-generated.nix { inherit pkgs python; inherit (pkgs) stdenv fetchurl; self = pythonPackages; } # Python packages for all python versions -// rec { +// { - inherit python isPy26 isPy27 isPy33 isPy34 isPyPy isPy3k pythonName; - inherit (pkgs) fetchurl fetchsvn fetchgit stdenv unzip; + inherit python isPy26 isPy27 isPy33 isPy34 isPyPy isPy3k pythonName buildPythonPackage; # helpers - # glibcLocales doesn't build on Darwin - localePath = optionalString (! stdenv.isDarwin) "${pkgs.glibcLocales}/lib/locale/locale-archive"; - - callPackage = pkgs.newScope pythonPackages; - # global distutils config used by buildPythonPackage distutils-cfg = callPackage ../development/python-modules/distutils-cfg { }; - buildPythonPackage = makeOverridable (callPackage ../development/python-modules/generic { }); - wrapPython = pkgs.makeSetupHook { deps = pkgs.makeWrapper; substitutions.libPrefix = python.libPrefix; @@ -82,7 +80,7 @@ let maintainer = with maintainers; [ iyzsong ]; }; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/d/discid/${name}.tar.gz"; md5 = "2ad2141452dd10b03ad96ccdad075235"; }; @@ -97,20 +95,21 @@ let hdf5 = pkgs.hdf5.override { mpi = null; }; }; - h5py-mpi = h5py.override { + h5py-mpi = self.h5py.override { mpiSupport = true; mpi = pkgs.openmpi; hdf5 = pkgs.hdf5.override { mpi = pkgs.openmpi; enableShared = true; }; - inherit mpi4py; }; ipython = callPackage ../shells/ipython { + inherit pythonPackages; + qtconsoleSupport = !pkgs.stdenv.isDarwin; # qt is not supported on darwin pylabQtSupport = !pkgs.stdenv.isDarwin; pylabSupport = !pkgs.stdenv.isDarwin; # cups is not supported on darwin }; - ipythonLight = lowPrio (ipython.override { + ipythonLight = lowPrio (self.ipython.override { qtconsoleSupport = false; pylabSupport = false; pylabQtSupport = false; @@ -124,7 +123,7 @@ let # This is used for NixOps to make sure we won't break it with the next major # version of nixpart. - nixpart0 = nixpart; + nixpart0 = callPackage ../tools/filesystems/nixpart/0.4 { }; pitz = callPackage ../applications/misc/pitz { }; @@ -139,17 +138,17 @@ let pygtk = callPackage ../development/python-modules/pygtk { libglade = null; }; - pyGtkGlade = pygtk.override { + pyGtkGlade = self.pygtk.override { libglade = pkgs.gnome.libglade; }; pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { - pythonDBus = dbus; + pythonDBus = self.dbus; }; pyqt5 = callPackage ../development/python-modules/pyqt/5.x.nix { - sip = sip_4_16; - pythonDBus = dbus; + sip = self.sip_4_16; + pythonDBus = self.dbus; }; sip = callPackage ../development/python-modules/sip { }; @@ -165,12 +164,12 @@ let aafigure = buildPythonPackage rec { name = "aafigure-0.5"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/a/aafigure/${name}.tar.gz"; md5 = "5322888a21eb0bb2e749fbf98eddf574"; }; - propagatedBuildInputs = [ pillow ]; + propagatedBuildInputs = with self; [ pillow ]; # error: invalid command 'test' doCheck = false; @@ -193,16 +192,16 @@ let actdiag = buildPythonPackage rec { - name = "actdiag-0.5.1"; + name = "actdiag-0.5.3"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/a/actdiag/${name}.tar.gz"; - md5 = "171c47bc1f70e5fadfffd9df0c3157be"; + sha256 = "1vr4hnkr0gcvvpaycd8q3vcx029b2f5yv8swhdr8kwspaqb0dvfa"; }; - buildInputs = [ pep8 nose unittest2 docutils ]; + buildInputs = with self; [ pep8 nose unittest2 docutils ]; - propagatedBuildInputs = [ blockdiag ]; + propagatedBuildInputs = with self; [ blockdiag ]; # One test fails: # UnicodeEncodeError: 'ascii' codec can't encode character u'\u3042' in position 0: ordinal not in range(128) @@ -222,18 +221,18 @@ let rev = "9744c18c4d6b0a3e7f57b01e5fe145a60fc82a47"; name = "afew-1.0_${rev}"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://github.com/teythoon/afew/tarball/${rev}"; name = "${name}.tar.bz"; sha256 = "1qyban022aji2hl91dh0j3xa6ikkxl5argc6w71yp2x8b02kp3mf"; }; - buildInputs = [ pkgs.dbacl ]; + buildInputs = with self; [ pkgs.dbacl ]; - propagatedBuildInputs = [ - pythonPackages.notmuch - pythonPackages.chardet - ] ++ optional (!isPy3k) pythonPackages.subprocess32; + propagatedBuildInputs = with self; [ + self.notmuch + self.chardet + ] ++ optional (!isPy3k) self.subprocess32; doCheck = false; @@ -248,7 +247,7 @@ let meta = { homepage = https://github.com/teythoon/afew; - description = "afew is an initial tagging script for notmuch mail."; + description = "An initial tagging script for notmuch mail"; maintainers = [ stdenv.lib.maintainers.garbas ]; }; }; @@ -257,17 +256,17 @@ let alembic = buildPythonPackage rec { name = "alembic-0.6.6"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/a/alembic/${name}.tar.gz"; md5 = "71e4a8f6849e1527abfc4ea33d51f37c"; }; - buildInputs = [ nose mock ]; - propagatedBuildInputs = [ Mako sqlalchemy9 ]; + buildInputs = with self; [ nose mock ]; + propagatedBuildInputs = with self; [ Mako sqlalchemy9 ]; meta = { homepage = http://bitbucket.org/zzzeek/alembic; - description = "A database migration tool for SQLAlchemy."; + description = "A database migration tool for SQLAlchemy"; license = stdenv.lib.licenses.mit; }; }; @@ -276,42 +275,42 @@ let almir = buildPythonPackage rec { name = "almir-0.1.8"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/a/almir/${name}.zip"; md5 = "9a1f3c72a039622ca72b74be7a1cd37e"; }; - buildInputs = [ + buildInputs = with self; [ pkgs.which - pythonPackages.coverage - pythonPackages.mock - pythonPackages.tissue - pythonPackages.unittest2 - pythonPackages.webtest + self.coverage + self.mock + self.tissue + self.unittest2 + self.webtest ]; - propagatedBuildInputs = [ + propagatedBuildInputs = with self; [ pkgs.makeWrapper pkgs.bacula - pythonPackages.colander - pythonPackages.deform - pythonPackages.deform_bootstrap - pythonPackages.docutils - pythonPackages.nose - pythonPackages.mysql_connector_repackaged - pythonPackages.pg8000 - pythonPackages.pyramid - pythonPackages.pyramid_beaker - pythonPackages.pyramid_exclog - pythonPackages.pyramid_jinja2 - pythonPackages.pyramid_tm - pythonPackages.pytz - pythonPackages.sqlalchemy - pythonPackages.transaction - pythonPackages.waitress - pythonPackages.webhelpers - pythonPackages.zope_sqlalchemy - pythonPackages.psycopg2 + self.colander + self.deform + self.deform_bootstrap + self.docutils + self.nose + self.mysql_connector_repackaged + self.pg8000 + self.pyramid + self.pyramid_beaker + self.pyramid_exclog + self.pyramid_jinja2 + self.pyramid_tm + self.pytz + self.sqlalchemy + self.transaction + self.waitress + self.webhelpers + self.psycopg2 + (self.zope_sqlalchemy.override rec {propagatedBuildInputs = with self; [ sqlalchemy8 transaction ];}) ]; postInstall = '' @@ -329,7 +328,7 @@ let rev = "fa4ddf000dc2ac4933852b210901b649634a5f86"; name = "alot-0.3.5_${rev}"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://github.com/pazz/alot/tarball/${rev}"; name = "${name}.tar.bz"; sha256 = "0h11lqyxg0xbkc9y1xqjvd0kmfm5pdwnmv9chmlsi1614dxn08n0"; @@ -339,12 +338,12 @@ let doCheck = false; propagatedBuildInputs = - [ pythonPackages.notmuch - pythonPackages.urwid - pythonPackages.twisted - pythonPackages.magic - pythonPackages.configobj - pythonPackages.pygpgme + [ self.notmuch + self.urwid + self.twisted + self.magic + self.configobj + self.pygpgme ]; postInstall = '' @@ -364,12 +363,12 @@ let name = "anyjson-0.3.3"; disabled = isPy3k; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/a/anyjson/${name}.tar.gz"; md5 = "2ea28d6ec311aeeebaf993cb3008b27c"; }; - buildInputs = [ pythonPackages.nose ]; + buildInputs = with self; [ self.nose ]; meta = { homepage = http://pypi.python.org/pypi/anyjson/; @@ -381,7 +380,7 @@ let amqplib = buildPythonPackage rec { name = "amqplib-0.6.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://py-amqplib.googlecode.com/files/${name}.tgz"; sha1 = "f124e5e4a6644bf6d1734032a01ac44db1b25a29"; }; @@ -396,16 +395,27 @@ let }; + application = buildPythonPackage rec { + name = "python-application-${version}"; + version = "1.4.1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/python-application/${name}.tar.gz"; + sha256 = "3ae188e9dfd4bd63c9b43aebbf1d9de5df03fb5ac01e72f3bff5b41007570275"; + }; + }; + + apsw = buildPythonPackage rec { name = "apsw-3.7.6.2-r1"; disabled = isPyPy; - src = fetchurl { + src = pkgs.fetchurl { url = "http://apsw.googlecode.com/files/${name}.zip"; sha1 = "fa4aec08e59fa5964197f59ba42408d64031675b"; }; - buildInputs = [ pkgs.sqlite ]; + buildInputs = with self; [ pkgs.sqlite ]; # python: double free or corruption (fasttop): 0x0000000002fd4660 *** doCheck = false; @@ -420,9 +430,9 @@ let apscheduler = buildPythonPackage rec { name = "APScheduler-2.1.2"; - propagatedBuildInputs = with pythonPackages; [ futures tzlocal six pytest mock]; + propagatedBuildInputs = with self; [ futures tzlocal six pytest mock]; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/A/APScheduler/APScheduler-2.1.2.tar.gz"; md5 = "6862959d460c16ef325d63e1fc3a6684"; }; @@ -438,7 +448,7 @@ let area53 = buildPythonPackage (rec { name = "Area53-0.94"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/A/Area53/${name}.tar.gz"; sha256 = "0v9b7f8b6v21y410anx5sr52k2ac8jrzdf19q6m6p0zsdsf9vr42"; }; @@ -446,7 +456,7 @@ let # error: invalid command 'test' doCheck = false; - propagatedBuildInputs = [ pythonPackages.boto ]; + propagatedBuildInputs = with self; [ self.boto ]; }); @@ -454,7 +464,7 @@ let name = "arrow-${version}"; version = "0.4.4"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/a/arrow/${name}.tar.gz"; sha256 = "1sdr4gyjgvz86yr0ll0i11mgy8l1slndr7f0ngam87rpy78gp052"; }; @@ -473,10 +483,10 @@ let disabled = isPy3k; meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; - buildInputs = [ pkgs.zlib ]; + buildInputs = with self; [ pkgs.zlib ]; doCheck = false; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/a/async/${name}.tar.gz"; sha256 = "1lfmjm8apy9qpnpbq8g641fd01qxh9jlya5g2d6z60vf8p04rla1"; }; @@ -485,7 +495,7 @@ let argparse = buildPythonPackage (rec { name = "argparse-1.2.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://argparse.googlecode.com/files/${name}.tar.gz"; sha256 = "192174mys40m0bwk6l5jlfnzps0xi81sxm34cqms6dc3c454pbyx"; }; @@ -512,23 +522,23 @@ let }); astroid = buildPythonPackage (rec { - name = "astroid-1.1.1"; - propagatedBuildInputs = [ logilab_common ]; - src = fetchurl { - url = "https://pypi.python.org/packages/source/a/astroid/${name}.tar.gz"; - sha256 = "1x7103mlzndgg66yas6xrfwkwpihcq4bi9m8py1fjnhz8p5ka1vq"; + name = "astroid-1.2.1"; + propagatedBuildInputs = with self; [ logilab_common ]; + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/a/astroid/${name}.zip"; + md5 = "337017c82a28c97741797493fb2c980f"; }; }); autopep8 = buildPythonPackage (rec { - name = "autopep8-1.0.3"; + name = "autopep8-1.0.4"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/a/autopep8/${name}.tar.gz"; - md5 = "7c16d385cf9ad7c1d7fbcfcea2588a56"; + sha256 = "17lydqm8y9a5qadp6iifxrb5mb0g9fr1vxn5qy1fjpyhazxaw8n1"; }; - propagatedBuildInputs = [ pep8 ]; + propagatedBuildInputs = with self; [ pep8 ]; # One test fails: # FAIL: test_recursive_should_not_crash_on_unicode_filename (test.test_autopep8.CommandLineTests) @@ -548,7 +558,7 @@ let disabled = isPy3k; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/a/avro/${name}.tar.gz"; md5 = "7f4893205e5ad69ac86f6b44efb7df72"; }; @@ -564,7 +574,7 @@ let disabled = (!isPy3k); - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/a/avro3k/${name}.tar.gz"; sha256 = "15ahl0irwwj558s964abdxg4vp6iwlabri7klsm2am6q5r0ngsky"; }; @@ -577,10 +587,28 @@ let }; })); - backports_ssl_match_hostname_3_4_0_2 = pythonPackages.buildPythonPackage rec { + azure = buildPythonPackage rec { + version = "0.9.0"; + name = "azure-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/a/azure/${name}.zip"; + md5 = "9616767cf45c1c00794624e2a0889f23"; + }; + + propagatedBuildInputs = with self; [ dateutil ]; + + meta = with stdenv.lib; { + description = "Microsoft Azure SDK for Python"; + homepage = "http://azure.microsoft.com/en-us/develop/python/"; + license = licenses.asl20; + }; + }; + + backports_ssl_match_hostname_3_4_0_2 = self.buildPythonPackage rec { name = "backports.ssl_match_hostname-3.4.0.2"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/b/backports.ssl_match_hostname/backports.ssl_match_hostname-3.4.0.2.tar.gz"; md5 = "788214f20214c64631f0859dc79f23c6"; }; @@ -591,11 +619,46 @@ let }; }; + backports_lzma = self.buildPythonPackage rec { + name = "backports.lzma-0.0.3"; + disabled = isPy3k; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/b/backports.lzma/${name}.tar.gz"; + md5 = "c3d109746aefa86268e500c07d7e8e0f"; + }; + + buildInputs = [ pkgs.lzma ]; + + meta = { + describe = "Backport of Python 3.3's 'lzma' module for XZ/LZMA compressed files."; + homepage = https://github.com/peterjc/backports.lzma; + license = stdenv.lib.licenses.bsd3; + }; + }; + + babelfish = buildPythonPackage rec { + version = "0.5.3"; + name = "babelfish-${version}"; + disabled = isPy3k; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/b/babelfish/${name}.tar.gz"; + sha256 = "0wrw21dyq7v6lbffwvi1ik43d7dhmcv8xvgrrihhiv7ys1rd3gag"; + }; + + meta = { + homepage = http://pypi.python.org/pypi/babelfish; + description = "A module to work with countries and languages."; + license = stdenv.lib.licenses.bsd3; + }; + }; + batinfo = buildPythonPackage rec { version = "0.1.9"; name = "batinfo-${version}"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/b/batinfo/${name}.tar.gz"; sha256 = "0ppzbh8lii16xfq5piczn82hwps1fnbq9rbwwl3rdpdx0n86l560"; }; @@ -612,12 +675,12 @@ let bcdoc = buildPythonPackage rec { name = "bcdoc-0.12.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/b/bcdoc/bcdoc-0.12.1.tar.gz"; md5 = "7c8617347c294ea4d36ec73fb5b2c26e"; }; - buildInputs = [ pythonPackages.docutils pythonPackages.six ]; + buildInputs = with self; [ self.docutils self.six ]; meta = { homepage = https://github.com/botocore/bcdoc; @@ -630,7 +693,7 @@ let name = "beautifulsoup-3.2.1"; disabled = isPy3k; - src = fetchurl { + src = pkgs.fetchurl { url = "http://www.crummy.com/software/BeautifulSoup/download/3.x/BeautifulSoup-3.2.1.tar.gz"; sha256 = "1nshbcpdn0jpcj51x0spzjp519pkmqz0n0748j7dgpz70zlqbfpm"; }; @@ -648,7 +711,7 @@ let beautifulsoup4 = buildPythonPackage (rec { name = "beautifulsoup4-4.1.3"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/b/beautifulsoup4/${name}.tar.gz"; md5 = "f1481ed77336de77a2d8e5b061b6ad62"; }; @@ -670,17 +733,17 @@ let disabled = isPy3k; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/B/Beaker/${name}.tar.gz"; md5 = "c2e102870ed4c53104dec48ceadf8e9d"; }; buildInputs = - [ pythonPackages.sqlalchemy - pythonPackages.pycryptopp - pythonPackages.nose - pythonPackages.mock - pythonPackages.webtest + [ self.sqlalchemy + self.pycryptopp + self.nose + self.mock + self.webtest ]; # http://hydra.nixos.org/build/4511591/log/raw @@ -699,14 +762,14 @@ let bedup = buildPythonPackage rec { name = "bedup-20140413"; - src = fetchgit { + src = pkgs.fetchgit { url = "https://github.com/g2p/bedup.git"; rev = "5189e166145b8954ac41883f81ef3c3b50dc96ab"; sha256 = "e61768fa19934bd176799f90bda3ea9f49a5def21fa2523a8e47df8a48e730e9"; }; - buildInputs = [ pkgs.btrfsProgs ]; - propagatedBuildInputs = with pkgs; [ contextlib2 sqlalchemy9 pyxdg pycparser alembic ] + buildInputs = with self; [ pkgs.btrfsProgs ]; + propagatedBuildInputs = with self; [ contextlib2 sqlalchemy9 pyxdg pycparser alembic ] ++ optionals (!isPyPy) [ cffi ]; meta = { @@ -728,7 +791,7 @@ let beets = buildPythonPackage rec { name = "beets-1.3.6"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/b/beets/${name}.tar.gz"; md5 = "59615a54b3ac3983159e77ff9dda373e"; }; @@ -737,20 +800,20 @@ let preConfigure = "export HOME=$TMPDIR"; propagatedBuildInputs = - [ pythonPackages.pyyaml - pythonPackages.unidecode - pythonPackages.mutagen - pythonPackages.munkres - pythonPackages.musicbrainzngs - pythonPackages.enum34 - pythonPackages.pylast - pythonPackages.rarfile - pythonPackages.flask + [ self.pyyaml + self.unidecode + self.mutagen + self.munkres + self.musicbrainzngs + self.enum34 + self.pylast + self.rarfile + self.flask modules.sqlite3 modules.readline ]; - buildInputs = with pythonPackages; [ mock pyechonest six responses nose ]; + buildInputs = with self; [ mock pyechonest six responses nose ]; # 10 tests are failing doCheck = false; @@ -763,26 +826,70 @@ let }; }; - responses = pythonPackages.buildPythonPackage rec { + circus = buildPythonPackage rec { + name = "circus-0.11.1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/c/circus/${name}.tar.gz"; + md5 = "5c07cdbe9bb4a9b82e52737ad590617b"; + }; + + doCheck = false; # weird error + + propagatedBuildInputs = with self; [ iowait psutil pyzmq tornado mock ]; + }; + + cvxopt = buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "cvxopt"; + version = "1.1.7"; + disabled = isPyPy; + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/c/${pname}/${name}.tar.gz"; + sha256 = "f856ea2e9e2947abc1a6557625cc6b0e45228984f397a90c420b2f468dc4cb97"; + }; + doCheck = false; + buildInputs = with pkgs; [ liblapack blas ]; + meta = with stdenv.lib; { + homepage = "http://cvxopt.org/"; + description = "Python Software for Convex Optimization"; + maintainers = with maintainers; [ edwtjo ]; + license = licenses.gpl3Plus; + }; + }; + + iowait = buildPythonPackage rec { + name = "iowait-0.2"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/i/iowait/${name}.tar.gz"; + md5 = "f49ca7766fe4a67e03a731e575614f87"; + }; + + meta = with stdenv.lib; { + description = "Platform-independent module for I/O completion events"; + homepage = https://launchpad.net/python-iowait; + }; + }; + + responses = self.buildPythonPackage rec { name = "responses-0.2.2"; - propagatedBuildInputs = with pythonPackages; [ requests mock six pytest flake8 ]; + propagatedBuildInputs = with self; [ requests mock six pytest flake8 ]; doCheck = false; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/r/responses/responses-0.2.2.tar.gz"; md5 = "5d79fd425cf8d858dfc8afa6475395d3"; }; }; - rarfile = pythonPackages.buildPythonPackage rec { + rarfile = self.buildPythonPackage rec { name = "rarfile-2.6"; - propagatedBuildInputs = with pythonPackages; [ ]; - - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/r/rarfile/rarfile-2.6.tar.gz"; md5 = "50ce3f3fdb9196a00059a5ea7b3739fd"; }; @@ -793,12 +900,10 @@ let }; }; - pyechonest = pythonPackages.buildPythonPackage rec { + pyechonest = self.buildPythonPackage rec { name = "pyechonest-8.0.2"; - propagatedBuildInputs = with pythonPackages; [ ]; - - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pyechonest/pyechonest-8.0.2.tar.gz"; md5 = "5586fe8ece7af4e24f71ea740185127e"; }; @@ -813,12 +918,12 @@ let bitbucket_api = buildPythonPackage rec { name = "bitbucket-api-0.4.4"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/b/bitbucket-api/${name}.tar.gz"; md5 = "6f3cee3586c4aad9c0b2e04fce9704fb"; }; - propagatedBuildInputs = [ requests_oauth2 nose sh ]; + propagatedBuildInputs = with self; [ requests_oauth2 nose sh ]; doCheck = false; @@ -831,12 +936,12 @@ let bitbucket-cli = buildPythonPackage rec { name = "bitbucket-cli-0.4.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/b/bitbucket-cli/${name}.tar.gz"; md5 = "79cdbdc6c95dfa313d12cbdef406c9f2"; }; - pythonPath = [ requests ]; + pythonPath = [ self.requests ]; meta = with stdenv.lib; { description = "Bitbucket command line interface"; @@ -849,7 +954,7 @@ let bitstring = buildPythonPackage rec { name = "bitstring-3.1.2"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://python-bitstring.googlecode.com/files/${name}.zip"; sha256 = "1i1p3rkj4ad108f23xyib34r4rcy571gy65paml6fk77knh0k66p"; }; @@ -871,7 +976,7 @@ let name = "blinker-${version}"; version = "1.3"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/b/blinker/${name}.tar.gz"; md5 = "66e9688f2d287593a0e698cd8a5fbc57"; }; @@ -885,16 +990,16 @@ let blockdiag = buildPythonPackage rec { - name = "blockdiag-1.3.2"; + name = "blockdiag-1.4.7"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/b/blockdiag/${name}.tar.gz"; - md5 = "602a8750f312eeee84d6d138055dfae7"; + sha256 = "0bc29sh8hj3hmhclifh1by0n6vg2pl9wkxb7fmljyw0arjas54bf"; }; - buildInputs = [ pep8 nose unittest2 docutils ]; + buildInputs = with self; [ pep8 nose unittest2 docutils ]; - propagatedBuildInputs = [ pillow webcolors funcparserlib ]; + propagatedBuildInputs = with self; [ pillow webcolors funcparserlib ]; # One test fails: # ... @@ -913,12 +1018,12 @@ let bpython = buildPythonPackage rec { name = "bpython-0.12"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://www.bpython-interpreter.org/releases/bpython-0.12.tar.gz"; sha256 = "1ilf58qq7sazmcgg4f1wswbhcn2gb8qbbrpgm6gf0j2lbm60gabl"; }; - propagatedBuildInputs = [ modules.curses pygments ]; + propagatedBuildInputs = with self; [ modules.curses pygments ]; doCheck = false; meta = { @@ -933,11 +1038,11 @@ let boto = buildPythonPackage rec { name = "boto-${version}"; - version = "2.32.0"; + version = "2.34.0"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://github.com/boto/boto/archive/${version}.tar.gz"; - sha256 = "0bl5y7m0m84rz4q7hx783kxpj1n9wcm7dhv54bnx8cnanyd13cxn"; + sha256 = "08zavyn02qng9y0251a9mrlkb3aw33m7gx5kc97hwngl3xk3s777"; }; # The tests seem to require AWS credentials. @@ -958,20 +1063,19 @@ let }; }; - botocore = buildPythonPackage rec { - version = "0.33.0"; + version = "0.69.0"; name = "botocore-${version}"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/b/botocore/${name}.tar.gz"; - md5 = "6743c73a2e148abaa9c487a6e2ee53a3"; + md5 = "b71fe35ee01e636b54de28f1f875f084"; }; propagatedBuildInputs = - [ pythonPackages.dateutil - pythonPackages.requests - pythonPackages.jmespath + [ self.dateutil + self.requests + self.jmespath ]; meta = { @@ -988,12 +1092,12 @@ let version = "0.12.7"; name = "bottle-${version}"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/b/bottle/${name}.tar.gz"; sha256 = "0wr0gfz0bqlzhxk691x0xnf80b8v5pnl3jpnbgs1m9bcy28j3sp3"; }; - propagatedBuildInputs = [ setuptools ]; + propagatedBuildInputs = with self; [ setuptools ]; meta = with stdenv.lib; { homepage = http://bottlepy.org; @@ -1004,16 +1108,69 @@ let }; }; + box2d = buildPythonPackage rec { + name = "box2d-${version}"; + version = "2.3b0"; + disabled = (!isPy27); + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/B/Box2D/Box2D-2.3b0.zip"; + md5="25fc4f69cd580bdca0022ac3ace53865"; + }; + + patches = [ ../development/python-modules/box2d/disable-test.patch ]; + + propagatedBuildInputs = [ pkgs.swig pkgs.box2d ]; + + meta = with stdenv.lib; { + homepage = https://code.google.com/p/pybox2d/; + description = '' + A 2D game physics library for Python under + the very liberal zlib license + ''; + license = licenses.zlib; + platforms = platforms.all; + maintainers = [ maintainers.sepi ]; + }; + }; + + bugwarrior = buildPythonPackage rec { + name = "bugwarrior-${version}"; + version = "1.0.2"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/b/bugwarrior/${name}.tar.gz"; + # md5 = "09c93f86a27ffc092e69b46889a3bf50"; # provided by pypi website. + sha256 = "efe41756c152789f39006f157add9bedfa2b85d2cac15c067e635e37c70cb8f8"; + }; + + buildInputs = with self; [ mock unittest2 nose /* jira megaplan */ ]; + propagatedBuildInputs = with self; [ + twiggy requests2 offtrac bugzilla taskw dateutil pytz keyring six + jinja2 pycurl dogpile_cache lockfile click + ]; + + # for the moment jira>=0.22 and megaplan>=1.4 are missing for running the test suite. + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://github.com/ralphbean/bugwarrior; + description = "Sync github, bitbucket, bugzilla, and trac issues with taskwarrior"; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = [ maintainers.pierron ]; + }; + }; # bugz = buildPythonPackage (rec { # name = "bugz-0.9.3"; # - # src = fetchgit { + # src = pkgs.fetchgit { # url = "https://github.com/williamh/pybugz.git"; # rev = "refs/tags/0.9.3"; # }; # - # propagatedBuildInputs = [ pythonPackages.argparse modules.ssl ]; + # propagatedBuildInputs = with self; [ self.argparse ]; # # doCheck = false; # @@ -1023,20 +1180,48 @@ let # }; # }); + bugzilla = buildPythonPackage rec { + name = "bugzilla-${version}"; + version = "1.1.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/python-bugzilla/python-${name}.tar.gz"; + # md5 = "c95befd1fecad21f742beaa8180538c0"; # provided by pypi website. + sha256 = "11361635a4f1613803a0b9b93ba9126f7fd36180653f953e2590b1536d107d46"; + }; + + patches = [ ../development/python-modules/bugzilla/checkPhase-fix-cookie-compare.patch ]; - buildout = zc_buildout; - buildout152 = zc_buildout152; + buildInputs = with self; [ pep8 coverage logilab_common ]; + propagatedBuildInputs = [ self.requests2 ]; + + preCheck = '' + mkdir -p check-phase + export HOME=$(pwd)/check-phase + ''; + + meta = with stdenv.lib; { + homepage = https://fedorahosted.org/python-bugzilla/; + description = "Bugzilla XMLRPC access module"; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = [ maintainers.pierron ]; + }; + }; + + buildout = self.zc_buildout; + buildout152 = self.zc_buildout152; # A patched version of buildout, useful for buildout based development on Nix zc_buildout_nix = callPackage ../development/python-modules/buildout-nix { }; - zc_recipe_egg = zc_recipe_egg_buildout171; - zc_buildout = zc_buildout171; - zc_buildout2 = zc_buildout221; + zc_recipe_egg = self.zc_recipe_egg_buildout171; + zc_buildout = self.zc_buildout171; + zc_buildout2 = self.zc_buildout221; zc_buildout221 = buildPythonPackage rec { name = "zc.buildout-2.2.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zc.buildout/${name}.tar.gz"; md5 = "476a06eed08506925c700109119b6e41"; }; @@ -1054,7 +1239,7 @@ let disabled = isPy3k; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zc.buildout/${name}.tar.gz"; md5 = "8834a21586bf2be53dc412002241a996"; }; @@ -1072,7 +1257,7 @@ let disabled = isPy3k; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zc.buildout/${name}.tar.gz"; md5 = "87f7b3f8d13926c806242fd5f6fe36f7"; }; @@ -1095,21 +1280,21 @@ let inherit version; name = "zc.recipe.egg-${version}"; - buildInputs = [ buildout ]; + buildInputs = with self; [ buildout ]; doCheck = false; - src = fetchurl { + src = pkgs.fetchurl { inherit md5; url = "https://pypi.python.org/packages/source/z/zc.recipe.egg/zc.recipe.egg-${version}.tar.gz"; }; }; - zc_recipe_egg_buildout171 = zc_recipe_egg_fun { - buildout = zc_buildout171; + zc_recipe_egg_buildout171 = self.zc_recipe_egg_fun { + buildout = self.zc_buildout171; version = "1.3.2"; md5 = "1cb6af73f527490dde461d3614a36475"; }; - zc_recipe_egg_buildout2 = zc_recipe_egg_fun { - buildout = zc_buildout2; + zc_recipe_egg_buildout2 = self.zc_recipe_egg_fun { + buildout = self.zc_buildout2; version = "2.0.1"; md5 = "5e81e9d4cc6200f5b1abcf7c653dd9e3"; }; @@ -1118,7 +1303,7 @@ let name = "bunch-1.0.1"; meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/b/bunch/${name}.tar.gz"; sha256 = "1akalx2pd1fjlvrq69plvcx783ppslvikqdm93z2sdybq07pmish"; }; @@ -1129,12 +1314,12 @@ let cairocffi = buildPythonPackage rec { name = "cairocffi-0.5.4"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/c/cairocffi/${name}.tar.gz"; md5 = "e3fa4002583bfaa88b156e1af9c75bde"; }; - propagatedBuildInputs = [ cffi ]; + propagatedBuildInputs = with self; [ cffi ]; meta = { homepage = https://github.com/SimonSapin/cairocffi; @@ -1147,16 +1332,16 @@ let carrot = buildPythonPackage rec { name = "carrot-0.10.7"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/c/carrot/${name}.tar.gz"; md5 = "530a0614de3a669314c3acd4995c54d5"; }; - buildInputs = [ pythonPackages.nose ]; + buildInputs = with self; [ self.nose ]; propagatedBuildInputs = - [ pythonPackages.amqplib - pythonPackages.anyjson + [ self.amqplib + self.anyjson ]; doCheck = false; # depends on the network @@ -1171,14 +1356,14 @@ let name = "certifi-${version}"; version = "14.05.14"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/c/certifi/${name}.tar.gz"; sha256 = "0s8vxzfz6s4m6fvxc7z25k9j35w0rh6jkw3wwcd1az1mssncn6qy"; }; meta = with stdenv.lib; { homepage = http://certifi.io/; - description = "Python package for providing Mozilla's CA Bundle."; + description = "Python package for providing Mozilla's CA Bundle"; license = licenses.isc; maintainers = [ maintainers.koral ]; }; @@ -1186,12 +1371,12 @@ let characteristic = buildPythonPackage rec { name = "characteristic-14.1.0"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/c/characteristic/${name}.tar.gz"; md5 = "68ea7e28997fc57d3631791ec0567a05"; }; - buildInputs = [ pythonPackages.pytest ]; + buildInputs = with self; [ self.pytest ]; meta = { description = "Python attributes without boilerplate"; @@ -1205,12 +1390,12 @@ let name = "cheetah-${version}"; disabled = isPy3k; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/C/Cheetah/Cheetah-${version}.tar.gz"; md5 = "853917116e731afbc8c8a43c37e6ddba"; }; - propagatedBuildInputs = [ pythonPackages.markdown ]; + propagatedBuildInputs = with self; [ self.markdown ]; meta = { homepage = http://www.cheetahtemplate.org/; @@ -1223,7 +1408,7 @@ let name = "cherrypy-${version}"; version = "3.2.2"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://download.cherrypy.org/cherrypy/${version}/CherryPy-${version}.tar.gz"; sha256 = "14dn129h69wj0h8yr0bjwbrk8kygl6mkfnxc5m3fxhlm4xb8hnnw"; }; @@ -1238,16 +1423,35 @@ let }); + cjson = buildPythonPackage rec { + name = "python-cjson-${version}"; + version = "1.1.0"; + disabled = isPy3k || isPyPy; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/python-cjson/${name}.tar.gz"; + sha256 = "a01fabb7593728c3d851e1cd9a3efbd18f72650a31a5aa8a74018640da3de8b3"; + }; + + meta = with stdenv.lib; { + description = "This module implements a very fast JSON encoder/decoder for Python."; + homepage = "http://ag-projects.com/"; + license = licenses.lgpl2; + platforms = platforms.all; + }; + }; + + click = buildPythonPackage { name = "click-2.1"; - src = fetchurl { + src = pkgs.fetchurl { url = https://pypi.python.org/packages/source/c/click/click-2.1.tar.gz; md5 = "0ba97ba09af82c56e2d35f3412d0aa6e"; }; meta = { homepage = "http://click.pocoo.org/"; - description = "Click is a Python package for creating beautiful command line interfaces in a composable way with as little code as necessary."; - license = "bsd, 3-clause"; + description = "A Python package for creating beautiful command line interfaces in a composable way with as little code as necessary"; + license = stdenv.lib.licenses.bsd3; }; }; @@ -1255,12 +1459,12 @@ let clepy = buildPythonPackage rec { name = "clepy-0.3.20"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/c/clepy/${name}.tar.gz"; sha256 = "16vibfxms5z4ld8gbkra6dkhqm2cc3jnn0fwp7mw70nlwxnmm51c"; }; - buildInputs = [ pythonPackages.mock pythonPackages.nose pythonPackages.decorator ]; + buildInputs = with self; [ self.mock self.nose self.decorator ]; meta = { homepage = http://code.google.com/p/clepy/; @@ -1273,7 +1477,7 @@ let name = "clientform-0.2.10"; disabled = isPy3k; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/C/ClientForm/ClientForm-0.2.10.tar.gz"; sha256 = "0dydh3i1sx7rrj6d0gj375wkjpiivm7jjlsimw6hmwv4ck7yf1wm"; }; @@ -1292,7 +1496,7 @@ let version = "2.3"; name = "cogapp-${version}"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/c/cogapp/${name}.tar.gz"; sha256 = "0gzmzbsk54r1qa6wd0yg4zzdxvn2f19ciprr2acldxaknzrpllnn"; }; @@ -1313,12 +1517,12 @@ let colorama = buildPythonPackage rec { name = "colorama-0.2.5"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/c/colorama/colorama-0.2.5.tar.gz"; md5 = "308c6e38917bdbfc4d3b0783c614897d"; }; - propagatedBuildInputs = [ pythonPackages.clientform ]; + propagatedBuildInputs = with self; [ self.clientform ]; doCheck = false; @@ -1333,18 +1537,18 @@ let coilmq = buildPythonPackage (rec { name = "coilmq-0.6.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/C/CoilMQ/CoilMQ-0.6.1.tar.gz"; md5 = "5f39727415b837abd02651eeb2721749"; }; - propagatedBuildInputs = [ pythonPackages.stompclient ]; + propagatedBuildInputs = with self; [ self.stompclient ]; preConfigure = '' sed -i '/distribute/d' setup.py ''; - buildInputs = [ pythonPackages.coverage pythonPackages.sqlalchemy ]; + buildInputs = with self; [ self.coverage self.sqlalchemy ]; # ValueError: Could not parse auth file: # /tmp/nix-build-.../CoilMQ-0.6.1/coilmq/tests/resources/auth.ini @@ -1361,12 +1565,12 @@ let colander = buildPythonPackage rec { name = "colander-1.0b1"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/c/colander/${name}.tar.gz"; md5 = "89f2cf4b5c87d43f7917d6a0d4872e6a"; }; - propagatedBuildInputs = [ pythonPackages.translationstring ]; + propagatedBuildInputs = with self; [ self.translationstring ]; meta = { maintainers = [ @@ -1381,19 +1585,19 @@ let ColanderAlchemy = buildPythonPackage rec { name = "ColanderAlchemy-0.2.0"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/C/ColanderAlchemy/${name}.tar.gz"; md5 = "b054837bd2753cbf15f7d5028cba421b"; }; - buildInputs = [ unittest2 ]; - propagatedBuildInputs = [ colander sqlalchemy9 ]; + buildInputs = with self; [ unittest2 ]; + propagatedBuildInputs = with self; [ colander sqlalchemy9 ]; # string: argument name cannot be overridden via info kwarg. doCheck = false; meta = { - description = "Autogenerate Colander schemas based on SQLAlchemy models."; + description = "Autogenerate Colander schemas based on SQLAlchemy models"; homepage = https://github.com/stefanofontanelli/ColanderAlchemy; license = licenses.mit; }; @@ -1403,7 +1607,7 @@ let configobj = buildPythonPackage (rec { name = "configobj-5.0.6"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/c/configobj/${name}.tar.gz"; md5 = "e472a3a1c2a67bb0ec9b5d54c13a47d6"; }; @@ -1411,10 +1615,10 @@ let # error: invalid command 'test' doCheck = false; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = with self; [ six ]; meta = { - description = "Config file reading, writing and validation."; + description = "Config file reading, writing and validation"; homepage = http://pypi.python.org/pypi/configobj; license = licenses.bsd3; maintainers = [ stdenv.lib.maintainers.garbas ]; @@ -1426,12 +1630,12 @@ let version = "1.1.fb10"; name = "configshell-fb-${version}"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://github.com/agrover/configshell-fb/archive/v${version}.tar.gz"; sha256 = "1dd87xvm98nk3jzybb041gjdahi2z9b53pwqhyxcfj4a91y82ndy"; }; - propagatedBuildInputs = [ + propagatedBuildInputs = with self; [ pyparsing modules.readline urwid @@ -1446,14 +1650,14 @@ let construct = buildPythonPackage rec { - name = "construct-2.5.1"; + name = "construct-2.5.2"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/c/construct/${name}.tar.gz"; - sha256 = "08qksl87vr6g2wjxwsyrjh4w6v8bfmcgrcgln7irqvw5vv7qgqss"; + sha256 = "084h02p0m8lhmlywlwjdg0kd0hd6sz481c96qwcm5wddxrqn4nv6"; }; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = with self; [ six ]; meta = with stdenv.lib; { description = "Powerful declarative parser (and builder) for binary data"; @@ -1468,7 +1672,7 @@ let contextlib2 = buildPythonPackage rec { name = "contextlib2-0.4.0"; - src = fetchurl rec { + src = pkgs.fetchurl rec { url = "https://pypi.python.org/packages/source/c/contextlib2/${name}.tar.gz"; md5 = "ea687207db25f65552061db4a2c6727d"; }; @@ -1477,7 +1681,7 @@ let coverage = buildPythonPackage rec { name = "coverage-3.6"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/c/coverage/${name}.tar.gz"; md5 = "67d4e393f4c6a5ffc18605409d2aa1ac"; }; @@ -1491,27 +1695,40 @@ let covCore = buildPythonPackage rec { name = "cov-core-1.7"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/c/cov-core/cov-core-1.7.tar.gz"; md5 = "59c1e22e636633e10120beacbf45b28c"; }; meta = { description = "plugin core for use by pytest-cov, nose-cov and nose2-cov"; }; - propagatedBuildInputs = [ pythonPackages.coverage ]; + propagatedBuildInputs = with self; [ self.coverage ]; + }; + + crcmod = buildPythonPackage rec { + name = "crcmod-1.7"; + src = pkgs.fetchurl { + url = https://pypi.python.org/packages/source/c/crcmod/crcmod-1.7.tar.gz; + sha256 = "07k0hgr42vw2j92cln3klxka81f33knd7459cn3d8aszvfh52w6w"; + }; + meta = { + description = "Python module for generating objects that compute the Cyclic Redundancy Check (CRC)"; + homepage = http://crcmod.sourceforge.net/; + license = stdenv.lib.licenses.mit; + }; }; cython = buildPythonPackage rec { name = "Cython-0.20.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://www.cython.org/release/${name}.tar.gz"; sha256 = "0v3nc9z5ynnnjdgcgkyy5g9wazmkjv53nnpjal1v3mr199s6799i"; }; setupPyBuildFlags = ["--build-base=$out"]; - buildInputs = [ pkgs.pkgconfig ]; + buildInputs = with self; [ pkgs.pkgconfig ]; meta = { description = "An interpreter to help writing C extensions for Python 2"; @@ -1522,10 +1739,10 @@ let cryptacular = buildPythonPackage rec { name = "cryptacular-1.4.1"; - buildInputs = [ coverage nose ]; - propagatedBuildInputs = [ pbkdf2 modules.crypt ]; + buildInputs = with self; [ coverage nose ]; + propagatedBuildInputs = with self; [ pbkdf2 modules.crypt ]; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/c/cryptacular/${name}.tar.gz"; md5 = "fe12232ac660185186dd8057d8ca7b0e"; }; @@ -1538,12 +1755,49 @@ let }; }; - detox = pythonPackages.buildPythonPackage rec { + cryptography = buildPythonPackage rec { + name = "cryptography-0.6.1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/c/cryptography/${name}.tar.gz"; + sha256 = "17ij2acy28ryxahiq64lpf71d5z3sa9xhr4pjv7a1v81189i0j82"; + }; + + buildInputs = [ pkgs.openssl self.pretend self.cryptography_vectors + self.iso8601 self.pyasn1 self.pytest ]; + propagatedBuildInputs = [ self.six self.cffi ]; + }; + + cryptography_vectors = buildPythonPackage rec { + name = "cryptography_vectors-0.6.1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/c/cryptography-vectors/${name}.tar.gz"; + sha256 = "1ks1xdb1ff74qmjdzqcfvkrwsbnwpsjgg3cy18zh37p8985cvl3r"; + }; + }; + + pretend = buildPythonPackage rec { + name = "pretend-1.0.8"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pretend/pretend-1.0.8.tar.gz"; + sha256 = "0r5r7ygz9m6d2bklflbl84cqhjkc2q12xgis8268ygjh30g2q3wk"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/alex/pretend; + license = licenses.bsd3; + }; + }; + + + detox = self.buildPythonPackage rec { name = "detox-0.9.3"; - propagatedBuildInputs = with pythonPackages; [ tox py eventlet ]; + propagatedBuildInputs = with self; [ tox py eventlet ]; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/d/detox/detox-0.9.3.tar.gz"; md5 = "b52588ec61cd4c2d33e419677a5eac8c"; }; @@ -1558,7 +1812,7 @@ let pbkdf2 = buildPythonPackage rec { name = "pbkdf2-1.3"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pbkdf2/${name}.tar.gz"; md5 = "40cda566f61420490206597243dd869f"; }; @@ -1574,12 +1828,12 @@ let bcrypt = buildPythonPackage rec { name = "bcrypt-1.0.2"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/b/bcrypt/${name}.tar.gz"; md5 = "c5df008669d17dd6eeb5e2042d5e136f"; }; - buildInputs = [ pycparser mock pytest py ] ++ optionals (!isPyPy) [ cffi ]; + buildInputs = with self; [ pycparser mock pytest py ] ++ optionals (!isPyPy) [ cffi ]; meta = { maintainers = [ stdenv.lib.maintainers.iElectric ]; @@ -1587,14 +1841,14 @@ let }; cffi = buildPythonPackage rec { - name = "cffi-0.7.2"; + name = "cffi-0.8.6"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/c/cffi/${name}.tar.gz"; - md5 = "d329f5cb2053fd31dafc02e2c9ef0299"; + sha256 = "0406j3sgndmx88idv5zxkkrwfqxmjl18pj8gf47nsg4ymzixjci5"; }; - propagatedBuildInputs = [ pkgs.libffi pycparser ]; + propagatedBuildInputs = with self; [ pkgs.libffi pycparser ]; meta = { maintainers = [ stdenv.lib.maintainers.iElectric ]; @@ -1604,13 +1858,13 @@ let pycollada = buildPythonPackage rec { name = "pycollada-0.4"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pycollada/${name}.tar.gz"; md5 = "5d0f00c035491b945cdccdfd8a698ad2"; }; # pycollada-0.4 needs python-dateutil==1.5 - buildInputs = [ dateutil_1_5 numpy ]; + buildInputs = with self; [ dateutil_1_5 numpy ]; # Some tests fail because they refer to test data files that don't exist # (upstream packaging issue) @@ -1628,7 +1882,7 @@ let pycparser = buildPythonPackage rec { name = "pycparser-2.10"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pycparser/${name}.tar.gz"; md5 = "d87aed98c8a9f386aa56d365fe4d515f"; }; @@ -1644,7 +1898,7 @@ let pytest = buildPythonPackage rec { name = "pytest-2.6.2"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pytest/${name}.tar.gz"; md5 = "0a1735fb1d481ef3864f34678607ba85"; }; @@ -1654,11 +1908,11 @@ let rm testing/test_argcomplete.py ''; - propagatedBuildInputs = [ py ] + propagatedBuildInputs = with self; [ py ] ++ (optional isPy26 argparse) ++ stdenv.lib.optional pkgs.config.pythonPackages.pytest.selenium or false - pythonPackages.selenium; + self.selenium; meta = with stdenv.lib; { maintainers = with maintainers; [ iElectric lovek323 madjar ]; @@ -1669,13 +1923,13 @@ let pytest_xdist = buildPythonPackage rec { name = "pytest-xdist-1.8"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pytest-xdist/pytest-xdist-1.8.zip"; md5 = "9c0b8efe9d43b460f8cf049fa46ce14d"; }; - buildInputs = [ pytest ]; - propagatedBuildInputs = [ execnet ]; + buildInputs = with self; [ pytest ]; + propagatedBuildInputs = with self; [ execnet ]; meta = { description = "py.test xdist plugin for distributed testing and loop-on-failing modes"; @@ -1685,7 +1939,7 @@ let cssselect = buildPythonPackage rec { name = "cssselect-0.7.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/c/cssselect/cssselect-0.7.1.tar.gz"; md5 = "c6c5e9a2e7ca226ce03f6f67a771379c"; }; @@ -1696,12 +1950,12 @@ let cssutils = buildPythonPackage (rec { name = "cssutils-0.9.9"; - src = fetchurl { + src = pkgs.fetchurl { url = http://pypi.python.org/packages/source/c/cssutils/cssutils-0.9.9.zip; sha256 = "139yfm9yz9k33kgqw4khsljs10rkhhxyywbq9i82bh2r31cil1pp"; }; - buildInputs = [ pythonPackages.mock ]; + buildInputs = with self; [ self.mock ]; # couple of failing tests doCheck = false; @@ -1719,12 +1973,12 @@ let name = "darcsver-1.7.4"; disabled = isPy3k; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/d/darcsver/${name}.tar.gz"; sha256 = "1yb1c3jxqvy4r3qiwvnb86qi5plw6018h15r3yk5ji3nk54qdcb6"; }; - buildInputs = [ pythonPackages.mock ]; + buildInputs = with self; [ self.mock ]; # Note: We don't actually need to provide Darcs as a build input. # Darcsver will DTRT when Darcs isn't available. See news.gmane.org @@ -1747,12 +2001,12 @@ let dateutil = buildPythonPackage (rec { name = "dateutil-2.2"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/python-dateutil/python-${name}.tar.gz"; sha256 = "0s74ad6r789810s10dxgvaf48ni6adac2icrdad34zxygqq6bj7f"; }; - propagatedBuildInputs = [ pythonPackages.six ]; + propagatedBuildInputs = with self; [ self.six ]; meta = { description = "Powerful extensions to the standard datetime module"; @@ -1765,12 +2019,12 @@ let dateutil_1_5 = buildPythonPackage (rec { name = "dateutil-1.5"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/python-dateutil/python-${name}.tar.gz"; sha256 = "02dhw57jf5kjcp7ng1if7vdrbnlpb9yjmz7wygwwvf3gni4766bg"; }; - propagatedBuildInputs = [ pythonPackages.six ]; + propagatedBuildInputs = with self; [ self.six ]; meta = { description = "Powerful extensions to the standard datetime module"; @@ -1783,7 +2037,7 @@ let decorator = buildPythonPackage rec { name = "decorator-3.4.0"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/d/decorator/${name}.tar.gz"; md5 = "1e8756f719d746e2fc0dd28b41251356"; }; @@ -1797,22 +2051,22 @@ let deform = buildPythonPackage rec { name = "deform-0.9.9"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/d/deform/${name}.tar.gz"; sha256 = "0ympsjhxz5v8h4hi1mv811h064221bh26d68l9hv1x6m7sxbxpd0"; }; - buildInputs = [] ++ optional isPy26 unittest2; + buildInputs = with self; [] ++ optional isPy26 unittest2; propagatedBuildInputs = - [ pythonPackages.beautifulsoup4 - pythonPackages.peppercorn - pythonPackages.colander - pythonPackages.translationstring - pythonPackages.chameleon - pythonPackages.zope_deprecation - pythonPackages.coverage - pythonPackages.nose + [ self.beautifulsoup4 + self.peppercorn + self.colander + self.translationstring + self.chameleon + self.zope_deprecation + self.coverage + self.nose ]; meta = { @@ -1827,22 +2081,22 @@ let deform2 = buildPythonPackage rec { name = "deform-2.0a2"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/d/deform/${name}.tar.gz"; sha256 = "1gfaf1d8zp0mp4h229srlffxdp86w1nni9g4aqsshxysr23x591z"; }; - buildInputs = [] ++ optional isPy26 unittest2; + buildInputs = with self; [] ++ optional isPy26 unittest2; propagatedBuildInputs = - [ pythonPackages.beautifulsoup4 - pythonPackages.peppercorn - pythonPackages.colander - pythonPackages.translationstring - pythonPackages.chameleon - pythonPackages.zope_deprecation - pythonPackages.coverage - pythonPackages.nose + [ self.beautifulsoup4 + self.peppercorn + self.colander + self.translationstring + self.chameleon + self.zope_deprecation + self.coverage + self.nose ]; meta = { @@ -1858,12 +2112,12 @@ let deform_bootstrap = buildPythonPackage rec { name = "deform_bootstrap-0.2.9"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/d/deform_bootstrap/${name}.tar.gz"; sha256 = "1hgq3vqsfqdmlyahnlc40w13viawhpzqf4jzigsggdb41x545fda"; }; - propagatedBuildInputs = [ deform ]; + propagatedBuildInputs = with self; [ deform ]; meta = { maintainers = [ stdenv.lib.maintainers.iElectric ]; @@ -1875,7 +2129,7 @@ let demjson = buildPythonPackage rec { name = "demjson-1.6"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/d/demjson/${name}.tar.gz"; sha256 = "0abf7wqqq7rk1sycy47ayn5p93yy7gjq50cb2z69wmik1qqrr60x"; }; @@ -1896,12 +2150,12 @@ let }; }; - derpconf = pythonPackages.buildPythonPackage rec { + derpconf = self.buildPythonPackage rec { name = "derpconf-0.4.9"; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = with self; [ six ]; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/d/derpconf/${name}.tar.gz"; md5 = "a164807d7bf0c4adf1de781305f29b82"; }; @@ -1913,15 +2167,25 @@ let }; }; + dns = buildPythonPackage rec { + name = "dnspython-${version}"; + version = "1.12.0"; + + src = pkgs.fetchurl { + url = "http://www.dnspython.org/kits/1.12.0/dnspython-1.12.0.tar.gz"; + sha256 = "0kvjlkp96qzh3j31szpjlzqbp02brixh4j4clnpw80b0hspq5yq3"; + }; + }; + docker = buildPythonPackage rec { name = "docker-py-0.4.0"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/d/docker-py/${name}.tar.gz"; md5 = "21ab8fd729105487e6423b654d6c0860"; }; - propagatedBuildInputs = [ six requests websocket_client ]; + propagatedBuildInputs = with self; [ six requests websocket_client ]; # Version conflict doCheck = false; @@ -1933,13 +2197,69 @@ let }; }; + docker_registry_core = buildPythonPackage rec { + name = "docker-registry-core-2.0.3"; + disabled = isPy3k; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/d/docker-registry-core/${name}.tar.gz"; + md5 = "610ef9395f2e9a2f91c68d13325fce7b"; + }; + + DEPS = "loose"; + + doCheck = false; + propagatedBuildInputs = with self; [ + boto redis setuptools simplejson + ]; + + patchPhase = "> requirements/main.txt"; + + meta = { + description = "Docker registry core package"; + homepage = https://github.com/docker/docker-registry; + license = licenses.asl20; + }; + }; + + docker_registry = buildPythonPackage rec { + name = "docker-registry-0.9.0"; + disabled = isPy3k; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/d/docker-registry/${name}.tar.gz"; + md5 = "65eb9fd05b94f7f9fbbb5e2e8ca62912"; + }; + + DEPS = "loose"; + + doCheck = false; # requires redis server + propagatedBuildInputs = with self; [ + setuptools docker_registry_core blinker flask gevent gunicorn pyyaml + requests2 rsa sqlalchemy setuptools backports_lzma pyasn1 + ]; + + patchPhase = "> requirements/main.txt"; + + # Default config uses needed env variables + postInstall = '' + ln -s $out/lib/python2.7/site-packages/config/config_sample.yml $out/lib/python2.7/site-packages/config/config.yml + ''; + + meta = { + description = "Docker registry core package"; + homepage = https://github.com/docker/docker-registry; + license = licenses.asl20; + }; + }; + dogpile_cache = buildPythonPackage rec { name = "dogpile.cache-0.5.4"; - propagatedBuildInputs = [ dogpile_core ]; + propagatedBuildInputs = with self; [ dogpile_core ]; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/d/dogpile.cache/dogpile.cache-0.5.4.tar.gz"; md5 = "513b77ba1bd0c31bb15dd9dd0d8471af"; }; @@ -1947,7 +2267,7 @@ let doCheck = false; meta = { - description = "A caching front-end based on the Dogpile lock."; + description = "A caching front-end based on the Dogpile lock"; homepage = http://bitbucket.org/zzzeek/dogpile.cache; license = licenses.bsd3; }; @@ -1956,7 +2276,7 @@ let dogpile_core = buildPythonPackage rec { name = "dogpile.core-0.4.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/d/dogpile.core/dogpile.core-0.4.1.tar.gz"; md5 = "01cb19f52bba3e95c9b560f39341f045"; }; @@ -1973,7 +2293,7 @@ let dotfiles = buildPythonPackage rec { name = "dotfiles-0.6.3"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/d/dotfiles/${name}.tar.gz"; md5 = "95a0792eb92a8fc0db8a7e59389470fe"; }; @@ -1991,7 +2311,7 @@ let name = "dpkt-1.8"; disabled = isPy3k; - src = fetchurl { + src = pkgs.fetchurl { url = "https://dpkt.googlecode.com/files/${name}.tar.gz"; sha256 = "01q5prynymaqyfsfi2296xncicdpid2hs3yyasim8iigvkwy4vf5"; }; @@ -2011,7 +2331,7 @@ let urllib3 = buildPythonPackage rec { name = "urllib3-1.8"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/u/urllib3/${name}.tar.gz"; sha256 = "0pdigfxkq8mhzxxsn6isx8c4h9azqywr1k18yanwyxyj8cdzm28s"; }; @@ -2024,7 +2344,7 @@ let nosetests --cover-min-percentage 70 ''; - buildInputs = [ coverage tornado mock nose ]; + buildInputs = with self; [ coverage tornado mock nose ]; meta = with stdenv.lib; { description = "A Python library for Dropbox's HTTP-based Core and Datastore APIs"; @@ -2038,12 +2358,12 @@ let name = "dropbox-2.0.0"; doCheck = !isPy3k; # failures with hash randomization - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/d/dropbox/${name}.zip"; sha256 = "1bi2z1lql6ryylfflmizhqn98ab55777vn7n5krhqz40pdcjilkx"; }; - propagatedBuildInputs = [ urllib3 mock setuptools ]; + propagatedBuildInputs = with self; [ urllib3 mock setuptools ]; meta = with stdenv.lib; { description = "A Python library for Dropbox's HTTP-based Core and Datastore APIs"; @@ -2054,16 +2374,16 @@ let evdev = buildPythonPackage rec { - version = "0.4.5"; + version = "0.4.6"; name = "evdev-${version}"; disabled = isPy34; # see http://bugs.python.org/issue21121 - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/e/evdev/${name}.tar.gz"; - sha256 = "0w8ib3ab4mpfc1rvd335l8xkd41qbh3iyb0vfiiapgcfvqk74aq7"; + sha256 = "08bzyr3zc8ijnv25bysmmvzircblh42ja15f6ijdzmqqw8vfaij8"; }; - buildInputs = [ pkgs.linuxHeaders ]; + buildInputs = with self; [ pkgs.linuxHeaders ]; patchPhase = "sed -e 's#/usr/include/linux/input.h#${pkgs.linuxHeaders}/include/linux/input.h#' -i setup.py"; @@ -2079,17 +2399,37 @@ let }; + eventlib = buildPythonPackage rec { + name = "python-eventlib-${version}"; + version = "0.2.0"; + + src = pkgs.fetchurl { + url = "http://download.ag-projects.com/SipClient/${name}.tar.gz"; + sha256 = "0fld5lb85ql4a5bgc38sdxi5pgzqljysp1p8f7abxnd6vymh4rgi"; + }; + + propagatedBuildInputs = with self; [ greenlet ]; + + meta = with stdenv.lib; { + description = "Eventlib bindings for python."; + homepage = "http://ag-projects.com/"; + license = licenses.lgpl2; + platforms = platforms.all; + }; + }; + + eyeD3 = buildPythonPackage rec { version = "0.7.4"; name = "eyeD3-${version}"; disabled = isPyPy; - src = fetchurl { + src = pkgs.fetchurl { url = "http://eyed3.nicfit.net/releases/${name}.tgz"; sha256 = "001hzgqqnf2ig432mq78jsxidpky2rl2ilm28xwjp32vzphycf51"; }; - buildInputs = [ paver ]; + buildInputs = with self; [ paver ]; postInstall = '' for prog in "$out/bin/"*; do @@ -2117,7 +2457,7 @@ let execnet = buildPythonPackage rec { name = "execnet-1.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/e/execnet/${name}.zip"; md5 = "be885ccd9612966bb81839670d2da099"; }; @@ -2135,13 +2475,13 @@ let disabled = isPy3k; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/f/facebook-sdk/facebook-sdk-0.4.0.tar.gz"; md5 = "ac9f38e197e54b8ba9f3a61988cc33b7"; }; meta = with pkgs.stdenv.lib; { - description = "Client library that supports the Facebook Graph API and the official Facebook JavaScript SDK."; + description = "Client library that supports the Facebook Graph API and the official Facebook JavaScript SDK"; homepage = https://github.com/pythonforfacebook/facebook-sdk; license = licenses.asl20 ; }; @@ -2150,13 +2490,13 @@ let faker = buildPythonPackage rec { name = "faker-0.0.4"; disabled = isPy3k; - src = fetchurl { + src = pkgs.fetchurl { url = https://pypi.python.org/packages/source/F/Faker/Faker-0.0.4.tar.gz; sha256 = "09q5jna3j8di0gw5yjx0dvlndkrk2x9vvqzwyfsvg3nlp8h38js1"; }; - buildInputs = [ nose ]; + buildInputs = with self; [ nose ]; meta = with stdenv.lib; { - description = "A Python library for generating fake user data."; + description = "A Python library for generating fake user data"; homepage = http://pypi.python.org/pypi/Faker; license = licenses.mit; maintainers = with maintainers; [ lovek323 ]; @@ -2166,12 +2506,12 @@ let fake_factory = buildPythonPackage rec { name = "fake-factory-0.2"; - src = fetchurl { + src = pkgs.fetchurl { url = https://pypi.python.org/packages/source/f/fake-factory/fake-factory-0.2.tar.gz; sha256 = "0qdmk8p4anrj9mf95dh9v7bkhv1pz69hvhlw380kj4iz7b44b6zn"; }; meta = with stdenv.lib; { - description = "A Python package that generates fake data for you."; + description = "A Python package that generates fake data for you"; homepage = https://pypi.python.org/pypi/fake-factory; license = licenses.mit; maintainers = with maintainers; [ lovek323 ]; @@ -2181,27 +2521,27 @@ let fabric = buildPythonPackage rec { name = "fabric-${version}"; - version = "1.9.1"; - src = fetchurl { + version = "1.10.0"; + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/F/Fabric/Fabric-${version}.tar.gz"; - sha256 = "103mzf0l15kyvw5nmf7bsdrqg6y3wpyxmkyl2h9lk7jxb5gdc9s1"; + sha256 = "0nikc05iz1fx2c9pvxrhrs819cpmg566azm99450yq2m8qmp1cpd"; }; disabled = isPy3k; doCheck = (!isPyPy); # https://github.com/fabric/fabric/issues/11891 - propagatedBuildInputs = [ paramiko pycrypto ]; - buildInputs = [ fudge nose ]; + propagatedBuildInputs = with self; [ paramiko pycrypto ]; + buildInputs = with self; [ fudge nose ]; }; fedora_cert = stdenv.mkDerivation (rec { name = "fedora-cert-0.5.9.2"; meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; - src = fetchurl { + src = pkgs.fetchurl { url = "https://fedorahosted.org/releases/f/e/fedora-packager/fedora-packager-0.5.9.2.tar.bz2"; sha256 = "105swvzshgn3g6bjwk67xd8pslnhpxwa63mdsw6cl4c7cjp2blx9"; }; - propagatedBuildInputs = [ python python_fedora wrapPython ]; + propagatedBuildInputs = with self; [ python python_fedora wrapPython ]; postInstall = "mv $out/bin/fedpkg $out/bin/fedora-cert-fedpkg"; doCheck = false; @@ -2212,30 +2552,30 @@ let name = "fedpkg-1.14"; meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; - src = fetchurl { + src = pkgs.fetchurl { url = "https://fedorahosted.org/releases/f/e/fedpkg/fedpkg-1.14.tar.bz2"; sha256 = "0rj60525f2sv34g5llafnkmpvbwrfbmfajxjc14ldwzymp8clc02"; }; patches = [ ../development/python-modules/fedpkg-buildfix.diff ]; - propagatedBuildInputs = [ rpkg offtrac urlgrabber fedora_cert ]; + propagatedBuildInputs = with self; [ rpkg offtrac urlgrabber fedora_cert ]; }); fudge = buildPythonPackage rec { - name = "fudge-0.9.4"; - src = fetchurl { - url = https://pypi.python.org/packages/source/f/fudge/fudge-0.9.4.tar.gz; - sha256 = "03sj2x6mpzm48swpa4hnn1gi6yilgniyjfg1ylz95wm1ijggi33w"; + name = "fudge-0.9.6"; + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/f/fudge/${name}.tar.gz"; + sha256 = "185ia3vr3qk4f2s1a9hdxb8ci4qc0x0xidrad96pywg8j930qs9l"; }; - buildInputs = [ nose nosejs ]; - propagatedBuildInputs = [ sphinx ]; + buildInputs = with self; [ nose nosejs ]; + propagatedBuildInputs = with self; [ sphinx ]; }; funcparserlib = buildPythonPackage rec { name = "funcparserlib-0.3.6"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/f/funcparserlib/${name}.tar.gz"; md5 = "3aba546bdad5d0826596910551ce37c0"; }; @@ -2251,9 +2591,9 @@ let singledispatch = buildPythonPackage rec { name = "singledispatch-3.4.0.3"; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = with self; [ six ]; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/s/singledispatch/${name}.tar.gz"; md5 = "af2fc6a3d6cc5a02d0bf54d909785fcb"; }; @@ -2264,19 +2604,31 @@ let }; gcutil = buildPythonPackage rec { - name = "gcutil-1.15.0"; + name = "gcutil-1.16.1"; meta.maintainers = [ stdenv.lib.maintainers.phreedom ]; - src = fetchurl { - url = https://dl.google.com/dl/cloudsdk/release/artifacts/gcutil-1.15.0.tar.gz; - sha256 = "12c98ivhjr01iz6lkga574xm8p0bsil6arydvpblyw8sjkgim5sq"; + src = pkgs.fetchurl { + url = https://dl.google.com/dl/cloudsdk/release/artifacts/gcutil-1.16.1.tar.gz; + sha256 = "00jaf7x1ji9y46fbkww2sg6r6almrqfsprydz3q2swr4jrnrsx9x"; }; patchPhase = '' - substituteInPlace setup.py --replace "httplib2==0.8" "httplib2" + substituteInPlace setup.py \ + --replace "httplib2==0.8" "httplib2" \ + --replace "iso8601==0.1.4" "iso8601" ''; - propagatedBuildInputs = [ gflags iso8601_0_1_4 ipaddr httplib2 google_apputils google_api_python_client ]; + propagatedBuildInputs = with self; [ gflags iso8601 ipaddr httplib2 google_apputils google_api_python_client ]; + }; + + gnutls = buildPythonPackage rec { + name = "python-gnutls"; + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/python-gnutls/python-gnutls-2.0.1.tar.gz"; + sha256 = "d8fb368c6a4dd58bc6cd5e61d4a12d119c4506fd344a371b3429b3ac2623b9ac"; + }; + + propagatedBuildInputs = with self; [ pkgs.gnutls ]; }; gitdb = buildPythonPackage rec { @@ -2284,25 +2636,25 @@ let meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; doCheck = false; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/g/gitdb/${name}.tar.gz"; sha256 = "10rpmmlln59aq44cd5vkb77hslak5pa1rbmigg6ski5f1nn2spfy"; }; - propagatedBuildInputs = [ smmap async ]; + propagatedBuildInputs = with self; [ smmap async ]; }; GitPython = buildPythonPackage rec { name = "GitPython-0.3.2"; meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/G/GitPython/GitPython-0.3.2.RC1.tar.gz"; sha256 = "1q4lc2ps12l517mmrxc8iq6gxyhj6d77bnk1p7mxf38d99l8crzx"; }; - buildInputs = [ nose ]; - propagatedBuildInputs = [ gitdb ]; + buildInputs = with self; [ nose ]; + propagatedBuildInputs = with self; [ gitdb ]; }; googlecl = buildPythonPackage rec { @@ -2310,20 +2662,20 @@ let name = "googlecl-${version}"; disabled = isPy3k; - src = fetchurl { + src = pkgs.fetchurl { url = "https://googlecl.googlecode.com/files/${name}.tar.gz"; sha256 = "0nnf7xkr780wivr5xnchfcrahlzy9bi2dxcs1w1bh1014jql0iha"; }; meta = with stdenv.lib; { - description = "Brings Google services to the command line."; - homepage = "https://code.google.com/p/googlecl/"; + description = "Brings Google services to the command line"; + homepage = https://code.google.com/p/googlecl/; license = licenses.asl20; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; }; - propagatedBuildInputs = [ gdata ]; + propagatedBuildInputs = with self; [ gdata ]; }; gtimelog = buildPythonPackage rec { @@ -2332,7 +2684,7 @@ let disabled = isPy26; - src = fetchurl { + src = pkgs.fetchurl { url = "https://github.com/gtimelog/gtimelog/archive/${version}.tar.gz"; sha256 = "0qk8fv8cszzqpdi3wl9vvkym1jil502ycn6sic4jrxckw5s9jsfj"; }; @@ -2343,7 +2695,7 @@ let ''; # TODO: AppIndicator - propagatedBuildInputs = [ pkgs.gobjectIntrospection pygobject3 pkgs.makeWrapper pkgs.gtk3 ]; + propagatedBuildInputs = with self; [ pkgs.gobjectIntrospection pygobject3 pkgs.makeWrapper pkgs.gtk3 ]; checkPhase = '' substituteInPlace runtests --replace "/usr/bin/env python" "${python}/bin/${python.executable}" @@ -2369,7 +2721,7 @@ let itsdangerous = buildPythonPackage rec { name = "itsdangerous-0.24"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/i/itsdangerous/${name}.tar.gz"; sha256 = "06856q6x675ly542ig0plbqcyab6ksfzijlyf1hzhgg3sgwgrcyb"; }; @@ -2385,12 +2737,12 @@ let disabled = isPyPy; # doesn't find setuptools - src = fetchurl { + src = pkgs.fetchurl { url = "https://github.com/dbohdan/jsonwatch/archive/v0.2.0.tar.gz"; sha256 = "04b616ef97b9d8c3887004995420e52b72a4e0480a92dbf60aa6c50317261e06"; }; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = with self; [ six ]; meta = { description = "Like watch -d but for JSON"; @@ -2411,18 +2763,18 @@ let logilab_astng = buildPythonPackage rec { name = "logilab-astng-0.24.3"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://download.logilab.org/pub/astng/${name}.tar.gz"; sha256 = "0np4wpxyha7013vkkrdy54dvnil67gzi871lg60z8lap0l5h67wn"; }; - propagatedBuildInputs = [ logilab_common ]; + propagatedBuildInputs = with self; [ logilab_common ]; }; logster = buildPythonPackage { name = "logster-7475c53822"; - src = fetchgit { + src = pkgs.fetchgit { url = git://github.com/etsy/logster; rev = "7475c53822"; sha256 = "1ls007qmziwb50c5iikxhqin0xbn673gbd25m5k09861435cknvr"; @@ -2434,14 +2786,14 @@ let version = "1.2.2"; name = "Paver-${version}"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/P/Paver/Paver-${version}.tar.gz"; sha256 = "0lix9d33ndb3yk56sm1zlj80fbmxp0w60yk0d9pr2xqxiwi88sqy"; }; - buildInputs = [ cogapp mock virtualenv ]; + buildInputs = with self; [ cogapp mock virtualenv ]; - propagatedBuildInputs = [ nose ]; + propagatedBuildInputs = with self; [ nose ]; # the tests do not pass doCheck = false; @@ -2458,7 +2810,7 @@ let peppercorn = buildPythonPackage rec { name = "peppercorn-0.4"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/peppercorn/${name}.tar.gz"; md5 = "464d6f2342eaf704dfb52046c1f5c320"; }; @@ -2475,12 +2827,12 @@ let pew = buildPythonPackage rec { name = "pew-0.1.9"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pew/${name}.tar.gz"; md5 = "90a82400074b50a9e73c3045ed9ac217"; }; - propagatedBuildInputs = [ virtualenv virtualenv-clone ]; + propagatedBuildInputs = with self; [ virtualenv virtualenv-clone ]; meta = with stdenv.lib; { description = "Tools to manage multiple virtualenvs written in pure python, a virtualenvwrapper rewrite"; @@ -2489,16 +2841,43 @@ let }; }; + poppler-qt4 = buildPythonPackage rec { + name = "poppler-qt4-${version}"; + version = "0.18.1"; + disabled = isPy3k || isPyPy; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/python-poppler-qt4/" + + "python-poppler-qt4-${version}.tar.gz"; + md5 = "9c4c5a59b878aed78e96a6ae58c6c185"; + }; + + propagatedBuildInputs = [ pkgs.pyqt4 pkgs.sip pkgs.pkgconfig pkgs.popplerQt4 ]; + + preBuild = "${python}/bin/${python.executable} setup.py build_ext" + + " --include-dirs=${pkgs.popplerQt4}/include/poppler/"; + + meta = with stdenv.lib; { + description = "A Python binding to Poppler-Qt4"; + longDescription = '' + A Python binding to Poppler-Qt4 that aims for completeness + and for being actively maintained. + ''; + license = licenses.lgpl21Plus; + maintainers = [ maintainers.sepi ]; + platforms = platforms.all; + }; + }; pudb = buildPythonPackage rec { name = "pudb-2013.3.6"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pudb/${name}.tar.gz"; md5 = "063030763bf914166a0b2bc8c011143b"; }; - propagatedBuildInputs = [ pythonPackages.pygments pythonPackages.urwid ]; + propagatedBuildInputs = with self; [ self.pygments self.urwid ]; meta = with stdenv.lib; { description = "A full-screen, console-based Python debugger"; @@ -2511,7 +2890,7 @@ let pyramid = buildPythonPackage rec { name = "pyramid-1.5.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pyramid/${name}.tar.gz"; md5 = "8a1ab3b773d8e22437828f7df22852c1"; }; @@ -2521,7 +2900,7 @@ let rm pyramid/tests/test_response.py ''; - buildInputs = [ + buildInputs = with self; [ docutils virtualenv webtest @@ -2529,7 +2908,7 @@ let zope_interface ] ++ optional isPy26 unittest2; - propagatedBuildInputs = [ + propagatedBuildInputs = with self; [ paste_deploy repoze_lru repoze_sphinx_autointerface @@ -2553,12 +2932,12 @@ let pyramid_beaker = buildPythonPackage rec { name = "pyramid_beaker-0.7"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pyramid_beaker/${name}.tar.gz"; md5 = "acb863517a98b90b5f29648ce55dd563"; }; - propagatedBuildInputs = [ beaker pyramid ]; + propagatedBuildInputs = with self; [ beaker pyramid ]; meta = { maintainers = [ stdenv.lib.maintainers.iElectric ]; @@ -2575,7 +2954,7 @@ let md5 = "5bb5938356dfd13fce06e095f132e137"; }; - propagatedBuildInputs = [ + propagatedBuildInputs = with self; [ chameleon pyramid zope_interface @@ -2591,13 +2970,13 @@ let pyramid_jinja2 = buildPythonPackage rec { name = "pyramid_jinja2-1.9"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pyramid_jinja2/${name}.zip"; md5 = "a6728117cad24749ddb39d2827cd9033"; }; - buildInputs = [ webtest ]; - propagatedBuildInputs = [ jinja2 pyramid ]; + buildInputs = with self; [ webtest ]; + propagatedBuildInputs = with self; [ jinja2 pyramid ]; meta = { maintainers = [ stdenv.lib.maintainers.iElectric ]; @@ -2609,38 +2988,38 @@ let pyramid_debugtoolbar = buildPythonPackage rec { name = "pyramid_debugtoolbar-1.0.9"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pyramid_debugtoolbar/${name}.tar.gz"; sha256 = "1vnzg1qnnyisv7znxg7pasayfyr3nz7rrs5nqr4fmdgwj9q2pyv0"; }; - buildInputs = [ ]; - propagatedBuildInputs = [ pyramid pyramid_mako ]; + buildInputs = with self; [ ]; + propagatedBuildInputs = with self; [ pyramid pyramid_mako ]; }; pyramid_mako = buildPythonPackage rec { name = "pyramid_mako-0.3.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pyramid_mako/${name}.tar.gz"; sha256 = "00811djmsc4rz20kpy2paam05fbx6dmrv2i5jf90f6xp6zw4isy6"; }; - buildInputs = [ webtest ]; - propagatedBuildInputs = [ pyramid Mako ]; + buildInputs = with self; [ webtest ]; + propagatedBuildInputs = with self; [ pyramid Mako ]; }; pyramid_exclog = buildPythonPackage rec { name = "pyramid_exclog-0.7"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pyramid_exclog/${name}.tar.gz"; md5 = "05df86758b0d30ee6f8339ff36cef7a0"; }; - propagatedBuildInputs = [ pyramid ]; + propagatedBuildInputs = with self; [ pyramid ]; meta = { maintainers = [ @@ -2655,7 +3034,7 @@ let pyramid_tm = buildPythonPackage rec { name = "pyramid_tm-0.7"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pyramid_tm/${name}.tar.gz"; md5 = "6dc917d262c69366630c542bd21859a3"; }; @@ -2663,7 +3042,7 @@ let # tests are failing in version 0.7 but are fixed in trunk doCheck = false; - propagatedBuildInputs = [ transaction pyramid ]; + propagatedBuildInputs = with self; [ transaction pyramid ]; meta = { maintainers = [ stdenv.lib.maintainers.garbas @@ -2679,12 +3058,12 @@ let name = "pyramid_multiauth-${version}"; version = "0.3.2"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pyramid_multiauth/${name}.tar.gz"; md5 = "044e423abc4fb76937ac0c21c1205e9c"; }; - propagatedBuildInputs = [ pyramid ]; + propagatedBuildInputs = with self; [ pyramid ]; meta = with stdenv.lib; { description = "Authentication policy for Pyramid that proxies to a stack of other authentication policies"; @@ -2697,12 +3076,12 @@ let namePrefix = ""; version = "0.9"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/R/Radicale/Radicale-${version}.tar.gz"; sha256 = "77bf813fd26f0d359c1a7b7bcce9b842b4503c5516989a4a0a4f648e299e41f7"; }; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with self; [ flup ldap sqlalchemy @@ -2728,7 +3107,7 @@ let raven = buildPythonPackage rec { name = "raven-3.4.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/r/raven/${name}.tar.gz"; md5 = "6a9264133bf646149ffb9118d81445be"; }; @@ -2746,12 +3125,12 @@ let hypatia = buildPythonPackage rec { name = "hypatia-0.3"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/h/hypatia/${name}.tar.gz"; md5 = "d74c6dda31ff459a39fa5da9e98f2425"; }; - buildInputs = [ zope_interface zodb ]; + buildInputs = with self; [ zope_interface zodb ]; meta = { maintainers = [ stdenv.lib.maintainers.iElectric ]; @@ -2762,12 +3141,12 @@ let zope_copy = buildPythonPackage rec { name = "zope.copy-4.0.2"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zope.copy/${name}.zip"; md5 = "36aa2c96dec4cfeea57f54da2b733eb9"; }; - buildInputs = [ zope_interface zope_location zope_schema ]; + buildInputs = with self; [ zope_interface zope_location zope_schema ]; meta = { maintainers = [ stdenv.lib.maintainers.iElectric ]; @@ -2778,12 +3157,12 @@ let statsd = buildPythonPackage rec { name = "statsd-2.0.2"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/s/statsd/${name}.tar.gz"; md5 = "476ef5b9004f6e2cb25c7da440bb53d0"; }; - buildInputs = [ ]; + buildInputs = with self; [ ]; meta = { maintainers = [ stdenv.lib.maintainers.iElectric ]; @@ -2794,7 +3173,7 @@ let pyramid_zodbconn = buildPythonPackage rec { name = "pyramid_zodbconn-0.7"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pyramid_zodbconn/${name}.tar.gz"; md5 = "3c7746a227fbcda3e138ab8bfab7700b"; }; @@ -2802,8 +3181,8 @@ let # should be fixed in next release doCheck = false; - buildInputs = [ pyramid mock ]; - propagatedBuildInputs = [ zodb zodburi ]; + buildInputs = with self; [ pyramid mock ]; + propagatedBuildInputs = with self; [ zodb zodburi ]; meta = { maintainers = [ stdenv.lib.maintainers.iElectric ]; @@ -2814,13 +3193,13 @@ let pyramid_mailer = buildPythonPackage rec { name = "pyramid_mailer-0.13"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pyramid_mailer/${name}.tar.gz"; md5 = "43800c7c894097a23140da58e3638c93"; }; - buildInputs = [ pyramid transaction ]; - propagatedBuildInputs = [ repoze_sendmail ]; + buildInputs = with self; [ pyramid transaction ]; + propagatedBuildInputs = with self; [ repoze_sendmail ]; meta = { maintainers = [ stdenv.lib.maintainers.iElectric ]; @@ -2830,7 +3209,7 @@ let pyrtlsdr = buildPythonPackage rec { name = "pyrtlsdr-0.2.0"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pyrtlsdr/${name}.zip"; md5 = "646336675a00d38e6f54e77a17011b95"; }; @@ -2852,12 +3231,12 @@ let repoze_sendmail = buildPythonPackage rec { name = "repoze.sendmail-4.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/r/repoze.sendmail/${name}.tar.gz"; md5 = "81d15f1f03cc67d6f56f2091c594ef57"; }; - buildInputs = [ transaction ]; + buildInputs = with self; [ transaction ]; meta = { maintainers = [ stdenv.lib.maintainers.iElectric ]; @@ -2868,24 +3247,24 @@ let zodburi = buildPythonPackage rec { name = "zodburi-2.0"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zodburi/${name}.tar.gz"; md5 = "7876893829c2f784506c80d49f861b67"; }; - buildInputs = [ zodb mock ZEO ]; + buildInputs = with self; [ zodb mock ZEO ]; meta = { maintainers = [ stdenv.lib.maintainers.iElectric ]; }; }; - ZEO = pythonPackages.buildPythonPackage rec { + ZEO = self.buildPythonPackage rec { name = "ZEO-4.0.0"; - propagatedBuildInputs = [ random2 zodb six transaction persistent zc_lockfile zconfig zdaemon zope_interface ]; + propagatedBuildInputs = with self; [ random2 zodb six transaction persistent zc_lockfile zconfig zdaemon zope_interface ]; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/Z/ZEO/${name}.tar.gz"; md5 = "494d8320549185097ba4a6b6b76017d6"; }; @@ -2895,12 +3274,12 @@ let }; }; - random2 = pythonPackages.buildPythonPackage rec { + random2 = self.buildPythonPackage rec { name = "random2-1.0.1"; doCheck = !isPyPy; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/r/random2/${name}.zip"; md5 = "48a0a86fe00e447212d0095de8cf3e21"; }; @@ -2912,15 +3291,15 @@ let rev = "089818bc61c3dc5eca023254e37a280b041ea8cc"; name = "substanced-${rev}"; - src = fetchgit { + src = pkgs.fetchgit { inherit rev; url = "https://github.com/Pylons/substanced.git"; sha256 = "17s7sdvydw9a9d2d36c70lq962ryny3dv9nzdxqpfvwiry9iy3jx"; }; - buildInputs = [ mock ]; + buildInputs = with self; [ mock ]; - propagatedBuildInputs = [ + propagatedBuildInputs = with self; [ pyramid pytz zodb @@ -2950,7 +3329,7 @@ let repoze_lru = buildPythonPackage rec { name = "repoze.lru-0.6"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/r/repoze.lru/${name}.tar.gz"; md5 = "2c3b64b17a8e18b405f55d46173e14dd"; }; @@ -2969,12 +3348,12 @@ let repoze_sphinx_autointerface = buildPythonPackage rec { name = "repoze.sphinx.autointerface-0.7.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/r/repoze.sphinx.autointerface/${name}.tar.gz"; md5 = "f2fee996ae28dc16eb48f1a3e8f64801"; }; - propagatedBuildInputs = [ zope_interface sphinx ]; + propagatedBuildInputs = with self; [ zope_interface sphinx ]; meta = { maintainers = [ stdenv.lib.maintainers.iElectric ]; @@ -2987,7 +3366,7 @@ let version = "0.3a"; name = "rtmidi-${version}"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://chrisarndt.de/projects/python-rtmidi/download/python-${name}.tar.bz2"; sha256 = "0d2if633m3kbiricd5hgn1csccd8xab6lnab1bq9prdr9ks9i8h6"; }; @@ -2996,7 +3375,7 @@ let sed -i "/use_setuptools/d" setup.py ''; - buildInputs = [ pkgs.alsaLib pkgs.jack2 ]; + buildInputs = with self; [ pkgs.alsaLib pkgs.jack2 ]; meta = with stdenv.lib; { description = "A Python wrapper for the RtMidi C++ library written with Cython"; @@ -3009,9 +3388,9 @@ let zope_tales = buildPythonPackage rec { name = "zope.tales-4.0.2"; - propagatedBuildInputs = [ zope_interface six zope_testrunner ]; + propagatedBuildInputs = with self; [ zope_interface six zope_testrunner ]; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/z/zope.tales/${name}.zip"; md5 = "902b03a5f9774f6e2decf3f06d18a09d"; }; @@ -3021,12 +3400,12 @@ let zope_deprecation = buildPythonPackage rec { name = "zope.deprecation-3.5.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zope.deprecation/${name}.tar.gz"; md5 = "836cfea5fad548cd5a0d9af1300ec05e"; }; - buildInputs = [ zope_testing ]; + buildInputs = with self; [ zope_testing ]; meta = { maintainers = [ @@ -3041,7 +3420,7 @@ let venusian = buildPythonPackage rec { name = "venusian-1.0a7"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/v/venusian/${name}.tar.gz"; md5 = "6f67506dd3cf77116f1c01682a6c3f27"; }; @@ -3062,12 +3441,12 @@ let chameleon = buildPythonPackage rec { name = "Chameleon-2.15"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/C/Chameleon/${name}.tar.gz"; md5 = "0214647152fcfcb9ce357624f8f9f203"; }; - buildInputs = [] ++ optionals isPy26 [ ordereddict unittest2 ]; + buildInputs = with self; [] ++ optionals isPy26 [ ordereddict unittest2 ]; # TODO: https://github.com/malthe/chameleon/issues/139 doCheck = false; @@ -3084,7 +3463,7 @@ let distutils_extra = buildPythonPackage rec { name = "distutils-extra-2.26"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://launchpad.net/python-distutils-extra/trunk/2.26/+download/python-${name}.tar.gz"; md5 = "7caded30a45907b5cdb10ac4182846eb"; }; @@ -3096,15 +3475,15 @@ let }; deluge = buildPythonPackage rec { - name = "deluge-1.3.7"; + name = "deluge-1.3.10"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://download.deluge-torrent.org/source/${name}.tar.bz2"; - sha256 = "07m5lgkqymlh0810bk2f5l0k83n51xb3gszj11sr509jgbnxjnmm"; + sha256 = "1x8ylcw88a6x3zyvyxmzjsbcy9dr2s5dxam2aw6harb4n1l2v9kd"; }; - propagatedBuildInputs = with pkgs; [ - pyGtkGlade libtorrentRasterbar twisted Mako chardet pyxdg pyopenssl modules.curses + propagatedBuildInputs = with self; [ + pyGtkGlade pkgs.libtorrentRasterbar twisted Mako chardet pyxdg self.pyopenssl modules.curses ]; postInstall = '' @@ -3125,7 +3504,7 @@ let pyxdg = buildPythonPackage rec { name = "pyxdg-0.25"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pyxdg/${name}.tar.gz"; md5 = "bedcdb3a0ed85986d40044c87f23477c"; }; @@ -3144,7 +3523,7 @@ let chardet = buildPythonPackage rec { name = "chardet-2.1.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/c/chardet/${name}.tar.gz"; md5 = "295367fd210d20f3febda615a88e1ef0"; }; @@ -3157,13 +3536,13 @@ let }; }; - django = django_1_6; + django = self.django_1_6; django_1_6 = buildPythonPackage rec { name = "Django-${version}"; version = "1.6.6"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://www.djangoproject.com/m/releases/1.6/${name}.tar.gz"; sha256 = "143yp984n8a2bs1dflxjp1s7skmji0cwkw05s9ikbfikwmabsv2k"; }; @@ -3181,7 +3560,7 @@ let name = "Django-${version}"; version = "1.5.9"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://www.djangoproject.com/m/releases/1.5/${name}.tar.gz"; sha256 = "1lm0pa6m9f4cd6pv239lqj32z1snf8xjbvlbh8bqihs6a1f51kj7"; }; @@ -3199,7 +3578,7 @@ let name = "Django-${version}"; version = "1.4.14"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://www.djangoproject.com/m/releases/1.4/${name}.tar.gz"; sha256 = "173ci9ml2vs1z2x51wahssfn8mrmhd02varmg9kibm8z460svvc1"; }; @@ -3216,7 +3595,7 @@ let django_1_3 = buildPythonPackage rec { name = "Django-1.3.7"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://www.djangoproject.com/m/releases/1.3/${name}.tar.gz"; sha256 = "12pv8y2x3fhrcrjayfm6z40r57iwchfi5r19ajs8q8z78i3z8l7f"; }; @@ -3235,12 +3614,12 @@ let name = "django_evolution-0.6.9"; disabled = isPy3k; - src = fetchurl { + src = pkgs.fetchurl { url = "http://downloads.reviewboard.org/releases/django-evolution/${name}.tar.gz"; md5 = "c0d7d10bc41898c88b14d434c48766ff"; }; - propagatedBuildInputs = [ django_1_5 ]; + propagatedBuildInputs = with self; [ django_1_5 ]; meta = { description = "A database schema evolution tool for the Django web framework"; @@ -3252,7 +3631,7 @@ let django_tagging = buildPythonPackage rec { name = "django-tagging-0.3.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/d/django-tagging/${name}.tar.gz"; md5 = "a0855f2b044db15f3f8a025fa1016ddf"; }; @@ -3260,7 +3639,7 @@ let # error: invalid command 'test' doCheck = false; - propagatedBuildInputs = [ django_1_3 ]; + propagatedBuildInputs = with self; [ django_1_3 ]; meta = { description = "A generic tagging application for Django projects"; @@ -3272,12 +3651,12 @@ let djblets = buildPythonPackage rec { name = "Djblets-0.6.28"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://downloads.reviewboard.org/releases/Djblets/0.6/${name}.tar.gz"; sha256 = "11fsi911cqkjgv9j7646ljc2fgxsdfyq44kzmv01xhysm50fn6xx"; }; - propagatedBuildInputs = [ pil django_1_3 feedparser ]; + propagatedBuildInputs = with self; [ pil django_1_3 feedparser ]; meta = { description = "A collection of useful extensions for Django"; @@ -3290,13 +3669,13 @@ let name = "dulwich-${version}"; version = "0.9.7"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/d/dulwich/${name}.tar.gz"; sha256 = "1wq083g9b1xsk89kb0wwpi4mxy63x6760vn9x5sk1fx36h27prqj"; }; # Only test dependencies - buildInputs = [ pkgs.git gevent geventhttpclient mock fastimport ]; + buildInputs = with self; [ pkgs.git gevent geventhttpclient mock fastimport ]; meta = with stdenv.lib; { description = "Simple Python implementation of the Git file formats and protocols."; @@ -3311,12 +3690,12 @@ let name = "hg-git-${version}"; version = "0.6.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/h/hg-git/${name}.tar.gz"; sha256 = "136kz4w377ldcjdg865azi8aym0xnxzxl3rycnflgay26ar1309s"; }; - propagatedBuildInputs = [ pkgs.mercurial dulwich ]; + propagatedBuildInputs = with self; [ pkgs.mercurial dulwich ]; meta = with stdenv.lib; { description = "Push and pull from a Git server using Mercurial."; @@ -3329,7 +3708,7 @@ let docutils = buildPythonPackage rec { name = "docutils-0.11"; - src = fetchurl { + src = pkgs.fetchurl { url = "mirror://sourceforge/docutils/${name}.tar.gz"; sha256 = "1jbybs5a396nrjy9m13pgvsxdwaj7jw7nsawkhl4fi1nvxm1dx4s"; }; @@ -3339,14 +3718,14 @@ let meta = { homepage = http://docutils.sourceforge.net/; - description = "Docutils is an open-source text processing system for processing plaintext documentation into useful formats, such as HTML or LaTeX."; + description = "An open-source text processing system for processing plaintext documentation into useful formats, such as HTML or LaTeX"; }; }; doxypy = buildPythonPackage rec { name = "doxypy-0.4.2"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://code.foosel.org/files/${name}.tar.gz"; sha256 = "1afmb30zmy7942b53qa5vd3js883wwqqls35n8xfb3rnj0qnll8g"; }; @@ -3363,7 +3742,7 @@ let dtopt = buildPythonPackage rec { name = "dtopt-0.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/d/dtopt/${name}.tar.gz"; md5 = "9a41317149e926fcc408086aedee6bab"; }; @@ -3377,15 +3756,15 @@ let ecdsa = buildPythonPackage rec { name = "ecdsa-${version}"; - version = "0.10"; + version = "0.11"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/e/ecdsa/${name}.tar.gz"; - md5 = "e95941b3bcbf1726472bb724d7478551"; + md5 = "8ef586fe4dbb156697d756900cb41d7c"; }; # Only needed for tests - buildInputs = [ pkgs.openssl ]; + buildInputs = with self; [ pkgs.openssl ]; meta = { description = "ECDSA cryptographic signature library"; @@ -3398,12 +3777,11 @@ let elpy = buildPythonPackage rec { name = "elpy-1.0.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/e/elpy/elpy-1.0.1.tar.gz"; md5 = "5453f085f7871ed8fc11d51f0b68c785"; }; - buildInputs = [ ]; - propagatedBuildInputs = [ flake8 ]; + propagatedBuildInputs = with self; [ flake8 ]; doCheck = false; # there are no tests @@ -3418,27 +3796,27 @@ let name = "enum-0.4.4"; disabled = isPy3k; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/e/enum/${name}.tar.gz"; md5 = "ce75c7c3c86741175a84456cc5bd531e"; }; doCheck = !isPyPy; - buildInputs = [ ]; + buildInputs = with self; [ ]; - propagatedBuildInputs = [ ]; + propagatedBuildInputs = with self; [ ]; meta = { homepage = http://pypi.python.org/pypi/enum/; - description = "Robust enumerated type support in Python."; + description = "Robust enumerated type support in Python"; }; }; enum34 = buildPythonPackage rec { name = "enum34-1.0"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/e/enum34/${name}.tar.gz"; md5 = "9d57f5454c70c11707998ea26c1b0a7c"; }; @@ -3447,12 +3825,12 @@ let epc = buildPythonPackage rec { name = "epc-0.0.3"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/e/epc/${name}.tar.gz"; md5 = "04a93c0cd32b496969ead09f414dac74"; }; - propagatedBuildInputs = [ sexpdata ]; + propagatedBuildInputs = with self; [ sexpdata ]; doCheck = false; meta = { @@ -3465,14 +3843,14 @@ let eventlet = buildPythonPackage rec { name = "eventlet-0.15.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/e/eventlet/${name}.tar.gz"; md5 = "7155780824bb6344651a573838416f21"; }; - buildInputs = [ nose httplib2 ]; + buildInputs = with self; [ nose httplib2 ]; - propagatedBuildInputs = optionals (!isPyPy) [ greenlet ]; + propagatedBuildInputs = optionals (!isPyPy) [ self.greenlet ]; PYTHON_EGG_CACHE = "`pwd`/.egg-cache"; @@ -3488,7 +3866,7 @@ let name = "fastimport-${version}"; version = "0.9.4"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/f/fastimport/${name}.tar.gz"; sha256 = "0k8x7552ypx9rc14vbsvg2lc6z0r8pv9laah28pdwyynbq10825d"; }; @@ -3504,7 +3882,7 @@ let feedgenerator = buildPythonPackage (rec { name = "feedgenerator-1.7"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/f/feedgenerator/${name}.tar.gz"; md5 = "92978492871342ad64e8ae0ccfcf200c"; }; @@ -3514,7 +3892,7 @@ let export LC_ALL="en_US.UTF-8" ''; - propagatedBuildInputs = [ six pytz ]; + propagatedBuildInputs = with self; [ six pytz ]; meta = { homepage = https://github.com/dmdm/feedgenerator-py3k.git; @@ -3525,7 +3903,7 @@ let feedparser = buildPythonPackage (rec { name = "feedparser-5.1.3"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/f/feedparser/${name}.tar.gz"; md5 = "f2253de78085a1d5738f626fcc1d8f71"; }; @@ -3542,19 +3920,19 @@ let flake8 = buildPythonPackage (rec { name = "flake8-2.1.0"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/f/flake8/${name}.tar.gz"; md5 = "cf326cfb88a1db6c5b29a3a6d9efb257"; }; - buildInputs = [ nose mock ]; - propagatedBuildInputs = [ pyflakes pep8 mccabe ]; + buildInputs = with self; [ nose mock ]; + propagatedBuildInputs = with self; [ pyflakes pep8 mccabe ]; # 3 failing tests #doCheck = false; meta = { - description = "code checking using pep8 and pyflakes."; + description = "Code checking using pep8 and pyflakes"; homepage = http://pypi.python.org/pypi/flake8; license = licenses.mit; maintainers = [ stdenv.lib.maintainers.garbas ]; @@ -3565,12 +3943,12 @@ let flask = buildPythonPackage { name = "flask-0.10.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/F/Flask/Flask-0.10.1.tar.gz"; md5 = "378670fe456957eb3c27ddaef60b2b24"; }; - propagatedBuildInputs = [ werkzeug jinja2 ]; + propagatedBuildInputs = with self; [ werkzeug jinja2 ]; meta = { homepage = http://flask.pocoo.org/; @@ -3582,12 +3960,12 @@ let flask_cache = buildPythonPackage rec { name = "Flask-Cache-0.13.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/F/Flask-Cache/${name}.tar.gz"; md5 = "ab82a9cd0844891ccdb54fbb93fd6c59"; }; - propagatedBuildInputs = [ werkzeug flask ]; + propagatedBuildInputs = with self; [ werkzeug flask ]; meta = { homepage = https://github.com/thadeusb/flask-cache; @@ -3597,29 +3975,30 @@ let }; flexget = buildPythonPackage rec { - name = "FlexGet-1.2.161"; + version = "1.2.201"; + name = "FlexGet-${version}"; disabled = isPy3k; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/F/FlexGet/${name}.tar.gz"; - md5 = "f7533e7b1df49cc8027fc4a2cde0290d"; + md5 = "e940845fc38ee602109a876455a02084"; }; - buildInputs = [ nose ]; - # dateutil dependency: requirement is dateutil !=2.0 and != 2.2, - # dateutil_1_5 is used as it's supported, but a newer version could be used - propagatedBuildInputs = [ paver feedparser sqlalchemy pyyaml rpyc + buildInputs = with self; [ nose ]; + propagatedBuildInputs = with self; [ paver feedparser sqlalchemy pyyaml rpyc beautifulsoup4 html5lib pyrss2gen pynzb progressbar jinja2 flask - cherrypy requests dateutil_1_5 jsonschema python_tvrage tmdb3 ] + cherrypy requests dateutil_1_5 jsonschema python_tvrage tmdb3 + guessit pathpy + ] # enable deluge and transmission plugin support, if they're installed ++ stdenv.lib.optional (pkgs.config.pythonPackages.deluge or false) pythonpackages.deluge ++ stdenv.lib.optional (pkgs.transmission != null) - pythonPackages.transmissionrpc; + self.transmissionrpc; meta = { homepage = http://flexget.com/; - description = "Multipurpose automation tool for content like torrents, ..."; + description = "Multipurpose automation tool for content like torrents"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.iElectric ]; }; @@ -3629,14 +4008,14 @@ let version = "0.4.1"; name = "tvrage-${version}"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/python-tvrage/python-tvrage-${version}.tar.gz"; md5 = "cdfec252158c5047b626861900186dfb"; }; # has mostly networking dependent tests doCheck = false; - propagatedBuildInputs = [ beautifulsoup ]; + propagatedBuildInputs = with self; [ beautifulsoup ]; meta = { homepage = https://github.com/ckreutzer/python-tvrage; @@ -3650,12 +4029,12 @@ let version = "2.4.0"; name = "jsonschema-${version}"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/j/jsonschema/jsonschema-${version}.tar.gz"; md5 = "661f85c3d23094afbb9ac3c0673840bf"; }; - buildInputs = [ nose mock ]; + buildInputs = with self; [ nose mock ]; patchPhase = '' substituteInPlace jsonschema/tests/test_jsonschema_test_suite.py --replace "python" "${python}/bin/${python.executable}" @@ -3677,7 +4056,7 @@ let name = "flup-1.0.2"; disabled = isPy3k; - src = fetchurl { + src = pkgs.fetchurl { url = "http://www.saddi.com/software/flup/dist/${name}.tar.gz"; sha256 = "1nbx174g40l1z3a8arw72qz05a1qxi3didp9wm7kvkn1bxx33bab"; }; @@ -3688,16 +4067,35 @@ let }; }); + fonttools = buildPythonPackage (rec { + version = "2.4"; + name = "fonttools-${version}"; + disabled = isPy3k; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/F/FontTools/FontTools-${version}.tar.gz"; + sha256 = "13ggkzcj34kcca6bsxjkaqsxkp2bvxxf6ijiyhq1xlyb0z37z4qa"; + }; + + buildInputs = with self; [ + numpy + ]; + + meta = { + homepage = "http://sourceforge.net/projects/fonttools/"; + description = "Font file processing tools"; + }; + }); foolscap = buildPythonPackage (rec { name = "foolscap-0.6.4"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://foolscap.lothar.com/releases/${name}.tar.gz"; sha256 = "16cddyk5is0gjfn0ia5n2l4lhdzvbjzlx6sfpy7ddjd3d3fq7ckl"; }; - propagatedBuildInputs = [ twisted pkgs.pyopenssl ]; + propagatedBuildInputs = with self; [ twisted self.pyopenssl ]; meta = { homepage = http://foolscap.lothar.com/; @@ -3721,7 +4119,7 @@ let fs = buildPythonPackage rec { name = "fs-0.5.0"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/f/fs/${name}.tar.gz"; sha256 = "144f4yn2nvnxh2vrnmiabpwx3s637np0d1j1w95zym790d66shir"; }; @@ -3744,15 +4142,15 @@ let name = "${baseName}-${version}"; disabled = isPy3k; - src = fetchurl { + src = pkgs.fetchurl { url = "mirror://sourceforge/fuse/fuse-python-${version}.tar.gz"; sha256 = "06rmp1ap6flh64m81j0n3a357ij2vj9zwcvvw0p31y6hz1id9shi"; }; - buildInputs = [ pkgs.pkgconfig pkgs.fuse ]; + buildInputs = with self; [ pkgs.pkgconfig pkgs.fuse ]; meta = { - description = "Python bindings for FUSE."; + description = "Python bindings for FUSE"; license = stdenv.lib.licenses.lgpl21; }; }); @@ -3760,9 +4158,8 @@ let futures = buildPythonPackage rec { name = "futures-2.1.6"; - propagatedBuildInputs = with pythonPackages; [ ]; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/f/futures/futures-2.1.6.tar.gz"; md5 = "cfab9ac3cd55d6c7ddd0546a9f22f453"; }; @@ -3777,7 +4174,7 @@ let gcovr = buildPythonPackage rec { name = "gcovr-2.4"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/g/gcovr/${name}.tar.gz"; md5 = "672db629469882b93c40016aebff50ac"; }; @@ -3791,7 +4188,7 @@ let genshi = buildPythonPackage { name = "genshi-0.7"; - src = fetchurl { + src = pkgs.fetchurl { url = http://ftp.edgewall.com/pub/genshi/Genshi-0.7.tar.gz; sha256 = "0lkkbp6fbwzv0zda5iqc21rr7rdldkwh3hfabfjl9i4bwq14858x"; }; @@ -3800,7 +4197,7 @@ let # FAIL: test_sanitize_remove_src_javascript (genshi.filters.tests.html.HTMLSanitizerTestCase) doCheck = false; - buildInputs = [ pkgs.setuptools ]; + buildInputs = with self; [ pkgs.setuptools ]; meta = { description = "Python components for parsing HTML, XML and other textual content"; @@ -3819,13 +4216,13 @@ let name = "gevent-1.0.1"; disabled = isPy3k || isPyPy; # see https://github.com/surfly/gevent/issues/248 - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/g/gevent/${name}.tar.gz"; sha256 = "0hyzfb0gcx9pm5c2igan8y57hqy2wixrwvdjwsaivxsqs0ay49s6"; }; - buildInputs = [ pkgs.libev ]; - propagatedBuildInputs = optionals (!isPyPy) [ greenlet ]; + buildInputs = with self; [ pkgs.libev ]; + propagatedBuildInputs = optionals (!isPyPy) [ self.greenlet ]; meta = with stdenv.lib; { description = "Coroutine-based networking library"; @@ -3840,12 +4237,12 @@ let name = "geventhttpclient-${version}"; version = "1.1.0"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/g/geventhttpclient/${name}.tar.gz"; sha256 = "1k7s4dnkmcfqqkmbqi0vvb2ns53r9cl2652mq20bgg65zj26j2l6"; }; - propagatedBuildInputs = [ gevent certifi backports_ssl_match_hostname_3_4_0_2 ]; + propagatedBuildInputs = with self; [ gevent certifi backports_ssl_match_hostname_3_4_0_2 ]; meta = with stdenv.lib; { homepage = http://github.com/gwik/geventhttpclient; @@ -3858,37 +4255,37 @@ let gevent-socketio = buildPythonPackage rec { name = "gevent-socketio-0.3.6"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/g/gevent-socketio/${name}.tar.gz"; sha256 = "1zra86hg2l1jcpl9nsnqagy3nl3akws8bvrbpgdxk15x7ywllfak"; }; - buildInputs = [ versiontools gevent-websocket mock pytest ]; - propagatedBuildInputs = [ gevent ]; + buildInputs = with self; [ versiontools gevent-websocket mock pytest ]; + propagatedBuildInputs = with self; [ gevent ]; }; gevent-websocket = buildPythonPackage rec { name = "gevent-websocket-0.9.3"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/g/gevent-websocket/${name}.tar.gz"; sha256 = "07rqwfpbv13mk6gg8mf0bmvcf6siyffjpgai1xd8ky7r801j4xb4"; }; - propagatedBuildInputs = [ gevent ]; + propagatedBuildInputs = with self; [ gevent ]; }; genzshcomp = buildPythonPackage { name = "genzshcomp-0.5.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/g/genzshcomp/genzshcomp-0.5.1.tar.gz"; md5 = "7a954f1835875002e9044fe55ed1b488"; }; - buildInputs = [ pkgs.setuptools ] ++ (optional isPy26 argparse); + buildInputs = with self; [ pkgs.setuptools ] ++ (optional isPy26 argparse); meta = { description = "automatically generated zsh completion function for Python's option parser modules"; @@ -3900,7 +4297,7 @@ let gflags = buildPythonPackage rec { name = "gflags-2.0"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://python-gflags.googlecode.com/files/python-${name}.tar.gz"; sha256 = "1mkc7315bpmh39vbn0jq237jpw34zsrjr1sck98xi36bg8hnc41i"; }; @@ -3915,17 +4312,17 @@ let glance = buildPythonPackage rec { name = "glance-0.1.7"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/g/glance/${name}.tar.gz"; md5 = "e733713ccd23e4a6253386a47971cfb5"; }; - buildInputs = [ nose mox ]; + buildInputs = with self; [ nose mox ]; # tests fail for python2.6 doCheck = python.majorVersion != "2.6"; - propagatedBuildInputs = [ gflags sqlalchemy webob routes eventlet ]; + propagatedBuildInputs = with self; [ gflags sqlalchemy webob routes eventlet ]; PYTHON_EGG_CACHE = "`pwd`/.egg-cache"; @@ -3949,8 +4346,8 @@ let doCheck = false; - buildInputs = [ unittest2 ]; - propagatedBuildInputs = [ modules.curses modules.curses_panel psutil setuptools bottle batinfo pkgs.hddtemp pysnmp ]; + buildInputs = with self; [ unittest2 ]; + propagatedBuildInputs = with self; [ modules.curses modules.curses_panel psutil setuptools bottle batinfo pkgs.hddtemp pysnmp ]; preConfigure = '' sed -i 's/data_files\.append((conf_path/data_files.append(("etc\/glances"/' setup.py; @@ -3966,37 +4363,37 @@ let name = "goobook-1.5"; disabled = isPy3k; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/g/goobook/${name}.tar.gz"; sha256 = "05vpriy391l5i05ckl5ja5bswqyvl3rwrbmks9pi46w1813j7p5z"; }; - buildInputs = [ six ]; + buildInputs = with self; [ six ]; preConfigure = '' sed -i '/distribute/d' setup.py ''; meta = with stdenv.lib; { - description = "Search your google contacts from the command-line or mutt."; - homepage = "https://pypi.python.org/pypi/goobook"; + description = "Search your google contacts from the command-line or mutt"; + homepage = https://pypi.python.org/pypi/goobook; license = licenses.gpl3; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; }; - propagatedBuildInputs = [ gdata hcs_utils keyring simplejson ]; + propagatedBuildInputs = with self; [ gdata hcs_utils keyring simplejson ]; }; google_api_python_client = buildPythonPackage rec { name = "google-api-python-client-1.2"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://google-api-python-client.googlecode.com/files/google-api-python-client-1.2.tar.gz"; sha256 = "0xd619w71xk4ldmikxqhaaqn985rc2hy4ljgwfp50jb39afg7crw"; }; - propagatedBuildInputs = [ httplib2 ]; + propagatedBuildInputs = with self; [ httplib2 ]; meta = with stdenv.lib; { description = "The core Python library for accessing Google APIs"; @@ -4010,12 +4407,12 @@ let name = "google-apputils-0.4.0"; disabled = isPy3k; - src = fetchurl { + src = pkgs.fetchurl { url = http://pypi.python.org/packages/source/g/google-apputils/google-apputils-0.4.0.tar.gz; sha256 = "18wlivnqxvx1wsw177lckpl32nmr6cq7f5nhk8r72fvjy8wynq5j"; }; - propagatedBuildInputs = [ pytz gflags dateutil_1_5 mox ]; + propagatedBuildInputs = with self; [ pytz gflags dateutil_1_5 mox ]; meta = with stdenv.lib; { description = "Google Application Utilities for Python"; @@ -4023,18 +4420,22 @@ let }; }; + greenlet = buildPythonPackage rec { - name = "greenlet-0.4.3"; + name = "greenlet-${version}"; + version = "0.4.5"; disabled = isPyPy; # builtin for pypy - src = fetchurl { - url = "http://pypi.python.org/packages/source/g/greenlet/${name}.zip"; - md5 = "a5e467a5876c415cd357c1ab9027e06c"; + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/g/greenlet/${name}.zip"; + sha256 = "1gidivqcpn6i6k01bf3hgcn0m68h4b9srhpff9kgnk0c287z145r"; }; - meta = { + meta = with stdenv.lib; { homepage = http://pypi.python.org/pypi/greenlet; description = "Module for lightweight in-process concurrent programming"; + license = licenses.lgpl2; + platforms = platforms.all; }; }; @@ -4043,7 +4444,7 @@ let rev = "1977"; name = "gyp-r${rev}"; - src = fetchsvn { + src = pkgs.fetchsvn { url = "http://gyp.googlecode.com/svn/trunk"; inherit rev; sha256 = "0vnr75yd3bidysiwl9lljvf1dv6v9m9xqdnx0hdgyl92w689n9j8"; @@ -4060,15 +4461,39 @@ let }; }; + guessit = buildPythonPackage rec { + version = "0.9.3"; + name = "guessit-${version}"; + disabled = isPy3k; + + src = pkgs.fetchurl { + url = "http://pypi.python.org/packages/source/g/guessit/${name}.tar.gz"; + sha256 = "16kbxdz5zm3mfn739ynis04zw76x2gn1lz5d7vcwh8hzaj16yyk6"; + }; + + propagatedBuildInputs = with self; [ + dateutil_1_5 requests stevedore babelfish pyyaml + ]; + + # A unicode test fails + doCheck = false; + + meta = { + homepage = http://pypi.python.org/pypi/guessit; + license = stdenv.lib.licenses.lgpl3; + description = "A library for guessing information from video files."; + }; + }; + gunicorn = buildPythonPackage rec { name = "gunicorn-19.1.0"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/g/gunicorn/${name}.tar.gz"; md5 = "3d759bec3c46a680ff010775258c4c56"; }; - buildInputs = [ pytest ]; + buildInputs = with self; [ pytest ]; meta = { homepage = http://pypi.python.org/pypi/gunicorn; @@ -4079,7 +4504,7 @@ let hcs_utils = buildPythonPackage rec { name = "hcs_utils-1.5"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/h/hcs_utils/${name}.tar.gz"; sha256 = "1d2za9crkgzildx610w3zif2i8phcqhh6n8nzg3yvy2mg0s18mkl"; }; @@ -4089,7 +4514,7 @@ let export LC_ALL="en_US.UTF-8" ''; - buildInputs = [ six ]; + buildInputs = with self; [ six ]; meta = with stdenv.lib; { description = "Library collecting some useful snippets"; @@ -4105,7 +4530,7 @@ let name = "hetzner-${version}"; version = "0.7.2"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://github.com/RedMoonStudios/hetzner/archive/" + "v${version}.tar.gz"; sha256 = "07jnrgy9fkh1hwgsa8491ljz9spazmifqsg92m3xnamja1536qfl"; @@ -4126,13 +4551,13 @@ let htmllaundry = buildPythonPackage rec { name = "htmllaundry-2.0"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/h/htmllaundry/${name}.tar.gz"; md5 = "6db6909de76c4b259e65d90b5debdbda"; }; - buildInputs = [ nose ]; - propagatedBuildInputs = [ six lxml ]; + buildInputs = with self; [ nose ]; + propagatedBuildInputs = with self; [ six lxml ]; # some tests fail, probably because of changes in lxml # not relevant for me, if releavnt for you, fix it... @@ -4148,7 +4573,7 @@ let html5lib = buildPythonPackage (rec { name = "html5lib-0.95"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/h/html5lib/${name}.tar.gz"; md5 = "fe607f9917d81763e842f818f23464ee"; }; @@ -4165,12 +4590,12 @@ let name = "http_signature-0.1.4"; disabled = isPy3k; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/h/http_signature/${name}.tar.gz"; md5 = "015061846254bd5d8c5dbc2913985153"; }; - propagatedBuildInputs = [pycrypto]; + propagatedBuildInputs = with self; [pycrypto]; meta = { homepage = https://github.com/atl/py-http-signature; @@ -4182,12 +4607,12 @@ let httpbin = buildPythonPackage rec { name = "httpbin-0.2.0"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/h/httpbin/${name}.tar.gz"; md5 = "9b2bb2fab45f5fa839e9a776a64d6089"; }; - propagatedBuildInputs = [ flask markupsafe decorator itsdangerous six ]; + propagatedBuildInputs = with self; [ flask markupsafe decorator itsdangerous six ]; meta = { homepage = https://github.com/kennethreitz/httpbin; @@ -4200,7 +4625,7 @@ let httplib2 = buildPythonPackage rec { name = "httplib2-0.9"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/h/httplib2/${name}.tar.gz"; sha256 = "1asi5wpncnc6ki3bz33mhb9xh2lrkb24y4qng8bmqnczdmm8rsir"; }; @@ -4219,14 +4644,14 @@ let disabled = isPy3k; doCheck = !isPyPy; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/h/httpretty/${name}.tar.gz"; md5 = "50b02560a49fe928c90c53a49791f621"; }; - buildInputs = [ tornado requests httplib2 sure nose coverage ]; + buildInputs = with self; [ tornado requests httplib2 sure nose coverage ]; - propagatedBuildInputs = [ urllib3 ]; + propagatedBuildInputs = with self; [ urllib3 ]; postPatch = '' sed -i -e 's/==.*$//' *requirements.txt @@ -4247,9 +4672,29 @@ let }; }; + icalendar = buildPythonPackage rec { + version = "3.8.4"; + name = "icalendar-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/i/icalendar/${name}.zip"; + md5 = "d700e6e75613fd1ee882c4b11c58940c"; + }; + + buildInputs = with self; [ setuptools ]; + propagatedBuildInputs = with self; [ pytz ]; + + meta = with stdenv.lib; { + description = "A parser/generator of iCalendar files"; + homepage = "http://icalendar.readthedocs.org/"; + license = licenses.bsd2; + maintainers = [ maintainers.olcai ]; + }; + }; + importlib = if isPy26 then (buildPythonPackage { name = "importlib-1.0.2"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/i/importlib/importlib-1.0.2.tar.gz"; md5 = "4aa23397da8bd7c7426864e88e4db7e1"; }; @@ -4259,14 +4704,14 @@ let influxdb = buildPythonPackage rec { name = "influxdb-0.1.12"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/i/influxdb/${name}.tar.gz"; md5 = "6c975058ccc4df41dad8d8234c52d754"; }; # ImportError: No module named tests doCheck = false; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = with self; [ requests ]; meta = { description = "Python client for InfluxDB"; @@ -4279,15 +4724,15 @@ let version = "0.6.1"; name = "iptools-${version}"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/i/iptools/iptools-${version}.tar.gz"; md5 = "aed4045638fd40c16f8d9bb04606f700"; }; - buildInputs = [ nose ]; + buildInputs = with self; [ nose ]; meta = { - description = "Utilities for manipulating IP addresses including a class that can be used to include CIDR network blocks in Django's INTERNAL_IPS setting."; + description = "Utilities for manipulating IP addresses including a class that can be used to include CIDR network blocks in Django's INTERNAL_IPS setting"; homepage = http://pypi.python.org/pypi/iptools; }; }; @@ -4297,7 +4742,7 @@ let version = "0.74"; name = "ipy-${version}"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/I/IPy/IPy-${version}.tar.gz"; md5 = "f4f7ddc7c5e55a47222a5cc6c0a87b6d"; }; @@ -4316,7 +4761,7 @@ let name = "ipaddr-2.1.10"; disabled = isPy3k; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/i/ipaddr/${name}.tar.gz"; sha256 = "18ycwkfk3ypb1yd09wg20r7j7zq2a73d7j6j10qpgra7a7abzhyj"; }; @@ -4331,27 +4776,27 @@ let ipdb = buildPythonPackage rec { name = "ipdb-0.8"; disabled = isPyPy; # setupterm: could not find terminfo database - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/i/ipdb/${name}.zip"; md5 = "96dca0712efa01aa5eaf6b22071dd3ed"; }; - propagatedBuildInputs = [ pythonPackages.ipythonLight ]; + propagatedBuildInputs = with self; [ self.ipythonLight ]; }; ipdbplugin = buildPythonPackage { name = "ipdbplugin-1.4"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/i/ipdbplugin/ipdbplugin-1.4.tar.gz"; md5 = "f9a41512e5d901ea0fa199c3f648bba7"; }; - propagatedBuildInputs = [ pythonPackages.nose pythonPackages.ipythonLight ]; + propagatedBuildInputs = with self; [ self.nose self.ipythonLight ]; }; - iso8601_0_1_4 = buildPythonPackage { - name = "iso8601-0.1.4"; - src = fetchurl { - url = https://pypi.python.org/packages/source/i/iso8601/iso8601-0.1.4.tar.gz; - sha256 = "03gnjxpfq0wwimqnsvz32xcngq0hrdqryn3zm8qh95hnnggwqa3s"; + iso8601 = buildPythonPackage { + name = "iso8601-0.1.10"; + src = pkgs.fetchurl { + url = https://pypi.python.org/packages/source/i/iso8601/iso8601-0.1.10.tar.gz; + sha256 = "1qf01afxh7j4gja71vxv345if8avg6nnm0ry0zsk6j3030xgy4p7"; }; meta = { @@ -4364,51 +4809,54 @@ let jedi = buildPythonPackage (rec { name = "jedi-0.8.0-final0"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/j/jedi/${name}.tar.gz"; sha256 = "0jnhwh0b1hy5cssi3n5a4j7z9pgpcckyv5s52ba4jnq5bwgdpbcf"; }; meta = { - homepage = "https://github.com/davidhalter/jedi"; - description = "An autocompletion tool for Python that can be used for text editors."; + homepage = https://github.com/davidhalter/jedi; + description = "An autocompletion tool for Python that can be used for text editors"; license = licenses.lgpl3Plus; maintainers = [ stdenv.lib.maintainers.garbas ]; }; }); jinja2 = buildPythonPackage rec { - name = "Jinja2-2.7.1"; + name = "Jinja2-2.7.3"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/J/Jinja2/${name}.tar.gz"; - sha256 = "12scn3zmmj76rzyc0axjzf6dsazyj9xgp0l46q41rjhxm23s1h2w"; + # md5 = "b9dffd2f3b43d673802fe857c8445b1a"; # provided by pypi website. + sha256 = "2e24ac5d004db5714976a04ac0e80c6df6e47e98c354cb2c0d82f8879d4f8fdb"; }; - propagatedBuildInputs = [ pythonPackages.markupsafe ]; + propagatedBuildInputs = with self; [ self.markupsafe ]; meta = { homepage = http://jinja.pocoo.org/; description = "Stand-alone template engine"; - license = "BSD"; + license = licenses.bsd3; longDescription = '' Jinja2 is a template engine written in pure Python. It provides a Django inspired non-XML syntax but supports inline expressions and an optional sandboxed environment. ''; + platforms = platforms.all; + maintainers = [ maintainers.pierron ]; }; }; jmespath = buildPythonPackage rec { - name = "jmespath-0.2.1"; + name = "jmespath-0.4.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/j/jmespath/jmespath-0.2.1.tar.gz"; - md5 = "7800775aa12c6303f9ad597b6a8fa03c"; + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/j/jmespath/${name}.tar.gz"; + md5 = "a11ae39472672a650dfb55feab7d65eb"; }; - propagatedBuildInputs = [ ply ]; + propagatedBuildInputs = with self; [ ply ]; meta = { homepage = "https://github.com/boto/jmespath"; @@ -4417,15 +4865,38 @@ let }; }; + + jrnl = buildPythonPackage rec { + name = "jrnl-1.9.7"; + disabled = isPy3k; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/j/jrnl/${name}.tar.gz"; + md5 = "395faff36de8a08a5bfeedbf123e9067"; + }; + + propagatedBuildInputs = with self; [ + pytz six tzlocal keyring modules.readline argparse dateutil_1_5 + parsedatetime + ]; + + meta = with stdenv.lib; { + homepage = http://maebert.github.io/jrnl/; + description = "A simple command line journal application that stores your journal in a plain text file."; + license = licenses.mit; + }; + }; + + keyring = buildPythonPackage rec { - name = "keyring-3.2"; + name = "keyring-3.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/k/keyring/${name}.zip"; - sha256 = "1flccphpyrb8y8dra2fq2s2v3fg615d77kjjmzl0gmiidabkkdqf"; + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/k/keyring/${name}.zip"; + md5 = "81291e0c7337affb71442e6c7671e77f"; }; - buildInputs = + buildInputs = with self; [ fs gdata python_keyczar mock pyasn1 pycrypto pytest six ]; meta = with stdenv.lib; { @@ -4443,7 +4914,7 @@ let meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/k/kitchen/kitchen-1.1.1.tar.gz"; sha256 = "0ki840hjk1q19w6icv0dj2jxb00966nwy9b1jib0dgdspj00yrr5"; }; @@ -4453,7 +4924,7 @@ let name = "pylast-${version}"; version = "0.5.11"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pylast/${name}.tar.gz"; md5 = "506cf1b13020b3ed2f3c845ea0c9830e"; }; @@ -4472,14 +4943,14 @@ let libcloud = buildPythonPackage (rec { name = "libcloud-0.14.1"; - src = fetchurl { + src = pkgs.fetchurl { url = https://pypi.python.org/packages/source/a/apache-libcloud/apache-libcloud-0.14.1.tar.bz2; sha256 = "1l6190pjv54c7y8pzr089ij727qv7bqhhaznr2mkvimgr1wzsql5"; }; - buildInputs = [ mock ]; + buildInputs = with self; [ mock ]; - propagatedBuildInputs = [ pycrypto ]; + propagatedBuildInputs = with self; [ pycrypto ]; preConfigure = "cp libcloud/test/secrets.py-dist libcloud/test/secrets.py"; # failing tests for 26 and 27 @@ -4495,14 +4966,14 @@ let limnoria = buildPythonPackage (rec { name = "limnoria-20130327"; - src = fetchurl { + src = pkgs.fetchurl { url = https://pypi.python.org/packages/source/l/limnoria/limnoria-2013-06-01T10:32:51+0200.tar.gz; name = "limnoria-2013-06-01.tar.gz"; sha256 = "1i8q9zzf43sr3n1q4h6h1z8nz31g4aa8dq94ywvfbh7hklmchq6n"; }; - buildInputs = [ pkgs.git ]; - propagatedBuildInputs = [ modules.sqlite3 ]; + buildInputs = with self; [ pkgs.git ]; + propagatedBuildInputs = with self; [ modules.sqlite3 ]; doCheck = false; @@ -4519,12 +4990,12 @@ let name = "linode-${version}"; version = "0.4"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/l/linode/linode-${version}.tar.gz"; md5 = "03a306575cf274719b3206ecee0bda9e"; }; - propagatedBuildInputs = [ requests2 ]; + propagatedBuildInputs = with self; [ requests2 ]; meta = with stdenv.lib; { homepage = "https://github.com/ghickman/linode"; @@ -4534,11 +5005,27 @@ let }; }; + locustio = buildPythonPackage rec { + name = "locustio-0.7.2"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/l/locustio/${name}.tar.gz"; + md5 = "90cf4d029d58ad58d19ea17a16e59c34"; + }; + + propagatedBuildInputs = [ self.msgpack self.requests2 self.flask self.gevent self.pyzmq ]; + buildInputs = [ self.mock self.unittest2 ]; + + meta = { + homepage = http://locust.io/; + description = "A load testing tool"; + }; + }; lockfile = buildPythonPackage rec { name = "lockfile-0.9.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pylockfile.googlecode.com/files/${name}.tar.gz"; sha1 = "1eebaee375641c9f29aeb21768f917dd2b985752"; }; @@ -4555,23 +5042,23 @@ let logilab_common = buildPythonPackage rec { name = "logilab-common-0.61.0"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://download.logilab.org/pub/common/${name}.tar.gz"; sha256 = "09apsrcvjliawbxmfrmi1l8hlbaj87mb7n4lrlivy5maxs6yg4hd"; }; - propagatedBuildInputs = [ unittest2 ]; + propagatedBuildInputs = with self; [ unittest2 ]; }; lxml = buildPythonPackage ( rec { name = "lxml-3.3.6"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/l/lxml/${name}.tar.gz"; md5 = "a804b36864c483fe7abdd7f493a0c379"; }; - buildInputs = [ pkgs.libxml2 pkgs.libxslt ]; + buildInputs = with self; [ pkgs.libxml2 pkgs.libxslt ]; meta = { description = "Pythonic binding for the libxml2 and libxslt libraries"; @@ -4584,12 +5071,12 @@ let python_magic = buildPythonPackage rec { name = "python-magic-0.4.6"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/python-magic/${name}.tar.gz"; md5 = "07e7a0fea78dd81ed609414c3484df58"; }; - propagatedBuildInputs = [ pkgs.file ]; + propagatedBuildInputs = with self; [ pkgs.file ]; patchPhase = '' substituteInPlace magic.py --replace "ctypes.CDLL(dll)" "ctypes.CDLL('${pkgs.file}/lib/libmagic.so')" @@ -4614,7 +5101,7 @@ let src = pkgs.file.src; patches = [ ../tools/misc/file/python.patch ]; - buildInputs = [ python pkgs.file ]; + buildInputs = with self; [ python pkgs.file ]; preConfigure = "cd python"; @@ -4629,12 +5116,12 @@ let version = "0.21.1"; name = "m2crypto-${version}"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${version}.tar.gz"; md5 = "f93d8462ff7646397a9f77a2fe602d17"; }; - buildInputs = [ pkgs.swig pkgs.openssl ]; + buildInputs = with self; [ pkgs.swig pkgs.openssl ]; preBuild = "${python}/bin/${python.executable} setup.py build_ext --openssl=${pkgs.openssl}"; @@ -4650,16 +5137,16 @@ let Mako = buildPythonPackage rec { name = "Mako-0.9.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/M/Mako/${name}.tar.gz"; md5 = "fe3f394ef714776d09ec6133923736a7"; }; - buildInputs = [ markupsafe nose ]; - propagatedBuildInputs = [ markupsafe ]; + buildInputs = with self; [ markupsafe nose ]; + propagatedBuildInputs = with self; [ markupsafe ]; meta = { - description = "Super-fast templating language."; + description = "Super-fast templating language"; homepage = http://www.makotemplates.org; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.iElectric ]; @@ -4670,7 +5157,7 @@ let markupsafe = buildPythonPackage rec { name = "markupsafe-0.15"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/M/MarkupSafe/${name}.tar.gz"; md5 = "4e7c4d965fe5e033fa2d7bb7746bb186"; }; @@ -4687,17 +5174,17 @@ let name = "manuel-${version}"; version = "1.8.0"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/m/manuel/${name}.tar.gz"; sha256 = "1diyj6a8bvz2cdf9m0g2bbx9z2yjjnn3ylbg1zinpcjj6vldfx59"; }; - propagatedBuildInputs = [ six zope_testing ]; + propagatedBuildInputs = with self; [ six zope_testing ]; meta = { description = "A documentation builder"; homepage = http://pypi.python.org/pypi/manuel; - license = "ZPL"; + license = stdenv.lib.licenses.zpt20; }; }; @@ -4705,7 +5192,7 @@ let version = "2.3.1"; name = "markdown-${version}"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/M/Markdown/Markdown-${version}.tar.gz"; sha256 = "147j9hznv2r187a86d28glmg3pckfrdp0nz9yh7s1aqpawwdkszz"; }; @@ -4720,18 +5207,19 @@ let matplotlib = buildPythonPackage rec { - name = "matplotlib-1.3.1"; + name = "matplotlib-1.4.2"; - src = fetchurl { + src = pkgs.fetchurl { url = "mirror://sourceforge/matplotlib/${name}.tar.gz"; - sha256 = "0smgpn7lwbn02nbyhawyn0n6r3pb65zk501f21bjgavnjjfnf5pa"; + sha256 = "0m6v9nwdldlwk22gcd339zg6mny5m301fxgks7z8sb8m9wawg8qp"; }; - buildInputs = [ python pkgs.which pkgs.ghostscript ] ++ + buildInputs = with self; [ python pkgs.which pkgs.ghostscript ] ++ (if stdenv.isDarwin then [ pkgs.clangStdenv ] else [ pkgs.stdenv ]); - propagatedBuildInputs = + propagatedBuildInputs = with self; [ dateutil nose numpy pyparsing tornado pkgs.freetype pkgs.libpng pkgs.pkgconfig + mock pytz ]; meta = with stdenv.lib; { @@ -4746,12 +5234,12 @@ let mccabe = buildPythonPackage (rec { name = "mccabe-0.2.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/m/mccabe/${name}.tar.gz"; md5 = "5a3f3fa6a4bad126c88aaaa7dab682f5"; }; - buildInputs = [ ]; + buildInputs = with self; [ ]; meta = { description = "McCabe checker, plugin for flake8"; @@ -4766,12 +5254,12 @@ let name = "mechanize-0.1.11"; disabled = isPy3k; - src = fetchurl { + src = pkgs.fetchurl { url = "http://wwwsearch.sourceforge.net/mechanize/src/${name}.tar.gz"; sha256 = "1h62mwy4iz09jqz17nrb9j8y0djd500zdfqwrz9xmdwqzqwixkj2"; }; - propagatedBuildInputs = [ clientform ]; + propagatedBuildInputs = with self; [ clientform ]; meta = { description = "Stateful programmatic web browsing in Python"; @@ -4786,7 +5274,7 @@ let meld3 = buildPythonPackage rec { name = "meld3-1.0.0"; - src = fetchurl { + src = pkgs.fetchurl { url = https://pypi.python.org/packages/source/m/meld3/meld3-1.0.0.tar.gz; md5 = "ca270506dd4ecb20ae26fa72fbd9b0be"; }; @@ -4796,17 +5284,17 @@ let meta = { description = "An HTML/XML templating engine used by supervisor"; homepage = https://github.com/supervisor/meld3; - license = "free-non-copyleft"; + license = stdenv.lib.licenses.free; }; }; memcached = buildPythonPackage rec { name = "memcached-1.51"; - src = if isPy3k then fetchurl { + src = if isPy3k then pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/python3-memcached/python3-${name}.tar.gz"; sha256 = "0na8b369q8fivh3y0nvzbvhh3lgvxiyyv9xp93cnkvwfsr8mkgkw"; - } else fetchurl { + } else pkgs.fetchurl { url = "http://ftp.tummy.com/pub/python-memcached/old-releases/python-${name}.tar.gz"; sha256 = "124s98m6hvxj6x90d7aynsjfz878zli771q96ns767r2mbqn7192"; }; @@ -4821,7 +5309,7 @@ let memory_profiler = buildPythonPackage rec { name = "memory_profiler-0.27"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/m/memory_profiler/memory_profiler-0.27.tar.gz"; md5 = "212c0d7452dbaffb6b09474ac07b0668"; }; @@ -4839,12 +5327,12 @@ let version = "1.2.8"; name = "minimock-${version}"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://bitbucket.org/jab/minimock/get/${version}.zip"; sha256 = "c88fa8a7120623f23990a7f086a9657f6ced09025a55e3be8649a30b4945441a"; }; - buildInputs = [ nose ]; + buildInputs = with self; [ nose ]; checkPhase = "./test"; @@ -4856,11 +5344,11 @@ let rainbowstream = buildPythonPackage rec { name = "rainbowstream-${version}"; - version = "0.9.5"; + version = "1.1.6"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/r/rainbowstream/${name}.tar.gz"; - sha256 = "0v79xiihgsfjipxkzzi92l8y1f8vxxachpv71gyzyhxdsl2zfj57"; + sha256 = "04i2a8a5k6n6lgfpa9bzzbkhvywgd4bn3qlspl97pn8ply9kgszm"; }; doCheck = false; @@ -4870,9 +5358,16 @@ let export LC_ALL="en_US.UTF-8" ''; - buildInputs = [ + postInstall = '' + for prog in "$out/bin/"*; do + wrapProgram "$prog" \ + --prefix PYTHONPATH : "$PYTHONPATH" + done + ''; + + buildInputs = with self; [ pkgs.libjpeg pkgs.freetype pkgs.zlib - pillow twitter pyfiglet requests arrow dateutil modules.readline + pillow twitter pyfiglet requests arrow dateutil modules.readline pysocks ]; meta = { @@ -4887,13 +5382,13 @@ let baseName = "mitmproxy"; name = "${baseName}-${meta.version}"; - src = fetchurl { + src = pkgs.fetchurl { url = "${meta.homepage}/download/${name}.tar.gz"; sha256 = "0mpyw8iw4l4jv175qlbn0rrlgiz1k79m44jncbdxfj8ddvvvyz2j"; }; - buildInputs = [ - pkgs.pyopenssl pyasn1 urwid pil lxml flask protobuf netlib + buildInputs = with self; [ + pyopenssl pyasn1 urwid pil lxml flask protobuf netlib ]; doCheck = false; @@ -4916,12 +5411,12 @@ let mock = buildPythonPackage (rec { name = "mock-1.0.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/m/mock/${name}.tar.gz"; md5 = "c3971991738caa55ec7c356bbc154ee2"; }; - buildInputs = [ unittest2 ]; + buildInputs = with self; [ unittest2 ]; meta = { description = "Mock objects for Python"; @@ -4937,7 +5432,7 @@ let disabled = isPy3k; ver = "1.9.7"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://static.moinmo.in/files/moin-${ver}.tar.gz"; sha256 = "f4ba1b5c956bd96d2a61e27e68d297aa63d1afbc80d5740e139dcdf0affb4db5"; }; @@ -4954,13 +5449,13 @@ let moretools = buildPythonPackage rec { name = "moretools-0.1a41"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/m/moretools/${name}.tar.gz"; sha256 = "1n442wprbl3cmg08233m1sr3g4z0i8hv9g6bhch7kzdmbl21399f"; }; - buildInputs = [ six pathpy setuptools ]; - propagatedBuildInputs = [ decorator ]; + buildInputs = with self; [ six pathpy setuptools ]; + propagatedBuildInputs = with self; [ decorator ]; meta = with stdenv.lib; { description = "Many more basic tools for python 2/3 extending itertools, functools, operator and collections"; @@ -4974,7 +5469,7 @@ let mox = buildPythonPackage rec { name = "mox-0.5.3"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pymox.googlecode.com/files/${name}.tar.gz"; sha1 = "b71aeaacf31898c3b38d8b9ca5bcc0664499c0de"; }; @@ -4984,7 +5479,7 @@ let meta = { homepage = http://code.google.com/p/pymox/; - description = "A mock object framework for Python."; + description = "A mock object framework for Python"; }; }; @@ -4992,7 +5487,7 @@ let mpmath = buildPythonPackage rec { name = "mpmath-0.17"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://mpmath.googlecode.com/files/${name}.tar.gz"; sha256 = "1blgzwq4irzaf8abb4z0d2r48903n9zxf51fhnv3gv09bgxjqzxh"; }; @@ -5015,13 +5510,13 @@ let disabled = isPy3k; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/python-mpd/python-mpd-0.3.0.tar.gz"; md5 = "5b3849b131e2fb12f251434597d65635"; }; meta = with pkgs.stdenv.lib; { - description = "An MPD (Music Player Daemon) client library written in pure Python."; + description = "An MPD (Music Player Daemon) client library written in pure Python"; homepage = http://jatreuman.indefero.net/p/python-mpd/; license = licenses.gpl3; }; @@ -5031,7 +5526,7 @@ let name = "mrbob-${version}"; version = "0.1.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/m/mr.bob/mr.bob-${version}.zip"; md5 = "84a117c9a75b86842b0fa5f5c9c767f3"; }; @@ -5042,7 +5537,7 @@ let export LC_ALL="en_US.UTF-8" ''; - propagatedBuildInputs = [ argparse jinja2 six modules.readline ] ++ + propagatedBuildInputs = with self; [ argparse jinja2 six modules.readline ] ++ (optionals isPy26 [ importlib ordereddict ]); meta = { @@ -5051,11 +5546,35 @@ let }; }; + msgpack = buildPythonPackage rec { + name = "msgpack-python-${version}"; + version = "0.4.2"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/m/msgpack-python/${name}.tar.gz"; + md5 = "e3a0fdfd864c72c958bb501d39b39caf"; + }; + + propagatedBuildInputs = with self; [ ]; + }; + + msrplib = buildPythonPackage rec { + name = "python-msrplib-${version}"; + version = "0.15.0"; + + src = pkgs.fetchurl { + url = "http://download.ag-projects.com/SipClient/${name}.tar.gz"; + sha256 = "1sm03jcz663xkbhfmrk7rr5l3wlkydn8xs56fvqjxyapx0m5sw6f"; + }; + + propagatedBuildInputs = with self; [ eventlib application gnutls ]; + }; + munkres = buildPythonPackage rec { name = "munkres-1.0.6"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/m/munkres/${name}.tar.gz"; md5 = "d7ba3b8c5001578ae229a2d5a655872f"; }; @@ -5075,7 +5594,7 @@ let musicbrainzngs = buildPythonPackage rec { name = "musicbrainzngs-0.5"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/m/musicbrainzngs/${name}.tar.gz"; md5 = "9e17a181af72d04a291c9a960bc73d44"; }; @@ -5097,7 +5616,7 @@ let mutagen = buildPythonPackage (rec { name = "mutagen-1.23"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/m/mutagen/${name}.tar.gz"; sha256 = "12f70aaf5ggdzll76bhhkn64b27xy9s1acx417dbsaqnnbis8s76"; }; @@ -5117,7 +5636,7 @@ let name = "muttils-1.3"; disabled = isPy3k; - src = fetchurl { + src = pkgs.fetchurl { url = http://www.blacktrash.org/hg/muttils/archive/8bb26094df06.tar.bz2; sha256 = "1a4kxa0fpgg6rdj5p4kggfn8xpniqh8v5kbiaqc6wids02m7kag6"; }; @@ -5141,14 +5660,14 @@ let # plenty of failing tests doCheck = false; - src = fetchurl { + src = pkgs.fetchurl { url = mirror://sourceforge/mysql-python/MySQL-python-1.2.3.tar.gz; sha256 = "0vkyg9dmj29hzk7fy77f42p7bfj28skyzsjsjry4wqr3z6xnzrkx"; }; - buildInputs = [ nose ]; + buildInputs = with self; [ nose ]; - propagatedBuildInputs = [ pkgs.mysql pkgs.zlib ]; + propagatedBuildInputs = with self; [ pkgs.mysql pkgs.zlib ]; meta = { description = "MySQL database binding for Python"; @@ -5161,7 +5680,7 @@ let mysql_connector_repackaged = buildPythonPackage rec { name = "mysql-connector-repackaged-0.3.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/m/mysql-connector-repackaged/${name}.tar.gz"; md5 = "0b17ad1cb3fe763fd44487cb97cf45b2"; }; @@ -5180,7 +5699,7 @@ let name = "namebench-1.0.5"; disabled = isPy3k; - src = fetchurl { + src = pkgs.fetchurl { url = "http://namebench.googlecode.com/files/${name}.tgz"; sha256 = "6cbde35ce94d1f31e7d48f5d8eec13238b4dbc505675a33f1e183e600c1482c3"; }; @@ -5213,12 +5732,12 @@ let nbxmpp = buildPythonPackage rec { - name = "nbxmpp-0.5"; + name = "nbxmpp-0.5.1"; - src = fetchurl { + src = pkgs.fetchurl { name = "${name}.tar.gz"; - url = "https://python-nbxmpp.gajim.org/downloads/5"; - sha256 = "0y270c9v4i9n58p4ghlm18h50qcfichmfkgcpqd3bypx4fkmdx90"; + url = "https://python-nbxmpp.gajim.org/downloads/6"; + sha256 = "0agr0ikfdmna5rjvm7lm0mx52cdwqp5b2xbx3inagp70whmdv219"; }; meta = { @@ -5232,7 +5751,7 @@ let netaddr = buildPythonPackage rec { name = "netaddr-0.7.5"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://github.com/downloads/drkjam/netaddr/${name}.tar.gz"; sha256 = "0ssxic389rdc79zkz8dxcjpqdi5qs80h12khkag410cl9cwk11f2"; }; @@ -5250,7 +5769,7 @@ let version = "0.10.4"; name = "netifaces-${version}"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/n/netifaces/${name}.tar.gz"; sha256 = "1plw237a4zib4z8s62g0mrs8gm3kjfrp5sxh6bbk9nl3rdls2mln"; }; @@ -5266,14 +5785,14 @@ let name = "${baseName}-${meta.version}"; disabled = (!isPy27); - src = fetchurl { + src = pkgs.fetchurl { url = "https://github.com/cortesi/netlib/archive/v${meta.version}.tar.gz"; name = "${name}.tar.gz"; sha256 = "1x2n126b7fal64fb5fzkp4by7ym0iswn3w9mh6pm4c1vjdpnk592"; }; - buildInputs = [ - pkgs.pyopenssl pyasn1 + buildInputs = with self; [ + pyopenssl pyasn1 ]; doCheck = false; @@ -5290,13 +5809,13 @@ let name = "nevow-${version}"; version = "0.10.0"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/N/Nevow/Nevow-${version}.tar.gz"; sha256 = "90631f68f626c8934984908d3df15e7c198939d36be7ead1305479dfc67ff6d0"; name = "${name}.tar.gz"; }; - propagatedBuildInputs = [ twisted ]; + propagatedBuildInputs = with self; [ twisted ]; postInstall = "twistd --help > /dev/null"; @@ -5331,12 +5850,12 @@ let version = "1.3.4"; name = "nose-${version}"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/n/nose/${name}.tar.gz"; sha256 = "00qymfgwg4iam4xi0w9bnv7lcb3fypq1hzfafzgs1rfmwaj67g3n"; }; - buildInputs = [ coverage ]; + buildInputs = with self; [ coverage ]; doCheck = false; # lot's of transient errors, too much hassle checkPhase = if python.is_py3k or false then '' @@ -5355,12 +5874,12 @@ let version = "0.4"; name = "nose-selecttests-${version}"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/n/nose-selecttests/${name}.zip"; sha256 = "0lgrfgp3sq8xi8d9grrg0z8jsyk0wl8a3rxw31hb7vdncin5b7n5"; }; - propagatedBuildInputs = [ nose ]; + propagatedBuildInputs = with self; [ nose ]; meta = { description = "Simple nose plugin that enables developers to run subset of collected tests to spare some waiting time for better things"; @@ -5370,53 +5889,53 @@ let nose2 = if isPy26 then null else (buildPythonPackage rec { name = "nose2-0.4.5"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/n/nose2/${name}.tar.gz"; md5 = "d7e51c848227488e3cc0424faf5511cd"; }; meta = { description = "nose2 is the next generation of nicer testing for Python"; }; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = with self; [ six ]; # AttributeError: 'module' object has no attribute 'collector' doCheck = false; }); nosejs = buildPythonPackage { name = "nosejs-0.9.4"; - src = fetchurl { + src = pkgs.fetchurl { url = https://pypi.python.org/packages/source/N/NoseJS/NoseJS-0.9.4.tar.gz; sha256 = "0qrhkd3sga56qf6k0sqyhwfcladwi05gl6aqmr0xriiq1sgva5dy"; }; - buildInputs = [ nose ]; + buildInputs = with self; [ nose ]; }; nose-cprof = buildPythonPackage rec { name = "nose-cprof-0.1-0"; disabled = isPy3k; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/n/nose-cprof/${name}.tar.gz"; md5 = "5db27c3b8f01915335ae6fc5fd3afd44"; }; meta = { - description = "A python nose plugin to profile using cProfile rather than the default Hotshot profiler."; + description = "A python nose plugin to profile using cProfile rather than the default Hotshot profiler"; }; - buildInputs = [ nose ]; + buildInputs = with self; [ nose ]; }; notify = pkgs.stdenv.mkDerivation (rec { name = "python-notify-0.1.1"; - src = fetchurl { + src = pkgs.fetchurl { url = http://www.galago-project.org/files/releases/source/notify-python/notify-python-0.1.1.tar.bz2; sha256 = "1kh4spwgqxm534qlzzf2ijchckvs0pwjxl1irhicjmlg7mybnfvx"; }; - patches = singleton (fetchurl { + patches = singleton (pkgs.fetchurl { name = "libnotify07.patch"; url = "http://pkgs.fedoraproject.org/cgit/notify-python.git/plain/" + "libnotify07.patch?id2=289573d50ae4838a1658d573d2c9f4c75e86db0c"; @@ -5424,11 +5943,11 @@ let }); postPatch = '' - sed -i -e '/^PYGTK_CODEGEN/s|=.*|="${pygtk}/bin/pygtk-codegen-2.0"|' \ + sed -i -e '/^PYGTK_CODEGEN/s|=.*|="${self.pygtk}/bin/pygtk-codegen-2.0"|' \ configure ''; - buildInputs = [ python pkgs.pkgconfig pkgs.libnotify pygobject pygtk pkgs.glib pkgs.gtk pkgs.dbus_glib ]; + buildInputs = with self; [ python pkgs.pkgconfig pkgs.libnotify pygobject pygtk pkgs.glib pkgs.gtk pkgs.dbus_glib ]; postInstall = "cd $out/lib/python*/site-packages && ln -s gtk-*/pynotify ."; @@ -5445,7 +5964,7 @@ let sourceRoot = "${pkgs.notmuch.name}/bindings/python"; - buildInputs = [ python pkgs.notmuch ]; + buildInputs = with self; [ python pkgs.notmuch ]; meta = { description = "A Python wrapper around notmuch"; @@ -5458,13 +5977,13 @@ let version = "2.4"; name = "numexpr-${version}"; - src = fetchgit { + src = pkgs.fetchgit { url = https://github.com/pydata/numexpr.git; rev = "606cc9a110711e947d35ac2770749c00dab184c8"; sha256 = "1gxgkg7ncgjhnifn444iha5nrjhyr8sr6w5yp204186a1ysz858g"; }; - propagatedBuildInputs = with pkgs; [ numpy ]; + propagatedBuildInputs = with self; [ numpy ]; # Run the test suite. # It requires the build path to be in the python search path. @@ -5495,7 +6014,7 @@ let numpy = buildPythonPackage ( rec { name = "numpy-1.8.2"; - src = fetchurl { + src = pkgs.fetchurl { url = "mirror://sourceforge/numpy/${name}.tar.gz"; sha256 = "1gcxlk3mf43pzpxvbw8kcfg173g4105j9szsfc1kxwablail6myf"; }; @@ -5516,8 +6035,8 @@ let # error: invalid command 'test' doCheck = false; - buildInputs = [ pkgs.gfortran ]; - propagatedBuildInputs = [ pkgs.liblapack pkgs.blas ]; + buildInputs = with self; [ pkgs.gfortran ]; + propagatedBuildInputs = with self; [ pkgs.liblapack pkgs.blas ]; meta = { description = "Scientific tools for Python"; @@ -5527,16 +6046,16 @@ let nwdiag = buildPythonPackage rec { - name = "nwdiag-1.0.0"; + name = "nwdiag-1.0.3"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/n/nwdiag/${name}.tar.gz"; - md5 = "d81581a028840f8f7362ab21bf73e941"; + sha256 = "0n7ary1fngxk8bk15vabc8fhnmxlh098piciwaviwn7l4a5q1zys"; }; - buildInputs = [ pep8 nose unittest2 docutils ]; + buildInputs = with self; [ pep8 nose unittest2 docutils ]; - propagatedBuildInputs = [ blockdiag ]; + propagatedBuildInputs = with self; [ blockdiag ]; # tests fail doCheck = false; @@ -5555,13 +6074,13 @@ let name = "livestreamer-${version}"; disabled = isPyPy; - src = fetchurl { + src = pkgs.fetchurl { url = "https://github.com/chrippa/livestreamer/archive/v${version}.tar.gz"; sha256 = "0f1m51wax4q17ida4h0ckyakmlchf36kbhfa9qs6bpxc6xqqbry0"; }; - buildInputs = [ pkgs.makeWrapper ]; - propagatedBuildInputs = [ requests2 pkgs.rtmpdump pycrypto singledispatch futures ]; + buildInputs = with self; [ pkgs.makeWrapper ]; + propagatedBuildInputs = with self; [ requests2 pkgs.rtmpdump pycrypto singledispatch futures ]; postInstall = '' wrapProgram $out/bin/livestreamer --prefix PATH : ${pkgs.rtmpdump}/bin ''; @@ -5580,14 +6099,14 @@ let name = "oauth2-1.5.211"; disabled = isPy3k; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/o/oauth2/oauth2-1.5.211.tar.gz"; sha256 = "82a38f674da1fa496c0fc4df714cbb058540bed72a30c50a2e344b0d984c4d21"; }; - propagatedBuildInputs = [ httplib2 ]; + propagatedBuildInputs = with self; [ httplib2 ]; - buildInputs = [ mock coverage ]; + buildInputs = with self; [ mock coverage ]; # ServerNotFoundError: Unable to find the server at oauth-sandbox.sevengoslings.net doCheck = false; @@ -5605,14 +6124,14 @@ let oauthlib = buildPythonPackage rec { name = "oauthlib-0.5.0"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/o/oauthlib/${name}.tar.gz"; md5 = "d12c507de33403ebdf290fbffdb98213"; }; - buildInputs = [ mock nose unittest2 ]; + buildInputs = with self; [ mock nose unittest2 ]; - propagatedBuildInputs = [ pycrypto ]; + propagatedBuildInputs = with self; [ pycrypto ]; meta = { homepage = https://github.com/idan/oauthlib; @@ -5623,17 +6142,19 @@ let obfsproxy = buildPythonPackage ( rec { name = "obfsproxy-0.2.2"; - src = fetchgit { - url = https://git.torproject.org/pluggable-transports/obfsproxy.git; + src = pkgs.fetchgit { + url = meta.repositories.git; rev = "3c4e843a30c430aec1de03e0e09ef654072efc03"; sha256 = "8fd1e63a37bc42add7609d97d50ecd81da81881bcf7015a9e2958531dbf39018"; }; - propagatedBuildInputs = [ pyptlib argparse twisted pycrypto ]; + propagatedBuildInputs = with self; [ pyptlib argparse twisted pycrypto ]; meta = { description = "a pluggable transport proxy"; homepage = https://www.torproject.org/projects/obfsproxy; + repositories.git = https://git.torproject.org/pluggable-transports/obfsproxy.git; + maintainers = [ stdenv.lib.maintainers.phreedom ]; }; }); @@ -5641,7 +6162,7 @@ let name = "offtrac-0.1.0"; meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/o/offtrac/${name}.tar.gz"; sha256 = "06vd010pa1z7lyfj1na30iqzffr4kzj2k2sba09spik7drlvvl56"; }; @@ -5672,7 +6193,7 @@ let ordereddict = if isPy26 then (buildPythonPackage { name = "ordereddict-1.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/o/ordereddict/ordereddict-1.1.tar.gz"; md5 = "a0ed854ee442051b249bfad0f638bbec"; }; @@ -5682,7 +6203,7 @@ let ply = buildPythonPackage (rec { name = "ply-3.4"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://www.dabeaz.com/ply/${name}.tar.gz"; sha256 = "0sslnbpws847r1j1f41fjpn76w0asywfqgxwzyjrvmmxnw8myhxg"; }; @@ -5716,7 +6237,7 @@ let name = "osc-0.133+git"; disabled = isPy3k; - src = fetchgit { + src = pkgs.fetchgit { url = git://gitorious.org/opensuse/osc.git; rev = "6cd541967ee2fca0b89e81470f18b97a3ffc23ce"; sha256 = "a39ce0e321e40e9758bf7b9128d316c71b35b80eabc84f13df492083bb6f1cc6"; @@ -5726,20 +6247,31 @@ let doCheck = false; postInstall = "ln -s $out/bin/osc-wrapper.py $out/bin/osc"; - propagatedBuildInputs = [ pythonPackages.m2crypto ]; + propagatedBuildInputs = with self; [ self.m2crypto ]; }); + pagerduty = buildPythonPackage rec { + name = "pagerduty-${version}"; + version = "0.2.1"; + disabled = isPy3k; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pagerduty/pagerduty-${version}.tar.gz"; + md5 = "8109a330d16751a7f4041c0ccedec787"; + }; + }; + pandas = buildPythonPackage rec { - name = "pandas-0.14.0"; + name = "pandas-0.15.0"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pandas/${name}.tar.gz"; - sha256 = "f7997debca756c4dd5ccdf5a010dfe3d1c7dac98ee706b715d994cf7c9d35528"; + sha256 = "1w3wjnn3v37hf3hrd24lfgk6vpykarv9mihhpcfq6y7rg586bgjk"; }; - buildInputs = [ nose ]; - propagatedBuildInputs = [ dateutil numpy pytz modules.sqlite3 ]; + buildInputs = with self; [ nose ]; + propagatedBuildInputs = with self; [ dateutil numpy pytz modules.sqlite3 ]; # Tests require networking to pass doCheck = false; @@ -5753,20 +6285,31 @@ let }; }; + parsedatetime = buildPythonPackage rec { + name = "parsedatetime-${version}"; + version = "1.4"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/parsedatetime/${name}.tar.gz"; + md5 = "3aca729761be5259a508ed184df73c68"; + }; + }; + paramiko = buildPythonPackage rec { - name = "paramiko-1.14.0"; + name = "paramiko-1.15.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/paramiko/${name}.tar.gz"; - md5 = "e26324fd398af68ad506fe98853835c3"; + md5 = "48c274c3f9b1282932567b21f6acf3b5"; }; - propagatedBuildInputs = [ pycrypto ecdsa ]; - - # tests failures since 1.14.0 release.. - doCheck = false; + propagatedBuildInputs = with self; [ pycrypto ecdsa ]; - checkPhase = "${python}/bin/${python.executable} test.py"; + # https://github.com/paramiko/paramiko/issues/449 + doCheck = !(isPyPy || isPy33); + checkPhase = '' + ${python}/bin/${python.executable} test.py --no-sftp --no-big-file + ''; meta = { homepage = "https://github.com/paramiko/paramiko/"; @@ -5788,12 +6331,12 @@ let name = "paste-1.7.5.1"; disabled = isPy3k; - src = fetchurl { + src = pkgs.fetchurl { url = http://pypi.python.org/packages/source/P/Paste/Paste-1.7.5.1.tar.gz; md5 = "7ea5fabed7dca48eb46dc613c4b6c4ed"; }; - buildInputs = [ nose ]; + buildInputs = with self; [ nose ]; doCheck = false; # some files required by the test seem to be missing @@ -5808,12 +6351,12 @@ let version = "1.5.2"; name = "paste-deploy-${version}"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/P/PasteDeploy/PasteDeploy-${version}.tar.gz"; md5 = "352b7205c78c8de4987578d19431af3b"; }; - buildInputs = [ nose ]; + buildInputs = with self; [ nose ]; meta = { description = "Load, configure, and compose WSGI applications and servers"; @@ -5825,7 +6368,7 @@ let pathpy = buildPythonPackage rec { name = "path.py-5.2"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/path.py/${name}.zip"; sha256 = "0n1kpbbm1dg5f484yzxr7gb3ak6vjp92j70nw3bgjzsj9fh26afq"; }; @@ -5841,12 +6384,12 @@ let paypalrestsdk = buildPythonPackage rec { name = "paypalrestsdk-0.7.0"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/paypalrestsdk/${name}.tar.gz"; sha256 = "117kfipzfahf9ysv414bh1mmm5cc9ck5zb6rhpslx1f8gk3frvd6"; }; - propagatedBuildInputs = [ httplib2 ]; + propagatedBuildInputs = with self; [ httplib2 ]; meta = { homepage = https://developer.paypal.com/; @@ -5858,7 +6401,7 @@ let pbr = buildPythonPackage rec { name = "pbr-0.9.0"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pbr/${name}.tar.gz"; sha256 = "e5a57c434b1faa509a00bf458d2c7af965199d9cced3d05a547bff9880f7e8cb"; }; @@ -5868,7 +6411,7 @@ let doCheck = false; - buildInputs = [ pip ]; + buildInputs = with self; [ pip ]; meta = { description = "Python Build Reasonableness"; @@ -5881,7 +6424,7 @@ let name = "pelican-${version}"; version = "3.4.0"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pelican/${name}.tar.gz"; md5 = "8e57bdd075503903125b14621b1e533d"; }; @@ -5895,7 +6438,7 @@ let #buildInputs = [nose mock]; doCheck = false; - propagatedBuildInputs = [jinja2 pygments docutils pytz unidecode six dateutil feedgenerator blinker pillow beautifulsoup4]; + propagatedBuildInputs = with self; [jinja2 pygments docutils pytz unidecode six dateutil feedgenerator blinker pillow beautifulsoup4]; meta = { homepage = http://getpelican.com/; @@ -5909,7 +6452,7 @@ let name = "pep8-${version}"; version = "1.5.7"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pep8/${name}.tar.gz"; md5 = "f6adbdd69365ecca20513c709f9b7c93"; }; @@ -5926,7 +6469,7 @@ let pexpect = buildPythonPackage { name = "pexpect-2.3"; - src = fetchurl { + src = pkgs.fetchurl { url = "mirror://sourceforge/pexpect/pexpect-2.3.tar.gz"; sha256 = "0x8bfjjqygriry1iyygm5048ykl5qpbpzqfp6i8dhkslm3ryf5fk"; }; @@ -5935,8 +6478,8 @@ let doCheck = false; meta = { - homepage = "http://www.noah.org/wiki/Pexpect"; - description = "Automate interactive console applications such as ssh, ftp, etc."; + homepage = http://www.noah.org/wiki/Pexpect; + description = "Automate interactive console applications such as ssh, ftp, etc"; license = stdenv.lib.licenses.mit; longDescription = '' @@ -5961,12 +6504,12 @@ let pg8000 = buildPythonPackage rec { name = "pg8000-1.9.14"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pg8000/${name}.tar.gz"; sha256 = "1vandvfaf1m3a1fbc7nbm6syfqr9bazhzsnmai0jpjkbmb349izs"; }; - propagatedBuildInputs = [ pytz ]; + propagatedBuildInputs = with self; [ pytz ]; meta = { maintainers = [ @@ -5980,36 +6523,36 @@ let pip = buildPythonPackage rec { version = "1.5.6"; name = "pip-${version}"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pip/pip-${version}.tar.gz"; md5 = "01026f87978932060cc86c1dc527903e"; }; - buildInputs = [ mock scripttest virtualenv pytest ]; + buildInputs = with self; [ mock scripttest virtualenv pytest ]; }; pika = buildPythonPackage { name = "pika-0.9.12"; disabled = isPy3k; - src = fetchurl { + src = pkgs.fetchurl { url = https://pypi.python.org/packages/source/p/pika/pika-0.9.12.tar.gz; md5 = "7174fc7cc5570314fa3cfaa729106482"; }; - buildInputs = [ nose mock pyyaml ]; + buildInputs = with self; [ nose mock pyyaml ]; - propagatedBuildInputs = [ unittest2 ]; + propagatedBuildInputs = with self; [ unittest2 ]; }; pil = buildPythonPackage rec { name = "PIL-${version}"; version = "1.1.7"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://effbot.org/downloads/Imaging-${version}.tar.gz"; sha256 = "04aj80jhfbmxqzvmq40zfi4z3cw6vi01m3wkk6diz3lc971cfnw9"; }; - buildInputs = [ python pkgs.libjpeg pkgs.zlib pkgs.freetype ]; + buildInputs = with self; [ python pkgs.libjpeg pkgs.zlib pkgs.freetype ]; disabled = isPy3k; doCheck = true; @@ -6043,12 +6586,12 @@ let pillow = buildPythonPackage rec { name = "Pillow-2.3.0"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/P/Pillow/${name}.zip"; md5 = "56b6614499aacb7d6b5983c4914daea7"; }; - buildInputs = [ pkgs.freetype pkgs.libjpeg pkgs.zlib pkgs.libtiff pkgs.libwebp ]; + buildInputs = with self; [ pkgs.freetype pkgs.libjpeg pkgs.zlib pkgs.libtiff pkgs.libwebp pkgs.tcl ]; # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp. preConfigure = '' @@ -6057,11 +6600,10 @@ let s|^JPEG_ROOT =.*$|JPEG_ROOT = _lib_include("${pkgs.libjpeg}")|g ; s|^ZLIB_ROOT =.*$|ZLIB_ROOT = _lib_include("${pkgs.zlib}")|g ; s|^LCMS_ROOT =.*$|LCMS_ROOT = _lib_include("${pkgs.libwebp}")|g ; - s|^TIFF_ROOT =.*$|TIFF_ROOT = _lib_include("${pkgs.libtiff}")|g ;' + s|^TIFF_ROOT =.*$|TIFF_ROOT = _lib_include("${pkgs.libtiff}")|g ; + s|^TCL_ROOT=.*$|TCL_ROOT = _lib_include("${pkgs.tcl}")|g ;' ''; - - meta = { homepage = http://python-imaging.github.com/Pillow; @@ -6083,9 +6625,9 @@ let plumbum = buildPythonPackage rec { name = "plumbum-1.4.2"; - buildInputs = [ pythonPackages.six ]; + buildInputs = with self; [ self.six ]; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/plumbum/${name}.tar.gz"; md5 = "38b526af9012a5282ae91dfe372cefd3"; }; @@ -6096,7 +6638,7 @@ let name = "polib-${version}"; version = "1.0.4"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://bitbucket.org/izi/polib/downloads/${name}.tar.gz"; sha256 = "16klwlswfbgmkzrra80fgzhic9447pk3mnr75r2fkz72bkvpcclb"; }; @@ -6116,13 +6658,13 @@ let rev = "db80fc95ed01d2c559c4bdc7da8514ed3cc7fcd9"; name = "powerline-beta_${rev}"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://github.com/Lokaltog/powerline/tarball/${rev}"; name = "${name}.tar.bz"; sha256 = "1csd4vasy0avwfxrpdr61plj6k1nzf36f6qvd9kl15s3lnspsfaz"; }; - propagatedBuildInputs = [ pkgs.git pkgs.mercurial pkgs.bazaar pythonPackages.psutil pythonPackages.pygit2 ]; + propagatedBuildInputs = with self; [ pkgs.git pkgs.mercurial pkgs.bazaar self.psutil self.pygit2 ]; # error: This is still beta and some tests still fail doCheck = false; @@ -6145,7 +6687,7 @@ let meta = with stdenv.lib; { homepage = https://github.com/Lokaltog/powerline; - description = "The ultimate statusline/prompt utility."; + description = "The ultimate statusline/prompt utility"; license = licenses.mit; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.all; @@ -6156,7 +6698,7 @@ let prettytable = buildPythonPackage rec { name = "prettytable-0.7.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/P/PrettyTable/${name}.tar.bz2"; sha1 = "ad346a18d92c1d95f2295397c7a8a4f489e48851"; }; @@ -6176,12 +6718,12 @@ let protobuf = buildPythonPackage rec { inherit (pkgs.protobuf) name src; - propagatedBuildInputs = [ pkgs.protobuf google_apputils ]; + propagatedBuildInputs = with self; [ pkgs.protobuf google_apputils ]; sourceRoot = "${name}/python"; meta = { - description = "Protocol Buffers are Google's data interchange format."; + description = "Protocol Buffers are Google's data interchange format"; homepage = http://code.google.com/p/protobuf/; }; }; @@ -6191,7 +6733,7 @@ let name = "psutil-${version}"; version = "2.1.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/psutil/${name}.tar.gz"; sha256 = "14smqj57yjrm6hjz5n2annkgv0kmxckdhqvfx784f4d4lr52m0dz"; }; @@ -6213,16 +6755,16 @@ let # error: invalid command 'test' doCheck = false; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/psycopg2/${name}.tar.gz"; sha256 = "02h33barxigsczpympnwa0yvw9hgdv8d63bxm5x251ri26xz6b9s"; }; - propagatedBuildInputs = [ pkgs.postgresql ]; + propagatedBuildInputs = with self; [ pkgs.postgresql ]; meta = { description = "PostgreSQL database adapter for the Python programming language"; - license = "GPLv2/ZPL"; + license = with stdenv.lib.licenses; [ gpl2 zpt20 ]; }; }; @@ -6231,7 +6773,7 @@ let name = "publicsuffix-${version}"; version = "1.0.2"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/publicsuffix/${name}.tar.gz"; md5 = "f86babf56f6e58b564d3853adebcf37a"; }; @@ -6247,17 +6789,35 @@ let py = buildPythonPackage rec { name = "py-1.4.24"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/py/${name}.tar.gz"; md5 = "8f32ee0cd1e01472a255fe1d28d81217"; }; }; + pyalgotrade = buildPythonPackage { + name = "pyalogotrade-0.16"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/P/PyAlgoTrade/PyAlgoTrade-0.16.tar.gz"; + md5 = "01d70583ab15eb3bad21027bdeb30ae5"; + }; + + propagatedBuildInputs = with self; [ numpy scipy pytz ]; + + meta = { + description = "Python Algorithmic Trading"; + homepage = http://gbeced.github.io/pyalgotrade/; + license = stdenv.lib.licenses.asl20; + }; + }; + + pyasn1 = buildPythonPackage ({ name = "pyasn1-0.1.7"; - src = fetchurl { + src = pkgs.fetchurl { url = "mirror://sourceforge/pyasn1/0.1.7/pyasn1-0.1.7.tar.gz"; sha256 = "1aqy21fb564gmnkw2fbkn55c40diyx3z0ixh4savvxikqm9ivy74"; }; @@ -6275,12 +6835,12 @@ let name = "python-pyaudio-${version}"; version = "0.2.4"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://people.csail.mit.edu/hubert/pyaudio/packages/pyaudio-${version}.tar.gz"; md5 = "623809778f3d70254a25492bae63b575"; }; - buildInputs = [ python pkgs.portaudio ]; + buildInputs = with self; [ python pkgs.portaudio ]; buildPhase = if stdenv.isDarwin then '' PORTAUDIO_PATH="${pkgs.portaudio}" ${python}/bin/${python.executable} setup.py build --static-link @@ -6301,7 +6861,7 @@ let pygit2 = buildPythonPackage rec { name = "pygit2-0.21.2"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pygit2/${name}.tar.gz"; sha256 = "0lya4v91d4y5fwrb55n8m8avgmz0l81jml2spvx6r7j1czcx3zic"; }; @@ -6310,7 +6870,7 @@ let export DYLD_LIBRARY_PATH="${pkgs.libgit2}/lib" '' else "" ); - propagatedBuildInputs = [ pkgs.libgit2 ] ++ optionals (!isPyPy) [ cffi ]; + propagatedBuildInputs = with self; [ pkgs.libgit2 ] ++ optionals (!isPyPy) [ cffi ]; preCheck = '' # disable tests that require networking @@ -6320,7 +6880,7 @@ let meta = { homepage = https://pypi.python.org/pypi/pygit2; - description = "Pygit2 is a set of Python bindings to the libgit2 shared library."; + description = "A set of Python bindings to the libgit2 shared library"; license = with stdenv.lib.licenses; gpl2; platforms = with stdenv.lib.platforms; all; }; @@ -6330,28 +6890,62 @@ let Babel = buildPythonPackage (rec { name = "Babel-1.3"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/B/Babel/${name}.tar.gz"; sha256 = "0bnin777lc53nxd1hp3apq410jj5wx92n08h7h4izpl4f4sx00lz"; }; - propagatedBuildInputs = [ pytz ]; + propagatedBuildInputs = with self; [ pytz ]; meta = { homepage = http://babel.edgewall.org; - description = "A collection of tools for internationalizing Python applications."; + description = "A collection of tools for internationalizing Python applications"; license = "BSD"; maintainers = [ stdenv.lib.maintainers.garbas ]; platforms = stdenv.lib.platforms.linux; }; }); + pybfd = buildPythonPackage rec { + name = "pybfd-0.1.1"; + + disabled = isPyPy || isPy3k; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pybfd/${name}.tar.gz"; + md5 = "79dd6e12c90ad0515d0ad7fb1bd2f571"; + }; + + preConfigure = '' + substituteInPlace setup.py \ + --replace '"/usr/include"' '"${pkgs.gdb}/include"' \ + --replace '"/usr/lib"' '"${pkgs.binutils}/lib"' + ''; + + # --old-and-unmanageable not supported by this setup.py + installPhase = '' + mkdir -p "$out/lib/${python.libPrefix}/site-packages" + + export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" + + ${python}/bin/${python.executable} setup.py install \ + --install-lib=$out/lib/${python.libPrefix}/site-packages \ + --prefix="$out" + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/Groundworkstech/pybfd; + description = "A Python interface to the GNU Binary File Descriptor (BFD) library"; + license = licenses.gpl2; + platforms = platforms.linux; + }; + }; pyblock = stdenv.mkDerivation rec { name = "pyblock-${version}"; version = "0.53"; - src = fetchurl rec { + src = pkgs.fetchurl rec { url = "http://pkgs.fedoraproject.org/repo/pkgs/python-pyblock/" + "${name}.tar.bz2/${md5}/${name}.tar.bz2"; md5 = "f6d33a8362dee358517d0a9e2ebdd044"; @@ -6362,7 +6956,7 @@ let -e 's/-Werror *//' -e 's|/usr/|'"$out"'/|' Makefile ''; - buildInputs = [ python pkgs.lvm2 pkgs.dmraid ]; + buildInputs = with self; [ python pkgs.lvm2 pkgs.dmraid ]; makeFlags = [ "USESELINUX=0" @@ -6375,16 +6969,17 @@ let }; }; + pycapnp = buildPythonPackage rec { name = "pycapnp-0.4.4"; - homepage = "http://jparyani.github.io/pycapnp/index.html"; + disabled = isPyPy || isPy3k; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pycapnp/${name}.tar.gz"; sha256 = "33b2b79438bb9bf37097966e1c90403c34ab49be1eb647ee251b62f362ee3537"; }; - buildInputs = with pkgs; [ capnproto cython ]; + buildInputs = with pkgs; [ capnproto self.cython ]; # import setuptools as soon as possible, to minimize monkeypatching mayhem. postConfigure = '' @@ -6395,7 +6990,44 @@ let maintainers = with maintainers; [ cstrahan ]; license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.all; + homepage = "http://jparyani.github.io/pycapnp/index.html"; + }; + }; + + + pycdio = buildPythonPackage rec { + name = "pycdio-0.20"; + disabled = !isPy27; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pycdio/${name}.tar.gz"; + sha256 = "1mrh233pj584gf7la64d4xlmvdnfl4jwpxs95lnd3i4zd5drid14"; + }; + + preConfigure = '' + patchShebangs . + ''; + + buildInputs = [ + self.setuptools self.nose pkgs.pkgconfig pkgs.swig pkgs.libcdio + ]; + + patches = [ ../development/python-modules/pycdio/add-cdtext-toc.patch ]; + + # Run tests using nosetests but first need to install the binaries + # to the root source directory where they can be found. + checkPhase = '' + ./setup.py install_lib -d . + nosetests + ''; + + meta = with stdenv.lib; { + homepage = http://www.gnu.org/software/libcdio/; + description = "Wrapper around libcdio (CD Input and Control library)"; + maintainers = with maintainers; [ rycee ]; + license = licenses.gpl3Plus; }; + }; @@ -6403,7 +7035,7 @@ let name = "pycryptopp-0.6.0.1206569328141510525648634803928199668821045408958"; disabled = isPy3k || isPyPy; # see https://bitbucket.org/pypy/pypy/issue/1190/ - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pycryptopp/${name}.tar.gz"; sha256 = "0n90h1yg7bfvlbhnc54xb6dbqm286ykaksyg04kxlhyjgf8mhq8i"; }; @@ -6412,7 +7044,7 @@ let # in the pycryptopp distribution. preConfigure = "export PYCRYPTOPP_DISABLE_EMBEDDED_CRYPTOPP=1"; - buildInputs = [ setuptoolsDarcs darcsver pkgs.cryptopp ]; + buildInputs = with self; [ setuptoolsDarcs darcsver pkgs.cryptopp ]; meta = { homepage = http://allmydata.org/trac/pycryptopp; @@ -6431,12 +7063,12 @@ let name = "pycurl-7.19.5"; disabled = isPyPy; # https://github.com/pycurl/pycurl/issues/208 - src = fetchurl { + src = pkgs.fetchurl { url = "http://pycurl.sourceforge.net/download/${name}.tar.gz"; sha256 = "0hqsap82zklhi5fxhc69kxrwzb0g9566f7sdpz7f9gyxkmyam839"; }; - propagatedBuildInputs = [ pkgs.curl pkgs.openssl ]; + propagatedBuildInputs = with self; [ pkgs.curl pkgs.openssl ]; # error: invalid command 'test' doCheck = false; @@ -6458,7 +7090,7 @@ let name = "pycurl2-7.20.0"; disabled = isPy3k; - src = fetchgit { + src = pkgs.fetchgit { url = "https://github.com/Lispython/pycurl.git"; rev = "0f00109950b883d680bd85dc6e8a9c731a7d0d13"; sha256 = "0mhg7f9y5zl0m2xgz3rf1yqjd6l8n0qhfk7bpf36r44jfnhj75ld"; @@ -6467,7 +7099,7 @@ let # error: (6, "Couldn't resolve host 'h.wrttn.me'") doCheck = false; - buildInputs = [ pkgs.curl simplejson unittest2 nose ]; + buildInputs = with self; [ pkgs.curl simplejson unittest2 nose ]; meta = { homepage = https://pypi.python.org/pypi/pycurl2; @@ -6481,25 +7113,25 @@ let name = "pydot-1.0.2"; disabled = isPy3k; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pydot/${name}.tar.gz"; md5 = "cd739651ae5e1063a89f7efd5a9ec72b"; }; - propagatedBuildInputs = [pyparsing pkgs.graphviz]; + propagatedBuildInputs = with self; [pyparsing pkgs.graphviz]; meta = { homepage = http://code.google.com/p/pydot/; - description = "pydot allows to easily create both directed and non directed graphs from Python."; + description = "Allows to easily create both directed and non directed graphs from Python"; }; }; pyfeed = buildPythonPackage rec { url = "http://www.blarg.net/%7Esteveha/pyfeed-0.7.4.tar.gz"; name = stdenv.lib.nameFromURL url ".tar"; - src = fetchurl { + src = pkgs.fetchurl { inherit url; sha256 = "1h4msq573m7wm46h3cqlx4rsn99f0l11rhdqgf50lv17j8a8vvy1"; }; - propagatedBuildInputs = [xe]; + propagatedBuildInputs = with self; [xe]; # error: invalid command 'test' doCheck = false; @@ -6512,11 +7144,11 @@ let pyfiglet = buildPythonPackage rec { name = "pyfiglet-${version}"; - version = "0.7.1"; + version = "0.7.2"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pyfiglet/${name}.tar.gz"; - sha256 = "14lgwg47gnnad7sfkmmwhknwysbfmr74c9b2a6d9wgjmydycc6ka"; + sha256 = "0v8a18wvaqnb1jksyv5dc5n6zj0vrkyhz0ivmm8gfwpa0ky6n68y"; }; doCheck = false; @@ -6531,18 +7163,18 @@ let pyflakes = buildPythonPackage rec { name = "pyflakes-0.8.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pyflakes/${name}.tar.gz"; md5 = "905fe91ad14b912807e8fdc2ac2e2c23"; }; - buildInputs = [ unittest2 ]; + buildInputs = with self; [ unittest2 ]; doCheck = !isPyPy; meta = { - homepage = "https://launchpad.net/pyflakes"; - description = "A simple program which checks Python source files for errors."; + homepage = https://launchpad.net/pyflakes; + description = "A simple program which checks Python source files for errors"; license = licenses.mit; maintainers = [ stdenv.lib.maintainers.garbas ]; }; @@ -6551,7 +7183,7 @@ let pyglet = buildPythonPackage rec { name = "pyglet-1.1.4"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pyglet.googlecode.com/files/${name}.tar.gz"; sha256 = "048n20d606i3njnzhajadnznnfm8pwchs43hxs50da9p79g2m6qx"; }; @@ -6574,7 +7206,7 @@ let pygments = buildPythonPackage rec { name = "Pygments-1.6"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/P/Pygments/${name}.tar.gz"; md5 = "a18feedf6ffd0b0cc8c8b0fbdb2027b1"; }; @@ -6591,7 +7223,7 @@ let name = "pygpgme-${version}"; disabled = isPyPy; - src = fetchurl { + src = pkgs.fetchurl { url = "https://launchpad.net/pygpgme/trunk/${version}/+download/${name}.tar.gz"; sha256 = "5fd887c407015296a8fd3f4b867fe0fcca3179de97ccde90449853a3dfb802e1"; }; @@ -6599,7 +7231,7 @@ let # error: invalid command 'test' doCheck = false; - propagatedBuildInputs = [ pkgs.gpgme ]; + propagatedBuildInputs = with self; [ pkgs.gpgme ]; meta = { homepage = "https://launchpad.net/pygpgme"; @@ -6614,13 +7246,13 @@ let name = "python-pyinotify-${version}"; version = "0.9.3"; - src = fetchgit { + src = pkgs.fetchgit { url = "git://github.com/seb-m/pyinotify.git"; rev = "refs/tags/${version}"; sha256 = "d38ce95e4af00391e58246a8d7fe42bdb51d63054b09809600b2faef2a803472"; }; - buildInputs = [ python ]; + buildInputs = with self; [ python ]; installPhase = '' ${python}/bin/${python.executable} setup.py install --prefix=$out @@ -6638,7 +7270,7 @@ let name = "pykickstart-${version}"; version = "1.99.39"; - src = fetchurl rec { + src = pkgs.fetchurl rec { url = "http://pkgs.fedoraproject.org/repo/pkgs/pykickstart/" + "${name}.tar.gz/${md5}/${name}.tar.gz"; md5 = "d249f60aa89b1b4facd63f776925116d"; @@ -6649,7 +7281,7 @@ let key=lambda m: m.__name__)/" tests/baseclass.py ''; - propagatedBuildInputs = [ urlgrabber ]; + propagatedBuildInputs = with self; [ urlgrabber ]; checkPhase = '' export PYTHONPATH="$PYTHONPATH:." @@ -6668,12 +7300,12 @@ let name = "pyodbc-3.0.7"; disabled = isPyPy; # use pypypdbc instead - src = fetchurl { + src = pkgs.fetchurl { url = "https://pyodbc.googlecode.com/files/${name}.zip"; sha256 = "0ldkm8xws91j7zbvpqb413hvdz8r66bslr451q3qc0xi8cnmydfq"; }; - buildInputs = [ pkgs.libiodbc ]; + buildInputs = with self; [ pkgs.libiodbc ]; meta = with stdenv.lib; { description = "Python ODBC module to connect to almost any database"; @@ -6688,7 +7320,7 @@ let pyparsing = buildPythonPackage rec { name = "pyparsing-2.0.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pyparsing/${name}.tar.gz"; sha256 = "1r742rjbagf2i166k2w0r192adfw7l9lnsqz7wh4mflf00zws1q0"; }; @@ -6708,11 +7340,22 @@ let version = "3.10"; disabled = isPyPy; - src = fetchurl { + src = pkgs.fetchurl { url = "https://fedorahosted.org/releases/p/y/pyparted/${name}.tar.gz"; sha256 = "17wq4invmv1nfazaksf59ymqyvgv3i8h4q03ry2az0s9lldyg3dv"; }; + patches = singleton (pkgs.fetchurl { + url = "https://www.redhat.com/archives/pyparted-devel/" + + "2014-April/msg00000.html"; + postFetch = '' + sed -i -ne '/<!--X-Body-of-Message-->/,/<!--X-Body-of-Message-End-->/ { + s/^<[^>]*>//; /^$/!p + }' "$downloadedFile" + ''; + sha256 = "1lakhz3nvx0qacn90bj1nq13zqxphiw4d9dsc44gwa8nj24j2zws"; + }); + postPatch = '' sed -i -e 's|/sbin/mke2fs|${pkgs.e2fsprogs}&|' tests/baseclass.py sed -i -e ' @@ -6728,9 +7371,9 @@ let PATH="${pkgs.parted}/sbin:$PATH" ''; - buildInputs = [ pkgs.pkgconfig ]; + buildInputs = with self; [ pkgs.pkgconfig ]; - propagatedBuildInputs = [ pkgs.parted ]; + propagatedBuildInputs = with self; [ pkgs.parted ]; checkPhase = '' patchShebangs Makefile @@ -6749,7 +7392,7 @@ let pyptlib = buildPythonPackage (rec { name = "pyptlib-${version}"; version = "0.0.3"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pyptlib/pyptlib-${version}.tar.gz"; sha256 = "0mklak456jqifx57j9jmpb69h3ybxc880qk86pg4g8jk0i14pxh3"; }; @@ -6763,12 +7406,12 @@ let name = "pyqtgraph-${version}"; version = "0.9.8"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pyqtgraph/${name}.tar.gz"; sha256 = "1fnhj26d9qrqqmjx092m1qspclh3mia3vag7rji5wciw0plpszi5"; }; - propagatedBuildInputs = [ scipy numpy pyqt4 pyopengl ]; + propagatedBuildInputs = with self; [ scipy pyqt4 pyopengl ]; meta = with stdenv.lib; { description = "Scientific Graphics and GUI Library for Python"; @@ -6783,7 +7426,7 @@ let name = "Pyro-3.16"; disabled = isPy3k; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/P/Pyro/${name}.tar.gz"; md5 = "59d4d3f4a8786776c9d7f9051b8f1a69"; }; @@ -6800,7 +7443,7 @@ let pyrss2gen = buildPythonPackage (rec { name = "PyRSS2Gen-1.0.0"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/P/PyRSS2Gen/${name}.tar.gz"; md5 = "eae2bc6412c5679c287ecc1a59588f75"; }; @@ -6817,12 +7460,12 @@ let version = "4.2.5"; name = "pysnmp-${version}"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pysnmp/${name}.tar.gz"; sha256 = "0zq7yx8732ad9dxpxqgpqyixj7kfwbvf402q7l5njkv0kbcnavn4"; }; - propagatedBuildInputs = [ pyasn1 pycrypto ]; + propagatedBuildInputs = with self; [ pyasn1 pycrypto ]; meta = with stdenv.lib; { homepage = http://pysnmp.sf.net; @@ -6833,22 +7476,52 @@ let }; }; + pysocks = buildPythonPackage rec { + name = "pysocks-${version}"; + version = "1.5.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/P/PySocks/PySocks-${version}.tar.gz"; + sha256 = "10wq5311qrnk8rvzsh6gwzxi7h51pgvzw3d7s1mb39fsvf0vyjdk"; + }; + + doCheck = false; + + meta = { + description = "SOCKS module for Python"; + license = licenses.bsd3; + maintainers = [ maintainers.thoughtpolice ]; + }; + }; + python_fedora = buildPythonPackage (rec { name = "python-fedora-0.3.33"; meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; - src = fetchurl { + src = pkgs.fetchurl { url = "https://fedorahosted.org/releases/p/y/python-fedora/${name}.tar.gz"; sha256 = "1g05bh7d5d0gzrlnhpnca7jpqbgs2rgnlzzbvzzxmdbmlkqi3mws"; }; - propagatedBuildInputs = [ kitchen requests bunch paver ]; + propagatedBuildInputs = with self; [ kitchen requests bunch paver ]; doCheck = false; }); + python_simple_hipchat = buildPythonPackage rec { + name = "python-simple-hipchat-${version}"; + version = "0.1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/python-simple-hipchat/python-simple-hipchat-${version}.zip"; + md5 = "3806b3729a021511bac065360832f197"; + }; + + buildInputs = [ pkgs.unzip ]; + }; + python_keyczar = buildPythonPackage rec { name = "python-keyczar-0.71c"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/python-keyczar/${name}.tar.gz"; sha256 = "18mhiwqq6vp65ykmi8x3i5l3gvrvrrr8z2kv11z1rpixmyr7sw1p"; }; @@ -6861,14 +7534,14 @@ let platforms = platforms.unix; }; - buildInputs = [ pyasn1 pycrypto ]; + buildInputs = with self; [ pyasn1 pycrypto ]; }; pyudev = buildPythonPackage rec { name = "pyudev-${version}"; version = "0.16.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pyudev/${name}.tar.gz"; md5 = "4034de584b6d9efcbfc590a047c63285"; }; @@ -6879,7 +7552,7 @@ let }' pyudev/_libudev.py ''; - propagatedBuildInputs = [ pkgs.udev ]; + propagatedBuildInputs = with self; [ pkgs.udev ]; meta = { homepage = "http://pyudev.readthedocs.org/"; @@ -6893,7 +7566,7 @@ let pynzb = buildPythonPackage (rec { name = "pynzb-0.1.0"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pynzb/${name}.tar.gz"; md5 = "63c74a36348ac28aa99732dcb8be8c59"; }; @@ -6909,7 +7582,7 @@ let progressbar = buildPythonPackage (rec { name = "progressbar-2.2"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/progressbar/${name}.tar.gz"; md5 = "8ea4e2c17a8ec9e7d153767c5f2a7b28"; }; @@ -6929,20 +7602,20 @@ let name = "ldap-2.4.15"; disabled = isPy3k; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/python-ldap/python-${name}.tar.gz"; sha256 = "0w0nn5yj0nbbkvpbqgfni56v7sjx6jf6s6zvp9zmahyrvqrsrg1h"; }; NIX_CFLAGS_COMPILE = "-I${pkgs.cyrus_sasl}/include/sasl"; - propagatedBuildInputs = [pkgs.openldap pkgs.cyrus_sasl pkgs.openssl]; + propagatedBuildInputs = with self; [pkgs.openldap pkgs.cyrus_sasl pkgs.openssl]; }; pylibacl = buildPythonPackage (rec { name = "pylibacl-0.5.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://github.com/downloads/iustin/pylibacl/${name}.tar.gz"; sha256 = "1idks7j9bn62xzsaxkvhl7bdq6ws8kv8aa0wahfh7724qlbbcf1k"; }; @@ -6951,31 +7624,37 @@ let # IOError: [Errno 0] Error doCheck = false; - buildInputs = [ pkgs.acl ]; + buildInputs = with self; [ pkgs.acl ]; meta = { - description = "A Python extension module for POSIX ACLs. It can be used to query, list, add, and remove ACLs from files and directories under operating systems that support them."; + description = "A Python extension module for POSIX ACLs, it can be used to query, list, add, and remove ACLs from files and directories under operating systems that support them"; license = stdenv.lib.licenses.lgpl21Plus; }; }); - pymacs = pkgs.stdenv.mkDerivation rec { + pymacs = buildPythonPackage rec { version = "0.25"; - name = "Pymacs-${version}"; + name = "pymacs-${version}"; + disabled = isPy3k || isPyPy; - src = fetchurl { + src = pkgs.fetchurl { url = "https://github.com/pinard/Pymacs/tarball/v${version}"; name = "${name}.tar.gz"; sha256 = "1hmy76c5igm95rqbld7gvk0az24smvc8hplfwx2f5rhn6frj3p2i"; }; - buildInputs = [ python ]; + configurePhase = "make"; - patchPhase = '' - sed -e "s@ install@ install --prefix=$out@g" -i Makefile + # Doesn't work with --old-and-unmanagable + installPhase = '' + ${python}/bin/${python.executable} setup.py install \ + --install-lib=$out/lib/${python.libPrefix}/site-packages \ + --prefix="$out" ''; + doCheck = false; + meta = with stdenv.lib; { description = "Emacs Lisp to Python interface"; homepage = http://pymacs.progiciels-bpi.ca; @@ -6984,58 +7663,67 @@ let }; }; - pyopengl = - let version = "3.0.2"; - in - buildPythonPackage { - name = "pyopengl-${version}"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/PyOpenGL/PyOpenGL-${version}.tar.gz"; - sha256 = "9ef93bbea2c193898341f574e281c3ca0dfe87c53aa25fbec4b03581f6d1ba03"; - }; + pyopengl = buildPythonPackage rec { + name = "pyopengl-${version}"; + version = "3.0.2"; - propagatedBuildInputs = with pkgs; [ mesa freeglut pil ]; + src = pkgs.fetchurl { + url = "http://pypi.python.org/packages/source/P/PyOpenGL/PyOpenGL-${version}.tar.gz"; + sha256 = "9ef93bbea2c193898341f574e281c3ca0dfe87c53aa25fbec4b03581f6d1ba03"; + }; + propagatedBuildInputs = [ pkgs.mesa pkgs.freeglut self.pillow ]; + patchPhase = '' + sed -i "s|util.find_library( name )|name|" OpenGL/platform/ctypesloader.py + sed -i "s|'GL',|'libGL.so',|" OpenGL/platform/glx.py + sed -i "s|'GLU',|'${pkgs.mesa}/lib/libGLU.so',|" OpenGL/platform/glx.py + sed -i "s|'glut',|'${pkgs.freeglut}/lib/libglut.so',|" OpenGL/platform/glx.py + ''; + meta = { + homepage = http://pyopengl.sourceforge.net/; + description = "PyOpenGL, the Python OpenGL bindings"; + longDescription = '' + PyOpenGL is the cross platform Python binding to OpenGL and + related APIs. The binding is created using the standard (in + Python 2.5) ctypes library, and is provided under an extremely + liberal BSD-style Open-Source license. + ''; + license = "BSD-style"; + platforms = stdenv.lib.platforms.mesaPlatforms; + }; + }; - patchPhase = '' - sed -i "s|util.find_library( name )|name|" OpenGL/platform/ctypesloader.py - sed -i "s|'GL',|'libGL.so',|" OpenGL/platform/glx.py - sed -i "s|'GLU',|'${pkgs.mesa}/lib/libGLU.so',|" OpenGL/platform/glx.py - sed -i "s|'glut',|'${pkgs.freeglut}/lib/libglut.so',|" OpenGL/platform/glx.py - ''; + pyopenssl = buildPythonPackage rec { + name = "pyopenssl-${version}"; + version = "0.14"; - meta = { - homepage = http://pyopengl.sourceforge.net/; - description = "PyOpenGL, the Python OpenGL bindings"; + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-0.14.tar.gz"; + sha256 = "0vpfqhng4cky7chliknkxv910iabqbfcxvkjiankh08jkkjvi7d9"; + }; - longDescription = '' - PyOpenGL is the cross platform Python binding to OpenGL and - related APIs. The binding is created using the standard (in - Python 2.5) ctypes library, and is provided under an extremely - liberal BSD-style Open-Source license. - ''; + # 17 tests failing + doCheck = false; - license = "BSD-style"; - platforms = stdenv.lib.platforms.mesaPlatforms; - }; - }; + propagatedBuildInputs = [ self.cryptography ]; + }; pyquery = buildPythonPackage rec { name = "pyquery-1.2.4"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pyquery/${name}.tar.gz"; md5 = "268f08258738d21bc1920d7522f2a63b"; }; - propagatedBuildInputs = [ cssselect lxml ]; + propagatedBuildInputs = with self; [ cssselect lxml ]; }; pyrax = buildPythonPackage rec { name = "pyrax-1.8.2"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pyrax/${name}.tar.gz"; sha256 = "0hvim60bhgfj91m7pp8jfmb49f087xqlgkqa505zw28r7yl0hcfp"; }; @@ -7054,7 +7742,7 @@ let name = "pyreport-0.3.4c"; disabled = isPy3k; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pyreport/${name}.tar.gz"; md5 = "3076164a7079891d149a23f9435581db"; }; @@ -7065,7 +7753,7 @@ let meta = { homepage = http://pypi.python.org/pypi/pyreport; license = "BSD"; - description = "Pyreport makes notes out of a python script."; + description = "Pyreport makes notes out of a python script"; }; }); @@ -7073,7 +7761,7 @@ let pyserial = buildPythonPackage rec { name = "pyserial-2.7"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pyserial/${name}.tar.gz"; sha256 = "3542ec0838793e61d6224e27ff05e8ce4ba5a5c5cc4ec5c6a3e8d49247985477"; }; @@ -7090,7 +7778,7 @@ let pysphere = buildPythonPackage rec { name = "pysphere-0.1.8"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pysphere.googlecode.com/files/${name}.zip"; md5 = "c57cba33626ac4b1e3d1974923d59232"; }; @@ -7106,7 +7794,7 @@ let name = "pysqlite-2.6.3"; disabled = isPy3k; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pysqlite/${name}.tar.gz"; sha256 = "13djzgnbi71znjjyaw4nybg6smilgszcid646j5qav7mdchkb77y"; }; @@ -7114,7 +7802,7 @@ let # Since the `.egg' file is zipped, the `NEEDED' of the `.so' files # it contains is not taken into account. Thus, we must explicitly make # it a propagated input. - propagatedBuildInputs = [ pkgs.sqlite ]; + propagatedBuildInputs = with self; [ pkgs.sqlite ]; patchPhase = '' substituteInPlace "setup.cfg" \ @@ -7160,12 +7848,12 @@ let pysvn = pkgs.stdenv.mkDerivation { name = "pysvn-1.7.8"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pysvn.barrys-emacs.org/source_kits/pysvn-1.7.8.tar.gz"; sha256 = "1qk7af0laby1f79bd07l9p0dxn5xmcmfwlcb9l1hk29zwwq6x4v0"; }; - buildInputs = [ python pkgs.subversion pkgs.apr pkgs.aprutil pkgs.expat pkgs.neon pkgs.openssl ] + buildInputs = with self; [ python pkgs.subversion pkgs.apr pkgs.aprutil pkgs.expat pkgs.neon pkgs.openssl ] ++ (if stdenv.isLinux then [pkgs.e2fsprogs] else []); # There seems to be no way to pass that path to configure. @@ -7205,7 +7893,7 @@ let pytz = buildPythonPackage rec { name = "pytz-2013.9"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pytz/${name}.tar.bz2"; md5 = "ec7076947a46a8a3cb33cbf2983a562c"; }; @@ -7220,13 +7908,13 @@ let pyutil = buildPythonPackage (rec { name = "pyutil-1.7.9"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pyutil/${name}.tar.gz"; sha256 = "c303bb779f96073820e2eb7c9692fe15a57df491eb356839f3cb3377ed03b844"; }; - buildInputs = [ setuptoolsDarcs setuptoolsTrial ] ++ (if doCheck then [ simplejson ] else []); - propagatedBuildInputs = [ zbase32 argparse twisted ]; + buildInputs = with self; [ setuptoolsDarcs setuptoolsTrial ] ++ (if doCheck then [ simplejson ] else []); + propagatedBuildInputs = with self; [ zbase32 argparse twisted ]; # Tests fail because they try to write new code into the twisted # package, apparently some kind of plugin. doCheck = false; @@ -7255,13 +7943,14 @@ let name = "pywebkitgtk-${version}"; version = "1.1.8"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pywebkitgtk.googlecode.com/files/${name}.tar.bz2"; sha256 = "1svlwyl61rvbqbcbalkg6pbf38yjyv7qkq9sx4x35yk69lscaac2"; }; - buildInputs = with pkgs; [ - pkgconfig python gtk2 pygtk libxml2 libxslt libsoup webkitgtk2 icu + buildInputs = [ + pkgs.pkgconfig pkgs.gtk2 self.pygtk pkgs.libxml2 + pkgs.libxslt pkgs.libsoup pkgs.webkitgtk2 pkgs.icu ]; meta = { @@ -7275,7 +7964,7 @@ let pyxattr = buildPythonPackage (rec { name = "pyxattr-0.5.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://github.com/downloads/iustin/pyxattr/${name}.tar.gz"; sha256 = "0jmkffik6hdzs7ng8c65bggss2ai40nm59jykswdf5lpd36cxddq"; }; @@ -7283,10 +7972,10 @@ let # error: invalid command 'test' doCheck = false; - buildInputs = [ pkgs.attr ]; + buildInputs = with self; [ pkgs.attr ]; meta = { - description = "A Python extension module which gives access to the extended attributes for filesystem objects available in some operating systems."; + description = "A Python extension module which gives access to the extended attributes for filesystem objects available in some operating systems"; license = stdenv.lib.licenses.lgpl21Plus; }; }); @@ -7295,18 +7984,18 @@ let pyyaml = buildPythonPackage (rec { name = "PyYAML-3.10"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pyyaml.org/download/pyyaml/${name}.zip"; sha256 = "1r127fa354ppb667f4acxlzwxixap1jgzjrr790bw8mcpxv2hqaa"; }; - buildInputs = [ pkgs.pyrex ]; - propagatedBuildInputs = [ pkgs.libyaml ]; + buildInputs = with self; [ pkgs.pyrex ]; + propagatedBuildInputs = with self; [ pkgs.libyaml ]; meta = { description = "The next generation YAML parser and emitter for Python"; homepage = http://pyyaml.org; - license = "free"; # !? + license = stdenv.lib.licenses.free; # !? }; }); @@ -7314,7 +8003,7 @@ let recaptcha_client = buildPythonPackage rec { name = "recaptcha-client-1.0.6"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/r/recaptcha-client/${name}.tar.gz"; md5 = "74228180f7e1fb76c4d7089160b0d919"; }; @@ -7331,18 +8020,18 @@ let in buildPythonPackage rec { name = "reportlab-3.1.8"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/r/reportlab/${name}.tar.gz"; md5 = "820a9fda647078503597b85cdba7ed7f"; }; - buildInputs = [freetype]; + buildInputs = with self; [freetype]; # error: invalid command 'test' doCheck = false; meta = { - description = "The ReportLab Toolkit. An Open Source Python library for generating PDFs and graphics."; + description = "An Open Source Python library for generating PDFs and graphics"; homepage = http://www.reportlab.com/; }; }; @@ -7351,28 +8040,28 @@ let requests = buildPythonPackage rec { name = "requests-1.2.3"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/r/requests/${name}.tar.gz"; md5 = "adbd3f18445f7fe5e77f65c502e264fb"; }; meta = { - description = "Requests is an Apache2 Licensed HTTP library, written in Python, for human beings.."; + description = "An Apache2 licensed HTTP library, written in Python, for human beings"; homepage = http://docs.python-requests.org/en/latest/; }; }; requests2 = buildPythonPackage rec { - name = "requests-2.2.1"; + name = "requests-2.4.3"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/r/requests/${name}.tar.gz"; - md5 = "ac27081135f58d1a43e4fb38258d6f4e"; + md5 = "02214b3a179e445545de4b7a98d3dd17"; }; meta = { - description = "Requests is an Apache2 Licensed HTTP library, written in Python, for human beings.."; + description = "An Apache2 licensed HTTP library, written in Python, for human beings"; homepage = http://docs.python-requests.org/en/latest/; }; }; @@ -7381,12 +8070,12 @@ let requests_oauthlib = buildPythonPackage rec { name = "requests-oauthlib-0.3.2"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/r/requests-oauthlib/${name}.tar.gz"; md5 = "35b3b750493c231145c39db0216813e7"; }; - propagatedBuildInputs = [ oauthlib requests ]; + propagatedBuildInputs = with self; [ oauthlib requests ]; meta = { description = "OAuthlib authentication support for Requests"; @@ -7394,11 +8083,22 @@ let }; }; + retry_decorator = buildPythonPackage rec { + name = "retry_decorator-1.0.0"; + src = pkgs.fetchurl { + url = https://pypi.python.org/packages/source/r/retry_decorator/retry_decorator-1.0.0.tar.gz; + sha256 = "086zahyb6yn7ggpc58909c5r5h3jz321i1694l1c28bbpaxnlk88"; + }; + meta = { + homepage = https://github.com/pnpnpn/retry-decorator; + license = stdenv.lib.licenses.mit; + }; + }; quantities = buildPythonPackage rec { name = "quantities-0.10.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/q/quantities/quantities-0.10.1.tar.gz"; md5 = "e924e21c0a5ddc9ebcdacbbe511b8ec7"; }; @@ -7413,15 +8113,15 @@ let qutip = buildPythonPackage rec { name = "qutip-2.2.0"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://qutip.googlecode.com/files/QuTiP-2.2.0.tar.gz"; sha1 = "76ba4991322a991d580e78a197adc80d58bd5fb3"; }; - propagatedBuildInputs = [ numpy scipy matplotlib pkgs.pyqt4 + propagatedBuildInputs = with self; [ numpy scipy matplotlib pyqt4 cython ]; - buildInputs = with pkgs; [ gcc qt4 blas ] ++ [ nose ]; + buildInputs = [ pkgs.gcc pkgs.qt4 pkgs.blas self.nose ]; meta = { description = "QuTiP - Quantum Toolbox in Python"; @@ -7444,7 +8144,7 @@ let redis = buildPythonPackage rec { name = "redis-2.9.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/r/redis/${name}.tar.gz"; sha256 = "1r7lrh4kxccyhr4pyp13ilymmvh22pi7aa9514dmnhi74zn4g5xg"; }; @@ -7461,12 +8161,12 @@ let requests_oauth2 = buildPythonPackage rec { name = "requests-oauth2-0.1.1"; - src = fetchurl { + src = pkgs.fetchurl { url = https://github.com/maraujop/requests-oauth2/archive/0.1.1.tar.gz; sha256 = "1aij66qg9j5j4vzyh64nbg72y7pcafgjddxsi865racsay43xfqg"; }; - propagatedBuildInputs = [ requests_oauthlib ]; + propagatedBuildInputs = with self; [ requests_oauthlib ]; meta = { description = "Python's Requests OAuth2 (Open Authentication) plugin"; @@ -7479,12 +8179,12 @@ let name = "restview-${version}"; version = "2.1.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/r/restview/${name}.tar.gz"; sha256 = "07scf80hhr9rijrbfrplyi3gwkx74knnzfhvlg6yf1cd0x2yiy8v"; }; - propagatedBuildInputs = [ docutils mock pygments ]; + propagatedBuildInputs = with self; [ docutils mock pygments ]; meta = with stdenv.lib; { description = "ReStructuredText viewer"; @@ -7499,12 +8199,12 @@ let reviewboard = buildPythonPackage rec { name = "ReviewBoard-1.6.16"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://downloads.reviewboard.org/releases/ReviewBoard/1.6/${name}.tar.gz"; sha256 = "0vg3ypm57m43bscv8vswjdllv3d2j8lxqwwvpd65cl7jd1in0yr1"; }; - propagatedBuildInputs = + propagatedBuildInputs = with self; [ django_1_3 recaptcha_client pytz memcached dateutil_1_5 paramiko flup pygments djblets django_evolution pycrypto modules.sqlite3 pysvn pil psycopg2 @@ -7515,7 +8215,7 @@ let rdflib = buildPythonPackage (rec { name = "rdflib-4.1.2"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/r/rdflib/${name}.tar.gz"; sha256 = "0kvaf332cqbi47rqzlpdx4mbkvw12mkrzkj8n9l19wk713d4py9w"; }; @@ -7523,10 +8223,10 @@ let # error: invalid command 'test' doCheck = false; - propagatedBuildInputs = [ isodate ]; + propagatedBuildInputs = with self; [ isodate ]; meta = { - description = "RDFLib is a Python library for working with RDF, a simple yet powerful language for representing information."; + description = "A Python library for working with RDF, a simple yet powerful language for representing information"; homepage = http://www.rdflib.net/; }; }); @@ -7534,7 +8234,7 @@ let isodate = buildPythonPackage rec { name = "isodate-0.5.0"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/i/isodate/${name}.tar.gz"; md5 = "9a267e9327feb3d021cae26002ba6e0e"; }; @@ -7545,15 +8245,37 @@ let }; }; + robomachine = buildPythonPackage rec { + name = "robomachine-0.6"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/R/RoboMachine/RoboMachine-0.6.tar.gz"; + md5 = "4e95eaa43afda0f363c78a88e9da7159"; + }; + + propagatedBuildInputs = with self; [ pyparsing argparse robotframework ]; + + # Remove Windows .bat files + postInstall = '' + rm "$out"/bin/*.bat + ''; + + meta = with stdenv.lib; { + description = "Test data generator for Robot Framework"; + homepage = https://github.com/mkorpela/RoboMachine; + license = licenses.asl20; + maintainers = [ maintainers.bjornfor ]; + }; + }; robotframework = buildPythonPackage rec { - version = "2.8.5"; + version = "2.8.6"; name = "robotframework-${version}"; disabled = isPy3k; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/r/robotframework/${name}.tar.gz"; - sha256 = "0rzdn2gvmcrxs2fvxm11h55w4j5pv0lf443fc4hl8kzwjwgjckga"; + sha256 = "0hl44pwfkagr5272s90y0bkfllj0q1l4yw4rvkdrc6ikn6l61d9v"; }; # error: invalid command 'test' @@ -7570,18 +8292,18 @@ let robotframework-selenium2library = buildPythonPackage rec { - version = "1.5.0"; + version = "1.6.0"; name = "robotframework-selenium2library-${version}"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/r/robotframework-selenium2library/${name}.tar.gz"; - sha256 = "0hjmar9766jqfpbckac8zncyal546vm059wnkbn33f68djdcnwz1"; + sha256 = "1asdwrpb4s7q08bx641yrh3yicgba14n3hxmsqs58mqf86ignwly"; }; # error: invalid command 'test' #doCheck = false; - propagatedBuildInputs = [ robotframework selenium docutils decorator ]; + propagatedBuildInputs = with self; [ robotframework selenium docutils decorator ]; meta = with stdenv.lib; { description = ""; @@ -7595,12 +8317,12 @@ let version = "0.1a115"; name = "robotframework-tools-${version}"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/r/robotframework-tools/${name}.tar.gz"; sha256 = "04gkn1zpf3rsvbqdxrrjqqi8sa0md9gqwh6n5w2m03fdwjg4lc7q"; }; - propagatedBuildInputs = [ robotframework moretools pathpy six setuptools ]; + propagatedBuildInputs = with self; [ robotframework moretools pathpy six setuptools ]; meta = with stdenv.lib; { description = "Python Tools for Robot Framework and Test Libraries"; @@ -7615,7 +8337,7 @@ let version = "1.4.2"; name = "robotsuite-${version}"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/r/robotsuite/${name}.zip"; sha256 = "0sw09vrvwv3gzqb6jvhbrz09l6nzzj3i9av34qjddqfwq7cr1bla"; }; @@ -7623,8 +8345,8 @@ let # error: invalid command 'test' #doCheck = false; - buildInputs = [ unittest2 ]; - propagatedBuildInputs = [ robotframework lxml ]; + buildInputs = with self; [ unittest2 ]; + propagatedBuildInputs = with self; [ robotframework lxml ]; meta = with stdenv.lib; { description = "Python unittest test suite for Robot Framework"; @@ -7639,12 +8361,12 @@ let name = "robotframework-ride-${version}"; disabled = isPy3k; - src = fetchurl { + src = pkgs.fetchurl { url = "https://robotframework-ride.googlecode.com/files/${name}.tar.gz"; sha256 = "1lf5f4x80f7d983bmkx12sxcizzii21kghs8kf63a1mj022a5x5j"; }; - propagatedBuildInputs = [ pygments wxPython modules.sqlite3 ]; + propagatedBuildInputs = with self; [ pygments wxPython modules.sqlite3 ]; # ride_postinstall.py checks that needed deps are installed and creates a # desktop shortcut. We don't really need it and it clutters up bin/ so @@ -7672,7 +8394,7 @@ let disabled = isPy3k; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/r/rope/${name}.tar.gz"; sha256 = "0rdlvp8h74qs49wz1hx6qy8mgp2ddwlfs7z13h9139ynq04a3z7z"; }; @@ -7689,12 +8411,12 @@ let version = "0.7"; name = "ropemacs-${version}"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/r/ropemacs/${name}.tar.gz"; sha256 = "1x5qf1drcdz9jfiiakc60kzqkb3ahsg9j902c5byf3gjfacdrmqj"; }; - propagatedBuildInputs = [ ropemode ]; + propagatedBuildInputs = with self; [ ropemode ]; meta = with stdenv.lib; { description = "a plugin for performing python refactorings in emacs"; @@ -7708,12 +8430,12 @@ let version = "0.2"; name = "ropemode-${version}"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/r/ropemode/${name}.tar.gz"; sha256 = "0jw6h1wvk6wk0wknqdf7s9pw76m8472jv546lqdd88jbl2scgcjl"; }; - propagatedBuildInputs = [ rope ]; + propagatedBuildInputs = with self; [ rope ]; meta = with stdenv.lib; { description = "a plugin for performing python refactorings in emacs"; @@ -7728,12 +8450,12 @@ let routes = buildPythonPackage rec { name = "routes-1.12.3"; - src = fetchurl { + src = pkgs.fetchurl { url = http://pypi.python.org/packages/source/R/Routes/Routes-1.12.3.tar.gz; md5 = "9740ff424ff6b841632c784a38fb2be3"; }; - propagatedBuildInputs = [ paste webtest ]; + propagatedBuildInputs = with self; [ paste webtest ]; meta = { description = "A Python re-implementation of the Rails routes system for mapping URLs to application actions"; @@ -7745,7 +8467,7 @@ let name = "rpkg-1.14"; meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; - src = fetchurl { + src = pkgs.fetchurl { url = "https://fedorahosted.org/releases/r/p/rpkg/rpkg-1.14.tar.gz"; sha256 = "0d053hdjz87aym1sfm6c4cxmzmy5g0gkrmrczly86skj957r77a7"; }; @@ -7754,7 +8476,7 @@ let # buildPhase = "python setup.py build"; # doCheck = false; - propagatedBuildInputs = [ pycurl pkgs.koji GitPython pkgs.git + propagatedBuildInputs = with self; [ pycurl pkgs.koji GitPython pkgs.git pkgs.rpm pkgs.pyopenssl ]; }); @@ -7763,12 +8485,12 @@ let name = "rpyc-${version}"; version = "3.3.0"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/r/rpyc/${name}.tar.gz"; md5 = "6931cb92c41f547591b525142ccaeef1"; }; - propagatedBuildInputs = [ nose plumbum ]; + propagatedBuildInputs = with self; [ nose plumbum ]; meta = { description = "Remote Python Call (RPyC), a transparent and symmetric RPC library"; @@ -7780,12 +8502,12 @@ let rsa = buildPythonPackage rec { name = "rsa-3.1.2"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://bitbucket.org/sybren/python-rsa/get/version-3.1.2.tar.bz2"; sha256 = "0ag2q4gaapi74x47q74xhcjzs4b7r2bb6zrj2an4sz5d3yd06cgf"; }; - buildInputs = [ pythonPackages.pyasn1 ]; + buildInputs = with self; [ self.pyasn1 ]; meta = { homepage = http://stuvel.eu/rsa; @@ -7794,11 +8516,45 @@ let }; }; + squaremap = buildPythonPackage rec { + name = "squaremap-1.0.4"; + disabled = isPy3k; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/S/SquareMap/SquareMap-1.0.4.tar.gz"; + md5 = "e36a453baddb97c19af6f79d5ba51f38"; + }; + + meta = with stdenv.lib; { + description = "Hierarchic visualization control for wxPython"; + homepage = https://launchpad.net/squaremap; + license = licenses.bsd3; + }; + }; + + runsnakerun = buildPythonPackage rec { + name = "runsnakerun-2.0.4"; + + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/R/RunSnakeRun/RunSnakeRun-2.0.4.tar.gz"; + md5 = "3220b5b89994baee70b1c24d7e42a306"; + }; + + propagatedBuildInputs = [ self.squaremap self.wxPython28 ]; + + meta = with stdenv.lib; { + description = "GUI Viewer for Python profiling runs"; + homepage = http://www.vrplumber.com/programming/runsnakerun/; + license = licenses.bsd3; + }; + }; + rtslib_fb = buildPythonPackage rec { version = "2.1.fb43"; name = "rtslib-fb-${version}"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://github.com/agrover/rtslib-fb/archive/v${version}.tar.gz"; sha256 = "1b59vyy12g6rix9l2fxx0hjiq33shkb79v57gwffs57vh74wc53v"; }; @@ -7811,16 +8567,16 @@ let }; seqdiag = buildPythonPackage rec { - name = "seqdiag-0.9.0"; + name = "seqdiag-0.9.4"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/s/seqdiag/${name}.tar.gz"; - md5 = "92946555ce219df18002e6c88b4055d3"; + sha256 = "1qa7d0m1wahvmrj95rxkb6128cbwd4w3gy8gbzncls66h46bifiz"; }; - buildInputs = [ pep8 nose unittest2 docutils ]; + buildInputs = with self; [ pep8 nose unittest2 docutils ]; - propagatedBuildInputs = [ blockdiag ]; + propagatedBuildInputs = with self; [ blockdiag ]; # Tests fail: # ... @@ -7837,16 +8593,38 @@ let }; + scapy = buildPythonPackage rec { + name = "scapy-2.2.0"; + + disabled = isPy3k || isPyPy; + + src = pkgs.fetchurl { + url = "http://www.secdev.org/projects/scapy/files/${name}.tar.gz"; + sha256 = "1bqmp0xglkndrqgmybpwmzkv462mir8qlkfwsxwbvvzh9li3ndn5"; + }; + + propagatedBuildInputs = [ modules.readline ]; + + meta = with stdenv.lib; { + description = "Powerful interactive network packet manipulation program"; + homepage = http://www.secdev.org/projects/scapy/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; + }; + + scipy = buildPythonPackage rec { name = "scipy-0.14.0"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/s/scipy/${name}.tar.gz"; md5 = "d7c7f4ccf8b07b08d6fe49d5cd51f85d"; }; - buildInputs = [pkgs.gfortran]; - propagatedBuildInputs = [ numpy ]; + buildInputs = [ pkgs.gfortran ]; + propagatedBuildInputs = with self; [ numpy ]; # TODO: add ATLAS=${pkgs.atlas} preConfigure = '' @@ -7866,16 +8644,46 @@ let }; + scikitlearn = buildPythonPackage { + name = "scikit-learn-0.15.2"; + + disabled = isPy3k; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/s/scikit-learn/scikit-learn-0.15.2.tar.gz"; + md5 = "d9822ad0238e17b382a3c756ea94fe0d"; + }; + + buildInputs = with self; [ nose pillow pkgs.gfortran ]; + propagatedBuildInputs = with self; [ numpy scipy pkgs.atlas ]; + + buildPhase = '' + export ATLAS=${pkgs.atlas} + ${self.python.executable} setup.py build_ext -i --fcompiler='gnu95' + ''; + + checkPhase = '' + LOCALE_ARCHIVE=${localePath} LC_ALL="en_US.UTF-8" HOME=$TMPDIR ATLAS="" nosetests + ''; + + meta = { + description = "A set of python modules for machine learning and data mining"; + homepage = http://scikit-learn.org; + license = stdenv.lib.licenses.bsd3; + }; + }; + + scripttest = buildPythonPackage rec { version = "1.3"; name = "scripttest-${version}"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/s/scripttest/scripttest-${version}.tar.gz"; md5 = "1d1c5117ccfc7b5961cae6c1020c0848"; }; - buildInputs = [ nose pytest ]; + buildInputs = with self; [ nose pytest ]; meta = { description = "A library for testing interactive command-line applications"; @@ -7884,25 +8692,26 @@ let }; selenium = buildPythonPackage rec { - name = "selenium-2.39.0"; + name = "selenium-2.44.0"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/s/selenium/${name}.tar.gz"; - sha256 = "1kisndzl9s0vs0a5paqx35hxq28id3xyi1gfsjaixsi6rs0ibhhh"; + sha256 = "0l70pqwg88imbylcd831vg8nj8ipy4zr331f6qjccss7vn56i2h5"; }; - buildInputs = [pkgs.xlibs.libX11]; + buildInputs = with self; [pkgs.xlibs.libX11]; # Recompiling x_ignore_nofocus.so as the original one dlopen's libX11.so.6 by some # absolute paths. Replaced by relative path so it is found when used in nix. x_ignore_nofocus = - pkgs.fetchsvn { - url = http://selenium.googlecode.com/svn/tags/selenium-2.25.0/cpp/linux-specific; - rev = 17641; - sha256 = "1wif9r6307qhlcp2zbg6n05yvxxn9ppkxh8gpsplcbyh22zi7bcd"; + pkgs.fetchFromGitHub { + owner = "SeleniumHQ"; + repo = "selenium"; + rev = "selenium-2.44.0"; + sha256 = "13aqm0dwy17ghimy7m2mxjwlyc1k7zk5icxzrs1sa896056f1dyy"; }; preInstall = '' - cp "${x_ignore_nofocus}/"* . + cp "${x_ignore_nofocus}/cpp/linux-specific/"* . sed -i 's|dlopen(library,|dlopen("libX11.so.6",|' x_ignore_nofocus.c gcc -c -fPIC x_ignore_nofocus.c -o x_ignore_nofocus.o gcc -shared \ @@ -7917,14 +8726,14 @@ let setuptoolsDarcs = buildPythonPackage { name = "setuptools-darcs-1.2.9"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/s/setuptools_darcs/setuptools_darcs-1.2.9.tar.gz"; sha256 = "d37ce11030addbd729284c441facd0869cdc6e5c888dc5fa0a6f1edfe3c3e617"; }; # In order to break the dependency on darcs -> ghc, we don't add # darcs as a propagated build input. - propagatedBuildInputs = [ darcsver ]; + propagatedBuildInputs = with self; [ darcsver ]; meta = { description = "setuptools plugin for the Darcs version control system"; @@ -7939,12 +8748,12 @@ let setuptoolsTrial = buildPythonPackage { name = "setuptools-trial-0.5.12"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/s/setuptools_trial/setuptools_trial-0.5.12.tar.gz"; md5 = "f16f4237c9ee483a0cd13208849d96ad"; }; - propagatedBuildInputs = [ twisted ]; + propagatedBuildInputs = with self; [ twisted ]; meta = { description = "setuptools plug-in that helps run unit tests built with the \"Trial\" framework (from Twisted)"; @@ -7959,7 +8768,7 @@ let simplejson = buildPythonPackage (rec { name = "simplejson-3.3.0"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/s/simplejson/${name}.tar.gz"; md5 = "0e29b393bceac8081fa4e93ff9f6a001"; }; @@ -7984,12 +8793,12 @@ let sigal = buildPythonPackage rec { name = "sigal-0.7.0"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/s/sigal/${name}.tar.gz"; md5 = "d2386706ac8543378aebde1ea4edeba4"; }; - propagatedBuildInputs = [ jinja2 markdown pillow pilkit clint argh pytest ]; + propagatedBuildInputs = with self; [ jinja2 markdown pillow pilkit clint argh pytest ]; meta = with stdenv.lib; { description = "Yet another simple static gallery generator"; @@ -7999,10 +8808,10 @@ let }; }; - pgpdump = pythonPackages.buildPythonPackage rec { + pgpdump = self.buildPythonPackage rec { name = "pgpdump-1.5"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pgpdump/pgpdump-1.5.tar.gz"; md5 = "040a451c8e63de3e61fc5b66efa7fca5"; }; @@ -8017,12 +8826,12 @@ let spambayes = buildPythonPackage rec { name = "spambayes-1.1b1"; - src = fetchurl { + src = pkgs.fetchurl { url = "mirror://sourceforge/spambayes/${name}.tar.gz"; sha256 = "0kqvjb89b02wp41p650ydfspi1s8d7akx1igcrw62diidqbxp04n"; }; - propagatedBuildInputs = [ pydns lockfile ]; + propagatedBuildInputs = with self; [ pydns lockfile ]; meta = with stdenv.lib; { description = "Statistical anti-spam filter, initially based on the work of Paul Graham"; @@ -8033,12 +8842,12 @@ let shapely = buildPythonPackage rec { name = "Shapely-1.3.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/S/Shapely/${name}.tar.gz"; sha256 = "099sc7ajpp6hbgrx3c0bl6hhkz1mhnr0ahvc7s4i3f3b7q1zfn7l"; }; - buildInputs = [ pkgs.geos ]; + buildInputs = with self; [ pkgs.geos ]; preConfigure = '' export LANG="en_US.UTF-8"; @@ -8060,14 +8869,14 @@ let stevedore = buildPythonPackage rec { name = "stevedore-0.15"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/s/stevedore/${name}.tar.gz"; sha256 = "bec9269cbfa58de4f0849ec79bb7d54eeeed9df8b5fbfa1637fbc68062822847"; }; - buildInputs = [ pbr pip ]; + buildInputs = with self; [ pbr pip ] ++ optional isPy26 argparse; - propagatedBuildInputs = [ setuptools ]; + propagatedBuildInputs = with self; [ setuptools ]; meta = { description = "Manage dynamic plugins for Python applications"; @@ -8080,7 +8889,7 @@ let name = "pydns-2.3.6"; disabled = isPy3k; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pydns/${name}.tar.gz"; sha256 = "0qnv7i9824nb5h9psj0rwzjyprwgfiwh5s5raa9avbqazy5hv5pi"; }; @@ -8093,8 +8902,8 @@ let name = "sympy-0.7.4"; disabled = isPy34; # some tests fail - src = fetchurl { - url = "https://github.com/sympy/sympy/releases/download/${name}/${name}.tar.gz"; + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/s/sympy/${name}.tar.gz"; sha256 = "0h1b9mx0snyyybj1x1ga69qssgjzkkgx2rw6nddjhyz1fknf8ywh"; }; @@ -8106,7 +8915,7 @@ let meta = with stdenv.lib; { description = "A Python library for symbolic mathematics"; homepage = http://www.sympy.org/; - license = "free"; + license = licenses.bsd3; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; }; @@ -8115,7 +8924,7 @@ let pilkit = buildPythonPackage rec { name = "pilkit-1.1.4"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pilkit/${name}.tar.gz"; md5 = "659dd67440f4b576889f2cd350f43d7b"; }; @@ -8127,7 +8936,7 @@ let # tests fail, see https://github.com/matthewwithanm/pilkit/issues/9 doCheck = false; - buildInputs = [ pillow nose_progressive nose mock blessings ]; + buildInputs = with self; [ pillow nose_progressive nose mock blessings ]; meta = with stdenv.lib; { maintainers = [ maintainers.iElectric ]; @@ -8137,7 +8946,7 @@ let clint = buildPythonPackage rec { name = "clint-0.3.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/c/clint/${name}.tar.gz"; md5 = "7dcd43fb08bfb84c7d63e9356ada7b73"; }; @@ -8146,7 +8955,7 @@ let nosetests ''; - buildInputs = [ pillow nose_progressive nose mock blessings nose ]; + buildInputs = with self; [ pillow nose_progressive nose mock blessings nose ]; meta = with stdenv.lib; { maintainers = [ maintainers.iElectric ]; @@ -8156,7 +8965,7 @@ let argh = buildPythonPackage rec { name = "argh-0.23.3"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/a/argh/${name}.tar.gz"; md5 = "25bb02c6552b42875f2c36714e0ff16c"; }; @@ -8166,7 +8975,7 @@ let export LOCALE_ARCHIVE=${localePath} ''; - buildInputs = [ pytest py mock ]; + buildInputs = with self; [ pytest py mock ]; meta = with stdenv.lib; { maintainers = [ maintainers.iElectric ]; @@ -8176,13 +8985,13 @@ let nose_progressive = buildPythonPackage rec { name = "nose-progressive-1.3"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/n/nose-progressive/${name}.tar.gz"; md5 = "180be93929c5962044a35489f193259d"; }; - buildInputs = [ pillow blessings nose ]; - propagatedBuildInputs = [ modules.curses ]; + buildInputs = with self; [ pillow blessings nose ]; + propagatedBuildInputs = with self; [ modules.curses ]; meta = with stdenv.lib; { maintainers = [ maintainers.iElectric ]; @@ -8192,7 +9001,7 @@ let blessings = buildPythonPackage rec { name = "blessings-1.5.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/b/blessings/${name}.tar.gz"; md5 = "fbbddbf20b1f9a13e3fa612b1e086fd8"; }; @@ -8200,7 +9009,7 @@ let # 4 failing tests doCheck = false; - buildInputs = [ nose modules.curses ]; + buildInputs = with self; [ nose modules.curses ]; meta = with stdenv.lib; { maintainers = [ maintainers.iElectric ]; @@ -8212,9 +9021,9 @@ let disabled = isPy3k; - propagatedBuildInputs = [ quantities numpy ]; + propagatedBuildInputs = with self; [ quantities numpy ]; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/s/semantic/semantic-1.0.3.tar.gz"; md5 = "78a150190e3e7d0f6f357b4c828e5f0d"; }; @@ -8231,7 +9040,7 @@ let sexpdata = buildPythonPackage rec { name = "sexpdata-0.0.2"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/s/sexpdata/${name}.tar.gz"; md5 = "efc44265bc27cb3d6ffed4fbf5733fc1"; }; @@ -8248,7 +9057,7 @@ let sh = buildPythonPackage rec { name = "sh-1.08"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/s/sh/${name}.tar.gz"; md5 = "4028bcba85daa0aef579ed24261e88a3"; }; @@ -8262,12 +9071,34 @@ let }; + sipsimple = buildPythonPackage rec { + name = "sipsimple-${version}"; + version = "1.4.2"; + disabled = isPy3k; + + configurePhase = "find -name 'configure' -exec chmod a+x {} \\; ; find -name 'aconfigure' -exec chmod a+x {} \\; ; ${python}/bin/${python.executable} setup.py build_ext --pjsip-clean-compile"; + + src = pkgs.fetchurl { + url = "http://download.ag-projects.com/SipClient/python-${name}.tar.gz"; + sha256 = "f6e6de7ab5f20e8ae08966b8811462e4271833db4f7fbab58ffba4e5c07ab114"; + }; + + propagatedBuildInputs = with self; [ cython pkgs.openssl dns dateutil xcaplib msrplib]; + + buildInputs = with self; [ pkgs.alsaLib ]; + + installPhase = "${python}/bin/${python.executable} setup.py install --prefix=$out"; + + doCheck = false; + }; + + six = buildPythonPackage rec { - name = "six-1.7.3"; + name = "six-1.8.0"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/s/six/${name}.tar.gz"; - md5 = "784c6e5541c3c4952de9c0a966a0a80b"; + md5 = "1626eb24cc889110c38f7e786ec69885"; }; # error: invalid command 'test' @@ -8284,7 +9115,7 @@ let name = "Skype4Py-1.0.32.0"; disabled = isPy3k || isPyPy; - src = fetchurl { + src = pkgs.fetchurl { url = mirror://sourceforge/skype4py/Skype4Py-1.0.32.0.tar.gz; sha256 = "0cmkrv450wa8v50bng5dflpwkl5c1p9pzysjkb2956w5kvwh6f5b"; }; @@ -8298,7 +9129,7 @@ let # error: invalid command 'test' doCheck = false; - propagatedBuildInputs = [ pkgs.xlibs.libX11 pkgs.pythonDBus pygobject ]; + propagatedBuildInputs = with self; [ pkgs.xlibs.libX11 pkgs.pythonDBus pygobject ]; meta = { description = "High-level, platform independent Skype API wrapper for Python"; @@ -8315,12 +9146,12 @@ let smartdc = buildPythonPackage rec { name = "smartdc-0.1.12"; - src = fetchurl { + src = pkgs.fetchurl { url = https://pypi.python.org/packages/source/s/smartdc/smartdc-0.1.12.tar.gz; md5 = "b960f61facafc879142b699050f6d8b4"; }; - propagatedBuildInputs = [ requests http_signature ]; + propagatedBuildInputs = with self; [ requests http_signature ]; meta = { description = "Joyent SmartDataCenter CloudAPI connector using http-signature authentication via Requests"; @@ -8329,10 +9160,23 @@ let }; }; + socksipy-branch = buildPythonPackage rec { + name = "SocksiPy-branch-1.01"; + src = pkgs.fetchurl { + url = https://pypi.python.org/packages/source/S/SocksiPy-branch/SocksiPy-branch-1.01.tar.gz; + sha256 = "01l41v4g7fy9fzvinmjxy6zcbhgqaif8dhdqm4w90fwcw9h51a8p"; + }; + meta = { + homepage = http://code.google.com/p/socksipy-branch/; + description = "This Python module allows you to create TCP connections through a SOCKS proxy without any special effort"; + license = stdenv.lib.licenses.bsd3; + }; + }; + sorl_thumbnail = buildPythonPackage rec { name = "sorl-thumbnail-11.12"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/s/sorl-thumbnail/${name}.tar.gz"; sha256 = "050b9kzbx7jvs3qwfxxshhis090hk128maasy8pi5wss6nx5kyw4"; }; @@ -8352,13 +9196,13 @@ let disabled = isPy3k; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/s/supervisor/${name}.tar.gz"; md5 = "8c9714feaa63902f03871317e3ebf62e"; }; - buildInputs = [ mock ]; - propagatedBuildInputs = [ meld3 ]; + buildInputs = with self; [ mock ]; + propagatedBuildInputs = with self; [ meld3 ]; # failing tests when building under chroot as root user doesn't exist doCheck = false; @@ -8373,30 +9217,46 @@ let name = "subprocess32-3.2.6"; disabled = isPy3k; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/s/subprocess32/${name}.tar.gz"; md5 = "754c5ab9f533e764f931136974b618f1"; }; - doCheck = false; + buildInputs = [ pkgs.bash ]; + + doCheck = !isPyPy; + + preConfigure = '' + substituteInPlace test_subprocess32.py \ + --replace '/usr/' '${pkgs.bash}/' + ''; + + checkPhase = '' + TMP_PREFIX=`pwd`/tmp/$name + TMP_INSTALL_DIR=$TMP_PREFIX/lib/${pythonPackages.python.libPrefix}/site-packages + PYTHONPATH="$TMP_INSTALL_DIR:$PYTHONPATH" + mkdir -p $TMP_INSTALL_DIR + python setup.py develop --prefix $TMP_PREFIX + python test_subprocess32.py + ''; meta = { - homepage = "https://pypi.python.org/pypi/subprocess32"; - description = "Backport of the subprocess module from Python 3.2.5 for use on 2.x."; + homepage = https://pypi.python.org/pypi/subprocess32; + description = "Backport of the subprocess module from Python 3.2.5 for use on 2.x"; maintainers = [ stdenv.lib.maintainers.garbas ]; }; }; sphinx = buildPythonPackage (rec { - name = "Sphinx-1.2"; + name = "Sphinx-1.2.3"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/S/Sphinx/${name}.tar.gz"; - md5 = "8516046aad73fe46dedece4e8e434328"; + md5 = "a98c93124035b4cd7183604aec656cb3"; }; - propagatedBuildInputs = [docutils jinja2 pygments]; + propagatedBuildInputs = with self; [docutils jinja2 pygments]; meta = { description = "Sphinx is a tool that makes it easy to create intelligent and beautiful documentation for Python projects."; @@ -8411,12 +9271,12 @@ let sphinxcontrib_httpdomain = buildPythonPackage (rec { name = "sphinxcontrib-httpdomain-1.1.9"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/s/sphinxcontrib-httpdomain/${name}.tar.gz"; md5 = "0f63aea612cc9e0b55a6c39e5b0f87b7"; }; - propagatedBuildInputs = [sphinx]; + propagatedBuildInputs = with self; [sphinx]; meta = { description = "Provides a Sphinx domain for describing RESTful HTTP APIs"; @@ -8431,7 +9291,7 @@ let sphinx_pypi_upload = buildPythonPackage (rec { name = "Sphinx-PyPI-upload-0.2.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/S/Sphinx-PyPI-upload/${name}.tar.gz"; md5 = "b9f1df5c8443197e4d49abbba1cfddc4"; }; @@ -8445,12 +9305,12 @@ let }; }); - sqlalchemy = sqlalchemy9.override rec { + sqlalchemy = self.sqlalchemy9.override rec { name = "SQLAlchemy-0.7.10"; disabled = isPy34; doCheck = !isPyPy; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/S/SQLAlchemy/${name}.tar.gz"; sha256 = "0rhxgr85xdhjn467qfs0dkyj8x46zxcv6ad3dfx3w14xbkb3kakp"; }; @@ -8464,12 +9324,12 @@ let ''; }; - sqlalchemy8 = sqlalchemy9.override rec { + sqlalchemy8 = self.sqlalchemy9.override rec { name = "SQLAlchemy-0.8.7"; disabled = isPy34; doCheck = !isPyPy; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/S/SQLAlchemy/${name}.tar.gz"; md5 = "4f3377306309e46739696721b1785335"; }; @@ -8481,14 +9341,14 @@ let sqlalchemy9 = buildPythonPackage rec { name = "SQLAlchemy-0.9.4"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/S/SQLAlchemy/${name}.tar.gz"; md5 = "c008ea5e2565ec1418ee8461393a99b1"; }; - buildInputs = [ nose mock ]; + buildInputs = with self; [ nose mock ]; - propagatedBuildInputs = [ modules.sqlite3 ]; + propagatedBuildInputs = with self; [ modules.sqlite3 ]; checkPhase = '' ${python.executable} sqla_nose.py @@ -8506,14 +9366,14 @@ let version = "0.8.2"; disabled = isPy33; - src = fetchgit { + src = pkgs.fetchgit { url = https://github.com/crosspop/sqlalchemy-imageattach.git; rev = "refs/tags/${version}"; md5 = "cffdcde30952176e35fccf385f579dda"; }; - buildInputs = [ pytest webob pkgs.imagemagick nose ]; - propagatedBuildInputs = [ sqlalchemy8 wand ]; + buildInputs = with self; [ pytest webob pkgs.imagemagick nose ]; + propagatedBuildInputs = with self; [ sqlalchemy8 wand ]; checkPhase = '' cd tests @@ -8535,14 +9395,14 @@ let sqlalchemy_migrate = buildPythonPackage rec { name = "sqlalchemy-migrate-0.6.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://sqlalchemy-migrate.googlecode.com/files/${name}.tar.gz"; sha1 = "17168b5fa066bd56fd93f26345525377e8a83d8a"; }; - buildInputs = [ nose unittest2 scripttest ]; + buildInputs = with self; [ nose unittest2 scripttest ]; - propagatedBuildInputs = [ tempita decorator sqlalchemy ]; + propagatedBuildInputs = with self; [ tempita decorator sqlalchemy ]; preCheck = '' @@ -8564,12 +9424,12 @@ let version = "1.6.0"; disabled = isPy3k; # next release will be py3k compatible - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/python-statsd/${name}.tar.gz"; md5 = "3a0c71a160b504b843703c3041c7d7fb"; }; - buildInputs = [ mock nose coverage ]; + buildInputs = with self; [ mock nose coverage ]; meta = { description = "A client for Etsy's node-js statsd server"; @@ -8583,12 +9443,12 @@ let name = "stompclient-0.3.2"; disabled = isPy3k; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/s/stompclient/${name}.tar.gz"; md5 = "af0a314b6106dd80da24a918c24a1eab"; }; - buildInputs = [ mock nose ]; + buildInputs = with self; [ mock nose ]; # XXX: Ran 0 tests in 0.217s @@ -8604,12 +9464,12 @@ let name = "subunit-${version}"; version = "0.0.16"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://launchpad.net/subunit/trunk/${version}/+download/python-${name}.tar.gz"; sha256 = "1ylla1wlmv29vdr76r5kgr7y21bz4ahi3v26mxsys42w90rfkahi"; }; - propagatedBuildInputs = [ testtools ]; + propagatedBuildInputs = with self; [ testtools ]; meta = { description = "A streaming protocol for test results"; @@ -8621,21 +9481,25 @@ let sure = buildPythonPackage rec { name = "sure-${version}"; - version = "1.2.7"; + version = "1.2.8"; preBuild = '' export LOCALE_ARCHIVE=${localePath} export LC_ALL="en_US.UTF-8" ''; - src = fetchurl { + # https://github.com/gabrielfalcao/sure/issues/71 + doCheck = !isPy3k; + disabled = isPyPy; + + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/s/sure/${name}.tar.gz"; - md5 = "6dbecef27dffc41c8cd8aab8a8b3fdfb"; + sha256 = "0pgi9xg00wcw0m1pv5qp7jv53q38yffcmkf2fj1zlfi2b9c3njid"; }; - buildInputs = [ nose ]; + buildInputs = with self; [ nose ]; - propagatedBuildInputs = [ six mock ]; + propagatedBuildInputs = with self; [ six mock ]; meta = { description = "Utility belt for automated testing"; @@ -8648,7 +9512,7 @@ let structlog = buildPythonPackage rec { name = "structlog-0.4.2"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/s/structlog/${name}.tar.gz"; md5 = "062cda36069e8573e00c265f451f899e"; }; @@ -8671,7 +9535,7 @@ let # sha256 = "41c9da1dab2be7b60bff87e618befdf5da37c0a56287385cb0cbd3f91e452bb6"; # }; # - # propagatedBuildInputs = [ pysvn argparse ]; + # propagatedBuildInputs = with self; [ pysvn argparse ]; # # doCheck = false; # }; @@ -8680,12 +9544,12 @@ let version = "2.1.fb33"; name = "targetcli-fb-${version}"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://github.com/agrover/targetcli-fb/archive/v${version}.tar.gz"; sha256 = "1zcm0agdpf866020b43fl8zyyyzz6r74mn1sz4xpaa0pinpwjk42"; }; - propagatedBuildInputs = [ + propagatedBuildInputs = with self; [ configshell_fb rtslib_fb ]; @@ -8701,13 +9565,13 @@ let name = "tarsnapper-0.2.1"; disabled = isPy3k; - src = fetchgit { + src = pkgs.fetchgit { url = https://github.com/miracle2k/tarsnapper.git; rev = "620439bca68892f2ffaba1079a34b18496cc6596"; sha256 = "06pp499qm2dxpja2jgmmq2jrcx3m4nq52x5hhil9r1jxvyiq962p"; }; - propagatedBuildInputs = [ argparse pyyaml ]; + propagatedBuildInputs = with self; [ argparse pyyaml ]; patches = [ ../development/python-modules/tarsnapper-path.patch ]; @@ -8721,12 +9585,12 @@ let name = "TaskCoach-1.3.22"; disabled = isPy3k; - src = fetchurl { + src = pkgs.fetchurl { url = "mirror://sourceforge/taskcoach/${name}.tar.gz"; sha256 = "1ddx56bqmh347synhgjq625ijv5hqflr0apxg0nl4jqdsqk1zmxh"; }; - propagatedBuildInputs = [ wxPython ]; + propagatedBuildInputs = with self; [ wxPython ]; # I don't know why I need to add these libraries. Shouldn't they # be part of wxPython? @@ -8746,18 +9610,46 @@ let }; }; + taskw = buildPythonPackage rec { + version = "0.8.6"; + name = "taskw-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/t/taskw/${name}.tar.gz"; + # md5 = "9f3ce2eaff9a3986d04632547168894d"; # provided by pypi website. + sha256 = "341a165a1c2ef94fb1c2a49a785357377f04a0d55cabe9563179849497e47146"; + }; + + patches = [ ../development/python-modules/taskw/use-template-for-taskwarrior-install-path.patch ]; + postPatch = '' + substituteInPlace taskw/warrior.py \ + --replace '@@taskwarrior@@' '${pkgs.taskwarrior}' + ''; + + buildInputs = with self; [ nose pkgs.taskwarrior ]; + propagatedBuildInputs = with self; [ six dateutil pytz ]; + + meta = { + homepage = http://github.com/ralphbean/taskw; + description = "Python bindings for your taskwarrior database"; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = [ maintainers.pierron ]; + }; + }; + tempita = buildPythonPackage rec { version = "0.5.2"; name = "tempita-${version}"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/T/Tempita/Tempita-${version}.tar.gz"; md5 = "4c2f17bb9d481821c41b6fbee904cea1"; }; disabled = isPy3k; - buildInputs = [ nose ]; + buildInputs = with self; [ nose ]; meta = { homepage = http://pythonpaste.org/tempita/; @@ -8770,12 +9662,12 @@ let name = "testtools-${version}"; version = "0.9.34"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/t/testtools/${name}.tar.gz"; sha256 = "0s6sn9h26dif2c9sayf875x622kq8jb2f4qbc6if7gwh2sssgicn"; }; - propagatedBuildInputs = [ pythonPackages.python_mimeparse pythonPackages.extras lxml ]; + propagatedBuildInputs = with self; [ self.python_mimeparse self.extras lxml ]; meta = { description = "A set of extensions to the Python standard library's unit testing framework"; @@ -8789,7 +9681,7 @@ let name = "python-mimeparse-${version}"; version = "0.1.4"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/python-mimeparse/${name}.tar.gz"; sha256 = "1hyxg09kaj02ri0rmwjqi86wk4nd1akvv7n0dx77azz76wga4s9w"; }; @@ -8798,7 +9690,7 @@ let doCheck = false; meta = { - description = "A module provides basic functions for parsing mime-type names and matching them against a list of media-ranges."; + description = "A module provides basic functions for parsing mime-type names and matching them against a list of media-ranges"; homepage = https://code.google.com/p/mimeparse/; license = licenses.mit; }; @@ -8809,7 +9701,7 @@ let name = "extras-${version}"; version = "0.0.3"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/e/extras/extras-${version}.tar.gz"; sha256 = "1h7zx4dfyclalg0fqnfjijpn0f793a9mx8sy3b27gd31nr6dhq3s"; }; @@ -8818,7 +9710,7 @@ let doCheck = false; meta = { - description = "A module provides basic functions for parsing mime-type names and matching them against a list of media-ranges."; + description = "A module provides basic functions for parsing mime-type names and matching them against a list of media-ranges"; homepage = https://code.google.com/p/mimeparse/; license = licenses.mit; }; @@ -8828,13 +9720,13 @@ let name = "tmdb3-${version}"; version = "0.6.17"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/t/tmdb3/${name}.zip"; md5 = "cd259427454472164c9a2479504c9cbb"; }; meta = { - description = "Python implementation of the v3 API for TheMovieDB.org, allowing access to movie and cast information."; + description = "Python implementation of the v3 API for TheMovieDB.org, allowing access to movie and cast information"; homepage = http://pypi.python.org/pypi/tmdb3; license = stdenv.lib.licenses.bsd3; }; @@ -8849,11 +9741,11 @@ let tox = buildPythonPackage rec { name = "tox-1.7.2"; - propagatedBuildInputs = [ py virtualenv ]; + propagatedBuildInputs = with self; [ py virtualenv ]; doCheck = false; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/t/tox/${name}.tar.gz"; md5 = "0d9b3acb1a9252659d753b0ae6b9b264"; }; @@ -8864,7 +9756,7 @@ let disabled = isPy3k || isPyPy; # next release will have py3k/pypy support meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/s/smmap/${name}.tar.gz"; sha256 = "0vrdgr6npmajrv658fv8bij7zgm5jmz2yxkbv8kmbv25q1f9b8ny"; }; @@ -8874,7 +9766,7 @@ let name = "trac-1.0.1"; disabled = isPy3k; - src = fetchurl { + src = pkgs.fetchurl { url = http://ftp.edgewall.com/pub/trac/Trac-1.0.1.tar.gz; sha256 = "1nqa95fcnkpyq4jk6az7l7sqgm3b3pjq3bx1n7y4v3bad5jr1m4x"; }; @@ -8884,7 +9776,7 @@ let PYTHON_EGG_CACHE = "`pwd`/.egg-cache"; - propagatedBuildInputs = [ genshi pkgs.setuptools modules.sqlite3 ]; + propagatedBuildInputs = with self; [ genshi pkgs.setuptools modules.sqlite3 ]; meta = { description = "Enhanced wiki and issue tracking system for software development projects"; @@ -8898,17 +9790,17 @@ let name = "transaction-${version}"; version = "1.4.3"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/t/transaction/${name}.tar.gz"; md5 = "b4ca5983c9e3a0808ff5ff7648092c76"; }; - propagatedBuildInputs = [ zope_interface ]; + propagatedBuildInputs = with self; [ zope_interface ]; meta = { description = "Transaction management"; homepage = http://pypi.python.org/pypi/transaction; - license = "ZPL"; + license = stdenv.lib.licenses.zpt20; }; }; @@ -8916,15 +9808,15 @@ let name = "transmissionrpc-${version}"; version = "0.11"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/t/transmissionrpc/${name}.tar.gz"; md5 = "b2f918593e509f0e66e2e643291b436d"; }; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = with self; [ six ]; meta = { - description = "Python implementation of the Transmission bittorent client RPC protocol."; + description = "Python implementation of the Transmission bittorent client RPC protocol"; homepage = http://pypi.python.org/pypi/transmissionrpc/; license = stdenv.lib.licenses.mit; }; @@ -8934,7 +9826,7 @@ let name = "eggdeps-${version}"; version = "0.4"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/t/tl.eggdeps/tl.${name}.tar.gz"; md5 = "2472204a2abd0d8cd4d11ff0fbf36ae7"; }; @@ -8942,11 +9834,11 @@ let # tests fail, see http://hydra.nixos.org/build/4316603/log/raw doCheck = false; - propagatedBuildInputs = [ zope_interface zope_testing ]; + propagatedBuildInputs = with self; [ zope_interface zope_testing ]; meta = { description = "A tool which computes a dependency graph between active Python eggs"; homepage = http://thomas-lotze.de/en/software/eggdeps/; - license = "ZPL"; + license = stdenv.lib.licenses.zpt20; }; }; @@ -8954,20 +9846,20 @@ let turses = buildPythonPackage (rec { name = "turses-0.2.22"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/t/turses/${name}.tar.gz"; sha256 = "1dqgvdqly4c4d6819mbkqy4g8r7zch4dkmxicfwck7q8h96wmyx3"; }; - propagatedBuildInputs = [ oauth2 urwid tweepy ] ++ optional isPy26 argparse; + propagatedBuildInputs = with self; [ oauth2 urwid tweepy ] ++ optional isPy26 argparse; #buildInputs = [ tox ]; # needs tox doCheck = false; meta = { - homepage = "https://github.com/alejandrogomez/turses"; - description = "A Twitter client for the console."; + homepage = https://github.com/alejandrogomez/turses; + description = "A Twitter client for the console"; license = licenses.gpl3; maintainers = [ stdenv.lib.maintainers.garbas ]; platforms = stdenv.lib.platforms.linux; @@ -8978,7 +9870,7 @@ let name = "tweepy-2.3.0"; disabled = isPy3k; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/t/tweepy/${name}.tar.gz"; sha256 = "0wcj5g21brcqr1g7m4by4rs72lfiib4scg19qynn2wz1x77jyrzp"; }; @@ -8992,13 +9884,35 @@ let }; }); + twiggy = buildPythonPackage rec { + name = "Twiggy-${version}"; + version = "0.4.5"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/T/Twiggy/Twiggy-0.4.5.tar.gz"; + # md5 = "b0dfbbb7f56342e448af4d22a47a339c"; # provided by pypi website. + sha256 = "4e8f1894e5aee522db6cb245ccbfde3c5d1aa08d31330c7e3af783b0e66eec23"; + }; + + doCheck = false; + + meta = { + homepage = http://twiggy.wearpants.org; + # Taken from http://i.wearpants.org/blog/meet-twiggy/ + description = "Twiggy is the first totally new design for a logger since log4j"; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = [ maintainers.pierron ]; + }; + }; + twitter = buildPythonPackage rec { name = "twitter-${version}"; - version = "1.14.3"; + version = "1.15.0"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/t/twitter/${name}.tar.gz"; - sha256 = "1nhhjajbq0jik43q2makpnz094qcziq9p8rj35jxamybd0hwwzs9"; + sha256 = "1m6b17irb9klc345k8174pni724jzy2973z2x2jg69h83hipjw2c"; }; doCheck = false; @@ -9016,12 +9930,12 @@ let disabled = isPy3k; name = "Twisted-11.1.0"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/T/Twisted/${name}.tar.bz2"; sha256 = "05agfp17cndhv2w0p559lvknl7nv0xqkg10apc47fm53m8llbfvz"; }; - propagatedBuildInputs = [ zope_interface ]; + propagatedBuildInputs = with self; [ zope_interface ]; # Generate Twisted's plug-in cache. Twited users must do it as well. See # http://twistedmatrix.com/documents/current/core/howto/plugin.html#auto3 @@ -9048,9 +9962,9 @@ let tzlocal = buildPythonPackage rec { name = "tzlocal-1.1.1"; - propagatedBuildInputs = with pythonPackages; [ pytz ]; + propagatedBuildInputs = with self; [ pytz ]; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/t/tzlocal/tzlocal-1.1.1.zip"; md5 = "56c2a04501b98f2a1188d003fd6d3dba"; }; @@ -9059,7 +9973,7 @@ let doCheck = false; meta = with pkgs.stdenv.lib; { - description = "Tzinfo object for the local timezone."; + description = "Tzinfo object for the local timezone"; homepage = https://github.com/regebro/tzlocal; license = licenses.cddl; }; @@ -9070,11 +9984,11 @@ let name = "unittest2-${version}"; src = if python.is_py3k or false - then fetchurl { + then pkgs.fetchurl { url = "http://pypi.python.org/packages/source/u/unittest2py3k/unittest2py3k-${version}.tar.gz"; sha256 = "00yl6lskygcrddx5zspkhr0ibgvpknl4678kkm6s626539grq93q"; } - else fetchurl { + else pkgs.fetchurl { url = "http://pypi.python.org/packages/source/u/unittest2/unittest2-${version}.tar.gz"; md5 = "a0af5cac92bbbfa0c3b0e99571390e0f"; }; @@ -9094,7 +10008,7 @@ let name = "urlgrabber-3.9.1"; disabled = isPy3k; - src = fetchurl { + src = pkgs.fetchurl { url = "http://urlgrabber.baseurl.org/download/${name}.tar.gz"; sha256 = "4437076c8708e5754ea04540e46c7f4f233734ee3590bb8a96389264fb0650d0"; }; @@ -9102,7 +10016,7 @@ let # error: invalid command 'test' doCheck = false; - propagatedBuildInputs = [ pycurl ]; + propagatedBuildInputs = with self; [ pycurl ]; meta = { homepage = "urlgrabber.baseurl.org"; @@ -9119,7 +10033,7 @@ let # multiple: NameError: name 'evl' is not defined doCheck = false; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/u/urwid/${name}.tar.gz"; md5 = "6a05ada11b87e7b026b01fc5150855b0"; }; @@ -9137,14 +10051,14 @@ let name = "pyuv-0.11.5"; disabled = isPyPy; # see https://github.com/saghul/pyuv/issues/49 - src = fetchurl { + src = pkgs.fetchurl { url = "https://github.com/saghul/pyuv/archive/${name}.tar.gz"; sha256 = "c251952cb4e54c92ab0e871decd13cf73d11ca5dba9f92962de51d12e3a310a9"; }; patches = [ ../development/python-modules/pyuv-external-libuv.patch ]; - buildInputs = [ pkgs.libuvVersions.v0_11_29 ]; + buildInputs = with self; [ pkgs.libuvVersions.v0_11_29 ]; meta = { description = "Python interface for libuv"; @@ -9156,19 +10070,18 @@ let virtualenv = buildPythonPackage rec { name = "virtualenv-1.11.6"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/v/virtualenv/${name}.tar.gz"; md5 = "f61cdd983d2c4e6aeabb70b1060d6f49"; }; - inherit recursivePthLoader; - pythonPath = [ recursivePthLoader ]; + pythonPath = [ self.recursivePthLoader ]; patches = [ ../development/python-modules/virtualenv-change-prefix.patch ]; - propagatedBuildInputs = [ modules.readline modules.sqlite3 modules.curses ]; + propagatedBuildInputs = with self; [ modules.readline modules.sqlite3 modules.curses ]; - buildInputs = [ mock nose ]; + buildInputs = with self; [ mock nose ]; # XXX: Ran 0 tests in 0.003s @@ -9183,13 +10096,13 @@ let virtualenv-clone = buildPythonPackage rec { name = "virtualenv-clone-0.2.4"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/v/virtualenv-clone/${name}.tar.gz"; md5 = "71168b975eaaa91e65559bcc79290b3b"; }; - buildInputs = [pytest]; - propagatedBuildInputs = [virtualenv]; + buildInputs = with self; [pytest]; + propagatedBuildInputs = with self; [virtualenv]; # needs tox to run the tests doCheck = false; @@ -9204,7 +10117,7 @@ let virtualenvwrapper = buildPythonPackage (rec { name = "virtualenvwrapper-4.3"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/v/virtualenvwrapper/${name}.tar.gz"; sha256 = "514cbc22218347bf7b54bdbe49e1a5f550d2d53b1ad2491c10e91ddf48fb528f"; }; @@ -9212,12 +10125,30 @@ let # pip depend on $HOME setting preConfigure = "export HOME=$TMPDIR"; - buildInputs = [ pbr pip pkgs.which ]; - propagatedBuildInputs = [ stevedore virtualenv virtualenv-clone ]; + buildInputs = with self; [ pbr pip pkgs.which ]; + propagatedBuildInputs = with self; [ + stevedore + virtualenv + virtualenv-clone + ] ++ optional isPy26 argparse; patchPhase = '' - substituteInPlace "virtualenvwrapper.sh" --replace "which" "${pkgs.which}/bin/which" - substituteInPlace "virtualenvwrapper_lazy.sh" --replace "which" "${pkgs.which}/bin/which" + for file in "virtualenvwrapper.sh" "virtualenvwrapper_lazy.sh"; do + substituteInPlace "$file" --replace "which" "${pkgs.which}/bin/which" + + # We can't set PYTHONPATH in a normal way (like exporting in a wrapper + # script) because the user has to evaluate the script and we don't want + # modify the global PYTHONPATH which would affect the user's + # environment. + # Furthermore it isn't possible to just use VIRTUALENVWRAPPER_PYTHON + # for this workaround, because this variable is well quoted inside the + # shell script. + # (the trailing " -" is required to only replace things like these one: + # "$VIRTUALENVWRAPPER_PYTHON" -c "import os,[...] and not in + # if-statements or anything like that. + # ...and yes, this "patch" is hacky :) + substituteInPlace "$file" --replace '"$VIRTUALENVWRAPPER_PYTHON" -' 'env PYTHONPATH="$VIRTUALENVWRAPPER_PYTHONPATH" "$VIRTUALENVWRAPPER_PYTHON" -' + done ''; postInstall = '' @@ -9231,8 +10162,8 @@ let mv "$wrapper" "$wrapped" cat > "$wrapper" <<- EOF - export PATH=$PATH:\$PATH - export PYTHONPATH=$PYTHONPATH:$(toPythonPath $out):\$PYTHONPATH + export PATH="$PATH:\$PATH" + export VIRTUALENVWRAPPER_PYTHONPATH="$PYTHONPATH:$(toPythonPath $out)" source "$wrapped" EOF @@ -9251,7 +10182,7 @@ let waitress = buildPythonPackage rec { name = "waitress-0.8.7"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/w/waitress/${name}.tar.gz"; md5 = "714f3d458d82a47f12fb168460de8366"; }; @@ -9271,7 +10202,7 @@ let webcolors = buildPythonPackage rec { name = "webcolors-1.4"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/w/webcolors/${name}.tar.gz"; md5 = "35de9d785b5c04a9cc66a2eae0519254"; }; @@ -9291,12 +10222,12 @@ let wand = buildPythonPackage rec { name = "Wand-0.3.5"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/W/Wand/${name}.tar.gz"; md5 = "10bab03bf86ce8da2a95a3b15197ae2e"; }; - buildInputs = [ pkgs.imagemagick pytest psutil memory_profiler pytest_xdist ]; + buildInputs = with self; [ pkgs.imagemagick pytest psutil memory_profiler pytest_xdist ]; meta = { description = "Ctypes-based simple MagickWand API binding for Python"; @@ -9310,12 +10241,12 @@ let version = "1.4"; name = "webob-${version}"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/W/WebOb/WebOb-${version}.tar.gz"; md5 = "8437607c0cc00c35f658f972516ffb55"; }; - propagatedBuildInputs = [ nose modules.ssl ]; + propagatedBuildInputs = with self; [ nose ]; meta = { description = "WSGI request and response object"; @@ -9329,12 +10260,12 @@ let version = "0.3.0"; name = "websockify-${version}"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/w/websockify/websockify-${version}.tar.gz"; md5 = "29b6549d3421907de4bbd881ecc2e1b1"; }; - propagatedBuildInputs = [ numpy ]; + propagatedBuildInputs = with self; [ numpy ]; meta = { description = "WebSockets support for any application/server"; @@ -9347,7 +10278,7 @@ let version = "2.0.15"; name = "webtest-${version}"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/W/WebTest/WebTest-${version}.zip"; md5 = "49314bdba23f4d0bd807facb2a6d3f90"; }; @@ -9359,9 +10290,9 @@ let # XXX: skipping two tests fails in python2.6 doCheck = ! isPy26; - buildInputs = optionals isPy26 [ pythonPackages.ordereddict unittest2 ]; + buildInputs = optionals isPy26 [ self.ordereddict unittest2 ]; - propagatedBuildInputs = [ + propagatedBuildInputs = with self; [ nose webob six @@ -9385,12 +10316,12 @@ let werkzeug = buildPythonPackage rec { name = "Werkzeug-0.9.6"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/W/Werkzeug/${name}.tar.gz"; md5 = "f7afcadc03b0f2267bdc156c34586043"; }; - propagatedBuildInputs = [ itsdangerous ]; + propagatedBuildInputs = with self; [ itsdangerous ]; doCheck = false; # tests fail, not sure why @@ -9405,12 +10336,12 @@ let wokkel = buildPythonPackage (rec { url = "http://wokkel.ik.nu/releases/0.7.0/wokkel-0.7.0.tar.gz"; name = nameFromURL url ".tar"; - src = fetchurl { + src = pkgs.fetchurl { inherit url; sha256 = "0rnshrzw8605x05mpd8ndrx3ri8h6cx713mp8sl4f04f4gcrz8ml"; }; - propagatedBuildInputs = [twisted dateutil]; + propagatedBuildInputs = with self; [twisted dateutil]; meta = { description = "Some (mainly XMPP-related) additions to twisted"; @@ -9423,12 +10354,12 @@ let wsgiproxy2 = buildPythonPackage rec { name = "WSGIProxy2-0.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/W/WSGIProxy2/${name}.tar.gz"; md5 = "157049212f1c81a8790efa31146fbabf"; }; - propagatedBuildInputs = [ six webob ]; + propagatedBuildInputs = with self; [ six webob ]; meta = { maintainers = [ @@ -9439,9 +10370,7 @@ let }; }; - - wxPython = wxPython28; - + wxPython = self.wxPython28; wxPython28 = callPackage ../development/python-modules/wxPython/2.8.nix { wxGTK = pkgs.wxGTK28; @@ -9451,10 +10380,22 @@ let wxGTK = pkgs.wxGTK30; }; + xcaplib = buildPythonPackage rec { + name = "python-xcaplib-${version}"; + version = "1.0.17"; + + src = pkgs.fetchurl { + url = "http://download.ag-projects.com/SipClient/${name}.tar.gz"; + sha256 = "1bf8n9ghmgxz8kjgnwy4y7ajijy5hi7viabgh0pvzkhz9gfvck86"; + }; + + propagatedBuildInputs = with self; [ eventlib application ]; + }; + xe = buildPythonPackage rec { url = "http://www.blarg.net/%7Esteveha/xe-0.7.4.tar.gz"; name = stdenv.lib.nameFromURL url ".tar"; - src = fetchurl { + src = pkgs.fetchurl { inherit url; sha256 = "0v9878cl0y9cczdsr6xjy8v9l139lc23h4m5f86p4kpf2wlnpi42"; }; @@ -9471,7 +10412,7 @@ let xlib = buildPythonPackage (rec { name = "xlib-0.15rc1"; - src = fetchurl { + src = pkgs.fetchurl { url = "mirror://sourceforge/python-xlib/python-${name}.tar.bz2"; sha256 = "0mvzz605pxzj7lfp2w6z4qglmr4rjza9xrb7sl8yn12cklzfky0m"; }; @@ -9479,7 +10420,7 @@ let # Tests require `pyutil' so disable them to avoid circular references. doCheck = false; - propagatedBuildInputs = [ pkgs.xlibs.libX11 ]; + propagatedBuildInputs = with self; [ pkgs.xlibs.libX11 ]; meta = { description = "Fully functional X client library for Python programs"; @@ -9493,7 +10434,7 @@ let zbase32 = buildPythonPackage (rec { name = "zbase32-1.1.2"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zbase32/${name}.tar.gz"; sha256 = "2f44b338f750bd37b56e7887591bf2f1965bfa79f163b6afcbccf28da642ec56"; }; @@ -9501,7 +10442,7 @@ let # Tests require `pyutil' so disable them to avoid circular references. doCheck = false; - buildInputs = [ setuptoolsDarcs ]; + buildInputs = with self; [ setuptoolsDarcs ]; meta = { description = "zbase32, a base32 encoder/decoder"; @@ -9517,17 +10458,17 @@ let name = "zconfig-${version}"; version = "3.0.3"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/Z/ZConfig/ZConfig-${version}.tar.gz"; md5 = "60a107c5857c3877368dfe5930559804"; }; - propagatedBuildInputs = [ zope_testrunner ]; + propagatedBuildInputs = with self; [ zope_testrunner ]; meta = { description = "Structured Configuration Library"; homepage = http://pypi.python.org/pypi/ZConfig; - license = "ZPL"; + license = stdenv.lib.licenses.zpt20; maintainers = [ stdenv.lib.maintainers.goibhniu ]; }; }; @@ -9537,7 +10478,7 @@ let name = "zc.lockfile-${version}"; version = "1.0.2"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zc.lockfile/${name}.tar.gz"; md5 = "f099d4cf2583a0c7bea0146a44dc4d59"; }; @@ -9545,7 +10486,7 @@ let meta = { description = "Inter-process locks"; homepage = http://www.python.org/pypi/zc.lockfile; - license = "ZPL"; + license = stdenv.lib.licenses.zpt20; maintainers = [ stdenv.lib.maintainers.goibhniu ]; }; }; @@ -9555,12 +10496,12 @@ let name = "zdaemon-${version}"; version = "4.0.0"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zdaemon/${name}.tar.gz"; md5 = "4056e2ea35855695ed15389d9c168b92"; }; - propagatedBuildInputs = [ zconfig ]; + propagatedBuildInputs = [ self.zconfig ]; # too many deps.. doCheck = false; @@ -9568,7 +10509,7 @@ let meta = { description = "A daemon process control library and tools for Unix-based systems"; homepage = http://pypi.python.org/pypi/zdaemon; - license = "ZPL"; + license = stdenv.lib.licenses.zpt20; maintainers = [ stdenv.lib.maintainers.goibhniu ]; }; }; @@ -9578,13 +10519,13 @@ let name = "zfec-1.4.24"; disabled = isPyPy; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zfec/${name}.tar.gz"; sha256 = "1ks94zlpy7n8sb8380gf90gx85qy0p9073wi1wngg6mccxp9xsg3"; }; - buildInputs = [ setuptoolsDarcs ]; - propagatedBuildInputs = [ pyutil argparse ]; + buildInputs = with self; [ setuptoolsDarcs ]; + propagatedBuildInputs = with self; [ pyutil argparse ]; meta = { homepage = http://allmydata.org/trac/zfec; @@ -9609,17 +10550,17 @@ let version = "3.11.0"; disabled = isPyPy; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/Z/ZODB3/ZODB3-${version}.tar.gz"; md5 = "21975c1609296e7834e8cf4025af3039"; }; - propagatedBuildInputs = [ manuel transaction zc_lockfile zconfig zdaemon zope_interface zope_event BTrees persistent ZEO ]; + propagatedBuildInputs = with self; [ manuel transaction zc_lockfile zconfig zdaemon zope_interface zope_event BTrees persistent ZEO ]; meta = { description = "An object-oriented database for Python"; homepage = http://pypi.python.org/pypi/ZODB3; - license = "ZPL"; + license = stdenv.lib.licenses.zpt20; maintainers = [ stdenv.lib.maintainers.goibhniu ]; }; }; @@ -9630,12 +10571,12 @@ let version = "4.0.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/Z/ZODB/ZODB-${version}.tar.gz"; md5 = "092d787524b095164231742c96b32f50"; }; - propagatedBuildInputs = [ manuel transaction zc_lockfile zconfig zdaemon zope_interface persistent BTrees ] + propagatedBuildInputs = with self; [ manuel transaction zc_lockfile zconfig zdaemon zope_interface persistent BTrees ] ++ optionals isPy3k [ zodbpickle ]; preCheck = if isPy3k then '' @@ -9646,16 +10587,16 @@ let meta = { description = "An object-oriented database for Python"; homepage = http://pypi.python.org/pypi/ZODB; - license = "ZPL"; + license = stdenv.lib.licenses.zpt20; maintainers = [ stdenv.lib.maintainers.goibhniu ]; }; }; - zodbpickle = pythonPackages.buildPythonPackage rec { + zodbpickle = self.buildPythonPackage rec { name = "zodbpickle-0.5.2"; disabled = isPyPy; # https://github.com/zopefoundation/zodbpickle/issues/10 - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/z/zodbpickle/${name}.tar.gz"; md5 = "d401bd89f99ec8d56c22493e6f8c0443"; }; @@ -9669,14 +10610,14 @@ let }; - BTrees = pythonPackages.buildPythonPackage rec { + BTrees = self.buildPythonPackage rec { name = "BTrees-4.0.8"; patches = [ ./../development/python-modules/btrees_interger_overflow.patch ]; - propagatedBuildInputs = [ persistent zope_interface transaction ]; + propagatedBuildInputs = with self; [ persistent zope_interface transaction ]; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/B/BTrees/${name}.tar.gz"; md5 = "7f5df4cf8dd50fb0c584c0929a406c92"; }; @@ -9688,12 +10629,12 @@ let }; - persistent = pythonPackages.buildPythonPackage rec { + persistent = self.buildPythonPackage rec { name = "persistent-4.0.8"; - propagatedBuildInputs = [ zope_interface ]; + propagatedBuildInputs = with self; [ zope_interface ]; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/persistent/${name}.tar.gz"; md5 = "2942f1ca7764b1bef8d48fa0d9a236b7"; }; @@ -9707,12 +10648,12 @@ let xdot = buildPythonPackage rec { name = "xdot-0.6"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/x/xdot/xdot-0.6.tar.gz"; md5 = "a8e5fc5208657b03ad1bd4c46de75724"; }; - propagatedBuildInputs = with pythonPackages; [ pygtk pygobject pkgs.graphviz ]; + propagatedBuildInputs = with self; [ pygtk pygobject pkgs.graphviz ]; meta = with stdenv.lib; { description = "xdot.py is an interactive viewer for graphs written in Graphviz's dot"; @@ -9724,12 +10665,12 @@ let zope_broken = buildPythonPackage rec { name = "zope.broken-3.6.0"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zope.broken/${name}.zip"; md5 = "eff24d7918099a3e899ee63a9c31bee6"; }; - buildInputs = [ zope_interface ]; + buildInputs = with self; [ zope_interface ]; meta = { maintainers = [ stdenv.lib.maintainers.goibhniu ]; @@ -9740,12 +10681,12 @@ let zope_browser = buildPythonPackage rec { name = "zope.browser-2.0.2"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zope.browser/${name}.zip"; sha256 = "0f9r5rn9lzgi4hvkhgb6vgw8kpz9sv16jsfb9ws4am8gbqcgv2iy"; }; - propagatedBuildInputs = [ zope_interface ]; + propagatedBuildInputs = with self; [ zope_interface ]; meta = { maintainers = [ stdenv.lib.maintainers.goibhniu ]; @@ -9755,7 +10696,7 @@ let zope_browserresource = buildPythonPackage rec { name = "zope.browserresource-4.0.1"; - propagatedBuildInputs = [ + propagatedBuildInputs = with self; [ zope_component zope_configuration zope_contenttype zope_i18n zope_interface zope_location zope_publisher zope_schema zope_traversing ]; @@ -9763,7 +10704,7 @@ let # all tests fail doCheck = false; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/z/zope.browserresource/zope.browserresource-4.0.1.zip"; md5 = "81bbe92c1f04725561470f89d73222c5"; }; @@ -9774,12 +10715,12 @@ let zope_component = buildPythonPackage rec { name = "zope.component-4.2.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zope.component/zope.component-4.2.1.tar.gz"; sha256 = "1gzbr0j6c2h0cqnpi2cjss38wrz1bcwx8xahl3vykgz5laid15l6"; }; - propagatedBuildInputs = [ + propagatedBuildInputs = with self; [ zope_configuration zope_event zope_i18nmessageid zope_interface zope_testing ]; @@ -9796,12 +10737,12 @@ let zope_configuration = buildPythonPackage rec { name = "zope.configuration-4.0.3"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zope.configuration/zope.configuration-4.0.3.tar.gz"; sha256 = "1x9dfqypgympnlm25p9m43xh4qv3p7d75vksv9pzqibrb4cggw5n"; }; - propagatedBuildInputs = [ zope_i18nmessageid zope_schema ]; + propagatedBuildInputs = with self; [ zope_i18nmessageid zope_schema ]; meta = { maintainers = [ stdenv.lib.maintainers.goibhniu ]; @@ -9812,7 +10753,7 @@ let zope_container = buildPythonPackage rec { name = "zope.container-4.0.0"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zope.container/${name}.tar.gz"; md5 = "b24d2303ece65a2d9ce23a5bd074c335"; }; @@ -9820,7 +10761,7 @@ let # a test is failing doCheck = false; - propagatedBuildInputs = [ + propagatedBuildInputs = with self; [ zodb3 zope_broken zope_dottedname zope_publisher zope_filerepresentation zope_lifecycleevent zope_size zope_traversing @@ -9835,7 +10776,7 @@ let zope_contenttype = buildPythonPackage rec { name = "zope.contenttype-4.0.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zope.contenttype/${name}.tar.gz"; md5 = "171be44753e86742da8c81b3ad008ce0"; }; @@ -9849,7 +10790,7 @@ let zope_dottedname = buildPythonPackage rec { name = "zope.dottedname-3.4.6"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zope.dottedname/${name}.tar.gz"; md5 = "62d639f75b31d2d864fe5982cb23959c"; }; @@ -9863,7 +10804,7 @@ let name = "zope.event-${version}"; version = "4.0.3"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zope.event/${name}.tar.gz"; sha256 = "1w858k9kmgzfj36h65kp27m9slrmykvi5cjq6c119xqnaz5gdzgm"; }; @@ -9871,7 +10812,7 @@ let meta = { description = "An event publishing system"; homepage = http://pypi.python.org/pypi/zope.event; - license = "ZPL"; + license = stdenv.lib.licenses.zpt20; maintainers = [ stdenv.lib.maintainers.goibhniu ]; }; }; @@ -9881,17 +10822,17 @@ let name = "zope.exceptions-${version}"; version = "4.0.5"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zope.exceptions/${name}.tar.gz"; md5 = "c95569fcb444ae541777de7ae5297492"; }; - propagatedBuildInputs = [ zope_interface ]; + propagatedBuildInputs = with self; [ zope_interface ]; meta = { description = "Exception interfaces and implementations"; homepage = http://pypi.python.org/pypi/zope.exceptions; - license = "ZPL"; + license = stdenv.lib.licenses.zpt20; maintainers = [ stdenv.lib.maintainers.goibhniu ]; }; }; @@ -9900,12 +10841,12 @@ let zope_filerepresentation = buildPythonPackage rec { name = "zope.filerepresentation-3.6.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zope.filerepresentation/${name}.tar.gz"; md5 = "4a7a434094f4bfa99a7f22e75966c359"; }; - propagatedBuildInputs = [ zope_schema ]; + propagatedBuildInputs = with self; [ zope_schema ]; meta = { maintainers = [ stdenv.lib.maintainers.goibhniu ]; @@ -9916,12 +10857,12 @@ let zope_i18n = buildPythonPackage rec { name = "zope.i18n-3.8.0"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zope.i18n/${name}.tar.gz"; sha256 = "045nnimmshibcq71yym2d8yrs6wzzhxq5gl7wxjnkpyjm5y0hfkm"; }; - propagatedBuildInputs = [ pytz zope_component ]; + propagatedBuildInputs = with self; [ pytz zope_component ]; meta = { maintainers = [ stdenv.lib.maintainers.goibhniu ]; @@ -9932,7 +10873,7 @@ let zope_i18nmessageid = buildPythonPackage rec { name = "zope.i18nmessageid-4.0.3"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zope.i18nmessageid/zope.i18nmessageid-4.0.3.tar.gz"; sha256 = "1rslyph0klk58dmjjy4j0jxy21k03azksixc3x2xhqbkv97cmzml"; }; @@ -9946,12 +10887,12 @@ let zope_lifecycleevent = buildPythonPackage rec { name = "zope.lifecycleevent-3.7.0"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zope.lifecycleevent/${name}.tar.gz"; sha256 = "0s5brphqzzz89cykg61gy7zcmz0ryq1jj2va7gh2n1b3cccllp95"; }; - propagatedBuildInputs = [ zope_event zope_component ]; + propagatedBuildInputs = with self; [ zope_event zope_component ]; meta = { maintainers = [ stdenv.lib.maintainers.goibhniu ]; @@ -9962,12 +10903,12 @@ let zope_location = buildPythonPackage rec { name = "zope.location-4.0.3"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zope.location/zope.location-4.0.3.tar.gz"; sha256 = "1nj9da4ksiyv3h8n2vpzwd0pb03mdsh7zy87hfpx72b6p2zcwg74"; }; - propagatedBuildInputs = [ zope_proxy ]; + propagatedBuildInputs = with self; [ zope_proxy ]; # ignore circular dependency on zope_schema preBuild = '' @@ -9985,12 +10926,12 @@ let zope_proxy = buildPythonPackage rec { name = "zope.proxy-4.1.4"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zope.proxy/${name}.tar.gz"; md5 = "3bcaf8b8512a99649ecf2f158c11d05b"; }; - propagatedBuildInputs = [ zope_interface ]; + propagatedBuildInputs = with self; [ zope_interface ]; meta = { maintainers = [ stdenv.lib.maintainers.goibhniu ]; @@ -10001,12 +10942,12 @@ let zope_publisher = buildPythonPackage rec { name = "zope.publisher-3.12.6"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zope.publisher/${name}.tar.gz"; md5 = "495131970cc7cb14de8e517fb3857ade"; }; - propagatedBuildInputs = [ + propagatedBuildInputs = with self; [ zope_browser zope_contenttype zope_i18n zope_security ]; @@ -10019,12 +10960,12 @@ let zope_schema = buildPythonPackage rec { name = "zope.schema-4.4.2"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zope.schema/${name}.tar.gz"; sha256 = "1p943jdxb587dh7php4vx04qvn7b2877hr4qs5zyckvp5afhhank"; }; - propagatedBuildInputs = [ zope_location zope_event zope_interface zope_testing ] ++ optional isPy26 ordereddict; + propagatedBuildInputs = with self; [ zope_location zope_event zope_interface zope_testing ] ++ optional isPy26 ordereddict; meta = { maintainers = [ stdenv.lib.maintainers.goibhniu ]; @@ -10035,12 +10976,12 @@ let zope_security = buildPythonPackage rec { name = "zope.security-4.0.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zope.security/${name}.tar.gz"; md5 = "27d1f2873a0ee9c1f485f7b8f22d8e1c"; }; - propagatedBuildInputs = [ + propagatedBuildInputs = with self; [ zope_component zope_configuration zope_i18nmessageid zope_schema zope_proxy zope_testrunner ]; @@ -10054,12 +10995,12 @@ let zope_size = buildPythonPackage rec { name = "zope.size-3.5.0"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zope.size/${name}.tar.gz"; sha256 = "006xfkhvmypwd3ww9gbba4zly7n9w30bpp1h74d53la7l7fiqk2f"; }; - propagatedBuildInputs = [ zope_i18nmessageid zope_interface ]; + propagatedBuildInputs = with self; [ zope_i18nmessageid zope_interface ]; meta = { maintainers = [ stdenv.lib.maintainers.goibhniu ]; @@ -10072,13 +11013,13 @@ let doCheck = !isPyPy; # https://github.com/zopefoundation/zope.sqlalchemy/issues/12 - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zope.sqlalchemy/${name}.zip"; md5 = "0a468bd5b8884cd29fb71acbf7eaa31e"; }; - buildInputs = [ zope_testing zope_interface ]; - propagatedBuildInputs = [ sqlalchemy9 transaction ]; + buildInputs = with self; [ zope_testing zope_interface ]; + propagatedBuildInputs = with self; [ sqlalchemy9 transaction ]; meta = { maintainers = [ @@ -10094,19 +11035,19 @@ let name = "zope.testing-${version}"; version = "4.1.3"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zope.testing/${name}.tar.gz"; md5 = "6c73c5b668a67fdc116a25b884058ed9"; }; doCheck = !(python.isPypy or false); - propagatedBuildInputs = [ zope_interface zope_exceptions zope_location ]; + propagatedBuildInputs = with self; [ zope_interface zope_exceptions zope_location ]; meta = { description = "Zope testing helpers"; homepage = http://pypi.python.org/pypi/zope.testing; - license = "ZPL"; + license = stdenv.lib.licenses.zpt20; maintainers = [ stdenv.lib.maintainers.goibhniu ]; }; }; @@ -10116,19 +11057,19 @@ let name = "zope.testrunner-${version}"; version = "4.4.3"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zope.testrunner/${name}.zip"; sha256 = "1dwk35kg0bmj2lzp4fd2bgp6dv64q5sda09bf0y8j63y53vqbsw8"; }; - propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ] ++ optional (!python.is_py3k or false) subunit; + propagatedBuildInputs = with self; [ zope_interface zope_exceptions zope_testing six ] ++ optional (!python.is_py3k or false) subunit; doCheck = true; meta = { description = "A flexible test runner with layer support"; homepage = http://pypi.python.org/pypi/zope.testrunner; - license = "ZPL"; + license = stdenv.lib.licenses.zpt20; maintainers = [ stdenv.lib.maintainers.goibhniu ]; }; }; @@ -10137,12 +11078,12 @@ let zope_traversing = buildPythonPackage rec { name = "zope.traversing-4.0.0"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zope.traversing/${name}.zip"; md5 = "5cc40c552f953939f7c597ebbedd586f"; }; - propagatedBuildInputs = [ zope_location zope_security zope_publisher transaction zope_tales ]; + propagatedBuildInputs = with self; [ zope_location zope_security zope_publisher transaction zope_tales ]; # circular dependency on zope_browserresource doCheck = false; @@ -10156,58 +11097,56 @@ let zope_interface = buildPythonPackage rec { name = "zope.interface-4.1.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zope.interface/${name}.tar.gz"; md5 = "edcd5f719c5eb2e18894c4d06e29b6c6"; }; - propagatedBuildInputs = [ zope_event ]; + propagatedBuildInputs = with self; [ zope_event ]; meta = { description = "Zope.Interface"; homepage = http://zope.org/Products/ZopeInterface; - license = "ZPL"; + license = stdenv.lib.licenses.zpt20; maintainers = [ stdenv.lib.maintainers.goibhniu ]; }; }; + hgsvn = buildPythonPackage rec { + name = "hgsvn-0.3.5"; + src = pkgs.fetchurl rec { + url = "http://pypi.python.org/packages/source/h/hgsvn/${name}.zip"; + sha256 = "043yvkjf9hgm0xzhmwj1qk3fsmbgwm39f4wsqkscib9wfvxs8wbg"; + }; + disabled = isPy3k || isPyPy; - # XXX: link broken - # hgsvn = buildPythonPackage rec { - # name = "hgsvn-0.1.8"; - # src = fetchurl rec { - # name = "hgsvn-0.1.8.tar.gz"; - # url = "http://pypi.python.org/packages/source/h/hgsvn/${name}.tar.gz#md5=56209eae48b955754e09185712123428"; - # sha256 = "18a7bj1i0m4shkxmdvw1ci5i0isq5vqf0bpwgrhnk305rijvbpch"; - # }; - # - # buildInputs = [ pkgs.setuptools ]; - # doCheck = false; - # - # meta = { - # description = "HgSVN"; - # homepage = http://pypi.python.org/pypi/hgsvn; - # }; - # }; + buildInputs = with self; [ pkgs.setuptools ]; + doCheck = false; + + meta = { + description = "HgSVN"; + homepage = http://pypi.python.org/pypi/hgsvn; + }; + }; cliapp = buildPythonPackage rec { name = "cliapp-${version}"; version = "1.20140719"; disabled = isPy3k; - src = fetchurl rec { + src = pkgs.fetchurl rec { url = "http://code.liw.fi/debian/pool/main/p/python-cliapp/python-cliapp_${version}.orig.tar.gz"; sha256 = "0kxl2q85n4ggvbw2m8crl11x8n637mx6y3a3b5ydw8nhlsiqijgp"; }; - buildInputs = [ sphinx ]; + buildInputs = with self; [ sphinx ]; # error: invalid command 'test' doCheck = false; meta = { homepage = http://liw.fi/cliapp/; - description = "Python framework for Unix command line programs."; + description = "Python framework for Unix command line programs"; maintainers = [ stdenv.lib.maintainers.rickynils ]; }; }; @@ -10216,9 +11155,9 @@ let tornado = buildPythonPackage rec { name = "tornado-3.2"; - propagatedBuildInputs = [ backports_ssl_match_hostname_3_4_0_2 ]; + propagatedBuildInputs = with self; [ backports_ssl_match_hostname_3_4_0_2 ]; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/t/tornado/${name}.tar.gz"; md5 = "bd83cee5f1a5c5e139e87996d00b251b"; }; @@ -10228,17 +11167,17 @@ let tornadokick = buildPythonPackage rec { - name = "tornadokick-2014.07.23"; + name = "tornadokick-0.2.1"; - propagatedBuildInputs = [ tornado ]; + propagatedBuildInputs = with self; [ tornado ]; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/t/tornadokick/${name}.tar.gz"; - md5 = "201d26de2993a554b16140af3b4ee1b6"; + md5 = "95ee5a295ce3f361c6f843c4f39cbb8c"; }; meta = { - description = "The TornadoKick Web Toolkit for Tornado Web Framework."; + description = "A Toolkit for the Tornado Web Framework"; homepage = http://github.com/multoncore/tornadokick; license = stdenv.lib.licenses.asl20; }; @@ -10248,7 +11187,7 @@ let version = "0.2-b3634a2c6eb6d6936c3b2c1ef5078bf3a84c40c6"; name = "screenkey-${version}"; - propagatedBuildInputs = [ pygtk distutils_extra xlib pkgs.xorg.xmodmap ]; + propagatedBuildInputs = with self; [ pygtk distutils_extra xlib pkgs.xorg.xmodmap ]; preConfigure = '' substituteInPlace setup.py --replace "/usr/share" "./share" @@ -10261,7 +11200,7 @@ let --replace " keybinder.bind(self.options['hotkey'], self.hotkey_cb, show_item)" "" ''; - src = fetchgit { + src = pkgs.fetchgit { url = https://github.com/scs3jb/screenkey.git; rev = "b3634a2c6eb6d6936c3b2c1ef5078bf3a84c40c6"; sha256 = "eb754917e98e03cb9d528eb5f57a08c88fa7a8172f92325a9fe796b2daf14db0"; @@ -10282,13 +11221,13 @@ let disabled = isPy3k; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/t/tarman/tarman-${version}.zip"; sha256 = "0ri6gj883k042xaxa2d5ymmhbw2bfcxdzhh4bz7700ibxwxxj62h"; }; - buildInputs = [ unittest2 nose mock ]; - propagatedBuildInputs = [ modules.curses libarchive ]; + buildInputs = with self; [ unittest2 nose mock ]; + propagatedBuildInputs = with self; [ modules.curses libarchive ]; # tests are still failing doCheck = false; @@ -10300,36 +11239,35 @@ let name = "libarchive-${version}"; disabled = isPy3k; - src = fetchurl { + src = pkgs.fetchurl { url = "http://python-libarchive.googlecode.com/files/python-libarchive-${version}.tar.gz"; sha256 = "0j4ibc4mvq64ljya9max8832jafi04jciff9ia9qy0xhhlwkcx8x"; }; - propagatedBuildInputs = [ pkgs.libarchive ]; + propagatedBuildInputs = with self; [ pkgs.libarchive ]; }; pyzmq = buildPythonPackage rec { name = "pyzmq-13.0.0"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pyzmq/pyzmq-13.0.0.zip"; md5 = "fa2199022e54a393052d380c6e1a0934"; }; - buildInputs = [ pkgs.zeromq3 ]; - propagatedBuildInputs = [ ]; + buildInputs = with self; [ pkgs.zeromq3 ]; doCheck = false; }; tissue = buildPythonPackage rec { name = "tissue-0.9.2"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/t/tissue/${name}.tar.gz"; md5 = "87dbcdafff41bfa1b424413f79aa9153"; }; - buildInputs = [ nose ]; - propagatedBuildInputs = [ pep8 ]; + buildInputs = with self; [ nose ]; + propagatedBuildInputs = with self; [ pep8 ]; meta = { maintainers = [ @@ -10345,19 +11283,19 @@ let name = "tracing-${version}"; version = "0.8"; - src = fetchurl rec { + src = pkgs.fetchurl rec { url = "http://code.liw.fi/debian/pool/main/p/python-tracing/python-tracing_${version}.orig.tar.gz"; sha256 = "1l4ybj5rvrrcxf8csyq7qx52izybd502pmx70zxp46gxqm60d2l0"; }; - buildInputs = [ sphinx ]; + buildInputs = with self; [ sphinx ]; # error: invalid command 'test' doCheck = false; meta = { homepage = http://liw.fi/tracing/; - description = "Python debug logging helper."; + description = "Python debug logging helper"; maintainers = [ stdenv.lib.maintainers.rickynils ]; }; }; @@ -10365,7 +11303,7 @@ let translationstring = buildPythonPackage rec { name = "translationstring-1.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/t/translationstring/${name}.tar.gz"; md5 = "0979b46d8f0f852810c8ec4be5c26cf2"; }; @@ -10385,19 +11323,19 @@ let version = "0.23"; disabled = isPy3k; - src = fetchurl rec { + src = pkgs.fetchurl rec { url = "http://code.liw.fi/debian/pool/main/p/python-ttystatus/python-ttystatus_${version}.orig.tar.gz"; sha256 = "0ymimviyjyh2iizqilg88g4p26f5vpq1zm3cvg7dr7q4y3gmik8y"; }; - buildInputs = [ sphinx ]; + buildInputs = with self; [ sphinx ]; # error: invalid command 'test' doCheck = false; meta = { homepage = http://liw.fi/ttystatus/; - description = "Progress and status updates on terminals for Python."; + description = "Progress and status updates on terminals for Python"; maintainers = [ stdenv.lib.maintainers.rickynils ]; }; }; @@ -10406,20 +11344,20 @@ let name = "larch-${version}"; version = "1.20131130"; - src = fetchurl rec { + src = pkgs.fetchurl rec { url = "http://code.liw.fi/debian/pool/main/p/python-larch/python-larch_${version}.orig.tar.gz"; sha256 = "1hfanp9l6yc5348i3f5sb8c5s4r43y382hflnbl6cnz4pm8yh5r7"; }; - buildInputs = [ sphinx ]; - propagatedBuildInputs = [ tracing ttystatus cliapp ]; + buildInputs = with self; [ sphinx ]; + propagatedBuildInputs = with self; [ tracing ttystatus cliapp ]; # error: invalid command 'test' doCheck = false; meta = { homepage = http://liw.fi/larch/; - description = "Python B-tree library."; + description = "Python B-tree library"; maintainers = [ stdenv.lib.maintainers.rickynils ]; }; }; @@ -10428,12 +11366,12 @@ let websocket_client = buildPythonPackage rec { name = "websocket-client-0.17.0"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/w/websocket-client/${name}.tar.gz"; md5 = "c86591719085eaf4a01c2275e0c834fc"; }; - propagatedBuildInputs = [ six backports_ssl_match_hostname_3_4_0_2 unittest2 argparse ]; + propagatedBuildInputs = with self; [ six backports_ssl_match_hostname_3_4_0_2 unittest2 argparse ]; meta = { homepage = https://github.com/liris/websocket-client; @@ -10446,12 +11384,12 @@ let webhelpers = buildPythonPackage rec { name = "WebHelpers-1.3"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/W/WebHelpers/${name}.tar.gz"; md5 = "32749ffadfc40fea51075a7def32588b"; }; - buildInputs = [ routes markupsafe webob nose ]; + buildInputs = with self; [ routes markupsafe webob nose ]; # TODO: failing tests https://bitbucket.org/bbangert/webhelpers/pull-request/1/fix-error-on-webob-123/diff doCheck = false; @@ -10469,7 +11407,7 @@ let name = "whisper-${version}"; version = "0.9.12"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/w/whisper/${name}.tar.gz"; md5 = "5fac757cc4822ab0678dbe0d781d904e"; }; @@ -10488,12 +11426,12 @@ let name = "carbon-${version}"; version = "0.9.12"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/c/carbon/${name}.tar.gz"; md5 = "66967d5a622fd29973838fcd10eb34f3"; }; - propagatedBuildInputs = [ whisper txamqp zope_interface twisted ]; + propagatedBuildInputs = with self; [ whisper txamqp zope_interface twisted ]; # error: invalid command 'test' doCheck = false; @@ -10506,10 +11444,28 @@ let }; + ujson = buildPythonPackage rec { + name = "ujson-1.33"; + + disabled = isPyPy; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/u/ujson/${name}.zip"; + md5 = "8148a2493fff78940feab1e11dc0a893"; + }; + + meta = { + homepage = http://pypi.python.org/pypi/ujson; + description = "Ultra fast JSON encoder and decoder for Python"; + license = licenses.bsd3; + }; + }; + + unidecode = buildPythonPackage rec { name = "Unidecode-0.04.12"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/U/Unidecode/${name}.tar.gz"; md5 = "351dc98f4512bdd2e93f7a6c498730eb"; }; @@ -10526,7 +11482,7 @@ let pyusb = buildPythonPackage rec { name = "pyusb-1.0.0b1"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pyusb/${name}.tar.gz"; md5 = "5cc9c7dd77b4d12fcc22fee3b39844bc"; }; @@ -10549,14 +11505,14 @@ let usbtmc = buildPythonPackage rec { name = "usbtmc-${version}"; - version = "0.5"; + version = "0.6"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://github.com/python-ivi/python-usbtmc/archive/v${version}.tar.gz"; - sha256 = "0xn8whjcdn8wgs9j1gj7sw7fh425akdmq3hi448m36fywldbhryg"; + sha256 = "1wnw6ndc3s1i8zpbikz5zc40ijvpraqdb0xn8zmqlyn95xxfizw2"; }; - propagatedBuildInputs = [ pyusb ]; + propagatedBuildInputs = with self; [ pyusb ]; meta = { description = "Python implementation of the USBTMC instrument control protocol"; @@ -10571,12 +11527,12 @@ let name = "txamqp-${version}"; version = "0.3"; - src = fetchurl rec { + src = pkgs.fetchurl rec { url = "https://launchpad.net/txamqp/trunk/${version}/+download/python-txamqp_${version}.orig.tar.gz"; sha256 = "1r2ha0r7g14i4b5figv2spizjrmgfpspdbl1m031lw9px2hhm463"; }; - buildInputs = [ twisted ]; + buildInputs = with self; [ twisted ]; meta = { homepage = https://launchpad.net/txamqp; @@ -10589,7 +11545,7 @@ let name = "versiontools-1.9.1"; doCheck = (!isPy3k); - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/v/versiontools/${name}.tar.gz"; sha256 = "1xhl6kl7f4srgnw6zw4lr8j2z5vmrbaa83nzn2c9r2m1hwl36sd9"; }; @@ -10600,12 +11556,12 @@ let name = "graphite-web-${version}"; version = "0.9.12"; - src = fetchurl rec { + src = pkgs.fetchurl rec { url = "https://pypi.python.org/packages/source/g/graphite-web/${name}.tar.gz"; md5 = "8edbb61f1ffe11c181bd2cb9ec977c72"; }; - propagatedBuildInputs = [ django_1_3 django_tagging modules.sqlite3 whisper pkgs.pycairo ldap memcached ]; + propagatedBuildInputs = with self; [ django_1_3 django_tagging modules.sqlite3 whisper pkgs.pycairo ldap memcached ]; postInstall = '' wrapProgram $out/bin/run-graphite-devel-server.py \ @@ -10633,7 +11589,7 @@ let name = "graphite-api-1.0.1"; disabled = isPyPy; - src = fetchgit { + src = pkgs.fetchgit { url = "https://github.com/brutasse/graphite-api.git"; rev = "b6f75e8a08fae695c094fece6de611b893fc65fb"; sha256 = "41b90d5f35e99a020a6b1b77938690652521d1841b3165574fcfcee807ce4e6a"; @@ -10641,7 +11597,7 @@ let checkPhase = "nosetests"; - propagatedBuildInputs = [ + propagatedBuildInputs = with self; [ flask flask_cache cairocffi @@ -10654,7 +11610,7 @@ let tzlocal ]; - buildInputs = [ + buildInputs = with self; [ nose mock ]; @@ -10671,13 +11627,13 @@ let graphite_influxdb = buildPythonPackage rec { name = "graphite-influxdb-0.3"; - src = fetchgit { + src = pkgs.fetchgit { url = "https://github.com/vimeo/graphite-influxdb.git"; rev = "2273d12a24e1d804685a36debfd4224b7416b62f"; sha256 = "e386eaf190793d3ad0a42a74b9e137a968a51fc3806f602ff756e09c0c0648a8"; }; - propagatedBuildInputs = [ influxdb graphite_api ]; + propagatedBuildInputs = with self; [ influxdb graphite_api ]; passthru.moduleName = "graphite_influxdb.InfluxdbFinder"; @@ -10688,18 +11644,45 @@ let }; }; + graphite_pager = buildPythonPackage rec { + name = "graphite-pager-${version}"; + version = "2bbfe91220ec1e0ca1cdf4b5564386482a44ed7d"; + + src = pkgs.fetchgit { + url = "https://github.com/offlinehacker/graphite-pager.git"; + sha256 = "aa932f941efe4ed89971fe7572218b020d1a144259739ef78db6397b968eef62"; + rev = version; + }; + + buildInputs = with self; [ nose mock ]; + propagatedBuildInputs = with self; [ + jinja2 pyyaml redis requests pagerduty + python_simple_hipchat pushbullet + ]; + + patchPhase = "> requirements.txt"; + checkPhase = "nosetests"; + + meta = { + description = "A simple alerting application for Graphite metrics"; + homepage = https://github.com/seatgeek/graphite-pager; + maintainers = [ maintainers.offline ]; + license = licenses.bsd2; + }; + }; + pyspotify = buildPythonPackage rec { name = "pyspotify-${version}"; version = "1.11"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://github.com/mopidy/pyspotify/archive/v1.11.tar.gz"; sha256 = "089ml6pqr3f2d15n70jpzbaqjp5pjgqlyv4algkxw92xscjw2izg"; }; - buildInputs = [ pkgs.libspotify ] + buildInputs = with self; [ pkgs.libspotify ] ++ stdenv.lib.optional stdenv.isDarwin pkgs.install_name_tool; # python zip complains about old timestamps @@ -10732,7 +11715,7 @@ let version = "1.2.0"; - src = fetchgit { + src = pkgs.fetchgit { url = "https://github.com/jodal/pykka.git"; rev = "refs/tags/v${version}"; sha256 = "17vv2q636zp2fvxrp7ckgnz1ifaffcj5vdxvfb4isd1d32c49amb"; @@ -10753,7 +11736,7 @@ let version = "git-20130303"; - src = fetchgit { + src = pkgs.fetchgit { url = "https://github.com/Lawouach/WebSocket-for-Python.git"; rev = "ace276500ca7e4c357595e3773be151d37bcd6e2"; sha256 = "04m4m3ncn7g4rb81xg5n28imns7rsq8d2w98gjpaib6vlmyly3g1"; @@ -10778,7 +11761,7 @@ let name = "gdata-${version}"; version = "2.0.17"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://gdata-python-client.googlecode.com/files/${name}.tar.gz"; # sha1 = "d2d9f60699611f95dd8c328691a2555e76191c0c"; sha256 = "0bdaqmicpbj9v3p0swvyrqs7m35bzwdw1gy56d3k09np692jfwmd"; @@ -10799,12 +11782,12 @@ let version = "0.11"; disabled = isPy34; - src = fetchurl { + src = pkgs.fetchurl { url = "http://freshfoo.com/projects/IMAPClient/${name}.tar.gz"; sha256 = "1w54h8gz25qf6ggazzp6xf7kvsyiadsjfkkk17gm0p6pmzvvccbn"; }; - buildInputs = [ mock ]; + buildInputs = with self; [ mock ]; preConfigure = '' sed -i '/distribute_setup/d' setup.py @@ -10822,7 +11805,7 @@ let name = "Logbook-${version}"; version = "0.4.2"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/L/Logbook/${name}.tar.gz"; # md5 = "143cb15af4c4a784ca785a1546ad1b93"; sha256 = "1g2pnhxh7m64qsrs0ifwcmpfk7gqjvrawd8z66i001rsdnq778v0"; @@ -10837,14 +11820,14 @@ let libvirt = pkgs.stdenv.mkDerivation rec { name = "libvirt-python-${version}"; - version = "1.2.7"; + version = "1.2.9"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://libvirt.org/sources/python/${name}.tar.gz"; - sha256 = "0wg0pnvrwfjdl8haxr2dyfhdasddq97zy6l27xwrvd1hnh1394f1"; + sha256 = "1vbrkwvsvcfgibdw4drcypg2n6zcpi3zv23zw20nkk5fjfp26w4g"; }; - buildInputs = [ python pkgs.pkgconfig pkgs.libvirt lxml ]; + buildInputs = with self; [ python pkgs.pkgconfig pkgs.libvirt lxml ]; buildPhase = "python setup.py build"; @@ -10861,13 +11844,13 @@ let name = "searx-${rev}"; rev = "44d3af9fb2482cd0df1a8ababbe2fdf27ab33172"; - src = fetchgit { + src = pkgs.fetchgit { url = "git://github.com/asciimoo/searx"; inherit rev; sha256 = "1w505pzdkkcglq782wg7f5fxrw9i5jzp7px20c2xz18pps2m3rsm"; }; - propagatedBuildInputs = [ pyyaml lxml grequests flaskbabel flask requests + propagatedBuildInputs = with self; [ pyyaml lxml grequests flaskbabel flask requests gevent speaklater Babel pytz dateutil ]; meta = { @@ -10878,15 +11861,16 @@ let }; }; + grequests = buildPythonPackage rec { name = "grequests-0.2.0"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/g/grequests/${name}.tar.gz"; sha256 = "0lafzax5igbh8y4x0krizr573wjsxz7bhvwygiah6qwrzv83kv5c"; }; - buildInputs = [ requests gevent ]; + buildInputs = with self; [ requests gevent ]; meta = { description = "GRequests allows you to use Requests with Gevent to make asyncronous HTTP Requests easily."; @@ -10899,12 +11883,12 @@ let flaskbabel = buildPythonPackage rec { name = "Flask-Babel-0.9"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/F/Flask-Babel/${name}.tar.gz"; sha256 = "0k7vk4k54y55ma0nx2k5s0phfqbriwslhy5shh3b0d046q7ibzaa"; }; - buildInputs = [ flask jinja2 speaklater Babel pytz ]; + buildInputs = with self; [ flask jinja2 speaklater Babel pytz ]; meta = { description = "Adds i18n/l10n support to Flask applications"; @@ -10917,7 +11901,7 @@ let speaklater = buildPythonPackage rec { name = "speaklater-1.3"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/s/speaklater/${name}.tar.gz"; sha256 = "1ab5dbfzzgz6cnz4xlwx79gz83id4bhiw67k1cgqrlzfs0va7zjr"; }; @@ -10930,10 +11914,22 @@ let }; }; + pushbullet = buildPythonPackage rec { + name = "pushbullet.py-${version}"; + version = "0.5.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pushbullet.py/pushbullet.py-0.5.0.tar.gz"; + md5 = "36c83ba5f7d5208bb86c00eba633f921"; + }; + + propagatedBuildInputs = with self; [requests websocket_client python_magic ]; + }; + power = buildPythonPackage rec { name = "power-1.2"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/power/${name}.tar.gz"; sha256 = "09a00af8357f63dbb1a1eb13b82e39ccc0a14d6d2e44e5b235afe60ce8ee8195"; }; @@ -10949,12 +11945,12 @@ let version = "1.1.2"; name = "udiskie-${version}"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://github.com/coldfix/udiskie/archive/${version}.tar.gz"; sha256 = "07fyvwp4rga47ayfsmb79p2784sqrih0sglwnd9c4x6g63xgljvb"; }; - propagatedBuildInputs = with pythonPackages; [ pygtk pyyaml pygobject dbus notify pkgs.udisks2 pkgs.gettext ]; + propagatedBuildInputs = with self; [ pygtk pyyaml pygobject dbus notify pkgs.udisks2 pkgs.gettext ]; # tests require dbusmock doCheck = false; @@ -10970,34 +11966,14 @@ let pythonefl_1_11 = buildPythonPackage rec { name = "python-efl-${version}"; version = "1.11.0"; - src = fetchurl { + src = pkgs.fetchurl { url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.xz"; sha256 = "1d4hj39alg6j7ah1bc8wvlka9d13i8iy3fxxraik2f60w6811i48"; }; preConfigure = '' - export NIX_CFLAGS_COMPILE="-I${pkgs.e19.efl}/include/eo-1 -I${pkgs.e19.efl}/include/eina-1 -I${pkgs.e19.efl}/include/eina-1/eina -I${pkgs.e19.efl}/include/evas-1 -I${dbus}/include/dbus-1.0 -I${pkgs.e19.efl}/include/efl-1 -I${pkgs.e19.efl}/include/eet-1 -I${pkgs.e19.efl}/include/ecore-1 -I${pkgs.e19.efl}/include/ecore-evas-1 -I${pkgs.e19.efl}/include/ecore-file-1 -I${pkgs.e19.efl}/include/ecore-input-1 -I${pkgs.e19.efl}/include/ecore-imf-1 -I${pkgs.e19.efl}/include/ecore-con-1 -I${pkgs.e19.efl}/include/edje-1 -I${pkgs.e19.efl}/include/eldbus-1 -I${pkgs.e19.efl}/include/efreet-1 -I${pkgs.e19.efl}/include/ethumb-client-1 -I${pkgs.e19.efl}/include/ethumb-1 -I${pkgs.e19.efl}/include/ecore-x-1 $NIX_CFLAGS_COMPILE" + export NIX_CFLAGS_COMPILE="-I${pkgs.e19.efl}/include/eo-1 -I${pkgs.e19.efl}/include/eina-1 -I${pkgs.e19.efl}/include/eina-1/eina -I${pkgs.e19.efl}/include/evas-1 -I${self.dbus}/include/dbus-1.0 -I${pkgs.e19.efl}/include/efl-1 -I${pkgs.e19.efl}/include/eet-1 -I${pkgs.e19.efl}/include/ecore-1 -I${pkgs.e19.efl}/include/ecore-evas-1 -I${pkgs.e19.efl}/include/ecore-file-1 -I${pkgs.e19.efl}/include/ecore-input-1 -I${pkgs.e19.efl}/include/ecore-imf-1 -I${pkgs.e19.efl}/include/ecore-con-1 -I${pkgs.e19.efl}/include/edje-1 -I${pkgs.e19.efl}/include/eldbus-1 -I${pkgs.e19.efl}/include/efreet-1 -I${pkgs.e19.efl}/include/ethumb-client-1 -I${pkgs.e19.efl}/include/ethumb-1 -I${pkgs.e19.efl}/include/ecore-x-1 $NIX_CFLAGS_COMPILE" ''; - buildInputs = [ pkgs.pkgconfig pkgs.e19.efl pkgs.e19.elementary ]; - meta = { - description = "Python bindings for EFL and Elementary."; - homepage = http://enlightenment.org/; - maintainers = [ stdenv.lib.maintainers.matejc ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl3; - }; - }; - - pythonefl = buildPythonPackage rec { - name = "python-efl-${version}"; - version = "1.10.0"; - src = fetchurl { - url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.gz"; - sha256 = "1inv2qalnm9paifdwyh9q3ffxcp9bjj92phvfw1rgkaildvfji5i"; - }; - preConfigure = '' - export NIX_CFLAGS_COMPILE="-I${pkgs.e18.efl}/include/eo-1 -I${pkgs.e18.efl}/include/eina-1 -I${pkgs.e18.efl}/include/eina-1/eina -I${pkgs.e18.efl}/include/evas-1 -I${dbus}/include/dbus-1.0 -I${pkgs.e18.efl}/include/efl-1 -I${pkgs.e18.efl}/include/eet-1 -I${pkgs.e18.efl}/include/ecore-1 -I${pkgs.e18.efl}/include/ecore-evas-1 -I${pkgs.e18.efl}/include/ecore-file-1 -I${pkgs.e18.efl}/include/ecore-input-1 -I${pkgs.e18.efl}/include/ecore-imf-1 -I${pkgs.e18.efl}/include/ecore-con-1 -I${pkgs.e18.efl}/include/edje-1 -I${pkgs.e18.efl}/include/eldbus-1 -I${pkgs.e18.efl}/include/efreet-1 -I${pkgs.e18.efl}/include/ethumb-client-1 -I${pkgs.e18.efl}/include/ethumb-1 -I${pkgs.e18.efl}/include/ecore-x-1 $NIX_CFLAGS_COMPILE" - ''; - buildInputs = [ pkgs.pkgconfig pkgs.e18.efl pkgs.e18.elementary ]; + buildInputs = with self; [ pkgs.pkgconfig pkgs.e19.efl pkgs.e19.elementary ]; meta = { description = "Python bindings for EFL and Elementary."; homepage = http://enlightenment.org/; @@ -11010,7 +11986,7 @@ let snapperGUI = buildPythonPackage rec { name = "Snapper-GUI"; - src = fetchgit { + src = pkgs.fetchgit { url = "https://github.com/ricardomv/snapper-gui"; rev = "11d98586b122180c75a86fccda45c4d7e3137591"; sha256 = "7a9f86fc17dbf130526e70c3e925eac30e2c74d6b932efbf7e7cd9fbba6dc4b1"; @@ -11019,7 +11995,7 @@ let # no tests available doCheck = false; - propagatedBuildInputs = with pythonPackages; [ pygobject3 dbus ]; + propagatedBuildInputs = with self; [ pygobject3 dbus ]; meta = { homepage = https://github.com/ricardomv/snapper-gui; @@ -11033,7 +12009,7 @@ let redNotebook = buildPythonPackage rec { name = "rednotebook-1.8.1"; - src = fetchurl { + src = pkgs.fetchurl { url = "mirror://sourceforge/rednotebook/${name}.tar.gz"; sha256 = "00b7s4xpqpxsbzjvjx9qsx5d84m9pvn383c5di1nsfh35pig0rzn"; }; @@ -11041,7 +12017,7 @@ let # no tests available doCheck = false; - propagatedBuildInputs = with pythonPackages; [ pygtk pywebkitgtk pyyaml chardet ]; + propagatedBuildInputs = with self; [ pygtk pywebkitgtk pyyaml chardet ]; meta = { homepage = http://rednotebook.sourceforge.net/index.html; @@ -11055,11 +12031,57 @@ let # python2.7 specific packages } // optionalAttrs isPy27 ( - with pythonPackages; + with self; { + boto-230 = buildPythonPackage rec { + name = "boto-2.30.0"; + src = pkgs.fetchurl { + url = https://pypi.python.org/packages/source/b/boto/boto-2.30.0.tar.gz; + sha256 = "12gl8azmx1vv8dbv9jhnsbhjpc2dd1ng0jlbcg734k6ggwq1h6hh"; + }; + doCheck = false; + meta = { + homepage = https://github.com/boto/boto; + license = licenses.mit; + description = "Python interface to Amazon Web Services"; + }; + }; + + gcs-oauth2-boto-plugin = buildPythonPackage rec { + name = "gcs-oauth2-boto-plugin-1.8"; + src = pkgs.fetchurl { + url = https://pypi.python.org/packages/source/g/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.8.tar.gz; + sha256 = "0jy62y5bmaf1mb735lqwry1s5nx2qqrxvl5sxip9yg4miih3qkyb"; + }; + propagatedBuildInputs = with self; [ boto-230 httplib2 google_api_python_client retry_decorator pkgs.pyopenssl socksipy-branch ]; + meta = { + homepage = https://developers.google.com/storage/docs/gspythonlibrary; + description = "Provides OAuth 2.0 credentials that can be used with Google Cloud Storage"; + license = stdenv.lib.licenses.asl20; + }; + }; + + gsutil = buildPythonPackage rec { + name = "gsutil-4.6"; + meta = { + homepage = https://developers.google.com/storage/docs/gsutil; + description = "Google Cloud Storage Tool"; + maintainers = [ "Russell O'Connor <oconnorr@google.com>" ]; + license = stdenv.lib.licenses.asl20; + }; + doCheck = false; - pypi2nix = pythonPackages.buildPythonPackage rec { + src = pkgs.fetchurl { + url = https://pypi.python.org/packages/source/g/gsutil/gsutil-4.6.tar.gz; + sha256 = "1i0clm60162rbk45ljr8nsw4ndkzjnwb7r440shcqjrvw8jq49mn"; + }; + + propagatedBuildInputs = with self; [ boto-230 crcmod httplib2 gcs-oauth2-boto-plugin google_api_python_client gflags + retry_decorator pkgs.pyopenssl socksipy-branch ]; + }; + + pypi2nix = self.buildPythonPackage rec { rev = "04a68d8577acbceb88bdf51b1231a9dbdead7003"; name = "pypi2nix-1.0_${rev}"; @@ -11078,11 +12100,29 @@ let }; }; + svg2tikz = self.buildPythonPackage { + name = "svg2tikz-1.0.0"; - thumbor = pythonPackages.buildPythonPackage rec { + propagatedBuildInputs = with self; [lxml]; + + src = pkgs.fetchgit { + url = "https://github.com/kjellmf/svg2tikz"; + sha256 = "429428ec435e53672b85cdfbb89bb8af0ff9f8238f5d05970729e5177d252d5f"; + rev = "ad36f2c3818da13c4136d70a0fd8153acf8daef4"; + }; + + meta = { + homepage = https://github.com/kjellmf/svg2tikz; + description = "An SVG to TikZ converter"; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = with pkgs.stdenv.lib.maintainers; [gal_bolle]; + }; + }; + + thumbor = self.buildPythonPackage rec { name = "thumbor-4.0.4"; - propagatedBuildInputs = [ + propagatedBuildInputs = with self; [ tornado pycrypto pycurl @@ -11098,7 +12138,7 @@ let ffmpeg = null; }) ]; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/t/thumbor/${name}.tar.gz"; md5 = "cf639a1cc57ee287b299ace450444408"; }; @@ -11110,10 +12150,10 @@ let }; }; - thumborPexif = pythonPackages.buildPythonPackage rec { + thumborPexif = self.buildPythonPackage rec { name = "thumbor-pexif-0.14"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/t/thumbor-pexif/${name}.tar.gz"; md5 = "fb4cdb60f4a0bead5193fb483ccd3430"; }; @@ -11130,14 +12170,14 @@ let baseName = "pync"; name = "${baseName}-${version}"; - src = fetchurl { + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/${baseName}/${name}.tar.gz"; md5 = "5cc79077f386a17b539f1e51c05a3650"; }; - buildInputs = [ pkgs.coreutils ]; + buildInputs = with self; [ pkgs.coreutils ]; - propagatedBuildInputs = [ dateutil ]; + propagatedBuildInputs = with self; [ dateutil ]; preInstall = stdenv.lib.optionalString stdenv.isDarwin '' sed -i 's|^\([ ]*\)self.bin_path.*$|\1self.bin_path = "${pkgs.rubyLibs.terminal_notifier}/bin/terminal-notifier"|' build/lib/pync/TerminalNotifier.py @@ -11153,16 +12193,16 @@ let }; weboob = buildPythonPackage rec { - name = "weboob-0.j"; + name = "weboob-1.0"; - src = fetchurl { - url = "https://symlink.me/attachments/download/271/${name}.tar.gz"; - md5 = "9e11b1f376ccb87d35995ec87bba5b38"; + src = pkgs.fetchurl { + url = "https://symlink.me/attachments/download/289/${name}.tar.gz"; + md5 = "38f832f1b8654441adafe8558faa7109"; }; setupPyBuildFlags = ["--qt" "--xdg"]; - propagatedBuildInputs = [ pillow prettytable pyyaml dateutil gdata requests2 mechanize feedparser lxml pkgs.gnupg pyqt4 pkgs.libyaml simplejson cssselect ]; + propagatedBuildInputs = with self; [ pillow prettytable pyyaml dateutil gdata requests2 mechanize feedparser lxml pkgs.gnupg pyqt4 pkgs.libyaml simplejson cssselect futures ]; meta = { homepage = http://weboob.org; @@ -11171,4 +12211,37 @@ let maintainers = [ stdenv.lib.maintainers.DamienCassou ]; }; }; + + datadiff = buildPythonPackage rec { + name = "datadiff-1.1.6"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/d/datadiff/datadiff-1.1.6.zip"; + md5 = "c34a690db75eead148aa5fa89e575d1e"; + }; + + buildInputs = with self; [ nose ]; + + meta = with stdenv.lib; { + description = "DataDiff"; + homepage = http://sourceforge.net/projects/datadiff/; + license = licenses.asl20; + }; + }; + + termcolor = buildPythonPackage rec { + name = "termcolor-1.1.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/t/termcolor/termcolor-1.1.0.tar.gz"; + md5 = "043e89644f8909d462fbbfa511c768df"; + }; + + meta = with stdenv.lib; { + description = "Termcolor"; + homepage = http://pypi.python.org/pypi/termcolor; + license = licenses.mit; + }; + }; + }); in pythonPackages diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix index 0a8e7165d663..cc27693ab2be 100644 --- a/pkgs/top-level/release-lib.nix +++ b/pkgs/top-level/release-lib.nix @@ -1,9 +1,9 @@ -{ supportedSystems }: +{ supportedSystems, packageSet ? (import ./all-packages.nix) }: rec { # Ensure that we don't build packages marked as unfree. - allPackages = args: import ./all-packages.nix (args // { + allPackages = args: packageSet (args // { config.allowUnfree = false; }); diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index cfb14429a764..87eba72f4fc7 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -46,7 +46,6 @@ with import ./release-lib.nix { inherit supportedSystems; }; findutils = all; flex = all; gcc = all; - gcc33 = linux; gcc34 = linux; gcc44 = linux; gcj = linux; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 71f51554719c..90a82be0e05e 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -12,7 +12,7 @@ { nixpkgs ? { outPath = (import ./all-packages.nix {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } , officialRelease ? false , # The platforms for which we build Nixpkgs. - supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" ] + supportedSystems ? [ "x86_64-linux" "i686-linux" /* "x86_64-darwin" */ ] }: with import ./release-lib.nix { inherit supportedSystems; }; @@ -32,7 +32,7 @@ let jobs.manual jobs.stdenv.x86_64-linux jobs.stdenv.i686-linux - jobs.stdenv.x86_64-darwin + #jobs.stdenv.x86_64-darwin jobs.linux.x86_64-linux jobs.linux.i686-linux # Ensure that X11/GTK+ are in order. @@ -95,7 +95,6 @@ let gajim = linux; gawk = all; gcc = linux; - gcc33 = linux; gcc34 = linux; gcc44 = linux; gcj = linux; @@ -129,7 +128,6 @@ let inkscape = linux; irssi = linux; jfsutils = linux; - jfsrec = linux; jnettop = linux; jwhois = linux; kbd = linux; |